@cloudflare/workers-utils 0.38.0 → 0.39.0

package/dist/index.mjs

@@ -1,9 +1,9 @@
 export { MetricsRegistry } from './chunk-Z62CVNHJ.mjs';
 export { _forceColour, formatZodError } from './chunk-7AX24RFK.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-IQDQ5WRD.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, getDurableObjectContainerApps, getDurableObjectExports, hasDurableObjectExports, indexLocation, isDurableObjectContainerApp, isRedirectedConfig, parseByteSize, parseHumanDuration, parseJSON, parseJSONC, parseNonHyphenedUuid, parsePackageJSON, parseTOML, partitionExports, readFileSync, readFileSyncToBuffer, resolveContainerClassName, resolveWranglerConfigPath, searchLocation } from './chunk-IQDQ5WRD.mjs';
-import { assertNever } from './chunk-S3ANQ67D.mjs';
-export { DEFAULT_COMPAT_DATE, assertNever, constructWranglerConfig, mapWorkerMetadataBindings } from './chunk-S3ANQ67D.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-JGKSDUFK.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, getResolvedDurableObjectContainerApps, hasDurableObjectExports, indexLocation, isDurableObjectContainerApp, isRedirectedConfig, parseByteSize, parseHumanDuration, parseJSON, parseJSONC, parseNonHyphenedUuid, parsePackageJSON, parseTOML, partitionExports, readFileSync, readFileSyncToBuffer, resolveContainerClassName, resolveWranglerConfigPath, searchLocation, validateDurableObjectContainerApplications } from './chunk-JGKSDUFK.mjs';
+import { assertNever } from './chunk-5H6GBNUC.mjs';
+export { DEFAULT_COMPAT_DATE, assertNever, constructWranglerConfig, mapWorkerMetadataBindings } from './chunk-5H6GBNUC.mjs';
 export { NODEJS_COMPAT_DEFAULT_ON_DATE, NODEJS_COMPAT_V2_SWITCH_OVER_DATE, getTodaysCompatDate, isCompatDate, isNodejsCompatDefaultOn, resolveNodejsCompat, stripRedundantNodejsCompatFlags } from './chunk-C6O4ION7.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';
@@ -1692,7 +1692,6 @@ var defaultWranglerConfig = {
   vectorize: [],
   ai_search_namespaces: [],
   ai_search: [],
-  websearch: void 0,
   agent_memory: [],
   hyperdrive: [],
   workflows: [],
@@ -17214,7 +17213,6 @@ var friendlyBindingNames = {
   vectorize: "Vectorize Index",
   ai_search_namespaces: "AI Search Namespace",
   ai_search: "AI Search Instance",
-  websearch: "Web Search",
   agent_memory: "Agent Memory",
   hyperdrive: "Hyperdrive Config",
   r2_buckets: "R2 Bucket",
@@ -17268,7 +17266,6 @@ var bindingTypeFriendlyNames = {
   vectorize: "Vectorize Index",
   ai_search_namespace: "AI Search Namespace",
   ai_search: "AI Search Instance",
-  websearch: "Web Search",
   agent_memory: "Agent Memory",
   hyperdrive: "Hyperdrive Config",
   service: "Worker",
@@ -18543,16 +18540,6 @@ function normalizeAndValidateEnvironment(diagnostics, configPath, rawEnv, isDisp
       validateBindingArray(envName, validateAISearchBinding),
       []
     ),
-    websearch: notInheritable(
-      diagnostics,
-      topLevelEnv,
-      rawConfig,
-      rawEnv,
-      envName,
-      "websearch",
-      validateNamedSimpleBinding(envName),
-      void 0
-    ),
     agent_memory: notInheritable(
       diagnostics,
       topLevelEnv,
@@ -19805,7 +19792,6 @@ var validateUnsafeBinding = /* @__PURE__ */ __name((diagnostics, field, value) =
       "ai",
       "ai_search_namespace",
       "ai_search",
-      "websearch",
       "agent_memory",
       "kv_namespace",
       "durable_object_namespace",
@@ -20021,8 +20007,25 @@ function validateDurableObjectContainerImages(diagnostics, field, images, compli
         valid = false;
       }
     }
+    const isDockerfileBuild = hasDockerfile && !hasImage;
+    if (isDockerfileBuild) {
+      if (image.build_context !== void 0 && (typeof image.build_context !== "string" || image.build_context.length === 0)) {
+        diagnostics.errors.push(
+          `"${imageField}.build_context" must be a non-empty string.`
+        );
+        valid = false;
+      }
+      if (image.build_vars !== void 0 && (typeof image.build_vars !== "object" || image.build_vars === null || Array.isArray(image.build_vars) || Object.values(image.build_vars).some(
+        (value) => typeof value !== "string"
+      ))) {
+        diagnostics.errors.push(
+          `"${imageField}.build_vars" must be an object with string values.`
+        );
+        valid = false;
+      }
+    }
     const unsupportedFields = Object.keys(image).filter(
-      (property) => property !== "dockerfile" && property !== "image"
+      (property) => property !== "dockerfile" && property !== "image" && !(isDockerfileBuild && (property === "build_context" || property === "build_vars"))
     );
     if (unsupportedFields.length > 0) {
       diagnostics.errors.push(
@@ -20034,6 +20037,32 @@ function validateDurableObjectContainerImages(diagnostics, field, images, compli
   return valid;
 }
 __name(validateDurableObjectContainerImages, "validateDurableObjectContainerImages");
+function validateDurableObjectContainerUnsafe(diagnostics, field, value) {
+  if (value === void 0) {
+    return;
+  }
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    diagnostics.errors.push(`"${field}" should be an object.`);
+    return;
+  }
+  const unsafe = value;
+  const configuration = unsafe.configuration;
+  if (Object.keys(unsafe).some((key) => key !== "configuration") || configuration !== void 0 && (typeof configuration !== "object" || configuration === null || Array.isArray(configuration) || Object.keys(configuration).some((key) => key !== "experimental_flags"))) {
+    diagnostics.errors.push(
+      `Only "${field}.configuration.experimental_flags" is supported for Durable Object-managed Containers.`
+    );
+    return;
+  }
+  if (configuration !== void 0) {
+    const flags = configuration.experimental_flags;
+    if (flags !== void 0 && (!Array.isArray(flags) || flags.some((flag) => typeof flag !== "string"))) {
+      diagnostics.errors.push(
+        `"${field}.configuration.experimental_flags" should be an array of strings.`
+      );
+    }
+  }
+}
+__name(validateDurableObjectContainerUnsafe, "validateDurableObjectContainerUnsafe");
 function validateContainerApp(envName, topLevelName, configPath, options = {}) {
   const { generateDefaultName = true } = options;
   return (diagnostics, field, value, config2) => {
@@ -20049,19 +20078,16 @@ function validateContainerApp(envName, topLevelName, configPath, options = {}) {
     for (const containerAppOptional of value) {
       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,
+        "class_name",
+        containerAppOptional.class_name,
+        "string"
+      );
+      if (isDurableObjectManaged && containerAppOptional.class_name === "") {
+        diagnostics.errors.push(
+          `"containers.class_name" must be a non-empty string when specified for a Durable Object-managed Container.`
         );
       }
       validateOptionalProperty(
@@ -20071,7 +20097,7 @@ function validateContainerApp(envName, topLevelName, configPath, options = {}) {
         containerAppOptional.name,
         "string"
       );
-      if (generateDefaultName && !containerAppOptional.name && (!isDurableObjectManaged || hasValidDurableObjectClassName)) {
+      if (generateDefaultName && !containerAppOptional.name && (!isDurableObjectManaged || containerAppOptional.class_name === void 0 || 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".`
@@ -20093,12 +20119,35 @@ function validateContainerApp(envName, topLevelName, configPath, options = {}) {
           containerAppOptional.images,
           options.complianceConfig
         );
+        validateContainerObservability(
+          diagnostics,
+          `${field}.observability`,
+          containerAppOptional.observability,
+          config2
+        );
+        if (containerAppOptional.observability?.target_instance_count !== void 0 || containerAppOptional.observability?.target_instance_percentage !== void 0) {
+          diagnostics.errors.push(
+            `"${field}.observability" only supports enabling or disabling logs for Durable Object-managed Containers; instance targeting is not supported.`
+          );
+        }
+        validateDurableObjectContainerUnsafe(
+          diagnostics,
+          `${field}.unsafe`,
+          containerAppOptional.unsafe
+        );
         const unsupportedFields = Object.keys(containerAppOptional).filter(
-          (key) => !["name", "class_name", "scheduling_policy", "images"].includes(key)
+          (key) => ![
+            "name",
+            "class_name",
+            "scheduling_policy",
+            "images",
+            "observability",
+            "unsafe"
+          ].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.`
+            `Unsupported fields for Durable Object-managed Containers in ${field}: ${unsupportedFields.map((key) => `"${key}"`).join(",")}. Only "name", "class_name", "scheduling_policy", "images", "observability", and restricted "unsafe" settings are supported.`
           );
         }
         continue;
@@ -21940,6 +21989,8 @@ var validatePreviewsConfig = /* @__PURE__ */ __name((envName, configPath) => (di
     "d1_databases",
     "r2_buckets",
     "vectorize",
+    "ai_search_namespaces",
+    "ai_search",
     "hyperdrive",
     "services",
     "analytics_engine_datasets",
@@ -22026,6 +22077,18 @@ var validatePreviewsConfig = /* @__PURE__ */ __name((envName, configPath) => (di
     previews.vectorize,
     void 0
   ) && isValid;
+  isValid = validateBindingArray(envName, validateAISearchNamespaceBinding)(
+    diagnostics,
+    `${field}.ai_search_namespaces`,
+    previews.ai_search_namespaces,
+    void 0
+  ) && isValid;
+  isValid = validateBindingArray(envName, validateAISearchBinding)(
+    diagnostics,
+    `${field}.ai_search`,
+    previews.ai_search,
+    void 0
+  ) && isValid;
   isValid = validateBindingArray(envName, validateHyperdriveBinding)(
     diagnostics,
     `${field}.hyperdrive`,
@@ -23181,7 +23244,6 @@ var BINDING_LOCAL_SUPPORT = {
   flagship: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
   vpc_service: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
   vpc_network: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
-  websearch: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
   agent_memory: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator"
 };
 function getBindingLocalSupport(type) {
@@ -23679,11 +23741,6 @@ function convertConfigToBindings(config2, options) {
         }
         break;
       }
-      case "websearch": {
-        const { binding, ...x } = info;
-        output[binding] = { type: "websearch", ...x };
-        break;
-      }
       case "agent_memory": {
         for (const { binding, ...x } of info) {
           output[binding] = { type: "agent_memory", ...x };
@@ -23856,7 +23913,6 @@ function printBindings(bindings, options) {
     bindings
   );
   const ai_search = extractBindingsOfType("ai_search", bindings);
-  const websearch = extractBindingsOfType("websearch", bindings);
   const agent_memory = extractBindingsOfType("agent_memory", bindings);
   const hyperdrive = extractBindingsOfType("hyperdrive", bindings);
   const r2_buckets = extractBindingsOfType("r2_bucket", bindings);
@@ -24074,16 +24130,6 @@ function printBindings(bindings, options) {
       }))
     );
   }
-  if (websearch.length > 0) {
-    output.push(
-      ...websearch.map(({ binding }) => ({
-        name: binding,
-        type: getBindingTypeFriendlyName("websearch"),
-        value: void 0,
-        mode: getMode({ isSimulatedLocally: false })
-      }))
-    );
-  }
   if (agent_memory.length > 0) {
     output.push(
       ...agent_memory.map(({ binding, namespace }) => ({
@@ -24565,7 +24611,7 @@ ${allTailConsumers.map(({ service, streaming }) => {
     log(
       `${containersTitle}
 ${containers.map(
-        (container) => container.scheduling_policy === "durable_object" ? `- ${container.class_name} (durable_object)` : `- ${container.name} (${container.image})`
+        (container) => container.scheduling_policy === "durable_object" ? `- ${container.class_name ?? container.name} (durable_object)` : `- ${container.name} (${container.image})`
       ).join("\n")}`
     );
     log("");