@based/schema 0.0.9 → 0.0.11

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export * from './types';
 export * from './validateSchema';
 export * from './set';
+export * from './walker';

package/dist/index.js

@@ -17,4 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./types"), exports);
 __exportStar(require("./validateSchema"), exports);
 __exportStar(require("./set"), exports);
+__exportStar(require("./walker"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAuB;AAEvB,mDAAgC;AAEhC,wCAAqB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAuB;AAEvB,mDAAgC;AAEhC,wCAAqB;AAErB,2CAAwB"}

package/dist/set/collections.js

@@ -3,7 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.record = exports.array = exports.object = exports.set = void 0;
 const error_1 = require("./error");
 const _1 = require(".");
+// what about making errors return signature
 const set = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
+    if (value && typeof value === 'object') {
+        if (value.$default) {
+            (0, error_1.error)(handlers, error_1.ParseError.defaultNotSupported, path);
+        }
+        if (value.$value) {
+            value = value.$value;
+        }
+    }
     const q = [];
     const fieldDef = fieldSchema.items;
     if (Array.isArray(value)) {
@@ -33,9 +42,9 @@ const set = async (path, value, fieldSchema, typeSchema, target, handlers, noCol
                 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, value.$delete[i], fieldDef, typeSchema, target, handlers, true));
+        if (value.$remove) {
+            for (let i = 0; i < value.$remove.length; i++) {
+                q.push((0, _1.fieldWalker)(path, value.$remove[i], fieldDef, typeSchema, target, handlers, true));
             }
         }
         await Promise.all(q);
@@ -47,26 +56,35 @@ const set = async (path, value, fieldSchema, typeSchema, target, handlers, noCol
 exports.set = set;
 const object = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
     if (typeof value !== 'object') {
-        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+        (0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
+        return;
     }
     const isArray = Array.isArray(value);
     if (isArray) {
-        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+        (0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
+        return;
     }
     const q = [];
     for (const key in value) {
         const propDef = fieldSchema.properties[key];
         if (!propDef) {
-            (0, error_1.error)([...path, key], error_1.ParseError.fieldDoesNotExist);
+            (0, error_1.error)(handlers, error_1.ParseError.fieldDoesNotExist, [...path, key]);
+            continue;
         }
         q.push((0, _1.fieldWalker)([...path, key], value[key], propDef, typeSchema, target, handlers, noCollect));
     }
     await Promise.all(q);
+    if (fieldSchema.required) {
+        for (const req of fieldSchema.required) {
+            if (!(req in value)) {
+                target.required.push([...path, req]);
+            }
+        }
+    }
 };
 exports.object = object;
-// unshift // only allow 1 command
+// IF REQUIRED AND PUSH OR UNSHIFT just throw here scince we dont need to parse at all...
 const array = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
-    // $value
     let isArray = Array.isArray(value);
     let parsedValue = value;
     let opCount = 0;
@@ -81,11 +99,13 @@ const array = async (path, value, fieldSchema, typeSchema, target, handlers, noC
         if (value.$insert) {
             opCount++;
             if (opCount > 1) {
-                (0, error_1.error)(path, error_1.ParseError.multipleOperationsNotAllowed);
+                (0, error_1.error)(handlers, error_1.ParseError.multipleOperationsNotAllowed, path);
+                return;
             }
             if (typeof value.$insert !== 'object' ||
                 value.$insert.$idx === undefined) {
-                (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+                (0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
+                return;
             }
             else {
                 const insert = Array.isArray(value.$insert.$value)
@@ -101,21 +121,27 @@ const array = async (path, value, fieldSchema, typeSchema, target, handlers, noC
         if (value.$remove) {
             opCount++;
             if (opCount > 1) {
-                (0, error_1.error)(path, error_1.ParseError.multipleOperationsNotAllowed);
+                (0, error_1.error)(handlers, error_1.ParseError.multipleOperationsNotAllowed, path);
+                return;
             }
             if (value.$remove.$idx === undefined) {
-                (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+                (0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
+                return;
             }
         }
         if (value.$push) {
             opCount++;
             if (opCount > 1) {
-                (0, error_1.error)(path, error_1.ParseError.multipleOperationsNotAllowed);
+                (0, error_1.error)(handlers, error_1.ParseError.multipleOperationsNotAllowed, path);
+                return;
             }
+            // TODO: FIX PUSH PARSING
             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, push[i], fieldSchema.values, typeSchema, target, handlers, true));
+                q.push((0, _1.fieldWalker)(
+                // exception
+                [...path, '$push', i], push[i], fieldSchema.values, typeSchema, target, handlers, true));
             }
             await Promise.all(q);
             parsedValue = { $push: push };
@@ -123,14 +149,18 @@ const array = async (path, value, fieldSchema, typeSchema, target, handlers, noC
         if (value.$unshift) {
             opCount++;
             if (opCount > 1) {
-                (0, error_1.error)(path, error_1.ParseError.multipleOperationsNotAllowed);
+                (0, error_1.error)(handlers, error_1.ParseError.multipleOperationsNotAllowed, path);
+                return;
             }
             const q = [];
             const unshift = Array.isArray(value.$unshift)
                 ? value.$unshift
                 : [value.$unshift];
+            // TODO: FIX UNSHIFT PARSING
             for (let i = 0; i < unshift.length; i++) {
-                q.push((0, _1.fieldWalker)(path, unshift[i], fieldSchema.values, typeSchema, target, handlers, true));
+                q.push((0, _1.fieldWalker)(
+                // exception
+                [...path, '$unshift', i], unshift[i], fieldSchema.values, typeSchema, target, handlers, true));
             }
             await Promise.all(q);
             parsedValue = { $unshift: unshift };
@@ -138,11 +168,13 @@ const array = async (path, value, fieldSchema, typeSchema, target, handlers, noC
         if (value.$assign) {
             opCount++;
             if (opCount > 1) {
-                (0, error_1.error)(path, error_1.ParseError.multipleOperationsNotAllowed);
+                (0, error_1.error)(handlers, error_1.ParseError.multipleOperationsNotAllowed, path);
+                return;
             }
             if (typeof value.$assign !== 'object' ||
                 typeof value.$assign.$idx !== 'number') {
-                (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+                (0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
+                return;
             }
             await (0, _1.fieldWalker)([...path, value.$assign.$idx], value.$assign.$value, fieldSchema.values, typeSchema, target, handlers, noCollect);
             return;
@@ -161,7 +193,8 @@ const array = async (path, value, fieldSchema, typeSchema, target, handlers, noC
         }
     }
     if (!isArray) {
-        (0, error_1.error)(path, error_1.ParseError.incorrectFieldType);
+        (0, error_1.error)(handlers, error_1.ParseError.incorrectFieldType, path);
+        return;
     }
     const q = [];
     const collector = [];

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

@@ -1,3 +1,4 @@
+import { BasedSetHandlers } from '../types';
 export declare enum ParseError {
     'incorrectFieldType' = 0,
     'incorrectNodeType' = 1,
@@ -8,6 +9,8 @@ export declare enum ParseError {
     'referenceIsIncorrectType' = 6,
     'valueAndDefault' = 7,
     'defaultNotSupported' = 8,
-    'multipleOperationsNotAllowed' = 9
+    'multipleOperationsNotAllowed' = 9,
+    'requiredFieldNotDefined' = 10,
+    'languageNotSupported' = 11
 }
-export declare const error: (path: (number | string)[], error: ParseError, type?: string) => never;
+export declare const error: (handlers: BasedSetHandlers, error: ParseError, path?: (number | string)[]) => void;

package/dist/set/error.js

@@ -13,10 +13,17 @@ var ParseError;
     ParseError[ParseError["valueAndDefault"] = 7] = "valueAndDefault";
     ParseError[ParseError["defaultNotSupported"] = 8] = "defaultNotSupported";
     ParseError[ParseError["multipleOperationsNotAllowed"] = 9] = "multipleOperationsNotAllowed";
+    ParseError[ParseError["requiredFieldNotDefined"] = 10] = "requiredFieldNotDefined";
+    ParseError[ParseError["languageNotSupported"] = 11] = "languageNotSupported";
 })(ParseError = exports.ParseError || (exports.ParseError = {}));
-const error = (path, error, type // nice to give as option
-) => {
-    throw new Error(`Field: "${path.join('.')}" ${ParseError[error]}`);
+const error = (handlers, error, path) => {
+    const message = path
+        ? `${ParseError[error]} ${path.join('.')}`
+        : `${ParseError[error]}`;
+    handlers.collectErrors({
+        message,
+        code: error,
+    });
 };
 exports.error = error;
 //# sourceMappingURL=error.js.map

package/dist/set/error.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/set/error.ts"],"names":[],"mappings":";;;AAEA,IAAY,UAaX;AAbD,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;IAC9B,kFAAyB,CAAA;IACzB,4EAAsB,CAAA;AACxB,CAAC,EAbW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAarB;AAEM,MAAM,KAAK,GAAG,CACnB,QAA0B,EAC1B,KAAiB,EACjB,IAA0B,EAC1B,EAAE;IACF,MAAM,OAAO,GAAG,IAAI;QAClB,CAAC,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAC1C,CAAC,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,EAAE,CAAA;IAE1B,QAAQ,CAAC,aAAa,CAAC;QACrB,OAAO;QACP,IAAI,EAAE,KAAK;KACZ,CAAC,CAAA;AACJ,CAAC,CAAA;AAbY,QAAA,KAAK,SAajB"}

package/dist/set/index.d.ts

@@ -1,5 +1,5 @@
-import { BasedSchemaField, BasedSchemaType, BasedSetHandlers, BasedSchema, BasedSetTarget } from '../types';
+import { BasedSchemaField, BasedSchemaType, BasedSetHandlers, BasedSchema, BasedSetTarget, BasedSetOptionalHandlers } from '../types';
 export declare const fieldWalker: (path: (string | number)[], value: any, fieldSchema: BasedSchemaField, typeSchema: BasedSchemaType, target: BasedSetTarget, handlers: BasedSetHandlers, noCollect?: boolean) => Promise<void>;
 export declare const setWalker: (schema: BasedSchema, value: {
     [key: string]: any;
-}, handlers: BasedSetHandlers) => Promise<BasedSetTarget>;
+}, inHandlers: BasedSetOptionalHandlers) => Promise<BasedSetTarget>;

package/dist/set/index.js

@@ -21,12 +21,12 @@ const fieldWalker = async (path, value, fieldSchema, typeSchema, target, handler
     }
     const typeDef = fieldSchema.type ?? ('enum' in fieldSchema ? 'enum' : '');
     if (!typeDef) {
-        (0, error_1.error)(path, error_1.ParseError.fieldDoesNotExist);
+        (0, error_1.error)(handlers, error_1.ParseError.fieldDoesNotExist, path);
     }
     if ('customValidator' in fieldSchema) {
         const customValidator = fieldSchema.customValidator;
         if (!(await customValidator(value, path, target))) {
-            (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+            (0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
         }
     }
     const parse = parsers_1.default[typeDef];
@@ -34,28 +34,57 @@ const fieldWalker = async (path, value, fieldSchema, typeSchema, target, handler
     return;
 };
 exports.fieldWalker = fieldWalker;
-const setWalker = async (schema, value, handlers) => {
+const setWalker = async (schema, value, inHandlers) => {
+    let errors;
+    const collect = [];
+    const x = { ...inHandlers };
+    if (!('collectErrors' in x)) {
+        errors = [];
+        x.collectErrors = (info) => {
+            errors.push(info);
+        };
+    }
+    let prevCollect;
+    if (!('collect' in x)) {
+        x.collect = (info) => {
+            collect.push(info);
+        };
+    }
+    else {
+        prevCollect = x.collect;
+        x.collect = (info) => {
+            collect.push(info);
+        };
+    }
+    const handlers = x;
     let type;
     if (value.$id) {
         type = schema.prefixToTypeMapping[value.$id.slice(0, 2)];
         if (!type) {
-            (0, error_1.error)([value.$id], error_1.ParseError.incorrectNodeType);
+            (0, error_1.error)(handlers, error_1.ParseError.incorrectNodeType, [value.$id]);
         }
     }
     if (value.type) {
         if (type && value.type !== type) {
-            (0, error_1.error)([value.$id, value.type], error_1.ParseError.incorrectNodeType);
+            (0, error_1.error)(handlers, error_1.ParseError.incorrectNodeType, [value.$id, value.type]);
         }
         type = value.type;
     }
     const schemaType = schema.types[type];
     if (!schemaType) {
-        (0, error_1.error)([type], error_1.ParseError.incorrectNodeType);
+        (0, error_1.error)(handlers, error_1.ParseError.incorrectNodeType, [type]);
     }
     const target = {
         type,
         schema,
+        required: [],
     };
+    if (value.$language) {
+        if (!schema.languages.includes(value.$language)) {
+            (0, error_1.error)(handlers, error_1.ParseError.languageNotSupported, ['$language']);
+        }
+        target.$language = value.$language;
+    }
     if (value.$id) {
         target.$id = value.$id;
     }
@@ -64,10 +93,10 @@ const setWalker = async (schema, value, handlers) => {
     }
     const q = [];
     for (const key in value) {
-        if (key[0] !== '$') {
+        if (key[0] !== '$' && key !== 'type') {
             const fieldSchema = schemaType.fields[key];
             if (!fieldSchema) {
-                (0, error_1.error)([key], error_1.ParseError.fieldDoesNotExist);
+                (0, error_1.error)(handlers, error_1.ParseError.fieldDoesNotExist, [key]);
             }
             else {
                 q.push((0, exports.fieldWalker)([key], value[key], fieldSchema, schemaType, target, handlers));
@@ -75,10 +104,36 @@ const setWalker = async (schema, value, handlers) => {
         }
     }
     await Promise.all(q);
-    // required fields (collect them!)
-    //   if (!(await handlers.requiredFields(value, [], target))) {
-    //     throw new Error('Missing required fields')
-    //   }
+    if (schemaType.required) {
+        for (const req of schemaType.required) {
+            if (!(req in value)) {
+                target.required.push([req]);
+            }
+        }
+    }
+    if (target.required?.length) {
+        const requireDefined = await Promise.all(target.required.map(async (req) => {
+            return handlers.checkRequiredFields(req);
+        }));
+        for (let i = 0; i < requireDefined.length; i++) {
+            if (!requireDefined[i]) {
+                const r = target.required[i];
+                (0, error_1.error)(handlers, error_1.ParseError.requiredFieldNotDefined, r);
+            }
+        }
+    }
+    if (errors?.length) {
+        const err = new Error('Errors in in set' +
+            errors.reduce((str, info) => {
+                return str + `\n - ${info.message}`;
+            }, ''));
+        throw err;
+    }
+    if (prevCollect) {
+        for (const x of collect) {
+            prevCollect(x);
+        }
+    }
     return target;
 };
 exports.setWalker = setWalker;

package/dist/set/index.js.map

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

package/dist/set/number.js

@@ -2,62 +2,75 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.integer = exports.number = exports.timestamp = void 0;
 const error_1 = require("./error");
-const validate = (path, value, fieldSchema) => {
+const validate = (handlers, path, value, fieldSchema) => {
     if (typeof value !== 'number') {
-        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+        (0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
+        return false;
     }
     if (fieldSchema.type === 'integer' && value - Math.floor(value) !== 0) {
-        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+        (0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
+        return false;
     }
     if (fieldSchema.multipleOf &&
         value / fieldSchema.multipleOf -
             Math.floor(value / fieldSchema.multipleOf) !==
             0) {
-        (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+        (0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
+        return false;
     }
     if (fieldSchema.maximum) {
-        if (fieldSchema.exclusiveMaximum && value > value) {
-            (0, error_1.error)(path, error_1.ParseError.exceedsMaximum);
+        if (fieldSchema.exclusiveMaximum) {
+            if (value >= fieldSchema.maximum) {
+                (0, error_1.error)(handlers, error_1.ParseError.exceedsMaximum, path);
+                return false;
+            }
         }
-        else if (value >= value) {
-            (0, error_1.error)(path, error_1.ParseError.exceedsMaximum);
+        else if (value > fieldSchema.maximum) {
+            (0, error_1.error)(handlers, error_1.ParseError.exceedsMaximum, path);
+            return false;
         }
     }
     if (fieldSchema.minimum) {
-        if (fieldSchema.exclusiveMinimum && value < value) {
-            (0, error_1.error)(path, error_1.ParseError.subceedsMinimum);
+        if (fieldSchema.exclusiveMinimum) {
+            if (value <= fieldSchema.minimum) {
+                (0, error_1.error)(handlers, error_1.ParseError.subceedsMinimum, path);
+                return false;
+            }
         }
-        else if (value <= value) {
-            (0, error_1.error)(path, error_1.ParseError.subceedsMinimum);
+        else if (value < fieldSchema.minimum) {
+            (0, error_1.error)(handlers, error_1.ParseError.subceedsMinimum, path);
+            return false;
         }
     }
     return value;
 };
-const shared = (path, value, fieldSchema) => {
+const shared = (handlers, path, value, fieldSchema) => {
     if (typeof value === 'object') {
         if (value.$increment) {
-            validate([...path, '$increment'], value.$increment, fieldSchema);
+            validate(handlers, [...path, '$increment'], value.$increment, fieldSchema);
         }
         if (value.$decrement) {
-            validate([...path, '$decrement'], value.$decrement, fieldSchema);
+            validate(handlers, [...path, '$decrement'], value.$decrement, fieldSchema);
         }
         if (value.$value !== undefined) {
-            validate(path, value.$value, fieldSchema);
+            validate(handlers, path, value.$value, fieldSchema);
         }
         if (value.$default !== undefined) {
             if (value.$value !== undefined) {
-                (0, error_1.error)(path, error_1.ParseError.valueAndDefault);
+                (0, error_1.error)(handlers, error_1.ParseError.valueAndDefault, path);
+                return;
             }
-            validate(path, value.$default, fieldSchema);
+            validate(handlers, path, value.$default, fieldSchema);
         }
     }
     else {
-        validate(path, value, fieldSchema);
+        validate(handlers, path, value, fieldSchema);
     }
     return value;
 };
 const timestamp = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
     if (typeof value === 'string') {
+        // TODO: now + 10 and stuff
         if (value === 'now') {
             value = Date.now();
         }
@@ -65,11 +78,12 @@ const timestamp = async (path, value, fieldSchema, typeSchema, target, handlers,
             const d = new Date(value);
             value = d.valueOf();
             if (isNaN(value)) {
-                (0, error_1.error)(path, error_1.ParseError.incorrectFormat);
+                (0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
+                return;
             }
         }
     }
-    const parsedValue = shared(path, value, fieldSchema);
+    const parsedValue = shared(handlers, path, value, fieldSchema);
     if (!noCollect) {
         handlers.collect({
             path,
@@ -82,7 +96,7 @@ const timestamp = async (path, value, fieldSchema, typeSchema, target, handlers,
 };
 exports.timestamp = timestamp;
 const number = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
-    const parsedValue = shared(path, value, fieldSchema);
+    const parsedValue = shared(handlers, path, value, fieldSchema);
     if (!noCollect) {
         handlers.collect({
             path,
@@ -95,7 +109,7 @@ const number = async (path, value, fieldSchema, typeSchema, target, handlers, no
 };
 exports.number = number;
 const integer = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
-    const parsedValue = shared(path, value, fieldSchema);
+    const parsedValue = shared(handlers, path, value, fieldSchema);
     if (!noCollect) {
         handlers.collect({
             path,

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.js

@@ -13,18 +13,20 @@ const parseValueAndDefault = async (path, value, fieldSchema, typeSchema, target
         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);
+            await 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);
+                (0, error_1.error)(handlers, error_1.ParseError.valueAndDefault, path);
             }
-            parse(path, value.$default, fieldSchema, typeSchema, target, handlers, true);
+            console.info('->', path, 'go');
+            await parse(path, value.$default, fieldSchema, typeSchema, target, handlers, true);
             handled = true;
         }
     }
     if (handled && !noCollect) {
+        console.log('collect?');
         handlers.collect({ path, value, typeSchema, fieldSchema, target });
     }
     return handled;

package/dist/set/parseDefaultAndValue.js.map

@@ -1 +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"}
+{"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,MAAM,KAAK,CACT,IAAI,EACJ,KAAK,CAAC,MAAM,EACZ,WAAW,EACX,UAAU,EACV,MAAM,EACN,QAAQ,EACR,IAAI,CACL,CAAA;YACD,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,QAAQ,EAAE,kBAAU,CAAC,eAAe,EAAE,IAAI,CAAC,CAAA;aAClD;YACD,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;YAC9B,MAAM,KAAK,CACT,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,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QACvB,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;AAhDY,QAAA,oBAAoB,wBAgDhC"}