theprogrammablemind 7.5.8-beta.44 → 7.5.8-beta.46

package/client.js

@@ -60,7 +60,6 @@ const vimdiff = (actualJSON, expectedJSON) => {
   // console.log(`vimdiff ${path}/actual.json ${path}/expected.json`)
   {
     const editor = runtime.process.env.EDITOR || 'vimdiff'
-    debugger
     // const child = runtime.child_process.spawn(editor, [`${path}/expected.json`, `${path}/actual.json`], { stdio: 'inherit' })
     console.log(`${editor} ${path}/expected.json ${path}/actual.json`)
     runtime.child_process.execSync(`${editor} ${path}/expected.json ${path}/actual.json`, {stdio: 'inherit'})
@@ -1493,7 +1492,7 @@ const knowledgeModule = async ({
   if (!isProcess) {
     if (template) {
       if (config.needsRebuild(template.template, template.instance)) {
-        throw new Error(`This module "${config.name}" cannot be used because the instance file needs rebuilding. Run on the command line with no arguements or the -rt argument to rebuild.`)
+        throw new Error(`This module "${config.name}" cannot be used because the instance file needs rebuilding. Run on the command line with no arguments or the -rt argument to rebuild.`)
       }
       try {
         config.load(template.template, template.instance)

package/package.json

@@ -63,6 +63,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.8-beta.44",
+  "version": "7.5.8-beta.46",
   "license": "ISC"
 }

package/src/config.js

@@ -70,9 +70,6 @@ const setupInitializerFNArgs = (config, args) => {
   const aw = (word, def) => config.addWord(word, def, args.uuid)
   const ag = (generator) => config.addGenerator(generator, args.uuid, config.name)
   const km = (name) => config.getConfig(name)
-  console.log('name', name)
-  console.log('config.getConfig', config.getConfig)
-  console.log('config', config)
   const apis = (name) => config.getConfig(name).api
 
   return {
@@ -943,7 +940,10 @@ class Config {
         return { ...query, where: undefined }
       }
     }
-    const sameQueries = helpers.safeEquals((cleanupWhere(template.queries) || []).map(helpers.updateQueries), (cleanupWhere(instance.queries) || []))
+    const cleanupWheres = (elements) => {
+      return elements.map( cleanupWhere )
+    }
+    const sameQueries = helpers.safeEquals(cleanupWheres(template.queries || []).map(helpers.updateQueries), cleanupWheres(instance.queries || []))
     return !(instance && sameQueries && sameFragments)
   }
 

package/src/helpers.js

@@ -53,6 +53,8 @@ const safeEquals = (v1, v2) => {
     return v1 == v2
   } else if (type == 'function') {
     return v1.toString() == v2.toString()
+  } else if (v1 == undefined || v2 == undefined) {
+    return v1 == v2
   } else {
     if (v1.length != v2.length) {
       return false