@o3co/ts.hocon 1.6.0 → 1.7.0

package/dist/zod.js

@@ -241,55 +241,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));
@@ -305,9 +256,6 @@ function stringSegmentsToKey(segments) {
 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;
@@ -338,19 +286,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") {
@@ -368,6 +309,41 @@ 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 foldOptionalSelfRefAbsent(prior, fullKey);
@@ -396,12 +372,6 @@ function foldOptionalSelfRefAbsent(v, fullKey) {
     }
     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) {
@@ -409,7 +379,7 @@ function foldOptionalSelfRefAbsent(v, fullKey) {
       if (folded === void 0) return void 0;
       fields.set(key, folded);
     }
-    return { _kind: "res-obj", fields, priorValues: new Map(v.priorValues) };
+    return { _kind: "res-obj", fields, priorValues: new Map(v.priorValues), resetKeys: new Set(v.resetKeys) };
   }
   const hv = v;
   if (hv.kind === "array") {
@@ -458,14 +428,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") {
@@ -500,14 +463,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 !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;
@@ -536,6 +496,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) => {
@@ -589,9 +596,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);
     }
@@ -601,6 +618,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();
@@ -1856,31 +1874,15 @@ 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 oldPrior = obj.priorValues.get(head);
       const priorInput = isResObj(existing) ? foldNestedSelfRefs(existing, childPrefix) : existing;
@@ -1922,19 +1924,15 @@ 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 oldPrior = obj.priorValues.get(head);
       const priorInput = isResObj(existing) ? foldNestedSelfRefs(existing, childPrefix) : existing;
@@ -1947,6 +1945,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": {
@@ -2011,11 +2024,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;
@@ -2164,7 +2172,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") {
@@ -2449,38 +2456,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
@@ -2498,7 +2473,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") {
@@ -2509,7 +2484,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 {
@@ -2898,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));
@@ -2912,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);
@@ -2946,9 +2921,8 @@ function renderHoconAsJSON(v) {
         case "boolean":
           return v.raw;
         case "number": {
-          const n = Number(v.raw);
-          if (Number.isFinite(n)) return v.raw;
-          return JSON.stringify(v.raw);
+          const norm = normalizeLeadingZeroNumber(v.raw);
+          return JSON_NUMBER_RE.test(norm) ? norm : JSON.stringify(v.raw);
         }
         case "string":
           return JSON.stringify(v.raw);
@@ -2970,6 +2944,10 @@ function renderHoconAsJSON(v) {
   }
   throw new Error(`renderHoconAsJSON: unsupported value kind (unresolved placeholder?)`);
 }
+var JSON_NUMBER_RE = /^-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?$/;
+function normalizeLeadingZeroNumber(raw) {
+  return raw.replace(/^([+-]?)0+(\d)/, "$1$2");
+}
 
 // src/parse.ts
 function getEnv(opts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3co/ts.hocon",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Full Lightbend HOCON spec-compliant parser and config library for TypeScript",
   "keywords": [
     "hocon",