@based/schema 5.0.0-alpha.7 → 5.0.0-alpha.8

package/dist/def/createEmptyDef.d.ts

@@ -8,6 +8,7 @@ export declare const createEmptyDef: (typeName: string, type: StrictSchemaType |
     reverseProps: {};
     idUint8: Uint8Array;
     id: number;
+    mainEmpty: Uint8Array;
     mainLen: number;
     separate: any[];
     tree: {};

package/dist/def/createEmptyDef.js

@@ -8,7 +8,9 @@ export const createEmptyDef = (typeName, type, locales) => {
         props: {},
         reverseProps: {},
         idUint8: new Uint8Array([0, 0]),
+        // empty main buffer
         id: 0,
+        mainEmpty: new Uint8Array(0),
         mainLen: 0,
         separate: [],
         tree: {},

package/dist/def/fillEmptyMain.d.ts

@@ -0,0 +1,5 @@
+import { PropDef } from './types.js';
+export declare const ENCODER: TextEncoder;
+export declare const fillEmptyMain: (vals: PropDef[], mainLen: number) => Uint8Array;
+export declare const isZeroes: (buf: Uint8Array) => boolean;
+//# sourceMappingURL=fillEmptyMain.d.ts.map

package/dist/def/fillEmptyMain.js

@@ -0,0 +1,56 @@
+import { BINARY, BOOLEAN, CREATED, ENUM, INT16, INT32, INT8, NUMBER, STRING, TIMESTAMP, UINT16, UINT32, UINT8, UPDATED, } from './types.js';
+// Lets add validation of values in here - need to validate DEFAULT!
+export const ENCODER = new TextEncoder();
+export const fillEmptyMain = (vals, mainLen) => {
+    const mainEmpty = new Uint8Array(mainLen);
+    for (const f of vals) {
+        if (f.separate) {
+            continue;
+        }
+        const t = f.typeIndex;
+        const s = f.start;
+        let val = f.default;
+        if (t === BOOLEAN || t === INT8 || t === UINT8 || t === ENUM) {
+            mainEmpty[s] = val === true ? 1 : 0;
+        }
+        else if (t === UINT32 || t === INT32) {
+            mainEmpty[s] = val;
+            mainEmpty[s + 1] = val >>>= 8;
+            mainEmpty[s + 2] = val >>>= 8;
+            mainEmpty[s + 3] = val >>>= 8;
+        }
+        else if (t === UINT16 || t === INT16) {
+            mainEmpty[s] = val;
+            mainEmpty[s + 1] = val >>>= 8;
+        }
+        else if (t === NUMBER ||
+            t === TIMESTAMP ||
+            t === CREATED ||
+            t === UPDATED) {
+            const view = new DataView(mainEmpty.buffer, s, 8);
+            view.setFloat64(0, val, true);
+        }
+        else if (t === STRING) {
+            val = ENCODER.encode(val);
+            mainEmpty[s] = val.byteLength;
+            mainEmpty.set(val, s + 1);
+        }
+        else if (t === BINARY) {
+            if (val !== undefined) {
+                mainEmpty.set(val, s);
+            }
+        }
+    }
+    return mainEmpty;
+};
+export const isZeroes = (buf) => {
+    let i = 0;
+    while (i < buf.byteLength) {
+        if (buf[i] !== 0) {
+            return false;
+        }
+        i++;
+    }
+    return true;
+};
+//# sourceMappingURL=fillEmptyMain.js.map

package/dist/def/readFromPacked.js

@@ -1,4 +1,4 @@
-import { REVERSE_SIZE_MAP } from './types.js';
+import { DEFAULT_MAP, REVERSE_SIZE_MAP, } from './types.js';
 export const readFromPacked = (packed) => {
     const size = (packed[0] | (packed[1] << 8)) >>> 0;
     const props = [];
@@ -86,6 +86,8 @@ export const readFromPacked = (packed) => {
             bufferTmp: new Uint8Array([]),
             props: [],
         },
+        mainEmpty: new Uint8Array([]),
+        mainEmptyAllZeroes: true,
         // need this...
         locales: {},
         localeSize: 0,
@@ -98,6 +100,7 @@ export const readFromPacked = (packed) => {
             separate: false,
             __isPropDef: true,
             start: s,
+            default: DEFAULT_MAP[p.typeIndex], // tmp
             typeIndex: p.typeIndex,
             path: p.path.split('.'),
             len,
@@ -113,6 +116,7 @@ export const readFromPacked = (packed) => {
             __isPropDef: true,
             start: 0,
             typeIndex: p.typeIndex,
+            default: DEFAULT_MAP[p.typeIndex], // tmp
             path: p.path.split('.'),
             len: 0,
             compression: 1,

package/dist/def/typeDef.js

@@ -1,6 +1,6 @@
 import { isPropType, getPropType, } from '../index.js';
 import { setByPath } from '@saulx/utils';
-import { TYPE_INDEX_MAP, REFERENCES, REFERENCE, } from './types.js';
+import { TYPE_INDEX_MAP, REFERENCES, REFERENCE, DEFAULT_MAP, } from './types.js';
 import { makePacked } from './makePacked.js';
 import { makeSeparateTextSort } from './makeSeparateTextSort.js';
 import { makeSeparateSort } from './makeSeparateSort.js';
@@ -9,6 +9,7 @@ import { isSeparate } from './utils.js';
 import { addEdges } from './addEdges.js';
 import { createEmptyDef } from './createEmptyDef.js';
 import { hashObjectIgnoreKeyOrder } from '@saulx/hash';
+import { fillEmptyMain, isZeroes } from './fillEmptyMain.js';
 export const DEFAULT_BLOCK_CAPACITY = 100_000;
 export const updateTypeDefs = (schema, schemaTypesParsed, schemaTypesParsedById) => {
     for (const field in schemaTypesParsed) {
@@ -57,6 +58,7 @@ export const createSchemaTypeDef = (typeName, type, parsed, locales, result = cr
     let separateSortProps = 0;
     let separateSortText = 0;
     for (const key in target) {
+        // Create prop def
         const schemaProp = target[key];
         const propPath = [...path, key];
         const propType = getPropType(schemaProp);
@@ -89,6 +91,7 @@ export const createSchemaTypeDef = (typeName, type, parsed, locales, result = cr
                 path: propPath,
                 start: 0,
                 len,
+                default: schemaProp.default ?? DEFAULT_MAP[TYPE_INDEX_MAP[propType]],
                 prop: isseparate ? ++result.cnt : 0,
             };
             if (isPropType('enum', schemaProp)) {
@@ -138,6 +141,7 @@ export const createSchemaTypeDef = (typeName, type, parsed, locales, result = cr
         }
     }
     if (top) {
+        // Put top level together
         const vals = Object.values(result.props);
         vals.sort((a, b) => {
             if (b.separate &&
@@ -168,6 +172,8 @@ export const createSchemaTypeDef = (typeName, type, parsed, locales, result = cr
                 setByPath(result.tree, f.path, f);
             }
         }
+        result.mainEmpty = fillEmptyMain(vals, result.mainLen);
+        result.mainEmptyAllZeroes = isZeroes(result.mainEmpty);
         makePacked(result, typeName, vals, len);
         if (separateSortText > 0) {
             makeSeparateTextSort(result);

package/dist/def/types.d.ts

@@ -69,6 +69,7 @@ export type PropDef = {
     inversePropNumber?: number;
     enum?: any[];
     dependent?: boolean;
+    default: any;
     edgeMainLen?: 0;
     reverseEnum?: {
         [key: string]: number;
@@ -83,6 +84,7 @@ export type PropDef = {
     reverseMainEdges?: {
         [start: string]: PropDefEdge;
     };
+    edgeMainEmpty?: Uint8Array;
     __isEdge?: boolean;
 };
 export type PropDefEdge = Partial<PropDef> & {
@@ -133,6 +135,8 @@ export type SchemaTypeDef = {
     main: {
         [start: string]: PropDef;
     };
+    mainEmpty: Uint8Array;
+    mainEmptyAllZeroes: boolean;
     tree: SchemaPropTree;
     hasSeperateSort: boolean;
     seperateSort: SchemaSortUndefinedHandler;
@@ -148,7 +152,8 @@ export type SchemaTypeDef = {
     localeSize: number;
 };
 export declare const SIZE_MAP: Record<InternalSchemaProp, number>;
-export declare let REVERSE_SIZE_MAP: Record<TypeIndex, number>;
+export declare const DEFAULT_MAP: Record<TypeIndex, any>;
+export declare const REVERSE_SIZE_MAP: Record<TypeIndex, number>;
 export declare const REVERSE_TYPE_INDEX_MAP: Record<TypeIndex, InternalSchemaProp>;
 export declare const ID_FIELD_DEF: PropDef;
 export declare const EMPTY_MICRO_BUFFER: PropDef;

package/dist/def/types.js

@@ -83,9 +83,34 @@ const reverseMap = {};
 for (const k in TYPE_INDEX_MAP) {
     reverseMap[TYPE_INDEX_MAP[k]] = k;
 }
-export let REVERSE_SIZE_MAP;
-// @ts-ignore
-REVERSE_SIZE_MAP = {};
+// TODO update defaults
+export const DEFAULT_MAP = {
+    [TYPE_INDEX_MAP.alias]: '',
+    [TYPE_INDEX_MAP.binary]: undefined,
+    [TYPE_INDEX_MAP.boolean]: false,
+    [TYPE_INDEX_MAP.cardinality]: 0,
+    [TYPE_INDEX_MAP.created]: 0,
+    [TYPE_INDEX_MAP.updated]: 0,
+    [TYPE_INDEX_MAP.number]: 0,
+    [TYPE_INDEX_MAP.timestamp]: 0,
+    [TYPE_INDEX_MAP.enum]: 0,
+    [TYPE_INDEX_MAP.id]: 0,
+    [TYPE_INDEX_MAP.int16]: 0,
+    [TYPE_INDEX_MAP.int32]: 0,
+    [TYPE_INDEX_MAP.int8]: 0,
+    [TYPE_INDEX_MAP.uint8]: 0,
+    [TYPE_INDEX_MAP.uint16]: 0,
+    [TYPE_INDEX_MAP.uint32]: 0,
+    [TYPE_INDEX_MAP.json]: undefined,
+    [TYPE_INDEX_MAP.microbuffer]: undefined,
+    [TYPE_INDEX_MAP.reference]: undefined,
+    [TYPE_INDEX_MAP.references]: [],
+    [TYPE_INDEX_MAP.string]: '',
+    [TYPE_INDEX_MAP.aliases]: [],
+    [TYPE_INDEX_MAP.text]: '',
+    [TYPE_INDEX_MAP.vector]: undefined, // maybe not can set a vec with 0
+};
+export const REVERSE_SIZE_MAP = {};
 for (const k in SIZE_MAP) {
     REVERSE_SIZE_MAP[TYPE_INDEX_MAP[k]] = SIZE_MAP[k];
 }
@@ -96,6 +121,7 @@ export const ID_FIELD_DEF = {
     path: ['id'],
     start: 0,
     prop: 255,
+    default: 0,
     len: 4,
     __isPropDef: true,
 };
@@ -104,6 +130,7 @@ export const EMPTY_MICRO_BUFFER = {
     separate: true,
     path: [''],
     start: 0,
+    default: undefined,
     prop: 0,
     len: 1,
     __isPropDef: true,

package/dist/lang.d.ts

@@ -145,7 +145,7 @@ declare const langCodes: {
     readonly yo: 143;
     readonly zu: 144;
 };
-export declare const langCodesMap: Map<string, 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | 76 | 77 | 78 | 79 | 80 | 81 | 82 | 83 | 84 | 85 | 86 | 87 | 88 | 89 | 90 | 91 | 92 | 93 | 94 | 95 | 96 | 97 | 98 | 99 | 100 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | 110 | 111 | 112 | 113 | 114 | 115 | 116 | 117 | 118 | 119 | 120 | 121 | 122 | 123 | 124 | 125 | 126 | 127 | 128 | 129 | 130 | 131 | 132 | 133 | 134 | 135 | 136 | 137 | 138 | 139 | 140 | 141 | 142 | 143 | 144>;
+export declare const langCodesMap: Map<string, 0 | 2 | 1 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | 76 | 77 | 78 | 79 | 80 | 81 | 82 | 83 | 84 | 85 | 86 | 87 | 88 | 89 | 90 | 91 | 92 | 93 | 94 | 95 | 96 | 97 | 98 | 99 | 100 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | 110 | 111 | 112 | 113 | 114 | 115 | 116 | 117 | 118 | 119 | 120 | 121 | 122 | 123 | 124 | 125 | 126 | 127 | 128 | 129 | 130 | 131 | 132 | 133 | 134 | 135 | 136 | 137 | 138 | 139 | 140 | 141 | 142 | 143 | 144>;
 export declare const inverseLangMap: Map<any, any>;
 export type LangName = keyof typeof langCodes;
 export type LangCode = (typeof langCodes)[LangName];

package/dist/parse/index.d.ts

@@ -12,7 +12,7 @@ export declare class SchemaParser {
     parseTypes(): void;
     parseProps(props: any, schemaType?: SchemaType): void;
     parseLocales(): void;
-    parse(): void;
+    parse(): StrictSchema;
 }
 export declare const print: (schema: Schema, path: string[]) => string;
 export declare const parse: (schema: Schema) => {

package/dist/parse/index.js

@@ -3,10 +3,11 @@ import { getPropType } from './utils.js';
 import propParsers from './props.js';
 import pc from 'picocolors';
 import { expectBoolean, expectObject } from './assert.js';
+import { deepCopy } from '@saulx/utils';
 export { getPropType };
 export class SchemaParser {
     constructor(schema) {
-        this.schema = schema;
+        this.schema = deepCopy(schema);
     }
     isItems;
     inQuery;
@@ -97,6 +98,7 @@ export class SchemaParser {
                 throw Error(UNKNOWN_PROP);
             }
         }
+        return this.schema;
     }
 }
 export const print = (schema, path) => {
@@ -120,9 +122,7 @@ export const print = (schema, path) => {
 export const parse = (schema) => {
     const parser = new SchemaParser(schema);
     try {
-        parser.parse();
-        // @ts-ignore
-        return { schema };
+        return { schema: parser.parse() };
     }
     catch (e) {
         const cause = parser.path.slice(0, Math.min(4, parser.lvl) + 1);

package/dist/parse/props.js

@@ -270,6 +270,7 @@ p.text = propParser({
         throw Error(TEXT_REQUIRES_LOCALES);
     },
 }, {
+    format: binaryOpts.format,
     default(val, prop) {
         console.warn('MAKE DEFAULT VALUE FOR TEXT');
     },

package/dist/types.d.ts

@@ -40,6 +40,7 @@ export type SchemaReferencesOneWay = Prop<{
 export type SchemaText = Prop<{
     type: 'text';
     default?: Record<string, string>;
+    format?: StringFormat;
 }>;
 type NumberType = 'number' | 'int8' | 'uint8' | 'int16' | 'uint16' | 'int32' | 'uint32';
 export type SchemaNumber = Prop<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/schema",
-  "version": "5.0.0-alpha.7",
+  "version": "5.0.0-alpha.8",
   "license": "MIT",
   "files": [
     "dist",
@@ -8,6 +8,7 @@
     "package.json",
     "!dist/**/*.map"
   ],
+  "main": "./dist/index.js",
   "exports": {
     "./def": "./dist/def/index.js",
     ".": "./dist/index.js"
@@ -28,7 +29,7 @@
     "typescript": "^5.6.3"
   },
   "dependencies": {
-    "@saulx/utils": "^5.0.0",
+    "@saulx/utils": "^6.1.1",
     "picocolors": "^1.1.0"
   }
-}
+}