theprogrammablemind 9.6.0-beta.2 → 9.6.0

package/client.js

@@ -1184,7 +1184,10 @@ const checkTemplate = (template) => {
   if (!template) {
     return
   }
-  validProps(['fragments', 'configs'], template, 'template.template')
+  if (template.checks) {
+    throw new Error("The 'checks' property should be in the 'test' property not the 'template' property")
+  }
+  validProps(['fragments', 'configs'], template.template, 'template.template')
 }
 
 const checkTest = (testConfig) => {
@@ -1218,7 +1221,6 @@ const knowledgeModuleImpl = async ({
   demo,
   test,
   template,
-  instance, // instance file
   errorHandler = defaultErrorHandler,
   process: processResults = defaultProcess,
   stopAtFirstFailure = true,
@@ -1634,10 +1636,10 @@ const knowledgeModuleImpl = async ({
         let needsRebuild
         if (args.rebuildTemplate && !args.rebuildTemplateFull) {
           // get the startOfChanges for the partial rebuild
-          needsRebuild = config.needsRebuild(template, instance, { ...options, rebuild: false })
+          needsRebuild = config.needsRebuild(template.template, template.instance, { ...options, rebuild: false })
         } else {
           // do a check or full rebuild
-          needsRebuild = config.needsRebuild(template, instance, options)
+          needsRebuild = config.needsRebuild(template.template, template.instance, options)
         }
 
         if (needsRebuild.needsRebuild) {
@@ -1653,7 +1655,7 @@ const knowledgeModuleImpl = async ({
           config.config.rebuild = true
         }
         try {
-          await config.load(rebuildTemplate, template, instance, { rebuild: needsRebuild.needsRebuild || options.rebuild, previousResultss: needsRebuild.previousResultss, startOfChanges: needsRebuild.startOfChanges })
+          await config.load(rebuildTemplate, template.template, template.instance, { rebuild: needsRebuild.needsRebuild || options.rebuild, previousResultss: needsRebuild.previousResultss, startOfChanges: needsRebuild.startOfChanges })
           config.fixtures()
         } catch (e) {
           console.error(`Error loading template for ${config.name}. ${e.error ? e.error : e}${e.stack ? e.stack : ''}`)
@@ -1975,8 +1977,8 @@ const knowledgeModuleImpl = async ({
   } else {
     const initConfig = async (config) => {
       if (template) {
-        if (config.needsRebuild(template, instance, { isModule: !isProcess }).needsRebuild) {
-          config.needsRebuild(template, instance, { isModule: !isProcess })
+        if (config.needsRebuild(template.template, template.instance, { isModule: !isProcess }).needsRebuild) {
+          config.needsRebuild(template.template, template.instance, { isModule: !isProcess })
           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)
         }
@@ -1991,7 +1993,7 @@ const knowledgeModuleImpl = async ({
       }
       if (template) {
         try {
-          await config.load(rebuildTemplate, template, instance)
+          await config.load(rebuildTemplate, template.template, template.instance)
         } catch (e) {
           errorHandler(e)
         }

package/package.json

@@ -72,6 +72,6 @@
     "scriptjs": "^2.5.9",
     "uuid": "^8.3.2"
   },
-  "version": "9.6.0-beta.2",
+  "version": "9.6.0",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -553,8 +553,7 @@ const handleCalculatedProps = (baseConfig, moreConfig, { addFirst, uuid } = {})
         'skipable', 
         'uuid',
         'where', 
-        'words', 
-        /Bridge$/, 
+        'words', /Bridge$/, 
       ]
       helpers.validProps(valid, bridge, 'bridge')
       handleBridgeProps(baseConfig, bridge, { addFirst, uuid })

package/src/digraph.js

@@ -80,9 +80,6 @@ class Digraph {
 */
 
   acdcs (s, from, to) {
-    if (!s) {
-      return new Set()
-    }
     const todo = [s]
     const seen = new Set([s])
     const acdcs = new Set([])

package/src/project2.js

@@ -11,7 +11,7 @@ function areFirstNEqual(arr1, arr2, n) {
 }
 
 function project(source, filters, path=[]) {
-  if (['boolean', 'string', 'number'].includes(typeof source)) {
+  if (['string', 'number'].includes(typeof source)) {
     return source
   }
   if (Array.isArray(source)) {
@@ -63,9 +63,7 @@ function project(source, filters, path=[]) {
   properties.forEach(prop => {
     if (prop.path && (prop.path.length === path.length + 1) && areFirstNEqual(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]
-      } else if (Array.isArray(source[endProp])) {
+      if (Array.isArray(source[endProp])) {
         result[endProp] = []
         for (const key in source[endProp]) {
           result[endProp].push(project(source[endProp][key], filters, [...path, endProp, key]))