@ragestudio/scylla-odm 0.22.5 → 0.22.6
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/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryParser.d.ts","sourceRoot":"","sources":["../../src/utils/queryParser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"queryParser.d.ts","sourceRoot":"","sources":["../../src/utils/queryParser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AA2E9C,MAAM,CAAC,OAAO,UAAU,WAAW,CAClC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EACjB,KAAK,EAAE,GAAG,EACV,KAAK,GAAE,MAAU,OA6BjB;AAWD,wBAAgB,gBAAgB,CAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,SAAS,EAAE,MAAM,GACf,OAAO,CAYT;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEzD"}
|
package/utils/queryParser.js
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
import cassandra from "../driver";
|
|
1
|
+
import { mapping } from "../driver/mapping/index.js";
|
|
3
2
|
import isPlainObject from "./isPlainObject.js";
|
|
4
|
-
const { q } = cassandra.mapping;
|
|
5
3
|
const MAX_QUERY_DEPTH = 3;
|
|
6
4
|
const MAX_IN_ELEMENTS = 1000;
|
|
7
5
|
const VALID_OPERATORS = new Set([
|
|
@@ -27,7 +25,7 @@ function buildOperator(operator, opValue) {
|
|
|
27
25
|
return opValue;
|
|
28
26
|
case "$ne":
|
|
29
27
|
requireNotNull(opValue, "$ne");
|
|
30
|
-
return q.notEq(opValue);
|
|
28
|
+
return mapping.q.notEq(opValue);
|
|
31
29
|
case "$in":
|
|
32
30
|
if (!Array.isArray(opValue)) {
|
|
33
31
|
throw new Error("$in operator requires an array");
|
|
@@ -40,19 +38,19 @@ function buildOperator(operator, opValue) {
|
|
|
40
38
|
throw new Error(`$in array element at index ${i} cannot be null or undefined`);
|
|
41
39
|
}
|
|
42
40
|
}
|
|
43
|
-
return q.in_(opValue);
|
|
41
|
+
return mapping.q.in_(opValue);
|
|
44
42
|
case "$gt":
|
|
45
43
|
requireNotNull(opValue, "$gt");
|
|
46
|
-
return q.gt(opValue);
|
|
44
|
+
return mapping.q.gt(opValue);
|
|
47
45
|
case "$gte":
|
|
48
46
|
requireNotNull(opValue, "$gte");
|
|
49
|
-
return q.gte(opValue);
|
|
47
|
+
return mapping.q.gte(opValue);
|
|
50
48
|
case "$lt":
|
|
51
49
|
requireNotNull(opValue, "$lt");
|
|
52
|
-
return q.lt(opValue);
|
|
50
|
+
return mapping.q.lt(opValue);
|
|
53
51
|
case "$lte":
|
|
54
52
|
requireNotNull(opValue, "$lte");
|
|
55
|
-
return q.lte(opValue);
|
|
53
|
+
return mapping.q.lte(opValue);
|
|
56
54
|
}
|
|
57
55
|
}
|
|
58
56
|
export default function queryParser(model, query, depth = 0) {
|
|
@@ -82,7 +80,7 @@ function parseField(value) {
|
|
|
82
80
|
const compiledOps = operators.map((op) => buildOperator(op, value[op]));
|
|
83
81
|
return compiledOps.length === 1
|
|
84
82
|
? compiledOps[0]
|
|
85
|
-
: q.and(...compiledOps);
|
|
83
|
+
: mapping.q.and(...compiledOps);
|
|
86
84
|
}
|
|
87
85
|
export function isValidFieldName(fields, fieldName) {
|
|
88
86
|
const invalidPatterns = [
|
package/utils/queryParser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryParser.js","sourceRoot":"","sources":["../../src/utils/queryParser.ts"],"names":[],"mappings":"AAEA,
|
|
1
|
+
{"version":3,"file":"queryParser.js","sourceRoot":"","sources":["../../src/utils/queryParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeChecker.d.ts","sourceRoot":"","sources":["../../src/utils/typeChecker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"typeChecker.d.ts","sourceRoot":"","sources":["../../src/utils/typeChecker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAmF9C,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAoCzE"}
|
package/utils/typeChecker.js
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
import cassandra from "../driver";
|
|
3
|
-
const { types } = cassandra;
|
|
1
|
+
import { types } from "../driver/types/index.js";
|
|
4
2
|
import { isValidFieldName } from "./queryParser.js";
|
|
5
3
|
const stringTypes = new Set(["ascii", "text", "varchar", "inet"]);
|
|
6
4
|
const intTypes = new Set(["int", "smallint", "tinyint"]);
|
package/utils/typeChecker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeChecker.js","sourceRoot":"","sources":["../../src/utils/typeChecker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"typeChecker.js","sourceRoot":"","sources":["../../src/utils/typeChecker.ts"],"names":[],"mappings":"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"}
|