@cloudflare/workers-utils 0.37.0 → 0.38.1

package/dist/index.mjs

@@ -1,12 +1,12 @@
 export { MetricsRegistry } from './chunk-Z62CVNHJ.mjs';
 export { _forceColour, formatZodError } from './chunk-7AX24RFK.mjs';
-import { isRedirectedRawConfig, configFileName, formatConfigSnippet, getDurableObjectExports, getContainerNameToClassNameMap, parsePackageJSON, readFileSync, ParseError, parseJSON, APIError, dir, parseTOML, modify, applyEdits, format, dist_default, parseJSONC } from './chunk-V6JSHOVJ.mjs';
-export { APIError, ENVIRONMENT_TAG_PREFIX, INHERIT_SYMBOL, JSON_CONFIG_FORMATS, PATH_TO_DEPLOY_CONFIG, ParseError, SERVICE_TAG_PREFIX, configFileName, configFormat, experimental_readRawConfig, findWranglerConfig, formatConfigSnippet, getContainerDurableObjectClassNames, getContainerNameToClassNameMap, getDurableObjectExports, hasDurableObjectExports, indexLocation, isRedirectedConfig, parseByteSize, parseHumanDuration, parseJSON, parseJSONC, parseNonHyphenedUuid, parsePackageJSON, parseTOML, partitionExports, readFileSync, readFileSyncToBuffer, resolveContainerClassName, resolveWranglerConfigPath, searchLocation } from './chunk-V6JSHOVJ.mjs';
-import { assertNever } from './chunk-CDB2RWUW.mjs';
-export { DEFAULT_COMPAT_DATE, assertNever, constructWranglerConfig, mapWorkerMetadataBindings } from './chunk-CDB2RWUW.mjs';
+import { isRedirectedRawConfig, configFileName, formatConfigSnippet, getDurableObjectExports, getContainerNameToClassNameMap, parsePackageJSON, readFileSync, ParseError, parseJSON, APIError, CONTAINER_IMAGES_BINDING, dir, parseTOML, modify, applyEdits, format, dist_default, parseJSONC } from './chunk-T5JQYOMX.mjs';
+export { APIError, CONTAINER_IMAGES_BINDING, ENVIRONMENT_TAG_PREFIX, INHERIT_SYMBOL, JSON_CONFIG_FORMATS, PATH_TO_DEPLOY_CONFIG, ParseError, SERVICE_TAG_PREFIX, configFileName, configFormat, experimental_readRawConfig, findWranglerConfig, formatConfigSnippet, getContainerDurableObjectClassNames, getContainerNameToClassNameMap, getDurableObjectClassNameToUseSQLiteMap, getDurableObjectContainerApps, getDurableObjectExports, hasDurableObjectExports, indexLocation, isDurableObjectContainerApp, isRedirectedConfig, parseByteSize, parseHumanDuration, parseJSON, parseJSONC, parseNonHyphenedUuid, parsePackageJSON, parseTOML, partitionExports, readFileSync, readFileSyncToBuffer, resolveContainerClassName, resolveWranglerConfigPath, searchLocation, validateDurableObjectContainerApplications } from './chunk-T5JQYOMX.mjs';
+import { assertNever } from './chunk-KBTXSRPS.mjs';
+export { DEFAULT_COMPAT_DATE, assertNever, constructWranglerConfig, mapWorkerMetadataBindings } from './chunk-KBTXSRPS.mjs';
 export { NODEJS_COMPAT_DEFAULT_ON_DATE, NODEJS_COMPAT_V2_SWITCH_OVER_DATE, getTodaysCompatDate, isCompatDate, isNodejsCompatDefaultOn, resolveNodejsCompat, stripRedundantNodejsCompatFlags } from './chunk-C6O4ION7.mjs';
-import { getCloudflareEnv, getCloudflareApiBaseUrl, getTraceHeader, getCloudflaredPathFromEnv, getOutputFilePathFromEnv, getOutputFileDirectoryFromEnv, getCIOverrideName, getWranglerCacheDirFromEnv } from './chunk-XUGGRRBO.mjs';
-export { COMPLIANCE_REGION_CONFIG_PUBLIC, COMPLIANCE_REGION_CONFIG_UNKNOWN, getBrowserRenderingHeadfulFromEnv, getBuildConditionsFromEnv, getBuildPlatformFromEnv, getC3CommandFromEnv, getCIGeneratePreviewAlias, getCIMatchTag, getCIOverrideName, getCIOverrideNetworkModeHost, getCfFetchEnabledFromEnv, getCfFetchPathFromEnv, getCloudflareApiBaseUrl, getCloudflareApiEnvironmentFromEnv, getCloudflareComplianceRegion, getCloudflareEnv, getCloudflareIncludeProcessEnvFromEnv, getCloudflareLoadDevVarsFromDotEnv, getCloudflaredPathFromEnv, getComplianceRegionSubdomain, getD1ExtraLocationChoices, getDisableConfigWatching, getLocalExplorerEnabledFromEnv, getLocalObservabilityEnabledFromEnv, getNoSkillsUpdatePromptsFromEnv, getOpenNextDeployFromEnv, getOutputFileDirectoryFromEnv, getOutputFilePathFromEnv, getRegistryPath, getSanitizeLogs, getSubdomainMixedStateCheckDisabled, getTraceHeader, getWorkersCIBranchName, getWranglerCacheDirFromEnv, getWranglerHideBanner, getWranglerSendErrorReportsFromEnv, getWranglerSendMetricsFromEnv, isDoNotTrackEnabled } from './chunk-XUGGRRBO.mjs';
+import { getCloudflareEnv, getCloudflareContainerRegistry, getCloudflareApiBaseUrl, getTraceHeader, getCloudflaredPathFromEnv, getOutputFilePathFromEnv, getOutputFileDirectoryFromEnv, getCIOverrideName, getWranglerCacheDirFromEnv } from './chunk-IYSONYTF.mjs';
+export { COMPLIANCE_REGION_CONFIG_PUBLIC, COMPLIANCE_REGION_CONFIG_UNKNOWN, getBrowserRenderingHeadfulFromEnv, getBuildConditionsFromEnv, getBuildPlatformFromEnv, getC3CommandFromEnv, getCIGeneratePreviewAlias, getCIMatchTag, getCIOverrideName, getCIOverrideNetworkModeHost, getCfFetchEnabledFromEnv, getCfFetchPathFromEnv, getCloudflareApiBaseUrl, getCloudflareApiEnvironmentFromEnv, getCloudflareComplianceRegion, getCloudflareContainerRegistry, getCloudflareEnv, getCloudflareIncludeProcessEnvFromEnv, getCloudflareLoadDevVarsFromDotEnv, getCloudflaredPathFromEnv, getComplianceRegionSubdomain, getD1ExtraLocationChoices, getDisableConfigWatching, getLocalExplorerEnabledFromEnv, getLocalObservabilityEnabledFromEnv, getNoSkillsUpdatePromptsFromEnv, getOpenNextDeployFromEnv, getOutputFileDirectoryFromEnv, getOutputFilePathFromEnv, getRegistryPath, getSanitizeLogs, getSubdomainMixedStateCheckDisabled, getTraceHeader, getWorkersCIBranchName, getWranglerCacheDirFromEnv, getWranglerHideBanner, getWranglerSendErrorReportsFromEnv, getWranglerSendMetricsFromEnv, isDoNotTrackEnabled } from './chunk-IYSONYTF.mjs';
 import { dedent } from './chunk-MCNIGVAF.mjs';
 export { getBooleanEnvironmentVariableFactory, getDockerPath, getEnvironmentVariableFactory } from './chunk-3IYLA2JH.mjs';
 import { UserError, FatalError } from './chunk-WO2IAW6M.mjs';
@@ -18451,7 +18451,16 @@ function normalizeAndValidateEnvironment(diagnostics, configPath, rawEnv, isDisp
       // `name` is inheritable, so a named environment that doesn't redeclare it
       // still runs under the top level Worker name — fall back to it so the
       // generated container name isn't built from `undefined`.
-      validateContainerApp(envName, rawEnv.name ?? rawConfig?.name, configPath),
+      validateContainerApp(
+        envName,
+        rawEnv.name ?? rawConfig?.name,
+        configPath,
+        {
+          complianceConfig: {
+            compliance_region: rawEnv.compliance_region ?? topLevelEnv?.compliance_region
+          }
+        }
+      ),
       void 0
     ),
     send_email: notInheritable(
@@ -19903,6 +19912,15 @@ function validatePreviewsContainers(envName, configPath) {
   });
   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"`);
@@ -19937,6 +19955,85 @@ function validatePreviewsContainers(envName, configPath) {
   };
 }
 __name(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(validateDurableObjectContainerImages, "validateDurableObjectContainerImages");
 function validateContainerApp(envName, topLevelName, configPath, options = {}) {
   const { generateDefaultName = true } = options;
   return (diagnostics, field, value, config2) => {
@@ -19950,13 +20047,23 @@ 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,
@@ -19964,7 +20071,7 @@ function validateContainerApp(envName, topLevelName, configPath, options = {}) {
         containerAppOptional.name,
         "string"
       );
-      if (generateDefaultName && !containerAppOptional.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".`
@@ -19979,6 +20086,23 @@ function validateContainerApp(envName, topLevelName, configPath, options = {}) {
           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.`
@@ -20992,6 +21116,7 @@ var validateBindingsHaveUniqueNames = /* @__PURE__ */ __name((diagnostics, confi
     ])
   );
   bindingsGroupedByType["Secret"] = config2.secrets?.required ?? [];
+  bindingsGroupedByType["Container images"] = [CONTAINER_IMAGES_BINDING];
   const bindingsGroupedByName = {};
   for (const bindingType in bindingsGroupedByType) {
     const bindingNames = bindingsGroupedByType[bindingType];
@@ -24439,7 +24564,9 @@ ${allTailConsumers.map(({ service, streaming }) => {
     }
     log(
       `${containersTitle}
-${containers.map((c) => `- ${c.name} (${c.image})`).join("\n")}`
+${containers.map(
+        (container) => container.scheduling_policy === "durable_object" ? `- ${container.class_name} (durable_object)` : `- ${container.name} (${container.image})`
+      ).join("\n")}`
     );
     log("");
   }