@slonik/sql-tag 43.0.2 → 43.0.3
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.
- package/dist/factories/createSqlTokenSqlFragment.d.ts +2 -2
- package/dist/factories/createSqlTokenSqlFragment.d.ts.map +1 -1
- package/dist/factories/createSqlTokenSqlFragment.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createArraySqlFragment.d.ts +2 -2
- package/dist/sqlFragmentFactories/createArraySqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createArraySqlFragment.js +2 -0
- package/dist/sqlFragmentFactories/createArraySqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createBinarySqlFragment.d.ts +2 -2
- package/dist/sqlFragmentFactories/createBinarySqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createBinarySqlFragment.js +2 -0
- package/dist/sqlFragmentFactories/createBinarySqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createDateSqlFragment.d.ts +2 -2
- package/dist/sqlFragmentFactories/createDateSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createDateSqlFragment.js +2 -0
- package/dist/sqlFragmentFactories/createDateSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createFragmentSqlFragment.d.ts +2 -2
- package/dist/sqlFragmentFactories/createFragmentSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createFragmentSqlFragment.js +2 -0
- package/dist/sqlFragmentFactories/createFragmentSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createIdentifierSqlFragment.d.ts +2 -2
- package/dist/sqlFragmentFactories/createIdentifierSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createIdentifierSqlFragment.js +2 -0
- package/dist/sqlFragmentFactories/createIdentifierSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createIntervalSqlFragment.d.ts +2 -2
- package/dist/sqlFragmentFactories/createIntervalSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createIntervalSqlFragment.js +2 -0
- package/dist/sqlFragmentFactories/createIntervalSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createJsonSqlFragment.d.ts +2 -2
- package/dist/sqlFragmentFactories/createJsonSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createJsonSqlFragment.js +2 -0
- package/dist/sqlFragmentFactories/createJsonSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createListSqlFragment.d.ts +2 -2
- package/dist/sqlFragmentFactories/createListSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createListSqlFragment.js +2 -0
- package/dist/sqlFragmentFactories/createListSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createQuerySqlFragment.d.ts +2 -2
- package/dist/sqlFragmentFactories/createQuerySqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createQuerySqlFragment.js +2 -0
- package/dist/sqlFragmentFactories/createQuerySqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createTimestampSqlFragment.d.ts +2 -2
- package/dist/sqlFragmentFactories/createTimestampSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createTimestampSqlFragment.js +2 -0
- package/dist/sqlFragmentFactories/createTimestampSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createUnnestSqlFragment.d.ts +2 -2
- package/dist/sqlFragmentFactories/createUnnestSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createUnnestSqlFragment.js +2 -0
- package/dist/sqlFragmentFactories/createUnnestSqlFragment.js.map +1 -1
- package/dist/types.d.ts +11 -10
- package/dist/types.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/factories/createSqlTokenSqlFragment.ts +2 -2
- package/src/index.ts +1 -1
- package/src/sqlFragmentFactories/createArraySqlFragment.ts +4 -2
- package/src/sqlFragmentFactories/createBinarySqlFragment.ts +4 -2
- package/src/sqlFragmentFactories/createDateSqlFragment.ts +4 -2
- package/src/sqlFragmentFactories/createFragmentSqlFragment.ts +4 -2
- package/src/sqlFragmentFactories/createIdentifierSqlFragment.ts +4 -2
- package/src/sqlFragmentFactories/createIntervalSqlFragment.ts +4 -2
- package/src/sqlFragmentFactories/createJsonSqlFragment.ts +4 -2
- package/src/sqlFragmentFactories/createListSqlFragment.ts +4 -2
- package/src/sqlFragmentFactories/createQuerySqlFragment.ts +4 -2
- package/src/sqlFragmentFactories/createTimestampSqlFragment.ts +4 -2
- package/src/sqlFragmentFactories/createUnnestSqlFragment.ts +4 -2
- package/src/types.ts +14 -10
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
export declare const createSqlTokenSqlFragment: (token: SqlTokenType, greatestParameterPosition: number) =>
|
|
1
|
+
import { type SqlFragmentToken, type SqlToken as SqlTokenType } from '../types';
|
|
2
|
+
export declare const createSqlTokenSqlFragment: (token: SqlTokenType, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createSqlTokenSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSqlTokenSqlFragment.d.ts","sourceRoot":"","sources":["../../src/factories/createSqlTokenSqlFragment.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"createSqlTokenSqlFragment.d.ts","sourceRoot":"","sources":["../../src/factories/createSqlTokenSqlFragment.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,QAAQ,IAAI,YAAY,EAAE,MAAM,UAAU,CAAC;AAGhF,eAAO,MAAM,yBAAyB,UAC7B,YAAY,6BACQ,MAAM,KAChC,gBA4BF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSqlTokenSqlFragment.js","sourceRoot":"","sources":["../../src/factories/createSqlTokenSqlFragment.ts"],"names":[],"mappings":";;;AAAA,2FAAwF;AACxF,6FAA0F;AAC1F,yFAAsF;AACtF,iGAA8F;AAC9F,qGAAkG;AAClG,iGAA8F;AAC9F,yFAAsF;AACtF,yFAAsF;AACtF,2FAAwF;AACxF,mGAAgG;AAChG,6FAA0F;AAC1F,sCAamB;AAEnB,2CAAsD;AAE/C,MAAM,yBAAyB,GAAG,CACvC,KAAmB,EACnB,yBAAiC,
|
|
1
|
+
{"version":3,"file":"createSqlTokenSqlFragment.js","sourceRoot":"","sources":["../../src/factories/createSqlTokenSqlFragment.ts"],"names":[],"mappings":";;;AAAA,2FAAwF;AACxF,6FAA0F;AAC1F,yFAAsF;AACtF,iGAA8F;AAC9F,qGAAkG;AAClG,iGAA8F;AAC9F,yFAAsF;AACtF,yFAAsF;AACtF,2FAAwF;AACxF,mGAAgG;AAChG,6FAA0F;AAC1F,sCAamB;AAEnB,2CAAsD;AAE/C,MAAM,yBAAyB,GAAG,CACvC,KAAmB,EACnB,yBAAiC,EACf,EAAE;IACpB,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAU,EAAE,CAAC;QAC9B,OAAO,IAAA,+CAAsB,EAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC;IAClE,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAW,EAAE,CAAC;QACtC,OAAO,IAAA,iDAAuB,EAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC;IACnE,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAS,EAAE,CAAC;QACpC,OAAO,IAAA,6CAAqB,EAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC;IACjE,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,sBAAa,EAAE,CAAC;QACxC,OAAO,IAAA,qDAAyB,EAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC;IACrE,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAe,EAAE,CAAC;QAC1C,OAAO,IAAA,yDAA2B,EAAC,KAAK,CAAC,CAAC;IAC5C,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,sBAAa,EAAE,CAAC;QACxC,OAAO,IAAA,qDAAyB,EAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC;IACrE,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAe,EAAE,CAAC;QAC1C,OAAO,IAAA,6CAAqB,EAAC,KAAK,EAAE,yBAAyB,EAAE,IAAI,CAAC,CAAC;IACvE,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAS,EAAE,CAAC;QACpC,OAAO,IAAA,6CAAqB,EAAC,KAAK,EAAE,yBAAyB,EAAE,KAAK,CAAC,CAAC;IACxE,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAS,EAAE,CAAC;QACpC,OAAO,IAAA,6CAAqB,EAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC;IACjE,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAU,EAAE,CAAC;QACrC,OAAO,IAAA,+CAAsB,EAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC;IAClE,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,uBAAc,EAAE,CAAC;QACzC,OAAO,IAAA,uDAA0B,EAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC;IACtE,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAW,EAAE,CAAC;QACtC,OAAO,IAAA,iDAAuB,EAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,IAAI,6BAAoB,CAAC,wBAAwB,CAAC,CAAC;AAC3D,CAAC,CAAC;AA/BW,QAAA,yBAAyB,6BA+BpC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { createSqlTag } from './factories/createSqlTag';
|
|
2
2
|
export { createSqlTokenSqlFragment } from './factories/createSqlTokenSqlFragment';
|
|
3
|
-
export { type ArraySqlToken, type BinarySqlToken, type DateSqlToken, type FragmentSqlToken, type IdentifierSqlToken, type IntervalInput, type IntervalSqlToken, type JsonBinarySqlToken, type JsonSqlToken, type ListSqlToken, type PrimitiveValueExpression, type QuerySqlToken, type SerializableValue, type
|
|
3
|
+
export { type ArraySqlToken, type BinarySqlToken, type DateSqlToken, type FragmentSqlToken, type IdentifierSqlToken, type IntervalInput, type IntervalSqlToken, type JsonBinarySqlToken, type JsonSqlToken, type ListSqlToken, type PrimitiveValueExpression, type QuerySqlToken, type SerializableValue, type SqlFragmentToken, type SqlTag, type SqlToken, type TimestampSqlToken, type UnnestSqlToken, type ValueExpression, } from './types';
|
|
4
4
|
export { isSqlToken } from './utilities/isSqlToken';
|
|
5
5
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,wBAAwB,EAC7B,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,wBAAwB,EAC7B,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,MAAM,EACX,KAAK,QAAQ,EACb,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,eAAe,GACrB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type ArraySqlToken, type
|
|
2
|
-
export declare const createArraySqlFragment: (token: ArraySqlToken, greatestParameterPosition: number) =>
|
|
1
|
+
import { type ArraySqlToken, type SqlFragmentToken } from '../types';
|
|
2
|
+
export declare const createArraySqlFragment: (token: ArraySqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createArraySqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createArraySqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createArraySqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createArraySqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createArraySqlFragment.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAOrE,eAAO,MAAM,sBAAsB,UAC1B,aAAa,6BACO,MAAM,KAChC,gBAwDF,CAAC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createArraySqlFragment = void 0;
|
|
4
4
|
const createSqlTokenSqlFragment_1 = require("../factories/createSqlTokenSqlFragment");
|
|
5
|
+
const tokens_1 = require("../tokens");
|
|
5
6
|
const escapeIdentifier_1 = require("../utilities/escapeIdentifier");
|
|
6
7
|
const formatSlonikPlaceholder_1 = require("../utilities/formatSlonikPlaceholder");
|
|
7
8
|
const isPrimitiveValueExpression_1 = require("../utilities/isPrimitiveValueExpression");
|
|
@@ -41,6 +42,7 @@ const createArraySqlFragment = (token, greatestParameterPosition) => {
|
|
|
41
42
|
}
|
|
42
43
|
return {
|
|
43
44
|
sql,
|
|
45
|
+
type: tokens_1.FragmentToken,
|
|
44
46
|
values,
|
|
45
47
|
};
|
|
46
48
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createArraySqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createArraySqlFragment.ts"],"names":[],"mappings":";;;AAAA,sFAAmF;
|
|
1
|
+
{"version":3,"file":"createArraySqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createArraySqlFragment.ts"],"names":[],"mappings":";;;AAAA,sFAAmF;AACnF,sCAA0C;AAE1C,oEAAiE;AACjE,kFAA+E;AAC/E,wFAAqF;AACrF,wDAAqD;AACrD,2CAAyE;AAElE,MAAM,sBAAsB,GAAG,CACpC,KAAoB,EACpB,yBAAiC,EACf,EAAE;IACpB,IAAI,gBAAgB,GAAG,yBAAyB,CAAC;IAEjD,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACjC,IAAI,KAAK,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;YACjC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3B,SAAS;YACX,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,0BAAiB,CACzB,kEAAkE,CACnE,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC,IAAA,uDAA0B,EAAC,KAAK,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,0BAAiB,CACzB,kEAAkE,CACnE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE9B,gBAAgB,EAAE,CAAC;IAEnB,IAAI,GAAG,GAAG,IAAA,iDAAuB,EAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAE3D,IACE,IAAA,uBAAU,EAAC,KAAK,CAAC,UAAU,CAAC;QAC5B,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,uBAAuB,EACjD,CAAC;QACD,MAAM,WAAW,GAAG,IAAA,qDAAyB,EAC3C,KAAK,CAAC,UAAU,EAChB,gBAAgB,CACjB,CAAC;QAEF,IAAI,WAAW,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,6BAAoB,CAC5B,+CAA+C,CAChD,CAAC;QACJ,CAAC;QAED,GAAG,IAAI,WAAW,CAAC,GAAG,CAAC;IACzB,CAAC;SAAM,IAAI,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QAChD,GAAG,IAAI,IAAA,mCAAgB,EAAC,KAAK,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;IACnD,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,0BAAiB,CACzB,sGAAsG,CACvG,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG;QACH,IAAI,EAAE,sBAAa;QACnB,MAAM;KACP,CAAC;AACJ,CAAC,CAAC;AA3DW,QAAA,sBAAsB,0BA2DjC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type BinarySqlToken, type
|
|
2
|
-
export declare const createBinarySqlFragment: (token: BinarySqlToken, greatestParameterPosition: number) =>
|
|
1
|
+
import { type BinarySqlToken, type SqlFragmentToken } from '../types';
|
|
2
|
+
export declare const createBinarySqlFragment: (token: BinarySqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createBinarySqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createBinarySqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createBinarySqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createBinarySqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createBinarySqlFragment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAItE,eAAO,MAAM,uBAAuB,UAC3B,cAAc,6BACM,MAAM,KAChC,gBAUF,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createBinarySqlFragment = void 0;
|
|
4
|
+
const tokens_1 = require("../tokens");
|
|
4
5
|
const formatSlonikPlaceholder_1 = require("../utilities/formatSlonikPlaceholder");
|
|
5
6
|
const errors_1 = require("@slonik/errors");
|
|
6
7
|
const createBinarySqlFragment = (token, greatestParameterPosition) => {
|
|
@@ -9,6 +10,7 @@ const createBinarySqlFragment = (token, greatestParameterPosition) => {
|
|
|
9
10
|
}
|
|
10
11
|
return {
|
|
11
12
|
sql: (0, formatSlonikPlaceholder_1.formatSlonikPlaceholder)(greatestParameterPosition + 1),
|
|
13
|
+
type: tokens_1.FragmentToken,
|
|
12
14
|
values: [token.data],
|
|
13
15
|
};
|
|
14
16
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createBinarySqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createBinarySqlFragment.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"createBinarySqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createBinarySqlFragment.ts"],"names":[],"mappings":";;;AAAA,sCAA0C;AAE1C,kFAA+E;AAC/E,2CAAmD;AAE5C,MAAM,uBAAuB,GAAG,CACrC,KAAqB,EACrB,yBAAiC,EACf,EAAE;IACpB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,0BAAiB,CAAC,gCAAgC,CAAC,CAAC;IAChE,CAAC;IAED,OAAO;QACL,GAAG,EAAE,IAAA,iDAAuB,EAAC,yBAAyB,GAAG,CAAC,CAAC;QAC3D,IAAI,EAAE,sBAAa;QACnB,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;KACrB,CAAC;AACJ,CAAC,CAAC;AAbW,QAAA,uBAAuB,2BAalC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type DateSqlToken, type
|
|
2
|
-
export declare const createDateSqlFragment: (token: DateSqlToken, greatestParameterPosition: number) =>
|
|
1
|
+
import { type DateSqlToken, type SqlFragmentToken } from '../types';
|
|
2
|
+
export declare const createDateSqlFragment: (token: DateSqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createDateSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createDateSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createDateSqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createDateSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createDateSqlFragment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAIpE,eAAO,MAAM,qBAAqB,UACzB,YAAY,6BACQ,MAAM,KAChC,gBAYF,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createDateSqlFragment = void 0;
|
|
4
|
+
const tokens_1 = require("../tokens");
|
|
4
5
|
const formatSlonikPlaceholder_1 = require("../utilities/formatSlonikPlaceholder");
|
|
5
6
|
const errors_1 = require("@slonik/errors");
|
|
6
7
|
const createDateSqlFragment = (token, greatestParameterPosition) => {
|
|
@@ -9,6 +10,7 @@ const createDateSqlFragment = (token, greatestParameterPosition) => {
|
|
|
9
10
|
}
|
|
10
11
|
return {
|
|
11
12
|
sql: (0, formatSlonikPlaceholder_1.formatSlonikPlaceholder)(greatestParameterPosition + 1) + '::date',
|
|
13
|
+
type: tokens_1.FragmentToken,
|
|
12
14
|
values: [token.date.toISOString().slice(0, 10)],
|
|
13
15
|
};
|
|
14
16
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createDateSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createDateSqlFragment.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"createDateSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createDateSqlFragment.ts"],"names":[],"mappings":";;;AAAA,sCAA0C;AAE1C,kFAA+E;AAC/E,2CAAmD;AAE5C,MAAM,qBAAqB,GAAG,CACnC,KAAmB,EACnB,yBAAiC,EACf,EAAE;IACpB,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,0BAAiB,CACzB,mDAAmD,CACpD,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,EAAE,IAAA,iDAAuB,EAAC,yBAAyB,GAAG,CAAC,CAAC,GAAG,QAAQ;QACtE,IAAI,EAAE,sBAAa;QACnB,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;KAChD,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,qBAAqB,yBAehC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type FragmentSqlToken, type
|
|
2
|
-
export declare const createFragmentSqlFragment: (token: FragmentSqlToken, greatestParameterPosition: number) =>
|
|
1
|
+
import { type FragmentSqlToken, type SqlFragmentToken } from '../types';
|
|
2
|
+
export declare const createFragmentSqlFragment: (token: FragmentSqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createFragmentSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createFragmentSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createFragmentSqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createFragmentSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createFragmentSqlFragment.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAIxE,eAAO,MAAM,yBAAyB,UAC7B,gBAAgB,6BACI,MAAM,KAChC,gBAwCF,CAAC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createFragmentSqlFragment = void 0;
|
|
4
4
|
const slonikPlaceholderRegexRule_1 = require("../regexRules/slonikPlaceholderRegexRule");
|
|
5
|
+
const tokens_1 = require("../tokens");
|
|
5
6
|
const formatSlonikPlaceholder_1 = require("../utilities/formatSlonikPlaceholder");
|
|
6
7
|
const errors_1 = require("@slonik/errors");
|
|
7
8
|
const createFragmentSqlFragment = (token, greatestParameterPosition) => {
|
|
@@ -27,6 +28,7 @@ const createFragmentSqlFragment = (token, greatestParameterPosition) => {
|
|
|
27
28
|
}
|
|
28
29
|
return {
|
|
29
30
|
sql,
|
|
31
|
+
type: tokens_1.FragmentToken,
|
|
30
32
|
values: token.values,
|
|
31
33
|
};
|
|
32
34
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createFragmentSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createFragmentSqlFragment.ts"],"names":[],"mappings":";;;AAAA,yFAAsF;
|
|
1
|
+
{"version":3,"file":"createFragmentSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createFragmentSqlFragment.ts"],"names":[],"mappings":";;;AAAA,yFAAsF;AACtF,sCAA0C;AAE1C,kFAA+E;AAC/E,2CAAsD;AAE/C,MAAM,yBAAyB,GAAG,CACvC,KAAuB,EACvB,yBAAiC,EACf,EAAE;IACpB,IAAI,GAAG,GAAG,EAAE,CAAC;IAEb,IAAI,6BAA6B,GAAG,MAAM,CAAC,iBAAiB,CAAC;IAC7D,IAAI,gCAAgC,GAAG,CAAC,CAAC;IAEzC,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,uDAA0B,EAAE,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACpE,MAAM,iBAAiB,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAElD,IAAI,iBAAiB,GAAG,gCAAgC,EAAE,CAAC;YACzD,gCAAgC,GAAG,iBAAiB,CAAC;QACvD,CAAC;QAED,IAAI,iBAAiB,GAAG,6BAA6B,EAAE,CAAC;YACtD,6BAA6B,GAAG,iBAAiB,CAAC;QACpD,CAAC;QAED,OAAO,IAAA,iDAAuB,EAC5B,iBAAiB,GAAG,yBAAyB,CAC9C,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,gCAAgC,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAC3D,MAAM,IAAI,6BAAoB,CAC5B,iFAAiF,CAClF,CAAC;IACJ,CAAC;IAED,IACE,6BAA6B,KAAK,MAAM,CAAC,iBAAiB;QAC1D,6BAA6B,KAAK,CAAC,EACnC,CAAC;QACD,MAAM,IAAI,6BAAoB,CAAC,qCAAqC,CAAC,CAAC;IACxE,CAAC;IAED,OAAO;QACL,GAAG;QACH,IAAI,EAAE,sBAAa;QACnB,MAAM,EAAE,KAAK,CAAC,MAAM;KACrB,CAAC;AACJ,CAAC,CAAC;AA3CW,QAAA,yBAAyB,6BA2CpC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type IdentifierSqlToken, type
|
|
2
|
-
export declare const createIdentifierSqlFragment: (token: IdentifierSqlToken) =>
|
|
1
|
+
import { type IdentifierSqlToken, type SqlFragmentToken } from '../types';
|
|
2
|
+
export declare const createIdentifierSqlFragment: (token: IdentifierSqlToken) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createIdentifierSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createIdentifierSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIdentifierSqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createIdentifierSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIdentifierSqlFragment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAI1E,eAAO,MAAM,2BAA2B,UAC/B,kBAAkB,KACxB,gBAkBF,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createIdentifierSqlFragment = void 0;
|
|
4
|
+
const tokens_1 = require("../tokens");
|
|
4
5
|
const escapeIdentifier_1 = require("../utilities/escapeIdentifier");
|
|
5
6
|
const errors_1 = require("@slonik/errors");
|
|
6
7
|
const createIdentifierSqlFragment = (token) => {
|
|
@@ -14,6 +15,7 @@ const createIdentifierSqlFragment = (token) => {
|
|
|
14
15
|
.join('.');
|
|
15
16
|
return {
|
|
16
17
|
sql,
|
|
18
|
+
type: tokens_1.FragmentToken,
|
|
17
19
|
values: [],
|
|
18
20
|
};
|
|
19
21
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createIdentifierSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIdentifierSqlFragment.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"createIdentifierSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIdentifierSqlFragment.ts"],"names":[],"mappings":";;;AAAA,sCAA0C;AAE1C,oEAAiE;AACjE,2CAAmD;AAE5C,MAAM,2BAA2B,GAAG,CACzC,KAAyB,EACP,EAAE;IACpB,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK;SACpB,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE;QACtB,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE,CAAC;YACvC,MAAM,IAAI,0BAAiB,CACzB,qDAAqD,CACtD,CAAC;QACJ,CAAC;QAED,OAAO,IAAA,mCAAgB,EAAC,cAAc,CAAC,CAAC;IAC1C,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,OAAO;QACL,GAAG;QACH,IAAI,EAAE,sBAAa;QACnB,MAAM,EAAE,EAAE;KACX,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,2BAA2B,+BAoBtC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type IntervalSqlToken, type
|
|
2
|
-
export declare const createIntervalSqlFragment: (token: IntervalSqlToken, greatestParameterPosition: number) =>
|
|
1
|
+
import { type IntervalSqlToken, type SqlFragmentToken } from '../types';
|
|
2
|
+
export declare const createIntervalSqlFragment: (token: IntervalSqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createIntervalSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createIntervalSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIntervalSqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createIntervalSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIntervalSqlFragment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAgCxE,eAAO,MAAM,yBAAyB,UAC7B,gBAAgB,6BACI,MAAM,KAChC,gBAoCF,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createIntervalSqlFragment = void 0;
|
|
4
|
+
const tokens_1 = require("../tokens");
|
|
4
5
|
const formatSlonikPlaceholder_1 = require("../utilities/formatSlonikPlaceholder");
|
|
5
6
|
const errors_1 = require("@slonik/errors");
|
|
6
7
|
const zod_1 = require("zod");
|
|
@@ -50,6 +51,7 @@ const createIntervalSqlFragment = (token, greatestParameterPosition) => {
|
|
|
50
51
|
}
|
|
51
52
|
return {
|
|
52
53
|
sql: 'make_interval(' + intervalTokens.join(', ') + ')',
|
|
54
|
+
type: tokens_1.FragmentToken,
|
|
53
55
|
values,
|
|
54
56
|
};
|
|
55
57
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createIntervalSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIntervalSqlFragment.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"createIntervalSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIntervalSqlFragment.ts"],"names":[],"mappings":";;;AAAA,sCAA0C;AAE1C,kFAA+E;AAC/E,2CAAmD;AACnD,6BAAwB;AAExB,MAAM,aAAa,GAAG,OAAC;KACpB,MAAM,CAAC;IACN,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC7B,CAAC;KACD,MAAM,EAAE,CAAC;AAEZ,MAAM,iBAAiB,GAAG;IACxB,OAAO;IACP,QAAQ;IACR,OAAO;IACP,MAAM;IACN,OAAO;IACP,SAAS;IACT,SAAS;CACV,CAAC;AAEF,MAAM,QAAQ,GAAG;IACf,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,MAAM;CAChB,CAAC;AAEK,MAAM,yBAAyB,GAAG,CACvC,KAAuB,EACvB,yBAAiC,EACf,EAAE;IACpB,IAAI,aAAa,CAAC;IAElB,IAAI,CAAC;QACH,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACtD,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,0BAAiB,CACzB,qDAAqD,CACtD,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,MAAM,cAAc,GAAa,EAAE,CAAC;IAEpC,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE,CAAC;QACjD,MAAM,KAAK,GAAG,aAAa,CAAC,gBAAgB,CAAC,CAAC;QAE9C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEnB,MAAM,WAAW,GAAG,QAAQ,CAAC,gBAAgB,CAAC,IAAI,gBAAgB,CAAC;YAEnE,cAAc,CAAC,IAAI,CACjB,WAAW;gBACT,MAAM;gBACN,IAAA,iDAAuB,EAAC,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC,CACrE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,GAAG,EAAE,gBAAgB,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG;QACvD,IAAI,EAAE,sBAAa;QACnB,MAAM;KACP,CAAC;AACJ,CAAC,CAAC;AAvCW,QAAA,yBAAyB,6BAuCpC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type JsonBinarySqlToken, type JsonSqlToken, type
|
|
2
|
-
export declare const createJsonSqlFragment: (token: JsonBinarySqlToken | JsonSqlToken, greatestParameterPosition: number, binary: boolean) =>
|
|
1
|
+
import { type JsonBinarySqlToken, type JsonSqlToken, type SqlFragmentToken } from '../types';
|
|
2
|
+
export declare const createJsonSqlFragment: (token: JsonBinarySqlToken | JsonSqlToken, greatestParameterPosition: number, binary: boolean) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createJsonSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createJsonSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createJsonSqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createJsonSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createJsonSqlFragment.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACtB,MAAM,UAAU,CAAC;AAWlB,eAAO,MAAM,qBAAqB,UACzB,kBAAkB,GAAG,YAAY,6BACb,MAAM,UACzB,OAAO,KACd,gBA8CF,CAAC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createJsonSqlFragment = void 0;
|
|
4
4
|
const Logger_1 = require("../Logger");
|
|
5
|
+
const tokens_1 = require("../tokens");
|
|
5
6
|
const formatSlonikPlaceholder_1 = require("../utilities/formatSlonikPlaceholder");
|
|
6
7
|
const isPlainObject_1 = require("../utilities/isPlainObject");
|
|
7
8
|
const safeStringify_1 = require("../utilities/safeStringify");
|
|
@@ -42,6 +43,7 @@ const createJsonSqlFragment = (token, greatestParameterPosition, binary) => {
|
|
|
42
43
|
sql: (0, formatSlonikPlaceholder_1.formatSlonikPlaceholder)(greatestParameterPosition + 1) +
|
|
43
44
|
'::' +
|
|
44
45
|
(binary ? 'jsonb' : 'json'),
|
|
46
|
+
type: tokens_1.FragmentToken,
|
|
45
47
|
values: [value],
|
|
46
48
|
};
|
|
47
49
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createJsonSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createJsonSqlFragment.ts"],"names":[],"mappings":";;;AAAA,sCAAmC;
|
|
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,3 +1,3 @@
|
|
|
1
|
-
import { type ListSqlToken, type
|
|
2
|
-
export declare const createListSqlFragment: (token: ListSqlToken, greatestParameterPosition: number) =>
|
|
1
|
+
import { type ListSqlToken, type SqlFragmentToken } from '../types';
|
|
2
|
+
export declare const createListSqlFragment: (token: ListSqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createListSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createListSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createListSqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createListSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createListSqlFragment.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,YAAY,EAEjB,KAAK,gBAAgB,EACtB,MAAM,UAAU,CAAC;AAMlB,eAAO,MAAM,qBAAqB,UACzB,YAAY,6BACQ,MAAM,KAChC,gBAiCF,CAAC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.createListSqlFragment = void 0;
|
|
4
4
|
const createPrimitiveValueExpressions_1 = require("../factories/createPrimitiveValueExpressions");
|
|
5
5
|
const createSqlTokenSqlFragment_1 = require("../factories/createSqlTokenSqlFragment");
|
|
6
|
+
const tokens_1 = require("../tokens");
|
|
6
7
|
const formatSlonikPlaceholder_1 = require("../utilities/formatSlonikPlaceholder");
|
|
7
8
|
const isPrimitiveValueExpression_1 = require("../utilities/isPrimitiveValueExpression");
|
|
8
9
|
const isSqlToken_1 = require("../utilities/isSqlToken");
|
|
@@ -31,6 +32,7 @@ const createListSqlFragment = (token, greatestParameterPosition) => {
|
|
|
31
32
|
}
|
|
32
33
|
return {
|
|
33
34
|
sql: placeholders.join(token.glue.sql),
|
|
35
|
+
type: tokens_1.FragmentToken,
|
|
34
36
|
values: (0, createPrimitiveValueExpressions_1.createPrimitiveValueExpressions)(values),
|
|
35
37
|
};
|
|
36
38
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createListSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createListSqlFragment.ts"],"names":[],"mappings":";;;AAAA,kGAA+F;AAC/F,sFAAmF;
|
|
1
|
+
{"version":3,"file":"createListSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createListSqlFragment.ts"],"names":[],"mappings":";;;AAAA,kGAA+F;AAC/F,sFAAmF;AACnF,sCAA0C;AAM1C,kFAA+E;AAC/E,wFAAqF;AACrF,wDAAqD;AACrD,2CAAmD;AAE5C,MAAM,qBAAqB,GAAG,CACnC,KAAmB,EACnB,yBAAiC,EACf,EAAE;IACpB,MAAM,MAAM,GAA+B,EAAE,CAAC;IAC9C,MAAM,YAAY,GAA2C,EAAE,CAAC;IAEhE,IAAI,gBAAgB,GAAG,yBAAyB,CAAC;IAEjD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,0BAAiB,CAAC,yCAAyC,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QACnC,IAAI,IAAA,uBAAU,EAAC,MAAM,CAAC,EAAE,CAAC;YACvB,MAAM,WAAW,GAAG,IAAA,qDAAyB,EAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;YAExE,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACnC,gBAAgB,IAAI,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC;YAC9C,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;QACrC,CAAC;aAAM,IAAI,IAAA,uDAA0B,EAAC,MAAM,CAAC,EAAE,CAAC;YAC9C,YAAY,CAAC,IAAI,CAAC,IAAA,iDAAuB,EAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;YAE/D,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,0BAAiB,CACzB,gFAAgF,CACjF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,GAAG,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;QACtC,IAAI,EAAE,sBAAa;QACnB,MAAM,EAAE,IAAA,iEAA+B,EAAC,MAAM,CAAC;KAChD,CAAC;AACJ,CAAC,CAAC;AApCW,QAAA,qBAAqB,yBAoChC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type QuerySqlToken, type
|
|
2
|
-
export declare const createQuerySqlFragment: (token: QuerySqlToken, greatestParameterPosition: number) =>
|
|
1
|
+
import { type QuerySqlToken, type SqlFragmentToken } from '../types';
|
|
2
|
+
export declare const createQuerySqlFragment: (token: QuerySqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createQuerySqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createQuerySqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createQuerySqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createQuerySqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createQuerySqlFragment.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAIrE,eAAO,MAAM,sBAAsB,UAC1B,aAAa,6BACO,MAAM,KAChC,gBAwCF,CAAC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createQuerySqlFragment = void 0;
|
|
4
4
|
const slonikPlaceholderRegexRule_1 = require("../regexRules/slonikPlaceholderRegexRule");
|
|
5
|
+
const tokens_1 = require("../tokens");
|
|
5
6
|
const formatSlonikPlaceholder_1 = require("../utilities/formatSlonikPlaceholder");
|
|
6
7
|
const errors_1 = require("@slonik/errors");
|
|
7
8
|
const createQuerySqlFragment = (token, greatestParameterPosition) => {
|
|
@@ -27,6 +28,7 @@ const createQuerySqlFragment = (token, greatestParameterPosition) => {
|
|
|
27
28
|
}
|
|
28
29
|
return {
|
|
29
30
|
sql,
|
|
31
|
+
type: tokens_1.FragmentToken,
|
|
30
32
|
values: token.values,
|
|
31
33
|
};
|
|
32
34
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createQuerySqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createQuerySqlFragment.ts"],"names":[],"mappings":";;;AAAA,yFAAsF;
|
|
1
|
+
{"version":3,"file":"createQuerySqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createQuerySqlFragment.ts"],"names":[],"mappings":";;;AAAA,yFAAsF;AACtF,sCAA0C;AAE1C,kFAA+E;AAC/E,2CAAsD;AAE/C,MAAM,sBAAsB,GAAG,CACpC,KAAoB,EACpB,yBAAiC,EACf,EAAE;IACpB,IAAI,GAAG,GAAG,EAAE,CAAC;IAEb,IAAI,6BAA6B,GAAG,MAAM,CAAC,iBAAiB,CAAC;IAC7D,IAAI,gCAAgC,GAAG,CAAC,CAAC;IAEzC,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,uDAA0B,EAAE,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACpE,MAAM,iBAAiB,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAElD,IAAI,iBAAiB,GAAG,gCAAgC,EAAE,CAAC;YACzD,gCAAgC,GAAG,iBAAiB,CAAC;QACvD,CAAC;QAED,IAAI,iBAAiB,GAAG,6BAA6B,EAAE,CAAC;YACtD,6BAA6B,GAAG,iBAAiB,CAAC;QACpD,CAAC;QAED,OAAO,IAAA,iDAAuB,EAC5B,iBAAiB,GAAG,yBAAyB,CAC9C,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,gCAAgC,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAC3D,MAAM,IAAI,6BAAoB,CAC5B,iFAAiF,CAClF,CAAC;IACJ,CAAC;IAED,IACE,6BAA6B,KAAK,MAAM,CAAC,iBAAiB;QAC1D,6BAA6B,KAAK,CAAC,EACnC,CAAC;QACD,MAAM,IAAI,6BAAoB,CAAC,qCAAqC,CAAC,CAAC;IACxE,CAAC;IAED,OAAO;QACL,GAAG;QACH,IAAI,EAAE,sBAAa;QACnB,MAAM,EAAE,KAAK,CAAC,MAAM;KACrB,CAAC;AACJ,CAAC,CAAC;AA3CW,QAAA,sBAAsB,0BA2CjC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
export declare const createTimestampSqlFragment: (token: TimestampSqlToken, greatestParameterPosition: number) =>
|
|
1
|
+
import { type SqlFragmentToken, type TimestampSqlToken } from '../types';
|
|
2
|
+
export declare const createTimestampSqlFragment: (token: TimestampSqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createTimestampSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTimestampSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createTimestampSqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createTimestampSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createTimestampSqlFragment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAIzE,eAAO,MAAM,0BAA0B,UAC9B,iBAAiB,6BACG,MAAM,KAChC,gBAeF,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createTimestampSqlFragment = void 0;
|
|
4
|
+
const tokens_1 = require("../tokens");
|
|
4
5
|
const formatSlonikPlaceholder_1 = require("../utilities/formatSlonikPlaceholder");
|
|
5
6
|
const errors_1 = require("@slonik/errors");
|
|
6
7
|
const createTimestampSqlFragment = (token, greatestParameterPosition) => {
|
|
@@ -11,6 +12,7 @@ const createTimestampSqlFragment = (token, greatestParameterPosition) => {
|
|
|
11
12
|
sql: 'to_timestamp(' +
|
|
12
13
|
(0, formatSlonikPlaceholder_1.formatSlonikPlaceholder)(greatestParameterPosition + 1) +
|
|
13
14
|
')',
|
|
15
|
+
type: tokens_1.FragmentToken,
|
|
14
16
|
values: [String(token.date.getTime() / 1000)],
|
|
15
17
|
};
|
|
16
18
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTimestampSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createTimestampSqlFragment.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"createTimestampSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createTimestampSqlFragment.ts"],"names":[],"mappings":";;;AAAA,sCAA0C;AAE1C,kFAA+E;AAC/E,2CAAmD;AAE5C,MAAM,0BAA0B,GAAG,CACxC,KAAwB,EACxB,yBAAiC,EACf,EAAE;IACpB,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,0BAAiB,CACzB,wDAAwD,CACzD,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,EACD,eAAe;YACf,IAAA,iDAAuB,EAAC,yBAAyB,GAAG,CAAC,CAAC;YACtD,GAAG;QACL,IAAI,EAAE,sBAAa;QACnB,MAAM,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAK,CAAC,CAAC;KAC/C,CAAC;AACJ,CAAC,CAAC;AAlBW,QAAA,0BAA0B,8BAkBrC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
export declare const createUnnestSqlFragment: (token: UnnestSqlToken, greatestParameterPosition: number) =>
|
|
1
|
+
import { type SqlFragmentToken, type UnnestSqlToken } from '../types';
|
|
2
|
+
export declare const createUnnestSqlFragment: (token: UnnestSqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createUnnestSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createUnnestSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createUnnestSqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createUnnestSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createUnnestSqlFragment.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACpB,MAAM,UAAU,CAAC;AAQlB,eAAO,MAAM,uBAAuB,UAC3B,cAAc,6BACM,MAAM,KAChC,gBAuGF,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createUnnestSqlFragment = void 0;
|
|
4
|
+
const tokens_1 = require("../tokens");
|
|
4
5
|
const countArrayDimensions_1 = require("../utilities/countArrayDimensions");
|
|
5
6
|
const escapeIdentifier_1 = require("../utilities/escapeIdentifier");
|
|
6
7
|
const formatSlonikPlaceholder_1 = require("../utilities/formatSlonikPlaceholder");
|
|
@@ -74,6 +75,7 @@ const createUnnestSqlFragment = (token, greatestParameterPosition) => {
|
|
|
74
75
|
const sql = 'unnest(' + unnestSqlTokens.join(', ') + ')';
|
|
75
76
|
return {
|
|
76
77
|
sql,
|
|
78
|
+
type: tokens_1.FragmentToken,
|
|
77
79
|
values,
|
|
78
80
|
};
|
|
79
81
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createUnnestSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createUnnestSqlFragment.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"createUnnestSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createUnnestSqlFragment.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -15,18 +15,19 @@ export type IntervalInput = {
|
|
|
15
15
|
weeks?: number;
|
|
16
16
|
years?: number;
|
|
17
17
|
};
|
|
18
|
-
export type
|
|
18
|
+
export type SqlFragmentToken = {
|
|
19
19
|
readonly sql: string;
|
|
20
|
+
readonly type: typeof tokens.FragmentToken;
|
|
20
21
|
readonly values: readonly PrimitiveValueExpression[];
|
|
21
22
|
};
|
|
22
|
-
export type ValueExpression = PrimitiveValueExpression |
|
|
23
|
+
export type ValueExpression = PrimitiveValueExpression | SqlFragmentToken | SqlToken;
|
|
23
24
|
/**
|
|
24
25
|
* "string" type covers all type name identifiers – the literal values are added only to assist developer
|
|
25
26
|
* experience with auto suggestions for commonly used type name identifiers.
|
|
26
27
|
*/
|
|
27
28
|
export type TypeNameIdentifier = string | 'bool' | 'bytea' | 'float4' | 'float8' | 'int2' | 'int4' | 'int8' | 'json' | 'text' | 'timestamptz' | 'uuid';
|
|
28
29
|
export type ArraySqlToken = {
|
|
29
|
-
readonly memberType:
|
|
30
|
+
readonly memberType: SqlFragmentToken | TypeNameIdentifier;
|
|
30
31
|
readonly type: typeof tokens.ArrayToken;
|
|
31
32
|
readonly values: readonly PrimitiveValueExpression[];
|
|
32
33
|
};
|
|
@@ -52,7 +53,7 @@ export type IntervalSqlToken = {
|
|
|
52
53
|
readonly type: typeof tokens.IntervalToken;
|
|
53
54
|
};
|
|
54
55
|
export type ListSqlToken = {
|
|
55
|
-
readonly glue:
|
|
56
|
+
readonly glue: SqlFragmentToken;
|
|
56
57
|
readonly members: readonly ValueExpression[];
|
|
57
58
|
readonly type: typeof tokens.ListToken;
|
|
58
59
|
};
|
|
@@ -75,26 +76,26 @@ export type TimestampSqlToken = {
|
|
|
75
76
|
readonly type: typeof tokens.TimestampToken;
|
|
76
77
|
};
|
|
77
78
|
export type UnnestSqlToken = {
|
|
78
|
-
readonly columnTypes: Array<[...string[], TypeNameIdentifier]> | Array<
|
|
79
|
+
readonly columnTypes: Array<[...string[], TypeNameIdentifier]> | Array<SqlFragmentToken | TypeNameIdentifier>;
|
|
79
80
|
readonly tuples: ReadonlyArray<readonly ValueExpression[]>;
|
|
80
81
|
readonly type: typeof tokens.UnnestToken;
|
|
81
82
|
};
|
|
82
83
|
export type SqlToken = ArraySqlToken | BinarySqlToken | DateSqlToken | FragmentSqlToken | IdentifierSqlToken | IntervalSqlToken | JsonBinarySqlToken | JsonSqlToken | ListSqlToken | QuerySqlToken | TimestampSqlToken | UnnestSqlToken;
|
|
83
84
|
export type SqlTag<Z extends Record<string, ZodTypeAny> = Record<string, ZodTypeAny>> = {
|
|
84
|
-
array: (values: readonly PrimitiveValueExpression[], memberType:
|
|
85
|
+
array: (values: readonly PrimitiveValueExpression[], memberType: SqlFragmentToken | TypeNameIdentifier) => ArraySqlToken;
|
|
85
86
|
binary: (data: Buffer) => BinarySqlToken;
|
|
86
87
|
date: (date: Date) => DateSqlToken;
|
|
87
|
-
fragment: (template: TemplateStringsArray, ...values: ValueExpression[]) =>
|
|
88
|
+
fragment: (template: TemplateStringsArray, ...values: ValueExpression[]) => SqlFragmentToken;
|
|
88
89
|
identifier: (names: readonly string[]) => IdentifierSqlToken;
|
|
89
90
|
interval: (interval: IntervalInput) => IntervalSqlToken;
|
|
90
|
-
join: (members: readonly ValueExpression[], glue:
|
|
91
|
+
join: (members: readonly ValueExpression[], glue: SqlFragmentToken) => ListSqlToken;
|
|
91
92
|
json: (value: SerializableValue) => JsonSqlToken;
|
|
92
93
|
jsonb: (value: SerializableValue) => JsonBinarySqlToken;
|
|
93
|
-
literalValue: (value: string) =>
|
|
94
|
+
literalValue: (value: string) => SqlFragmentToken;
|
|
94
95
|
timestamp: (date: Date) => TimestampSqlToken;
|
|
95
96
|
type: <Y extends ZodTypeAny>(parser: Y) => (template: TemplateStringsArray, ...values: ValueExpression[]) => QuerySqlToken<Y>;
|
|
96
97
|
typeAlias: <K extends keyof Z>(typeAlias: K) => (template: TemplateStringsArray, ...values: ValueExpression[]) => QuerySqlToken<Z[K]>;
|
|
97
|
-
unnest: (tuples: ReadonlyArray<readonly any[]>, columnTypes: Array<[...string[], TypeNameIdentifier]> | Array<
|
|
98
|
+
unnest: (tuples: ReadonlyArray<readonly any[]>, columnTypes: Array<[...string[], TypeNameIdentifier]> | Array<SqlFragmentToken | TypeNameIdentifier>) => UnnestSqlToken;
|
|
98
99
|
unsafe: (template: TemplateStringsArray, ...values: ValueExpression[]) => QuerySqlToken;
|
|
99
100
|
};
|
|
100
101
|
//# sourceMappingURL=types.d.ts.map
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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,iBAAiB,EAAE,GACnB,OAAO,GACP,MAAM,GACN,MAAM,GACN,SAAS,iBAAiB,EAAE,GAC5B;IACE,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAC;CAClC,GACD,IAAI,GACJ,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,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
]
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@slonik/errors": "^43.0.
|
|
20
|
-
"@slonik/types": "^43.0.
|
|
19
|
+
"@slonik/errors": "^43.0.3",
|
|
20
|
+
"@slonik/types": "^43.0.3",
|
|
21
21
|
"roarr": "^7.21.1",
|
|
22
22
|
"safe-stable-stringify": "^2.4.3",
|
|
23
23
|
"serialize-error": "^8.0.0"
|
|
@@ -83,5 +83,5 @@
|
|
|
83
83
|
"test": "nyc ava --verbose --serial"
|
|
84
84
|
},
|
|
85
85
|
"types": "./dist/index.d.ts",
|
|
86
|
-
"version": "43.0.
|
|
86
|
+
"version": "43.0.3"
|
|
87
87
|
}
|
|
@@ -23,13 +23,13 @@ import {
|
|
|
23
23
|
TimestampToken,
|
|
24
24
|
UnnestToken,
|
|
25
25
|
} from '../tokens';
|
|
26
|
-
import { type
|
|
26
|
+
import { type SqlFragmentToken, type SqlToken as SqlTokenType } from '../types';
|
|
27
27
|
import { UnexpectedStateError } from '@slonik/errors';
|
|
28
28
|
|
|
29
29
|
export const createSqlTokenSqlFragment = (
|
|
30
30
|
token: SqlTokenType,
|
|
31
31
|
greatestParameterPosition: number,
|
|
32
|
-
):
|
|
32
|
+
): SqlFragmentToken => {
|
|
33
33
|
if (token.type === ArrayToken) {
|
|
34
34
|
return createArraySqlFragment(token, greatestParameterPosition);
|
|
35
35
|
} else if (token.type === BinaryToken) {
|
package/src/index.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { createSqlTokenSqlFragment } from '../factories/createSqlTokenSqlFragment';
|
|
2
|
-
import {
|
|
2
|
+
import { FragmentToken } from '../tokens';
|
|
3
|
+
import { type ArraySqlToken, type SqlFragmentToken } from '../types';
|
|
3
4
|
import { escapeIdentifier } from '../utilities/escapeIdentifier';
|
|
4
5
|
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
|
|
5
6
|
import { isPrimitiveValueExpression } from '../utilities/isPrimitiveValueExpression';
|
|
@@ -9,7 +10,7 @@ import { InvalidInputError, UnexpectedStateError } from '@slonik/errors';
|
|
|
9
10
|
export const createArraySqlFragment = (
|
|
10
11
|
token: ArraySqlToken,
|
|
11
12
|
greatestParameterPosition: number,
|
|
12
|
-
):
|
|
13
|
+
): SqlFragmentToken => {
|
|
13
14
|
let placeholderIndex = greatestParameterPosition;
|
|
14
15
|
|
|
15
16
|
for (const value of token.values) {
|
|
@@ -62,6 +63,7 @@ export const createArraySqlFragment = (
|
|
|
62
63
|
|
|
63
64
|
return {
|
|
64
65
|
sql,
|
|
66
|
+
type: FragmentToken,
|
|
65
67
|
values,
|
|
66
68
|
};
|
|
67
69
|
};
|
|
@@ -1,17 +1,19 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { FragmentToken } from '../tokens';
|
|
2
|
+
import { type BinarySqlToken, type SqlFragmentToken } from '../types';
|
|
2
3
|
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
|
|
3
4
|
import { InvalidInputError } from '@slonik/errors';
|
|
4
5
|
|
|
5
6
|
export const createBinarySqlFragment = (
|
|
6
7
|
token: BinarySqlToken,
|
|
7
8
|
greatestParameterPosition: number,
|
|
8
|
-
):
|
|
9
|
+
): SqlFragmentToken => {
|
|
9
10
|
if (!Buffer.isBuffer(token.data)) {
|
|
10
11
|
throw new InvalidInputError('Binary value must be a buffer.');
|
|
11
12
|
}
|
|
12
13
|
|
|
13
14
|
return {
|
|
14
15
|
sql: formatSlonikPlaceholder(greatestParameterPosition + 1),
|
|
16
|
+
type: FragmentToken,
|
|
15
17
|
values: [token.data],
|
|
16
18
|
};
|
|
17
19
|
};
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { FragmentToken } from '../tokens';
|
|
2
|
+
import { type DateSqlToken, type SqlFragmentToken } from '../types';
|
|
2
3
|
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
|
|
3
4
|
import { InvalidInputError } from '@slonik/errors';
|
|
4
5
|
|
|
5
6
|
export const createDateSqlFragment = (
|
|
6
7
|
token: DateSqlToken,
|
|
7
8
|
greatestParameterPosition: number,
|
|
8
|
-
):
|
|
9
|
+
): SqlFragmentToken => {
|
|
9
10
|
if (!(token.date instanceof Date)) {
|
|
10
11
|
throw new InvalidInputError(
|
|
11
12
|
'Date parameter value must be an instance of Date.',
|
|
@@ -14,6 +15,7 @@ export const createDateSqlFragment = (
|
|
|
14
15
|
|
|
15
16
|
return {
|
|
16
17
|
sql: formatSlonikPlaceholder(greatestParameterPosition + 1) + '::date',
|
|
18
|
+
type: FragmentToken,
|
|
17
19
|
values: [token.date.toISOString().slice(0, 10)],
|
|
18
20
|
};
|
|
19
21
|
};
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { slonikPlaceholderRegexRule } from '../regexRules/slonikPlaceholderRegexRule';
|
|
2
|
-
import {
|
|
2
|
+
import { FragmentToken } from '../tokens';
|
|
3
|
+
import { type FragmentSqlToken, type SqlFragmentToken } from '../types';
|
|
3
4
|
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
|
|
4
5
|
import { UnexpectedStateError } from '@slonik/errors';
|
|
5
6
|
|
|
6
7
|
export const createFragmentSqlFragment = (
|
|
7
8
|
token: FragmentSqlToken,
|
|
8
9
|
greatestParameterPosition: number,
|
|
9
|
-
):
|
|
10
|
+
): SqlFragmentToken => {
|
|
10
11
|
let sql = '';
|
|
11
12
|
|
|
12
13
|
let leastMatchedParameterPosition = Number.POSITIVE_INFINITY;
|
|
@@ -43,6 +44,7 @@ export const createFragmentSqlFragment = (
|
|
|
43
44
|
|
|
44
45
|
return {
|
|
45
46
|
sql,
|
|
47
|
+
type: FragmentToken,
|
|
46
48
|
values: token.values,
|
|
47
49
|
};
|
|
48
50
|
};
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { FragmentToken } from '../tokens';
|
|
2
|
+
import { type IdentifierSqlToken, type SqlFragmentToken } from '../types';
|
|
2
3
|
import { escapeIdentifier } from '../utilities/escapeIdentifier';
|
|
3
4
|
import { InvalidInputError } from '@slonik/errors';
|
|
4
5
|
|
|
5
6
|
export const createIdentifierSqlFragment = (
|
|
6
7
|
token: IdentifierSqlToken,
|
|
7
|
-
):
|
|
8
|
+
): SqlFragmentToken => {
|
|
8
9
|
const sql = token.names
|
|
9
10
|
.map((identifierName) => {
|
|
10
11
|
if (typeof identifierName !== 'string') {
|
|
@@ -19,6 +20,7 @@ export const createIdentifierSqlFragment = (
|
|
|
19
20
|
|
|
20
21
|
return {
|
|
21
22
|
sql,
|
|
23
|
+
type: FragmentToken,
|
|
22
24
|
values: [],
|
|
23
25
|
};
|
|
24
26
|
};
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { FragmentToken } from '../tokens';
|
|
2
|
+
import { type IntervalSqlToken, type SqlFragmentToken } from '../types';
|
|
2
3
|
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
|
|
3
4
|
import { InvalidInputError } from '@slonik/errors';
|
|
4
5
|
import { z } from 'zod';
|
|
@@ -33,7 +34,7 @@ const tokenMap = {
|
|
|
33
34
|
export const createIntervalSqlFragment = (
|
|
34
35
|
token: IntervalSqlToken,
|
|
35
36
|
greatestParameterPosition: number,
|
|
36
|
-
):
|
|
37
|
+
): SqlFragmentToken => {
|
|
37
38
|
let intervalInput;
|
|
38
39
|
|
|
39
40
|
try {
|
|
@@ -66,6 +67,7 @@ export const createIntervalSqlFragment = (
|
|
|
66
67
|
|
|
67
68
|
return {
|
|
68
69
|
sql: 'make_interval(' + intervalTokens.join(', ') + ')',
|
|
70
|
+
type: FragmentToken,
|
|
69
71
|
values,
|
|
70
72
|
};
|
|
71
73
|
};
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { Logger } from '../Logger';
|
|
2
|
+
import { FragmentToken } from '../tokens';
|
|
2
3
|
import {
|
|
3
4
|
type JsonBinarySqlToken,
|
|
4
5
|
type JsonSqlToken,
|
|
5
|
-
type
|
|
6
|
+
type SqlFragmentToken,
|
|
6
7
|
} from '../types';
|
|
7
8
|
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
|
|
8
9
|
import { isPlainObject } from '../utilities/isPlainObject';
|
|
@@ -18,7 +19,7 @@ export const createJsonSqlFragment = (
|
|
|
18
19
|
token: JsonBinarySqlToken | JsonSqlToken,
|
|
19
20
|
greatestParameterPosition: number,
|
|
20
21
|
binary: boolean,
|
|
21
|
-
):
|
|
22
|
+
): SqlFragmentToken => {
|
|
22
23
|
let value;
|
|
23
24
|
|
|
24
25
|
if (token.value === undefined) {
|
|
@@ -61,6 +62,7 @@ export const createJsonSqlFragment = (
|
|
|
61
62
|
formatSlonikPlaceholder(greatestParameterPosition + 1) +
|
|
62
63
|
'::' +
|
|
63
64
|
(binary ? 'jsonb' : 'json'),
|
|
65
|
+
type: FragmentToken,
|
|
64
66
|
values: [value],
|
|
65
67
|
};
|
|
66
68
|
};
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { createPrimitiveValueExpressions } from '../factories/createPrimitiveValueExpressions';
|
|
2
2
|
import { createSqlTokenSqlFragment } from '../factories/createSqlTokenSqlFragment';
|
|
3
|
+
import { FragmentToken } from '../tokens';
|
|
3
4
|
import {
|
|
4
5
|
type ListSqlToken,
|
|
5
6
|
type PrimitiveValueExpression,
|
|
6
|
-
type
|
|
7
|
+
type SqlFragmentToken,
|
|
7
8
|
} from '../types';
|
|
8
9
|
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
|
|
9
10
|
import { isPrimitiveValueExpression } from '../utilities/isPrimitiveValueExpression';
|
|
@@ -13,7 +14,7 @@ import { InvalidInputError } from '@slonik/errors';
|
|
|
13
14
|
export const createListSqlFragment = (
|
|
14
15
|
token: ListSqlToken,
|
|
15
16
|
greatestParameterPosition: number,
|
|
16
|
-
):
|
|
17
|
+
): SqlFragmentToken => {
|
|
17
18
|
const values: PrimitiveValueExpression[] = [];
|
|
18
19
|
const placeholders: Array<PrimitiveValueExpression | null> = [];
|
|
19
20
|
|
|
@@ -43,6 +44,7 @@ export const createListSqlFragment = (
|
|
|
43
44
|
|
|
44
45
|
return {
|
|
45
46
|
sql: placeholders.join(token.glue.sql),
|
|
47
|
+
type: FragmentToken,
|
|
46
48
|
values: createPrimitiveValueExpressions(values),
|
|
47
49
|
};
|
|
48
50
|
};
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { slonikPlaceholderRegexRule } from '../regexRules/slonikPlaceholderRegexRule';
|
|
2
|
-
import {
|
|
2
|
+
import { FragmentToken } from '../tokens';
|
|
3
|
+
import { type QuerySqlToken, type SqlFragmentToken } from '../types';
|
|
3
4
|
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
|
|
4
5
|
import { UnexpectedStateError } from '@slonik/errors';
|
|
5
6
|
|
|
6
7
|
export const createQuerySqlFragment = (
|
|
7
8
|
token: QuerySqlToken,
|
|
8
9
|
greatestParameterPosition: number,
|
|
9
|
-
):
|
|
10
|
+
): SqlFragmentToken => {
|
|
10
11
|
let sql = '';
|
|
11
12
|
|
|
12
13
|
let leastMatchedParameterPosition = Number.POSITIVE_INFINITY;
|
|
@@ -43,6 +44,7 @@ export const createQuerySqlFragment = (
|
|
|
43
44
|
|
|
44
45
|
return {
|
|
45
46
|
sql,
|
|
47
|
+
type: FragmentToken,
|
|
46
48
|
values: token.values,
|
|
47
49
|
};
|
|
48
50
|
};
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { FragmentToken } from '../tokens';
|
|
2
|
+
import { type SqlFragmentToken, type TimestampSqlToken } from '../types';
|
|
2
3
|
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
|
|
3
4
|
import { InvalidInputError } from '@slonik/errors';
|
|
4
5
|
|
|
5
6
|
export const createTimestampSqlFragment = (
|
|
6
7
|
token: TimestampSqlToken,
|
|
7
8
|
greatestParameterPosition: number,
|
|
8
|
-
):
|
|
9
|
+
): SqlFragmentToken => {
|
|
9
10
|
if (!(token.date instanceof Date)) {
|
|
10
11
|
throw new InvalidInputError(
|
|
11
12
|
'Timestamp parameter value must be an instance of Date.',
|
|
@@ -17,6 +18,7 @@ export const createTimestampSqlFragment = (
|
|
|
17
18
|
'to_timestamp(' +
|
|
18
19
|
formatSlonikPlaceholder(greatestParameterPosition + 1) +
|
|
19
20
|
')',
|
|
21
|
+
type: FragmentToken,
|
|
20
22
|
values: [String(token.date.getTime() / 1_000)],
|
|
21
23
|
};
|
|
22
24
|
};
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import { FragmentToken } from '../tokens';
|
|
1
2
|
import {
|
|
2
3
|
type PrimitiveValueExpression,
|
|
3
|
-
type
|
|
4
|
+
type SqlFragmentToken,
|
|
4
5
|
type UnnestSqlToken,
|
|
5
6
|
} from '../types';
|
|
6
7
|
import { countArrayDimensions } from '../utilities/countArrayDimensions';
|
|
@@ -13,7 +14,7 @@ import { InvalidInputError } from '@slonik/errors';
|
|
|
13
14
|
export const createUnnestSqlFragment = (
|
|
14
15
|
token: UnnestSqlToken,
|
|
15
16
|
greatestParameterPosition: number,
|
|
16
|
-
):
|
|
17
|
+
): SqlFragmentToken => {
|
|
17
18
|
const { columnTypes } = token;
|
|
18
19
|
|
|
19
20
|
const values: PrimitiveValueExpression[] = [];
|
|
@@ -113,6 +114,7 @@ export const createUnnestSqlFragment = (
|
|
|
113
114
|
|
|
114
115
|
return {
|
|
115
116
|
sql,
|
|
117
|
+
type: FragmentToken,
|
|
116
118
|
values,
|
|
117
119
|
};
|
|
118
120
|
};
|
package/src/types.ts
CHANGED
|
@@ -26,12 +26,16 @@ export type IntervalInput = {
|
|
|
26
26
|
years?: number;
|
|
27
27
|
};
|
|
28
28
|
|
|
29
|
-
export type
|
|
29
|
+
export type SqlFragmentToken = {
|
|
30
30
|
readonly sql: string;
|
|
31
|
+
readonly type: typeof tokens.FragmentToken;
|
|
31
32
|
readonly values: readonly PrimitiveValueExpression[];
|
|
32
33
|
};
|
|
33
34
|
|
|
34
|
-
export type ValueExpression =
|
|
35
|
+
export type ValueExpression =
|
|
36
|
+
| PrimitiveValueExpression
|
|
37
|
+
| SqlFragmentToken
|
|
38
|
+
| SqlToken;
|
|
35
39
|
|
|
36
40
|
/**
|
|
37
41
|
* "string" type covers all type name identifiers – the literal values are added only to assist developer
|
|
@@ -52,7 +56,7 @@ export type TypeNameIdentifier =
|
|
|
52
56
|
| 'uuid';
|
|
53
57
|
|
|
54
58
|
export type ArraySqlToken = {
|
|
55
|
-
readonly memberType:
|
|
59
|
+
readonly memberType: SqlFragmentToken | TypeNameIdentifier;
|
|
56
60
|
readonly type: typeof tokens.ArrayToken;
|
|
57
61
|
readonly values: readonly PrimitiveValueExpression[];
|
|
58
62
|
};
|
|
@@ -84,7 +88,7 @@ export type IntervalSqlToken = {
|
|
|
84
88
|
};
|
|
85
89
|
|
|
86
90
|
export type ListSqlToken = {
|
|
87
|
-
readonly glue:
|
|
91
|
+
readonly glue: SqlFragmentToken;
|
|
88
92
|
readonly members: readonly ValueExpression[];
|
|
89
93
|
readonly type: typeof tokens.ListToken;
|
|
90
94
|
};
|
|
@@ -114,7 +118,7 @@ export type TimestampSqlToken = {
|
|
|
114
118
|
export type UnnestSqlToken = {
|
|
115
119
|
readonly columnTypes:
|
|
116
120
|
| Array<[...string[], TypeNameIdentifier]>
|
|
117
|
-
| Array<
|
|
121
|
+
| Array<SqlFragmentToken | TypeNameIdentifier>;
|
|
118
122
|
readonly tuples: ReadonlyArray<readonly ValueExpression[]>;
|
|
119
123
|
readonly type: typeof tokens.UnnestToken;
|
|
120
124
|
};
|
|
@@ -138,23 +142,23 @@ export type SqlTag<
|
|
|
138
142
|
> = {
|
|
139
143
|
array: (
|
|
140
144
|
values: readonly PrimitiveValueExpression[],
|
|
141
|
-
memberType:
|
|
145
|
+
memberType: SqlFragmentToken | TypeNameIdentifier,
|
|
142
146
|
) => ArraySqlToken;
|
|
143
147
|
binary: (data: Buffer) => BinarySqlToken;
|
|
144
148
|
date: (date: Date) => DateSqlToken;
|
|
145
149
|
fragment: (
|
|
146
150
|
template: TemplateStringsArray,
|
|
147
151
|
...values: ValueExpression[]
|
|
148
|
-
) =>
|
|
152
|
+
) => SqlFragmentToken;
|
|
149
153
|
identifier: (names: readonly string[]) => IdentifierSqlToken;
|
|
150
154
|
interval: (interval: IntervalInput) => IntervalSqlToken;
|
|
151
155
|
join: (
|
|
152
156
|
members: readonly ValueExpression[],
|
|
153
|
-
glue:
|
|
157
|
+
glue: SqlFragmentToken,
|
|
154
158
|
) => ListSqlToken;
|
|
155
159
|
json: (value: SerializableValue) => JsonSqlToken;
|
|
156
160
|
jsonb: (value: SerializableValue) => JsonBinarySqlToken;
|
|
157
|
-
literalValue: (value: string) =>
|
|
161
|
+
literalValue: (value: string) => SqlFragmentToken;
|
|
158
162
|
timestamp: (date: Date) => TimestampSqlToken;
|
|
159
163
|
type: <Y extends ZodTypeAny>(
|
|
160
164
|
parser: Y,
|
|
@@ -176,7 +180,7 @@ export type SqlTag<
|
|
|
176
180
|
tuples: ReadonlyArray<readonly any[]>,
|
|
177
181
|
columnTypes:
|
|
178
182
|
| Array<[...string[], TypeNameIdentifier]>
|
|
179
|
-
| Array<
|
|
183
|
+
| Array<SqlFragmentToken | TypeNameIdentifier>,
|
|
180
184
|
) => UnnestSqlToken;
|
|
181
185
|
unsafe: (
|
|
182
186
|
template: TemplateStringsArray,
|