smol-toml 1.1.2 → 1.1.4

package/dist/extract.js

@@ -71,7 +71,18 @@ export function extractValue(str, ptr, end) {
     let endPtr;
     if (c === '"' || c === "'") {
         endPtr = getStringEnd(str, ptr);
-        return [parseString(str, ptr, endPtr), endPtr + +(!!end && str[endPtr] === ',')];
+        let parsed = parseString(str, ptr, endPtr);
+        if (end) {
+            endPtr = skipVoid(str, endPtr, end !== ']');
+            if (str[endPtr] && str[endPtr] !== ',' && str[endPtr] !== end && str[endPtr] !== '\n' && str[endPtr] !== '\r') {
+                throw new TomlError('unexpected character encountered', {
+                    toml: str,
+                    ptr: endPtr,
+                });
+            }
+            endPtr += (+(str[endPtr] === ','));
+        }
+        return [parsed, endPtr];
     }
     endPtr = skipUntil(str, ptr, ',', end);
     let slice = sliceAndTrimEndOf(str, ptr, endPtr - (+(str[endPtr - 1] === ',')), end === ']');

package/dist/parse.js

@@ -39,7 +39,7 @@ function peekTable(key, table, meta, type) {
         if (i) {
             t = hasOwn ? t[k] : (t[k] = {});
             m = (state = m[k]).c;
-            if (type === 0 /* Type.DOTTED */ && state.t === 1 /* Type.EXPLICIT */) {
+            if (type === 0 /* Type.DOTTED */ && (state.t === 1 /* Type.EXPLICIT */ || state.t === 2 /* Type.ARRAY */)) {
                 return null;
             }
             if (state.t === 2 /* Type.ARRAY */) {
@@ -59,7 +59,7 @@ function peekTable(key, table, meta, type) {
             }
             m[k] = {
                 t: i < key.length - 1 && type === 2 /* Type.ARRAY */
-                    ? 0 /* Type.DOTTED */
+                    ? 3 /* Type.ARRAY_DOTTED */
                     : type,
                 d: false,
                 i: 0,
@@ -68,7 +68,7 @@ function peekTable(key, table, meta, type) {
         }
     }
     state = m[k];
-    if (state.t !== type) {
+    if (state.t !== type && !(type === 1 /* Type.EXPLICIT */ && state.t === 3 /* Type.ARRAY_DOTTED */)) {
         // Bad key type!
         return null;
     }

package/dist/stringify.js

@@ -41,7 +41,7 @@ function isArrayOfTables(obj) {
         if (extendedTypeOf(obj[i]) !== 'object')
             return false;
     }
-    return true;
+    return obj.length != 0;
 }
 function formatString(s) {
     return JSON.stringify(s).replace(/\x7f/g, '\\u007f');
@@ -76,8 +76,10 @@ function stringifyValue(val, type = extendedTypeOf(val)) {
     }
 }
 function stringifyInlineTable(obj) {
-    let res = '{ ';
     let keys = Object.keys(obj);
+    if (keys.length === 0)
+        return '{}';
+    let res = '{ ';
     for (let i = 0; i < keys.length; i++) {
         let k = keys[i];
         if (i)
@@ -89,6 +91,8 @@ function stringifyInlineTable(obj) {
     return res + ' }';
 }
 function stringifyArray(array) {
+    if (array.length === 0)
+        return '[]';
     let res = '[ ';
     for (let i = 0; i < array.length; i++) {
         if (i)

package/dist/util.d.ts

@@ -32,5 +32,5 @@ export type TomlPrimitive = string | number | boolean | TomlDate | {
 export declare function indexOfNewline(str: string, start?: number, end?: number): number;
 export declare function skipComment(str: string, ptr: number): number;
 export declare function skipVoid(str: string, ptr: number, banNewLines?: boolean, banComments?: boolean): number;
-export declare function skipUntil(str: string, ptr: number, sep: string, end?: string): number;
+export declare function skipUntil(str: string, ptr: number, sep: string, end?: string, banNewLines?: boolean): number;
 export declare function getStringEnd(str: string, seek: number): number;

package/dist/util.js

@@ -56,7 +56,7 @@ export function skipVoid(str, ptr, banNewLines, banComments) {
         ? ptr
         : skipVoid(str, skipComment(str, ptr), banNewLines);
 }
-export function skipUntil(str, ptr, sep, end) {
+export function skipUntil(str, ptr, sep, end, banNewLines = false) {
     if (!end) {
         ptr = indexOfNewline(str, ptr);
         return ptr < 0 ? str.length : ptr;
@@ -72,6 +72,9 @@ export function skipUntil(str, ptr, sep, end) {
         else if (c === end) {
             return i;
         }
+        else if (banNewLines && (c === '\n' || c === '\r' && str[i + 1] === '\n')) {
+            return i;
+        }
     }
     throw new TomlError('cannot find end of structure', {
         toml: str,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "smol-toml",
-	"version": "1.1.2",
+	"version": "1.1.4",
 	"keywords": [
 		"toml",
 		"parser",
@@ -24,14 +24,13 @@
 	"devDependencies": {
 		"@iarna/toml": "3.0.0",
 		"@ltd/j-toml": "^1.38.0",
-		"@tsconfig/esm": "^1.0.3",
-		"@tsconfig/node-lts": "^18.12.1",
-		"@tsconfig/strictest": "^2.0.1",
-		"@types/node": "^20.1.0",
-		"@vitest/ui": "^0.31.0",
+		"@tsconfig/node-lts": "^20.1.1",
+		"@tsconfig/strictest": "^2.0.2",
+		"@types/node": "^20.11.5",
+		"@vitest/ui": "^1.2.1",
 		"fast-toml": "^0.5.4",
-		"typescript": "^5.0.4",
-		"vitest": "^0.31.0"
+		"typescript": "^5.3.3",
+		"vitest": "^1.2.1"
 	},
 	"exports": {
 		".": {