@enricai/barnacle 1.12.73 → 1.12.75

package/dist/scripts/recon-generate.js

@@ -24,6 +24,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveStepPayloadField = resolveStepPayloadField;
 exports.buildKnownFieldValues = buildKnownFieldValues;
 exports.extractStepPersonaValue = extractStepPersonaValue;
+exports.extractNavigateToHashFragmentValue = extractNavigateToHashFragmentValue;
 exports.deriveFillLabelField = deriveFillLabelField;
 exports.harvestPersonaBindings = harvestPersonaBindings;
 exports.resolveCompositePersonaFields = resolveCompositePersonaFields;
@@ -60,6 +61,7 @@ exports.ancestorScopedAccessor = ancestorScopedAccessor;
 exports.compileActionSteps = compileActionSteps;
 exports.collectHeaderBindings = collectHeaderBindings;
 exports.deriveProducerBoundaryBindings = deriveProducerBoundaryBindings;
+exports.collectUnboundLiterals = collectUnboundLiterals;
 exports.emitMultiStepExecuteHttp = emitMultiStepExecuteHttp;
 exports.countSpliceableFacets = countSpliceableFacets;
 exports.spliceFacetsIntoStringVariable = spliceFacetsIntoStringVariable;
@@ -359,6 +361,34 @@ function extractStepPersonaValue(instruction, env) {
     const value = pickValueSpan(instruction, spans).value;
     return value.length > 0 ? value : null;
 }
+/**
+ * Extracts the trailing path segment of a navigateTo URL's hash fragment —
+ * e.g. `.../#/jobs/category-widgets` yields `widgets` — as the persona value
+ * an explicit `payloadField` annotation on that step names. Site-agnostic:
+ * reads only the URL's own hash shape, no domain knowledge.
+ *
+ * When `previousHash` is given and the current hash is a strict extension of
+ * it (the accumulating-hash case, e.g. `#a` -> `#a,b`), the persona value is
+ * only the NEW suffix the step added, not the whole cumulative string — a
+ * cumulative value would never recur verbatim in any single request literal.
+ *
+ * @returns the segment (or delta), or null when the URL has no non-empty
+ *   hash segment
+ */
+function extractNavigateToHashFragmentValue(url, previousHash) {
+    const hashIndex = url.indexOf("#");
+    if (hashIndex === -1)
+        return null;
+    const hash = url.slice(hashIndex + 1);
+    if (previousHash && hash.length > previousHash.length && hash.startsWith(previousHash)) {
+        const suffix = hash.slice(previousHash.length);
+        const delta = /^[,/]/.test(suffix) ? suffix.slice(1) : suffix;
+        if (delta.length > 0)
+            return delta;
+    }
+    const segments = hash.split("/").filter((s) => s.length > 0);
+    return segments.length > 0 ? segments[segments.length - 1] : null;
+}
 /**
  * Derives a payload field name from the field LABEL in a fill/enter/type
  * instruction, for steps the consumer vocabulary does not cover.
@@ -405,9 +435,32 @@ function deriveFillLabelField(instruction) {
 function harvestPersonaBindings(flowSteps, vocabulary, env) {
     const bindings = new Map();
     const knownFieldValues = buildKnownFieldValues(flowSteps, vocabulary, env);
+    let previousNavigateToHash;
     for (const step of flowSteps) {
         const isObj = typeof step !== "string";
         const instruction = isObj ? step.step : step;
+        // A navigateTo step carries no prose instruction to extract a persona
+        // value FROM — its own text is a captured page.goto, not a fill/select
+        // label. The facet an explicit `payloadField` annotation names instead
+        // lives in the URL itself (recon-browser captures navigation targets like
+        // `.../#/jobs/category-widgets`), so the value to correlate against
+        // downstream header/body templates is the URL's own hash-derived
+        // fragment, not anything extractStepPersonaValue could find in `step.step`.
+        if (isObj && step.navigateTo !== undefined) {
+            const hashIndex = step.navigateTo.indexOf("#");
+            const currentHash = hashIndex === -1 ? undefined : step.navigateTo.slice(hashIndex + 1);
+            if (!step.payloadField) {
+                previousNavigateToHash = currentHash;
+                continue;
+            }
+            const value = extractNavigateToHashFragmentValue(step.navigateTo, previousNavigateToHash);
+            previousNavigateToHash = currentHash;
+            if (value === null)
+                continue;
+            if (!bindings.has(value))
+                bindings.set(value, `payload.${step.payloadField}`);
+            continue;
+        }
         const vocabField = resolveStepPayloadField(instruction, isObj ? step.payloadField : undefined, isObj ? step.payloadFieldNone : undefined, vocabulary, knownFieldValues);
         // Vocabulary wins outright. Only on a miss do we fall back to deriving the
         // field from the instruction's own label — and never when the author opted
@@ -3913,7 +3966,7 @@ function locateFormEnvelopePath(parsedBody) {
  * search there stops an earlier element's already-rewritten (or still-frozen)
  * span from swallowing a later element's identically-named key.
  */
-function applyStructuredValuePayloadSubstitutionsForEnvelope(template, envelope, outStructuredKeys, priorStepStateValues, searchFrom, envelopePath, rootBody) {
+function applyStructuredValuePayloadSubstitutionsForEnvelope(template, envelope, outStructuredKeys, unconditionalExcludeValues, restrictedExcludeSourceByValue, searchFrom, envelopePath, rootBody) {
     let result = template;
     let cursor = searchFrom;
     // The body root's own entries are eligible too, whenever the located
@@ -3935,8 +3988,29 @@ function applyStructuredValuePayloadSubstitutionsForEnvelope(template, envelope,
             Object.keys(value).length > 0;
         if (!isNonEmptyArray && !isNestedObject)
             continue;
-        if (priorStepStateValues.size > 0) {
-            const carriesThreadedValue = [...walkAllPrimitiveLeaves(value)].some(({ value: leaf }) => leaf !== null && priorStepStateValues.has(String(leaf)));
+        if (unconditionalExcludeValues.size > 0 || restrictedExcludeSourceByValue.size > 0) {
+            // A name-free join/chain value (unconditionalExcludeValues) excludes the
+            // whole field on ANY leaf coincidence, same as before. A RESTRICTED prior-
+            // step value (one with a real source field name) additionally requires
+            // keyNamesCorrelate(sourceName, key) — mirroring the discipline
+            // replaceGuardedAgainstExistingPlaceholders/findThreadedJoinFields already
+            // apply to the exact same class of value-coincidence false positive.
+            // Without this, a broken field's own unrelated short scalar leaf (a
+            // count/id) merely equalling SOME other step's produced value gets the
+            // ENTIRE array/object excluded from threading, even though nothing about
+            // that leaf's key names the same concept as the matched value's source.
+            const carriesThreadedValue = [...walkAllPrimitiveLeaves(value)].some(({ value: leaf, path: leafPath }) => {
+                if (leaf === null)
+                    return false;
+                const leafValue = String(leaf);
+                if (unconditionalExcludeValues.has(leafValue))
+                    return true;
+                const sourceName = restrictedExcludeSourceByValue.get(leafValue);
+                if (sourceName === undefined)
+                    return false;
+                const leafKey = leafPath.at(-1);
+                return leafKey !== undefined && keyNamesCorrelate(sourceName, leafKey);
+            });
             if (carriesThreadedValue)
                 continue;
         }
@@ -3993,7 +4067,7 @@ function applyStructuredValuePayloadSubstitutionsForEnvelope(template, envelope,
  * pass to it. Shared by the top-level-object and top-level-array branches of
  * {@link applyStructuredValuePayloadSubstitutions} below.
  */
-function applyStructuredValuePayloadSubstitutionsForObjectBody(template, objectBody, outStructuredKeys, priorStepStateValues, searchFrom) {
+function applyStructuredValuePayloadSubstitutionsForObjectBody(template, objectBody, outStructuredKeys, unconditionalExcludeValues, restrictedExcludeSourceByValue, searchFrom) {
     const envelopePath = locateFormEnvelopePath(objectBody);
     let envelope = objectBody;
     for (const seg of envelopePath) {
@@ -4004,12 +4078,33 @@ function applyStructuredValuePayloadSubstitutionsForObjectBody(template, objectB
     if (envelope === null || typeof envelope !== "object" || Array.isArray(envelope)) {
         return { result: template, nextSearchFrom: searchFrom };
     }
-    return applyStructuredValuePayloadSubstitutionsForEnvelope(template, envelope, outStructuredKeys, priorStepStateValues, searchFrom, envelopePath, objectBody);
+    return applyStructuredValuePayloadSubstitutionsForEnvelope(template, envelope, outStructuredKeys, unconditionalExcludeValues, restrictedExcludeSourceByValue, searchFrom, envelopePath, objectBody);
 }
-function applyStructuredValuePayloadSubstitutions(template, parsedBody, outStructuredKeys, priorStepStateValues = new Set()) {
+/**
+ * `priorStepStateBindings` carries the SAME value→binding map
+ * {@link deriveStateVarByValue} produces. A binding with `restricted: true`
+ * (a value whose source has a real field name) only excludes a candidate
+ * field when its own leaf's key {@link keyNamesCorrelate}s with that source
+ * name — an unrestricted binding (name-free, e.g. a bare array-index chain
+ * hop) or a `joinFieldValues` entry excludes unconditionally on any leaf
+ * match, same as before. Without the correlation requirement, an array/
+ * object field whose own unrelated short scalar leaf (a count/id) merely
+ * EQUALS some other step's produced value gets the whole field wrongly
+ * excluded from threading — the same value-coincidence class of bug
+ * {@link keyNamesCorrelate}'s other call sites already guard against.
+ */
+function applyStructuredValuePayloadSubstitutions(template, parsedBody, outStructuredKeys, priorStepStateBindings = new Map(), joinFieldValues = new Set()) {
     if (parsedBody === null || typeof parsedBody !== "object") {
         return template;
     }
+    const unconditionalExcludeValues = new Set(joinFieldValues);
+    const restrictedExcludeSourceByValue = new Map();
+    for (const [value, binding] of priorStepStateBindings) {
+        if (binding.restricted)
+            restrictedExcludeSourceByValue.set(value, binding.sourceName);
+        else
+            unconditionalExcludeValues.add(value);
+    }
     // A cruise-line-style multi-room/multi-guest search body commonly batches
     // per-element criteria as a top-level JSON ARRAY rather than a single
     // object. Walk each element in textual order (via the growing searchFrom
@@ -4022,13 +4117,13 @@ function applyStructuredValuePayloadSubstitutions(template, parsedBody, outStruc
         for (const element of parsedBody) {
             if (element === null || typeof element !== "object" || Array.isArray(element))
                 continue;
-            const { result: nextResult, nextSearchFrom } = applyStructuredValuePayloadSubstitutionsForObjectBody(result, element, outStructuredKeys, priorStepStateValues, cursor);
+            const { result: nextResult, nextSearchFrom } = applyStructuredValuePayloadSubstitutionsForObjectBody(result, element, outStructuredKeys, unconditionalExcludeValues, restrictedExcludeSourceByValue, cursor);
             result = nextResult;
             cursor = nextSearchFrom;
         }
         return result;
     }
-    const { result } = applyStructuredValuePayloadSubstitutionsForObjectBody(template, parsedBody, outStructuredKeys, priorStepStateValues, 0);
+    const { result } = applyStructuredValuePayloadSubstitutionsForObjectBody(template, parsedBody, outStructuredKeys, unconditionalExcludeValues, restrictedExcludeSourceByValue, 0);
     return result;
 }
 /** Maximum length to guard against indexing massive blobs (HTML fragments,
@@ -5742,13 +5837,14 @@ function applyVolatileFieldSubstitutions(template, parsedBody, shieldedUuids, bo
     return result;
 }
 /**
- * Collects captured string leaves that survived every binding/generation pass as
- * still-literal — the values a reviewer must look at because they couldn't be
- * traced to a payload field, a generator, or a schema anchor. Returns the JSON
- * key names (deduped, in first-seen order) so the emitter can prepend a single
- * `// TODO: unbound captured literal` marker; it never mutates the body, so the
- * file still compiles. Short values (< {@link MIN_STATE_VALUE_LENGTH}) are
- * skipped — they are the legitimately-constant enum-like fields.
+ * Collects captured string leaves AND whole array/object values that survived
+ * every binding/generation pass as still-literal — the values a reviewer must
+ * look at because they couldn't be traced to a payload field, a generator, or
+ * a schema anchor. Returns the JSON key names (deduped, in first-seen order)
+ * so the emitter can prepend a single `// TODO: unbound captured literal`
+ * marker; it never mutates the body, so the file still compiles. Short string
+ * values (< {@link MIN_STATE_VALUE_LENGTH}) are skipped — they are the
+ * legitimately-constant enum-like fields.
  */
 function collectUnboundLiterals(finalTemplate, parsedBody, shieldedUuids) {
     const unbound = [];
@@ -5767,6 +5863,20 @@ function collectUnboundLiterals(finalTemplate, parsedBody, shieldedUuids) {
             unbound.push(key);
         }
     }
+    if (parsedBody !== null && typeof parsedBody === "object") {
+        for (const [key, value] of Object.entries(parsedBody)) {
+            if (value === null || typeof value !== "object")
+                continue;
+            if (seen.has(key))
+                continue;
+            // Whole array/object value never got threaded as a unit — ${JSON.stringify(...)}
+            // never replaced it, so it still sits verbatim in the emitted template.
+            if (finalTemplate.includes(JSON.stringify(value))) {
+                seen.add(key);
+                unbound.push(key);
+            }
+        }
+    }
     return unbound;
 }
 /** Builds the multi-step `executeHttp` body as a single template-literal string.
@@ -6280,10 +6390,7 @@ flowSteps = [], vocabulary = undefined) {
         // dependent-drill-down join field (e.g. a bulk `{"tokens":[...]}` lookup)
         // must stay reachable for state threading, not get frozen as caller data.
         const rawBodyWithStructuredSubs = parsedBody !== null
-            ? applyStructuredValuePayloadSubstitutions(rawBodyWithFacetSplices, parsedBody, outStructuredKeys, new Set([
-                ...deriveStateVarByValue(prior, cap).keys(),
-                ...(joinFieldValuesByStep.get(i) ?? []),
-            ]))
+            ? applyStructuredValuePayloadSubstitutions(rawBodyWithFacetSplices, parsedBody, outStructuredKeys, deriveStateVarByValue(prior, cap), joinFieldValuesByStep.get(i) ?? new Set())
             : rawBodyWithFormSubs;
         // Whole-value caller coordinates bind here — after structured subs, BEFORE
         // state threading — so a composite coordinate (a jobLocation or jobSeqNo
@@ -11491,10 +11598,22 @@ function computeFlowPayloadFieldNames(flowSteps, vocabulary, env) {
     for (const step of flowSteps) {
         const isObj = typeof step !== "string";
         const instruction = isObj ? step.step : step;
-        // navigateTo/emailStep/password-token steps bypass field resolution
-        // entirely — see emitBrowserFlowTs's stepLiterals pass for why.
-        if (isObj && step.navigateTo !== undefined)
+        // A navigateTo step's own instruction text bypasses field resolution —
+        // it's a captured page.goto, not a prose instruction, so there is no
+        // label/quoted-constant to correlate (see emitBrowserFlowTs's stepLiterals
+        // pass). An explicit `payloadField` annotation is a different thing: it is
+        // the author directly naming the facet the navigation target encodes, and
+        // resolveStepPayloadField's own `explicit` short-circuit would honor it
+        // unconditionally — so it must still be registered here, or every
+        // downstream consumer of this accumulator (REST facet-splice, schema
+        // declaration) silently drops the facet the author explicitly declared.
+        if (isObj && step.navigateTo !== undefined) {
+            if (step.payloadField) {
+                payloadFieldNames.add(step.payloadField);
+                registerFieldOptionality(step.payloadField, step.optional === true);
+            }
             continue;
+        }
         if (isObj && step.emailStep === true)
             continue;
         if (instruction.includes(RECON_PASSWORD_TOKEN))