@o3co/ts.hocon 1.10.0 → 1.11.0

package/dist/zod.js

@@ -1,3 +1,10 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
 // src/coerce.ts
 var DECIMAL_NUMBER_RE = /^-?(?:\d+\.?\d*|\.\d+)(?:[eE][+-]?\d+)?$/;
 function isHoconWs(cp) {
@@ -643,6 +650,7 @@ function isFileNotFoundError(e) {
 // src/internal/resolver/include-loader.ts
 import { createRequire } from "module";
 import * as nodePath from "path";
+import { pathToFileURL } from "url";
 
 // src/internal/lexer/lexer.ts
 function isHoconWhitespace(ch) {
@@ -1485,25 +1493,39 @@ function parseTokens(tokens) {
   return new Parser(tokens).parse();
 }
 
+// src/internal/strip-bom.ts
+function stripBom(input) {
+  return input.charCodeAt(0) === 65279 ? input.slice(1) : input;
+}
+
 // src/internal/properties/properties.ts
 function parseProperties(input) {
   const pairs = [];
-  for (const { text, line } of logicalLines(input)) {
+  for (const { text, line } of logicalLines(stripBom(input))) {
     const [rawKey, rawValue] = splitKeyValue(text);
     const key = unescapeProps(rawKey, line);
     if (key === "") continue;
-    pairs.push([key, unescapeProps(rawValue, line)]);
+    pairs.push([key.split("."), unescapeProps(rawValue, line)]);
   }
   return nestPairs(pairs);
 }
 function nestPairs(pairs) {
   const root = /* @__PURE__ */ Object.create(null);
-  const sorted = [...pairs].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
-  for (const [key, value] of sorted) {
-    setNested(root, key.split("."), value);
+  const sorted = [...pairs].sort(([a], [b]) => compareSegments(a, b));
+  for (const [segments, value] of sorted) {
+    setNested(root, segments, value);
   }
   return root;
 }
+function compareSegments(a, b) {
+  const n = Math.min(a.length, b.length);
+  for (let i = 0; i < n; i++) {
+    const x = a[i];
+    const y = b[i];
+    if (x !== y) return x < y ? -1 : 1;
+  }
+  return a.length - b.length;
+}
 function logicalLines(input) {
   const natural = input.replace(/\r\n/g, "\n").replace(/\r/g, "\n").split("\n");
   const out = [];
@@ -1590,19 +1612,16 @@ function unescapeProps(s, line) {
   }
   return out;
 }
-var DANGEROUS_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
 function setNested(obj, segments, value) {
   let current = obj;
   for (let i = 0; i < segments.length - 1; i++) {
     const seg = segments[i];
-    if (seg === void 0 || DANGEROUS_KEYS.has(seg)) return;
     if (!(seg in current) || typeof current[seg] !== "object" || current[seg] === null) {
       current[seg] = /* @__PURE__ */ Object.create(null);
     }
     current = current[seg];
   }
   const last = segments[segments.length - 1];
-  if (last === void 0 || DANGEROUS_KEYS.has(last)) return;
   if (typeof current[last] === "object" && current[last] !== null) return;
   current[last] = value;
 }
@@ -1623,7 +1642,22 @@ function recordToHoconValue(obj) {
 }
 
 // src/internal/resolver/include-loader.ts
-var _require = createRequire(import.meta.url);
+var _require;
+function getRequire() {
+  if (_require === void 0) {
+    _require = pickRequire(
+      typeof __require === "function" ? __require : void 0,
+      import.meta.url
+    );
+  }
+  return _require;
+}
+function pickRequire(candidate, metaUrl) {
+  if (typeof candidate?.resolve === "function") {
+    return candidate;
+  }
+  return createRequire(metaUrl ?? pathToFileURL(nodePath.join(process.cwd(), "noop.js")));
+}
 function isPnpPath(p) {
   return p.includes(".yarn/cache") || p.includes(".pnp.cjs") || p.includes(".pnp.loader");
 }
@@ -1679,7 +1713,7 @@ function defaultPackageResolver(identifier, file, includingFile, baseDir, resolv
   const from = resolveFrom ? Array.isArray(resolveFrom) ? resolveFrom : [resolveFrom] : baseDir ? [baseDir] : includingFile ? [nodePath.dirname(includingFile)] : [process.cwd()];
   let resolved;
   try {
-    resolved = _require.resolve(`${identifier}/${file}`, { paths: from });
+    resolved = getRequire().resolve(`${identifier}/${file}`, { paths: from });
   } catch {
     throw new PackageLookupError(
       `include package("${identifier}", "${file}"): module not found (starting from: ${from.join(", ")})`,
@@ -2729,10 +2763,10 @@ var Config = class _Config {
     }
     if (v.kind === "object") {
       const converted = numericObjectToArray(v);
-      if (converted !== null) return converted.map(hoconToJs);
+      if (converted !== null) return converted.map((item) => hoconToJs(item));
     }
     if (v.kind !== "array") throw new ConfigError(`expected array at ${path2}`, path2);
-    return v.items.map(hoconToJs);
+    return v.items.map((item) => hoconToJs(item));
   }
   has(path2) {
     return this.lookupNode(path2) !== void 0;
@@ -2860,8 +2894,52 @@ var Config = class _Config {
       originDescription: this._originDescription
     });
   }
-  toObject() {
-    return hoconToJs(this.root);
+  /**
+   * The whole config as plain JS data: objects, arrays, strings, numbers,
+   * booleans and `null`.
+   *
+   * Keys are reproduced exactly as the config carries them, `__proto__`,
+   * `constructor` and `prototype` included: each is defined as an **own data
+   * property**, so the returned object's prototype is always
+   * `Object.prototype`, and this call writes nothing to the global one.
+   *
+   * ### Passing the result to other code
+   *
+   * A config file — especially a `.properties` file or an env namespace you
+   * merged in — can therefore hand you an own `__proto__` key, and what happens
+   * next depends entirely on how the consumer copies it:
+   *
+   * ```ts
+   * const data = cfg.toObject()
+   * { ...data }                  // safe — own properties are copied as data
+   * structuredClone(data)        // safe
+   * Object.assign({}, data)      // NOT safe — [[Set]] on the {} target hits
+   *                              // Object.prototype's __proto__ setter: the key
+   *                              // vanishes and config data becomes the result's
+   *                              // prototype
+   * deepMerge({}, data)          // NOT safe — a naive recursive merge reads
+   *                              // target['__proto__'], gets Object.prototype,
+   *                              // and writes to it: global pollution
+   * for (const k in data) …      // prefer Object.entries / Object.keys
+   * ```
+   *
+   * Those two hazards come from the **destination** object's prototype, so no
+   * option here can disarm them — copy with spread or `structuredClone` instead.
+   *
+   * What `{ nullPrototype: true }` does give you is a result that inherits
+   * nothing: every object comes back with a `null` prototype, so reading
+   * `x.__proto__`, `x.constructor` or `x.toString` yields config data or
+   * `undefined` rather than something from `Object.prototype`, and code that
+   * merges *into* this object cannot climb out of it. Keys are all still
+   * present. The trade-off is the usual one for prototype-less objects: not
+   * `instanceof Object`, and no `hasOwnProperty` of their own.
+   *
+   * Numbers follow the JS number model, so an integer wider than 2^53 rounds
+   * here even when the config holds it exactly — read those with
+   * {@link Config.getString} instead.
+   */
+  toObject(opts) {
+    return hoconToJs(this.root, opts?.nullPrototype === true);
   }
   /**
    * @internal Test-only: renders this resolved Config's value tree as canonical
@@ -2973,16 +3051,25 @@ function scalarToJs(raw, valueType) {
       return raw;
   }
 }
-function hoconToJs(v) {
+function hoconToJs(v, nullPrototype = false) {
   switch (v.kind) {
     case "scalar":
       return scalarToJs(v.raw, v.valueType);
     case "array":
-      return v.items.map(hoconToJs);
+      return v.items.map((item) => hoconToJs(item, nullPrototype));
     case "object": {
-      const obj = /* @__PURE__ */ Object.create(null);
-      for (const [k, val] of v.fields) obj[k] = hoconToJs(val);
-      return Object.assign({}, obj);
+      const entries = Array.from(v.fields, ([k, val]) => [k, hoconToJs(val, nullPrototype)]);
+      if (nullPrototype) {
+        const obj = /* @__PURE__ */ Object.create(null);
+        for (const [k, val] of entries) Object.defineProperty(obj, k, {
+          value: val,
+          writable: true,
+          enumerable: true,
+          configurable: true
+        });
+        return obj;
+      }
+      return Object.fromEntries(entries);
     }
   }
 }
@@ -3173,7 +3260,7 @@ function coerceValue(value, schema) {
       const obj = value;
       const result = { ...obj };
       for (const key of Object.keys(shape)) {
-        if (key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key)) {
           result[key] = coerceValue(obj[key], shape[key]);
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3co/ts.hocon",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "Full Lightbend HOCON spec-compliant parser and config library for TypeScript",
   "keywords": [
     "hocon",
@@ -13,39 +13,74 @@
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
     },
     "./zod": {
-      "types": "./dist/zod.d.ts",
-      "import": "./dist/zod.js",
-      "require": "./dist/zod.cjs"
+      "import": {
+        "types": "./dist/zod.d.ts",
+        "default": "./dist/zod.js"
+      },
+      "require": {
+        "types": "./dist/zod.d.cts",
+        "default": "./dist/zod.cjs"
+      }
     },
     "./adapters/properties": {
-      "types": "./dist/adapters/properties.d.ts",
-      "import": "./dist/adapters/properties.js",
-      "require": "./dist/adapters/properties.cjs"
+      "import": {
+        "types": "./dist/adapters/properties.d.ts",
+        "default": "./dist/adapters/properties.js"
+      },
+      "require": {
+        "types": "./dist/adapters/properties.d.cts",
+        "default": "./dist/adapters/properties.cjs"
+      }
     },
     "./adapters/env": {
-      "types": "./dist/adapters/env.d.ts",
-      "import": "./dist/adapters/env.js",
-      "require": "./dist/adapters/env.cjs"
+      "import": {
+        "types": "./dist/adapters/env.d.ts",
+        "default": "./dist/adapters/env.js"
+      },
+      "require": {
+        "types": "./dist/adapters/env.d.cts",
+        "default": "./dist/adapters/env.cjs"
+      }
     },
     "./adapters/jsonc": {
-      "types": "./dist/adapters/jsonc.d.ts",
-      "import": "./dist/adapters/jsonc.js",
-      "require": "./dist/adapters/jsonc.cjs"
+      "import": {
+        "types": "./dist/adapters/jsonc.d.ts",
+        "default": "./dist/adapters/jsonc.js"
+      },
+      "require": {
+        "types": "./dist/adapters/jsonc.d.cts",
+        "default": "./dist/adapters/jsonc.cjs"
+      }
     },
     "./adapters/toml": {
-      "types": "./dist/adapters/toml.d.ts",
-      "import": "./dist/adapters/toml.js",
-      "require": "./dist/adapters/toml.cjs"
+      "import": {
+        "types": "./dist/adapters/toml.d.ts",
+        "default": "./dist/adapters/toml.js"
+      },
+      "require": {
+        "types": "./dist/adapters/toml.d.cts",
+        "default": "./dist/adapters/toml.cjs"
+      }
     },
     "./adapters/yaml": {
-      "types": "./dist/adapters/yaml.d.ts",
-      "import": "./dist/adapters/yaml.js",
-      "require": "./dist/adapters/yaml.cjs"
+      "import": {
+        "types": "./dist/adapters/yaml.d.ts",
+        "default": "./dist/adapters/yaml.js"
+      },
+      "require": {
+        "types": "./dist/adapters/yaml.d.cts",
+        "default": "./dist/adapters/yaml.cjs"
+      }
     }
   },
   "main": "./dist/index.cjs",
@@ -95,6 +130,7 @@
   "bugs": "https://github.com/o3co/ts.hocon/issues",
   "scripts": {
     "build": "tsup",
+    "smoke": "tsup && node tools/smoke-entrypoints.mjs",
     "test": "vitest run",
     "test:watch": "vitest",
     "typecheck": "tsc --noEmit",