theprogrammablemind_4wp 9.3.0 → 9.4.1

package/src/digraph.js

@@ -22,7 +22,7 @@ class Digraph {
     while (Object.keys(frontier).length > 0) {
       const n = Object.keys(frontier)[0]
       const ps = frontier[n]
-      if (to == n) {
+      if (to === n) {
         return ps[0]
       }
       if (done.has(n)) {
@@ -184,7 +184,7 @@ class Digraph {
   }
 
   exists (child, parent) {
-    return this._edges.find((edge) => edge[0] == child && edge[1] == parent)
+    return this._edges.find((edge) => edge[0] === child && edge[1] === parent)
   }
 
   addList (l) {

package/src/digraph_internal.js

@@ -24,7 +24,7 @@ class DigraphInternal {
   addEdge (edge) {
     edge = toA(edge)
     // if (this._edges.find((existing) => _.isEqual(edge, existing))) {
-    if (this._edges.find((existing) => edge[0] == existing[0] && edge[1] == existing[1])) {
+    if (this._edges.find((existing) => edge[0] === existing[0] && edge[1] === existing[1])) {
       return false
     }
     this._edges.push(edge)
@@ -154,7 +154,7 @@ class DigraphInternal {
   }
 
   exists (child, parent) {
-    return this._edges.findIndex((edge) => edge[0] == child && edge[1] == parent) != -1
+    return this._edges.findIndex((edge) => edge[0] === child && edge[1] === parent) != -1
   }
 
   addList (l) {

package/src/flatten.js

@@ -92,7 +92,7 @@ const flatten = (markers, value) => {
   const split = markers.includes(marker)
   if (split) {
     if ('value' in properties) {
-      flattenedValues = []
+      let flattenedValues = []
       for (const v of properties.value) {
         if (v.flatten) {
           flattenedValues = flattenedValues.concat(flatten(markers, v)[0])

package/src/generators.js

@@ -65,7 +65,7 @@ class Generator {
     // return this.match(args)
     const matches = await this.match(args)
     if ((matches && (options.debug || {}).match) ||
-        callId == this.callId) {
+        callId === this.callId) {
       // next line is the matcher
       debugger // eslint-disable-line no-debugger
       await this.match(args)
@@ -78,7 +78,7 @@ class Generator {
     if (!log) {
       throw new Error('generators.apply argument log is required')
     }
-    if (baseArgs.call && config && sbaseArgs.calls.stack.length > config.maxDepth) {
+    if (baseArgs.call && config && baseArgs.calls.stack.length > config.maxDepth) {
       throw new Error(`Max depth of ${config.maxDepth} for calls has been exceeded. maxDepth can be set on the config object. To see the calls run with the --dl or set the debugLoops property on the config`)
     }
 
@@ -116,11 +116,11 @@ class Generator {
       apis: this.getAPIs(config)
     }
     const args = Object.assign({}, baseArgs, moreArgs, (baseArgs.getUUIDScoped || (() => { return {} }))(this.uuid))
-    if (this.property == 'generatorp') {
+    if (this.property === 'generatorp') {
       args.g = args.gp
     }
     if ((options.debug || {}).apply ||
-        callId == this.callId) {
+        callId === this.callId) {
       debugger // eslint-disable-line no-debugger
     }
     return await this._apply(args)
@@ -218,7 +218,7 @@ class Generators {
           lines.setElement(0, 2, stack)
           lines.newRow()
           lines.setElement(0, 1, 'DEBUG')
-          lines.setElement(0, 2, `To debug this use args.callId == '${args.calls.current()}'`)
+          lines.setElement(0, 2, `To debug this use args.callId === '${args.calls.current()}'`)
           lines.newRow()
           lines.setElement(0, 1, 'ERROR')
           lines.setElement(0, 2, errorMessage)
@@ -250,7 +250,7 @@ class Generators {
           lines.setElement(0, 2, stack)
           lines.newRow()
           lines.setElement(0, 1, 'DEBUG')
-          lines.setElement(0, 2, `To debug this use args.callId == '${args.calls.current()}'`)
+          lines.setElement(0, 2, `To debug this use args.callId === '${args.calls.current()}'`)
           lines.newRow()
           lines.setElement(0, 1, 'TO')
           lines.setElement(0, 2, `context_id: ${context.context_id}`)

package/src/helpers.js

@@ -97,7 +97,7 @@ const appendNoDups = (l1, l2) => {
 }
 
 const safeNoDups = (list) => {
-  noDups = []
+  const noDups = []
   for (const element of list) {
     if (!noDups.find((e) => safeEquals(e, element))) {
       noDups.push(element)
@@ -112,14 +112,14 @@ const safeEquals = (v1, v2) => {
   }
 
   const type = typeof v1
-  if (type == 'number' || type == 'string') {
-    return v1 == v2
-  } else if (type == 'function') {
-    return v1.toString() == v2.toString()
+  if (type === 'number' || type === 'string') {
+    return v1 === v2
+  } else if (type === 'function') {
+    return v1.toString() === v2.toString()
   } else if (v1 == undefined || v2 == undefined) {
-    return v1 == v2
+    return v1 === v2
   } else {
-    if (v1.length != v2.length) {
+    if (v1.length !== v2.length) {
       return false
     }
     for (const key in v1) {
@@ -148,7 +148,7 @@ const semanticsGenerate = (from, known) => {
   }
 
   return {
-    match: ({context}) => marker == marker,
+    match: ({context}) => marker === marker,
     apply: ({context}) => {
     },
   }
@@ -299,9 +299,9 @@ const sortJson = (json) => {
 const validProps = (valids, object, type) => {
   for (const prop of Object.keys(object)) {
     let okay = false
-    for (valid of valids) {
+    for (const valid of valids) {
       if (typeof valid === 'string') {
-        okay = prop == valid
+        okay = prop === valid
       } else {
         okay = prop.match(valid)
       }
@@ -310,6 +310,7 @@ const validProps = (valids, object, type) => {
       }
     }
     if (!okay) {
+      valids.sort()
       throw new Error(`Unknown property "${prop}" in the ${type}. Valid properties are ${valids.join(', ')}. The ${type} is ${JSON.stringify(object)}`)
     }
   }
@@ -334,7 +335,7 @@ const updateQueries = (queryOrConfig) => {
 
 const functionsToStrings = (config) => {
   config = { ...config }
-  defToStrings = (def) => {
+  const defToStrings = (def) => {
     if (def.apply) {
       // return { ...def, match: def.match.toString(), apply: def.apply.toString() }
       return { match: def.match.toString(), apply: def.apply.toString() }
@@ -390,7 +391,7 @@ const ecatch = (where, call) => {
 }
 
 const equalKey = (key1, key2) => {
-  return key1[0] == key2[0] && key1[1] == key2[1]
+  return key1[0] === key2[0] && key1[1] === key2[1]
 }
 
 // matches for { context: ..., [ordered], choose: ... } exactely OR
@@ -399,8 +400,8 @@ const subPriority = (sub, sup) => {
   if (Array.isArray(sub)) {
     const subChoosen = sub[0]
     const subOther = sub[1]
-    const hasChoosen = sup.choose.find((index) => equalKey(sup.context[index], subChoosen)) != undefined
-    const hasOtherChosen = sup.choose.find((index) => equalKey(sup.context[index], subOther)) != undefined
+    const hasChoosen = sup.choose.find((index) => equalKey(sup.context[index], subChoosen)) !== undefined
+    const hasOtherChosen = sup.choose.find((index) => equalKey(sup.context[index], subOther)) !== undefined
     const hasOther = sup.context.find((other) => equalKey(other, subOther)) !== undefined
     return !!(hasChoosen && hasOther) && !hasOtherChosen
   }
@@ -418,7 +419,7 @@ const subPriority = (sub, sup) => {
   }
   const chosen1 = choose(sub)
   const chosen2 = choose(sup)
-  const sameId = (id1, id2) => id1[0] == id2[0] && id1[1] == id2[1]
+  const sameId = (id1, id2) => id1[0] === id2[0] && id1[1] === id2[1]
   // same length so only need one way
   const missing1 = chosen1.find((id1) => !chosen2.find((id2) => sameId(id1, id2)))
   if (missing1) {

package/src/project.js

@@ -1,15 +1,38 @@
+function isObject(value) {
+  return typeof value === "object" && value !== null;
+}
+
+const merge = (value1, value2) => {
+  if (Array.isArray(value1) && Array.isArray(value2)) {
+    const merged = []
+    for (let i = 0; i < value1.length; ++i) {
+      merged.push(merge(value1[i], value2[i]))
+    }
+    return merged
+  }
+  if (isObject(value1) && isObject(value2)) {
+    return Object.assign({}, value1, value2)
+  }
+}
 
 const project = (object, filter) => {
   if (!object) {
     return
   }
+  if (typeof object === 'string' || typeof object === 'number') {
+    return object
+  }
 
   const projection = {}
   const set = (property, value) => {
     if (value === null || value === undefined) {
       return
     }
-    projection[property] = value
+    if (projection[property]) {
+      projection[property] = merge(value, projection[property])
+    } else {
+      projection[property] = value
+    }
   }
   if (Array.isArray(filter)) {
     if (Array.isArray(object)) {
@@ -78,4 +101,4 @@ const project = (object, filter) => {
   return projection
 }
 
-module.exports = { project }
+module.exports = { project, merge }

package/src/project2.js

@@ -0,0 +1,54 @@
+function project(source, filters) {
+  if (['string', 'number'].includes(typeof source)) {
+    return source
+  }
+
+  if (Object.keys(source).length === 0 && filters.length === 0) {
+    return {};
+  }
+
+  // Find the applicable filter for the current context
+  const filter = filters.find(f => f.match({ context: source }));
+  if (!filter) {
+    if (Array.isArray(source)) {
+      return source.map((element) => project(element, filters))
+    }
+    return {};
+  }
+
+  // Get the properties to include from the apply function
+  let properties = filter.apply(source);
+
+  // update 
+  const updatedProperties = []
+  for (const property of properties) {
+    if (property.properties) {
+      for (const moreProperty of source[property.properties] || []) {
+        updatedProperties.push(moreProperty)
+      }
+    } else {
+      updatedProperties.push(property)
+    }
+  }
+  properties = updatedProperties
+
+  // Build the result object
+  const result = {};
+  properties.forEach(prop => {
+    if (source.hasOwnProperty(prop)) {
+      // If the property is an object and not null, recursively project it
+      if (typeof source[prop] === 'object' && source[prop] !== null) {
+        result[prop] = project(source[prop], filters);
+      } else {
+        // Copy primitive or null properties directly
+        result[prop] = source[prop];
+      }
+    }
+  });
+
+  return result;
+}
+
+module.exports = {
+  project
+}

package/src/semantics.js

@@ -72,7 +72,7 @@ class Semantic {
   async matches (args, context, options = {}) {
     this.fixUpArgs(args, context)
     const matches = await this.matcher(args)
-    if (matches && (options.debug || {}).match || args.callId == this.callId) {
+    if (matches && (options.debug || {}).match || args.callId === this.callId) {
       // next line is the matcher
       debugger // eslint-disable-line no-debugger
       await this.matcher(args)
@@ -92,7 +92,7 @@ class Semantic {
     const contextPrime = Object.assign({}, context)
     this.fixUpArgs(args, contextPrime)
 
-    if ((options.debug || {}).apply || args.callId == this.callId) {
+    if ((options.debug || {}).apply || args.callId === this.callId) {
       debugger // eslint-disable-line no-debugger
     }
     if (args.breakOnSemantics) {
@@ -234,7 +234,7 @@ class Semantics {
           lines.setElement(0, 2, stack)
           lines.newRow()
           lines.setElement(0, 1, 'DEBUG')
-          lines.setElement(0, 2, `To debug this use args.callId == '${args.calls.current()}'`)
+          lines.setElement(0, 2, `To debug this use args.callId === '${args.calls.current()}'`)
           lines.newRow()
           lines.setElement(0, 1, 'ERROR')
           lines.setElement(0, 2, errorMessage)
@@ -269,7 +269,7 @@ class Semantics {
           lines.setElement(0, 2, stack)
           lines.newRow()
           lines.setElement(0, 1, 'DEBUG')
-          lines.setElement(0, 2, `To debug this use args.callId == '${args.calls.current()}'`)
+          lines.setElement(0, 2, `To debug this use args.callId === '${args.calls.current()}'`)
           lines.newRow()
           lines.setElement(0, 1, 'RESULT')
           lines.setElement(0, 2, `context_id: ${context.context_id}`)

package/src/unflatten.js

@@ -36,7 +36,7 @@ const concatLists = (l1, l2) => {
 
 const findPropertyWithManyValues = (contexts, properties) => {
   for (const property of properties) {
-    if (new Set(contexts.map((context) => context[property])).size == 1) {
+    if (new Set(contexts.map((context) => context[property])).size === 1) {
       return property
     }
   }