@zuplo/cli 7.0.2 → 7.1.0

package/node_modules/strip-json-comments/index.d.ts

@@ -1,13 +1,18 @@
-declare namespace stripJsonComments {
-	interface Options {
-		/**
-		Replace comments with whitespace instead of stripping them entirely.
+export type Options = {
+	/**
+	Strip trailing commas in addition to comments.
 
-		@default true
-		*/
-		readonly whitespace?: boolean;
-	}
-}
+	@default false
+	*/
+	readonly trailingCommas?: boolean;
+
+	/**
+	Replace comments and trailing commas with whitespace instead of stripping them entirely.
+
+	@default true
+	*/
+	readonly whitespace?: boolean;
+};
 
 /**
 Strip comments from JSON. Lets you use comments in your JSON files!
@@ -19,6 +24,8 @@ It will replace single-line comments `//` and multi-line comments `/**\/` with w
 
 @example
 ```
+import stripJsonComments from 'strip-json-comments';
+
 const json = `{
 	// Rainbows
 	"unicorn": "cake"
@@ -28,9 +35,7 @@ JSON.parse(stripJsonComments(json));
 //=> {unicorn: 'cake'}
 ```
 */
-declare function stripJsonComments(
+export default function stripJsonComments(
 	jsonString: string,
-	options?: stripJsonComments.Options
+	options?: Options
 ): string;
-
-export = stripJsonComments;

package/node_modules/strip-json-comments/index.js

@@ -1,8 +1,10 @@
-'use strict';
 const singleComment = Symbol('singleComment');
 const multiComment = Symbol('multiComment');
+
 const stripWithoutWhitespace = () => '';
-const stripWithWhitespace = (string, start, end) => string.slice(start, end).replace(/\S/g, ' ');
+
+// Replace all characters except ASCII spaces, tabs and line endings with regular spaces to ensure valid JSON output.
+const stripWithWhitespace = (string, start, end) => string.slice(start, end).replace(/[^ \t\r\n]/g, ' ');
 
 const isEscaped = (jsonString, quotePosition) => {
 	let index = quotePosition - 1;
@@ -16,62 +18,96 @@ const isEscaped = (jsonString, quotePosition) => {
 	return Boolean(backslashCount % 2);
 };
 
-module.exports = (jsonString, options = {}) => {
+export default function stripJsonComments(jsonString, {whitespace = true, trailingCommas = false} = {}) {
 	if (typeof jsonString !== 'string') {
 		throw new TypeError(`Expected argument \`jsonString\` to be a \`string\`, got \`${typeof jsonString}\``);
 	}
 
-	const strip = options.whitespace === false ? stripWithoutWhitespace : stripWithWhitespace;
+	const strip = whitespace ? stripWithWhitespace : stripWithoutWhitespace;
 
-	let insideString = false;
-	let insideComment = false;
+	let isInsideString = false;
+	let isInsideComment = false;
 	let offset = 0;
+	let buffer = '';
 	let result = '';
+	let commaIndex = -1;
 
-	for (let i = 0; i < jsonString.length; i++) {
-		const currentCharacter = jsonString[i];
-		const nextCharacter = jsonString[i + 1];
+	for (let index = 0; index < jsonString.length; index++) {
+		const currentCharacter = jsonString[index];
+		const nextCharacter = jsonString[index + 1];
 
-		if (!insideComment && currentCharacter === '"') {
-			const escaped = isEscaped(jsonString, i);
+		if (!isInsideComment && currentCharacter === '"') {
+			// Enter or exit string
+			const escaped = isEscaped(jsonString, index);
 			if (!escaped) {
-				insideString = !insideString;
+				isInsideString = !isInsideString;
 			}
 		}
 
-		if (insideString) {
+		if (isInsideString) {
 			continue;
 		}
 
-		if (!insideComment && currentCharacter + nextCharacter === '//') {
-			result += jsonString.slice(offset, i);
-			offset = i;
-			insideComment = singleComment;
-			i++;
-		} else if (insideComment === singleComment && currentCharacter + nextCharacter === '\r\n') {
-			i++;
-			insideComment = false;
-			result += strip(jsonString, offset, i);
-			offset = i;
+		if (!isInsideComment && currentCharacter + nextCharacter === '//') {
+			// Enter single-line comment
+			buffer += jsonString.slice(offset, index);
+			offset = index;
+			isInsideComment = singleComment;
+			index++;
+		} else if (isInsideComment === singleComment && currentCharacter + nextCharacter === '\r\n') {
+			// Exit single-line comment via \r\n
+			index++;
+			isInsideComment = false;
+			buffer += strip(jsonString, offset, index);
+			offset = index;
 			continue;
-		} else if (insideComment === singleComment && currentCharacter === '\n') {
-			insideComment = false;
-			result += strip(jsonString, offset, i);
-			offset = i;
-		} else if (!insideComment && currentCharacter + nextCharacter === '/*') {
-			result += jsonString.slice(offset, i);
-			offset = i;
-			insideComment = multiComment;
-			i++;
+		} else if (isInsideComment === singleComment && currentCharacter === '\n') {
+			// Exit single-line comment via \n
+			isInsideComment = false;
+			buffer += strip(jsonString, offset, index);
+			offset = index;
+		} else if (!isInsideComment && currentCharacter + nextCharacter === '/*') {
+			// Enter multiline comment
+			buffer += jsonString.slice(offset, index);
+			offset = index;
+			isInsideComment = multiComment;
+			index++;
 			continue;
-		} else if (insideComment === multiComment && currentCharacter + nextCharacter === '*/') {
-			i++;
-			insideComment = false;
-			result += strip(jsonString, offset, i + 1);
-			offset = i + 1;
+		} else if (isInsideComment === multiComment && currentCharacter + nextCharacter === '*/') {
+			// Exit multiline comment
+			index++;
+			isInsideComment = false;
+			buffer += strip(jsonString, offset, index + 1);
+			offset = index + 1;
 			continue;
+		} else if (trailingCommas && !isInsideComment) {
+			if (commaIndex !== -1) {
+				if (currentCharacter === '}' || currentCharacter === ']') {
+					// Strip trailing comma
+					buffer += jsonString.slice(offset, index);
+					result += strip(buffer, 0, 1) + buffer.slice(1);
+					buffer = '';
+					offset = index;
+					commaIndex = -1;
+				} else if (currentCharacter !== ' ' && currentCharacter !== '\t' && currentCharacter !== '\r' && currentCharacter !== '\n') {
+					// Hit non-whitespace following a comma; comma is not trailing
+					buffer += jsonString.slice(offset, index);
+					offset = index;
+					commaIndex = -1;
+				}
+			} else if (currentCharacter === ',') {
+				// Flush buffer prior to this point, and save new comma index
+				result += buffer + jsonString.slice(offset, index);
+				buffer = '';
+				offset = index;
+				commaIndex = index;
+			}
 		}
 	}
 
-	return result + (insideComment ? strip(jsonString.slice(offset)) : jsonString.slice(offset));
-};
+	const remaining = (isInsideComment === singleComment)
+		? strip(jsonString, offset)
+		: jsonString.slice(offset);
+
+	return result + buffer + remaining;
+}

package/node_modules/strip-json-comments/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "strip-json-comments",
-	"version": "3.1.1",
+	"version": "5.0.3",
 	"description": "Strip comments from JSON. Lets you use comments in your JSON files!",
 	"license": "MIT",
 	"repository": "sindresorhus/strip-json-comments",
@@ -10,8 +10,12 @@
 		"email": "sindresorhus@gmail.com",
 		"url": "https://sindresorhus.com"
 	},
+	"type": "module",
+	"exports": "./index.js",
+	"types": "./index.d.ts",
+	"sideEffects": false,
 	"engines": {
-		"node": ">=8"
+		"node": ">=14.16"
 	},
 	"scripts": {
 		"test": "xo && ava && tsd",
@@ -39,9 +43,14 @@
 		"jsonc"
 	],
 	"devDependencies": {
-		"ava": "^1.4.1",
+		"ava": "^4.3.1",
 		"matcha": "^0.7.0",
-		"tsd": "^0.7.2",
-		"xo": "^0.24.0"
+		"tsd": "^0.22.0",
+		"xo": "^0.54.2"
+	},
+	"xo": {
+		"rules": {
+			"complexity": "off"
+		}
 	}
 }

package/node_modules/strip-json-comments/readme.md

@@ -1,4 +1,4 @@
-# strip-json-comments [![Build Status](https://travis-ci.com/sindresorhus/strip-json-comments.svg?branch=master)](https://travis-ci.com/github/sindresorhus/strip-json-comments)
+# strip-json-comments
 
 > Strip comments from JSON. Lets you use comments in your JSON files!
 
@@ -17,13 +17,15 @@ Also available as a [Gulp](https://github.com/sindresorhus/gulp-strip-json-comme
 
 ## Install
 
-```
-$ npm install strip-json-comments
+```sh
+npm install strip-json-comments
 ```
 
 ## Usage
 
 ```js
+import stripJsonComments from 'strip-json-comments';
+
 const json = `{
 	// Rainbows
 	"unicorn": /* ❤ */ "cake"
@@ -47,32 +49,27 @@ Accepts a string with JSON and returns a string without comments.
 
 Type: `object`
 
+##### trailingCommas
+
+Type: `boolean`\
+Default: `false`
+
+Strip trailing commas in addition to comments.
+
 ##### whitespace
 
 Type: `boolean`\
 Default: `true`
 
-Replace comments with whitespace instead of stripping them entirely.
+Replace comments and trailing commas with whitespace instead of stripping them entirely.
 
 ## Benchmark
 
-```
-$ npm run bench
+```sh
+npm run bench
 ```
 
 ## Related
 
 - [strip-json-comments-cli](https://github.com/sindresorhus/strip-json-comments-cli) - CLI for this module
 - [strip-css-comments](https://github.com/sindresorhus/strip-css-comments) - Strip comments from CSS
-
----
-
-<div align="center">
-	<b>
-		<a href="https://tidelift.com/subscription/pkg/npm-strip-json-comments?utm_source=npm-strip-json-comments&utm_medium=referral&utm_campaign=readme">Get professional support for this package with a Tidelift subscription</a>
-	</b>
-	<br>
-	<sub>
-		Tidelift helps make open source sustainable for maintainers while giving companies<br>assurances about security, maintenance, and licensing for their dependencies.
-	</sub>
-</div>

package/node_modules/thread-stream/.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
       contents: read
     steps:
       - name: Check out repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -38,20 +38,17 @@ jobs:
       contents: read
     strategy:
       matrix:
-        node-version: [18, 20, 22]
+        node-version: [20, 22, 24, 26]
         os: [macos-latest, ubuntu-latest, windows-latest]
-        exclude:
-          - os: windows-latest
-            node-version: 22
 
     steps:
       - name: Check out repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: Setup Node ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -61,23 +58,6 @@ jobs:
       - name: Run tests
         run: npm run test:ci
 
-      - name: Coveralls Parallel
-        uses: coverallsapp/github-action@v2.3.0
-        with:
-          github-token: ${{ secrets.github_token }}
-          parallel: true
-          flag-name: run-${{ matrix.node-version }}-${{ matrix.os }}
-
-  coverage:
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Coveralls Finished
-        uses: coverallsapp/github-action@v2.3.0
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          parallel-finished: true
-
   automerge:
     name: Automerge Dependabot PRs
     if: >

package/node_modules/thread-stream/README.md

@@ -39,6 +39,8 @@ stream.flush(function () {
 })
 ```
 
+`flush(cb)` waits for the worker destination flush when supported (`flush`, `flushSync`, or pending `drain`).
+
 In `worker.js`:
 
 ```js

package/node_modules/thread-stream/eslint.config.js

@@ -0,0 +1,10 @@
+'use strict'
+
+const neostandard = require('neostandard')
+
+module.exports = neostandard({
+  ignores: [
+    'test/ts/**/*',
+    'test/syntax-error.mjs'
+  ]
+})

package/node_modules/thread-stream/index.d.ts

@@ -59,6 +59,13 @@ declare class ThreadStream extends EventEmitter {
    * Calling the {@link write()} method after calling {@link end()} will emit an error.
    */
   end(): void
+  /**
+   * Flush the stream asynchronously.
+   *
+   * The callback is invoked once data has been consumed by the worker and the
+   * worker destination has acknowledged the flush.
+   */
+  flush(cb?: (err?: Error) => void): void
   /**
    * Flush the stream synchronously.
    * This method should be called in the shutdown phase to make sure that all data has been flushed.