@based/schema 0.0.7 → 0.0.9

package/dist/set/checkDefaultAndValue.d.ts

@@ -0,0 +1,3 @@
+import { BasedSchemaFields } from '../types';
+import { Parser } from './types';
+export declare const parseValueAndDefault: Parser<keyof BasedSchemaFields>;

package/dist/set/checkDefaultAndValue.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseValueAndDefault = void 0;
+const error_1 = require("./error");
+const parsers_1 = __importDefault(require("./parsers"));
+const parseValueAndDefault = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
+    let handled = false;
+    if (typeof value === 'object') {
+        const typeDef = fieldSchema.type ?? ('enum' in fieldSchema ? 'enum' : '');
+        const parse = parsers_1.default[typeDef];
+        if (value.$value !== undefined) {
+            // TODO: for errors handle path a bit smarter...
+            parse(path, value.$value, fieldSchema, typeSchema, target, handlers, true);
+            handled = true;
+        }
+        if (value.$default !== undefined) {
+            if (value.$value !== undefined) {
+                (0, error_1.error)(path, error_1.ParseError.valueAndDefault);
+            }
+            parse(path, value.$default, fieldSchema, typeSchema, target, handlers, true);
+            handled = true;
+        }
+    }
+    if (handled && !noCollect) {
+        handlers.collect({ path, value, typeSchema, fieldSchema, target });
+    }
+    return handled;
+};
+exports.parseValueAndDefault = parseValueAndDefault;
+//# sourceMappingURL=checkDefaultAndValue.js.map

package/dist/set/checkDefaultAndValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkDefaultAndValue.js","sourceRoot":"","sources":["../../src/set/checkDefaultAndValue.ts"],"names":[],"mappings":";;;;;;AAEA,mCAA2C;AAC3C,wDAA+B;AAExB,MAAM,oBAAoB,GAAoC,KAAK,EACxE,IAAI,EACJ,KAAK,EACL,WAAW,EACX,UAAU,EACV,MAAM,EACN,QAAQ,EACR,SAAS,EACS,EAAE;IACpB,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QACzE,MAAM,KAAK,GAAG,iBAAO,CAAC,OAAO,CAAC,CAAA;QAC9B,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE;YAC9B,gDAAgD;YAChD,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;YAC1E,OAAO,GAAG,IAAI,CAAA;SACf;QACD,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE;YAChC,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC9B,IAAA,aAAK,EAAC,IAAI,EAAE,kBAAU,CAAC,eAAe,CAAC,CAAA;aACxC;YACD,KAAK,CACH,IAAI,EACJ,KAAK,CAAC,QAAQ,EACd,WAAW,EACX,UAAU,EACV,MAAM,EACN,QAAQ,EACR,IAAI,CACL,CAAA;YACD,OAAO,GAAG,IAAI,CAAA;SACf;KACF;IACD,IAAI,OAAO,IAAI,CAAC,SAAS,EAAE;QACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAA;KACnE;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAtCY,QAAA,oBAAoB,wBAsChC"}

package/dist/set/collections.js

@@ -30,12 +30,12 @@ const set = async (path, value, fieldSchema, typeSchema, target, handlers, noCol
     else {
         if (value.$add) {
             for (let i = 0; i < value.$add.length; i++) {
-                q.push((0, _1.fieldWalker)([...path, '$add', i], value.$add[i], fieldDef, typeSchema, target, handlers, true));
+                q.push((0, _1.fieldWalker)(path, value.$add[i], fieldDef, typeSchema, target, handlers, true));
             }
         }
         if (value.$delete) {
             for (let i = 0; i < value.$add.length; i++) {
-                q.push((0, _1.fieldWalker)([...path, '$delete', i], value.$delete[i], fieldDef, typeSchema, target, handlers, true));
+                q.push((0, _1.fieldWalker)(path, value.$delete[i], fieldDef, typeSchema, target, handlers, true));
             }
         }
         await Promise.all(q);
@@ -64,13 +64,28 @@ const object = async (path, value, fieldSchema, typeSchema, target, handlers, no
     await Promise.all(q);
 };
 exports.object = object;
+// unshift // only allow 1 command
 const array = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
-    const isArray = Array.isArray(value);
-    if (typeof value === 'object' && !isArray) {
+    // $value
+    let isArray = Array.isArray(value);
+    let parsedValue = value;
+    let opCount = 0;
+    let has$Value = false;
+    if (typeof parsedValue === 'object' && !isArray) {
+        if (value.$value) {
+            opCount++;
+            has$Value = true;
+            parsedValue = value.$value;
+            isArray = Array.isArray(parsedValue);
+        }
         if (value.$insert) {
+            opCount++;
+            if (opCount > 1) {
+                (0, error_1.error)(path, error_1.ParseError.multipleOperationsNotAllowed);
+            }
             if (typeof value.$insert !== 'object' ||
                 value.$insert.$idx === undefined) {
-                (0, error_1.error)([...path, '$insert'], error_1.ParseError.incorrectFormat);
+                (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
             }
             else {
                 const insert = Array.isArray(value.$insert.$value)
@@ -78,44 +93,102 @@ const array = async (path, value, fieldSchema, typeSchema, target, handlers, noC
                     : [value.$insert.$value];
                 const q = [];
                 for (let i = 0; i < insert.length; i++) {
-                    q.push((0, _1.fieldWalker)([...path, 'insert', i], insert[i], fieldSchema.values, typeSchema, target, handlers, true));
+                    q.push((0, _1.fieldWalker)(path, insert[i], fieldSchema.values, typeSchema, target, handlers, true));
                 }
                 await Promise.all(q);
             }
         }
-        if (value.$remove && value.$remove.$idx === undefined) {
-            (0, error_1.error)([...path, '$remove'], error_1.ParseError.incorrectFormat);
+        if (value.$remove) {
+            opCount++;
+            if (opCount > 1) {
+                (0, error_1.error)(path, error_1.ParseError.multipleOperationsNotAllowed);
+            }
+            if (value.$remove.$idx === undefined) {
+                (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+            }
         }
         if (value.$push) {
+            opCount++;
+            if (opCount > 1) {
+                (0, error_1.error)(path, error_1.ParseError.multipleOperationsNotAllowed);
+            }
             const q = [];
             const push = Array.isArray(value.$push) ? value.$push : [value.$push];
             for (let i = 0; i < push.length; i++) {
-                q.push((0, _1.fieldWalker)([...path, i], push[i], fieldSchema.values, typeSchema, target, handlers, true));
+                q.push((0, _1.fieldWalker)(path, push[i], fieldSchema.values, typeSchema, target, handlers, true));
             }
             await Promise.all(q);
+            parsedValue = { $push: push };
+        }
+        if (value.$unshift) {
+            opCount++;
+            if (opCount > 1) {
+                (0, error_1.error)(path, error_1.ParseError.multipleOperationsNotAllowed);
+            }
+            const q = [];
+            const unshift = Array.isArray(value.$unshift)
+                ? value.$unshift
+                : [value.$unshift];
+            for (let i = 0; i < unshift.length; i++) {
+                q.push((0, _1.fieldWalker)(path, unshift[i], fieldSchema.values, typeSchema, target, handlers, true));
+            }
+            await Promise.all(q);
+            parsedValue = { $unshift: unshift };
         }
         if (value.$assign) {
-            if (typeof value.$assign !== 'object' ||
-                value.$assign.$idx === undefined) {
-                (0, error_1.error)([...path, '$assign'], error_1.ParseError.incorrectFormat);
+            opCount++;
+            if (opCount > 1) {
+                (0, error_1.error)(path, error_1.ParseError.multipleOperationsNotAllowed);
             }
-            else {
-                await (0, _1.fieldWalker)([...path, '$assign', '$value'], value.$assign.$value, fieldSchema.values, typeSchema, target, handlers, true);
+            if (typeof value.$assign !== 'object' ||
+                typeof value.$assign.$idx !== 'number') {
+                (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
             }
+            await (0, _1.fieldWalker)([...path, value.$assign.$idx], value.$assign.$value, fieldSchema.values, typeSchema, target, handlers, noCollect);
+            return;
         }
-        if (!noCollect) {
-            handlers.collect({ path, value, typeSchema, fieldSchema, target });
+        if (!has$Value && !noCollect) {
+            handlers.collect({
+                path,
+                value: parsedValue,
+                typeSchema,
+                fieldSchema,
+                target,
+            });
+        }
+        if (!has$Value) {
+            return;
         }
-        return;
     }
     if (!isArray) {
         (0, error_1.error)(path, error_1.ParseError.incorrectFieldType);
     }
     const q = [];
-    for (let i = 0; i < value.length; i++) {
-        q.push((0, _1.fieldWalker)([...path, i], value[i], fieldSchema.values, typeSchema, target, handlers, noCollect));
+    const collector = [];
+    const nHandler = noCollect
+        ? handlers
+        : {
+            ...handlers,
+            collect: (collect) => {
+                collector.push(collect);
+            },
+        };
+    for (let i = 0; i < parsedValue.length; i++) {
+        q.push((0, _1.fieldWalker)([...path, i], parsedValue[i], fieldSchema.values, typeSchema, target, nHandler, noCollect));
     }
     await Promise.all(q);
+    if (!noCollect) {
+        handlers.collect({
+            path,
+            typeSchema,
+            fieldSchema,
+            target,
+            value: { $delete: true },
+        });
+        for (const c of collector) {
+            handlers.collect(c);
+        }
+    }
 };
 exports.array = array;
 const record = async (path, value, fieldSchema) => { };

package/dist/set/collections.js.map

@@ -1 +1 @@
-{"version":3,"file":"collections.js","sourceRoot":"","sources":["../../src/set/collections.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"collections.js","sourceRoot":"","sources":["../../src/set/collections.ts"],"names":[],"mappings":"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"}

package/dist/set/error.d.ts

@@ -5,6 +5,9 @@ export declare enum ParseError {
     'subceedsMinimum' = 3,
     'fieldDoesNotExist' = 4,
     'incorrectFormat' = 5,
-    'referenceIsIncorrectType' = 6
+    'referenceIsIncorrectType' = 6,
+    'valueAndDefault' = 7,
+    'defaultNotSupported' = 8,
+    'multipleOperationsNotAllowed' = 9
 }
 export declare const error: (path: (number | string)[], error: ParseError, type?: string) => never;

package/dist/set/error.js

@@ -10,6 +10,9 @@ var ParseError;
     ParseError[ParseError["fieldDoesNotExist"] = 4] = "fieldDoesNotExist";
     ParseError[ParseError["incorrectFormat"] = 5] = "incorrectFormat";
     ParseError[ParseError["referenceIsIncorrectType"] = 6] = "referenceIsIncorrectType";
+    ParseError[ParseError["valueAndDefault"] = 7] = "valueAndDefault";
+    ParseError[ParseError["defaultNotSupported"] = 8] = "defaultNotSupported";
+    ParseError[ParseError["multipleOperationsNotAllowed"] = 9] = "multipleOperationsNotAllowed";
 })(ParseError = exports.ParseError || (exports.ParseError = {}));
 const error = (path, error, type // nice to give as option
 ) => {

package/dist/set/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/set/error.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAQX;AARD,WAAY,UAAU;IACpB,uEAAoB,CAAA;IACpB,qEAAmB,CAAA;IACnB,+DAAgB,CAAA;IAChB,iEAAiB,CAAA;IACjB,qEAAmB,CAAA;IACnB,iEAAiB,CAAA;IACjB,mFAA0B,CAAA;AAC5B,CAAC,EARW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAQrB;AAEM,MAAM,KAAK,GAAG,CACnB,IAAyB,EACzB,KAAiB,EACjB,IAAa,CAAC,yBAAyB;EACvC,EAAE;IACF,MAAM,IAAI,KAAK,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;AACpE,CAAC,CAAA;AANY,QAAA,KAAK,SAMjB"}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/set/error.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAWX;AAXD,WAAY,UAAU;IACpB,uEAAoB,CAAA;IACpB,qEAAmB,CAAA;IACnB,+DAAgB,CAAA;IAChB,iEAAiB,CAAA;IACjB,qEAAmB,CAAA;IACnB,iEAAiB,CAAA;IACjB,mFAA0B,CAAA;IAC1B,iEAAiB,CAAA;IACjB,yEAAqB,CAAA;IACrB,2FAA8B,CAAA;AAChC,CAAC,EAXW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAWrB;AAEM,MAAM,KAAK,GAAG,CACnB,IAAyB,EACzB,KAAiB,EACjB,IAAa,CAAC,yBAAyB;EACvC,EAAE;IACF,MAAM,IAAI,KAAK,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;AACpE,CAAC,CAAA;AANY,QAAA,KAAK,SAMjB"}

package/dist/set/number.js

@@ -6,6 +6,15 @@ const validate = (path, value, fieldSchema) => {
     if (typeof value !== 'number') {
         (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
     }
+    if (fieldSchema.type === 'integer' && value - Math.floor(value) !== 0) {
+        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+    }
+    if (fieldSchema.multipleOf &&
+        value / fieldSchema.multipleOf -
+            Math.floor(value / fieldSchema.multipleOf) !==
+            0) {
+        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+    }
     if (fieldSchema.maximum) {
         if (fieldSchema.exclusiveMaximum && value > value) {
             (0, error_1.error)(path, error_1.ParseError.exceedsMaximum);
@@ -32,8 +41,14 @@ const shared = (path, value, fieldSchema) => {
         if (value.$decrement) {
             validate([...path, '$decrement'], value.$decrement, fieldSchema);
         }
-        if (value.$value) {
-            validate([...path], value.$value, fieldSchema);
+        if (value.$value !== undefined) {
+            validate(path, value.$value, fieldSchema);
+        }
+        if (value.$default !== undefined) {
+            if (value.$value !== undefined) {
+                (0, error_1.error)(path, error_1.ParseError.valueAndDefault);
+            }
+            validate(path, value.$default, fieldSchema);
         }
     }
     else {
@@ -50,7 +65,7 @@ const timestamp = async (path, value, fieldSchema, typeSchema, target, handlers,
             const d = new Date(value);
             value = d.valueOf();
             if (isNaN(value)) {
-                throw (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+                (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
             }
         }
     }
@@ -80,9 +95,6 @@ const number = async (path, value, fieldSchema, typeSchema, target, handlers, no
 };
 exports.number = number;
 const integer = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
-    if (typeof value === 'number' && value - Math.floor(value) !== 0) {
-        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
-    }
     const parsedValue = shared(path, value, fieldSchema);
     if (!noCollect) {
         handlers.collect({

package/dist/set/number.js.map

@@ -1 +1 @@
-{"version":3,"file":"number.js","sourceRoot":"","sources":["../../src/set/number.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"number.js","sourceRoot":"","sources":["../../src/set/number.ts"],"names":[],"mappings":"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"}

package/dist/set/parseDefaultAndValue.d.ts

@@ -0,0 +1,3 @@
+import { BasedSchemaFields } from '../types';
+import { Parser } from './types';
+export declare const parseValueAndDefault: Parser<keyof BasedSchemaFields>;

package/dist/set/parseDefaultAndValue.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseValueAndDefault = void 0;
+const error_1 = require("./error");
+const parsers_1 = __importDefault(require("./parsers"));
+const parseValueAndDefault = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
+    let handled = false;
+    if (typeof value === 'object') {
+        const typeDef = fieldSchema.type ?? ('enum' in fieldSchema ? 'enum' : '');
+        const parse = parsers_1.default[typeDef];
+        if (value.$value !== undefined) {
+            // TODO: for errors handle path a bit smarter...
+            parse(path, value.$value, fieldSchema, typeSchema, target, handlers, true);
+            handled = true;
+        }
+        if (value.$default !== undefined) {
+            if (value.$value !== undefined) {
+                (0, error_1.error)(path, error_1.ParseError.valueAndDefault);
+            }
+            parse(path, value.$default, fieldSchema, typeSchema, target, handlers, true);
+            handled = true;
+        }
+    }
+    if (handled && !noCollect) {
+        handlers.collect({ path, value, typeSchema, fieldSchema, target });
+    }
+    return handled;
+};
+exports.parseValueAndDefault = parseValueAndDefault;
+//# sourceMappingURL=parseDefaultAndValue.js.map

package/dist/set/parseDefaultAndValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseDefaultAndValue.js","sourceRoot":"","sources":["../../src/set/parseDefaultAndValue.ts"],"names":[],"mappings":";;;;;;AAEA,mCAA2C;AAC3C,wDAA+B;AAExB,MAAM,oBAAoB,GAAoC,KAAK,EACxE,IAAI,EACJ,KAAK,EACL,WAAW,EACX,UAAU,EACV,MAAM,EACN,QAAQ,EACR,SAAS,EACS,EAAE;IACpB,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QACzE,MAAM,KAAK,GAAG,iBAAO,CAAC,OAAO,CAAC,CAAA;QAC9B,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE;YAC9B,gDAAgD;YAChD,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;YAC1E,OAAO,GAAG,IAAI,CAAA;SACf;QACD,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE;YAChC,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC9B,IAAA,aAAK,EAAC,IAAI,EAAE,kBAAU,CAAC,eAAe,CAAC,CAAA;aACxC;YACD,KAAK,CACH,IAAI,EACJ,KAAK,CAAC,QAAQ,EACd,WAAW,EACX,UAAU,EACV,MAAM,EACN,QAAQ,EACR,IAAI,CACL,CAAA;YACD,OAAO,GAAG,IAAI,CAAA;SACf;KACF;IACD,IAAI,OAAO,IAAI,CAAC,SAAS,EAAE;QACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAA;KACnE;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAtCY,QAAA,oBAAoB,wBAsChC"}

package/dist/set/rest.js

@@ -4,17 +4,31 @@ exports.json = exports.enumParser = exports.boolean = exports.cardinality = void
 const utils_1 = require("@saulx/utils");
 const hash_1 = require("@saulx/hash");
 const error_1 = require("./error");
-const cardinality = async (path, value, fieldSchema, typeSchema, target, handlers) => {
+const parseDefaultAndValue_1 = require("./parseDefaultAndValue");
+const cardinality = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
     if (value && typeof value === 'object') {
-        value = (0, hash_1.hashObjectIgnoreKeyOrder)(value).toString(16);
+        if (value.$default !== undefined) {
+            (0, error_1.error)(path, error_1.ParseError.defaultNotSupported);
+        }
+        if (value.$value !== undefined) {
+            value = (0, hash_1.hashObjectIgnoreKeyOrder)(value.$value).toString(16);
+        }
+        else {
+            value = (0, hash_1.hashObjectIgnoreKeyOrder)(value).toString(16);
+        }
     }
     else {
         value = (0, hash_1.hash)(value).toString(16);
     }
-    handlers.collect({ path, value, typeSchema, fieldSchema, target });
+    if (!noCollect) {
+        handlers.collect({ path, value, typeSchema, fieldSchema, target });
+    }
 };
 exports.cardinality = cardinality;
 const boolean = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
+    if (await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, value, fieldSchema, typeSchema, target, handlers, noCollect)) {
+        return;
+    }
     if (typeof value !== 'boolean') {
         (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
     }
@@ -25,18 +39,23 @@ const boolean = async (path, value, fieldSchema, typeSchema, target, handlers, n
 exports.boolean = boolean;
 const enumParser = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
     const enumValues = fieldSchema.enum;
-    for (let i = 0; i < enumValues.length; i++) {
-        if ((0, utils_1.deepEqual)(enumValues[i], value)) {
-            if (!noCollect) {
-                handlers.collect({ path, value: i, typeSchema, fieldSchema, target });
+    if (!(await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, value, fieldSchema, typeSchema, target, handlers, noCollect))) {
+        for (let i = 0; i < enumValues.length; i++) {
+            if ((0, utils_1.deepEqual)(enumValues[i], value)) {
+                if (!noCollect) {
+                    handlers.collect({ path, value: i, typeSchema, fieldSchema, target });
+                }
+                return;
             }
-            return;
         }
+        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
     }
-    (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
 };
 exports.enumParser = enumParser;
 const json = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
+    if (await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, value, fieldSchema, typeSchema, target, handlers, noCollect)) {
+        return;
+    }
     try {
         const parsedValue = JSON.stringify(value);
         if (!noCollect) {
@@ -50,7 +69,7 @@ const json = async (path, value, fieldSchema, typeSchema, target, handlers, noCo
         }
     }
     catch (err) {
-        throw err(path, error_1.ParseError.incorrectFormat);
+        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
     }
 };
 exports.json = json;

package/dist/set/rest.js.map

@@ -1 +1 @@
-{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../src/set/rest.ts"],"names":[],"mappings":";;;AACA,wCAAwC;AACxC,sCAA4D;AAC5D,mCAA2C;AAEpC,MAAM,WAAW,GAA0B,KAAK,EACrD,IAAI,EACJ,KAAK,EACL,WAAW,EACX,UAAU,EACV,MAAM,EACN,QAAQ,EACR,EAAE;IACF,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACtC,KAAK,GAAG,IAAA,+BAAwB,EAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;KACrD;SAAM;QACL,KAAK,GAAG,IAAA,WAAI,EAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;KACjC;IACD,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAA;AACpE,CAAC,CAAA;AAdY,QAAA,WAAW,eAcvB;AAEM,MAAM,OAAO,GAAsB,KAAK,EAC7C,IAAI,EACJ,KAAK,EACL,WAAW,EACX,UAAU,EACV,MAAM,EACN,QAAQ,EACR,SAAS,EACT,EAAE;IACF,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE;QAC9B,IAAA,aAAK,EAAC,IAAI,EAAE,kBAAU,CAAC,eAAe,CAAC,CAAA;KACxC;IACD,IAAI,CAAC,SAAS,EAAE;QACd,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAA;KACnE;AACH,CAAC,CAAA;AAfY,QAAA,OAAO,WAenB;AAEM,MAAM,UAAU,GAAmB,KAAK,EAC7C,IAAI,EACJ,KAAK,EACL,WAAW,EACX,UAAU,EACV,MAAM,EACN,QAAQ,EACR,SAAS,EACT,EAAE;IACF,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CAAA;IACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC1C,IAAI,IAAA,iBAAS,EAAC,UAAU,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE;YACnC,IAAI,CAAC,SAAS,EAAE;gBACd,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAA;aACtE;YACD,OAAM;SACP;KACF;IACD,IAAA,aAAK,EAAC,IAAI,EAAE,kBAAU,CAAC,eAAe,CAAC,CAAA;AACzC,CAAC,CAAA;AAnBY,QAAA,UAAU,cAmBtB;AAEM,MAAM,IAAI,GAAmB,KAAK,EACvC,IAAI,EACJ,KAAK,EACL,WAAW,EACX,UAAU,EACV,MAAM,EACN,QAAQ,EACR,SAAS,EACT,EAAE;IACF,IAAI;QACF,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QACzC,IAAI,CAAC,SAAS,EAAE;YACd,QAAQ,CAAC,OAAO,CAAC;gBACf,IAAI;gBACJ,KAAK,EAAE,WAAW;gBAClB,UAAU;gBACV,WAAW;gBACX,MAAM;aACP,CAAC,CAAA;SACH;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,GAAG,CAAC,IAAI,EAAE,kBAAU,CAAC,eAAe,CAAC,CAAA;KAC5C;AACH,CAAC,CAAA;AAvBY,QAAA,IAAI,QAuBhB"}
+{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../src/set/rest.ts"],"names":[],"mappings":"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"}

package/dist/set/string.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.text = exports.string = void 0;
 const error_1 = require("./error");
 const validator_1 = __importDefault(require("validator"));
+const parseDefaultAndValue_1 = require("./parseDefaultAndValue");
 const formatPatterns = {
     email: validator_1.default.isEmail,
     URL: validator_1.default.isURL,
@@ -90,6 +91,9 @@ const validate = (path, value, fieldSchema) => {
     }
 };
 const string = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
+    if (await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, value, fieldSchema, typeSchema, target, handlers, noCollect)) {
+        return;
+    }
     validate(path, value, fieldSchema);
     if (!noCollect) {
         handlers.collect({ path, value, typeSchema, fieldSchema, target });
@@ -114,14 +118,16 @@ const text = async (path, value, fieldSchema, typeSchema, target, handlers, noCo
     if (valueType !== 'object') {
         (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
     }
+    if (target.$language &&
+        (await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, value, fieldSchema, typeSchema, target, handlers, noCollect))) {
+        return;
+    }
     for (const key in value) {
         const newPath = [...path, key];
         if (typeof value[key] === 'object') {
             if (value[key].$value) {
                 (0, exports.text)([...path, key, '$value'], value[key].$value, fieldSchema, typeSchema, target, handlers, true);
             }
-            // if (value[key].$default) {
-            // }
             if (!noCollect) {
                 handlers.collect({
                     path: newPath,
@@ -133,7 +139,8 @@ const text = async (path, value, fieldSchema, typeSchema, target, handlers, noCo
             }
             continue;
         }
-        validate(newPath, value[key], fieldSchema);
+        // if
+        // validate(newPath, value[key], fieldSchema)
         if (!noCollect) {
             handlers.collect({
                 path: newPath,

package/dist/set/string.js.map

@@ -1 +1 @@
-{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/set/string.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/set/string.ts"],"names":[],"mappings":"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"}

package/dist/set/types.d.ts

@@ -1,5 +1,5 @@
 import { BasedSchemaType, BasedSetHandlers, BasedSetTarget, BasedSchemaFields } from '../types';
-export type Parser<K extends keyof BasedSchemaFields> = (path: (string | number)[], value: any, fieldSchema: BasedSchemaFields[K], typeSchema: BasedSchemaType, target: BasedSetTarget, handlers: BasedSetHandlers, noCollect?: boolean) => Promise<void>;
+export type Parser<K extends keyof BasedSchemaFields> = (path: (string | number)[], value: any, fieldSchema: BasedSchemaFields[K], typeSchema: BasedSchemaType, target: BasedSetTarget, handlers: BasedSetHandlers, noCollect?: boolean) => Promise<void | boolean>;
 export type Parsers = {
     [Key in keyof BasedSchemaFields]: Parser<Key>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/schema",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "license": "MIT",
   "main": "dist/index.js",
   "scripts": {

package/src/set/collections.ts

@@ -40,7 +40,7 @@ export const set: Parser<'set'> = async (
       for (let i = 0; i < value.$add.length; i++) {
         q.push(
           fieldWalker(
-            [...path, '$add', i],
+            path,
             value.$add[i],
             fieldDef,
             typeSchema,
@@ -55,7 +55,7 @@ export const set: Parser<'set'> = async (
       for (let i = 0; i < value.$add.length; i++) {
         q.push(
           fieldWalker(
-            [...path, '$delete', i],
+            path,
             value.$delete[i],
             fieldDef,
             typeSchema,
@@ -110,6 +110,7 @@ export const object: Parser<'object'> = async (
   await Promise.all(q)
 }
 
+// unshift // only allow 1 command
 export const array: Parser<'array'> = async (
   path,
   value,
@@ -119,14 +120,30 @@ export const array: Parser<'array'> = async (
   handlers,
   noCollect
 ) => {
-  const isArray = Array.isArray(value)
-  if (typeof value === 'object' && !isArray) {
+  // $value
+
+  let isArray = Array.isArray(value)
+  let parsedValue = value
+  let opCount = 0
+  let has$Value = false
+
+  if (typeof parsedValue === 'object' && !isArray) {
+    if (value.$value) {
+      opCount++
+      has$Value = true
+      parsedValue = value.$value
+      isArray = Array.isArray(parsedValue)
+    }
     if (value.$insert) {
+      opCount++
+      if (opCount > 1) {
+        error(path, ParseError.multipleOperationsNotAllowed)
+      }
       if (
         typeof value.$insert !== 'object' ||
         value.$insert.$idx === undefined
       ) {
-        error([...path, '$insert'], ParseError.incorrectFormat)
+        error(path, ParseError.incorrectFormat)
       } else {
         const insert = Array.isArray(value.$insert.$value)
           ? value.$insert.$value
@@ -135,7 +152,7 @@ export const array: Parser<'array'> = async (
         for (let i = 0; i < insert.length; i++) {
           q.push(
             fieldWalker(
-              [...path, 'insert', i],
+              path,
               insert[i],
               fieldSchema.values,
               typeSchema,
@@ -148,16 +165,27 @@ export const array: Parser<'array'> = async (
         await Promise.all(q)
       }
     }
-    if (value.$remove && value.$remove.$idx === undefined) {
-      error([...path, '$remove'], ParseError.incorrectFormat)
+    if (value.$remove) {
+      opCount++
+      if (opCount > 1) {
+        error(path, ParseError.multipleOperationsNotAllowed)
+      }
+      if (value.$remove.$idx === undefined) {
+        error(path, ParseError.incorrectFormat)
+      }
     }
     if (value.$push) {
+      opCount++
+      if (opCount > 1) {
+        error(path, ParseError.multipleOperationsNotAllowed)
+      }
+
       const q: Promise<void>[] = []
       const push = Array.isArray(value.$push) ? value.$push : [value.$push]
       for (let i = 0; i < push.length; i++) {
         q.push(
           fieldWalker(
-            [...path, i],
+            path,
             push[i],
             fieldSchema.values,
             typeSchema,
@@ -168,48 +196,108 @@ export const array: Parser<'array'> = async (
         )
       }
       await Promise.all(q)
+      parsedValue = { $push: push }
+    }
+    if (value.$unshift) {
+      opCount++
+      if (opCount > 1) {
+        error(path, ParseError.multipleOperationsNotAllowed)
+      }
+      const q: Promise<void>[] = []
+      const unshift = Array.isArray(value.$unshift)
+        ? value.$unshift
+        : [value.$unshift]
+      for (let i = 0; i < unshift.length; i++) {
+        q.push(
+          fieldWalker(
+            path,
+            unshift[i],
+            fieldSchema.values,
+            typeSchema,
+            target,
+            handlers,
+            true
+          )
+        )
+      }
+      await Promise.all(q)
+      parsedValue = { $unshift: unshift }
     }
     if (value.$assign) {
+      opCount++
+      if (opCount > 1) {
+        error(path, ParseError.multipleOperationsNotAllowed)
+      }
       if (
         typeof value.$assign !== 'object' ||
-        value.$assign.$idx === undefined
+        typeof value.$assign.$idx !== 'number'
       ) {
-        error([...path, '$assign'], ParseError.incorrectFormat)
-      } else {
-        await fieldWalker(
-          [...path, '$assign', '$value'],
-          value.$assign.$value,
-          fieldSchema.values,
-          typeSchema,
-          target,
-          handlers,
-          true
-        )
+        error(path, ParseError.incorrectFormat)
       }
+      await fieldWalker(
+        [...path, value.$assign.$idx],
+        value.$assign.$value,
+        fieldSchema.values,
+        typeSchema,
+        target,
+        handlers,
+        noCollect
+      )
+      return
     }
-    if (!noCollect) {
-      handlers.collect({ path, value, typeSchema, fieldSchema, target })
+    if (!has$Value && !noCollect) {
+      handlers.collect({
+        path,
+        value: parsedValue,
+        typeSchema,
+        fieldSchema,
+        target,
+      })
+    }
+    if (!has$Value) {
+      return
     }
-    return
   }
   if (!isArray) {
     error(path, ParseError.incorrectFieldType)
   }
   const q: Promise<void>[] = []
-  for (let i = 0; i < value.length; i++) {
+  const collector: any[] = []
+  const nHandler = noCollect
+    ? handlers
+    : {
+        ...handlers,
+        collect: (collect) => {
+          collector.push(collect)
+        },
+      }
+  for (let i = 0; i < parsedValue.length; i++) {
     q.push(
       fieldWalker(
         [...path, i],
-        value[i],
+        parsedValue[i],
         fieldSchema.values,
         typeSchema,
         target,
-        handlers,
+        nHandler,
         noCollect
       )
     )
   }
   await Promise.all(q)
+
+  if (!noCollect) {
+    handlers.collect({
+      path,
+      typeSchema,
+      fieldSchema,
+      target,
+      value: { $delete: true },
+    })
+    for (const c of collector) {
+      handlers.collect(c)
+    }
+  }
 }
 
 export const record: Parser<'record'> = async (path, value, fieldSchema) => {}

package/src/set/error.ts

@@ -6,6 +6,9 @@ export enum ParseError {
   'fieldDoesNotExist',
   'incorrectFormat',
   'referenceIsIncorrectType',
+  'valueAndDefault',
+  'defaultNotSupported',
+  'multipleOperationsNotAllowed',
 }
 
 export const error = (

package/src/set/number.ts

@@ -17,6 +17,17 @@ const validate = (
   if (typeof value !== 'number') {
     error(path, ParseError.incorrectFormat)
   }
+  if (fieldSchema.type === 'integer' && value - Math.floor(value) !== 0) {
+    error(path, ParseError.incorrectFormat)
+  }
+  if (
+    fieldSchema.multipleOf &&
+    value / fieldSchema.multipleOf -
+      Math.floor(value / fieldSchema.multipleOf) !==
+      0
+  ) {
+    error(path, ParseError.incorrectFormat)
+  }
   if (fieldSchema.maximum) {
     if (fieldSchema.exclusiveMaximum && value > value) {
       error(path, ParseError.exceedsMaximum)
@@ -49,8 +60,14 @@ const shared = (
     if (value.$decrement) {
       validate([...path, '$decrement'], value.$decrement, fieldSchema)
     }
-    if (value.$value) {
-      validate([...path], value.$value, fieldSchema)
+    if (value.$value !== undefined) {
+      validate(path, value.$value, fieldSchema)
+    }
+    if (value.$default !== undefined) {
+      if (value.$value !== undefined) {
+        error(path, ParseError.valueAndDefault)
+      }
+      validate(path, value.$default, fieldSchema)
     }
   } else {
     validate(path, value, fieldSchema)
@@ -74,7 +91,7 @@ export const timestamp: Parser<'timestamp'> = async (
       const d = new Date(value)
       value = d.valueOf()
       if (isNaN(value)) {
-        throw error(path, ParseError.incorrectFormat)
+        error(path, ParseError.incorrectFormat)
       }
     }
   }
@@ -120,9 +137,6 @@ export const integer: Parser<'integer'> = async (
   handlers,
   noCollect
 ) => {
-  if (typeof value === 'number' && value - Math.floor(value) !== 0) {
-    error(path, ParseError.incorrectFormat)
-  }
   const parsedValue = shared(path, value, fieldSchema)
   if (!noCollect) {
     handlers.collect({

package/src/set/parseDefaultAndValue.ts

@@ -0,0 +1,44 @@
+import { BasedSchemaFields } from '../types'
+import { Parser } from './types'
+import { error, ParseError } from './error'
+import parsers from './parsers'
+
+export const parseValueAndDefault: Parser<keyof BasedSchemaFields> = async (
+  path,
+  value,
+  fieldSchema,
+  typeSchema,
+  target,
+  handlers,
+  noCollect
+): Promise<boolean> => {
+  let handled = false
+  if (typeof value === 'object') {
+    const typeDef = fieldSchema.type ?? ('enum' in fieldSchema ? 'enum' : '')
+    const parse = parsers[typeDef]
+    if (value.$value !== undefined) {
+      // TODO: for errors handle path a bit smarter...
+      parse(path, value.$value, fieldSchema, typeSchema, target, handlers, true)
+      handled = true
+    }
+    if (value.$default !== undefined) {
+      if (value.$value !== undefined) {
+        error(path, ParseError.valueAndDefault)
+      }
+      parse(
+        path,
+        value.$default,
+        fieldSchema,
+        typeSchema,
+        target,
+        handlers,
+        true
+      )
+      handled = true
+    }
+  }
+  if (handled && !noCollect) {
+    handlers.collect({ path, value, typeSchema, fieldSchema, target })
+  }
+  return handled
+}

package/src/set/rest.ts

@@ -2,6 +2,7 @@ import { Parser } from './types'
 import { deepEqual } from '@saulx/utils'
 import { hashObjectIgnoreKeyOrder, hash } from '@saulx/hash'
 import { error, ParseError } from './error'
+import { parseValueAndDefault } from './parseDefaultAndValue'
 
 export const cardinality: Parser<'cardinality'> = async (
   path,
@@ -9,14 +10,24 @@ export const cardinality: Parser<'cardinality'> = async (
   fieldSchema,
   typeSchema,
   target,
-  handlers
+  handlers,
+  noCollect
 ) => {
   if (value && typeof value === 'object') {
-    value = hashObjectIgnoreKeyOrder(value).toString(16)
+    if (value.$default !== undefined) {
+      error(path, ParseError.defaultNotSupported)
+    }
+    if (value.$value !== undefined) {
+      value = hashObjectIgnoreKeyOrder(value.$value).toString(16)
+    } else {
+      value = hashObjectIgnoreKeyOrder(value).toString(16)
+    }
   } else {
     value = hash(value).toString(16)
   }
-  handlers.collect({ path, value, typeSchema, fieldSchema, target })
+  if (!noCollect) {
+    handlers.collect({ path, value, typeSchema, fieldSchema, target })
+  }
 }
 
 export const boolean: Parser<'boolean'> = async (
@@ -28,9 +39,24 @@ export const boolean: Parser<'boolean'> = async (
   handlers,
   noCollect
 ) => {
+  if (
+    await parseValueAndDefault(
+      path,
+      value,
+      fieldSchema,
+      typeSchema,
+      target,
+      handlers,
+      noCollect
+    )
+  ) {
+    return
+  }
+
   if (typeof value !== 'boolean') {
     error(path, ParseError.incorrectFormat)
   }
+
   if (!noCollect) {
     handlers.collect({ path, value, typeSchema, fieldSchema, target })
   }
@@ -46,15 +72,27 @@ export const enumParser: Parser<'enum'> = async (
   noCollect
 ) => {
   const enumValues = fieldSchema.enum
-  for (let i = 0; i < enumValues.length; i++) {
-    if (deepEqual(enumValues[i], value)) {
-      if (!noCollect) {
-        handlers.collect({ path, value: i, typeSchema, fieldSchema, target })
+  if (
+    !(await parseValueAndDefault(
+      path,
+      value,
+      fieldSchema,
+      typeSchema,
+      target,
+      handlers,
+      noCollect
+    ))
+  ) {
+    for (let i = 0; i < enumValues.length; i++) {
+      if (deepEqual(enumValues[i], value)) {
+        if (!noCollect) {
+          handlers.collect({ path, value: i, typeSchema, fieldSchema, target })
+        }
+        return
       }
-      return
     }
+    error(path, ParseError.incorrectFormat)
   }
-  error(path, ParseError.incorrectFormat)
 }
 
 export const json: Parser<'json'> = async (
@@ -66,6 +104,20 @@ export const json: Parser<'json'> = async (
   handlers,
   noCollect
 ) => {
+  if (
+    await parseValueAndDefault(
+      path,
+      value,
+      fieldSchema,
+      typeSchema,
+      target,
+      handlers,
+      noCollect
+    )
+  ) {
+    return
+  }
+
   try {
     const parsedValue = JSON.stringify(value)
     if (!noCollect) {
@@ -78,6 +130,6 @@ export const json: Parser<'json'> = async (
       })
     }
   } catch (err) {
-    throw err(path, ParseError.incorrectFormat)
+    error(path, ParseError.incorrectFormat)
   }
 }

package/src/set/string.ts

@@ -2,6 +2,7 @@ import { Parser } from './types'
 import { error, ParseError } from './error'
 import { BasedSchemaFieldString, BasedSchemaFieldText } from '../types'
 import validators from 'validator'
+import { parseValueAndDefault } from './parseDefaultAndValue'
 
 const formatPatterns: Record<
   BasedSchemaFieldString['format'],
@@ -104,6 +105,19 @@ export const string: Parser<'string'> = async (
   handlers,
   noCollect
 ) => {
+  if (
+    await parseValueAndDefault(
+      path,
+      value,
+      fieldSchema,
+      typeSchema,
+      target,
+      handlers,
+      noCollect
+    )
+  ) {
+    return
+  }
   validate(path, value, fieldSchema)
   if (!noCollect) {
     handlers.collect({ path, value, typeSchema, fieldSchema, target })
@@ -138,6 +152,21 @@ export const text: Parser<'text'> = async (
     error(path, ParseError.incorrectFormat)
   }
 
+  if (
+    target.$language &&
+    (await parseValueAndDefault(
+      path,
+      value,
+      fieldSchema,
+      typeSchema,
+      target,
+      handlers,
+      noCollect
+    ))
+  ) {
+    return
+  }
+
   for (const key in value) {
     const newPath = [...path, key]
 
@@ -153,10 +182,6 @@ export const text: Parser<'text'> = async (
           true
         )
       }
-
-      // if (value[key].$default) {
-      // }
-
       if (!noCollect) {
         handlers.collect({
           path: newPath,
@@ -169,7 +194,9 @@ export const text: Parser<'text'> = async (
       continue
     }
 
-    validate(newPath, value[key], fieldSchema)
+    // if
+
+    // validate(newPath, value[key], fieldSchema)
 
     if (!noCollect) {
       handlers.collect({

package/src/set/types.ts

@@ -13,7 +13,7 @@ export type Parser<K extends keyof BasedSchemaFields> = (
   target: BasedSetTarget,
   handlers: BasedSetHandlers,
   noCollect?: boolean
-) => Promise<void>
+) => Promise<void | boolean>
 
 export type Parsers = {
   [Key in keyof BasedSchemaFields]: Parser<Key>

package/test/setWalker.ts

@@ -12,6 +12,9 @@ const schema: BasedSchema = {
         blub: {
           type: 'number',
         },
+        flap: {
+          type: 'number',
+        },
         snurp: {
           type: 'array',
           values: {
@@ -210,29 +213,112 @@ test.serial('collect correctly', async (t) => {
   const result = [
     { path: ['visits'], value: '3a9009740ee' },
     { path: ['blub'], value: { $increment: 1 } },
-    { path: ['bla'], value: false },
     { path: ['time'], value: now },
+    { path: ['form', 'snurp'], value: 'blx12' },
+    {
+      path: ['snurpArray', 0],
+      value: 100,
+    },
+
+    { path: ['bla'], value: false },
     { path: ['form', 'lastName'], value: 'de beer' },
     { path: ['form', 'json'], value: '{"bla":1,"x":2,"y":3}' },
-    { path: ['form', 'snurp'], value: 'blx12' },
     { path: ['form', 'things'], value: 2 },
     { path: ['form', 'password'], value: 'mypassword!' },
-    { path: ['snurp', 0, 'x', 0], value: 1 },
-    { path: ['snurp', 0, 'x', 1], value: 2 },
-    { path: ['snurp', 0, 'x', 2], value: 3 },
     { path: ['form', 'bla'], value: { $value: ['bl123', 'bl234'] } },
     { path: ['form', 'blab'], value: { $add: ['bl456'] } },
-    {
-      path: ['snurpArray'],
-      value: { $assign: { $idx: 0, $value: 100 } },
-    },
+
     { path: ['setje'], value: { $value: [1, 2, 3] } },
     { path: ['form', 'blub'], value: { $value: ['x'] } },
     {
       path: ['specialArray'],
       value: { $insert: { $value: ['a', 'b', 'c'], $idx: 0 } },
     },
+
+    { path: ['snurp'], value: { $delete: true } },
+    { path: ['snurp', 0, 'x'], value: { $delete: true } },
+    { path: ['snurp', 0, 'x', 0], value: 1 },
+    { path: ['snurp', 0, 'x', 1], value: 2 },
+    { path: ['snurp', 0, 'x', 2], value: 3 },
   ]
 
+  console.log(results)
+
   t.deepEqual(results, result)
+
+  console.info('DID COMPARSION!')
+
+  const results2: any[] = []
+  await setWalker(
+    schema,
+    {
+      $id: 'bl1',
+      blub: {
+        $value: 4,
+      },
+      flap: {
+        $default: 1,
+      },
+    },
+    {
+      collect: ({ path, value, typeSchema, fieldSchema, target }) => {
+        console.dir(
+          {
+            path,
+            value,
+          },
+          { depth: 10 }
+        )
+        results2.push({
+          path,
+          value,
+        })
+      },
+      referenceFilterCondition: async (id, filter) => {
+        return true
+      },
+    }
+  )
+
+  t.deepEqual(results2, [
+    { path: ['blub'], value: { $value: 4 } },
+    { path: ['flap'], value: { $default: 1 } },
+  ])
+
+  const results3: any[] = []
+  await setWalker(
+    schema,
+    {
+      $id: 'bl1',
+      snurpArray: {
+        $push: 1,
+      },
+      specialArray: {
+        $push: { $value: 'flap' },
+      },
+    },
+    {
+      collect: ({ path, value, typeSchema, fieldSchema, target }) => {
+        console.dir(
+          {
+            path,
+            value,
+          },
+          { depth: 10 }
+        )
+        results3.push({
+          path,
+          value,
+        })
+      },
+      referenceFilterCondition: async (id, filter) => {
+        return true
+      },
+    }
+  )
+
+  t.deepEqual(results3, [
+    { path: ['snurpArray'], value: { $push: [1] } },
+    { path: ['specialArray'], value: { $push: [{ $value: 'flap' }] } },
+  ])
 })