theprogrammablemind 7.12.8-beta.8 → 7.12.8-beta.9

package/package.json

@@ -65,6 +65,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.12.8-beta.8",
+  "version": "7.12.8-beta.9",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -105,7 +105,6 @@ const validConfigProps = (config) => {
     'objects',
     'bridges',
     'operators',
-    'trie',
     'words',
     'priorities',
     'associations',
@@ -442,10 +441,6 @@ const isValidWordDef = (word, def, config) => {
   */
 }
 
-const isValidTrie = (trie) => {
-  return true
-}
-
 const hierarchyToCanonical = (edge) => {
   if (Array.isArray(edge)) {
     return { child: edge[0], parent: edge[1] }
@@ -453,17 +448,6 @@ const hierarchyToCanonical = (edge) => {
   return edge
 }
 
-// for trie defs
-
-const addPattern = (config, uuid) => ({ pattern, defs }) => {
-  if (!config.trie) {
-    config.trie = []
-  }
-  const trie = config.trie
-  const def = { id, initial, uuid }
-  trie.unshift({ pattern, defs })
-}
-
 const addWord = (config, uuid) => ({ word, id, initial }) => {
   if (!config.words) {
     config.words = {
@@ -552,12 +536,6 @@ function setWordsUUIDs (words, uuid) {
   }
 }
 
-function setTrieUUIDs (patterns, uuid) {
-  for (const pattern of patterns) {
-    pattern.defs.map((def) => Object.assign(def, { uuid }))
-  }
-}
-
 function applyUUID (config, uuid) {
   if (config instanceof Config) {
     config = config.config
@@ -588,9 +566,6 @@ function applyUUID (config, uuid) {
   if (config.words) {
     setWordsUUIDs(config.words, uuid)
   }
-  if (config.trie) {
-    setTrieUUIDs(config.trie, uuid)
-  }
   for (const property of bags) {
     if (config[property]) {
       config[property].forEach((bag) => { bag.uuid = uuid })
@@ -890,7 +865,6 @@ class Config {
         namespaced: {}
       },
       description: '',
-      trie: [],
       words: {
         literals: {},
         patterns: [],
@@ -923,7 +897,6 @@ class Config {
       'eqClasses',
       'priorities',
       'associations',
-      'trie',
       'words',
       'floaters',
       'implicits',
@@ -1473,18 +1446,6 @@ class Config {
     this._delta.json.operators.push({ action: 'add', operator })
   }
 
-  /*
-  addPattern (pattern, def, uuid) {
-    if (!this.config.trie) {
-      this.config.trie = []
-    }
-    const patterns = this.config.trie
-    def = Object.assign({}, def, { uuid: uuid || this._uuid })
-    patterns.unshift({ pattern, def })
-    this._delta.json.trie.push({ action: 'add', pattern, def })
-  }
-  */
-
   addWord (word, def, uuid) {
     this.addWordInternal(word, def, uuid)
   }
@@ -1748,18 +1709,6 @@ class Config {
       }
     }
     config.words.hierarchy = hierarchyPrime
-
-    const toDelete = []
-    for (const [index, pattern] of config.trie.entries()) {
-      const defs = pattern.defs
-      pattern.defs = defs.filter((def) => !def.development)
-      if (pattern.defs.length == 0) {
-        toDelete.unshift(index)
-      }
-    }
-    for (const index of toDelete) {
-      config.patterns.split(index, 1)
-    }
   }
 
   // configs = [ { config, namespace } ... ]
@@ -1773,7 +1722,6 @@ class Config {
 
       config.operators = config.operators || []
       config.bridges = config.bridges || []
-      config.trie = config.trie || []
       config.words = config.words || { literals: {}, patterns: [], hierarchy: [] }
       config.generators = config.generators || []
       config.semantics = config.semantics || []
@@ -1830,10 +1778,6 @@ class Config {
       isValidWordDef(config.words)
     }
 
-    if (config && config.trie) {
-      isValidTrie(config.trie)
-    }
-
     if (config && config.priorities) {
       priorities_valid(config.priorities)
     }
@@ -1936,7 +1880,6 @@ class Config {
     this._delta = {
       cacheKey,
       json: {
-        trie: [],
         words: [],
         operators: [],
         bridges: [],
@@ -2121,7 +2064,6 @@ class Config {
   setUUIDs () {
     this.config.bridges && this.config.bridges.forEach((bridge) => { bridge.uuid = this._uuid })
     this.config.words && setWordsUUIDs(this.config.words, this._uuid)
-    this.config.trie && setTrieUUIDs(this.config.trie, this._uuid)
     this.config.operators && this.config.operators.forEach((operator) => { operator.uuid = this._uuid })
     const ids = Array.from(new Set(this.config.bridges.map((bridge) => bridge.id)))
     ids.sort()
@@ -2198,10 +2140,6 @@ class Config {
       }
     }
 
-    if (this.config.trie) {
-      mapDefList(this.config.trie)
-    }
-
     if (this.config.bridges) {
       this.config.bridges.forEach((bridge) => {
         if (bridge.uuid) {
@@ -2385,9 +2323,6 @@ class Config {
       }
     }
 
-    // TODO trie
-    isValidTrie(this.config.trie)
-
     const kmsUuids = this.configs.map((km) => km.uuid)
     const bridgesUuids = this.config.bridges.map((bridge) => bridge.uuid).filter((uuid) => uuid)
     let result = true
@@ -2590,7 +2525,6 @@ class Config {
         hierarchy: this.config.hierarchy,
         priorities: this.config.priorities,
         associations: this.config.associations,
-        trie: this.config.trie,
         words: this.config.words
       }
 
@@ -2601,8 +2535,6 @@ class Config {
       this.config.associations = { positive: [], negative: [] }
       this.config.words = initWords({})
 
-      this.config.trie = []
-
       for (let i = 0; i < addInternals.length; ++i) {
         let name
         if (addInternals[i]) {
@@ -2809,19 +2741,6 @@ class Config {
       }
     }
 
-    if (config.trie) {
-      // TODO not currently used
-      /*
-      const words = {}
-      for (const word in config.words) {
-        words[word] = config.words[word].map((word) => {
-          return Object.assign({}, word, { id: toNS(word.id), uuid })
-        })
-      }
-      config.words = words
-      */
-    }
-
     if (config.hierarchy) {
       helpers.mapInPlace(config.hierarchy, (h) => {
         if (Array.isArray(h)) {
@@ -2942,7 +2861,6 @@ class Config {
 
     // TODO trie
     if (property == 'words') {
-      throw "you need to fix this"
       for (const word in value) {
         for (const def of value[word]) {
           if (!def.uuid) {
@@ -2952,10 +2870,6 @@ class Config {
       }
     }
 
-    if (property == 'trie') {
-      isValidTrie(value)
-    }
-
     if (['operators', 'bridges'].includes(property)) {
       for (const def of value) {
         if (!def.uuid) {
@@ -3092,17 +3006,7 @@ class Config {
         this.config[key] = value
         continue
       }
-      if (key === 'trie') {
-        const configTrie = this.config.trie
-        const morePatterns = more.trie
-        for (const pattern of morePatterns) {
-          if (addFirst) {
-            configTrie.unshift(pattern)
-          } else {
-            configTrie.push(pattern)
-          }
-        }
-      } else if (key === 'words') {
+      if (key === 'words') {
         if (more.words.literals) {
           const literals = this.config.words.literals
           const moreLiterals = more.words.literals
@@ -3243,11 +3147,7 @@ class Config {
         this.config[key] = value
         continue
       }
-      if (key === 'trie') {
-        for (const pattern of more.trie) {
-          this.config.trie.unshift(pattern)
-        }
-      } else if (key === 'words') {
+      if (key === 'words') {
         if (this.config.words.literals) {
           const literals = this.config.words.literals
           const moreLiterals = more.words.literals