theprogrammablemind 9.4.5 → 9.5.0-beta.0

package/client.js

@@ -416,17 +416,17 @@ const getConfigForTest = (config, testConfig) => {
   const configForTest = {}
   for (const key of Object.keys(includes)) {
     if (key === 'words') {
-      const words = config.config.words
+      const all = typeof includes.words == 'boolean'
       configForTest.words = {
         literals: {},
         patterns: [],
         hierarchy: []
       }
-
-      const literals = config.config.words.literals
+      const words = config.config.words
+      const literals = words.literals
       let includesWord = (word) => true
-      if (Array.isArray(includes.words)) {
-        includesWord = (word) => includes.words.includes(word)
+      if (Array.isArray(includes.words.literals)) {
+        includesWord = (word) => includes.words.literals.includes(word)
       }
       for (const key in literals) {
         if (!includesWord(key)) {
@@ -440,11 +440,15 @@ const getConfigForTest = (config, testConfig) => {
         configForTest.words.literals[key] = defs
       }
 
-      const patterns = config.config.words.patterns || []
-      configForTest.words.patterns = patterns.map((pattern) => Object.assign({}, pattern, { uuid: undefined }))
+      if (all || includes.words.patterns) {
+        const patterns = config.config.words.patterns || []
+        configForTest.words.patterns = patterns.map((pattern) => Object.assign({}, pattern, { uuid: undefined }))
+      }
 
-      const hierarchy = config.config.words.hierarchy || []
-      configForTest.words.hierarchy = hierarchy.map((hierarchy) => Object.assign({}, hierarchy, { uuid: undefined }))
+      if (all || includes.words.hierarchy) {
+        const hierarchy = config.config.words.hierarchy || []
+        configForTest.words.hierarchy = hierarchy.map((hierarchy) => Object.assign({}, hierarchy, { uuid: undefined }))
+      }
     } else if (key === 'operators') {
       let include = (operator) => true
       if (Array.isArray(includes.operators)) {
@@ -893,6 +897,10 @@ const defaultInnerProcess = (config, errorHandler, responses) => {
     console.log(JSON.stringify(pickedResultContexts, null, 2))
   }
 
+  const actualConfig = sortJson(convertToStable(getConfigForTest(config, config.testConfig)), { depth: 25 })
+  console.log('--- Config showing only the checked values')
+  console.log(JSON.stringify(actualConfig, null, 2))
+
   console.log('--- The contexts are ----------')
   console.log(JSON.stringify(sortJson(responses.contexts, { depth: 25 }), null, 2))
   console.log('')

package/package.json

@@ -22,6 +22,7 @@
     "to": "node node_modules/.bin/jest --runInBand -t NEO23",
     "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",
     "test:watch": "npm run test -- --watch"
   },
   "keywords": [
@@ -70,6 +71,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "9.4.5",
+  "version": "9.5.0-beta.0",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -207,11 +207,10 @@ const validConfigProps = (config) => {
 
 const setupInitializerFNArgs = (config, args) => {
   const aw = (word, def) => config.addWord(word, def, args.uuid)
-  const ap = (pattern, def) => config.addPattern(pattern, def, args.uuid)
+  const ap = (pattern, def) => config.addPattern(pattern, args.uuid)
   const ag = (generator) => config.addGenerator(generator, args.uuid, config.name)
   const km = (name) => config.getConfig(name)
   const apis = (name) => config.getConfig(name).api
-
   return {
     ...args,
     addWord: aw,
@@ -490,7 +489,7 @@ const handleCalculatedProps = (baseConfig, moreConfig, { addFirst, uuid } = {})
     moreConfig.bridges = moreConfig.bridges.map((bridge) => {
       bridge = { ...bridge }
       const valid = ['after', 'conditional', 'associations', 'before', 'bridge', 'check', 'disabled', 'development', 'skipable', 'return_type_selector', 'evaluator', 'evaluators', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'operator', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
-        'level', 'optional', 'selector', 'semantic', 'semantics', 'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where', 'uuid']
+        'level', 'optional', 'selector', 'separators', 'semantic', 'semantics', 'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where', 'uuid']
       helpers.validProps(valid, bridge, 'bridge')
       handleBridgeProps(baseConfig, bridge, { addFirst, uuid })
       return bridge
@@ -1653,7 +1652,7 @@ class Config {
     this._delta.json.words.push({ action: 'add', word, def })
   }
 
-  addPattern (pattern, def, uuid) {
+  addPattern (pattern, uuid) {
     if (!this.config.words) {
       this.config.words = {
         literals: {},
@@ -1662,10 +1661,11 @@ class Config {
       }
     }
 
+    pattern.defs = pattern.defs.map((def) => Object.assign({}, def, { uuid: uuid || this._uuid }) )
+
     const patterns = this.config.words.patterns
-    def = Object.assign({}, def, { uuid: uuid || this._uuid })
-    patterns.unshift({ pattern, defs: [def] })
-    this._delta.json.words.push({ action: 'add', pattern, defs: [def] })
+    patterns.unshift(pattern)
+    this._delta.json.words.push({ action: 'add', pattern })
   }
 
   getAPI (uuid) {

package/src/configHelpers.js

@@ -15,6 +15,7 @@ const gs = (g) => async (contexts, separator, lastSeparator) => {
     lastSeparator = separator
   }
   let nextSeparator = ''
+  let lastEnd = 0
   for (let i = 0; i < contexts.length; ++i) {
     const context = contexts[i]
     const value = await g(context)
@@ -25,6 +26,10 @@ const gs = (g) => async (contexts, separator, lastSeparator) => {
         nextSeparator = separator
       }
     }
+    if (lastEnd + 1 == context.range?.start) {
+      nextSeparator = ''
+    }
+    lastEnd = context.range?.end
     s += nextSeparator + value
   }
   return s
@@ -124,6 +129,10 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   }
   args.log = (message) => logs.push(message)
 
+  args.addWord = (word, def) => config.addWord(word, def, args.uuid)
+  args.addPattern = (pattern, def) => config.addPattern(pattern, args.uuid)
+  args.addGenerator = (generator) => config.addGenerator(generator, args.uuid, config.name)
+
   args.addAssumedScoped = (args, assumed) => {
     const addAssumed = (args, ...moreAssumed) => {
       return { ...args, assumed: Object.assign({}, assumed, (args.assumed || {}), ...moreAssumed) }
@@ -462,6 +471,14 @@ const loadInstance = async (config, instance) => {
 
       const uuid = config.nameToUUID(instance.name)
       setupArgs(args, config, config.logs, hierarchy, uuid)
+      if (config.name == instance.name) {
+        args.isModule = !!config.isModule
+        args.isProcess = !config.isModule
+      } else {
+        // only main can load as process
+        args.isModule = true
+        args.isProcess = false
+      }
       await results.apply(args)
     } else if (results.isFragment) {
     } else {