@o3co/ts.hocon 1.5.0 → 1.6.0

package/dist/index.js

@@ -286,6 +286,252 @@ function mergeUnresolved(receiver, fallback) {
   return result;
 }
 
+// src/internal/resolver/fold-self-ref.ts
+function substFullKey(s) {
+  return stringSegmentsToKey(s.segments.map((seg) => seg.text));
+}
+function stringSegmentsToKey(segments) {
+  return segments.map((t) => {
+    if (t === "" || /[^a-zA-Z0-9\-_]/.test(t)) {
+      return `"${t.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+    }
+    return t;
+  }).join(".");
+}
+function containsSelfRef(v, fullKey) {
+  if (isSubst(v)) return !v.knownAbsent && substFullKey(v) === fullKey;
+  if (isConcat(v)) return v.nodes.some((n) => containsSelfRef(n, fullKey));
+  if (isAppend(v)) {
+    return containsSelfRef(v.existing, fullKey) || containsSelfRef(v.elem, fullKey);
+  }
+  if (isResObj(v)) {
+    for (const f of v.fields.values()) {
+      if (containsSelfRef(f, fullKey)) return true;
+    }
+    return false;
+  }
+  const hv = v;
+  if (hv.kind === "array") {
+    return hv.items.some((item) => containsSelfRef(item, fullKey));
+  }
+  if (hv.kind === "object") {
+    for (const f of hv.fields.values()) {
+      if (containsSelfRef(f, fullKey)) return true;
+    }
+    return false;
+  }
+  return false;
+}
+function foldSelfRef(v, fullKey, replacement) {
+  if (isSubst(v)) {
+    return substFullKey(v) === fullKey ? replacement : v;
+  }
+  if (isConcat(v)) {
+    return {
+      _kind: "concat-placeholder",
+      nodes: v.nodes.map((n) => foldSelfRef(n, fullKey, replacement)),
+      line: v.line,
+      col: v.col
+    };
+  }
+  if (isAppend(v)) {
+    return {
+      _kind: "append-placeholder",
+      existing: foldSelfRef(v.existing, fullKey, replacement),
+      elem: foldSelfRef(v.elem, fullKey, replacement)
+    };
+  }
+  if (isResObj(v)) {
+    const newFields = /* @__PURE__ */ new Map();
+    for (const [k, val] of v.fields) {
+      newFields.set(k, foldSelfRef(val, fullKey, replacement));
+    }
+    return { _kind: "res-obj", fields: newFields, priorValues: new Map(v.priorValues) };
+  }
+  const hv = v;
+  if (hv.kind === "array") {
+    return {
+      kind: "array",
+      items: hv.items.map((item) => foldSelfRef(item, fullKey, replacement))
+    };
+  }
+  if (hv.kind === "object") {
+    const newFields = /* @__PURE__ */ new Map();
+    for (const [k, val] of hv.fields) {
+      newFields.set(k, foldSelfRef(val, fullKey, replacement));
+    }
+    return { kind: "object", fields: newFields };
+  }
+  return v;
+}
+function foldOrSkipPrior(prior, fullKey, old) {
+  if (!containsSelfRef(prior, fullKey)) return cloneResolverValue(prior);
+  if (old === void 0) return foldOptionalSelfRefAbsent(prior, fullKey);
+  return foldSelfRef(prior, fullKey, old);
+}
+function foldOptionalSelfRefAbsent(v, fullKey) {
+  if (isSubst(v) && substFullKey(v) === fullKey) {
+    if (!v.optional) return void 0;
+    return {
+      _kind: "subst-placeholder",
+      segments: v.segments.map((seg) => ({ text: seg.text, line: seg.line, col: seg.col })),
+      optional: v.optional,
+      knownAbsent: true,
+      listSuffix: v.listSuffix,
+      line: v.line,
+      col: v.col,
+      prefixLen: v.prefixLen
+    };
+  }
+  if (isConcat(v)) {
+    const nodes = [];
+    for (const node of v.nodes) {
+      const folded = foldOptionalSelfRefAbsent(node, fullKey);
+      if (folded === void 0) return void 0;
+      nodes.push(folded);
+    }
+    return { _kind: "concat-placeholder", nodes, line: v.line, col: v.col };
+  }
+  if (isAppend(v)) {
+    const existing = foldOptionalSelfRefAbsent(v.existing, fullKey);
+    const elem = foldOptionalSelfRefAbsent(v.elem, fullKey);
+    if (existing === void 0 || elem === void 0) return void 0;
+    return { _kind: "append-placeholder", existing, elem };
+  }
+  if (isResObj(v)) {
+    const fields = /* @__PURE__ */ new Map();
+    for (const [key, value] of v.fields) {
+      const folded = foldOptionalSelfRefAbsent(value, fullKey);
+      if (folded === void 0) return void 0;
+      fields.set(key, folded);
+    }
+    return { _kind: "res-obj", fields, priorValues: new Map(v.priorValues) };
+  }
+  const hv = v;
+  if (hv.kind === "array") {
+    const items = [];
+    for (const item of hv.items) {
+      const folded = foldOptionalSelfRefAbsent(item, fullKey);
+      if (folded === void 0) return void 0;
+      items.push(folded);
+    }
+    return { kind: "array", items };
+  }
+  if (hv.kind === "object") {
+    const fields = /* @__PURE__ */ new Map();
+    for (const [key, value] of hv.fields) {
+      const folded = foldOptionalSelfRefAbsent(value, fullKey);
+      if (folded === void 0) return void 0;
+      fields.set(key, folded);
+    }
+    return { kind: "object", fields };
+  }
+  return cloneResolverValue(v);
+}
+function cloneResolverValue(v) {
+  if (isSubst(v)) {
+    return {
+      _kind: "subst-placeholder",
+      segments: v.segments.map((seg) => ({ text: seg.text, line: seg.line, col: seg.col })),
+      optional: v.optional,
+      knownAbsent: v.knownAbsent,
+      listSuffix: v.listSuffix,
+      line: v.line,
+      col: v.col,
+      prefixLen: v.prefixLen
+    };
+  }
+  if (isConcat(v)) {
+    return {
+      _kind: "concat-placeholder",
+      nodes: v.nodes.map((n) => cloneResolverValue(n)),
+      line: v.line,
+      col: v.col
+    };
+  }
+  if (isResObj(v)) {
+    const newFields = /* @__PURE__ */ new Map();
+    for (const [k, val] of v.fields) newFields.set(k, cloneResolverValue(val));
+    const newPriors = /* @__PURE__ */ new Map();
+    for (const [k, val] of v.priorValues) newPriors.set(k, cloneResolverValue(val));
+    return { _kind: "res-obj", fields: newFields, priorValues: newPriors };
+  }
+  if (isAppend(v)) {
+    return {
+      _kind: "append-placeholder",
+      existing: cloneResolverValue(v.existing),
+      elem: cloneResolverValue(v.elem)
+    };
+  }
+  const hv = v;
+  if (hv.kind === "array") {
+    return {
+      kind: "array",
+      items: hv.items.map((item) => cloneResolverValue(item))
+    };
+  }
+  if (hv.kind === "object") {
+    const newFields = /* @__PURE__ */ new Map();
+    for (const [k, val] of hv.fields) {
+      newFields.set(k, cloneResolverValue(val));
+    }
+    return { kind: "object", fields: newFields };
+  }
+  return hv;
+}
+function foldNestedSelfRefs(v, pathPrefix) {
+  if (!isResObj(v)) return v;
+  const newFields = /* @__PURE__ */ new Map();
+  for (const [k, fieldVal] of v.fields) {
+    const childPath = [...pathPrefix, k];
+    const fullKey = stringSegmentsToKey(childPath);
+    const folded = foldNestedSelfRefs(fieldVal, childPath);
+    let finalVal = folded;
+    if (containsSelfRef(folded, fullKey)) {
+      const leafPrior = v.priorValues.get(k);
+      if (leafPrior !== void 0) {
+        const leafPriorFolded = foldNestedSelfRefs(leafPrior, childPath);
+        finalVal = foldSelfRef(folded, fullKey, leafPriorFolded);
+      }
+    }
+    newFields.set(k, finalVal);
+  }
+  return { _kind: "res-obj", fields: newFields, priorValues: new Map(v.priorValues) };
+}
+function containsSubstByPath(v, target) {
+  if (isSubst(v)) return !v.knownAbsent && segmentsTextEqual(v.segments, target);
+  if (isConcat(v)) return v.nodes.some((n) => containsSubstByPath(n, target));
+  if (isAppend(v)) {
+    return containsSubstByPath(v.existing, target) || containsSubstByPath(v.elem, target);
+  }
+  if (isResObj(v)) {
+    for (const f of v.fields.values()) {
+      if (containsSubstByPath(f, target)) return true;
+    }
+    return false;
+  }
+  const hv = v;
+  if (hv.kind === "array") {
+    return hv.items.some((item) => containsSubstByPath(item, target));
+  }
+  if (hv.kind === "object") {
+    for (const f of hv.fields.values()) {
+      if (containsSubstByPath(f, target)) return true;
+    }
+    return false;
+  }
+  return false;
+}
+function segmentsTextEqual(a, b) {
+  if (a.length !== b.length) return false;
+  for (let i = 0; i < a.length; i++) {
+    const ai = a[i];
+    const bi = b[i];
+    if (ai === void 0 || bi === void 0 || ai.text !== bi.text) return false;
+  }
+  return true;
+}
+
 // src/internal/resolver/utils.ts
 function segmentsToKey(segments) {
   return segments.map((s) => {
@@ -327,13 +573,22 @@ function deepMergeHoconValues(base, overlay) {
   }
   return { kind: "object", fields: merged };
 }
-function deepMergeResObjInto(dst, src) {
+function deepMergeResObjInto(dst, src, pathPrefix = []) {
   for (const [k, srcVal] of src.fields) {
+    const childPrefix = [...pathPrefix, k];
+    const fullKey = stringSegmentsToKey(childPrefix);
     const dstVal = dst.fields.get(k);
     if (dstVal !== void 0 && isResObj(dstVal) && isResObj(srcVal)) {
-      deepMergeResObjInto(dstVal, srcVal);
+      const priorExisting = dst.priorValues.get(k);
+      const prior = foldOrSkipPrior(dstVal, fullKey, priorExisting);
+      if (prior !== void 0) dst.priorValues.set(k, prior);
+      deepMergeResObjInto(dstVal, srcVal, childPrefix);
     } else {
-      if (dstVal !== void 0) dst.priorValues.set(k, dstVal);
+      if (dstVal !== void 0) {
+        const priorExisting = dst.priorValues.get(k);
+        const prior = foldOrSkipPrior(dstVal, fullKey, priorExisting);
+        if (prior !== void 0) dst.priorValues.set(k, prior);
+      }
       dst.fields.set(k, srcVal);
     }
   }
@@ -411,6 +666,11 @@ var Lexer = class {
     this.line = 1;
     this.col = 1;
     this.hadSpace = false;
+    // Accumulates literal whitespace chars consumed between tokens. Reset on every
+    // token push. Used so the parser can preserve path-expression whitespace
+    // (xx.hocon#42, E13) — e.g. tab vs space adjacent to dots in key paths.
+    // Comment text is NOT accumulated; only the actual WS chars.
+    this.whitespaceBuffer = "";
     this.tokens = [];
     if (input.charCodeAt(0) === 65279) this.input = input.slice(1);
   }
@@ -426,6 +686,7 @@ var Lexer = class {
         continue;
       }
       if (isHoconWhitespace(ch)) {
+        this.whitespaceBuffer += ch;
         this.advance();
         this.hadSpace = true;
         continue;
@@ -517,7 +778,7 @@ var Lexer = class {
       }
       throw new ParseError(`unexpected character: ${JSON.stringify(ch)}`, sl, sc);
     }
-    this.tokens.push({ kind: "eof", value: "", line: this.line, col: this.col, isQuoted: false, precedingSpace: false });
+    this.tokens.push({ kind: "eof", value: "", line: this.line, col: this.col, isQuoted: false, precedingSpace: false, precedingWhitespace: "" });
     return this.tokens;
   }
   peek(offset = 0) {
@@ -534,12 +795,14 @@ var Lexer = class {
     return ch;
   }
   push(kind, value, l, c, isQuoted = false) {
-    this.tokens.push({ kind, value, line: l, col: c, isQuoted, precedingSpace: this.hadSpace });
+    this.tokens.push({ kind, value, line: l, col: c, isQuoted, precedingSpace: this.hadSpace, precedingWhitespace: this.whitespaceBuffer });
     this.hadSpace = false;
+    this.whitespaceBuffer = "";
   }
   pushSubst(payload, value, l, c) {
-    this.tokens.push({ kind: "subst", value, line: l, col: c, isQuoted: false, precedingSpace: this.hadSpace, subst: payload });
+    this.tokens.push({ kind: "subst", value, line: l, col: c, isQuoted: false, precedingSpace: this.hadSpace, precedingWhitespace: this.whitespaceBuffer, subst: payload });
     this.hadSpace = false;
+    this.whitespaceBuffer = "";
   }
   /**
    * Read body of a quoted string. Opening `"` must already be consumed.
@@ -785,7 +1048,7 @@ function isUnquotedContinue(ch, nextFn) {
 }
 
 // src/internal/parser/parser.ts
-var EOF_TOKEN = { kind: "eof", value: "", line: 0, col: 0, isQuoted: false, precedingSpace: false, subst: void 0 };
+var EOF_TOKEN = { kind: "eof", value: "", line: 0, col: 0, isQuoted: false, precedingSpace: false, precedingWhitespace: "", subst: void 0 };
 var Parser = class {
   constructor(tokens) {
     this.tokens = tokens;
@@ -898,13 +1161,17 @@ var Parser = class {
     let trailingDot = false;
     let firstWasQuoted = false;
     let spaceConcat = false;
+    let postDotPrefix = "";
     while (true) {
       const t = this.peek();
       if (t.kind === "string") {
         this.advance();
         if (segments.length === 0) firstWasQuoted = true;
         if (spaceConcat) {
-          segments[segments.length - 1] = `${segments[segments.length - 1]} ${t.value}`;
+          segments[segments.length - 1] = `${segments[segments.length - 1]}${t.precedingWhitespace}${t.value}`;
+        } else if (postDotPrefix !== "") {
+          segments.push(`${postDotPrefix}${t.value}`);
+          postDotPrefix = "";
         } else {
           segments.push(t.value);
         }
@@ -914,24 +1181,23 @@ var Parser = class {
         const raw = t.value.startsWith(".") && segments.length > 0 && !t.precedingSpace ? t.value.slice(1) : t.value;
         const parts = raw.split(".");
         const filtered = parts.filter((s) => s.length > 0);
-        for (const seg of filtered) {
-          if (seg[0] === "-" && !(seg.length >= 2 && seg[1] >= "0" && seg[1] <= "9")) {
-            const after = seg.length >= 2 ? JSON.stringify(seg[1]) : "EOF";
-            throw new ParseError(
-              `unquoted key segment cannot begin with '-' unless followed by a digit (got '-' then ${after} in ${JSON.stringify(seg)}, HOCON.md L270-276)`,
-              t.line,
-              t.col
-            );
-          }
-        }
-        if (spaceConcat && filtered.length > 0) {
+        if (spaceConcat) {
+          segments[segments.length - 1] = `${segments[segments.length - 1]}${t.precedingWhitespace}`;
           if (raw.startsWith(".")) {
             segments.push(...filtered);
-          } else {
+          } else if (filtered.length > 0) {
             const [head, ...tail] = filtered;
-            segments[segments.length - 1] = `${segments[segments.length - 1]} ${head}`;
+            segments[segments.length - 1] = `${segments[segments.length - 1]}${head}`;
             segments.push(...tail);
           }
+        } else if (postDotPrefix !== "" && raw.startsWith(".")) {
+          segments.push(postDotPrefix);
+          postDotPrefix = "";
+          segments.push(...filtered);
+        } else if (postDotPrefix !== "" && filtered.length > 0) {
+          const [head, ...tail] = filtered;
+          segments.push(`${postDotPrefix}${head}`, ...tail);
+          postDotPrefix = "";
         } else {
           segments.push(...filtered);
         }
@@ -941,11 +1207,23 @@ var Parser = class {
         break;
       }
       spaceConcat = false;
-      if (trailingDot) continue;
+      if (trailingDot) {
+        const next2 = this.peek();
+        if ((next2.kind === "unquoted" || next2.kind === "string") && next2.precedingWhitespace.length > 0) {
+          postDotPrefix = next2.precedingWhitespace;
+        } else {
+          postDotPrefix = "";
+        }
+        continue;
+      }
       const next = this.peek();
       if (next.kind === "unquoted" && next.value === "." && !next.precedingSpace) {
         this.advance();
         trailingDot = true;
+        const afterDot = this.peek();
+        if ((afterDot.kind === "unquoted" || afterDot.kind === "string") && afterDot.precedingWhitespace.length > 0) {
+          postDotPrefix = afterDot.precedingWhitespace;
+        }
         continue;
       }
       if (next.kind === "unquoted" && next.value.startsWith(".") && !next.precedingSpace) {
@@ -958,6 +1236,14 @@ var Parser = class {
       }
       break;
     }
+    if (trailingDot) {
+      const here = this.peek();
+      throw new ParseError(
+        `path has a trailing period '.' \u2014 empty key segment not allowed (HOCON.md path rules)`,
+        here.line,
+        here.col
+      );
+    }
     return { segments, firstWasQuoted };
   }
   parseInclude() {
@@ -1130,7 +1416,8 @@ var Parser = class {
         break;
       }
       if (hadSpace) {
-        parts.push({ kind: "scalar", raw: " ", valueType: "string", pos: { line: t.line, col: t.col }, _separator: true });
+        const sep = t.precedingWhitespace.length > 0 ? t.precedingWhitespace : " ";
+        parts.push({ kind: "scalar", raw: sep, valueType: "string", pos: { line: t.line, col: t.col }, _separator: true });
       }
       parts.push(node);
     }
@@ -1343,7 +1630,7 @@ var IncludeLoader = class {
     for (const ext of probeExts) {
       const obj = this.loadSingle(`${absPath}${ext}`);
       if (obj !== void 0) {
-        deepMergeResObjInto(merged, obj);
+        deepMergeResObjInto(merged, obj, []);
         foundAny = true;
       }
     }
@@ -1376,7 +1663,7 @@ var IncludeLoader = class {
     for (const ext of probeExts) {
       const obj = await this.loadSingleAsync(`${absPath}${ext}`);
       if (obj !== void 0) {
-        deepMergeResObjInto(merged, obj);
+        deepMergeResObjInto(merged, obj, []);
         foundAny = true;
       }
     }
@@ -1548,7 +1835,7 @@ var StructureBuilder = class _StructureBuilder {
       if (pathPrefix.length > 0) {
         this.relativizeResObj(included, pathPrefix);
       }
-      deepMergeResObjInto(obj, included);
+      deepMergeResObjInto(obj, included, pathPrefix);
       return;
     }
     const [head, ...tail] = field.key;
@@ -1563,12 +1850,27 @@ var StructureBuilder = class _StructureBuilder {
       return;
     }
     const childPrefix = [...pathPrefix, head];
+    const fullKey = stringSegmentsToKey(childPrefix);
     if (field.append) {
       const existing2 = obj.fields.get(head) ?? { kind: "array", items: [] };
-      obj.priorValues.set(head, existing2);
+      const oldPrior = obj.priorValues.get(head);
+      const folded = foldOrSkipPrior(existing2, fullKey, oldPrior);
+      if (folded !== void 0) obj.priorValues.set(head, folded);
       obj.fields.set(head, {
         _kind: "append-placeholder",
-        existing: existing2,
+        // Use the folded existing (self-ref-free) for the Append. When the
+        // fold returned undefined (self-ref present but no old prior),
+        // fall back to the original existing — resolveSubst will then
+        // raise the "self-ref with no prior value" error at resolve time,
+        // matching the pre-fix behaviour for that edge case.
+        //
+        // Clone `folded` again so the Append.existing and priorValues[head]
+        // do not share the same Subst/Concat references — relativizeResObj
+        // walks BOTH `fields` and `priorValues` and mutates Subst.segments
+        // in place, so a shared reference would get its prefix applied
+        // twice (resulting in e.g. `${outer.outer.base}` instead of
+        // `${outer.base}`). Codex review on PR #131.
+        existing: folded !== void 0 ? cloneResolverValue(folded) : existing2,
         elem: this.astToResolverValue(field.value, childPrefix)
       });
       return;
@@ -1576,10 +1878,13 @@ var StructureBuilder = class _StructureBuilder {
     const existing = obj.fields.get(head);
     const newVal = this.astToResolverValue(field.value, childPrefix);
     if (existing !== void 0) {
-      obj.priorValues.set(head, existing);
+      const oldPrior = obj.priorValues.get(head);
+      const priorInput = isResObj(existing) ? foldNestedSelfRefs(existing, childPrefix) : existing;
+      const prior = foldOrSkipPrior(priorInput, fullKey, oldPrior);
+      if (prior !== void 0) obj.priorValues.set(head, prior);
     }
     if (existing !== void 0 && isResObj(existing) && isResObj(newVal)) {
-      deepMergeResObjInto(existing, newVal);
+      deepMergeResObjInto(existing, newVal, childPrefix);
       return;
     }
     obj.fields.set(head, newVal);
@@ -1596,7 +1901,7 @@ var StructureBuilder = class _StructureBuilder {
       if (pathPrefix.length > 0) {
         this.relativizeResObj(included, pathPrefix);
       }
-      deepMergeResObjInto(obj, included);
+      deepMergeResObjInto(obj, included, pathPrefix);
       return;
     }
     const [head, ...tail] = field.key;
@@ -1611,12 +1916,15 @@ var StructureBuilder = class _StructureBuilder {
       return;
     }
     const childPrefix = [...pathPrefix, head];
+    const fullKey = stringSegmentsToKey(childPrefix);
     if (field.append) {
       const existing2 = obj.fields.get(head) ?? { kind: "array", items: [] };
-      obj.priorValues.set(head, existing2);
+      const oldPrior = obj.priorValues.get(head);
+      const folded = foldOrSkipPrior(existing2, fullKey, oldPrior);
+      if (folded !== void 0) obj.priorValues.set(head, folded);
       obj.fields.set(head, {
         _kind: "append-placeholder",
-        existing: existing2,
+        existing: folded !== void 0 ? cloneResolverValue(folded) : existing2,
         elem: await this.astToResolverValueAsync(field.value, childPrefix)
       });
       return;
@@ -1624,10 +1932,13 @@ var StructureBuilder = class _StructureBuilder {
     const existing = obj.fields.get(head);
     const newVal = await this.astToResolverValueAsync(field.value, childPrefix);
     if (existing !== void 0) {
-      obj.priorValues.set(head, existing);
+      const oldPrior = obj.priorValues.get(head);
+      const priorInput = isResObj(existing) ? foldNestedSelfRefs(existing, childPrefix) : existing;
+      const prior = foldOrSkipPrior(priorInput, fullKey, oldPrior);
+      if (prior !== void 0) obj.priorValues.set(head, prior);
     }
     if (existing !== void 0 && isResObj(existing) && isResObj(newVal)) {
-      deepMergeResObjInto(existing, newVal);
+      deepMergeResObjInto(existing, newVal, childPrefix);
       return;
     }
     obj.fields.set(head, newVal);
@@ -1646,7 +1957,7 @@ var StructureBuilder = class _StructureBuilder {
         return inner;
       }
       case "subst":
-        return { _kind: "subst-placeholder", segments: ast.segments, optional: ast.optional, listSuffix: ast.listSuffix, line: ast.pos.line, col: ast.pos.col, prefixLen: 0 };
+        return { _kind: "subst-placeholder", segments: ast.segments, optional: ast.optional, knownAbsent: false, listSuffix: ast.listSuffix, line: ast.pos.line, col: ast.pos.col, prefixLen: 0 };
       case "concat":
         return { _kind: "concat-placeholder", nodes: ast.nodes.map((n) => this.astToResolverValue(n, pathPrefix)), line: ast.pos.line, col: ast.pos.col };
       case "include":
@@ -1670,7 +1981,7 @@ var StructureBuilder = class _StructureBuilder {
       case "object":
         return await this.buildAsync(ast, pathPrefix);
       case "subst":
-        return { _kind: "subst-placeholder", segments: ast.segments, optional: ast.optional, listSuffix: ast.listSuffix, line: ast.pos.line, col: ast.pos.col, prefixLen: 0 };
+        return { _kind: "subst-placeholder", segments: ast.segments, optional: ast.optional, knownAbsent: false, listSuffix: ast.listSuffix, line: ast.pos.line, col: ast.pos.col, prefixLen: 0 };
       case "concat": {
         const nodes = [];
         for (const n of ast.nodes) {
@@ -1759,6 +2070,23 @@ var SubstitutionResolver = class {
     // narrower than path-equality. Spec amendment deferred to a follow-up
     // xx.hocon PR (see Phase 6 #3f close-out notes).
     this.resolvingConcats = /* @__PURE__ */ new WeakSet();
+    // Path stack tracking the full dotted path of the field currently being
+    // assigned in `resolveResObj`. Leaf keys are pushed on entry to each
+    // `(key, val)` iteration and popped on exit, so nested objects build up
+    // the full path (e.g. `["o", "history"]` while resolving `o.history`).
+    //
+    // Used to tighten self-ref detection at the L192 found-lookup site:
+    // a substitution `${X}` whose looked-up value contains a Subst pointing
+    // at `X` is only a true self-reference when the field currently being
+    // assigned is `X` (or a descendant of `X`). Without this guard, an
+    // external lookup like `b = ${o}` (where o has a self-referential
+    // field) would mis-fire and short-circuit to o's prior, returning the
+    // wrong value for b. The is_owner gate (rfp prefix-matches s.segments)
+    // narrows the check to the owner case only.
+    //
+    // Cross-impl with rs.hocon v1.5.1's resolving_field_path (same purpose,
+    // same prefix-match semantics).
+    this.resolvingFieldPath = [];
   }
   /** Returns a prefix for error messages, including origin info when set. */
   originPrefix() {
@@ -1770,35 +2098,57 @@ var SubstitutionResolver = class {
   resolveResObj(obj) {
     const result = /* @__PURE__ */ new Map();
     for (const [key, val] of obj.fields) {
-      const resolved = this.resolveVal(val, obj);
+      this.resolvingFieldPath.push(key);
+      const fullCacheKey = stringSegmentsToKey(this.resolvingFieldPath);
+      this.cache.delete(fullCacheKey);
+      let resolved;
+      try {
+        resolved = this.resolveVal(val, obj);
+      } finally {
+        this.resolvingFieldPath.pop();
+      }
       if (resolved !== void 0) {
         if (resolved.kind === "object") {
           const prior = obj.priorValues.get(key);
           if (prior !== void 0) {
             const priorResolved = this.resolveVal(prior, obj);
             if (priorResolved !== void 0 && priorResolved.kind === "object") {
-              result.set(
-                key,
-                deepMergeHoconValues(
-                  priorResolved,
-                  resolved
-                )
+              const finalValue = deepMergeHoconValues(
+                priorResolved,
+                resolved
               );
+              result.set(key, finalValue);
+              this.cache.set(fullCacheKey, finalValue);
+              this.cacheDescendants(fullCacheKey, finalValue);
               continue;
             }
           }
         }
         result.set(key, resolved);
+        this.cache.set(fullCacheKey, resolved);
+        this.cacheDescendants(fullCacheKey, resolved);
       } else {
         const prior = obj.priorValues.get(key);
         if (prior !== void 0) {
           const priorResolved = this.resolveVal(prior, obj);
-          if (priorResolved !== void 0) result.set(key, priorResolved);
+          if (priorResolved !== void 0) {
+            result.set(key, priorResolved);
+            this.cache.set(fullCacheKey, priorResolved);
+            this.cacheDescendants(fullCacheKey, priorResolved);
+          }
         }
       }
     }
     return { kind: "object", fields: result };
   }
+  cacheDescendants(prefix, value) {
+    if (value.kind !== "object") return;
+    for (const [key, child] of value.fields) {
+      const childKey = `${prefix}.${stringSegmentsToKey([key])}`;
+      this.cache.set(childKey, child);
+      this.cacheDescendants(childKey, child);
+    }
+  }
   resolveVal(v, scope) {
     if (isSubst(v)) return this.resolveSubst(v, scope);
     if (isConcat(v)) {
@@ -1824,6 +2174,7 @@ var SubstitutionResolver = class {
     return hv;
   }
   resolveSubst(s, scope) {
+    if (s.knownAbsent) return void 0;
     const key = s.listSuffix ? `${segmentsToKey(s.segments)}[]` : segmentsToKey(s.segments);
     if (this.cache.has(key)) return this.cache.get(key);
     if (this.resolving.has(key)) {
@@ -1860,7 +2211,10 @@ var SubstitutionResolver = class {
     try {
       const found = lookupPath(this.root, s.segments);
       if (found !== void 0) {
-        if (isConcat(found) && this.resolvingConcats.has(found)) {
+        const rfp = this.resolvingFieldPath;
+        const isOwner = rfp.length >= s.segments.length && s.segments.every((seg, i) => rfp[i] === seg.text);
+        const isSelfRef = isConcat(found) && this.resolvingConcats.has(found) || isOwner && containsSubstByPath(found, s.segments);
+        if (isSelfRef) {
           let prior;
           if (s.segments.length > 1) {
             const leafSeg = s.segments[s.segments.length - 1]?.text ?? "";
@@ -1913,6 +2267,28 @@ var SubstitutionResolver = class {
         if (result !== void 0) this.cache.set(key, result);
         return result;
       }
+      if (s.prefixLen > 0 && s.segments.length > s.prefixLen) {
+        const originalSegments = s.segments.slice(s.prefixLen);
+        const fallbackFound = lookupPath(this.root, originalSegments);
+        if (fallbackFound !== void 0) {
+          let result = this.resolveVal(fallbackFound, scope);
+          if (originalSegments.length === 1 && result !== void 0 && result.kind === "object") {
+            const rootSeg = originalSegments[0]?.text ?? "";
+            const prior = this.root.priorValues.get(rootSeg);
+            if (prior !== void 0) {
+              const priorResolved = this.resolveVal(prior, scope);
+              if (priorResolved !== void 0 && priorResolved.kind === "object") {
+                result = deepMergeHoconValues(
+                  priorResolved,
+                  result
+                );
+              }
+            }
+          }
+          if (result !== void 0) this.cache.set(key, result);
+          return result;
+        }
+      }
       if (s.listSuffix && this.opts.useSystemEnvironment !== false) {
         const result = this.resolveEnvList(s);
         if (result !== void 0) {