@aurorajs.dev/catalyst-cli 1.1.3 → 2.0.0

package/dist/templates/backend/packages/hub/src/@app/hub/app/shared/functions/hub-assert-no-accounts-reference.function.spec.ts

@@ -0,0 +1,230 @@
+import {
+  DEFAULT_MAX_DEPTH,
+  LOGICAL_OPERATOR,
+  QueryDslError,
+  QueryDslValidator,
+  QueryStatement,
+} from '@aurorajs.dev/core-back';
+import { ForbiddenException } from '@nestjs/common';
+import { hubAssertNoAccountsReference } from './hub-assert-no-accounts-reference.function.js';
+
+type WhereClause = NonNullable<QueryStatement['where']>;
+
+/**
+ * Coverage rows of design D2 (`close-hub-accounts-query-oracle`): every client reference to the
+ * `accounts` relation of HubApp is rejected with a 403 that names the referenced path.
+ */
+function captureRejection(statement: QueryStatement): ForbiddenException {
+  try {
+    hubAssertNoAccountsReference(statement);
+  } catch (error) {
+    return error as ForbiddenException;
+  }
+  throw new Error('expected hubAssertNoAccountsReference to throw');
+}
+
+function expectRejectionNaming(statement: QueryStatement, path: string): void {
+  const rejection = captureRejection(statement);
+
+  expect(rejection).toBeInstanceOf(ForbiddenException);
+  expect(rejection.getStatus()).toBe(403);
+  expect(rejection.getResponse()).toEqual({
+    statusCode: 403,
+    error: 'Forbidden',
+    message: `Query on relation path "${path}" of HubApp is not allowed.`,
+    translation: 'Errors.HubAppAccountsNotQueryable',
+    params: { path, aggregate: 'HubApp' },
+  });
+}
+
+describe('hubAssertNoAccountsReference', () => {
+  describe('rejects references to accounts', () => {
+    it('in a root where clause', () => {
+      expectRejectionNaming(
+        { where: { accounts: { email: { iLike: '%@example.test' } } } },
+        'accounts.email',
+      );
+    });
+
+    it('inside and', () => {
+      expectRejectionNaming(
+        {
+          where: {
+            and: [{ isActive: { eq: true } }, { accounts: { username: { eq: 'demo' } } }],
+          },
+        },
+        'accounts.username',
+      );
+    });
+
+    it('inside or', () => {
+      expectRejectionNaming(
+        { where: { or: [{ name: { iLike: '%portal%' } }, { accounts: { id: { in: ['a'] } } }] } },
+        'accounts.id',
+      );
+    });
+
+    it('inside not', () => {
+      expectRejectionNaming(
+        { where: { not: { accounts: { email: { isNull: true } } } } },
+        'accounts.email',
+      );
+    });
+
+    it('inside an array-valued not', () => {
+      expectRejectionNaming(
+        { where: { not: [{ accounts: { email: { eq: 'user@example.test' } } }] } } as never,
+        'accounts.email',
+      );
+    });
+
+    it('under an array-valued not INSIDE the accounts subtree, still naming the column', () => {
+      expectRejectionNaming(
+        { where: { accounts: { not: [{ email: { eq: 'user@example.test' } }] } } } as never,
+        'accounts.email',
+      );
+    });
+
+    it('inside logical operators nested several levels deep', () => {
+      expectRejectionNaming(
+        {
+          where: {
+            or: [
+              { isActive: { eq: true } },
+              { not: { and: [{ code: { eq: 'x' } }, { accounts: { username: { eq: 'demo' } } }] } },
+            ],
+          },
+        },
+        'accounts.username',
+      );
+    });
+
+    it('through a multi-hop path, naming the full path', () => {
+      expectRejectionNaming(
+        { where: { accounts: { user: { name: { eq: 'Jane' } } } } },
+        'accounts.user.name',
+      );
+    });
+
+    it('through a logical operator inside the accounts subtree, naming the column', () => {
+      expectRejectionNaming(
+        { where: { accounts: { or: [{ email: { eq: 'a@example.test' } }] } } },
+        'accounts.email',
+      );
+    });
+
+    it('in the existence form with no column, naming the relation', () => {
+      expectRejectionNaming({ where: { accounts: {} } } as never, 'accounts');
+    });
+
+    it('as a literal dotted key in where', () => {
+      expectRejectionNaming(
+        { where: { 'accounts.email': { eq: 'user@example.test' } } },
+        'accounts.email',
+      );
+    });
+
+    it('in an order field', () => {
+      expectRejectionNaming(
+        {
+          order: [
+            { field: 'name', dir: 'asc' },
+            { field: 'accounts.email', dir: 'desc' },
+          ],
+        },
+        'accounts.email',
+      );
+    });
+
+    it('in an order field equal to the relation name', () => {
+      expectRejectionNaming({ order: [{ field: 'accounts', dir: 'asc' }] }, 'accounts');
+    });
+
+    it('in an aggregation field', () => {
+      expectRejectionNaming(
+        { aggregation: { fields: [{ fn: 'count', field: 'accounts.id' }] } },
+        'accounts.id',
+      );
+    });
+
+    it('in an aggregation groupBy entry', () => {
+      expectRejectionNaming(
+        {
+          aggregation: {
+            fields: [{ fn: 'count', field: 'id' }],
+            groupBy: ['isActive', 'accounts.email'],
+          },
+        },
+        'accounts.email',
+      );
+    });
+  });
+
+  describe("depth-cap coupling with QueryDslValidator (the walker's one unguarded assumption)", () => {
+    /**
+     * Wraps `leaf` in `depth` nested `and` clauses. The innermost object — where `leaf`'s keys are
+     * actually walked/validated — lands at nesting depth `1 + depth` (root `where` starts at depth
+     * 1, matching `QueryDslValidator`'s own count in `query-dsl-validator.js`).
+     */
+    function nestAnd(leaf: WhereClause, depth: number): WhereClause {
+      return depth <= 0 ? leaf : { [LOGICAL_OPERATOR.AND]: [nestAnd(leaf, depth - 1)] };
+    }
+
+    // One `accounts` reference nested exactly DEFAULT_MAX_DEPTH `and` wrappers below the root: the
+    // innermost object is walked/validated at depth `1 + DEFAULT_MAX_DEPTH`, one past the cap both
+    // sides share.
+    const statement: QueryStatement = {
+      where: nestAnd(
+        { accounts: { email: { eq: 'past-the-cap@example.test' } } },
+        DEFAULT_MAX_DEPTH,
+      ),
+    };
+
+    it('does NOT throw from hubAssertNoAccountsReference — the walker gives up past its own depth cap', () => {
+      // Honest documentation of `assertWhereClause`'s early return: this is not a bug fixed here,
+      // it is the exact hole the next test proves is closed on the other side.
+      expect(() => hubAssertNoAccountsReference(structuredClone(statement))).not.toThrow();
+    });
+
+    it('IS rejected by the real QueryDslValidator — the assumption that makes the early return safe', () => {
+      // `DrizzleCriteria.implements()` calls `QueryDslValidator.validate(queryStatement ?? {})`
+      // with no `options`, so every request path validates against this same DEFAULT_MAX_DEPTH.
+      // If that default ever drifts from the walker's own cap, this statement would reach SQL
+      // translation with its `accounts` reference unrejected by either side, and no test would
+      // fail — this pins the coupling so one would.
+      expect(() => QueryDslValidator.validate(structuredClone(statement))).toThrow(QueryDslError);
+    });
+  });
+
+  describe('lets legitimate statements through untouched', () => {
+    const legitimateStatements: Array<[string, QueryStatement]> = [
+      ['a plain column filter', { where: { isActive: { eq: true } } }],
+      ['an order on a column', { order: [{ field: 'name', dir: 'asc' }], limit: 10, offset: 20 }],
+      ['an application dot-path order', { order: [{ field: 'application.name', dir: 'desc' }] }],
+      ['an application nested where', { where: { application: { name: { iLike: '%crm%' } } } }],
+      [
+        'an aggregation over own columns',
+        { aggregation: { fields: [{ fn: 'count', field: 'id' }], groupBy: ['isActive'] } },
+      ],
+      [
+        'a column whose name only starts with the relation name',
+        { where: { accountsCount: { gt: 1 } }, order: [{ field: 'accountsCount', dir: 'asc' }] },
+      ],
+      [
+        'an array-valued not with no accounts reference',
+        { where: { not: [{ isActive: { eq: true } }] } } as never,
+      ],
+    ];
+
+    it.each(legitimateStatements)('%s', (_label, statement) => {
+      const snapshot = structuredClone(statement);
+
+      expect(() => hubAssertNoAccountsReference(statement)).not.toThrow();
+      expect(statement).toEqual(snapshot);
+    });
+
+    it('undefined', () => {
+      expect(() => hubAssertNoAccountsReference(undefined)).not.toThrow();
+    });
+  });
+});

package/dist/templates/backend/packages/hub/src/@app/hub/app/shared/functions/hub-assert-no-accounts-reference.function.ts

@@ -0,0 +1,106 @@
+import { DEFAULT_MAX_DEPTH, LOGICAL_OPERATOR, QueryStatement } from '@aurorajs.dev/core-back';
+import { ForbiddenException } from '@nestjs/common';
+
+const ACCOUNTS_RELATION = 'accounts';
+const AGGREGATE_NAME = 'HubApp';
+
+type ClauseNode = Record<string, unknown>;
+
+function isClauseNode(value: unknown): value is ClauseNode {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+function isAccountsPath(field: unknown): field is string {
+  return (
+    typeof field === 'string' &&
+    (field === ACCOUNTS_RELATION || field.startsWith(`${ACCOUNTS_RELATION}.`))
+  );
+}
+
+function rejectPath(path: string): never {
+  throw new ForbiddenException({
+    statusCode: 403,
+    error: 'Forbidden',
+    message: `Query on relation path "${path}" of ${AGGREGATE_NAME} is not allowed.`,
+    translation: 'Errors.HubAppAccountsNotQueryable',
+    params: { path, aggregate: AGGREGATE_NAME },
+  });
+}
+
+/**
+ * Extends `path` along the first entry of a where subtree so the rejection names a column, not
+ * just the relation: an object value is a segment, a logical operator is transparent, and any
+ * other value ends the path. The test is the SHAPE of the value, not membership in
+ * `WHERE_OPERATOR`, so an operand that is itself an object leaks its operator key into the
+ * reported path (`accounts.email.eq`). That operand is invalid input `QueryDslValidator` rejects,
+ * and the 403 fires either way, so the accuracy is not worth a second vocabulary here.
+ */
+function describeReferencedPath(path: string, node: unknown, depth: number): string {
+  if (depth > DEFAULT_MAX_DEPTH || !isClauseNode(node)) return path;
+
+  const firstEntry = Object.entries(node)[0];
+  if (!firstEntry) return path;
+
+  const [key, child] = firstEntry;
+  if (key === LOGICAL_OPERATOR.AND || key === LOGICAL_OPERATOR.OR || key === LOGICAL_OPERATOR.NOT) {
+    const firstClause = Array.isArray(child) ? child[0] : child;
+    return describeReferencedPath(path, firstClause, depth + 1);
+  }
+  if (!isClauseNode(child)) return path;
+
+  return describeReferencedPath(`${path}.${key}`, child, depth + 1);
+}
+
+/**
+ * Walks only the HubApp level of a where clause (root keys and the clauses under logical
+ * operators): a key named `accounts` under another relation belongs to that relation's target.
+ * Depth counts exactly like `QueryDslValidator` (root at 1), which rejects anything deeper before
+ * SQL is built, so stopping at `DEFAULT_MAX_DEPTH` still walks every clause that can execute.
+ */
+function assertWhereClause(clause: unknown, depth: number): void {
+  if (depth > DEFAULT_MAX_DEPTH || !isClauseNode(clause)) return;
+
+  for (const [key, child] of Object.entries(clause)) {
+    if (
+      key === LOGICAL_OPERATOR.AND ||
+      key === LOGICAL_OPERATOR.OR ||
+      key === LOGICAL_OPERATOR.NOT
+    ) {
+      const nestedClauses = Array.isArray(child) ? child : [child];
+      for (const nestedClause of nestedClauses) assertWhereClause(nestedClause, depth + 1);
+      continue;
+    }
+    if (isAccountsPath(key)) rejectPath(describeReferencedPath(key, child, depth + 1));
+  }
+}
+
+/**
+ * Rejects (403) any client reference to the `accounts` relation of HubApp from `where`, `order`
+ * or `aggregation`. A `where` on `accounts` compiles to an EXISTS through the HubAppAccount pivot,
+ * so the presence of rows is an oracle over IamAccount / IamUser columns for every caller of the
+ * launchpad read. Never mutates the statement; `relations`/`include` are left to
+ * `hubSanitizeEagerLoads`, since a where inside a relations node filters children, not HubApp rows.
+ *
+ * @throws ForbiddenException naming the referenced path
+ */
+export function hubAssertNoAccountsReference(statement: QueryStatement | undefined): void {
+  if (!statement) return;
+
+  assertWhereClause(statement.where, 1);
+
+  const orderClauses = Array.isArray(statement.order) ? statement.order : [];
+  for (const orderClause of orderClauses) {
+    if (isAccountsPath(orderClause?.field)) rejectPath(orderClause.field);
+  }
+
+  const aggregation = statement.aggregation;
+  const aggregateFields = Array.isArray(aggregation?.fields) ? aggregation.fields : [];
+  for (const aggregateField of aggregateFields) {
+    if (isAccountsPath(aggregateField?.field)) rejectPath(aggregateField.field);
+  }
+
+  const groupByFields = Array.isArray(aggregation?.groupBy) ? aggregation.groupBy : [];
+  for (const groupByField of groupByFields) {
+    if (isAccountsPath(groupByField)) rejectPath(groupByField);
+  }
+}

package/dist/templates/backend/packages/hub/src/@app/hub/app/shared/functions/hub-sanitize-eager-loads-vs-relation-order.spec.ts

@@ -63,9 +63,9 @@
  * definition. Recorded in
  * `openspec/changes/generate-cross-bc-drizzle-relations/`.
  */
-import { hubAppTable } from '@app/hub/app';
-import { hubSanitizeEagerLoads } from '@app/hub/app/shared';
-import { oAuthApplicationTable } from '@app/o-auth/application';
+import { hubAppTable } from '@app/hub/app/index.js';
+import { hubSanitizeEagerLoads } from '@app/hub/app/shared/index.js';
+import { oAuthApplicationTable } from '@app/o-auth/application/index.js';
 import { DrizzleCriteria, QueryStatement } from '@aurorajs.dev/core-back';
 import { getTableColumns } from 'drizzle-orm';
 

package/dist/templates/backend/packages/hub/src/@app/hub/app/shared/functions/hub-sanitize-eager-loads.function.spec.ts

@@ -1,4 +1,4 @@
-import { hubSanitizeEagerLoads } from './hub-sanitize-eager-loads.function';
+import { hubSanitizeEagerLoads } from './hub-sanitize-eager-loads.function.js';
 
 describe('hubSanitizeEagerLoads', () => {
   it('strips `include` (legacy Sequelize shape)', () => {

package/dist/templates/backend/packages/hub/src/@app/hub/app/shared/functions/hub-validate-redirect-uri.function.spec.ts

@@ -1,4 +1,4 @@
-import { hubValidateRedirectUri } from './hub-validate-redirect-uri.function';
+import { hubValidateRedirectUri } from './hub-validate-redirect-uri.function.js';
 
 describe('hubValidateRedirectUri', () => {
   // Accepted: absolute http(s) URLs

package/dist/templates/backend/packages/hub/src/@app/hub/app/shared/functions/index.ts

@@ -1,2 +1,3 @@
-export * from './hub-sanitize-eager-loads.function';
-export * from './hub-validate-redirect-uri.function';
+export * from './hub-assert-no-accounts-reference.function.js';
+export * from './hub-sanitize-eager-loads.function.js';
+export * from './hub-validate-redirect-uri.function.js';

package/dist/templates/backend/packages/hub/src/@app/hub/app/shared/index.ts

@@ -1 +1 @@
-export * from './functions';
+export * from './functions/index.js';

package/dist/templates/backend/packages/hub/src/@app/hub/app-account/application/create/hub-create-app-account.handler.ts

@@ -2,9 +2,10 @@
  * @aurora-catalyst-generated
  * @source cliter/hub/app-account.aurora.yaml
  */
-import { HubAppAccount, HubCreateAppAccountInput } from '@api/graphql';
-import { HubCreateAppAccountService, HubFindAppAccountByIdService } from '@app/hub/app-account';
-import { HubAppAccountFieldSchema } from '@app/hub/app-account/domain';
+import { HubAppAccount, HubCreateAppAccountInput } from '@api/graphql.js';
+import { HubCreateAppAccountService } from '@app/hub/app-account/application/create/hub-create-app-account.service.js';
+import { HubFindAppAccountByIdService } from '@app/hub/app-account/application/find/hub-find-app-account-by-id.service.js';
+import { HubAppAccountFieldSchema } from '@app/hub/app-account/domain/index.js';
 import { ApplySchema, EmitEvent, HandlerMeta } from '@aurorajs.dev/core-back';
 import { Injectable } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
@@ -18,7 +19,7 @@ export class HubCreateAppAccountHandler {
   ) {}
 
   @EmitEvent('hub.appAccount.created')
-  @ApplySchema(HubAppAccountFieldSchema)
+  @ApplySchema({ schema: HubAppAccountFieldSchema, operation: 'create' })
   async main(payload: HubCreateAppAccountInput, handlerMeta?: HandlerMeta): Promise<HubAppAccount> {
     await this.createService.main(payload, handlerMeta);
 

package/dist/templates/backend/packages/hub/src/@app/hub/app-account/application/create/hub-create-app-account.service.ts

@@ -2,8 +2,8 @@
  * @aurora-catalyst-generated
  * @source cliter/hub/app-account.aurora.yaml
  */
-import { HubAppAccount, HubCreateAppAccountInput } from '@api/graphql';
-import { HubDrizzleAppAccountRepository } from '@app/hub/app-account';
+import { HubAppAccount, HubCreateAppAccountInput } from '@api/graphql.js';
+import { HubDrizzleAppAccountRepository } from '@app/hub/app-account/infrastructure/drizzle/hub-drizzle-app-account.repository.js';
 import { HandlerMeta } from '@aurorajs.dev/core-back';
 import { Injectable } from '@nestjs/common';
 

package/dist/templates/backend/packages/hub/src/@app/hub/app-account/application/create/hub-create-apps-accounts.handler.ts

@@ -2,9 +2,9 @@
  * @aurora-catalyst-generated
  * @source cliter/hub/app-account.aurora.yaml
  */
-import { HubCreateAppAccountInput } from '@api/graphql';
-import { HubCreateAppsAccountsService } from '@app/hub/app-account';
-import { HubAppAccountFieldSchema } from '@app/hub/app-account/domain';
+import { HubCreateAppAccountInput } from '@api/graphql.js';
+import { HubCreateAppsAccountsService } from '@app/hub/app-account/application/create/hub-create-apps-accounts.service.js';
+import { HubAppAccountFieldSchema } from '@app/hub/app-account/domain/index.js';
 import { ApplySchema, EmitEvent, HandlerMeta } from '@aurorajs.dev/core-back';
 import { Injectable } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
@@ -17,7 +17,7 @@ export class HubCreateAppsAccountsHandler {
   ) {}
 
   @EmitEvent('hub.appAccount.created', { returnInputPayload: true })
-  @ApplySchema(HubAppAccountFieldSchema)
+  @ApplySchema({ schema: HubAppAccountFieldSchema, operation: 'create' })
   async main(payload: HubCreateAppAccountInput[], handlerMeta?: HandlerMeta): Promise<boolean> {
     await this.createService.main(payload, handlerMeta);
 

package/dist/templates/backend/packages/hub/src/@app/hub/app-account/application/create/hub-create-apps-accounts.service.ts

@@ -2,8 +2,8 @@
  * @aurora-catalyst-generated
  * @source cliter/hub/app-account.aurora.yaml
  */
-import { HubCreateAppAccountInput } from '@api/graphql';
-import { HubDrizzleAppAccountRepository } from '@app/hub/app-account';
+import { HubCreateAppAccountInput } from '@api/graphql.js';
+import { HubDrizzleAppAccountRepository } from '@app/hub/app-account/infrastructure/drizzle/hub-drizzle-app-account.repository.js';
 import { HandlerMeta } from '@aurorajs.dev/core-back';
 import { Injectable } from '@nestjs/common';
 

package/dist/templates/backend/packages/hub/src/@app/hub/app-account/application/delete/hub-delete-app-account-by-id.handler.ts

@@ -2,9 +2,10 @@
  * @aurora-catalyst-generated
  * @source cliter/hub/app-account.aurora.yaml
  */
-import { HubAppAccount } from '@api/graphql';
-import { HubDeleteAppAccountByIdService, HubFindAppAccountByIdService } from '@app/hub/app-account';
-import { HubAppAccountFieldSchema } from '@app/hub/app-account/domain';
+import { HubAppAccount } from '@api/graphql.js';
+import { HubDeleteAppAccountByIdService } from '@app/hub/app-account/application/delete/hub-delete-app-account-by-id.service.js';
+import { HubFindAppAccountByIdService } from '@app/hub/app-account/application/find/hub-find-app-account-by-id.service.js';
+import { HubAppAccountFieldSchema } from '@app/hub/app-account/domain/index.js';
 import { EmitEvent, Format, HandlerMeta, QueryStatement } from '@aurorajs.dev/core-back';
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';

package/dist/templates/backend/packages/hub/src/@app/hub/app-account/application/delete/hub-delete-app-account-by-id.service.ts

@@ -2,7 +2,7 @@
  * @aurora-catalyst-generated
  * @source cliter/hub/app-account.aurora.yaml
  */
-import { HubDrizzleAppAccountRepository } from '@app/hub/app-account';
+import { HubDrizzleAppAccountRepository } from '@app/hub/app-account/infrastructure/drizzle/hub-drizzle-app-account.repository.js';
 import { HandlerMeta, QueryStatement } from '@aurorajs.dev/core-back';
 import { Injectable } from '@nestjs/common';
 

package/dist/templates/backend/packages/hub/src/@app/hub/app-account/application/delete/hub-delete-apps-accounts.handler.ts

@@ -2,9 +2,10 @@
  * @aurora-catalyst-generated
  * @source cliter/hub/app-account.aurora.yaml
  */
-import { HubAppAccount } from '@api/graphql';
-import { HubDeleteAppsAccountsService, HubGetAppsAccountsService } from '@app/hub/app-account';
-import { HubAppAccountFieldSchema } from '@app/hub/app-account/domain';
+import { HubAppAccount } from '@api/graphql.js';
+import { HubDeleteAppsAccountsService } from '@app/hub/app-account/application/delete/hub-delete-apps-accounts.service.js';
+import { HubGetAppsAccountsService } from '@app/hub/app-account/application/get/hub-get-apps-accounts.service.js';
+import { HubAppAccountFieldSchema } from '@app/hub/app-account/domain/index.js';
 import { EmitEvent, Format, HandlerMeta, QueryStatement } from '@aurorajs.dev/core-back';
 import { Injectable } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';

package/dist/templates/backend/packages/hub/src/@app/hub/app-account/application/delete/hub-delete-apps-accounts.service.ts

@@ -2,7 +2,7 @@
  * @aurora-catalyst-generated
  * @source cliter/hub/app-account.aurora.yaml
  */
-import { HubDrizzleAppAccountRepository } from '@app/hub/app-account';
+import { HubDrizzleAppAccountRepository } from '@app/hub/app-account/infrastructure/drizzle/hub-drizzle-app-account.repository.js';
 import { HandlerMeta, QueryStatement } from '@aurorajs.dev/core-back';
 import { Injectable } from '@nestjs/common';
 

package/dist/templates/backend/packages/hub/src/@app/hub/app-account/application/find/hub-find-app-account-by-id.handler.ts

@@ -2,9 +2,9 @@
  * @aurora-catalyst-generated
  * @source cliter/hub/app-account.aurora.yaml
  */
-import { HubAppAccount } from '@api/graphql';
-import { HubFindAppAccountByIdService } from '@app/hub/app-account';
-import { HubAppAccountFieldSchema } from '@app/hub/app-account/domain';
+import { HubAppAccount } from '@api/graphql.js';
+import { HubFindAppAccountByIdService } from '@app/hub/app-account/application/find/hub-find-app-account-by-id.service.js';
+import { HubAppAccountFieldSchema } from '@app/hub/app-account/domain/index.js';
 import { Format, HandlerMeta, QueryStatement } from '@aurorajs.dev/core-back';
 import { Injectable, NotFoundException } from '@nestjs/common';
 

package/dist/templates/backend/packages/hub/src/@app/hub/app-account/application/find/hub-find-app-account-by-id.service.ts

@@ -2,8 +2,8 @@
  * @aurora-catalyst-generated
  * @source cliter/hub/app-account.aurora.yaml
  */
-import { HubAppAccount } from '@api/graphql';
-import { HubDrizzleAppAccountRepository } from '@app/hub/app-account';
+import { HubAppAccount } from '@api/graphql.js';
+import { HubDrizzleAppAccountRepository } from '@app/hub/app-account/infrastructure/drizzle/hub-drizzle-app-account.repository.js';
 import { HandlerMeta, QueryStatement } from '@aurorajs.dev/core-back';
 import { Injectable } from '@nestjs/common';
 
@@ -17,7 +17,7 @@ export class HubFindAppAccountByIdService {
     constraint?: QueryStatement,
     handlerMeta?: HandlerMeta,
   ): Promise<HubAppAccount> {
-    return await this.repository.findById(undefined, {
+    const appAccount = await this.repository.findById(undefined, {
       constraint,
       handlerMeta,
       findArguments: {
@@ -25,5 +25,7 @@ export class HubFindAppAccountByIdService {
         accountId: accountId,
       },
     });
+
+    return appAccount;
   }
 }

package/dist/templates/backend/packages/hub/src/@app/hub/app-account/application/find/hub-find-app-account.handler.ts

@@ -2,9 +2,9 @@
  * @aurora-catalyst-generated
  * @source cliter/hub/app-account.aurora.yaml
  */
-import { HubAppAccount } from '@api/graphql';
-import { HubFindAppAccountService } from '@app/hub/app-account';
-import { HubAppAccountFieldSchema } from '@app/hub/app-account/domain';
+import { HubAppAccount } from '@api/graphql.js';
+import { HubFindAppAccountService } from '@app/hub/app-account/application/find/hub-find-app-account.service.js';
+import { HubAppAccountFieldSchema } from '@app/hub/app-account/domain/index.js';
 import { Format, HandlerMeta, QueryStatement } from '@aurorajs.dev/core-back';
 import { Injectable, NotFoundException } from '@nestjs/common';
 

package/dist/templates/backend/packages/hub/src/@app/hub/app-account/application/find/hub-find-app-account.service.ts

@@ -2,8 +2,8 @@
  * @aurora-catalyst-generated
  * @source cliter/hub/app-account.aurora.yaml
  */
-import { HubAppAccount } from '@api/graphql';
-import { HubDrizzleAppAccountRepository } from '@app/hub/app-account';
+import { HubAppAccount } from '@api/graphql.js';
+import { HubDrizzleAppAccountRepository } from '@app/hub/app-account/infrastructure/drizzle/hub-drizzle-app-account.repository.js';
 import { HandlerMeta, QueryStatement } from '@aurorajs.dev/core-back';
 import { Injectable } from '@nestjs/common';
 
@@ -16,10 +16,12 @@ export class HubFindAppAccountService {
     constraint?: QueryStatement,
     handlerMeta?: HandlerMeta,
   ): Promise<HubAppAccount> {
-    return await this.repository.find({
+    const appAccount = await this.repository.find({
       queryStatement,
       constraint,
       handlerMeta,
     });
+
+    return appAccount;
   }
 }

package/dist/templates/backend/packages/hub/src/@app/hub/app-account/application/get/hub-get-apps-accounts.handler.ts

@@ -2,9 +2,9 @@
  * @aurora-catalyst-generated
  * @source cliter/hub/app-account.aurora.yaml
  */
-import { HubAppAccount } from '@api/graphql';
-import { HubGetAppsAccountsService } from '@app/hub/app-account';
-import { HubAppAccountFieldSchema } from '@app/hub/app-account/domain';
+import { HubAppAccount } from '@api/graphql.js';
+import { HubGetAppsAccountsService } from '@app/hub/app-account/application/get/hub-get-apps-accounts.service.js';
+import { HubAppAccountFieldSchema } from '@app/hub/app-account/domain/index.js';
 import { Format, HandlerMeta, QueryStatement } from '@aurorajs.dev/core-back';
 import { Injectable } from '@nestjs/common';
 

package/dist/templates/backend/packages/hub/src/@app/hub/app-account/application/get/hub-get-apps-accounts.service.ts

@@ -2,8 +2,8 @@
  * @aurora-catalyst-generated
  * @source cliter/hub/app-account.aurora.yaml
  */
-import { HubAppAccount } from '@api/graphql';
-import { HubDrizzleAppAccountRepository } from '@app/hub/app-account';
+import { HubAppAccount } from '@api/graphql.js';
+import { HubDrizzleAppAccountRepository } from '@app/hub/app-account/infrastructure/drizzle/hub-drizzle-app-account.repository.js';
 import { HandlerMeta, QueryStatement } from '@aurorajs.dev/core-back';
 import { Injectable } from '@nestjs/common';
 
@@ -16,10 +16,12 @@ export class HubGetAppsAccountsService {
     constraint?: QueryStatement,
     handlerMeta?: HandlerMeta,
   ): Promise<HubAppAccount[]> {
-    return await this.repository.get({
+    const rows = await this.repository.get({
       queryStatement,
       constraint,
       handlerMeta,
     });
+
+    return rows;
   }
 }

package/dist/templates/backend/packages/hub/src/@app/hub/app-account/application/paginate/hub-paginate-apps-accounts.handler.ts

@@ -2,9 +2,9 @@
  * @aurora-catalyst-generated
  * @source cliter/hub/app-account.aurora.yaml
  */
-import { Pagination } from '@api/graphql';
-import { HubPaginateAppsAccountsService } from '@app/hub/app-account';
-import { HubAppAccountFieldSchema } from '@app/hub/app-account/domain';
+import { Pagination } from '@api/graphql.js';
+import { HubPaginateAppsAccountsService } from '@app/hub/app-account/application/paginate/hub-paginate-apps-accounts.service.js';
+import { HubAppAccountFieldSchema } from '@app/hub/app-account/domain/index.js';
 import { Format, HandlerMeta, QueryStatement } from '@aurorajs.dev/core-back';
 import { Injectable } from '@nestjs/common';