esoftplay 0.0.140-t → 0.0.140-u

package/modules/lib/object.ts

@@ -23,32 +23,42 @@ export default class m {
   cursorBuilder(command: string, array: any, value: any, ...values: any[]): (cursor?: string | number | FilterByItem, ...cursors: (string | number | FilterByItem)[]) => this {
     return (cursor?: string | number | FilterByItem, ...cursors: (string | number | FilterByItem)[]) => {
       let _value = array
-      const cCursor = [cursor, ...cursors].map((item) => {
+      let cCursor = [cursor, ...cursors]
+      let spec = {}
+      let hasError = false
+
+      cCursor = [cursor, ...cursors].map((item) => {
         if (typeof item == 'string') {
           _value = _value[item]
           return item
         } else if (typeof item == 'function') {
           if (Array.isArray(_value)) {
             const idx = _value.findIndex(item)
-            _value = _value[idx]
-            return idx
+            if (idx > -1) {
+              _value = _value[idx]
+              return idx
+            } else {
+              hasError = true
+              return undefined
+            }
           } else {
-            new Error("LibObject : CursorByFilter must be executed at array")
+            hasError = true
+            return undefined
+            // new Error("LibObject : CursorByFilter must be executed at array")
           }
-        } else {
-          return item
         }
       });
 
       let pathToUpdate = cCursor.filter(x => x != undefined).join('.')
-      // let pathToUpdate = [cursor, ...cursors].filter(x => x != undefined).join('.')
       let allValues = [value, ...values].filter(x => x != undefined)
-      let spec = {}
       if (pathToUpdate != '')
         spec = { [pathToUpdate]: [command, ...allValues] }
       else
         spec = [command, ...allValues]
-      this.#value = update(array, spec)
+      if (hasError)
+        this.#value = array
+      else
+        this.#value = update(array, spec)
       return this
     }
   }
@@ -126,29 +136,43 @@ export default class m {
 function cursorBuilder(command: string, array: any, value: any, ...values: any[]): (cursor?: string | number | FilterByItem, ...cursors: (string | number | FilterByItem)[]) => any {
   return function (cursor?: string | number | FilterByItem, ...cursors: (string | number | FilterByItem)[]) {
     let _value = array
-    const cCursor = [cursor, ...cursors].map((item) => {
+    let cCursor = [cursor, ...cursors]
+    let spec = {}
+    let hasError = false
+
+    cCursor = [cursor, ...cursors].map((item) => {
       if (typeof item == 'string') {
         _value = _value[item]
         return item
       } else if (typeof item == 'function') {
         if (Array.isArray(_value)) {
           const idx = _value.findIndex(item)
-          _value = _value[idx]
-          return idx
+          if (idx > -1) {
+            _value = _value[idx]
+            return idx
+          } else {
+            hasError = true
+            return undefined
+          }
         } else {
-          new Error("LibObject : CursorByFilter must be executed at array")
+          hasError = true
+          return undefined
+          // new Error("LibObject : CursorByFilter must be executed at array")
         }
       }
     });
 
     let pathToUpdate = cCursor.filter(x => x != undefined).join('.')
     let allValues = [value, ...values].filter(x => x != undefined)
-    let spec = {}
     if (pathToUpdate != '')
       spec = { [pathToUpdate]: [command, ...allValues] }
     else
       spec = [command, ...allValues]
-    return update(array, spec)
+
+    if (hasError)
+      return array
+    else
+      return update(array, spec)
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esoftplay",
-  "version": "0.0.140-t",
+  "version": "0.0.140-u",
   "description": "embedding data from esoftplay framework (web based) into mobile app",
   "main": "cache/index.js",
   "types": "../../index.d.ts",