@pattern-stack/codegen 0.6.7 → 0.7.0

package/templates/entity/new/backend/domain/entity.ejs.t

@@ -16,23 +16,6 @@ force: true
 <% if (hasEntityRefFields) { -%>
 import type { EntityType } from '<%= locations.dbSchemaServer.import %>';
 <% } -%>
-<%
-// Collect unique non-self-referential imports
-const importedEntities = new Set();
-[...belongsToRelations, ...hasManyRelations, ...hasOneRelations].forEach((rel) => {
-  if (rel.target !== name) {
-    importedEntities.add(rel.target);
-  }
-});
--%>
-<% if (importedEntities.size > 0) { -%>
-
-<% importedEntities.forEach((target) => {
-  const targetClass = target.charAt(0).toUpperCase() + target.slice(1).replace(/_([a-z])/g, (_, c) => c.toUpperCase());
--%>
-import type { <%= targetClass %> } from '../<%= target %>/<%= target %>.entity';
-<% }) -%>
-<% } -%>
 
 export class <%= className %> {
 	constructor(
@@ -51,28 +34,12 @@ export class <%= className %> {
 		public readonly validFrom: Date | null,
 		public readonly validTo: Date | null,
 		public readonly isActive: boolean,
-<% } -%>
-<% if (hasRelationships) { -%>
-		// Loaded relations (optional, populated when eager-loaded)
-<% belongsToRelations.forEach((rel) => { -%>
-		public readonly <%= rel.name %>?: <%= rel.targetClass %>,
-<% }) -%>
-<% hasManyRelations.forEach((rel) => { -%>
-		public readonly <%= rel.name %>?: <%= rel.targetClass %>[],
-<% }) -%>
-<% hasOneRelations.forEach((rel) => { -%>
-		public readonly <%= rel.name %>?: <%= rel.targetClass %>,
-<% }) -%>
 <% } -%>
 	) {}
 
 	static fromRecord(
 		// biome-ignore lint/suspicious/noExplicitAny: Drizzle records have dynamic shape
 		record: Record<string, any>,
-<% if (hasRelationships) { -%>
-		// biome-ignore lint/suspicious/noExplicitAny: Returns different entity types
-		mapRelation?: (name: string, data: unknown) => any,
-<% } -%>
 	): <%= className %> {
 		return new <%= className %>(
 			record.id,
@@ -90,17 +57,6 @@ export class <%= className %> {
 			record.validFrom,
 			record.validTo,
 			record.isActive,
-<% } -%>
-<% if (hasRelationships) { -%>
-<% belongsToRelations.forEach((rel) => { -%>
-			record.<%= rel.name %> ? mapRelation?.('<%= rel.name %>', record.<%= rel.name %>) : undefined,
-<% }) -%>
-<% hasManyRelations.forEach((rel) => { -%>
-			record.<%= rel.name %> ? mapRelation?.('<%= rel.name %>', record.<%= rel.name %>) : undefined,
-<% }) -%>
-<% hasOneRelations.forEach((rel) => { -%>
-			record.<%= rel.name %> ? mapRelation?.('<%= rel.name %>', record.<%= rel.name %>) : undefined,
-<% }) -%>
 <% } -%>
 		);
 	}

package/templates/entity/new/backend/domain/grouped-index.ejs.t

@@ -14,23 +14,6 @@ force: true
 <% if (hasEntityRefFields) { -%>
 import type { EntityType } from '<%= locations.dbSchemaServer.import %>';
 <% } -%>
-<%
-// Collect unique non-self-referential imports
-const importedEntities = new Set();
-[...belongsToRelations, ...hasManyRelations, ...hasOneRelations].forEach((rel) => {
-  if (rel.target !== name) {
-    importedEntities.add(rel.target);
-  }
-});
--%>
-<% if (importedEntities.size > 0) { -%>
-
-<% importedEntities.forEach((target) => {
-  const targetClass = target.charAt(0).toUpperCase() + target.slice(1).replace(/_([a-z])/g, (_, c) => c.toUpperCase());
--%>
-import type { <%= targetClass %> } from '../<%= target %>';
-<% }) -%>
-<% } -%>
 
 // ============================================================================
 // Entity
@@ -53,28 +36,12 @@ export class <%= className %> {
 		public readonly validFrom: Date | null,
 		public readonly validTo: Date | null,
 		public readonly isActive: boolean,
-<% } -%>
-<% if (hasRelationships) { -%>
-		// Loaded relations (optional, populated when eager-loaded)
-<% belongsToRelations.forEach((rel) => { -%>
-		public readonly <%= rel.name %>?: <%= rel.targetClass %>,
-<% }) -%>
-<% hasManyRelations.forEach((rel) => { -%>
-		public readonly <%= rel.name %>?: <%= rel.targetClass %>[],
-<% }) -%>
-<% hasOneRelations.forEach((rel) => { -%>
-		public readonly <%= rel.name %>?: <%= rel.targetClass %>,
-<% }) -%>
 <% } -%>
 	) {}
 
 	static fromRecord(
 		// biome-ignore lint/suspicious/noExplicitAny: Drizzle records have dynamic shape
 		record: Record<string, any>,
-<% if (hasRelationships) { -%>
-		// biome-ignore lint/suspicious/noExplicitAny: Returns different entity types
-		mapRelation?: (name: string, data: unknown) => any,
-<% } -%>
 	): <%= className %> {
 		return new <%= className %>(
 			record.id,
@@ -92,17 +59,6 @@ export class <%= className %> {
 			record.validFrom,
 			record.validTo,
 			record.isActive,
-<% } -%>
-<% if (hasRelationships) { -%>
-<% belongsToRelations.forEach((rel) => { -%>
-			record.<%= rel.name %> ? mapRelation?.('<%= rel.name %>', record.<%= rel.name %>) : undefined,
-<% }) -%>
-<% hasManyRelations.forEach((rel) => { -%>
-			record.<%= rel.name %> ? mapRelation?.('<%= rel.name %>', record.<%= rel.name %>) : undefined,
-<% }) -%>
-<% hasOneRelations.forEach((rel) => { -%>
-			record.<%= rel.name %> ? mapRelation?.('<%= rel.name %>', record.<%= rel.name %>) : undefined,
-<% }) -%>
 <% } -%>
 		);
 	}
@@ -111,18 +67,6 @@ export class <%= className %> {
 // ============================================================================
 // Repository Interface
 // ============================================================================
-<% if (hasRelationships) { -%>
-
-/**
- * Type-safe eager loading options.
- * Pass to repository methods to include related entities.
- */
-export type <%= className %>With = {
-<% relationships.forEach((rel) => { -%>
-	<%= rel.name %>?: boolean;
-<% }) -%>
-};
-<% } -%>
 
 /**
  * Domain-level input types for repository operations.
@@ -143,8 +87,8 @@ export type Update<%= className %>Input = Partial<Create<%= className %>Input>;
 
 export interface I<%= className %>Repository {
 	create(input: Create<%= className %>Input): Promise<<%= className %>>;
-	findById(id: string<%= hasRelationships ? `, include?: ${className}With` : '' %>): Promise<<%= className %> | null>;
-	findAll(<%= hasRelationships ? `include?: ${className}With` : '' %>): Promise<<%= className %>[]>;
+	findById(id: string): Promise<<%= className %> | null>;
+	findAll(): Promise<<%= className %>[]>;
 	update(id: string, input: Update<%= className %>Input): Promise<<%= className %> | null>;
 	delete(id: string): Promise<<%= className %> | null>;
 <% if (hasSoftDelete) { -%>
@@ -154,10 +98,10 @@ export interface I<%= className %>Repository {
 	findOnlyDeleted(): Promise<<%= className %>[]>;
 <% } -%>
 <% belongsToRelations.forEach((rel) => { -%>
-	findBy<%= rel.foreignKeyPascal %>(id: string<%= hasRelationships ? `, include?: ${className}With` : '' %>): Promise<<%= className %>[]>;
+	findBy<%= rel.foreignKeyPascal %>(id: string, opts?: { cursor?: string; limit?: number }): Promise<<%= className %>[]>;
 <% }) -%>
 <% entityRefFields.forEach((ref) => { -%>
-	findBy<%= ref.pascalName %>(entityType: EntityType, entityId: string<%= hasRelationships ? `, include?: ${className}With` : '' %>): Promise<<%= className %>[]>;
+	findBy<%= ref.pascalName %>(entityType: EntityType, entityId: string): Promise<<%= className %>[]>;
 <% }) -%>
 }
 <% } -%>

package/templates/entity/new/backend/domain/index.ejs.t

@@ -11,5 +11,5 @@ force: true
  * when using separate file layout (file_grouping: "separate")
  */
 
-export * from './<%= name %>.entity';
-export * from './<%= name %>.repository.interface';
+export * from './<%= fileNames.entity.replace('.ts', '') %>';
+export * from './<%= fileNames.repositoryInterface.replace('.ts', '') %>';

package/templates/entity/new/backend/domain/repository-interface.ejs.t

@@ -9,25 +9,13 @@ force: true
  * Generated by entity codegen - do not edit directly
  */
 
-import type { <%= className %> } from './<%= name %>.entity';
+import type { <%= className %> } from './<%= (typeof fileNames !== 'undefined' ? fileNames.entity : name + '.entity.ts').replace('.ts', '') %>';
 <% if (hasEntityRefFields) { -%>
 import type { EntityType } from '<%= locations.dbSchemaServer.import %>';
 <% } -%>
 <% if (hasEmits && (createEventType || updateEventType || deleteEventType)) { -%>
 import type { DrizzleTransaction } from '<%= eventsTokenImport %>';
 <% } -%>
-<% if (hasRelationships) { -%>
-
-/**
- * Type-safe eager loading options.
- * Pass to repository methods to include related entities.
- */
-export type <%= className %>With = {
-<% relationships.forEach((rel) => { -%>
-	<%= rel.name %>?: boolean;
-<% }) -%>
-};
-<% } -%>
 
 /**
  * Domain-level input types for repository operations.
@@ -48,8 +36,8 @@ export type Update<%= className %>Input = Partial<Create<%= className %>Input>;
 
 export interface I<%= className %>Repository {
 	create(input: Create<%= className %>Input<%= (hasEmits && createEventType) ? ', tx?: DrizzleTransaction' : '' %>): Promise<<%= className %>>;
-	findById(id: string<%= hasRelationships ? `, include?: ${className}With` : '' %>): Promise<<%= className %> | null>;
-	findAll(<%= hasRelationships ? `include?: ${className}With` : '' %>): Promise<<%= className %>[]>;
+	findById(id: string): Promise<<%= className %> | null>;
+	findAll(): Promise<<%= className %>[]>;
 	update(id: string, input: Update<%= className %>Input<%= (hasEmits && updateEventType) ? ', tx?: DrizzleTransaction' : '' %>): Promise<<%= className %> | null>;
 	delete(id: string<%= (hasEmits && deleteEventType) ? ', tx?: DrizzleTransaction' : '' %>): Promise<<%= className %> | null>;
 <% if (hasSoftDelete) { -%>
@@ -58,16 +46,27 @@ export interface I<%= className %>Repository {
 	findWithDeleted(): Promise<<%= className %>[]>;
 	findOnlyDeleted(): Promise<<%= className %>[]>;
 <% } -%>
+<%_
+// CGP-358: FK methods with opts take priority. Always emit FK signatures with opts.
+// Skip declarative query signature when FK covers the same method name.
+const _riFkMethodNames = new Set(belongsToRelations.map(rel => `findBy${rel.foreignKeyPascal}`));
+_%>
 <% belongsToRelations.forEach((rel) => { -%>
-	findBy<%= rel.foreignKeyPascal %>(id: string<%= hasRelationships ? `, include?: ${className}With` : '' %>): Promise<<%= className %>[]>;
+	findBy<%= rel.foreignKeyPascal %>(id: string, opts?: { cursor?: string; limit?: number }): Promise<<%= className %>[]>;
 <% }) -%>
 <% entityRefFields.forEach((ref) => { -%>
-	findBy<%= ref.pascalName %>(entityType: EntityType, entityId: string<%= hasRelationships ? `, include?: ${className}With` : '' %>): Promise<<%= className %>[]>;
+	findBy<%= ref.pascalName %>(entityType: EntityType, entityId: string): Promise<<%= className %>[]>;
 <% }) -%>
 <% if (hasDeclarativeQueries) { -%>
 	// Declarative queries (from queries: block in entity YAML)
 <% processedQueries.forEach((q) => { -%>
+<%_
+// Skip declarative signature when FK method covers it (opts is a superset of plain single-param).
+const _skipRiDq = _riFkMethodNames.has(q.methodName) && !q.isUnique && !q.hasVia && !q.hasSelect;
+_%>
+<% if (!_skipRiDq) { -%>
 	<%= q.methodName %>(<%- q.params.map(p => `${p.camelName}: ${p.tsType}`).join(', ') %>): Promise<<%- q.returnType %>>;
+<% } -%>
 <% }) -%>
 <% } -%>
 }

package/templates/entity/new/backend/modules/core/module.ejs.t

@@ -32,6 +32,9 @@ import { <%= className %>Repository } from '<%= imports.moduleToRepository %>';
 <% if (hasDeclarativeQueries) { -%>
 import { declarativeQueryClasses } from '<%= imports.moduleToDeclarativeQueries %>';
 <% } -%>
+<% if (hasRelationships && !isGrouped) { -%>
+import { relationshipQueryClasses } from '<%= imports.moduleToRelationshipQueries %>';
+<% } -%>
 <% if (exposeRest || exposeElectric) { -%>
 import { <%= classNamePlural %>Controller } from '<%= imports.moduleToController %>';
 <% } -%>
@@ -58,6 +61,10 @@ import { create<%= className %>Schema, update<%= className %>Schema, <%= camelNa
 <% if (hasDeclarativeQueries) { -%>
 		// Declarative queries
 		...declarativeQueryClasses,
+<% } -%>
+<% if (hasRelationships && !isGrouped) { -%>
+		// Relationship composition queries
+		...relationshipQueryClasses,
 <% } -%>
 	],
 	exports: [
@@ -71,6 +78,9 @@ import { create<%= className %>Schema, update<%= className %>Schema, <%= camelNa
 		<%= deleteCommandClass %>,
 <% if (hasDeclarativeQueries) { -%>
 		...declarativeQueryClasses,
+<% } -%>
+<% if (hasRelationships && !isGrouped) { -%>
+		...relationshipQueryClasses,
 <% } -%>
 	],
 })

package/templates/entity/new/backend/presentation/controller.ejs.t

@@ -19,9 +19,6 @@ import {
 	ParseUUIDPipe,
 	Post,
 	Put,
-<% if (hasRelationships) { -%>
-	Query,
-<% } -%>
 	UsePipes,
 } from '@nestjs/common';
 import {
@@ -44,9 +41,6 @@ import { <%= deleteCommandClass %> } from '<%= imports.controllerToDeleteCommand
 import { <%= updateCommandClass %> } from '<%= imports.controllerToUpdateCommand %>';
 import { ZodValidationPipe } from '../../core/pipes/zod-validation.pipe';
 import { <%= className %> } from '<%= imports.controllerToDomain %>';
-<% if (hasRelationships) { -%>
-import type { <%= className %>With } from '<%= imports.controllerToDomain %>';
-<% } -%>
 
 // OPENAPI-3: controller decorators reference schemas by `$ref` rather
 // than `type:` class references because generated DTOs are Zod-derived
@@ -72,12 +66,8 @@ export class <%= classNamePlural %>Controller {
 	})
 	@ApiResponse({ status: 401, schema: { $ref: '#/components/schemas/ErrorResponseDto' } })
 	@Get()
-	async findAll(<%- hasRelationships ? `@Query('include') include?: string` : '' %>): Promise<<%= className %>[]> {
-<% if (hasRelationships) { -%>
-		return this.list<%= classNamePlural %>Query.execute(this.parseInclude(include));
-<% } else { -%>
+	async findAll(): Promise<<%= className %>[]> {
 		return this.list<%= classNamePlural %>Query.execute();
-<% } -%>
 	}
 
 	@ApiOperation({ summary: 'Find <%= name %> by id', operationId: 'find<%= className %>ById' })
@@ -88,15 +78,8 @@ export class <%= classNamePlural %>Controller {
 	@Get(':id')
 	async findById(
 		@Param('id', ParseUUIDPipe) id: string,
-<% if (hasRelationships) { -%>
-		@Query('include') include?: string,
-<% } -%>
 	): Promise<<%= className %>> {
-<% if (hasRelationships) { -%>
-		return this.get<%= className %>ByIdQuery.execute(id, this.parseInclude(include));
-<% } else { -%>
 		return this.get<%= className %>ByIdQuery.execute(id);
-<% } -%>
 	}
 
 	@ApiOperation({ summary: 'Create <%= name %>', operationId: 'create<%= className %>' })
@@ -144,23 +127,8 @@ export class <%= classNamePlural %>Controller {
 	): Promise<<%= className %>> {
 		return this.delete<%= className %>Command.execute(id, { actor: { tenantId, userId } });
 	}
-<% if (hasRelationships) { -%>
-
-	/**
-	 * Parse comma-separated include query param into typed options.
-	 * Example: ?include=account,owner → { account: true, owner: true }
-	 */
-	private parseInclude(include?: string): <%= className %>With | undefined {
-		if (!include) return undefined;
-		const parts = include.split(',').map((s) => s.trim());
-		return {
-<% relationships.forEach((rel) => { -%>
-			<%= rel.name %>: parts.includes('<%= rel.name %>'),
-<% }) -%>
-		};
-	}
-<% } -%>
 }
+
 <% } -%>
 <% if (exposeElectric) { -%>
 /**

package/templates/entity/new/clean-lite-ps/entity.ejs.t

@@ -7,6 +7,9 @@ import {
 <%_ clpDrizzleImports.filter(i => i !== 'relations').forEach(i => { _%>
   <%= i %>,
 <%_ }) _%>
+<%_ if (typeof clpHasSelfFk !== 'undefined' && clpHasSelfFk) { _%>
+  type AnyPgColumn,
+<%_ } _%>
 } from 'drizzle-orm/pg-core';
 <%_ if (clpHasRelationsBlock) { _%>
 import { relations, type InferSelectModel } from 'drizzle-orm';
@@ -18,6 +21,18 @@ import { type InferSelectModel } from 'drizzle-orm';
 import { <%= rel.relatedTable %> } from '<%= rel.importPath %>';
 <%_ } _%>
 <%_ }) _%>
+<%_ /* CGP-358b: import has_many target tables for many() relation const */ _%>
+<%_ if (typeof clpExistingHasMany !== 'undefined') { _%>
+<%_ clpExistingHasMany.filter(rel => !rel.isSelfRef).forEach(rel => { _%>
+import { <%= rel.targetPlural %> } from '../<%= rel.targetPlural %>/<%= rel.target %>.entity';
+<%_ }) _%>
+<%_ } _%>
+<%_ if (typeof clpEnumFields !== 'undefined' && clpEnumFields.length > 0) { _%>
+
+<%_ clpEnumFields.forEach(ef => { _%>
+export const <%= ef.enumName %> = pgEnum('<%= ef.dbName %>', [<%- ef.choices.map(c => `'${c}'`).join(', ') %>]);
+<%_ }) _%>
+<%_ } _%>
 
 export const <%= entityNamePlural %> = pgTable(
   '<%= entityNamePlural %>',
@@ -30,7 +45,7 @@ export const <%= entityNamePlural %> = pgTable(
     // cascade rules never fire for a soft-deleted parent. This FK constraint only applies on
     // hard-delete (e.g. admin purge). See ADR-021: docs/adrs/ADR-021-on-delete-semantics.md
 <%_ } _%>
-    <%= rel.camelField %>: uuid('<%= rel.field %>')<%= rel.nullable ? '' : '.notNull()' %>.references(() => <%= rel.relatedTable %>.id, { onDelete: '<%= rel.onDelete %>' }),
+    <%= rel.camelField %>: uuid('<%= rel.field %>')<%= rel.nullable ? '' : '.notNull()' %>.references(<%= rel.isSelfFk ? '(): AnyPgColumn ' : '() ' %>=> <%= rel.relatedTable %>.id, { onDelete: '<%= rel.onDelete %>' }),
 <%_ }) _%>
 <%_ clpProcessedFields.forEach(field => { _%>
     <%= field.camelName %>: <%- field.drizzleChain %>,
@@ -51,14 +66,18 @@ export const <%= entityNamePlural %> = pgTable(
   },
 );
 <%_ if (clpHasRelationsBlock) { _%>
+<%_ const needsMany = typeof clpExistingHasMany !== 'undefined' && clpExistingHasMany.length > 0; _%>
 
-export const <%= entityNamePlural %>Relations = relations(<%= entityNamePlural %>, ({ one }) => ({
+export const <%= entityNamePlural %>Relations = relations(<%= entityNamePlural %>, ({ one<%= needsMany ? ', many' : '' %> }) => ({
 <%_ clpBelongsTo.forEach(rel => { _%>
   <%= rel.relationKey %>: one(<%= rel.relatedTable %>, {
     fields: [<%= entityNamePlural %>.<%= rel.camelField %>],
     references: [<%= rel.relatedTable %>.id],
   }),
 <%_ }) _%>
+<%_ if (typeof clpExistingHasMany !== 'undefined') { clpExistingHasMany.forEach(rel => { _%>
+  <%= rel.name %>: many(<%= rel.targetPlural %>),
+<%_ }) } _%>
 }));
 <%_ } _%>
 

package/templates/entity/new/clean-lite-ps/module.ejs.t

@@ -13,9 +13,21 @@ force: true
 import { Inject, Module, type OnModuleInit } from '@nestjs/common';
 import { OPENAPI_REGISTRY, type OpenApiRegistry } from '@shared/openapi';
 import { DatabaseModule } from '@shared/database/database.module';
-<%_ clpBelongsTo.forEach(rel => { _%>
-// import { <%= rel.relatedEntityPascal %>sModule } from '../<%= rel.relatedPlural %>/<%= rel.relatedPlural %>.module';
+<%_ /* CGP-358b: Import cross-entity repos needed for has_many composition */ _%>
+<%_ if (typeof clpExistingHasMany !== 'undefined') { _%>
+<%_ const hasManyNeedingImport = clpExistingHasMany.filter(r => !r.isSelfRef); _%>
+<%_ const uniqueHasManyForModule = [...new Map(hasManyNeedingImport.map(r => [r.target, r])).values()]; _%>
+<%_ uniqueHasManyForModule.forEach(rel => { _%>
+import { <%= rel.targetClass %>Repository } from '../<%= rel.targetPlural %>/<%= rel.target %>.repository';
+<%_ }) _%>
+<%_ } _%>
+<%_ /* CGP-358b: Import cross-entity repos needed for belongs_to composition */ _%>
+<%_ if (typeof clpBelongsTo !== 'undefined') { _%>
+<%_ const uniqueBelongsToForModule = [...new Map(clpBelongsTo.filter(r => !r.isSelfFk).map(r => [r.relatedEntity, r])).values()]; _%>
+<%_ uniqueBelongsToForModule.forEach(rel => { _%>
+import { <%= rel.relatedEntityPascal %>Repository } from '../<%= rel.relatedPlural %>/<%= rel.relatedEntity %>.repository';
 <%_ }) _%>
+<%_ } _%>
 <% if (eavEnabled) { -%>
 import { FieldValuesModule } from '../field_values/field_values.module';
 <% } -%>
@@ -68,6 +80,19 @@ import { <%= classNames.searchController %> } from './<%= entityName %>-search.c
   providers: [
     <%= classNames.repository %>,
     <%= classNames.service %>,
+<%_ /* CGP-358b: Register cross-entity repos as providers (needed for service DI) */ _%>
+<%_ if (typeof clpExistingHasMany !== 'undefined') { _%>
+<%_ const uniqueHasManyProviders = [...new Map(clpExistingHasMany.filter(r => !r.isSelfRef).map(r => [r.target, r])).values()]; _%>
+<%_ uniqueHasManyProviders.forEach(rel => { _%>
+    <%= rel.targetClass %>Repository,
+<%_ }) _%>
+<%_ } _%>
+<%_ if (typeof clpBelongsTo !== 'undefined') { _%>
+<%_ const uniqueBelongsToProviders = [...new Map(clpBelongsTo.filter(r => !r.isSelfFk).map(r => [r.relatedEntity, r])).values()]; _%>
+<%_ uniqueBelongsToProviders.forEach(rel => { _%>
+    <%= rel.relatedEntityPascal %>Repository,
+<%_ }) _%>
+<%_ } _%>
     <%= classNames.findByIdUseCase %>,
     <%= classNames.listUseCase %>,
 <% if (eavEnabled) { -%>