theprogrammablemind_4wp 7.5.8-beta.47 → 7.5.8-beta.48

package/client.js

@@ -1492,7 +1492,8 @@ 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 arguments or the -rt argument to rebuild.`)
+        const 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.`
+        throw new Error(error)
       }
       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.47",
+  "version": "7.5.8-beta.48",
   "license": "ISC"
 }

package/src/config.js

@@ -933,17 +933,35 @@ class Config {
     const instanceFragments = (instance.fragments || []).map((fragment) => fragment.key || fragment.query).map( toCanonical )
     const templateFragments = (template.fragments || []).concat(this.dynamicFragments).map( toCanonical )
     const sameFragments = helpers.safeEquals(templateFragments, instanceFragments)
-    const cleanupWhere = (query) => {
-      if (typeof query == 'string') {
+    const toCanonicalQuery = (queryOrConfig) => {
+      if (typeof queryOrConfig == 'string') {
+        const query = queryOrConfig
         return query
       } else {
-        return { ...query, where: undefined }
+        const config = { ...queryOrConfig }
+        delete config.where
+        config.generators = (config.generators || []).map((generator) => {
+          generator = {...generator}
+          delete generator.where
+          generator.match = generator.match.toString()
+          generator.apply = generator.apply.toString()
+          return generator
+        })
+        config.semantics = (config.semantics || []).map((semantic) => {
+          semantic = {...semantic}
+          delete semantic.where
+          semantic.match = semantic.match.toString()
+          semantic.apply = semantic.apply.toString()
+          return semantic
+        })
+        return config
       }
     }
-    const cleanupWheres = (elements) => {
-      return elements.map( cleanupWhere )
+    const toCanonicalQueries = (elements) => {
+      return elements.map( toCanonicalQuery )
     }
-    const sameQueries = helpers.safeEquals(cleanupWheres(template.queries || []).map(helpers.updateQueries), cleanupWheres(instance.queries || []))
+
+    const sameQueries = helpers.safeEquals(toCanonicalQueries(template.queries || []).map(helpers.updateQueries), toCanonicalQueries(instance.queries || []))
     return !(instance && sameQueries && sameFragments)
   }