@go-to-k/cdkd 0.91.0 → 0.91.2

package/dist/cli.js

@@ -21504,6 +21504,28 @@ var TemplateParser = class {
       }
       return;
     }
+    if ("Fn::Join" in obj) {
+      const joinValue = obj["Fn::Join"];
+      if (Array.isArray(joinValue) && joinValue.length >= 2) {
+        this.extractRefsFromValue(joinValue[1], dependencies);
+      }
+      return;
+    }
+    if ("Fn::Select" in obj) {
+      const selectValue = obj["Fn::Select"];
+      if (Array.isArray(selectValue) && selectValue.length >= 2) {
+        this.extractRefsFromValue(selectValue[0], dependencies);
+        this.extractRefsFromValue(selectValue[1], dependencies);
+      }
+      return;
+    }
+    if ("Fn::Split" in obj) {
+      const splitValue = obj["Fn::Split"];
+      if (Array.isArray(splitValue) && splitValue.length >= 2) {
+        this.extractRefsFromValue(splitValue[1], dependencies);
+      }
+      return;
+    }
     Object.values(obj).forEach((v) => this.extractRefsFromValue(v, dependencies));
   }
   /**
@@ -70146,6 +70168,268 @@ async function loadStateForStack(stackName, synthRegion, opts) {
 // src/local/lambda-resolver.ts
 import { existsSync as existsSync4, statSync as statSync3 } from "node:fs";
 import { dirname, isAbsolute, resolve as resolve4 } from "node:path";
+
+// src/local/intrinsic-image.ts
+function tryResolveImageFnJoin(raw, resources, context) {
+  if (!raw || typeof raw !== "object")
+    return { kind: "not-applicable" };
+  const obj = raw;
+  const arg = obj["Fn::Join"];
+  if (arg === void 0)
+    return { kind: "not-applicable" };
+  if (!Array.isArray(arg) || arg.length !== 2 || !Array.isArray(arg[1])) {
+    return { kind: "unsupported-join", reason: "Fn::Join must be [delimiter, [elements]]" };
+  }
+  const [delimiter, elements] = arg;
+  if (typeof delimiter !== "string") {
+    return {
+      kind: "unsupported-join",
+      reason: `Fn::Join delimiter must be a string, got ${typeof delimiter}`
+    };
+  }
+  const repoLogicalId = findEcrRepositoryRefInTree(elements, resources);
+  const stateResources = context?.stateResources;
+  if (repoLogicalId && !stateResources) {
+    return { kind: "needs-state", repoLogicalId };
+  }
+  const parts = [];
+  for (const element of elements) {
+    const r = resolveImageIntrinsic(element, resources, context);
+    if (r === void 0) {
+      if (!repoLogicalId)
+        return { kind: "not-applicable" };
+      return {
+        kind: "unsupported-join",
+        reason: "one or more Fn::Join elements could not be resolved"
+      };
+    }
+    parts.push(r);
+  }
+  return { kind: "resolved", uri: parts.join(delimiter) };
+}
+function findEcrRepositoryRefInTree(node, resources) {
+  if (node === null || node === void 0)
+    return void 0;
+  if (typeof node === "string" || typeof node === "number" || typeof node === "boolean") {
+    return void 0;
+  }
+  if (Array.isArray(node)) {
+    for (const item of node) {
+      const hit = findEcrRepositoryRefInTree(item, resources);
+      if (hit)
+        return hit;
+    }
+    return void 0;
+  }
+  if (typeof node !== "object")
+    return void 0;
+  const obj = node;
+  if (typeof obj["Ref"] === "string") {
+    const target = obj["Ref"];
+    if (resources[target]?.Type === "AWS::ECR::Repository")
+      return target;
+    return void 0;
+  }
+  const getAtt = obj["Fn::GetAtt"];
+  if (getAtt !== void 0) {
+    let lid;
+    if (Array.isArray(getAtt) && typeof getAtt[0] === "string")
+      lid = getAtt[0];
+    else if (typeof getAtt === "string")
+      lid = getAtt.split(".")[0];
+    if (lid && resources[lid]?.Type === "AWS::ECR::Repository")
+      return lid;
+    return void 0;
+  }
+  for (const value of Object.values(obj)) {
+    const hit = findEcrRepositoryRefInTree(value, resources);
+    if (hit)
+      return hit;
+  }
+  return void 0;
+}
+function resolveImageIntrinsic(node, resources, context) {
+  const v = resolveImageIntrinsicAny(node, resources, context);
+  if (typeof v === "string")
+    return v;
+  if (typeof v === "number" || typeof v === "boolean")
+    return String(v);
+  return void 0;
+}
+function resolveImageIntrinsicAny(node, resources, context) {
+  if (node === null || node === void 0)
+    return void 0;
+  if (typeof node === "string" || typeof node === "number" || typeof node === "boolean") {
+    return node;
+  }
+  if (Array.isArray(node)) {
+    return void 0;
+  }
+  if (typeof node !== "object")
+    return void 0;
+  const obj = node;
+  const keys = Object.keys(obj);
+  if (keys.length !== 1)
+    return void 0;
+  const intrinsic = keys[0];
+  const arg = obj[intrinsic];
+  if (intrinsic === "Ref") {
+    if (typeof arg !== "string")
+      return void 0;
+    if (arg.startsWith("AWS::")) {
+      const p = context?.pseudoParameters;
+      if (!p)
+        return void 0;
+      if (arg === "AWS::URLSuffix")
+        return p.urlSuffix;
+      if (arg === "AWS::Partition")
+        return p.partition;
+      if (arg === "AWS::Region")
+        return p.region;
+      if (arg === "AWS::AccountId")
+        return p.accountId;
+      return void 0;
+    }
+    const refResource = resources[arg];
+    if (refResource?.Type !== "AWS::ECR::Repository")
+      return void 0;
+    const stateEntry = context?.stateResources?.[arg];
+    if (!stateEntry)
+      return void 0;
+    return stateEntry.physicalId;
+  }
+  if (intrinsic === "Fn::GetAtt") {
+    let logicalId;
+    let attr;
+    if (Array.isArray(arg) && arg.length === 2 && typeof arg[0] === "string" && typeof arg[1] === "string") {
+      logicalId = arg[0];
+      attr = arg[1];
+    } else if (typeof arg === "string") {
+      const dot = arg.indexOf(".");
+      if (dot > 0 && dot < arg.length - 1) {
+        logicalId = arg.slice(0, dot);
+        attr = arg.slice(dot + 1);
+      }
+    }
+    if (!logicalId || !attr)
+      return void 0;
+    if (resources[logicalId]?.Type !== "AWS::ECR::Repository")
+      return void 0;
+    const cached = context?.stateResources?.[logicalId]?.attributes?.[attr];
+    if (typeof cached === "string" && cached.length > 0)
+      return cached;
+    return void 0;
+  }
+  if (intrinsic === "Fn::Split") {
+    if (!Array.isArray(arg) || arg.length !== 2)
+      return void 0;
+    const argArr = arg;
+    const delim = argArr[0];
+    if (typeof delim !== "string")
+      return void 0;
+    const src = resolveImageIntrinsicAny(argArr[1], resources, context);
+    if (typeof src !== "string")
+      return void 0;
+    return src.split(delim);
+  }
+  if (intrinsic === "Fn::Select") {
+    if (!Array.isArray(arg) || arg.length !== 2)
+      return void 0;
+    const argArr = arg;
+    const rawIndex = argArr[0];
+    let index;
+    if (typeof rawIndex === "number") {
+      index = rawIndex;
+    } else if (typeof rawIndex === "string" && /^-?\d+$/.test(rawIndex)) {
+      index = Number.parseInt(rawIndex, 10);
+    }
+    if (index === void 0 || !Number.isFinite(index))
+      return void 0;
+    const list = resolveImageIntrinsicAny(argArr[1], resources, context);
+    if (Array.isArray(list)) {
+      if (index < 0 || index >= list.length)
+        return void 0;
+      const picked = list[index];
+      if (typeof picked === "string")
+        return picked;
+      return void 0;
+    }
+    if (Array.isArray(argArr[1])) {
+      const listLiteral = argArr[1];
+      if (index < 0 || index >= listLiteral.length)
+        return void 0;
+      return resolveImageIntrinsic(listLiteral[index], resources, context);
+    }
+    return void 0;
+  }
+  if (intrinsic === "Fn::Join") {
+    if (!Array.isArray(arg) || arg.length !== 2)
+      return void 0;
+    const [delim, parts] = arg;
+    if (typeof delim !== "string" || !Array.isArray(parts))
+      return void 0;
+    const resolved = [];
+    for (const part of parts) {
+      const r = resolveImageIntrinsic(part, resources, context);
+      if (r === void 0)
+        return void 0;
+      resolved.push(r);
+    }
+    return resolved.join(delim);
+  }
+  if (intrinsic === "Fn::Sub") {
+    let template;
+    if (typeof arg === "string")
+      template = arg;
+    else if (Array.isArray(arg) && typeof arg[0] === "string")
+      template = arg[0];
+    if (template === void 0)
+      return void 0;
+    const out = substituteImagePlaceholders(template, resources, context);
+    if (out.includes("${"))
+      return void 0;
+    return out;
+  }
+  return void 0;
+}
+function substituteImagePlaceholders(flat, resources, context) {
+  if (!flat.includes("${"))
+    return flat;
+  return flat.replace(/\$\{([^}]+)\}/g, (full, key) => {
+    if (context?.pseudoParameters) {
+      if (key === "AWS::AccountId" && context.pseudoParameters.accountId) {
+        return context.pseudoParameters.accountId;
+      }
+      if (key === "AWS::Region" && context.pseudoParameters.region) {
+        return context.pseudoParameters.region;
+      }
+      if (key === "AWS::Partition" && context.pseudoParameters.partition) {
+        return context.pseudoParameters.partition;
+      }
+      if (key === "AWS::URLSuffix" && context.pseudoParameters.urlSuffix) {
+        return context.pseudoParameters.urlSuffix;
+      }
+    }
+    if (context?.stateResources) {
+      const dot = key.indexOf(".");
+      const logicalId = dot === -1 ? key : key.slice(0, dot);
+      const refResource = resources[logicalId];
+      const stateEntry = context.stateResources[logicalId];
+      if (refResource?.Type === "AWS::ECR::Repository" && stateEntry) {
+        if (dot === -1) {
+          return stateEntry.physicalId;
+        }
+        const attr = key.slice(dot + 1);
+        const cached = stateEntry.attributes?.[attr];
+        if (typeof cached === "string")
+          return cached;
+      }
+    }
+    return full;
+  });
+}
+
+// src/local/lambda-resolver.ts
 var LocalInvokeResolutionError = class _LocalInvokeResolutionError extends Error {
   constructor(message) {
     super(message);
@@ -70217,7 +70501,7 @@ function resolveLambdaTarget(target, stacks) {
       `Resource '${logicalId}' in ${stack.stackName} is ${resource.Type}, not a Lambda function. cdkd local invoke only works on AWS::Lambda::Function resources in v1.`
     );
   }
-  return extractLambdaProperties(stack, logicalId, resource);
+  return extractLambdaProperties(stack, logicalId, resource, resources);
 }
 function pickStack(parsed, stacks) {
   if (parsed.stackPattern === null) {
@@ -70240,12 +70524,12 @@ function pickStack(parsed, stacks) {
   }
   return matched[0];
 }
-function extractLambdaProperties(stack, logicalId, resource) {
+function extractLambdaProperties(stack, logicalId, resource, resources) {
   const props = resource.Properties ?? {};
   const memoryMb = typeof props["MemorySize"] === "number" ? props["MemorySize"] : 128;
   const timeoutSec = typeof props["Timeout"] === "number" ? props["Timeout"] : 3;
   const code = props["Code"] ?? {};
-  const imageUri = extractImageUri(code["ImageUri"]);
+  const imageUri = extractImageUri(code["ImageUri"], logicalId, stack.stackName, resources);
   if (imageUri !== void 0) {
     return extractImageLambdaProperties({
       stack,
@@ -70287,7 +70571,7 @@ function extractLambdaProperties(stack, logicalId, resource) {
     ...inlineCode !== void 0 && { inlineCode }
   };
 }
-function extractImageUri(value) {
+function extractImageUri(value, logicalId, stackName, resources) {
   if (typeof value === "string" && value.length > 0)
     return value;
   if (value && typeof value === "object" && !Array.isArray(value)) {
@@ -70297,6 +70581,24 @@ function extractImageUri(value) {
       return sub;
     if (Array.isArray(sub) && typeof sub[0] === "string")
       return sub[0];
+    if ("Fn::Join" in obj) {
+      const joinResolved = tryResolveImageFnJoin(value, resources, void 0);
+      if (joinResolved.kind === "resolved")
+        return joinResolved.uri;
+      if (joinResolved.kind === "needs-state") {
+        throw new LocalInvokeResolutionError(
+          `Lambda '${logicalId}' in ${stackName} references same-stack ECR repository '${joinResolved.repoLogicalId}' via Fn::Join. cdkd local invoke cannot resolve the repository URI without state \u2014 deploy the stack first (so cdkd records the repository physical id), rebuild via lambda.DockerImageCode.fromImageAsset, or pin a public image.`
+        );
+      }
+      if (joinResolved.kind === "unsupported-join") {
+        throw new LocalInvokeResolutionError(
+          `Lambda '${logicalId}' in ${stackName} has an unsupported Fn::Join Code.ImageUri shape: ${joinResolved.reason}. cdkd local invoke recognizes the canonical CDK 2.x lambda.DockerImageCode.fromEcr Fn::Join shape (delimiter "" with nested Fn::Select/Fn::Split over an ECR Repository Arn GetAtt + Ref to the repo).`
+        );
+      }
+      throw new LocalInvokeResolutionError(
+        `Lambda '${logicalId}' in ${stackName} has an Fn::Join Code.ImageUri that cdkd local invoke cannot resolve. The shape likely references AWS pseudo parameters (e.g. \${AWS::URLSuffix}) for an imported ECR repository. Workarounds: rebuild via lambda.DockerImageCode.fromImageAsset, or pin a fully-literal public image URI.`
+      );
+    }
   }
   return void 0;
 }
@@ -77268,42 +77570,6 @@ function classifyResolvedImage(uri) {
   }
   return { kind: "public", uri };
 }
-function substituteImagePlaceholders(flat, resources, context) {
-  if (!flat.includes("${"))
-    return flat;
-  return flat.replace(/\$\{([^}]+)\}/g, (full, key) => {
-    if (context?.pseudoParameters) {
-      if (key === "AWS::AccountId" && context.pseudoParameters.accountId) {
-        return context.pseudoParameters.accountId;
-      }
-      if (key === "AWS::Region" && context.pseudoParameters.region) {
-        return context.pseudoParameters.region;
-      }
-      if (key === "AWS::Partition" && context.pseudoParameters.partition) {
-        return context.pseudoParameters.partition;
-      }
-      if (key === "AWS::URLSuffix" && context.pseudoParameters.urlSuffix) {
-        return context.pseudoParameters.urlSuffix;
-      }
-    }
-    if (context?.stateResources) {
-      const dot = key.indexOf(".");
-      const logicalId = dot === -1 ? key : key.slice(0, dot);
-      const refResource = resources[logicalId];
-      const stateEntry = context.stateResources[logicalId];
-      if (refResource?.Type === "AWS::ECR::Repository" && stateEntry) {
-        if (dot === -1) {
-          return stateEntry.physicalId;
-        }
-        const attr = key.slice(dot + 1);
-        const cached = stateEntry.attributes?.[attr];
-        if (typeof cached === "string")
-          return cached;
-      }
-    }
-    return full;
-  });
-}
 function tryResolveImageGetAtt(raw, resources, context) {
   if (!raw || typeof raw !== "object")
     return void 0;
@@ -77355,228 +77621,6 @@ function extractImageString(value) {
   }
   return void 0;
 }
-function tryResolveImageFnJoin(raw, resources, context) {
-  if (!raw || typeof raw !== "object")
-    return { kind: "not-applicable" };
-  const obj = raw;
-  const arg = obj["Fn::Join"];
-  if (arg === void 0)
-    return { kind: "not-applicable" };
-  if (!Array.isArray(arg) || arg.length !== 2 || !Array.isArray(arg[1])) {
-    return { kind: "unsupported-join", reason: "Fn::Join must be [delimiter, [elements]]" };
-  }
-  const [delimiter, elements] = arg;
-  if (typeof delimiter !== "string") {
-    return {
-      kind: "unsupported-join",
-      reason: `Fn::Join delimiter must be a string, got ${typeof delimiter}`
-    };
-  }
-  const repoLogicalId = findEcrRepositoryRefInTree(elements, resources);
-  const stateResources = context?.stateResources;
-  if (repoLogicalId && !stateResources) {
-    return { kind: "needs-state", repoLogicalId };
-  }
-  const parts = [];
-  for (const element of elements) {
-    const r = resolveImageIntrinsic(element, resources, context);
-    if (r === void 0) {
-      if (!repoLogicalId)
-        return { kind: "not-applicable" };
-      return {
-        kind: "unsupported-join",
-        reason: "one or more Fn::Join elements could not be resolved"
-      };
-    }
-    parts.push(r);
-  }
-  return { kind: "resolved", uri: parts.join(delimiter) };
-}
-function findEcrRepositoryRefInTree(node, resources) {
-  if (node === null || node === void 0)
-    return void 0;
-  if (typeof node === "string" || typeof node === "number" || typeof node === "boolean") {
-    return void 0;
-  }
-  if (Array.isArray(node)) {
-    for (const item of node) {
-      const hit = findEcrRepositoryRefInTree(item, resources);
-      if (hit)
-        return hit;
-    }
-    return void 0;
-  }
-  if (typeof node !== "object")
-    return void 0;
-  const obj = node;
-  if (typeof obj["Ref"] === "string") {
-    const target = obj["Ref"];
-    if (resources[target]?.Type === "AWS::ECR::Repository")
-      return target;
-    return void 0;
-  }
-  const getAtt = obj["Fn::GetAtt"];
-  if (getAtt !== void 0) {
-    let lid;
-    if (Array.isArray(getAtt) && typeof getAtt[0] === "string")
-      lid = getAtt[0];
-    else if (typeof getAtt === "string")
-      lid = getAtt.split(".")[0];
-    if (lid && resources[lid]?.Type === "AWS::ECR::Repository")
-      return lid;
-    return void 0;
-  }
-  for (const value of Object.values(obj)) {
-    const hit = findEcrRepositoryRefInTree(value, resources);
-    if (hit)
-      return hit;
-  }
-  return void 0;
-}
-function resolveImageIntrinsic(node, resources, context) {
-  const v = resolveImageIntrinsicAny(node, resources, context);
-  if (typeof v === "string")
-    return v;
-  if (typeof v === "number" || typeof v === "boolean")
-    return String(v);
-  return void 0;
-}
-function resolveImageIntrinsicAny(node, resources, context) {
-  if (node === null || node === void 0)
-    return void 0;
-  if (typeof node === "string" || typeof node === "number" || typeof node === "boolean") {
-    return node;
-  }
-  if (Array.isArray(node)) {
-    return void 0;
-  }
-  if (typeof node !== "object")
-    return void 0;
-  const obj = node;
-  const keys = Object.keys(obj);
-  if (keys.length !== 1)
-    return void 0;
-  const intrinsic = keys[0];
-  const arg = obj[intrinsic];
-  if (intrinsic === "Ref") {
-    if (typeof arg !== "string")
-      return void 0;
-    if (arg.startsWith("AWS::")) {
-      const p = context?.pseudoParameters;
-      if (!p)
-        return void 0;
-      if (arg === "AWS::URLSuffix")
-        return p.urlSuffix;
-      if (arg === "AWS::Partition")
-        return p.partition;
-      if (arg === "AWS::Region")
-        return p.region;
-      if (arg === "AWS::AccountId")
-        return p.accountId;
-      return void 0;
-    }
-    const refResource = resources[arg];
-    if (refResource?.Type !== "AWS::ECR::Repository")
-      return void 0;
-    const stateEntry = context?.stateResources?.[arg];
-    if (!stateEntry)
-      return void 0;
-    return stateEntry.physicalId;
-  }
-  if (intrinsic === "Fn::GetAtt") {
-    let logicalId;
-    let attr;
-    if (Array.isArray(arg) && arg.length === 2 && typeof arg[0] === "string" && typeof arg[1] === "string") {
-      logicalId = arg[0];
-      attr = arg[1];
-    } else if (typeof arg === "string") {
-      const dot = arg.indexOf(".");
-      if (dot > 0 && dot < arg.length - 1) {
-        logicalId = arg.slice(0, dot);
-        attr = arg.slice(dot + 1);
-      }
-    }
-    if (!logicalId || !attr)
-      return void 0;
-    if (resources[logicalId]?.Type !== "AWS::ECR::Repository")
-      return void 0;
-    const cached = context?.stateResources?.[logicalId]?.attributes?.[attr];
-    if (typeof cached === "string" && cached.length > 0)
-      return cached;
-    return void 0;
-  }
-  if (intrinsic === "Fn::Split") {
-    if (!Array.isArray(arg) || arg.length !== 2)
-      return void 0;
-    const argArr = arg;
-    const delim = argArr[0];
-    if (typeof delim !== "string")
-      return void 0;
-    const src = resolveImageIntrinsicAny(argArr[1], resources, context);
-    if (typeof src !== "string")
-      return void 0;
-    return src.split(delim);
-  }
-  if (intrinsic === "Fn::Select") {
-    if (!Array.isArray(arg) || arg.length !== 2)
-      return void 0;
-    const argArr = arg;
-    const rawIndex = argArr[0];
-    let index;
-    if (typeof rawIndex === "number") {
-      index = rawIndex;
-    } else if (typeof rawIndex === "string" && /^-?\d+$/.test(rawIndex)) {
-      index = Number.parseInt(rawIndex, 10);
-    }
-    if (index === void 0 || !Number.isFinite(index))
-      return void 0;
-    const list = resolveImageIntrinsicAny(argArr[1], resources, context);
-    if (Array.isArray(list)) {
-      if (index < 0 || index >= list.length)
-        return void 0;
-      const picked = list[index];
-      if (typeof picked === "string")
-        return picked;
-      return void 0;
-    }
-    if (Array.isArray(argArr[1])) {
-      const listLiteral = argArr[1];
-      if (index < 0 || index >= listLiteral.length)
-        return void 0;
-      return resolveImageIntrinsic(listLiteral[index], resources, context);
-    }
-    return void 0;
-  }
-  if (intrinsic === "Fn::Join") {
-    if (!Array.isArray(arg) || arg.length !== 2)
-      return void 0;
-    const [delim, parts] = arg;
-    if (typeof delim !== "string" || !Array.isArray(parts))
-      return void 0;
-    const resolved = [];
-    for (const part of parts) {
-      const r = resolveImageIntrinsic(part, resources, context);
-      if (r === void 0)
-        return void 0;
-      resolved.push(r);
-    }
-    return resolved.join(delim);
-  }
-  if (intrinsic === "Fn::Sub") {
-    let template;
-    if (typeof arg === "string")
-      template = arg;
-    else if (Array.isArray(arg) && typeof arg[0] === "string")
-      template = arg[0];
-    if (template === void 0)
-      return void 0;
-    const out = substituteImagePlaceholders(template, resources, context);
-    if (out.includes("${"))
-      return void 0;
-    return out;
-  }
-  return void 0;
-}
 function parseVolume(raw, idx, taskLogicalId) {
   if (!raw || typeof raw !== "object") {
     throw new EcsTaskResolutionError(`Task '${taskLogicalId}' Volumes[${idx}] is not an object.`);
@@ -80264,7 +80308,7 @@ function reorderArgs(argv) {
 }
 async function main() {
   const program = new Command18();
-  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.91.0");
+  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.91.2");
   program.addCommand(createBootstrapCommand());
   program.addCommand(createSynthCommand());
   program.addCommand(createListCommand());