@based/schema 5.0.0-alpha.26 → 5.0.0-alpha.27

package/dist/def/addEdges.js

@@ -1,9 +1,11 @@
 import { getPropType } from '../index.js';
 import { DEFAULT_MAP } from './defaultMap.js';
+import { fillEmptyMain } from './fillEmptyMain.js';
 import { TYPE_INDEX_MAP, REFERENCES, REFERENCE, ENUM, NUMBER, } from './types.js';
 import { getPropLen, isSeparate, parseMinMaxStep } from './utils.js';
 import { defaultValidation, VALIDATION_MAP } from './validation.js';
 export const addEdges = (prop, refProp) => {
+    const mainEdges = [];
     for (const key in refProp) {
         if (key[0] === '$') {
             if (!prop.edges) {
@@ -21,6 +23,9 @@ export const addEdges = (prop, refProp) => {
                 prop.edgesSeperateCnt++;
             }
             const typeIndex = TYPE_INDEX_MAP[edgeType];
+            if (edgeProp.default !== undefined) {
+                prop.hasDefaultEdges = true;
+            }
             // add default
             const edge = {
                 __isPropDef: true,
@@ -35,6 +40,9 @@ export const addEdges = (prop, refProp) => {
                 default: edgeProp.default ?? DEFAULT_MAP[typeIndex],
                 start: prop.edgeMainLen,
             };
+            if (!separate) {
+                mainEdges.push(edge);
+            }
             if (edgeProp.max !== undefined) {
                 edge.max = parseMinMaxStep(edgeProp.max);
             }
@@ -72,5 +80,6 @@ export const addEdges = (prop, refProp) => {
             }
         }
     }
+    prop.edgeMainEmpty = fillEmptyMain(mainEdges, prop.edgeMainLen);
 };
 //# sourceMappingURL=addEdges.js.map

package/dist/def/fillEmptyMain.d.ts

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

package/dist/def/fillEmptyMain.js

@@ -1,6 +1,5 @@
 import { convertToTimestamp } from '@saulx/utils';
 import { BINARY, BOOLEAN, ENUM, INT16, INT32, INT8, NUMBER, STRING, TIMESTAMP, UINT16, UINT32, UINT8, } 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);
@@ -12,14 +11,13 @@ export const fillEmptyMain = (vals, mainLen) => {
         const s = f.start;
         let val = f.default;
         if (t === ENUM) {
-            mainEmpty[s] =
-                typeof f.default === 'number' ? f.default : f.reverseEnum[val];
+            mainEmpty[s] = f.default ?? 0;
         }
         else if (t === INT8 || t === UINT8) {
             mainEmpty[s] = val;
         }
         else if (t === BOOLEAN) {
-            mainEmpty[s] = val === true ? 1 : 0;
+            mainEmpty[s] = val ? 1 : 0;
         }
         else if (t === UINT32 || t === INT32) {
             mainEmpty[s] = val;

package/dist/def/types.d.ts

@@ -86,6 +86,7 @@ export type PropDef = {
     transform?: Transform;
     default: any;
     edgeMainLen?: 0;
+    hasDefaultEdges?: boolean;
     reverseEnum?: {
         [key: string]: number;
     };

package/dist/serialize.js

@@ -50,8 +50,11 @@ const handleSingleValue = (ops, val, obj, prev, fromObject, key) => {
         schemaBuffer.len += val.byteLength;
     }
     else if (type === 'function') {
-        const str = val.toString();
-        // Pessimistically assume 4 bytes per char for UTF-8 to be safe.
+        // Support both arrow functions and methods (including shorthand method syntax)
+        let str = val.toString();
+        if (typeof val === 'function' && /^[a-zA-Z0-9_$]+\s*\(/.test(str)) {
+            str = 'function ' + str;
+        }
         ensureCapacity(1 + 2 + str.length * 4);
         schemaBuffer.buf[schemaBuffer.len] = FUNCTION;
         schemaBuffer.len += 1;
@@ -103,7 +106,7 @@ const handleSingleValue = (ops, val, obj, prev, fromObject, key) => {
             schemaBuffer.buf[schemaBuffer.len] = val;
             schemaBuffer.len += 1;
         }
-        else if ((val < 4294967295 || val > 0) && isInt) {
+        else if (val < 4294967295 && val > 0 && isInt) {
             ensureCapacity(5);
             schemaBuffer.buf[schemaBuffer.len] = UINT32;
             schemaBuffer.len += 1;

package/package.json

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