corebasic 1.0.218 → 1.0.219

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

@@ -1,5 +1,6 @@
 import { entries, reduceRanges, extractBounds, getNormalizedBounds } from './index.js';
 import { formatDate, fillDates } from './date.js';
+import * as Dip from '../../elabase.js';
 const EXPLICIT_SUFFIX_POLICY_TYPES = new Set(["string", "date", "number"]);
 export async function suffix(doc, policies, insertMode, arg) {
     let suffixes = [""];
@@ -26,17 +27,17 @@ export async function suffix(doc, policies, insertMode, arg) {
         if (policy_type === "date") {
             keys = keys.map(key => formatDate(key, format));
             if (ranges.length) {
-                ranges = extractBounds(reduceRanges(ranges));
-                const from = ranges.from ?? policy.min; // policy.min is always inclusive i.e $gte
-                const to = ranges.to ?? policy.max; // policy.max is always inclusive i.e $lte
-                const fromOp = ranges.from ? ranges.fromOp : "$gte"; // policy.min is $gte
-                const toOp = ranges.to ? ranges.toOp : "$lte"; // policy.max is $lte
+                const bounds = extractBounds(reduceRanges(ranges));
+                const from = bounds.from ?? policy.min; // policy.min is always inclusive i.e $gte
+                const to = bounds.to ?? policy.max; // policy.max is always inclusive i.e $lte
+                const fromOp = bounds.from ? bounds.fromOp : "$gte"; // policy.min is $gte
+                const toOp = bounds.to ? bounds.toOp : "$lte"; // policy.max is $lte
                 if (from === undefined || to === undefined) {
                     keys = []; // Fall back to Dip.operation("ls").
                     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);
+                    let 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)
@@ -51,9 +52,9 @@ export async function suffix(doc, policies, insertMode, arg) {
             keys = [...new Set(keys)];
         }
         else if (policy_type === "number" && ranges.length) {
-            ranges = getNormalizedBounds(extractBounds(reduceRanges(ranges)), "number");
-            const from = ranges.from ?? policy.min; // policy.min is always inclusive i.e $gte
-            const to = ranges.to ?? policy.max; // policy.max is always inclusive i.e $lte
+            const bounds = getNormalizedBounds(extractBounds(reduceRanges(ranges)), "number");
+            const from = bounds.from ?? policy.min; // policy.min is always inclusive i.e $gte
+            const to = bounds.to ?? policy.max; // policy.max is always inclusive i.e $lte
             if (from === undefined || to === undefined) {
                 keys = []; // Fall back to Dip.operation("ls").
                 console.warn(`Warn: Missing suffix policy min/max bound for ${policy_type} range specified for key ${policy.key} in Dip`);

package/dist/libs/dipper.js

@@ -1,3 +1,4 @@
+// @ts-ignore
 import axios from 'axios';
 // import {curly} from 'node-libcurl'
 function hashStr(str) {
@@ -68,6 +69,6 @@ export default async function dipper(arg) {
 export const shard_stats = () => {
     let total = Object.values(shard_hits).reduce((partial, value) => partial + value, 0);
     let result = {};
-    Object.entries(shard_hits).forEach(([key, value]) => result[key] = parseFloat(value * 100 / total).toFixed(2));
+    Object.entries(shard_hits).forEach(([key, value]) => result[key] = (value * 100 / total).toFixed(2));
     return result;
 };

package/dist/libs/elabase.js

@@ -6,7 +6,7 @@ import * as Cpp from './cpp.js';
 import { applySuffixPolicy } from './dip/suffix/policy.js';
 export const shard_stats = ShardStats;
 let Events = {
-    send: function () { }
+    send: function (topic, data) { }
 };
 const url = process.env.DIP_URL || "http://127.0.0.1"; // Set DIP_URL to "http://dip" (Prod) or http://dip-dev (Dev) in CI/CD
 let port = process.env.DIP_PORT || 9401;
@@ -50,7 +50,7 @@ class DipMeta {
     }
 }
 export const isDipMeta = meta => meta instanceof DipMeta;
-export const globalMeta = args => {
+export const globalMeta = (args) => {
     return new DipMeta({ ...args, company: "GLOBAL", outlet: "GLOBAL" });
 };
 export const companyMeta = (company, args) => {

package/libs/dip/suffix/date.ts

@@ -1,4 +1,4 @@
-import {getNormalizedBounds} from './index.ts'
+import {getNormalizedBounds, type Bounds} from './index.ts'
 import {addUTCYears, addUTCMonths, addUTCDays} from '../../utils.ts'
 
 
@@ -94,7 +94,7 @@ export function fillDates(bounds_t, format) {
     else
         step = "year";
 
-    let bounds = { ...bounds_t, from: new Date(bounds_t.from), to: new Date(bounds_t.to) }
+    let bounds: Bounds = { ...bounds_t, from: new Date(bounds_t.from), to: new Date(bounds_t.to) }
 
     bounds = getNormalizedBounds(bounds, "date")
 
@@ -103,13 +103,13 @@ export function fillDates(bounds_t, format) {
 
         switch (step) {
             case "day":
-                addUTCDays(bounds.from, 1)
+                addUTCDays(bounds.from as Date, 1)
                 break;
             case "month":
-                addUTCMonths(bounds.from, 1)
+                addUTCMonths(bounds.from as Date, 1)
                 break;
             case "year":
-                addUTCYears(bounds.from, 1)
+                addUTCYears(bounds.from as Date, 1)
                 break;
         }
     }

package/libs/dip/suffix/index.ts

@@ -160,11 +160,19 @@ export function reduceRanges(values) {
     return other;
 }
 
+export type Bounds = {
+    values: any[],
+    from: number | string | Date;
+    to: number | string | Date;
+    fromOp: "$gt" | "$gte";
+    toOp: "$lt" | "$lte";
+}
+
 // reduceRanges() resolves conflicting bounds before extractBounds() runs.
 // extractBounds() receives at most one lower bound and atmost one upper bound. reduceRanges() ensures this
 // The for loop in extractBounds() may look slightly misleading because it looks like it is designed to resolve conflicts: but reduceRanges() has already done the conflict resolution.
 // NOTE CRITICAL: extractBounds() MUST ONLY BE RUN ON THE OUTPUT OF reduceRanges()
-export function extractBounds(values) {
+export function extractBounds(values): Bounds {
     let lower = null;
     let upper = null;
     let lowerOp = null
@@ -204,20 +212,20 @@ export function extractBounds(values) {
 }
 
 // Converts exclusive bounds ($gt/$lt) into inclusive bounds
-export function getNormalizedBounds(bounds_t, type) {
+export function getNormalizedBounds(bounds_t: Bounds, type): Bounds {
     let bounds = {...bounds_t}
 
     if (type === "number") {
         if (bounds.fromOp === "$gt")
-            bounds.from++;
+            (bounds.from as number)++;
         if (bounds.toOp === "$lt")
-            bounds.to--;
+            (bounds.to as number)--;
     } else if (type === "date") {
         if (bounds.fromOp === "$gt")
-            bounds.from = new Date(bounds.from.getTime() + 1);
+            bounds.from = new Date((bounds.from as Date).getTime() + 1);
 
         if (bounds.toOp === "$lt")
-            bounds.to = new Date(bounds.to.getTime() - 1);
+            bounds.to = new Date((bounds.to as Date).getTime() - 1);
     }
 
     return bounds

package/libs/dip/suffix/suffix.ts

@@ -1,5 +1,6 @@
-import {entries, reduceRanges, extractBounds, getNormalizedBounds} from './index.ts'
+import {entries, reduceRanges, extractBounds, getNormalizedBounds, type Bounds} from './index.ts'
 import {formatDate, fillDates} from './date.ts'
+import * as Dip from '../../elabase.ts'
 
 type Arg = { db?: string; collection?: string; [key: string]: any }
 
@@ -37,16 +38,16 @@ export async function suffix(doc, policies, insertMode?: boolean, arg?: Arg) {
         if (policy_type === "date") {
             keys = keys.map(key => formatDate(key, format))
             if (ranges.length) {
-                ranges = extractBounds(reduceRanges(ranges))
-                const from = ranges.from ?? policy.min // policy.min is always inclusive i.e $gte
-                const to = ranges.to ?? policy.max  // policy.max is always inclusive i.e $lte
-                const fromOp = ranges.from ? ranges.fromOp : "$gte" // policy.min is $gte
-                const toOp = ranges.to ? ranges.toOp : "$lte"  // policy.max is $lte
+                const bounds = extractBounds(reduceRanges(ranges))
+                const from = bounds.from ?? policy.min // policy.min is always inclusive i.e $gte
+                const to = bounds.to ?? policy.max  // policy.max is always inclusive i.e $lte
+                const fromOp = bounds.from ? bounds.fromOp : "$gte" // policy.min is $gte
+                const toOp = bounds.to ? bounds.toOp : "$lte"  // policy.max is $lte
                 if (from === undefined || to === undefined) {
                     keys = [] // Fall back to Dip.operation("ls").
                     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)
+                    let 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)
@@ -59,9 +60,9 @@ export async function suffix(doc, policies, insertMode?: boolean, arg?: Arg) {
             }
             keys = [...new Set(keys)];
         } else if (policy_type === "number" && ranges.length) {
-            ranges = getNormalizedBounds(extractBounds(reduceRanges(ranges)), "number")
-            const from = ranges.from ?? policy.min // policy.min is always inclusive i.e $gte
-            const to = ranges.to ?? policy.max // policy.max is always inclusive i.e $lte
+            const bounds = getNormalizedBounds(extractBounds(reduceRanges(ranges)), "number")
+            const from = bounds.from ?? policy.min // policy.min is always inclusive i.e $gte
+            const to = bounds.to ?? policy.max // policy.max is always inclusive i.e $lte
             if (from === undefined || to === undefined) {
                 keys = [] // Fall back to Dip.operation("ls").
                 console.warn(`Warn: Missing suffix policy min/max bound for ${policy_type} range specified for key ${policy.key} in Dip`)

package/libs/dipper.ts

@@ -1,3 +1,4 @@
+// @ts-ignore
 import axios from 'axios'
 // import {curly} from 'node-libcurl'
 
@@ -84,8 +85,8 @@ export default async function dipper(arg) {
 
 
 export const shard_stats = () => {
-    let total = Object.values(shard_hits).reduce( (partial, value) => partial + value, 0)
+    let total: number = (Object.values(shard_hits) as number[]).reduce( (partial: number, value: number) => partial + value, 0)
     let result = {}
-    Object.entries(shard_hits).forEach( ([key,value]) => result[key] = parseFloat(value * 100 / total).toFixed(2) )
+    Object.entries(shard_hits).forEach( ([key, value]) => result[key] = ((value as number) * 100 / total).toFixed(2) )
     return result
 }

package/libs/elabase.ts

@@ -13,7 +13,7 @@ export const shard_stats = ShardStats
 
 
 let Events = {
-    send: function() { }
+    send: function(topic?: string, data?: any) { }
 }
 
 
@@ -63,6 +63,9 @@ function deepFreeze(obj) {
     return obj;
 }
 class DipMeta {
+    declare company?: string;
+    declare outlet?: string;
+
     constructor(obj) {
         Object.assign(this, deepFreeze(obj));
         Object.freeze(this);
@@ -70,10 +73,10 @@ class DipMeta {
 }
 export const isDipMeta = meta => meta instanceof DipMeta
 
-export const globalMeta = args => {
+export const globalMeta = (args?: any) => {
     return new DipMeta({ ...args, company: "GLOBAL", outlet: "GLOBAL" })
 }
-export const companyMeta = (company, args) => {
+export const companyMeta = (company, args?: any) => {
     if (typeof company !== "string" && !Array.isArray(company))
         throw new Error("Error: Invalid company provided in Dip.companyMeta()")
     if (!company || (typeof company === "string" && company.trim() === "") ||  company === "GLOBAL" || (Array.isArray(company) && (!company.length || company.some(item => typeof item !== "string" || item.trim() === "" || item === "GLOBAL")) ))
@@ -81,7 +84,7 @@ export const companyMeta = (company, args) => {
 
     return new DipMeta({...args, outlet: "GLOBAL", company})
 }
-export const outletMeta = (outlet, args) => {
+export const outletMeta = (outlet, args?: any) => {
     if (typeof outlet !== "string" && !Array.isArray(outlet))
         throw new Error("Error: Invalid outlet provided in Dip.outletMeta()")
     if (!outlet || (typeof outlet === "string" && outlet.trim() === "") ||  outlet === "GLOBAL" || (Array.isArray(outlet) && (!outlet.length || outlet.some(item => typeof item !== "string" || item.trim() === "" || item === "GLOBAL")) ))
@@ -90,7 +93,7 @@ export const outletMeta = (outlet, args) => {
     return new DipMeta({...args, company: "GLOBAL", outlet})
 }
 
-export const customMeta = (company, outlet, args) => {
+export const customMeta = (company, outlet, args?: any) => {
 
     if (typeof company !== "string" && !Array.isArray(company))
         throw new Error("Error: Invalid company provided in Dip.customMeta()")

package/package.json

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