5.0.8

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/npmextra",
-  "version": "5.0.1",
+  "version": "5.0.8",
   "private": false,
   "description": "do more with npm",
   "main": "dist_ts/index.js",

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/npmextra',
-  version: '5.0.1',
+  version: '5.0.8',
   description: 'do more with npm'
 }

ts/npmextra.classes.appdata.ts

@@ -11,19 +11,19 @@ export interface IAppDataOptions {
    * kvStoreKey: 'MY_ENV_VAR'
    */
   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:
    * ${PWD}/.nogit/appdata
    * @param pathArg
    * @returns
    */
-  public static async createAndInit(optionsArg: IAppDataOptions = {}) {
-    const appData = new AppData(optionsArg);
+  public static async createAndInit<T = any>(optionsArg: IAppDataOptions = {}): Promise<AppData<T>> {
+    const appData = new AppData<T>(optionsArg);
     await appData.readyDeferred.promise;
     return appData;
   }
@@ -31,7 +31,7 @@ export class AppData {
   // instance
   public readyDeferred = plugins.smartpromise.defer();
   public options: IAppDataOptions;
-  private kvStore: KeyValueStore;
+  private kvStore: KeyValueStore<T>;
   constructor(optionsArg: IAppDataOptions = {}) {
     this.options = optionsArg;
     this.init();
@@ -67,18 +67,47 @@ export class AppData {
     });
 
     if (this.options.envMapping) {
-      const qenvInstance = new plugins.qenv.Qenv(process.cwd(), '~/.cloudlyrc');
-      for (const key in this.options.envMapping) {
-        let envValue = await qenvInstance.getEnvVarOnDemand(key);
-        if (envValue) {
-          if (key.endsWith('_JSON')) {
-            envValue = JSON.parse(envValue);
+      const qenvInstance = new plugins.qenv.Qenv(process.cwd(), plugins.path.join(process.cwd(), '.nogit'));
+    
+      // Recursive function to handle nested objects, now includes key parameter
+      const processEnvMapping = async (key: string, mappingValue: any, parentKey: string = ''): Promise<any> => {
+        if (typeof mappingValue === 'string') {
+          let envValue = await qenvInstance.getEnvVarOnDemand(mappingValue);
+          if (envValue) {
+            if (mappingValue.endsWith('_JSON')) {
+              envValue = JSON.parse(envValue);
+            }
+            if (!parentKey) {
+              await this.kvStore.writeKey(key, envValue);
+            } else {
+              return 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
+            await 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();
   }
 
@@ -102,6 +131,7 @@ export class AppData {
     } else {
       console.log('All mandatory keys are present in the appdata');
     }
+    return missingMandatoryKeys;
   }
 
   public async waitForAndGetKey(keyArg: string) {