@voxgig/system 1.13.1 → 1.14.0

package/dist/lib/utility.js

@@ -34,9 +34,49 @@ function listmsgs(point) {
     });
     return msgs;
 }
+// A message definition declares its pattern as a LIST; a chain node never
+// does, because every value in a chain node is a map - the next pattern level,
+// or the '$' leaf. So this tells the two shapes apart even for a legacy
+// pattern pair spelled `pat:`. It is the same discriminator @voxgig/model
+// validates the declared shape with (see its producer/msg.ts).
+function ismsgdef(val) {
+    return null != val && 'object' === typeof val &&
+        !Array.isArray(val) && Array.isArray(val.pat);
+}
+// The pattern pairs of a declared-shape definition, in the walker's path form.
+// A malformed pair is skipped rather than thrown on: @voxgig/model fails the
+// build on those, so one reaching here means the model came from somewhere
+// else, and dropping it degrades better than crashing srv startup.
+function msgdefpath(def) {
+    let path = [];
+    for (let pair of def.pat) {
+        if (null == pair || 'object' !== typeof pair || Array.isArray(pair)) {
+            continue;
+        }
+        let keys = Object.keys(pair);
+        if (1 === keys.length) {
+            path.push([keys[0], pair[keys[0]]]);
+        }
+    }
+    return path;
+}
 function walkmsgs(point, path, handle) {
-    let points = 'object' === typeof point ?
+    let entries = 'object' === typeof point ?
         Object.entries(point).filter(entry => !entry[0].includes('$')) : [];
+    // A declared-shape definition carries its pattern as data, so it IS a
+    // message here, not a node to descend into. Everything else is a chain node
+    // and walks as before, which is what lets both shapes appear in one model.
+    let points = [];
+    for (let entry of entries) {
+        if (ismsgdef(entry[1])) {
+            let meta = { ...entry[1] };
+            delete meta.pat;
+            handle(path.concat(msgdefpath(entry[1])), meta);
+        }
+        else {
+            points.push(entry);
+        }
+    }
     for (let step of points) {
         let key = step[0];
         // TODO: capture error log if step[1] empty (key with no vals)
@@ -44,8 +84,13 @@ function walkmsgs(point, path, handle) {
             walkmsgs(step[1][val], path.concat([[key, val]]), handle);
         }
     }
-    // if any $ meta props, or no points, we found a msg
-    if (0 === points.length || point.$) {
+    // if any $ meta props, or nothing here at all, we found a msg.
+    //
+    // This asks about ENTRIES, not the chain nodes among them: a node holding
+    // only declared-shape definitions is a container, and must not also emit a
+    // patternless message of its own. With no definitions present the two are
+    // the same set, so legacy models walk exactly as before.
+    if (0 === entries.length || point.$) {
         const meta = point.$ || {};
         handle(path, meta);
     }

package/dist/lib/utility.js.map

@@ -1 +1 @@
-{"version":3,"file":"utility.js","sourceRoot":"","sources":["../../lib/utility.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utility.js","sourceRoot":"","sources":["../../lib/utility.ts"],"names":[],"mappings":"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"}

package/lib/utility.ts

@@ -49,13 +49,61 @@ function listmsgs(point?: Record<string, any>): Msg[] {
 }
 
 
+// A message definition declares its pattern as a LIST; a chain node never
+// does, because every value in a chain node is a map - the next pattern level,
+// or the '$' leaf. So this tells the two shapes apart even for a legacy
+// pattern pair spelled `pat:`. It is the same discriminator @voxgig/model
+// validates the declared shape with (see its producer/msg.ts).
+function ismsgdef(val: any): boolean {
+  return null != val && 'object' === typeof val &&
+    !Array.isArray(val) && Array.isArray(val.pat)
+}
+
+
+// The pattern pairs of a declared-shape definition, in the walker's path form.
+// A malformed pair is skipped rather than thrown on: @voxgig/model fails the
+// build on those, so one reaching here means the model came from somewhere
+// else, and dropping it degrades better than crashing srv startup.
+function msgdefpath(def: Record<string, any>): string[][] {
+  let path: string[][] = []
+
+  for (let pair of def.pat) {
+    if (null == pair || 'object' !== typeof pair || Array.isArray(pair)) {
+      continue
+    }
+    let keys = Object.keys(pair)
+    if (1 === keys.length) {
+      path.push([keys[0], pair[keys[0]]])
+    }
+  }
+
+  return path
+}
+
+
 function walkmsgs(
   point: Record<string, any>,
   path: string[][],
   handle: (path: string[][], meta: any) => void) {
 
-  let points = 'object' === typeof point ?
+  let entries = 'object' === typeof point ?
     Object.entries(point).filter(entry => !entry[0].includes('$')) : []
+
+  // A declared-shape definition carries its pattern as data, so it IS a
+  // message here, not a node to descend into. Everything else is a chain node
+  // and walks as before, which is what lets both shapes appear in one model.
+  let points: [string, any][] = []
+  for (let entry of entries) {
+    if (ismsgdef(entry[1])) {
+      let meta = { ...entry[1] }
+      delete meta.pat
+      handle(path.concat(msgdefpath(entry[1])), meta)
+    }
+    else {
+      points.push(entry)
+    }
+  }
+
   for (let step of points) {
     let key = step[0]
     // TODO: capture error log if step[1] empty (key with no vals)
@@ -64,8 +112,13 @@ function walkmsgs(
     }
   }
 
-  // if any $ meta props, or no points, we found a msg
-  if (0 === points.length || point.$) {
+  // if any $ meta props, or nothing here at all, we found a msg.
+  //
+  // This asks about ENTRIES, not the chain nodes among them: a node holding
+  // only declared-shape definitions is a container, and must not also emit a
+  // patternless message of its own. With no definitions present the two are
+  // the same set, so legacy models walk exactly as before.
+  if (0 === entries.length || point.$) {
     const meta = point.$ || {}
     handle(path, meta)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/system",
-  "version": "1.13.1",
+  "version": "1.14.0",
   "main": "dist/system.js",
   "type": "commonjs",
   "types": "dist/system.d.ts",