theprogrammablemind 9.8.0-beta.16 → 9.8.0-beta.18

package/package.json

@@ -18,9 +18,11 @@
     "test:debug": "node inspect node_modules/.bin/jest --runInBand --config ./jest.config.json",
     "td": "node inspect node_modules/.bin/jest --runInBand --config ./jest.config.json",
     "tod": "node inspect node_modules/.bin/jest --runInBand -t NEO23",
+    "toda": "node inspect node_modules/.bin/jest --runInBand -t NEO23A",
     "lint:fix": "eslint \"**/*.js\" --fix",
     "lint": "eslint \"**/*.js\"",
     "to": "node node_modules/.bin/jest --runInBand -t NEO23",
+    "toa": "node node_modules/.bin/jest --runInBand -t NEO23A",
     "tos": "node node_modules/.bin/jest --runInBand -t NEOS23",
     "test": "jest --config ./jest.config.json",
     "test:python": "node node_modules/.bin/jest --runInBand -t PYTHON",
@@ -73,6 +75,6 @@
     "scriptjs": "^2.5.9",
     "uuid": "^8.3.2"
   },
-  "version": "9.8.0-beta.16",
+  "version": "9.8.0-beta.18",
   "license": "UNLICENSED"
 }

package/src/helpers.js

@@ -22,12 +22,30 @@ class OverrideCheck {
   }
 }
 
-function pathEquals (p1, p2) {
+function pathEquals (p1, p2, n) {
+  if (n !== undefined) {
+    if (n < 0) {
+      p1 = p1.slice(n)
+      p2 = p2.slice(n)
+    } else {
+      p1 = p1.slice(0, n)
+      p2 = p2.slice(0, n)
+    }
+  }
+
   if (p1.length !== p2.length) {
     return false
   }
   for (let i = 0; i < p1.length; ++i) {
-    if (typeof p2[i] == 'function') {
+    if (p1[i].integer) {
+      if (!Number.isInteger(p2[i])) {
+        return false
+      }
+    } else if (p2[i].integer) {
+      if (!Number.isInteger(p1[i])) {
+        return false
+      }
+    } else if (typeof p2[i] == 'function') {
       if (!p2[i](p1[i])) {
         return false
       }

package/src/project2.js

@@ -1,18 +1,6 @@
 const debug = require('./debug')
 const helpers = require('./helpers')
 
-function areFirstNEqual(arr1, arr2, n) {
-  if (n <= 0) return true;
-  if (arr1.length < n || arr2.length < n) return false;
-
-  for (let i = 0; i < n; i++) {
-    if (arr1[i] !== arr2[i]) {
-      return false;
-    }
-  }
-  return true;
-}
-
 function project(source, filters, path=[]) {
   if (['boolean', 'string', 'number'].includes(typeof source)) {
     return source
@@ -49,12 +37,16 @@ function project(source, filters, path=[]) {
   let properties = []
   for (const filter of selectedFilters) {
     for (const property of filter.apply(source)) {
-      properties.push(property)
+      if (!properties.includes(property)) {
+        properties.push(property)
+      }
     }
   }
   if (source?.checks) {
     for (const check of source.checks) {
-      properties.push(check)
+      if (!properties.includes(check)) {
+        properties.push(check)
+      }
     }
   }
 
@@ -64,10 +56,14 @@ function project(source, filters, path=[]) {
     // property that contains a list of properties to be checked
     if (property.properties) {
       for (const moreProperty of source[property.properties] || []) {
-        updatedProperties.push(moreProperty)
+        if (!updatedProperties.includes(property)) {
+          updatedProperties.push(moreProperty)
+        }
       }
     } else {
-      updatedProperties.push(property)
+      if (!updatedProperties.includes(property)) {
+        updatedProperties.push(property)
+      }
     }
   }
   properties = updatedProperties
@@ -75,7 +71,7 @@ function project(source, filters, path=[]) {
   // Build the result object
   const result = {};
   properties.forEach(prop => {
-    if (prop.path && (prop.path.length === path.length + 1) && areFirstNEqual(path, prop.path, path.length) && source.hasOwnProperty(prop.path[path.length])) {
+    if (prop.path && (prop.path.length === path.length + 1) && helpers.pathEquals(path, prop.path, path.length) && source.hasOwnProperty(prop.path[path.length])) {
       const endProp = prop.path[path.length]
       if (['boolean', 'string', 'number'].includes(typeof source[endProp])) {
         result[endProp] = source[endProp]
@@ -109,8 +105,18 @@ function project(source, filters, path=[]) {
         const instantiatedCheck = []
         for (const check of prop.check) {
           if (typeof check.property == 'function') {
-            for (const sourceKey of source[prop.property].keys()) {
+            const keys = (value) => {
+              if (Array.isArray(value)) {
+                return value.keys()
+              } else {
+                return Object.keys(value)
+              }
+            }
+            for (const sourceKey of keys(source[prop.property])) {
               if (check.property(sourceKey)) {
+                if (!check.check) {
+                  throw new Error(`For the property check of the property '${check.property.toString()}', the 'check' (singular) property is missing.`)
+                }
                 instantiatedCheck.push({ property: sourceKey, check: check.check })
               }
             }