fix: interface define

package.json

@@ -64,7 +64,7 @@
   "dependencies": {
     "@nestjs/common": "^8.4.7",
     "@vodyani/class-decorator": "^8.2.3",
-    "@vodyani/core": "^8.9.2",
+    "@vodyani/core": "^8.9.4",
     "@vodyani/utils": "^8.7.1",
     "js-yaml": "^4.1.0",
     "lodash": "4.17.21"

src/provider/dynamic-data-source.ts

@@ -39,7 +39,7 @@ export class AsyncDynamicDataSourceProvider<T = any, C = any> implements IClient
   public async redeploy(key: string, config: C) {
     const client = this.getClient(key);
 
-    await client.redeploy(config);
+    await client.create(config);
 
     this.clients.set(key, client);
     this.keys.add(key);
@@ -90,7 +90,7 @@ export class DynamicDataSourceProvider<T = any, C = any> implements IClientMedia
   public redeploy(key: string, config: C) {
     const client = this.getClient(key);
 
-    client.redeploy(config);
+    client.create(config);
 
     this.clients.set(key, client);
     this.keys.add(key);

src/struct/config-client.ts

@@ -1,7 +1,7 @@
-import { IConfigClient, IConfigClientSubscriber, IConfigLoader } from '@vodyani/core';
+import { IConfigClientSubscriber, IConfigLoader } from '@vodyani/core';
 import { isValidString, toHash } from '@vodyani/utils';
 
-export abstract class AbstractConfigClient implements IConfigClient {
+export class LocalConfigClient {
   private subscriber: IConfigClientSubscriber;
 
   private hash: string;
@@ -44,5 +44,3 @@ export abstract class AbstractConfigClient implements IConfigClient {
     this.subscriber = null;
   }
 }
-
-export class LocalConfigClient extends AbstractConfigClient {}

src/struct/config-loader.ts

@@ -9,12 +9,18 @@ export class JSONConfigLoader implements IConfigLoader {
   constructor(
     private readonly path: string,
     private readonly defaultEnv: string,
-    private readonly currentEnv: string,
+    private readonly currentEnv?: string,
   ) {}
 
   public execute() {
     const defaultResult = this.readJSONFile(this.defaultEnv);
+
+    if (!this.currentEnv) {
+      return defaultResult;
+    }
+
     const currentResult = this.readJSONFile(this.currentEnv);
+
     return toDeepMerge(defaultResult, currentResult);
   }
 
@@ -29,12 +35,18 @@ export class YamlConfigLoader implements IConfigLoader {
   constructor(
     private readonly path: string,
     private readonly defaultEnv: string,
-    private readonly currentEnv: string,
+    private readonly currentEnv?: string,
   ) {}
 
   public execute() {
     const defaultResult = this.readYamlFile(this.defaultEnv);
+
+    if (!this.currentEnv) {
+      return defaultResult;
+    }
+
     const currentResult = this.readYamlFile(this.currentEnv);
+
     return toDeepMerge(defaultResult, currentResult);
   }
 

test/struct/config-client.spec.ts

@@ -2,7 +2,7 @@ import { resolve } from 'path';
 
 import { describe, it, expect } from '@jest/globals';
 
-import { JSONConfigLoader, ConfigClientSubscriber, AbstractConfigClient, ConfigProvider } from '../../src';
+import { JSONConfigLoader, ConfigClientSubscriber, LocalConfigClient, ConfigProvider } from '../../src';
 
 interface File {
   json: {
@@ -19,7 +19,7 @@ describe('LocalConfigClient', () => {
   const loader = new JSONConfigLoader(jsonFilePath, 'DEFAULT', 'LOCAL');
 
   it('LocalConfigClient', async () => {
-    class DemoConfigClient extends AbstractConfigClient {
+    class DemoConfigClient extends LocalConfigClient {
       public polling(): void {
         this.contrast({ poller: 'DemoConfigClient' });
         super.polling();

test/struct/config-handler.spec.ts

@@ -2,7 +2,7 @@ import { resolve } from 'path';
 
 import { describe, expect, it } from '@jest/globals';
 
-import { ConfigClientSubscriber, ConfigHandlerOptions, ConfigProvider, JSONConfigLoader, AbstractConfigClient } from '../../src';
+import { ConfigClientSubscriber, ConfigHandlerOptions, ConfigProvider, JSONConfigLoader, LocalConfigClient } from '../../src';
 import { ConfigArgumentHandler, ConfigClientHandler } from '../../src/struct/config-handler';
 
 interface File {
@@ -15,7 +15,7 @@ interface File {
   poller?: string;
 }
 
-class DemoConfigClient extends AbstractConfigClient {
+class DemoConfigClient extends LocalConfigClient {
   public polling(): void {
     this.contrast({ poller: 'DemoConfigClient' });
     super.polling();

test/struct/config-loader.spec.ts

@@ -17,6 +17,12 @@ describe('ConfigLoader', () => {
     expect(config.json.list).toEqual([1, 2]);
     expect(config.json.name).toBe('json');
     expect(config.json.age).toBe(3);
+
+    const loader2 = new JSONConfigLoader(jsonFilePath, 'DEFAULT');
+    const config2 = loader2.execute();
+
+    expect(config2.json.list).toEqual([1]);
+    expect(config2.json.name).toBe('json');
   });
 
   it('YamlConfigLoader', async () => {
@@ -27,5 +33,11 @@ describe('ConfigLoader', () => {
     expect(config.yaml.list).toEqual([1, 2]);
     expect(config.yaml.name).toBe('yaml');
     expect(config.yaml.age).toBe(3);
+
+    const loader2 = new YamlConfigLoader(yamlFilePath, 'DEFAULT');
+    const config2 = loader2.execute();
+
+    expect(config2.yaml.list).toEqual([1]);
+    expect(config2.yaml.name).toBe('yaml');
   });
 });