From 426852e2c9d6175db6a48885bdff353fd3ef4872 Mon Sep 17 00:00:00 2001 From: Wyatt Herkamp Date: Wed, 18 Oct 2023 08:06:12 -0400 Subject: [PATCH] Update to smol-toml 1.1.3 --- dist/restore/index.js | 34 +++++++++++++++++++++------------- dist/save/index.js | 34 +++++++++++++++++++++------------- package-lock.json | 31 ++++++++----------------------- package.json | 2 +- 4 files changed, 51 insertions(+), 50 deletions(-) diff --git a/dist/restore/index.js b/dist/restore/index.js index 7170d307..c064de79 100644 --- a/dist/restore/index.js +++ b/dist/restore/index.js @@ -62971,7 +62971,7 @@ var promises_default = /*#__PURE__*/__nccwpck_require__.n(promises_); // EXTERNAL MODULE: external "os" var external_os_ = __nccwpck_require__(2037); var external_os_default = /*#__PURE__*/__nccwpck_require__.n(external_os_); -;// CONCATENATED MODULE: ../smol-toml/dist/error.js +;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/error.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63036,7 +63036,7 @@ class TomlError extends Error { } } -;// CONCATENATED MODULE: ../smol-toml/dist/date.js +;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/date.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63163,7 +63163,7 @@ class TomlDate extends Date { } } -;// CONCATENATED MODULE: ../smol-toml/dist/util.js +;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/util.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63268,7 +63268,7 @@ function getStringEnd(str, seek) { return seek; } -;// CONCATENATED MODULE: ../smol-toml/dist/primitive.js +;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/primitive.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63442,7 +63442,7 @@ function parseValue(value, toml, ptr) { return date; } -;// CONCATENATED MODULE: ../smol-toml/dist/extract.js +;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/extract.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63517,8 +63517,16 @@ function extractValue(str, ptr, end) { if (c === '"' || c === "'") { endPtr = getStringEnd(str, ptr); let parsed = parseString(str, ptr, endPtr); - if (end) - endPtr = skipUntil(str, endPtr, ',', end, end !== ']'); + 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); @@ -63539,7 +63547,7 @@ function extractValue(str, ptr, end) { ]; } -;// CONCATENATED MODULE: ../smol-toml/dist/struct.js +;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/struct.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63743,7 +63751,7 @@ function parseArray(str, ptr) { return [res, ptr]; } -;// CONCATENATED MODULE: ../smol-toml/dist/parse.js +;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/parse.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63785,7 +63793,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 */) { @@ -63805,7 +63813,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, @@ -63814,7 +63822,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; } @@ -63893,7 +63901,7 @@ function parse(toml) { return res; } -;// CONCATENATED MODULE: ../smol-toml/dist/index.js +;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/index.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause diff --git a/dist/save/index.js b/dist/save/index.js index 06262f56..c85c4e5a 100644 --- a/dist/save/index.js +++ b/dist/save/index.js @@ -62973,7 +62973,7 @@ var promises_default = /*#__PURE__*/__nccwpck_require__.n(promises_); // EXTERNAL MODULE: external "os" var external_os_ = __nccwpck_require__(2037); var external_os_default = /*#__PURE__*/__nccwpck_require__.n(external_os_); -;// CONCATENATED MODULE: ../smol-toml/dist/error.js +;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/error.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63038,7 +63038,7 @@ class TomlError extends Error { } } -;// CONCATENATED MODULE: ../smol-toml/dist/date.js +;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/date.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63165,7 +63165,7 @@ class TomlDate extends Date { } } -;// CONCATENATED MODULE: ../smol-toml/dist/util.js +;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/util.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63270,7 +63270,7 @@ function getStringEnd(str, seek) { return seek; } -;// CONCATENATED MODULE: ../smol-toml/dist/primitive.js +;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/primitive.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63444,7 +63444,7 @@ function parseValue(value, toml, ptr) { return date; } -;// CONCATENATED MODULE: ../smol-toml/dist/extract.js +;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/extract.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63519,8 +63519,16 @@ function extractValue(str, ptr, end) { if (c === '"' || c === "'") { endPtr = getStringEnd(str, ptr); let parsed = parseString(str, ptr, endPtr); - if (end) - endPtr = skipUntil(str, endPtr, ',', end, end !== ']'); + 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); @@ -63541,7 +63549,7 @@ function extractValue(str, ptr, end) { ]; } -;// CONCATENATED MODULE: ../smol-toml/dist/struct.js +;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/struct.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63745,7 +63753,7 @@ function parseArray(str, ptr) { return [res, ptr]; } -;// CONCATENATED MODULE: ../smol-toml/dist/parse.js +;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/parse.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63787,7 +63795,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 */) { @@ -63807,7 +63815,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, @@ -63816,7 +63824,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; } @@ -63895,7 +63903,7 @@ function parse(toml) { return res; } -;// CONCATENATED MODULE: ../smol-toml/dist/index.js +;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/index.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause diff --git a/package-lock.json b/package-lock.json index 01f16a5a..de02a79f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@actions/exec": "^1.1.1", "@actions/glob": "^0.4.0", "@actions/io": "^1.1.3", - "smol-toml": "file:../smol-toml" + "smol-toml": "1.1.3" }, "devDependencies": { "@vercel/ncc": "^0.38.0", @@ -26,26 +26,6 @@ "url": "https://github.com/sponsors/Swatinem" } }, - "../smol-toml": { - "version": "1.1.2", - "license": "BSD-3-Clause", - "devDependencies": { - "@iarna/toml": "3.0.0", - "@ltd/j-toml": "^1.38.0", - "@tsconfig/esm": "^1.0.3", - "@tsconfig/node-lts": "^18.12.5", - "@tsconfig/strictest": "^2.0.2", - "@types/node": "^20.8.6", - "@vitest/ui": "^0.34.6", - "fast-toml": "^0.5.4", - "typescript": "^5.2.2", - "vitest": "^0.34.6" - }, - "engines": { - "node": ">= 18", - "pnpm": ">= 8" - } - }, "node_modules/@actions/buildjet-cache": { "name": "github-actions.cache-buildjet", "version": "0.2.0", @@ -533,8 +513,13 @@ } }, "node_modules/smol-toml": { - "resolved": "../smol-toml", - "link": true + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.1.3.tgz", + "integrity": "sha512-qTyy6Owjho1ISBmxj4HdrFWB2kMQ5RczU6J04OqslSfdSH656OIHuomHS4ZDvhwm37nig/uXyiTMJxlC9zIVfw==", + "engines": { + "node": ">= 18", + "pnpm": ">= 8" + } }, "node_modules/tr46": { "version": "0.0.3", diff --git a/package.json b/package.json index 6f4f9ae3..e7d9b24f 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@actions/exec": "^1.1.1", "@actions/glob": "^0.4.0", "@actions/io": "^1.1.3", - "smol-toml": "file:../smol-toml" + "smol-toml": "1.1.3" }, "devDependencies": { "@vercel/ncc": "^0.38.0",