@based/schema 0.0.16 → 1.0.2

package/dist/walker.d.ts

@@ -1,51 +0,0 @@
-import { ParseError } from './set/error';
-import { BasedSchema } from './types';
-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;
-    skipCollection?: boolean;
-    fieldSchema?: BasedSchemaFields[K];
-    typeSchema?: BasedSchemaType;
-    path: Path;
-    key?: number | string;
-    value: any;
-    target: T;
-    fromBackTrack: any[];
-    parse: Parse<T>;
-    collect: (args: Args<T>) => any;
-    backtrack: BackTrack<T>;
-    requiresAsyncValidation: (validationType: any) => Promise<any>;
-    error: ErrorHandler<T>;
-};
-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: (args: Args<T>) => Promise<Args<T>>;
-    parsers: {
-        fields: Partial<{
-            [Key in keyof BasedSchemaFields]: FieldParser<Key, T>;
-        }>;
-        keys: {
-            [key: string]: KeyParser<T>;
-        };
-        any: KeyParser<T>;
-    };
-    collect?: (args: Args<T>) => any;
-    backtrack?: BackTrack<T>;
-    requiresAsyncValidation?: (validationType: any) => Promise<boolean>;
-    errorsCollector?: ErrorHandler<T>;
-};
-export declare const walk: <T>(opts: Opts<T>, value: any) => Promise<{
-    target: T;
-    errors: {
-        code: ParseError;
-        message: string;
-    }[];
-}>;
-export {};

package/dist/walker.js

@@ -1,120 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.walk = void 0;
-const walk = async (opts, value) => {
-    const errors = [];
-    if (!('collect' in opts)) {
-        opts.collect = () => { };
-    }
-    if (!('backtrack' in opts)) {
-        opts.backtrack = (args, btC, c) => btC;
-    }
-    if (!('requiresAsyncValidation' in opts)) {
-        opts.requiresAsyncValidation = async () => true;
-    }
-    const errorsCollector = (args, code) => {
-        const err = {
-            code,
-            message: `Error in ${args.path.join('.')}`,
-        };
-        if (opts.errorsCollector) {
-            opts.errorsCollector(args, code);
-        }
-        errors.push(err);
-    };
-    const parse = async (prevArgs, key, value) => {
-        const collectedCommands = [];
-        const fromBackTrack = [];
-        const args = {
-            schema: opts.schema,
-            path: key ? [...prevArgs.path, key] : prevArgs.path,
-            key: key ?? prevArgs.path[prevArgs.path.length - 1],
-            parentValue: value ? prevArgs.value : undefined,
-            value: value ?? prevArgs.value,
-            target: prevArgs.target,
-            parse: prevArgs.parse,
-            collect: (args) => {
-                collectedCommands.push(opts.collect(args));
-            },
-            fromBackTrack,
-            backtrack: opts.backtrack,
-            error: errorsCollector,
-            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;
-                    const j = i;
-                    q.push((async () => {
-                        const newArgs = await parser({
-                            ...args,
-                            value: args.value[j],
-                            path: [...args.path, j],
-                            key: j,
-                        });
-                        if (newArgs) {
-                            return parse(newArgs);
-                        }
-                    })());
-                }
-            }
-            else {
-                for (const key in args.value) {
-                    const parser = opts.parsers.keys[key] || opts.parsers.any;
-                    q.push((async () => {
-                        const newArgs = await parser({
-                            ...args,
-                            value: args.value[key],
-                            path: [...args.path, key],
-                            key,
-                        });
-                        if (newArgs) {
-                            return parse(newArgs);
-                        }
-                    })());
-                }
-            }
-            await Promise.all(q);
-            if (fromBackTrack.length || collectedCommands.length) {
-                const x = args.backtrack(args, fromBackTrack, collectedCommands);
-                if (x) {
-                    prevArgs.fromBackTrack?.push(x);
-                }
-            }
-        }
-    };
-    const args = await opts.init({
-        schema: opts.schema,
-        path: [],
-        value,
-        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: args.target,
-        errors,
-    };
-};
-exports.walk = walk;
-//# sourceMappingURL=walker.js.map

package/dist/walker.js.map

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

package/src/set/collections.ts

@@ -1,338 +0,0 @@
-import { Parser } from './types'
-import { error, ParseError } from './error'
-import { fieldWalker } from '.'
-
-// what about making errors return signature
-
-export const set: Parser<'set'> = async (
-  path,
-  value,
-  fieldSchema,
-  typeSchema,
-  target,
-  handlers,
-  noCollect
-) => {
-  if (value && typeof value === 'object') {
-    if (value.$default) {
-      error(handlers, ParseError.defaultNotSupported, path)
-    }
-
-    if (value.$value) {
-      value = value.$value
-    }
-  }
-
-  const q: Promise<void>[] = []
-  const fieldDef = fieldSchema.items
-
-  if (Array.isArray(value)) {
-    const parsedArray = []
-    for (let i = 0; i < value.length; i++) {
-      q.push(
-        fieldWalker([...path, i], value[i], fieldDef, typeSchema, target, {
-          ...handlers,
-          collect: ({ value }) => {
-            parsedArray.push(value)
-          },
-        })
-      )
-    }
-    await Promise.all(q)
-    if (!noCollect) {
-      handlers.collect({
-        path,
-        value: { $value: parsedArray },
-        typeSchema,
-        fieldSchema,
-        target,
-      })
-    }
-  } else {
-    if (value.$add) {
-      for (let i = 0; i < value.$add.length; i++) {
-        q.push(
-          fieldWalker(
-            path,
-            value.$add[i],
-            fieldDef,
-            typeSchema,
-            target,
-            handlers,
-            true
-          )
-        )
-      }
-    }
-    if (value.$remove) {
-      for (let i = 0; i < value.$remove.length; i++) {
-        q.push(
-          fieldWalker(
-            path,
-            value.$remove[i],
-            fieldDef,
-            typeSchema,
-            target,
-            handlers,
-            true
-          )
-        )
-      }
-    }
-    await Promise.all(q)
-    if (!noCollect) {
-      handlers.collect({ path, value, typeSchema, fieldSchema, target })
-    }
-  }
-}
-
-export const object: Parser<'object'> = async (
-  path,
-  value,
-  fieldSchema,
-  typeSchema,
-  target,
-  handlers,
-  noCollect
-) => {
-  if (typeof value !== 'object') {
-    error(handlers, ParseError.incorrectFormat, path)
-    return
-  }
-  const isArray = Array.isArray(value)
-  if (isArray) {
-    error(handlers, ParseError.incorrectFormat, path)
-    return
-  }
-  const q: Promise<void>[] = []
-  for (const key in value) {
-    const propDef = fieldSchema.properties[key]
-    if (!propDef) {
-      error(handlers, ParseError.fieldDoesNotExist, [...path, key])
-      continue
-    }
-    q.push(
-      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])
-      }
-    }
-  }
-}
-
-// IF REQUIRED AND PUSH OR UNSHIFT just throw here scince we dont need to parse at all...
-export const array: Parser<'array'> = async (
-  path,
-  value,
-  fieldSchema,
-  typeSchema,
-  target,
-  handlers,
-  noCollect
-) => {
-  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(handlers, ParseError.multipleOperationsNotAllowed, path)
-        return
-      }
-      if (
-        typeof value.$insert !== 'object' ||
-        value.$insert.$idx === undefined
-      ) {
-        error(handlers, ParseError.incorrectFormat, path)
-        return
-      } else {
-        const insert = Array.isArray(value.$insert.$value)
-          ? value.$insert.$value
-          : [value.$insert.$value]
-        const q: Promise<void>[] = []
-        for (let i = 0; i < insert.length; i++) {
-          q.push(
-            fieldWalker(
-              path,
-              insert[i],
-              fieldSchema.values,
-              typeSchema,
-              target,
-              handlers,
-              true
-            )
-          )
-        }
-        await Promise.all(q)
-      }
-    }
-    if (value.$remove) {
-      opCount++
-      if (opCount > 1) {
-        error(handlers, ParseError.multipleOperationsNotAllowed, path)
-        return
-      }
-      if (value.$remove.$idx === undefined) {
-        error(handlers, ParseError.incorrectFormat, path)
-        return
-      }
-    }
-    if (value.$push) {
-      opCount++
-      if (opCount > 1) {
-        error(handlers, ParseError.multipleOperationsNotAllowed, path)
-        return
-      }
-
-      // TODO: FIX PUSH PARSING
-      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(
-            // exception
-            [...path, '$push', i],
-            push[i],
-            fieldSchema.values,
-            typeSchema,
-            target,
-            handlers,
-            true
-          )
-        )
-      }
-      await Promise.all(q)
-      parsedValue = { $push: push }
-    }
-    if (value.$unshift) {
-      opCount++
-      if (opCount > 1) {
-        error(handlers, ParseError.multipleOperationsNotAllowed, path)
-        return
-      }
-      const q: Promise<void>[] = []
-      const unshift = Array.isArray(value.$unshift)
-        ? value.$unshift
-        : [value.$unshift]
-
-      // TODO: FIX UNSHIFT PARSING
-      for (let i = 0; i < unshift.length; i++) {
-        q.push(
-          fieldWalker(
-            // exception
-            [...path, '$unshift', i],
-            unshift[i],
-            fieldSchema.values,
-            typeSchema,
-            target,
-            handlers,
-            true
-          )
-        )
-      }
-      await Promise.all(q)
-      parsedValue = { $unshift: unshift }
-    }
-    if (value.$assign) {
-      opCount++
-      if (opCount > 1) {
-        error(handlers, ParseError.multipleOperationsNotAllowed, path)
-        return
-      }
-      if (
-        typeof value.$assign !== 'object' ||
-        typeof value.$assign.$idx !== 'number'
-      ) {
-        error(handlers, ParseError.incorrectFormat, path)
-        return
-      }
-      await fieldWalker(
-        [...path, value.$assign.$idx],
-        value.$assign.$value,
-        fieldSchema.values,
-        typeSchema,
-        target,
-        handlers,
-        noCollect
-      )
-      return
-    }
-    if (!has$Value && !noCollect) {
-      handlers.collect({
-        path,
-        value: parsedValue,
-        typeSchema,
-        fieldSchema,
-        target,
-      })
-    }
-    if (!has$Value) {
-      return
-    }
-  }
-  if (!isArray) {
-    error(handlers, ParseError.incorrectFieldType, path)
-    return
-  }
-  const q: Promise<void>[] = []
-  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],
-        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)
-    }
-  }
-}
-
-export const record: Parser<'record'> = async (path, value, fieldSchema) => {}

package/src/set/number.ts

@@ -1,167 +0,0 @@
-import { Parser } from './types'
-import { error, ParseError } from './error'
-import {
-  BasedSchemaFieldInteger,
-  BasedSchemaFieldNumber,
-  BasedSchemaFieldTimeStamp,
-  BasedSetHandlers,
-} from '../types'
-
-const validate = (
-  handlers: BasedSetHandlers,
-  path: (number | string)[],
-  value: any,
-  fieldSchema:
-    | BasedSchemaFieldInteger
-    | BasedSchemaFieldNumber
-    | BasedSchemaFieldTimeStamp
-): number | false => {
-  if (typeof value !== 'number') {
-    error(handlers, ParseError.incorrectFormat, path)
-    return false
-  }
-  if (fieldSchema.type === 'integer' && value - Math.floor(value) !== 0) {
-    error(handlers, ParseError.incorrectFormat, path)
-    return false
-  }
-  if (
-    fieldSchema.multipleOf &&
-    value / fieldSchema.multipleOf -
-      Math.floor(value / fieldSchema.multipleOf) !==
-      0
-  ) {
-    error(handlers, ParseError.incorrectFormat, path)
-    return false
-  }
-  if (fieldSchema.maximum) {
-    if (fieldSchema.exclusiveMaximum) {
-      if (value >= fieldSchema.maximum) {
-        error(handlers, ParseError.exceedsMaximum, path)
-        return false
-      }
-    } else if (value > fieldSchema.maximum) {
-      error(handlers, ParseError.exceedsMaximum, path)
-      return false
-    }
-  }
-  if (fieldSchema.minimum) {
-    if (fieldSchema.exclusiveMinimum) {
-      if (value <= fieldSchema.minimum) {
-        error(handlers, ParseError.subceedsMinimum, path)
-        return false
-      }
-    } else if (value < fieldSchema.minimum) {
-      error(handlers, ParseError.subceedsMinimum, path)
-      return false
-    }
-  }
-  return value
-}
-
-const shared = (
-  handlers: BasedSetHandlers,
-  path: (number | string)[],
-  value: any,
-  fieldSchema:
-    | BasedSchemaFieldInteger
-    | BasedSchemaFieldNumber
-    | BasedSchemaFieldTimeStamp
-): any => {
-  if (typeof value === 'object') {
-    if (value.$increment) {
-      validate(handlers, [...path, '$increment'], value.$increment, fieldSchema)
-    }
-    if (value.$decrement) {
-      validate(handlers, [...path, '$decrement'], value.$decrement, fieldSchema)
-    }
-    if (value.$value !== undefined) {
-      validate(handlers, path, value.$value, fieldSchema)
-    }
-    if (value.$default !== undefined) {
-      if (value.$value !== undefined) {
-        error(handlers, ParseError.valueAndDefault, path)
-        return
-      }
-      validate(handlers, path, value.$default, fieldSchema)
-    }
-  } else {
-    validate(handlers, path, value, fieldSchema)
-  }
-  return value
-}
-
-export const timestamp: Parser<'timestamp'> = async (
-  path,
-  value,
-  fieldSchema,
-  typeSchema,
-  target,
-  handlers,
-  noCollect
-) => {
-  if (typeof value === 'string') {
-    // TODO: now + 10 and stuff
-    if (value === 'now') {
-      value = Date.now()
-    } else {
-      const d = new Date(value)
-      value = d.valueOf()
-      if (isNaN(value)) {
-        error(handlers, ParseError.incorrectFormat, path)
-        return
-      }
-    }
-  }
-  const parsedValue = shared(handlers, path, value, fieldSchema)
-  if (!noCollect) {
-    handlers.collect({
-      path,
-      value: parsedValue,
-      typeSchema,
-      fieldSchema,
-      target,
-    })
-  }
-}
-
-export const number: Parser<'number'> = async (
-  path,
-  value,
-  fieldSchema,
-  typeSchema,
-  target,
-  handlers,
-  noCollect
-) => {
-  const parsedValue = shared(handlers, path, value, fieldSchema)
-  if (!noCollect) {
-    handlers.collect({
-      path,
-      value: parsedValue,
-      typeSchema,
-      fieldSchema,
-      target,
-    })
-  }
-}
-
-export const integer: Parser<'integer'> = async (
-  path,
-  value,
-  fieldSchema,
-  typeSchema,
-  target,
-  handlers,
-  noCollect
-) => {
-  const parsedValue = shared(handlers, path, value, fieldSchema)
-  if (!noCollect) {
-    handlers.collect({
-      path,
-      value: parsedValue,
-      typeSchema,
-      fieldSchema,
-      target,
-    })
-  }
-}