@based/schema 1.1.3 → 1.1.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/dist/set/fields/array.js +2 -2
- package/dist/set/fields/array.js.map +1 -1
- package/package.json +1 -1
- package/src/set/fields/array.ts +8 -2
- package/test/walker.ts +43 -37
package/dist/set/fields/array.js
CHANGED
|
@@ -49,12 +49,12 @@ const operations = {
|
|
|
49
49
|
collectOperation(args, collected, value);
|
|
50
50
|
},
|
|
51
51
|
$push: async (args, value) => {
|
|
52
|
-
const { collected, arr } = await parseArray(args, value.$push);
|
|
52
|
+
const { collected, arr } = await parseArray(args, value.$push.$value ?? value.$push);
|
|
53
53
|
value.$push = arr;
|
|
54
54
|
collectOperation(args, collected, value);
|
|
55
55
|
},
|
|
56
56
|
$unshift: async (args, value) => {
|
|
57
|
-
const { collected, arr } = await parseArray(args, value.$unshift);
|
|
57
|
+
const { collected, arr } = await parseArray(args, value.$unshift.$value ?? value.$unshift);
|
|
58
58
|
value.$unshift = arr;
|
|
59
59
|
collectOperation(args, collected, value);
|
|
60
60
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"array.js","sourceRoot":"","sources":["../../../src/set/fields/array.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"array.js","sourceRoot":"","sources":["../../../src/set/fields/array.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AACxC,uCAAwC;AAIxC,MAAM,gBAAgB,GAAG,CACvB,IAAwC,EACxC,SAAgB,EAChB,KAAU,EACV,EAAE;IACF,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACnB,IAAI,SAAS,CAAC,MAAM,EAAE;QACpB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAA;QACvC,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;YAC5B,OAAO,CAAC,IAAI,CAAC,CAAA;SACd;KACF;AACH,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,KAAK,EACtB,IAAwC,EACxC,KAAU,EACV,MAAc,CAAC,EACkD,EAAE;IACnE,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IACxD,MAAM,CAAC,GAAmB,EAAE,CAAA;IAC5B,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IACvC,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,QAAQ,CACzD,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAC7B,CAAA;IACD,MAAM,SAAS,GAAgC,EAAE,CAAA;IACjD,yBAAyB;IACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,CAAC,CAAC,IAAI,CACJ,IAAI,CAAC,KAAK,CAAC;YACT,GAAG,EAAE,CAAC,GAAG,GAAG;YACZ,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;YACnB,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM;YACpC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBACjB,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gBAC5C,aAAa;gBACb,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAA;gBACjB,IAAA,iBAAS,EAAC,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;gBAC9B,IAAI,aAAa,EAAE;oBACjB,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;iBACtB;YACH,CAAC;SACF,CAAC,CACH,CAAA;KACF;IACD,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACpB,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,CAAA;AAC3B,CAAC,CAAA;AAED,MAAM,UAAU,GAKZ;IACF,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;QAC7B,IAAI,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC1C,IAAI,CAAC,KAAK,CAAC,kBAAU,CAAC,eAAe,CAAC,CAAA;YACtC,OAAM;SACP;QACD,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,MAAM,UAAU,CACzC,IAAI,EACJ,KAAK,CAAC,OAAO,CAAC,MAAM,EACpB,KAAK,CAAC,OAAO,CAAC,IAAI,CACnB,CAAA;QACD,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,GAAG,CAAA;QAC1B,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;IAC1C,CAAC;IACD,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;QAC3B,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,MAAM,UAAU,CACzC,IAAI,EACJ,KAAK,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,KAAK,CAClC,CAAA;QACD,KAAK,CAAC,KAAK,GAAG,GAAG,CAAA;QACjB,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;IAC1C,CAAC;IACD,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;QAC9B,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,MAAM,UAAU,CACzC,IAAI,EACJ,KAAK,CAAC,QAAQ,CAAC,MAAM,IAAI,KAAK,CAAC,QAAQ,CACxC,CAAA;QACD,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAA;QACpB,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;IAC1C,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;QAC7B,IAAI,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC1C,IAAI,CAAC,KAAK,CAAC,kBAAU,CAAC,eAAe,CAAC,CAAA;YACtC,OAAM;SACP;QACD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACrB,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;QAC7B,IACE,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;YACjC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EACtC;YACA,IAAI,CAAC,KAAK,CAAC,kBAAU,CAAC,eAAe,CAAC,CAAA;YACtC,OAAM;SACP;QACD,MAAM,IAAI,CAAC,KAAK,CAAC;YACf,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;YACvB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM;YAC3B,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM;SACrC,CAAC,CAAA;IACJ,CAAC;CACF,CAAA;AAEM,MAAM,KAAK,GAAyB,KAAK,EAAE,IAAI,EAAE,EAAE;IACxD,IAAI,CAAC,IAAI,EAAE,CAAA;IACX,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE;QAClC,IAAI,CAAC,KAAK,CAAC,kBAAU,CAAC,eAAe,CAAC,CAAA;QACtC,OAAM;KACP;IACD,IAAI,KAAK,GAAG,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAA;IACnE,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,MAAM,CAAC,GAAmB,EAAE,CAAA;QAC5B,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;QAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACrC,CAAC,CAAC,IAAI,CACJ,IAAI,CAAC,KAAK,CAAC;gBACT,GAAG,EAAE,CAAC;gBACN,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;gBACpB,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM;aACrC,CAAC,CACH,CAAA;SACF;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QACpB,OAAM;KACP;IACD,IAAI,YAAY,GAAG,KAAK,CAAA;IACxB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;QACvB,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE;YACnB,IAAI,YAAY,EAAE;gBAChB,IAAI,CAAC,KAAK,CAAC,kBAAU,CAAC,4BAA4B,CAAC,CAAA;gBACnD,OAAM;aACP;YACD,MAAM,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;YAClC,YAAY,GAAG,IAAI,CAAA;SACpB;aAAM;YACL,IAAI,CAAC,KAAK,CAAC,kBAAU,CAAC,iBAAiB,CAAC,CAAA;SACzC;KACF;AACH,CAAC,CAAA;AAnCY,QAAA,KAAK,SAmCjB"}
|
package/package.json
CHANGED
package/src/set/fields/array.ts
CHANGED
|
@@ -72,12 +72,18 @@ const operations: {
|
|
|
72
72
|
collectOperation(args, collected, value)
|
|
73
73
|
},
|
|
74
74
|
$push: async (args, value) => {
|
|
75
|
-
const { collected, arr } = await parseArray(
|
|
75
|
+
const { collected, arr } = await parseArray(
|
|
76
|
+
args,
|
|
77
|
+
value.$push.$value ?? value.$push
|
|
78
|
+
)
|
|
76
79
|
value.$push = arr
|
|
77
80
|
collectOperation(args, collected, value)
|
|
78
81
|
},
|
|
79
82
|
$unshift: async (args, value) => {
|
|
80
|
-
const { collected, arr } = await parseArray(
|
|
83
|
+
const { collected, arr } = await parseArray(
|
|
84
|
+
args,
|
|
85
|
+
value.$unshift.$value ?? value.$unshift
|
|
86
|
+
)
|
|
81
87
|
value.$unshift = arr
|
|
82
88
|
collectOperation(args, collected, value)
|
|
83
89
|
},
|
package/test/walker.ts
CHANGED
|
@@ -946,26 +946,15 @@ test('string', async (t) => {
|
|
|
946
946
|
)
|
|
947
947
|
|
|
948
948
|
console.info('---- doink 40 array ------')
|
|
949
|
-
r = await setWalker(
|
|
950
|
-
|
|
951
|
-
{
|
|
952
|
-
$
|
|
953
|
-
|
|
954
|
-
$
|
|
955
|
-
$idx: 10,
|
|
956
|
-
$value: 1212,
|
|
957
|
-
},
|
|
949
|
+
r = await setWalker(schema, {
|
|
950
|
+
$id: 'bl120',
|
|
951
|
+
intarray: {
|
|
952
|
+
$insert: {
|
|
953
|
+
$idx: 10,
|
|
954
|
+
$value: 1212,
|
|
958
955
|
},
|
|
959
956
|
},
|
|
960
|
-
|
|
961
|
-
console.info('GO ASYNC', args.path, args.value, type)
|
|
962
|
-
if (args.value.type === 'thing') {
|
|
963
|
-
return 'ti' + Math.floor(Math.random() * 10000).toString(16)
|
|
964
|
-
} else {
|
|
965
|
-
return 'bl1221'
|
|
966
|
-
}
|
|
967
|
-
}
|
|
968
|
-
)
|
|
957
|
+
})
|
|
969
958
|
|
|
970
959
|
console.dir(r.errors)
|
|
971
960
|
console.dir(
|
|
@@ -974,31 +963,48 @@ test('string', async (t) => {
|
|
|
974
963
|
)
|
|
975
964
|
|
|
976
965
|
console.info('---- doink 41 record + array ------')
|
|
977
|
-
r = await setWalker(
|
|
978
|
-
|
|
979
|
-
{
|
|
980
|
-
|
|
981
|
-
|
|
982
|
-
|
|
983
|
-
|
|
984
|
-
$
|
|
985
|
-
$value: { flap: 100 },
|
|
986
|
-
$idx: 5,
|
|
987
|
-
},
|
|
966
|
+
r = await setWalker(schema, {
|
|
967
|
+
$id: 'bl120',
|
|
968
|
+
record: {
|
|
969
|
+
blabla: {
|
|
970
|
+
bla: {
|
|
971
|
+
$insert: {
|
|
972
|
+
$value: { flap: 100 },
|
|
973
|
+
$idx: 5,
|
|
988
974
|
},
|
|
989
975
|
},
|
|
990
976
|
},
|
|
991
977
|
},
|
|
992
|
-
|
|
993
|
-
|
|
994
|
-
|
|
995
|
-
|
|
996
|
-
|
|
997
|
-
|
|
998
|
-
|
|
999
|
-
|
|
978
|
+
})
|
|
979
|
+
|
|
980
|
+
console.dir(r.errors)
|
|
981
|
+
console.dir(
|
|
982
|
+
r.collected.map((v) => ({ path: v.path, value: v.value })),
|
|
983
|
+
{ depth: 10 }
|
|
984
|
+
)
|
|
985
|
+
|
|
986
|
+
console.info('---- doink 41 int unshift + array ------')
|
|
987
|
+
r = await setWalker(schema, {
|
|
988
|
+
$id: 'bl120',
|
|
989
|
+
intarray: {
|
|
990
|
+
$unshift: [-10, -20, -30],
|
|
991
|
+
},
|
|
992
|
+
})
|
|
993
|
+
|
|
994
|
+
console.dir(r.errors)
|
|
995
|
+
console.dir(
|
|
996
|
+
r.collected.map((v) => ({ path: v.path, value: v.value })),
|
|
997
|
+
{ depth: 10 }
|
|
1000
998
|
)
|
|
1001
999
|
|
|
1000
|
+
console.info('---- doink 42 int unshift + array ------')
|
|
1001
|
+
r = await setWalker(schema, {
|
|
1002
|
+
$id: 'bl120',
|
|
1003
|
+
intarray: {
|
|
1004
|
+
$unshift: { $value: [-10, -20, -30] },
|
|
1005
|
+
},
|
|
1006
|
+
})
|
|
1007
|
+
|
|
1002
1008
|
console.dir(r.errors)
|
|
1003
1009
|
console.dir(
|
|
1004
1010
|
r.collected.map((v) => ({ path: v.path, value: v.value })),
|