entodicton 9.5.1-beta.21 → 9.5.1-beta.23

package/client.js

@@ -12,9 +12,8 @@ const _ = require('lodash')
 const stringify = require('json-stable-stringify')
 const Lines = require('./lines')
 const flattens = require('./src/flatten')
-const { appendNoDups, updateQueries, safeNoDups, stableId, where, suggestAssociationsFix, suggestAssociationsFixFromSummaries, validProps } = require('./src/helpers')
+const { sortJson, appendNoDups, updateQueries, safeNoDups, stableId, where, suggestAssociationsFix, suggestAssociationsFixFromSummaries, validProps } = require('./src/helpers')
 const runtime = require('./runtime')
-const sortJson = runtime.sortJson
 const debug = require('./src/debug')
 
 const getConfig_getObjectsCheck = (config, testConfig) => {
@@ -69,6 +68,7 @@ const pickObjects = (config, testConfig, getObjects) => {
     if (!objects) {
       throw new Error(`In the checks for ${config.name} the KM ${km} does not exist`)
     }
+
     if (checks[km] && checks[km].find((check) => check.match && check.apply)) {
       projection[km] = project2(objects, checks[km])
     } else {
@@ -973,7 +973,7 @@ const rebuildTemplate = async ({ config, instance, target, previousResultss, reb
     if (instance.fragments) {
       pr = instance.fragments[index]
     }
-    return Object.assign({}, toProperties(query), { property: 'fragments', previousResults: pr, skipSemantics: false })
+    return Object.assign({}, toProperties(query), { property: 'fragments', previousResults: pr, skipSemantics: true })
   }
 
   const looper = async (configs) => {

package/package.json

@@ -70,9 +70,8 @@
     "node-fetch": "^2.6.1",
     "readline": "^1.3.0",
     "scriptjs": "^2.5.9",
-    "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "9.5.1-beta.21",
+  "version": "9.5.1-beta.23",
   "license": "UNLICENSED"
 }

package/runtime.js

@@ -13,7 +13,6 @@ module.exports = {
   ArgumentParser,
   readline: require('readline'),
   jsonDiff: require('json-diff'),
-  sortJson: require('sort-json'),
   util: require('util'),
   performance: require('perf_hooks')
 }

package/src/config.js

@@ -515,8 +515,43 @@ const handleCalculatedProps = (baseConfig, moreConfig, { addFirst, uuid } = {})
   if (moreConfig.bridges) {
     moreConfig.bridges = moreConfig.bridges.map((bridge) => {
       bridge = { ...bridge }
-      const valid = ['after', 'conditional', 'associations', 'before', 'bridge', 'check', 'disabled', 'scope', 'skipable', 'return_type_selector', 'evaluator', 'evaluators', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'operator', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
-        'level', 'optional', 'selector', 'separators', 'semantic', 'semantics', 'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where', 'uuid']
+      const valid = [
+        'after', 
+        'associations', 
+        'before', 
+        'bridge', 
+        'check', 
+        'children', 
+        'conditional', 
+        'convolution', 
+        'disabled', 
+        'enhanced_associations', 
+        'evaluator', 
+        'evaluators', 
+        'generatorp', 
+        'generatorpr', 
+        'generatorr', 
+        'generators', 
+        'id', 
+        'inverted', 
+        'isA', 
+        'level', 
+        'levelSpecificHierarchy', 
+        'localHierarchy', 
+        'operator', 
+        'optional', 
+        'parents',
+        'return_type_selector', 
+        'scope', 
+        'selector', 
+        'semantic', 
+        'semantics', 
+        'separators', 
+        'skipable', 
+        'uuid',
+        'where', 
+        'words', /Bridge$/, 
+      ]
       helpers.validProps(valid, bridge, 'bridge')
       handleBridgeProps(baseConfig, bridge, { addFirst, uuid })
       return bridge
@@ -679,7 +714,7 @@ function setWordsUUIDs (words, uuid) {
   for (const key in literals) {
     literals[key] = literals[key].map((o) => Object.assign(o, { uuid }))
   }
-  const patterns = words.patterns
+  const patterns = words.patterns || []
   for (const pattern of patterns) {
     pattern.defs.map((def) => Object.assign(def, { uuid }))
   }
@@ -1137,10 +1172,20 @@ class Config {
     }
   }
 
-  fragment (args, query) {
+  // mappings are optional
+  async fragment (args, query, mappings) {
     const fragment = this.getFragment(query)
     if (fragment) {
-      return fragmentInstantiator(args, fragment.contexts)
+      let fi = fragmentInstantiator(args, fragment.contexts)
+      if (mappings) {
+        fi = await fi
+        return fi.instantiate([{
+          match: ({context}) => !!mappings[context.value], // is the value in the mappings
+          apply: ({context}) => Object.assign(context, mappings[context.value]),
+        }])
+      } else {
+        return fi
+      }
     }
   }
 

package/src/configHelpers.js

@@ -118,8 +118,9 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   // args.listable = listable(hierarchy)
   // args.asList = asList
   args.retry = () => { throw new RetryError() }
-  args.fragments = (query) => {
-    return config.fragment(args, query)
+  // mappings are optional
+  args.fragments = (query, mappings) => {
+    return config.fragment(args, query, mappings)
   }
   args.fragmentMapper = (values, fromModelQuery, toModelQuery) => {
     return config.fragmentMapper(args, values, fromModelQuery, toModelQuery)

package/src/fragments.js

@@ -30,7 +30,11 @@ function fragmentInstantiator (args, contexts) {
           todo.push({ context: context[key], path: [...path, key] })
         }
       }
-      return instantiated
+      if (contexts.length == 1 && instantiated.length == 1) {
+        return instantiated[0]
+      } else {
+        return instantiated
+      }
     }
   })
 }

package/src/helpers.js

@@ -292,8 +292,53 @@ const hashCode = (str) => {
   return hash
 }
 
-const sortJson = (json) => {
-  return json
+/**
+ * Recursively sorts object keys alphabetically.
+ * Fully handles arrays (including objects inside arrays) and preserves Date/other non-plain objects.
+ *
+ * @param {any} input - The value to sort (object, array, primitive, etc.)
+ * @param {Object} [options]
+ *   - ignoreCase: boolean (default false) – case-insensitive sort
+ *   - reverse: boolean (default false) – reverse alphabetical order
+ * @returns {any} New sorted value
+ */
+function sortJson(input, options = {}) {
+  const { ignoreCase = false, reverse = false } = options;
+
+  // Helper: is this a plain object {} (not Array, Date, Map, null, etc.)
+  function isPlainObject(value) {
+    return value !== null && typeof value === 'object' && value.constructor === Object;
+  }
+
+  // Handle arrays: map over elements and recurse
+  if (Array.isArray(input)) {
+    return input.map(item => sortJson(item, options));
+  }
+
+  // If not a plain object, return unchanged (preserves Date, Map, Set, primitives, etc.)
+  if (!isPlainObject(input)) {
+    return input;
+  }
+
+  // Sorter for keys
+  const sorter = (a, b) => {
+    const A = ignoreCase ? a.toLowerCase() : a;
+    const B = ignoreCase ? b.toLowerCase() : b;
+    return reverse ? B.localeCompare(A) : A.localeCompare(B);
+  };
+
+  // Build new sorted object
+  const sorted = {};
+
+  Object.keys(input)
+    .sort(sorter)
+    .forEach(key => {
+      const value = input[key];
+      // Always recurse: handles nested objects and arrays properly
+      sorted[key] = sortJson(value, options);
+    });
+
+  return sorted;
 }
 
 const validProps = (valids, object, type) => {

package/src/project2.js

@@ -3,6 +3,13 @@ function project(source, filters) {
     return source
   }
 
+  function isPlainObject(obj) {
+    return Object.prototype.toString.call(obj) === '[object Object]';
+  }
+  if (!isPlainObject(source) && !Array.isArray(source)) {
+    return source
+  }
+
   if (Object.keys(source).length === 0 && filters.length === 0) {
     return {};
   }