corebasic 1.0.223 → 1.0.225

package/dist/libs/dip/suffix/suffix.js

@@ -79,8 +79,11 @@ export async function suffix(doc, policies, insertMode, arg) {
         if (!keys.length && !insertMode) {
             ls = true;
             for (const suffix of suffixes) {
-                const dirs = (await Dip.operation("ls", { db: arg.db, collection: arg.collection, suffix })).filter(dir => !dir.startsWith('chunk-'));
-                suffixAssociatedKeys[suffix] = dirs;
+                for (const collection of arg.collection) {
+                    const dirs = (await Dip.operation("ls", { db: arg.db, collection: collection, suffix })).filter(dir => !dir.startsWith('chunk-'));
+                    suffixAssociatedKeys[suffix] = suffixAssociatedKeys[suffix] ?? [];
+                    suffixAssociatedKeys[suffix].push(...dirs);
+                }
             }
             console.warn(`Warn: Query omitted suffix policy key ${policy.key} in Dip. Falling back to Dip.operation(ls), incurring additional performance and network round-trip overhead.`);
         }

package/dist/libs/dip/suffix/tests/suffix.test.js

@@ -1,9 +1,10 @@
 import { describe, test } from "node:test";
 import assert from "node:assert/strict";
 import { suffix } from "../suffix.js";
+const arg = { db: "test-db", collection: ["test-collection"] };
 describe("suffix()", () => {
     test("returns empty suffixes when no policies exist", async () => {
-        const result = await suffix({}, [], true, {});
+        const result = await suffix({}, [], true, arg);
         assert.deepEqual(result, []);
     });
     test("generates string suffix from fixed value", async () => {
@@ -12,7 +13,7 @@ describe("suffix()", () => {
                 type: "string",
                 value: "hello"
             }
-        ], true, {});
+        ], true, arg);
         assert.deepEqual(result, [
             "/hello"
         ]);
@@ -23,7 +24,7 @@ describe("suffix()", () => {
                 type: "string",
                 value: "  hello  "
             }
-        ], true, {});
+        ], true, arg);
         assert.deepEqual(result, [
             "/hello"
         ]);
@@ -34,7 +35,7 @@ describe("suffix()", () => {
                 type: "string",
                 value: " "
             }
-        ], true, {}));
+        ], true, arg));
     });
     test("uses document key for string policy", async () => {
         const result = await suffix({
@@ -44,7 +45,7 @@ describe("suffix()", () => {
                 type: "string",
                 key: "name"
             }
-        ], true, {});
+        ], true, arg);
         assert.deepEqual(result, [
             "/alice"
         ]);
@@ -62,7 +63,7 @@ describe("suffix()", () => {
                 type: "number",
                 key: "year"
             }
-        ], true, {});
+        ], true, arg);
         assert.deepEqual(result, [
             "/books/2026"
         ]);
@@ -79,7 +80,7 @@ describe("suffix()", () => {
                 type: "string",
                 key: "tags"
             }
-        ], true, {});
+        ], true, arg);
         assert.deepEqual(result.sort(), [
             "/a",
             "/b",
@@ -94,7 +95,7 @@ describe("suffix()", () => {
                 type: "number",
                 key: "age"
             }
-        ], true, {});
+        ], true, arg);
         assert.deepEqual(result, [
             "/42"
         ]);
@@ -105,7 +106,7 @@ describe("suffix()", () => {
                 type: "boolean",
                 value: true
             }
-        ], true, {}));
+        ], true, arg));
     });
     test("defaults type to string", async () => {
         const result = await suffix({
@@ -114,7 +115,7 @@ describe("suffix()", () => {
             {
                 key: "id"
             }
-        ], true, {});
+        ], true, arg);
         assert.deepEqual(result, [
             "/abc"
         ]);
@@ -127,7 +128,7 @@ describe("suffix()", () => {
                 type: "date",
                 key: "created"
             }
-        ], true, {}));
+        ], true, arg));
     });
     test("rejects date format containing slash", async () => {
         await assert.rejects(() => suffix({
@@ -137,7 +138,7 @@ describe("suffix()", () => {
                 type: "date:YYYY/MM/DD",
                 key: "created"
             }
-        ], true, {}));
+        ], true, arg));
     });
     test("formats date suffix", async () => {
         const result = await suffix({
@@ -147,7 +148,7 @@ describe("suffix()", () => {
                 type: "date:YYYY-MM-DD",
                 key: "created"
             }
-        ], true, {});
+        ], true, arg);
         assert.deepEqual(result, [
             "/2026-07-09"
         ]);
@@ -164,7 +165,7 @@ describe("suffix()", () => {
                 type: "string",
                 key: "tags"
             }
-        ], true, {});
+        ], true, arg);
         assert.deepEqual(result.sort(), [
             "/a",
             "/b"
@@ -176,7 +177,7 @@ describe("suffix()", () => {
                 type: "string",
                 key: "missing"
             }
-        ], true, {}));
+        ], true, arg));
     });
     test("number range expands inclusive bounds", async () => {
         const result = await suffix({
@@ -189,7 +190,7 @@ describe("suffix()", () => {
                 type: "number",
                 key: "score"
             }
-        ], true, {});
+        ], true, arg);
         assert.deepEqual(result.sort(), [
             "/1",
             "/2",
@@ -209,7 +210,7 @@ describe("suffix()", () => {
                 min: 5,
                 max: 7
             }
-        ], true, {});
+        ], true, arg);
         assert.deepEqual(result.sort(), ["/1", "/2"]);
     });
     test("number range uses policy max fallback", async () => {
@@ -223,7 +224,7 @@ describe("suffix()", () => {
                 key: "score",
                 max: 7
             }
-        ], true, {});
+        ], true, arg);
         assert.deepEqual(result.sort(), ["/5", "/6", "/7"]);
     });
     test("number range uses policy min fallback", async () => {
@@ -237,7 +238,7 @@ describe("suffix()", () => {
                 key: "score",
                 min: 5
             }
-        ], true, {});
+        ], true, arg);
         assert.deepEqual(result.sort(), ["/5", "/6", "/7"]);
     });
     test("date range expands dates", async () => {
@@ -251,7 +252,7 @@ describe("suffix()", () => {
                 type: "date:YYYY-MM-DD",
                 key: "created"
             }
-        ], true, {});
+        ], true, arg);
         assert.deepEqual(result.sort(), [
             "/2026-01-01",
             "/2026-01-02",
@@ -270,7 +271,7 @@ describe("suffix()", () => {
                 key: "value",
                 ls_threshold: 5
             }
-        ], true, {}));
+        ], true, arg));
     });
     test("throws when ls threshold exceeded for date range", async () => {
         await assert.rejects(() => suffix({
@@ -284,7 +285,7 @@ describe("suffix()", () => {
                 key: "created",
                 ls_threshold: 2
             }
-        ], true, {}));
+        ], true, arg));
     });
     test("creates cartesian product for multiple suffix values", async () => {
         const result = await suffix({
@@ -305,7 +306,7 @@ describe("suffix()", () => {
                 type: "number",
                 key: "b"
             }
-        ], true, {});
+        ], true, arg);
         assert.deepEqual(result.sort(), [
             "/x/1",
             "/x/2",

package/dist/libs/elabase.js

@@ -133,7 +133,7 @@ let batches = {};
 // Ported
 export function batchBegin() {
     const uid = ++BATCH_COUNTER; // Safe. No skew in async ++BATCH_COUNTER as single thread and ++COUNTER is atomic in event loop sense. ⚠️ Only breaks on worker_threads or cluster (multi-process)
-    batches[uid] = [];
+    batches[uid.toString()] = [];
     return uid;
 }
 // Ported
@@ -264,15 +264,18 @@ export const insert = async (meta, collection, value, options, extras) => {
     validate_meta(meta, 'in Dip.insert()');
     const topology_meta = validate_topology(meta, collection, 'in Dip.insert()'); // TODO: loop for arrays
     let arg = {
-        collection: collection,
+        collection: typeof collection === "string" ? [collection] : collection,
         insert: value,
         options: options ? options : {},
         syncMode: meta.syncMode,
+        db: extras?.db ?? meta?.db ?? db,
         ...(meta.DIP_URL ? { DIP_URL: meta.DIP_URL } : {}),
         ...(meta.DIP_DB ? { db: meta.DIP_DB } : {}),
+        suffix: [],
+        executor: "native",
     };
     arg = Object.assign(arg, extras);
-    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.insert, true, arg);
+    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.insert, true, { db: arg.db, collection: arg.collection });
     let suffix_from_meta = generate_suffix(meta);
     arg.suffix = (suffix_from_meta.length ? suffix_from_meta : [""]).flatMap(meta => (suffix_from_policy.length ? suffix_from_policy : [""]).map(policy => meta + policy));
     arg.executor = meta.executor ?? "native";
@@ -302,15 +305,18 @@ export const query = async (meta, collection, query, options, extras) => {
     validate_meta(meta, 'in Dip.query()');
     const topology_meta = validate_topology(meta, collection, 'in Dip.query()'); // TODO: loop for arrays
     let arg = {
-        collection: collection,
+        collection: typeof collection === "string" ? [collection] : collection,
         query: query,
         options: options ? options : {},
         syncMode: meta.syncMode,
+        db: extras?.db ?? meta?.db ?? db,
         ...(meta.DIP_URL ? { DIP_URL: meta.DIP_URL } : {}),
         ...(meta.DIP_DB ? { db: meta.DIP_DB } : {}),
+        suffix: [],
+        executor: "native",
     };
     arg = Object.assign(arg, extras);
-    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, arg);
+    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, { db: arg.db, collection: arg.collection });
     let suffix_from_meta = generate_suffix(meta);
     arg.suffix = (suffix_from_meta.length ? suffix_from_meta : [""]).flatMap(meta => (suffix_from_policy.length ? suffix_from_policy : [""]).map(policy => meta + policy));
     arg.executor = meta.executor ?? "native";
@@ -348,16 +354,19 @@ export const update = async (meta, collection, query, update, options, extras) =
     validate_meta(meta, 'in Dip.update()');
     const topology_meta = validate_topology(meta, collection, 'in Dip.update()'); // TODO: loop for arrays
     let arg = {
-        collection: collection,
+        collection: typeof collection === "string" ? [collection] : collection,
         query: query,
         update: update,
         options: options ? options : {},
         syncMode: meta.syncMode,
+        db: extras?.db ?? meta?.db ?? db,
         ...(meta.DIP_URL ? { DIP_URL: meta.DIP_URL } : {}),
         ...(meta.DIP_DB ? { db: meta.DIP_DB } : {}),
+        suffix: [],
+        executor: "native",
     };
     arg = Object.assign(arg, extras);
-    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, arg);
+    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, { db: arg.db, collection: arg.collection });
     let suffix_from_meta = generate_suffix(meta);
     arg.suffix = (suffix_from_meta.length ? suffix_from_meta : [""]).flatMap(meta => (suffix_from_policy.length ? suffix_from_policy : [""]).map(policy => meta + policy));
     arg.executor = meta.executor ?? "native";
@@ -385,16 +394,19 @@ export const remove = async (meta, collection, query, options, extras) => {
     validate_meta(meta, 'in Dip.remove()');
     const topology_meta = validate_topology(meta, collection, 'in Dip.remove()'); // TODO: loop for arrays
     let arg = {
-        collection: collection,
+        collection: typeof collection === "string" ? [collection] : collection,
         query: query,
         options: options ? options : {},
         delete: true,
         syncMode: meta.syncMode,
+        db: extras?.db ?? meta?.db ?? db,
         ...(meta.DIP_URL ? { DIP_URL: meta.DIP_URL } : {}),
         ...(meta.DIP_DB ? { db: meta.DIP_DB } : {}),
+        suffix: [],
+        executor: "native",
     };
     arg = Object.assign(arg, extras);
-    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, arg);
+    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, { db: arg.db, collection: arg.collection });
     let suffix_from_meta = generate_suffix(meta);
     arg.suffix = (suffix_from_meta.length ? suffix_from_meta : [""]).flatMap(meta => (suffix_from_policy.length ? suffix_from_policy : [""]).map(policy => meta + policy));
     arg.executor = meta.executor ?? "native";
@@ -541,13 +553,13 @@ function convert_to_array_buffer(value) {
     return Essentials.stringToUtf8ArrayBuffer(JSON.stringify(value));
 }
 export function newRaw() {
-    let obj = { buffers: [], size: 0, hashes: {} };
-    obj.add = value => {
+    let obj = { buffers: [], size: 0, hashes: new Map() };
+    obj.add = (value) => {
         if (value === undefined)
             return undefined;
         const buf = (value instanceof ArrayBuffer) ? value : convert_to_array_buffer(value);
         const hash = Essentials.defaultHash(buf);
-        for (let item of obj.hashes[hash] ?? []) { // Conflict. Fallback to verify
+        for (const item of obj.hashes.get(hash) ?? []) { // Conflict. Fallback to verify
             if (Essentials.memcmpEqual(buf, item.buf))
                 return item.offset;
         }
@@ -555,8 +567,9 @@ export function newRaw() {
         obj.buffers.push({ buf, vlq });
         let offset = obj.size;
         obj.size += vlq.byteLength + buf.byteLength;
-        obj.hashes[hash] = obj.hashes[hash] ?? [];
-        obj.hashes[hash].push({ offset, buf });
+        if (!obj.hashes.get(hash))
+            obj.hashes.set(hash, []);
+        obj.hashes.get(hash).push({ offset, buf });
         return offset;
     };
     return obj;

package/dist/libs/utils.js

@@ -331,13 +331,22 @@ export function parseMob(mob, code) {
         return mob;
     mob = mob.trim().replace(/(,| |-|\+)/g, ''); // remove comma, space, hyphen and plus
     mob = mob.startsWith("0") ? mob.replace(/^0*/, '') : mob; // remove starting n zeroes
-    let prefix = Mobile.codes[code].phone;
+    const entry = Mobile.codes[code];
+    if (!entry)
+        throw new Error('Error: Invalid code in Utils.parseMob()');
+    let prefix = entry.phone;
     if (!mob.startsWith(prefix)) {
         mob = `${prefix}${mob}`;
     }
     else { // mob.startsWith(prefix)
-        if (mob.length < Mobile.codes[code].phoneLength + prefix.length) // mob just happens to start with prefix
-            mob = `${prefix}${mob}`;
+        const phoneLengthItems = typeof entry.phoneLength === "number" ? [entry.phoneLength] : entry.phoneLength;
+        for (const phoneLength of phoneLengthItems) {
+            if (mob.length < phoneLength + prefix.length) // mob just happens to start with prefix
+                return `${prefix}${mob}`;
+            else if (mob.length === phoneLength + prefix.length)
+                return mob;
+        }
+        throw new Error('Error: Mismatched phoneLength in Utils.parseMob()');
     }
     return mob;
 }

package/libs/cpp.ts

@@ -2,7 +2,7 @@
 import crypto from 'node:crypto';
 
 
-function readContent(buffer, valueRef, bytesRef) {
+function readContent(buffer: Uint8Array, valueRef, bytesRef) { // Buffer is assignable to Uint8Array so no need for Buffer | Uint8Array
     const MASK = 0x7F;
     const MSB = 0x80;
     const MAX_VLQ_BYTES = 10;

package/libs/dip/suffix/policy.ts

@@ -135,7 +135,7 @@ export function matchPolicy(query, when, g_obj?: Record<string, any>) {
 
 
 
-type Arg = { db?: string; collection?: string; [key: string]: any }
+type Arg = { db: string; collection: string[]; }
 
 export async function applySuffixPolicy(COLLECTIONS_JSON, collections, query, insertMode?: boolean, arg?: Arg) {
     collections = Array.isArray(collections) ? collections : [collections]

package/libs/dip/suffix/suffix.ts

@@ -2,7 +2,7 @@ import {entries, reduceRanges, extractBounds, getNormalizedBounds, type Bounds}
 import {formatDate, fillDates} from './date.ts'
 import * as Dip from '../../elabase.ts'
 
-type Arg = { db?: string; collection?: string; [key: string]: any }
+type Arg = { db: string; collection: string[]; }
 
 const EXPLICIT_SUFFIX_POLICY_TYPES = new Set([  "string", "date", "number" ]);
 export async function suffix(doc, policies, insertMode?: boolean, arg?: Arg) {
@@ -87,8 +87,11 @@ export async function suffix(doc, policies, insertMode?: boolean, arg?: Arg) {
         if (!keys.length && !insertMode) {
             ls = true
             for (const suffix of suffixes) {
-                const dirs = (await Dip.operation("ls", { db: arg.db, collection: arg.collection, suffix })).filter(dir => !dir.startsWith('chunk-'))
-                suffixAssociatedKeys[suffix] = dirs
+                for (const collection of arg.collection) {
+                    const dirs = (await Dip.operation("ls", { db: arg.db, collection: collection, suffix })).filter(dir => !dir.startsWith('chunk-'))
+                    suffixAssociatedKeys[suffix] = suffixAssociatedKeys[suffix] ?? []
+                    suffixAssociatedKeys[suffix].push(...dirs)
+                }
             }
             console.warn(`Warn: Query omitted suffix policy key ${policy.key} in Dip. Falling back to Dip.operation(ls), incurring additional performance and network round-trip overhead.`)
         }

package/libs/dip/suffix/tests/suffix.test.ts

@@ -3,6 +3,7 @@ import assert from "node:assert/strict";
 
 import { suffix } from "../suffix.ts";
 
+const arg = {db: "test-db", collection: ["test-collection"]}
 
 describe("suffix()", () => {
 
@@ -13,7 +14,7 @@ describe("suffix()", () => {
             {},
             [],
             true,
-            {}
+            arg
         );
 
         assert.deepEqual(result, []);
@@ -33,7 +34,7 @@ describe("suffix()", () => {
                 }
             ],
             true,
-            {}
+            arg
         );
 
 
@@ -59,7 +60,7 @@ describe("suffix()", () => {
                 }
             ],
             true,
-            {}
+            arg
         );
 
 
@@ -87,7 +88,7 @@ describe("suffix()", () => {
                         }
                     ],
                     true,
-                    {}
+                    arg
                 )
         );
 
@@ -108,7 +109,7 @@ describe("suffix()", () => {
                 }
             ],
             true,
-            {}
+            arg
         );
 
 
@@ -141,7 +142,7 @@ describe("suffix()", () => {
                 }
             ],
             true,
-            {}
+            arg
         );
 
 
@@ -173,7 +174,7 @@ describe("suffix()", () => {
                 }
             ],
             true,
-            {}
+            arg
         );
 
 
@@ -203,7 +204,7 @@ describe("suffix()", () => {
                 }
             ],
             true,
-            {}
+            arg
         );
 
 
@@ -231,7 +232,7 @@ describe("suffix()", () => {
                         }
                     ],
                     true,
-                    {}
+                    arg
                 )
         );
 
@@ -251,7 +252,7 @@ describe("suffix()", () => {
                 }
             ],
             true,
-            {}
+            arg
         );
 
 
@@ -281,7 +282,7 @@ describe("suffix()", () => {
                         }
                     ],
                     true,
-                    {}
+                    arg
                 )
         );
 
@@ -304,7 +305,7 @@ describe("suffix()", () => {
                         }
                     ],
                     true,
-                    {}
+                    arg
                 )
         );
 
@@ -325,7 +326,7 @@ describe("suffix()", () => {
                 }
             ],
             true,
-            {}
+            arg
         );
 
 
@@ -357,7 +358,7 @@ describe("suffix()", () => {
                 }
             ],
             true,
-            {}
+            arg
         );
 
 
@@ -386,7 +387,7 @@ describe("suffix()", () => {
                         }
                     ],
                     true,
-                    {}
+                    arg
                 )
         );
 
@@ -410,7 +411,7 @@ describe("suffix()", () => {
                 }
             ],
             true,
-            {}
+            arg
         );
 
 
@@ -445,7 +446,7 @@ describe("suffix()", () => {
                 }
             ],
             true,
-            {}
+            arg
         );
         assert.deepEqual(result.sort(), ["/1", "/2"]);
     });
@@ -466,7 +467,7 @@ describe("suffix()", () => {
                 }
             ],
             true,
-            {}
+            arg
         );
         assert.deepEqual(result.sort(), ["/5", "/6", "/7"]);
     });
@@ -486,7 +487,7 @@ describe("suffix()", () => {
                 }
             ],
             true,
-            {}
+            arg
         );
         assert.deepEqual(result.sort(), ["/5", "/6", "/7"]);
     });
@@ -507,7 +508,7 @@ describe("suffix()", () => {
                 }
             ],
             true,
-            {}
+            arg
         );
 
 
@@ -543,7 +544,7 @@ describe("suffix()", () => {
                         }
                     ],
                     true,
-                    {}
+                    arg
                 )
         );
 
@@ -570,7 +571,7 @@ describe("suffix()", () => {
                         }
                     ],
                     true,
-                    {}
+                    arg
                 )
         );
 
@@ -602,7 +603,7 @@ describe("suffix()", () => {
                 }
             ],
             true,
-            {}
+            arg
         );
 
 

package/libs/elabase.ts

@@ -173,7 +173,7 @@ let batches = {}
 // Ported
 export function batchBegin() { // Manual Lifecycle. If you forget to batchSubmit() or batchAbort(), then memory leak due to dangling batch
     const uid = ++BATCH_COUNTER; // Safe. No skew in async ++BATCH_COUNTER as single thread and ++COUNTER is atomic in event loop sense. ⚠️ Only breaks on worker_threads or cluster (multi-process)
-    batches[uid] = []
+    batches[uid.toString()] = []
     return uid
 }
 // Ported
@@ -310,6 +310,30 @@ export const operation = async (name, extras) => {
     return execute({ operation: name, ...extras })
 }
 
+type Options = {
+    upsert: boolean;
+    monotonic: boolean;
+    idempotent: boolean;
+    $orderby: any;
+    $fields: any;
+    _id?: string | number;
+}
+type InsertRequest = {
+    db: string;
+    executor: "native" | "raw";
+    collection: string[];
+    suffix: string | string[];
+    _id?: string | number;
+    insert: number | any;
+    options: Options;
+    syncMode: boolean;
+    DIP_URL?: string;
+    DIP_DB?: string;
+}
+
+type QueryRequest = Omit<InsertRequest, "_id" | "insert"> & { query: any }
+type UpdateRequest = Omit<InsertRequest, "insert"> & { query: any, update: any }
+type RemoveRequest = QueryRequest & { delete: true }
 
 // Ported
 export const insert = async (meta, collection, value, options?: any, extras?: any) => {
@@ -322,16 +346,19 @@ export const insert = async (meta, collection, value, options?: any, extras?: an
 
     const topology_meta = validate_topology(meta, collection, 'in Dip.insert()') // TODO: loop for arrays
 
-    let arg = {
-        collection: collection,
+    let arg: InsertRequest = {
+        collection: typeof collection === "string" ? [collection] : collection,
         insert: value,
         options: options ? options : {},
         syncMode: meta.syncMode,
+        db: extras?.db ?? meta?.db ?? db,
         ...(meta.DIP_URL ? {DIP_URL: meta.DIP_URL} : {}),
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
+        suffix: [],
+        executor: "native",
     }
     arg = Object.assign(arg, extras)
-    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.insert, true, arg)
+    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.insert, true, {db: arg.db, collection: arg.collection})
     let suffix_from_meta = generate_suffix(meta)
     arg.suffix = (suffix_from_meta.length ? suffix_from_meta : [""]).flatMap(meta => (suffix_from_policy.length ? suffix_from_policy : [""]).map(policy => meta + policy))
     arg.executor = meta.executor ?? "native"
@@ -366,16 +393,19 @@ export const query = async (meta, collection, query, options?: any, extras?: any
 
     const topology_meta = validate_topology(meta, collection, 'in Dip.query()') // TODO: loop for arrays
 
-    let arg = {
-        collection: collection,
+    let arg: QueryRequest = {
+        collection: typeof collection === "string" ? [collection] : collection,
         query: query,
         options: options ? options : {},
         syncMode: meta.syncMode,
+        db: extras?.db ?? meta?.db ?? db,
         ...(meta.DIP_URL ? {DIP_URL: meta.DIP_URL} : {}),
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
+        suffix: [],
+        executor: "native",
     }
     arg = Object.assign(arg, extras)
-    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, arg)
+    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, {db: arg.db, collection: arg.collection})
     let suffix_from_meta = generate_suffix(meta)
     arg.suffix = (suffix_from_meta.length ? suffix_from_meta : [""]).flatMap(meta => (suffix_from_policy.length ? suffix_from_policy : [""]).map(policy => meta + policy))
     arg.executor = meta.executor ?? "native"
@@ -418,17 +448,20 @@ export const update = async (meta, collection, query, update, options?: any, ext
 
     const topology_meta = validate_topology(meta, collection, 'in Dip.update()') // TODO: loop for arrays
 
-    let arg = {
-        collection: collection,
+    let arg: UpdateRequest = {
+        collection: typeof collection === "string" ? [collection] : collection,
         query: query,
         update: update,
         options: options ? options : {},
         syncMode: meta.syncMode,
+        db: extras?.db ?? meta?.db ?? db,
         ...(meta.DIP_URL ? {DIP_URL: meta.DIP_URL} : {}),
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
+        suffix: [],
+        executor: "native",
     }
     arg = Object.assign(arg, extras)
-    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, arg)
+    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, {db: arg.db, collection: arg.collection})
     let suffix_from_meta = generate_suffix(meta)
     arg.suffix = (suffix_from_meta.length ? suffix_from_meta : [""]).flatMap(meta => (suffix_from_policy.length ? suffix_from_policy : [""]).map(policy => meta + policy))
     arg.executor = meta.executor ?? "native"
@@ -461,17 +494,20 @@ export const remove = async (meta, collection, query, options?: any, extras?: an
 
     const topology_meta = validate_topology(meta, collection, 'in Dip.remove()') // TODO: loop for arrays
 
-    let arg = {
-        collection: collection,
+    let arg: RemoveRequest = {
+        collection: typeof collection === "string" ? [collection] : collection,
         query: query,
         options: options ? options : {},
         delete: true,
         syncMode: meta.syncMode,
+        db: extras?.db ?? meta?.db ?? db,
         ...(meta.DIP_URL ? {DIP_URL: meta.DIP_URL} : {}),
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
+        suffix: [],
+        executor: "native",
     }
     arg = Object.assign(arg, extras)
-    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, arg)
+    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, {db: arg.db, collection: arg.collection})
     let suffix_from_meta = generate_suffix(meta)
     arg.suffix = (suffix_from_meta.length ? suffix_from_meta : [""]).flatMap(meta => (suffix_from_policy.length ? suffix_from_policy : [""]).map(policy => meta + policy))
     arg.executor = meta.executor ?? "native"
@@ -657,14 +693,22 @@ function convert_to_array_buffer(value) {
 }
 
 export function newRaw() {
-    let obj = {buffers: [], size: 0, hashes:{}}
-    obj.add = value => {
+    type BufferItem = {buf: ArrayBuffer | Uint8Array; vlq: Uint8Array}
+    type HashItem = {buf: ArrayBuffer | Uint8Array; offset: number}
+    type RawManager = {
+        buffers: BufferItem[];
+        size: number;
+        hashes: Map<bigint, HashItem[]>;
+        add: (value: ArrayBuffer | string | number | any) => number;
+    }
+    let obj: RawManager = {buffers: [], size: 0, hashes: new Map()} as RawManager
+    obj.add = (value: ArrayBuffer | string | number | any): number => {
         if (value === undefined)
             return undefined
             const buf = (value instanceof ArrayBuffer) ? value : convert_to_array_buffer(value);
 
         const hash = Essentials.defaultHash(buf)
-        for (let item of obj.hashes[hash] ?? []) { // Conflict. Fallback to verify
+        for (const item of obj.hashes.get(hash) ?? []) { // Conflict. Fallback to verify
             if (Essentials.memcmpEqual(buf, item.buf))
                 return item.offset
         }
@@ -674,8 +718,10 @@ export function newRaw() {
         let offset = obj.size
         obj.size += vlq.byteLength + buf.byteLength;
 
-        obj.hashes[hash] = obj.hashes[hash] ?? []
-        obj.hashes[hash].push({offset, buf})
+
+        if (!obj.hashes.get(hash))
+            obj.hashes.set(hash, [])
+        obj.hashes.get(hash).push({offset, buf})
 
         return offset
     }
@@ -695,11 +741,11 @@ function buildHybridRequest(request) {
         if (item.update) {
             if ( item._id === undefined && item.options?.upsert && item.query?._id !== undefined)
                 item._id = item.query._id
-                item.update = raw.add(item.update)
+            item.update = raw.add(item.update)
         } else if (item.insert) {
             if (item._id === undefined && item.insert?._id !== undefined)
                 item._id = item.insert._id
-                item.insert = raw.add(item.insert)
+            item.insert = raw.add(item.insert)
         }
         item._id = raw.add(item._id)
 

package/libs/mobilecodes.ts

@@ -1,7 +1,10 @@
 
 // Found at https://gist.github.com/ally-commits/9073ff23fc7f96fab1290fdec22775bc
 
-export const codes = {
+type CountryItem = { code: string; label: string; phone: string; phoneLength: number | number[], min?: number, max?: number, suggested?: boolean }
+
+
+export const codes: Record<string, CountryItem> = {
   AD: { code: 'AD', label: 'Andorra', phone: '376', phoneLength: 6 },
   AE: {
     code: 'AE',

package/libs/utils.ts

@@ -280,72 +280,126 @@ export async function fileToJson(path, file) {
     let data = (await readFile(new URL(file, path).toString().replace('file://',''), 'utf8'))
     // return JSON.parse((JSON as Record<string, any>).minify(data))
 
-    const json_minify = function (json: string): string {
-
-        var tokenizer = /"|(\/\*)|(\*\/)|(\/\/)|\n|\r|\[|]/g,
-        in_string = false,
-        in_multiline_comment = false,
-        in_singleline_comment = false,
-        tmp, tmp2, new_str = [], ns = 0, from = 0, lc, rc,
-        prevFrom
-        ;
-
-        tokenizer.lastIndex = 0;
-
-        while ( tmp = tokenizer.exec(json) ) {
-            lc = RegExp.leftContext;
-            rc = RegExp.rightContext;
-            if (!in_multiline_comment && !in_singleline_comment) {
-                tmp2 = lc.substring(from);
-                if (!in_string) {
-                    tmp2 = tmp2.replace(/(\n|\r|\s)*/g,"");
-                }
-                new_str[ns++] = tmp2;
-            }
-            prevFrom = from;
-            from = tokenizer.lastIndex;
-
-            // found a " character, and we're not currently in
-            // a comment? check for previous `\` escaping immediately
-            // leftward adjacent to this match
-            if (tmp[0] === "\"" && !in_multiline_comment && !in_singleline_comment) {
-                // limit left-context matching to only go back
-                // to the position of the last token match
-                //
-                // see: https://github.com/getify/JSON.minify/issues/64
-                lc.lastIndex = prevFrom;
-
-                // perform leftward adjacent escaping match
-                tmp2 = lc.match(/(\\)*$/);
-                // start of string with ", or unescaped " character found to end string?
-                if (!in_string || !tmp2 || (tmp2[0].length % 2) === 0) {
-                    in_string = !in_string;
+    // import stripJsonComments from "strip-json-comments";
+    // ====================================================
+    const singleComment = Symbol('singleComment');
+    const multiComment = Symbol('multiComment');
+
+    const stripWithoutWhitespace = () => '';
+
+    // Replace all characters except ASCII spaces, tabs and line endings with regular spaces to ensure valid JSON output.
+    const stripWithWhitespace = (string, start, end?: number) => string.slice(start, end).replace(/[^ \t\r\n]/g, ' ');
+
+    const isEscaped = (jsonString, quotePosition) => {
+        let index = quotePosition - 1;
+        let backslashCount = 0;
+
+        while (jsonString[index] === '\\') {
+            index -= 1;
+            backslashCount += 1;
+        }
+
+        return Boolean(backslashCount % 2);
+    };
+
+    function stripJsonComments(jsonString, {whitespace = true, trailingCommas = false} = {}) {
+        if (typeof jsonString !== 'string') {
+            throw new TypeError(`Expected argument \`jsonString\` to be a \`string\`, got \`${typeof jsonString}\``);
+        }
+
+        const strip = whitespace ? stripWithWhitespace : stripWithoutWhitespace;
+
+        let isInsideString = false;
+        let isInsideComment: false | typeof singleComment | typeof multiComment = false;
+        // let isInsideComment = false;
+        let offset = 0;
+        let buffer = '';
+        let result = '';
+        let commaIndex = -1;
+
+        for (let index = 0; index < jsonString.length; index++) {
+            const currentCharacter = jsonString[index];
+            const nextCharacter = jsonString[index + 1];
+
+            if (!isInsideComment && currentCharacter === '"') {
+                // Enter or exit string
+                const escaped = isEscaped(jsonString, index);
+                if (!escaped) {
+                    isInsideString = !isInsideString;
                 }
-                from--; // include " character in next catch
-                rc = json.substring(from);
             }
-            else if (tmp[0] === "/*" && !in_string && !in_multiline_comment && !in_singleline_comment) {
-                in_multiline_comment = true;
-            }
-            else if (tmp[0] === "*/" && !in_string && in_multiline_comment && !in_singleline_comment) {
-                in_multiline_comment = false;
-            }
-            else if (tmp[0] === "//" && !in_string && !in_multiline_comment && !in_singleline_comment) {
-                in_singleline_comment = true;
-            }
-            else if ((tmp[0] === "\n" || tmp[0] === "\r") && !in_string && !in_multiline_comment && in_singleline_comment) {
-                in_singleline_comment = false;
+
+            if (isInsideString) {
+                continue;
             }
-            else if (!in_multiline_comment && !in_singleline_comment && !(/\n|\r|\s/.test(tmp[0]))) {
-                new_str[ns++] = tmp[0];
+
+            if (!isInsideComment && currentCharacter + nextCharacter === '//') {
+                // Enter single-line comment
+                buffer += jsonString.slice(offset, index);
+                offset = index;
+                isInsideComment = singleComment;
+                index++;
+            } else if (isInsideComment === singleComment && currentCharacter + nextCharacter === '\r\n') {
+                // Exit single-line comment via \r\n
+                index++;
+                isInsideComment = false;
+                buffer += strip(jsonString, offset, index);
+                offset = index;
+                continue;
+            } else if (isInsideComment === singleComment && currentCharacter === '\n') {
+                // Exit single-line comment via \n
+                isInsideComment = false;
+                buffer += strip(jsonString, offset, index);
+                offset = index;
+            } else if (!isInsideComment && currentCharacter + nextCharacter === '/*') {
+                // Enter multiline comment
+                buffer += jsonString.slice(offset, index);
+                offset = index;
+                isInsideComment = multiComment;
+                index++;
+                continue;
+            } else if (isInsideComment === multiComment && currentCharacter + nextCharacter === '*/') {
+                // Exit multiline comment
+                index++;
+                isInsideComment = false;
+                buffer += strip(jsonString, offset, index + 1);
+                offset = index + 1;
+                continue;
+            } else if (trailingCommas && !isInsideComment) {
+                if (commaIndex !== -1) {
+                    if (currentCharacter === '}' || currentCharacter === ']') {
+                        // Strip trailing comma
+                        buffer += jsonString.slice(offset, index);
+                        result += strip(buffer, 0, 1) + buffer.slice(1);
+                        buffer = '';
+                        offset = index;
+                        commaIndex = -1;
+                    } else if (currentCharacter !== ' ' && currentCharacter !== '\t' && currentCharacter !== '\r' && currentCharacter !== '\n') {
+                        // Hit non-whitespace following a comma; comma is not trailing
+                        buffer += jsonString.slice(offset, index);
+                        offset = index;
+                        commaIndex = -1;
+                    }
+                } else if (currentCharacter === ',') {
+                    // Flush buffer prior to this point, and save new comma index
+                    result += buffer + jsonString.slice(offset, index);
+                    buffer = '';
+                    offset = index;
+                    commaIndex = index;
+                }
             }
         }
-        new_str[ns++] = rc;
-        return new_str.join("");
+
+        const remaining = (isInsideComment === singleComment)
+        ? strip(jsonString, offset)
+        : jsonString.slice(offset);
+
+        return result + buffer + remaining;
     }
+    // ====================================================
 
 
-    return JSON.parse(json_minify(data))
+    return JSON.parse(stripJsonComments(data))
 }
 
 // ----------------
@@ -406,13 +460,23 @@ export function parseMob(mob: string, code: string): string {
     mob = mob.trim().replace(/(,| |-|\+)/g, '') // remove comma, space, hyphen and plus
     mob = mob.startsWith("0") ? mob.replace(/^0*/,'') : mob // remove starting n zeroes
 
-    let prefix = Mobile.codes[code].phone
+    const entry = Mobile.codes[code]
+    if (!entry)
+        throw new Error('Error: Invalid code in Utils.parseMob()')
+
+    let prefix = entry.phone
 
     if (!mob.startsWith(prefix)) {
         mob = `${prefix}${mob}`
     } else { // mob.startsWith(prefix)
-        if (mob.length < Mobile.codes[code].phoneLength + prefix.length) // mob just happens to start with prefix
-            mob = `${prefix}${mob}`
+        const phoneLengthItems = typeof entry.phoneLength === "number" ? [entry.phoneLength] : entry.phoneLength
+        for (const phoneLength of phoneLengthItems) {
+            if (mob.length < phoneLength + prefix.length) // mob just happens to start with prefix
+                return `${prefix}${mob}`
+            else if (mob.length === phoneLength + prefix.length)
+                return mob
+        }
+        throw new Error('Error: Mismatched phoneLength in Utils.parseMob()')
     }
     return mob
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "corebasic",
   "type": "module",
-  "version": "1.0.223",
+  "version": "1.0.225",
   "description": "",
   "main": "dist/index.js",
   "types": "./index.ts",