@bbn/bbn 1.0.87 → 1.0.89

package/dist/bundle.d.ts

@@ -1591,6 +1591,14 @@ declare module "fn/ajax/ajax" {
     export { ajax };
 }
 declare module "fn/misc/analyzeFunction" {
+    /**
+     * Analyzes the given function and extracts details about its structure.
+     *
+     * @function analyzeFunction
+     * @param {Function} fn - The function to analyze.
+     * @returns {Object} An object containing details about the function.
+     * @throws {Error} When unexpected syntax is encountered while parsing.
+     */
     const analyzeFunction: (fn: any) => {
         body: any;
         args: any[];

package/dist/bundle.js

@@ -745,7 +745,7 @@
         "use strict";
         Object.defineProperty(exports, "__esModule", { value: true });
         exports.db = void 0;
-        const idb = indexedDB || window['webkitIndexedDB'] || window['mozIndexedDB'] || window['OIndexedDB'] || window['msIndexedDB'];
+        const idb = window['indexedDB'] || window['webkitIndexedDB'] || window['mozIndexedDB'] || window['OIndexedDB'] || window['msIndexedDB'];
         const dbObject = function (dbName) {
             const conn = db._connections[dbName];
             const structure = db._structures[dbName];
@@ -3212,9 +3212,19 @@
         "use strict";
         Object.defineProperty(exports, "__esModule", { value: true });
         exports.analyzeFunction = void 0;
+        /**
+         * Analyzes the given function and extracts details about its structure.
+         *
+         * @function analyzeFunction
+         * @param {Function} fn - The function to analyze.
+         * @returns {Object} An object containing details about the function.
+         * @throws {Error} When unexpected syntax is encountered while parsing.
+         */
         const analyzeFunction = function (fn) {
-            const functionString = fn.toString();
-            let all = functionString.split('');
+            const all = typeof fn === 'function' ? fn.toString() : fn;
+            if (typeof all !== 'string') {
+                throw Error('Unexpected type ' + typeof fn + ' while parsing function');
+            }
             let exp = '';
             let isArrow = false;
             let isAsync = false;
@@ -3229,12 +3239,33 @@
             let escapable = ['"', "'", '`'];
             let isEscaped = false;
             let settingDefault = false;
+            let isComment = false;
+            let isCommentLine = false;
             for (let i = 0; i < all.length; i++) {
-                if (all[i] === currentQuote && !isEscaped && currentQuote) {
+                // Handle string literals
+                if (!isComment && all[i] === '/' && all[i + 1] === '*') {
+                    isComment = true;
+                    exp = '';
+                }
+                else if (all[i] === '*' && all[i + 1] === '/') {
+                    isComment = false;
+                }
+                else if (!isCommentLine && all[i] === '/' && all[i + 1] === '/') {
+                    isCommentLine = true;
+                    exp = '';
+                }
+                else if (all[i] === '\n') {
+                    isCommentLine = false;
+                }
+                else if (isComment || isCommentLine) {
+                    continue;
+                }
+                else if (all[i] === currentQuote && !isEscaped && currentQuote) {
                     currentQuote = '';
                     exp += all[i];
                 }
                 else if (currentQuote) {
+                    isEscaped = all[i] === '\\' && !isEscaped;
                     exp += all[i];
                 }
                 else if (escapable.includes(all[i]) && !isEscaped) {
@@ -3256,13 +3287,13 @@
                 else if (all[i] === ')') {
                     if (parOpened === parClosed + 1) {
                         if (settingDefault) {
-                            currentArg.default = exp.trim();
+                            currentArg['default'] = exp.trim();
                             settingDefault = false;
                         }
                         else if (exp) {
-                            currentArg.name = exp.trim();
+                            currentArg['name'] = exp.trim();
                         }
-                        if (currentArg.name || currentArg.default) {
+                        if (currentArg['name'] || currentArg['default']) {
                             args.push(currentArg);
                             currentArg = {};
                         }
@@ -3270,37 +3301,32 @@
                     }
                     parClosed++;
                 }
-                else if (all[i] === '=') {
-                    if (functionString.substr(i, 2) === '=>') {
-                        if (exp.trim() !== '' && parOpened === parClosed) {
-                            currentArg.name = exp.trim();
-                            args.push(currentArg);
-                            currentArg = {};
-                            exp = '';
-                        }
-                        isArrow = true;
-                        i++;
-                        continue;
-                    }
-                    else if (parOpened > parClosed && !settingDefault) {
-                        currentArg.name = exp.trim();
+                else if (all[i] === '=' && all[i + 1] === '>') {
+                    if (exp.trim() !== '' && parOpened === parClosed) {
+                        currentArg['name'] = exp.trim();
+                        args.push(currentArg);
+                        currentArg = {};
                         exp = '';
-                        settingDefault = true;
-                    }
-                    else {
-                        exp += all[i];
                     }
+                    isArrow = true;
+                    i++;
+                    continue;
+                }
+                else if (all[i] === '=' && parOpened > parClosed && !settingDefault) {
+                    currentArg['name'] = exp.trim();
+                    exp = '';
+                    settingDefault = true;
                 }
                 else if (all[i] === ',') {
                     if (parOpened > parClosed) {
                         if (settingDefault) {
-                            currentArg.default = exp.trim();
+                            currentArg['default'] = exp.trim();
                             settingDefault = false;
                         }
                         else if (exp) {
-                            currentArg.name = exp.trim();
+                            currentArg['name'] = exp.trim();
                         }
-                        if (currentArg.name || currentArg.default) {
+                        if (currentArg['name'] || currentArg['default']) {
                             args.push(currentArg);
                             currentArg = {};
                         }
@@ -3311,11 +3337,11 @@
                     }
                 }
                 else if (all[i] === '{' || all[i] === '}') {
-                    body = functionString.substring(i).trim();
+                    body = all.substring(i).trim();
                     break;
                 }
                 else if (isArrow) {
-                    body = functionString.substring(functionString.indexOf('=>') + 2).trim();
+                    body = all.substring(all.indexOf('=>') + 2).trim();
                     break;
                 }
                 else if (all[i] === ' ') {

package/dist/db.js

@@ -2,7 +2,7 @@ import { _ } from './_';
 import { each } from './fn/loop/each';
 import { iterate } from './fn/loop/iterate';
 import { log } from './fn/browser/log';
-const idb = indexedDB || window['webkitIndexedDB'] || window['mozIndexedDB'] || window['OIndexedDB'] || window['msIndexedDB'];
+const idb = window['indexedDB'] || window['webkitIndexedDB'] || window['mozIndexedDB'] || window['OIndexedDB'] || window['msIndexedDB'];
 const dbObject = function (dbName) {
     const conn = db._connections[dbName];
     const structure = db._structures[dbName];

package/dist/fn/misc/analyzeFunction.d.ts

@@ -1,3 +1,11 @@
+/**
+ * Analyzes the given function and extracts details about its structure.
+ *
+ * @function analyzeFunction
+ * @param {Function} fn - The function to analyze.
+ * @returns {Object} An object containing details about the function.
+ * @throws {Error} When unexpected syntax is encountered while parsing.
+ */
 declare const analyzeFunction: (fn: any) => {
     body: any;
     args: any[];

package/dist/fn/misc/analyzeFunction.js

@@ -1,7 +1,17 @@
 import { md5 } from '../string/md5';
+/**
+ * Analyzes the given function and extracts details about its structure.
+ *
+ * @function analyzeFunction
+ * @param {Function} fn - The function to analyze.
+ * @returns {Object} An object containing details about the function.
+ * @throws {Error} When unexpected syntax is encountered while parsing.
+ */
 const analyzeFunction = function (fn) {
-    const functionString = fn.toString();
-    let all = functionString.split('');
+    const all = typeof fn === 'function' ? fn.toString() : fn;
+    if (typeof all !== 'string') {
+        throw Error('Unexpected type ' + typeof fn + ' while parsing function');
+    }
     let exp = '';
     let isArrow = false;
     let isAsync = false;
@@ -16,12 +26,33 @@ const analyzeFunction = function (fn) {
     let escapable = ['"', "'", '`'];
     let isEscaped = false;
     let settingDefault = false;
+    let isComment = false;
+    let isCommentLine = false;
     for (let i = 0; i < all.length; i++) {
-        if (all[i] === currentQuote && !isEscaped && currentQuote) {
+        // Handle string literals
+        if (!isComment && all[i] === '/' && all[i + 1] === '*') {
+            isComment = true;
+            exp = '';
+        }
+        else if (all[i] === '*' && all[i + 1] === '/') {
+            isComment = false;
+        }
+        else if (!isCommentLine && all[i] === '/' && all[i + 1] === '/') {
+            isCommentLine = true;
+            exp = '';
+        }
+        else if (all[i] === '\n') {
+            isCommentLine = false;
+        }
+        else if (isComment || isCommentLine) {
+            continue;
+        }
+        else if (all[i] === currentQuote && !isEscaped && currentQuote) {
             currentQuote = '';
             exp += all[i];
         }
         else if (currentQuote) {
+            isEscaped = all[i] === '\\' && !isEscaped;
             exp += all[i];
         }
         else if (escapable.includes(all[i]) && !isEscaped) {
@@ -43,13 +74,13 @@ const analyzeFunction = function (fn) {
         else if (all[i] === ')') {
             if (parOpened === parClosed + 1) {
                 if (settingDefault) {
-                    currentArg.default = exp.trim();
+                    currentArg['default'] = exp.trim();
                     settingDefault = false;
                 }
                 else if (exp) {
-                    currentArg.name = exp.trim();
+                    currentArg['name'] = exp.trim();
                 }
-                if (currentArg.name || currentArg.default) {
+                if (currentArg['name'] || currentArg['default']) {
                     args.push(currentArg);
                     currentArg = {};
                 }
@@ -57,37 +88,32 @@ const analyzeFunction = function (fn) {
             }
             parClosed++;
         }
-        else if (all[i] === '=') {
-            if (functionString.substr(i, 2) === '=>') {
-                if (exp.trim() !== '' && parOpened === parClosed) {
-                    currentArg.name = exp.trim();
-                    args.push(currentArg);
-                    currentArg = {};
-                    exp = '';
-                }
-                isArrow = true;
-                i++;
-                continue;
-            }
-            else if (parOpened > parClosed && !settingDefault) {
-                currentArg.name = exp.trim();
+        else if (all[i] === '=' && all[i + 1] === '>') {
+            if (exp.trim() !== '' && parOpened === parClosed) {
+                currentArg['name'] = exp.trim();
+                args.push(currentArg);
+                currentArg = {};
                 exp = '';
-                settingDefault = true;
-            }
-            else {
-                exp += all[i];
             }
+            isArrow = true;
+            i++;
+            continue;
+        }
+        else if (all[i] === '=' && parOpened > parClosed && !settingDefault) {
+            currentArg['name'] = exp.trim();
+            exp = '';
+            settingDefault = true;
         }
         else if (all[i] === ',') {
             if (parOpened > parClosed) {
                 if (settingDefault) {
-                    currentArg.default = exp.trim();
+                    currentArg['default'] = exp.trim();
                     settingDefault = false;
                 }
                 else if (exp) {
-                    currentArg.name = exp.trim();
+                    currentArg['name'] = exp.trim();
                 }
-                if (currentArg.name || currentArg.default) {
+                if (currentArg['name'] || currentArg['default']) {
                     args.push(currentArg);
                     currentArg = {};
                 }
@@ -98,11 +124,11 @@ const analyzeFunction = function (fn) {
             }
         }
         else if (all[i] === '{' || all[i] === '}') {
-            body = functionString.substring(i).trim();
+            body = all.substring(i).trim();
             break;
         }
         else if (isArrow) {
-            body = functionString.substring(functionString.indexOf('=>') + 2).trim();
+            body = all.substring(all.indexOf('=>') + 2).trim();
             break;
         }
         else if (all[i] === ' ') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbn/bbn",
-  "version": "1.0.87",
+  "version": "1.0.89",
   "description": "Javascript toolkit",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,6 +18,7 @@
   "author": "Thomas Nabet <thomas.nabet@gmail.com>",
   "license": "MIT",
   "devDependencies": {
+    "mocha": "^10.2.0",
     "typescript": "^5.2.2"
   },
   "bugs": {
@@ -26,7 +27,9 @@
   "homepage": "https://github.com/nabab/bbn-js#readme",
   "dependencies": {
     "axios": "^1.5.1",
+    "chai": "^4.3.10",
     "dayjs": "^1.11.10",
+    "jsdom-global": "^3.0.2",
     "typescript-bundle": "^1.0.18"
   },
   "directories": {