@getmonoceros/workbench 1.14.0 → 1.14.1

package/dist/bin.js

@@ -739,25 +739,20 @@ function resolveGitUserFields(user, vars) {
   };
   return { name: resolve(user.name), email: resolve(user.email) };
 }
-function interpolateFeatures(features, vars) {
-  const missing = [];
-  const out = {};
-  for (const [ref, options] of Object.entries(features)) {
-    const next = {};
-    for (const [key, value] of Object.entries(options)) {
+function interpolateFeatureOptions(features, vars) {
+  return features.map((f) => {
+    if (!f.options) return f;
+    const opts = {};
+    for (const [key, value] of Object.entries(f.options)) {
       if (typeof value !== "string") {
-        next[key] = value;
+        opts[key] = value;
         continue;
       }
       const r = interpolate(value, vars);
-      for (const name of r.missing) {
-        missing.push({ location: `features.${ref}.${key}`, name });
-      }
-      next[key] = r.value;
+      opts[key] = r.missing.length > 0 ? "" : r.value.trim();
     }
-    out[ref] = next;
-  }
-  return { features: out, missing };
+    return { ...f, options: opts };
+  });
 }
 function buildEnvStub(name) {
   return `# Secrets and values for \${VAR} references in ${name}.yml.
@@ -3020,13 +3015,17 @@ function addInstallUrlToDoc(doc, url) {
 function addFeatureToDoc(doc, ref, options = {}, displayName) {
   const seq = ensureSeq(doc, "features");
   const label = displayName ?? ref;
+  const summary = loadFeatureManifestSummary(ref);
+  const hints = featureOptionHints(summary, ref, Object.keys(options));
+  const mergedOptions = { ...options };
+  for (const h of hints) mergedOptions[h.key] = h.placeholder;
   for (const item of seq.items) {
     if (!isMap2(item)) continue;
     const itemRef = item.get("ref");
     if (itemRef !== ref) continue;
     const itemJs = item.toJS(doc);
     const existingJs = itemJs.options ?? {};
-    if (JSON.stringify(existingJs) === JSON.stringify(options)) {
+    if (JSON.stringify(existingJs) === JSON.stringify(mergedOptions)) {
       return false;
     }
     throw new Error(
@@ -3035,10 +3034,9 @@ function addFeatureToDoc(doc, ref, options = {}, displayName) {
   }
   const entry2 = new YAMLMap2();
   entry2.set("ref", ref);
-  if (Object.keys(options).length > 0) {
-    entry2.set("options", options);
+  if (Object.keys(mergedOptions).length > 0) {
+    entry2.set("options", mergedOptions);
   }
-  const summary = loadFeatureManifestSummary(ref);
   const headerBefore = buildFeatureHeaderCommentBefore(
     summary,
     FEATURE_HEADER_WIDTH
@@ -3047,12 +3045,6 @@ function addFeatureToDoc(doc, ref, options = {}, displayName) {
     entry2.commentBefore = headerBefore;
     entry2.spaceBefore = true;
   }
-  const hints = featureOptionHints(summary, ref, Object.keys(options));
-  if (hints.length > 0) {
-    const commentLines = [" options:"];
-    for (const h of hints) commentLines.push(`   ${h.key}: ${h.placeholder}`);
-    entry2.comment = commentLines.join("\n");
-  }
   seq.add(entry2);
   return true;
 }
@@ -5176,26 +5168,26 @@ ${sectionLine(label)}
   const parsed = await readConfig(ymlPath);
   const globalConfig = await readMonocerosConfig({ monocerosHome: home });
   warnOnDeprecatedFeatureRefs(parsed.config.features, globalConfig, logger);
+  const envPath = containerEnvPath(opts.name, home);
+  await ensureEnvGitignored(containerConfigsDir(home));
+  const envVars = readEnvFile(envPath);
+  const resolvedFeatures = interpolateFeatureOptions(
+    parsed.config.features,
+    envVars
+  );
   const createOpts = normalizeOptions(
     solutionConfigToCreateOptions(
-      parsed.config,
+      { ...parsed.config, features: resolvedFeatures },
       globalConfig?.defaults?.features ?? {}
     )
   );
-  const envPath = containerEnvPath(opts.name, home);
-  await ensureEnvGitignored(containerConfigsDir(home));
-  const envVars = readEnvFile(envPath);
   const interpServices = interpolateServices(createOpts.services, envVars);
-  const interpFeatures = interpolateFeatures(
-    createOpts.features ?? {},
-    envVars
-  );
-  const missingVars = [...interpServices.missing, ...interpFeatures.missing];
-  if (missingVars.length > 0) {
-    throw new Error(formatMissingVarsError(missingVars, prettyPath(envPath)));
+  if (interpServices.missing.length > 0) {
+    throw new Error(
+      formatMissingVarsError(interpServices.missing, prettyPath(envPath))
+    );
   }
   createOpts.services = interpServices.services;
-  if (createOpts.features) createOpts.features = interpFeatures.features;
   const gitUserErrors = [];
   let containerGitOverride;
   if (parsed.config.git?.user) {
@@ -5492,7 +5484,7 @@ async function persistPromptedIdentity(prompted, ymlPath, home, logger) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "1.14.0" : "dev";
+var CLI_VERSION = true ? "1.14.1" : "dev";
 
 // src/commands/_dispatch.ts
 import { consola as consola12 } from "consola";
@@ -6374,17 +6366,12 @@ function renderFeatureBlock(out, feature, summary, commented) {
     }
     return;
   }
-  if (activeKeys.length > 0) {
-    out.push(`    options:`);
-    for (const [key, value] of activeKeys) {
-      out.push(`      ${key}: ${renderScalarValue(value)}`);
-    }
+  out.push(`    options:`);
+  for (const [key, value] of activeKeys) {
+    out.push(`      ${key}: ${renderScalarValue(value)}`);
   }
-  if (hints.length > 0) {
-    out.push(`    # options:`);
-    for (const hint of hints) {
-      out.push(`    #   ${hint.key}: ${hint.placeholder}`);
-    }
+  for (const hint of hints) {
+    out.push(`      ${hint.key}: ${hint.placeholder}`);
   }
 }
 function pushHeader(out, header, name) {