corebasic 1.0.181 → 1.0.183

package/libs/dip.js

@@ -8,10 +8,10 @@ export const query = Elabase.query
 export const update = Elabase.update
 export const remove = Elabase.remove
 
-export const transactionBegin = Elabase.transactionBegin
-export const transactionAbort = Elabase.transactionAbort
-export const transactionReset = Elabase.transactionReset
-export const transactionCommit = Elabase.transactionCommit
+export const batchBegin = Elabase.batchBegin
+export const batchAbort = Elabase.batchAbort
+export const batchReset = Elabase.batchReset
+export const batchSubmit = Elabase.batchSubmit
 
 export const shard_stats = Elabase.shard_stats
 export let config = Elabase.config

package/libs/elabase.js

@@ -54,74 +54,84 @@ export function start(dbName) {
     }
 }
 
-function generate_suffix(meta) {
+function validate_collection(collection, fn_name) {
+    if ((typeof collection === 'string' && collection.trim() === "") || (typeof collection !== 'string' && !Array.isArray(collection)) || (Array.isArray(collection) && (!collection.length || collection.some(item => typeof item !== "string" || item.trim() === "")))) {
+        throw {message: `Error: Invalid collection ${fn_name}`}
+    }
+}
 
+function validate_meta(meta, fn_name) {
     if (!meta || typeof meta !== 'object') {
-        throw {message: "Dip Error. Invalid meta"}
+        throw {message: `Error: Invalid meta ${fn_name}`}
     }
     if ((typeof meta.company === 'string' && meta.company.trim() === "") || (typeof meta.company !== 'string' && !Array.isArray(meta.company)) || (Array.isArray(meta.company) && (!meta.company.length || meta.company.some(item => typeof item !== "string"|| item.trim() === "")))) {
-        throw {message: "Dip Error. Invalid meta.company"}
+        throw {message: `Error: Invalid meta.company ${fn_name}`}
     }
     if ((typeof meta.outlet === 'string' && meta.outlet.trim() === "") || (typeof meta.outlet !== 'string' && !Array.isArray(meta.outlet)) || (Array.isArray(meta.outlet) && (!meta.outlet.length || meta.outlet.some(item => typeof item !== "string" || item.trim() === "")))) {
-        throw {message: "Dip Error. Invalid meta.outlet"}
+        throw {message: `Error: Invalid meta.outlet ${fn_name}`}
     }
     if ((meta.suffix !== undefined && typeof meta.suffix !== 'string' && !Array.isArray(meta.suffix)) || (Array.isArray(meta.suffix) && meta.suffix.some(item => typeof item !== "string" || item.trim() === ""))) {
-        throw {message: "Dip Error. Invalid meta.suffix"}
+        throw {message: `Error: Invalid meta.suffix ${fn_name}`}
     } else if (typeof meta.suffix === 'string' && meta.suffix.trim() === "")
-        throw {message: "Dip Error. Invalid meta.suffix"}
-
-
-        let company = typeof meta.company == 'string' ? [meta.company] : (meta.company?.length ? meta.company : [])
-        let outlet = typeof meta.outlet == 'string' ? [meta.outlet] : (meta.outlet?.length ? meta.outlet : [])
-        let suffix = typeof meta.suffix == 'string' ? [meta.suffix] : (meta.suffix?.length ? meta.suffix : [])
-
-        company = company.filter(item => item.trim() !== "")
-        outlet = outlet.filter(item => item.trim() !== "")
-        suffix = suffix.filter(item => item.trim() !== "")
-
-        company = company.length ? company : [""]
-        outlet = outlet.length ? outlet : [""]
-        suffix = suffix.length ? suffix : [""]
-
-        company = new Set(company)
-        outlet = new Set(outlet)
-        suffix = new Set(suffix)
-
-        // console.log(company, outlet, suffix)
-        let suffixes = []
-        for (let c of company) {
-            for (let o of outlet) {
-                for (let s of suffix) {
-                    let pathSegments = [c, o, s].filter(segment => segment !== "");
-                    if (pathSegments.length > 0) {
-                        suffixes.push(pathSegments.join('/'));
-                    }
+        throw {message: `Error: Invalid meta.suffix ${fn_name}`}
+}
+
+function generate_suffix(meta) {
+
+    // Assuming validate_meta() is called before reaching here. If not then this is intentional validation bypass
+
+    let company = typeof meta.company == 'string' ? [meta.company] : (meta.company?.length ? meta.company : [])
+    let outlet = typeof meta.outlet == 'string' ? [meta.outlet] : (meta.outlet?.length ? meta.outlet : [])
+    let suffix = typeof meta.suffix == 'string' ? [meta.suffix] : (meta.suffix?.length ? meta.suffix : [])
+
+    company = company.filter(item => item.trim() !== "")
+    outlet = outlet.filter(item => item.trim() !== "")
+    suffix = suffix.filter(item => item.trim() !== "")
+
+    company = company.length ? company : [""]
+    outlet = outlet.length ? outlet : [""]
+    suffix = suffix.length ? suffix : [""]
+
+    company = new Set(company)
+    outlet = new Set(outlet)
+    suffix = new Set(suffix)
+
+    // console.log(company, outlet, suffix)
+    let suffixes = []
+    for (let c of company) {
+        for (let o of outlet) {
+            for (let s of suffix) {
+                let pathSegments = [c, o, s].filter(segment => segment !== "");
+                if (pathSegments.length > 0) {
+                    suffixes.push(pathSegments.join('/'));
                 }
             }
         }
+    }
 
-        return suffixes
+    return suffixes
 }
 
-let isBranch = false
-let batches = []
+let BATCH_COUNTER = 0n;
+let batches = {}
 
 export function batchBegin() {
-    isBranch = true
-    batches = []
+    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] = []
+    return uid
 }
-export function batchAbort() {
-    isBranch = false
-    batches = []
+export function batchAbort(batch_id) {
+    delete batches[batch_id]
 }
 export function batchReset() {
     batchAbort()
 }
-export function batchSubmit(arg) {
-    let txns = batches
-    let mode = batches.some(txn => txn.insert || txn.update || txn.delete) ? "command" : "query"
-    isBranch = false
-    batches = []
+export function batchSubmit(batch_id, arg) {
+    if (!batch_id || !batches[batch_id] || !batches[batch_id].length)
+        throw {message: `Error: Invalid batch in Dip.batchSubmit()`}
+    let txns = batches[batch_id]
+    let mode = batches[batch_id].some(txn => txn.insert || txn.update || txn.delete) ? "command" : "query"
+    delete batches[batch_id]
     return new Promise((resolve, reject) => resolve())
     .then(() => execute({ "batch": txns, mode, version: arg?.version, compression: arg?.compression }))
     .then (result => {
@@ -136,16 +146,10 @@ export const operation = async (name, extras) => {
 
 
 export const insert = async (meta, collection, value, _id, extras) => {
-    if (typeof collection !== "string") throw {message: "Error: collection type is not string in Dip.insert()"}
-    // Multi Company Support
-    if (Utils.isEmpty(meta?.company)) throw {message: "Error: meta argument not provided in Dip.insert()"}
-    collection = `${meta.company}.${collection}`
-    if (meta.company !== "GLOBAL") {
-        if (typeof value === "object" && !Array.isArray(value))
-            value.company = meta.company
-    }
-    value.outlet = value.outlet ?? meta.outlet
-    // ---------------------
+
+    validate_collection(collection, 'in Dip.insert()')
+
+    validate_meta(meta, 'in Dip.insert()')
 
     var arg = {
         collection: collection,
@@ -164,8 +168,10 @@ export const insert = async (meta, collection, value, _id, extras) => {
         throw {message: "Error: invalid _id in Dip.insert()"}
 
 
-    if (isBranch) {
-        batches.push(arg)
+    if (meta.batch) {
+        if (!batches[meta.batch])
+            throw {message: 'Error: Invalid batch in Dip.insert()'}
+        batches[meta.batch].push(arg)
         return
     }
     arg.mode = "command"
@@ -178,18 +184,10 @@ export const insert = async (meta, collection, value, _id, extras) => {
 }
 
 export const query = async (meta, collection, query, options, extras) => {
-    if (typeof collection !== "string") throw {message: "Error: collection type is not string in Dip.query()"}
-    if (meta?.USE_EMPTY_COMPANY) {
-
-    } else {
-        // Multi Company Support
-        if (Utils.isEmpty(meta?.company)) throw {message: "Error: meta argument not provided in Dip.query()"}
-        collection = `${meta.company}.${collection}`
-        if (meta.company !== "GLOBAL")
-            query.company = meta.company
-    }
-    // ---------------------
 
+    validate_collection(collection, 'in Dip.query()')
+
+    validate_meta(meta, 'in Dip.query()')
 
     var arg = {
         collection: collection,
@@ -200,8 +198,10 @@ export const query = async (meta, collection, query, options, extras) => {
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
-    if (isBranch) {
-        batches.push(arg)
+    if (meta.batch) {
+        if (!batches[meta.batch])
+            throw {message: 'Error: Invalid batch in Dip.query()'}
+        batches[meta.batch].push(arg)
         return
     }
     arg.mode = "query"
@@ -228,27 +228,10 @@ function collectionArray(col) {
 
 
 export const update = async (meta, collection, query, update, options, extras) => {
-    // Multi Company Support
-    if (Utils.isEmpty(meta?.company)) throw {message: "Error: meta argument not provided in Dip.update()"}
-    if (typeof collection !== "string") throw {message: "Error: collection type is not string in Dip.update()"}
-    collection = `${meta.company}.${collection}`
-    if (meta.company !== "GLOBAL") {
-        query.company = meta.company
-        update.$set = update.$set ?? {}
-        update.$set.company = meta.company
-        if (options?.upsert) {
-            update.$setOnInsert = update.$setOnInsert ?? {}
-            update.$setOnInsert.company = meta.company
-            update.$setOnInsert.outlet = update.$setOnInsert.outlet ?? update.$set?.outlet ?? meta.outlet
-
-            let _id = update.$setOnInsert._id ?? update.$set?._id ?? query?._id
-            if (!(["string", "number"].includes(typeof _id)))
-                throw {message: "Error: invalid _id in Dip.update() with upsert"}
-            if (typeof _id === "string" && _id.trim().length === 0)
-                throw {message: "Error: invalid _id in Dip.update() with upsert"}
-        }
-    }
-    // ---------------------
+
+    validate_collection(collection, 'in Dip.update()')
+
+    validate_meta(meta, 'in Dip.update()')
 
     var arg = {
         collection: collection,
@@ -260,8 +243,10 @@ export const update = async (meta, collection, query, update, options, extras) =
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
-    if (isBranch) {
-        batches.push(arg)
+    if (meta.batch) {
+        if (!batches[meta.batch])
+            throw {message: 'Error: Invalid batch in Dip.update()'}
+        batches[meta.batch].push(arg)
         return
     }
     arg.mode = "command"
@@ -274,17 +259,13 @@ export const update = async (meta, collection, query, update, options, extras) =
 }
 
 export const remove = async (meta, collection, query, options, extras) => {
-    // Multi Company Support
-    if (Utils.isEmpty(meta?.company)) throw {message: "Error: meta argument not provided in Dip.remove()"}
-    if (typeof collection !== "string") throw {message: "Error: collection type is not string in Dip.remove()"}
-    collection = `${meta.company}.${collection}`
-    if (meta.company !== "GLOBAL")
-        query.company = meta.company
-    // ---------------------
-    if (Utils.isEmpty(query._id) && !meta.allowDangerousRemove) {
-        throw { message: "Error: Dip.remove() without _id blocked by default (Dangerous Operation). Set allowDangerousRemove key if intentional." }
-        return
-    }
+
+    validate_collection(collection, 'in Dip.remove()')
+
+    if (Utils.isEmpty(query._id) && !meta.allowDangerousRemove)
+        throw { message: "Error: Dip.remove() without _id blocked by default (Dangerous Operation). Set meta.allowDangerousRemove if intentional." }
+
+    validate_meta(meta, 'in Dip.remove()')
 
     var arg = {
         collection: collection,
@@ -296,8 +277,10 @@ export const remove = async (meta, collection, query, options, extras) => {
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
-    if (isBranch) {
-        batches.push(arg)
+    if (meta.batch) {
+        if (!batches[meta.batch])
+            throw {message: 'Error: Invalid batch in Dip.query()'}
+        batches[meta.batch].push(arg)
         return
     }
     arg.mode = "command"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "corebasic",
   "type": "module",
-  "version": "1.0.181",
+  "version": "1.0.183",
   "description": "",
   "main": "index.js",
   "scripts": {