Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1a106e322c | |||
| 36ded40032 | |||
| 44f5f84195 | |||
| 72655a6a0e | |||
| 961df11121 | |||
| ee6f5e63ee | |||
| a40b6adeef | |||
| 6ee324a0ef | |||
| 215a48a409 | |||
| aeaa6149e4 | |||
| 75059dfca8 | |||
| 90c0f30ce1 | |||
| 9a55303978 | |||
| 224125fb8e |
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@push.rocks/npmextra",
|
"name": "@push.rocks/npmextra",
|
||||||
"version": "5.0.3",
|
"version": "5.0.10",
|
||||||
"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.3',
|
version: '5.0.10',
|
||||||
description: 'do more with npm'
|
description: 'do more with npm'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,19 +67,28 @@ 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> => {
|
||||||
if (typeof mappingValue === 'string') {
|
if (typeof mappingValue === 'string') {
|
||||||
let envValue = await qenvInstance.getEnvVarOnDemand(mappingValue);
|
let envValue: string;
|
||||||
|
if (mappingValue.startsWith('hard:')) {
|
||||||
|
envValue = mappingValue.replace('hard:', '');
|
||||||
|
} else {
|
||||||
|
envValue = await qenvInstance.getEnvVarOnDemand(mappingValue);
|
||||||
|
}
|
||||||
if (envValue) {
|
if (envValue) {
|
||||||
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 {
|
||||||
|
return undefined;
|
||||||
}
|
}
|
||||||
} else if (typeof mappingValue === 'object' && mappingValue !== null) {
|
} else if (typeof mappingValue === 'object' && mappingValue !== null) {
|
||||||
const resultObject = {};
|
const resultObject = {};
|
||||||
@@ -91,7 +100,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 +138,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) {
|
||||||
|
|||||||
Reference in New Issue
Block a user