@o3co/ts.hocon 1.5.2 → 1.6.1

package/dist/index.js

@@ -237,55 +237,6 @@ var NotResolvedError = class extends ConfigError {
   }
 };
 
-// src/internal/resolver/types.ts
-var separatorValues = /* @__PURE__ */ new WeakSet();
-function isSubst(v) {
-  return v._kind === "subst-placeholder";
-}
-function isConcat(v) {
-  return v._kind === "concat-placeholder";
-}
-function isAppend(v) {
-  return v._kind === "append-placeholder";
-}
-function isResObj(v) {
-  return v._kind === "res-obj";
-}
-function makeResObj() {
-  return { _kind: "res-obj", fields: /* @__PURE__ */ new Map(), priorValues: /* @__PURE__ */ new Map() };
-}
-function mergeUnresolved(receiver, fallback) {
-  const result = makeResObj();
-  for (const [k, v] of fallback.fields) {
-    result.fields.set(k, v);
-  }
-  for (const [k, v] of fallback.priorValues) {
-    result.priorValues.set(k, v);
-  }
-  for (const [k, rv] of receiver.fields) {
-    const existing = result.fields.get(k);
-    if (existing !== void 0) {
-      const recPrior = receiver.priorValues.get(k);
-      if (recPrior !== void 0 && !isResObj(recPrior)) {
-        result.fields.set(k, rv);
-        continue;
-      }
-      if (isResObj(rv) && isResObj(existing)) {
-        result.fields.set(k, mergeUnresolved(rv, existing));
-        continue;
-      }
-      result.priorValues.set(k, existing);
-    }
-    result.fields.set(k, rv);
-  }
-  for (const [k, v] of receiver.priorValues) {
-    if (receiver.fields.has(k)) {
-      result.priorValues.set(k, v);
-    }
-  }
-  return result;
-}
-
 // src/internal/resolver/fold-self-ref.ts
 function substFullKey(s) {
   return stringSegmentsToKey(s.segments.map((seg) => seg.text));
@@ -299,11 +250,8 @@ function stringSegmentsToKey(segments) {
   }).join(".");
 }
 function containsSelfRef(v, fullKey) {
-  if (isSubst(v)) return substFullKey(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;
@@ -334,19 +282,12 @@ function foldSelfRef(v, fullKey, replacement) {
       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) };
+    return { _kind: "res-obj", fields: newFields, priorValues: new Map(v.priorValues), resetKeys: new Set(v.resetKeys) };
   }
   const hv = v;
   if (hv.kind === "array") {
@@ -364,17 +305,106 @@ function foldSelfRef(v, fullKey, replacement) {
   }
   return v;
 }
+function foldKnownAbsentSelfRef(v, fullKey, replacement) {
+  if (isSubst(v)) {
+    return v.knownAbsent && substFullKey(v) === fullKey ? replacement : v;
+  }
+  if (isConcat(v)) {
+    return {
+      _kind: "concat-placeholder",
+      nodes: v.nodes.map((n) => foldKnownAbsentSelfRef(n, fullKey, replacement)),
+      line: v.line,
+      col: v.col
+    };
+  }
+  if (isResObj(v)) {
+    const newFields = /* @__PURE__ */ new Map();
+    for (const [k, val] of v.fields) {
+      newFields.set(k, foldKnownAbsentSelfRef(val, fullKey, replacement));
+    }
+    return { _kind: "res-obj", fields: newFields, priorValues: new Map(v.priorValues), resetKeys: new Set(v.resetKeys) };
+  }
+  const hv = v;
+  if (hv.kind === "array") {
+    return {
+      kind: "array",
+      items: hv.items.map((item) => foldKnownAbsentSelfRef(item, fullKey, replacement))
+    };
+  }
+  if (hv.kind === "object") {
+    const newFields = /* @__PURE__ */ new Map();
+    for (const [k, val] of hv.fields) {
+      newFields.set(k, foldKnownAbsentSelfRef(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 void 0;
+  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 (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), resetKeys: new Set(v.resetKeys) };
+  }
+  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,
@@ -394,14 +424,7 @@ function cloneResolverValue(v) {
     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)
-    };
+    return { _kind: "res-obj", fields: newFields, priorValues: newPriors, resetKeys: new Set(v.resetKeys) };
   }
   const hv = v;
   if (hv.kind === "array") {
@@ -436,14 +459,11 @@ function foldNestedSelfRefs(v, pathPrefix) {
     }
     newFields.set(k, finalVal);
   }
-  return { _kind: "res-obj", fields: newFields, priorValues: new Map(v.priorValues) };
+  return { _kind: "res-obj", fields: newFields, priorValues: new Map(v.priorValues), resetKeys: new Set(v.resetKeys) };
 }
 function containsSubstByPath(v, target) {
-  if (isSubst(v)) return segmentsTextEqual(v.segments, 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;
@@ -472,6 +492,53 @@ function segmentsTextEqual(a, b) {
   return true;
 }
 
+// src/internal/resolver/types.ts
+var separatorValues = /* @__PURE__ */ new WeakSet();
+function isSubst(v) {
+  return v._kind === "subst-placeholder";
+}
+function isConcat(v) {
+  return v._kind === "concat-placeholder";
+}
+function isResObj(v) {
+  return v._kind === "res-obj";
+}
+function makeResObj() {
+  return { _kind: "res-obj", fields: /* @__PURE__ */ new Map(), priorValues: /* @__PURE__ */ new Map(), resetKeys: /* @__PURE__ */ new Set() };
+}
+function mergeUnresolved(receiver, fallback) {
+  const result = makeResObj();
+  for (const [k, v] of fallback.fields) {
+    result.fields.set(k, v);
+  }
+  for (const [k, v] of fallback.priorValues) {
+    result.priorValues.set(k, v);
+  }
+  for (const [k, rv] of receiver.fields) {
+    const existing = result.fields.get(k);
+    if (existing !== void 0) {
+      const recPrior = receiver.priorValues.get(k);
+      if (recPrior !== void 0 && !isResObj(recPrior)) {
+        result.fields.set(k, rv);
+        continue;
+      }
+      if (isResObj(rv) && isResObj(existing)) {
+        result.fields.set(k, mergeUnresolved(rv, existing));
+        continue;
+      }
+      const foldedPrior = foldOrSkipPrior(existing, k, void 0);
+      if (foldedPrior !== void 0) result.priorValues.set(k, foldedPrior);
+    }
+    result.fields.set(k, rv);
+  }
+  for (const [k, v] of receiver.priorValues) {
+    if (receiver.fields.has(k)) {
+      result.priorValues.set(k, v);
+    }
+  }
+  return result;
+}
+
 // src/internal/resolver/utils.ts
 function segmentsToKey(segments) {
   return segments.map((s) => {
@@ -525,9 +592,19 @@ function deepMergeResObjInto(dst, src, pathPrefix = []) {
       deepMergeResObjInto(dstVal, srcVal, childPrefix);
     } else {
       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);
+        if (src.resetKeys.has(k)) {
+          dst.priorValues.delete(k);
+        } else {
+          const dstFolded = foldOrSkipPrior(dstVal, fullKey, dst.priorValues.get(k));
+          if (dstFolded !== void 0) {
+            const srcPrior = src.priorValues.get(k);
+            if (srcPrior !== void 0) {
+              dst.priorValues.set(k, foldKnownAbsentSelfRef(srcPrior, fullKey, dstFolded));
+            } else {
+              dst.priorValues.set(k, dstFolded);
+            }
+          }
+        }
       }
       dst.fields.set(k, srcVal);
     }
@@ -537,6 +614,7 @@ function deepMergeResObjInto(dst, src, pathPrefix = []) {
       dst.priorValues.set(k, srcPrior);
     }
   }
+  for (const k of src.resetKeys) dst.resetKeys.add(k);
 }
 function hoconValueToResObj(hv) {
   const obj = makeResObj();
@@ -606,6 +684,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);
   }
@@ -621,6 +704,7 @@ var Lexer = class {
         continue;
       }
       if (isHoconWhitespace(ch)) {
+        this.whitespaceBuffer += ch;
         this.advance();
         this.hadSpace = true;
         continue;
@@ -712,7 +796,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) {
@@ -729,12 +813,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.
@@ -980,7 +1066,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;
@@ -1093,13 +1179,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);
         }
@@ -1109,24 +1199,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);
         }
@@ -1136,11 +1225,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) {
@@ -1153,6 +1254,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() {
@@ -1325,7 +1434,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);
     }
@@ -1760,35 +1870,19 @@ var StructureBuilder = class _StructureBuilder {
     const childPrefix = [...pathPrefix, head];
     const fullKey = stringSegmentsToKey(childPrefix);
     if (field.append) {
-      const existing2 = obj.fields.get(head) ?? { kind: "array", items: [] };
-      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",
-        // 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)
-      });
+      const synthetic = this.desugarAppend(field, childPrefix);
+      this.applyField(obj, synthetic, pathPrefix);
       return;
     }
     const existing = obj.fields.get(head);
     const newVal = this.astToResolverValue(field.value, childPrefix);
+    if (!containsSelfRef(newVal, fullKey)) {
+      obj.resetKeys.add(head);
+    }
     if (existing !== void 0) {
-      const exFolded = foldNestedSelfRefs(existing, childPrefix);
       const oldPrior = obj.priorValues.get(head);
-      const prior = foldOrSkipPrior(exFolded, fullKey, oldPrior);
+      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)) {
@@ -1826,23 +1920,19 @@ var StructureBuilder = class _StructureBuilder {
     const childPrefix = [...pathPrefix, head];
     const fullKey = stringSegmentsToKey(childPrefix);
     if (field.append) {
-      const existing2 = obj.fields.get(head) ?? { kind: "array", items: [] };
-      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: folded !== void 0 ? cloneResolverValue(folded) : existing2,
-        elem: await this.astToResolverValueAsync(field.value, childPrefix)
-      });
+      const synthetic = this.desugarAppend(field, childPrefix);
+      await this.applyFieldAsync(obj, synthetic, pathPrefix);
       return;
     }
     const existing = obj.fields.get(head);
     const newVal = await this.astToResolverValueAsync(field.value, childPrefix);
+    if (!containsSelfRef(newVal, fullKey)) {
+      obj.resetKeys.add(head);
+    }
     if (existing !== void 0) {
-      const exFolded = foldNestedSelfRefs(existing, childPrefix);
       const oldPrior = obj.priorValues.get(head);
-      const prior = foldOrSkipPrior(exFolded, fullKey, oldPrior);
+      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)) {
@@ -1851,6 +1941,21 @@ var StructureBuilder = class _StructureBuilder {
     }
     obj.fields.set(head, newVal);
   }
+  /** Builds the `key = ${?fullkey} [value]` field that `key += value` desugars
+   * to (S13b.2, HOCON.md L732). `childPrefix` is the field's fully-qualified
+   * path (pathPrefix + key), so a nested `srv { items += x }` references
+   * `${?srv.items}`; include relativization rewrites it under a mount prefix.
+   * `field.key` is already single-segment here (multi-segment keys are split
+   * into nested objects upstream). Returns a NEW AstField (append=false);
+   * positions inherit from the original field so resolve-time errors (the
+   * S13b.2 non-array check, now via the scalar+array concat) keep a location. */
+  desugarAppend(field, childPrefix) {
+    const segments = childPrefix.map((text) => ({ text, line: field.pos.line, col: field.pos.col }));
+    const subst = { kind: "subst", segments, optional: true, listSuffix: false, pos: field.pos };
+    const elemArray = { kind: "array", items: [field.value], pos: field.pos };
+    const synthetic = { kind: "concat", nodes: [subst, elemArray], pos: field.pos };
+    return { key: field.key, value: synthetic, append: false, pos: field.pos };
+  }
   astToResolverValue(ast, pathPrefix) {
     switch (ast.kind) {
       case "scalar": {
@@ -1865,7 +1970,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":
@@ -1889,7 +1994,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) {
@@ -1915,11 +2020,6 @@ var StructureBuilder = class _StructureBuilder {
       }
       return;
     }
-    if (isAppend(val)) {
-      this.relativizeSubstPaths(val.existing, prefixSegments);
-      this.relativizeSubstPaths(val.elem, prefixSegments);
-      return;
-    }
     if (isResObj(val)) {
       this.relativizeResObj(val, prefixSegments);
       return;
@@ -2007,6 +2107,8 @@ var SubstitutionResolver = class {
     const result = /* @__PURE__ */ new Map();
     for (const [key, val] of obj.fields) {
       this.resolvingFieldPath.push(key);
+      const fullCacheKey = stringSegmentsToKey(this.resolvingFieldPath);
+      this.cache.delete(fullCacheKey);
       let resolved;
       try {
         resolved = this.resolveVal(val, obj);
@@ -2019,28 +2121,42 @@ var SubstitutionResolver = class {
           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)) {
@@ -2052,7 +2168,6 @@ var SubstitutionResolver = class {
         this.resolvingConcats.delete(v);
       }
     }
-    if (isAppend(v)) return this.resolveAppend(v, scope);
     if (isResObj(v)) return this.resolveResObj(v);
     const hv = v;
     if (hv.kind === "array") {
@@ -2066,6 +2181,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)) {
@@ -2158,6 +2274,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) {
@@ -2314,38 +2452,6 @@ var SubstitutionResolver = class {
     }
     return folded;
   }
-  resolveAppend(a, scope) {
-    const existing = this.resolveVal(a.existing, scope) ?? { kind: "array", items: [] };
-    if (this.opts.allowUnresolved && (isSubst(existing) || isConcat(existing) || isAppend(existing))) {
-      return a;
-    }
-    const elem = this.resolveVal(a.elem, scope);
-    let priorItems;
-    if (existing.kind === "array") {
-      priorItems = existing.items;
-    } else if (existing.kind === "object") {
-      const converted = numericObjectToArray(existing);
-      if (converted === null) {
-        throw new ResolveError(
-          `'+=' on non-array value: prior value is object with non-numeric keys (spec L732)`,
-          "",
-          0,
-          0
-        );
-      }
-      priorItems = converted;
-    } else {
-      throw new ResolveError(
-        `'+=' on non-array value: prior value is ${existing.kind} (spec L732)`,
-        "",
-        0,
-        0
-      );
-    }
-    const items = [...priorItems];
-    if (elem !== void 0) items.push(elem);
-    return { kind: "array", items };
-  }
 };
 
 // src/internal/resolver/resolver.ts
@@ -2363,7 +2469,7 @@ function containsPlaceholders(tree) {
 }
 function valContainsPlaceholders(v) {
   const rv = v;
-  if (isSubst(rv) || isConcat(rv) || isAppend(rv)) return true;
+  if (isSubst(rv) || isConcat(rv)) return true;
   if (isResObj(rv)) return containsPlaceholders(rv);
   const hv = v;
   if (hv?.kind === "array") {
@@ -2374,7 +2480,7 @@ function valContainsPlaceholders(v) {
 function buildPartialHoconFromResObj(tree) {
   const fields = /* @__PURE__ */ new Map();
   for (const [k, v] of tree.fields) {
-    if (!isSubst(v) && !isConcat(v) && !isAppend(v)) {
+    if (!isSubst(v) && !isConcat(v)) {
       if (isResObj(v)) {
         fields.set(k, buildPartialHoconFromResObj(v));
       } else {
@@ -2767,7 +2873,7 @@ function hoconToJs(v) {
 function resObjToKeyShape(tree) {
   const fields = /* @__PURE__ */ new Map();
   for (const [k, v] of tree.fields) {
-    if (isSubst(v) || isConcat(v) || isAppend(v)) {
+    if (isSubst(v) || isConcat(v)) {
       fields.set(k, { kind: "scalar", raw: "", valueType: "null" });
     } else if (isResObj(v)) {
       fields.set(k, resObjToKeyShape(v));
@@ -2781,7 +2887,7 @@ function stripPlaceholderFields(v) {
   const fields = /* @__PURE__ */ new Map();
   let hadPlaceholders = false;
   for (const [k, val] of v.fields) {
-    if (val._kind === "subst-placeholder" || val._kind === "concat-placeholder" || val._kind === "append-placeholder") {
+    if (val._kind === "subst-placeholder" || val._kind === "concat-placeholder") {
       hadPlaceholders = true;
     } else if (val.kind === "object") {
       const inner = stripPlaceholderFields(val);