npm - @based/schema - Versions diffs - 0.0.14 → 0.0.16 - Mend

@based/schema 0.0.14 → 0.0.16

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.

Files changed (9) hide show

package/dist/set2/index.js CHANGED Viewed

@@ -1 +1,71 @@
+// import { ParseError } from '../set/error'
+// import { BasedSchema, BasedSetTarget } from '../types'
+// import { walk } from '../walker'
+// export const setWalker2 = (schema: BasedSchema, value: any) => {
+//   return walk<BasedSetTarget>(
+//     {
+//       schema,
+//       parsers: {
+//         keys: {},
+//         fields: {
+//           object: async (args) => {
+//             if (typeof value !== 'object') {
+//               args.error(args, ParseError.incorrectFormat)
+//               return
+//             }
+//             const isArray = Array.isArray(value)
+//             if (isArray) {
+//               args.error(args, ParseError.incorrectFormat)
+//               return
+//             }
+//             const q: Promise<any>[] = []
+//             for (const key in value) {
+//               q.push(args.parse(args, key, value[key]))
+//             }
+//             await Promise.all(q)
+//           },
+//           boolean: async (args) => {
+//             if (typeof value !== 'boolean') {
+//               args.error(args, ParseError.incorrectFormat)
+//               return
+//             }
+//             args.collect(args)
+//           },
+//         },
+//         any: async (args) => {
+//           args.error(args, ParseError.fieldDoesNotExist)
+//         },
+//       },
+//       init: async (value, args) => {
+//         let type: string
+//         if (value.$id) {
+//           type = schema.prefixToTypeMapping[value.$id.slice(0, 2)]
+//           if (!type) {
+//             args.error(args, ParseError.incorrectFieldType)
+//             return
+//           }
+//         }
+//         if (value.type) {
+//           if (type && value.type !== type) {
+//             args.error(args, ParseError.incorrectNodeType)
+//             return
+//           }
+//           type = value.type
+//         }
+//         const schemaType = schema.types[type]
+//         if (!schemaType) {
+//           args.error(args, ParseError.incorrectNodeType)
+//           return
+//         }
+//         const target: BasedSetTarget = {
+//           type,
+//           schema,
+//           required: [],
+//         }
+//         return { ...args, target }
+//       },
+//     },
+//     value
+//   )
+// }
 //# sourceMappingURL=index.js.map

package/dist/set2/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/set2/index.ts"],"names":[],"mappings":""}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/set2/index.ts"],"names":[],"mappings":"AAAA,4CAA4C;AAC5C,yDAAyD;AACzD,mCAAmC;AAEnC,mEAAmE;AACnE,iCAAiC;AACjC,QAAQ;AACR,gBAAgB;AAChB,mBAAmB;AACnB,oBAAoB;AACpB,oBAAoB;AACpB,sCAAsC;AACtC,+CAA+C;AAC/C,6DAA6D;AAC7D,uBAAuB;AACvB,gBAAgB;AAChB,mDAAmD;AACnD,6BAA6B;AAC7B,6DAA6D;AAC7D,uBAAuB;AACvB,gBAAgB;AAChB,2CAA2C;AAC3C,yCAAyC;AACzC,0DAA0D;AAC1D,gBAAgB;AAChB,mCAAmC;AACnC,eAAe;AACf,uCAAuC;AACvC,gDAAgD;AAChD,6DAA6D;AAC7D,uBAAuB;AACvB,gBAAgB;AAChB,iCAAiC;AACjC,eAAe;AACf,aAAa;AACb,iCAAiC;AACjC,2DAA2D;AAC3D,aAAa;AACb,WAAW;AACX,uCAAuC;AACvC,2BAA2B;AAC3B,2BAA2B;AAC3B,qEAAqE;AACrE,yBAAyB;AACzB,8DAA8D;AAC9D,qBAAqB;AACrB,cAAc;AACd,YAAY;AACZ,4BAA4B;AAC5B,+CAA+C;AAC/C,6DAA6D;AAC7D,qBAAqB;AACrB,cAAc;AACd,8BAA8B;AAC9B,YAAY;AACZ,gDAAgD;AAChD,6BAA6B;AAC7B,2DAA2D;AAC3D,mBAAmB;AACnB,YAAY;AACZ,2CAA2C;AAC3C,kBAAkB;AAClB,oBAAoB;AACpB,0BAA0B;AAC1B,YAAY;AACZ,qCAAqC;AACrC,WAAW;AACX,SAAS;AACT,YAAY;AACZ,MAAM;AACN,IAAI"}

package/dist/walker.d.ts CHANGED Viewed

@@ -4,6 +4,7 @@ import { BasedSchemaType, BasedSchemaFields } from './types';
 type Path = (string | number)[];
 type ErrorHandler<T> = (args: Args<T>, code: ParseError) => void;
 type Parse<T> = (args: Args<T>, key?: string | number, value?: any) => Promise<Args<T> | void>;
+type BackTrack<T> = (args: Args<T>, fromBackTrack: any[], collectedCommands: any[]) => any;
 export type Args<T, K extends keyof BasedSchemaFields = keyof BasedSchemaFields> = {
     schema: BasedSchema;
     parentValue?: any;
@@ -14,23 +15,21 @@ export type Args<T, K extends keyof BasedSchemaFields = keyof BasedSchemaFields>
     key?: number | string;
     value: any;
     target: T;
+    fromBackTrack: any[];
     parse: Parse<T>;
     collect: (args: Args<T>) => any;
-    backtrack: (args: Args<T>, collectedCommands: any[]) => any;
+    backtrack: BackTrack<T>;
     requiresAsyncValidation: (validationType: any) => Promise<any>;
     error: ErrorHandler<T>;
 };
-export type FieldParser<T, K extends keyof BasedSchemaFields> = (args: Args<T, K>) => Promise<Args<T> | void>;
-export type KeyParser<T> = (args: Args<T, keyof BasedSchemaFields>) => Promise<Args<T> | void>;
+export type FieldParser<K extends keyof BasedSchemaFields, T = any> = (args: Args<T, K>) => Promise<Args<T> | void>;
+export type KeyParser<T = any> = (args: Args<T, keyof BasedSchemaFields>) => Promise<Args<T> | void>;
 export type Opts<T> = {
     schema: BasedSchema;
-    init: (value: any, opts: Opts<T>, errors: {
-        code: ParseError;
-        message: string;
-    }[]) => Promise<T>;
+    init: (args: Args<T>) => Promise<Args<T>>;
     parsers: {
         fields: Partial<{
-            [Key in keyof BasedSchemaFields]: FieldParser<T, Key>;
+            [Key in keyof BasedSchemaFields]: FieldParser<Key, T>;
         }>;
         keys: {
             [key: string]: KeyParser<T>;
@@ -38,7 +37,7 @@ export type Opts<T> = {
         any: KeyParser<T>;
     };
     collect?: (args: Args<T>) => any;
-    backtrack?: (args: Args<T>, collectedCommands: any[]) => any;
+    backtrack?: BackTrack<T>;
     requiresAsyncValidation?: (validationType: any) => Promise<boolean>;
     errorsCollector?: ErrorHandler<T>;
 };

package/dist/walker.js CHANGED Viewed

@@ -7,21 +7,21 @@ const walk = async (opts, value) => {
         opts.collect = () => { };
     }
     if (!('backtrack' in opts)) {
-        opts.backtrack = (c) => c;
+        opts.backtrack = (args, btC, c) => btC;
     }
     if (!('requiresAsyncValidation' in opts)) {
         opts.requiresAsyncValidation = async () => true;
     }
-    const target = await opts.init(value, opts, errors);
     const errorsCollector = (args, code) => {
-        errors.push({
+        const err = {
             code,
             message: `Error in ${args.path.join('.')}`,
-        });
+        };
+        if (opts.errorsCollector) {
+            opts.errorsCollector(args, code);
+        }
+        errors.push(err);
     };
-    if (!('errorsCollector' in opts)) {
-        opts.errorsCollector = errorsCollector;
-    }
     const parse = async (prevArgs, key, value) => {
         const collectedCommands = [];
         const fromBackTrack = [];
@@ -31,19 +31,25 @@ const walk = async (opts, value) => {
             key: key ?? prevArgs.path[prevArgs.path.length - 1],
             parentValue: value ? prevArgs.value : undefined,
             value: value ?? prevArgs.value,
-            target,
-            parse,
+            target: prevArgs.target,
+            parse: prevArgs.parse,
             collect: (args) => {
                 collectedCommands.push(opts.collect(args));
             },
-            backtrack: (args, commands) => {
-                fromBackTrack.push(opts.backtrack(args, commands));
-            },
+            fromBackTrack,
+            backtrack: opts.backtrack,
             error: errorsCollector,
-            requiresAsyncValidation: opts.requiresAsyncValidation,
+            requiresAsyncValidation: prevArgs.requiresAsyncValidation,
         };
         if (typeof args.value === 'object' && args.value !== null) {
             const q = [];
+            if (args.typeSchema && !args.fieldSchema) {
+                // top level
+            }
+            if (args.fieldSchema) {
+                //
+            }
+            // first do key parsers
             if (Array.isArray(args.value)) {
                 for (let i = 0; i < args.value.length; i++) {
                     const parser = opts.parsers.keys[i] || opts.parsers.any;
@@ -78,28 +84,35 @@ const walk = async (opts, value) => {
                 }
             }
             await Promise.all(q);
-            if (fromBackTrack.length) {
-                args.backtrack(args, fromBackTrack);
-            }
-            else if (collectedCommands.length) {
-                args.backtrack(args, collectedCommands);
+            if (fromBackTrack.length || collectedCommands.length) {
+                const x = args.backtrack(args, fromBackTrack, collectedCommands);
+                if (x) {
+                    prevArgs.fromBackTrack?.push(x);
+                }
             }
         }
     };
-    const args = {
+    const args = await opts.init({
         schema: opts.schema,
         path: [],
         value,
-        target,
         parse,
         collect: opts.collect,
         backtrack: opts.backtrack,
         error: errorsCollector,
         requiresAsyncValidation: opts.requiresAsyncValidation,
-    };
+    });
+    if (!args) {
+        return {
+            // TODO: temp
+            // @ts-ignore // for now
+            target: {},
+            errors,
+        };
+    }
     await parse(args);
     return {
-        target,
+        target: args.target,
         errors,
     };
 };

package/dist/walker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"walker.js","sourceRoot":"","sources":["../src/walker.ts"],"names":[],"mappings":";;;~~AA+DO~~,MAAM,IAAI,GAAG,KAAK,EACvB,IAAa,EACb,KAAU,EAIT,EAAE;IACH,MAAM,MAAM,GAA4C,EAAE,CAAA;IAE1D,IAAI,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,EAAE;QACxB,IAAI,CAAC,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,CAAA;KACxB;IAED,IAAI,CAAC,CAAC,WAAW,IAAI,IAAI,CAAC,EAAE;QAC1B,IAAI,CAAC,SAAS,GAAG,CAAC,~~CAAC~~,EAAE,EAAE,CAAC,CAAC,CAAA;~~KAC1B~~;IAED,IAAI,CAAC,CAAC,yBAAyB,IAAI,IAAI,CAAC,EAAE;QACxC,IAAI,CAAC,uBAAuB,GAAG,KAAK,IAAI,EAAE,CAAC,IAAI,CAAA;KAChD;IAED,MAAM,~~MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IAEnD,MAAM,~~eAAe,GAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;QACtD,MAAM,~~CAAC~~,~~IAAI,CAAC~~;YACV,IAAI;YACJ,OAAO,EAAE,YAAY,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;SAC3C,~~CAAC,~~CAAA;~~IACJ~~,CAAC,~~CAAA~~;~~IAED~~,IAAI,CAAC,CAAC,~~iBAAiB,~~IAAI,IAAI,CAAC,~~EAAE~~;~~QAChC~~,IAAI,CAAC,~~eAAe,~~GAAG,~~eAAe~~,CAAA;~~KACvC~~;IAED,MAAM,KAAK,GAAa,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;QACrD,MAAM,iBAAiB,GAAU,EAAE,CAAA;QACnC,MAAM,aAAa,GAAU,EAAE,CAAA;QAC/B,MAAM,IAAI,GAAY;YACpB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI;YACnD,GAAG,EAAE,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;YACnD,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YAC/C,KAAK,EAAE,KAAK,IAAI,QAAQ,CAAC,KAAK;YAC9B,MAAM;~~YACN~~,KAAK;~~YACL~~,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChB,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;YAC5C,CAAC;YACD,SAAS,EAAE,~~CAAC,~~IAAI,~~EAAE,QAAQ,EAAE,EAAE;gBAC5B,aAAa,~~CAAC,~~IAAI,CAAC,IAAI,CAAC,~~SAAS~~,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAA~~;~~YACpD~~,~~CAAC;YACD,~~KAAK,EAAE,eAAe;YACtB,uBAAuB,EAAE,~~IAAI~~,CAAC,uBAAuB;~~SACtD~~,CAAA;QACD,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE;YACzD,MAAM,CAAC,GAA8B,EAAE,CAAA;~~YACvC~~,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAA;oBACvD,MAAM,CAAC,GAAG,CAAC,CAAA;oBACX,CAAC,CAAC,IAAI,CACJ,CAAC,KAAK,IAAI,EAAE;wBACV,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC;4BAC3B,GAAG,IAAI;4BACP,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;4BACpB,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;4BACvB,GAAG,EAAE,CAAC;yBACP,CAAC,CAAA;wBACF,IAAI,OAAO,EAAE;4BACX,OAAO,KAAK,CAAC,OAAO,CAAC,CAAA;yBACtB;oBACH,CAAC,CAAC,EAAE,CACL,CAAA;iBACF;aACF;iBAAM;gBACL,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,EAAE;oBAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAA;oBACzD,CAAC,CAAC,IAAI,CACJ,CAAC,KAAK,IAAI,EAAE;wBACV,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC;4BAC3B,GAAG,IAAI;4BACP,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;4BACtB,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC;4BACzB,GAAG;yBACJ,CAAC,CAAA;wBACF,IAAI,OAAO,EAAE;4BACX,OAAO,KAAK,CAAC,OAAO,CAAC,CAAA;yBACtB;oBACH,CAAC,CAAC,EAAE,CACL,CAAA;iBACF;aACF;YAED,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;YAEpB,IAAI,aAAa,CAAC,MAAM,EAAE;~~gBACxB~~,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,CAAA;~~aACpC;iBAAM~~,IAAI,~~iBAAiB,~~CAAC,~~MAAM,~~EAAE;~~gBACnC~~,~~IAAI~~,CAAC,~~SAAS~~,~~CAAC~~,IAAI,~~EAAE~~,~~iBAAiB~~,CAAC,CAAA;~~aACxC~~;SACF;IACH,CAAC,CAAA;~~IAED~~,MAAM,IAAI,GAAY;~~QACpB~~,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,IAAI,EAAE,EAAE;QACR,KAAK;QACL,~~MAAM;QACN,~~KAAK;QACL,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,KAAK,EAAE,eAAe;QACtB,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;KACtD,CAAA;~~IAED~~,MAAM,KAAK,CAAC,IAAI,CAAC,CAAA;~~IAEjB~~,OAAO;QACL,MAAM;~~QACN~~,MAAM;KACP,CAAA;AACH,CAAC,CAAA;~~AAzHY~~,QAAA,IAAI,~~QAyHhB~~"}
1	+ {"version":3,"file":"walker.js","sourceRoot":"","sources":["../src/walker.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

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

package/src/set2/index.ts CHANGED Viewed

@@ -0,0 +1,71 @@
+// import { ParseError } from '../set/error'
+// import { BasedSchema, BasedSetTarget } from '../types'
+// import { walk } from '../walker'
+// export const setWalker2 = (schema: BasedSchema, value: any) => {
+//   return walk<BasedSetTarget>(
+//     {
+//       schema,
+//       parsers: {
+//         keys: {},
+//         fields: {
+//           object: async (args) => {
+//             if (typeof value !== 'object') {
+//               args.error(args, ParseError.incorrectFormat)
+//               return
+//             }
+//             const isArray = Array.isArray(value)
+//             if (isArray) {
+//               args.error(args, ParseError.incorrectFormat)
+//               return
+//             }
+//             const q: Promise<any>[] = []
+//             for (const key in value) {
+//               q.push(args.parse(args, key, value[key]))
+//             }
+//             await Promise.all(q)
+//           },
+//           boolean: async (args) => {
+//             if (typeof value !== 'boolean') {
+//               args.error(args, ParseError.incorrectFormat)
+//               return
+//             }
+//             args.collect(args)
+//           },
+//         },
+//         any: async (args) => {
+//           args.error(args, ParseError.fieldDoesNotExist)
+//         },
+//       },
+//       init: async (value, args) => {
+//         let type: string
+//         if (value.$id) {
+//           type = schema.prefixToTypeMapping[value.$id.slice(0, 2)]
+//           if (!type) {
+//             args.error(args, ParseError.incorrectFieldType)
+//             return
+//           }
+//         }
+//         if (value.type) {
+//           if (type && value.type !== type) {
+//             args.error(args, ParseError.incorrectNodeType)
+//             return
+//           }
+//           type = value.type
+//         }
+//         const schemaType = schema.types[type]
+//         if (!schemaType) {
+//           args.error(args, ParseError.incorrectNodeType)
+//           return
+//         }
+//         const target: BasedSetTarget = {
+//           type,
+//           schema,
+//           required: [],
+//         }
+//         return { ...args, target }
+//       },
+//     },
+//     value
+//   )
+// }

package/src/walker.ts CHANGED Viewed

@@ -1,7 +1,6 @@
 import { ParseError } from './set/error'
 import { BasedSchema, BasedSetHandlers, BasedSetTarget } from './types'
 import { BasedSchemaType, BasedSchemaFields } from './types'
-import { SetOptional } from 'type-fest'
 type Path = (string | number)[]
@@ -13,6 +12,12 @@ type Parse<T> = (
   value?: any
 ) => Promise<Args<T> | void> // If true will not continue
+type BackTrack<T> = (
+  args: Args<T>,
+  fromBackTrack: any[],
+  collectedCommands: any[]
+) => any
 export type Args<
   T,
   K extends keyof BasedSchemaFields = keyof BasedSchemaFields
@@ -26,37 +31,34 @@ export type Args<
   key?: number | string
   value: any
   target: T
+  fromBackTrack: any[]
   parse: Parse<T>
   collect: (args: Args<T>) => any
-  backtrack: (args: Args<T>, collectedCommands: any[]) => any
+  backtrack: BackTrack<T>
   requiresAsyncValidation: (validationType: any) => Promise<any>
   error: ErrorHandler<T>
 }
-export type FieldParser<T, K extends keyof BasedSchemaFields> = (
+export type FieldParser<K extends keyof BasedSchemaFields, T = any> = (
   args: Args<T, K>
 ) => Promise<Args<T> | void>
-export type KeyParser<T> = (
+export type KeyParser<T = any> = (
   args: Args<T, keyof BasedSchemaFields>
 ) => Promise<Args<T> | void>
 export type Opts<T> = {
   schema: BasedSchema
-  init: (
-    value: any,
-    opts: Opts<T>,
-    errors: { code: ParseError; message: string }[]
-  ) => Promise<T>
+  init: (args: Args<T>) => Promise<Args<T>>
   parsers: {
     fields: Partial<{
-      [Key in keyof BasedSchemaFields]: FieldParser<T, Key>
+      [Key in keyof BasedSchemaFields]: FieldParser<Key, T>
     }>
     keys: { [key: string]: KeyParser<T> } // $list -> true
     any: KeyParser<T> // y.x
   }
   collect?: (args: Args<T>) => any
-  backtrack?: (args: Args<T>, collectedCommands: any[]) => any // from back TRACKS OR COLLECT
+  backtrack?: BackTrack<T>
   requiresAsyncValidation?: (validationType: any) => Promise<boolean>
   errorsCollector?: ErrorHandler<T>
 }
@@ -75,24 +77,22 @@ export const walk = async <T>(
   }
   if (!('backtrack' in opts)) {
-    opts.backtrack = (c) => c
+    opts.backtrack = (args, btC, c) => btC
   }
   if (!('requiresAsyncValidation' in opts)) {
     opts.requiresAsyncValidation = async () => true
   }
-  const target = await opts.init(value, opts, errors)
   const errorsCollector: ErrorHandler<T> = (args, code) => {
-    errors.push({
+    const err = {
       code,
       message: `Error in ${args.path.join('.')}`,
-    })
-  }
-  if (!('errorsCollector' in opts)) {
-    opts.errorsCollector = errorsCollector
+    }
+    if (opts.errorsCollector) {
+      opts.errorsCollector(args, code)
+    }
+    errors.push(err)
   }
   const parse: Parse<T> = async (prevArgs, key, value) => {
@@ -104,19 +104,29 @@ export const walk = async <T>(
       key: key ?? prevArgs.path[prevArgs.path.length - 1],
       parentValue: value ? prevArgs.value : undefined,
       value: value ?? prevArgs.value,
-      target,
-      parse,
+      target: prevArgs.target,
+      parse: prevArgs.parse,
       collect: (args) => {
         collectedCommands.push(opts.collect(args))
       },
-      backtrack: (args, commands) => {
-        fromBackTrack.push(opts.backtrack(args, commands))
-      },
+      fromBackTrack,
+      backtrack: opts.backtrack,
       error: errorsCollector,
-      requiresAsyncValidation: opts.requiresAsyncValidation,
+      requiresAsyncValidation: prevArgs.requiresAsyncValidation,
     }
     if (typeof args.value === 'object' && args.value !== null) {
       const q: Promise<Args<T> | void>[] = []
+      if (args.typeSchema && !args.fieldSchema) {
+        // top level
+      }
+      if (args.fieldSchema) {
+        //
+      }
+      // first do key parsers
       if (Array.isArray(args.value)) {
         for (let i = 0; i < args.value.length; i++) {
           const parser = opts.parsers.keys[i] || opts.parsers.any
@@ -156,30 +166,36 @@ export const walk = async <T>(
       await Promise.all(q)
-      if (fromBackTrack.length) {
-        args.backtrack(args, fromBackTrack)
-      } else if (collectedCommands.length) {
-        args.backtrack(args, collectedCommands)
+      if (fromBackTrack.length || collectedCommands.length) {
+        const x = args.backtrack(args, fromBackTrack, collectedCommands)
+        if (x) {
+          prevArgs.fromBackTrack?.push(x)
+        }
       }
     }
   }
-  const args: Args<T> = {
+  const args: Args<T> = await opts.init(<Args<T>>{
     schema: opts.schema,
     path: [],
     value,
-    target,
     parse,
     collect: opts.collect,
     backtrack: opts.backtrack,
     error: errorsCollector,
     requiresAsyncValidation: opts.requiresAsyncValidation,
+  })
+  if (!args) {
+    return {
+      // TODO: temp
+      // @ts-ignore // for now
+      target: {},
+      errors,
+    }
   }
   await parse(args)
   return {
-    target,
+    target: args.target,
     errors,
   }
 }

package/test/walker.ts CHANGED Viewed

@@ -36,19 +36,17 @@ test('walker', async (t) => {
   const x = await walk(
     {
       schema,
-      init: async () => {
-        console.log('init!\n')
-        return { lullz: true }
+      init: async (args) => {
+        return { ...args, target: { lullz: true } }
       },
       parsers: {
         keys: {
-          $list: async (args) => {
-            return {
-              ...args,
-              value: { flapdrol: true },
-            }
-          },
+          // $list: async (args) => {
+          //   return {
+          //     ...args,
+          //     value: { flapdrol: true },
+          //   }
+          // },
         },
         fields: {
           // string: () => {}
@@ -61,10 +59,21 @@ test('walker', async (t) => {
       collect: (args) => {
         return args.path.join('.')
       },
-      backtrack: (args, collectedCommands) => {
-        console.log('    \n-----------BACK TRACK GOOD GO', collectedCommands)
-        // if return next btrack will not receive  backtrack from commands
-        return collectedCommands
+      backtrack: (args, fromBt, collected) => {
+        console.log(
+          '    \n-----------BACK TRACK GOOD GO',
+          '\n',
+          'path:',
+          args.path.join('.'),
+          '\n',
+          'backtracked:',
+          JSON.stringify(fromBt),
+          '\n',
+          'collected:',
+          collected,
+          '--------------------'
+        )
+        return fromBt.length ? fromBt : collected
       },
     },
     {
@@ -90,7 +99,6 @@ test('walker', async (t) => {
   )
   console.info('------------')
-  console.info(x)
   t.true(true)
 })