@based/db 0.0.27 → 0.0.29

package/dist/src/client/modify/references/edge.js

@@ -6,7 +6,7 @@ import { getBuffer, writeBinaryRaw } from '../binary.js';
 import { ModifyError, ModifyState } from '../ModifyRes.js';
 import { DECREMENT, INCREMENT, RANGE_ERR, UPDATE, UPDATE_PARTIAL, } from '../types.js';
 import { appendFixedValue } from '../fixed.js';
-import { appendRefs } from './appendRefs.js';
+import { appendEdgeRefs } from './appendEdgeRefs.js';
 function valueOperation(value) {
     if (typeof value === 'object' && value !== null) {
         if (value.increment > 0) {
@@ -24,172 +24,194 @@ export function writeEdges(t, ref, ctx) {
     let mainFields;
     let mainSize = 0;
     let hasIncr = false;
-    for (const key in t.edges) {
-        if (key in ref) {
-            const edge = t.edges[key];
-            let value = ref[key];
-            if (edge.separate === true) {
-                if (ctx.len + 2 > ctx.max) {
-                    return RANGE_ERR;
+    for (const key in ref) {
+        if (key === 'id' || key === '$index') {
+            continue;
+        }
+        const edge = t.edges?.[key];
+        if (!edge) {
+            return new ModifyError(t, key, `Does not exist`);
+        }
+        let value = ref[key];
+        if (edge.separate === true) {
+            if (ctx.len + 2 > ctx.max) {
+                return RANGE_ERR;
+            }
+            ctx.buf[ctx.len++] = UPDATE;
+            ctx.buf[ctx.len++] = edge.prop;
+            /*
+                Seperate fields:
+      
+                | Offset  | Field       | Size (bytes)| Description                           |
+                |---------|-------------|-------------|---------------------------------------|
+                | 0       | modify op   | 1           | Modify operation identifier           |
+                | 1       | prop        | 1           | Field identifier                      |
+                | 2       | type        | 1           | Indicates MICRO_BUFFER type           |
+                | 3       | size        | 4           | Size of the data in bytes             |
+                | 7       | data        | Variable    | Content                               |
+              */
+            if (edge.typeIndex === BINARY) {
+                let size = 0;
+                // add null
+                if (value === null) {
+                    size = 0;
                 }
-                ctx.buf[ctx.len++] = UPDATE;
-                ctx.buf[ctx.len++] = edge.prop;
-                /*
-                  Seperate fields:
-        
-                  | Offset  | Field       | Size (bytes)| Description                           |
-                  |---------|-------------|-------------|---------------------------------------|
-                  | 0       | modify op   | 1           | Modify operation identifier           |
-                  | 1       | prop        | 1           | Field identifier                      |
-                  | 2       | type        | 1           | Indicates MICRO_BUFFER type           |
-                  | 3       | size        | 4           | Size of the data in bytes             |
-                  | 7       | data        | Variable    | Content                               |
-                */
-                if (edge.typeIndex === BINARY) {
-                    let size = 0;
-                    if (value === null) {
-                        size = 0;
-                    }
-                    else {
-                        const buf = getBuffer(value);
-                        if (!buf) {
-                            return new ModifyError(edge, value);
-                        }
-                        size = buf.byteLength;
-                    }
-                    if (ctx.len + EDGE_HEADER_SIZE + size > ctx.max) {
-                        return RANGE_ERR;
-                    }
-                    ctx.buf[ctx.len++] = STRING;
-                    if (size) {
-                        writeBinaryRaw(value, ctx);
-                    }
-                    else {
-                        ctx.buf[ctx.len++] = 0;
-                        ctx.buf[ctx.len++] = 0;
-                        ctx.buf[ctx.len++] = 0;
-                        ctx.buf[ctx.len++] = 0;
+                else {
+                    const buf = getBuffer(value);
+                    if (!buf || !edge.validation(buf, edge)) {
+                        return new ModifyError(edge, value);
                     }
+                    size = buf.byteLength;
+                    value = buf;
+                }
+                if (ctx.len + EDGE_HEADER_SIZE + size > ctx.max) {
+                    return RANGE_ERR;
+                }
+                ctx.buf[ctx.len++] = STRING;
+                if (size) {
+                    writeBinaryRaw(value, ctx);
+                }
+                else {
+                    ctx.buf[ctx.len++] = 0;
+                    ctx.buf[ctx.len++] = 0;
+                    ctx.buf[ctx.len++] = 0;
+                    ctx.buf[ctx.len++] = 0;
                 }
-                else if (edge.typeIndex === STRING) {
-                    if (typeof value !== 'string') {
+            }
+            else if (edge.typeIndex === STRING) {
+                let size = 0;
+                // add null
+                if (value !== null) {
+                    if (!edge.validation(value, edge)) {
                         return new ModifyError(edge, value);
                     }
-                    if (ctx.len + EDGE_HEADER_SIZE + ENCODER.encode(value).byteLength >
-                        ctx.max) {
+                    const isBuffer = value instanceof Uint8Array;
+                    size = isBuffer
+                        ? value.byteLength
+                        : ENCODER.encode(value).byteLength + 6;
+                    if (ctx.len + EDGE_HEADER_SIZE + size > ctx.max) {
                         return RANGE_ERR;
                     }
                     ctx.buf[ctx.len++] = STRING;
-                    let size = write(ctx.buf, value, ctx.len + 4, edge.compression === 0);
-                    let sizeU32 = size;
-                    ctx.buf[ctx.len++] = sizeU32;
-                    ctx.buf[ctx.len++] = sizeU32 >>>= 8;
-                    ctx.buf[ctx.len++] = sizeU32 >>>= 8;
-                    ctx.buf[ctx.len++] = sizeU32 >>>= 8;
-                    ctx.len += size;
+                    size = write(ctx.buf, value, ctx.len + 4, edge.compression === 0);
                 }
-                else if (edge.typeIndex === REFERENCE) {
-                    if (typeof value !== 'number') {
-                        if (value instanceof ModifyState) {
-                            value = value.tmpId;
-                        }
-                        else {
-                            return new ModifyError(edge, value);
-                        }
-                    }
-                    if (value > 0) {
-                        ctx.buf[ctx.len++] = REFERENCE;
-                        ctx.buf[ctx.len++] = value;
-                        ctx.buf[ctx.len++] = value >>>= 8;
-                        ctx.buf[ctx.len++] = value >>>= 8;
-                        ctx.buf[ctx.len++] = value >>>= 8;
+                let sizeU32 = size;
+                ctx.buf[ctx.len++] = sizeU32;
+                ctx.buf[ctx.len++] = sizeU32 >>>= 8;
+                ctx.buf[ctx.len++] = sizeU32 >>>= 8;
+                ctx.buf[ctx.len++] = sizeU32 >>>= 8;
+                ctx.len += size;
+            }
+            else if (edge.typeIndex === REFERENCE) {
+                // add null
+                if (typeof value !== 'number') {
+                    if (value instanceof ModifyState) {
+                        value = value.tmpId;
                     }
                     else {
                         return new ModifyError(edge, value);
                     }
                 }
-                else if (edge.typeIndex === REFERENCES) {
-                    if (!Array.isArray(value)) {
-                        return new ModifyError(edge, value);
-                    }
-                    let size = value.length * 4;
-                    if (ctx.len + EDGE_HEADER_SIZE + size > ctx.max) {
-                        return RANGE_ERR;
-                    }
-                    ctx.buf[ctx.len++] = REFERENCES;
-                    ctx.buf[ctx.len++] = size;
-                    ctx.buf[ctx.len++] = size >>>= 8;
-                    ctx.buf[ctx.len++] = size >>>= 8;
-                    ctx.buf[ctx.len++] = size >>>= 8;
-                    appendRefs(edge, ctx, value);
+                if (!edge.validation(value, edge)) {
+                    return new ModifyError(edge, value);
                 }
-                else if (edge.typeIndex === CARDINALITY) {
-                    if (!Array.isArray(value)) {
-                        value = [value];
-                    }
-                    const len = value.length;
-                    let size = 4 + len * 8;
-                    if (ctx.len + size + EDGE_HEADER_SIZE > ctx.max) {
-                        return RANGE_ERR;
-                    }
-                    ctx.buf[ctx.len++] = CARDINALITY;
-                    writeHllBuf(value, ctx, edge, size);
+                if (value > 0) {
+                    ctx.buf[ctx.len++] = REFERENCE;
+                    ctx.buf[ctx.len++] = value;
+                    ctx.buf[ctx.len++] = value >>>= 8;
+                    ctx.buf[ctx.len++] = value >>>= 8;
+                    ctx.buf[ctx.len++] = value >>>= 8;
+                }
+                else {
+                    return new ModifyError(edge, value);
                 }
             }
-            else {
-                const op = valueOperation(value);
-                if (op === 0) {
+            else if (edge.typeIndex === REFERENCES) {
+                // add null
+                if (!Array.isArray(value)) {
                     return new ModifyError(edge, value);
                 }
-                if (op != UPDATE) {
-                    hasIncr = true;
-                    value = value.increment;
+                let size = value.length * 4;
+                if (ctx.len + EDGE_HEADER_SIZE + size > ctx.max) {
+                    return RANGE_ERR;
                 }
-                if (!hasIncr && t.edgeMainLen == edge.len) {
-                    /*
-                    Full main update:
-          
-                    | Offset  | Field       | Size (bytes)| Description                           |
-                    |---------|-------------|-------------|---------------------------------------|
-                    | 0       | modify op   | 1           | Modify operation identifier           |
-                    | 1       | prop        | 1           | Field identifier (0)                  |
-                    | 2       | type        | 1           | Indicates MICRO_BUFFER type           |
-                    | 3       | mainSize    | 4           | Size of the main data in bytes        |
-                    | 7       | main buffer | Variable    | Main data content                     |
-                    */
-                    if (ctx.len + 7 + edge.len > ctx.max) {
-                        return RANGE_ERR;
-                    }
-                    ctx.buf[ctx.len++] = UPDATE;
-                    ctx.buf[ctx.len++] = 0;
-                    ctx.buf[ctx.len++] = MICRO_BUFFER;
-                    const size = edge.len;
-                    let sizeU32 = size;
-                    ctx.buf[ctx.len++] = sizeU32;
-                    ctx.buf[ctx.len++] = sizeU32 >>>= 8;
-                    ctx.buf[ctx.len++] = sizeU32 >>>= 8;
-                    ctx.buf[ctx.len++] = sizeU32 >>>= 8;
-                    const err = appendFixedValue(ctx, value, edge);
-                    if (err) {
-                        return err;
-                    }
+                ctx.buf[ctx.len++] = REFERENCES;
+                ctx.buf[ctx.len++] = size;
+                ctx.buf[ctx.len++] = size >>>= 8;
+                ctx.buf[ctx.len++] = size >>>= 8;
+                ctx.buf[ctx.len++] = size >>>= 8;
+                const err = appendEdgeRefs(edge, ctx, value);
+                if (err) {
+                    return err;
+                }
+            }
+            else if (edge.typeIndex === CARDINALITY) {
+                // add null
+                if (!Array.isArray(value)) {
+                    value = [value];
+                }
+                const len = value.length;
+                let size = 4 + len * 8;
+                if (ctx.len + size + EDGE_HEADER_SIZE > ctx.max) {
+                    return RANGE_ERR;
+                }
+                ctx.buf[ctx.len++] = CARDINALITY;
+                writeHllBuf(value, ctx, edge, size);
+            }
+        }
+        else {
+            const op = valueOperation(value);
+            if (op === 0) {
+                return new ModifyError(edge, value);
+            }
+            if (op != UPDATE) {
+                hasIncr = true;
+                value = value.increment;
+            }
+            if (!hasIncr && t.edgeMainLen == edge.len) {
+                /*
+                  Full main update:
+        
+                  | Offset  | Field       | Size (bytes)| Description                           |
+                  |---------|-------------|-------------|---------------------------------------|
+                  | 0       | modify op   | 1           | Modify operation identifier           |
+                  | 1       | prop        | 1           | Field identifier (0)                  |
+                  | 2       | type        | 1           | Indicates MICRO_BUFFER type           |
+                  | 3       | mainSize    | 4           | Size of the main data in bytes        |
+                  | 7       | main buffer | Variable    | Main data content                     |
+                  */
+                if (ctx.len + 7 + edge.len > ctx.max) {
+                    return RANGE_ERR;
+                }
+                ctx.buf[ctx.len++] = UPDATE;
+                ctx.buf[ctx.len++] = 0;
+                ctx.buf[ctx.len++] = MICRO_BUFFER;
+                const size = edge.len;
+                let sizeU32 = size;
+                ctx.buf[ctx.len++] = sizeU32;
+                ctx.buf[ctx.len++] = sizeU32 >>>= 8;
+                ctx.buf[ctx.len++] = sizeU32 >>>= 8;
+                ctx.buf[ctx.len++] = sizeU32 >>>= 8;
+                const err = appendFixedValue(ctx, value, edge);
+                if (err) {
+                    return err;
+                }
+            }
+            else {
+                mainSize += edge.len;
+                if (!mainFields) {
+                    mainFields = [edge, value, op];
                 }
                 else {
-                    mainSize += edge.len;
-                    if (!mainFields) {
-                        mainFields = [edge, value, op];
-                    }
-                    else {
-                        const len = mainFields.length;
-                        for (let i = 0; i < len; i += 3) {
-                            if (edge.start < mainFields[i].start) {
-                                mainFields.splice(i, 0, edge, value, op);
-                                break;
-                            }
-                            else if (mainFields[len - i - 3].start < edge.start) {
-                                mainFields.splice(len - i, 0, edge, value, op);
-                                break;
-                            }
+                    const len = mainFields.length;
+                    for (let i = 0; i < len; i += 3) {
+                        if (edge.start < mainFields[i].start) {
+                            mainFields.splice(i, 0, edge, value, op);
+                            break;
+                        }
+                        else if (mainFields[len - i - 3].start < edge.start) {
+                            mainFields.splice(len - i, 0, edge, value, op);
+                            break;
                         }
                     }
                 }
@@ -246,13 +268,6 @@ export function writeEdges(t, ref, ctx) {
             | 13      | propType    | 1           | Prop typeIndex                       |
             | ...     | ...         | ...         | Additional (start, len) pairs        |
             | X       | main        | len         | Actual main content                  |
-      
-            ### Notes:
-            - The number of `(start, len, operation)` pairs is not explicitly stored
-              but **derived** from the structure.
-            - Parsing logic must determine the end of pairs by computing:
-              `Pairs End Offset = (size - mainSize)`
-              Sections are processed until the `MAIN` data block begins.
             */
             const mainFieldsStartSize = mainFields.length * 2;
             if (ctx.len + 7 + mainSize + mainFieldsStartSize > ctx.max) {
@@ -261,48 +276,40 @@ export function writeEdges(t, ref, ctx) {
             ctx.buf[ctx.len++] = UPDATE_PARTIAL;
             ctx.buf[ctx.len++] = 0;
             ctx.buf[ctx.len++] = MICRO_BUFFER;
-            let sizeU32 = mainFieldsStartSize + t.edgeMainLen;
-            ctx.buf[ctx.len++] = sizeU32;
-            ctx.buf[ctx.len++] = sizeU32 >>>= 8;
-            ctx.buf[ctx.len++] = sizeU32 >>>= 8;
-            ctx.buf[ctx.len++] = sizeU32 >>>= 8;
-            let mainTotal = t.edgeMainLen;
-            ctx.buf[ctx.len++] = mainTotal;
-            ctx.buf[ctx.len++] = mainTotal >>>= 8;
+            const size = mainFieldsStartSize + t.edgeMainLen;
+            ctx.buf[ctx.len++] = size;
+            ctx.buf[ctx.len++] = size >>> 8;
+            ctx.buf[ctx.len++] = size >>> 16;
+            ctx.buf[ctx.len++] = size >>> 24;
+            ctx.buf[ctx.len++] = t.edgeMainLen;
+            ctx.buf[ctx.len++] = t.edgeMainLen >>> 8;
             // Index of start of fields
             const sIndex = ctx.len;
             ctx.len += mainFieldsStartSize;
-            // this has to be replaced
             // Add zeroes
             ctx.buf.fill(0, ctx.len, ctx.len + t.edgeMainLen);
             // Keep track of written bytes from append fixed
-            let writtenFields = 0;
-            // do this different...
             let startMain = ctx.len;
             for (let i = 0; i < mainFields.length; i += 3) {
                 const edge = mainFields[i];
                 const value = mainFields[i + 1];
                 const op = mainFields[i + 2];
-                const sIndexI = i + sIndex;
-                let start = edge.start;
-                ctx.buf[sIndexI] = start;
-                ctx.buf[sIndexI + 1] = start >>>= 8;
-                let len = edge.len;
-                ctx.buf[sIndexI + 2] = len;
-                ctx.buf[sIndexI + 3] = len >>>= 8;
+                const sIndexI = i * 2 + sIndex;
+                ctx.buf[sIndexI] = edge.start;
+                ctx.buf[sIndexI + 1] = edge.start >>> 8;
+                ctx.buf[sIndexI + 2] = edge.len;
+                ctx.buf[sIndexI + 3] = edge.len >>> 8;
                 ctx.buf[sIndexI + 4] = op;
                 ctx.buf[sIndexI + 5] = edge.typeIndex;
                 ctx.len = startMain + edge.start;
-                if (edge.start + edge.len > writtenFields) {
-                    writtenFields = edge.start + edge.len;
-                }
+                // Add null support (defaults)
                 const err = appendFixedValue(ctx, value, edge);
                 if (err) {
                     return err;
                 }
             }
-            // Correction to reuse append fixed value
-            ctx.len += t.edgeMainLen - writtenFields;
+            // Correction append fixed value writes the len
+            ctx.len = startMain + t.edgeMainLen;
         }
     }
 }

package/dist/src/client/modify/references/reference.js

@@ -1,6 +1,6 @@
 import { ModifyError, ModifyState } from '../ModifyRes.js';
 import { setCursor } from '../setCursor.js';
-import { DELETE, RANGE_ERR } from '../types.js';
+import { DELETE, RANGE_ERR, EDGE_NOINDEX_TMPID, NOEDGE_NOINDEX_TMPID, EDGE_NOINDEX_REALID, NOEDGE_INDEX_REALID, } from '../types.js';
 import { writeEdges } from './edge.js';
 import { dbUpdateFromUpsert } from './references.js';
 function writeRef(id, ctx, schema, def, parentId, modifyOp, hasEdges, isTmpId) {
@@ -11,10 +11,10 @@ function writeRef(id, ctx, schema, def, parentId, modifyOp, hasEdges, isTmpId) {
     setCursor(ctx, schema, def.prop, def.typeIndex, parentId, modifyOp);
     ctx.buf[ctx.len++] = modifyOp;
     if (isTmpId) {
-        ctx.buf[ctx.len++] = hasEdges ? 2 : 3;
+        ctx.buf[ctx.len++] = hasEdges ? EDGE_NOINDEX_TMPID : NOEDGE_NOINDEX_TMPID;
     }
     else {
-        ctx.buf[ctx.len++] = hasEdges ? 1 : 0;
+        ctx.buf[ctx.len++] = hasEdges ? EDGE_NOINDEX_REALID : NOEDGE_INDEX_REALID;
     }
     ctx.buf[ctx.len++] = id;
     ctx.buf[ctx.len++] = id >>>= 8;
@@ -42,7 +42,6 @@ function singleReferenceEdges(ref, ctx, schema, def, parentId, modifyOp) {
     // TODO SINGLE REF
     if (id > 0) {
         if (def.edgesSeperateCnt === 0 && def.edgeMainLen === 0) {
-            // edgeMainLen, edgesSeperateCnt
             return writeRef(id, ctx, schema, def, parentId, modifyOp, false, isTmpId);
         }
         else {
@@ -50,10 +49,7 @@ function singleReferenceEdges(ref, ctx, schema, def, parentId, modifyOp) {
             if (err) {
                 return err;
             }
-            // def.edgeMainLen
-            // const edgesLen = getEdgeSize(def, ref)
-            // edgeMainLen can be done better
-            // TODO REOMVE - SEEMS REDUNDANT
+            // TODO REMOVE - SEEMS REDUNDANT
             if (ctx.len + 4 > ctx.max) {
                 return RANGE_ERR;
             }

package/dist/src/client/modify/references/references.js

@@ -1,7 +1,7 @@
 import { REFERENCES } from '@based/schema/def';
 import { ModifyError, ModifyState } from '../ModifyRes.js';
 import { setCursor } from '../setCursor.js';
-import { DELETE, RANGE_ERR } from '../types.js';
+import { DELETE, EDGE_INDEX_REALID, EDGE_INDEX_TMPID, EDGE_NOINDEX_REALID, EDGE_NOINDEX_TMPID, NOEDGE_INDEX_REALID, NOEDGE_INDEX_TMPID, NOEDGE_NOINDEX_REALID, NOEDGE_NOINDEX_TMPID, RANGE_ERR, REF_OP_UPDATE, } from '../types.js';
 import { writeEdges } from './edge.js';
 export function writeReferences(value, ctx, schema, def, res, mod) {
     if (typeof value !== 'object') {
@@ -28,13 +28,9 @@ export function writeReferences(value, ctx, schema, def, res, mod) {
             err = deleteRefs(def, ctx, schema, mod, val, res.tmpId);
         }
         else if (key === 'update') {
-            // and add add: []
-            // replace this with update
             err = updateRefs(def, ctx, schema, mod, val, res.tmpId, 1);
         }
         else if (key === 'add') {
-            // and add add: []
-            // replace this with update
             err = updateRefs(def, ctx, schema, mod, val, res.tmpId, 1);
         }
         else if (key === 'upsert') {
@@ -104,7 +100,6 @@ function updateRefs(def, ctx, schema, mod, refs, parentId, op) {
     if (nrOrErr) {
         if (typeof nrOrErr === 'number') {
             if (nrOrErr === refs.length) {
-                // reset
                 ctx.len = initpos;
             }
             else if (ctx.len + 2 > ctx.max) {
@@ -128,7 +123,8 @@ function appendRefs(def, ctx, modifyOp, refs, op, remaining) {
     let i = refs.length - remaining;
     let totalpos = ctx.len;
     ctx.len += 4;
-    ctx.buf[ctx.len++] = i === 0 ? op : 1; // if it just did a PUT, it should ADD not overwrite the remaining
+    // if it just did a PUT, it should ADD not overwrite the remaining
+    ctx.buf[ctx.len++] = i === 0 ? op : REF_OP_UPDATE;
     ctx.buf[ctx.len++] = remaining;
     ctx.buf[ctx.len++] = remaining >>>= 8;
     ctx.buf[ctx.len++] = remaining >>>= 8;
@@ -183,12 +179,12 @@ function appendRefs(def, ctx, modifyOp, refs, op, remaining) {
         if (!def.validation(id, def)) {
             return new ModifyError(def, refs);
         }
-        if (hasEdges) {
+        if (hasEdges && typeof ref === 'object' && !(ref instanceof ModifyState)) {
             if (index === undefined) {
                 if (ctx.len + 9 > ctx.max) {
                     return RANGE_ERR;
                 }
-                ctx.buf[ctx.len++] = isTmpId ? 5 : 1;
+                ctx.buf[ctx.len++] = isTmpId ? EDGE_NOINDEX_TMPID : EDGE_NOINDEX_REALID;
                 ctx.buf[ctx.len++] = id;
                 ctx.buf[ctx.len++] = id >>>= 8;
                 ctx.buf[ctx.len++] = id >>>= 8;
@@ -198,7 +194,7 @@ function appendRefs(def, ctx, modifyOp, refs, op, remaining) {
                 if (ctx.len + 13 > ctx.max) {
                     return RANGE_ERR;
                 }
-                ctx.buf[ctx.len++] = isTmpId ? 6 : 2;
+                ctx.buf[ctx.len++] = isTmpId ? EDGE_INDEX_TMPID : EDGE_INDEX_REALID;
                 ctx.buf[ctx.len++] = id;
                 ctx.buf[ctx.len++] = id >>>= 8;
                 ctx.buf[ctx.len++] = id >>>= 8;
@@ -227,7 +223,9 @@ function appendRefs(def, ctx, modifyOp, refs, op, remaining) {
             if (ctx.len + 5 > ctx.max) {
                 return RANGE_ERR;
             }
-            ctx.buf[ctx.len++] = isTmpId ? 4 : 0;
+            ctx.buf[ctx.len++] = isTmpId
+                ? NOEDGE_NOINDEX_TMPID
+                : NOEDGE_NOINDEX_REALID;
             ctx.buf[ctx.len++] = id;
             ctx.buf[ctx.len++] = id >>>= 8;
             ctx.buf[ctx.len++] = id >>>= 8;
@@ -237,7 +235,7 @@ function appendRefs(def, ctx, modifyOp, refs, op, remaining) {
             if (ctx.len + 9 > ctx.max) {
                 return RANGE_ERR;
             }
-            ctx.buf[ctx.len++] = isTmpId ? 7 : 3;
+            ctx.buf[ctx.len++] = isTmpId ? NOEDGE_INDEX_TMPID : NOEDGE_INDEX_REALID;
             ctx.buf[ctx.len++] = id;
             ctx.buf[ctx.len++] = id >>>= 8;
             ctx.buf[ctx.len++] = id >>>= 8;
@@ -260,6 +258,9 @@ function appendRefs(def, ctx, modifyOp, refs, op, remaining) {
 }
 function putRefs(def, ctx, modifyOp, refs, op) {
     let size = refs.length * 4 + 1;
+    if (refs.length === 0) {
+        return 0;
+    }
     ctx.buf[ctx.len++] = modifyOp;
     ctx.buf[ctx.len++] = size;
     ctx.buf[ctx.len++] = size >>>= 8;
@@ -272,7 +273,7 @@ function putRefs(def, ctx, modifyOp, refs, op) {
         let ref = refs[i];
         if (typeof ref === 'number') {
             if (!def.validation(ref, def)) {
-                break;
+                return new ModifyError(def, ref);
             }
             else {
                 ctx.buf[ctx.len++] = ref;
@@ -286,9 +287,12 @@ function putRefs(def, ctx, modifyOp, refs, op) {
                 return ref.error;
             }
             ref = ref.getId();
-            if (!def.validation(ref, def)) {
+            if (!ref) {
                 break;
             }
+            if (!def.validation(ref, def)) {
+                return new ModifyError(def, ref);
+            }
             ctx.buf[ctx.len++] = ref;
             ctx.buf[ctx.len++] = ref >>>= 8;
             ctx.buf[ctx.len++] = ref >>>= 8;

package/dist/src/client/modify/string.js

@@ -25,9 +25,6 @@ export function writeString(lang, value, ctx, def, t, parentId, modifyOp) {
             ? value.byteLength
             : ENCODER.encode(value).byteLength + 6;
         if (ctx.len + 11 /* SIZE.DEFAULT_CURSOR */ + 11 + size > ctx.max) {
-            // +10 OR +11, the original check was +20 but
-            // there are 10 addtional bytes in this scope
-            // 5 compression size
             return RANGE_ERR;
         }
         if (modifyOp === CREATE) {

package/dist/src/client/modify/text.js

@@ -1,4 +1,3 @@
-import { langCodesMap } from '@based/schema';
 import { CREATE, UPDATE, RANGE_ERR, DELETE, } from './types.js';
 import { writeString } from './string.js';
 import { ModifyError } from './ModifyRes.js';
@@ -14,9 +13,18 @@ export function writeText(value, ctx, def, t, res, parentId, modifyOp) {
         }
         return;
     }
-    // todo proper fallback as well
     if ((value && typeof value !== 'object') || value === null) {
-        const locale = res.locale ?? langCodesMap.get('en'); // TODO: Add def lang option...
+        let locale = res.locale;
+        if (!locale) {
+            // TODO: Add def lang option...
+            for (const localeCode of def.seperateTextSort.localeToIndex.keys()) {
+                locale = localeCode;
+                break;
+            }
+        }
+        if (!def.seperateTextSort.localeToIndex.has(locale)) {
+            return new ModifyError(t, locale, 'Invalid locale');
+        }
         if (value == null) {
             // @ts-ignore
             value = '';

package/dist/src/client/modify/types.d.ts

@@ -26,3 +26,14 @@ export type ModifyOpts = {
     locale?: LangName;
     overwrite?: boolean;
 };
+export declare const NOEDGE_NOINDEX_REALID = 0;
+export declare const EDGE_NOINDEX_REALID = 1;
+export declare const EDGE_INDEX_REALID = 2;
+export declare const NOEDGE_INDEX_REALID = 3;
+export declare const NOEDGE_NOINDEX_TMPID = 4;
+export declare const EDGE_NOINDEX_TMPID = 5;
+export declare const EDGE_INDEX_TMPID = 6;
+export declare const NOEDGE_INDEX_TMPID = 7;
+export declare const REF_OP_UPDATE = 1;
+export declare const REF_OP_OVERWRITE = 0;
+export type REF_OP = typeof REF_OP_OVERWRITE | typeof REF_OP_UPDATE;

package/dist/src/client/modify/types.js

@@ -14,4 +14,14 @@ export const SWITCH_TYPE = 2;
 export const SWITCH_FIELD = 0;
 export const SWITCH_ID_CREATE = 9;
 export const SWITCH_ID_UPDATE = 1;
+export const NOEDGE_NOINDEX_REALID = 0;
+export const EDGE_NOINDEX_REALID = 1;
+export const EDGE_INDEX_REALID = 2;
+export const NOEDGE_INDEX_REALID = 3;
+export const NOEDGE_NOINDEX_TMPID = 4;
+export const EDGE_NOINDEX_TMPID = 5;
+export const EDGE_INDEX_TMPID = 6;
+export const NOEDGE_INDEX_TMPID = 7;
+export const REF_OP_UPDATE = 1;
+export const REF_OP_OVERWRITE = 0;
 //# sourceMappingURL=types.js.map