@aurorajs.dev/catalyst-cli 1.0.2 → 2.0.0

package/dist/templates/codegen/backend/@app/__module_name__/application/delete/__bounded_context_name__-delete-__module_name__-by-id.service.ts.eta

@@ -2,28 +2,112 @@
 * @aurora-catalyst-generated
 * @source cliter/<%= it.fmt.toKebabCase(it.schema.boundedContextName) %>/<%= it.fmt.toKebabCase(it.schema.moduleName) %>.aurora.yaml
 */
+<%_
+  const isI18nTable = it.i18nStrategy === 'table' && it.filters.hasI18nProperties(it.schema.aggregateProperties ?? []);
+  const bcPascal = it.fmt.toPascalCase(it.schema.boundedContextName);
+  const modPascal = it.fmt.toPascalCase(it.schema.moduleName);
+  const moduleVar = it.fmt.toCamelCase(it.schema.moduleName);
+  const fkName = it.i18nTable.getI18nTableForeignKeyName(it.schema);
+  const translatedLocalesField = it.fmt.toCamelCase(it.i18nEmbedded.TRANSLATED_LOCALES_COLUMN);
+_%>
 <%_ let importsArray = [
   { items: 'Injectable', path: '@nestjs/common' },
-  { items: ['HandlerMeta'], path: it.config.AURORA_CORE_BACK },
-  { items: ['QueryStatement'], path: it.config.AURORA_CORE_COMMON },
-  { items: `${it.fmt.toPascalCase(it.schema.boundedContextName)}Sequelize${it.fmt.toPascalCase(it.schema.moduleName)}Repository`, path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}` },
+  { items: ['HandlerMeta', 'QueryStatement'], path: it.config.AURORA_CORE_BACK },
+  {
+    items: [`${bcPascal}Drizzle${modPascal}Repository`],
+    path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}/infrastructure/drizzle/${it.fmt.toKebabCase(it.schema.boundedContextName)}-drizzle-${it.fmt.toKebabCase(it.schema.moduleName)}.repository.js`,
+  },
+  ...(isI18nTable
+    ? [
+        {
+          items: [`${bcPascal}Drizzle${modPascal}I18nRepository`],
+          path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}/infrastructure/drizzle/${it.fmt.toKebabCase(it.schema.boundedContextName)}-drizzle-${it.fmt.toKebabCase(it.schema.moduleName)}-i18n.repository.js`,
+        },
+      ]
+    : []),
 ]; _%>
-<% if (it.predicates.hasI18nProperties(it.schema.aggregateProperties)) { -%>
-<%_ importsArray.push(
-  { items: `${it.fmt.toPascalCase(it.schema.boundedContextName)}I${it.fmt.toPascalCase(it.schema.moduleName)}I18nRepository`, path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}` },
-  { items: `${it.fmt.toPascalCase(it.schema.boundedContextName)}${it.fmt.toPascalCase(it.schema.moduleName)}AvailableLangs`, path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}/domain/value-objects` },
-  { items: '* as _', path: 'lodash', defaultImport: true },
-); _%>
+<% if (isI18nTable) { -%>
+<%_ importsArray.push({
+  items: [it.schema.aggregateName],
+  path: '@api/graphql.js',
+}); _%>
 <% } -%>
 <%~ it.gen.importManager({ imports: importsArray }) %>
 @Injectable()
-export class <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Delete<%= it.fmt.toPascalCase(it.schema.moduleName) %>ByIdService
+export class <%= bcPascal %>Delete<%= modPascal %>ByIdService
 {
   constructor(
-    private readonly repository: <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Sequelize<%= it.fmt.toPascalCase(it.schema.moduleName) %>Repository,
-    <%~ include('/partials/declare-i18n-repository', { ...it }) %>
+    private readonly repository: <%= bcPascal %>Drizzle<%= modPascal %>Repository,
+<% if (isI18nTable) { -%>
+    private readonly repositoryI18n: <%= bcPascal %>Drizzle<%= modPascal %>I18nRepository,
+<% } -%>
   ) {}
 
+<% if (isI18nTable) { -%>
+  async main(
+    id: string,
+    lang: { id: string; iso6392: string },
+    isFallbackLang: boolean,
+    constraint?: QueryStatement,
+    handlerMeta?: HandlerMeta,
+  ): Promise<void>
+  {
+    if (isFallbackLang) {
+      // deleting the base language deletes the whole aggregate: the base row and
+      // every companion row by <%= fkName %> (application-level cascade, no DB constraint)
+      await this.repository.deleteById(
+        id,
+        {
+          deleteOptions: handlerMeta?.repositoryOptions,
+          handlerMeta,
+        },
+      );
+
+      await this.repositoryI18n.delete({
+        queryStatement: {
+          where: {
+            <%= fkName %>: { eq: id },
+          },
+        },
+        deleteOptions: handlerMeta?.repositoryOptions,
+      });
+    } else {
+      // deleting a non-base language removes only that companion row
+      await this.repositoryI18n.delete({
+        queryStatement: {
+          where: {
+            <%= fkName %>: { eq: id },
+            langId: { eq: lang.id },
+          },
+        },
+        deleteOptions: handlerMeta?.repositoryOptions,
+      });
+
+      // and drops the locale from the base row's translated_locales — server-managed
+      // field (design.md D6: write-only, excluded from the @api/graphql contract), read
+      // here through a narrow, honest widening of the aggregate type
+      const <%= moduleVar %> = (await this.repository.findById(id, { constraint, handlerMeta })) as
+        | (<%= it.schema.aggregateName %> & { <%= translatedLocalesField %>?: string[] })
+        | null;
+
+      // the repository's own UpdateByIdInput generic already narrows to the base-row
+      // shape (Omit the companion-only i18n fields, add translatedLocales), so this
+      // plain literal typechecks with no cast needed
+      await this.repository.updateById(
+        {
+          id,
+          <%= translatedLocalesField %>: (<%= moduleVar %>?.<%= translatedLocalesField %> ?? []).filter(
+            (locale: string) => locale !== lang.iso6392,
+          ),
+        },
+        {
+          handlerMeta,
+          updateByIdOptions: handlerMeta?.repositoryOptions,
+        },
+      );
+    }
+  }
+<% } else { -%>
   async main(
     <% for (const prop of it.filters.getPrimaryKeyProperties(it.schema.aggregateProperties)) { -%>
     <%= it.fmt.toCamelCase(it.mappers.getPropertyName(prop)) %>: string,
@@ -32,12 +116,7 @@ export class <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Delete<%= i
     handlerMeta?: HandlerMeta,
   ): Promise<void>
   {
-    <% if (it.predicates.hasI18nProperties(it.schema.aggregateProperties)) { -%>
-    const fallbackLang = handlerMeta.meta.fallbackLang;
-    const contentLanguage = handlerMeta.meta.contentLanguage;
-
-    <% } -%>
-    const <%= it.fmt.toCamelCase(it.schema.moduleName) %> = await this.repository
+    const <%= moduleVar %> = await this.repository
       .findById(
         <% if (it.filters.getPrimaryKeyProperties(it.schema.aggregateProperties).length === 1) { -%>
         id,
@@ -57,69 +136,10 @@ export class <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Delete<%= i
         },
       );
 
-    <% if (it.predicates.hasI18nProperties(it.schema.aggregateProperties)) { -%>
-    if (<%= it.fmt.toCamelCase(it.schema.moduleName) %>.langId === fallbackLang.id)
-    {
-      // delete all translations if delete fallback language
-      await this.repository
-        .deleteById(
-          <%= it.fmt.toCamelCase(it.schema.moduleName) %>.id,
-          {
-            deleteOptions: handlerMeta?.repositoryOptions,
-            handlerMeta,
-          },
-        );
-
-      await this.repositoryI18n
-        .delete(
-          {
-            queryStatement: {
-              where: {
-                <%= it.fmt.toCamelCase(it.schema.moduleName) %>Id: <%= it.fmt.toCamelCase(it.schema.moduleName) %>.id,
-              },
-            },
-            deleteOptions: handlerMeta?.repositoryOptions,
-          },
-        );
-    }
-    else
-    {
-      // delete only one translation
-      await this.repositoryI18n
-        .delete(
-          {
-            queryStatement: {
-              where: {
-                <%= it.fmt.toCamelCase(it.schema.moduleName) %>Id: <%= it.fmt.toCamelCase(it.schema.moduleName) %>.id,
-                langId: contentLanguage.id,
-              },
-            },
-            deleteOptions: handlerMeta?.repositoryOptions,
-          },
-        );
-
-      // update available langs when delete translation
-      <%= it.fmt.toCamelCase(it.schema.moduleName) %>.availableLangs = new <%= it.fmt.toPascalCase(it.schema.boundedContextName) %><%= it.fmt.toPascalCase(it.schema.moduleName) %>AvailableLangs(<%= it.fmt.toCamelCase(it.schema.moduleName) %>.availableLangs.removeItem(contentLanguage.id));
-
-      await this.repository
-        .update(
-          <%= it.fmt.toCamelCase(it.schema.moduleName) %>,
-          {
-            dataFactory   : aggregate => _.pick(aggregate.toDTO(), 'id', 'availableLangs'),
-            updateOptions : handlerMeta?.repositoryOptions,
-            queryStatement: {
-              where: {
-                id: <%= it.fmt.toCamelCase(it.schema.moduleName) %>.id,
-              },
-            },
-          },
-        );
-    }
-    <% } else { -%>
     await this.repository
       .deleteById(
         <% if (it.filters.getPrimaryKeyProperties(it.schema.aggregateProperties).length === 1) { -%>
-        <%= it.fmt.toCamelCase(it.schema.moduleName) %>.id,
+        <%= moduleVar %>.id,
         <% } else { -%>
         undefined,
         <% } -%>
@@ -129,12 +149,12 @@ export class <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Delete<%= i
           <% if (it.filters.getPrimaryKeyProperties(it.schema.aggregateProperties).length > 1) { -%>
           findArguments: {
             <% for (const prop of it.filters.getPrimaryKeyProperties(it.schema.aggregateProperties)) { -%>
-            <%= it.fmt.toCamelCase(it.mappers.getPropertyName(prop)) %>: <%= it.fmt.toCamelCase(it.schema.moduleName) %>.<%= it.fmt.toCamelCase(it.mappers.getPropertyName(prop)) %>,
+            <%= it.fmt.toCamelCase(it.mappers.getPropertyName(prop)) %>: <%= moduleVar %>.<%= it.fmt.toCamelCase(it.mappers.getPropertyName(prop)) %>,
             <% } -%>
           },
           <% } -%>
         },
       );
-    <% } -%>
   }
+<% } -%>
 }

package/dist/templates/codegen/backend/@app/__module_name__/application/delete/__bounded_context_name__-delete-__module_names__.handler.ts.eta

@@ -5,14 +5,18 @@
 <%_
   let importsArray = [
     { items: ['Injectable'], path: '@nestjs/common' },
-    { items: ['QueryStatement'], path: it.config.AURORA_CORE_COMMON },
-    { items: it.schema.aggregateName, path: '@api/graphql' },
     {
-      items: [
-        `${it.fmt.toPascalCase(it.schema.boundedContextName)}Delete${it.fmt.toPascalCase(it.schema.moduleNames)}Service`,
-        `${it.fmt.toPascalCase(it.schema.boundedContextName)}Get${it.fmt.toPascalCase(it.schema.moduleNames)}Service`,
-      ],
-      path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}`,
+      items: ['Format', 'EmitEvent', 'HandlerMeta', 'QueryStatement'],
+      path: it.config.AURORA_CORE_BACK,
+    },
+    { items: it.schema.aggregateName, path: '@api/graphql.js' },
+    {
+      items: [`${it.fmt.toPascalCase(it.schema.boundedContextName)}Delete${it.fmt.toPascalCase(it.schema.moduleNames)}Service`],
+      path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}/application/delete/${it.fmt.toKebabCase(it.schema.boundedContextName)}-delete-${it.fmt.toKebabCase(it.schema.moduleNames)}.service.js`,
+    },
+    {
+      items: [`${it.fmt.toPascalCase(it.schema.boundedContextName)}Get${it.fmt.toPascalCase(it.schema.moduleNames)}Service`],
+      path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}/application/get/${it.fmt.toKebabCase(it.schema.boundedContextName)}-get-${it.fmt.toKebabCase(it.schema.moduleNames)}.service.js`,
     },
     {
       items: ['EventEmitter2'],
@@ -20,22 +24,12 @@
     },
     {
       items: [`${it.schema.aggregateName}FieldSchema`],
-      path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}/domain`,
-    },
-    {
-      items: ['Format', 'EmitEvent', 'HandlerMeta'],
-      path: it.config.AURORA_CORE_BACK,
+      path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}/domain/index.js`,
     },
   ];
 _%>
-<% if (it.filters.hasI18nProperties(it.schema.aggregateProperties)) { -%>
-<%_ importsArray.push(
-  { items: ['BadRequestException'], path: '@nestjs/common' },
-  { items: ['CoreAddI18nConstraintService', 'CoreGetSearchKeyLangService', 'CoreGetFallbackLangService', 'CoreGetContentLanguageObjectService'], path: it.config.AURORA_CORE_BACK },
-); _%>
-<% } -%>
 <% if (it.schema.hasTenant) { -%>
-<%_ importsArray.push({ items: 'IamAccountResponse', path: `${it.config.APP_CONTAINER}/iam/account` }); _%>
+<%_ importsArray.push({ items: 'IamAccount', path: '@api/graphql.js' }); _%>
 <% } -%>
 <%~ it.gen.importManager({ imports: importsArray }) %>
 @Injectable()
@@ -45,40 +39,19 @@ export class <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Delete<%= i
     private readonly eventEmitter: EventEmitter2,
     private readonly deleteService: <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Delete<%= it.fmt.toPascalCase(it.schema.moduleNames) %>Service,
     private readonly getService: <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Get<%= it.fmt.toPascalCase(it.schema.moduleNames) %>Service,
-    <% if (it.filters.hasI18nProperties(it.schema.aggregateProperties)) { -%>
-    private readonly coreAddI18nConstraintService: CoreAddI18nConstraintService,
-    private readonly coreGetContentLanguageObjectService: CoreGetContentLanguageObjectService,
-    private readonly coreGetFallbackLangService: CoreGetFallbackLangService,
-    private readonly coreGetSearchKeyLangService: CoreGetSearchKeyLangService,
-    <% } -%>
   ) {}
 
   @EmitEvent('<%= it.fmt.toCamelCase(it.schema.boundedContextName) %>.<%= it.fmt.toCamelCase(it.schema.moduleName) %>.deleted')
   @Format(<%= it.schema.aggregateName %>FieldSchema)
   async main(
     <% if (it.schema.hasTenant) { -%>
-    account: IamAccountResponse,
+    account: IamAccount,
     <% } -%>
     queryStatement?: QueryStatement,
     constraint?: QueryStatement,
     handlerMeta?: HandlerMeta,
   ): Promise<<%= it.fmt.toPascalCase(it.schema.boundedContextName) %><%= it.fmt.toPascalCase(it.schema.moduleName) %>[]>
   {
-    <% if (it.filters.hasI18nProperties(it.schema.aggregateProperties)) { -%>
-    const contentLanguage = handlerMeta?.meta?.contentLanguage as string;
-    if (!contentLanguage) throw new BadRequestException('To delete an multi-language objects, the content-language header must be defined.');
-
-    constraint = await this.coreAddI18nConstraintService.add(
-      constraint,
-      '<%= it.fmt.toCamelCase(it.schema.moduleName) %>I18n',
-      contentLanguage,
-      {
-        searchKeyLang        : this.coreGetSearchKeyLangService.get(),
-        defineDefaultLanguage: false,
-      },
-    );
-
-    <% } -%>
     const <%= it.fmt.toCamelCase(it.schema.moduleNames) %> = await this.getService.main(
       queryStatement,
       constraint,
@@ -88,18 +61,7 @@ export class <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Delete<%= i
     await this.deleteService.main(
       queryStatement,
       constraint,
-      <% if (it.filters.hasI18nProperties(it.schema.aggregateProperties)) { -%>
-      {
-        ...handlerMeta,
-        meta: {
-          ...handlerMeta?.meta,
-          fallbackLang   : await this.coreGetFallbackLangService.get(),
-          contentLanguage: await this.coreGetContentLanguageObjectService.get(contentLanguage),
-        },
-      },
-      <% } else { -%>
       handlerMeta,
-      <% } -%>
     );
 
     return <%= it.fmt.toCamelCase(it.schema.moduleNames) %>;

package/dist/templates/codegen/backend/@app/__module_name__/application/delete/__bounded_context_name__-delete-__module_names__.service.ts.eta

@@ -2,31 +2,38 @@
 * @aurora-catalyst-generated
 * @source cliter/<%= it.fmt.toKebabCase(it.schema.boundedContextName) %>/<%= it.fmt.toKebabCase(it.schema.moduleName) %>.aurora.yaml
 */
+<%_
+  const isI18nTable = it.i18nStrategy === 'table' && it.filters.hasI18nProperties(it.schema.aggregateProperties ?? []);
+  const bcPascal = it.fmt.toPascalCase(it.schema.boundedContextName);
+  const modPascal = it.fmt.toPascalCase(it.schema.moduleName);
+  const moduleNamesVar = it.fmt.toCamelCase(it.schema.moduleNames);
+  const fkName = it.i18nTable.getI18nTableForeignKeyName(it.schema);
+_%>
 <%_ let importsArray = [
   { items: 'Injectable', path: '@nestjs/common' },
-  { items: ['HandlerMeta'], path: it.config.AURORA_CORE_BACK },
-  { items: ['QueryStatement'], path: it.config.AURORA_CORE_COMMON },
+  { items: ['HandlerMeta', 'QueryStatement'], path: it.config.AURORA_CORE_BACK },
   {
-    items: [
-      `${it.fmt.toPascalCase(it.schema.boundedContextName)}Sequelize${it.fmt.toPascalCase(it.schema.moduleName)}Repository`,
-      `${it.fmt.toPascalCase(it.schema.boundedContextName)}Add${it.fmt.toPascalCase(it.schema.moduleNames)}ContextEvent`,
-    ],
-    path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}`,
+    items: [`${bcPascal}Drizzle${modPascal}Repository`],
+    path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}/infrastructure/drizzle/${it.fmt.toKebabCase(it.schema.boundedContextName)}-drizzle-${it.fmt.toKebabCase(it.schema.moduleName)}.repository.js`,
   },
+  ...(isI18nTable
+    ? [
+        {
+          items: [`${bcPascal}Drizzle${modPascal}I18nRepository`],
+          path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}/infrastructure/drizzle/${it.fmt.toKebabCase(it.schema.boundedContextName)}-drizzle-${it.fmt.toKebabCase(it.schema.moduleName)}-i18n.repository.js`,
+        },
+      ]
+    : []),
 ]; _%>
-<% if (it.predicates.hasI18nProperties(it.schema.aggregateProperties)) { -%>
-<%_ importsArray.push(
-  { items: `${it.fmt.toPascalCase(it.schema.boundedContextName)}I${it.fmt.toPascalCase(it.schema.moduleName)}I18nRepository`, path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}` },
-  { items: 'Operator', path: it.config.AURORA_CORE_BACK },
-); _%>
-<% } -%>
 <%~ it.gen.importManager({ imports: importsArray }) %>
 @Injectable()
-export class <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Delete<%= it.fmt.toPascalCase(it.schema.moduleNames) %>Service
+export class <%= bcPascal %>Delete<%= it.fmt.toPascalCase(it.schema.moduleNames) %>Service
 {
   constructor(
-    private readonly repository: <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Sequelize<%= it.fmt.toPascalCase(it.schema.moduleName) %>Repository,
-    <%~ include('/partials/declare-i18n-repository', { ...it }) %>
+    private readonly repository: <%= bcPascal %>Drizzle<%= modPascal %>Repository,
+<% if (isI18nTable) { -%>
+    private readonly repositoryI18n: <%= bcPascal %>Drizzle<%= modPascal %>I18nRepository,
+<% } -%>
   ) {}
 
   async main(
@@ -35,62 +42,33 @@ export class <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Delete<%= i
     handlerMeta?: HandlerMeta,
   ): Promise<void>
   {
-    <% if (it.predicates.hasI18nProperties(it.schema.aggregateProperties)) { -%>
-    const fallbackLang = handlerMeta.meta.fallbackLang;
-    const contentLanguage = handlerMeta.meta.contentLanguage;
-
-    <% } -%>
-    const <%= it.fmt.toCamelCase(it.schema.moduleNames) %> = await this.repository.get({
+    const <%= moduleNamesVar %> = await this.repository.get({
       queryStatement,
       constraint,
       handlerMeta,
     });
 
-    if (<%= it.fmt.toCamelCase(it.schema.moduleNames) %>.length === 0) return;
-
-    <% if (it.predicates.hasI18nProperties(it.schema.aggregateProperties)) { -%>
-    if (<%= it.fmt.toCamelCase(it.schema.moduleNames) %>[0].langId.value === fallbackLang.id)
-    {
-      // delete all translations if delete fallback language
-      await this.repository.delete({
-        queryStatement,
-        constraint,
-        handlerMeta,
-        deleteOptions: handlerMeta?.repositoryOptions,
-      });
+    if (<%= moduleNamesVar %>.length === 0) return;
 
-      await this.repositoryI18n.delete({
-        queryStatement: {
-          where: {
-            <%= it.fmt.toCamelCase(it.schema.moduleName) %>Id: {
-              [Operator.in]: <%= it.fmt.toCamelCase(it.schema.moduleNames) %>.map(item => item.id),
-            },
-          },
-        },
-        deleteOptions: handlerMeta?.repositoryOptions,
-      });
-    }
-    else
-    {
-      await this.repositoryI18n.delete({
-        queryStatement: {
-          where: {
-            <%= it.fmt.toCamelCase(it.schema.moduleName) %>Id: {
-              [Operator.in]: <%= it.fmt.toCamelCase(it.schema.moduleNames) %>.map(item => item.id),
-            },
-            langId: contentLanguage.id,
-          },
-        },
-        deleteOptions: handlerMeta?.repositoryOptions,
-      });
-    }
-    <% } else { -%>
     await this.repository.delete({
       queryStatement,
       constraint,
       handlerMeta,
       deleteOptions: handlerMeta?.repositoryOptions,
     });
-    <% } -%>
+<% if (isI18nTable) { -%>
+
+    // application-level cascade: bulk delete has no DB constraint on the companion
+    // FK (design.md D1/D7) — without this, deleting the base rows in bulk orphans
+    // every companion row instead of cascading like delete-by-id already does
+    await this.repositoryI18n.delete({
+      queryStatement: {
+        where: {
+          <%= fkName %>: { in: <%= moduleNamesVar %>.map((row) => row.id) },
+        },
+      },
+      deleteOptions: handlerMeta?.repositoryOptions,
+    });
+<% } -%>
   }
 }

package/dist/templates/codegen/backend/@app/__module_name__/application/find/__bounded_context_name__-find-__module_name__-by-id.handler.ts.eta

@@ -3,55 +3,45 @@
 * @source cliter/<%= it.fmt.toKebabCase(it.schema.boundedContextName) %>/<%= it.fmt.toKebabCase(it.schema.moduleName) %>.aurora.yaml
 */
 <%_
+  const isI18nTable = it.i18nStrategy === 'table' && it.filters.hasI18nProperties(it.schema.aggregateProperties ?? []);
+  const i18nRelationLabel = it.i18nTable.getI18nTableRelationLabel(it.schema);
   let importsArray = [
     { items: ['Injectable', 'NotFoundException'], path: '@nestjs/common' },
-    { items: ['QueryStatement'], path: it.config.AURORA_CORE_COMMON },
-    { items: it.schema.aggregateName, path: '@api/graphql' },
     {
-      items: `${it.fmt.toPascalCase(it.schema.boundedContextName)}Find${it.fmt.toPascalCase(it.schema.moduleName)}ByIdService`,
-      path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}`,
+      items: isI18nTable
+        ? ['CoreAddI18nConstraintService', 'Format', 'HandlerMeta', 'QueryStatement']
+        : ['Format', 'HandlerMeta', 'QueryStatement'],
+      path: it.config.AURORA_CORE_BACK,
     },
+    { items: it.schema.aggregateName, path: '@api/graphql.js' },
     {
-      items: [`${it.schema.aggregateName}FieldSchema`],
-      path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}/domain`,
+      items: [`${it.fmt.toPascalCase(it.schema.boundedContextName)}Find${it.fmt.toPascalCase(it.schema.moduleName)}ByIdService`],
+      path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}/application/find/${it.fmt.toKebabCase(it.schema.boundedContextName)}-find-${it.fmt.toKebabCase(it.schema.moduleName)}-by-id.service.js`,
     },
     {
-      items: ['Format', 'HandlerMeta'],
-      path: it.config.AURORA_CORE_BACK,
+      items: [`${it.schema.aggregateName}FieldSchema`],
+      path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}/domain/index.js`,
     },
   ];
 _%>
-<% if (it.filters.hasI18nProperties(it.schema.aggregateProperties)) { -%>
-<%_ importsArray.push(
-  { items: ['BadRequestException'], path: '@nestjs/common' },
-  { items: ['CoreAddI18nConstraintService', 'CoreGetSearchKeyLangService', 'Utils'], path: it.config.AURORA_CORE_BACK },
-); _%>
-<% } -%>
 <% if (it.schema.hasTenant) { -%>
-<%_ importsArray.push({ items: 'IamAccountResponse', path: `${it.config.APP_CONTAINER}/iam/account` }); _%>
+<%_ importsArray.push({ items: 'IamAccount', path: '@api/graphql.js' }); _%>
 <% } -%>
 <%~ it.gen.importManager({ imports: importsArray }) %>
 @Injectable()
 export class <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Find<%= it.fmt.toPascalCase(it.schema.moduleName) %>ByIdHandler
 {
-  <% if (it.filters.hasI18nProperties(it.schema.aggregateProperties)) { -%>
-  i18nColumns: string[] = [<% for (const [i, prop] of it.filters.getI18nSearchableProperties(it.schema.aggregateProperties, [`${it.fmt.toCamelCase(it.schema.moduleName)}Id`]).entries()) { -%>'<%= it.fmt.toCamelCase(it.mappers.getPropertyName(prop)) %>'<% if (i < it.filters.getI18nSearchableProperties(it.schema.aggregateProperties, [`${it.fmt.toCamelCase(it.schema.moduleName)}Id`]).length - 1) { -%>, <% } -%><% } -%>];
-  i18nRelationship: string = '<%= it.fmt.toCamelCase(it.schema.moduleName) %>I18n';
-  i18nFunctionReplace = (key: string): string => this.i18nColumns.includes(key) ? `$${this.i18nRelationship}.${key}$` : key;
-
-  <% } -%>
   constructor(
     private readonly findByIdService: <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Find<%= it.fmt.toPascalCase(it.schema.moduleName) %>ByIdService,
-    <% if (it.filters.hasI18nProperties(it.schema.aggregateProperties)) { -%>
+<% if (isI18nTable) { -%>
     private readonly coreAddI18nConstraintService: CoreAddI18nConstraintService,
-    private readonly coreGetSearchKeyLangService: CoreGetSearchKeyLangService,
-    <% } -%>
+<% } -%>
   ) {}
 
   @Format(<%= it.schema.aggregateName %>FieldSchema)
   async main(
     <% if (it.schema.hasTenant) { -%>
-    account: IamAccountResponse,
+    account: IamAccount,
     <% } -%>
     <% for (const prop of it.filters.getPrimaryKeyProperties(it.schema.aggregateProperties)) { -%>
     <%= it.fmt.toCamelCase(it.mappers.getPropertyName(prop)) %>: <%= it.mappers.getPropertyJavascriptType(prop, it.config) %>,
@@ -60,23 +50,15 @@ export class <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Find<%= it.
     handlerMeta?: HandlerMeta,
   ): Promise<<%= it.fmt.toPascalCase(it.schema.boundedContextName) %><%= it.fmt.toPascalCase(it.schema.moduleName) %>>
   {
-    <% if (it.filters.hasI18nProperties(it.schema.aggregateProperties)) { -%>
+<% if (isI18nTable) { -%>
+    // read locale: no header required — an absent/unknown Content-Language falls
+    // back server-side to APP_FALLBACK_LANG inside coreAddI18nConstraintService.add()
+    // (and '*' selects every translation); an explicit header overrides the default.
     const contentLanguage = handlerMeta?.meta?.contentLanguage as string;
-    if (!contentLanguage) throw new BadRequestException('To find a multi-language object, the content-language header must be defined.');
-
-    constraint = await this.coreAddI18nConstraintService.add(
-      constraint,
-      this.i18nRelationship,
-      contentLanguage,
-      {
-        searchKeyLang: this.coreGetSearchKeyLangService.get(),
-      },
-    );
 
-    // Replace all i18n keys by $<%= it.fmt.toCamelCase(it.schema.moduleName) %>I18n.key$
-    constraint = Utils.deepMapKeys(constraint, this.i18nFunctionReplace);
+    constraint = await this.coreAddI18nConstraintService.add(constraint, '<%= i18nRelationLabel %>', contentLanguage);
 
-    <% } -%>
+<% } -%>
     const <%= it.fmt.toCamelCase(it.schema.moduleName) %> = await this.findByIdService.main(
       <% for (const prop of it.filters.getPrimaryKeyProperties(it.schema.aggregateProperties)) { -%>
       <%= it.fmt.toCamelCase(it.mappers.getPropertyName(prop)) %>,

package/dist/templates/codegen/backend/@app/__module_name__/application/find/__bounded_context_name__-find-__module_name__-by-id.service.ts.eta

@@ -2,25 +2,28 @@
 * @aurora-catalyst-generated
 * @source cliter/<%= it.fmt.toKebabCase(it.schema.boundedContextName) %>/<%= it.fmt.toKebabCase(it.schema.moduleName) %>.aurora.yaml
 */
+<%_
+  const isI18nTable = it.i18nStrategy === 'table' && it.filters.hasI18nProperties(it.schema.aggregateProperties ?? []);
+  const i18nRelationLabel = it.i18nTable.getI18nTableRelationLabel(it.schema);
+  const i18nFieldNames = it.filters
+    .getI18nProperties(it.schema.aggregateProperties ?? [])
+    .map((prop) => it.fmt.toCamelCase(it.mappers.getPropertyName(prop)));
+_%>
 <%_ let importsArray = [
   { items: ['Injectable'], path: '@nestjs/common' },
-  { items: ['HandlerMeta'], path: it.config.AURORA_CORE_BACK },
-  { items: ['QueryStatement'], path: it.config.AURORA_CORE_COMMON },
-  { items: [it.schema.aggregateName], path: '@api/graphql' },
+  { items: ['HandlerMeta', 'QueryStatement'], path: it.config.AURORA_CORE_BACK },
+  { items: [it.schema.aggregateName], path: '@api/graphql.js' },
   {
-    items: [
-      it.schema.aggregateName,
-      `${it.fmt.toPascalCase(it.schema.boundedContextName)}Sequelize${it.fmt.toPascalCase(it.schema.moduleName)}Repository`,
-    ],
-    path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}`,
-  },
+      items: [`${it.fmt.toPascalCase(it.schema.boundedContextName)}Drizzle${it.fmt.toPascalCase(it.schema.moduleName)}Repository`],
+      path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}/infrastructure/drizzle/${it.fmt.toKebabCase(it.schema.boundedContextName)}-drizzle-${it.fmt.toKebabCase(it.schema.moduleName)}.repository.js`,
+    },
 ]; _%>
 <%~ it.gen.importManager({ imports: importsArray }) %>
 @Injectable()
 export class <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Find<%= it.fmt.toPascalCase(it.schema.moduleName) %>ByIdService
 {
   constructor(
-    private readonly repository: <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Sequelize<%= it.fmt.toPascalCase(it.schema.moduleName) %>Repository,
+    private readonly repository: <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Drizzle<%= it.fmt.toPascalCase(it.schema.moduleName) %>Repository,
   ) {}
 
   async main(
@@ -31,7 +34,7 @@ export class <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Find<%= it.
     handlerMeta?: HandlerMeta,
   ): Promise<<%= it.schema.aggregateName %>>
   {
-    return await this.repository.findById(
+    const <%= it.fmt.toCamelCase(it.schema.moduleName) %> = await this.repository.findById(
       <% if (it.filters.getPrimaryKeyProperties(it.schema.aggregateProperties).length === 1) { -%>
       id,
       <% } else { -%>
@@ -49,5 +52,26 @@ export class <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Find<%= it.
         <% } -%>
       },
     );
+
+<% if (isI18nTable) { -%>
+    return <%= it.fmt.toCamelCase(it.schema.moduleName) %> ? this.flattenI18n(<%= it.fmt.toCamelCase(it.schema.moduleName) %>) : <%= it.fmt.toCamelCase(it.schema.moduleName) %>;
+<% } else { -%>
+    return <%= it.fmt.toCamelCase(it.schema.moduleName) %>;
+<% } -%>
+  }
+
+<% if (isI18nTable) { -%>
+  // Flattens the joined `<%= i18nRelationLabel %>` companion row (design.md D5) — the
+  // DTO/GraphQL contract (design.md D6) exposes the translated fields as
+  // top-level scalars, not nested under the relation.
+  private flattenI18n(
+    row: <%= it.schema.aggregateName %> & { <%= i18nRelationLabel %>?: Pick<<%= it.schema.aggregateName %>, <% for (const [i, name] of i18nFieldNames.entries()) { -%>'<%= name %>'<% if (i < i18nFieldNames.length - 1) { -%> | <% } -%><% } -%>>[] },
+  ): <%= it.schema.aggregateName %>
+  {
+    const { <%= i18nRelationLabel %>, ...base } = row;
+    const { <%= i18nFieldNames.join(', ') %> } = <%= i18nRelationLabel %>?.[0] ?? {};
+
+    return { ...base, <%= i18nFieldNames.join(', ') %> };
   }
+<% } -%>
 }