@cloudflare/vitest-plugin 1.1.6 → 1.1.7

package/dist/pool/index.mjs

@@ -325,7 +325,7 @@ function createFatalError$1(message, isJson, options) {
 __name$3(createFatalError$1, "createFatalError");
 
 //#endregion
-//#region ../workers-utils/dist/chunk-V6JSHOVJ.mjs
+//#region ../workers-utils/dist/chunk-IQDQ5WRD.mjs
 function hasKnownExportType(entry) {
 	const type = entry?.type;
 	return type === "durable-object" || type === "worker";
@@ -352,6 +352,15 @@ function hasDurableObjectExports(exports$1) {
 	return Object.keys(getDurableObjectExports(exports$1)).length > 0;
 }
 __name$3(hasDurableObjectExports, "hasDurableObjectExports");
+var CONTAINER_IMAGES_BINDING = "EXPERIMENTAL_CLOUDFLARE_CONTAINER_IMAGES";
+function isDurableObjectContainerApp(container) {
+	return container.scheduling_policy === "durable_object";
+}
+__name$3(isDurableObjectContainerApp, "isDurableObjectContainerApp");
+function getDurableObjectContainerApps(containers) {
+	return Array.isArray(containers) ? containers.filter(isDurableObjectContainerApp) : [];
+}
+__name$3(getDurableObjectContainerApps, "getDurableObjectContainerApps");
 function getContainerNameToClassNameMap(exports$1) {
 	const containerNameToClassName = /* @__PURE__ */ new Map();
 	for (const [className, entry] of Object.entries(getDurableObjectExports(exports$1))) if ("container" in entry && typeof entry.container === "string" && !containerNameToClassName.has(entry.container)) containerNameToClassName.set(entry.container, className);
@@ -2736,8 +2745,8 @@ function formatConfigSnippet(snippet, configPath, formatted = true) {
 __name$3(formatConfigSnippet, "formatConfigSnippet");
 
 //#endregion
-//#region ../workers-utils/dist/chunk-CDB2RWUW.mjs
-var DEFAULT_COMPAT_DATE = "2026-09-08";
+//#region ../workers-utils/dist/chunk-S3ANQ67D.mjs
+var DEFAULT_COMPAT_DATE = "2026-09-10";
 function assertNever(_value) {}
 __name$3(assertNever, "assertNever");
 function mapWorkerMetadataBindings(bindings) {
@@ -3268,7 +3277,7 @@ function getGlobalWranglerCachePath() {
 __name$3(getGlobalWranglerCachePath, "getGlobalWranglerCachePath");
 
 //#endregion
-//#region ../workers-utils/dist/chunk-XUGGRRBO.mjs
+//#region ../workers-utils/dist/chunk-IYSONYTF.mjs
 var getC3CommandFromEnv = getEnvironmentVariableFactory({
 	variableName: "WRANGLER_C3_COMMAND",
 	defaultValue: /* @__PURE__ */ __name$3(() => "create cloudflare", "defaultValue")
@@ -3296,6 +3305,7 @@ var getCloudflareApiEnvironmentFromEnv = getEnvironmentVariableFactory({
 	choices: ["production", "staging"]
 });
 var COMPLIANCE_REGION_CONFIG_PUBLIC = { compliance_region: "public" };
+var COMPLIANCE_REGION_CONFIG_UNKNOWN = { compliance_region: void 0 };
 var getCloudflareComplianceRegionFromEnv = getEnvironmentVariableFactory({
 	variableName: "CLOUDFLARE_COMPLIANCE_REGION",
 	choices: ["public", "fedramp_high"]
@@ -3318,6 +3328,11 @@ function getComplianceRegionSubdomain(complianceConfig) {
 	return getCloudflareComplianceRegion(complianceConfig) === "fedramp_high" ? ".fed" : "";
 }
 __name$3(getComplianceRegionSubdomain, "getComplianceRegionSubdomain");
+function getCloudflareContainerRegistry(complianceConfig = COMPLIANCE_REGION_CONFIG_UNKNOWN) {
+	if (process.env.CLOUDFLARE_CONTAINER_REGISTRY) return process.env.CLOUDFLARE_CONTAINER_REGISTRY;
+	return `${process.env.WRANGLER_API_ENVIRONMENT === "staging" ? "staging." : ""}registry${getComplianceRegionSubdomain(complianceConfig)}.cloudflare.com`;
+}
+__name$3(getCloudflareContainerRegistry, "getCloudflareContainerRegistry");
 function getStagingSubdomain() {
 	return getCloudflareApiEnvironmentFromEnv() === "staging" ? ".staging" : "";
 }
@@ -42054,7 +42069,7 @@ function normalizeAndValidateEnvironment(diagnostics, configPath, rawEnv, isDisp
 		exports: inheritable(diagnostics, topLevelEnv, rawEnv, "exports", validateExports, {}),
 		kv_namespaces: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "kv_namespaces", validateBindingArray(envName, validateKVBinding), []),
 		cloudchamber: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "cloudchamber", validateCloudchamberConfig, {}),
-		containers: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "containers", validateContainerApp(envName, rawEnv.name ?? rawConfig?.name, configPath), void 0),
+		containers: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "containers", validateContainerApp(envName, rawEnv.name ?? rawConfig?.name, configPath, { complianceConfig: { compliance_region: rawEnv.compliance_region ?? topLevelEnv?.compliance_region } }), void 0),
 		send_email: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "send_email", validateBindingArray(envName, validateSendEmailBinding), []),
 		queues: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "queues", validateQueues(envName), {
 			producers: [],
@@ -42675,6 +42690,11 @@ function validatePreviewsContainers(envName, configPath) {
 	const innerValidator = validateContainerApp(envName, void 0, configPath, { generateDefaultName: false });
 	return (diagnostics, field, value, config2) => {
 		if (Array.isArray(value)) {
+			const durableObjectPolicyFields = [...value.entries()].filter(([, entry]) => entry && typeof entry === "object" && entry.scheduling_policy === "durable_object").map(([index]) => `"${field}[${index}].scheduling_policy"`);
+			if (durableObjectPolicyFields.length > 0) {
+				diagnostics.errors.push(`${durableObjectPolicyFields.join(", ")} cannot be "durable_object". Durable Object-managed Containers are configured only in the top-level "containers" array.`);
+				return false;
+			}
 			const nameFields = [...value.entries()].filter(([, entry]) => entry && typeof entry === "object" && "name" in entry).map(([index]) => `"${field}[${index}].name"`);
 			if (nameFields.length > 0) {
 				diagnostics.errors.push(`${nameFields.join(", ")} cannot be set. A preview container's application name is generated from the worker name, preview slug, and Durable Object class name, so that separate previews of the same Worker do not collide. Remove it and identify the container with "class_name".`);
@@ -42699,6 +42719,63 @@ function validatePreviewsContainers(envName, configPath) {
 	};
 }
 __name$3(validatePreviewsContainers, "validatePreviewsContainers");
+function validateDurableObjectContainerImages(diagnostics, field, images, complianceConfig) {
+	if (images === void 0) return true;
+	if (typeof images !== "object" || images === null || Array.isArray(images) || Object.keys(images).length === 0) {
+		diagnostics.errors.push(`"${field}" must be a non-empty object when present.`);
+		return false;
+	}
+	let valid = true;
+	const entries = Object.entries(images);
+	if (entries.length > 100) {
+		diagnostics.errors.push(`"${field}" must contain at most 100 images.`);
+		valid = false;
+	}
+	for (const [imageName, imageValue] of entries) {
+		const imageField = `${field}.${imageName}`;
+		if (imageName.length === 0 || imageName.length > 128) {
+			diagnostics.errors.push(`"${field}" image names must be between 1 and 128 characters.`);
+			valid = false;
+		}
+		if (typeof imageValue !== "object" || imageValue === null || Array.isArray(imageValue)) {
+			diagnostics.errors.push(`"${imageField}" must be an object with either a "dockerfile" or "image" field.`);
+			valid = false;
+			continue;
+		}
+		const image = imageValue;
+		const hasDockerfile = image.dockerfile !== void 0;
+		const hasImage = image.image !== void 0;
+		if (hasDockerfile === hasImage) {
+			diagnostics.errors.push(`"${imageField}" must specify exactly one of "dockerfile" or "image".`);
+			valid = false;
+		}
+		if (hasDockerfile && (typeof image.dockerfile !== "string" || image.dockerfile.length === 0)) {
+			diagnostics.errors.push(`"${imageField}.dockerfile" must be a non-empty string.`);
+			valid = false;
+		}
+		if (hasImage && (typeof image.image !== "string" || image.image.length === 0)) {
+			diagnostics.errors.push(`"${imageField}.image" must be a non-empty string.`);
+			valid = false;
+		}
+		if (typeof image.image === "string" && image.image.length > 0) {
+			const registry2 = getCloudflareContainerRegistry(complianceConfig);
+			const prefix = `${registry2}/`;
+			const reference = image.image.slice(prefix.length);
+			const digestReference = reference.match(/^[a-z0-9]+(?:(?:[._]|__|-+)[a-z0-9]+)*(?:\/[a-z0-9]+(?:(?:[._]|__|-+)[a-z0-9]+)*)+@sha256:[a-f0-9]{64}$/);
+			if (!image.image.startsWith(prefix) || digestReference?.[0] !== reference) {
+				diagnostics.errors.push(`"${imageField}.image" must be a digest-pinned image in the managed registry, in the form "${registry2}/<account-id>/<repository>@sha256:<64 lowercase hex characters>".`);
+				valid = false;
+			}
+		}
+		const unsupportedFields = Object.keys(image).filter((property) => property !== "dockerfile" && property !== "image");
+		if (unsupportedFields.length > 0) {
+			diagnostics.errors.push(`Unexpected fields found in ${imageField} field: ${unsupportedFields.map((property) => `"${property}"`).join(", ")}`);
+			valid = false;
+		}
+	}
+	return valid;
+}
+__name$3(validateDurableObjectContainerImages, "validateDurableObjectContainerImages");
 function validateContainerApp(envName, topLevelName, configPath, options = {}) {
 	const { generateDefaultName = true } = options;
 	return (diagnostics, field, value, config2) => {
@@ -42708,15 +42785,30 @@ function validateContainerApp(envName, topLevelName, configPath, options = {}) {
 			return false;
 		}
 		for (const containerAppOptional of value) {
-			validateOptionalProperty(diagnostics, field, "class_name", containerAppOptional.class_name, "string");
+			const isDurableObjectManaged = containerAppOptional.scheduling_policy === "durable_object";
+			const hasValidDurableObjectClassName = typeof containerAppOptional.class_name === "string" && containerAppOptional.class_name.length > 0;
+			if (isDurableObjectManaged) {
+				if (!hasValidDurableObjectClassName) diagnostics.errors.push(`"containers.class_name" must be a non-empty string when "containers.scheduling_policy" is "durable_object".`);
+			} else validateOptionalProperty(diagnostics, field, "class_name", containerAppOptional.class_name, "string");
 			validateOptionalProperty(diagnostics, field, "name", containerAppOptional.name, "string");
-			if (generateDefaultName && !containerAppOptional.name) if (containerAppOptional.class_name === void 0) diagnostics.errors.push(`"containers.name" is required when "containers.class_name" is not defined, because there is no class name to derive a default name from. Either name this container and reference it from a Durable Object's \`exports\` entry, or set "containers.class_name".`);
+			if (generateDefaultName && !containerAppOptional.name && (!isDurableObjectManaged || hasValidDurableObjectClassName)) if (containerAppOptional.class_name === void 0) diagnostics.errors.push(`"containers.name" is required when "containers.class_name" is not defined, because there is no class name to derive a default name from. Either name this container and reference it from a Durable Object's \`exports\` entry, or set "containers.class_name".`);
 			else if (!topLevelName) diagnostics.errors.push(`Must have either a top level "name" and "containers.class_name" field defined, or have field "containers.name" defined.`);
 			else {
 				let name = `${topLevelName}-${containerAppOptional.class_name}`;
 				name += config2 === void 0 ? "" : `-${envName}`;
 				containerAppOptional.name = name.toLowerCase().replace(/ /g, "-");
 			}
+			if (isDurableObjectManaged) {
+				validateDurableObjectContainerImages(diagnostics, `${field}.images`, containerAppOptional.images, options.complianceConfig);
+				const unsupportedFields = Object.keys(containerAppOptional).filter((key) => ![
+					"name",
+					"class_name",
+					"scheduling_policy",
+					"images"
+				].includes(key));
+				if (unsupportedFields.length > 0) diagnostics.errors.push(`Unsupported fields for Durable Object-managed Containers in ${field}: ${unsupportedFields.map((key) => `"${key}"`).join(",")}. Only "name", "class_name", "scheduling_policy", and "images" are supported.`);
+				continue;
+			}
 			if (!containerAppOptional.configuration?.image && !containerAppOptional.image) diagnostics.errors.push(`"containers.image" field must be defined for each container app. This should be the path to your Dockerfile or an image URI pointing to the Cloudflare registry.`);
 			if ("configuration" in containerAppOptional) {
 				diagnostics.warnings.push(`"containers.configuration" is deprecated. Use top level "containers" fields instead. "configuration.image" should be "image", limits should be set via "instance_type".`);
@@ -43291,6 +43383,7 @@ var validateBindingsHaveUniqueNames = /* @__PURE__ */ __name$3((diagnostics, con
 	const bindingNamesArray = Object.entries(friendlyBindingNames);
 	const bindingsGroupedByType = Object.fromEntries(bindingNamesArray.map(([bindingType, binding]) => [binding, getBindingNames(bindingType === "queues" ? config2[bindingType]?.producers : config2[bindingType])]));
 	bindingsGroupedByType["Secret"] = config2.secrets?.required ?? [];
+	bindingsGroupedByType["Container images"] = [CONTAINER_IMAGES_BINDING];
 	const bindingsGroupedByName = {};
 	for (const bindingType in bindingsGroupedByType) {
 		const bindingNames = bindingsGroupedByType[bindingType];
@@ -45327,7 +45420,7 @@ ${allTailConsumers.map(({ service, streaming }) => {
 		let containersTitle = "The following containers are available:";
 		if (context.name && isMultiWorker) containersTitle = `The following containers are available from ${source_default.blue(context.name)}:`;
 		log$2(`${containersTitle}
-${containers.map((c$1) => `- ${c$1.name} (${c$1.image})`).join("\n")}`);
+${containers.map((container) => container.scheduling_policy === "durable_object" ? `- ${container.class_name} (durable_object)` : `- ${container.name} (${container.image})`).join("\n")}`);
 		log$2("");
 	}
 	if (context.unsafeMetadata) {
@@ -59847,7 +59940,7 @@ var require_command_exists = /* @__PURE__ */ __commonJS$2({ "../../node_modules/
 }) });
 
 //#endregion
-//#region ../deploy-helpers/dist/chunk-PXVCTRCA.mjs
+//#region ../deploy-helpers/dist/chunk-3G6JZQDH.mjs
 var import_undici$1 = require_undici();
 var import_command_exists = require_command_exists();
 function handleUnsafeCapnp(capnp) {
@@ -60371,7 +60464,8 @@ function createWorkerUploadForm(worker, bindings, options) {
 		bindings: metadataBindings,
 		containers: worker.containers === void 0 ? void 0 : worker.containers.map((c$1) => ({
 			...c$1.name !== void 0 && { name: c$1.name },
-			...c$1.class_name !== void 0 && { class_name: c$1.class_name }
+			...c$1.class_name !== void 0 && { class_name: c$1.class_name },
+			...c$1.images !== void 0 && { images: c$1.images }
 		})),
 		...compatibility_date && { compatibility_date },
 		...compatibility_flags && { compatibility_flags },
@@ -60406,7 +60500,7 @@ __name$1(createWorkerUploadForm, "createWorkerUploadForm");
 //#endregion
 //#region ../remote-bindings/dist/index.mjs
 var import_undici = require_undici();
-var version = "0.0.21";
+var version = "0.0.22";
 var NoDefaultValueProvided = class extends UserError$1 {
 	constructor() {
 		super("This command cannot be run in a non-interactive context", { telemetryMessage: "remote bindings prompt default missing" });