theprogrammablemind 7.3.5-beta.24 → 7.3.5-beta.26

package/client.js

@@ -12,22 +12,7 @@ const { appendNoDups, InitCalls } = require('./src/helpers')
 const sortJson = require('sort-json')
 const util = require('util')
 const { diffString } = require('json-diff')
-
-const isJest = () => {
-  return process.env.JEST_WORKER_ID !== undefined;
-}
-
-let fs
-let ArgumentParser
-
-const setupLibs = () => {
-  if (!fs) {
-    fs = require('fs')
-  }
-  if (!ArgumentParser) {
-    ArgumentParser = require('argparse').ArgumentParser
-  }
-}
+const runtime = require('./runtime')
 
 const ask = (config) => (asks) => {
   for (let ask of asks) {
@@ -66,13 +51,13 @@ const ask = (config) => (asks) => {
 const vimdiff = (actualJSON, expectedJSON) => {
   const path = '.'
   const actual = sortJson(actualJSON, { depth: 25 })
-  fs.writeFileSync(`${path}/actual.json`, JSON.stringify(actual, 0, 2))
+  runtime.fs.writeFileSync(`${path}/actual.json`, JSON.stringify(actual, 0, 2))
   const expected = sortJson(expectedJSON, { depth: 25 })
-  fs.writeFileSync(`${path}/expected.json`, JSON.stringify(expected, 0, 2))
+  runtime.fs.writeFileSync(`${path}/expected.json`, JSON.stringify(expected, 0, 2))
   // console.log(`vimdiff ${path}/actual.json ${path}/expected.json`)
   {
-    const editor = process.env.EDITOR || 'vimdiff'
-    const child = child_process.spawn(editor, [`${path}/expected.json`, `${path}/actual.json`], { stdio: 'inherit' })
+    const editor = runtime.process.env.EDITOR || 'vimdiff'
+    const child = runtime.child_process.spawn(editor, [`${path}/expected.json`, `${path}/actual.json`], { stdio: 'inherit' })
     child.on('exit', function (e, code) {
       console.log('finished')
     })
@@ -247,14 +232,13 @@ const writeTestFile = (fn, tests) => {
     }
   }
   stabilize(tests)
-  fs.writeFileSync(fn, stringify(tests, { space: 2 }), { encoding: 'utf8', flag: 'w+' })
+  runtime.fs.writeFileSync(fn, stringify(tests, { space: 2 }), { encoding: 'utf8', flag: 'w+' })
 }
 
 const writeTest = (fn, query, objects, generated, paraphrases, responses, contexts, associations, metadata, config, saveDeveloper) => {
-  setupLibs()
   let tests = []
-  if (fs.existsSync(fn)) {
-    tests = JSON.parse(fs.readFileSync(fn))
+  if (runtime.fs.existsSync(fn)) {
+    tests = JSON.parse(runtime.fs.readFileSync(fn))
   }
   for (let association of associations) {
     association.sort()
@@ -720,7 +704,7 @@ const runTestsHelper = async (config, tests, failed, juicyBits) => {
 }
 
 const runTests = async (config, testFile, juicyBits) => {
-  const tests = JSON.parse(fs.readFileSync(testFile))
+  const tests = JSON.parse(runtime.fs.readFileSync(testFile))
   const { beforeTests, afterTests } = juicyBits
   beforeTests()
   if (juicyBits.verbose) {
@@ -757,7 +741,7 @@ const saveTestsHelper = async (testFile, config, tests, todo, beforeQuery, testC
 }
 
 const saveTests = (config, testFile, beforeQuery, testConfig) => {
-  const tests = JSON.parse(fs.readFileSync(testFile))
+  const tests = JSON.parse(runtime.fs.readFileSync(testFile))
   console.log(testFile)
   return saveTestsHelper(testFile, config, tests, tests.map( (test) => test.query ), beforeQuery, testConfig)
 }
@@ -1074,13 +1058,13 @@ const build = async ({ config, target, beforeQuery, template, errorHandler = def
       return template
     };
     stabilizeOutput(accumulators)
-    fs.writeFileSync(instanceName, JSON.stringify(Object.assign({ queries: template.queries }, accumulators), 0, 2))
+    runtime.fs.writeFileSync(instanceName, JSON.stringify(Object.assign({ queries: template.queries }, accumulators), 0, 2))
 
     // km tests file
     const testsName = `./${target}.test.json`
-    if (!fs.existsSync(testsName)) {
+    if (!runtime.fs.existsSync(testsName)) {
       console.log(`Writing km file tests file "${testsName}" since it does not exist`)
-      fs.writeFileSync(testsName, JSON.stringify({}, 0, 2))
+      runtime.fs.writeFileSync(testsName, JSON.stringify({}, 0, 2))
     }
   }
 
@@ -1118,10 +1102,6 @@ const knowledgeModule = async ({
   const isProcess = require.main === moduleFromJSFile
   const testConfig = test
 
-  if (isProcess && isJest()) {
-    setupLibs()
-  }
-
   // remove test only stuff
   if (!isProcess) {
     config.config.operators = config.config.operators.filter( (operator) => {
@@ -1172,8 +1152,8 @@ const knowledgeModule = async ({
     config.tests = test.contents
     test = test.name
   } else {
-    if (fs && fs.existsSync(test)) {
-      config.tests = JSON.parse(fs.readFileSync(test))
+    if (runtime.fs && runtime.fs.existsSync(test)) {
+      config.tests = JSON.parse(runtime.fs.readFileSync(test))
     } else {
       config.tests = {}
     }
@@ -1190,8 +1170,7 @@ const knowledgeModule = async ({
 
   if (isProcess) {
     // setup();
-    setupLibs()
-    const parser = new ArgumentParser({
+    const parser = new runtime.ArgumentParser({
       description: 'Entodicton knowledge module'
     })
 
@@ -1238,7 +1217,7 @@ const knowledgeModule = async ({
     }
 
     if (args.clean) {
-      const tests = JSON.parse(fs.readFileSync(testConfig.name))
+      const tests = JSON.parse(runtime.fs.readFileSync(testConfig.name))
       for (let test of tests) {
         delete test.associations
       }
@@ -1248,7 +1227,7 @@ const knowledgeModule = async ({
     }
 
     if (args.queryDelete) {
-      let tests = JSON.parse(fs.readFileSync(testConfig.name))
+      let tests = JSON.parse(runtime.fs.readFileSync(testConfig.name))
       tests = tests.filter( (test) => test.query !== args.queryDelete );
       writeTestFile(testConfig.name, tests)
       console.log(`Remove the test for "${args.queryDelete}"`)
@@ -1400,7 +1379,7 @@ const knowledgeModule = async ({
         const l = (n, hasError) => {
           if (n === 0) {
             if (hasError) {
-              process.exit(-1)
+              processContext.exit(-1)
             }
             return
           }
@@ -1446,7 +1425,7 @@ const knowledgeModule = async ({
             l(n - 1, hasError || newError)
           }).catch((error) => {
             console.error(error)
-            process.exit(-1)
+            processContext.exit(-1)
             errorHandler(error)
           })
         }
@@ -1455,7 +1434,7 @@ const knowledgeModule = async ({
         test()
       }
     } else if (args.loop) {
-      const readline = require('readline').createInterface({ input: process.stdin, output: process.stdout })
+      const readline = require('readline').createInterface({ input: runtime.process.stdin, output: runtime.process.stdout })
       const f = () => readline.question('Enter query? (newline to quit) ', query => {
         query = query.trim()
         if (query.length === 0) {
@@ -1503,13 +1482,12 @@ const test = (name) => {
 */
 
 const ensureTestFile = (module, name, type) => {
-  setupLibs()
   const isProcess = require.main === module
   if (isProcess) {
     const fn = `./${name}.${type}.json`
-    if (!fs.existsSync(fn)) {
+    if (!runtime.fs.existsSync(fn)) {
       console.log('writing')
-      fs.writeFileSync(fn, '[]')
+      runtime.fs.writeFileSync(fn, '[]')
     }
   }
 }

package/package.json

@@ -36,6 +36,7 @@
     "lines.js",
     "demo.js",
     "demo.test.json",
+    "runtime.js",
     "src/helpers.js",
     "src/flatten.js",
     "src/unflatten.js",
@@ -60,6 +61,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.3.5-beta.24",
+  "version": "7.3.5-beta.26",
   "license": "ISC"
 }

package/runtime.js

@@ -0,0 +1,11 @@
+module.exports = {
+  process: {
+    env: "Should not be called in the browser",
+    exit: "Should not be called in the browser",
+    stdin: "Should not be called in the browser",
+    stdout: "Should not be called in the browser",
+  },
+  child_process: "Should not be called in the browser",
+  fs: "Should not be called in the browser",
+  ArgumentParser: "Should not be called in the browser",
+}

package/src/config.js

@@ -6,6 +6,7 @@ const client = require('../client')
 const Digraph = require('./digraph')
 const helpers = require('./helpers')
 const deepEqual = require('deep-equal')
+const runtime = require('../runtime')
 const _ = require('lodash')
 
 const debugBreak = () => {
@@ -21,20 +22,18 @@ const indent = (string, indent) => {
     return string.replace(/^/gm, ' '.repeat(indent));
 }
 
-/* TODO FIX THIS greg
-if (process.env.DEBUG_HIERARCHY) {
-  global.entodictonDebugHierarchy = JSON.parse(process.env.DEBUG_HIERARCHY)
+if (runtime.process.env.DEBUG_HIERARCHY) {
+  global.entodictonDebugHierarchy = JSON.parse(runtime.process.env.DEBUG_HIERARCHY)
 }
 
-if (process.env.DEBUG_BRIDGE) {
+if (runtime.process.env.DEBUG_BRIDGE) {
   // id/level
-  global.entodictonDebugBridge = process.env.DEBUG_BRIDGE.split('/')
+  global.entodictonDebugBridge = runtime.process.env.DEBUG_BRIDGE.split('/')
   if (global.entodictonDebugBridge.length !== 2) {
     console.log('Expected DEBUG_BRIDGE to be of the form "id/level"');
   }
   global.entodictonDebugBridge[1] = int(global.entodictonDebugBridge[1])
 }
-*/
 
 const hierarchyCanonical = (element) => {
     if (element.child && element.parent) {
@@ -1232,12 +1231,9 @@ class Config {
     return true
   }
 
-  /*
   dump(fn) {
-    const fs = require('fs')
-    fs.writeFileSync(fn, JSON.stringify(this.config, 0, 2))
+    runtime.fs.writeFileSync(fn, JSON.stringify(this.config, 0, 2))
   }
-  */
 
   copy (options = {}) {
     this.valid()