@go-to-k/cdkd 0.221.5 → 0.221.7

package/dist/{deploy-engine-DlXVqVTW.js → deploy-engine-cBd5QvfA.js}

@@ -3973,8 +3973,9 @@ var TemplateParser = class {
 					Object.values(varMap).forEach((v) => this.extractRefsFromValue(v, dependencies));
 				}
 			}
-			if (body !== void 0) for (const match of body.matchAll(/\$\{([^}]+)\}/g)) {
-				const placeholder = match[1];
+			if (body !== void 0) for (const match of body.matchAll(/\$\{(!)?([^}]+)\}/g)) {
+				if (match[1] === "!") continue;
+				const placeholder = match[2];
 				if (!placeholder) continue;
 				const dot = placeholder.indexOf(".");
 				const name = dot >= 0 ? placeholder.slice(0, dot) : placeholder;
@@ -5685,8 +5686,13 @@ var IntrinsicFunctionResolver = class {
 	async resolveGetAtt(getAtt, context) {
 		let logicalId;
 		let attributeName;
-		if (Array.isArray(getAtt)) [logicalId, attributeName] = getAtt;
-		else {
+		if (Array.isArray(getAtt)) {
+			const [rawLogicalId, rawAttributeName] = getAtt;
+			logicalId = rawLogicalId;
+			const resolvedAttributeName = await this.resolveValue(rawAttributeName, context);
+			if (typeof resolvedAttributeName !== "string") throw new Error(`Fn::GetAtt attribute name for ${logicalId} must resolve to a string, got ${typeof resolvedAttributeName}: ${stringifyValue(resolvedAttributeName)}`);
+			attributeName = resolvedAttributeName;
+		} else {
 			const parts = getAtt.split(".");
 			if (parts.length !== 2) throw new Error(`Invalid Fn::GetAtt format: ${getAtt}`);
 			[logicalId, attributeName] = parts;
@@ -5976,10 +5982,24 @@ var IntrinsicFunctionResolver = class {
 			for (const [key, val] of Object.entries(variables)) variables[key] = await this.resolveValue(val, context);
 		} else template = subArgs;
 		const replacements = [];
-		const matches = template.matchAll(/\$\{([^}]+)\}/g);
+		const matches = template.matchAll(/\$\{(!)?([^}]*)\}/g);
 		for (const match of matches) {
-			const varNameStr = match[1];
-			if (!varNameStr) continue;
+			const isEscaped = match[1] === "!";
+			const varNameStr = match[2];
+			if (isEscaped) {
+				replacements.push({
+					match: match[0],
+					replacement: `\${${varNameStr ?? ""}}`
+				});
+				continue;
+			}
+			if (!varNameStr) {
+				replacements.push({
+					match: match[0],
+					replacement: match[0]
+				});
+				continue;
+			}
 			let replacement;
 			if (varNameStr in variables) replacement = String(variables[varNameStr]);
 			else {
@@ -6007,8 +6027,11 @@ var IntrinsicFunctionResolver = class {
 				replacement
 			});
 		}
-		let result = template;
-		for (const { match, replacement } of replacements) result = result.replace(match, replacement);
+		let cursor = 0;
+		let result = template.replace(/\$\{(!)?([^}]*)\}/g, (whole) => {
+			const entry = replacements[cursor++];
+			return entry ? entry.replacement : whole;
+		});
 		if (result.includes("{{resolve:")) result = await this.resolveDynamicReferences(result);
 		this.logger.debug(`Resolved Fn::Sub: ${result}`);
 		return result;
@@ -6383,20 +6406,39 @@ var IntrinsicFunctionResolver = class {
 	* Resolve Fn::FindInMap intrinsic function
 	*
 	* Fn::FindInMap: [MapName, TopLevelKey, SecondLevelKey]
-	* Looks up a value in the Mappings section of the template
+	* Fn::FindInMap: [MapName, TopLevelKey, SecondLevelKey, { DefaultValue: <value> }]
+	* Looks up a value in the Mappings section of the template. When the optional
+	* 4th argument supplies a `DefaultValue` and the requested top-level OR
+	* second-level key is absent, CloudFormation returns the DefaultValue instead
+	* of failing; cdkd mirrors that here. Without a DefaultValue the missing-key
+	* cases throw (backward compatible).
 	*/
 	async resolveFindInMap(findInMapArgs, context) {
-		const [rawMapName, rawTopLevelKey, rawSecondLevelKey] = findInMapArgs;
+		const [rawMapName, rawTopLevelKey, rawSecondLevelKey, rawOptions] = findInMapArgs;
 		const mapName = String(await this.resolveValue(rawMapName, context));
 		const topLevelKey = String(await this.resolveValue(rawTopLevelKey, context));
 		const secondLevelKey = String(await this.resolveValue(rawSecondLevelKey, context));
+		const hasDefaultValue = typeof rawOptions === "object" && rawOptions !== null && !Array.isArray(rawOptions) && "DefaultValue" in rawOptions;
+		const resolveDefault = () => this.resolveValue(rawOptions["DefaultValue"], context);
 		const mappings = context.template.Mappings;
-		if (!mappings) throw new Error(`Fn::FindInMap: no Mappings section found in template`);
-		const map = mappings[mapName];
-		if (!map) throw new Error(`Fn::FindInMap: mapping '${mapName}' not found in Mappings section`);
+		const map = mappings?.[mapName];
+		if (!mappings) {
+			if (hasDefaultValue) return await resolveDefault();
+			throw new Error(`Fn::FindInMap: no Mappings section found in template`);
+		}
+		if (!map) {
+			if (hasDefaultValue) return await resolveDefault();
+			throw new Error(`Fn::FindInMap: mapping '${mapName}' not found in Mappings section`);
+		}
 		const topLevel = map[topLevelKey];
-		if (!topLevel || typeof topLevel !== "object") throw new Error(`Fn::FindInMap: top-level key '${topLevelKey}' not found in mapping '${mapName}'`);
-		if (!(secondLevelKey in topLevel)) throw new Error(`Fn::FindInMap: second-level key '${secondLevelKey}' not found in mapping '${mapName}' -> '${topLevelKey}'`);
+		if (!topLevel || typeof topLevel !== "object") {
+			if (hasDefaultValue) return await resolveDefault();
+			throw new Error(`Fn::FindInMap: top-level key '${topLevelKey}' not found in mapping '${mapName}'`);
+		}
+		if (!(secondLevelKey in topLevel)) {
+			if (hasDefaultValue) return await resolveDefault();
+			throw new Error(`Fn::FindInMap: second-level key '${secondLevelKey}' not found in mapping '${mapName}' -> '${topLevelKey}'`);
+		}
 		const result = topLevel[secondLevelKey];
 		this.logger.debug(`Resolved Fn::FindInMap: ${mapName}.${topLevelKey}.${secondLevelKey} -> ${JSON.stringify(result)}`);
 		return result;
@@ -12890,4 +12932,4 @@ var DeployEngine = class {
 
 //#endregion
 export { clearBucketRegionCache as $, AssetPublisher as A, getLegacyStateBucketName as B, DiffCalculator as C, S3StateBackend as D, LockManager as E, getDockerCmd as F, resolveStateBucketWithDefaultAndSource as G, resolveCaptureObservedState as H, runDockerForeground as I, CFN_TEMPLATE_URL_LIMIT as J, warnDeprecatedNoPrefixCliFlag as K, runDockerStreaming as L, WorkGraph as M, buildDockerImage as N, rebuildClientForBucketRegion as O, formatDockerLoginError as P, AssemblyReader as Q, Synthesizer as R, applyRoleArnIfSet as S, TemplateParser as T, resolveSkipPrefix as U, resolveApp as V, resolveStateBucketWithDefault as W, findLargeInlineResources as X, MIGRATE_TMP_PREFIX as Y, uploadCfnTemplate as Z, collectInlinePolicyNamesManagedBySiblings as _, withRetry as a, CloudControlProvider as b, extractDeploymentEventError as c, cyan as d, resolveBucketRegion as et, gray as f, IAMRoleProvider as g, yellow as h, withResourceDeadline as i, stringifyValue as j, shouldRetainResource as k, formatResourceLine as l, red as m, DEFAULT_RESOURCE_WARN_AFTER_MS as n, isRetryableTransientError as o, green as p, CFN_TEMPLATE_BODY_LIMIT as q, DeployEngine as r, IMPLICIT_DELETE_DEPENDENCIES as s, DEFAULT_RESOURCE_TIMEOUT_MS as t, bold as u, ProviderRegistry as v, DagBuilder as w, IntrinsicFunctionResolver as x, findActionableSilentDrops as y, getDefaultStateBucketName as z };
-//# sourceMappingURL=deploy-engine-DlXVqVTW.js.map
+//# sourceMappingURL=deploy-engine-cBd5QvfA.js.map