Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
df9d197508 | |||
ae33716af4 | |||
31b64eda5e | |||
7f3437e3cd | |||
8903bee78d | |||
a02b45a673 |
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@push.rocks/npmextra",
|
"name": "@push.rocks/npmextra",
|
||||||
"version": "5.0.0",
|
"version": "5.0.3",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "do more with npm",
|
"description": "do more with npm",
|
||||||
"main": "dist_ts/index.js",
|
"main": "dist_ts/index.js",
|
||||||
|
@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@push.rocks/npmextra',
|
name: '@push.rocks/npmextra',
|
||||||
version: '5.0.0',
|
version: '5.0.3',
|
||||||
description: 'do more with npm'
|
description: 'do more with npm'
|
||||||
}
|
}
|
||||||
|
@ -11,19 +11,19 @@ export interface IAppDataOptions {
|
|||||||
* kvStoreKey: 'MY_ENV_VAR'
|
* kvStoreKey: 'MY_ENV_VAR'
|
||||||
*/
|
*/
|
||||||
envMapping?: {
|
envMapping?: {
|
||||||
[key: string]: string;
|
[key: string]: string | object;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export class AppData {
|
export class AppData<T = any> {
|
||||||
/**
|
/**
|
||||||
* creates appdata. If no pathArg is given, data will be stored here:
|
* creates appdata. If no pathArg is given, data will be stored here:
|
||||||
* ${PWD}/.nogit/appdata
|
* ${PWD}/.nogit/appdata
|
||||||
* @param pathArg
|
* @param pathArg
|
||||||
* @returns
|
* @returns
|
||||||
*/
|
*/
|
||||||
public static async createAndInit(optionsArg: IAppDataOptions = {}) {
|
public static async createAndInit<T = any>(optionsArg: IAppDataOptions = {}): Promise<AppData<T>> {
|
||||||
const appData = new AppData(optionsArg);
|
const appData = new AppData<T>(optionsArg);
|
||||||
await appData.readyDeferred.promise;
|
await appData.readyDeferred.promise;
|
||||||
return appData;
|
return appData;
|
||||||
}
|
}
|
||||||
@ -67,17 +67,44 @@ export class AppData {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (this.options.envMapping) {
|
if (this.options.envMapping) {
|
||||||
const qenvInstance = new plugins.qenv.Qenv(process.cwd(), '~/.cloudlyrc');
|
const qenvInstance = new plugins.qenv.Qenv();
|
||||||
for (const key in this.options.envMapping) {
|
|
||||||
let envValue = await qenvInstance.getEnvVarOnDemand(key);
|
// Recursive function to handle nested objects, now includes key parameter
|
||||||
if (envValue) {
|
const processEnvMapping = async (key: string, mappingValue: any, parentKey: string = ''): Promise<any> => {
|
||||||
if (key.endsWith('_JSON')) {
|
if (typeof mappingValue === 'string') {
|
||||||
envValue = JSON.parse(envValue);
|
let envValue = await qenvInstance.getEnvVarOnDemand(mappingValue);
|
||||||
|
if (envValue) {
|
||||||
|
if (mappingValue.endsWith('_JSON')) {
|
||||||
|
envValue = JSON.parse(envValue);
|
||||||
|
}
|
||||||
|
// Determine the correct key to use (top-level or nested)
|
||||||
|
const effectiveKey = parentKey || key;
|
||||||
|
this.kvStore.writeKey(effectiveKey, envValue);
|
||||||
|
}
|
||||||
|
} else if (typeof mappingValue === 'object' && mappingValue !== null) {
|
||||||
|
const resultObject = {};
|
||||||
|
for (const innerKey in mappingValue) {
|
||||||
|
const nestedValue = mappingValue[innerKey];
|
||||||
|
// For nested objects, call recursively but do not immediately write to kvStore
|
||||||
|
const nestedResult = await processEnvMapping(innerKey, nestedValue, key);
|
||||||
|
resultObject[innerKey] = nestedResult;
|
||||||
|
}
|
||||||
|
if (parentKey === '') {
|
||||||
|
// Only write to kvStore if at the top level
|
||||||
|
this.kvStore.writeKey(key, resultObject);
|
||||||
|
} else {
|
||||||
|
// For nested objects, return the constructed object instead of writing to kvStore
|
||||||
|
return resultObject;
|
||||||
}
|
}
|
||||||
await this.kvStore.writeKey(key, envValue);
|
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
for (const key in this.options.envMapping) {
|
||||||
|
await processEnvMapping(key, this.options.envMapping[key]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
this.readyDeferred.resolve();
|
this.readyDeferred.resolve();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user