@o3co/ts.hocon 1.14.2 → 1.14.3

package/README.ja.md

@@ -265,6 +265,16 @@ const Session = z.object({
 getValidated(cfg, 'session', Session) // { lifetime: 1800, maxBody: 65536 }
 ```
 
+単位のない数値は、getter と同じく既定の単位で読みます（`lifetime = 30` は 30 ms）。単位をスキーマの契約にするには `{ requireUnit: true }` を渡します。数値や、数値だけの文字列（環境変数が渡す `"30"`）はキーのパス付きで拒否され（`duration must name its unit`、`params.problem` は `missing-unit`）、`30s`・`"30 s"`・`64KiB` はこれまでどおり読みます。`hocon.period({ requireUnit: true })` も、単位のない日数を同じように拒否します。
+
+```ts
+const Token = z.object({
+  ttl: hocon.duration('s', { requireUnit: true }).pipe(z.number().int().min(1).max(3600)),
+})
+// token { ttl = 30 } を getValidated(cfg, 'token', Token):  ttl で ZodError、duration must name its unit
+// token { ttl = 30s } を getValidated(cfg, 'token', Token): { ttl: 30 }
+```
+
 `hocon.period()` は `getPeriod()` と同じ規則で period を読み、`Period`（`{ years, months, days }`）を返します。制約はスキーマ側で refine します:
 
 ```ts
@@ -276,7 +286,7 @@ const Backup = z.object({
 getValidated(cfg, 'backup', Backup) // { keep: { years: 0, months: 0, days: 14 } }
 ```
 
-不正な duration / byte size / period は、キーのパス付きのバリデーションエラーになります。issue の message は問題だけを示し、値は含めません（`not a duration`、`byte size must be non-negative`）。誤ったキーに置かれたシークレットがログに出ないようにするためです。`params.problem` は `invalid`・`negative`・`overflow` のいずれかで、値は Zod に input の報告を求めたときだけ issue の `input` に入ります。マーカーは普通の Zod スキーマなので、`validate`・`getValidated`・`parseWithSchema`・`parseFileWithSchema` をはじめ、Zod が実行するところならどこでも使えます。指数表記（`1e3`、`"1.5e2s"`）は getter もマーカーも読みます。ただしマーカーは数値を JavaScript の値として読むため、double の精度を超える桁数の数値リテラルは、リテラルの文字列を正確に読む getter と結果が異なることがあります（`1.99999999999999999` B は `getBytes()` では 1、マーカーでは 2）。period のマーカーは、小数点や指数を含むリテラル（`7.0`、`1e2`）も整数として読みます（`getPeriod()` は拒否します）。単位付きで書けば（`30s`、`7d`）どちらの差も出ません。
+不正な duration / byte size / period は、キーのパス付きのバリデーションエラーになります。issue の message は問題だけを示し、値は含めません（`not a duration`、`byte size must be non-negative`）。誤ったキーに置かれたシークレットがログに出ないようにするためです。`params.problem` は `invalid`・`negative`・`overflow`（`requireUnit` のときは `missing-unit` も）のいずれかで、値は Zod に input の報告を求めたときだけ issue の `input` に入ります。マーカーは普通の Zod スキーマなので、`validate`・`getValidated`・`parseWithSchema`・`parseFileWithSchema` をはじめ、Zod が実行するところならどこでも使えます。指数表記（`1e3`、`"1.5e2s"`）は getter もマーカーも読みます。ただしマーカーは数値を JavaScript の値として読むため、double の精度を超える桁数の数値リテラルは、リテラルの文字列を正確に読む getter と結果が異なることがあります（`1.99999999999999999` B は `getBytes()` では 1、マーカーでは 2）。period のマーカーは、小数点や指数を含むリテラル（`7.0`、`1e2`）も整数として読みます（`getPeriod()` は拒否します）。単位付きで書けば（`30s`、`7d`）どちらの差も出ません。
 
 未解決の Config（`resolveSubstitutions: false` でパースしたもの、`resolve()` 前のフォールバックの重なり、または何かが残った `resolve({ allowUnresolved: true })` の結果）に対しては、`validate` は保留中の値が欠けたツリーを検証するのではなく、getter と同じく `NotResolvedError` を投げます。`getValidated` は、値が未解決のパスでは `NotResolvedError` を投げ、解決済みのパスなら検証します。先に `resolve()` を呼んでください。
 

package/README.md

@@ -266,6 +266,16 @@ const Session = z.object({
 getValidated(cfg, 'session', Session) // { lifetime: 1800, maxBody: 65536 }
 ```
 
+A bare number reads in the default unit (`lifetime = 30` is 30 ms), as the getters read it. To make the unit part of the schema's contract, pass `{ requireUnit: true }`: a number or a string of the number alone (`"30"`, what an environment variable gives) is then refused with the key's path (`duration must name its unit`, `params.problem` `missing-unit`), and `30s`, `"30 s"` or `64KiB` read as before. `hocon.period({ requireUnit: true })` refuses a bare number of days the same way.
+
+```ts
+const Token = z.object({
+  ttl: hocon.duration('s', { requireUnit: true }).pipe(z.number().int().min(1).max(3600)),
+})
+// getValidated(cfg, 'token', Token) with token { ttl = 30 }:  ZodError at ttl, duration must name its unit
+// getValidated(cfg, 'token', Token) with token { ttl = 30s }: { ttl: 30 }
+```
+
 `hocon.period()` reads a period the way `getPeriod()` does and gives a `Period` (`{ years, months, days }`); refine it in the schema:
 
 ```ts
@@ -277,7 +287,7 @@ const Backup = z.object({
 getValidated(cfg, 'backup', Backup) // { keep: { years: 0, months: 0, days: 14 } }
 ```
 
-An invalid duration, size or period fails validation with the key's path. The issue message names the problem, not the value (`not a duration`, `byte size must be non-negative`), so a secret set under the wrong key does not reach the logs; `params.problem` is `invalid`, `negative` or `overflow`, and the value is in the issue's `input` only when Zod is asked to report input. The markers are ordinary Zod schemas, so they work in `validate`, `getValidated`, `parseWithSchema`, `parseFileWithSchema` and anywhere else Zod runs them. Getters and markers both read exponent forms (`1e3`, `"1.5e2s"`). A marker reads a number through its JavaScript value, though, so a number literal with more significant digits than a double holds can read differently from the getters, which read the literal's text exactly (`1.99999999999999999` B is 1 through `getBytes()`, 2 through the marker); a period marker also reads a literal with a decimal point or an exponent (`7.0`, `1e2`) as an integer, which `getPeriod()` refuses. Write unit values with a unit (`30s`, `7d`) to avoid both.
+An invalid duration, size or period fails validation with the key's path. The issue message names the problem, not the value (`not a duration`, `byte size must be non-negative`), so a secret set under the wrong key does not reach the logs; `params.problem` is `invalid`, `negative` or `overflow` (or `missing-unit` with `requireUnit`), and the value is in the issue's `input` only when Zod is asked to report input. The markers are ordinary Zod schemas, so they work in `validate`, `getValidated`, `parseWithSchema`, `parseFileWithSchema` and anywhere else Zod runs them. Getters and markers both read exponent forms (`1e3`, `"1.5e2s"`). A marker reads a number through its JavaScript value, though, so a number literal with more significant digits than a double holds can read differently from the getters, which read the literal's text exactly (`1.99999999999999999` B is 1 through `getBytes()`, 2 through the marker); a period marker also reads a literal with a decimal point or an exponent (`7.0`, `1e2`) as an integer, which `getPeriod()` refuses. Write unit values with a unit (`30s`, `7d`) to avoid both.
 
 On an unresolved Config (parsed with `resolveSubstitutions: false`, a fallback stack not yet `resolve()`d, or the result of `resolve({ allowUnresolved: true })` with something left), `validate` throws `NotResolvedError`, as the getters do, rather than validating a tree with the pending values missing; `getValidated` throws it for a path whose value is unresolved and validates a resolved one. Call `resolve()` first.
 

package/dist/adapters/env.cjs

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkPCAMDXJ4cjs = require('../chunk-PCAMDXJ4.cjs');
+var _chunkSDGXLF4Gcjs = require('../chunk-SDGXLF4G.cjs');
 
 
 
@@ -8,14 +8,14 @@ var _chunkPCAMDXJ4cjs = require('../chunk-PCAMDXJ4.cjs');
 
 
 
-var _chunkL3D2RE2Ucjs = require('../chunk-L3D2RE2U.cjs');
+var _chunkNHJJUTADcjs = require('../chunk-NHJJUTAD.cjs');
 
 // src/adapters/env.ts
 var SEPARATOR = "__";
 function loadEnv(opts = {}) {
   const prefix = _nullishCoalesce(opts.prefix, () => ( ""));
   if (prefix === "") {
-    throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+    throw new (0, _chunkNHJJUTADcjs.ConfigError)(
       "loadEnv: a prefix is required when mounting the environment (spec F1.1)",
       ""
     );
@@ -29,44 +29,44 @@ function loadEnv(opts = {}) {
     const value = source[name];
     if (value === void 0) continue;
     const path = toPath(name.slice(prefix.length));
-    const key = _chunkL3D2RE2Ucjs.pathKey.call(void 0, path);
+    const key = _chunkNHJJUTADcjs.pathKey.call(void 0, path);
     const prev = seen.get(key);
     if (prev !== void 0) {
-      throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(`loadEnv: ${prev} and ${name} both map to "${path.join(".")}"`, path.join("."));
+      throw new (0, _chunkNHJJUTADcjs.ConfigError)(`loadEnv: ${prev} and ${name} both map to "${path.join(".")}"`, path.join("."));
     }
     seen.set(key, name);
     pairs.push([path, value]);
   }
-  return _chunkPCAMDXJ4cjs.fromMap.call(void 0, _chunkL3D2RE2Ucjs.nestPairs.call(void 0, pairs), _nullishCoalesce(opts.originDescription, () => ( "environment variables")));
+  return _chunkSDGXLF4Gcjs.fromMap.call(void 0, _chunkNHJJUTADcjs.nestPairs.call(void 0, pairs), _nullishCoalesce(opts.originDescription, () => ( "environment variables")));
 }
 function parseDotEnv(input, opts = {}) {
   const origin = _nullishCoalesce(opts.originDescription, () => ( ".env"));
   const prefix = _nullishCoalesce(opts.prefix, () => ( ""));
   const pairs = [];
-  const lines = _chunkL3D2RE2Ucjs.stripBom.call(void 0, input).replace(/\r\n/g, "\n").replace(/\r/g, "\n").split("\n");
+  const lines = _chunkNHJJUTADcjs.stripBom.call(void 0, input).replace(/\r\n/g, "\n").replace(/\r/g, "\n").split("\n");
   for (let i = 0; i < lines.length; i++) {
     const raw = (_nullishCoalesce(lines[i], () => ( ""))).trim();
     if (raw === "" || raw.startsWith("#")) continue;
     const line = stripExport(raw);
     const eq = line.indexOf("=");
-    if (eq === -1) throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(`${origin}:${i + 1}: expected NAME=value`, "");
+    if (eq === -1) throw new (0, _chunkNHJJUTADcjs.ConfigError)(`${origin}:${i + 1}: expected NAME=value`, "");
     const name = line.slice(0, eq).trim();
-    if (name === "") throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(`${origin}:${i + 1}: empty variable name`, "");
+    if (name === "") throw new (0, _chunkNHJJUTADcjs.ConfigError)(`${origin}:${i + 1}: empty variable name`, "");
     if (!name.startsWith(prefix)) continue;
     checkName(name, origin, i + 1);
     const value = dotEnvValue(line.slice(eq + 1).replace(/^[ \t]+/, ""), origin, i + 1, name);
     pairs.push([toPath(name.slice(prefix.length)), value]);
   }
-  return _chunkPCAMDXJ4cjs.fromMap.call(void 0, _chunkL3D2RE2Ucjs.nestPairs.call(void 0, pairs), origin);
+  return _chunkSDGXLF4Gcjs.fromMap.call(void 0, _chunkNHJJUTADcjs.nestPairs.call(void 0, pairs), origin);
 }
 function toPath(name) {
   const segs = name.split(SEPARATOR).map(asciiLower);
   if (segs.some((s) => s === "")) {
-    throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(`env: "${name}" produces an empty path segment`, name);
+    throw new (0, _chunkNHJJUTADcjs.ConfigError)(`env: "${name}" produces an empty path segment`, name);
   }
-  if (_chunkL3D2RE2Ucjs.tooDeep.call(void 0, segs.length)) {
-    throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
-      `env: "${name}" maps to a path ${segs.length} segments deep, over the limit of ${_chunkL3D2RE2Ucjs.MAX_PATH_SEGMENTS}`,
+  if (_chunkNHJJUTADcjs.tooDeep.call(void 0, segs.length)) {
+    throw new (0, _chunkNHJJUTADcjs.ConfigError)(
+      `env: "${name}" maps to a path ${segs.length} segments deep, over the limit of ${_chunkNHJJUTADcjs.MAX_PATH_SEGMENTS}`,
       name
     );
   }
@@ -77,7 +77,7 @@ function asciiLower(s) {
 }
 function dotEnvValue(v, origin, line, name) {
   const fail = (msg) => {
-    throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(`${origin}:${line}: ${name}: ${msg}`, name);
+    throw new (0, _chunkNHJJUTADcjs.ConfigError)(`${origin}:${line}: ${name}: ${msg}`, name);
   };
   if (v.startsWith("'")) {
     const end = v.indexOf("'", 1);
@@ -123,7 +123,7 @@ function checkName(name, origin, line) {
   const bad = /\p{White_Space}|#/u.exec(name);
   if (bad) {
     const what = bad[0] === "#" ? "'#'" : "whitespace";
-    throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+    throw new (0, _chunkNHJJUTADcjs.ConfigError)(
       `${origin}:${line}: variable name "${name}" contains ${what}; the line is not NAME=value (spec F1.7)`,
       name
     );

package/dist/adapters/env.js

@@ -1,6 +1,6 @@
 import {
   fromMap
-} from "../chunk-YRNDXYGQ.js";
+} from "../chunk-SZ7MDLYZ.js";
 import {
   ConfigError,
   MAX_PATH_SEGMENTS,
@@ -8,7 +8,7 @@ import {
   pathKey,
   stripBom,
   tooDeep
-} from "../chunk-GOXMKYWS.js";
+} from "../chunk-5PV3HO2V.js";
 
 // src/adapters/env.ts
 var SEPARATOR = "__";

package/dist/adapters/json5.cjs

@@ -1,27 +1,27 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkPCAMDXJ4cjs = require('../chunk-PCAMDXJ4.cjs');
+var _chunkSDGXLF4Gcjs = require('../chunk-SDGXLF4G.cjs');
 
 
 
 
 
-var _chunkL3D2RE2Ucjs = require('../chunk-L3D2RE2U.cjs');
+var _chunkNHJJUTADcjs = require('../chunk-NHJJUTAD.cjs');
 
 // src/adapters/json5.ts
 function parseJson5(input, originDescription) {
-  const p = new Parser(_chunkL3D2RE2Ucjs.stripBom.call(void 0, input), originDescription);
-  const doc = _chunkL3D2RE2Ucjs.guardStackDepth.call(void 0, 
+  const p = new Parser(_chunkNHJJUTADcjs.stripBom.call(void 0, input), originDescription);
+  const doc = _chunkNHJJUTADcjs.guardStackDepth.call(void 0, 
     () => p.parseDocument(),
-    (msg) => _chunkL3D2RE2Ucjs.depthError.call(void 0, `json5: ${describe(originDescription)}: ${msg}`)
+    (msg) => _chunkNHJJUTADcjs.depthError.call(void 0, `json5: ${describe(originDescription)}: ${msg}`)
   );
   if (doc === null || typeof doc !== "object" || Array.isArray(doc)) {
-    throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+    throw new (0, _chunkNHJJUTADcjs.ConfigError)(
       `json5: ${describe(originDescription)}: document root is ${rootKind(doc)}, but a config root must be an object (spec F0.3)`,
       ""
     );
   }
-  return _chunkPCAMDXJ4cjs.fromMap.call(void 0, doc, originDescription);
+  return _chunkSDGXLF4Gcjs.fromMap.call(void 0, doc, originDescription);
 }
 function describe(origin) {
   return origin === void 0 || origin === "" ? "document" : origin;
@@ -95,7 +95,7 @@ var Parser = class {
   }
   errf(msg) {
     const col = [...this.src.slice(this.lineAt, this.pos)].length + 1;
-    return new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+    return new (0, _chunkNHJJUTADcjs.ConfigError)(
       `json5: ${describe(this.origin)}: line ${this.line + 1} col ${col}: ${msg}`,
       ""
     );

package/dist/adapters/json5.js

@@ -1,12 +1,12 @@
 import {
   fromMap
-} from "../chunk-YRNDXYGQ.js";
+} from "../chunk-SZ7MDLYZ.js";
 import {
   ConfigError,
   depthError,
   guardStackDepth,
   stripBom
-} from "../chunk-GOXMKYWS.js";
+} from "../chunk-5PV3HO2V.js";
 
 // src/adapters/json5.ts
 function parseJson5(input, originDescription) {

package/dist/adapters/jsonc.cjs

@@ -1,26 +1,26 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkPCAMDXJ4cjs = require('../chunk-PCAMDXJ4.cjs');
+var _chunkSDGXLF4Gcjs = require('../chunk-SDGXLF4G.cjs');
 
 
 
 
 
-var _chunkL3D2RE2Ucjs = require('../chunk-L3D2RE2U.cjs');
+var _chunkNHJJUTADcjs = require('../chunk-NHJJUTAD.cjs');
 
 // src/adapters/jsonc.ts
 function parseJsonc(input, originDescription) {
-  const doc = _chunkL3D2RE2Ucjs.guardStackDepth.call(void 0, 
-    () => JSON.parse(stripTrailingCommas(stripComments(_chunkL3D2RE2Ucjs.stripBom.call(void 0, input))), bigIntReviver),
-    (msg) => _chunkL3D2RE2Ucjs.depthError.call(void 0, `jsonc: ${msg}`)
+  const doc = _chunkNHJJUTADcjs.guardStackDepth.call(void 0, 
+    () => JSON.parse(stripTrailingCommas(stripComments(_chunkNHJJUTADcjs.stripBom.call(void 0, input))), bigIntReviver),
+    (msg) => _chunkNHJJUTADcjs.depthError.call(void 0, `jsonc: ${msg}`)
   );
   if (doc === null || typeof doc !== "object" || Array.isArray(doc)) {
-    throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+    throw new (0, _chunkNHJJUTADcjs.ConfigError)(
       `jsonc: document root is ${Array.isArray(doc) ? "an array" : typeof doc}, but a config root must be an object (spec F0.3)`,
       ""
     );
   }
-  return _chunkPCAMDXJ4cjs.fromMap.call(void 0, doc, originDescription);
+  return _chunkSDGXLF4Gcjs.fromMap.call(void 0, doc, originDescription);
 }
 function isIntegerLiteral(source) {
   return !/[.eE]/.test(source);
@@ -38,7 +38,7 @@ function bigIntReviver(key, value, context) {
   const source = _optionalChain([context, 'optionalAccess', _2 => _2.source]);
   if (source === void 0) {
     if (!Number.isInteger(value)) return value;
-    throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+    throw new (0, _chunkNHJJUTADcjs.ConfigError)(
       `jsonc: the integer at "${key || "<root>"}" needs more precision than a JS number holds, and this runtime does not expose JSON.parse source text (${HAS_SOURCE_TEXT_ACCESS ? "unexpected \u2014 the capability probe said otherwise" : "requires Node >= 22 or an engine with JSON.parse source access"}), so it cannot be read losslessly (spec F0.5)`,
       key
     );
@@ -82,7 +82,7 @@ function stripComments(src) {
     }
     if (c === "/" && src[i + 1] === "*") {
       const end = src.indexOf("*/", i + 2);
-      if (end === -1) throw new (0, _chunkL3D2RE2Ucjs.ConfigError)("jsonc: unterminated block comment", "");
+      if (end === -1) throw new (0, _chunkNHJJUTADcjs.ConfigError)("jsonc: unterminated block comment", "");
       out += lineBreaksOf(src.slice(i, end + 2)) || " ";
       i = end + 2;
       continue;
@@ -97,7 +97,7 @@ function endOfString(src, i) {
     if (src[j] === "\\") j++;
     else if (src[j] === '"') return j + 1;
   }
-  throw new (0, _chunkL3D2RE2Ucjs.ConfigError)("jsonc: unterminated string literal", "");
+  throw new (0, _chunkNHJJUTADcjs.ConfigError)("jsonc: unterminated string literal", "");
 }
 function stripTrailingCommas(src) {
   let out = "";

package/dist/adapters/jsonc.js

@@ -1,12 +1,12 @@
 import {
   fromMap
-} from "../chunk-YRNDXYGQ.js";
+} from "../chunk-SZ7MDLYZ.js";
 import {
   ConfigError,
   depthError,
   guardStackDepth,
   stripBom
-} from "../chunk-GOXMKYWS.js";
+} from "../chunk-5PV3HO2V.js";
 
 // src/adapters/jsonc.ts
 function parseJsonc(input, originDescription) {

package/dist/adapters/properties.cjs

@@ -1,13 +1,13 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkPCAMDXJ4cjs = require('../chunk-PCAMDXJ4.cjs');
+var _chunkSDGXLF4Gcjs = require('../chunk-SDGXLF4G.cjs');
 
 
-var _chunkL3D2RE2Ucjs = require('../chunk-L3D2RE2U.cjs');
+var _chunkNHJJUTADcjs = require('../chunk-NHJJUTAD.cjs');
 
 // src/adapters/properties.ts
 function parsePropertiesConfig(input, originDescription) {
-  return _chunkPCAMDXJ4cjs.fromMap.call(void 0, _chunkL3D2RE2Ucjs.parseProperties.call(void 0, input), originDescription);
+  return _chunkSDGXLF4Gcjs.fromMap.call(void 0, _chunkNHJJUTADcjs.parseProperties.call(void 0, input), originDescription);
 }
 
 

package/dist/adapters/properties.js

@@ -1,9 +1,9 @@
 import {
   fromMap
-} from "../chunk-YRNDXYGQ.js";
+} from "../chunk-SZ7MDLYZ.js";
 import {
   parseProperties
-} from "../chunk-GOXMKYWS.js";
+} from "../chunk-5PV3HO2V.js";
 
 // src/adapters/properties.ts
 function parsePropertiesConfig(input, originDescription) {

package/dist/adapters/toml.cjs

@@ -1,21 +1,21 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkPCAMDXJ4cjs = require('../chunk-PCAMDXJ4.cjs');
+var _chunkSDGXLF4Gcjs = require('../chunk-SDGXLF4G.cjs');
 
 
 
 
 
-var _chunkL3D2RE2Ucjs = require('../chunk-L3D2RE2U.cjs');
+var _chunkNHJJUTADcjs = require('../chunk-NHJJUTAD.cjs');
 
 // src/adapters/toml.ts
 var _smoltoml = require('smol-toml');
 function parseTomlConfig(input, originDescription) {
-  const doc = _smoltoml.parse.call(void 0, _chunkL3D2RE2Ucjs.stripBom.call(void 0, input));
-  return _chunkPCAMDXJ4cjs.fromMap.call(void 0, 
-    _chunkL3D2RE2Ucjs.guardStackDepth.call(void 0, 
+  const doc = _smoltoml.parse.call(void 0, _chunkNHJJUTADcjs.stripBom.call(void 0, input));
+  return _chunkSDGXLF4Gcjs.fromMap.call(void 0, 
+    _chunkNHJJUTADcjs.guardStackDepth.call(void 0, 
       () => convert(doc, ""),
-      (msg) => _chunkL3D2RE2Ucjs.depthError.call(void 0, `toml: ${msg}`)
+      (msg) => _chunkNHJJUTADcjs.depthError.call(void 0, `toml: ${msg}`)
     ),
     originDescription
   );
@@ -33,7 +33,7 @@ function convert(v, atPath) {
     );
   }
   if (typeof v === "number" && !Number.isFinite(v)) {
-    throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+    throw new (0, _chunkNHJJUTADcjs.ConfigError)(
       `toml: ${v} at "${atPath}" is not representable in HOCON (spec F0.6)`,
       atPath
     );

package/dist/adapters/toml.js

@@ -1,12 +1,12 @@
 import {
   fromMap
-} from "../chunk-YRNDXYGQ.js";
+} from "../chunk-SZ7MDLYZ.js";
 import {
   ConfigError,
   depthError,
   guardStackDepth,
   stripBom
-} from "../chunk-GOXMKYWS.js";
+} from "../chunk-5PV3HO2V.js";
 
 // src/adapters/toml.ts
 import { parse as parseToml } from "smol-toml";

package/dist/adapters/yaml.cjs

@@ -1,43 +1,43 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkPCAMDXJ4cjs = require('../chunk-PCAMDXJ4.cjs');
+var _chunkSDGXLF4Gcjs = require('../chunk-SDGXLF4G.cjs');
 
 
 
 
 
-var _chunkL3D2RE2Ucjs = require('../chunk-L3D2RE2U.cjs');
+var _chunkNHJJUTADcjs = require('../chunk-NHJJUTAD.cjs');
 
 // src/adapters/yaml.ts
 var _yaml = require('yaml'); var _yaml2 = _interopRequireDefault(_yaml);
 function parseYaml(input, originDescription) {
-  const docs = _yaml2.default.parseAllDocuments(_chunkL3D2RE2Ucjs.stripBom.call(void 0, input), { version: "1.2", merge: true, intAsBigInt: true });
+  const docs = _yaml2.default.parseAllDocuments(_chunkNHJJUTADcjs.stripBom.call(void 0, input), { version: "1.2", merge: true, intAsBigInt: true });
   if (docs.length > 1) {
-    throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+    throw new (0, _chunkNHJJUTADcjs.ConfigError)(
       "yaml: multi-document streams are not supported (spec F5.7); a config is one document",
       ""
     );
   }
   const doc = docs[0];
-  if (doc === void 0) return _chunkPCAMDXJ4cjs.fromMap.call(void 0, {}, originDescription);
+  if (doc === void 0) return _chunkSDGXLF4Gcjs.fromMap.call(void 0, {}, originDescription);
   if (doc.errors.length > 0) {
-    throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(`yaml: ${_nullishCoalesce(_optionalChain([doc, 'access', _ => _.errors, 'access', _2 => _2[0], 'optionalAccess', _3 => _3.message]), () => ( "parse error"))}`, "");
+    throw new (0, _chunkNHJJUTADcjs.ConfigError)(`yaml: ${_nullishCoalesce(_optionalChain([doc, 'access', _ => _.errors, 'access', _2 => _2[0], 'optionalAccess', _3 => _3.message]), () => ( "parse error"))}`, "");
   }
   return fromYamlValue(doc.toJS({ mapAsMap: true }), originDescription);
 }
 function fromYamlValue(value, originDescription) {
-  if (value === null || value === void 0) return _chunkPCAMDXJ4cjs.fromMap.call(void 0, {}, originDescription);
-  const normalized = _chunkL3D2RE2Ucjs.guardStackDepth.call(void 0, 
+  if (value === null || value === void 0) return _chunkSDGXLF4Gcjs.fromMap.call(void 0, {}, originDescription);
+  const normalized = _chunkNHJJUTADcjs.guardStackDepth.call(void 0, 
     () => convert(value, ""),
-    (msg) => _chunkL3D2RE2Ucjs.depthError.call(void 0, `yaml: ${msg}`)
+    (msg) => _chunkNHJJUTADcjs.depthError.call(void 0, `yaml: ${msg}`)
   );
   if (typeof normalized !== "object" || normalized === null || Array.isArray(normalized)) {
-    throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+    throw new (0, _chunkNHJJUTADcjs.ConfigError)(
       `yaml: document root is ${Array.isArray(normalized) ? "an array" : typeof normalized}, but a config root must be an object (spec F0.3)`,
       ""
     );
   }
-  return _chunkPCAMDXJ4cjs.fromMap.call(void 0, normalized, originDescription);
+  return _chunkSDGXLF4Gcjs.fromMap.call(void 0, normalized, originDescription);
 }
 function convert(v, atPath) {
   if (Array.isArray(v)) return v.map((e, i) => convert(e, `${atPath}[${i}]`));
@@ -49,14 +49,14 @@ function convert(v, atPath) {
     const seen = /* @__PURE__ */ new Map();
     for (const [k, e] of v) {
       if (k !== null && typeof k === "object") {
-        throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+        throw new (0, _chunkNHJJUTADcjs.ConfigError)(
           `yaml: a collection key at "${atPath}" is not usable as an object key (spec F5.3)`,
           atPath
         );
       }
       const key = String(k);
       if (seen.has(key)) {
-        throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+        throw new (0, _chunkNHJJUTADcjs.ConfigError)(
           `yaml: sibling mapping keys ${keyForm(seen.get(key))} and ${keyForm(k)} both give the key "${key}"${atPath === "" ? "" : ` at "${atPath}"`}; rename one of them, because one of the two values would otherwise be lost. Quoting a non-string key helps only where that changes the key text, as 0x10 does and 1 does not (spec F5.3)`,
           atPath
         );
@@ -77,7 +77,7 @@ function convert(v, atPath) {
     );
   }
   if (typeof v === "number" && !Number.isFinite(v)) {
-    throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+    throw new (0, _chunkNHJJUTADcjs.ConfigError)(
       `yaml: ${v} at "${atPath}" is not representable in HOCON (spec F0.6)`,
       atPath
     );

package/dist/adapters/yaml.js

@@ -1,12 +1,12 @@
 import {
   fromMap
-} from "../chunk-YRNDXYGQ.js";
+} from "../chunk-SZ7MDLYZ.js";
 import {
   ConfigError,
   depthError,
   guardStackDepth,
   stripBom
-} from "../chunk-GOXMKYWS.js";
+} from "../chunk-5PV3HO2V.js";
 
 // src/adapters/yaml.ts
 import YAML from "yaml";

package/dist/{chunk-GOXMKYWS.js → chunk-5PV3HO2V.js}

@@ -265,6 +265,19 @@ function readBytes(text, outputUnit) {
   if (value < 0) return { ok: false, problem: "negative" };
   return { ok: true, value };
 }
+function namesMagnitudeUnit(text) {
+  const split = splitUnitText(text);
+  return split !== void 0 && split.unit !== "";
+}
+function namesPeriodUnit(text) {
+  return splitPeriodText(text).unit !== "";
+}
+function splitPeriodText(text) {
+  const trimmed = trimHoconWs(text);
+  let i = 0;
+  while (i < trimmed.length && "+-0123456789".includes(trimmed[i])) i++;
+  return { digits: trimmed.slice(0, i), unit: trimHoconWs(trimmed.slice(i)) };
+}
 var PERIOD_UNITS = /* @__PURE__ */ new Map([
   ["", { field: "days", factor: 1 }],
   ["d", { field: "days", factor: 1 }],
@@ -284,11 +297,9 @@ var PERIOD_UNITS = /* @__PURE__ */ new Map([
 var I32_MIN = -(2 ** 31);
 var I32_MAX = 2 ** 31 - 1;
 function readPeriod(text) {
-  const trimmed = trimHoconWs(text);
-  let i = 0;
-  while (i < trimmed.length && "+-0123456789".includes(trimmed[i])) i++;
-  const digits = trimmed.slice(0, i);
-  const unit = PERIOD_UNITS.get(trimHoconWs(trimmed.slice(i)));
+  const split = splitPeriodText(text);
+  const digits = split.digits;
+  const unit = PERIOD_UNITS.get(split.unit);
   if (!/^[+-]?\d+$/.test(digits) || unit === void 0) return { ok: false, problem: "invalid" };
   const n = Number(digits) * unit.factor;
   if (n < I32_MIN || n > I32_MAX) return { ok: false, problem: "invalid" };
@@ -3775,6 +3786,8 @@ export {
   coerceNumber,
   readDuration,
   readBytes,
+  namesMagnitudeUnit,
+  namesPeriodUnit,
   readPeriod,
   ParseError,
   ResolveError,

package/dist/{chunk-OUPKYWL3.cjs → chunk-CPM55MMQ.cjs}

@@ -11,7 +11,7 @@
 
 
 
-var _chunkL3D2RE2Ucjs = require('./chunk-L3D2RE2U.cjs');
+var _chunkNHJJUTADcjs = require('./chunk-NHJJUTAD.cjs');
 
 // src/parse.ts
 var _fs = require('fs'); var fs = _interopRequireWildcard(_fs);
@@ -34,11 +34,11 @@ async function defaultReadFile(filePath) {
   return fs.promises.readFile(filePath, "utf-8");
 }
 function buildResolveContext(input, opts) {
-  const tokens = _chunkL3D2RE2Ucjs.tokenize.call(void 0, input);
-  const ast = _chunkL3D2RE2Ucjs.parseTokens.call(void 0, tokens);
+  const tokens = _chunkNHJJUTADcjs.tokenize.call(void 0, input);
+  const ast = _chunkNHJJUTADcjs.parseTokens.call(void 0, tokens);
   if (ast.kind === "array") {
     const origin = _nullishCoalesce(opts.originDescription, () => ( "input"));
-    throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+    throw new (0, _chunkNHJJUTADcjs.ConfigError)(
       `${origin}: ${ast.pos.line}:${ast.pos.col}: document has type array rather than object at file root (HOCON.md L989-991); the Config API requires an object root`,
       ""
     );
@@ -59,22 +59,22 @@ function parse(input, opts = {}) {
 }
 var parseString = parse;
 function parseStringWithOptions(input, opts = {}) {
-  return _chunkL3D2RE2Ucjs.guardStackDepth.call(void 0, 
+  return _chunkNHJJUTADcjs.guardStackDepth.call(void 0, 
     () => parseStringInner(input, opts),
-    (msg) => new (0, _chunkL3D2RE2Ucjs.ParseError)(msg, 1, 1, opts.originDescription)
+    (msg) => new (0, _chunkNHJJUTADcjs.ParseError)(msg, 1, 1, opts.originDescription)
   );
 }
 function parseStringInner(input, opts) {
   const resolveSubstitutions = _nullishCoalesce(opts.resolveSubstitutions, () => ( true));
   const { ast, resolveOpts } = buildResolveContext(input, opts);
   if (resolveSubstitutions) {
-    const value = _chunkL3D2RE2Ucjs.resolve.call(void 0, ast, resolveOpts);
+    const value = _chunkNHJJUTADcjs.resolve.call(void 0, ast, resolveOpts);
     if (value.kind !== "object") throw new Error("resolved value is not an object");
-    return new (0, _chunkL3D2RE2Ucjs.Config)(value, { resolved: true, originDescription: opts.originDescription });
+    return new (0, _chunkNHJJUTADcjs.Config)(value, { resolved: true, originDescription: opts.originDescription });
   }
-  const tree = _chunkL3D2RE2Ucjs.buildTree.call(void 0, ast, resolveOpts);
-  const hasPlaceholders = _chunkL3D2RE2Ucjs.containsPlaceholders.call(void 0, tree);
-  return _chunkL3D2RE2Ucjs.Config._fromUnresolvedResObj(tree, {
+  const tree = _chunkNHJJUTADcjs.buildTree.call(void 0, ast, resolveOpts);
+  const hasPlaceholders = _chunkNHJJUTADcjs.containsPlaceholders.call(void 0, tree);
+  return _chunkNHJJUTADcjs.Config._fromUnresolvedResObj(tree, {
     parseBaseDir: opts.baseDir,
     originDescription: opts.originDescription,
     resolved: !hasPlaceholders,
@@ -95,22 +95,22 @@ function parseFileWithOptions(filePath, opts = {}) {
   });
 }
 async function parseAsync(input, opts = {}) {
-  return _chunkL3D2RE2Ucjs.guardStackDepthAsync.call(void 0, 
+  return _chunkNHJJUTADcjs.guardStackDepthAsync.call(void 0, 
     () => parseStringInnerAsync(input, opts),
-    (msg) => new (0, _chunkL3D2RE2Ucjs.ParseError)(msg, 1, 1, opts.originDescription)
+    (msg) => new (0, _chunkNHJJUTADcjs.ParseError)(msg, 1, 1, opts.originDescription)
   );
 }
 async function parseStringInnerAsync(input, opts) {
   const resolveSubstitutions = _nullishCoalesce(opts.resolveSubstitutions, () => ( true));
   const { ast, resolveOpts } = buildResolveContext(input, opts);
   if (resolveSubstitutions) {
-    const value = await _chunkL3D2RE2Ucjs.resolveAsync.call(void 0, ast, resolveOpts);
+    const value = await _chunkNHJJUTADcjs.resolveAsync.call(void 0, ast, resolveOpts);
     if (value.kind !== "object") throw new Error("resolved value is not an object");
-    return new (0, _chunkL3D2RE2Ucjs.Config)(value, { resolved: true, originDescription: opts.originDescription });
+    return new (0, _chunkNHJJUTADcjs.Config)(value, { resolved: true, originDescription: opts.originDescription });
   }
-  const tree = await _chunkL3D2RE2Ucjs.buildTreeAsync.call(void 0, ast, resolveOpts);
-  const hasPlaceholders = _chunkL3D2RE2Ucjs.containsPlaceholders.call(void 0, tree);
-  return _chunkL3D2RE2Ucjs.Config._fromUnresolvedResObj(tree, {
+  const tree = await _chunkNHJJUTADcjs.buildTreeAsync.call(void 0, ast, resolveOpts);
+  const hasPlaceholders = _chunkNHJJUTADcjs.containsPlaceholders.call(void 0, tree);
+  return _chunkNHJJUTADcjs.Config._fromUnresolvedResObj(tree, {
     parseBaseDir: opts.baseDir,
     originDescription: opts.originDescription,
     resolved: !hasPlaceholders,

package/dist/{chunk-JVABBNF5.js → chunk-ITRXT66R.js}

@@ -11,7 +11,7 @@ import {
   resolve,
   resolveAsync,
   tokenize
-} from "./chunk-GOXMKYWS.js";
+} from "./chunk-5PV3HO2V.js";
 
 // src/parse.ts
 import * as fs from "fs";