smol-toml 1.3.0 → 1.3.1

package/dist/extract.d.ts

@@ -26,4 +26,4 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 import { type TomlPrimitive } from './util.js';
-export declare function extractValue(str: string, ptr: number, end?: string): [TomlPrimitive, number];
+export declare function extractValue(str: string, ptr: number, end: string | undefined, depth: number): [TomlPrimitive, number];

package/dist/extract.js

@@ -50,12 +50,18 @@ function sliceAndTrimEndOf(str, startPtr, endPtr, allowNewLines) {
     }
     return [trimmed, commentIdx];
 }
-export function extractValue(str, ptr, end) {
+export function extractValue(str, ptr, end, depth) {
+    if (depth === 0) {
+        throw new TomlError('document contains excessively nested structures. aborting.', {
+            toml: str,
+            ptr: ptr
+        });
+    }
     let c = str[ptr];
     if (c === '[' || c === '{') {
         let [value, endPtr] = c === '['
-            ? parseArray(str, ptr)
-            : parseInlineTable(str, ptr);
+            ? parseArray(str, ptr, depth)
+            : parseInlineTable(str, ptr, depth);
         let newPtr = skipUntil(str, endPtr, ',', end);
         if (end === '}') {
             let nextNewLine = indexOfNewline(str, endPtr, newPtr);

package/dist/index.cjs

@@ -382,10 +382,16 @@ function sliceAndTrimEndOf(str, startPtr, endPtr, allowNewLines) {
   }
   return [trimmed, commentIdx];
 }
-function extractValue(str, ptr, end) {
+function extractValue(str, ptr, end, depth) {
+  if (depth === 0) {
+    throw new TomlError("document contains excessively nested structures. aborting.", {
+      toml: str,
+      ptr
+    });
+  }
   let c = str[ptr];
   if (c === "[" || c === "{") {
-    let [value, endPtr2] = c === "[" ? parseArray(str, ptr) : parseInlineTable(str, ptr);
+    let [value, endPtr2] = c === "[" ? parseArray(str, ptr, depth) : parseInlineTable(str, ptr, depth);
     let newPtr = skipUntil(str, endPtr2, ",", end);
     if (end === "}") {
       let nextNewLine = indexOfNewline(str, endPtr2, newPtr);
@@ -501,7 +507,7 @@ function parseKey(str, ptr, end = "=") {
   } while (dot + 1 && dot < endPtr);
   return [parsed, skipVoid(str, endPtr + 1, true, true)];
 }
-function parseInlineTable(str, ptr) {
+function parseInlineTable(str, ptr, depth) {
   let res = {};
   let seen = /* @__PURE__ */ new Set();
   let c;
@@ -548,7 +554,7 @@ function parseInlineTable(str, ptr) {
           ptr
         });
       }
-      let [value, valueEndPtr] = extractValue(str, keyEndPtr, "}");
+      let [value, valueEndPtr] = extractValue(str, keyEndPtr, "}", depth - 1);
       seen.add(value);
       t[k] = value;
       ptr = valueEndPtr;
@@ -569,7 +575,7 @@ function parseInlineTable(str, ptr) {
   }
   return [res, ptr];
 }
-function parseArray(str, ptr) {
+function parseArray(str, ptr, depth) {
   let res = [];
   let c;
   ptr++;
@@ -582,7 +588,7 @@ function parseArray(str, ptr) {
     } else if (c === "#")
       ptr = skipComment(str, ptr);
     else if (c !== " " && c !== "	" && c !== "\n" && c !== "\r") {
-      let e = extractValue(str, ptr - 1, "]");
+      let e = extractValue(str, ptr - 1, "]", depth - 1);
       res.push(e[0]);
       ptr = e[1];
     }
@@ -656,7 +662,8 @@ function peekTable(key, table, meta, type) {
   }
   return [k, t, state.c];
 }
-function parse(toml) {
+function parse(toml, opts) {
+  let maxDepth = opts?.maxDepth ?? 1e3;
   let res = {};
   let meta = {};
   let tbl = res;
@@ -705,7 +712,7 @@ function parse(toml) {
           ptr
         });
       }
-      let v = extractValue(toml, k[1]);
+      let v = extractValue(toml, k[1], void 0, maxDepth);
       p[1][p[0]] = v[0];
       ptr = v[1];
     }
@@ -743,7 +750,10 @@ function isArrayOfTables(obj) {
 function formatString(s) {
   return JSON.stringify(s).replace(/\x7f/g, "\\u007f");
 }
-function stringifyValue(val, type = extendedTypeOf(val)) {
+function stringifyValue(val, type, depth) {
+  if (depth === 0) {
+    throw new Error("Could not stringify the object: maximum object depth exceeded");
+  }
   if (type === "number") {
     if (isNaN(val))
       return "nan";
@@ -766,13 +776,13 @@ function stringifyValue(val, type = extendedTypeOf(val)) {
     return val.toISOString();
   }
   if (type === "object") {
-    return stringifyInlineTable(val);
+    return stringifyInlineTable(val, depth);
   }
   if (type === "array") {
-    return stringifyArray(val);
+    return stringifyArray(val, depth);
   }
 }
-function stringifyInlineTable(obj) {
+function stringifyInlineTable(obj, depth) {
   let keys = Object.keys(obj);
   if (keys.length === 0)
     return "{}";
@@ -783,11 +793,11 @@ function stringifyInlineTable(obj) {
       res += ", ";
     res += BARE_KEY.test(k) ? k : formatString(k);
     res += " = ";
-    res += stringifyValue(obj[k]);
+    res += stringifyValue(obj[k], extendedTypeOf(obj[k]), depth - 1);
   }
   return res + " }";
 }
-function stringifyArray(array) {
+function stringifyArray(array, depth) {
   if (array.length === 0)
     return "[]";
   let res = "[ ";
@@ -797,21 +807,27 @@ function stringifyArray(array) {
     if (array[i] === null || array[i] === void 0) {
       throw new TypeError("arrays cannot contain null or undefined values");
     }
-    res += stringifyValue(array[i]);
+    res += stringifyValue(array[i], extendedTypeOf(array[i]), depth - 1);
   }
   return res + " ]";
 }
-function stringifyArrayTable(array, key) {
+function stringifyArrayTable(array, key, depth) {
+  if (depth === 0) {
+    throw new Error("Could not stringify the object: maximum object depth exceeded");
+  }
   let res = "";
   for (let i = 0; i < array.length; i++) {
     res += `[[${key}]]
 `;
-    res += stringifyTable(array[i], key);
+    res += stringifyTable(array[i], key, depth);
     res += "\n\n";
   }
   return res;
 }
-function stringifyTable(obj, prefix = "") {
+function stringifyTable(obj, prefix, depth) {
+  if (depth === 0) {
+    throw new Error("Could not stringify the object: maximum object depth exceeded");
+  }
   let preamble = "";
   let tables = "";
   let keys = Object.keys(obj);
@@ -824,17 +840,17 @@ function stringifyTable(obj, prefix = "") {
       }
       let key = BARE_KEY.test(k) ? k : formatString(k);
       if (type === "array" && isArrayOfTables(obj[k])) {
-        tables += stringifyArrayTable(obj[k], prefix ? `${prefix}.${key}` : key);
+        tables += stringifyArrayTable(obj[k], prefix ? `${prefix}.${key}` : key, depth - 1);
       } else if (type === "object") {
         let tblKey = prefix ? `${prefix}.${key}` : key;
         tables += `[${tblKey}]
 `;
-        tables += stringifyTable(obj[k], tblKey);
+        tables += stringifyTable(obj[k], tblKey, depth - 1);
         tables += "\n\n";
       } else {
         preamble += key;
         preamble += " = ";
-        preamble += stringifyValue(obj[k], type);
+        preamble += stringifyValue(obj[k], type, depth);
         preamble += "\n";
       }
     }
@@ -842,11 +858,12 @@ function stringifyTable(obj, prefix = "") {
   return `${preamble}
 ${tables}`.trim();
 }
-function stringify(obj) {
+function stringify(obj, opts) {
   if (extendedTypeOf(obj) !== "object") {
     throw new TypeError("stringify can only be called with an object");
   }
-  return stringifyTable(obj);
+  let maxDepth = opts?.maxDepth ?? 1e3;
+  return stringifyTable(obj, "", maxDepth);
 }
 
 // dist/index.js

package/dist/parse.d.ts

@@ -26,4 +26,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 import { type TomlPrimitive } from './util.js';
-export declare function parse(toml: string): Record<string, TomlPrimitive>;
+export declare function parse(toml: string, opts?: {
+    maxDepth: number;
+}): Record<string, TomlPrimitive>;

package/dist/parse.js

@@ -93,7 +93,8 @@ function peekTable(key, table, meta, type) {
     }
     return [k, t, state.c];
 }
-export function parse(toml) {
+export function parse(toml, opts) {
+    let maxDepth = opts?.maxDepth ?? 1000;
     let res = {};
     let meta = {};
     let tbl = res;
@@ -131,7 +132,7 @@ export function parse(toml) {
                     ptr: ptr,
                 });
             }
-            let v = extractValue(toml, k[1]);
+            let v = extractValue(toml, k[1], void 0, maxDepth);
             p[1][p[0]] = v[0];
             ptr = v[1];
         }

package/dist/stringify.d.ts

@@ -25,4 +25,6 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-export declare function stringify(obj: any): string;
+export declare function stringify(obj: any, opts?: {
+    maxDepth?: number;
+}): string;

package/dist/stringify.js

@@ -25,7 +25,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-const BARE_KEY = /^[a-z0-9-_]+$/i;
+let BARE_KEY = /^[a-z0-9-_]+$/i;
 function extendedTypeOf(obj) {
     let type = typeof obj;
     if (type === 'object') {
@@ -46,7 +46,10 @@ function isArrayOfTables(obj) {
 function formatString(s) {
     return JSON.stringify(s).replace(/\x7f/g, '\\u007f');
 }
-function stringifyValue(val, type = extendedTypeOf(val)) {
+function stringifyValue(val, type, depth) {
+    if (depth === 0) {
+        throw new Error("Could not stringify the object: maximum object depth exceeded");
+    }
     if (type === 'number') {
         if (isNaN(val))
             return 'nan';
@@ -69,13 +72,13 @@ function stringifyValue(val, type = extendedTypeOf(val)) {
         return val.toISOString();
     }
     if (type === 'object') {
-        return stringifyInlineTable(val);
+        return stringifyInlineTable(val, depth);
     }
     if (type === 'array') {
-        return stringifyArray(val);
+        return stringifyArray(val, depth);
     }
 }
-function stringifyInlineTable(obj) {
+function stringifyInlineTable(obj, depth) {
     let keys = Object.keys(obj);
     if (keys.length === 0)
         return '{}';
@@ -86,11 +89,11 @@ function stringifyInlineTable(obj) {
             res += ', ';
         res += BARE_KEY.test(k) ? k : formatString(k);
         res += ' = ';
-        res += stringifyValue(obj[k]);
+        res += stringifyValue(obj[k], extendedTypeOf(obj[k]), depth - 1);
     }
     return res + ' }';
 }
-function stringifyArray(array) {
+function stringifyArray(array, depth) {
     if (array.length === 0)
         return '[]';
     let res = '[ ';
@@ -100,20 +103,26 @@ function stringifyArray(array) {
         if (array[i] === null || array[i] === void 0) {
             throw new TypeError('arrays cannot contain null or undefined values');
         }
-        res += stringifyValue(array[i]);
+        res += stringifyValue(array[i], extendedTypeOf(array[i]), depth - 1);
     }
     return res + ' ]';
 }
-function stringifyArrayTable(array, key) {
+function stringifyArrayTable(array, key, depth) {
+    if (depth === 0) {
+        throw new Error("Could not stringify the object: maximum object depth exceeded");
+    }
     let res = '';
     for (let i = 0; i < array.length; i++) {
         res += `[[${key}]]\n`;
-        res += stringifyTable(array[i], key);
+        res += stringifyTable(array[i], key, depth);
         res += '\n\n';
     }
     return res;
 }
-function stringifyTable(obj, prefix = '') {
+function stringifyTable(obj, prefix, depth) {
+    if (depth === 0) {
+        throw new Error("Could not stringify the object: maximum object depth exceeded");
+    }
     let preamble = '';
     let tables = '';
     let keys = Object.keys(obj);
@@ -126,27 +135,28 @@ function stringifyTable(obj, prefix = '') {
             }
             let key = BARE_KEY.test(k) ? k : formatString(k);
             if (type === 'array' && isArrayOfTables(obj[k])) {
-                tables += stringifyArrayTable(obj[k], prefix ? `${prefix}.${key}` : key);
+                tables += stringifyArrayTable(obj[k], prefix ? `${prefix}.${key}` : key, depth - 1);
             }
             else if (type === 'object') {
                 let tblKey = prefix ? `${prefix}.${key}` : key;
                 tables += `[${tblKey}]\n`;
-                tables += stringifyTable(obj[k], tblKey);
+                tables += stringifyTable(obj[k], tblKey, depth - 1);
                 tables += '\n\n';
             }
             else {
                 preamble += key;
                 preamble += ' = ';
-                preamble += stringifyValue(obj[k], type);
+                preamble += stringifyValue(obj[k], type, depth);
                 preamble += '\n';
             }
         }
     }
     return `${preamble}\n${tables}`.trim();
 }
-export function stringify(obj) {
+export function stringify(obj, opts) {
     if (extendedTypeOf(obj) !== 'object') {
         throw new TypeError('stringify can only be called with an object');
     }
-    return stringifyTable(obj);
+    let maxDepth = opts?.maxDepth ?? 1000;
+    return stringifyTable(obj, '', maxDepth);
 }

package/dist/struct.d.ts

@@ -27,5 +27,5 @@
  */
 import { type TomlPrimitive } from './util.js';
 export declare function parseKey(str: string, ptr: number, end?: string): [string[], number];
-export declare function parseInlineTable(str: string, ptr: number): [Record<string, TomlPrimitive>, number];
-export declare function parseArray(str: string, ptr: number): [TomlPrimitive[], number];
+export declare function parseInlineTable(str: string, ptr: number, depth: number): [Record<string, TomlPrimitive>, number];
+export declare function parseArray(str: string, ptr: number, depth: number): [TomlPrimitive[], number];

package/dist/struct.js

@@ -102,7 +102,7 @@ export function parseKey(str, ptr, end = '=') {
     } while (dot + 1 && dot < endPtr);
     return [parsed, skipVoid(str, endPtr + 1, true, true)];
 }
-export function parseInlineTable(str, ptr) {
+export function parseInlineTable(str, ptr, depth) {
     let res = {};
     let seen = new Set();
     let c;
@@ -152,7 +152,7 @@ export function parseInlineTable(str, ptr) {
                     ptr: ptr
                 });
             }
-            let [value, valueEndPtr] = extractValue(str, keyEndPtr, '}');
+            let [value, valueEndPtr] = extractValue(str, keyEndPtr, '}', depth - 1);
             seen.add(value);
             t[k] = value;
             ptr = valueEndPtr;
@@ -173,7 +173,7 @@ export function parseInlineTable(str, ptr) {
     }
     return [res, ptr];
 }
-export function parseArray(str, ptr) {
+export function parseArray(str, ptr, depth) {
     let res = [];
     let c;
     ptr++;
@@ -187,7 +187,7 @@ export function parseArray(str, ptr) {
         else if (c === '#')
             ptr = skipComment(str, ptr);
         else if (c !== ' ' && c !== '\t' && c !== '\n' && c !== '\r') {
-            let e = extractValue(str, ptr - 1, ']');
+            let e = extractValue(str, ptr - 1, ']', depth - 1);
             res.push(e[0]);
             ptr = e[1];
         }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "smol-toml",
 	"license": "BSD-3-Clause",
-	"version": "1.3.0",
+	"version": "1.3.1",
 	"description": "A small, fast, and correct TOML parser/serializer",
 	"author": "Cynthia <cyyynthia@borkenware.com>",
 	"repository": "github:squirrelchat/smol-toml",
@@ -13,7 +13,7 @@
 		"serializer"
 	],
 	"type": "module",
-	"packageManager": "pnpm@9.4.0",
+	"packageManager": "pnpm@9.12.3",
 	"engines": {
 		"node": ">= 18"
 	},
@@ -28,14 +28,14 @@
 	"devDependencies": {
 		"@iarna/toml": "3.0.0",
 		"@ltd/j-toml": "^1.38.0",
-		"@tsconfig/node-lts": "^20.1.3",
+		"@tsconfig/node-lts": "^22.0.0",
 		"@tsconfig/strictest": "^2.0.5",
-		"@types/node": "^20.14.10",
-		"@vitest/ui": "^2.0.3",
-		"esbuild": "^0.23.0",
+		"@types/node": "^22.9.0",
+		"@vitest/ui": "^2.1.5",
+		"esbuild": "^0.24.0",
 		"fast-toml": "^0.5.4",
-		"typescript": "^5.5.3",
-		"vitest": "^2.0.3"
+		"typescript": "^5.6.3",
+		"vitest": "^2.1.5"
 	},
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.js",