@runeya/runeya 2.0.6 → 2.0.8

package/{dist-RZD3EUA3.js → dist-PSPHMTZN.js}

@@ -778,6 +778,33 @@ var EnvironmentResolver = class {
     }
     return { ctx, secretKeys: parentSecretKeys, keySources: parentKeySources };
   }
+  /**
+   * For service-scoped envs, compute effective parentIds by also including
+   * the service-scoped envs of ancestor global environments.
+   *
+   * Example: "Server (test)" has parentIds=[test-global]. test-global has
+   * parentIds=[Local-global]. This method adds "Server (Local)" to the
+   * effective parents so service-specific variables from ancestor envs
+   * are inherited correctly.
+   */
+  async getEffectiveParentIds(environment) {
+    if (environment.scope !== "service" || !environment.reference || !environment.activateOn) {
+      return environment.parentIds;
+    }
+    const additionalIds = [];
+    for (const parentId of environment.parentIds) {
+      const parentEnv = await environmentStore.get(parentId);
+      if (!parentEnv || parentEnv.scope !== "global") continue;
+      for (const grandparentGlobalId of parentEnv.parentIds) {
+        const ancestorServiceEnv = await environmentStore.findServiceEnvironment(environment.reference, grandparentGlobalId);
+        if (ancestorServiceEnv && !environment.parentIds.includes(ancestorServiceEnv.id)) {
+          additionalIds.push(ancestorServiceEnv.id);
+        }
+      }
+    }
+    if (additionalIds.length === 0) return environment.parentIds;
+    return [...environment.parentIds, ...additionalIds];
+  }
   async resolveDag(environmentId, visited) {
     if (visited.has(environmentId)) {
       throw new Error(`Circular dependency detected in environment inheritance for ${environmentId}`);
@@ -787,8 +814,9 @@ var EnvironmentResolver = class {
       throw new Error(`Environment "${environmentId}" not found`);
     }
     visited.add(environmentId);
+    const effectiveParentIds = await this.getEffectiveParentIds(environment);
     const parentResults = [];
-    for (const parentId of environment.parentIds) {
+    for (const parentId of effectiveParentIds) {
       const parentVisited = new Set(visited);
       const parentResult = await this.resolveDag(parentId, parentVisited);
       parentResults.push(parentResult);
@@ -821,9 +849,12 @@ var EnvironmentResolver = class {
         parentKeySources[variable.key] = { environmentId: source.environmentId, environmentName: source.environmentName };
       }
     }
+    const isInterpRef = (v) => /\{\{environment\.[^}]+\}\}/.test(v);
     for (const result of parentResults) {
       for (const [key, value] of Object.entries(result.parentEnv)) {
-        if (!(key in parentEnv)) {
+        const existingIsRef = key in parentEnv && isInterpRef(parentEnv[key]);
+        const newIsConcrete = !isInterpRef(value);
+        if (!(key in parentEnv) || existingIsRef && newIsConcrete) {
           parentEnv[key] = value;
         }
       }
@@ -2041,13 +2072,20 @@ var environmentRouter = router({
       for (const serviceId of project.serviceIds) {
         const service = await serviceStore.get(serviceId);
         if (!service) continue;
+        const parentServiceEnvIds = [];
+        for (const parentGlobalId of env2.parentIds) {
+          const parentServiceEnv = await environmentStore.findServiceEnvironment(serviceId, parentGlobalId);
+          if (parentServiceEnv) {
+            parentServiceEnvIds.push(parentServiceEnv.id);
+          }
+        }
         const svcEnv = await environmentStore.create({
           projectId: input.projectId,
           name: `${service.name} (${env2.name})`,
           scope: "service",
           reference: serviceId,
           activateOn: env2.id,
-          parentIds: [env2.id],
+          parentIds: [env2.id, ...parentServiceEnvIds],
           variables: {}
         });
         await projectStore.addEnvironment(input.projectId, svcEnv.id);
@@ -10958,7 +10996,7 @@ async function pullEnv(opts) {
   });
   return Object.entries(env2).map(([key, value]) => `${key}=${value}`).join("\n");
 }
-dotenv.config();
+dotenv.config({ quiet: true });
 function listenWithRetry(server, port, host, wss, maxRetries = 20, delay = 500) {
   return new Promise((resolve5, reject) => {
     let attempts = 0;
@@ -11028,4 +11066,4 @@ export {
   createLocalServer,
   pullEnv
 };
-//# sourceMappingURL=dist-RZD3EUA3.js.map
+//# sourceMappingURL=dist-PSPHMTZN.js.map