@slonik/sql-tag 48.12.3 → 48.13.1
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/README.md +0 -1
- package/dist/Logger.js +2 -2
- package/dist/factories/createPrimitiveValueExpressions.d.ts +1 -1
- package/dist/factories/createPrimitiveValueExpressions.js +10 -10
- package/dist/factories/createSqlTag.d.ts +2 -2
- package/dist/factories/createSqlTag.d.ts.map +1 -1
- package/dist/factories/createSqlTag.js +16 -16
- package/dist/factories/createSqlTag.js.map +1 -1
- package/dist/factories/createSqlTag.test/array.test.js +44 -44
- package/dist/factories/createSqlTag.test/array.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/date.test.js +9 -9
- package/dist/factories/createSqlTag.test/date.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/identifier.test.js +11 -14
- package/dist/factories/createSqlTag.test/identifier.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/interval.test.js +10 -10
- package/dist/factories/createSqlTag.test/join.test.js +24 -24
- package/dist/factories/createSqlTag.test/join.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/json.test.js +27 -27
- package/dist/factories/createSqlTag.test/json.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/jsonb.test.js +27 -27
- package/dist/factories/createSqlTag.test/jsonb.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/literalValue.test.js +5 -5
- package/dist/factories/createSqlTag.test/literalValue.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/sql.test.js +37 -37
- package/dist/factories/createSqlTag.test/sql.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/timestamp.test.js +9 -9
- package/dist/factories/createSqlTag.test/timestamp.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/type.test.js +4 -4
- package/dist/factories/createSqlTag.test/typeAlias.test.js +8 -8
- package/dist/factories/createSqlTag.test/unnest.test.js +25 -25
- package/dist/factories/createSqlTag.test/unnest.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/uuid.test.js +10 -10
- package/dist/factories/createSqlTag.test/uuid.test.js.map +1 -1
- package/dist/factories/createSqlTokenSqlFragment.d.ts +1 -1
- package/dist/factories/createSqlTokenSqlFragment.d.ts.map +1 -1
- package/dist/factories/createSqlTokenSqlFragment.js +28 -67
- package/dist/factories/createSqlTokenSqlFragment.js.map +1 -1
- package/dist/index.d.ts +5 -5
- package/dist/index.js +4 -4
- package/dist/sqlFragmentFactories/createArraySqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createArraySqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createArraySqlFragment.js +15 -15
- package/dist/sqlFragmentFactories/createArraySqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createBinarySqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createBinarySqlFragment.js +4 -4
- package/dist/sqlFragmentFactories/createDateSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createDateSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createDateSqlFragment.js +5 -5
- package/dist/sqlFragmentFactories/createDateSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createFragmentSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createFragmentSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createFragmentSqlFragment.js +7 -7
- package/dist/sqlFragmentFactories/createFragmentSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createIdentifierSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createIdentifierSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createIdentifierSqlFragment.js +6 -6
- package/dist/sqlFragmentFactories/createIdentifierSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createIntervalSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createIntervalSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createIntervalSqlFragment.js +10 -20
- package/dist/sqlFragmentFactories/createIntervalSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createJsonSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createJsonSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createJsonSqlFragment.js +16 -18
- package/dist/sqlFragmentFactories/createJsonSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createListSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createListSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createListSqlFragment.js +9 -9
- package/dist/sqlFragmentFactories/createListSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createQuerySqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createQuerySqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createQuerySqlFragment.js +7 -7
- package/dist/sqlFragmentFactories/createQuerySqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createTimestampSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createTimestampSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createTimestampSqlFragment.js +5 -7
- package/dist/sqlFragmentFactories/createTimestampSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createUnnestSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createUnnestSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createUnnestSqlFragment.js +19 -20
- package/dist/sqlFragmentFactories/createUnnestSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createUuidSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createUuidSqlFragment.js +5 -5
- package/dist/tokens.d.ts.map +1 -1
- package/dist/tokens.js +14 -14
- package/dist/tokens.js.map +1 -1
- package/dist/types.d.ts +5 -5
- package/dist/types.d.ts.map +1 -1
- package/dist/utilities/countArrayDimensions.js +1 -1
- package/dist/utilities/countArrayDimensions.test.js +6 -6
- package/dist/utilities/escapeIdentifier.test.js +5 -5
- package/dist/utilities/escapeLiteralValue.js +2 -2
- package/dist/utilities/escapeLiteralValue.test.js +7 -7
- package/dist/utilities/formatSlonikPlaceholder.js +1 -1
- package/dist/utilities/isPlainObject.js +1 -1
- package/dist/utilities/isPrimitiveValueExpression.js +4 -4
- package/dist/utilities/isSqlToken.d.ts +1 -1
- package/dist/utilities/isSqlToken.d.ts.map +1 -1
- package/dist/utilities/isSqlToken.js +9 -9
- package/dist/utilities/isSqlToken.js.map +1 -1
- package/dist/utilities/safeStringify.js +3 -3
- package/dist/utilities/stripArrayNotation.js +1 -1
- package/dist/utilities/stripArrayNotation.test.js +6 -6
- package/package.json +35 -39
- package/src/Logger.ts +2 -2
- package/src/declarations.d.ts +2 -2
- package/src/factories/createPrimitiveValueExpressions.ts +11 -11
- package/src/factories/createSqlTag.test/array.test.ts +54 -66
- package/src/factories/createSqlTag.test/date.test.ts +9 -11
- package/src/factories/createSqlTag.test/identifier.test.ts +11 -14
- package/src/factories/createSqlTag.test/interval.test.ts +10 -10
- package/src/factories/createSqlTag.test/join.test.ts +25 -31
- package/src/factories/createSqlTag.test/json.test.ts +27 -30
- package/src/factories/createSqlTag.test/jsonb.test.ts +27 -30
- package/src/factories/createSqlTag.test/literalValue.test.ts +5 -7
- package/src/factories/createSqlTag.test/sql.test.ts +38 -41
- package/src/factories/createSqlTag.test/timestamp.test.ts +9 -14
- package/src/factories/createSqlTag.test/type.test.ts +4 -4
- package/src/factories/createSqlTag.test/typeAlias.test.ts +9 -9
- package/src/factories/createSqlTag.test/unnest.test.ts +25 -34
- package/src/factories/createSqlTag.test/uuid.test.ts +10 -12
- package/src/factories/createSqlTag.ts +26 -47
- package/src/factories/createSqlTokenSqlFragment.ts +30 -74
- package/src/index.ts +5 -5
- package/src/sqlFragmentFactories/createArraySqlFragment.ts +17 -22
- package/src/sqlFragmentFactories/createBinarySqlFragment.ts +5 -5
- package/src/sqlFragmentFactories/createDateSqlFragment.ts +6 -8
- package/src/sqlFragmentFactories/createFragmentSqlFragment.ts +9 -11
- package/src/sqlFragmentFactories/createIdentifierSqlFragment.ts +8 -12
- package/src/sqlFragmentFactories/createIntervalSqlFragment.ts +11 -23
- package/src/sqlFragmentFactories/createJsonSqlFragment.ts +17 -25
- package/src/sqlFragmentFactories/createListSqlFragment.ts +10 -14
- package/src/sqlFragmentFactories/createQuerySqlFragment.ts +9 -11
- package/src/sqlFragmentFactories/createTimestampSqlFragment.ts +6 -11
- package/src/sqlFragmentFactories/createUnnestSqlFragment.ts +20 -29
- package/src/sqlFragmentFactories/createUuidSqlFragment.ts +6 -6
- package/src/tokens.ts +14 -16
- package/src/types.ts +65 -87
- package/src/utilities/countArrayDimensions.test.ts +6 -6
- package/src/utilities/countArrayDimensions.ts +1 -1
- package/src/utilities/escapeIdentifier.test.ts +5 -5
- package/src/utilities/escapeLiteralValue.test.ts +7 -7
- package/src/utilities/escapeLiteralValue.ts +2 -2
- package/src/utilities/formatSlonikPlaceholder.ts +1 -1
- package/src/utilities/isPlainObject.ts +1 -1
- package/src/utilities/isPrimitiveValueExpression.ts +4 -4
- package/src/utilities/isSqlToken.ts +10 -12
- package/src/utilities/safeStringify.ts +3 -3
- package/src/utilities/stripArrayNotation.test.ts +6 -6
- package/src/utilities/stripArrayNotation.ts +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { FragmentToken } from
|
|
2
|
-
import { formatSlonikPlaceholder } from
|
|
3
|
-
import { InvalidInputError } from
|
|
4
|
-
import { z } from
|
|
1
|
+
import { FragmentToken } from "../tokens.js";
|
|
2
|
+
import { formatSlonikPlaceholder } from "../utilities/formatSlonikPlaceholder.js";
|
|
3
|
+
import { InvalidInputError } from "@slonik/errors";
|
|
4
|
+
import { z } from "zod";
|
|
5
5
|
const IntervalInput = z
|
|
6
6
|
.object({
|
|
7
7
|
days: z.number().optional(),
|
|
@@ -13,18 +13,10 @@ const IntervalInput = z
|
|
|
13
13
|
years: z.number().optional(),
|
|
14
14
|
})
|
|
15
15
|
.strict();
|
|
16
|
-
const intervalFragments = [
|
|
17
|
-
'years',
|
|
18
|
-
'months',
|
|
19
|
-
'weeks',
|
|
20
|
-
'days',
|
|
21
|
-
'hours',
|
|
22
|
-
'minutes',
|
|
23
|
-
'seconds',
|
|
24
|
-
];
|
|
16
|
+
const intervalFragments = ["years", "months", "weeks", "days", "hours", "minutes", "seconds"];
|
|
25
17
|
const tokenMap = {
|
|
26
|
-
minutes:
|
|
27
|
-
seconds:
|
|
18
|
+
minutes: "mins",
|
|
19
|
+
seconds: "secs",
|
|
28
20
|
};
|
|
29
21
|
export const createIntervalSqlFragment = (token, greatestParameterPosition) => {
|
|
30
22
|
let intervalInput;
|
|
@@ -32,7 +24,7 @@ export const createIntervalSqlFragment = (token, greatestParameterPosition) => {
|
|
|
32
24
|
intervalInput = IntervalInput.parse(token.interval);
|
|
33
25
|
}
|
|
34
26
|
catch {
|
|
35
|
-
throw new InvalidInputError(
|
|
27
|
+
throw new InvalidInputError("Interval input must not contain unknown properties.");
|
|
36
28
|
}
|
|
37
29
|
const values = [];
|
|
38
30
|
const intervalTokens = [];
|
|
@@ -41,13 +33,11 @@ export const createIntervalSqlFragment = (token, greatestParameterPosition) => {
|
|
|
41
33
|
if (value !== undefined) {
|
|
42
34
|
values.push(value);
|
|
43
35
|
const mappedToken = tokenMap[intervalFragment] ?? intervalFragment;
|
|
44
|
-
intervalTokens.push(mappedToken +
|
|
45
|
-
' => ' +
|
|
46
|
-
formatSlonikPlaceholder(greatestParameterPosition + values.length));
|
|
36
|
+
intervalTokens.push(mappedToken + " => " + formatSlonikPlaceholder(greatestParameterPosition + values.length));
|
|
47
37
|
}
|
|
48
38
|
}
|
|
49
39
|
return {
|
|
50
|
-
sql:
|
|
40
|
+
sql: "make_interval(" + intervalTokens.join(", ") + ")",
|
|
51
41
|
type: FragmentToken,
|
|
52
42
|
values,
|
|
53
43
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createIntervalSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIntervalSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,aAAa,GAAG,CAAC;KACpB,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC7B,CAAC;KACD,MAAM,EAAE,CAAC;AAEZ,MAAM,iBAAiB,GAAG
|
|
1
|
+
{"version":3,"file":"createIntervalSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIntervalSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,aAAa,GAAG,CAAC;KACpB,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC7B,CAAC;KACD,MAAM,EAAE,CAAC;AAEZ,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;AAE9F,MAAM,QAAQ,GAAG;IACf,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,MAAM;CAChB,CAAC;AAEF,MAAM,CAAC,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,iBAAiB,CAAC,qDAAqD,CAAC,CAAC;IACrF,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,GAAG,MAAM,GAAG,uBAAuB,CAAC,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC,CAC1F,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,GAAG,EAAE,gBAAgB,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG;QACvD,IAAI,EAAE,aAAa;QACnB,MAAM;KACP,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { JsonBinarySqlToken, JsonSqlToken, SqlFragmentToken } from
|
|
1
|
+
import type { JsonBinarySqlToken, JsonSqlToken, SqlFragmentToken } from "../types.js";
|
|
2
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":"AAEA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"createJsonSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createJsonSqlFragment.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAWtF,eAAO,MAAM,qBAAqB,GAChC,OAAO,kBAAkB,GAAG,YAAY,EACxC,2BAA2B,MAAM,EACjC,QAAQ,OAAO,KACd,gBA0CF,CAAC"}
|
|
@@ -1,26 +1,26 @@
|
|
|
1
|
-
import { Logger } from
|
|
2
|
-
import { FragmentToken } from
|
|
3
|
-
import { formatSlonikPlaceholder } from
|
|
4
|
-
import { isPlainObject } from
|
|
5
|
-
import { safeStringify } from
|
|
6
|
-
import { InvalidInputError } from
|
|
7
|
-
import { serializeError } from
|
|
1
|
+
import { Logger } from "../Logger.js";
|
|
2
|
+
import { FragmentToken } from "../tokens.js";
|
|
3
|
+
import { formatSlonikPlaceholder } from "../utilities/formatSlonikPlaceholder.js";
|
|
4
|
+
import { isPlainObject } from "../utilities/isPlainObject.js";
|
|
5
|
+
import { safeStringify } from "../utilities/safeStringify.js";
|
|
6
|
+
import { InvalidInputError } from "@slonik/errors";
|
|
7
|
+
import { serializeError } from "serialize-error";
|
|
8
8
|
const log = Logger.child({
|
|
9
|
-
namespace:
|
|
9
|
+
namespace: "createJsonSqlFragment",
|
|
10
10
|
});
|
|
11
11
|
export const createJsonSqlFragment = (token, greatestParameterPosition, binary) => {
|
|
12
12
|
let value;
|
|
13
13
|
if (token.value === undefined) {
|
|
14
|
-
throw new InvalidInputError(
|
|
14
|
+
throw new InvalidInputError("JSON payload must not be undefined.");
|
|
15
15
|
}
|
|
16
16
|
else if (token.value === null) {
|
|
17
|
-
value =
|
|
17
|
+
value = "null";
|
|
18
18
|
// @todo Deep check Array.
|
|
19
19
|
}
|
|
20
20
|
else if (!isPlainObject(token.value) &&
|
|
21
21
|
!Array.isArray(token.value) &&
|
|
22
|
-
![
|
|
23
|
-
throw new InvalidInputError(
|
|
22
|
+
!["boolean", "number", "string"].includes(typeof token.value)) {
|
|
23
|
+
throw new InvalidInputError("JSON payload must be a primitive value or a plain object.");
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
26
26
|
try {
|
|
@@ -29,17 +29,15 @@ export const createJsonSqlFragment = (token, greatestParameterPosition, binary)
|
|
|
29
29
|
catch (error) {
|
|
30
30
|
log.error({
|
|
31
31
|
error: serializeError(error),
|
|
32
|
-
},
|
|
33
|
-
throw new InvalidInputError(
|
|
32
|
+
}, "payload cannot be stringified");
|
|
33
|
+
throw new InvalidInputError("JSON payload cannot be stringified.");
|
|
34
34
|
}
|
|
35
35
|
if (value === undefined) {
|
|
36
|
-
throw new InvalidInputError(
|
|
36
|
+
throw new InvalidInputError("JSON payload cannot be stringified. The resulting value is undefined.");
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
return {
|
|
40
|
-
sql: formatSlonikPlaceholder(greatestParameterPosition + 1) +
|
|
41
|
-
'::' +
|
|
42
|
-
(binary ? 'jsonb' : 'json'),
|
|
40
|
+
sql: formatSlonikPlaceholder(greatestParameterPosition + 1) + "::" + (binary ? "jsonb" : "json"),
|
|
43
41
|
type: FragmentToken,
|
|
44
42
|
values: [value],
|
|
45
43
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createJsonSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createJsonSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"createJsonSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createJsonSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC;IACvB,SAAS,EAAE,uBAAuB;CACnC,CAAC,CAAC;AAEH,MAAM,CAAC,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,iBAAiB,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,aAAa,CAAC,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,iBAAiB,CAAC,2DAA2D,CAAC,CAAC;IAC3F,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,CACP;gBACE,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC;aAC7B,EACD,+BAA+B,CAChC,CAAC;YAEF,MAAM,IAAI,iBAAiB,CAAC,qCAAqC,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,iBAAiB,CACzB,uEAAuE,CACxE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,GAAG,EACD,uBAAuB,CAAC,yBAAyB,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QAC7F,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,CAAC,KAAK,CAAC;KAChB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { ListSqlToken, SqlFragmentToken } from
|
|
1
|
+
import type { ListSqlToken, SqlFragmentToken } from "../types.js";
|
|
2
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":"AAGA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"createListSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createListSqlFragment.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAA4B,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAM5F,eAAO,MAAM,qBAAqB,GAChC,OAAO,YAAY,EACnB,2BAA2B,MAAM,KAChC,gBAiCF,CAAC"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
import { createPrimitiveValueExpressions } from
|
|
2
|
-
import { createSqlTokenSqlFragment } from
|
|
3
|
-
import { FragmentToken } from
|
|
4
|
-
import { formatSlonikPlaceholder } from
|
|
5
|
-
import { isPrimitiveValueExpression } from
|
|
6
|
-
import { isSqlToken } from
|
|
7
|
-
import { InvalidInputError } from
|
|
1
|
+
import { createPrimitiveValueExpressions } from "../factories/createPrimitiveValueExpressions.js";
|
|
2
|
+
import { createSqlTokenSqlFragment } from "../factories/createSqlTokenSqlFragment.js";
|
|
3
|
+
import { FragmentToken } from "../tokens.js";
|
|
4
|
+
import { formatSlonikPlaceholder } from "../utilities/formatSlonikPlaceholder.js";
|
|
5
|
+
import { isPrimitiveValueExpression } from "../utilities/isPrimitiveValueExpression.js";
|
|
6
|
+
import { isSqlToken } from "../utilities/isSqlToken.js";
|
|
7
|
+
import { InvalidInputError } from "@slonik/errors";
|
|
8
8
|
export const createListSqlFragment = (token, greatestParameterPosition) => {
|
|
9
9
|
const values = [];
|
|
10
10
|
const placeholders = [];
|
|
11
11
|
let placeholderIndex = greatestParameterPosition;
|
|
12
12
|
if (token.members.length === 0) {
|
|
13
|
-
throw new InvalidInputError(
|
|
13
|
+
throw new InvalidInputError("Value list must have at least 1 member.");
|
|
14
14
|
}
|
|
15
15
|
for (const member of token.members) {
|
|
16
16
|
if (isSqlToken(member)) {
|
|
@@ -24,7 +24,7 @@ export const createListSqlFragment = (token, greatestParameterPosition) => {
|
|
|
24
24
|
values.push(member);
|
|
25
25
|
}
|
|
26
26
|
else {
|
|
27
|
-
throw new InvalidInputError(
|
|
27
|
+
throw new InvalidInputError("Invalid list member type. Must be a SQL token or a primitive value expression.");
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createListSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createListSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,MAAM,iDAAiD,CAAC;AAClG,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"createListSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createListSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,MAAM,iDAAiD,CAAC;AAClG,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AACxF,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,MAAM,CAAC,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,iBAAiB,CAAC,yCAAyC,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QACnC,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACvB,MAAM,WAAW,GAAG,yBAAyB,CAAC,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,0BAA0B,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9C,YAAY,CAAC,IAAI,CAAC,uBAAuB,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;YAE/D,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,iBAAiB,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,aAAa;QACnB,MAAM,EAAE,+BAA+B,CAAC,MAAM,CAAC;KAChD,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { QuerySqlToken, SqlFragmentToken } from
|
|
1
|
+
import type { QuerySqlToken, SqlFragmentToken } from "../types.js";
|
|
2
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":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAInE,eAAO,MAAM,sBAAsB,GACjC,OAAO,aAAa,EACpB,2BAA2B,MAAM,KAChC,
|
|
1
|
+
{"version":3,"file":"createQuerySqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createQuerySqlFragment.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAInE,eAAO,MAAM,sBAAsB,GACjC,OAAO,aAAa,EACpB,2BAA2B,MAAM,KAChC,gBAsCF,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { slonikPlaceholderRegexRule } from
|
|
2
|
-
import { FragmentToken } from
|
|
3
|
-
import { formatSlonikPlaceholder } from
|
|
4
|
-
import { UnexpectedStateError } from
|
|
1
|
+
import { slonikPlaceholderRegexRule } from "../regexRules/slonikPlaceholderRegexRule.js";
|
|
2
|
+
import { FragmentToken } from "../tokens.js";
|
|
3
|
+
import { formatSlonikPlaceholder } from "../utilities/formatSlonikPlaceholder.js";
|
|
4
|
+
import { UnexpectedStateError } from "@slonik/errors";
|
|
5
5
|
export const createQuerySqlFragment = (token, greatestParameterPosition) => {
|
|
6
|
-
let sql =
|
|
6
|
+
let sql = "";
|
|
7
7
|
let leastMatchedParameterPosition = Number.POSITIVE_INFINITY;
|
|
8
8
|
let greatestMatchedParameterPosition = 0;
|
|
9
9
|
sql += token.sql.replaceAll(slonikPlaceholderRegexRule, (match, g1) => {
|
|
@@ -17,11 +17,11 @@ export const createQuerySqlFragment = (token, greatestParameterPosition) => {
|
|
|
17
17
|
return formatSlonikPlaceholder(parameterPosition + greatestParameterPosition);
|
|
18
18
|
});
|
|
19
19
|
if (greatestMatchedParameterPosition > token.values.length) {
|
|
20
|
-
throw new UnexpectedStateError(
|
|
20
|
+
throw new UnexpectedStateError("The greatest parameter position is greater than the number of parameter values.");
|
|
21
21
|
}
|
|
22
22
|
if (leastMatchedParameterPosition !== Number.POSITIVE_INFINITY &&
|
|
23
23
|
leastMatchedParameterPosition !== 1) {
|
|
24
|
-
throw new UnexpectedStateError(
|
|
24
|
+
throw new UnexpectedStateError("Parameter position must start at 1.");
|
|
25
25
|
}
|
|
26
26
|
return {
|
|
27
27
|
sql,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createQuerySqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createQuerySqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,CAAC,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,0BAA0B,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,uBAAuB,
|
|
1
|
+
{"version":3,"file":"createQuerySqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createQuerySqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,CAAC,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,0BAA0B,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,uBAAuB,CAAC,iBAAiB,GAAG,yBAAyB,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;IAEH,IAAI,gCAAgC,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAC3D,MAAM,IAAI,oBAAoB,CAC5B,iFAAiF,CAClF,CAAC;IACJ,CAAC;IAED,IACE,6BAA6B,KAAK,MAAM,CAAC,iBAAiB;QAC1D,6BAA6B,KAAK,CAAC,EACnC,CAAC;QACD,MAAM,IAAI,oBAAoB,CAAC,qCAAqC,CAAC,CAAC;IACxE,CAAC;IAED,OAAO;QACL,GAAG;QACH,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,KAAK,CAAC,MAAM;KACrB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { SqlFragmentToken, TimestampSqlToken } from
|
|
1
|
+
import type { SqlFragmentToken, TimestampSqlToken } from "../types.js";
|
|
2
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":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIvE,eAAO,MAAM,0BAA0B,GACrC,OAAO,iBAAiB,EACxB,2BAA2B,MAAM,KAChC,
|
|
1
|
+
{"version":3,"file":"createTimestampSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createTimestampSqlFragment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIvE,eAAO,MAAM,0BAA0B,GACrC,OAAO,iBAAiB,EACxB,2BAA2B,MAAM,KAChC,gBAUF,CAAC"}
|
|
@@ -1,14 +1,12 @@
|
|
|
1
|
-
import { FragmentToken } from
|
|
2
|
-
import { formatSlonikPlaceholder } from
|
|
3
|
-
import { InvalidInputError } from
|
|
1
|
+
import { FragmentToken } from "../tokens.js";
|
|
2
|
+
import { formatSlonikPlaceholder } from "../utilities/formatSlonikPlaceholder.js";
|
|
3
|
+
import { InvalidInputError } from "@slonik/errors";
|
|
4
4
|
export const createTimestampSqlFragment = (token, greatestParameterPosition) => {
|
|
5
5
|
if (!(token.date instanceof Date)) {
|
|
6
|
-
throw new InvalidInputError(
|
|
6
|
+
throw new InvalidInputError("Timestamp parameter value must be an instance of Date.");
|
|
7
7
|
}
|
|
8
8
|
return {
|
|
9
|
-
sql:
|
|
10
|
-
formatSlonikPlaceholder(greatestParameterPosition + 1) +
|
|
11
|
-
')',
|
|
9
|
+
sql: "to_timestamp(" + formatSlonikPlaceholder(greatestParameterPosition + 1) + ")",
|
|
12
10
|
type: FragmentToken,
|
|
13
11
|
values: [String(token.date.getTime() / 1_000)],
|
|
14
12
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTimestampSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createTimestampSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,KAAwB,EACxB,yBAAiC,EACf,EAAE;IACpB,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,iBAAiB,
|
|
1
|
+
{"version":3,"file":"createTimestampSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createTimestampSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,KAAwB,EACxB,yBAAiC,EACf,EAAE;IACpB,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,iBAAiB,CAAC,wDAAwD,CAAC,CAAC;IACxF,CAAC;IAED,OAAO;QACL,GAAG,EAAE,eAAe,GAAG,uBAAuB,CAAC,yBAAyB,GAAG,CAAC,CAAC,GAAG,GAAG;QACnF,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;KAC/C,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { SqlFragmentToken, UnnestSqlToken } from
|
|
1
|
+
import type { SqlFragmentToken, UnnestSqlToken } from "../types.js";
|
|
2
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":"AACA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"createUnnestSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createUnnestSqlFragment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAA4B,gBAAgB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAQ9F,eAAO,MAAM,uBAAuB,GAClC,OAAO,cAAc,EACrB,2BAA2B,MAAM,KAChC,gBAkGF,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { FragmentToken } from
|
|
2
|
-
import { countArrayDimensions } from
|
|
3
|
-
import { escapeIdentifier } from
|
|
4
|
-
import { formatSlonikPlaceholder } from
|
|
5
|
-
import { isPrimitiveValueExpression } from
|
|
6
|
-
import { stripArrayNotation } from
|
|
7
|
-
import { InvalidInputError } from
|
|
1
|
+
import { FragmentToken } from "../tokens.js";
|
|
2
|
+
import { countArrayDimensions } from "../utilities/countArrayDimensions.js";
|
|
3
|
+
import { escapeIdentifier } from "../utilities/escapeIdentifier.js";
|
|
4
|
+
import { formatSlonikPlaceholder } from "../utilities/formatSlonikPlaceholder.js";
|
|
5
|
+
import { isPrimitiveValueExpression } from "../utilities/isPrimitiveValueExpression.js";
|
|
6
|
+
import { stripArrayNotation } from "../utilities/stripArrayNotation.js";
|
|
7
|
+
import { InvalidInputError } from "@slonik/errors";
|
|
8
8
|
export const createUnnestSqlFragment = (token, greatestParameterPosition) => {
|
|
9
9
|
const { columnTypes } = token;
|
|
10
10
|
const values = [];
|
|
@@ -16,19 +16,19 @@ export const createUnnestSqlFragment = (token, greatestParameterPosition) => {
|
|
|
16
16
|
const typeMember = columnTypes[columnIndex];
|
|
17
17
|
let columnType = columnTypes[columnIndex];
|
|
18
18
|
let columnTypeIsIdentifier;
|
|
19
|
-
if (typeof typeMember ===
|
|
19
|
+
if (typeof typeMember === "string") {
|
|
20
20
|
columnType = typeMember;
|
|
21
21
|
columnTypeIsIdentifier = false;
|
|
22
22
|
}
|
|
23
23
|
else if (Array.isArray(typeMember)) {
|
|
24
24
|
columnType = typeMember
|
|
25
25
|
.map((identifierName) => {
|
|
26
|
-
if (typeof identifierName !==
|
|
27
|
-
throw new InvalidInputError(
|
|
26
|
+
if (typeof identifierName !== "string") {
|
|
27
|
+
throw new InvalidInputError("sql.unnest column identifier name array member type must be a string (type name identifier) or a SQL token.");
|
|
28
28
|
}
|
|
29
29
|
return escapeIdentifier(identifierName);
|
|
30
30
|
})
|
|
31
|
-
.join(
|
|
31
|
+
.join(".");
|
|
32
32
|
columnTypeIsIdentifier = true;
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
@@ -36,22 +36,21 @@ export const createUnnestSqlFragment = (token, greatestParameterPosition) => {
|
|
|
36
36
|
columnTypeIsIdentifier = true;
|
|
37
37
|
}
|
|
38
38
|
unnestSqlTokens.push(formatSlonikPlaceholder(++placeholderIndex) +
|
|
39
|
-
|
|
39
|
+
"::" +
|
|
40
40
|
(columnTypeIsIdentifier
|
|
41
41
|
? stripArrayNotation(columnType)
|
|
42
42
|
: escapeIdentifier(stripArrayNotation(columnType))) +
|
|
43
|
-
|
|
43
|
+
"[]".repeat(countArrayDimensions(columnType) + 1));
|
|
44
44
|
unnestBindings[columnIndex] = [];
|
|
45
45
|
columnIndex++;
|
|
46
46
|
}
|
|
47
47
|
let lastTupleSize;
|
|
48
48
|
for (const tupleValues of token.tuples) {
|
|
49
|
-
if (typeof lastTupleSize ===
|
|
50
|
-
|
|
51
|
-
throw new Error('Each tuple in a list of tuples must have an equal number of members.');
|
|
49
|
+
if (typeof lastTupleSize === "number" && lastTupleSize !== tupleValues.length) {
|
|
50
|
+
throw new Error("Each tuple in a list of tuples must have an equal number of members.");
|
|
52
51
|
}
|
|
53
52
|
if (tupleValues.length !== columnTypes.length) {
|
|
54
|
-
throw new Error(
|
|
53
|
+
throw new Error("Column types length must match tuple member length.");
|
|
55
54
|
}
|
|
56
55
|
lastTupleSize = tupleValues.length;
|
|
57
56
|
let tupleColumnIndex = 0;
|
|
@@ -59,17 +58,17 @@ export const createUnnestSqlFragment = (token, greatestParameterPosition) => {
|
|
|
59
58
|
if (!Array.isArray(tupleValue) &&
|
|
60
59
|
!isPrimitiveValueExpression(tupleValue) &&
|
|
61
60
|
!Buffer.isBuffer(tupleValue)) {
|
|
62
|
-
throw new InvalidInputError(
|
|
61
|
+
throw new InvalidInputError("Invalid unnest tuple member type. Must be a primitive value expression.");
|
|
63
62
|
}
|
|
64
63
|
const tupleBindings = unnestBindings[tupleColumnIndex++];
|
|
65
64
|
if (!tupleBindings) {
|
|
66
|
-
throw new Error(
|
|
65
|
+
throw new Error("test");
|
|
67
66
|
}
|
|
68
67
|
tupleBindings.push(tupleValue);
|
|
69
68
|
}
|
|
70
69
|
}
|
|
71
70
|
values.push(...unnestBindings);
|
|
72
|
-
const sql =
|
|
71
|
+
const sql = "unnest(" + unnestSqlTokens.join(", ") + ")";
|
|
73
72
|
return {
|
|
74
73
|
sql,
|
|
75
74
|
type: FragmentToken,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createUnnestSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createUnnestSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"createUnnestSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createUnnestSqlFragment.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { SqlFragmentToken, UuidSqlToken } from
|
|
1
|
+
import type { SqlFragmentToken, UuidSqlToken } from "../types.js";
|
|
2
2
|
export type UUID = `${string}-${string}-${string}-${string}-${string}`;
|
|
3
3
|
export declare const createUuidSqlFragment: (token: UuidSqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
4
4
|
//# sourceMappingURL=createUuidSqlFragment.d.ts.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { FragmentToken } from
|
|
2
|
-
import { formatSlonikPlaceholder } from
|
|
3
|
-
import { InvalidInputError } from
|
|
1
|
+
import { FragmentToken } from "../tokens.js";
|
|
2
|
+
import { formatSlonikPlaceholder } from "../utilities/formatSlonikPlaceholder.js";
|
|
3
|
+
import { InvalidInputError } from "@slonik/errors";
|
|
4
4
|
// eslint-disable-next-line func-style
|
|
5
5
|
function isValidUuid(uuid) {
|
|
6
6
|
const uuidRegex = /^[\da-f]{8}(?:-[\da-f]{4}){3}-[\da-f]{12}$/iu;
|
|
@@ -8,10 +8,10 @@ function isValidUuid(uuid) {
|
|
|
8
8
|
}
|
|
9
9
|
export const createUuidSqlFragment = (token, greatestParameterPosition) => {
|
|
10
10
|
if (!isValidUuid(token.uuid)) {
|
|
11
|
-
throw new InvalidInputError(
|
|
11
|
+
throw new InvalidInputError("UUID parameter value must be a valid UUID.");
|
|
12
12
|
}
|
|
13
13
|
return {
|
|
14
|
-
sql: formatSlonikPlaceholder(greatestParameterPosition + 1) +
|
|
14
|
+
sql: formatSlonikPlaceholder(greatestParameterPosition + 1) + "::uuid",
|
|
15
15
|
type: FragmentToken,
|
|
16
16
|
values: [token.uuid],
|
|
17
17
|
};
|
package/dist/tokens.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU,eAAmC,CAAC;AAC3D,eAAO,MAAM,WAAW,eAAoC,CAAC;AAC7D,eAAO,MAAM,wBAAwB,
|
|
1
|
+
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU,eAAmC,CAAC;AAC3D,eAAO,MAAM,WAAW,eAAoC,CAAC;AAC7D,eAAO,MAAM,wBAAwB,eAAkD,CAAC;AACxF,eAAO,MAAM,SAAS,eAAkC,CAAC;AACzD,eAAO,MAAM,aAAa,eAAsC,CAAC;AACjE,eAAO,MAAM,eAAe,eAAwC,CAAC;AACrE,eAAO,MAAM,aAAa,eAAsC,CAAC;AACjE,eAAO,MAAM,eAAe,eAAyC,CAAC;AACtE,eAAO,MAAM,SAAS,eAAkC,CAAC;AACzD,eAAO,MAAM,SAAS,eAAkC,CAAC;AACzD,eAAO,MAAM,UAAU,eAAmC,CAAC;AAC3D,eAAO,MAAM,cAAc,eAAuC,CAAC;AACnE,eAAO,MAAM,WAAW,eAAoC,CAAC;AAC7D,eAAO,MAAM,SAAS,eAAkC,CAAC"}
|
package/dist/tokens.js
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
export const ArrayToken = Symbol.for(
|
|
2
|
-
export const BinaryToken = Symbol.for(
|
|
3
|
-
export const ComparisonPredicateToken = Symbol.for(
|
|
4
|
-
export const DateToken = Symbol.for(
|
|
5
|
-
export const FragmentToken = Symbol.for(
|
|
6
|
-
export const IdentifierToken = Symbol.for(
|
|
7
|
-
export const IntervalToken = Symbol.for(
|
|
8
|
-
export const JsonBinaryToken = Symbol.for(
|
|
9
|
-
export const JsonToken = Symbol.for(
|
|
10
|
-
export const ListToken = Symbol.for(
|
|
11
|
-
export const QueryToken = Symbol.for(
|
|
12
|
-
export const TimestampToken = Symbol.for(
|
|
13
|
-
export const UnnestToken = Symbol.for(
|
|
14
|
-
export const UuidToken = Symbol.for(
|
|
1
|
+
export const ArrayToken = Symbol.for("SLONIK_TOKEN_ARRAY");
|
|
2
|
+
export const BinaryToken = Symbol.for("SLONIK_TOKEN_BINARY");
|
|
3
|
+
export const ComparisonPredicateToken = Symbol.for("SLONIK_TOKEN_COMPARISON_PREDICATE");
|
|
4
|
+
export const DateToken = Symbol.for("SLONIK_TOKEN_DATE");
|
|
5
|
+
export const FragmentToken = Symbol.for("SLONIK_TOKEN_FRAGMENT");
|
|
6
|
+
export const IdentifierToken = Symbol.for("SLONIK_TOKEN_IDENTIFIER");
|
|
7
|
+
export const IntervalToken = Symbol.for("SLONIK_TOKEN_INTERVAL");
|
|
8
|
+
export const JsonBinaryToken = Symbol.for("SLONIK_TOKEN_JSON_BINARY");
|
|
9
|
+
export const JsonToken = Symbol.for("SLONIK_TOKEN_JSON");
|
|
10
|
+
export const ListToken = Symbol.for("SLONIK_TOKEN_LIST");
|
|
11
|
+
export const QueryToken = Symbol.for("SLONIK_TOKEN_QUERY");
|
|
12
|
+
export const TimestampToken = Symbol.for("SLONIK_TOKEN_TIMESTAMP");
|
|
13
|
+
export const UnnestToken = Symbol.for("SLONIK_TOKEN_UNNEST");
|
|
14
|
+
export const UuidToken = Symbol.for("SLONIK_TOKEN_UUID");
|
|
15
15
|
//# sourceMappingURL=tokens.js.map
|
package/dist/tokens.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;AAC3D,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;AAC7D,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;AAC3D,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;AAC7D,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;AACxF,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACzD,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;AACjE,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;AACrE,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;AACjE,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;AACtE,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACzD,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACzD,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;AAC3D,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;AACnE,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;AAC7D,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC"}
|
package/dist/types.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type * as tokens from
|
|
2
|
-
import type { PrimitiveValueExpression } from
|
|
3
|
-
import type { StandardSchemaV1 } from
|
|
4
|
-
export { type PrimitiveValueExpression } from
|
|
1
|
+
import type * as tokens from "./tokens.js";
|
|
2
|
+
import type { PrimitiveValueExpression } from "@slonik/types";
|
|
3
|
+
import type { StandardSchemaV1 } from "@standard-schema/spec";
|
|
4
|
+
export { type PrimitiveValueExpression } from "@slonik/types";
|
|
5
5
|
export type ArraySqlToken<T extends TypeNameIdentifier = TypeNameIdentifier> = {
|
|
6
6
|
readonly memberType: SqlFragmentToken | T;
|
|
7
7
|
readonly type: typeof tokens.ArrayToken;
|
|
@@ -107,7 +107,7 @@ export type TimestampSqlToken = {
|
|
|
107
107
|
* "string" type covers all type name identifiers – the literal values are added only to assist developer
|
|
108
108
|
* experience with auto suggestions for commonly used type name identifiers.
|
|
109
109
|
*/
|
|
110
|
-
export type TypeNameIdentifier =
|
|
110
|
+
export type TypeNameIdentifier = "bool" | "bytea" | "float4" | "float8" | "int2" | "int4" | "int8" | "json" | "text" | "timestamptz" | "uuid" | string;
|
|
111
111
|
export type UnnestSqlToken = {
|
|
112
112
|
readonly columnTypes: Array<[...string[], TypeNameIdentifier]> | Array<SqlFragmentToken | TypeNameIdentifier>;
|
|
113
113
|
readonly tuples: ReadonlyArray<readonly ValueExpression[]>;
|
package/dist/types.d.ts.map
CHANGED
|
@@ -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":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { countArrayDimensions } from
|
|
2
|
-
import test from
|
|
3
|
-
test(
|
|
4
|
-
t.is(countArrayDimensions(
|
|
5
|
-
t.is(countArrayDimensions(
|
|
6
|
-
t.is(countArrayDimensions(
|
|
1
|
+
import { countArrayDimensions } from "./countArrayDimensions.js";
|
|
2
|
+
import test from "ava";
|
|
3
|
+
test("returns the number of array dimensions", (t) => {
|
|
4
|
+
t.is(countArrayDimensions("foo"), 0);
|
|
5
|
+
t.is(countArrayDimensions("foo[]"), 1);
|
|
6
|
+
t.is(countArrayDimensions("foo[][]"), 2);
|
|
7
7
|
});
|
|
8
8
|
//# sourceMappingURL=countArrayDimensions.test.js.map
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { escapeIdentifier } from
|
|
2
|
-
import test from
|
|
3
|
-
test(
|
|
4
|
-
t.is(escapeIdentifier(
|
|
5
|
-
t.is(escapeIdentifier(
|
|
1
|
+
import { escapeIdentifier } from "./escapeIdentifier.js";
|
|
2
|
+
import test from "ava";
|
|
3
|
+
test("escapes SQL identifiers", (t) => {
|
|
4
|
+
t.is(escapeIdentifier("foo"), '"foo"');
|
|
5
|
+
t.is(escapeIdentifier("foo bar"), '"foo bar"');
|
|
6
6
|
t.is(escapeIdentifier('"foo"'), '"""foo"""');
|
|
7
7
|
});
|
|
8
8
|
//# sourceMappingURL=escapeIdentifier.test.js.map
|