corebasic 1.0.209 → 1.0.211

package/libs/dip/suffix/policy.js

@@ -136,18 +136,22 @@ export function matchPolicy(query, when, g_obj) {
 
 
 
-export async function applySuffixPolicy(COLLECTIONS_JSON, collection, query) {
-    const collection_policy = COLLECTIONS_JSON[collection]?.policy ?? []
-    const suffixPolicies = typeof collection_policy === "object" && !Array.isArray(collection_policy) ? [collection_policy] : COLLECTIONS_JSON[collection]?.policy ?? []
+export async function applySuffixPolicy(COLLECTIONS_JSON, collections, query, insertMode, arg) {
+    collections = Array.isArray(collections) ? collections : [collections]
     let suffixes = []
-    for (const policy of suffixPolicies) {
-        if (matchPolicy(query, policy.when ?? {})) {
-            // generate suffixes
-            const array = await suffix(query, policy.suffix ?? [])
-            suffixes.push(...array)
+
+    for (let collection of collections) {
+        const collection_policy = COLLECTIONS_JSON[collection]?.policy ?? []
+        const suffixPolicies = typeof collection_policy === "object" && !Array.isArray(collection_policy) ? [collection_policy] : COLLECTIONS_JSON[collection]?.policy ?? []
+        for (const policy of suffixPolicies) {
+            if (matchPolicy(query, policy.when ?? {})) {
+                // generate suffixes
+                const array = await suffix(query, policy.suffix ?? [], insertMode, arg)
+                suffixes.push(...array)
+            }
         }
+        suffixes = [...new Set(suffixes)];
     }
-    suffixes = [...new Set(suffixes)];
     return suffixes
 }
 

package/libs/dip/suffix/suffix.js

@@ -47,6 +47,8 @@ export async function suffix(doc, policies, insertMode, arg) {
                     console.warn(`Warn: Missing suffix policy min/max bound for ${policy_type} range specified for key ${policy.key} in Dip`)
                 } else {
                     ranges = fillDates({from, to, fromOp, toOp}, format)
+                    if (!ranges.length && policy.inferRange)
+                        ranges = [...new Set([from === undefined ? undefined : formatDate(from, format), to === undefined ? undefined : formatDate(to, format)].filter(item => item))]
                     // console.log(ranges)
                     if (ranges.length > ls_threshold) {
                         keys = [] // Too many suffixes to enumerate. Fall back to Dip.operation("ls").

package/libs/elabase.js

@@ -323,8 +323,9 @@ export const insert = async (meta, collection, value, options, extras) => {
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
-    arg.suffix = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.insert, true, arg)
-    arg.suffix = (arg.suffix ?? []).concat(generate_suffix(meta))
+    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.insert, true, arg)
+    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"
     arg = Object.assign({}, topology_meta, arg)
     if (options?._id) {
@@ -366,8 +367,9 @@ export const query = async (meta, collection, query, options, extras) => {
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
-    arg.suffix = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, arg)
-    arg.suffix = (arg.suffix ?? []).concat(generate_suffix(meta))
+    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, arg)
+    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"
     arg = Object.assign({}, topology_meta, arg)
     if (meta.batch) {
@@ -418,8 +420,9 @@ export const update = async (meta, collection, query, update, options, extras) =
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
-    arg.suffix = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, arg)
-    arg.suffix = (arg.suffix ?? []).concat(generate_suffix(meta))
+    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, arg)
+    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"
     arg = Object.assign({}, topology_meta, arg)
     if (meta.batch) {
@@ -460,8 +463,9 @@ export const remove = async (meta, collection, query, options, extras) => {
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
-    arg.suffix = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, arg)
-    arg.suffix = (arg.suffix ?? []).concat(generate_suffix(meta))
+    let suffix_from_policy = await applySuffixPolicy(COLLECTIONS_JSON, collection, arg.query, false, arg)
+    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"
     arg = Object.assign({}, topology_meta, arg)
     if (meta.batch) {

package/package.json

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