feat(config): improve ConfigService

libs/auth/package.json

@@ -30,7 +30,6 @@
     "@mikro-orm/nestjs": "^5.2.3",
     "@nestjs-modules/mailer": "^1.10.3",
     "@nestjs/common": "^10.3.0",
-    "@nestjs/config": "^3.0.0",
     "@nestjs/core": "^10.3.0",
     "@nestlib/config": "workspace:^",
     "@types/express": "^4.17.17",
@@ -43,7 +42,6 @@
     "@mikro-orm/nestjs": "^5.2.2",
     "@nestjs-modules/mailer": "^1.9.1",
     "@nestjs/common": "*",
-    "@nestjs/config": "*",
     "@nestjs/core": "*",
     "@nestlib/config": "*"
   },

libs/auth/src/AuthController.ts

@@ -15,8 +15,8 @@ import {
   UsePipes,
   ValidationPipe,
 } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
 import { MailerService } from '@nestjs-modules/mailer';
+import { ConfigService } from '@nestlib/config';
 import { ErrorInterceptor, ResponseInterceptor } from '@nestlib/interceptors';
 
 import { AuthRole } from './AuthDecorator';

libs/config/src/ConfigModule.ts

@@ -0,0 +1,45 @@
+import { DynamicModule, Module } from '@nestjs/common';
+import {
+  ConfigModule as NestConfigModule,
+  ConfigService as NestConfigService,
+} from '@nestjs/config';
+
+// import { ConfigModule } from '@nestlib/config';
+import { ConfigService } from './ConfigService';
+import { loadConfigEnvs } from './loadConfigEnvs';
+
+@Module({
+  // import: [],
+  // controllers: [AuthController],
+  // providers: [CryptoService, AuthOtpService, AuthService],
+  // exports: [ConfigService],
+})
+export class ConfigModule {
+  static forRoot(): DynamicModule {
+    const rootDir = process.cwd();
+    const envFiles = ['.env', '../.env', '../../.env'].map((f) => `${rootDir}/${f}`);
+    const configEnvs = [
+      '.env.js',
+      '.env.json',
+      '../.env.js',
+      '../.env.json',
+      '../../.env.js',
+      '../../.env.json',
+    ].map((f) => `${rootDir}/${f}`);
+    // console.log('[CnfModule]', { envFiles, configEnvs });
+    return {
+      imports: [
+        NestConfigModule.forRoot({ envFilePath: envFiles }),
+        NestConfigModule.forRoot(loadConfigEnvs(['process.env.ENV_JSON', ...configEnvs])),
+        // ConfigModule.forRoot(loadConfigEnvs(['process.env.ENV_JSON', ...configEnvs])),
+      ],
+      module: ConfigModule,
+      // controllers: [AuthController],
+      providers: [ConfigService, NestConfigService],
+      exports: [ConfigService, NestConfigService],
+    };
+  }
+  static getExports() {
+    return [ConfigService, NestConfigService];
+  }
+}

libs/config/src/ConfigService.ts

@@ -0,0 +1,15 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService as NestConfigService } from '@nestjs/config';
+
+@Injectable()
+export class ConfigService {
+  constructor(private configService: NestConfigService) {}
+  get(key: string) {
+    const res = this.configService.get(key);
+    // console.log('ConfigService.get', { key }, res);
+    // console.log('configService', this.configService);
+    return res;
+  }
+}
+
+export default ConfigService;

libs/config/src/getConfig.ts

@@ -0,0 +1,21 @@
+import { pick } from '@lsk4/algos';
+import { Err } from '@lsk4/err';
+import { ConfigService as NestConfigService } from '@nestjs/config';
+
+// ConfigService
+import { ConfigModule } from './ConfigModule';
+import { PropsFn } from './types';
+
+export const getConfig = (path: string, fields?: string[] | PropsFn) => ({
+  imports: [ConfigModule],
+  useFactory: (configService: NestConfigService) => {
+    const res = configService.get(path);
+    if (!res) throw new Err(`!config: ${path}`, { path });
+    if (Array.isArray(fields)) return pick(res, fields);
+    if (typeof fields === 'function') return fields(res);
+    return res;
+  },
+  inject: [NestConfigService],
+});
+
+export default getConfig;

libs/config/src/index.ts

@@ -1,2 +1,10 @@
+/* eslint-disable no-unreachable-loop */
+// https://docs.nestjs.com/techniques/configuration
+
+// export * from './config';
+export * from './ConfigService';
+export * from './ConfigModule';
+export * from './getConfig';
 export * from './getEnvConfig';
-export * from './config';
+export * from './loadConfigEnvs';
+export * from './types';

libs/config/src/loadConfigEnvs.ts

@@ -0,0 +1,19 @@
+import { getEnvConfig } from './getEnvConfig';
+import { PropsFn } from './types';
+
+const get = (obj: any, key: string) => (key ? obj[key] : obj);
+
+export const loadConfigEnvs = (path: string | string[], keyOrFn?: string | PropsFn) => ({
+  load: [
+    () => {
+      const config = getEnvConfig(path);
+      if (typeof keyOrFn === 'function') return keyOrFn(config);
+      if (!keyOrFn) return config;
+      return get(config, keyOrFn);
+    },
+  ],
+  isGlobal: true,
+  expandVariables: true,
+});
+
+export default loadConfigEnvs;

libs/config/src/types.ts

@@ -0,0 +1 @@
+export type PropsFn = (res: Record<string, unknown>) => Record<string, unknown>;

libs/upload/package.json

@@ -15,16 +15,16 @@
     "@aws-sdk/client-s3": "^3.490.0",
     "@aws-sdk/s3-request-presigner": "^3.490.0",
     "@lsk4/err": "^4.5.0",
+    "@nestlib/config": "workspace:^",
     "aws-sdk": "^2.1535.0",
     "fishbird": "^1.1.8"
   },
   "devDependencies": {
-    "@nestjs/config": "^3.0.0",
+    "@nestjs/common": "^10.3.0",
     "nestjs-s3": "^2.0.1"
   },
   "peerDependencies": {
     "@nestjs/common": "*",
-    "@nestjs/config": "*",
     "nestjs-s3": "*"
   },
   "//": "///////////========================/////////========================/////////========================//////////",

libs/upload/src/UploadService.ts

@@ -2,7 +2,7 @@ import { GetObjectCommand } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { Err } from '@lsk4/err';
 import { Injectable } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
+import { ConfigService } from '@nestlib/config';
 import { S3 } from 'aws-sdk';
 import { map } from 'fishbird';
 import { InjectS3 } from 'nestjs-s3';