@google-cloud/kcmd 0.2.0 → 0.2.1

package/build/ts/kcmd/cli.js

@@ -35,7 +35,7 @@ var cac = __toESM(require("cac"));
 // package.json
 var package_default = {
   name: "@google-cloud/kcmd",
-  version: "0.2.0",
+  version: "0.2.1",
   description: "Google Knowledge Catalog Metadata as Code Library, CLI and MCP Server",
   repository: {
     type: "git",
@@ -3743,12 +3743,6 @@ function normalizeModelSugars(m, extended) {
     delete m.entities;
   }
 }
-function deploymentTargetsExtension(targets) {
-  return {
-    vendorName: GOOGLE_VENDOR,
-    data: JSON.stringify({ deploymentTargets: targets })
-  };
-}
 function isGoogleVendor(vendorName) {
   return typeof vendorName === "string" && vendorName.toUpperCase() === GOOGLE_VENDOR;
 }
@@ -4359,13 +4353,6 @@ function convertModel(m, version, opts, warnings) {
     model.aiContext = ai;
   if (block.kept)
     model.customExtensions = block.kept;
-  const foldedTargets = version === GOOGLE_VERSION ? deployments.map((d) => d.target) : [];
-  if (foldedTargets.length) {
-    model.customExtensions = [
-      ...model.customExtensions ?? [],
-      deploymentTargetsExtension(foldedTargets)
-    ];
-  }
   return model;
 }
 function convertDataset(ds, block, version, opts, warnings, dialect) {
@@ -8947,7 +8934,7 @@ async function initOkfWorkspace(ctx, manifest2, options = {}) {
   const hasConceptFiles = fs8.readdirSync(BUNDLE_DIR).some((f) => f.endsWith(".md"));
   if (!fs8.existsSync(indexPath) && !fs8.existsSync(agentsPath) && !hasConceptFiles) {
     fs8.writeFileSync(indexPath, `---
-okf_version: "0.3"
+okf_version: "0.2"
 ---
 # ${groupId}
 `, "utf8");
@@ -8957,225 +8944,7 @@ okf_version: "0.3"
 
 // src/libts/semantic/osi_converter.ts
 var yaml12 = __toESM(require("yaml"));
-
-// src/libts/semantic/deployment_target.ts
 var GOOGLE_VENDOR2 = "GOOGLE";
-var BQ_GRAPH_TARGET = /^\/\/bigquery\.googleapis\.com\/projects\/([A-Za-z0-9_-]+)\/datasets\/([A-Za-z0-9_-]+)\/propertyGraphs\/([A-Za-z0-9_-]+)$/;
-var SPANNER_GRAPH_TARGET = /^\/\/spanner\.googleapis\.com\/projects\/([A-Za-z0-9_-]+)\/instances\/([A-Za-z0-9_-]+)\/databases\/([A-Za-z0-9_-]+)\/graphs\/([A-Za-z0-9_-]+)$/;
-var SPANNER_PROPERTY_GRAPH = /^(spanner\.googleapis\.com\/projects\/[A-Za-z0-9_-]+\/instances\/[A-Za-z0-9_-]+\/databases\/[A-Za-z0-9_-]+)\/propertyGraphs\/([A-Za-z0-9_-]+)$/;
-var ALLOYDB_TARGET = /^\/\/alloydb\.googleapis\.com\/projects\/([A-Za-z0-9_-]+)\/locations\/([A-Za-z0-9_-]+)\/clusters\/([A-Za-z0-9_-]+)\/databases\/([A-Za-z0-9_-]+)$/;
-var LEGACY_ALLOYDB_TARGET = /^\/\/alloydb\.googleapis\.com\/projects\/([A-Za-z0-9_-]+)\/locations\/([A-Za-z0-9_-]+)\/clusters\/([A-Za-z0-9_-]+)\/instances\/([A-Za-z0-9_-]+)\/databases\/([A-Za-z0-9_-]+)$/;
-var BQ_GRAPH_FORM = "bigquery.googleapis.com/projects/<p>/datasets/<d>/propertyGraphs/<g>";
-var SPANNER_GRAPH_FORM = "spanner.googleapis.com/projects/<p>/instances/<i>/databases/<db>/graphs/<g>";
-var ALLOYDB_FORM = "alloydb.googleapis.com/projects/<p>/locations/<l>/clusters/<c>/databases/<db>";
-var CATALOG_PREFIXES = [
-  ["bigquery:graph:", BQ_GRAPH_FORM],
-  ["bigquery:propertygraph:", BQ_GRAPH_FORM],
-  ["spanner:graph:", SPANNER_GRAPH_FORM],
-  ["alloydb:", ALLOYDB_FORM]
-];
-function parseTarget(uri) {
-  if (uri.startsWith("//"))
-    return;
-  const resource = asResourceUri(uri);
-  const bq = resource.match(BQ_GRAPH_TARGET);
-  if (bq) {
-    return {
-      engine: "bigquery",
-      coordinates: { project: bq[1], dataset: bq[2], graphName: bq[3], uri }
-    };
-  }
-  const sp = resource.match(SPANNER_GRAPH_TARGET);
-  if (sp) {
-    return {
-      engine: "spanner",
-      coordinates: {
-        project: sp[1],
-        instance: sp[2],
-        database: sp[3],
-        graphName: sp[4],
-        uri
-      }
-    };
-  }
-  const ad = resource.match(ALLOYDB_TARGET);
-  if (ad) {
-    return {
-      engine: "alloydb",
-      coordinates: {
-        project: ad[1],
-        location: ad[2],
-        cluster: ad[3],
-        database: ad[4],
-        uri
-      }
-    };
-  }
-  return;
-}
-function clusterUri(legacy) {
-  return `//alloydb.googleapis.com/projects/${legacy[1]}/locations/${legacy[2]}/clusters/${legacy[3]}/databases/${legacy[5]}`;
-}
-function deploymentTargetError(model, d) {
-  return targetError(`Model '${model.name}': deployment '${d.name}' targets '${d.target}'`, d.target);
-}
-function googleBlockTargetError(model, target) {
-  return targetError(`Model '${model.name}': the GOOGLE custom_extension's ` + `'deploymentTargets' lists '${target}'`, target);
-}
-function spannerGraphName(target) {
-  const m = asResourceName(target).match(SPANNER_PROPERTY_GRAPH);
-  return m ? `${m[1]}/graphs/${m[2]}` : undefined;
-}
-function targetProblem(at2, target) {
-  return parseTarget(target) ? undefined : targetError(at2, target);
-}
-function targetError(at2, target) {
-  const legacy = asResourceUri(target).match(LEGACY_ALLOYDB_TARGET);
-  if (legacy) {
-    return `${at2}, the instance-based AlloyDB name, which names no real ` + `resource. An AlloyDB database belongs to its cluster; write '${asResourceName(clusterUri(legacy))}'.`;
-  }
-  const name = asResourceName(target);
-  if (name !== target && parseTarget(name)) {
-    return `${at2}, which is ${resourceUriFix(target)}.`;
-  }
-  const graph = spannerGraphName(target);
-  if (graph) {
-    return `${at2}, which names a Spanner graph by 'propertyGraphs'; write ` + `its Dataplex name: '${graph}'.`;
-  }
-  const form = CATALOG_PREFIXES.find(([prefix]) => target.startsWith(prefix))?.[1];
-  if (form) {
-    return `${at2}, which is a Knowledge Catalog name. Write the GCP resource ` + `name instead: '${form}'.`;
-  }
-  return `${at2}, which is not a BigQuery graph, a Spanner graph or an ` + `AlloyDB database. Write a GCP resource name: '${BQ_GRAPH_FORM}', '${SPANNER_GRAPH_FORM}' or '${ALLOYDB_FORM}'.`;
-}
-function parseDeploymentSelection(raw) {
-  if (raw === undefined || typeof raw === "boolean")
-    return;
-  const noNames = `--deployment names no deployment; give one or more ` + `deployment names, comma-separated.`;
-  const names = [];
-  const parts = Array.isArray(raw) ? raw : [raw];
-  for (const part of parts) {
-    const pieces = typeof part === "boolean" ? [] : String(part).split(",").map((p) => p.trim()).filter((p) => p);
-    if (!pieces.length)
-      throw new Error(noNames);
-    for (const name of pieces) {
-      if (!names.includes(name))
-        names.push(name);
-    }
-  }
-  if (!names.length)
-    throw new Error(noNames);
-  return names;
-}
-function resolveModelDeployments(model, selected) {
-  const declared = model.deployments ?? [];
-  let chosen = declared;
-  if (selected !== undefined) {
-    const byName = new Map(declared.map((d) => [d.name, d]));
-    chosen = [];
-    for (const name of selected) {
-      const d = byName.get(name);
-      if (!d) {
-        const available = declared.length ? declared.map((x) => x.name).join(", ") : "none";
-        return {
-          error: `Model '${model.name}' has no deployment named '${name}' (available: ${available}).`
-        };
-      }
-      chosen.push(d);
-    }
-  }
-  const deployments = [];
-  for (const d of chosen) {
-    const parsed = parseTarget(d.target);
-    if (!parsed)
-      return { error: deploymentTargetError(model, d) };
-    deployments.push({
-      ...parsed,
-      name: d.name,
-      profile: d.profile ?? DEFAULT_PROFILE
-    });
-  }
-  return { deployments };
-}
-var targetsCache = new WeakMap;
-function extensionTargets(model) {
-  return googleBlockTargets(model.customExtensions, model.name);
-}
-function googleBlockTargets(exts, modelName) {
-  const uris = [];
-  for (const ext of exts ?? []) {
-    if (ext.vendorName !== GOOGLE_VENDOR2) {
-      continue;
-    }
-    let data;
-    try {
-      data = JSON.parse(ext.data);
-    } catch {
-      throw new Error(`Model '${modelName}': GOOGLE custom_extension 'data' is not valid JSON.`);
-    }
-    const list = data?.deploymentTargets;
-    if (!Array.isArray(list)) {
-      continue;
-    }
-    for (const uri of list) {
-      if (typeof uri !== "string") {
-        uris.push(JSON.stringify(uri));
-      } else if (uri.trim() !== "") {
-        uris.push(uri.trim());
-      }
-    }
-  }
-  return uris;
-}
-function unnamedDeployments(targets) {
-  const seen = new Set;
-  const kept = targets.map((t) => t.trim()).filter((t) => {
-    if (t === "" || seen.has(t))
-      return false;
-    seen.add(t);
-    return true;
-  });
-  return kept.map((target, i) => ({
-    name: kept.length === 1 ? "default" : `deployment_${i + 1}`,
-    target
-  }));
-}
-function googleDeploymentTargets(model) {
-  const cached = targetsCache.get(model);
-  if (cached)
-    return cached;
-  const uris = model.deployments !== undefined ? model.deployments.map((d) => d.target) : extensionTargets(model);
-  const bigQuery = [];
-  const spanner = [];
-  const alloyDb = [];
-  const malformed = [];
-  for (const uri of uris) {
-    const parsed = parseTarget(uri);
-    if (parsed?.engine === "bigquery") {
-      bigQuery.push(parsed.coordinates);
-    } else if (parsed?.engine === "spanner") {
-      spanner.push(parsed.coordinates);
-    } else if (parsed?.engine === "alloydb") {
-      alloyDb.push(parsed.coordinates);
-    } else {
-      malformed.push(uri);
-    }
-  }
-  const result = { uris, bigQuery, spanner, alloyDb, malformed };
-  targetsCache.set(model, result);
-  return result;
-}
-function bigQueryGraphTargets(model) {
-  const { bigQuery, malformed } = googleDeploymentTargets(model);
-  return { targets: bigQuery, malformed };
-}
-function spannerGraphTargets(model) {
-  const { spanner, malformed } = googleDeploymentTargets(model);
-  return { targets: spanner, malformed };
-}
-
-// src/libts/semantic/osi_converter.ts
-var GOOGLE_VENDOR3 = "GOOGLE";
 var CANONICAL_DIALECT = "BIGQUERY";
 var ALLOWED_DIALECT_SET = new Set(ALLOWED_DIALECTS);
 function serializeModelFiles(model, opts = {}) {
@@ -9316,7 +9085,7 @@ function modelDoc(model, warnings, logical, version) {
     target: d.target,
     profile: d.profile
   }));
-  const deployments = placement.model.deployments === "native" ? nonEmpty(namedDeployments.length ? namedDeployments : deploymentsFromGoogleExtensions(model)) : undefined;
+  const deployments = placement.model.deployments === "native" ? nonEmpty(namedDeployments) : undefined;
   const blockProfiles = placement.model.profiles === "block" ? nonEmpty(profileDocuments(model, warnings).map((p) => p.doc)) : undefined;
   const blockDeployments = placement.model.deployments === "block" ? nonEmpty(namedDeployments) : undefined;
   const blockPayload = compact({
@@ -9336,7 +9105,7 @@ function modelDoc(model, warnings, logical, version) {
     metrics: nonEmpty((model.metrics ?? []).map((m) => metricDoc(m, warnings, version))),
     actions: placement.model.actions === "native" ? nonEmpty((model.actions ?? []).map((a) => actionDoc(a, warnings, emittedFields))) : undefined,
     constraints: placement.model.constraints === "native" ? nonEmpty((model.constraints ?? []).map((c) => constraintDoc(c))) : undefined,
-    custom_extensions: customExtensionsDoc(model.customExtensions, `model '${model.name}'`, isGoogleVersion, true, warnings, false, blockPayload)
+    custom_extensions: customExtensionsDoc(model.customExtensions, `model '${model.name}'`, isGoogleVersion, warnings, false, blockPayload)
   });
 }
 function warnGoogleOnlyContent(model, warnings) {
@@ -9375,7 +9144,7 @@ function datasetDoc(entity, warnings, logical, version) {
     description: entity.description,
     ai_context: aiContextDoc(entity.aiContext, isGoogleVersion),
     fields: nonEmpty((entity.fields ?? []).map((f) => fieldDoc(f, warnings, logical || isGoogleVersion && !!entity.abstract, isGoogleVersion))),
-    custom_extensions: customExtensionsDoc(entity.customExtensions, `entity '${entity.name}'`, isGoogleVersion, false, warnings, false, blockPayload)
+    custom_extensions: customExtensionsDoc(entity.customExtensions, `entity '${entity.name}'`, isGoogleVersion, warnings, false, blockPayload)
   });
 }
 function datatypeDoc(type) {
@@ -9394,7 +9163,7 @@ function fieldDoc(field, warnings, logical, isGoogleVersion) {
     dimension: dimensionDoc(field),
     description: field.description,
     ai_context: aiContextDoc(field.aiContext, isGoogleVersion),
-    custom_extensions: customExtensionsDoc(field.customExtensions, `field '${field.name}'`, isGoogleVersion, false, warnings, true)
+    custom_extensions: customExtensionsDoc(field.customExtensions, `field '${field.name}'`, isGoogleVersion, warnings, true)
   });
 }
 function metricDoc(metric, warnings, version) {
@@ -9413,7 +9182,7 @@ function metricDoc(metric, warnings, version) {
     datatype: datatypeDoc(metric.type),
     description: metric.description,
     ai_context: aiContextDoc(metric.aiContext, isGoogleVersion),
-    custom_extensions: customExtensionsDoc(metric.customExtensions, `metric '${metric.name}'`, isGoogleVersion, false, warnings, false, blockPayload)
+    custom_extensions: customExtensionsDoc(metric.customExtensions, `metric '${metric.name}'`, isGoogleVersion, warnings, false, blockPayload)
   });
 }
 function emitted(model) {
@@ -9513,7 +9282,7 @@ function relationshipDoc(rel, warnings, version) {
     to_columns: nonEmpty(rel.destination.columns),
     description: placement.relationship.description === "native" ? description : undefined,
     ai_context: aiContextDoc(rel.aiContext, isGoogleVersion),
-    custom_extensions: customExtensionsDoc(rel.customExtensions, `relationship '${rel.name}'`, isGoogleVersion, false, warnings, false, blockPayload)
+    custom_extensions: customExtensionsDoc(rel.customExtensions, `relationship '${rel.name}'`, isGoogleVersion, warnings, false, blockPayload)
   });
 }
 function expressionDoc(item, isGoogleVersion, where, warnings) {
@@ -9579,11 +9348,7 @@ function aiContextDoc(ai, isGoogleVersion) {
   }
   return isGoogleVersion ? { ...base, custom } : { ...custom, ...base };
 }
-function deploymentsFromGoogleExtensions(model) {
-  const targets = (model.customExtensions ?? []).flatMap((ext) => blockTargets(ext, model.name));
-  return unnamedDeployments(targets);
-}
-function customExtensionsDoc(exts, where, isGoogleVersion, isModel, warnings, isField = false, blockPayload) {
+function customExtensionsDoc(exts, where, isGoogleVersion, warnings, isField = false, blockPayload) {
   const payload = blockPayload ? { ...blockPayload } : {};
   if (!exts?.length && Object.keys(payload).length === 0)
     return;
@@ -9591,13 +9356,10 @@ function customExtensionsDoc(exts, where, isGoogleVersion, isModel, warnings, is
     const kept2 = [];
     let droppedGoogle2 = 0;
     for (const e of exts ?? []) {
-      if (e.vendorName !== GOOGLE_VENDOR3) {
+      if (e.vendorName !== GOOGLE_VENDOR2) {
         kept2.push({ vendor_name: e.vendorName, data: e.data });
         continue;
       }
-      if (isModel && payload.deployments !== undefined && isDeploymentTargetsBlock(e)) {
-        continue;
-      }
       droppedGoogle2 += 1;
     }
     if (droppedGoogle2 > 0) {
@@ -9605,7 +9367,7 @@ function customExtensionsDoc(exts, where, isGoogleVersion, isModel, warnings, is
     }
     if (Object.keys(payload).length > 0) {
       kept2.push({
-        vendor_name: GOOGLE_VENDOR3,
+        vendor_name: GOOGLE_VENDOR2,
         data: JSON.stringify(payload)
       });
     }
@@ -9614,12 +9376,10 @@ function customExtensionsDoc(exts, where, isGoogleVersion, isModel, warnings, is
   const kept = [];
   let droppedGoogle = 0;
   for (const ext of exts ?? []) {
-    if (ext.vendorName !== GOOGLE_VENDOR3) {
+    if (ext.vendorName !== GOOGLE_VENDOR2) {
       kept.push({ vendor_name: ext.vendorName, data: ext.data });
       continue;
     }
-    if (isModel && blockTargets(ext, "").length > 0)
-      continue;
     droppedGoogle += 1;
   }
   if (droppedGoogle > 0) {
@@ -9627,21 +9387,6 @@ function customExtensionsDoc(exts, where, isGoogleVersion, isModel, warnings, is
   }
   return nonEmpty(kept);
 }
-function isDeploymentTargetsBlock(e) {
-  try {
-    const d = JSON.parse(e.data);
-    return !!d && typeof d === "object" && Object.hasOwn(d, "deploymentTargets");
-  } catch {
-    return false;
-  }
-}
-function blockTargets(ext, modelName) {
-  try {
-    return googleBlockTargets([ext], modelName);
-  } catch {
-    return [];
-  }
-}
 function compact(obj) {
   const out = {};
   for (const [k, v] of Object.entries(obj)) {
@@ -10921,6 +10666,189 @@ function quote(s) {
   return `"${escaped}"`;
 }
 
+// src/libts/semantic/deployment_target.ts
+var BQ_GRAPH_TARGET = /^\/\/bigquery\.googleapis\.com\/projects\/([A-Za-z0-9_-]+)\/datasets\/([A-Za-z0-9_-]+)\/propertyGraphs\/([A-Za-z0-9_-]+)$/;
+var SPANNER_GRAPH_TARGET = /^\/\/spanner\.googleapis\.com\/projects\/([A-Za-z0-9_-]+)\/instances\/([A-Za-z0-9_-]+)\/databases\/([A-Za-z0-9_-]+)\/graphs\/([A-Za-z0-9_-]+)$/;
+var SPANNER_PROPERTY_GRAPH = /^(spanner\.googleapis\.com\/projects\/[A-Za-z0-9_-]+\/instances\/[A-Za-z0-9_-]+\/databases\/[A-Za-z0-9_-]+)\/propertyGraphs\/([A-Za-z0-9_-]+)$/;
+var ALLOYDB_TARGET = /^\/\/alloydb\.googleapis\.com\/projects\/([A-Za-z0-9_-]+)\/locations\/([A-Za-z0-9_-]+)\/clusters\/([A-Za-z0-9_-]+)\/databases\/([A-Za-z0-9_-]+)$/;
+var LEGACY_ALLOYDB_TARGET = /^\/\/alloydb\.googleapis\.com\/projects\/([A-Za-z0-9_-]+)\/locations\/([A-Za-z0-9_-]+)\/clusters\/([A-Za-z0-9_-]+)\/instances\/([A-Za-z0-9_-]+)\/databases\/([A-Za-z0-9_-]+)$/;
+var BQ_GRAPH_FORM = "bigquery.googleapis.com/projects/<p>/datasets/<d>/propertyGraphs/<g>";
+var SPANNER_GRAPH_FORM = "spanner.googleapis.com/projects/<p>/instances/<i>/databases/<db>/graphs/<g>";
+var ALLOYDB_FORM = "alloydb.googleapis.com/projects/<p>/locations/<l>/clusters/<c>/databases/<db>";
+var CATALOG_PREFIXES = [
+  ["bigquery:graph:", BQ_GRAPH_FORM],
+  ["bigquery:propertygraph:", BQ_GRAPH_FORM],
+  ["spanner:graph:", SPANNER_GRAPH_FORM],
+  ["alloydb:", ALLOYDB_FORM]
+];
+function parseTarget(uri) {
+  if (uri.startsWith("//"))
+    return;
+  const resource = asResourceUri(uri);
+  const bq = resource.match(BQ_GRAPH_TARGET);
+  if (bq) {
+    return {
+      engine: "bigquery",
+      coordinates: { project: bq[1], dataset: bq[2], graphName: bq[3], uri }
+    };
+  }
+  const sp = resource.match(SPANNER_GRAPH_TARGET);
+  if (sp) {
+    return {
+      engine: "spanner",
+      coordinates: {
+        project: sp[1],
+        instance: sp[2],
+        database: sp[3],
+        graphName: sp[4],
+        uri
+      }
+    };
+  }
+  const ad = resource.match(ALLOYDB_TARGET);
+  if (ad) {
+    return {
+      engine: "alloydb",
+      coordinates: {
+        project: ad[1],
+        location: ad[2],
+        cluster: ad[3],
+        database: ad[4],
+        uri
+      }
+    };
+  }
+  return;
+}
+function clusterUri(legacy) {
+  return `//alloydb.googleapis.com/projects/${legacy[1]}/locations/${legacy[2]}/clusters/${legacy[3]}/databases/${legacy[5]}`;
+}
+function deploymentTargetError(model, d) {
+  return targetError(`Model '${model.name}': deployment '${d.name}' targets '${d.target}'`, d.target);
+}
+function spannerGraphName(target) {
+  const m = asResourceName(target).match(SPANNER_PROPERTY_GRAPH);
+  return m ? `${m[1]}/graphs/${m[2]}` : undefined;
+}
+function targetProblem(at2, target) {
+  return parseTarget(target) ? undefined : targetError(at2, target);
+}
+function targetError(at2, target) {
+  const legacy = asResourceUri(target).match(LEGACY_ALLOYDB_TARGET);
+  if (legacy) {
+    return `${at2}, the instance-based AlloyDB name, which names no real ` + `resource. An AlloyDB database belongs to its cluster; write '${asResourceName(clusterUri(legacy))}'.`;
+  }
+  const name = asResourceName(target);
+  if (name !== target && parseTarget(name)) {
+    return `${at2}, which is ${resourceUriFix(target)}.`;
+  }
+  const graph = spannerGraphName(target);
+  if (graph) {
+    return `${at2}, which names a Spanner graph by 'propertyGraphs'; write ` + `its Dataplex name: '${graph}'.`;
+  }
+  const form = CATALOG_PREFIXES.find(([prefix]) => target.startsWith(prefix))?.[1];
+  if (form) {
+    return `${at2}, which is a Knowledge Catalog name. Write the GCP resource ` + `name instead: '${form}'.`;
+  }
+  return `${at2}, which is not a BigQuery graph, a Spanner graph or an ` + `AlloyDB database. Write a GCP resource name: '${BQ_GRAPH_FORM}', '${SPANNER_GRAPH_FORM}' or '${ALLOYDB_FORM}'.`;
+}
+function parseDeploymentSelection(raw) {
+  if (raw === undefined || typeof raw === "boolean")
+    return;
+  const noNames = `--deployment names no deployment; give one or more ` + `deployment names, comma-separated.`;
+  const names = [];
+  const parts = Array.isArray(raw) ? raw : [raw];
+  for (const part of parts) {
+    const pieces = typeof part === "boolean" ? [] : String(part).split(",").map((p) => p.trim()).filter((p) => p);
+    if (!pieces.length)
+      throw new Error(noNames);
+    for (const name of pieces) {
+      if (!names.includes(name))
+        names.push(name);
+    }
+  }
+  if (!names.length)
+    throw new Error(noNames);
+  return names;
+}
+function resolveModelDeployments(model, selected) {
+  const declared = model.deployments ?? [];
+  let chosen = declared;
+  if (selected !== undefined) {
+    const byName = new Map(declared.map((d) => [d.name, d]));
+    chosen = [];
+    for (const name of selected) {
+      const d = byName.get(name);
+      if (!d) {
+        const available = declared.length ? declared.map((x) => x.name).join(", ") : "none";
+        return {
+          error: `Model '${model.name}' has no deployment named '${name}' (available: ${available}).`
+        };
+      }
+      chosen.push(d);
+    }
+  }
+  const deployments = [];
+  for (const d of chosen) {
+    const parsed = parseTarget(d.target);
+    if (!parsed)
+      return { error: deploymentTargetError(model, d) };
+    deployments.push({
+      ...parsed,
+      name: d.name,
+      profile: d.profile ?? DEFAULT_PROFILE
+    });
+  }
+  return { deployments };
+}
+var targetsCache = new WeakMap;
+function unnamedDeployments(targets) {
+  const seen = new Set;
+  const kept = targets.map((t) => t.trim()).filter((t) => {
+    if (t === "" || seen.has(t))
+      return false;
+    seen.add(t);
+    return true;
+  });
+  return kept.map((target, i) => ({
+    name: kept.length === 1 ? "default" : `deployment_${i + 1}`,
+    target
+  }));
+}
+function googleDeploymentTargets(model) {
+  const cached = targetsCache.get(model);
+  if (cached)
+    return cached;
+  const uris = (model.deployments ?? []).map((d) => d.target);
+  const bigQuery = [];
+  const spanner = [];
+  const alloyDb = [];
+  const malformed = [];
+  for (const uri of uris) {
+    const parsed = parseTarget(uri);
+    if (parsed?.engine === "bigquery") {
+      bigQuery.push(parsed.coordinates);
+    } else if (parsed?.engine === "spanner") {
+      spanner.push(parsed.coordinates);
+    } else if (parsed?.engine === "alloydb") {
+      alloyDb.push(parsed.coordinates);
+    } else {
+      malformed.push(uri);
+    }
+  }
+  const result = { uris, bigQuery, spanner, alloyDb, malformed };
+  targetsCache.set(model, result);
+  return result;
+}
+function bigQueryGraphTargets(model) {
+  const { bigQuery, malformed } = googleDeploymentTargets(model);
+  return { targets: bigQuery, malformed };
+}
+function spannerGraphTargets(model) {
+  const { spanner, malformed } = googleDeploymentTargets(model);
+  return { targets: spanner, malformed };
+}
+
 // src/libts/semantic/deploy_bigquery.ts
 var MAX_QUERY_POLLS = 30;
 var POLL_BACKOFF_MS = 1000;
@@ -11004,18 +10932,12 @@ async function deployBigQuery(models, ctx, options = {}) {
   };
   for (const { document, model } of models) {
     modelsSeen++;
-    let targets;
-    let malformed;
-    try {
-      ({ targets, malformed } = bigQueryGraphTargets(model));
-    } catch (err) {
-      return fail(`Model '${model.name}' (${document}): ${err.message || err}`);
-    }
+    const { targets, malformed } = bigQueryGraphTargets(model);
     if (!targets.length) {
       if (malformed.length) {
-        return fail(`Model '${model.name}' (${document}) declares BigQuery Graph ` + `deploymentTarget(s) that could not be parsed: ` + `${malformed.join(", ")}. Expected ${BQ_GRAPH_FORM}.`);
+        return fail(`Model '${model.name}' (${document}) declares BigQuery Graph ` + `deployment target(s) that could not be parsed: ` + `${malformed.join(", ")}. Expected ${BQ_GRAPH_FORM}.`);
       }
-      return fail(`Model '${model.name}' (${document}) declares no BigQuery Graph ` + `deploymentTarget in a GOOGLE custom_extension; nothing to deploy.`);
+      return fail(`Model '${model.name}' (${document}) declares no BigQuery Graph ` + `deployment target; nothing to deploy.`);
     }
     for (const bad of malformed) {
       warnings.push(`[${model.name}] ignoring unparseable BigQuery Graph target: ${bad}`);
@@ -11581,13 +11503,15 @@ async function provisionOne(cat, dest, type) {
   const aspectLabel = `aspect type '${type.id}'`;
   const aspect = await cat.createAspectType(home.project, home.location, type.id, type.aspectType);
   if (aspect.status === 409) {
-    const upd = await cat.updateAspectType(home.project, home.location, type.id, type.aspectType, ["description", "display_name", "metadata_template"]);
-    const reason = upd.status !== 200 ? `${upd.message || upd.status}` : await cat.awaitOperation(upd.result, `updating ${aspectLabel}`);
+    const upd = await cat.updateAspectType(home.project, home.location, type.id, type.aspectType, ["description", "display_name", "metadata_template"]).catch((err) => ({ status: 0, message: String(err?.message || err) }));
+    const reason = upd.status !== 200 ? `${upd.message || upd.status}` : await cat.awaitOperation(upd.result, "the update operation").catch((err) => String(err?.message || err));
     if (upd.status === 403) {
       warnings.push(`no permission to update the existing ${aspectLabel} in project ` + `'${home.project}' (${reason}); left it unchanged`);
-    } else if (reason) {
+    } else if (reason && /Backwards incompatible template change/i.test(reason)) {
       const resource = customAspectTypeName(type.id, dest);
-      warnings.push(`left the existing ${aspectLabel} unchanged (${reason}). It is ` + `${resource}, and Dataplex will not patch it into the template ` + `this build states -- a template field that was removed or ` + `renumbered is a backwards-incompatible change and is refused. A ` + `push will fail wherever the two disagree. To move it forward, ` + `delete it and re-run this command: gcloud dataplex aspect-types ` + `delete ${type.id} --project=${home.project} ` + `--location=${home.location}. Deleting takes the aspects of every ` + `entry already published with this type, so re-push those models ` + `afterwards.`);
+      warnings.push(`left the existing ${aspectLabel} unchanged (${reason}). It is ` + `${resource}, and Dataplex will not patch it into the template ` + `this build states -- a template field that was removed or ` + `renumbered is a backwards-incompatible change and is refused. A ` + `push will fail wherever the two disagree. To move it forward, ` + `delete the entry type and then the aspect type, and re-run this ` + `command: gcloud dataplex entry-types delete ${type.id} ` + `--project=${home.project} --location=${home.location} && gcloud ` + `dataplex aspect-types delete ${type.id} --project=${home.project} ` + `--location=${home.location}. Deleting the entry type also deletes ` + `every entry of that type in the project, so push the models that ` + `had them again afterwards.`);
+    } else if (reason) {
+      warnings.push(`could not update the existing ${aspectLabel} in project ` + `'${home.project}' (${reason}). Run this command again in a minute ` + `to retry the update.`);
     }
   } else if (aspect.status !== 200) {
     const refused2 = denial(aspectLabel, aspect.status, aspect.message);
@@ -12754,21 +12678,6 @@ function sleep3(ms) {
 }
 async function preflightKnowledgeCatalog(models, ctx, opts) {
   const emit = emitModels(models, opts);
-  if (emit.error) {
-    return {
-      result: {
-        success: false,
-        details: emit.error,
-        warnings: emit.warnings,
-        created: 0,
-        updated: 0,
-        deleted: 0,
-        linked: 0,
-        unlinked: 0,
-        plan: []
-      }
-    };
-  }
   return preflightEmittedModels(emit.emitted, emit.warnings, ctx, opts);
 }
 async function applyKnowledgeCatalog(prepared, ctx, opts) {
@@ -12868,7 +12777,7 @@ var MAX_ASPECT_DATA_BYTES = 120 * 1024;
 var MAX_SCHEMA_ASPECT_DATA_BYTES = 2 * 1024 * 1024;
 function checkCatalogAspects(models, opts) {
   const emit = emitModels(models, opts);
-  const error = emit.error ?? emit.emitted.map(emittedAspectsError).find((e) => e);
+  const error = emit.emitted.map(emittedAspectsError).find((e) => e);
   return { error, warnings: emit.warnings };
 }
 function emittedAspectsError(model) {
@@ -12928,26 +12837,17 @@ async function checkCustomTypes(cat, dest, typeIds) {
 function emitModels(models, opts) {
   const emitted2 = [];
   const warnings = [];
-  for (const { document, model } of models) {
-    let resources;
-    try {
-      resources = generateCatalogResources(model, {
-        project: opts.project,
-        location: opts.location,
-        entryGroup: opts.entryGroup,
-        systemTypeProject: opts.systemTypeProject,
-        systemTypeLocation: opts.systemTypeLocation,
-        emitExpressions: opts.emitExpressions,
-        v2Aspects: opts.v2Aspects,
-        overviews: opts.overviews
-      });
-    } catch (err) {
-      return {
-        emitted: emitted2,
-        warnings,
-        error: `Model '${model.name}' (${document}): ${err.message || err}`
-      };
-    }
+  for (const { model } of models) {
+    const resources = generateCatalogResources(model, {
+      project: opts.project,
+      location: opts.location,
+      entryGroup: opts.entryGroup,
+      systemTypeProject: opts.systemTypeProject,
+      systemTypeLocation: opts.systemTypeLocation,
+      emitExpressions: opts.emitExpressions,
+      v2Aspects: opts.v2Aspects,
+      overviews: opts.overviews
+    });
     for (const w of resources.warnings)
       warnings.push(`[${model.name}] ${w}`);
     emitted2.push({ model: model.name, resources });
@@ -13609,18 +13509,12 @@ async function deploySpanner(models, ctx, options = {}) {
   const backoffMs = options.pollBackoffMs ?? POLL_BACKOFF_MS2;
   for (const { document, model } of models) {
     modelsSeen++;
-    let targets;
-    let malformed;
-    try {
-      ({ targets, malformed } = spannerGraphTargets(model));
-    } catch (err) {
-      return fail(`Model '${model.name}' (${document}): ${err.message || err}`);
-    }
+    const { targets, malformed } = spannerGraphTargets(model);
     if (!targets.length) {
       if (malformed.length) {
-        return fail(`Model '${model.name}' (${document}) declares Spanner Graph ` + `deploymentTarget(s) that could not be parsed: ` + `${malformed.join(", ")}. Expected ${SPANNER_GRAPH_FORM}.`);
+        return fail(`Model '${model.name}' (${document}) declares Spanner Graph ` + `deployment target(s) that could not be parsed: ` + `${malformed.join(", ")}. Expected ${SPANNER_GRAPH_FORM}.`);
       }
-      return fail(`Model '${model.name}' (${document}) declares no Spanner Graph ` + `deploymentTarget in a GOOGLE custom_extension; nothing to deploy.`);
+      return fail(`Model '${model.name}' (${document}) declares no Spanner Graph ` + `deployment target; nothing to deploy.`);
     }
     for (const bad of malformed) {
       warnings.push(`[${model.name}] ignoring unparseable Spanner Graph target: ${bad}`);
@@ -13954,13 +13848,7 @@ function validatePushRequirements(models, opts = {}) {
   const errors = [];
   for (const { document, model } of models) {
     errors.push(...nameAndDescriptionErrors(model, document, !!opts.v2Aspects));
-    let deployInfo;
-    try {
-      deployInfo = googleDeploymentTargets(model);
-    } catch (err) {
-      errors.push(`${err.message || err} (${document})`);
-      continue;
-    }
+    const deployInfo = googleDeploymentTargets(model);
     if (deployInfo.bigQuery.length + deployInfo.spanner.length > 0) {
       for (const rel of model.relationships ?? []) {
         if (rel.association)
@@ -15211,11 +15099,7 @@ async function validateBigQueryDataSources(models, bq, defaultProject, graph) {
   return errors;
 }
 function billingProject(model, defaultProject) {
-  try {
-    return googleDeploymentTargets(model).bigQuery[0]?.project ?? defaultProject;
-  } catch {
-    return defaultProject;
-  }
+  return googleDeploymentTargets(model).bigQuery[0]?.project ?? defaultProject;
 }
 function probeableRef(dataSource) {
   const trimmed = (dataSource ?? "").trim();
@@ -15260,12 +15144,7 @@ async function validateSpannerActionStatements(models, spanner) {
     const statements = pendingStatements(loaded);
     if (!statements.length)
       continue;
-    let target;
-    try {
-      target = spannerGraphTargets(loaded.model).targets[0];
-    } catch {
-      continue;
-    }
+    const target = spannerGraphTargets(loaded.model).targets[0];
     if (!target)
       continue;
     const key = `${target.project}/${target.instance}/${target.database}`;
@@ -16652,10 +16531,9 @@ function withDialects({ fileName, content }, profile, doc) {
   return writeDocument({ document, links, text: text3 }, root);
 }
 function validateDeploymentTargets(model, doc) {
-  for (const t of googleDeploymentTargets(model).uris) {
-    if (targetProblem("", t)) {
-      const d = model.deployments?.find((x) => x.target === t);
-      doc.errors.push(d ? deploymentTargetError(model, d) : googleBlockTargetError(model, t));
+  for (const d of model.deployments ?? []) {
+    if (targetProblem("", d.target)) {
+      doc.errors.push(deploymentTargetError(model, d));
     }
   }
 }
@@ -16977,10 +16855,9 @@ function modelsFromCatalogResources(entries, entryLinks = [], opts = {}) {
     if (description !== undefined)
       model.description = description;
     readActionsAndConstraints(model, children(actionEntries2), children(constraintEntries2), warnings);
-    const targets = readDeploymentTargets(anchor, name, warnings);
-    if (targets) {
-      model.customExtensions = [targets.extension];
-      model.deployments = targets.deployments;
+    const deployments = readDeploymentTargets(anchor, name, warnings);
+    if (deployments) {
+      model.deployments = deployments;
     }
     const ai = readAiContext(anchor);
     if (ai)
@@ -17347,15 +17224,8 @@ function readDeploymentTargets(anchor, modelName, warnings) {
     if (problem !== undefined)
       warnings.push(problem);
   }
-  const targets = deployments.map((d) => d.target);
   warnings.push(`model '${modelName}': deployment names were not recovered (the ` + `catalog stores target URIs only); using ${deployments.map((d) => `'${d.name}'`).join(", ")}`);
-  return {
-    extension: {
-      vendorName: "GOOGLE",
-      data: JSON.stringify({ deploymentTargets: targets })
-    },
-    deployments
-  };
+  return deployments;
 }
 function readRelationships(links, modelName, entityByEntryId, warnings) {
   const prefix = linkNamePrefix(modelName);
@@ -17686,18 +17556,16 @@ function strayBindings(model, store) {
   return strays;
 }
 function resolveStore(model, profile = DEFAULT_PROFILE) {
-  let all;
-  try {
-    all = googleDeploymentTargets(model);
-  } catch (err) {
-    return { error: `${err?.message || err}`, named: true, rejected: true };
-  }
+  const all = googleDeploymentTargets(model);
   const vanilla = model.version === OSSIE_VERSION;
   const where = vanilla && model.deployments ? `its GOOGLE block's 'deployments'` : `'deployments'`;
   if (all.malformed.length) {
-    const unparsed = model.deployments?.find((d) => d.target === all.malformed[0]);
-    const error = unparsed ? deploymentTargetError(model, unparsed) : googleBlockTargetError(model, all.malformed[0]);
-    return { error, named: true, rejected: true };
+    const unparsed = model.deployments.find((d) => d.target === all.malformed[0]);
+    return {
+      error: deploymentTargetError(model, unparsed),
+      named: true,
+      rejected: true
+    };
   }
   const used = deploymentsFor(model, profile);
   if ("error" in used)
@@ -17762,9 +17630,7 @@ function profileTargets(model, profile) {
   return "error" in used ? [] : googleDeploymentTargets(used.model).uris;
 }
 function deploymentNames(model, uris, profile) {
-  const deployments = model.deployments;
-  if (!deployments)
-    return "";
+  const deployments = model.deployments ?? [];
   const names = uris.map((uri) => deployments.find((d) => d.target === uri)?.name ?? uri);
   return ` for profile '${profile}' (${names.join(", ")})`;
 }
@@ -18771,12 +18637,8 @@ function okfWorkspace() {
   return readWorkspaceLayout("catalog.yaml") === OKF_FORMAT;
 }
 function hasTargetType(loaded, type) {
-  try {
-    const t = googleDeploymentTargets(loaded.model);
-    return type === "bigquery" ? t.bigQuery.length > 0 : t.spanner.length > 0;
-  } catch {
-    return false;
-  }
+  const t = googleDeploymentTargets(loaded.model);
+  return type === "bigquery" ? t.bigQuery.length > 0 : t.spanner.length > 0;
 }
 function pruningDialect(model) {
   return hasTargetType({ model }, "spanner") ? "SPANNER" : sourcesDialect(model);
@@ -19439,10 +19301,7 @@ async function printStore(options, ctx, snapshot2) {
   return 0;
 }
 function printProfileReport(model, name) {
-  let targets = [];
-  try {
-    targets = profileTargets(model, name);
-  } catch {}
+  const targets = profileTargets(model, name);
   const { report } = pruneUnavailable(model, name, pruningDialect({ ...model, deployments: unnamedDeployments(targets) }));
   console.log(`    target: ${targets.length ? targets.join(", ") : "(none; no deployment names this profile)"}`);
   console.log("    sources:");
@@ -20198,7 +20057,7 @@ async function startServer(basePath = ".") {
 }
 
 // src/tool/main.ts
-var BUILD_COMMIT = `+${"e2a3a9b"}`;
+var BUILD_COMMIT = `+${"5d0c5b3"}`;
 async function run(command) {
   let exitCode = 1;
   try {