|
|
@ -31,7 +31,7 @@ export class AppData<T = any> {
|
|
|
|
// instance
|
|
|
|
// instance
|
|
|
|
public readyDeferred = plugins.smartpromise.defer();
|
|
|
|
public readyDeferred = plugins.smartpromise.defer();
|
|
|
|
public options: IAppDataOptions;
|
|
|
|
public options: IAppDataOptions;
|
|
|
|
private kvStore: KeyValueStore;
|
|
|
|
private kvStore: KeyValueStore<T>;
|
|
|
|
constructor(optionsArg: IAppDataOptions = {}) {
|
|
|
|
constructor(optionsArg: IAppDataOptions = {}) {
|
|
|
|
this.options = optionsArg;
|
|
|
|
this.options = optionsArg;
|
|
|
|
this.init();
|
|
|
|
this.init();
|
|
|
@ -67,7 +67,7 @@ export class AppData<T = any> {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
if (this.options.envMapping) {
|
|
|
|
if (this.options.envMapping) {
|
|
|
|
const qenvInstance = new plugins.qenv.Qenv();
|
|
|
|
const qenvInstance = new plugins.qenv.Qenv(process.cwd(), plugins.path.join(process.cwd(), '.nogit'));
|
|
|
|
|
|
|
|
|
|
|
|
// Recursive function to handle nested objects, now includes key parameter
|
|
|
|
// Recursive function to handle nested objects, now includes key parameter
|
|
|
|
const processEnvMapping = async (key: string, mappingValue: any, parentKey: string = ''): Promise<any> => {
|
|
|
|
const processEnvMapping = async (key: string, mappingValue: any, parentKey: string = ''): Promise<any> => {
|
|
|
@ -77,9 +77,11 @@ export class AppData<T = any> {
|
|
|
|
if (mappingValue.endsWith('_JSON')) {
|
|
|
|
if (mappingValue.endsWith('_JSON')) {
|
|
|
|
envValue = JSON.parse(envValue);
|
|
|
|
envValue = JSON.parse(envValue);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Determine the correct key to use (top-level or nested)
|
|
|
|
if (!parentKey) {
|
|
|
|
const effectiveKey = parentKey || key;
|
|
|
|
await this.kvStore.writeKey(key, envValue);
|
|
|
|
this.kvStore.writeKey(effectiveKey, envValue);
|
|
|
|
} else {
|
|
|
|
|
|
|
|
return envValue;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (typeof mappingValue === 'object' && mappingValue !== null) {
|
|
|
|
} else if (typeof mappingValue === 'object' && mappingValue !== null) {
|
|
|
|
const resultObject = {};
|
|
|
|
const resultObject = {};
|
|
|
@ -91,7 +93,7 @@ export class AppData<T = any> {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (parentKey === '') {
|
|
|
|
if (parentKey === '') {
|
|
|
|
// Only write to kvStore if at the top level
|
|
|
|
// Only write to kvStore if at the top level
|
|
|
|
this.kvStore.writeKey(key, resultObject);
|
|
|
|
await this.kvStore.writeKey(key, resultObject);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
// For nested objects, return the constructed object instead of writing to kvStore
|
|
|
|
// For nested objects, return the constructed object instead of writing to kvStore
|
|
|
|
return resultObject;
|
|
|
|
return resultObject;
|
|
|
@ -129,6 +131,7 @@ export class AppData<T = any> {
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
console.log('All mandatory keys are present in the appdata');
|
|
|
|
console.log('All mandatory keys are present in the appdata');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return missingMandatoryKeys;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public async waitForAndGetKey(keyArg: string) {
|
|
|
|
public async waitForAndGetKey(keyArg: string) {
|
|
|
|