@shopware/api-gen 1.5.1 → 1.5.3

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { g as generate, l as loadSchema, v as validateJson } from './shared/api-gen.DDkIkZIo.mjs';
+export { g as generate, l as loadSchema, v as validateJson } from './shared/api-gen.DwUlbL4g.mjs';
 import 'node:fs';
 import 'node:path';
 import 'ofetch';

package/dist/shared/{api-gen.DDkIkZIo.mjs → api-gen.DwUlbL4g.mjs}

@@ -2272,7 +2272,7 @@ function getKeysOfEnumerableProperties(object, compareKeys) {
 * with spacing, indentation, and comma
 * without surrounding punctuation (for example, braces)
 */
-function printIteratorEntries(iterator, config, indentation, depth, refs, printer, separator = ": ") {
+function printIteratorEntries(iterator, config, indentation, depth, refs, printer, separator = ": ", length) {
 	let result = "";
 	let width = 0;
 	let current = iterator.next();
@@ -2282,7 +2282,7 @@ function printIteratorEntries(iterator, config, indentation, depth, refs, printe
 		while (!current.done) {
 			result += indentationNext;
 			if (width++ === config.maxWidth) {
-				result += "…";
+				result += typeof length === "number" ? `…(${length - width + 1})` : "…";
 				break;
 			}
 			const name = printer(current.value[0], config, indentationNext, depth, refs);
@@ -2304,7 +2304,7 @@ function printIteratorEntries(iterator, config, indentation, depth, refs, printe
 * with spacing, indentation, and comma
 * without surrounding punctuation (braces or brackets)
 */
-function printIteratorValues(iterator, config, indentation, depth, refs, printer) {
+function printIteratorValues(iterator, config, indentation, depth, refs, printer, length) {
 	let result = "";
 	let width = 0;
 	let current = iterator.next();
@@ -2314,7 +2314,7 @@ function printIteratorValues(iterator, config, indentation, depth, refs, printer
 		while (!current.done) {
 			result += indentationNext;
 			if (width++ === config.maxWidth) {
-				result += "…";
+				result += typeof length === "number" ? `…(${length - width + 1})` : "…";
 				break;
 			}
 			result += printer(current.value, config, indentationNext, depth, refs);
@@ -2345,7 +2345,7 @@ function printListItems(list, config, indentation, depth, refs, printer) {
 		for (let i = 0; i < length; i++) {
 			result += indentationNext;
 			if (i === config.maxWidth) {
-				result += "…";
+				result += `…(${length - i})`;
 				break;
 			}
 			if (isDataView(list) || i in list) {
@@ -2366,17 +2366,22 @@ function printListItems(list, config, indentation, depth, refs, printer) {
 * with spacing, indentation, and comma
 * without surrounding punctuation (for example, braces)
 */
-function printObjectProperties(val, config, indentation, depth, refs, printer) {
+function printObjectProperties(val, config, indentation, depth, refs, printer, compareKeysOverride = config.compareKeys) {
 	let result = "";
-	const keys = getKeysOfEnumerableProperties(val, config.compareKeys);
+	const keys = getKeysOfEnumerableProperties(val, compareKeysOverride);
 	if (keys.length > 0) {
 		result += config.spacingOuter;
 		const indentationNext = indentation + config.indent;
 		for (let i = 0; i < keys.length; i++) {
+			result += indentationNext;
+			if (i === config.maxWidth) {
+				result += `…(${keys.length - i})`;
+				break;
+			}
 			const key = keys[i];
-			const name = printer(key, config, indentationNext, depth, refs);
+			const name = !config.quoteKeys && isUnquotableKey(key) ? key : printer(key, config, indentationNext, depth, refs);
 			const value = printer(val[key], config, indentationNext, depth, refs);
-			result += `${indentationNext + name}: ${value}`;
+			result += `${name}: ${value}`;
 			if (i < keys.length - 1) {
 				result += `,${config.spacingInner}`;
 			} else if (!config.min) {
@@ -2387,6 +2392,12 @@ function printObjectProperties(val, config, indentation, depth, refs, printer) {
 	}
 	return result;
 }
+// https://github.com/nodejs/node/blob/61102cdbb3d59155ad5bb4fc9419627a31e63f7a/lib/internal/util/inspect.js#L249
+// /^[a-zA-Z_][a-zA-Z_0-9]*$/
+const keyStrRegExp = /^[a-z_]\w*$/i;
+function isUnquotableKey(key) {
+	return typeof key === "string" && key !== "__proto__" && keyStrRegExp.test(key);
+}
 
 const asymmetricMatcher = typeof Symbol === "function" && Symbol.for ? Symbol.for("jest.asymmetricMatcher") : 1267621;
 const SPACE$2 = " ";
@@ -2463,7 +2474,7 @@ function printProps(keys, props, config, indentation, depth, refs, printer) {
 	return keys.map((key) => {
 		const value = props[key];
 		// hidden injected value that should not be printed
-		if (typeof value === "string" && value[0] === "_" && value.startsWith("__vitest_") && value.match(/__vitest_\d+__/)) {
+		if (typeof value === "string" && value[0] === "_" && value.startsWith("__vitest_") && /__vitest_\d+__/.test(value)) {
 			return "";
 		}
 		let printed = printer(value, config, indentationNext, depth, refs);
@@ -2561,7 +2572,7 @@ const plugin$3 = {
 	test: test$3
 };
 
-// SENTINEL constants are from https://github.com/facebook/immutable-js
+// SENTINEL constants are from https://github.com/immutable-js/immutable-js
 const IS_ITERABLE_SENTINEL = "@@__IMMUTABLE_ITERABLE__@@";
 const IS_LIST_SENTINEL = "@@__IMMUTABLE_LIST__@@";
 const IS_KEYED_SENTINEL = "@@__IMMUTABLE_KEYED__@@";
@@ -2608,7 +2619,9 @@ function printImmutableSeq(val, config, indentation, depth, refs, printer) {
 		return printAsLeaf(name);
 	}
 	if (val[IS_KEYED_SENTINEL]) {
-		return `${name + SPACE}{${val._iter || val._object ? printIteratorEntries(val.entries(), config, indentation, depth, refs, printer) : LAZY}}`;
+		return `${name + SPACE}{${
+		// from Immutable collection of entries or from ECMAScript object
+		val._iter || val._object ? printIteratorEntries(val.entries(), config, indentation, depth, refs, printer) : LAZY}}`;
 	}
 	return `${name + SPACE}[${val._iter || val._array || val._collection || val._iterable ? printIteratorValues(val.values(), config, indentation, depth, refs, printer) : LAZY}]`;
 }
@@ -2991,7 +3004,7 @@ function printError(val) {
 * The first port of call for printing an object, handles most of the
 * data-types in JS.
 */
-function printBasicValue(val, printFunctionName, escapeRegex, escapeString) {
+function printBasicValue(val, printFunctionName, escapeRegex, escapeString, singleQuote) {
 	if (val === true || val === false) {
 		return `${val}`;
 	}
@@ -3009,10 +3022,15 @@ function printBasicValue(val, printFunctionName, escapeRegex, escapeString) {
 		return printBigInt(val);
 	}
 	if (typeOf === "string") {
+		const q = singleQuote ? "'" : "\"";
 		if (escapeString) {
-			return `"${val.replaceAll(/"|\\/g, "\\$&")}"`;
+			// escape quote in each case, e.g.
+			//   it's me -> 'it\'s me'
+			//   say "hi" -> "say \"hi\""
+			const escapePattern = singleQuote ? /['\\]/g : /["\\]/g;
+			return `${q}${val.replaceAll(escapePattern, "\\$&")}${q}`;
 		}
-		return `"${val}"`;
+		return `${q}${val}${q}`;
 	}
 	if (typeOf === "function") {
 		return printFunction(val, printFunctionName);
@@ -3071,17 +3089,17 @@ function printComplexValue(val, config, indentation, depth, refs, hasCalledToJSO
 		return hitMaxDepth ? "[Arguments]" : `${min ? "" : "Arguments "}[${printListItems(val, config, indentation, depth, refs, printer)}]`;
 	}
 	if (isToStringedArrayType(toStringed)) {
-		return hitMaxDepth ? `[${val.constructor.name}]` : `${min ? "" : !config.printBasicPrototype && val.constructor.name === "Array" ? "" : `${val.constructor.name} `}[${printListItems(val, config, indentation, depth, refs, printer)}]`;
+		return hitMaxDepth ? `[${val.constructor.name}]` : `${!config.printBasicPrototype && val.constructor.name === "Array" ? "" : `${val.constructor.name} `}[${printListItems(val, config, indentation, depth, refs, printer)}]`;
 	}
 	if (toStringed === "[object Map]") {
-		return hitMaxDepth ? "[Map]" : `Map {${printIteratorEntries(val.entries(), config, indentation, depth, refs, printer, " => ")}}`;
+		return hitMaxDepth ? "[Map]" : `Map {${printIteratorEntries(val.entries(), config, indentation, depth, refs, printer, " => ", val.size)}}`;
 	}
 	if (toStringed === "[object Set]") {
-		return hitMaxDepth ? "[Set]" : `Set {${printIteratorValues(val.values(), config, indentation, depth, refs, printer)}}`;
+		return hitMaxDepth ? "[Set]" : `Set {${printIteratorValues(val.values(), config, indentation, depth, refs, printer, val.size)}}`;
 	}
 	// Avoid failure to serialize global window object in jsdom test environment.
 	// For example, not even relevant if window is prop of React element.
-	return hitMaxDepth || isWindow(val) ? `[${getConstructorName$1(val)}]` : `${min ? "" : !config.printBasicPrototype && getConstructorName$1(val) === "Object" ? "" : `${getConstructorName$1(val)} `}{${printObjectProperties(val, config, indentation, depth, refs, printer)}}`;
+	return hitMaxDepth || isWindow(val) ? `[${getConstructorName$1(val)}]` : `${!config.printBasicPrototype && getConstructorName$1(val) === "Object" ? "" : `${getConstructorName$1(val)} `}{${printObjectProperties(val, config, indentation, depth, refs, printer)}}`;
 }
 const ErrorPlugin = {
 	test: (val) => val && val instanceof Error,
@@ -3099,7 +3117,7 @@ const ErrorPlugin = {
 			...rest
 		};
 		const name = val.name !== "Error" ? val.name : getConstructorName$1(val);
-		return hitMaxDepth ? `[${name}]` : `${name} {${printIteratorEntries(Object.entries(entries).values(), config, indentation, depth, refs, printer)}}`;
+		return hitMaxDepth ? `[${name}]` : `${name} {${printObjectProperties(entries, config, indentation, depth, refs, printer, null)}}`;
 	}
 };
 function isNewPlugin(plugin) {
@@ -3142,7 +3160,7 @@ function printer(val, config, indentation, depth, refs, hasCalledToJSON) {
 	if (plugin !== null) {
 		result = printPlugin(plugin, val, config, indentation, depth, refs);
 	} else {
-		const basicResult = printBasicValue(val, config.printFunctionName, config.escapeRegex, config.escapeString);
+		const basicResult = printBasicValue(val, config.printFunctionName, config.escapeRegex, config.escapeString, config.singleQuote);
 		if (basicResult !== null) {
 			result = basicResult;
 		} else {
@@ -3178,6 +3196,8 @@ const DEFAULT_OPTIONS = {
 	highlight: false,
 	indent: 2,
 	maxDepth: Number.POSITIVE_INFINITY,
+	// Practical default hard-limit to avoid too long string being generated
+	// (Node's limit is buffer.constants.MAX_STRING_LENGTH ~ 512MB)
 	maxOutputLength: 1e6,
 	maxWidth: Number.POSITIVE_INFINITY,
 	min: false,
@@ -3185,7 +3205,11 @@ const DEFAULT_OPTIONS = {
 	printBasicPrototype: true,
 	printFunctionName: true,
 	printShadowRoot: true,
-	theme: DEFAULT_THEME
+	theme: DEFAULT_THEME,
+	singleQuote: false,
+	quoteKeys: true,
+	spacingInner: "\n",
+	spacingOuter: "\n"
 };
 function validateOptions(options) {
 	for (const key of Object.keys(options)) {
@@ -3239,11 +3263,13 @@ function getConfig(options) {
 		maxWidth: options?.maxWidth ?? DEFAULT_OPTIONS.maxWidth,
 		min: options?.min ?? DEFAULT_OPTIONS.min,
 		plugins: options?.plugins ?? DEFAULT_OPTIONS.plugins,
-		printBasicPrototype: options?.printBasicPrototype ?? true,
+		printBasicPrototype: options?.printBasicPrototype ?? !options?.min,
 		printFunctionName: getPrintFunctionName(options),
 		printShadowRoot: options?.printShadowRoot ?? true,
-		spacingInner: options?.min ? " " : "\n",
-		spacingOuter: options?.min ? "" : "\n",
+		spacingInner: options?.spacingInner ?? (options?.min ? " " : "\n"),
+		spacingOuter: options?.spacingOuter ?? (options?.min ? "" : "\n"),
+		singleQuote: options?.singleQuote ?? DEFAULT_OPTIONS.singleQuote,
+		quoteKeys: options?.quoteKeys ?? DEFAULT_OPTIONS.quoteKeys,
 		maxOutputLength: options?.maxOutputLength ?? DEFAULT_OPTIONS.maxOutputLength,
 		_outputLengthPerDepth: []
 	};
@@ -3259,18 +3285,17 @@ function createIndent(indent) {
 function format(val, options) {
 	if (options) {
 		validateOptions(options);
-		if (options.plugins) {
-			const plugin = findPlugin(options.plugins, val);
-			if (plugin !== null) {
-				return printPlugin(plugin, val, getConfig(options), "", 0, []);
-			}
-		}
 	}
-	const basicResult = printBasicValue(val, getPrintFunctionName(options), getEscapeRegex(options), getEscapeString(options));
+	const config = getConfig(options);
+	const plugin = findPlugin(config.plugins, val);
+	if (plugin !== null) {
+		return printPlugin(plugin, val, config, "", 0, []);
+	}
+	const basicResult = printBasicValue(val, config.printFunctionName, config.escapeRegex, config.escapeString, config.singleQuote);
 	if (basicResult !== null) {
 		return basicResult;
 	}
-	return printComplexValue(val, getConfig(options), "", 0, []);
+	return printComplexValue(val, config, "", 0, []);
 }
 const plugins = {
 	AsymmetricMatcher: plugin$5,
@@ -8943,6 +8968,7 @@ function eq(a, b, aStack, bStack, customTesters, hasKey) {
 			// of `NaN` are equivalent.
 			return numA === numB || Number.isNaN(numA) && Number.isNaN(numB);
 		}
+		// RegExps are compared by their source patterns and flags.
 		case "[object RegExp]": return a.source === b.source && a.flags === b.flags;
 		case "[object Temporal.Instant]":
 		case "[object Temporal.ZonedDateTime]":
@@ -9055,7 +9081,13 @@ if (!Object.hasOwn(globalThis, MATCHERS_OBJECT)) {
 	const matchers = Object.create(null);
 	const customEqualityTesters = [];
 	const asymmetricMatchers = Object.create(null);
-	Object.defineProperty(globalThis, MATCHERS_OBJECT, { get: () => globalState });
+	// `configurable` so that vm pools can strip the accessors from a disposed
+	// context: the getters capture the expect state, which would otherwise keep
+	// the whole test-file world reachable from the leaked context shell
+	Object.defineProperty(globalThis, MATCHERS_OBJECT, {
+		configurable: true,
+		get: () => globalState
+	});
 	Object.defineProperty(globalThis, JEST_MATCHERS_OBJECT, {
 		configurable: true,
 		get: () => ({
@@ -9064,7 +9096,10 @@ if (!Object.hasOwn(globalThis, MATCHERS_OBJECT)) {
 			customEqualityTesters
 		})
 	});
-	Object.defineProperty(globalThis, ASYMMETRIC_MATCHERS_OBJECT, { get: () => asymmetricMatchers });
+	Object.defineProperty(globalThis, ASYMMETRIC_MATCHERS_OBJECT, {
+		configurable: true,
+		get: () => asymmetricMatchers
+	});
 }
 
 const KEYS_TO_HANDLE = ["oneOf", "anyOf", "allOf", "not", "$ref"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopware/api-gen",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "Shopware CLI for API client generation.",
   "author": "Shopware",
   "type": "module",
@@ -37,21 +37,23 @@
   "devDependencies": {
     "@types/yargs": "17.0.35",
     "@typescript/native-preview": "7.0.0-dev.20260205.1",
-    "@vitest/coverage-v8": "4.1.10",
+    "@vitest/coverage-v8": "5.0.0",
+    "@vitest/expect": "5.0.0",
+    "@vitest/utils": "5.0.0",
     "json5": "2.2.3",
     "picocolors": "1.1.1",
     "unbuild": "3.6.1",
-    "vitest": "4.1.10",
+    "vitest": "5.0.0",
     "tsconfig": "0.0.0"
   },
   "dependencies": {
     "ofetch": "1.5.1",
-    "openapi-typescript": "7.8.0",
-    "oxfmt": "0.58.0",
+    "openapi-typescript": "7.13.0",
+    "oxfmt": "0.65.0",
     "ts-morph": "27.0.2",
     "typescript": "5.9.3",
     "yargs": "18.0.0",
-    "@shopware/api-client": "1.5.1"
+    "@shopware/api-client": "1.7.0"
   },
   "scripts": {
     "build": "unbuild",