xcraft-core-utils 4.9.0 → 4.10.0

package/lib/reflect.js

@@ -1,12 +1,123 @@
 'use strict';
 
-const STRIP_COMMENTS = /(\/\/.*$)|(\/\*[\s\S]*?\*\/)|(\s*=[^,\)]*(('(?:\\'|[^'\r\n])*')|("(?:\\"|[^"\r\n])*"))|(\s*=[^,\)]*))/gm;
-const ARGUMENT_NAMES = /([^\s,]+)/g;
+// Not compatible CommonJS
+// https://github.com/sindresorhus/fn-args/blob/v6.0.0/index.js
+
+function functionArguments(function_) {
+  if (typeof function_ !== 'function') {
+    throw new TypeError('Expected a function');
+  }
+
+  const commentRegex = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/gm;
+  const quotes = ['`', '"', "'"];
+
+  const functionSource = function_.toString().replace(commentRegex, ''); // Function with no comments
+
+  let functionWithNoDefaults = '';
+  let depth = 0; // () [] {}
+  let index = 0;
+
+  // To remove default values we can not use regexp because finite automaton can not handle such
+  // things as (potential) infinity-nested blocks (), [], {}
+
+  // Remove default values
+  for (
+    ;
+    index < functionSource.length && functionSource.charAt(index) !== ')';
+    index += 1
+  ) {
+    // Exiting if an arrow occurs. Needed when arrow function without '()'.
+    if (functionSource.startsWith('=>', index)) {
+      functionWithNoDefaults = functionSource;
+      index = functionSource.length;
+      break;
+    }
+
+    // If we found a default value - skip it
+    if (functionSource.charAt(index) === '=') {
+      for (
+        ;
+        index < functionSource.length &&
+        ((functionSource.charAt(index) !== ',' &&
+          functionSource.charAt(index) !== ')') ||
+          depth !== 0);
+        index += 1
+      ) {
+        // Skip all quotes
+        let wasQuote = false;
+
+        for (const quote of quotes) {
+          if (functionSource.charAt(index) === quote) {
+            index += 1;
+
+            for (
+              ;
+              index < functionSource.length &&
+              functionSource.charAt(index) !== quote;
+
+            ) {
+              index += 1;
+            }
+
+            wasQuote = true;
+            break;
+          }
+        }
+
+        // If any quote type was skipped, start the cycle again
+        if (wasQuote) {
+          continue;
+        }
+
+        switch (
+          functionSource.charAt(index) // Keeps correct depths of all types of parenthesises
+        ) {
+          case '(':
+          case '[':
+          case '{':
+            depth += 1;
+            break;
+          case ')':
+          case ']':
+          case '}':
+            depth -= 1;
+            break;
+          default:
+        }
+      }
+
+      if (functionSource.charAt(index) === ',') {
+        functionWithNoDefaults += ',';
+      }
+
+      if (functionSource.charAt(index) === ')') {
+        // Quits from the cycle immediately
+        functionWithNoDefaults += ')';
+        break;
+      }
+    } else {
+      functionWithNoDefaults += functionSource.charAt(index);
+    }
+  }
+
+  if (index < functionSource.length && functionSource.charAt(index) === ')') {
+    functionWithNoDefaults += ')';
+  }
+
+  // The first part matches parens-less arrow functions
+  // The second part matches the rest
+  const regexFnArguments = /^(?:async)?([^=()]+)=|\(([^)]+)\)/;
+
+  const match = regexFnArguments.exec(functionWithNoDefaults);
+
+  return match
+    ? (match[1] || match[2])
+        .split(',')
+        .map((x) => x.trim())
+        .filter(Boolean)
+    : [];
+}
 
 exports.funcParams = (func) => {
-  const fnStr = func.toString().replace(STRIP_COMMENTS, '');
-  const result = fnStr
-    .slice(fnStr.indexOf('(') + 1, fnStr.indexOf(')'))
-    .match(ARGUMENT_NAMES);
-  return result || [];
+  return functionArguments(func);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcraft-core-utils",
-  "version": "4.9.0",
+  "version": "4.10.0",
   "description": "Xcraft utils",
   "main": "index.js",
   "engines": {