@zodmire/core 0.1.0 → 0.1.1

package/mod.d.mts

@@ -25,7 +25,7 @@ interface VendoredFileEntry {
 }
 /** The manifest of config files to vendor into end-user projects. */
 declare const VENDORED_FILE_MANIFEST: readonly VendoredFileEntry[];
-/** Rewrite Deno-style `npm:zod@*` imports to bare `"zod"` for end-user consumption. */
+/** Rewrite `npm:zod@*` imports to bare `"zod"` for end-user consumption. */
 declare function rewriteImports(content: string): string;
 /** Apply import rewriting and prepend a version header. */
 declare function prepareVendoredFile(content: string, generatorVersion: string): string;

package/mod.mjs

@@ -63,7 +63,7 @@ const VENDORED_FILE_MANIFEST = [
 		sourceRelativePath: "packages/config/composition_config.ts"
 	}
 ];
-/** Rewrite Deno-style `npm:zod@*` imports to bare `"zod"` for end-user consumption. */
+/** Rewrite `npm:zod@*` imports to bare `"zod"` for end-user consumption. */
 function rewriteImports(content) {
 	return content.replace(/["']npm:zod@[^"']*["']/g, "\"zod\"");
 }
@@ -2069,6 +2069,9 @@ function readModelPortBaseFileName(readModelName) {
 function resolvedReadModelName$2(query) {
 	return query.readSide?.readModelName ?? query.readModelName ?? query.name;
 }
+function queryOutputExportName$1(query) {
+	return query.outputSchemaExportName?.trim() || void 0;
+}
 function queryReadModelPortTypeName$1(query) {
 	return `${readModelContractName$3(resolvedReadModelName$2(query))}RepositoryPort`;
 }
@@ -2130,7 +2133,7 @@ ${query.outputFields.map((f) => {
 function createListQueryHandlerStub(_spec, query) {
 	const handlerName = `${pascalCase(query.name)}Handler`;
 	const queryTypeName = `${pascalCase(query.name)}Query`;
-	const outputContractName = queryOutputContractName$2(query);
+	const outputContractName = queryOutputContractName$1(query);
 	const readModelPortType = queryReadModelPortTypeName$1(query);
 	const readModelVariable = queryReadModelVariableName$1(query);
 	const readModelMethodName = queryReadModelMethodName$1(query);
@@ -2193,7 +2196,7 @@ ${(query.inputFields ?? []).map((f) => {
 `;
 }
 function createViewContractStub(query) {
-	return `export interface ${queryOutputContractName$2(query)} {
+	return `export interface ${queryOutputContractName$1(query)} {
 ${query.outputFields.map((f) => {
 		const opt = f.optional ? "?" : "";
 		return `  readonly ${camelCase(f.name)}${opt}: ${formatFieldType(f)};`;
@@ -2201,11 +2204,14 @@ ${query.outputFields.map((f) => {
 }
 `;
 }
-function queryOutputContractName$2(query) {
-	const baseName = pascalCase(resolvedReadModelName$2(query));
-	return baseName.endsWith("View") ? baseName : `${baseName}View`;
+function queryOutputContractName$1(query) {
+	const outputExportName = queryOutputExportName$1(query);
+	if (outputExportName) return pascalCase(outputExportName);
+	return readModelContractName$3(resolvedReadModelName$2(query));
 }
 function queryViewFileBase$2(query) {
+	const outputExportName = queryOutputExportName$1(query);
+	if (outputExportName) return kebabCase(outputExportName).replace(/-view$/, "");
 	return kebabCase(resolvedReadModelName$2(query)).replace(/-view$/, "");
 }
 function createCommandStub(spec, command) {
@@ -2457,7 +2463,7 @@ export interface ${queryName} {
 }
 function buildQueryHandlerBody(_spec, query) {
 	const queryTypeName = `${pascalCase(query.name)}Query`;
-	const outputContractName = queryOutputContractName$2(query);
+	const outputContractName = queryOutputContractName$1(query);
 	const readModelPortType = queryReadModelPortTypeName$1(query);
 	const handlerName = `${pascalCase(query.name)}Handler`;
 	const readModelVariable = queryReadModelVariableName$1(query);
@@ -2483,7 +2489,7 @@ export class ${handlerName} {
 function createQueryHandlerStub(_spec, query) {
 	if (query.outputFields && query.outputFields.length > 0) return buildQueryHandlerBody(_spec, query);
 	const queryTypeName = `${pascalCase(query.name)}Query`;
-	const outputContractName = queryOutputContractName$2(query);
+	const outputContractName = queryOutputContractName$1(query);
 	const readModelPortType = queryReadModelPortTypeName$1(query);
 	const handlerName = `${pascalCase(query.name)}Handler`;
 	const readModelVariable = queryReadModelVariableName$1(query);
@@ -2557,7 +2563,7 @@ function createReadModelRepositoryPortStub(readModelName, queries) {
 	importLines.set("tx", `import type { Transaction } from "../../../../../lib/transaction.ts";`);
 	const queryMethodLines = queries.slice().sort((left, right) => left.name.localeCompare(right.name)).map((query) => {
 		const queryTypeName = `${pascalCase(query.name)}Query`;
-		const outputContractName = queryOutputContractName$2(query);
+		const outputContractName = queryOutputContractName$1(query);
 		const viewFileBase = queryViewFileBase$2(query);
 		const returnType = query.queryKind === "list" ? `PaginatedResult<${outputContractName}>` : outputContractName;
 		if (query.queryKind === "list") needsPaginatedResult = true;
@@ -2590,7 +2596,7 @@ function inputContractFileName(commandOrQueryName) {
 	return `${kebabCase(commandOrQueryName)}.input`;
 }
 function viewContractFileName(query) {
-	return `${kebabCase(resolvedReadModelName$2(query)).replace(/-view$/, "")}.view`;
+	return `${queryViewFileBase$2(query)}.view`;
 }
 function createHandlerMapStub(spec) {
 	const contextPascal = pascalCase(spec.context.name);
@@ -2682,7 +2688,7 @@ function createPublishedReadBoundaryStub(contextSpec) {
 		const queryHandlerName = `${pascalCase(query.name)}Handler`;
 		const handlerVarName = `${camelCase(query.name)}Handler`;
 		const queryTypeName = `${pascalCase(query.name)}Query`;
-		const outputContractName = queryOutputContractName$2(query);
+		const outputContractName = queryOutputContractName$1(query);
 		const queryFileName = kebabCase(query.name);
 		const outputFileName = queryViewFileBase$2(query);
 		const readModelDepName = queryReadModelVariableName$1(query);
@@ -2916,10 +2922,17 @@ function readModelTableConstName(readModelName) {
 function resolvedReadModelName$1(query) {
 	return query.readSide?.readModelName ?? query.readModelName ?? query.name;
 }
-function queryOutputContractName$1(query) {
+function queryOutputExportName(query) {
+	return query.outputSchemaExportName?.trim() || void 0;
+}
+function queryOutputContractName(query) {
+	const outputExportName = queryOutputExportName(query);
+	if (outputExportName) return pascalCase(outputExportName);
 	return readModelContractName$2(resolvedReadModelName$1(query));
 }
 function queryViewFileBase$1(query) {
+	const outputExportName = queryOutputExportName(query);
+	if (outputExportName) return kebabCase(outputExportName).replace(/-view$/, "");
 	return readModelRepositoryFileBase$1(resolvedReadModelName$1(query));
 }
 function queryReadModelMethodName(query) {
@@ -3926,7 +3939,7 @@ function createReadModelRepositorySkeleton(modulePath, readModelName, queries) {
 	const methodBlocks = queries.slice().sort((left, right) => left.name.localeCompare(right.name)).map((query) => {
 		const methodName = queryReadModelMethodName(query);
 		const queryTypeName = `${pascalCase(query.name)}Query`;
-		const outputTypeName = queryOutputContractName$1(query);
+		const outputTypeName = queryOutputContractName(query);
 		const viewFileBase = queryViewFileBase$1(query);
 		importLines.set(`query:${queryTypeName}`, `import type { ${queryTypeName} } from "../../../../../core/contexts/${modulePath}/application/queries/${kebabCase(query.name)}.query.ts";`);
 		importLines.set(`view:${outputTypeName}`, `import type { ${outputTypeName} } from "../../../../../core/contexts/${modulePath}/application/contracts/${viewFileBase}.view.ts";`);
@@ -6106,10 +6119,14 @@ ${Object.entries(fields).map(([fieldName, expr]) => `  readonly ${camelCase(fiel
 }`;
 }
 function sourceQueryViewTypeName(acl) {
+	const outputExportName = acl.sourceQuery.outputSchemaExportName?.trim();
+	if (outputExportName) return pascalCase(outputExportName);
 	const baseName = acl.sourceQuery.readModelName ? pascalCase(acl.sourceQuery.readModelName) : pascalCase(acl.sourceQuery.name);
 	return baseName.endsWith("View") ? baseName : `${baseName}View`;
 }
 function sourceQueryViewFileName(acl) {
+	const outputExportName = acl.sourceQuery.outputSchemaExportName?.trim();
+	if (outputExportName) return `${kebabCase(outputExportName).replace(/-view$/, "")}.view.ts`;
 	return `${(acl.sourceQuery.readModelName ? kebabCase(acl.sourceQuery.readModelName) : kebabCase(acl.sourceQuery.name)).replace(/-view$/, "")}.view.ts`;
 }
 function readResponseFieldType(acl, mapping) {
@@ -6563,23 +6580,22 @@ function uniqueQueriesByReadModel(queries) {
 	}
 	return [...queriesByReadModel.values()].sort((left, right) => resolvedReadModelName(left).localeCompare(resolvedReadModelName(right)));
 }
-function queryOutputContractName(query) {
-	return readModelContractName(resolvedReadModelName(query));
-}
 function queryViewFileBase(query) {
+	const outputExportName = query.outputSchemaExportName?.trim();
+	if (outputExportName) return kebabCase(outputExportName).replace(/-view$/, "");
 	return readModelRepositoryFileBase(resolvedReadModelName(query));
 }
 function queryReadModelPortTypeName(query) {
-	return `${queryOutputContractName(query)}RepositoryPort`;
+	return `${readModelContractName(resolvedReadModelName(query))}RepositoryPort`;
 }
 function queryReadModelVariableName(query) {
 	return camelCase(queryReadModelPortTypeName(query));
 }
 function queryReadModelRepositoryClassName(query) {
-	return `Drizzle${queryOutputContractName(query)}Repository`;
+	return `Drizzle${readModelContractName(resolvedReadModelName(query))}Repository`;
 }
 function queryReadModelRepositoryAlias(contextSymbolStem, query) {
-	return `${contextSymbolStem}${queryOutputContractName(query)}Repository`;
+	return `${contextSymbolStem}${readModelContractName(resolvedReadModelName(query))}Repository`;
 }
 function uniqueReadContexts(acls) {
 	const seen = /* @__PURE__ */ new Set();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zodmire/core",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "license": "MIT",
   "type": "module",
   "main": "./mod.mjs",
@@ -17,7 +17,7 @@
     }
   },
   "dependencies": {
-    "@zodmire/config": "^0.1.0",
+    "@zodmire/config": "^0.1.1",
     "@traversable/zod": "^0.0.57",
     "drizzle-kit": "^0.31.9",
     "oxfmt": "^0.42.0",