@nejs/basic-extensions 2.9.0 → 2.11.0

package/src/json.extensions.js

@@ -2,6 +2,23 @@ import { Patch } from '@nejs/extension'
 
 export const JSONExtensions = new Patch(JSON, {
   [Patch.kMutablyHidden]: {
+    extractAllFrom(string) {
+      const pattern = this.JSONStartPattern
+      const notJSON = Symbol("Value is not valid JSON")
+      const decoder = part => {
+        try { return JSON.parse(part) } catch (_) { return notJSON }
+      }
+
+      const parts = []
+      let part = undefined
+
+      while ((part = pattern.exec(string))) {
+        parts.push(decoder(part?.[0]))
+      }
+
+      return parts.filter(isJSON => isJSON !== notJSON)
+    },
+
     /**
      * The `extractFrom` method attempts to extract a JSON object from a string.
      * It uses a regular expression to identify potential JSON objects in the
@@ -27,25 +44,7 @@ export const JSONExtensions = new Patch(JSON, {
      * console.log(JSON.extractFrom(str2))  // Output: {name: 'John', age: 30}
      */
     extractFrom(string) {
-      const pattern = /([\w\{\[\"]+) ?/g
-      const decoder = part => {
-        try { return JSON.parse(part) } catch (_) { return undefined }
-      }
-
-      for (
-        let part = pattern.exec(string);
-        part;
-        part = pattern.exec(string)
-      ) {
-        if (part && part?.index) {
-          const decoded = decoder(string.substring(part.index))
-          if (decoded) {
-            return decoded
-          }
-        }
-      }
-
-      return undefined
+      this.extractAllFrom(string)?.[0]
     },
 
     /**

package/src/map.extensions.js

@@ -136,9 +136,11 @@ export const MapPrototypeExtensions = new Patch(Map.prototype, {
 // Object<->Function<->Global occurs. See original source in global.this.js
 // {@see globalThis.isThenElse}
 function isThenElse(bv, tv, ev) {
+  function isFunction(value) { typeof value === 'function' }
+
   if (arguments.length > 1) {
     var _then = isFunction(tv) ? tv(bv) : tv; if (arguments.length > 2) {
       var _else = isFunction(ev) ? tv(bv) : ev; return bv ? _then : _else
     } return bv || _then;
   } return bv
-}
+}

package/src/number.extension.js

@@ -265,9 +265,11 @@ export const NumberPrototypeExtensions = new Patch(Number.prototype, {
 // Object<->Function<->Global occurs. See original source in global.this.js
 // {@see globalThis.isThenElse}
 function isThenElse(bv, tv, ev) {
+  function isFunction(value) { typeof value === 'function' }
+
   if (arguments.length > 1) {
     var _then = isFunction(tv) ? tv(bv) : tv; if (arguments.length > 2) {
       var _else = isFunction(ev) ? tv(bv) : ev; return bv ? _then : _else
     } return bv || _then;
   } return bv
-}
+}