npm - @based/schema - Versions diffs - 5.0.0-alpha.6 → 5.0.0-alpha.7 - Mend

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

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 (5) hide show

package/dist/def/addEdges.js CHANGED Viewed

@@ -1,33 +1,35 @@
 import { getPropType } from '../index.js';
-import { SIZE_MAP, TYPE_INDEX_MAP, REFERENCES, REFERENCE, ENUM, } from './types.js';
+import { TYPE_INDEX_MAP, REFERENCES, REFERENCE, ENUM, } from './types.js';
+import { getPropLen, isSeparate } from './utils.js';
 export const addEdges = (prop, refProp) => {
-    let edgesCnt = 0;
     for (const key in refProp) {
         if (key[0] === '$') {
             if (!prop.edges) {
+                prop.edgeMainLen = 0;
                 prop.edges = {};
-                prop.reverseEdges = {};
-                prop.edgesTotalLen = 0;
+                prop.reverseSeperateEdges = {};
+                prop.reverseMainEdges = {};
+                prop.edgesSeperateCnt = 0;
+            }
+            const edgeProp = refProp[key];
+            const edgeType = getPropType(edgeProp);
+            const len = getPropLen(edgeProp);
+            const separate = isSeparate(edgeProp, len);
+            if (separate) {
+                prop.edgesSeperateCnt++;
             }
-            edgesCnt++;
-            const edgeType = getPropType(refProp[key]);
             const edge = {
                 __isPropDef: true,
                 __isEdge: true,
-                prop: edgesCnt,
+                prop: separate ? prop.edgesSeperateCnt : 0,
                 name: key,
                 typeIndex: TYPE_INDEX_MAP[edgeType],
-                len: SIZE_MAP[edgeType],
-                separate: true,
+                len,
+                separate,
                 path: [...prop.path, key],
+                start: prop.edgeMainLen,
             };
-            if (edge.len == 0) {
-                prop.edgesTotalLen = 0;
-            }
-            else {
-                // [field] [size] [data]
-                prop.edgesTotalLen += 1 + 2 + edge.len; // field len
-            }
+            prop.edgeMainLen += edge.len;
             if (edge.typeIndex === ENUM) {
                 edge.enum = Array.isArray(refProp[key])
                     ? refProp[key]
@@ -44,7 +46,12 @@ export const addEdges = (prop, refProp) => {
                 edge.inverseTypeName = refProp[key].ref;
             }
             prop.edges[key] = edge;
-            prop.reverseEdges[edge.prop] = edge;
+            if (separate) {
+                prop.reverseSeperateEdges[edge.prop] = edge;
+            }
+            else {
+                prop.reverseMainEdges[edge.start] = edge;
+            }
         }
     }
 };

package/dist/def/selvaBuffer.js CHANGED Viewed

@@ -1,31 +1,18 @@
-import { ALIAS, ALIASES, BINARY, BOOLEAN, CREATED, EMPTY_MICRO_BUFFER, ENUM, CARDINALITY, INT16, INT32, INT8, MICRO_BUFFER, NULL, NUMBER, REFERENCE, REFERENCES, STRING, TEXT, TIMESTAMP, UINT16, UINT32, UINT8, UPDATED, VECTOR, WEAK_REFERENCE, WEAK_REFERENCES, JSON, } from './types.js';
+import { ALIAS, ALIASES, BINARY, EMPTY_MICRO_BUFFER, CARDINALITY, MICRO_BUFFER, REFERENCE, REFERENCES, STRING, TEXT, VECTOR, WEAK_REFERENCE, WEAK_REFERENCES, JSON, } from './types.js';
 const selvaTypeMap = new Uint8Array(32); // 1.2x faster than JS array
-selvaTypeMap[NULL] = 0;
-selvaTypeMap[TIMESTAMP] = 4;
-selvaTypeMap[CREATED] = 1;
-selvaTypeMap[UPDATED] = 1;
-selvaTypeMap[NUMBER] = 4;
-selvaTypeMap[CARDINALITY] = 11;
-selvaTypeMap[INT8] = 20;
-selvaTypeMap[UINT8] = 6;
-selvaTypeMap[INT16] = 21;
-selvaTypeMap[UINT16] = 22;
-selvaTypeMap[INT32] = 23;
-selvaTypeMap[UINT32] = 7;
-selvaTypeMap[BOOLEAN] = 9;
-selvaTypeMap[ENUM] = 10;
-selvaTypeMap[STRING] = 11;
-selvaTypeMap[TEXT] = 12;
-selvaTypeMap[REFERENCE] = 13;
-selvaTypeMap[REFERENCES] = 14;
-selvaTypeMap[WEAK_REFERENCE] = 15;
-selvaTypeMap[WEAK_REFERENCES] = 16;
-selvaTypeMap[MICRO_BUFFER] = 17;
-selvaTypeMap[ALIAS] = 18;
-selvaTypeMap[ALIASES] = 19;
-selvaTypeMap[BINARY] = 11;
-selvaTypeMap[VECTOR] = 17;
-selvaTypeMap[JSON] = 11;
+selvaTypeMap[MICRO_BUFFER] = 1;
+selvaTypeMap[VECTOR] = 1;
+selvaTypeMap[BINARY] = 2;
+selvaTypeMap[CARDINALITY] = 2;
+selvaTypeMap[JSON] = 2;
+selvaTypeMap[STRING] = 2;
+selvaTypeMap[TEXT] = 3;
+selvaTypeMap[REFERENCE] = 4;
+selvaTypeMap[REFERENCES] = 5;
+selvaTypeMap[WEAK_REFERENCE] = 6;
+selvaTypeMap[WEAK_REFERENCES] = 7;
+selvaTypeMap[ALIAS] = 8;
+selvaTypeMap[ALIASES] = 9;
 const EDGE_FIELD_CONSTRAINT_FLAG_DEPENDENT = 0x01;
 function blockCapacity(blockCapacity) {
     const buf = new Uint8Array(Uint32Array.BYTES_PER_ELEMENT);
@@ -64,12 +51,26 @@ const propDefBuffer = (schema, prop, isEdge) => {
             prop.inversePropNumber = dstType.props[prop.inversePropName].prop;
             buf[4] = prop.inversePropNumber;
             if (prop.edges) {
-                const props = Object.values(prop.edges);
-                eschema = props
-                    .map((prop) => propDefBuffer(schema, prop, true))
-                    .flat(1);
-                eschema.unshift(0, 0, 0, 0, sepPropCount(props), 0);
-                view.setUint32(5, eschema.length, true);
+                const edgesS = Object.values(prop.edges);
+                if (edgesS.length) {
+                    const props = edgesS
+                        .filter((v) => v.separate === true)
+                        .sort((a, b) => (a.prop > b.prop ? 1 : -1));
+                    const p = [
+                        {
+                            ...EMPTY_MICRO_BUFFER,
+                            len: prop.edgeMainLen || 1, // allow zero here... else useless padding
+                            __isEdgeDef: true,
+                        },
+                        // or handle this here...
+                        ...props,
+                    ];
+                    eschema = p
+                        .map((prop) => propDefBuffer(schema, prop, true))
+                        .flat(1);
+                    eschema.unshift(0, 0, 0, 0, sepPropCount(p), 0);
+                    view.setUint32(5, eschema.length, true);
+                }
             }
         }
         return [...buf, ...eschema];

package/dist/def/types.d.ts CHANGED Viewed

@@ -68,18 +68,22 @@ export type PropDef = {
     inverseTypeId?: number;
     inversePropNumber?: number;
     enum?: any[];
+    dependent?: boolean;
+    edgeMainLen?: 0;
     reverseEnum?: {
         [key: string]: number;
     };
-    edgesTotalLen?: number;
+    edgesSeperateCnt?: number;
     edges?: {
         [key: string]: PropDefEdge;
     };
-    reverseEdges?: {
+    reverseSeperateEdges?: {
         [prop: string]: PropDefEdge;
     };
+    reverseMainEdges?: {
+        [start: string]: PropDefEdge;
+    };
     __isEdge?: boolean;
-    dependent?: boolean;
 };
 export type PropDefEdge = Partial<PropDef> & {
     __isPropDef: true;
@@ -90,6 +94,13 @@ export type PropDefEdge = Partial<PropDef> & {
     edgesTotalLen?: number;
     __isEdge: true;
 };
+export type PropDefAggregate = Partial<PropDef> & {
+    __isPropDef: true;
+    typeIndex: TypeIndex;
+    len: number;
+    prop: number;
+    name: string;
+};
 export type SchemaPropTree = {
     [key: string]: SchemaPropTree | PropDef;
 };

package/dist/lang.d.ts CHANGED Viewed

@@ -145,7 +145,7 @@ declare const langCodes: {
     readonly yo: 143;
     readonly zu: 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 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 inverseLangMap: Map<any, any>;
 export type LangName = keyof typeof langCodes;
 export type LangCode = (typeof langCodes)[LangName];

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@based/schema",
-  "version": "5.0.0-alpha.6",
+  "version": "5.0.0-alpha.7",
   "license": "MIT",
   "files": [
     "dist",