corebasic 1.0.180 → 1.0.182

package/libs/elabase.js

@@ -54,6 +54,63 @@ export function start(dbName) {
     }
 }
 
+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: `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: `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: `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: `Error: Invalid meta.suffix ${fn_name}`}
+    } else if (typeof meta.suffix === 'string' && meta.suffix.trim() === "")
+        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
+}
 
 let isBranch = false
 let batches = []
@@ -88,19 +145,14 @@ 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,
+        suffix: generate_suffix(meta),
         insert: value,
         ...(meta.DIP_URL ? {DIP_URL: meta.DIP_URL} : {}),
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
@@ -129,21 +181,14 @@ 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,
+        suffix: generate_suffix(meta),
         query: query,
         options: options ? options : {},
         ...(meta.DIP_URL ? {DIP_URL: meta.DIP_URL} : {}),
@@ -178,30 +223,14 @@ 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,
+        suffix: generate_suffix(meta),
         query: query,
         update: update,
         options: options ? options : {},
@@ -223,20 +252,17 @@ 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,
+        suffix: generate_suffix(meta),
         query: query,
         delete: true,
         options: options ? options : {},

package/package.json

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