chore: updating repo

.gitignore

@@ -1,6 +1,7 @@
-cjs
-mjs
-node_modules
 .vscode/configurationCache.log
 .vscode/dryrun.log
 .vscode/targets.log
+cjs
+coverage
+mjs
+node_modules

.npmignore

@@ -1,9 +1,8 @@
 .github
 .vscode
-*.sh
 *.test.*
 jest.*
 Makefile
-src
 test
-tsconfig.json
+tsconfig.*
+wip

Makefile

@@ -1,5 +1,7 @@
 test:
-	pnpm exec jest
+	pnpm tsc
+	pnpm eslint src
+	pnpm jest --coverage
 
 clean:
 	rm -Rf cjs mjs test/*.js
@@ -11,7 +13,7 @@ build-cjs:
 
 build-mjs:
 	rm -Rf mjs
-	pnpm exec tsc -d --sourceMap --outDir mjs
+	pnpm exec tsc -p tsconfig.mjs.json
 
 build: build-cjs build-mjs
 
@@ -20,11 +22,11 @@ rebuild: clean build
 update:
 	pnpm up --latest
 
-preversion: rebuild test
+preversion: test rebuild
 
 postversion:
 	git push
 	git push --tags
-	pnpm publish
+	pnpm publish --access public
 
 .PHONY: test

eslint.config.mjs

@@ -0,0 +1 @@
+export { default } from '@prelude/eslint-config'

package.json

@@ -20,6 +20,7 @@
   },
   "scripts": {
     "test": "make test",
+    "build": "make build",
     "preversion": "make preversion",
     "postversion": "make postversion"
   },
@@ -33,21 +34,16 @@
   "author": "Mirek Rusin <[email protected]>",
   "license": "MIT",
   "devDependencies": {
-    "@appliedblockchain/eslint-config": "3.1.1",
-    "@babel/core": "7.22.1",
-    "@swc/core": "1.3.62",
-    "@swc/jest": "0.2.26",
-    "@tsconfig/node18": "2.0.1",
-    "@types/debug": "4.1.8",
-    "@types/jest": "29.5.2",
-    "@types/node": "20.2.5",
-    "@types/tedious": "4.0.9",
-    "@typescript-eslint/eslint-plugin": "5.59.8",
-    "@typescript-eslint/parser": "5.59.8",
-    "debug": "4.3.4",
-    "eslint": "8.42.0",
-    "jest": "29.5.0",
-    "tedious": "16.1.0",
-    "typescript": "5.1.3"
+    "@jest/globals": "^29.7.0",
+    "@prelude/eslint-config": "0.0.1",
+    "@swc/core": "1.7.14",
+    "@swc/jest": "0.2.36",
+    "@tsconfig/node20": "^20.1.4",
+    "@types/node": "22.5.0",
+    "@types/tedious": "4.0.14",
+    "eslint": "9.9.0",
+    "jest": "29.7.0",
+    "tedious": "19.0.0",
+    "typescript": "5.5.4"
   }
 }

src/assign-object.test.ts

@@ -1,3 +1,4 @@
+import { test, expect } from '@jest/globals'
 import * as Tsql from './index.js'
 
 test('assigns auto values', () => {

src/assign.test.ts

@@ -1,3 +1,4 @@
+import { test, expect } from '@jest/globals'
 import * as Tsql from './index.js'
 
 test('assigns auto values', () => {

src/defined.ts

@@ -4,6 +4,8 @@ const defined =
     const object_ = Object.assign({}, object)
     for (const key in object) {
       if (typeof object_[key] === 'undefined') {
+
+        // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
         delete object_[key]
       }
     }

src/demargin.test.ts

@@ -1,3 +1,4 @@
+import { test, expect } from '@jest/globals'
 import * as Tsql from './index.js'
 
 test('simple', () => {

src/demargin.ts

@@ -7,17 +7,17 @@ export const demargin =
       throw new TypeError(`Expected value to be string, got ${value}.`)
     }
     const lines = value.split('\n')
-    if (lines.length && lines[0].split('').every(_ => _ === ' ')) {
+    if ((lines.length > 0) && lines[0].split('').every(_ => _ === ' ')) {
       lines.shift()
     }
-    if (lines.length && lines[lines.length - 1].split('').every(_ => _ === ' ')) {
+    if ((lines.length > 0) && lines[lines.length - 1].split('').every(_ => _ === ' ')) {
       lines.pop()
     }
     let margin = Infinity
-    for (let i = 0; i < lines.length; i++) {
-      for (let j = 0; j < lines[i].length; j++) {
-        if (lines[i][j] !== ' ') {
-          margin = Math.min(margin, j)
+    for (const line of lines) {
+      for (let i = 0; i < line.length; i++) {
+        if (line[i] !== ' ') {
+          margin = Math.min(margin, i)
           break
         }
       }

src/identifier.test.ts

@@ -1,3 +1,4 @@
+import { test, expect } from '@jest/globals'
 import * as Tsql from './index.js'
 
 test('basic', () => {

src/identifier.ts

@@ -11,7 +11,7 @@ export type Identifier =
 export function isPlain(value: string) {
   return (
     !keywords[value.toLowerCase()] &&
-    !!String(value).match(/^[a-z_@#][a-z0-9_]*$/i)
+    !!String(value).match(/^[a-z_@#]\w*$/i)
   )
 }
 

src/in.test.ts

@@ -1,9 +1,10 @@
+import { test, expect } from '@jest/globals'
 import * as Tsql from './index.js'
 
 test('in', () => {
-  expect(Tsql.in('foo', [ 1 ])!.toString()).toEqual('foo in (1)')
-  expect(Tsql.in('foo', [])!.toString()).toEqual('0=1')
-  expect(Tsql.in('foo', null)!.toString()).toEqual('0=1')
+  expect(String(Tsql.in('foo', [ 1 ]))).toEqual('foo in (1)')
+  expect(String(Tsql.in('foo', []))).toEqual('0=1')
+  expect(String(Tsql.in('foo', null))).toEqual('0=1')
   expect(typeof Tsql.in('foo', undefined)).toBe('undefined')
   expect(
     Tsql.and(

src/in.ts

@@ -17,7 +17,7 @@ export const in_ =
   (l: S | string, r: undefined | null | unknown[]): undefined | S =>
     typeof r === 'undefined' ?
       undefined :
-      r && !isNull(r) && r.length ?
+      r && !isNull(r) && (r.length > 0) ?
         tsql`${fallback(l, id)} in ${row(r)}` :
         logicalFalse
 

src/inline-table-of-column.ts

@@ -12,7 +12,7 @@ import tsql from './template.js'
  */
 export const inlineTableOfColumn =
   (table: Sid | string, column: Sid | string, values: unknown[]): S => {
-    if (!values.length) {
+    if (values.length === 0) {
       throw new Error(`Can't generate literal table ${table} using column ${column} with an empty array of values.`)
     }
     const table_ = id(table)

src/inline-table-of-objects.test.ts

@@ -1,3 +1,4 @@
+import { test, expect } from '@jest/globals'
 import * as Tsql from './index.js'
 
 test('literalTableOfObjects', () => {

src/insert-not-matched.ts

@@ -42,7 +42,7 @@ export const insertNotMatched =
       throw new TypeError(`Expected array of values, got ${objects}.`)
     }
 
-    if (!objects.length) {
+    if (objects.length === 0) {
       return tsql`select 0;`
     }
 

src/insert-object.test.ts

@@ -1,3 +1,4 @@
+import { test, expect } from '@jest/globals'
 import * as Tsql from './index.js'
 
 test('insert-object', () => {

src/insert-object.ts

@@ -17,7 +17,7 @@ export const insertObject =
   (table: Sid | string, object: Record<string, unknown>, output?: S): S => {
     const object_ = defined(object)
     const keys = Object.keys(object_)
-    if (!keys.length) {
+    if (keys.length === 0) {
       throw new TypeError(`Expected object with keys, got ${object_}.`)
     }
     const table_ = id(table)

src/insert-objects.test.ts

@@ -1,9 +1,10 @@
-import Sql from './test/sql.js'
+import { beforeAll, afterAll, afterEach, test, expect } from '@jest/globals'
+import Client from './test/client.js'
 
-let sql: Sql
+let sql: Client
 
 beforeAll(async () => {
-  sql = await Sql.random()
+  sql = await Client.random()
 }, 30 * 1000)
 
 afterAll(async () => {
@@ -44,7 +45,7 @@ test.each([
   1000,
   1001,
   2000
-])('insert %i records', async (length) => {
+])('insert %i records', async length => {
   const users = Array.from({ length }, (_, i) => ({ name: `user-${i}` }))
   await sql.insertObjects('Users', users)
   await expect(sql.count('Users')).resolves.toBe(length)

src/insert-objects.ts

@@ -26,7 +26,7 @@ export const insertObjects =
       throw new TypeError(`Expected array of values, got ${objects}.`)
     }
 
-    if (!objects.length) {
+    if (objects.length === 0) {
       return tsql`select 0;`
     }
 

src/interpolate.test.ts

@@ -1,3 +1,4 @@
+import { test, expect } from '@jest/globals'
 import * as Tsql from './index.js'
 
 test('simple', () => {

src/interpolate.ts

@@ -6,7 +6,7 @@ type Margin = {
   open: boolean
 }
 
-function updateMargin(margin: Margin, value: string) {
+function updateMargin(mutableMargin: Margin, value: string) {
 
   // Locate start of last line.
   const start = value.lastIndexOf('\n') + 1
@@ -27,8 +27,8 @@ function updateMargin(margin: Margin, value: string) {
   const blanks = end === value.length
 
   // Update margin.
-  margin.column = multiline ? column : margin.column + (margin.open ? column : 0)
-  margin.open = (margin.open || multiline) && blanks
+  mutableMargin.column = multiline ? column : mutableMargin.column + (mutableMargin.open ? column : 0)
+  mutableMargin.open = (mutableMargin.open || multiline) && blanks
 }
 
 /**
@@ -40,7 +40,7 @@ export const interpolate =
     if (!Array.isArray(xs) || !Array.isArray(ys)) {
       throw new TypeError(`Expected xs and ys to be an array, got ${xs} and ${ys}.`)
     }
-    if (!xs.length && !ys.length) {
+    if ((xs.length === 0) && (ys.length === 0)) {
       return []
     }
     if (xs.length - 1 !== ys.length) {

src/interpolate1.ts

@@ -4,7 +4,7 @@ export const interpolate1 =
     if (!Array.isArray(xs)) {
       throw new TypeError(`Expected xs to be an array, got ${xs}.`)
     }
-    if (!xs.length) {
+    if (xs.length === 0) {
       return []
     }
     const rs: (T | I)[] = [ xs[0] ]

src/is-null.test.ts

@@ -1,3 +1,4 @@
+import { test, expect } from '@jest/globals'
 import * as Tsql from './index.js'
 
 test('is-null', () => {

src/json-modify.test.ts

@@ -1,3 +1,4 @@
+import { test, expect } from '@jest/globals'
 import * as Tsql from './index.js'
 
 test('jsonModify', () => {

src/json-path.test.ts

@@ -1,3 +1,4 @@
+import { test, expect } from '@jest/globals'
 import * as Tsql from './index.js'
 
 test('jsonPath', () => {

src/json-path.ts

@@ -14,7 +14,7 @@ export const jsonPath =
     if (mode) {
       parts.push(mode)
     }
-    if (parts.length) {
+    if (parts.length > 0) {
       return `${parts.join(' ')} $.${path}`
     }
     return `$.${path}`

src/keys-of-objects.ts

@@ -13,7 +13,7 @@ export const keysOfObjects =
     if (!Array.isArray(objects)) {
       throw new TypeError(`Expected array, got ${objects}.`)
     }
-    if (!objects.length) {
+    if (objects.length === 0) {
       throw new TypeError('Expected non empty array.')
     }
     const keys = Object.keys(objects[0]).sort()

src/keywords.ts

@@ -973,7 +973,7 @@ const keywords_ = [
 ]
 
 /** An array of MSSQL keywords. */
-const keywords: { [keyword: string]: undefined | true } =
+const keywords: Record<string, undefined | true> =
   keywords_.reduce((r, _) => ({ ...r, [_]: true }), {})
 
 export default keywords

src/lines.test.ts

@@ -1,8 +1,9 @@
+import { test, expect } from '@jest/globals'
 import * as Tsql from './index.js'
 
 test('simple', () => {
   expect(() => Tsql.lines([])).toThrow('Expected at least one line.')
-  expect(() => Tsql.lines([undefined, undefined])).toThrow('Expected at least one line.')
-  expect(Tsql.lines(['foo', 'bar'])?.toString()).toEqual(`N'foo'\nN'bar'`)
-  expect(Tsql.lines(['foo', undefined, 'bar'])?.toString()).toEqual(`N'foo'\nN'bar'`)
+  expect(() => Tsql.lines([ undefined, undefined ])).toThrow('Expected at least one line.')
+  expect(Tsql.lines([ 'foo', 'bar' ])?.toString()).toEqual('N\'foo\'\nN\'bar\'')
+  expect(Tsql.lines([ 'foo', undefined, 'bar' ])?.toString()).toEqual('N\'foo\'\nN\'bar\'')
 })

src/margin-of-first-line.test.ts

@@ -1,3 +1,4 @@
+import { test, expect } from '@jest/globals'
 import marginOfFirstLine from './margin-of-first-line.js'
 
 test('marginOfFirstLine', () => {

src/margin-of-last-line.test.ts

@@ -1,3 +1,4 @@
+import { test, expect } from '@jest/globals'
 import marginOfLastLine from './margin-of-last-line.js'
 
 test('marginOfLastLine', () => {

src/margin.test.ts

@@ -1,3 +1,4 @@
+import { test, expect } from '@jest/globals'
 import * as Tsql from './index.js'
 
 test('margin', () => {

src/merge-1n.ts

@@ -24,7 +24,7 @@ export const merge1n =
     if (!Array.isArray(values)) {
       throw new TypeError(`Expected array of values, got ${values}.`)
     }
-    if (!values.length) {
+    if (values.length === 0) {
       return tsql`delete from ${table_} where ${lcolumn_} = ${lid};`
     }
     return tsql`

src/merge1n.test.ts

@@ -1,3 +1,4 @@
+import { test, expect } from '@jest/globals'
 import * as Tsql from './index.js'
 
 test('merge1n', () => {

src/modify-jsons.test.ts

@@ -1,3 +1,4 @@
+import { test, expect } from '@jest/globals'
 import * as Tsql from './index.js'
 
 test('modify-jsons', () => {