@o3co/ts.hocon 1.4.0 → 1.5.0

package/dist/index.cjs

@@ -949,12 +949,17 @@ var Parser = class {
     const segments = [];
     let trailingDot = false;
     let firstWasQuoted = false;
+    let spaceConcat = false;
     while (true) {
       const t = this.peek();
       if (t.kind === "string") {
         this.advance();
         if (segments.length === 0) firstWasQuoted = true;
-        segments.push(t.value);
+        if (spaceConcat) {
+          segments[segments.length - 1] = `${segments[segments.length - 1]} ${t.value}`;
+        } else {
+          segments.push(t.value);
+        }
         trailingDot = false;
       } else if (t.kind === "unquoted") {
         this.advance();
@@ -971,12 +976,23 @@ var Parser = class {
             );
           }
         }
-        segments.push(...filtered);
+        if (spaceConcat && filtered.length > 0) {
+          if (raw.startsWith(".")) {
+            segments.push(...filtered);
+          } else {
+            const [head, ...tail] = filtered;
+            segments[segments.length - 1] = `${segments[segments.length - 1]} ${head}`;
+            segments.push(...tail);
+          }
+        } else {
+          segments.push(...filtered);
+        }
         trailingDot = raw.endsWith(".");
       } else {
         if (segments.length === 0) throw new ParseError(`expected key, got ${t.kind}`, t.line, t.col);
         break;
       }
+      spaceConcat = false;
       if (trailingDot) continue;
       const next = this.peek();
       if (next.kind === "unquoted" && next.value === "." && !next.precedingSpace) {
@@ -988,6 +1004,10 @@ var Parser = class {
         trailingDot = true;
         continue;
       }
+      if ((next.kind === "unquoted" || next.kind === "string") && next.precedingSpace) {
+        spaceConcat = true;
+        continue;
+      }
       break;
     }
     return { segments, firstWasQuoted };
@@ -1503,7 +1523,9 @@ var IncludeLoader = class {
       return hoconValueToResObj(propertiesToHoconValue(content));
     }
     const tokens = tokenize(content);
-    assertNonEmptyDocument(tokens, candidate);
+    if (!hasContentTokens(tokens)) {
+      return makeResObj();
+    }
     const ast = parseTokens(tokens);
     return this.onBuildResObj(ast, {
       ...this.opts,
@@ -1528,7 +1550,9 @@ var IncludeLoader = class {
       return hoconValueToResObj(propertiesToHoconValue(content));
     }
     const tokens = tokenize(content);
-    assertNonEmptyDocument(tokens, candidate);
+    if (!hasContentTokens(tokens)) {
+      return makeResObj();
+    }
     const ast = parseTokens(tokens);
     return this.onBuildResObjAsync(ast, {
       ...this.opts,
@@ -2100,8 +2124,33 @@ var SubstitutionResolver = class {
   }
   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);
-    const items = existing.kind === "array" ? [...existing.items] : [existing];
+    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 };
   }
@@ -2203,6 +2252,9 @@ var Config = class _Config {
   }
   getString(path2) {
     const v = this.requireScalar(path2);
+    if (v.valueType === "null") {
+      throw new ConfigError(`expected string at ${path2}, got ${v.valueType}`, path2);
+    }
     return v.raw;
   }
   getNumber(path2) {

package/dist/index.js

@@ -897,12 +897,17 @@ var Parser = class {
     const segments = [];
     let trailingDot = false;
     let firstWasQuoted = false;
+    let spaceConcat = false;
     while (true) {
       const t = this.peek();
       if (t.kind === "string") {
         this.advance();
         if (segments.length === 0) firstWasQuoted = true;
-        segments.push(t.value);
+        if (spaceConcat) {
+          segments[segments.length - 1] = `${segments[segments.length - 1]} ${t.value}`;
+        } else {
+          segments.push(t.value);
+        }
         trailingDot = false;
       } else if (t.kind === "unquoted") {
         this.advance();
@@ -919,12 +924,23 @@ var Parser = class {
             );
           }
         }
-        segments.push(...filtered);
+        if (spaceConcat && filtered.length > 0) {
+          if (raw.startsWith(".")) {
+            segments.push(...filtered);
+          } else {
+            const [head, ...tail] = filtered;
+            segments[segments.length - 1] = `${segments[segments.length - 1]} ${head}`;
+            segments.push(...tail);
+          }
+        } else {
+          segments.push(...filtered);
+        }
         trailingDot = raw.endsWith(".");
       } else {
         if (segments.length === 0) throw new ParseError(`expected key, got ${t.kind}`, t.line, t.col);
         break;
       }
+      spaceConcat = false;
       if (trailingDot) continue;
       const next = this.peek();
       if (next.kind === "unquoted" && next.value === "." && !next.precedingSpace) {
@@ -936,6 +952,10 @@ var Parser = class {
         trailingDot = true;
         continue;
       }
+      if ((next.kind === "unquoted" || next.kind === "string") && next.precedingSpace) {
+        spaceConcat = true;
+        continue;
+      }
       break;
     }
     return { segments, firstWasQuoted };
@@ -1450,7 +1470,9 @@ var IncludeLoader = class {
       return hoconValueToResObj(propertiesToHoconValue(content));
     }
     const tokens = tokenize(content);
-    assertNonEmptyDocument(tokens, candidate);
+    if (!hasContentTokens(tokens)) {
+      return makeResObj();
+    }
     const ast = parseTokens(tokens);
     return this.onBuildResObj(ast, {
       ...this.opts,
@@ -1475,7 +1497,9 @@ var IncludeLoader = class {
       return hoconValueToResObj(propertiesToHoconValue(content));
     }
     const tokens = tokenize(content);
-    assertNonEmptyDocument(tokens, candidate);
+    if (!hasContentTokens(tokens)) {
+      return makeResObj();
+    }
     const ast = parseTokens(tokens);
     return this.onBuildResObjAsync(ast, {
       ...this.opts,
@@ -2047,8 +2071,33 @@ var SubstitutionResolver = class {
   }
   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);
-    const items = existing.kind === "array" ? [...existing.items] : [existing];
+    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 };
   }
@@ -2150,6 +2199,9 @@ var Config = class _Config {
   }
   getString(path2) {
     const v = this.requireScalar(path2);
+    if (v.valueType === "null") {
+      throw new ConfigError(`expected string at ${path2}, got ${v.valueType}`, path2);
+    }
     return v.raw;
   }
   getNumber(path2) {

package/dist/zod.cjs

@@ -940,12 +940,17 @@ var Parser = class {
     const segments = [];
     let trailingDot = false;
     let firstWasQuoted = false;
+    let spaceConcat = false;
     while (true) {
       const t = this.peek();
       if (t.kind === "string") {
         this.advance();
         if (segments.length === 0) firstWasQuoted = true;
-        segments.push(t.value);
+        if (spaceConcat) {
+          segments[segments.length - 1] = `${segments[segments.length - 1]} ${t.value}`;
+        } else {
+          segments.push(t.value);
+        }
         trailingDot = false;
       } else if (t.kind === "unquoted") {
         this.advance();
@@ -962,12 +967,23 @@ var Parser = class {
             );
           }
         }
-        segments.push(...filtered);
+        if (spaceConcat && filtered.length > 0) {
+          if (raw.startsWith(".")) {
+            segments.push(...filtered);
+          } else {
+            const [head, ...tail] = filtered;
+            segments[segments.length - 1] = `${segments[segments.length - 1]} ${head}`;
+            segments.push(...tail);
+          }
+        } else {
+          segments.push(...filtered);
+        }
         trailingDot = raw.endsWith(".");
       } else {
         if (segments.length === 0) throw new ParseError(`expected key, got ${t.kind}`, t.line, t.col);
         break;
       }
+      spaceConcat = false;
       if (trailingDot) continue;
       const next = this.peek();
       if (next.kind === "unquoted" && next.value === "." && !next.precedingSpace) {
@@ -979,6 +995,10 @@ var Parser = class {
         trailingDot = true;
         continue;
       }
+      if ((next.kind === "unquoted" || next.kind === "string") && next.precedingSpace) {
+        spaceConcat = true;
+        continue;
+      }
       break;
     }
     return { segments, firstWasQuoted };
@@ -1494,7 +1514,9 @@ var IncludeLoader = class {
       return hoconValueToResObj(propertiesToHoconValue(content));
     }
     const tokens = tokenize(content);
-    assertNonEmptyDocument(tokens, candidate);
+    if (!hasContentTokens(tokens)) {
+      return makeResObj();
+    }
     const ast = parseTokens(tokens);
     return this.onBuildResObj(ast, {
       ...this.opts,
@@ -1519,7 +1541,9 @@ var IncludeLoader = class {
       return hoconValueToResObj(propertiesToHoconValue(content));
     }
     const tokens = tokenize(content);
-    assertNonEmptyDocument(tokens, candidate);
+    if (!hasContentTokens(tokens)) {
+      return makeResObj();
+    }
     const ast = parseTokens(tokens);
     return this.onBuildResObjAsync(ast, {
       ...this.opts,
@@ -2091,8 +2115,33 @@ var SubstitutionResolver = class {
   }
   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);
-    const items = existing.kind === "array" ? [...existing.items] : [existing];
+    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 };
   }
@@ -2190,6 +2239,9 @@ var Config = class _Config {
   }
   getString(path2) {
     const v = this.requireScalar(path2);
+    if (v.valueType === "null") {
+      throw new ConfigError(`expected string at ${path2}, got ${v.valueType}`, path2);
+    }
     return v.raw;
   }
   getNumber(path2) {

package/dist/zod.js

@@ -901,12 +901,17 @@ var Parser = class {
     const segments = [];
     let trailingDot = false;
     let firstWasQuoted = false;
+    let spaceConcat = false;
     while (true) {
       const t = this.peek();
       if (t.kind === "string") {
         this.advance();
         if (segments.length === 0) firstWasQuoted = true;
-        segments.push(t.value);
+        if (spaceConcat) {
+          segments[segments.length - 1] = `${segments[segments.length - 1]} ${t.value}`;
+        } else {
+          segments.push(t.value);
+        }
         trailingDot = false;
       } else if (t.kind === "unquoted") {
         this.advance();
@@ -923,12 +928,23 @@ var Parser = class {
             );
           }
         }
-        segments.push(...filtered);
+        if (spaceConcat && filtered.length > 0) {
+          if (raw.startsWith(".")) {
+            segments.push(...filtered);
+          } else {
+            const [head, ...tail] = filtered;
+            segments[segments.length - 1] = `${segments[segments.length - 1]} ${head}`;
+            segments.push(...tail);
+          }
+        } else {
+          segments.push(...filtered);
+        }
         trailingDot = raw.endsWith(".");
       } else {
         if (segments.length === 0) throw new ParseError(`expected key, got ${t.kind}`, t.line, t.col);
         break;
       }
+      spaceConcat = false;
       if (trailingDot) continue;
       const next = this.peek();
       if (next.kind === "unquoted" && next.value === "." && !next.precedingSpace) {
@@ -940,6 +956,10 @@ var Parser = class {
         trailingDot = true;
         continue;
       }
+      if ((next.kind === "unquoted" || next.kind === "string") && next.precedingSpace) {
+        spaceConcat = true;
+        continue;
+      }
       break;
     }
     return { segments, firstWasQuoted };
@@ -1454,7 +1474,9 @@ var IncludeLoader = class {
       return hoconValueToResObj(propertiesToHoconValue(content));
     }
     const tokens = tokenize(content);
-    assertNonEmptyDocument(tokens, candidate);
+    if (!hasContentTokens(tokens)) {
+      return makeResObj();
+    }
     const ast = parseTokens(tokens);
     return this.onBuildResObj(ast, {
       ...this.opts,
@@ -1479,7 +1501,9 @@ var IncludeLoader = class {
       return hoconValueToResObj(propertiesToHoconValue(content));
     }
     const tokens = tokenize(content);
-    assertNonEmptyDocument(tokens, candidate);
+    if (!hasContentTokens(tokens)) {
+      return makeResObj();
+    }
     const ast = parseTokens(tokens);
     return this.onBuildResObjAsync(ast, {
       ...this.opts,
@@ -2051,8 +2075,33 @@ var SubstitutionResolver = class {
   }
   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);
-    const items = existing.kind === "array" ? [...existing.items] : [existing];
+    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 };
   }
@@ -2150,6 +2199,9 @@ var Config = class _Config {
   }
   getString(path2) {
     const v = this.requireScalar(path2);
+    if (v.valueType === "null") {
+      throw new ConfigError(`expected string at ${path2}, got ${v.valueType}`, path2);
+    }
     return v.raw;
   }
   getNumber(path2) {

package/package.json

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