corebasic 1.0.228 → 1.0.230

package/dist/libs/utils.js

@@ -4,8 +4,7 @@ import crypto from "node:crypto";
 import { readFile, writeFile } from 'fs/promises';
 export let pipeline = { execute: execute };
 export function log(...args) {
-    let res = [];
-    args.forEach(arg => res.push(typeof arg === "object" ? JSON.stringify(arg, null, '\t') : arg));
+    const res = args.map(arg => typeof arg === "object" ? JSON.stringify(arg, null, '\t') : arg);
     console.log(...res);
 }
 let UID_COUNTER = crypto.randomBytes(3).readUIntBE(0, 3);
@@ -23,7 +22,7 @@ export function uid() {
 export function isEmpty(str) {
     if (!str)
         return true;
-    return str.match(/\S/) ? false : true; // matches a non space character
+    return String(str).match(/\S/) ? false : true; // matches a non space character
 }
 export let GLOBAL_META = { company: "GLOBAL", outlet: "GLOBAL" };
 export function isEmptyJson(json) {
@@ -70,7 +69,12 @@ export function toAppDate(date) {
 }
 export function toDate(arg, currentTime) {
     let st = arg.split('/');
-    let temp = new Date(parseInt(st[2]), parseInt(st[1]) - 1, parseInt(st[0]));
+    if (st.length !== 3)
+        throw new Error("Invalid arg in Utils.toDate()");
+    const day = st[0];
+    const month = st[1];
+    const year = st[2];
+    let temp = new Date(parseInt(year), parseInt(month) - 1, parseInt(day));
     temp.setHours(0);
     temp.setMinutes(0);
     temp.setSeconds(0);
@@ -99,43 +103,44 @@ export function getDatesBetweenTwoDates(start, end) {
     }
     return arr;
 }
-export function deepCopy(obj) {
-    if (Object.prototype.toString.call(obj) === '[object Array]') {
-        let out = [], i = 0, len = obj.length;
-        for (; i < len; i++) {
-            if (Object.prototype.toString.call(obj[i]) === '[object Date]')
-                out[i] = new Date(obj[i]);
-            else
-                out[i] = arguments.callee(obj[i]);
-        }
-        return out;
-    }
-    if (typeof obj === 'object') {
-        let out = {}, i;
-        for (i in obj) {
-            if (Object.prototype.toString.call(obj[i]) === '[object Date]')
-                out[i] = new Date(obj[i]);
-            else
-                out[i] = arguments.callee(obj[i]);
-        }
-        return out;
-    }
-    return obj;
-}
+// export function deepCopy(obj) {
+//     if (Object.prototype.toString.call(obj) === '[object Array]') {
+//         let out = [], i = 0, len = obj.length;
+//         for ( ; i < len; i++ ) {
+//             if (Object.prototype.toString.call(obj[i]) === '[object Date]')
+//                 out[i] = new Date(obj[i])
+//             else
+//                 out[i] = arguments.callee(obj[i]);
+//         }
+//         return out;
+//     }
+//     if (typeof obj === 'object') {
+//         let out = {}, i;
+//         for ( i in obj ) {
+//             if (Object.prototype.toString.call(obj[i]) === '[object Date]')
+//                 out[i] = new Date(obj[i])
+//             else
+//                 out[i] = arguments.callee(obj[i]);
+//         }
+//         return out;
+//     }
+//     return obj;
+// }
 export function formatAMPM(date) {
     let hours = date.getHours();
     let minutes = date.getMinutes();
     let ampm = hours >= 12 ? 'pm' : 'am';
     hours = hours % 12;
     hours = hours ? hours : 12; // the hour '0' should be '12'
-    minutes = minutes < 10 ? '0' + minutes : minutes;
-    let strTime = hours + ':' + minutes + ' ' + ampm;
+    let strTime = hours + ':' + (minutes < 10 ? '0' + minutes : minutes) + ' ' + ampm;
     return strTime;
 }
 export function sum(array) {
     let res = 0;
-    for (let i in array)
-        res += parseFloat(array[i]) ? parseFloat(array[i]) : 0;
+    for (let i in array) {
+        const val = parseFloat(String(array[i] ?? 0));
+        res += val ? val : 0;
+    }
     return res;
 }
 export function addMonths(date, monthsToAdd) {
@@ -180,9 +185,11 @@ export function addUTCHours(date, hoursToAdd) {
 }
 export function validityToMillisecs(start, validity) {
     const now = new Date(start);
-    let [count, period] = validity.trim().split(' ').filter(item => item.trim());
-    count = parseIntValue(count);
-    period = period.toLowerCase();
+    const parts = validity.trim().split(' ').filter(item => item.trim());
+    if (parts.length !== 2)
+        throw new Error("Invalid validity string in validityToUTCMillisecs()");
+    const count = parseIntValue(parts[0]);
+    const period = parts[1].toLowerCase();
     const timeline = {
         year: () => addYears(now, count),
         years: () => addYears(now, count),
@@ -202,9 +209,11 @@ export function validityToMillisecs(start, validity) {
 }
 export function validityToUTCMillisecs(start, validity) {
     const now = new Date(start);
-    let [count, period] = validity.trim().split(' ').filter(item => item.trim());
-    count = parseIntValue(count);
-    period = period.toLowerCase();
+    const parts = validity.trim().split(' ').filter(item => item.trim());
+    if (parts.length !== 2)
+        throw new Error("Invalid validity string in validityToUTCMillisecs()");
+    const count = parseIntValue(parts[0]);
+    const period = parts[1].toLowerCase();
     const timeline = {
         year: () => addUTCYears(now, count),
         years: () => addUTCYears(now, count),
@@ -258,7 +267,7 @@ export async function fileToJson(path, file) {
         let commaIndex = -1;
         for (let index = 0; index < jsonString.length; index++) {
             const currentCharacter = jsonString[index];
-            const nextCharacter = jsonString[index + 1];
+            const nextCharacter = jsonString[index + 1] ?? "";
             if (!isInsideComment && currentCharacter === '"') {
                 // Enter or exit string
                 const escaped = isEscaped(jsonString, index);
@@ -359,7 +368,8 @@ function startPipeline(pipeline, index, data, errfn) {
     index = index == undefined ? 0 : index;
     if (index == pipeline.length)
         return;
-    pipeline[index](data).then(data => startPipeline(pipeline, index + 1, data)).catch(err => { if (errfn)
+    const item = pipeline[index];
+    item(data).then((data) => startPipeline(pipeline, index + 1, data, errfn)).catch((err) => { if (errfn)
         errfn(err); });
 }
 // ---------------------------

package/libs/utils.ts

@@ -6,9 +6,8 @@ import {readFile,writeFile} from 'fs/promises';
 
 export let pipeline = { execute: execute }
 
-export function log(...args) {
-    let res = []
-    args.forEach(arg => res.push(typeof arg  === "object" ? JSON.stringify(arg,null,'\t') : arg))
+export function log(...args: unknown[]): void {
+    const res = args.map(arg => typeof arg  === "object" ? JSON.stringify(arg, null,'\t') : arg)
     console.log(...res)
 }
 
@@ -32,21 +31,21 @@ export function uid(): string {
     return buf.toString("hex");
 }
 
-export function isEmpty(str): boolean { // returns true for undefined
+export function isEmpty(str: undefined | number | string): boolean { // returns true for undefined
     if(!str)
         return true
-    return str.match(/\S/) ? false : true // matches a non space character
+    return String(str).match(/\S/) ? false : true // matches a non space character
 }
 
 export let GLOBAL_META = { company: "GLOBAL", outlet: "GLOBAL" }
 
-export function isEmptyJson(json): boolean {
+export function isEmptyJson(json: object): boolean {
     for (let i in json)
         return false
     return true
 }
 
-export function uniqueObjects(array, key) {
+export function uniqueObjects<T extends Record<string, unknown>>(array: T[], key: keyof T): T[]  {
     // remove duplicates from array of objects with key
     return [
         ...new Map(
@@ -99,7 +98,14 @@ export function toDate(arg: string, currentTime?: boolean): Date | undefined { /
 
     let st = arg.split('/')
 
-    let temp = new Date(parseInt(st[2]), parseInt(st[1]) - 1, parseInt(st[0]));
+    if (st.length !== 3)
+        throw new Error("Invalid arg in Utils.toDate()")
+
+    const day = st[0]!
+    const month = st[1]!
+    const year = st[2]!
+
+    let temp = new Date(parseInt(year), parseInt(month) - 1, parseInt(day));
     temp.setHours(0) ; temp.setMinutes(0); temp.setSeconds(0); temp.setMilliseconds(0)
 
     if (currentTime) {
@@ -117,8 +123,8 @@ export function toDate(arg: string, currentTime?: boolean): Date | undefined { /
 
 
 
-export function getDatesBetweenTwoDates(start, end) {
-    let arr = [];
+export function getDatesBetweenTwoDates(start: number | Date, end: number | Date) {
+    let arr: Date[] = [];
     let dt = new Date(start);
 
 	dt.setHours(0)
@@ -133,45 +139,46 @@ export function getDatesBetweenTwoDates(start, end) {
     return arr;
 }
 
-export function deepCopy(obj) {
-    if (Object.prototype.toString.call(obj) === '[object Array]') {
-        let out = [], i = 0, len = obj.length;
-        for ( ; i < len; i++ ) {
-            if (Object.prototype.toString.call(obj[i]) === '[object Date]')
-                out[i] = new Date(obj[i])
-            else
-                out[i] = arguments.callee(obj[i]);
-        }
-        return out;
-    }
-    if (typeof obj === 'object') {
-        let out = {}, i;
-        for ( i in obj ) {
-            if (Object.prototype.toString.call(obj[i]) === '[object Date]')
-                out[i] = new Date(obj[i])
-            else
-                out[i] = arguments.callee(obj[i]);
-        }
-        return out;
-    }
-    return obj;
-}
-
-
-export function formatAMPM(date) {
+// export function deepCopy(obj) {
+//     if (Object.prototype.toString.call(obj) === '[object Array]') {
+//         let out = [], i = 0, len = obj.length;
+//         for ( ; i < len; i++ ) {
+//             if (Object.prototype.toString.call(obj[i]) === '[object Date]')
+//                 out[i] = new Date(obj[i])
+//             else
+//                 out[i] = arguments.callee(obj[i]);
+//         }
+//         return out;
+//     }
+//     if (typeof obj === 'object') {
+//         let out = {}, i;
+//         for ( i in obj ) {
+//             if (Object.prototype.toString.call(obj[i]) === '[object Date]')
+//                 out[i] = new Date(obj[i])
+//             else
+//                 out[i] = arguments.callee(obj[i]);
+//         }
+//         return out;
+//     }
+//     return obj;
+// }
+
+
+export function formatAMPM(date: Date): string {
     let hours = date.getHours();
     let minutes = date.getMinutes();
     let ampm = hours >= 12 ? 'pm' : 'am';
     hours = hours % 12;
     hours = hours ? hours : 12; // the hour '0' should be '12'
-    minutes = minutes < 10 ? '0'+minutes : minutes;
-    let strTime = hours + ':' + minutes + ' ' + ampm;
+    let strTime = hours + ':' + (minutes < 10 ? '0'+minutes : minutes) + ' ' + ampm;
     return strTime;
 }
-export function sum(array) {   // Eg: sum([10,20,undefined, NaN, 40])
+export function sum(array: Array<number | string | undefined>) {   // Eg: sum([10,20,undefined, NaN, 40])
     let res = 0
-    for (let i in array)
-        res += parseFloat(array[i]) ? parseFloat(array[i]) : 0
+    for (let i in array) {
+        const val = parseFloat(String(array[i] ?? 0))
+        res += val ? val : 0
+    }
     return res;
 }
 
@@ -219,12 +226,16 @@ export function addUTCHours(date: Date, hoursToAdd: number): Date {
     return date
 }
 
-export function validityToMillisecs(start, validity) { // start is in ms
+export function validityToMillisecs(start: number, validity: string) { // start is in ms
     const now = new Date(start)
 
-    let [count, period] = validity.trim().split(' ').filter(item => item.trim())
-    count = parseIntValue(count)
-    period = period.toLowerCase()
+    const parts = validity.trim().split(' ').filter(item => item.trim())
+
+    if (parts.length !== 2)
+        throw new Error("Invalid validity string in validityToUTCMillisecs()");
+
+    const count = parseIntValue(parts[0])
+    const period = parts[1]!.toLowerCase()
 
     const timeline = {
         year: () => addYears(now, count),
@@ -241,16 +252,20 @@ export function validityToMillisecs(start, validity) { // start is in ms
         minutes: () => now.setMinutes(now.getMinutes() + count),
     }
 
-    timeline[period]()
+    timeline[period as keyof typeof timeline]()
 
     return now.getTime()
 }
-export function validityToUTCMillisecs(start, validity) { // start is in ms
+export function validityToUTCMillisecs(start: number, validity: string) { // start is in ms
     const now = new Date(start)
 
-    let [count, period] = validity.trim().split(' ').filter(item => item.trim())
-    count = parseIntValue(count)
-    period = period.toLowerCase()
+    const parts = validity.trim().split(' ').filter(item => item.trim())
+
+    if (parts.length !== 2)
+        throw new Error("Invalid validity string in validityToUTCMillisecs()");
+
+    const count = parseIntValue(parts[0])
+    const period = parts[1]!.toLowerCase()
 
     const timeline = {
         year: () => addUTCYears(now, count),
@@ -267,7 +282,7 @@ export function validityToUTCMillisecs(start, validity) { // start is in ms
         minutes: () => now.setUTCMinutes(now.getUTCMinutes() + count),
     }
 
-    timeline[period]()
+    timeline[period as keyof typeof timeline]()
 
     return now.getTime()
 }
@@ -276,7 +291,7 @@ export function validityToUTCMillisecs(start, validity) { // start is in ms
 // ----------------
 // JSON
 // ----------------
-export async function fileToJson(path, file) {
+export async function fileToJson(path: string | URL, file: string) {
     let data = (await readFile(new URL(file, path).toString().replace('file://',''), 'utf8'))
     // return JSON.parse((JSON as Record<string, any>).minify(data))
 
@@ -288,9 +303,9 @@ export async function fileToJson(path, file) {
     const stripWithoutWhitespace = () => '';
 
     // Replace all characters except ASCII spaces, tabs and line endings with regular spaces to ensure valid JSON output.
-    const stripWithWhitespace = (string, start, end?: number) => string.slice(start, end).replace(/[^ \t\r\n]/g, ' ');
+    const stripWithWhitespace = (string: string, start: number, end?: number): string => string.slice(start, end).replace(/[^ \t\r\n]/g, ' ');
 
-    const isEscaped = (jsonString, quotePosition) => {
+    const isEscaped = (jsonString: string, quotePosition: number): boolean => {
         let index = quotePosition - 1;
         let backslashCount = 0;
 
@@ -302,7 +317,7 @@ export async function fileToJson(path, file) {
         return Boolean(backslashCount % 2);
     };
 
-    function stripJsonComments(jsonString, {whitespace = true, trailingCommas = false} = {}) {
+    function stripJsonComments(jsonString: string, {whitespace = true, trailingCommas = false} = {}): string {
         if (typeof jsonString !== 'string') {
             throw new TypeError(`Expected argument \`jsonString\` to be a \`string\`, got \`${typeof jsonString}\``);
         }
@@ -318,8 +333,8 @@ export async function fileToJson(path, file) {
         let commaIndex = -1;
 
         for (let index = 0; index < jsonString.length; index++) {
-            const currentCharacter = jsonString[index];
-            const nextCharacter = jsonString[index + 1];
+            const currentCharacter = jsonString[index]!;
+            const nextCharacter = jsonString[index + 1] ?? "";
 
             if (!isInsideComment && currentCharacter === '"') {
                 // Enter or exit string
@@ -406,10 +421,10 @@ export async function fileToJson(path, file) {
 // File
 // ----------------
 
-export async function fileToString(file) {
+export async function fileToString(file: string | URL): Promise<string> {
     return await readFile(file, 'utf8')
 }
-export async function stringToFile(file, data) {
+export async function stringToFile(file: string, data: string) {
     return await writeFile(file, data)
 }
 
@@ -418,23 +433,25 @@ export async function stringToFile(file, data) {
 // ----------------
 
 
-function execute(pipeline, errfn?: Function) {
-    startPipeline(pipeline, 0, undefined, errfn)
+function execute<T>(pipeline: Array<(data: T) => Promise<T>>, errfn?: (err: unknown) => void) {
+    startPipeline(pipeline, 0, undefined as T, errfn)
 }
 
-function startPipeline(pipeline, index, data, errfn?: Function) {
+function startPipeline<T>(pipeline: Array<(data: T) => Promise<T>>, index: number, data: T, errfn?:  (err: unknown) => void) {
     index = index == undefined ? 0 : index
     if (index == pipeline.length)
         return
-    pipeline[index](data).then(data => startPipeline(pipeline, index + 1, data)).catch(err => { if (errfn) errfn(err) } )
+
+    const item = pipeline[index]
+    item!(data).then((data: T) => startPipeline(pipeline, index + 1, data, errfn)).catch((err: unknown) => { if (errfn) errfn(err) } )
 }
 
 
 // ---------------------------
 // Express Middleware Exclude
 // ---------------------------
-export const excludeMiddleware = function(middleware, ...paths) {
-    return function(req, res, next) {
+export const excludeMiddleware = function(middleware: (...args: unknown[]) => void, ...paths: string[]) {
+    return function(req: {path: string}, res: unknown, next: () => void) {
         const pathCheck = paths.some(path => {
           let url  = req.path.split('/')
           let cmp  = path.split('/')

package/package.json

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

package/tsconfig.json

@@ -38,7 +38,7 @@
       // "noPropertyAccessFromIndexSignature": true,
 
       // Recommended Options
-      "strict": false,
+      "strict": true,
       "jsx": "react-jsx",
       "verbatimModuleSyntax": true,
       "isolatedModules": true,