@based/schema 2.2.10 → 2.2.12

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@based/schema",
-  "version": "2.2.10",
+  "version": "2.2.12",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "dist/src/index.js",
   "files": [
     "dist",
     "!dist/**/*.js.map"
@@ -11,25 +11,20 @@
     "build": "npx tsc",
     "watch": "npx tsc --watch",
     "clean": "rimraf {.turbo,dist,node_modules}",
-    "test": "ava --color --node-arguments='--expose-gc' --timeout 3m --verbose",
-    "test-ci": "ava --color --node-arguments='--expose-gc' --concurrency 1 --timeout 3m"
+    "test": "ava --color --timeout 3m --verbose",
+    "test-ci": "ava --color --concurrency 1 --timeout 3m"
   },
   "sideEffects": false,
+  "type": "module",
   "dependencies": {
     "validator": "^13.9.0",
     "@saulx/hash": "^2.0.0",
     "@saulx/utils": "^3.5.0"
   },
   "ava": {
+    "timeout": "2m",
     "files": [
-      "test/*.ts"
-    ],
-    "concurrency": 1,
-    "extensions": [
-      "ts"
-    ],
-    "require": [
-      "ts-node/register"
+      "./dist/test/*.js"
     ]
   },
   "devDependencies": {
@@ -37,6 +32,6 @@
     "ts-node": "10.9.1",
     "typescript": "^5.1.6",
     "rimraf": "^3.0.2",
-    "ava": "3.15.0"
+    "ava": "5.3.1"
   }
 }

package/dist/display/dateString copy.d.ts

@@ -1,3 +0,0 @@
-export type DateFormat = 'date' | 'date-time' | 'date-time-text' | 'human' | 'time' | 'time-precise';
-declare const _default: (nr: number | string, format?: DateFormat) => string | number;
-export default _default;

package/dist/display/dateString copy.js

@@ -1,127 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const addZero = (d) => {
-    const s = d + '';
-    if (s.length === 1) {
-        return '0' + s;
-    }
-    return s;
-};
-exports.default = (nr, format) => {
-    if (!format) {
-        return nr;
-    }
-    if (typeof nr === 'number') {
-        const thenDate = new Date(nr);
-        if (format === 'date') {
-            return (thenDate.getDate() +
-                '/' +
-                (thenDate.getMonth() + 1) +
-                '/' +
-                thenDate.getFullYear());
-        }
-        else if (format === 'time') {
-            return thenDate.getHours() + ':' + addZero(thenDate.getMinutes());
-        }
-        else if (format === 'time-precise') {
-            return (thenDate.getHours() +
-                ':' +
-                addZero(thenDate.getMinutes()) +
-                ':' +
-                addZero(thenDate.getSeconds()));
-        }
-        else if (format === 'date-time-text') {
-            return `${thenDate.toLocaleDateString('default', {
-                day: 'numeric',
-                month: 'long',
-                year: 'numeric',
-            })}, ${thenDate.toLocaleTimeString()}`;
-        }
-        else if (format === 'date-time') {
-            return (thenDate.getHours() +
-                ':' +
-                addZero(thenDate.getMinutes()) +
-                ' ' +
-                thenDate.getDate() +
-                '/' +
-                (thenDate.getMonth() + 1) +
-                '/' +
-                thenDate.getFullYear());
-        }
-        else if (format === 'human') {
-            const nowDate = new Date();
-            if (nowDate.getTime() > thenDate.getTime()) {
-                var secondsSince = Math.floor((nowDate.getTime() - thenDate.getTime()) / 1000);
-                var interval = secondsSince / 31536000; // seconds in a year
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'years' : 'year'} ago`;
-                }
-                interval = secondsSince / 2592000; // seconds in a month
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'months' : 'month'} ago`;
-                }
-                interval = secondsSince / 86400; // seconds in a day
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'days' : 'day'} ago`;
-                }
-                interval = secondsSince / 3600; // seconds in an hour
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'hours' : 'hour'} ago`;
-                }
-                interval = secondsSince / 60; // seconds in a minute :)
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'minutes' : 'minute'} ago`;
-                }
-                if (secondsSince > 10) {
-                    const x = Math.floor(secondsSince);
-                    return `${x} ${x > 1 ? 'seconds' : 'second'} ago`;
-                }
-                return 'Now';
-            }
-            else {
-                // in the future
-                var secondsSince = Math.floor((thenDate.getTime() - nowDate.getTime()) / 1000);
-                var interval = secondsSince / 31536000; // seconds in a year
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'years' : 'year'} from now`;
-                }
-                interval = secondsSince / 2592000; // seconds in a month
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'months' : 'month'} from now`;
-                }
-                interval = secondsSince / 86400; // seconds in a day
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'days' : 'day'} from now`;
-                }
-                interval = secondsSince / 3600; // seconds in an hour
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'hours' : 'hour'} from now`;
-                }
-                interval = secondsSince / 60; // seconds in a minute :)
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'minutes' : 'minute'} from now`;
-                }
-                if (secondsSince > 10) {
-                    const x = Math.floor(secondsSince);
-                    return `${x} ${x > 1 ? 'seconds' : 'second'} from now`;
-                }
-                return 'Now';
-            }
-        }
-        return String(nr);
-    }
-    else {
-        return nr;
-    }
-};
-//# sourceMappingURL=dateString%20copy.js.map

package/dist/display/dateString.d.ts

@@ -1,3 +0,0 @@
-export type DateFormat = 'date' | 'date-time' | 'date-time-text' | 'human' | 'time' | 'time-precise';
-declare const _default: (nr: number | string, format?: DateFormat) => string | number;
-export default _default;

package/dist/display/dateString.js

@@ -1,127 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const addZero = (d) => {
-    const s = d + '';
-    if (s.length === 1) {
-        return '0' + s;
-    }
-    return s;
-};
-exports.default = (nr, format) => {
-    if (!format) {
-        return nr;
-    }
-    if (typeof nr === 'number') {
-        const thenDate = new Date(nr);
-        if (format === 'date') {
-            return (thenDate.getDate() +
-                '/' +
-                (thenDate.getMonth() + 1) +
-                '/' +
-                thenDate.getFullYear());
-        }
-        else if (format === 'time') {
-            return thenDate.getHours() + ':' + addZero(thenDate.getMinutes());
-        }
-        else if (format === 'time-precise') {
-            return (thenDate.getHours() +
-                ':' +
-                addZero(thenDate.getMinutes()) +
-                ':' +
-                addZero(thenDate.getSeconds()));
-        }
-        else if (format === 'date-time-text') {
-            return `${thenDate.toLocaleDateString('default', {
-                day: 'numeric',
-                month: 'long',
-                year: 'numeric',
-            })}, ${thenDate.toLocaleTimeString()}`;
-        }
-        else if (format === 'date-time') {
-            return (thenDate.getHours() +
-                ':' +
-                addZero(thenDate.getMinutes()) +
-                ' ' +
-                thenDate.getDate() +
-                '/' +
-                (thenDate.getMonth() + 1) +
-                '/' +
-                thenDate.getFullYear());
-        }
-        else if (format === 'human') {
-            const nowDate = new Date();
-            if (nowDate.getTime() > thenDate.getTime()) {
-                var secondsSince = Math.floor((nowDate.getTime() - thenDate.getTime()) / 1000);
-                var interval = secondsSince / 31536000; // seconds in a year
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'years' : 'year'} ago`;
-                }
-                interval = secondsSince / 2592000; // seconds in a month
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'months' : 'month'} ago`;
-                }
-                interval = secondsSince / 86400; // seconds in a day
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'days' : 'day'} ago`;
-                }
-                interval = secondsSince / 3600; // seconds in an hour
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'hours' : 'hour'} ago`;
-                }
-                interval = secondsSince / 60; // seconds in a minute :)
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'minutes' : 'minute'} ago`;
-                }
-                if (secondsSince > 10) {
-                    const x = Math.floor(secondsSince);
-                    return `${x} ${x > 1 ? 'seconds' : 'second'} ago`;
-                }
-                return 'Now';
-            }
-            else {
-                // in the future
-                var secondsSince = Math.floor((thenDate.getTime() - nowDate.getTime()) / 1000);
-                var interval = secondsSince / 31536000; // seconds in a year
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'years' : 'year'} from now`;
-                }
-                interval = secondsSince / 2592000; // seconds in a month
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'months' : 'month'} from now`;
-                }
-                interval = secondsSince / 86400; // seconds in a day
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'days' : 'day'} from now`;
-                }
-                interval = secondsSince / 3600; // seconds in an hour
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'hours' : 'hour'} from now`;
-                }
-                interval = secondsSince / 60; // seconds in a minute :)
-                if (interval > 1) {
-                    const x = Math.floor(interval);
-                    return `${x} ${x > 1 ? 'minutes' : 'minute'} from now`;
-                }
-                if (secondsSince > 10) {
-                    const x = Math.floor(secondsSince);
-                    return `${x} ${x > 1 ? 'seconds' : 'second'} from now`;
-                }
-                return 'Now';
-            }
-        }
-        return String(nr);
-    }
-    else {
-        return nr;
-    }
-};
-//# sourceMappingURL=dateString.js.map

package/dist/display/display.d.ts

@@ -1 +0,0 @@
-export declare const display: (value: string | number | void, field: BasedSchemaField) => string | number | void;

package/dist/display/display.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.display = void 0;
-const display = (value, field) => {
-    return '';
-};
-exports.display = display;
-//# sourceMappingURL=display.js.map

package/dist/display/index.js

@@ -1,26 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.display = void 0;
-const timestamp_1 = __importDefault(require("./timestamp"));
-const number_1 = __importDefault(require("./number"));
-const string_1 = __importDefault(require("./string"));
-const display = (value, field) => {
-    if (field.type === 'timestamp' && typeof value === 'number') {
-        // @ts-ignore
-        return (0, timestamp_1.default)(value, field.display);
-    }
-    if (field.type === 'number' && typeof value === 'number') {
-        // @ts-ignore
-        return (0, number_1.default)(value, field.display);
-    }
-    if (field.type === 'string' && typeof value === 'string') {
-        // @ts-ignore
-        return (0, string_1.default)(value, field.display);
-    }
-    return value;
-};
-exports.display = display;
-//# sourceMappingURL=index.js.map

package/dist/display/number copy.d.ts

@@ -1,3 +0,0 @@
-export type NumberFormat = 'short' | 'human' | 'ratio' | 'bytes' | 'euro' | 'dollar' | 'pound' | `round-${number}`;
-declare const parseNumber: (nr: number | string, format?: NumberFormat) => string | number;
-export default parseNumber;

package/dist/display/number copy.js

@@ -1,81 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const parseNumber = (nr, format) => {
-    if (!format) {
-        return nr;
-    }
-    if (typeof nr === 'number') {
-        if (format === 'euro' || format === 'dollar' || format === 'pound') {
-            const p = String(parseNumber(nr, 'short'));
-            const fraction = format === 'euro' ? ',' : '.';
-            const [s, f] = p.split('.');
-            return `${format === 'euro'
-                ? '€'
-                : format === 'pound'
-                    ? '£'
-                    : format === 'dollar'
-                        ? '$'
-                        : ''}${s}${f ? `${fraction}${f}` : ''}`;
-        }
-        else if (format.startsWith('round-')) {
-            const [, fixed] = format.split('round-');
-            const n = Number(fixed);
-            if (!n) {
-                return `${nr.toFixed()}`;
-            }
-            return `${nr.toFixed(n)}`;
-        }
-        else if (format === 'bytes') {
-            const kb = nr / 1024;
-            const mb = kb / 1024;
-            const gb = mb / 1024;
-            if (gb >= 1) {
-                return `${gb.toFixed(2)} gb`;
-            }
-            else if (mb >= 1) {
-                return `${mb.toFixed(2)} mb`;
-            }
-            else if (kb >= 1) {
-                return `${kb.toFixed(2)} kb`;
-            }
-            else {
-                return `${nr} ${nr === 1 ? 'byte' : 'bytes'}`;
-            }
-        }
-        else if (format === 'ratio') {
-            return `${Math.round(nr * 10000) / 100}%`;
-        }
-        else if (format === 'short') {
-            if (nr >= 1e6) {
-                nr = nr / 1e6;
-                nr = nr.toFixed(1);
-                if (nr[nr.length - 1] === '0') {
-                    nr = nr.slice(0, -2);
-                }
-                return nr + 'm';
-            }
-            else if (nr >= 1e3) {
-                nr = nr / 1e3;
-                nr = nr.toFixed(1);
-                if (nr[nr.length - 1] === '0') {
-                    nr = nr.slice(0, -2);
-                }
-                return nr + 'k';
-            }
-            nr = nr.toFixed(2);
-            if (nr[nr.length - 1] === '0') {
-                nr = nr.slice(0, -3);
-            }
-            return String(nr);
-        }
-        else if (format === 'human') {
-            return nr.toFixed(2);
-        }
-        return String(nr);
-    }
-    else {
-        return nr;
-    }
-};
-exports.default = parseNumber;
-//# sourceMappingURL=number%20copy.js.map

package/dist/display.d.ts

@@ -1,2 +0,0 @@
-import { BasedSchemaField } from './types';
-export declare const display: (value: string | number | void, field: BasedSchemaField) => string | number | void;

package/dist/display.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.display = void 0;
-const display = (value, field) => {
-    return '';
-};
-exports.display = display;
-//# sourceMappingURL=display.js.map

package/dist/index.d.ts

@@ -1,5 +0,0 @@
-export * from './types';
-export * from './validateSchema';
-export * from './walker';
-export * from './set';
-export * from './display';

package/dist/index.js

@@ -1,22 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./types"), exports);
-__exportStar(require("./validateSchema"), exports);
-__exportStar(require("./walker"), exports);
-__exportStar(require("./set"), exports);
-__exportStar(require("./display"), exports);
-//# sourceMappingURL=index.js.map

package/dist/set/fields/array.d.ts

@@ -1,2 +0,0 @@
-import { FieldParser } from '../../walker';
-export declare const array: FieldParser<'array'>;

package/dist/set/fields/index.d.ts

@@ -1,3 +0,0 @@
-import { FieldParsers } from '../../walker';
-import { BasedSetTarget } from '../../types';
-export declare const fields: Partial<FieldParsers<BasedSetTarget>>;

package/dist/set/fields/index.js

@@ -1,74 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fields = void 0;
-const error_1 = require("../../error");
-const array_1 = require("./array");
-const object_1 = require("./object");
-const number_1 = require("./number");
-const string_1 = require("./string");
-const references_1 = require("./references");
-const set_1 = require("./set");
-const hash_1 = require("@saulx/hash");
-const utils_1 = require("@saulx/utils");
-exports.fields = {
-    array: array_1.array,
-    object: object_1.object,
-    record: object_1.record,
-    number: number_1.number,
-    integer: number_1.integer,
-    timestamp: number_1.timestamp,
-    string: string_1.string,
-    set: set_1.set,
-    text: string_1.text,
-    reference: references_1.reference,
-    references: references_1.references,
-    cardinality: async (args) => {
-        let hashedValue;
-        if (args.value && typeof args.value === 'object') {
-            args.stop();
-            if (args.value.$default !== undefined) {
-                args.error(error_1.ParseError.defaultNotSupported);
-                return;
-            }
-            if (args.value.$value !== undefined) {
-                hashedValue = (0, hash_1.hashObjectIgnoreKeyOrder)(args.value.$value).toString(16);
-            }
-            else {
-                hashedValue = (0, hash_1.hashObjectIgnoreKeyOrder)(args.value).toString(16);
-            }
-        }
-        else {
-            hashedValue = (0, hash_1.hash)(args.value).toString(16);
-        }
-        args.collect(hashedValue);
-    },
-    boolean: async (args) => {
-        if (typeof args.value !== 'boolean') {
-            args.error(error_1.ParseError.incorrectFormat);
-            return;
-        }
-        args.collect();
-    },
-    json: async (args) => {
-        args.stop();
-        try {
-            const parsedValue = JSON.stringify(args.value);
-            args.collect(parsedValue);
-        }
-        catch (err) {
-            args.error(error_1.ParseError.invalidJSON);
-        }
-    },
-    enum: async (args) => {
-        // args.stop()
-        const enumValues = args.fieldSchema.enum;
-        for (let i = 0; i < enumValues.length; i++) {
-            if ((0, utils_1.deepEqual)(enumValues[i], args.value)) {
-                args.collect(i);
-                return;
-            }
-        }
-        args.error(error_1.ParseError.incorrectFormat);
-    },
-};
-//# sourceMappingURL=index.js.map

package/dist/set/fields/object.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.record = exports.object = void 0;
-const error_1 = require("../../error");
-const object = async (args) => {
-    if (typeof args.value !== 'object' || args.value === null) {
-        args.error(error_1.ParseError.incorrectFormat);
-        return;
-    }
-    const isArray = Array.isArray(args.value);
-    if (isArray) {
-        args.error(error_1.ParseError.incorrectFormat);
-        return;
-    }
-    args.collect();
-    return args;
-};
-exports.object = object;
-const record = async (args) => {
-    if (typeof args.value !== 'object' || args.value === null) {
-        args.error(error_1.ParseError.incorrectFormat);
-        return;
-    }
-    const isArray = Array.isArray(args.value);
-    if (isArray) {
-        args.error(error_1.ParseError.incorrectFormat);
-        return;
-    }
-    args.collect();
-    return args;
-};
-exports.record = record;
-//# sourceMappingURL=object.js.map

package/dist/set/fields/set.d.ts

@@ -1,2 +0,0 @@
-import { FieldParser } from '../../walker';
-export declare const set: FieldParser<'set'>;

package/dist/set/types.js

@@ -1 +0,0 @@
-//# sourceMappingURL=types.js.map

package/dist/types.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.languages = exports.isCollection = exports.basedSchemaFieldTypes = void 0;
-const languages_1 = require("./languages");
-exports.basedSchemaFieldTypes = [
-    'array',
-    'object',
-    'record',
-    'set',
-    'string',
-    'boolean',
-    'number',
-    'json',
-    'integer',
-    'timestamp',
-    'reference',
-    'references',
-    'text',
-    'enum',
-    'cardinality',
-];
-const isCollection = (type) => {
-    return type === 'array' || type === 'object' || type === 'record';
-};
-exports.isCollection = isCollection;
-exports.languages = Object.keys(languages_1.languages);
-//# sourceMappingURL=types.js.map

package/dist/updateSchema.d.ts

@@ -1,2 +0,0 @@
-import { BasedSchema, BasedSchemaPartial } from './types';
-export declare const updateSchema: (newSchema: BasedSchemaPartial, oldSchema?: BasedSchema) => Promise<BasedSchema>;

package/dist/updateSchema.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateSchema = void 0;
-const updateSchema = async (newSchema, oldSchema = {
-    $defs: {},
-    types: {},
-    language: 'en',
-    root: { fields: {} },
-    prefixToTypeMapping: {},
-}) => {
-    // add sha
-    // put isRequired on the new schema in REQUIRED arrays
-    return oldSchema;
-};
-exports.updateSchema = updateSchema;
-//# sourceMappingURL=updateSchema.js.map

package/dist/validateSchema.d.ts

@@ -1,4 +0,0 @@
-import { BasedSchemaPartial, BasedSchemaFieldPartial, BasedSchemaTypePartial } from './types';
-export declare const validateType: (fromSchema: BasedSchemaPartial, typeName: string, type: BasedSchemaTypePartial) => void;
-export declare const validateField: (fromSchema: BasedSchemaPartial, path: string[], field: BasedSchemaFieldPartial) => void;
-export declare const validateSchema: (schema: BasedSchemaPartial) => BasedSchemaPartial;