corebasic 1.0.187 → 1.0.189

package/libs/dip.js

@@ -12,7 +12,7 @@ export const batchBegin = Elabase.batchBegin
 export const batchAbort = Elabase.batchAbort
 export const batchSubmit = Elabase.batchSubmit
 export const batch = Elabase.batch
-export const global = Elabase.global
+export const globalMeta = Elabase.globalMeta
 
 export const shard_stats = Elabase.shard_stats
 export let config = Elabase.config

package/libs/elabase.js

@@ -1,5 +1,6 @@
 import axios from 'axios'
 import {default as dipper, shard_stats as ShardStats} from './dipper.js'
+import * as Utils from './utils.js'
 
 
 
@@ -10,13 +11,6 @@ export const shard_stats = ShardStats
 
 
 
-
-
-let Utils = {
-      isEmpty: function(arg) { return arg === "" || arg == undefined || !arg ? true : false },
-      requisites: { startElabase: function () { } }
-}
-
 let Events = {
     send: function() { }
 }
@@ -46,15 +40,15 @@ let internal = {
 
 let db = internal.db // default database
 
+
 export function start(dbName) {
     if (!Utils.isEmpty(dbName) && Utils.isEmpty(db)) {
         internal.db = "data/" + dbName
         db = "data/" + dbName
-        Utils.requisites.startElabase()
     }
 }
 
-export const global = args => {
+export const globalMeta = args => {
     let obj = { ...args, company: "GLOBAL", outlet: "GLOBAL" }
     return {
         ...obj,
@@ -168,6 +162,63 @@ export function batchSubmit(batch, arg) {
     })
 }
 
+
+const COLLECTIONS_JSON = await (async () => {
+    try {
+        return await Utils.fileToJson(new URL('../../..', import.meta.url), 'collections.json')
+    } catch(e) {
+        console.error(e)
+        console.warn("Warn: Dip Failed to load collections.json. Semantics, topology and legality enforcement is not active")
+    }
+})();
+
+function init_collections_config() {
+    for (let collection in COLLECTIONS_JSON) {
+        let config = COLLECTIONS_JSON[collection]
+        if (config.suffix !== undefined && (typeof config.suffix !== "object" || Array.isArray(config.suffix)) ) {
+            throw {message: `Error: Initiating collection configs failed. Invalid suffix in collection: ${collection}`}
+        }
+    }
+}
+if (COLLECTIONS_JSON)
+    init_collections_config()
+
+
+function validate_topology(meta, collection, fn_name) {
+
+    let new_meta = meta
+
+    let config = COLLECTIONS_JSON?.[collection]
+    if (!config) {
+        console.warn(`Warn: Nonexistant config for collection: ${collection}${fn_name ? ` in ${fn_name}` : ''}`)
+        return new_meta
+    }
+
+    function check_core_meta(config, meta, suffix) {
+        if (config.company !== meta.company && typeof config.company !== "object")
+            throw {message: `Error: Incompatible meta.company config for collection: ${collection}${suffix ? ' suffix: ' + suffix : ''}${fn_name ? ` in ${fn_name}` : ''}`}
+            if (config.outlet !== meta.outlet && typeof config.outlet !== "object") {
+                Utils.log(config, meta)
+                throw {message: `Error: Incompatible meta.outlet config for collection: ${collection}${suffix ? ' suffix: ' + suffix : ''}${fn_name ? ` in ${fn_name}` : ''}`}
+            }
+    }
+
+    check_core_meta(config, meta)
+
+    if (config.suffix && meta.suffix) {
+        if (!config.suffix[meta.suffix]) {
+            console.warn(`Warn: Nonexistant suffix config for collection: ${collection} suffix:${meta.suffix}${fn_name ? ` in ${fn_name}` : ''}`)
+            return new_meta
+        }
+        check_core_meta(config.suffix[meta.suffix], meta, meta.suffix)
+        new_meta = Object.assign({}, {...config, suffix: undefined, company: undefined, outlet: undefined}, {...config.suffix[meta.suffix], company: undefined, outlet: undefined}, meta)
+    } else {
+        new_meta = Object.assign({}, {...config, suffix: undefined, company: undefined, outlet: undefined}, {company: undefined, outlet: undefined}, meta)
+    }
+
+    return new_meta
+}
+
 export const operation = async (name, extras) => {
     return execute({ operation: name, ...extras })
 }
@@ -179,6 +230,8 @@ export const insert = async (meta, collection, value, _id, extras) => {
 
     validate_meta(meta, 'in Dip.insert()')
 
+    const topology_meta = validate_topology(meta, collection, 'in Dip.insert()')
+
     var arg = {
         collection: collection,
         suffix: generate_suffix(meta),
@@ -187,6 +240,7 @@ export const insert = async (meta, collection, value, _id, extras) => {
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
+    arg = Object.assign({}, topology_meta, arg)
     if (_id)
         arg._id = _id
 
@@ -217,6 +271,8 @@ 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()')
+
     var arg = {
         collection: collection,
         suffix: generate_suffix(meta),
@@ -226,6 +282,7 @@ export const query = async (meta, collection, query, options, extras) => {
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
+    arg = Object.assign({}, topology_meta, arg)
     if (meta.batch) {
         if (!batches[meta.batch])
             throw {message: 'Error: Invalid batch in Dip.query()'}
@@ -261,6 +318,8 @@ 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()')
+
     var arg = {
         collection: collection,
         suffix: generate_suffix(meta),
@@ -271,6 +330,7 @@ export const update = async (meta, collection, query, update, options, extras) =
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
+    arg = Object.assign({}, topology_meta, arg)
     if (meta.batch) {
         if (!batches[meta.batch])
             throw {message: 'Error: Invalid batch in Dip.update()'}
@@ -295,6 +355,8 @@ 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()')
+
     var arg = {
         collection: collection,
         suffix: generate_suffix(meta),
@@ -305,6 +367,7 @@ export const remove = async (meta, collection, query, options, extras) => {
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
+    arg = Object.assign({}, topology_meta, arg)
     if (meta.batch) {
         if (!batches[meta.batch])
             throw {message: 'Error: Invalid batch in Dip.query()'}

package/package.json

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