smol-toml 1.5.2 → 1.6.1

package/README.md

@@ -1,5 +1,5 @@
 # smol-toml
-[![TOML 1.0.0](https://img.shields.io/badge/TOML-1.0.0-9c4221?style=flat-square)](https://toml.io/en/v1.0.0)
+[![TOML 1.1.0](https://img.shields.io/badge/TOML-1.1.0-9c4221?style=flat-square)](https://toml.io/en/v1.1.0)
 [![License](https://img.shields.io/github/license/squirrelchat/smol-toml.svg?style=flat-square)](https://github.com/squirrelchat/smol-toml/blob/mistress/LICENSE)
 [![npm](https://img.shields.io/npm/v/smol-toml?style=flat-square)](https://npm.im/smol-toml)
 [![Build](https://img.shields.io/github/actions/workflow/status/squirrelchat/smol-toml/build.yaml?style=flat-square&logo=github)](https://github.com/squirrelchat/smol-toml/actions/workflows/build.yaml)
@@ -8,7 +8,7 @@
 [![Weekly downloads](https://img.shields.io/npm/dw/smol-toml?style=flat-square)](https://npm.im/smol-toml)
 [![Monthly downloads](https://img.shields.io/npm/dm/smol-toml?style=flat-square)](https://npm.im/smol-toml)
 
-A small, fast, and correct TOML parser and serializer. smol-toml is fully(ish) spec-compliant with TOML v1.0.0.
+A small, fast, and correct TOML parser and serializer. smol-toml is fully(ish) spec-compliant with TOML v1.1.0.
 
 Why yet another TOML parser? Well, the ecosystem of TOML parsers in JavaScript is quite underwhelming, most likely due
 to a lack of interest. With most parsers being outdated, unmaintained, non-compliant, or a combination of these, a new
@@ -144,8 +144,11 @@ const localTime = TomlDate.wrapAsLocalTime(jsDate)
 
 ## Performance
 > [!NOTE]
-> These benchmarks are starting to get a bit old. They will be updated in the (hopefully near) future to better
-> reflect numbers of the latest version of smol-toml on the latest version of Node.js.
+> These benchmarks are starting to get quite old and were ran prior to the release of TOML 1.1.0 which changed subtle
+> implementation details.
+>
+> They will be updated in the (hopefully near) future to better reflect numbers of the latest version of smol-toml
+> on the latest version of Node.js.
 
 A note on these performance numbers: in some highly synthetic tests, other parsers such as `fast-toml` greatly
 outperform other parsers, mostly due to their lack of compliance with the spec. For example, to parse a string,

package/dist/date.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.
  */
-let DATE_TIME_RE = /^(\d{4}-\d{2}-\d{2})?[T ]?(?:(\d{2}):\d{2}:\d{2}(?:\.\d+)?)?(Z|[-+]\d{2}:\d{2})?$/i;
+let DATE_TIME_RE = /^(\d{4}-\d{2}-\d{2})?[T ]?(?:(\d{2}):\d{2}(?::\d{2}(?:\.\d+)?)?)?(Z|[-+]\d{2}:\d{2})?$/i;
 export class TomlDate extends Date {
     #hasDate = false;
     #hasTime = false;

package/dist/extract.js

@@ -27,9 +27,9 @@
  */
 import { parseString, parseValue } from './primitive.js';
 import { parseArray, parseInlineTable } from './struct.js';
-import { indexOfNewline, skipVoid, skipUntil, skipComment, getStringEnd } from './util.js';
+import { skipVoid, skipUntil, skipComment, getStringEnd } from './util.js';
 import { TomlError } from './error.js';
-function sliceAndTrimEndOf(str, startPtr, endPtr, allowNewLines) {
+function sliceAndTrimEndOf(str, startPtr, endPtr) {
     let value = str.slice(startPtr, endPtr);
     let commentIdx = value.indexOf('#');
     if (commentIdx > -1) {
@@ -38,17 +38,7 @@ function sliceAndTrimEndOf(str, startPtr, endPtr, allowNewLines) {
         skipComment(str, commentIdx);
         value = value.slice(0, commentIdx);
     }
-    let trimmed = value.trimEnd();
-    if (!allowNewLines) {
-        let newlineIdx = value.indexOf('\n', trimmed.length);
-        if (newlineIdx > -1) {
-            throw new TomlError('newlines are not allowed in inline tables', {
-                toml: str,
-                ptr: startPtr + newlineIdx
-            });
-        }
-    }
-    return [trimmed, commentIdx];
+    return [value.trimEnd(), commentIdx];
 }
 export function extractValue(str, ptr, end, depth, integersAsBigInt) {
     if (depth === 0) {
@@ -62,24 +52,25 @@ export function extractValue(str, ptr, end, depth, integersAsBigInt) {
         let [value, endPtr] = c === '['
             ? parseArray(str, ptr, depth, integersAsBigInt)
             : parseInlineTable(str, ptr, depth, integersAsBigInt);
-        let newPtr = end ? skipUntil(str, endPtr, ',', end) : endPtr;
-        if (endPtr - newPtr && end === '}') {
-            let nextNewLine = indexOfNewline(str, endPtr, newPtr);
-            if (nextNewLine > -1) {
-                throw new TomlError('newlines are not allowed in inline tables', {
+        if (end) {
+            endPtr = skipVoid(str, endPtr);
+            if (str[endPtr] === ',')
+                endPtr++;
+            else if (str[endPtr] !== end) {
+                throw new TomlError('expected comma or end of structure', {
                     toml: str,
-                    ptr: nextNewLine
+                    ptr: endPtr,
                 });
             }
         }
-        return [value, newPtr];
+        return [value, endPtr];
     }
     let endPtr;
     if (c === '"' || c === "'") {
         endPtr = getStringEnd(str, ptr);
         let parsed = parseString(str, ptr, endPtr);
         if (end) {
-            endPtr = skipVoid(str, endPtr, end !== ']');
+            endPtr = skipVoid(str, endPtr);
             if (str[endPtr] && str[endPtr] !== ',' && str[endPtr] !== end && str[endPtr] !== '\n' && str[endPtr] !== '\r') {
                 throw new TomlError('unexpected character encountered', {
                     toml: str,
@@ -91,7 +82,7 @@ export function extractValue(str, ptr, end, depth, integersAsBigInt) {
         return [parsed, endPtr];
     }
     endPtr = skipUntil(str, ptr, ',', end);
-    let slice = sliceAndTrimEndOf(str, ptr, endPtr - (+(str[endPtr - 1] === ',')), end === ']');
+    let slice = sliceAndTrimEndOf(str, ptr, endPtr - (+(str[endPtr - 1] === ',')));
     if (!slice[0]) {
         throw new TomlError('incomplete key-value declaration: no value specified', {
             toml: str,

package/dist/index.cjs

@@ -99,9 +99,14 @@ function skipComment(str, ptr) {
 }
 function skipVoid(str, ptr, banNewLines, banComments) {
   let c;
-  while ((c = str[ptr]) === " " || c === "	" || !banNewLines && (c === "\n" || c === "\r" && str[ptr + 1] === "\n"))
-    ptr++;
-  return banComments || c !== "#" ? ptr : skipVoid(str, skipComment(str, ptr), banNewLines);
+  while (1) {
+    while ((c = str[ptr]) === " " || c === "	" || !banNewLines && (c === "\n" || c === "\r" && str[ptr + 1] === "\n"))
+      ptr++;
+    if (banComments || c !== "#")
+      break;
+    ptr = skipComment(str, ptr);
+  }
+  return ptr;
 }
 function skipUntil(str, ptr, sep, end, banNewLines = false) {
   if (!end) {
@@ -143,7 +148,7 @@ function getStringEnd(str, seek) {
 }
 
 // dist/date.js
-var DATE_TIME_RE = /^(\d{4}-\d{2}-\d{2})?[T ]?(?:(\d{2}):\d{2}:\d{2}(?:\.\d+)?)?(Z|[-+]\d{2}:\d{2})?$/i;
+var DATE_TIME_RE = /^(\d{4}-\d{2}-\d{2})?[T ]?(?:(\d{2}):\d{2}(?::\d{2}(?:\.\d+)?)?)?(Z|[-+]\d{2}:\d{2})?$/i;
 var TomlDate = class _TomlDate extends Date {
   #hasDate = false;
   #hasTime = false;
@@ -238,13 +243,14 @@ var TomlDate = class _TomlDate extends Date {
 var INT_REGEX = /^((0x[0-9a-fA-F](_?[0-9a-fA-F])*)|(([+-]|0[ob])?\d(_?\d)*))$/;
 var FLOAT_REGEX = /^[+-]?\d(_?\d)*(\.\d(_?\d)*)?([eE][+-]?\d(_?\d)*)?$/;
 var LEADING_ZERO = /^[+-]?0[0-9_]/;
-var ESCAPE_REGEX = /^[0-9a-f]{4,8}$/i;
+var ESCAPE_REGEX = /^[0-9a-f]{2,8}$/i;
 var ESC_MAP = {
   b: "\b",
   t: "	",
   n: "\n",
   f: "\f",
   r: "\r",
+  e: "\x1B",
   '"': '"',
   "\\": "\\"
 };
@@ -279,8 +285,8 @@ function parseString(str, ptr = 0, endPtr = str.length) {
     }
     if (isEscape) {
       isEscape = false;
-      if (c === "u" || c === "U") {
-        let code = str.slice(ptr, ptr += c === "u" ? 4 : 8);
+      if (c === "x" || c === "u" || c === "U") {
+        let code = str.slice(ptr, ptr += c === "x" ? 2 : c === "u" ? 4 : 8);
         if (!ESCAPE_REGEX.test(code)) {
           throw new TomlError("invalid unicode escape", {
             toml: str,
@@ -373,24 +379,14 @@ function parseValue(value, toml, ptr, integersAsBigInt) {
 }
 
 // dist/extract.js
-function sliceAndTrimEndOf(str, startPtr, endPtr, allowNewLines) {
+function sliceAndTrimEndOf(str, startPtr, endPtr) {
   let value = str.slice(startPtr, endPtr);
   let commentIdx = value.indexOf("#");
   if (commentIdx > -1) {
     skipComment(str, commentIdx);
     value = value.slice(0, commentIdx);
   }
-  let trimmed = value.trimEnd();
-  if (!allowNewLines) {
-    let newlineIdx = value.indexOf("\n", trimmed.length);
-    if (newlineIdx > -1) {
-      throw new TomlError("newlines are not allowed in inline tables", {
-        toml: str,
-        ptr: startPtr + newlineIdx
-      });
-    }
-  }
-  return [trimmed, commentIdx];
+  return [value.trimEnd(), commentIdx];
 }
 function extractValue(str, ptr, end, depth, integersAsBigInt) {
   if (depth === 0) {
@@ -402,24 +398,25 @@ function extractValue(str, ptr, end, depth, integersAsBigInt) {
   let c = str[ptr];
   if (c === "[" || c === "{") {
     let [value, endPtr2] = c === "[" ? parseArray(str, ptr, depth, integersAsBigInt) : parseInlineTable(str, ptr, depth, integersAsBigInt);
-    let newPtr = end ? skipUntil(str, endPtr2, ",", end) : endPtr2;
-    if (endPtr2 - newPtr && end === "}") {
-      let nextNewLine = indexOfNewline(str, endPtr2, newPtr);
-      if (nextNewLine > -1) {
-        throw new TomlError("newlines are not allowed in inline tables", {
+    if (end) {
+      endPtr2 = skipVoid(str, endPtr2);
+      if (str[endPtr2] === ",")
+        endPtr2++;
+      else if (str[endPtr2] !== end) {
+        throw new TomlError("expected comma or end of structure", {
           toml: str,
-          ptr: nextNewLine
+          ptr: endPtr2
         });
       }
     }
-    return [value, newPtr];
+    return [value, endPtr2];
   }
   let endPtr;
   if (c === '"' || c === "'") {
     endPtr = getStringEnd(str, ptr);
     let parsed = parseString(str, ptr, endPtr);
     if (end) {
-      endPtr = skipVoid(str, endPtr, end !== "]");
+      endPtr = skipVoid(str, endPtr);
       if (str[endPtr] && str[endPtr] !== "," && str[endPtr] !== end && str[endPtr] !== "\n" && str[endPtr] !== "\r") {
         throw new TomlError("unexpected character encountered", {
           toml: str,
@@ -431,7 +428,7 @@ function extractValue(str, ptr, end, depth, integersAsBigInt) {
     return [parsed, endPtr];
   }
   endPtr = skipUntil(str, ptr, ",", end);
-  let slice = sliceAndTrimEndOf(str, ptr, endPtr - +(str[endPtr - 1] === ","), end === "]");
+  let slice = sliceAndTrimEndOf(str, ptr, endPtr - +(str[endPtr - 1] === ","));
   if (!slice[0]) {
     throw new TomlError("incomplete key-value declaration: no value specified", {
       toml: str,
@@ -521,17 +518,16 @@ function parseInlineTable(str, ptr, depth, integersAsBigInt) {
   let res = {};
   let seen = /* @__PURE__ */ new Set();
   let c;
-  let comma = 0;
   ptr++;
   while ((c = str[ptr++]) !== "}" && c) {
-    let err = { toml: str, ptr: ptr - 1 };
-    if (c === "\n") {
-      throw new TomlError("newlines are not allowed in inline tables", err);
-    } else if (c === "#") {
-      throw new TomlError("inline tables cannot contain comments", err);
-    } else if (c === ",") {
-      throw new TomlError("expected key-value, found comma", err);
-    } else if (c !== " " && c !== "	") {
+    if (c === ",") {
+      throw new TomlError("expected value, found comma", {
+        toml: str,
+        ptr: ptr - 1
+      });
+    } else if (c === "#")
+      ptr = skipComment(str, ptr);
+    else if (c !== " " && c !== "	" && c !== "\n" && c !== "\r") {
       let k;
       let t = res;
       let hasOwn = false;
@@ -560,15 +556,8 @@ function parseInlineTable(str, ptr, depth, integersAsBigInt) {
       seen.add(value);
       t[k] = value;
       ptr = valueEndPtr;
-      comma = str[ptr - 1] === "," ? ptr - 1 : 0;
     }
   }
-  if (comma) {
-    throw new TomlError("trailing commas are not allowed in inline tables", {
-      toml: str,
-      ptr: comma
-    });
-  }
   if (!c) {
     throw new TomlError("unfinished table encountered", {
       toml: str,

package/dist/primitive.js

@@ -31,13 +31,14 @@ import { TomlError } from './error.js';
 let INT_REGEX = /^((0x[0-9a-fA-F](_?[0-9a-fA-F])*)|(([+-]|0[ob])?\d(_?\d)*))$/;
 let FLOAT_REGEX = /^[+-]?\d(_?\d)*(\.\d(_?\d)*)?([eE][+-]?\d(_?\d)*)?$/;
 let LEADING_ZERO = /^[+-]?0[0-9_]/;
-let ESCAPE_REGEX = /^[0-9a-f]{4,8}$/i;
+let ESCAPE_REGEX = /^[0-9a-f]{2,8}$/i;
 let ESC_MAP = {
     b: '\b',
     t: '\t',
     n: '\n',
     f: '\f',
     r: '\r',
+    e: '\x1b',
     '"': '"',
     '\\': '\\',
 };
@@ -73,9 +74,9 @@ export function parseString(str, ptr = 0, endPtr = str.length) {
         }
         if (isEscape) {
             isEscape = false;
-            if (c === 'u' || c === 'U') {
+            if (c === 'x' || c === 'u' || c === 'U') {
                 // Unicode escape
-                let code = str.slice(ptr, (ptr += (c === 'u' ? 4 : 8)));
+                let code = str.slice(ptr, (ptr += (c === 'x' ? 2 : c === 'u' ? 4 : 8)));
                 if (!ESCAPE_REGEX.test(code)) {
                     throw new TomlError('invalid unicode escape', {
                         toml: str,

package/dist/struct.js

@@ -106,20 +106,17 @@ export function parseInlineTable(str, ptr, depth, integersAsBigInt) {
     let res = {};
     let seen = new Set();
     let c;
-    let comma = 0;
     ptr++;
     while ((c = str[ptr++]) !== '}' && c) {
-        let err = { toml: str, ptr: ptr - 1 };
-        if (c === '\n') {
-            throw new TomlError('newlines are not allowed in inline tables', err);
-        }
-        else if (c === '#') {
-            throw new TomlError('inline tables cannot contain comments', err);
-        }
-        else if (c === ',') {
-            throw new TomlError('expected key-value, found comma', err);
+        if (c === ',') {
+            throw new TomlError('expected value, found comma', {
+                toml: str,
+                ptr: ptr - 1,
+            });
         }
-        else if (c !== ' ' && c !== '\t') {
+        else if (c === '#')
+            ptr = skipComment(str, ptr);
+        else if (c !== ' ' && c !== '\t' && c !== '\n' && c !== '\r') {
             let k;
             let t = res;
             let hasOwn = false;
@@ -148,15 +145,8 @@ export function parseInlineTable(str, ptr, depth, integersAsBigInt) {
             seen.add(value);
             t[k] = value;
             ptr = valueEndPtr;
-            comma = str[ptr - 1] === ',' ? ptr - 1 : 0;
         }
     }
-    if (comma) {
-        throw new TomlError('trailing commas are not allowed in inline tables', {
-            toml: str,
-            ptr: comma,
-        });
-    }
     if (!c) {
         throw new TomlError('unfinished table encountered', {
             toml: str,

package/dist/util.js

@@ -56,11 +56,16 @@ export function skipComment(str, ptr) {
 }
 export function skipVoid(str, ptr, banNewLines, banComments) {
     let c;
-    while ((c = str[ptr]) === ' ' || c === '\t' || (!banNewLines && (c === '\n' || c === '\r' && str[ptr + 1] === '\n')))
-        ptr++;
-    return banComments || c !== '#'
-        ? ptr
-        : skipVoid(str, skipComment(str, ptr), banNewLines);
+    while (1) {
+        while ((c = str[ptr]) === ' ' || c === '\t' || (!banNewLines && (c === '\n' || c === '\r' && str[ptr + 1] === '\n')))
+            ptr++;
+        // Tucking the return statement here would save 5 characters >:)
+        // But TypeScript fails to detect there is no way to exit the loop so it complains about the lack of final return
+        if (banComments || c !== '#')
+            break;
+        ptr = skipComment(str, ptr);
+    }
+    return ptr;
 }
 export function skipUntil(str, ptr, sep, end, banNewLines = false) {
     if (!end) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "smol-toml",
   "license": "BSD-3-Clause",
-  "version": "1.5.2",
+  "version": "1.6.1",
   "description": "A small, fast, and correct TOML parser/serializer",
   "author": "Cynthia <cyyynthia@borkenware.com>",
   "repository": "github:squirrelchat/smol-toml",
@@ -19,15 +19,15 @@
   "devDependencies": {
     "@iarna/toml": "3.0.0",
     "@ltd/j-toml": "^1.38.0",
-    "@tsconfig/node-lts": "^22.0.3",
+    "@tsconfig/node-lts": "^24.0.0",
     "@tsconfig/strictest": "^2.0.8",
-    "@types/node": "^24.10.1",
-    "@vitest/ui": "^4.0.8",
-    "esbuild": "^0.27.0",
+    "@types/node": "^25.5.0",
+    "@vitest/ui": "^4.1.1",
+    "esbuild": "^0.27.4",
     "fast-toml": "^0.5.4",
     "pin-github-action": "^3.4.0",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.8"
+    "vitest": "^4.1.1"
   },
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",