grafeo-ogm 2.5.2 → 2.5.4
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/CHANGELOG.md +52 -0
- package/dist/cjs/compilers/mutation.compiler.d.ts.map +1 -1
- package/dist/cjs/compilers/mutation.compiler.js +8 -3
- package/dist/cjs/compilers/mutation.compiler.js.map +1 -1
- package/dist/cjs/compilers/select-normalizer.d.ts +5 -0
- package/dist/cjs/compilers/select-normalizer.d.ts.map +1 -1
- package/dist/cjs/compilers/select-normalizer.js +54 -3
- package/dist/cjs/compilers/select-normalizer.js.map +1 -1
- package/dist/cjs/compilers/selection.compiler.d.ts +47 -0
- package/dist/cjs/compilers/selection.compiler.d.ts.map +1 -1
- package/dist/cjs/compilers/selection.compiler.js +248 -56
- package/dist/cjs/compilers/selection.compiler.js.map +1 -1
- package/dist/cjs/compilers/where.compiler.d.ts +17 -7
- package/dist/cjs/compilers/where.compiler.d.ts.map +1 -1
- package/dist/cjs/compilers/where.compiler.js +45 -13
- package/dist/cjs/compilers/where.compiler.js.map +1 -1
- package/dist/cjs/execution/executor.d.ts +7 -2
- package/dist/cjs/execution/executor.d.ts.map +1 -1
- package/dist/cjs/execution/executor.js +22 -5
- package/dist/cjs/execution/executor.js.map +1 -1
- package/dist/cjs/generator/generate-types.d.ts.map +1 -1
- package/dist/cjs/generator/generate-types.js +19 -2
- package/dist/cjs/generator/generate-types.js.map +1 -1
- package/dist/cjs/generator/type-emitters/model-map-emitter.d.ts +2 -1
- package/dist/cjs/generator/type-emitters/model-map-emitter.d.ts.map +1 -1
- package/dist/cjs/generator/type-emitters/model-map-emitter.js +9 -7
- package/dist/cjs/generator/type-emitters/model-map-emitter.js.map +1 -1
- package/dist/cjs/generator/type-emitters/utility-types.d.ts +13 -1
- package/dist/cjs/generator/type-emitters/utility-types.d.ts.map +1 -1
- package/dist/cjs/generator/type-emitters/utility-types.js +21 -3
- package/dist/cjs/generator/type-emitters/utility-types.js.map +1 -1
- package/dist/cjs/interface-model.d.ts +14 -10
- package/dist/cjs/interface-model.d.ts.map +1 -1
- package/dist/cjs/interface-model.js +22 -14
- package/dist/cjs/interface-model.js.map +1 -1
- package/dist/cjs/ogm.js +1 -1
- package/dist/cjs/ogm.js.map +1 -1
- package/dist/cjs/schema/parser.d.ts.map +1 -1
- package/dist/cjs/schema/parser.js +7 -2
- package/dist/cjs/schema/parser.js.map +1 -1
- package/dist/cjs/testing/cypher-assert.d.ts +2 -2
- package/dist/cjs/testing/cypher-assert.d.ts.map +1 -1
- package/dist/cjs/testing/cypher-assert.js +54 -6
- package/dist/cjs/testing/cypher-assert.js.map +1 -1
- package/dist/cjs/testing/neo4j-record-factory.d.ts +5 -0
- package/dist/cjs/testing/neo4j-record-factory.d.ts.map +1 -1
- package/dist/cjs/testing/neo4j-record-factory.js +82 -27
- package/dist/cjs/testing/neo4j-record-factory.js.map +1 -1
- package/dist/cjs/utils/cypher-field-projection.d.ts +9 -1
- package/dist/cjs/utils/cypher-field-projection.d.ts.map +1 -1
- package/dist/cjs/utils/cypher-field-projection.js +39 -9
- package/dist/cjs/utils/cypher-field-projection.js.map +1 -1
- package/dist/cjs/utils/cypher-sort-projection.d.ts +6 -4
- package/dist/cjs/utils/cypher-sort-projection.d.ts.map +1 -1
- package/dist/cjs/utils/cypher-sort-projection.js +9 -7
- package/dist/cjs/utils/cypher-sort-projection.js.map +1 -1
- package/dist/cjs/utils/write-coercion.d.ts.map +1 -1
- package/dist/cjs/utils/write-coercion.js +12 -1
- package/dist/cjs/utils/write-coercion.js.map +1 -1
- package/dist/esm/compilers/mutation.compiler.d.ts.map +1 -1
- package/dist/esm/compilers/mutation.compiler.js +8 -3
- package/dist/esm/compilers/mutation.compiler.js.map +1 -1
- package/dist/esm/compilers/select-normalizer.d.ts +5 -0
- package/dist/esm/compilers/select-normalizer.d.ts.map +1 -1
- package/dist/esm/compilers/select-normalizer.js +54 -3
- package/dist/esm/compilers/select-normalizer.js.map +1 -1
- package/dist/esm/compilers/selection.compiler.d.ts +47 -0
- package/dist/esm/compilers/selection.compiler.d.ts.map +1 -1
- package/dist/esm/compilers/selection.compiler.js +249 -57
- package/dist/esm/compilers/selection.compiler.js.map +1 -1
- package/dist/esm/compilers/where.compiler.d.ts +17 -7
- package/dist/esm/compilers/where.compiler.d.ts.map +1 -1
- package/dist/esm/compilers/where.compiler.js +45 -13
- package/dist/esm/compilers/where.compiler.js.map +1 -1
- package/dist/esm/execution/executor.d.ts +7 -2
- package/dist/esm/execution/executor.d.ts.map +1 -1
- package/dist/esm/execution/executor.js +22 -5
- package/dist/esm/execution/executor.js.map +1 -1
- package/dist/esm/generator/generate-types.d.ts.map +1 -1
- package/dist/esm/generator/generate-types.js +20 -3
- package/dist/esm/generator/generate-types.js.map +1 -1
- package/dist/esm/generator/type-emitters/model-map-emitter.d.ts +2 -1
- package/dist/esm/generator/type-emitters/model-map-emitter.d.ts.map +1 -1
- package/dist/esm/generator/type-emitters/model-map-emitter.js +9 -7
- package/dist/esm/generator/type-emitters/model-map-emitter.js.map +1 -1
- package/dist/esm/generator/type-emitters/utility-types.d.ts +13 -1
- package/dist/esm/generator/type-emitters/utility-types.d.ts.map +1 -1
- package/dist/esm/generator/type-emitters/utility-types.js +19 -3
- package/dist/esm/generator/type-emitters/utility-types.js.map +1 -1
- package/dist/esm/interface-model.d.ts +14 -10
- package/dist/esm/interface-model.d.ts.map +1 -1
- package/dist/esm/interface-model.js +22 -14
- package/dist/esm/interface-model.js.map +1 -1
- package/dist/esm/ogm.js +1 -1
- package/dist/esm/ogm.js.map +1 -1
- package/dist/esm/schema/parser.d.ts.map +1 -1
- package/dist/esm/schema/parser.js +7 -2
- package/dist/esm/schema/parser.js.map +1 -1
- package/dist/esm/testing/cypher-assert.d.ts +2 -2
- package/dist/esm/testing/cypher-assert.d.ts.map +1 -1
- package/dist/esm/testing/cypher-assert.js +54 -6
- package/dist/esm/testing/cypher-assert.js.map +1 -1
- package/dist/esm/testing/neo4j-record-factory.d.ts +5 -0
- package/dist/esm/testing/neo4j-record-factory.d.ts.map +1 -1
- package/dist/esm/testing/neo4j-record-factory.js +82 -27
- package/dist/esm/testing/neo4j-record-factory.js.map +1 -1
- package/dist/esm/utils/cypher-field-projection.d.ts +9 -1
- package/dist/esm/utils/cypher-field-projection.d.ts.map +1 -1
- package/dist/esm/utils/cypher-field-projection.js +39 -9
- package/dist/esm/utils/cypher-field-projection.js.map +1 -1
- package/dist/esm/utils/cypher-sort-projection.d.ts +6 -4
- package/dist/esm/utils/cypher-sort-projection.d.ts.map +1 -1
- package/dist/esm/utils/cypher-sort-projection.js +9 -7
- package/dist/esm/utils/cypher-sort-projection.js.map +1 -1
- package/dist/esm/utils/write-coercion.d.ts.map +1 -1
- package/dist/esm/utils/write-coercion.js +12 -1
- package/dist/esm/utils/write-coercion.js.map +1 -1
- package/package.json +1 -1
|
@@ -169,8 +169,13 @@ function parseField(field, enumNames, ownerName) {
|
|
|
169
169
|
return scalar;
|
|
170
170
|
});
|
|
171
171
|
}
|
|
172
|
-
else if (val)
|
|
173
|
-
|
|
172
|
+
else if (val) {
|
|
173
|
+
const scalar = scalarDefaultString(val);
|
|
174
|
+
// v2.5.3 — a single value on a list field coerces to a one-element
|
|
175
|
+
// list (GraphQL input coercion). Pre-2.5.3 the scalar was stored on
|
|
176
|
+
// a field the generated types declare as a list.
|
|
177
|
+
defaultValue = isArray && scalar !== undefined ? [scalar] : scalar;
|
|
178
|
+
}
|
|
174
179
|
}
|
|
175
180
|
// Determine if this is truly a scalar property
|
|
176
181
|
// A non-scalar, non-enum type without @relationship is unusual but we treat it as a property
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/schema/parser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/schema/parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,8 +28,8 @@ export declare class CypherAssert {
|
|
|
28
28
|
* words, e.g. 'ORDER BY', 'ON CREATE SET'), never inside a name, a
|
|
29
29
|
* parameter, a string or a comment. A clause runs from its keyword to the
|
|
30
30
|
* next clause keyword at the same bracket depth (WHERE, ORDER BY, SKIP and
|
|
31
|
-
* LIMIT each count as their own clause),
|
|
32
|
-
* bracket closing the enclosing one. The assertion passes when any
|
|
31
|
+
* LIMIT each count as their own clause), the `|` ending a comprehension's
|
|
32
|
+
* predicate, or the bracket closing the enclosing one. The assertion passes when any
|
|
33
33
|
* occurrence of the clause contains `pattern`.
|
|
34
34
|
*
|
|
35
35
|
* Before v2.5.0 the clause was a raw substring (`'SET'` matched
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypher-assert.d.ts","sourceRoot":"","sources":["../../../src/testing/cypher-assert.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cypher-assert.d.ts","sourceRoot":"","sources":["../../../src/testing/cypher-assert.ts"],"names":[],"mappings":"AA6NA;;;GAGG;AACH,qBAAa,YAAY;IACvB;;;;;;;;;;OAUG;IACH,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAkBxC;;;OAGG;IACH,MAAM,CAAC,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAStE;;;;;;;;;;;;;;;;;;OAkBG;IACH,MAAM,CAAC,oBAAoB,CACzB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GACd,IAAI;IAaP;;OAEG;IACH,MAAM,CAAC,uBAAuB,CAC5B,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,MAAM,EAC3B,OAAO,CAAC,EAAE,MAAM,GACf,IAAI;IAQP;;;OAGG;IACH,MAAM,CAAC,YAAY,CACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,IAAI;CAeR"}
|
|
@@ -136,11 +136,53 @@ function isKeywordUse(sig, k) {
|
|
|
136
136
|
return false;
|
|
137
137
|
return true;
|
|
138
138
|
}
|
|
139
|
+
/** The bracket that encloses `sig[k]`, or undefined at the top level. */
|
|
140
|
+
function enclosingOpener(sig, k) {
|
|
141
|
+
let depth = 0;
|
|
142
|
+
for (let i = k - 1; i >= 0; i--) {
|
|
143
|
+
const t = sig[i];
|
|
144
|
+
if (t.kind !== 'punct')
|
|
145
|
+
continue;
|
|
146
|
+
if (')]}'.includes(t.text))
|
|
147
|
+
depth++;
|
|
148
|
+
else if ('([{'.includes(t.text) && --depth < 0)
|
|
149
|
+
return t.text;
|
|
150
|
+
}
|
|
151
|
+
return undefined;
|
|
152
|
+
}
|
|
153
|
+
/**
|
|
154
|
+
* Whether the `|` at `sig[j]` belongs to a label expression (`n:A|B`,
|
|
155
|
+
* `n:!A|B&C`): walking back over names joined by `|` / `&` / `!` reaches
|
|
156
|
+
* a `:`.
|
|
157
|
+
*/
|
|
158
|
+
function isLabelExpressionBar(sig, j) {
|
|
159
|
+
let i = j - 1;
|
|
160
|
+
for (;;) {
|
|
161
|
+
if (sig[i]?.kind !== 'word' && sig[i]?.kind !== 'quoted')
|
|
162
|
+
return false;
|
|
163
|
+
i--;
|
|
164
|
+
while (sig[i]?.kind === 'punct' && sig[i].text === '!')
|
|
165
|
+
i--;
|
|
166
|
+
const t = sig[i];
|
|
167
|
+
if (t?.kind !== 'punct')
|
|
168
|
+
return false;
|
|
169
|
+
if (t.text === ':')
|
|
170
|
+
return true;
|
|
171
|
+
if (t.text !== '|' && t.text !== '&')
|
|
172
|
+
return false;
|
|
173
|
+
i--;
|
|
174
|
+
}
|
|
175
|
+
}
|
|
139
176
|
/**
|
|
140
177
|
* The source text of every occurrence of `clauseType` used as a keyword:
|
|
141
178
|
* from the keyword to the next clause keyword at the same bracket depth,
|
|
142
|
-
*
|
|
143
|
-
* that closes the enclosing one — whichever comes first.
|
|
179
|
+
* the `|` that ends a list or pattern comprehension's predicate, or the
|
|
180
|
+
* bracket that closes the enclosing one — whichever comes first.
|
|
181
|
+
*
|
|
182
|
+
* v2.5.3 — `|` ends the clause only inside `[ … ]` (a comprehension), and
|
|
183
|
+
* never as part of a label expression (`n:A|B`) or `||`. Pre-2.5.3 any `|`
|
|
184
|
+
* at the clause's depth ended it, so `WHERE n:A|B AND n.x = $p` was cut
|
|
185
|
+
* at the label expression.
|
|
144
186
|
*/
|
|
145
187
|
function clauseSegments(cypher, clauseType) {
|
|
146
188
|
const words = clauseType.trim().toUpperCase().split(/\s+/);
|
|
@@ -152,6 +194,7 @@ function clauseSegments(cypher, clauseType) {
|
|
|
152
194
|
continue;
|
|
153
195
|
let depth = 0;
|
|
154
196
|
let end = cypher.length;
|
|
197
|
+
const inComprehension = enclosingOpener(sig, k) === '[';
|
|
155
198
|
for (let j = k + words.length; j < sig.length; j++) {
|
|
156
199
|
const t = sig[j];
|
|
157
200
|
if (t.kind === 'punct' && '([{'.includes(t.text))
|
|
@@ -163,8 +206,13 @@ function clauseSegments(cypher, clauseType) {
|
|
|
163
206
|
}
|
|
164
207
|
}
|
|
165
208
|
else if (depth === 0 && t.kind === 'punct' && t.text === '|') {
|
|
166
|
-
|
|
167
|
-
|
|
209
|
+
const next = sig[j + 1];
|
|
210
|
+
if (next?.kind === 'punct' && next.text === '|' && next.start === t.end)
|
|
211
|
+
j++; // `||` concatenation
|
|
212
|
+
else if (inComprehension && !isLabelExpressionBar(sig, j)) {
|
|
213
|
+
end = t.start;
|
|
214
|
+
break;
|
|
215
|
+
}
|
|
168
216
|
}
|
|
169
217
|
else if (depth === 0 &&
|
|
170
218
|
t.kind === 'word' &&
|
|
@@ -231,8 +279,8 @@ class CypherAssert {
|
|
|
231
279
|
* words, e.g. 'ORDER BY', 'ON CREATE SET'), never inside a name, a
|
|
232
280
|
* parameter, a string or a comment. A clause runs from its keyword to the
|
|
233
281
|
* next clause keyword at the same bracket depth (WHERE, ORDER BY, SKIP and
|
|
234
|
-
* LIMIT each count as their own clause),
|
|
235
|
-
* bracket closing the enclosing one. The assertion passes when any
|
|
282
|
+
* LIMIT each count as their own clause), the `|` ending a comprehension's
|
|
283
|
+
* predicate, or the bracket closing the enclosing one. The assertion passes when any
|
|
236
284
|
* occurrence of the clause contains `pattern`.
|
|
237
285
|
*
|
|
238
286
|
* Before v2.5.0 the clause was a raw substring (`'SET'` matched
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypher-assert.js","sourceRoot":"","sources":["../../../src/testing/cypher-assert.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cypher-assert.js","sourceRoot":"","sources":["../../../src/testing/cypher-assert.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,11 @@ export declare class Neo4jRecordFactory {
|
|
|
25
25
|
* A string with neither an offset nor a zone id is read as UTC, as Neo4j
|
|
26
26
|
* reads it with its default zone.
|
|
27
27
|
*
|
|
28
|
+
* With a zone id and no offset, the zone rules apply as in Neo4j
|
|
29
|
+
* (v2.5.3): a wall time inside a DST gap moves later by the gap, an
|
|
30
|
+
* ambiguous one takes the earlier offset, and historical (local mean
|
|
31
|
+
* time) offsets are honoured for any year.
|
|
32
|
+
*
|
|
28
33
|
* Before v2.4.8 the value was converted to UTC with the offset dropped
|
|
29
34
|
* and the fraction cut to milliseconds; before v2.5.0 an offset-less
|
|
30
35
|
* string was read in the machine's local zone.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"neo4j-record-factory.d.ts","sourceRoot":"","sources":["../../../src/testing/neo4j-record-factory.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,OAAO,EAAE,MAAM,IAAI,WAAW,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"neo4j-record-factory.d.ts","sourceRoot":"","sources":["../../../src/testing/neo4j-record-factory.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,OAAO,EAAE,MAAM,IAAI,WAAW,EAAE,MAAM,cAAc,CAAC;AAkGrE;;GAEG;AACH,qBAAa,kBAAkB;IAC7B;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,WAAW;IAMzD;;OAEG;IACH,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAItC;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IA6C3C,2EAA2E;IAC3E,OAAO,CAAC,MAAM,CAAC,cAAc;IAoB7B;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,IAAI,CACT,MAAM,EAAE,MAAM,EAAE,EAChB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,OAAO,GAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAO,GAChE,OAAO;CASX"}
|
|
@@ -9,8 +9,11 @@ const neo4j_driver_1 = __importDefault(require("neo4j-driver"));
|
|
|
9
9
|
* ISO-8601 date-time as Neo4j's `datetime()` accepts it: a date, an
|
|
10
10
|
* optional time with up to nine fractional digits, an optional offset
|
|
11
11
|
* (`Z`, `±HH`, `±HHMM`, `±HH:MM`) and an optional `[Area/City]` zone id.
|
|
12
|
+
*
|
|
13
|
+
* v2.5.3 — the basic format (`20240101T100000Z`, no separators) is
|
|
14
|
+
* accepted too, as Neo4j accepts it.
|
|
12
15
|
*/
|
|
13
|
-
const ISO_DATE_TIME = /^([+-]?\d{4,})-(\d{2})-(\d{2})(?:[T ](\d{2})
|
|
16
|
+
const ISO_DATE_TIME = /^(?:([+-]?\d{4,})-(\d{2})-(\d{2})|([+-]?\d{4})(\d{2})(\d{2}))(?:[T ](\d{2}):?(\d{2})(?::?(\d{2})(?:[.,](\d{1,9}))?)?)?(Z|[+-]\d{2}(?::?\d{2})?)?(?:\[([^\]]+)\])?$/i;
|
|
14
17
|
function parseOffsetSeconds(offset) {
|
|
15
18
|
if (offset.toUpperCase() === 'Z')
|
|
16
19
|
return 0;
|
|
@@ -18,16 +21,26 @@ function parseOffsetSeconds(offset) {
|
|
|
18
21
|
const digits = offset.slice(1).replace(':', '');
|
|
19
22
|
const hours = Number(digits.slice(0, 2));
|
|
20
23
|
const minutes = digits.length > 2 ? Number(digits.slice(2, 4)) : 0;
|
|
21
|
-
|
|
24
|
+
// v2.5.3 — `-00:00` is offset 0, not -0 (which `toEqual` tells apart
|
|
25
|
+
// from the driver's 0).
|
|
26
|
+
return sign * (hours * 3600 + minutes * 60) || 0;
|
|
22
27
|
}
|
|
23
28
|
/**
|
|
24
|
-
*
|
|
25
|
-
*
|
|
29
|
+
* Epoch milliseconds of a wall-clock time read as UTC. v2.5.3 — `Date.UTC`
|
|
30
|
+
* maps years 0–99 to 1900–1999, so the year is set with `setUTCFullYear`.
|
|
26
31
|
*/
|
|
27
|
-
function
|
|
32
|
+
function utcMs(year, month, day, hour, minute, second) {
|
|
33
|
+
const d = new Date(0);
|
|
34
|
+
d.setUTCFullYear(year, month - 1, day);
|
|
35
|
+
d.setUTCHours(hour, minute, second, 0);
|
|
36
|
+
return d.getTime();
|
|
37
|
+
}
|
|
38
|
+
/** Offset of `timeZone` at an instant, in whole seconds. */
|
|
39
|
+
function zoneOffsetAt(timeZone, instantMs) {
|
|
28
40
|
const fmt = new Intl.DateTimeFormat('en-US', {
|
|
29
41
|
timeZone,
|
|
30
42
|
hourCycle: 'h23',
|
|
43
|
+
era: 'short',
|
|
31
44
|
year: 'numeric',
|
|
32
45
|
month: '2-digit',
|
|
33
46
|
day: '2-digit',
|
|
@@ -35,16 +48,44 @@ function zoneOffsetSeconds(timeZone, wallClockAsUtcMs) {
|
|
|
35
48
|
minute: '2-digit',
|
|
36
49
|
second: '2-digit',
|
|
37
50
|
});
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
const
|
|
47
|
-
|
|
51
|
+
const p = {};
|
|
52
|
+
let bc = false;
|
|
53
|
+
for (const part of fmt.formatToParts(new Date(instantMs)))
|
|
54
|
+
if (part.type === 'era')
|
|
55
|
+
bc = part.value.toUpperCase().startsWith('B');
|
|
56
|
+
else if (part.type !== 'literal')
|
|
57
|
+
p[part.type] = Number(part.value);
|
|
58
|
+
// v2.5.3 — `Intl` writes year -1 as "2 BC".
|
|
59
|
+
const year = bc ? 1 - p.year : p.year;
|
|
60
|
+
const asUtc = utcMs(year, p.month, p.day, p.hour, p.minute, p.second);
|
|
61
|
+
return Math.round((asUtc - Math.floor(instantMs / 1000) * 1000) / 1000);
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* Resolve a wall-clock time in `timeZone` as Neo4j (java.time) does:
|
|
65
|
+
* - a valid wall time keeps its offset;
|
|
66
|
+
* - in a DST overlap the earlier offset (the larger one) wins;
|
|
67
|
+
* - in a DST gap the wall time moves later by the length of the gap.
|
|
68
|
+
*
|
|
69
|
+
* Returns the offset and the (possibly shifted) wall time as UTC ms.
|
|
70
|
+
* Pre-2.5.3 a gap time kept its non-existent wall clock and an overlap in
|
|
71
|
+
* a zone east of UTC took the later offset.
|
|
72
|
+
*/
|
|
73
|
+
function resolveZoned(timeZone, wallMs) {
|
|
74
|
+
const DAY = 86400000;
|
|
75
|
+
const first = zoneOffsetAt(timeZone, wallMs);
|
|
76
|
+
const candidates = new Set([
|
|
77
|
+
zoneOffsetAt(timeZone, wallMs - DAY),
|
|
78
|
+
zoneOffsetAt(timeZone, wallMs + DAY),
|
|
79
|
+
first,
|
|
80
|
+
zoneOffsetAt(timeZone, wallMs - first * 1000),
|
|
81
|
+
]);
|
|
82
|
+
const valid = [...candidates].filter((o) => zoneOffsetAt(timeZone, wallMs - o * 1000) === o);
|
|
83
|
+
if (valid.length > 0)
|
|
84
|
+
return { offsetSeconds: Math.max(...valid), wallMs };
|
|
85
|
+
// Gap: the instant uses the offset before the transition (the smaller).
|
|
86
|
+
const instant = wallMs - Math.min(...candidates) * 1000;
|
|
87
|
+
const offsetSeconds = zoneOffsetAt(timeZone, instant);
|
|
88
|
+
return { offsetSeconds, wallMs: instant + offsetSeconds * 1000 };
|
|
48
89
|
}
|
|
49
90
|
/**
|
|
50
91
|
* Factory for creating mock Neo4j Record objects for testing.
|
|
@@ -78,6 +119,11 @@ class Neo4jRecordFactory {
|
|
|
78
119
|
* A string with neither an offset nor a zone id is read as UTC, as Neo4j
|
|
79
120
|
* reads it with its default zone.
|
|
80
121
|
*
|
|
122
|
+
* With a zone id and no offset, the zone rules apply as in Neo4j
|
|
123
|
+
* (v2.5.3): a wall time inside a DST gap moves later by the gap, an
|
|
124
|
+
* ambiguous one takes the earlier offset, and historical (local mean
|
|
125
|
+
* time) offsets are honoured for any year.
|
|
126
|
+
*
|
|
81
127
|
* Before v2.4.8 the value was converted to UTC with the offset dropped
|
|
82
128
|
* and the fraction cut to milliseconds; before v2.5.0 an offset-less
|
|
83
129
|
* string was read in the machine's local zone.
|
|
@@ -88,19 +134,28 @@ class Neo4jRecordFactory {
|
|
|
88
134
|
// pre-v2.5.0 parse.
|
|
89
135
|
if (!m)
|
|
90
136
|
return Neo4jRecordFactory.legacyDateTime(isoString);
|
|
91
|
-
const [,
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
137
|
+
const [, ey, emo, ed, by, bmo, bd, h, mi, s, frac, offset, zoneId] = m;
|
|
138
|
+
let year = Number(ey ?? by);
|
|
139
|
+
let month = Number(emo ?? bmo);
|
|
140
|
+
let day = Number(ed ?? bd);
|
|
141
|
+
let hour = Number(h ?? 0);
|
|
142
|
+
let minute = Number(mi ?? 0);
|
|
143
|
+
let second = Number(s ?? 0);
|
|
98
144
|
const nanosecond = frac ? Number(frac.padEnd(9, '0')) : 0;
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
145
|
+
let offsetSeconds = 0;
|
|
146
|
+
if (offset !== undefined)
|
|
147
|
+
offsetSeconds = parseOffsetSeconds(offset);
|
|
148
|
+
else if (zoneId !== undefined) {
|
|
149
|
+
const resolved = resolveZoned(zoneId, utcMs(year, month, day, hour, minute, second));
|
|
150
|
+
offsetSeconds = resolved.offsetSeconds;
|
|
151
|
+
const w = new Date(resolved.wallMs);
|
|
152
|
+
year = w.getUTCFullYear();
|
|
153
|
+
month = w.getUTCMonth() + 1;
|
|
154
|
+
day = w.getUTCDate();
|
|
155
|
+
hour = w.getUTCHours();
|
|
156
|
+
minute = w.getUTCMinutes();
|
|
157
|
+
second = w.getUTCSeconds();
|
|
158
|
+
}
|
|
104
159
|
return new neo4j_driver_1.default.types.DateTime(year, month, day, hour, minute, second, nanosecond, offsetSeconds, zoneId);
|
|
105
160
|
}
|
|
106
161
|
/** The pre-v2.5.0 parse: through `Date`, in UTC, millisecond precision. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"neo4j-record-factory.js","sourceRoot":"","sources":["../../../src/testing/neo4j-record-factory.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqE;AAErE
|
|
1
|
+
{"version":3,"file":"neo4j-record-factory.js","sourceRoot":"","sources":["../../../src/testing/neo4j-record-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,15 @@ export declare function buildCypherFieldCall(statement: string, nodeVar: string,
|
|
|
20
20
|
* implementer's field selected through an inline fragment on an
|
|
21
21
|
* abstract type). Other rows still keep their row, with `null`.
|
|
22
22
|
*/
|
|
23
|
-
guardLabel?: string
|
|
23
|
+
guardLabel?: string,
|
|
24
|
+
/**
|
|
25
|
+
* v2.5.3 — name the reduced column with this (unique) alias instead of
|
|
26
|
+
* `columnName`. Pre-2.5.3 the CALL returned `AS <columnName>` and the
|
|
27
|
+
* caller renamed it in a following WITH, so a `columnName` equal to a
|
|
28
|
+
* variable already in scope (`n`, `score`, `__typename`) failed the
|
|
29
|
+
* query with "Variable already declared".
|
|
30
|
+
*/
|
|
31
|
+
outputAlias?: string): string;
|
|
24
32
|
/**
|
|
25
33
|
* Builds an inline `head(COLLECT { ... })` subquery expression for a
|
|
26
34
|
* `@cypher` scalar field. Used inside contexts where a CALL prelude cannot
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypher-field-projection.d.ts","sourceRoot":"","sources":["../../../src/utils/cypher-field-projection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAG1D;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM;AAClB;;;;GAIG;AACH,UAAU,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"cypher-field-projection.d.ts","sourceRoot":"","sources":["../../../src/utils/cypher-field-projection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAG1D;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM;AAClB;;;;GAIG;AACH,UAAU,CAAC,EAAE,MAAM;AACnB;;;;;;GAMG;AACH,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,CA0BR;AAQD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM;AACf;;;GAGG;AACH,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CAIR;AAkBD;;;;;;;;;;GAUG;AACH,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,GAChB,IAAI,CASN;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,gBAAgB;IAWzB,sEAAsE;IACtE,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,2DAA2D;IAC3D,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,4DAA4D;IAC5D,OAAO,CAAC,QAAQ,CAAC,cAAc;IAfjC;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6B;IACrD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;IAC1C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;;IAG7C,sEAAsE;IACrD,OAAO,EAAE,MAAM;IAChC,2DAA2D;IAC1C,YAAY,GAAE,aAAa,CAAC,MAAM,CAAM;IACzD,4DAA4D;IAC3C,cAAc,GAAE,MAAe;IAKlD;;;;;;OAMG;IACH,QAAQ,CACN,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,kBAAkB;IAC3B;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM;IA4CT,+CAA+C;IAC/C,MAAM,IAAI,OAAO;IAIjB,sEAAsE;IACtE,IAAI,IAAI,MAAM,EAAE;IAIhB,wDAAwD;IACxD,OAAO,IAAI,MAAM,EAAE;IAInB,0CAA0C;IAC1C,UAAU,IAAI,MAAM;CAGrB"}
|
|
@@ -27,23 +27,46 @@ function buildCypherFieldCall(statement, nodeVar, columnName,
|
|
|
27
27
|
* implementer's field selected through an inline fragment on an
|
|
28
28
|
* abstract type). Other rows still keep their row, with `null`.
|
|
29
29
|
*/
|
|
30
|
-
guardLabel
|
|
30
|
+
guardLabel,
|
|
31
|
+
/**
|
|
32
|
+
* v2.5.3 — name the reduced column with this (unique) alias instead of
|
|
33
|
+
* `columnName`. Pre-2.5.3 the CALL returned `AS <columnName>` and the
|
|
34
|
+
* caller renamed it in a following WITH, so a `columnName` equal to a
|
|
35
|
+
* variable already in scope (`n`, `score`, `__typename`) failed the
|
|
36
|
+
* query with "Variable already declared".
|
|
37
|
+
*/
|
|
38
|
+
outputAlias) {
|
|
31
39
|
const col = (0, validation_1.escapeIdentifier)(columnName);
|
|
40
|
+
if (outputAlias !== undefined)
|
|
41
|
+
(0, validation_1.assertSafeIdentifier)(outputAlias, '@cypher alias');
|
|
42
|
+
const out = outputAlias ?? col;
|
|
43
|
+
// v2.5.3 — a statement that returns a column named like the node
|
|
44
|
+
// variable (`RETURN this.rank AS n`) would redeclare it when the inner
|
|
45
|
+
// CALL hands its columns back. Rebind the node to a private name first
|
|
46
|
+
// (only then, so every other statement's Cypher is unchanged).
|
|
47
|
+
const shadows = mentionsIdentifier(statement, nodeVar);
|
|
48
|
+
const inner = shadows ? `${nodeVar}__cf_this` : nodeVar;
|
|
32
49
|
return [
|
|
33
50
|
`CALL {`,
|
|
34
51
|
` WITH ${nodeVar}`,
|
|
52
|
+
...(shadows ? [` WITH ${nodeVar} AS ${inner}`] : []),
|
|
35
53
|
...(guardLabel !== undefined
|
|
36
|
-
? [` WITH ${
|
|
54
|
+
? [` WITH ${inner} WHERE ${inner}:${(0, validation_1.escapeIdentifier)(guardLabel)}`]
|
|
37
55
|
: []),
|
|
38
56
|
` CALL {`,
|
|
39
|
-
` WITH ${
|
|
40
|
-
` WITH ${
|
|
57
|
+
` WITH ${inner}`,
|
|
58
|
+
` WITH ${inner} AS this`,
|
|
41
59
|
` ${statement}`,
|
|
42
60
|
` }`,
|
|
43
|
-
` RETURN head(collect(${col})) AS ${
|
|
61
|
+
` RETURN head(collect(${col})) AS ${out}`,
|
|
44
62
|
`}`,
|
|
45
63
|
].join('\n');
|
|
46
64
|
}
|
|
65
|
+
/** Whether `name` appears in `cypher` as a standalone identifier token. */
|
|
66
|
+
function mentionsIdentifier(cypher, name) {
|
|
67
|
+
const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
68
|
+
return new RegExp(`(?<![\\w.$])\`?${escaped}\`?(?![\\w])`).test(cypher);
|
|
69
|
+
}
|
|
47
70
|
/**
|
|
48
71
|
* Builds an inline `head(COLLECT { ... })` subquery expression for a
|
|
49
72
|
* `@cypher` scalar field. Used inside contexts where a CALL prelude cannot
|
|
@@ -73,7 +96,14 @@ fieldLabel) {
|
|
|
73
96
|
* Cypher's aggregating functions, as a call (`count(`, not the `COUNT {`
|
|
74
97
|
* subquery expression, which does not aggregate the enclosing query).
|
|
75
98
|
*/
|
|
76
|
-
const AGGREGATING_CALL =
|
|
99
|
+
const AGGREGATING_CALL = /(?<![\w.$`])(?:avg|collect|count|max|min|percentileCont|percentileDisc|stDev|stDevP|sum)\s*\(/i;
|
|
100
|
+
/**
|
|
101
|
+
* v2.5.3 — string literals and comments, blanked before the aggregation
|
|
102
|
+
* test: pre-2.5.3 `RETURN 'count(' + this.x AS c` was refused. A name
|
|
103
|
+
* qualified with `.` (`apoc.coll.max(`) is not an aggregating call either
|
|
104
|
+
* (see the lookbehind above).
|
|
105
|
+
*/
|
|
106
|
+
const LITERALS_AND_COMMENTS = /'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"|`[^`]*`|\/\/[^\n]*|\/\*[\s\S]*?\*\//g;
|
|
77
107
|
/**
|
|
78
108
|
* Refuse an aggregating `@cypher` statement where it would be projected
|
|
79
109
|
* inline (v2.4.8). Neo4j 5 rejects ANY aggregating subquery expression
|
|
@@ -86,7 +116,7 @@ const AGGREGATING_CALL = /\b(?:avg|collect|count|max|min|percentileCont|percenti
|
|
|
86
116
|
* CALL-prelude projection is unaffected and keeps working.
|
|
87
117
|
*/
|
|
88
118
|
function assertInlineableCypherField(fieldLabel, statement) {
|
|
89
|
-
if (!AGGREGATING_CALL.test(statement))
|
|
119
|
+
if (!AGGREGATING_CALL.test(statement.replace(LITERALS_AND_COMMENTS, "''")))
|
|
90
120
|
return;
|
|
91
121
|
throw new errors_1.OGMError(`@cypher field "${fieldLabel}" aggregates in its statement, so it can only be selected at the top level of a query. ` +
|
|
92
122
|
`Neo4j 5 rejects aggregating subqueries nested inside a projection ("Aggregation column contains implicit grouping expressions"), ` +
|
|
@@ -161,8 +191,8 @@ class CypherFieldScope {
|
|
|
161
191
|
(0, validation_1.assertSafeIdentifier)(alias, '@cypher alias');
|
|
162
192
|
const carry = [...this.preserveVars, ...this.carriedAliases];
|
|
163
193
|
const carryStr = carry.length ? `, ${carry.join(', ')}` : '';
|
|
164
|
-
this.callLines.push(buildCypherFieldCall(propDef.cypherStatement, this.nodeVar, columnName, guardLabel));
|
|
165
|
-
this.callLines.push(`WITH ${this.nodeVar}${carryStr}, ${
|
|
194
|
+
this.callLines.push(buildCypherFieldCall(propDef.cypherStatement, this.nodeVar, columnName, guardLabel, alias));
|
|
195
|
+
this.callLines.push(`WITH ${this.nodeVar}${carryStr}, ${alias}`);
|
|
166
196
|
this.carriedAliases.push(alias);
|
|
167
197
|
this.aliases.set(key, alias);
|
|
168
198
|
return alias;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypher-field-projection.js","sourceRoot":"","sources":["../../../src/utils/cypher-field-projection.ts"],"names":[],"mappings":";;;AAmBA,
|
|
1
|
+
{"version":3,"file":"cypher-field-projection.js","sourceRoot":"","sources":["../../../src/utils/cypher-field-projection.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,11 +6,13 @@ import type { PropertyDefinition } from '../schema/types';
|
|
|
6
6
|
* no rows sorts with `null` instead of vanishing, and one returning
|
|
7
7
|
* several rows sorts once.
|
|
8
8
|
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
9
|
+
* With `outputAlias` (v2.5.3) the column comes out under that unique
|
|
10
|
+
* alias (e.g. `__sort_<fieldName>`); the caller follows the CALL with its
|
|
11
|
+
* own `WITH` to carry it forward with any prior sort aliases.
|
|
12
12
|
*/
|
|
13
|
-
export declare function buildCypherSortProjection(statement: string, nodeVar: string, columnName: string
|
|
13
|
+
export declare function buildCypherSortProjection(statement: string, nodeVar: string, columnName: string,
|
|
14
|
+
/** v2.5.3 — see `buildCypherFieldCall`'s `outputAlias`. */
|
|
15
|
+
outputAlias?: string): string;
|
|
14
16
|
/**
|
|
15
17
|
* Compiles a `sort` array (mixed stored-field + `@cypher`-field entries)
|
|
16
18
|
* into the Cypher fragments needed before and after the `RETURN` clause.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypher-sort-projection.d.ts","sourceRoot":"","sources":["../../../src/utils/cypher-sort-projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAU1D;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"cypher-sort-projection.d.ts","sourceRoot":"","sources":["../../../src/utils/cypher-sort-projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAU1D;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM;AAClB,2DAA2D;AAC3D,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,CAQR;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,kBAAkB,GAAG,SAAS,CAAC;IAClE,YAAY,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACtC,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAmDnC;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAE5D"}
|