create-forgeon 0.1.18 → 0.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-forgeon",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "Forgeon project generator CLI",
   "license": "MIT",
   "author": "Forgeon",

package/src/modules/executor.test.mjs

@@ -110,9 +110,23 @@ describe('addModule', () => {
 
       const appModule = fs.readFileSync(path.join(projectRoot, 'apps', 'api', 'src', 'app.module.ts'), 'utf8');
       assert.match(appModule, /coreConfig/);
-      assert.match(appModule, /validateCoreEnv/);
+      assert.match(appModule, /createEnvValidator/);
+      assert.match(appModule, /coreEnvSchema/);
+      assert.match(appModule, /i18nConfig/);
+      assert.match(appModule, /i18nEnvSchema/);
       assert.match(appModule, /CoreConfigModule/);
 
+      const forgeonI18nModule = fs.readFileSync(
+        path.join(projectRoot, 'packages', 'i18n', 'src', 'forgeon-i18n.module.ts'),
+        'utf8',
+      );
+      assert.match(forgeonI18nModule, /const resolvers = \[/);
+      assert.match(forgeonI18nModule, /I18nModule\.forRootAsync\([\s\S]*resolvers,/);
+      assert.doesNotMatch(
+        forgeonI18nModule,
+        /exports:\s*\[I18nModule,\s*I18nConfigModule,\s*I18nConfigService\]/,
+      );
+
       const appTsx = fs.readFileSync(path.join(projectRoot, 'apps', 'web', 'src', 'App.tsx'), 'utf8');
       assert.match(appTsx, /@forgeon\/i18n-web/);
       assert.match(appTsx, /react-i18next/);

package/templates/base/apps/api/src/app.module.ts

@@ -1,31 +1,31 @@
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
-import { CoreConfigModule, coreConfig, validateCoreEnv } from '@forgeon/core';
-import { ForgeonI18nModule } from '@forgeon/i18n';
+import {
+  CoreConfigModule,
+  coreConfig,
+  coreEnvSchema,
+  createEnvValidator,
+} from '@forgeon/core';
+import { ForgeonI18nModule, i18nConfig, i18nEnvSchema } from '@forgeon/i18n';
 import { join } from 'path';
 import { HealthController } from './health/health.controller';
 import { PrismaModule } from './prisma/prisma.module';
 import { AppExceptionFilter } from './common/filters/app-exception.filter';
 
-const i18nDefaultLang = process.env.I18N_DEFAULT_LANG ?? 'en';
-const i18nFallbackLang = process.env.I18N_FALLBACK_LANG ?? 'en';
 const i18nPath = join(__dirname, '..', '..', '..', 'resources', 'i18n');
 
 @Module({
   imports: [
     ConfigModule.forRoot({
       isGlobal: true,
-      load: [coreConfig],
-      validate: validateCoreEnv,
+      load: [coreConfig, i18nConfig],
+      validate: createEnvValidator([coreEnvSchema, i18nEnvSchema]),
       envFilePath: '.env',
     }),
     CoreConfigModule,
     ForgeonI18nModule.register({
-      enabled: true,
-      defaultLang: i18nDefaultLang,
-      fallbackLang: i18nFallbackLang,
       path: i18nPath,
-    }),
+    }),
     PrismaModule,
   ],
   controllers: [HealthController],

package/templates/base/packages/i18n/package.json

@@ -7,10 +7,12 @@
   "scripts": {
     "build": "tsc -p tsconfig.json"
   },
-  "dependencies": {
-    "@nestjs/common": "^11.0.1",
-    "nestjs-i18n": "^10.5.1"
-  },
+  "dependencies": {
+    "@nestjs/config": "^4.0.2",
+    "@nestjs/common": "^11.0.1",
+    "nestjs-i18n": "^10.5.1",
+    "zod": "^3.23.8"
+  },
   "devDependencies": {
     "@types/node": "^22.10.7",
     "typescript": "^5.7.3"

package/templates/base/packages/i18n/src/forgeon-i18n.module.ts

@@ -1,47 +1,47 @@
-import { DynamicModule, Module } from '@nestjs/common';
-import {
-  AcceptLanguageResolver,
-  I18nJsonLoader,
-  I18nModule,
-  QueryResolver,
-} from 'nestjs-i18n';
-import { join } from 'path';
-
-export interface ForgeonI18nOptions {
-  enabled: boolean;
-  defaultLang: string;
-  fallbackLang: string;
-  path?: string;
-}
-
-@Module({})
-export class ForgeonI18nModule {
-  static register(options: ForgeonI18nOptions): DynamicModule {
-    if (!options.enabled) {
-      return { module: ForgeonI18nModule };
-    }
-
-    const translationsPath =
-      options.path ?? join(process.cwd(), 'resources', 'i18n');
-
-    return {
-      module: ForgeonI18nModule,
-      imports: [
-        I18nModule.forRoot({
-          fallbackLanguage: options.fallbackLang,
-          loader: I18nJsonLoader,
-          loaderOptions: {
-            path: translationsPath,
-            watch: false,
-          },
-          resolvers: [
-            { use: AcceptLanguageResolver, options: { matchType: 'strict-loose' } },
-            { use: QueryResolver, options: ['lang'] },
-          ],
-        }),
-      ],
-      exports: [I18nModule],
-    };
-  }
-}
+import { DynamicModule, Module } from '@nestjs/common';
+import {
+  AcceptLanguageResolver,
+  I18nJsonLoader,
+  I18nModule,
+  QueryResolver,
+} from 'nestjs-i18n';
+import { join } from 'path';
+import { I18nConfigModule } from './i18n-config.module';
+import { I18nConfigService } from './i18n-config.service';
+
+export interface ForgeonI18nOptions {
+  path?: string;
+}
+
+@Module({})
+export class ForgeonI18nModule {
+  static register(options: ForgeonI18nOptions = {}): DynamicModule {
+    const translationsPath = options.path ?? join(process.cwd(), 'resources', 'i18n');
+    const resolvers = [
+      { use: AcceptLanguageResolver, options: { matchType: 'strict-loose' } },
+      { use: QueryResolver, options: ['lang'] },
+    ];
+
+    return {
+      module: ForgeonI18nModule,
+      imports: [
+        I18nConfigModule,
+        I18nModule.forRootAsync({
+          imports: [I18nConfigModule],
+          inject: [I18nConfigService],
+          resolvers,
+          useFactory: (config: I18nConfigService) => ({
+            fallbackLanguage: config.fallbackLang,
+            loader: I18nJsonLoader,
+            loaderOptions: {
+              path: translationsPath,
+              watch: false,
+            },
+          }),
+        }),
+      ],
+      exports: [I18nModule, I18nConfigModule],
+    };
+  }
+}
 

package/templates/base/packages/i18n/src/i18n-config.loader.ts

@@ -0,0 +1,20 @@
+import { registerAs } from '@nestjs/config';
+import { parseI18nEnv } from './i18n-env.schema';
+
+export const I18N_CONFIG_NAMESPACE = 'i18n';
+
+export interface I18nConfigValues {
+  defaultLang: string;
+  fallbackLang: string;
+}
+
+export const i18nConfig = registerAs(
+  I18N_CONFIG_NAMESPACE,
+  (): I18nConfigValues => {
+    const env = parseI18nEnv(process.env);
+    return {
+      defaultLang: env.I18N_DEFAULT_LANG,
+      fallbackLang: env.I18N_FALLBACK_LANG,
+    };
+  },
+);

package/templates/base/packages/i18n/src/i18n-config.module.ts

@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+import { ConfigModule } from '@nestjs/config';
+import { I18nConfigService } from './i18n-config.service';
+
+@Module({
+  imports: [ConfigModule],
+  providers: [I18nConfigService],
+  exports: [I18nConfigService],
+})
+export class I18nConfigModule {}

package/templates/base/packages/i18n/src/i18n-config.service.ts

@@ -0,0 +1,20 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { I18N_CONFIG_NAMESPACE } from './i18n-config.loader';
+
+@Injectable()
+export class I18nConfigService {
+  constructor(private readonly configService: ConfigService) {}
+
+  get defaultLang(): string {
+    return this.configService.getOrThrow<string>(
+      `${I18N_CONFIG_NAMESPACE}.defaultLang`,
+    );
+  }
+
+  get fallbackLang(): string {
+    return this.configService.getOrThrow<string>(
+      `${I18N_CONFIG_NAMESPACE}.fallbackLang`,
+    );
+  }
+}

package/templates/base/packages/i18n/src/i18n-env.schema.ts

@@ -0,0 +1,14 @@
+import { z } from 'zod';
+
+export const i18nEnvSchema = z
+  .object({
+    I18N_DEFAULT_LANG: z.string().trim().min(1).default('en'),
+    I18N_FALLBACK_LANG: z.string().trim().min(1).default('en'),
+  })
+  .passthrough();
+
+export type I18nEnv = z.infer<typeof i18nEnvSchema>;
+
+export function parseI18nEnv(input: Record<string, unknown>): I18nEnv {
+  return i18nEnvSchema.parse(input);
+}

package/templates/base/packages/i18n/src/index.ts

@@ -1,2 +1,6 @@
-export * from './forgeon-i18n.module';
+export * from './forgeon-i18n.module';
+export * from './i18n-env.schema';
+export * from './i18n-config.loader';
+export * from './i18n-config.module';
+export * from './i18n-config.service';