@o3co/ts.hocon 1.14.1 → 1.14.3

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";

package/dist/{chunk-L3D2RE2U.cjs → chunk-NHJJUTAD.cjs}

@@ -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" };
@@ -3798,4 +3809,6 @@ function completeJsonNumber(raw) {
 
 
 
-exports.coerceBoolean = coerceBoolean; exports.coerceNumber = coerceNumber; exports.readDuration = readDuration; exports.readBytes = readBytes; exports.readPeriod = readPeriod; exports.ParseError = ParseError; exports.ResolveError = ResolveError; exports.PackageLookupError = PackageLookupError; exports.ConfigError = ConfigError; exports.NotResolvedError = NotResolvedError; exports.tokenize = tokenize; exports.parseTokens = parseTokens; exports.stripBom = stripBom; exports.MAX_PATH_SEGMENTS = MAX_PATH_SEGMENTS; exports.tooDeep = tooDeep; exports.guardStackDepth = guardStackDepth; exports.depthError = depthError; exports.guardStackDepthAsync = guardStackDepthAsync; exports.parseProperties = parseProperties; exports.nestPairs = nestPairs; exports.pathKey = pathKey; exports.buildTree = buildTree; exports.buildTreeAsync = buildTreeAsync; exports.containsPlaceholders = containsPlaceholders; exports.resolve = resolve2; exports.resolveAsync = resolveAsync; exports.Config = Config;
+
+
+exports.coerceBoolean = coerceBoolean; exports.coerceNumber = coerceNumber; exports.readDuration = readDuration; exports.readBytes = readBytes; exports.namesMagnitudeUnit = namesMagnitudeUnit; exports.namesPeriodUnit = namesPeriodUnit; exports.readPeriod = readPeriod; exports.ParseError = ParseError; exports.ResolveError = ResolveError; exports.PackageLookupError = PackageLookupError; exports.ConfigError = ConfigError; exports.NotResolvedError = NotResolvedError; exports.tokenize = tokenize; exports.parseTokens = parseTokens; exports.stripBom = stripBom; exports.MAX_PATH_SEGMENTS = MAX_PATH_SEGMENTS; exports.tooDeep = tooDeep; exports.guardStackDepth = guardStackDepth; exports.depthError = depthError; exports.guardStackDepthAsync = guardStackDepthAsync; exports.parseProperties = parseProperties; exports.nestPairs = nestPairs; exports.pathKey = pathKey; exports.buildTree = buildTree; exports.buildTreeAsync = buildTreeAsync; exports.containsPlaceholders = containsPlaceholders; exports.resolve = resolve2; exports.resolveAsync = resolveAsync; exports.Config = Config;

package/dist/{chunk-PCAMDXJ4.cjs → chunk-SDGXLF4G.cjs}

@@ -3,20 +3,20 @@
 
 
 
-var _chunkL3D2RE2Ucjs = require('./chunk-L3D2RE2U.cjs');
+var _chunkNHJJUTADcjs = require('./chunk-NHJJUTAD.cjs');
 
 // src/value-factory.ts
 function fromMap(values, originDescription) {
-  const fields = _chunkL3D2RE2Ucjs.guardStackDepth.call(void 0, 
+  const fields = _chunkNHJJUTADcjs.guardStackDepth.call(void 0, 
     () => coerceObject(values, ""),
-    (msg) => _chunkL3D2RE2Ucjs.depthError.call(void 0, `fromMap: ${msg}`)
+    (msg) => _chunkNHJJUTADcjs.depthError.call(void 0, `fromMap: ${msg}`)
   );
   const root = { kind: "object", fields };
-  return _chunkL3D2RE2Ucjs.Config._fromResolvedValue(root, { originDescription });
+  return _chunkNHJJUTADcjs.Config._fromResolvedValue(root, { originDescription });
 }
 function empty(originDescription) {
   const root = { kind: "object", fields: /* @__PURE__ */ new Map() };
-  return _chunkL3D2RE2Ucjs.Config._fromResolvedValue(root, { originDescription });
+  return _chunkNHJJUTADcjs.Config._fromResolvedValue(root, { originDescription });
 }
 var INT64_MAX = 9223372036854775807n;
 var INT64_MIN = -9223372036854775808n;
@@ -33,7 +33,7 @@ function coerceValue(v, atPath) {
     return { kind: "scalar", raw: "null", valueType: "null" };
   }
   if (v === void 0) {
-    throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+    throw new (0, _chunkNHJJUTADcjs.ConfigError)(
       `fromMap: undefined is not a valid HOCON value at path "${atPath}"`,
       atPath
     );
@@ -43,7 +43,7 @@ function coerceValue(v, atPath) {
       return { kind: "scalar", raw: v, valueType: "string" };
     case "number": {
       if (Number.isNaN(v) || !Number.isFinite(v)) {
-        throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+        throw new (0, _chunkNHJJUTADcjs.ConfigError)(
           `fromMap: ${v} is not representable in HOCON (NaN/Infinity not allowed) at path "${atPath}"`,
           atPath
         );
@@ -54,7 +54,7 @@ function coerceValue(v, atPath) {
       return { kind: "scalar", raw: v ? "true" : "false", valueType: "boolean" };
     case "bigint": {
       if (v > INT64_MAX || v < INT64_MIN) {
-        throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+        throw new (0, _chunkNHJJUTADcjs.ConfigError)(
           `fromMap: integer ${v} is out of int64 range (HOCON integers are int64; spec F0.5) at path "${atPath}"`,
           atPath
         );
@@ -70,7 +70,7 @@ function coerceValue(v, atPath) {
       return { kind: "object", fields };
     }
     default:
-      throw new (0, _chunkL3D2RE2Ucjs.ConfigError)(
+      throw new (0, _chunkNHJJUTADcjs.ConfigError)(
         `fromMap: unsupported value type "${typeof v}" at path "${atPath}"`,
         atPath
       );

package/dist/{chunk-YRNDXYGQ.js → chunk-SZ7MDLYZ.js}

@@ -3,7 +3,7 @@ import {
   ConfigError,
   depthError,
   guardStackDepth
-} from "./chunk-GOXMKYWS.js";
+} from "./chunk-5PV3HO2V.js";
 
 // src/value-factory.ts
 function fromMap(values, originDescription) {

package/dist/index.cjs

@@ -8,11 +8,11 @@
 
 
 
-var _chunkOUPKYWL3cjs = require('./chunk-OUPKYWL3.cjs');
+var _chunkCPM55MMQcjs = require('./chunk-CPM55MMQ.cjs');
 
 
 
-var _chunkPCAMDXJ4cjs = require('./chunk-PCAMDXJ4.cjs');
+var _chunkSDGXLF4Gcjs = require('./chunk-SDGXLF4G.cjs');
 
 
 
@@ -22,17 +22,17 @@ var _chunkPCAMDXJ4cjs = require('./chunk-PCAMDXJ4.cjs');
 
 
 
-var _chunkL3D2RE2Ucjs = require('./chunk-L3D2RE2U.cjs');
+var _chunkNHJJUTADcjs = require('./chunk-NHJJUTAD.cjs');
 
 // src/value.ts
 function asString(v) {
   return v.kind === "scalar" && v.valueType === "string" ? v.raw : void 0;
 }
 function asNumber(v) {
-  return v.kind === "scalar" ? _chunkL3D2RE2Ucjs.coerceNumber.call(void 0, v.raw) : void 0;
+  return v.kind === "scalar" ? _chunkNHJJUTADcjs.coerceNumber.call(void 0, v.raw) : void 0;
 }
 function asBoolean(v) {
-  return v.kind === "scalar" ? _chunkL3D2RE2Ucjs.coerceBoolean.call(void 0, v.raw) : void 0;
+  return v.kind === "scalar" ? _chunkNHJJUTADcjs.coerceBoolean.call(void 0, v.raw) : void 0;
 }
 function asObject(v) {
   return v.kind === "object" ? v.fields : void 0;
@@ -79,4 +79,4 @@ function isNull(v) {
 
 
 
-exports.Config = _chunkL3D2RE2Ucjs.Config; exports.ConfigError = _chunkL3D2RE2Ucjs.ConfigError; exports.NotResolvedError = _chunkL3D2RE2Ucjs.NotResolvedError; exports.PackageLookupError = _chunkL3D2RE2Ucjs.PackageLookupError; exports.ParseError = _chunkL3D2RE2Ucjs.ParseError; exports.ResolveError = _chunkL3D2RE2Ucjs.ResolveError; exports.asArray = asArray; exports.asBoolean = asBoolean; exports.asNumber = asNumber; exports.asObject = asObject; exports.asString = asString; exports.defaultParseOptions = _chunkOUPKYWL3cjs.defaultParseOptions; exports.defaultResolveOptions = _chunkOUPKYWL3cjs.defaultResolveOptions; exports.empty = _chunkPCAMDXJ4cjs.empty; exports.fromMap = _chunkPCAMDXJ4cjs.fromMap; exports.isArray = isArray; exports.isNull = isNull; exports.isObject = isObject; exports.isScalar = isScalar; exports.parse = _chunkOUPKYWL3cjs.parse; exports.parseAsync = _chunkOUPKYWL3cjs.parseAsync; exports.parseFile = _chunkOUPKYWL3cjs.parseFile; exports.parseFileAsync = _chunkOUPKYWL3cjs.parseFileAsync; exports.parseFileWithOptions = _chunkOUPKYWL3cjs.parseFileWithOptions; exports.parseString = _chunkOUPKYWL3cjs.parseString; exports.parseStringWithOptions = _chunkOUPKYWL3cjs.parseStringWithOptions;
+exports.Config = _chunkNHJJUTADcjs.Config; exports.ConfigError = _chunkNHJJUTADcjs.ConfigError; exports.NotResolvedError = _chunkNHJJUTADcjs.NotResolvedError; exports.PackageLookupError = _chunkNHJJUTADcjs.PackageLookupError; exports.ParseError = _chunkNHJJUTADcjs.ParseError; exports.ResolveError = _chunkNHJJUTADcjs.ResolveError; exports.asArray = asArray; exports.asBoolean = asBoolean; exports.asNumber = asNumber; exports.asObject = asObject; exports.asString = asString; exports.defaultParseOptions = _chunkCPM55MMQcjs.defaultParseOptions; exports.defaultResolveOptions = _chunkCPM55MMQcjs.defaultResolveOptions; exports.empty = _chunkSDGXLF4Gcjs.empty; exports.fromMap = _chunkSDGXLF4Gcjs.fromMap; exports.isArray = isArray; exports.isNull = isNull; exports.isObject = isObject; exports.isScalar = isScalar; exports.parse = _chunkCPM55MMQcjs.parse; exports.parseAsync = _chunkCPM55MMQcjs.parseAsync; exports.parseFile = _chunkCPM55MMQcjs.parseFile; exports.parseFileAsync = _chunkCPM55MMQcjs.parseFileAsync; exports.parseFileWithOptions = _chunkCPM55MMQcjs.parseFileWithOptions; exports.parseString = _chunkCPM55MMQcjs.parseString; exports.parseStringWithOptions = _chunkCPM55MMQcjs.parseStringWithOptions;

package/dist/index.js

@@ -8,11 +8,11 @@ import {
   parseFileWithOptions,
   parseString,
   parseStringWithOptions
-} from "./chunk-JVABBNF5.js";
+} from "./chunk-ITRXT66R.js";
 import {
   empty,
   fromMap
-} from "./chunk-YRNDXYGQ.js";
+} from "./chunk-SZ7MDLYZ.js";
 import {
   Config,
   ConfigError,
@@ -22,7 +22,7 @@ import {
   ResolveError,
   coerceBoolean,
   coerceNumber
-} from "./chunk-GOXMKYWS.js";
+} from "./chunk-5PV3HO2V.js";
 
 // src/value.ts
 function asString(v) {

package/dist/zod.cjs

@@ -1,14 +1,16 @@
 "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 _chunkOUPKYWL3cjs = require('./chunk-OUPKYWL3.cjs');
+var _chunkCPM55MMQcjs = require('./chunk-CPM55MMQ.cjs');
 
 
 
 
 
 
-var _chunkL3D2RE2Ucjs = require('./chunk-L3D2RE2U.cjs');
+
+
+var _chunkNHJJUTADcjs = require('./chunk-NHJJUTAD.cjs');
 
 // src/zod.ts
 var _zod2 = require('zod');
@@ -27,8 +29,11 @@ function parseValue(value, schema) {
   let result;
   try {
     result = schema.safeParse(coerced);
-  } catch (e) {
-    throw new _zod2.z.ZodError(refused);
+  } catch (err) {
+    if (err instanceof _zod2.z.core.$ZodAsyncError || _optionalChain([err, 'optionalAccess', _ => _.constructor, 'optionalAccess', _2 => _2.name]) === "$ZodAsyncError") {
+      throw new _zod2.z.ZodError(refused);
+    }
+    throw err;
   }
   if (result.success) throw new _zod2.z.ZodError(refused);
   throw new _zod2.z.ZodError([...refused, ...withoutPrototypeKeyIssues(result.error.issues)]);
@@ -60,7 +65,7 @@ function dropPrototypeKeys(value, path, issues) {
   }
   return kept;
 }
-function unitMarker(what, read) {
+function unitMarker(what, read, namesUnit) {
   return _zod2.z.transform((input, ctx) => {
     if (typeof input !== "string" && typeof input !== "number") {
       ctx.issues.push({ code: "custom", message: `expected ${what}, got ${describeInput(input)}`, input });
@@ -68,16 +73,18 @@ function unitMarker(what, read) {
     }
     const text = typeof input === "string" ? input : String(input);
     const reading = read(text);
+    if (reading.ok && namesUnit !== void 0 && (typeof input === "number" || !namesUnit(text))) {
+      pushProblem(ctx, what, "missing-unit", input);
+      return _zod2.z.NEVER;
+    }
     if (reading.ok) return reading.value;
-    ctx.issues.push({
-      code: "custom",
-      message: unitProblemMessage(what, reading.problem),
-      input,
-      params: { problem: reading.problem }
-    });
+    pushProblem(ctx, what, reading.problem, input);
     return _zod2.z.NEVER;
   });
 }
+function pushProblem(ctx, what, problem, input) {
+  ctx.issues.push({ code: "custom", message: unitProblemMessage(what, problem), input, params: { problem } });
+}
 function unitProblemMessage(what, problem) {
   switch (problem) {
     case "invalid":
@@ -86,6 +93,8 @@ function unitProblemMessage(what, problem) {
       return `${what} must be non-negative`;
     case "overflow":
       return `${what} overflows the representable range`;
+    case "missing-unit":
+      return `${what} must name its unit`;
   }
 }
 function describeInput(input) {
@@ -100,9 +109,10 @@ var hocon = {
    * significant digits than a double holds can read differently: the getter
    * reads its text, the marker its JS value (`1.0000000000000001` in `us`:
    * 1000.0000000000001 through the getter, 1000 here).
+   * `options.requireUnit` refuses a value that does not name its unit (#233).
    */
-  duration(unit) {
-    return unitMarker("duration", (text) => _chunkL3D2RE2Ucjs.readDuration.call(void 0, text, unit));
+  duration(unit, options) {
+    return unitMarker("duration", (text) => _chunkNHJJUTADcjs.readDuration.call(void 0, text, unit), requireUnit(options, _chunkNHJJUTADcjs.namesMagnitudeUnit));
   },
   /**
    * A byte size, read as {@link Config.getBytes} reads it (default unit `B`),
@@ -110,47 +120,52 @@ var hocon = {
    * significant digits than a double holds can read differently: the getter
    * reads its text, the marker its JS value (`1.99999999999999999`: 1 through
    * the getter, 2 here).
+   * `options.requireUnit` refuses a value that does not name its unit (#233).
    */
-  bytes(unit) {
-    return unitMarker("byte size", (text) => _chunkL3D2RE2Ucjs.readBytes.call(void 0, text, unit));
+  bytes(unit, options) {
+    return unitMarker("byte size", (text) => _chunkNHJJUTADcjs.readBytes.call(void 0, text, unit), requireUnit(options, _chunkNHJJUTADcjs.namesMagnitudeUnit));
   },
   /**
    * A calendar period, read as {@link Config.getPeriod} reads it (a bare
    * integer is days), except that a number literal with a decimal point or in
    * exponent form (`7.0`, `1e2`) can read differently: the getter refuses it,
    * the marker reads the JS number.
+   * `options.requireUnit` refuses a value that does not name its unit (#233).
    */
-  period() {
-    return unitMarker("period", _chunkL3D2RE2Ucjs.readPeriod);
+  period(options) {
+    return unitMarker("period", _chunkNHJJUTADcjs.readPeriod, requireUnit(options, _chunkNHJJUTADcjs.namesPeriodUnit));
   }
 };
+function requireUnit(options, namesUnit) {
+  return _optionalChain([options, 'optionalAccess', _3 => _3.requireUnit]) === true ? namesUnit : void 0;
+}
 function getDefType(schema) {
   const zod = schema._zod;
-  return _optionalChain([zod, 'optionalAccess', _ => _.def, 'optionalAccess', _2 => _2.type]);
+  return _optionalChain([zod, 'optionalAccess', _4 => _4.def, 'optionalAccess', _5 => _5.type]);
 }
 function getDef(schema) {
-  return _optionalChain([schema, 'access', _3 => _3._zod, 'optionalAccess', _4 => _4.def]);
+  return _optionalChain([schema, 'access', _6 => _6._zod, 'optionalAccess', _7 => _7.def]);
 }
 function getInnerSchema(schema) {
-  const def = _optionalChain([schema, 'access', _5 => _5._zod, 'optionalAccess', _6 => _6.def]);
-  return _nullishCoalesce(_optionalChain([def, 'optionalAccess', _7 => _7.innerType]), () => ( _optionalChain([def, 'optionalAccess', _8 => _8.schema])));
+  const def = _optionalChain([schema, 'access', _8 => _8._zod, 'optionalAccess', _9 => _9.def]);
+  return _nullishCoalesce(_optionalChain([def, 'optionalAccess', _10 => _10.innerType]), () => ( _optionalChain([def, 'optionalAccess', _11 => _11.schema])));
 }
 function getObjectShape(schema) {
-  const shape = _optionalChain([schema, 'access', _9 => _9._zod, 'optionalAccess', _10 => _10.def, 'optionalAccess', _11 => _11.shape]);
+  const shape = _optionalChain([schema, 'access', _12 => _12._zod, 'optionalAccess', _13 => _13.def, 'optionalAccess', _14 => _14.shape]);
   return typeof shape === "object" && shape !== null ? shape : void 0;
 }
 function getPropValues(schema) {
-  return _optionalChain([schema, 'access', _12 => _12._zod, 'optionalAccess', _13 => _13.propValues]);
+  return _optionalChain([schema, 'access', _15 => _15._zod, 'optionalAccess', _16 => _16.propValues]);
 }
 function getArrayElement(schema) {
-  return _optionalChain([schema, 'access', _14 => _14._zod, 'optionalAccess', _15 => _15.def, 'optionalAccess', _16 => _16.element]);
+  return _optionalChain([schema, 'access', _17 => _17._zod, 'optionalAccess', _18 => _18.def, 'optionalAccess', _19 => _19.element]);
 }
 function parseWithSchema(input, schema, opts) {
-  const config = _chunkOUPKYWL3cjs.parse.call(void 0, input, opts);
+  const config = _chunkCPM55MMQcjs.parse.call(void 0, input, opts);
   return validate(config, schema);
 }
 function parseFileWithSchema(filePath, schema, opts) {
-  const config = _chunkOUPKYWL3cjs.parseFile.call(void 0, filePath, opts);
+  const config = _chunkCPM55MMQcjs.parseFile.call(void 0, filePath, opts);
   return validate(config, schema);
 }
 function coerceValue(value, schema) {
@@ -160,18 +175,22 @@ function coerceValue(value, schema) {
   switch (defType) {
     case "boolean":
       if (typeof value === "string") {
-        const coerced = _chunkL3D2RE2Ucjs.coerceBoolean.call(void 0, value);
+        const coerced = _chunkNHJJUTADcjs.coerceBoolean.call(void 0, value);
         return coerced !== void 0 ? coerced : value;
       }
       return value;
     case "number":
       if (typeof value === "string") {
-        const coerced = _chunkL3D2RE2Ucjs.coerceNumber.call(void 0, value);
+        const coerced = _chunkNHJJUTADcjs.coerceNumber.call(void 0, value);
         return coerced !== void 0 ? coerced : value;
       }
       return value;
+    case "enum": {
+      const values = schema._zod.values;
+      return coerceToLiteral(value, values);
+    }
     case "literal": {
-      const values = _optionalChain([getDef, 'call', _17 => _17(schema), 'optionalAccess', _18 => _18.values]);
+      const values = _optionalChain([getDef, 'call', _20 => _20(schema), 'optionalAccess', _21 => _21.values]);
       return values ? coerceToLiteral(value, new Set(values)) : value;
     }
     case "object": {
@@ -185,8 +204,23 @@ function coerceValue(value, schema) {
           result[key] = coerceValue(obj[key], shape[key]);
         }
       }
+      const catchall = _optionalChain([getDef, 'call', _22 => _22(schema), 'optionalAccess', _23 => _23.catchall]);
+      if (catchall) {
+        for (const key of Object.keys(obj)) {
+          if (!Object.prototype.hasOwnProperty.call(shape, key)) result[key] = coerceValue(obj[key], catchall);
+        }
+      }
       return result;
     }
+    case "intersection": {
+      if (accepts(schema, value)) return value;
+      const def = getDef(schema);
+      const forLeft = coerceValue(value, def.left);
+      if (accepts(schema, forLeft)) return forLeft;
+      const forRight = coerceValue(value, def.right);
+      if (accepts(schema, forRight)) return forRight;
+      return coerceValue(forLeft, def.right);
+    }
     case "array": {
       if (!Array.isArray(value)) return value;
       const elementSchema = getArrayElement(schema);
@@ -195,7 +229,7 @@ function coerceValue(value, schema) {
     }
     case "record": {
       if (typeof value !== "object" || Array.isArray(value)) return value;
-      const valueSchema = _optionalChain([getDef, 'call', _19 => _19(schema), 'optionalAccess', _20 => _20.valueType]);
+      const valueSchema = _optionalChain([getDef, 'call', _24 => _24(schema), 'optionalAccess', _25 => _25.valueType]);
       if (!valueSchema) return value;
       const result = {};
       for (const [key, item] of Object.entries(value)) result[key] = coerceValue(item, valueSchema);
@@ -204,8 +238,8 @@ function coerceValue(value, schema) {
     case "tuple": {
       if (!Array.isArray(value)) return value;
       const def = getDef(schema);
-      const items = _nullishCoalesce(_optionalChain([def, 'optionalAccess', _21 => _21.items]), () => ( []));
-      const rest = _optionalChain([def, 'optionalAccess', _22 => _22.rest]);
+      const items = _nullishCoalesce(_optionalChain([def, 'optionalAccess', _26 => _26.items]), () => ( []));
+      const rest = _optionalChain([def, 'optionalAccess', _27 => _27.rest]);
       return value.map((item, i) => {
         const itemSchema = i < items.length ? items[i] : rest;
         return itemSchema ? coerceValue(item, itemSchema) : item;
@@ -214,11 +248,11 @@ function coerceValue(value, schema) {
     case "union":
       return coerceUnion(value, schema);
     case "pipe": {
-      const input = _optionalChain([getDef, 'call', _23 => _23(schema), 'optionalAccess', _24 => _24.in]);
+      const input = _optionalChain([getDef, 'call', _28 => _28(schema), 'optionalAccess', _29 => _29.in]);
       return input ? coerceValue(value, input) : value;
     }
     case "lazy": {
-      const getter = _optionalChain([getDef, 'call', _25 => _25(schema), 'optionalAccess', _26 => _26.getter]);
+      const getter = _optionalChain([getDef, 'call', _30 => _30(schema), 'optionalAccess', _31 => _31.getter]);
       return getter ? coerceValue(value, getter()) : value;
     }
     case "optional":
@@ -226,6 +260,7 @@ function coerceValue(value, schema) {
     case "default":
     case "prefault":
     case "nonoptional":
+    case "success":
     case "catch":
     case "readonly": {
       const inner = getInnerSchema(schema);
@@ -237,13 +272,13 @@ function coerceValue(value, schema) {
 }
 function coerceUnion(value, schema) {
   const def = getDef(schema);
-  const options = _nullishCoalesce(_optionalChain([def, 'optionalAccess', _27 => _27.options]), () => ( []));
-  const discriminator = _optionalChain([def, 'optionalAccess', _28 => _28.discriminator]);
+  const options = _nullishCoalesce(_optionalChain([def, 'optionalAccess', _32 => _32.options]), () => ( []));
+  const discriminator = _optionalChain([def, 'optionalAccess', _33 => _33.discriminator]);
   if (discriminator !== void 0) {
     if (typeof value !== "object" || value === null || Array.isArray(value)) return value;
     const tag = Object.prototype.hasOwnProperty.call(value, discriminator) ? value[discriminator] : void 0;
-    const tagsOf = (o) => _optionalChain([getPropValues, 'call', _29 => _29(o), 'optionalAccess', _30 => _30[discriminator]]);
-    const option = _nullishCoalesce(options.find((o) => _optionalChain([tagsOf, 'call', _31 => _31(o), 'optionalAccess', _32 => _32.has, 'call', _33 => _33(tag)])), () => ( options.find((o) => {
+    const tagsOf = (o) => _optionalChain([getPropValues, 'call', _34 => _34(o), 'optionalAccess', _35 => _35[discriminator]]);
+    const option = _nullishCoalesce(options.find((o) => _optionalChain([tagsOf, 'call', _36 => _36(o), 'optionalAccess', _37 => _37.has, 'call', _38 => _38(tag)])), () => ( options.find((o) => {
       const tags = tagsOf(o);
       return tags !== void 0 && tags.has(coerceToLiteral(tag, tags));
     })));
@@ -258,16 +293,16 @@ function coerceUnion(value, schema) {
 }
 function coerceToLiteral(value, literals) {
   if (typeof value !== "string" || literals.has(value)) return value;
-  const n = _chunkL3D2RE2Ucjs.coerceNumber.call(void 0, value);
+  const n = _chunkNHJJUTADcjs.coerceNumber.call(void 0, value);
   if (n !== void 0 && literals.has(n)) return n;
-  const b = _chunkL3D2RE2Ucjs.coerceBoolean.call(void 0, value);
+  const b = _chunkNHJJUTADcjs.coerceBoolean.call(void 0, value);
   if (b !== void 0 && literals.has(b)) return b;
   return value;
 }
 function accepts(schema, value) {
   try {
     return schema.safeParse(value).success;
-  } catch (e2) {
+  } catch (e) {
     return false;
   }
 }

package/dist/zod.d.cts

@@ -4,10 +4,12 @@ import { C as Config, D as DurationUnit, B as ByteUnit, b as Period, a as ParseO
 /**
  * The whole config, validated against `schema`. HOCON strings are coerced
  * where the schema expects a number or a boolean (`"8080"` → 8080), through
- * objects, arrays, records, tuples, unions, pipes (by their input schema), lazy
- * schemas and optional / nullable / default / prefault / nonoptional / catch /
- * readonly wrappers; a union coerces by the option that takes the value (see
- * the README). Unit values go through the {@link hocon} markers.
+ * objects (and their catchall), arrays, records, tuples, unions,
+ * intersections, pipes (by their input schema), lazy schemas, numeric literals
+ * and enums, and optional / nullable / default / prefault / nonoptional /
+ * success / catch / readonly wrappers; a union coerces by the option that
+ * takes the value (see the README). Unit values go through the {@link hocon}
+ * markers.
  *
  * An object key named `__proto__`, `constructor` or `prototype` anywhere in
  * the value is refused with a `ZodError` issue at the object that holds it
@@ -34,6 +36,18 @@ declare function validate<T>(config: Config, schema: ZodType<T>): T;
  * @throws `ZodError` when the value does not match the schema.
  */
 declare function getValidated<T>(config: Config, path: string, schema: ZodType<T>): T;
+/**
+ * Options for the {@link hocon} unit markers.
+ */
+interface UnitMarkerOptions {
+    /**
+     * Refuse a value that does not name its unit: a number (`ttl = 30`) or a
+     * string of the number alone (`"30"`, what an environment variable gives),
+     * which would otherwise read in the default unit (milliseconds, bytes, days).
+     * `30s`, `"30 s"`, `64KiB`, `2w` read as before. Default `false` (#233).
+     */
+    readonly requireUnit?: boolean;
+}
 /**
  * Zod schema markers for HOCON unit values. Each reads the forms the matching
  * Config getter reads and gives what the getter gives (a number in the
@@ -54,23 +68,26 @@ declare const hocon: {
      * significant digits than a double holds can read differently: the getter
      * reads its text, the marker its JS value (`1.0000000000000001` in `us`:
      * 1000.0000000000001 through the getter, 1000 here).
+     * `options.requireUnit` refuses a value that does not name its unit (#233).
      */
-    duration(unit?: DurationUnit): ZodTransform<number, unknown>;
+    duration(unit?: DurationUnit, options?: UnitMarkerOptions): ZodTransform<number, unknown>;
     /**
      * A byte size, read as {@link Config.getBytes} reads it (default unit `B`),
      * exponent forms included, except that a number literal with more
      * significant digits than a double holds can read differently: the getter
      * reads its text, the marker its JS value (`1.99999999999999999`: 1 through
      * the getter, 2 here).
+     * `options.requireUnit` refuses a value that does not name its unit (#233).
      */
-    bytes(unit?: ByteUnit): ZodTransform<number, unknown>;
+    bytes(unit?: ByteUnit, options?: UnitMarkerOptions): ZodTransform<number, unknown>;
     /**
      * A calendar period, read as {@link Config.getPeriod} reads it (a bare
      * integer is days), except that a number literal with a decimal point or in
      * exponent form (`7.0`, `1e2`) can read differently: the getter refuses it,
      * the marker reads the JS number.
+     * `options.requireUnit` refuses a value that does not name its unit (#233).
      */
-    period(): ZodTransform<Period, unknown>;
+    period(options?: UnitMarkerOptions): ZodTransform<Period, unknown>;
 };
 /**
  * Parse a HOCON string and {@link validate} it.
@@ -89,4 +106,4 @@ declare function parseWithSchema<T>(input: string, schema: ZodType<T>, opts?: Pa
  */
 declare function parseFileWithSchema<T>(filePath: string, schema: ZodType<T>, opts?: ParseOptions): T;
 
-export { getValidated, hocon, parseFileWithSchema, parseWithSchema, validate };
+export { type UnitMarkerOptions, getValidated, hocon, parseFileWithSchema, parseWithSchema, validate };