@slonik/sql-tag 46.0.1 → 46.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -22,7 +22,7 @@ const createJsonSqlFragment = (token, greatestParameterPosition, binary) => {
22
22
  }
23
23
  else if (!(0, isPlainObject_1.isPlainObject)(token.value) &&
24
24
  !Array.isArray(token.value) &&
25
- !['number', 'string', 'boolean'].includes(typeof token.value)) {
25
+ !['boolean', 'number', 'string'].includes(typeof token.value)) {
26
26
  throw new errors_1.InvalidInputError('JSON payload must be a primitive value or a plain object.');
27
27
  }
28
28
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"createJsonSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createJsonSqlFragment.ts"],"names":[],"mappings":";;;AAAA,sCAAmC;AACnC,sCAA0C;AAM1C,kFAA+E;AAC/E,8DAA2D;AAC3D,8DAA2D;AAC3D,2CAAmD;AACnD,qDAAiD;AAEjD,MAAM,GAAG,GAAG,eAAM,CAAC,KAAK,CAAC;IACvB,SAAS,EAAE,uBAAuB;CACnC,CAAC,CAAC;AAEI,MAAM,qBAAqB,GAAG,CACnC,KAAwC,EACxC,yBAAiC,EACjC,MAAe,EACG,EAAE;IACpB,IAAI,KAAK,CAAC;IAEV,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC9B,MAAM,IAAI,0BAAiB,CAAC,qCAAqC,CAAC,CAAC;IACrE,CAAC;SAAM,IAAI,KAAK,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;QAChC,KAAK,GAAG,MAAM,CAAC;QAEf,0BAA0B;IAC5B,CAAC;SAAM,IACL,CAAC,IAAA,6BAAa,EAAC,KAAK,CAAC,KAAK,CAAC;QAC3B,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;QAC3B,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,OAAO,KAAK,CAAC,KAAK,CAAC,EAC7D,CAAC;QACD,MAAM,IAAI,0BAAiB,CACzB,2DAA2D,CAC5D,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,KAAK,GAAG,IAAA,6BAAa,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,CACP;gBACE,KAAK,EAAE,IAAA,gCAAc,EAAC,KAAK,CAAC;aAC7B,EACD,+BAA+B,CAChC,CAAC;YAEF,MAAM,IAAI,0BAAiB,CAAC,qCAAqC,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,0BAAiB,CACzB,uEAAuE,CACxE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,GAAG,EACD,IAAA,iDAAuB,EAAC,yBAAyB,GAAG,CAAC,CAAC;YACtD,IAAI;YACJ,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QAC7B,IAAI,EAAE,sBAAa;QACnB,MAAM,EAAE,CAAC,KAAK,CAAC;KAChB,CAAC;AACJ,CAAC,CAAC;AAlDW,QAAA,qBAAqB,yBAkDhC"}
1
+ {"version":3,"file":"createJsonSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createJsonSqlFragment.ts"],"names":[],"mappings":";;;AAAA,sCAAmC;AACnC,sCAA0C;AAM1C,kFAA+E;AAC/E,8DAA2D;AAC3D,8DAA2D;AAC3D,2CAAmD;AACnD,qDAAiD;AAEjD,MAAM,GAAG,GAAG,eAAM,CAAC,KAAK,CAAC;IACvB,SAAS,EAAE,uBAAuB;CACnC,CAAC,CAAC;AAEI,MAAM,qBAAqB,GAAG,CACnC,KAAwC,EACxC,yBAAiC,EACjC,MAAe,EACG,EAAE;IACpB,IAAI,KAAK,CAAC;IAEV,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC9B,MAAM,IAAI,0BAAiB,CAAC,qCAAqC,CAAC,CAAC;IACrE,CAAC;SAAM,IAAI,KAAK,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;QAChC,KAAK,GAAG,MAAM,CAAC;QAEf,0BAA0B;IAC5B,CAAC;SAAM,IACL,CAAC,IAAA,6BAAa,EAAC,KAAK,CAAC,KAAK,CAAC;QAC3B,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;QAC3B,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,KAAK,CAAC,KAAK,CAAC,EAC7D,CAAC;QACD,MAAM,IAAI,0BAAiB,CACzB,2DAA2D,CAC5D,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,KAAK,GAAG,IAAA,6BAAa,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,CACP;gBACE,KAAK,EAAE,IAAA,gCAAc,EAAC,KAAK,CAAC;aAC7B,EACD,+BAA+B,CAChC,CAAC;YAEF,MAAM,IAAI,0BAAiB,CAAC,qCAAqC,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,0BAAiB,CACzB,uEAAuE,CACxE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,GAAG,EACD,IAAA,iDAAuB,EAAC,yBAAyB,GAAG,CAAC,CAAC;YACtD,IAAI;YACJ,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QAC7B,IAAI,EAAE,sBAAa;QACnB,MAAM,EAAE,CAAC,KAAK,CAAC;KAChB,CAAC;AACJ,CAAC,CAAC;AAlDW,QAAA,qBAAqB,yBAkDhC"}
package/dist/types.d.ts CHANGED
@@ -2,9 +2,9 @@ import type * as tokens from './tokens';
2
2
  import { type PrimitiveValueExpression } from '@slonik/types';
3
3
  import { type ZodTypeAny } from 'zod';
4
4
  export { type PrimitiveValueExpression } from '@slonik/types';
5
- export type SerializableValue = SerializableValue[] | boolean | number | string | readonly SerializableValue[] | {
5
+ export type SerializableValue = {
6
6
  [key: string]: SerializableValue;
7
- } | null | undefined;
7
+ } | boolean | null | number | readonly SerializableValue[] | SerializableValue[] | string | undefined;
8
8
  export type IntervalInput = {
9
9
  days?: number;
10
10
  hours?: number;
@@ -24,7 +24,7 @@ export type ValueExpression = PrimitiveValueExpression | SqlFragmentToken | SqlT
24
24
  * "string" type covers all type name identifiers – the literal values are added only to assist developer
25
25
  * experience with auto suggestions for commonly used type name identifiers.
26
26
  */
27
- type TypeNameIdentifier = string | 'bool' | 'bytea' | 'float4' | 'float8' | 'int2' | 'int4' | 'int8' | 'json' | 'text' | 'timestamptz' | 'uuid';
27
+ type TypeNameIdentifier = 'bool' | 'bytea' | 'float4' | 'float8' | 'int2' | 'int4' | 'int8' | 'json' | 'text' | 'timestamptz' | 'uuid' | string;
28
28
  export type ArraySqlToken = {
29
29
  readonly memberType: SqlFragmentToken | TypeNameIdentifier;
30
30
  readonly type: typeof tokens.ArrayToken;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,KAAK,CAAC;AAEtC,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAE9D,MAAM,MAAM,iBAAiB,GACzB;IACE,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAC;CAClC,GACD,OAAO,GACP,IAAI,GACJ,MAAM,GACN,SAAS,iBAAiB,EAAE,GAC5B,iBAAiB,EAAE,GACnB,MAAM,GACN,SAAS,CAAC;AAEd,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,OAAO,MAAM,CAAC,aAAa,CAAC;IAC3C,QAAQ,CAAC,MAAM,EAAE,SAAS,wBAAwB,EAAE,CAAC;CACtD,CAAC;AAEF,MAAM,MAAM,eAAe,GACvB,wBAAwB,GACxB,gBAAgB,GAChB,QAAQ,CAAC;AAEb;;;GAGG;AACH,KAAK,kBAAkB,GACnB,MAAM,GACN,OAAO,GACP,QAAQ,GACR,QAAQ,GACR,MAAM,GACN,MAAM,GACN,MAAM,GACN,MAAM,GACN,MAAM,GACN,aAAa,GACb,MAAM,GACN,MAAM,CAAC;AAEX,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,UAAU,EAAE,gBAAgB,GAAG,kBAAkB,CAAC;IAC3D,QAAQ,CAAC,IAAI,EAAE,OAAO,MAAM,CAAC,UAAU,CAAC;IACxC,QAAQ,CAAC,MAAM,EAAE,SAAS,wBAAwB,EAAE,CAAC;CACtD,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,OAAO,MAAM,CAAC,WAAW,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,OAAO,MAAM,CAAC,SAAS,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,OAAO,MAAM,CAAC,aAAa,CAAC;IAC3C,QAAQ,CAAC,MAAM,EAAE,SAAS,wBAAwB,EAAE,CAAC;CACtD,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,IAAI,EAAE,OAAO,MAAM,CAAC,eAAe,CAAC;CAC9C,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,OAAO,MAAM,CAAC,aAAa,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,SAAS,eAAe,EAAE,CAAC;IAC7C,QAAQ,CAAC,IAAI,EAAE,OAAO,MAAM,CAAC,SAAS,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,IAAI,EAAE,OAAO,MAAM,CAAC,eAAe,CAAC;IAC7C,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,IAAI,EAAE,OAAO,MAAM,CAAC,SAAS,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI;IAC7D,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IACnB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,OAAO,MAAM,CAAC,UAAU,CAAC;IACxC,QAAQ,CAAC,MAAM,EAAE,SAAS,wBAAwB,EAAE,CAAC;CACtD,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,OAAO,MAAM,CAAC,cAAc,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,WAAW,EAChB,KAAK,CAAC,CAAC,GAAG,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAC,GACxC,KAAK,CAAC,gBAAgB,GAAG,kBAAkB,CAAC,CAAC;IACjD,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,SAAS,eAAe,EAAE,CAAC,CAAC;IAC3D,QAAQ,CAAC,IAAI,EAAE,OAAO,MAAM,CAAC,WAAW,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,QAAQ,GAChB,aAAa,GACb,cAAc,GACd,YAAY,GACZ,gBAAgB,GAChB,kBAAkB,GAClB,gBAAgB,GAChB,kBAAkB,GAClB,YAAY,GACZ,YAAY,GACZ,aAAa,GACb,iBAAiB,GACjB,cAAc,CAAC;AAEnB,MAAM,MAAM,MAAM,CAChB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,IAC/D;IACF,KAAK,EAAE,CACL,MAAM,EAAE,SAAS,wBAAwB,EAAE,EAC3C,UAAU,EAAE,gBAAgB,GAAG,kBAAkB,KAC9C,aAAa,CAAC;IACnB,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,cAAc,CAAC;IACzC,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,YAAY,CAAC;IACnC,QAAQ,EAAE,CACR,QAAQ,EAAE,oBAAoB,EAC9B,GAAG,MAAM,EAAE,eAAe,EAAE,KACzB,gBAAgB,CAAC;IACtB,UAAU,EAAE,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,KAAK,kBAAkB,CAAC;IAC7D,QAAQ,EAAE,CAAC,QAAQ,EAAE,aAAa,KAAK,gBAAgB,CAAC;IACxD,IAAI,EAAE,CACJ,OAAO,EAAE,SAAS,eAAe,EAAE,EACnC,IAAI,EAAE,gBAAgB,KACnB,YAAY,CAAC;IAClB,IAAI,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,YAAY,CAAC;IACjD,KAAK,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,kBAAkB,CAAC;IACxD,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,gBAAgB,CAAC;IAClD,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,iBAAiB,CAAC;IAC7C,IAAI,EAAE,CAAC,CAAC,SAAS,UAAU,EACzB,MAAM,EAAE,CAAC,KACN,CACH,QAAQ,EAAE,oBAAoB,EAC9B,GAAG,MAAM,EAAE,eAAe,EAAE,KACzB,aAAa,CAAC,CAAC,CAAC,CAAC;IACtB,SAAS,EAAE,CAAC,CAAC,SAAS,MAAM,CAAC,EAC3B,SAAS,EAAE,CAAC,KACT,CACH,QAAQ,EAAE,oBAAoB,EAC9B,GAAG,MAAM,EAAE,eAAe,EAAE,KACzB,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzB,MAAM,EAAE,CAKN,MAAM,EAAE,aAAa,CAAC,SAAS,GAAG,EAAE,CAAC,EACrC,WAAW,EACP,KAAK,CAAC,CAAC,GAAG,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAC,GACxC,KAAK,CAAC,gBAAgB,GAAG,kBAAkB,CAAC,KAC7C,cAAc,CAAC;IACpB,MAAM,EAAE,CACN,QAAQ,EAAE,oBAAoB,EAC9B,GAAG,MAAM,EAAE,eAAe,EAAE,KACzB,aAAa,CAAC;CACpB,CAAC"}
@@ -1,2 +1,2 @@
1
- export declare const isPrimitiveValueExpression: (maybe: unknown) => maybe is bigint | boolean | number | string | null;
1
+ export declare const isPrimitiveValueExpression: (maybe: unknown) => maybe is bigint | boolean | null | number | string;
2
2
  //# sourceMappingURL=isPrimitiveValueExpression.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"isPrimitiveValueExpression.d.ts","sourceRoot":"","sources":["../../src/utilities/isPrimitiveValueExpression.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,0BAA0B,UAC9B,OAAO,KACb,KAAK,IAAI,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,IAQhD,CAAC"}
1
+ {"version":3,"file":"isPrimitiveValueExpression.d.ts","sourceRoot":"","sources":["../../src/utilities/isPrimitiveValueExpression.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,0BAA0B,UAC9B,OAAO,KACb,KAAK,IAAI,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,MAAM,GAAG,MAQ9C,CAAC"}
@@ -1,2 +1,2 @@
1
- export declare const safeStringify: (subject: unknown, replacer?: Array<number | string> | ((key: string, value: unknown) => unknown) | null | undefined, space?: number | string) => string;
1
+ export declare const safeStringify: (subject: unknown, replacer?: ((key: string, value: unknown) => unknown) | Array<number | string> | null | undefined, space?: number | string) => string;
2
2
  //# sourceMappingURL=safeStringify.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"safeStringify.d.ts","sourceRoot":"","sources":["../../src/utilities/safeStringify.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,aAAa,YACf,OAAO,aAEZ,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,GACtB,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,GAC1C,IAAI,GACJ,SAAS,UACL,MAAM,GAAG,MAAM,KACtB,MAQF,CAAC"}
1
+ {"version":3,"file":"safeStringify.d.ts","sourceRoot":"","sources":["../../src/utilities/safeStringify.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,aAAa,YACf,OAAO,aAEZ,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,GAC1C,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,GACtB,IAAI,GACJ,SAAS,UACL,MAAM,GAAG,MAAM,KACtB,MAQF,CAAC"}
package/package.json CHANGED
@@ -16,23 +16,23 @@
16
16
  ]
17
17
  },
18
18
  "dependencies": {
19
- "@slonik/errors": "^46.0.1",
20
- "@slonik/types": "^46.0.1",
19
+ "@slonik/errors": "^46.2.0",
20
+ "@slonik/types": "^46.2.0",
21
21
  "roarr": "^7.21.1",
22
22
  "safe-stable-stringify": "^2.4.3",
23
23
  "serialize-error": "^8.0.0"
24
24
  },
25
25
  "description": "A Node.js PostgreSQL client with strict types, detailed logging and assertions.",
26
26
  "devDependencies": {
27
- "@types/node": "^18.15.3",
27
+ "@types/node": "^22.9.0",
28
28
  "ava": "^6.1.3",
29
- "cspell": "^8.6.0",
30
- "eslint": "^8.57.0",
31
- "eslint-config-canonical": "^42.8.1",
29
+ "cspell": "^8.16.0",
30
+ "eslint": "^9.14.0",
32
31
  "nyc": "^15.1.0",
33
32
  "ts-node": "^10.9.1",
34
- "typescript": "^5.4.5",
35
- "zod": "^3.22.4"
33
+ "typescript": "^5.6.3",
34
+ "zod": "^3.22.4",
35
+ "@slonik/eslint-config": "^46.2.0"
36
36
  },
37
37
  "engines": {
38
38
  "node": ">=18"
@@ -75,7 +75,7 @@
75
75
  "url": "https://github.com/gajus/slonik"
76
76
  },
77
77
  "types": "./dist/index.d.ts",
78
- "version": "46.0.1",
78
+ "version": "46.2.0",
79
79
  "scripts": {
80
80
  "build": "rm -fr ./dist && tsc --project ./tsconfig.json",
81
81
  "lint": "npm run lint:cspell && npm run lint:eslint && npm run lint:tsc",
@@ -12,7 +12,7 @@ export const createPrimitiveValueExpressions = (
12
12
  ): readonly PrimitiveValueExpression[] => {
13
13
  const primitiveValueExpressions: Array<
14
14
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
15
- any[] | Buffer | boolean | number | string | bigint | null
15
+ any[] | bigint | boolean | Buffer | null | number | string
16
16
  > = [];
17
17
 
18
18
  for (const value of values) {
@@ -31,7 +31,7 @@ export const createJsonSqlFragment = (
31
31
  } else if (
32
32
  !isPlainObject(token.value) &&
33
33
  !Array.isArray(token.value) &&
34
- !['number', 'string', 'boolean'].includes(typeof token.value)
34
+ !['boolean', 'number', 'string'].includes(typeof token.value)
35
35
  ) {
36
36
  throw new InvalidInputError(
37
37
  'JSON payload must be a primitive value or a plain object.',
@@ -16,7 +16,7 @@ export const createListSqlFragment = (
16
16
  greatestParameterPosition: number,
17
17
  ): SqlFragmentToken => {
18
18
  const values: PrimitiveValueExpression[] = [];
19
- const placeholders: Array<PrimitiveValueExpression | null> = [];
19
+ const placeholders: Array<null | PrimitiveValueExpression> = [];
20
20
 
21
21
  let placeholderIndex = greatestParameterPosition;
22
22
 
package/src/types.ts CHANGED
@@ -5,15 +5,15 @@ import { type ZodTypeAny } from 'zod';
5
5
  export { type PrimitiveValueExpression } from '@slonik/types';
6
6
 
7
7
  export type SerializableValue =
8
- | SerializableValue[]
9
- | boolean
10
- | number
11
- | string
12
- | readonly SerializableValue[]
13
8
  | {
14
9
  [key: string]: SerializableValue;
15
10
  }
11
+ | boolean
16
12
  | null
13
+ | number
14
+ | readonly SerializableValue[]
15
+ | SerializableValue[]
16
+ | string
17
17
  | undefined;
18
18
 
19
19
  export type IntervalInput = {
@@ -42,7 +42,6 @@ export type ValueExpression =
42
42
  * experience with auto suggestions for commonly used type name identifiers.
43
43
  */
44
44
  type TypeNameIdentifier =
45
- | string
46
45
  | 'bool'
47
46
  | 'bytea'
48
47
  | 'float4'
@@ -53,7 +52,8 @@ type TypeNameIdentifier =
53
52
  | 'json'
54
53
  | 'text'
55
54
  | 'timestamptz'
56
- | 'uuid';
55
+ | 'uuid'
56
+ | string;
57
57
 
58
58
  export type ArraySqlToken = {
59
59
  readonly memberType: SqlFragmentToken | TypeNameIdentifier;
@@ -1,6 +1,6 @@
1
1
  export const isPrimitiveValueExpression = (
2
2
  maybe: unknown,
3
- ): maybe is bigint | boolean | number | string | null => {
3
+ ): maybe is bigint | boolean | null | number | string => {
4
4
  return (
5
5
  typeof maybe === 'string' ||
6
6
  typeof maybe === 'number' ||
@@ -9,8 +9,8 @@ const stringify = configure({
9
9
  export const safeStringify = (
10
10
  subject: unknown,
11
11
  replacer?:
12
- | Array<number | string>
13
12
  | ((key: string, value: unknown) => unknown)
13
+ | Array<number | string>
14
14
  | null
15
15
  | undefined,
16
16
  space?: number | string,