@orval/core 8.16.0 → 8.17.0

package/dist/index.d.mts

@@ -395,27 +395,31 @@ interface CommonMockOptions {
   generateEachHttpStatus?: boolean;
   locale?: keyof typeof allLocales;
   preferredContentType?: string;
+  arrayItems?: boolean;
 }
 interface MswMockOptions extends CommonMockOptions {
   type: typeof OutputMockType.MSW;
   baseUrl?: string;
   delay?: false | number | (() => number);
   delayFunctionLazyExecute?: boolean;
+  path?: string;
 }
 interface FakerMockOptions extends CommonMockOptions {
   type: typeof OutputMockType.FAKER;
   schemas?: boolean;
   operationResponses?: boolean;
-  arrayItems?: boolean;
+  path?: string;
 }
 type GlobalMockOptions = MswMockOptions | FakerMockOptions;
 interface OutputMocksConfig {
   indexMockFiles?: boolean;
+  path?: string;
   generators: (GlobalMockOptions | ClientMockBuilder)[];
 }
 type OutputMocksOption = boolean | OutputMocksConfig | ClientMockBuilder;
 interface NormalizedMocksConfig {
   indexMockFiles: boolean;
+  path?: string;
   generators: (GlobalMockOptions | ClientMockBuilder)[];
 }
 type OverrideMockOptions = Partial<GlobalMockOptions> & {
@@ -953,9 +957,16 @@ interface ContextSpec {
    * Tracks array-item mock factory names already emitted per output file scope.
    * Populated by `@orval/mock` when `arrayItems: true` so shared `$ref` item
    * factories are not re-declared within the same file (single/split) or tag
-   * bucket (tags/tags-split).
+   * bucket (tags/tags-split). Scope keys include the active mock generator
+   * type so separate `.msw.ts` / `.faker.ts` files each get their own copy.
    */
   arrayItemMockFactories?: Map<string, Set<string>>;
+  /**
+   * Set by `@orval/mock` while generating per-operation mock output so
+   * file-scoped helpers (e.g. array-item factory dedup) can distinguish
+   * separate mock generator files.
+   */
+  activeMockOutputType?: OutputMockType;
 }
 /**
  * Maps a `$dynamicAnchor` name to its resolution target.

package/dist/index.mjs

@@ -1320,7 +1320,7 @@ const getUnion = (value, enumName) => {
 };
 function getEnumUnionFromSchema(schema) {
 	if (!schema?.enum) return "";
-	return schema.enum.filter((val) => val !== null).map((val) => isString(val) ? `'${escape(val)}'` : String(val)).join(" | ");
+	return schema.enum.filter((val) => val !== null).map((val) => isString(val) ? `'${jsStringLiteralEscape(val)}'` : String(val)).join(" | ");
 }
 const stripNullUnion = (value) => value.replaceAll(/\s*\|\s*null/g, "").trim();
 const isSpreadableEnumRef = (schema, refName) => {
@@ -1707,13 +1707,13 @@ function getPropertyNamesEnumKeyType(item) {
 	if (Array.isArray(propertyNames.enum)) {
 		const enumValues = propertyNames.enum.filter((val) => isString(val));
 		if (enumValues.length > 0) return {
-			value: enumValues.map((val) => `'${escape(val)}'`).join(" | "),
+			value: enumValues.map((val) => `'${jsStringLiteralEscape(val)}'`).join(" | "),
 			imports: [],
 			dependencies: []
 		};
 	}
 	if (isString(propertyNames.const)) return {
-		value: `'${escape(propertyNames.const)}'`,
+		value: `'${jsStringLiteralEscape(propertyNames.const)}'`,
 		imports: [],
 		dependencies: []
 	};
@@ -1878,7 +1878,7 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 			const hasConst = constValue !== void 0;
 			let constLiteral;
 			if (!hasConst) constLiteral = void 0;
-			else if (isString(constValue)) constLiteral = `'${escape(constValue)}'`;
+			else if (isString(constValue)) constLiteral = `'${jsStringLiteralEscape(constValue)}'`;
 			else constLiteral = JSON.stringify(constValue);
 			const needsValueImport = hasConst && (resolvedValue.isEnum || resolvedValue.type === "enum");
 			const usedResolvedValue = !hasConst || needsValueImport;
@@ -2011,7 +2011,7 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 		else if (typeof constValue === "boolean") type = "boolean";
 		else type = "object";
 		return {
-			value: typeof constValue === "string" ? `'${escape(constValue)}'` : JSON.stringify(constValue),
+			value: typeof constValue === "string" ? `'${jsStringLiteralEscape(constValue)}'` : JSON.stringify(constValue),
 			imports: [],
 			schemas: [],
 			isEnum: false,
@@ -2152,7 +2152,7 @@ function getScalar({ item, name, context, formDataContext }) {
 			let value = "string";
 			let isEnum = false;
 			if (enumItems) {
-				value = enumItems.map((enumItem) => isString(enumItem) ? `'${escape(enumItem)}'` : `${enumItem}`).filter(Boolean).join(` | `);
+				value = enumItems.map((enumItem) => isString(enumItem) ? `'${jsStringLiteralEscape(enumItem)}'` : `${enumItem}`).filter(Boolean).join(` | `);
 				isEnum = true;
 			}
 			if (!formDataContext?.urlEncoded) {
@@ -2164,7 +2164,7 @@ function getScalar({ item, name, context, formDataContext }) {
 			}
 			if (context.output.override.useDates && (schemaFormat === "date" || schemaFormat === "date-time")) value = "Date";
 			value += nullable;
-			if (schemaConst) value = `'${schemaConst}'`;
+			if (schemaConst) value = `'${jsStringLiteralEscape(schemaConst)}'`;
 			return {
 				value,
 				isEnum,
@@ -2214,7 +2214,7 @@ function getScalar({ item, name, context, formDataContext }) {
 				nullable
 			});
 			if (enumItems) return {
-				value: enumItems.map((enumItem) => isString(enumItem) ? `'${escape(enumItem)}'` : String(enumItem)).filter(Boolean).join(` | `) + nullable,
+				value: enumItems.map((enumItem) => isString(enumItem) ? `'${jsStringLiteralEscape(enumItem)}'` : String(enumItem)).filter(Boolean).join(` | `) + nullable,
 				isEnum: true,
 				type: "string",
 				imports: [],
@@ -4457,8 +4457,9 @@ function findRefs(value) {
 	if (!value || typeof value !== "object") return [];
 	if (Array.isArray(value)) return value.flatMap((item) => findRefs(item));
 	const obj = value;
-	if (typeof obj.$ref === "string") return [obj.$ref];
-	return Object.values(obj).flatMap((val) => findRefs(val));
+	const refs = [];
+	if (typeof obj.$ref === "string") refs.push(obj.$ref);
+	return refs.concat(Object.values(obj).flatMap((val) => findRefs(val)));
 }
 function parseComponentRef(ref) {
 	const parts = ref.split("/");
@@ -5811,6 +5812,21 @@ function collapseInlineMockOutputs(mockOutputs) {
 	return mockOutputs.filter((m) => m.type !== OutputMockType.FAKER);
 }
 //#endregion
+//#region src/writers/mock-utils.ts
+function getMockDir(entry, mockConfig) {
+	if (!isFunction(entry) && entry.path) return entry.path;
+	return mockConfig.path;
+}
+function hasAnyMockPath(mockConfig) {
+	if (mockConfig.path) return true;
+	return mockConfig.generators.some((g) => !isFunction(g) && !!g.path);
+}
+function resolveMockSchemasPath(mockFilePath, schemasTarget) {
+	const ext = nodePath.extname(mockFilePath);
+	const targetExt = nodePath.extname(schemasTarget);
+	return getRelativeImportPath(mockFilePath, targetExt === ".schemas" ? schemasTarget + ext : targetExt ? schemasTarget : schemasTarget + ext);
+}
+//#endregion
 //#region src/writers/target.ts
 function emptyMockOutputFull$1(type) {
 	return {
@@ -5961,30 +5977,33 @@ interface TypedResponse<T> extends Response {
 //#region src/writers/single-mode.ts
 async function writeSingleMode({ builder, output, projectName, header, needSchema, generateSchemasInline }) {
 	try {
-		const { path } = getFileInfo(output.target, {
+		const { path: targetPath, filename, dirname, extension } = getFileInfo(output.target, {
 			backupFilename: conventionName(builder.info.title ?? "filename", output.namingConvention),
 			extension: output.fileExtension
 		});
 		const { imports, mockOutputs: rawMockOutputs, implementation, mutators, clientMutators, formData, formUrlEncoded, paramsSerializer, paramsFilter, fetchReviver } = generateTarget(builder, output);
-		const mockOutputs = collapseInlineMockOutputs(rawMockOutputs);
-		const implementationMock = mockOutputs.map((m) => m.implementation).join("\n\n");
-		const finalizedImplementationMock = builder.finalizeMockImplementation ? builder.finalizeMockImplementation(implementationMock, getFinalizeMockImplementationOptions(output, mockOutputs)) : implementationMock;
-		const importsMock = mockOutputs.flatMap((m) => m.imports);
-		let data = header;
-		const schemaCustomImportPath = getSchemasImportPath(output.schemas);
-		const schemasPath = output.schemas ? schemaCustomImportPath ?? getRelativeImportPath(path, getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname) : void 0;
 		const isAllowSyntheticDefaultImports = isSyntheticDefaultImportsAllow(output.tsconfig);
+		const shouldDeinlineMocks = hasAnyMockPath(output.mock);
+		const schemaCustomImportPath = getSchemasImportPath(output.schemas);
+		const schemasPath = output.schemas ? schemaCustomImportPath ?? getRelativeImportPath(targetPath, getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname) : void 0;
+		const relativeSchemasPath = schemasPath ?? "./" + filename + ".schemas" + extension.replace(/\.ts$/, "");
+		const schemasTarget = output.schemas ? getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname : targetPath;
 		const normalizedImports = imports.filter((imp) => {
 			const searchWords = [imp.alias, imp.name].filter((part) => Boolean(part?.length)).map((part) => escapeRegExp(part)).join("|");
 			if (!searchWords) return false;
 			return new RegExp(String.raw`\b(${searchWords})\b`, "g").test(implementation);
 		}).map((imp) => ({ ...imp }));
-		for (const mockImport of importsMock) {
-			const matchingImport = normalizedImports.find((imp) => imp.name === mockImport.name && (imp.alias ?? "") === (mockImport.alias ?? ""));
-			if (!matchingImport) continue;
-			if (!!mockImport.values || !!mockImport.isConstant || !!mockImport.default || !!mockImport.namespaceImport || !!mockImport.syntheticDefaultImport) matchingImport.values = true;
+		const collapsedMockOutputs = shouldDeinlineMocks ? [] : collapseInlineMockOutputs(rawMockOutputs);
+		if (!shouldDeinlineMocks) {
+			const importsMock = collapsedMockOutputs.flatMap((m) => m.imports);
+			for (const mockImport of importsMock) {
+				const matchingImport = normalizedImports.find((imp) => imp.name === mockImport.name && (imp.alias ?? "") === (mockImport.alias ?? ""));
+				if (!matchingImport) continue;
+				if (!!mockImport.values || !!mockImport.isConstant || !!mockImport.default || !!mockImport.namespaceImport || !!mockImport.syntheticDefaultImport) matchingImport.values = true;
+			}
 		}
-		const importsForBuilder = schemasPath ? generateImportsForBuilder(output, normalizedImports, schemasPath) : generateImportsForBuilder(output, normalizedImports.filter((imp) => !!imp.importPath), ".");
+		let data = header;
+		const importsForBuilder = schemasPath ? generateImportsForBuilder(output, normalizedImports, relativeSchemasPath) : generateImportsForBuilder(output, normalizedImports.filter((imp) => !!imp.importPath), ".");
 		data += builder.imports({
 			client: output.client,
 			implementation,
@@ -5998,10 +6017,10 @@ async function writeSingleMode({ builder, output, projectName, header, needSchem
 			packageJson: output.packageJson,
 			output
 		});
-		for (const mockOutput of mockOutputs) {
+		if (!shouldDeinlineMocks) for (const mockOutput of collapsedMockOutputs) {
 			const entry = output.mock.generators.find((g) => !isFunction(g) && g.type === mockOutput.type);
 			const filteredMockImports = mockOutput.imports.filter((impMock) => !normalizedImports.some((imp) => imp.name === impMock.name && (imp.alias ?? "") === (impMock.alias ?? "")));
-			const importsMockForBuilder = schemasPath ? generateImportsForBuilder(output, filteredMockImports, schemasPath) : generateImportsForBuilder(output, filteredMockImports.filter((imp) => !!imp.importPath), ".");
+			const importsMockForBuilder = schemasPath ? generateImportsForBuilder(output, filteredMockImports, relativeSchemasPath) : generateImportsForBuilder(output, filteredMockImports.filter((imp) => !!imp.importPath), ".");
 			data += builder.importsMock({
 				implementation: mockOutput.implementation,
 				imports: importsMockForBuilder,
@@ -6031,12 +6050,62 @@ async function writeSingleMode({ builder, output, projectName, header, needSchem
 		}
 		if (!output.schemas && needSchema) data += generateSchemasInline ? generateSchemasInline() : generateModelsInline(builder.schemas);
 		data += `${implementation.trim()}\n`;
-		if (mockOutputs.length > 0) {
-			data += "\n\n";
-			data += finalizedImplementationMock;
+		if (!shouldDeinlineMocks) {
+			const implementationMock = collapsedMockOutputs.map((m) => m.implementation).join("\n\n");
+			const finalizedImplementationMock = builder.finalizeMockImplementation ? builder.finalizeMockImplementation(implementationMock, getFinalizeMockImplementationOptions(output, collapsedMockOutputs)) : implementationMock;
+			if (collapsedMockOutputs.length > 0) {
+				data += "\n\n";
+				data += finalizedImplementationMock;
+			}
+		}
+		await writeGeneratedFile(targetPath, data);
+		const extraPaths = [];
+		if (shouldDeinlineMocks) {
+			const seenMockIndexKeys = /* @__PURE__ */ new Set();
+			const writtenMockEntries = [];
+			for (const mockOutput of rawMockOutputs) {
+				const rawEntry = output.mock.generators.find((g) => {
+					if (isFunction(g)) return mockOutput.type === OutputMockType.MSW;
+					return g.type === mockOutput.type;
+				});
+				if (!rawEntry) continue;
+				const mockExtension = isFunction(rawEntry) ? OutputMockType.MSW : getMockFileExtensionByTypeName(rawEntry);
+				const mockDir = getMockDir(rawEntry, output.mock) ?? dirname;
+				const mockFilePath = nodePath.join(mockDir, filename + "." + mockExtension + extension);
+				const mockRelativeSchemasPath = schemaCustomImportPath ?? resolveMockSchemasPath(mockFilePath, schemasTarget);
+				const importsMockForBuilder = schemasPath || mockDir !== dirname ? generateImportsForBuilder(output, mockOutput.imports, mockRelativeSchemasPath) : generateImportsForBuilder(output, mockOutput.imports.filter((imp) => !!imp.importPath), ".");
+				let mockData = header;
+				const finalizedMockImplementation = builder.finalizeMockImplementation ? builder.finalizeMockImplementation(mockOutput.implementation, getFinalizeMockImplementationOptions(output, mockOutput)) : mockOutput.implementation;
+				mockData += builder.importsMock({
+					implementation: finalizedMockImplementation,
+					imports: importsMockForBuilder,
+					projectName,
+					hasSchemaDir: !!output.schemas,
+					isAllowSyntheticDefaultImports,
+					options: isFunction(rawEntry) ? void 0 : rawEntry
+				});
+				mockData += `\n${finalizedMockImplementation}`;
+				await writeGeneratedFile(mockFilePath, mockData);
+				extraPaths.push(mockFilePath);
+				const indexKey = `${mockExtension}::${mockDir}`;
+				if (!seenMockIndexKeys.has(indexKey)) {
+					seenMockIndexKeys.add(indexKey);
+					writtenMockEntries.push({
+						extension: mockExtension,
+						mockDir
+					});
+				}
+			}
+			if (output.mock.indexMockFiles) {
+				const importExtension = getImportExtension(output.fileExtension, output.tsconfig);
+				for (const { extension: mockExt, mockDir } of writtenMockEntries) {
+					const indexMockPath = nodePath.join(mockDir, `index.${mockExt}${extension}`);
+					await writeGeneratedFile(indexMockPath, `export * from './${filename}.${mockExt}${importExtension}'\n`);
+					extraPaths.push(indexMockPath);
+				}
+			}
 		}
-		await writeGeneratedFile(path, data);
-		return [path];
+		return [targetPath, ...extraPaths];
 	} catch (error) {
 		const errorMsg = error instanceof Error ? error.message : "unknown error";
 		throw new Error(`Oups... 🍻. An Error occurred while writing file => ${errorMsg}`, { cause: error });
@@ -6054,6 +6123,7 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 		let implementationData = header;
 		const schemaCustomImportPath = getSchemasImportPath(output.schemas);
 		const relativeSchemasPath = output.schemas ? schemaCustomImportPath ?? getRelativeImportPath(targetPath, getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname) : "./" + filename + ".schemas" + extension.replace(/\.ts$/, "");
+		const schemasTarget = output.schemas ? getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname : nodePath.join(dirname, filename + ".schemas" + extension.replace(/\.ts$/, ""));
 		const isAllowSyntheticDefaultImports = isSyntheticDefaultImportsAllow(output.tsconfig);
 		const importsForBuilder = generateImportsForBuilder(output, imports, relativeSchemasPath);
 		implementationData += builder.imports({
@@ -6094,11 +6164,19 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 		const implementationPath = nodePath.join(dirname, implementationFilename);
 		await writeGeneratedFile(implementationPath, implementationData);
 		const mockPaths = [];
-		const writtenMockExtensions = /* @__PURE__ */ new Set();
+		const seenMockIndexKeys = /* @__PURE__ */ new Set();
+		const writtenMockEntries = [];
 		for (const mockOutput of mockOutputs) {
-			const entry = output.mock.generators.find((g) => !isFunction(g) && g.type === mockOutput.type);
-			if (!entry) continue;
-			const importsMockForBuilder = generateImportsForBuilder(output, mockOutput.imports, relativeSchemasPath);
+			const rawEntry = output.mock.generators.find((g) => {
+				if (isFunction(g)) return mockOutput.type === OutputMockType.MSW;
+				return g.type === mockOutput.type;
+			});
+			if (!rawEntry) continue;
+			const mockExtension = isFunction(rawEntry) ? OutputMockType.MSW : getMockFileExtensionByTypeName(rawEntry);
+			const mockDir = getMockDir(rawEntry, output.mock) ?? dirname;
+			const mockFilePath = nodePath.join(mockDir, filename + "." + mockExtension + extension);
+			const mockRelativeSchemasPath = schemaCustomImportPath ?? resolveMockSchemasPath(mockFilePath, schemasTarget);
+			const importsMockForBuilder = generateImportsForBuilder(output, mockOutput.imports, mockRelativeSchemasPath);
 			let mockData = header;
 			const finalizedMockImplementation = builder.finalizeMockImplementation ? builder.finalizeMockImplementation(mockOutput.implementation, getFinalizeMockImplementationOptions(output, mockOutput)) : mockOutput.implementation;
 			mockData += builder.importsMock({
@@ -6107,21 +6185,26 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 				projectName,
 				hasSchemaDir: !!output.schemas,
 				isAllowSyntheticDefaultImports,
-				options: entry
+				options: isFunction(rawEntry) ? void 0 : rawEntry
 			});
 			mockData += `\n${finalizedMockImplementation}`;
-			const mockExtension = getMockFileExtensionByTypeName(entry);
-			const mockPath = nodePath.join(dirname, filename + "." + mockExtension + extension);
-			await writeGeneratedFile(mockPath, mockData);
-			mockPaths.push(mockPath);
-			writtenMockExtensions.add(mockExtension);
+			await writeGeneratedFile(mockFilePath, mockData);
+			mockPaths.push(mockFilePath);
+			const indexKey = `${mockExtension}::${mockDir}`;
+			if (!seenMockIndexKeys.has(indexKey)) {
+				seenMockIndexKeys.add(indexKey);
+				writtenMockEntries.push({
+					extension: mockExtension,
+					mockDir
+				});
+			}
 		}
 		const indexMockPaths = [];
 		if (output.mock.indexMockFiles) {
 			const importExtension = getImportExtension(output.fileExtension, output.tsconfig);
-			for (const mockExtension of writtenMockExtensions) {
-				const indexMockPath = nodePath.join(dirname, `index.${mockExtension}${extension}`);
-				await writeGeneratedFile(indexMockPath, `export * from './${filename}.${mockExtension}${importExtension}'\n`);
+			for (const { extension: mockExt, mockDir } of writtenMockEntries) {
+				const indexMockPath = nodePath.join(mockDir, `index.${mockExt}${extension}`);
+				await writeGeneratedFile(indexMockPath, `export * from './${filename}.${mockExt}${importExtension}'\n`);
 				indexMockPaths.push(indexMockPath);
 			}
 		}
@@ -6172,7 +6255,8 @@ function mergeOperationMockOutputs(accMockOutputs, opMockOutputs) {
 	const result = accMockOutputs.map((m) => ({
 		type: m.type,
 		implementation: { ...m.implementation },
-		imports: [...m.imports]
+		imports: [...m.imports],
+		strictMockSchemaTypeNames: m.strictMockSchemaTypeNames ? [...m.strictMockSchemaTypeNames] : void 0
 	}));
 	for (const op of opMockOutputs) {
 		let acc = result.find((m) => m.type === op.type);
@@ -6199,7 +6283,8 @@ function initialMockOutputsForOperation(op) {
 			handler: m.implementation.handler,
 			handlerName: m.implementation.handlerName ? "  " + m.implementation.handlerName + "()" : ""
 		},
-		imports: [...m.imports]
+		imports: [...m.imports],
+		strictMockSchemaTypeNames: m.strictMockSchemaTypeNames ? [...m.strictMockSchemaTypeNames] : void 0
 	}));
 }
 function generateTargetTags(currentAcc, operation) {
@@ -6281,7 +6366,8 @@ function generateTargetForTags(builder, options) {
 						handler: m.implementation.handlerName ? m.implementation.handler + header.implementationMock + m.implementation.handlerName + footer.implementationMock : m.implementation.handler,
 						handlerName: m.implementation.handlerName
 					},
-					imports: m.imports
+					imports: m.imports,
+					strictMockSchemaTypeNames: m.strictMockSchemaTypeNames
 				}));
 				transformed[tag] = {
 					implementation: header.implementation + target.implementation + footer.implementation,
@@ -6315,16 +6401,10 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 	});
 	const target = generateTargetForTags(builder, output);
 	const isAllowSyntheticDefaultImports = isSyntheticDefaultImportsAllow(output.tsconfig);
-	if (output.mock.generators.some((g) => isFunction(g))) throw new Error("Function mock generators (ClientMockBuilder) are not supported in tags-split mode. Use typed generators ({ type: \"msw\" } or { type: \"faker\" }).");
-	const generatorEntries = output.mock.generators.filter((g) => !isFunction(g));
-	const indexFilePathsByType = /* @__PURE__ */ new Map();
-	if (output.mock.indexMockFiles) for (const entry of generatorEntries) {
-		const ext = getMockFileExtensionByTypeName(entry);
-		const indexPath = nodePath.join(dirname, `index.${ext}${extension}`);
-		indexFilePathsByType.set(ext, indexPath);
-		await fs$1.outputFile(indexPath, "");
-	}
-	const tagEntries = Object.entries(target);
+	const mockIndexEntries = [];
+	const seenMockIndexKeys = /* @__PURE__ */ new Set();
+	const schemasTarget = output.schemas ? getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname : nodePath.join(dirname, filename + ".schemas" + extension.replace(/\.ts$/, ""));
+	const tagEntries = Object.entries(target).toSorted(([a], [b]) => a.localeCompare(b));
 	const generatedFilePathsArray = await Promise.all(tagEntries.map(async ([tag, target]) => {
 		try {
 			const { imports, implementation, mockOutputs, mutators, clientMutators, formData, fetchReviver, formUrlEncoded, paramsSerializer, paramsFilter } = target;
@@ -6408,9 +6488,16 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 			await writeGeneratedFile(implementationPath, implementationData);
 			const mockPaths = [];
 			for (const mockOutput of mockOutputs) {
-				const entry = output.mock.generators.find((g) => !isFunction(g) && g.type === mockOutput.type);
-				if (!entry) continue;
-				const importsMockForBuilder = generateImportsForBuilder(output, mockOutput.imports, relativeSchemasPath);
+				const rawEntry = output.mock.generators.find((g) => {
+					if (isFunction(g)) return mockOutput.type === OutputMockType.MSW;
+					return g.type === mockOutput.type;
+				});
+				if (!rawEntry) continue;
+				const mockExtension = isFunction(rawEntry) ? OutputMockType.MSW : getMockFileExtensionByTypeName(rawEntry);
+				const mockDir = getMockDir(rawEntry, output.mock) ?? dirname;
+				const mockFilePath = nodePath.join(mockDir, tag, tag + "." + mockExtension + extension);
+				const mockRelativeSchemasPath = schemaCustomImportPath ?? resolveMockSchemasPath(mockFilePath, schemasTarget);
+				const importsMockForBuilder = generateImportsForBuilder(output, mockOutput.imports, mockRelativeSchemasPath);
 				const finalizedMockImplementation = builder.finalizeMockImplementation ? builder.finalizeMockImplementation(mockOutput.implementation, getFinalizeMockImplementationOptions(output, mockOutput)) : mockOutput.implementation;
 				let mockData = header;
 				mockData += builder.importsMock({
@@ -6419,12 +6506,23 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 					projectName,
 					hasSchemaDir: !!output.schemas,
 					isAllowSyntheticDefaultImports,
-					options: entry
+					options: isFunction(rawEntry) ? void 0 : rawEntry
 				});
 				mockData += `\n${finalizedMockImplementation}`;
-				const mockPath = nodePath.join(dirname, tag, tag + "." + getMockFileExtensionByTypeName(entry) + extension);
-				await writeGeneratedFile(mockPath, mockData);
-				mockPaths.push(mockPath);
+				await writeGeneratedFile(mockFilePath, mockData);
+				mockPaths.push(mockFilePath);
+				const indexKey = `${mockExtension}::${mockDir}`;
+				let indexEntry = mockIndexEntries.find((e) => e.ext === mockExtension && e.mockDir === mockDir);
+				if (!indexEntry) {
+					indexEntry = {
+						ext: mockExtension,
+						mockDir,
+						tags: []
+					};
+					mockIndexEntries.push(indexEntry);
+					seenMockIndexKeys.add(indexKey);
+				}
+				if (!indexEntry.tags.includes(tag)) indexEntry.tags.push(tag);
 			}
 			return [
 				implementationPath,
@@ -6435,17 +6533,11 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 			throw new Error(`Oups... 🍻. An Error occurred while splitting tag ${tag} => ${String(error)}`, { cause: error });
 		}
 	}));
-	if (output.mock.indexMockFiles) for (const entry of generatorEntries) {
-		const ext = getMockFileExtensionByTypeName(entry);
-		const indexFilePath = indexFilePathsByType.get(ext);
-		if (!indexFilePath) continue;
-		const indexContent = tagEntries.map(([tag]) => {
-			const localMockPath = joinSafe("./", tag, tag + "." + ext);
-			return ext === OutputMockType.MSW ? `export { get${pascal(tag)}Mock } from '${localMockPath}'\n` : `export * from '${localMockPath}'\n`;
-		}).join("");
-		await fs$1.appendFile(indexFilePath, indexContent);
-	}
-	return [...new Set([...indexFilePathsByType.values(), ...generatedFilePathsArray.flat()])];
+	if (output.mock.indexMockFiles) for (const { ext, mockDir, tags } of mockIndexEntries) await writeGeneratedFile(nodePath.join(mockDir, `index.${ext}${extension}`), tags.toSorted((a, b) => a.localeCompare(b)).map((tag) => {
+		const localMockPath = joinSafe("./", tag, tag + "." + ext);
+		return ext === OutputMockType.MSW ? `export { get${pascal(tag)}Mock } from '${localMockPath}'\n` : `export * from '${localMockPath}'\n`;
+	}).join(""));
+	return [...new Set([...output.mock.indexMockFiles ? mockIndexEntries.map(({ mockDir, ext }) => nodePath.join(mockDir, `index.${ext}${extension}`)) : [], ...generatedFilePathsArray.flat()])];
 }
 //#endregion
 //#region src/writers/tags-mode.ts
@@ -6456,25 +6548,30 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema,
 	});
 	const target = generateTargetForTags(builder, output);
 	const isAllowSyntheticDefaultImports = isSyntheticDefaultImportsAllow(output.tsconfig);
-	return (await Promise.all(Object.entries(target).map(async ([tag, target]) => {
+	const shouldDeinlineMocks = hasAnyMockPath(output.mock);
+	const mockIndexEntries = [];
+	const seenMockIndexKeys = /* @__PURE__ */ new Set();
+	const schemaCustomImportPath = getSchemasImportPath(output.schemas);
+	const schemasPathRelative = output.schemas ? schemaCustomImportPath ?? getRelativeImportPath(targetPath, getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname) : "./" + filename + ".schemas" + extension.replace(/\.ts$/, "");
+	const schemasTarget = output.schemas ? getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname : nodePath.join(dirname, filename + ".schemas" + extension.replace(/\.ts$/, ""));
+	const tagEntries = Object.entries(target).toSorted(([a], [b]) => a.localeCompare(b));
+	const generatedFilePathsArray = await Promise.all(tagEntries.map(async ([tag, target]) => {
 		try {
 			const { imports, implementation, mockOutputs: rawMockOutputs, mutators, clientMutators, formData, formUrlEncoded, fetchReviver, paramsSerializer, paramsFilter } = target;
-			const mockOutputs = collapseInlineMockOutputs(rawMockOutputs);
-			const importsMock = mockOutputs.flatMap((m) => m.imports);
-			const implementationMock = mockOutputs.map((m) => m.implementation).join("\n\n");
-			const finalizedImplementationMock = builder.finalizeMockImplementation ? builder.finalizeMockImplementation(implementationMock, getFinalizeMockImplementationOptions(output, mockOutputs)) : implementationMock;
-			let data = header;
-			const schemaCustomImportPath = getSchemasImportPath(output.schemas);
-			const schemasPathRelative = output.schemas ? schemaCustomImportPath ?? getRelativeImportPath(targetPath, getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname) : "./" + filename + ".schemas" + extension.replace(/\.ts$/, "");
 			const normalizedImports = imports.filter((imp) => {
 				const searchWords = [imp.alias, imp.name].filter((part) => Boolean(part?.length)).map((part) => escapeRegExp(part)).join("|");
 				if (!searchWords) return false;
 				return new RegExp(String.raw`\b(${searchWords})\b`, "g").test(implementation);
 			}).map((imp) => ({ ...imp }));
-			for (const mockImport of importsMock) {
-				const matchingImport = normalizedImports.find((imp) => imp.name === mockImport.name && (imp.alias ?? "") === (mockImport.alias ?? ""));
-				if (!matchingImport) continue;
-				if (!!mockImport.values || !!mockImport.isConstant || !!mockImport.default || !!mockImport.namespaceImport || !!mockImport.syntheticDefaultImport) matchingImport.values = true;
+			const collapsedMockOutputs = shouldDeinlineMocks ? [] : collapseInlineMockOutputs(rawMockOutputs);
+			let data = header;
+			if (!shouldDeinlineMocks) {
+				const importsMock = collapsedMockOutputs.flatMap((m) => m.imports);
+				for (const mockImport of importsMock) {
+					const matchingImport = normalizedImports.find((imp) => imp.name === mockImport.name && (imp.alias ?? "") === (mockImport.alias ?? ""));
+					if (!matchingImport) continue;
+					if (!!mockImport.values || !!mockImport.isConstant || !!mockImport.default || !!mockImport.namespaceImport || !!mockImport.syntheticDefaultImport) matchingImport.values = true;
+				}
 			}
 			const importsForBuilder = generateImportsForBuilder(output, normalizedImports, schemasPathRelative);
 			data += builder.imports({
@@ -6490,7 +6587,7 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema,
 				packageJson: output.packageJson,
 				output
 			});
-			for (const mockOutput of mockOutputs) {
+			if (!shouldDeinlineMocks) for (const mockOutput of collapsedMockOutputs) {
 				const entry = output.mock.generators.find((g) => !isFunction(g) && g.type === mockOutput.type);
 				const importsMockForBuilder = generateImportsForBuilder(output, mockOutput.imports.filter((impMock) => !normalizedImports.some((imp) => imp.name === impMock.name && (imp.alias ?? "") === (impMock.alias ?? ""))), schemasPathRelative);
 				data += builder.importsMock({
@@ -6524,17 +6621,73 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema,
 				data += "\n";
 			}
 			data += implementation;
-			if (mockOutputs.length > 0) {
-				data += "\n\n";
-				data += finalizedImplementationMock;
+			if (!shouldDeinlineMocks) {
+				const implementationMock = collapsedMockOutputs.map((m) => m.implementation).join("\n\n");
+				const finalizedImplementationMock = builder.finalizeMockImplementation ? builder.finalizeMockImplementation(implementationMock, getFinalizeMockImplementationOptions(output, collapsedMockOutputs)) : implementationMock;
+				if (collapsedMockOutputs.length > 0) {
+					data += "\n\n";
+					data += finalizedImplementationMock;
+				}
 			}
-			const implementationPath = nodePath.join(dirname, `${kebab(tag)}${extension}`);
+			const kebabTag = kebab(tag);
+			const implementationPath = nodePath.join(dirname, `${kebabTag}${extension}`);
 			await writeGeneratedFile(implementationPath, data);
-			return [implementationPath, ...schemasPath ? [schemasPath] : []];
+			const extraPaths = [];
+			if (shouldDeinlineMocks) for (const mockOutput of rawMockOutputs) {
+				const rawEntry = output.mock.generators.find((g) => {
+					if (isFunction(g)) return mockOutput.type === OutputMockType.MSW;
+					return g.type === mockOutput.type;
+				});
+				if (!rawEntry) continue;
+				const mockExtension = isFunction(rawEntry) ? OutputMockType.MSW : getMockFileExtensionByTypeName(rawEntry);
+				const mockDir = getMockDir(rawEntry, output.mock) ?? dirname;
+				const mockFilePath = nodePath.join(mockDir, kebabTag, kebabTag + "." + mockExtension + extension);
+				const mockRelativeSchemasPath = schemaCustomImportPath ?? resolveMockSchemasPath(mockFilePath, schemasTarget);
+				const importsMockForBuilder = generateImportsForBuilder(output, mockOutput.imports, mockRelativeSchemasPath);
+				let mockData = header;
+				const finalizedMockImplementation = builder.finalizeMockImplementation ? builder.finalizeMockImplementation(mockOutput.implementation, getFinalizeMockImplementationOptions(output, mockOutput)) : mockOutput.implementation;
+				mockData += builder.importsMock({
+					implementation: finalizedMockImplementation,
+					imports: importsMockForBuilder,
+					projectName,
+					hasSchemaDir: !!output.schemas,
+					isAllowSyntheticDefaultImports,
+					options: isFunction(rawEntry) ? void 0 : rawEntry
+				});
+				mockData += `\n${finalizedMockImplementation}`;
+				await writeGeneratedFile(mockFilePath, mockData);
+				extraPaths.push(mockFilePath);
+				const indexKey = `${mockExtension}::${mockDir}`;
+				let indexEntry = mockIndexEntries.find((e) => e.ext === mockExtension && e.mockDir === mockDir);
+				if (!indexEntry) {
+					indexEntry = {
+						ext: mockExtension,
+						mockDir,
+						tags: []
+					};
+					mockIndexEntries.push(indexEntry);
+					seenMockIndexKeys.add(indexKey);
+				}
+				if (!indexEntry.tags.includes(kebabTag)) indexEntry.tags.push(kebabTag);
+			}
+			return [
+				implementationPath,
+				...schemasPath ? [schemasPath] : [],
+				...extraPaths
+			];
 		} catch (error) {
 			throw new Error(`Oups... 🍻. An Error occurred while writing tag ${tag} => ${String(error)}`, { cause: error });
 		}
-	}))).flat();
+	}));
+	if (shouldDeinlineMocks && output.mock.indexMockFiles) for (const { ext, mockDir, tags } of mockIndexEntries) {
+		const indexPath = nodePath.join(mockDir, `index.${ext}${extension}`);
+		await writeGeneratedFile(indexPath, tags.toSorted((a, b) => a.localeCompare(b)).map((kebabTag) => {
+			const localMockPath = joinSafe("./", kebabTag, kebabTag + "." + ext);
+			return ext === OutputMockType.MSW ? `export { get${pascal(kebabTag)}Mock } from '${localMockPath}'\n` : `export * from '${localMockPath}'\n`;
+		}).join(""));
+		generatedFilePathsArray.push([indexPath]);
+	}
+	return generatedFilePathsArray.flat();
 }
 //#endregion
 export { BODY_TYPE_NAME, DefaultTag, EnumGeneration, ErrorWithTag, FormDataArrayHandling, GetterPropType, LogLevels, NAMED_COMPONENT_SECTIONS, NamingConvention, OutputClient, OutputHttpClient, OutputMockType, OutputMode, PropertySortOrder, RefComponentSuffix, SchemaType, SupportedFormatter, TEMPLATE_TAG_REGEX, URL_REGEX, VERBS_WITH_BODY, Verbs, addDependency, asyncReduce, buildAngularParamsFilterExpression, buildDynamicScope, camel, collectReferencedComponents, combineSchemas, compareVersions, conventionName, count, createDebugger, createLogger, createSuccessMessage, createTypeAliasIfNeeded, dedupeUnionType, dynamicAnchorToParamName, dynamicAnchorsToUniqueParamNames, dynamicImport, escape, escapeRegExp, extractBoundAliasInfo, filterByContentType, filteredVerbs, fixCrossDirectoryImports, fixRegularSchemaImports, generalJSTypes, generalJSTypesWithArray, generateAxiosOptions, generateBodyMutatorConfig, generateBodyOptions, generateComponentDefinition, generateDependencyImports, generateFactory, generateFormDataAndUrlEncodedFunction, generateImports, generateModelInline, generateModelsInline, generateMutator, generateMutatorConfig, generateMutatorImports, generateMutatorRequestOptions, generateOptions, generateParameterDefinition, generateQueryParamsAxiosConfig, generateSchemasDefinition, generateTarget, generateTargetForTags, generateVerbImports, generateVerbOptions, generateVerbsOptions, getAngularFilteredParamsCallExpression, getAngularFilteredParamsExpression, getAngularFilteredParamsHelperBody, getArray, getBaseUrlRuntimeImports, getBodiesByContentType, getBody, getCombinedEnumValue, getDefaultContentType, getDynamicAnchorName, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getEnumUnionFromSchema, getExtension, getFileInfo, getFormDataFieldFileType, getFullRoute, getImportExtension, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getPropertySafe, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getResponseTypeCategory, getRoute, getRouteAsArray, getScalar, getSchemasImportPath, getSuccessResponseType, getTypedResponse, getWarningCount, isBinaryContentType, isBinaryScalarSchema, isBoolean, isComponentRef, isDirectory, isDynamicReference, isFakerMock, isFunction, isModule, isMswMock, isNullish, isNumber, isNumeric, isObject, isReference, isSchema, isString, isStringLike, isSyntheticDefaultImportsAllow, isUrl, isVerb, isVerbose, jsDoc, jsStringEscape, jsStringLiteralEscape, kebab, keyValuePairsToJsDoc, log, logError, logVerbose, logWarning, makeRouteSafe, mergeDeep, mismatchArgsMessage, pascal, removeFilesAndEmptyFolders, resetWarnings, resolveDiscriminators, resolveDynamicRef, resolveExampleRefs, resolveInstalledVersion, resolveInstalledVersions, resolveObject, resolveRef, resolveValue, sanitize, setVerbose, snake, sortByPriority, splitSchemasByType, startMessage, stringify, toObjectString, path_exports as upath, upper, wrapRouteParameters, writeGeneratedFile, writeModelInline, writeModelsInline, writeSchema, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode };