@aurorajs.dev/catalyst-cli 1.1.3 → 2.0.0

package/dist/templates/backend/packages/iam/src/@bridges/providers/account-loader.bridge.ts

@@ -1,5 +1,5 @@
-import { ACCOUNT_LOADER } from '@aurora/modules';
-import { IamAccountLoaderAdapter } from '@bridges/iam/account/adapters';
+import { ACCOUNT_LOADER } from '@aurora/modules/index.js';
+import { IamAccountLoaderAdapter } from '@bridges/iam/account/adapters/index.js';
 import { Provider } from '@nestjs/common';
 
 export const accountLoaderBridge: Provider = {

package/dist/templates/backend/packages/iam/src/@bridges/providers/credential-verifier.bridge.ts

@@ -1,5 +1,5 @@
-import { CREDENTIAL_VERIFIER } from '@aurora/modules';
-import { IamCredentialVerifierAdapter } from '@bridges/iam/user/adapters';
+import { CREDENTIAL_VERIFIER } from '@aurora/modules/index.js';
+import { IamCredentialVerifierAdapter } from '@bridges/iam/user/adapters/index.js';
 import { Provider } from '@nestjs/common';
 
 export const credentialVerifierBridge: Provider = {

package/dist/templates/backend/packages/iam/src/@bridges/providers/iam-bounded-context-seeder.bridge.ts

@@ -1,5 +1,5 @@
-import { IAM_BOUNDED_CONTEXT_SEEDER } from '@bridges/iam/bounded-context';
-import { IamBoundedContextSeederAdapter } from '@bridges/iam/bounded-context/adapters';
+import { IAM_BOUNDED_CONTEXT_SEEDER } from '@bridges/iam/bounded-context/index.js';
+import { IamBoundedContextSeederAdapter } from '@bridges/iam/bounded-context/adapters/index.js';
 import { Provider } from '@nestjs/common';
 
 export const iamBoundedContextSeederBridge: Provider = {

package/dist/templates/backend/packages/iam/src/@bridges/providers/iam-permission-seeder.bridge.ts

@@ -1,5 +1,5 @@
-import { IAM_PERMISSION_SEEDER } from '@bridges/iam/permission';
-import { IamPermissionSeederAdapter } from '@bridges/iam/permission/adapters';
+import { IAM_PERMISSION_SEEDER } from '@bridges/iam/permission/index.js';
+import { IamPermissionSeederAdapter } from '@bridges/iam/permission/adapters/index.js';
 import { Provider } from '@nestjs/common';
 
 export const iamPermissionSeederBridge: Provider = {

package/dist/templates/backend/packages/iam/test/acceptance/iam/core-back-exception-status.e2e-spec.ts

@@ -35,7 +35,7 @@
  * for auditing). `findById` returns `undefined` and never reaches a throw.
  *
  * Bootstrap recipe (real `AppModule`, real DB, real repositories, real `@Auth` guards, only the
- * auth STRATEGY swapped) and the deferred `require()` after `app.init()` for VALUE imports are
+ * auth STRATEGY swapped) and the deferred `import()` after `app.init()` for VALUE imports are
  * taken verbatim from `user-sensitive-fields-masking.e2e-spec.ts` — the `@app/iam/tag` barrel
  * imports its own repository file, which imports back FROM the barrel (codegen convention), so a
  * static top-level VALUE import here would make this spec the module-graph entry point and risk
@@ -46,30 +46,14 @@
  * @see openspec/changes/consolidate-core-back-into-monorepo/design.md — D8
  * @see openspec/changes/consolidate-core-back-into-monorepo/results-1.2-exception-status.md
  * @see scripts/check-peer-singleton.ts — the static half of the same property
- * @see project memory "Jest + @Auth ESM limitation"
  */
 
-// Mock ESM-importing module BEFORE imports (jwks-rsa ESM blocker — project memory).
-jest.mock(
-  '@aurora/modules/authentication/infrastructure/strategies/aurora-hub/aurora-hub-consumer.adapter',
-  () => ({
-    AuroraHubConsumerAdapter: class AuroraHubConsumerAdapterMock {
-      getPassportOptions() {
-        return { jwtFromRequest: () => null, secretOrKey: 'mock' };
-      }
-      validate(): Promise<Record<string, never>> {
-        return Promise.resolve({});
-      }
-    },
-  }),
-);
-
 // TYPE-ONLY static import (erased at runtime) — see file-header comment for why the VALUE import
-// is deferred to a post-`app.init()` `require()`.
-import type { IamDrizzleTagRepository } from '@app/iam/tag/infrastructure/drizzle/iam-drizzle-tag.repository';
+// is deferred to a post-`app.init()` `import()`.
+import type { IamDrizzleTagRepository } from '@app/iam/tag/infrastructure/drizzle/iam-drizzle-tag.repository.js';
 
-import { ACCOUNT_LOADER } from '@aurora/modules/authentication/domain/ports';
-import { LocalProviderAdapter } from '@aurora/modules/authentication/infrastructure/strategies/local-provider/local-provider.adapter';
+import { ACCOUNT_LOADER } from '@aurora/modules/authentication/domain/ports/index.js';
+import { LocalProviderAdapter } from '@aurora/modules/authentication/infrastructure/strategies/local-provider/local-provider.adapter.js';
 // `HttpException` MUST come from the BACKEND's own `@nestjs/common`. This import is the load-
 // bearing part of group A: if core-back ever resolves a second copy again, the exception it
 // constructs stops being an instance of THIS class and group A goes red.
@@ -83,7 +67,7 @@ import { join } from 'node:path';
 import { ExtractJwt } from 'passport-jwt';
 import request from 'supertest';
 import { App } from 'supertest/types';
-import { AppModule } from '../../../src/app.module';
+import { AppModule } from '../../../src/app.module.js';
 
 const TEST_JWT_SECRET = 'core-back-exception-status-e2e-secret';
 
@@ -151,7 +135,7 @@ describe('core-back exceptions — declared status survives the package boundary
       imports: [AppModule],
     })
       .overrideProvider(ACCOUNT_LOADER)
-      .useValue({ loadById: jest.fn() })
+      .useValue({ loadById: vi.fn() })
       .overrideProvider(LocalProviderAdapter)
       .useValue({
         getPassportOptions: () => ({
@@ -167,9 +151,10 @@ describe('core-back exceptions — declared status survives the package boundary
     app = moduleRef.createNestApplication();
     await app.init();
 
-    // Deferred `require()` AFTER AppModule finished loading — see file-header comment.
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const tagRepositoryModule = require('@app/iam/tag/infrastructure/drizzle/iam-drizzle-tag.repository');
+    // Deferred `import()` AFTER AppModule finished loading — see file-header comment.
+    const tagRepositoryModule = await import(
+      '@app/iam/tag/infrastructure/drizzle/iam-drizzle-tag.repository.js'
+    );
     const TagRepositoryClass: typeof IamDrizzleTagRepository =
       tagRepositoryModule.IamDrizzleTagRepository;
 
@@ -241,10 +226,7 @@ describe('core-back exceptions — declared status survives the package boundary
       const res = await request(app.getHttpServer())
         .put('/iam/tag/update')
         .set('Authorization', authHeader())
-        // Explicit Content-Type: the e2e harness's `mime` mock (jest-e2e moduleNameMapper) makes
-        // superagent's implicit `.type('json')` shorthand resolve to `null`, which breaks its JSON
-        // body serialization (`.send({...})` throws a byteLength TypeError). Same documented
-        // constraint as `user-sensitive-fields-masking.e2e-spec.ts`.
+        // Explicit Content-Type, bypassing superagent's implicit `.type('json')` shorthand lookup.
         .set('Content-Type', 'application/json')
         .send({ id: missingTagId, name: 'does-not-matter' });
 

package/dist/templates/backend/packages/iam/test/acceptance/iam/user-sensitive-fields-masking.e2e-spec.ts

@@ -25,7 +25,7 @@
  * on the `secret` type); both rows are deleted in `afterAll`. No seeded/production row is read or
  * relied upon.
  *
- * Deferred `require()` after `app.init()` for the handler/repository VALUE imports: the
+ * Deferred `import()` after `app.init()` for the handler/repository VALUE imports: the
  * `@app/iam/user` and `@app/iam/account` barrels import their own handler/repository files,
  * which import services back FROM the same barrel (codegen convention) — a static top-level
  * VALUE import here would make this spec the module-graph entry point and risk freezing
@@ -37,33 +37,18 @@
  * it costs nothing extra once the module is bootstrapped for the other cases.
  *
  * @see cliter/iam/business-rules/user.md — BR-IAM-USER-001
- * @see project memory "Jest + @Auth ESM limitation"
  */
 
-// Mock ESM-importing module BEFORE imports (jwks-rsa ESM blocker — project memory).
-jest.mock(
-  '@aurora/modules/authentication/infrastructure/strategies/aurora-hub/aurora-hub-consumer.adapter',
-  () => ({
-    AuroraHubConsumerAdapter: class AuroraHubConsumerAdapterMock {
-      getPassportOptions() {
-        return { jwtFromRequest: () => null, secretOrKey: 'mock' };
-      }
-      validate(): Promise<Record<string, never>> {
-        return Promise.resolve({});
-      }
-    },
-  }),
-);
-
 // TYPE-ONLY static imports (erased at runtime) — see file-header comment for why the VALUE
-// import is deferred to a post-`app.init()` `require()`.
-import type { IamDrizzleAccountRepository } from '@app/iam/account/infrastructure/drizzle/iam-drizzle-account.repository';
-import type { IamCreateUserHandler } from '@app/iam/user/application/create/iam-create-user.handler';
-import type { IamDrizzleUserRepository } from '@app/iam/user/infrastructure/drizzle/iam-drizzle-user.repository';
-
-import { IamAccountTypeEnum } from '@api/graphql';
-import { ACCOUNT_LOADER } from '@aurora/modules/authentication/domain/ports';
-import { LocalProviderAdapter } from '@aurora/modules/authentication/infrastructure/strategies/local-provider/local-provider.adapter';
+// import is deferred to a post-`app.init()` `import()`.
+import type { IamCreateAccountPayload } from '@app/iam/account/index.js';
+import type { IamDrizzleAccountRepository } from '@app/iam/account/infrastructure/drizzle/iam-drizzle-account.repository.js';
+import type { IamCreateUserHandler } from '@app/iam/user/application/create/iam-create-user.handler.js';
+import type { IamDrizzleUserRepository } from '@app/iam/user/infrastructure/drizzle/iam-drizzle-user.repository.js';
+
+import { IamAccountTypeEnum } from '@api/graphql.js';
+import { ACCOUNT_LOADER } from '@aurora/modules/authentication/domain/ports/index.js';
+import { LocalProviderAdapter } from '@aurora/modules/authentication/infrastructure/strategies/local-provider/local-provider.adapter.js';
 import { INestApplication } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import { Test, TestingModule } from '@nestjs/testing';
@@ -74,7 +59,7 @@ import { join } from 'node:path';
 import { ExtractJwt } from 'passport-jwt';
 import request from 'supertest';
 import { App } from 'supertest/types';
-import { AppModule } from '../../../src/app.module';
+import { AppModule } from '../../../src/app.module.js';
 
 const TEST_JWT_SECRET = 'iam-user-sensitive-fields-masking-e2e-secret';
 
@@ -138,7 +123,7 @@ describe('iam/user — sensitive fields masking (e2e, BR-IAM-USER-001)', () => {
       imports: [AppModule],
     })
       .overrideProvider(ACCOUNT_LOADER)
-      .useValue({ loadById: jest.fn() })
+      .useValue({ loadById: vi.fn() })
       .overrideProvider(LocalProviderAdapter)
       .useValue({
         getPassportOptions: () => ({
@@ -154,17 +139,20 @@ describe('iam/user — sensitive fields masking (e2e, BR-IAM-USER-001)', () => {
     app = moduleRef.createNestApplication();
     await app.init();
 
-    // Deferred `require()` AFTER AppModule finished loading — see file-header comment.
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const createUserHandlerModule = require('@app/iam/user/application/create/iam-create-user.handler');
+    // Deferred `import()` AFTER AppModule finished loading — see file-header comment.
+    const createUserHandlerModule = await import(
+      '@app/iam/user/application/create/iam-create-user.handler.js'
+    );
     const CreateUserHandlerClass: typeof IamCreateUserHandler =
       createUserHandlerModule.IamCreateUserHandler;
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const userRepositoryModule = require('@app/iam/user/infrastructure/drizzle/iam-drizzle-user.repository');
+    const userRepositoryModule = await import(
+      '@app/iam/user/infrastructure/drizzle/iam-drizzle-user.repository.js'
+    );
     const UserRepositoryClass: typeof IamDrizzleUserRepository =
       userRepositoryModule.IamDrizzleUserRepository;
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const accountRepositoryModule = require('@app/iam/account/infrastructure/drizzle/iam-drizzle-account.repository');
+    const accountRepositoryModule = await import(
+      '@app/iam/account/infrastructure/drizzle/iam-drizzle-account.repository.js'
+    );
     const AccountRepositoryClass: typeof IamDrizzleAccountRepository =
       accountRepositoryModule.IamDrizzleAccountRepository;
 
@@ -173,7 +161,13 @@ describe('iam/user — sensitive fields masking (e2e, BR-IAM-USER-001)', () => {
     accountRepository = moduleRef.get(AccountRepositoryClass, { strict: false });
 
     // Own fixture account — FK target for iam_user.account_id (real FK constraint).
-    await accountRepository.create({
+    // This calls the repository directly (bypassing IamCreateAccountHandler), so it is not
+    // subject to @ApplySchema's readonly rejection — but dApplicationCodes/dPermissions/
+    // dTenants left the public IamCreateAccountInput type the repository is generic over
+    // (design.md). IamCreateAccountPayload is the internal type this change introduces for
+    // exactly this case — a server-side writer that still needs to set the three columns —
+    // so the fixture types the object with it directly instead of casting through it.
+    const accountFixture: IamCreateAccountPayload = {
       id: sentinelAccountId,
       type: IamAccountTypeEnum.USER,
       username: `e2e-user-masking-${sentinelAccountId.slice(0, 8)}`,
@@ -182,7 +176,9 @@ describe('iam/user — sensitive fields masking (e2e, BR-IAM-USER-001)', () => {
       dApplicationCodes: [],
       dPermissions: { all: [] },
       dTenants: [],
-    });
+      hasAddChildTenants: false,
+    };
+    await accountRepository.create(accountFixture);
 
     // Real create flow (real handler → real @ApplySchema → real repository → real DB).
     await createUserHandler.main(
@@ -247,11 +243,7 @@ describe('iam/user — sensitive fields masking (e2e, BR-IAM-USER-001)', () => {
     const res = await request(app.getHttpServer())
       .post('/iam/users/paginate')
       .set('Authorization', authHeader(tokenWithUserGet))
-      // Explicit Content-Type: the e2e harness's `mime` mock (jest-e2e moduleNameMapper) makes
-      // superagent's implicit `.type('json')` shorthand resolve to `null`, which breaks its JSON
-      // body serialization (`.send({...})` throws a byteLength TypeError). Same documented
-      // constraint as test/acceptance/tools/custom-field-permissions.e2e-spec.ts — setting the
-      // full mime type explicitly skips the shorthand lookup entirely.
+      // Explicit Content-Type, bypassing superagent's implicit `.type('json')` shorthand lookup.
       .set('Content-Type', 'application/json')
       .send({ query: { where: { id: { eq: sentinelUserId } } } })
       .expect(200);

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/controllers/o-auth-count-access-token.controller.ts

@@ -2,8 +2,8 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-import { OAuthCountAccessTokenHandler } from '@app/o-auth/access-token';
-import { Auth } from '@aurora/decorators';
+import { OAuthCountAccessTokenHandler } from '@app/o-auth/access-token/index.js';
+import { Auth } from '@aurora/decorators/index.js';
 import { QueryStatement, Timezone } from '@aurorajs.dev/core-back';
 import { Body, Controller, HttpCode, Post } from '@nestjs/common';
 import { ApiOkResponse, ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger';

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/controllers/o-auth-delete-access-token-by-id.controller.ts

@@ -2,9 +2,9 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-import { OAuthAccessTokenDto } from '@api/o-auth/access-token';
-import { OAuthDeleteAccessTokenByIdHandler } from '@app/o-auth/access-token';
-import { Auth } from '@aurora/decorators';
+import { OAuthAccessTokenDto } from '@api/o-auth/access-token/index.js';
+import { OAuthDeleteAccessTokenByIdHandler } from '@app/o-auth/access-token/index.js';
+import { Auth } from '@aurora/decorators/index.js';
 import { QueryStatement, Timezone } from '@aurorajs.dev/core-back';
 import { Body, Controller, Delete, Param } from '@nestjs/common';
 import { ApiOkResponse, ApiOperation, ApiTags } from '@nestjs/swagger';

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/controllers/o-auth-find-access-token-by-id.controller.ts

@@ -2,9 +2,9 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-import { OAuthAccessTokenDto } from '@api/o-auth/access-token';
-import { OAuthFindAccessTokenByIdHandler } from '@app/o-auth/access-token';
-import { Auth } from '@aurora/decorators';
+import { OAuthAccessTokenDto } from '@api/o-auth/access-token/index.js';
+import { OAuthFindAccessTokenByIdHandler } from '@app/o-auth/access-token/index.js';
+import { Auth } from '@aurora/decorators/index.js';
 import { QueryStatement, Timezone } from '@aurorajs.dev/core-back';
 import { Body, Controller, HttpCode, Param, Post } from '@nestjs/common';
 import { ApiOkResponse, ApiOperation, ApiTags } from '@nestjs/swagger';

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/controllers/o-auth-find-access-token.controller.ts

@@ -2,9 +2,9 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-import { OAuthAccessTokenDto } from '@api/o-auth/access-token';
-import { OAuthFindAccessTokenHandler } from '@app/o-auth/access-token';
-import { Auth } from '@aurora/decorators';
+import { OAuthAccessTokenDto } from '@api/o-auth/access-token/index.js';
+import { OAuthFindAccessTokenHandler } from '@app/o-auth/access-token/index.js';
+import { Auth } from '@aurora/decorators/index.js';
 import { QueryStatement, Timezone } from '@aurorajs.dev/core-back';
 import { Body, Controller, HttpCode, Post } from '@nestjs/common';
 import { ApiBody, ApiOkResponse, ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger';

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/controllers/o-auth-get-access-tokens.controller.ts

@@ -2,9 +2,9 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-import { OAuthAccessTokenDto } from '@api/o-auth/access-token';
-import { OAuthGetAccessTokensHandler } from '@app/o-auth/access-token';
-import { Auth } from '@aurora/decorators';
+import { OAuthAccessTokenDto } from '@api/o-auth/access-token/index.js';
+import { OAuthGetAccessTokensHandler } from '@app/o-auth/access-token/index.js';
+import { Auth } from '@aurora/decorators/index.js';
 import { QueryStatement, Timezone } from '@aurorajs.dev/core-back';
 import { Body, Controller, HttpCode, Post } from '@nestjs/common';
 import { ApiBody, ApiOkResponse, ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger';

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/controllers/o-auth-paginate-access-tokens.controller.ts

@@ -2,8 +2,8 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-import { OAuthPaginateAccessTokensHandler } from '@app/o-auth/access-token';
-import { Auth } from '@aurora/decorators';
+import { OAuthPaginateAccessTokensHandler } from '@app/o-auth/access-token/index.js';
+import { Auth } from '@aurora/decorators/index.js';
 import { Pagination, QueryStatement, Timezone } from '@aurorajs.dev/core-back';
 import { Body, Controller, HttpCode, Post } from '@nestjs/common';
 import { ApiOkResponse, ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger';

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/dto/index.ts

@@ -2,7 +2,7 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-export { OAuthAccessTokenDto } from './o-auth-access-token.dto';
-export { OAuthCreateAccessTokenDto } from './o-auth-create-access-token.dto';
-export { OAuthUpdateAccessTokenByIdDto } from './o-auth-update-access-token-by-id.dto';
-export { OAuthUpdateAccessTokensDto } from './o-auth-update-access-tokens.dto';
+export { OAuthAccessTokenDto } from './o-auth-access-token.dto.js';
+export { OAuthCreateAccessTokenDto } from './o-auth-create-access-token.dto.js';
+export { OAuthUpdateAccessTokenByIdDto } from './o-auth-update-access-token-by-id.dto.js';
+export { OAuthUpdateAccessTokensDto } from './o-auth-update-access-tokens.dto.js';

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/dto/o-auth-access-token.dto.ts

@@ -2,8 +2,9 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-import { OAuthClientDto } from '@api/o-auth/client';
-import { OAuthRefreshTokenDto } from '@api/o-auth/refresh-token';
+import { OAuthClientDto } from '@api/o-auth/client/index.js';
+import { OAuthRefreshTokenDto } from '@api/o-auth/refresh-token/index.js';
+import { WrapperType } from '@aurorajs.dev/core-back';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class OAuthAccessTokenDto {
@@ -33,7 +34,7 @@ export class OAuthAccessTokenDto {
     type: () => OAuthClientDto,
     description: 'OAuthClient [input here api field description]',
   })
-  client?: OAuthClientDto;
+  client?: WrapperType<OAuthClientDto>;
 
   @ApiProperty({
     type: String,
@@ -75,7 +76,7 @@ export class OAuthAccessTokenDto {
     description:
       'One-to-one relationship with a refresh token. When present, the refresh token can be used to obtain a new access token after this one expires.',
   })
-  refreshToken?: OAuthRefreshTokenDto;
+  refreshToken?: WrapperType<OAuthRefreshTokenDto>;
 
   @ApiProperty({
     type: String,

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/dto/o-auth-create-access-token.dto.ts

@@ -2,7 +2,8 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-import { OAuthCreateRefreshTokenDto } from '@api/o-auth/refresh-token';
+import { OAuthCreateRefreshTokenDto } from '@api/o-auth/refresh-token/index.js';
+import { WrapperType } from '@aurorajs.dev/core-back';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class OAuthCreateAccessTokenDto {
@@ -57,9 +58,9 @@ export class OAuthCreateAccessTokenDto {
   expiresAt?: string;
 
   @ApiProperty({
-    type: OAuthCreateRefreshTokenDto,
+    type: () => OAuthCreateRefreshTokenDto,
     description:
       'One-to-one relationship with a refresh token. When present, the refresh token can be used to obtain a new access token after this one expires.',
   })
-  refreshToken?: OAuthCreateRefreshTokenDto;
+  refreshToken?: WrapperType<OAuthCreateRefreshTokenDto>;
 }

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/dto/o-auth-update-access-token-by-id.dto.ts

@@ -2,7 +2,8 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-import { OAuthUpdateRefreshTokenByIdDto } from '@api/o-auth/refresh-token';
+import { OAuthUpdateRefreshTokenByIdDto } from '@api/o-auth/refresh-token/index.js';
+import { WrapperType } from '@aurorajs.dev/core-back';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class OAuthUpdateAccessTokenByIdDto {
@@ -57,9 +58,9 @@ export class OAuthUpdateAccessTokenByIdDto {
   expiresAt?: string;
 
   @ApiProperty({
-    type: OAuthUpdateRefreshTokenByIdDto,
+    type: () => OAuthUpdateRefreshTokenByIdDto,
     description:
       'One-to-one relationship with a refresh token. When present, the refresh token can be used to obtain a new access token after this one expires.',
   })
-  refreshToken?: OAuthUpdateRefreshTokenByIdDto;
+  refreshToken?: WrapperType<OAuthUpdateRefreshTokenByIdDto>;
 }

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/dto/o-auth-update-access-tokens.dto.ts

@@ -2,7 +2,8 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-import { OAuthUpdateRefreshTokensDto } from '@api/o-auth/refresh-token';
+import { OAuthUpdateRefreshTokensDto } from '@api/o-auth/refresh-token/index.js';
+import { WrapperType } from '@aurorajs.dev/core-back';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class OAuthUpdateAccessTokensDto {
@@ -57,9 +58,9 @@ export class OAuthUpdateAccessTokensDto {
   expiresAt?: string;
 
   @ApiProperty({
-    type: OAuthUpdateRefreshTokensDto,
+    type: () => OAuthUpdateRefreshTokensDto,
     description:
       'One-to-one relationship with a refresh token. When present, the refresh token can be used to obtain a new access token after this one expires.',
   })
-  refreshToken?: OAuthUpdateRefreshTokensDto;
+  refreshToken?: WrapperType<OAuthUpdateRefreshTokensDto>;
 }

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/graphql/o-auth-access-token.graphql

@@ -103,10 +103,7 @@ type Query {
     constraint: QueryStatementInput
   ): Pagination!
 
-  oAuthCountAccessToken(
-    query: QueryStatementInput
-    constraint: QueryStatementInput
-  ): Int
+  oAuthCountAccessToken(query: QueryStatementInput, constraint: QueryStatementInput): Int
 }
 
 type Mutation {

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/index.ts

@@ -3,10 +3,10 @@
  * @source cliter/o-auth/access-token.aurora.yaml
  */
 // 1 - export DTOs
-export { OAuthAccessTokenDto } from './dto/o-auth-access-token.dto';
-export { OAuthCreateAccessTokenDto } from './dto/o-auth-create-access-token.dto';
-export { OAuthUpdateAccessTokenByIdDto } from './dto/o-auth-update-access-token-by-id.dto';
-export { OAuthUpdateAccessTokensDto } from './dto/o-auth-update-access-tokens.dto';
+export { OAuthAccessTokenDto } from './dto/o-auth-access-token.dto.js';
+export { OAuthCreateAccessTokenDto } from './dto/o-auth-create-access-token.dto.js';
+export { OAuthUpdateAccessTokenByIdDto } from './dto/o-auth-update-access-token-by-id.dto.js';
+export { OAuthUpdateAccessTokensDto } from './dto/o-auth-update-access-tokens.dto.js';
 
 // 2 - export controllers
 export {
@@ -29,35 +29,35 @@ export {
 };
 
 // 4 - import controllers
-import { OAuthCountAccessTokenController } from './controllers/o-auth-count-access-token.controller';
-import { OAuthDeleteAccessTokenByIdController } from './controllers/o-auth-delete-access-token-by-id.controller';
-import { OAuthFindAccessTokenByIdController } from './controllers/o-auth-find-access-token-by-id.controller';
-import { OAuthFindAccessTokenController } from './controllers/o-auth-find-access-token.controller';
-import { OAuthGetAccessTokensController } from './controllers/o-auth-get-access-tokens.controller';
-import { OAuthPaginateAccessTokensController } from './controllers/o-auth-paginate-access-tokens.controller';
+import { OAuthCountAccessTokenController } from './controllers/o-auth-count-access-token.controller.js';
+import { OAuthDeleteAccessTokenByIdController } from './controllers/o-auth-delete-access-token-by-id.controller.js';
+import { OAuthFindAccessTokenByIdController } from './controllers/o-auth-find-access-token-by-id.controller.js';
+import { OAuthFindAccessTokenController } from './controllers/o-auth-find-access-token.controller.js';
+import { OAuthGetAccessTokensController } from './controllers/o-auth-get-access-tokens.controller.js';
+import { OAuthPaginateAccessTokensController } from './controllers/o-auth-paginate-access-tokens.controller.js';
 
 // 5 - import resolvers
-import { OAuthCountAccessTokenResolver } from './resolvers/o-auth-count-access-token.resolver';
-import { OAuthDeleteAccessTokenByIdResolver } from './resolvers/o-auth-delete-access-token-by-id.resolver';
-import { OAuthFindAccessTokenByIdResolver } from './resolvers/o-auth-find-access-token-by-id.resolver';
-import { OAuthFindAccessTokenResolver } from './resolvers/o-auth-find-access-token.resolver';
-import { OAuthGetAccessTokensResolver } from './resolvers/o-auth-get-access-tokens.resolver';
-import { OAuthPaginateAccessTokensResolver } from './resolvers/o-auth-paginate-access-tokens.resolver';
+import { OAuthCountAccessTokenResolver } from './resolvers/o-auth-count-access-token.resolver.js';
+import { OAuthDeleteAccessTokenByIdResolver } from './resolvers/o-auth-delete-access-token-by-id.resolver.js';
+import { OAuthFindAccessTokenByIdResolver } from './resolvers/o-auth-find-access-token-by-id.resolver.js';
+import { OAuthFindAccessTokenResolver } from './resolvers/o-auth-find-access-token.resolver.js';
+import { OAuthGetAccessTokensResolver } from './resolvers/o-auth-get-access-tokens.resolver.js';
+import { OAuthPaginateAccessTokensResolver } from './resolvers/o-auth-paginate-access-tokens.resolver.js';
 
 export const OAuthAccessTokenApiControllers = [
   OAuthPaginateAccessTokensController,
-  OAuthCountAccessTokenController,
   OAuthGetAccessTokensController,
   OAuthFindAccessTokenByIdController,
   OAuthFindAccessTokenController,
   OAuthDeleteAccessTokenByIdController,
+  OAuthCountAccessTokenController,
 ];
 
 export const OAuthAccessTokenApiResolvers = [
   OAuthPaginateAccessTokensResolver,
-  OAuthCountAccessTokenResolver,
   OAuthGetAccessTokensResolver,
   OAuthFindAccessTokenByIdResolver,
   OAuthFindAccessTokenResolver,
   OAuthDeleteAccessTokenByIdResolver,
+  OAuthCountAccessTokenResolver,
 ];

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/resolvers/o-auth-count-access-token.resolver.ts

@@ -2,8 +2,8 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-import { OAuthCountAccessTokenHandler } from '@app/o-auth/access-token';
-import { Auth } from '@aurora/decorators';
+import { OAuthCountAccessTokenHandler } from '@app/o-auth/access-token/index.js';
+import { Auth } from '@aurora/decorators/index.js';
 import { QueryStatement, Timezone } from '@aurorajs.dev/core-back';
 import { Args, Query, Resolver } from '@nestjs/graphql';
 

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/resolvers/o-auth-delete-access-token-by-id.resolver.ts

@@ -2,9 +2,9 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-import { OAuthAccessToken } from '@api/graphql';
-import { OAuthDeleteAccessTokenByIdHandler } from '@app/o-auth/access-token';
-import { Auth } from '@aurora/decorators';
+import { OAuthAccessToken } from '@api/graphql.js';
+import { OAuthDeleteAccessTokenByIdHandler } from '@app/o-auth/access-token/index.js';
+import { Auth } from '@aurora/decorators/index.js';
 import { QueryStatement, Timezone } from '@aurorajs.dev/core-back';
 import { Args, Mutation, Resolver } from '@nestjs/graphql';
 

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/resolvers/o-auth-find-access-token-by-id.resolver.ts

@@ -2,9 +2,9 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-import { OAuthAccessToken } from '@api/graphql';
-import { OAuthFindAccessTokenByIdHandler } from '@app/o-auth/access-token';
-import { Auth } from '@aurora/decorators';
+import { OAuthAccessToken } from '@api/graphql.js';
+import { OAuthFindAccessTokenByIdHandler } from '@app/o-auth/access-token/index.js';
+import { Auth } from '@aurora/decorators/index.js';
 import { QueryStatement, Timezone } from '@aurorajs.dev/core-back';
 import { Args, Query, Resolver } from '@nestjs/graphql';
 

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/resolvers/o-auth-find-access-token.resolver.ts

@@ -2,9 +2,9 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-import { OAuthAccessToken } from '@api/graphql';
-import { OAuthFindAccessTokenHandler } from '@app/o-auth/access-token';
-import { Auth } from '@aurora/decorators';
+import { OAuthAccessToken } from '@api/graphql.js';
+import { OAuthFindAccessTokenHandler } from '@app/o-auth/access-token/index.js';
+import { Auth } from '@aurora/decorators/index.js';
 import { QueryStatement, Timezone } from '@aurorajs.dev/core-back';
 import { Args, Query, Resolver } from '@nestjs/graphql';
 

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/resolvers/o-auth-get-access-tokens.resolver.ts

@@ -2,9 +2,9 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-import { OAuthAccessToken } from '@api/graphql';
-import { OAuthGetAccessTokensHandler } from '@app/o-auth/access-token';
-import { Auth } from '@aurora/decorators';
+import { OAuthAccessToken } from '@api/graphql.js';
+import { OAuthGetAccessTokensHandler } from '@app/o-auth/access-token/index.js';
+import { Auth } from '@aurora/decorators/index.js';
 import { QueryStatement, Timezone } from '@aurorajs.dev/core-back';
 import { Args, Query, Resolver } from '@nestjs/graphql';
 

package/dist/templates/backend/packages/o-auth/src/@api/o-auth/access-token/resolvers/o-auth-paginate-access-tokens.resolver.ts

@@ -2,9 +2,9 @@
  * @aurora-catalyst-generated
  * @source cliter/o-auth/access-token.aurora.yaml
  */
-import { Pagination } from '@api/graphql';
-import { OAuthPaginateAccessTokensHandler } from '@app/o-auth/access-token';
-import { Auth } from '@aurora/decorators';
+import { Pagination } from '@api/graphql.js';
+import { OAuthPaginateAccessTokensHandler } from '@app/o-auth/access-token/index.js';
+import { Auth } from '@aurora/decorators/index.js';
 import { QueryStatement, Timezone } from '@aurorajs.dev/core-back';
 import { Args, Query, Resolver } from '@nestjs/graphql';