@based/schema 5.1.2 → 5.1.4

package/dist/dbSchema.js

@@ -6,7 +6,7 @@ function _makeEdgeTypes(newTypes, typeName, props, propPrefix) {
     for (const propName in props) {
         const prop = props[propName];
         const propType = getPropType(prop);
-        const nextPropPrefix = propPrefix ? `${propPrefix}.${propName}` : propName;
+        const nextPropPrefix = propPrefix ? `${propPrefix}_${propName}` : propName;
         if (propType === 'object') {
             _makeEdgeTypes(newTypes, typeName, prop.props, nextPropPrefix);
         }
@@ -16,7 +16,7 @@ function _makeEdgeTypes(newTypes, typeName, props, propPrefix) {
                 .filter((k) => k[0] === '$')
                 .forEach((k) => (edgeProps[k] = prop[k]));
             if (Object.keys(edgeProps).length > 0) {
-                putEdgeProps(`${typeName}.${nextPropPrefix}`, `${prop.ref}.${prop.prop}`, edgeProps);
+                putEdgeProps(`${typeName}_${nextPropPrefix}`, `${prop.ref}_${prop.prop}`, edgeProps);
             }
         }
         else if (propType === 'references') {
@@ -25,7 +25,7 @@ function _makeEdgeTypes(newTypes, typeName, props, propPrefix) {
                 .filter((k) => k[0] === '$')
                 .forEach((k) => (edgeProps[k] = prop.items[k]));
             if (Object.keys(edgeProps).length > 0) {
-                putEdgeProps(`${typeName}.${nextPropPrefix}`, `${prop.items.ref}.${prop.items.prop}`, edgeProps);
+                putEdgeProps(`${typeName}_${nextPropPrefix}`, `${prop.items.ref}_${prop.items.prop}`, edgeProps);
             }
         }
     }

package/dist/def/fillEmptyMain.js

@@ -11,7 +11,7 @@ export const fillEmptyMain = (vals, mainLen) => {
         const s = f.start;
         let val = f.default;
         if (t === ENUM) {
-            mainEmpty[s] = f.default ?? 0;
+            mainEmpty[s] = f.default ? (f.enum?.indexOf(f.default) ?? -1) + 1 : 0;
         }
         else if (t === INT8 || t === UINT8) {
             mainEmpty[s] = val;

package/dist/def/typeDef.js

@@ -52,7 +52,7 @@ export const updateTypeDefs = (schema) => {
                     // Update edgeNodeTypeId
                     if (!prop.edgeNodeTypeId) {
                         if (prop.edges) {
-                            const edgeTypeName = `_${[`${schema.type}.${prop.path.join('.')}`, `${dstType.type}.${dstType.props[prop.inversePropName].path.join('.')}`].sort().join(':')}`;
+                            const edgeTypeName = `_${[`${schema.type}_${prop.path.join('_')}`, `${dstType.type}_${dstType.props[prop.inversePropName].path.join('_')}`].sort().join(':')}`;
                             const edgeType = schemaTypesParsed[edgeTypeName];
                             prop.edgeNodeTypeId = edgeType.id;
                             dstType.props[prop.inversePropName].edgeNodeTypeId = edgeType.id;
@@ -201,6 +201,7 @@ const createSchemaTypeDef = (typeName, type, locales, result = createEmptyDef(ty
             prop.inversePropName = schemaProp.items.prop;
             prop.inverseTypeName = schemaProp.items.ref;
             prop.dependent = schemaProp.items.dependent;
+            prop.referencesCapped = schemaProp.capped ?? 0;
             addEdges(prop, schemaProp.items);
         }
         else if (isPropType('reference', schemaProp)) {

package/dist/def/types.d.ts

@@ -23,15 +23,16 @@ export type PropDef = {
     path: string[];
     start: number;
     len: number;
-    inverseTypeName?: string;
-    inversePropName?: string;
     compression?: 0 | 1;
-    inverseTypeId?: number;
-    inversePropNumber?: number;
     enum?: any[];
     dependent?: boolean;
     validation: Validation;
     default: any;
+    inverseTypeName?: string;
+    inversePropName?: string;
+    inverseTypeId?: number;
+    inversePropNumber?: number;
+    referencesCapped?: number;
     vectorBaseType?: VectorBaseType;
     vectorSize?: number;
     cardinalityMode?: number;

package/dist/parse/props.js

@@ -149,12 +149,12 @@ export const isDefault = (val, prop, ctx) => {
     if (!validation(val, tmpProp)) {
         throw new Error(`Incorrect default for type "${prop.type ?? 'enum'}"`);
     }
-    if ('enum' in prop) {
-        if (val === undefined) {
-            return 0;
-        }
-        return prop.enum.findIndex((v) => v === val) + 1;
-    }
+    // if ('enum' in prop) {
+    //   if (val === undefined) {
+    //     return 0
+    //   }
+    //   return prop.enum.findIndex((v) => v === val) + 1
+    // }
     return val;
 };
 p.boolean = propParser(STUB, {
@@ -276,6 +276,12 @@ p.references = propParser({
             throw new Error(INVALID_VALUE);
         }
     },
+    capped(val) {
+        if (val !== undefined &&
+            (typeof val !== 'number' || val < 0 || !Number.isInteger(val))) {
+            throw Error(INVALID_VALUE);
+        }
+    },
 }, {
     default(val, prop, ctx) {
         return isDefault(val, prop, ctx);

package/dist/types.d.ts

@@ -27,6 +27,7 @@ type NeverInItems = {
 export type SchemaReferences = Prop<{
     type?: 'references';
     default?: number[];
+    capped?: number;
     items: SchemaReference & NeverInItems;
 }>;
 export type SchemaReferencesOneWay = Prop<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/schema",
-  "version": "5.1.2",
+  "version": "5.1.4",
   "files": [
     "dist",
     "README.md",