devflare 1.0.0-next.16 → 1.0.0-next.17

package/dist/{previews-gm3z0syj.js → previews-02jmcwft.js}

@@ -1,70 +1,86 @@
-import {
-  findConfigPathsUnderDirectory
-} from "./index-9az6s7ad.js";
 import {
   buildPreviewScopeRowsFromLiveWorkers,
   buildPreviewWorkerCandidatesByScope,
   buildStableWorkerRowsFromLiveWorkers,
   collectConfiguredWorkerFamilies,
-  formatOverviewStatus,
-  formatRecordDate,
-  loadTrackedPreviewScopeRows,
-  orderPreviewWorkerNamesForDeletion,
-  shouldUseColor
-} from "./index-sgb7c8nm.js";
+  orderPreviewWorkerNamesForDeletion
+} from "./index-f9mhsept.js";
+import {
+  cleanupPreviewScopedResources
+} from "./index-qpmvca5j.js";
+import {
+  findConfigPathsUnderDirectory
+} from "./index-dxh2qyyw.js";
 import {
   asOptionalString,
   resolveCloudflareAccountId,
   resolveNamedSelection
-} from "./index-v5nmqthy.js";
+} from "./index-cxf22a0s.js";
 import {
   account
-} from "./index-e9yw4d6y.js";
-import"./index-72mve6vh.js";
-import {
-  retirePreviewRegistry
-} from "./index-epw1jxz5.js";
-import {
-  cleanupPreviewScopedResources
-} from "./index-k6vq6kkt.js";
+} from "./index-z043xk61.js";
+import"./index-7q8fke3k.js";
+import"./index-6ftrth7n.js";
 import {
   getDependencies
-} from "./index-1xpj0m4r.js";
+} from "./index-z9gy8w6b.js";
 import {
   bold,
+  createCliTheme,
   cyanBold,
   dim,
   formatTableLine,
   green,
   logLine,
+  red,
   whiteDim,
+  yellow,
   yellowBold
 } from "./index-stgn34cr.js";
 import"./index-3t6rypgc.js";
-import"./index-7g8zyws4.js";
+import"./index-ytq1t9jx.js";
 import"./index-rbht7m9r.js";
 import {
-  compileConfig
-} from "./index-pnbs1b8k.js";
+  compileBuildConfig
+} from "./index-zgrqest7.js";
 import {
   ConfigNotFoundError,
   loadConfig,
   loadResolvedConfig,
   resolveConfigPath
-} from "./index-6psz1h4c.js";
-import"./index-xk9djfjp.js";
-import"./index-0w826dsr.js";
+} from "./index-5p3bgjwr.js";
+import"./index-88tcq0t4.js";
+import"./index-dzayfxjy.js";
 import {
   resolvePreviewIdentifier
-} from "./index-6jef5emv.js";
-import"./index-t08te69w.js";
+} from "./index-p296ban8.js";
+import"./index-ykfgpsmm.js";
 import"./index-37x76zdn.js";
 
 // src/cli/preview-bindings.ts
 var WRANGLER_TEXT_COLUMNS_REGEX = /\s{2,}/;
+var ANSI_ESCAPE_REGEX = /\x1B\[[0-9;]*[A-Za-z]/g;
 function normalizeCell(value) {
   return (value ?? "").trim().replace(/\s+/g, " ");
 }
+function normalizeBindingName(value) {
+  const normalized = normalizeCell(value);
+  return normalized.startsWith("env.") ? normalized.slice(4) : normalized;
+}
+function parseCompactBindingLabel(value) {
+  const normalized = normalizeBindingName(value);
+  const match = normalized.match(/^(.*?)\s*\((.*)\)$/);
+  if (!match) {
+    return {
+      bindingName: normalized,
+      resource: ""
+    };
+  }
+  return {
+    bindingName: normalizeCell(match[1]),
+    resource: normalizeCell(match[2])
+  };
+}
 function buildAssociationKey(type, resource) {
   return `${normalizeCell(type).toLowerCase()}\x00${normalizeCell(resource).toLowerCase()}`;
 }
@@ -111,20 +127,20 @@ function addAssociationTarget(targets, input) {
   });
 }
 function collectBindingAssociationTargets(config) {
-  const compiled = compileConfig(config);
+  const compiled = compileBuildConfig(config);
   const targets = new Map;
   for (const binding of compiled.kv_namespaces ?? []) {
     addAssociationTarget(targets, {
       reference: binding.binding,
       type: "KV Namespace",
-      resource: binding.id
+      resource: "id" in binding ? binding.id : binding.name
     });
   }
   for (const binding of compiled.d1_databases ?? []) {
     addAssociationTarget(targets, {
       reference: binding.binding,
       type: "D1 Database",
-      resource: binding.database_id
+      resource: "database_id" in binding ? binding.database_id : binding.database_name
     });
   }
   for (const binding of compiled.r2_buckets ?? []) {
@@ -193,7 +209,7 @@ function collectBindingAssociationTargets(config) {
     addAssociationTarget(targets, {
       reference: binding.binding,
       type: "Hyperdrive",
-      resource: binding.id
+      resource: "id" in binding ? binding.id : binding.name
     });
   }
   if (compiled.browser?.binding) {
@@ -286,11 +302,11 @@ function parseWranglerVersionBindings(output) {
   const bindings = [];
   let inBindingTable = false;
   for (const rawLine of lines) {
-    const trimmed = rawLine.trim();
+    const trimmed = preprocessWranglerLine(rawLine);
     if (!trimmed) {
       continue;
     }
-    if (/^(binding\s+type|type)\s{2,}/i.test(rawLine) || /^(binding\s+type|type)$/i.test(trimmed)) {
+    if (isBindingTableHeader(trimmed)) {
       inBindingTable = true;
       continue;
     }
@@ -301,24 +317,56 @@ function parseWranglerVersionBindings(output) {
       continue;
     }
     const segments = trimmed.split(WRANGLER_TEXT_COLUMNS_REGEX).filter(Boolean);
-    if (segments.length < 2) {
+    if (segments.length === 0) {
       continue;
     }
     if (segments[0].endsWith(":")) {
       break;
     }
-    const [type, bindingName, ...resourceParts] = segments;
-    if (!type || !bindingName) {
-      continue;
+    const parsed = parseBindingRow(segments);
+    if (parsed) {
+      bindings.push(parsed);
     }
-    bindings.push({
-      type: normalizeCell(type),
-      bindingName: normalizeCell(bindingName),
-      resource: normalizeCell(resourceParts.join("  "))
-    });
   }
   return bindings;
 }
+function preprocessWranglerLine(rawLine) {
+  return rawLine.replace(ANSI_ESCAPE_REGEX, "").replace(/\r$/, "").trim();
+}
+function isBindingTableHeader(line) {
+  if (/^binding\s{2,}resource$/i.test(line)) {
+    return true;
+  }
+  if (/^(binding\s+type|type)(\s{2,}name)?\s{2,}resource$/i.test(line)) {
+    return true;
+  }
+  if (/^(binding\s+type|type)$/i.test(line)) {
+    return true;
+  }
+  return false;
+}
+function parseBindingRow(segments) {
+  if (segments.length < 2) {
+    return null;
+  }
+  if (/^env\./i.test(segments[0])) {
+    const parsed = parseCompactBindingLabel(segments[0]);
+    return {
+      type: normalizeCell(segments.slice(1).join("  ")),
+      bindingName: parsed.bindingName,
+      resource: parsed.resource
+    };
+  }
+  const [type, bindingName, ...resourceParts] = segments;
+  if (!type || !bindingName) {
+    return null;
+  }
+  return {
+    type: normalizeCell(type),
+    bindingName: normalizeBindingName(bindingName),
+    resource: normalizeCell(resourceParts.join("  "))
+  };
+}
 async function inspectWorkerBindings(exec, options) {
   const output = await runWranglerInspectionCommand(exec, ["wrangler", "versions", "view", options.versionId, "--name", options.workerName], options, "Wrangler versions view failed");
   return parseWranglerVersionBindings(output);
@@ -439,6 +487,41 @@ async function inspectBindingAssociations(options) {
   };
 }
 
+// src/cli/commands/previews-support/theme.ts
+function shouldUseColor(options) {
+  return createCliTheme(options).useColor;
+}
+function formatRecordDate(date) {
+  return date ? date.toISOString().slice(0, 19).replace("T", " ") : "N/A";
+}
+function formatStatus(value, theme) {
+  switch (value) {
+    case "active":
+      return green(value, theme);
+    case "superseded":
+    case "reassigned":
+    case "orphaned":
+      return yellow(value, theme);
+    case "deleted":
+    case "rolled_back":
+      return red(value, theme);
+    default:
+      return value;
+  }
+}
+function formatOverviewStatus(value, theme) {
+  switch (value) {
+    case "ready":
+      return green(value, theme);
+    case "partial":
+      return yellow(value, theme);
+    case "missing":
+      return red(value, theme);
+    default:
+      return formatStatus(value, theme);
+  }
+}
+
 // src/cli/commands/previews-support/cleanup.ts
 function comparePreviewCleanupScopeNames(left, right) {
   if (left === "preview" && right !== "preview") {
@@ -449,14 +532,9 @@ function comparePreviewCleanupScopeNames(left, right) {
   }
   return left.localeCompare(right);
 }
-function buildPreviewCleanupTarget(scope, scopeRows, workerCandidatesByScope, environment) {
+function buildPreviewCleanupTarget(scope, workerCandidatesByScope, environment) {
   const strategies = new Set;
   const workerNames = [...workerCandidatesByScope.get(scope) ?? []];
-  for (const row of scopeRows) {
-    if (row.scope === scope) {
-      strategies.add(row.strategy);
-    }
-  }
   if (workerNames.length > 0) {
     strategies.add("dedicated workers");
   }
@@ -469,18 +547,12 @@ function buildPreviewCleanupTarget(scope, scopeRows, workerCandidatesByScope, en
     workerNames
   };
 }
-function buildPreviewCleanupTargets(scopeRows, workerCandidatesByScope, environment) {
+function buildPreviewCleanupTargets(workerCandidatesByScope, environment) {
   const scopeNames = new Set;
-  for (const row of scopeRows) {
-    scopeNames.add(row.scope);
-  }
   for (const scope of workerCandidatesByScope.keys()) {
     scopeNames.add(scope);
   }
-  if (environment === "preview") {
-    scopeNames.add("preview");
-  }
-  return Array.from(scopeNames).sort(comparePreviewCleanupScopeNames).map((scope) => buildPreviewCleanupTarget(scope, scopeRows, workerCandidatesByScope, environment));
+  return Array.from(scopeNames).sort(comparePreviewCleanupScopeNames).map((scope) => buildPreviewCleanupTarget(scope, workerCandidatesByScope, environment));
 }
 function getPreviewCleanupResourceCandidateCount(result) {
   return result.candidates.kv.length + result.candidates.d1.length + result.candidates.r2.length + result.candidates.queues.length + result.candidates.vectorize.length + result.candidates.hyperdrive.length;
@@ -521,30 +593,9 @@ function logPreviewCleanupScopeBreakdown(logger, executions, theme) {
   }
   logLine(logger);
 }
-async function retireDeletedPreviewWorkers(accountId, databaseName, scope, workerNames) {
-  const registry = await account.getPreviewRegistryContext({
-    accountId,
-    databaseName,
-    apiOptions: { timeout: 1e4 },
-    skipContextCache: true
-  });
-  if (!registry) {
-    return;
-  }
-  for (const workerName of workerNames) {
-    await retirePreviewRegistry({
-      accountId,
-      workerName,
-      databaseName,
-      apiOptions: { timeout: 1e4 },
-      previewScope: scope,
-      apply: true
-    });
-  }
-}
 function showNoPreviewCleanupCandidatesHint(logger, selection, includeAll, theme) {
   if (includeAll) {
-    logger.warn("No preview-only resources or dedicated preview Worker scripts were discovered across the resolved preview scopes. This usually means those previews were already cleaned up or the remaining previews only share stable Workers and shared account resources.");
+    logger.warn("No preview-only resources or dedicated preview Worker scripts were discovered across the live preview scopes Devflare could resolve. This usually means those previews were already cleaned up or the remaining previews only share stable Workers and shared account resources.");
     return;
   }
   if (!selection?.identifier) {
@@ -655,7 +706,7 @@ function buildSectionLines(title, records, columns, theme) {
     return [];
   }
   const widths = columns.map((column) => column.width);
-  const coloredTitle = title === "Previews" || title === "Preview scopes" ? cyanBold(title, theme) : title === "Scopes" || title === "Stable workers" ? bold(title, theme) : yellowBold(title, theme);
+  const coloredTitle = title === "Preview scopes" ? cyanBold(title, theme) : title === "Stable workers" ? bold(title, theme) : yellowBold(title, theme);
   return [
     `${coloredTitle} ${dim(`(${records.length})`, theme)}`,
     formatTableLine(columns.map((column) => dim(column.label, theme)), widths),
@@ -666,7 +717,7 @@ function showWorkerFamilyOverviewFromLiveWorkers(families, workers, workersSubdo
   logLine(logger);
   logLiveWorkerFamilyOverview(logger, families, workers, workersSubdomain, theme);
   logLine(logger);
-  logLine(logger, dim("Preview scopes are derived from live worker names and the current config family.", theme));
+  logLine(logger, dim("Preview scopes are derived from live dedicated preview Worker names and the current config family.", theme));
   logLine(logger, dim("Use `devflare previews cleanup --scope <name>` to delete one scope or `--all` to clean every discovered scope.", theme));
   logLine(logger);
 }
@@ -681,7 +732,7 @@ function showWorkspaceWorkerFamilyOverviewFromLiveWorkers(familyGroups, workers,
     logLiveWorkerFamilyOverview(logger, families, workers, workersSubdomain, theme);
   }
   logLine(logger);
-  logLine(logger, dim("Preview scopes are derived from live worker names and each discovered config family.", theme));
+  logLine(logger, dim("Preview scopes are derived from live dedicated preview Worker names and each discovered config family.", theme));
   logLine(logger, dim("Run inside a configured package or pass `--config <path>` to narrow the summary or clean one family.", theme));
   logLine(logger);
 }
@@ -1005,7 +1056,7 @@ async function runBindingsSubcommand(parsed, context, logger, options, environme
   showBindingAssociations(logger, inspection, theme);
   return { exitCode: 0 };
 }
-async function runCleanupSubcommand(parsed, context, logger, options, databaseName, environment, configFile, includeAll, theme) {
+async function runCleanupSubcommand(parsed, context, logger, options, environment, configFile, includeAll, theme) {
   const cwd = options.cwd ?? process.cwd();
   const resolvedEnvironment = environment ?? "preview";
   const explicitScope = asOptionalString(parsed.options.scope) || asOptionalString(parsed.options.identifier);
@@ -1018,15 +1069,14 @@ async function runCleanupSubcommand(parsed, context, logger, options, databaseNa
   const configuredFamilies = collectConfiguredWorkerFamilies(config, resolvedEnvironment);
   const liveWorkers = await account.workers(context.accountId, CLI_API_OPTIONS);
   const workerCandidatesByScope = buildPreviewWorkerCandidatesByScope(configuredFamilies, liveWorkers);
-  const trackedScopeRows = includeAll || previewScope.identifier ? await loadTrackedPreviewScopeRows(context.accountId, databaseName, configuredFamilies, CLI_API_OPTIONS) : [];
-  const cleanupTargets = includeAll ? buildPreviewCleanupTargets(trackedScopeRows, workerCandidatesByScope, resolvedEnvironment) : previewScope.identifier ? [buildPreviewCleanupTarget(previewScope.identifier, trackedScopeRows, workerCandidatesByScope, resolvedEnvironment)] : [];
-  const cleanupRuns = cleanupTargets.length > 0 ? cleanupTargets.map((target) => ({
+  const cleanupTargets = includeAll ? buildPreviewCleanupTargets(workerCandidatesByScope, resolvedEnvironment) : previewScope.identifier ? [buildPreviewCleanupTarget(previewScope.identifier, workerCandidatesByScope, resolvedEnvironment)] : [];
+  const cleanupRuns = includeAll ? cleanupTargets.map((target) => ({
     scope: target.scope,
     target
-  })) : [{
+  })) : previewScope.identifier ? [{
     scope: previewScope.identifier,
-    target: undefined
-  }];
+    target: cleanupTargets[0]
+  }] : [];
   const applyCleanup = parsed.options.apply === true;
   const executions = [];
   if (includeAll) {
@@ -1040,9 +1090,6 @@ async function runCleanupSubcommand(parsed, context, logger, options, databaseNa
       for (const workerName of orderedWorkerNames) {
         await account.deleteWorker(context.accountId, workerName, CLI_API_OPTIONS);
       }
-      if (cleanupRun.target && orderedWorkerNames.length > 0) {
-        await retireDeletedPreviewWorkers(context.accountId, databaseName, cleanupRun.target.scope, orderedWorkerNames);
-      }
     }
     const result = await cleanupPreviewScopedResources(config, {
       environment: resolvedEnvironment,
@@ -1068,7 +1115,7 @@ async function runCleanupSubcommand(parsed, context, logger, options, databaseNa
     return sum + getPreviewCleanupResourceCandidateCount(execution.result);
   }, 0);
   const totalCandidates = totalWorkerCandidates + totalResourceCandidates;
-  const scopeCountSuffix = includeAll || previewScope.identifier ? ` across ${cleanupRuns.length} preview scope${cleanupRuns.length === 1 ? "" : "s"}` : "";
+  const scopeCountSuffix = cleanupRuns.length > 0 ? ` across ${cleanupRuns.length} preview scope${cleanupRuns.length === 1 ? "" : "s"}` : "";
   logger.success(applyCleanup ? `Deleted ${totalCandidates} preview-only cleanup candidate${totalCandidates === 1 ? "" : "s"}${scopeCountSuffix}` : `Preview cleanup dry run complete with ${totalCandidates} candidate${totalCandidates === 1 ? "" : "s"}${scopeCountSuffix}`);
   const resourceSummary = [
     totalWorkerCandidates > 0 ? `Workers ${totalWorkerCandidates}` : null,
@@ -1143,14 +1190,13 @@ async function runPreviewsCommand(parsed, logger, options) {
   }
   try {
     const context = await resolveContext(parsed, options, subcommand);
-    const databaseName = asOptionalString(parsed.options.database);
     const environment = asOptionalString(parsed.options.env);
     const configFile = asOptionalString(parsed.options.config);
     switch (subcommand) {
       case "bindings":
         return runBindingsSubcommand(parsed, context, logger, options, environment, configFile, theme);
       case "cleanup":
-        return runCleanupSubcommand(parsed, context, logger, options, databaseName, environment, configFile, includeAll, theme);
+        return runCleanupSubcommand(parsed, context, logger, options, environment, configFile, includeAll, theme);
       case "list":
       default:
         return runListSubcommand(context, logger, theme);