wip

metatypedev · Aug 22, 2024 · a81dba4 · a81dba4
1 parent db40575
commit a81dba4
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/examples/kitchen/ghjk.ts b/examples/kitchen/ghjk.ts
@@ -107,7 +107,8 @@ env("python")
     ports.cpy_bs({ version: "3.8.18", releaseTag: "20240224" }),
     ports.tar(),
     ports.zstd(),
-  );
+  )
+  .mixin(pyEnv());
 
 env("dev")
   // we can inherit from many envs
@@ -123,4 +124,4 @@ env("dev")
   }));
 
 env("venv")
-  .mixin(pyEnv({ install: { version: "3.8.18", releaseTag: "20240224" } }));
+  .inherit(["python"]);
diff --git a/files/mod.ts b/files/mod.ts
@@ -155,6 +155,7 @@ export class Ghjkfile {
       finalized: ReturnType<EnvFinalizer>;
       installSetId?: string;
       vars: Record<string, string>;
+      dynVars: Record<string, string>;
       envHash: string;
     }
   > = {};
@@ -415,6 +416,7 @@ export class Ghjkfile {
 
   #mergeEnvs(keys: string[], childName: string) {
     const mergedVars = {} as Record<string, [string, string] | undefined>;
+    const mergedDynVars = {} as Record<string, [string, string] | undefined>;
     let mergedInstalls = new Set<string>();
     const mergedOnEnterHooks = [];
     const mergedOnExitHooks = [];
@@ -423,7 +425,12 @@ export class Ghjkfile {
       [string, string] | undefined
     >;
     for (const parentName of keys) {
-      const { vars, installSetId, finalized } = this.#finalizedEnvs[parentName];
+      const {
+        vars,
+        dynVars,
+        installSetId,
+        finalized,
+      } = this.#finalizedEnvs[parentName];
       mergedOnEnterHooks.push(...finalized.onEnterHookTasks);
       mergedOnExitHooks.push(...finalized.onExitHookTasks);
       for (const [key, val] of Object.entries(vars)) {
@@ -443,6 +450,22 @@ export class Ghjkfile {
         }
         mergedVars[key] = [val, parentName];
       }
+
+      for (const [key, val] of Object.entries(dynVars)) {
+        const conflict = mergedDynVars[key];
+        if (conflict && val !== conflict[0]) {
+          logger.warn(
+            "dynamic environment variable conflict on multiple env inheritance, parent2 was chosen",
+            {
+              child: childName,
+              parent1: conflict[1],
+              parent2: parentName,
+              variable: key,
+            },
+          );
+        }
+        mergedDynVars[key] = [val, parentName];
+      }
       if (!installSetId) {
         continue;
       }