@zlink-systems/stream-wire 0.30.3 → 0.32.0

package/dist/esm/internal/framework-json-v1.d.ts

@@ -2,6 +2,7 @@ import type { ZLinkJsonSchema } from './json-contract';
 export declare const FRAMEWORK_JSON_V1_PROFILE = "framework-json-v1";
 export interface FrameworkJsonParseOptions {
     readonly rejectPropertyName?: (name: string) => boolean;
+    readonly onDuplicateProperty?: (name: string, path: readonly string[]) => void;
 }
 export declare function stringifyFrameworkJsonV1(value: unknown, schema?: ZLinkJsonSchema, replacer?: (this: unknown, key: string, value: unknown) => unknown): string;
 export declare function parseFrameworkJsonV1(text: string, options?: FrameworkJsonParseOptions, schema?: ZLinkJsonSchema, reviver?: (this: unknown, key: string, value: unknown) => unknown): unknown;

package/dist/internal/framework-json-v1.d.ts

@@ -2,6 +2,7 @@ import type { ZLinkJsonSchema } from './json-contract';
 export declare const FRAMEWORK_JSON_V1_PROFILE = "framework-json-v1";
 export interface FrameworkJsonParseOptions {
     readonly rejectPropertyName?: (name: string) => boolean;
+    readonly onDuplicateProperty?: (name: string, path: readonly string[]) => void;
 }
 export declare function stringifyFrameworkJsonV1(value: unknown, schema?: ZLinkJsonSchema, replacer?: (this: unknown, key: string, value: unknown) => unknown): string;
 export declare function parseFrameworkJsonV1(text: string, options?: FrameworkJsonParseOptions, schema?: ZLinkJsonSchema, reviver?: (this: unknown, key: string, value: unknown) => unknown): unknown;

package/dist/internal/framework-json-v1.js

@@ -10,22 +10,28 @@ function stringifyFrameworkJsonV1(value, schema, replacer) {
     if (value === undefined || typeof value === 'function' || typeof value === 'symbol') {
         throw new TypeError('framework-json-v1 payload is not a JSON value.');
     }
-    const encoded = JSON.stringify(value, replacer === undefined
-        ? frameworkJsonV1Replacer
-        : function (key, item) {
-            const transformed = replacer.call(this, key, item);
-            return frameworkJsonV1Replacer.call({ [key]: transformed }, key, transformed);
-        });
+    const encoded = replacer === undefined
+        ? JSON.stringify(value, frameworkJsonV1Replacer)
+        : stringifyWithReplacer(value, replacer);
     if (schema !== undefined) {
         validateFrameworkJsonV1Value(JSON.parse(encoded), schema, '$', false);
     }
     return encoded;
 }
+// Keep custom callback captures off the default encoding path.
+function stringifyWithReplacer(value, replacer) {
+    return JSON.stringify(value, function (key, item) {
+        const transformed = replacer.call(this, key, item);
+        return frameworkJsonV1Value(transformed, transformed);
+    });
+}
 //  Module-level so JSON.stringify does not allocate a fresh closure per
 //  encoded message. On the root call `this` is the {'': value} wrapper, so
 //  this[key] resolves the raw (pre-toJSON) source for every key including ''.
 function frameworkJsonV1Replacer(key, item) {
-    const source = this[key];
+    return frameworkJsonV1Value(this[key], item);
+}
+function frameworkJsonV1Value(source, item) {
     if (typeof source === 'number' && !Number.isFinite(source)) {
         throw new TypeError('framework-json-v1 only accepts finite JSON numbers.');
     }
@@ -169,24 +175,27 @@ class JsonPropertyScanner {
     text;
     options;
     index = 0;
+    firstEscape;
     constructor(text, options) {
         this.text = text;
         this.options = options;
+        const escape = text.indexOf('\\');
+        this.firstEscape = escape === -1 ? text.length : escape;
     }
     scan() {
         this.skipWhitespace();
-        this.scanValue();
+        this.scanValue([]);
         this.skipWhitespace();
         if (this.index !== this.text.length)
             this.fail('trailing data');
     }
-    scanValue() {
+    scanValue(path) {
         this.skipWhitespace();
         const token = this.text[this.index];
         if (token === '{')
-            return this.scanObject();
+            return this.scanObject(path);
         if (token === '[')
-            return this.scanArray();
+            return this.scanArray(path);
         if (token === '"') {
             this.scanString();
             return;
@@ -199,7 +208,7 @@ class JsonPropertyScanner {
             return this.scanLiteral('null');
         this.scanNumber();
     }
-    scanObject() {
+    scanObject(path) {
         this.index++;
         this.skipWhitespace();
         if (this.text[this.index] === '}') {
@@ -213,7 +222,12 @@ class JsonPropertyScanner {
                 this.fail('object property name');
             const property = this.scanString();
             if (properties.has(property)) {
-                throw new SyntaxError(`framework-json-v1 duplicate property '${property}'.`);
+                if (this.options.onDuplicateProperty !== undefined) {
+                    this.options.onDuplicateProperty(property, path);
+                }
+                else {
+                    throw new SyntaxError(`framework-json-v1 duplicate property '${property}'.`);
+                }
             }
             properties.add(property);
             if (this.options.rejectPropertyName?.(property) === true) {
@@ -223,7 +237,7 @@ class JsonPropertyScanner {
             if (this.text[this.index] !== ':')
                 this.fail("':' after object property");
             this.index++;
-            this.scanValue();
+            this.scanValue(this.options.onDuplicateProperty === undefined ? path : [...path, property]);
             this.skipWhitespace();
             const delimiter = this.text[this.index++];
             if (delimiter === '}')
@@ -232,7 +246,7 @@ class JsonPropertyScanner {
                 this.fail("',' or '}' after object property");
         }
     }
-    scanArray() {
+    scanArray(path) {
         this.index++;
         this.skipWhitespace();
         if (this.text[this.index] === ']') {
@@ -240,7 +254,7 @@ class JsonPropertyScanner {
             return;
         }
         for (;;) {
-            this.scanValue();
+            this.scanValue(this.options.onDuplicateProperty === undefined ? path : [...path, '[]']);
             this.skipWhitespace();
             const delimiter = this.text[this.index++];
             if (delimiter === ']')
@@ -250,26 +264,39 @@ class JsonPropertyScanner {
         }
     }
     scanString() {
-        const start = this.index++;
+        const text = this.text;
+        const start = this.index;
+        let index = start + 1;
+        //  Before the first backslash of the document every token ends at the
+        //  next quote, so native search finds it; later tokens walk the escapes.
+        const end = text.indexOf('"', index);
+        if (end !== -1 && end < this.firstEscape) {
+            this.index = end + 1;
+            return text.slice(index, end);
+        }
         let sawEscape = false;
         for (;;) {
-            if (this.index >= this.text.length)
+            if (index >= text.length) {
+                this.index = index;
                 this.fail('unterminated string');
-            const character = this.text[this.index++];
+            }
+            const character = text[index++];
             if (character === '"') {
+                this.index = index;
                 //  Without escapes the token content is verbatim; the outer
                 //  JSON.parse pass still rejects any raw control characters.
                 return sawEscape
-                    ? JSON.parse(this.text.slice(start, this.index))
-                    : this.text.slice(start + 1, this.index - 1);
+                    ? JSON.parse(text.slice(start, index))
+                    : text.slice(start + 1, index - 1);
             }
             if (character === '\\') {
                 sawEscape = true;
-                if (this.index >= this.text.length)
+                if (index >= text.length) {
+                    this.index = index;
                     this.fail('unterminated escape');
-                const escaped = this.text[this.index++];
-                if (escaped === 'u')
-                    this.index += 4;
+                }
+                if (text[index++] === 'u')
+                    index += 4;
             }
         }
     }

package/dist/internal/json-contract.js

@@ -4,6 +4,10 @@ exports.defineZLinkPacketJsonContract = defineZLinkPacketJsonContract;
 exports.readZLinkPacketJsonContract = readZLinkPacketJsonContract;
 exports.isPrototypeKey = isPrototypeKey;
 const MAX_CONTRACT_SCHEMA_DEPTH = 64;
+function isIntegerEnumName(name) {
+    // framework-json-v1 permits only declared enum names, never ordinal strings.
+    return /^[+-]?\d+$/u.test(name);
+}
 const ZLINK_PACKET_JSON_CONTRACTS = Symbol.for('@zlink-systems/framework:packet-json-contracts');
 function defineZLinkPacketJsonContract(packetName, contract) {
     if (packetName.trim().length === 0) {
@@ -59,8 +63,8 @@ function normalizeJsonSchema(schema, parents, depth) {
         case 'enum': {
             if (!Array.isArray(normalizedSchema.names) ||
                 normalizedSchema.names.length === 0 ||
-                normalizedSchema.names.some((name) => typeof name !== 'string' || name.length === 0)) {
-                throw new TypeError('ZLink packet enum schema requires non-empty string names.');
+                normalizedSchema.names.some((name) => typeof name !== 'string' || name.length === 0 || isIntegerEnumName(name))) {
+                throw new TypeError('ZLink packet enum schema requires non-empty, non-numeric string names.');
             }
             if (new Set(normalizedSchema.names).size !== normalizedSchema.names.length) {
                 throw new TypeError('ZLink packet enum schema names must be unique.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zlink-systems/stream-wire",
-  "version": "0.30.3",
+  "version": "0.32.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",