theprogrammablemind 7.4.3 → 7.5.0

package/client.js

@@ -1254,7 +1254,7 @@ const knowledgeModule = async ({
     parser.add_argument('-q', '--query', { help: 'Run the specified query' })
     parser.add_argument('-ip ', '--server', { help: 'Server to run against' })
     parser.add_argument('-qp ', '--queryParams', { help: 'Query params for the server call' })
-    parser.add_argument('-qd', '--queryDelete', { help: 'Delete the specified query from the tests file' })
+    parser.add_argument('-td', '--testDelete', { help: 'Delete the specified query from the tests file.' })
     parser.add_argument('-c', '--clean', { help: 'Remove data from the test files. a === association' })
     parser.add_argument('-od', '--objectDiff', { action: 'store_true', help: 'When showing the objects use a colour diff' })
     parser.add_argument('-daa', '--dontAddAssociations', { action: 'store_true', help: 'Do not add associations from the tests.' })
@@ -1293,11 +1293,11 @@ const knowledgeModule = async ({
       return
     }
 
-    if (args.queryDelete) {
+    if (args.testDelete) {
       let tests = JSON.parse(runtime.fs.readFileSync(testConfig.name))
-      tests = tests.filter( (test) => test.query !== args.queryDelete );
+      tests = tests.filter( (test) => test.query !== args.testDelete );
       writeTestFile(testConfig.name, tests)
-      console.log(`Remove the test for "${args.queryDelete}"`)
+      console.log(`Remove the test for "${args.testDelete}"`)
       return
     }
 

package/package.json

@@ -61,6 +61,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.4.3",
+  "version": "7.5.0",
   "license": "ISC"
 }

package/src/config.js

@@ -412,11 +412,11 @@ class Config {
   }
 
   getSemantics (logs = []) {
-    return new Semantics(this.config.semantics || [], logs)
+    return new Semantics(this.config.semantics || [], logs, { km: this.name })
   }
 
   getGenerators (logs = []) {
-    return new Generators(this.config.generators || [], logs)
+    return new Generators(this.config.generators || [], logs, { km: this.name })
   }
 
   warningNotEvaluated (log, value) {
@@ -1063,6 +1063,15 @@ class Config {
         // this.config.words = {}
       }
       for (let bridge of (this.config.bridges || [])) {
+        const valid = [ 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generators', 'hierarchy', 'id', 'inverted', 'isA',
+                        'level', 'optional', 'selector', 'semantic',  'uuid', 'words' ]
+        for (let prop of Object.keys(bridge)) {
+          if (!valid.includes(prop)) {
+            if (!prop.endsWith("Bridge")) {
+              throw `Unknown property "${prop}" in the bridge. Valid properties are ${valid}. The bridge is ${JSON.stringify(bridge)}`
+            }
+          }
+        }
         /*
         if (bridge.generator) {
           this.config.generators.push({ 
@@ -1084,7 +1093,7 @@ class Config {
         if (bridge.words) {
           for (let def of bridge.words) {
             if (typeof def == 'string') {
-              this.addWordInternal(def, {"id": bridge.id, "initial": "{}" })
+              this.addWordInternal(def, {"id": bridge.id, "initial": `{ value: "${def}"}` })
             } else {
               const word = def.word
               def = { initial: JSON.stringify(def), id: bridge.id, word: undefined }

package/src/generators.js

@@ -124,12 +124,14 @@ class Generator {
 }
 
 class Generators {
-  constructor (generators, logs = []) {
+  constructor (generators, logs = [], options = {}) {
+    let index = -1
     generators = (generators || []).map((generator) => {
       if (generator instanceof Generator) {
         return generator
       } else {
-        return new Generator(generator)
+        index += 1
+        return new Generator({ km: options.km, index, ...normalizeGenerator(generator) })
       }
     })
     this.defaults = []

package/src/semantics.js

@@ -115,12 +115,14 @@ class Semantic {
 }
 
 class Semantics {
-  constructor (semantics, logs = []) {
+  constructor (semantics, logs = [], options = {}) {
+    let index = -1
     semantics = semantics.map((semantic) => {
       if (semantic instanceof Semantic) {
         return semantic
       } else {
-        return new Semantic(semantic)
+        index += 1
+        return new Semantic({ km: options.km, index, ...normalizeSemantic(semantic) })
       }
     })