@cloudflare/config 0.16.0 → 0.17.0

package/dist/index.d.mts

@@ -588,8 +588,8 @@ declare const TailConsumerSchema: z.ZodObject<{
 }, z.core.$strict>;
 /**
  * Input Worker schema — parses Worker definitions from user-authored
- * `cloudflare.config.ts` files. Adds an optional `entrypoint` field to the base
- * schema.
+ * `cloudflare.config.ts` files. Adds an optional string `entrypoint` field to
+ * the base schema.
  */
 declare const InputWorkerSchema: z.ZodObject<{
   name: z.ZodString;
@@ -741,12 +741,9 @@ declare const InputWorkerSchema: z.ZodObject<{
       enabled: z.ZodBoolean;
     }, z.core.$strict>>;
   }, z.core.$strict>]>>>;
-  entrypoint: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
-    default: z.ZodString;
-  }, z.core.$strict>]>, z.ZodTransform<string, string | {
-    default: string;
-  }>>>;
+  entrypoint: z.ZodOptional<z.ZodString>;
 }, z.core.$strict>;
+type InputWorkerConfig = z.input<typeof InputWorkerSchema>;
 type ParsedInputWorkerConfig = z.output<typeof InputWorkerSchema>;
 /**
  * Input settings schema — parses the account settings at the top level of
@@ -912,11 +909,7 @@ declare const InputConfigSchema: z.ZodObject<{
         enabled: z.ZodBoolean;
       }, z.core.$strict>>;
     }, z.core.$strict>]>>>;
-    entrypoint: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
-      default: z.ZodString;
-    }, z.core.$strict>]>, z.ZodTransform<string, string | {
-      default: string;
-    }>>>;
+    entrypoint: z.ZodOptional<z.ZodString>;
   }, z.core.$strict>>;
   containers: z.ZodDefault<z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
     name: z.ZodString;
@@ -1346,4 +1339,4 @@ declare function loadAndParseConfig(configPath: string, ctx: ConfigContext): Pro
 /** Load and parse only account settings from the default export. */
 declare function loadAndParseConfigSettings(configPath: string, ctx: ConfigContext): Promise<LoadAndParseConfigSettingsResult>;
 //#endregion
-export { AgentMemoryBinding, AiBinding, AiSearchBinding, AiSearchNamespaceBinding, AnalyticsEngineDatasetBinding, AnalyticsEngineDatasetBindingSchema, ArtifactsBinding, AssetsBinding, AssetsSchema, BindingDevOptions, BindingSchema, Bindings, BrowserBinding, BrowserBindingSchema, CloudflareConfig, ConfigContext, type ConfigParseResult, type ConfigSettingsParseResult, ConnectTrigger, ContainerConfig, ContainerDefinition, D1Binding, D1BindingSchema, DispatchNamespaceBinding, DurableObjectBinding, DurableObjectCreatedExport, DurableObjectCreatedExportSchema, DurableObjectDeletedExport, DurableObjectDeletedExportSchema, DurableObjectExpectingTransferExport, DurableObjectExpectingTransferExportSchema, DurableObjectRenamedExport, DurableObjectRenamedExportSchema, DurableObjectTransferredExport, DurableObjectTransferredExportSchema, EmailTrigger, ExportSchema, Exports, FetchTrigger, FlagshipBinding, FlagshipBindingSchema, HyperdriveBinding, HyperdriveBindingSchema, ImagesBinding, InferDurableNamespaces, InferEnv, InferMainModule, InputConfigSchema, InputContainerSchema, InputSettingsSchema, InputWorkerSchema, JsonBinding, KVBindingSchema, KnownBindingSchema, KvBinding, type LoadAndParseConfigResult, type LoadAndParseConfigSettingsResult, type LoadConfigResult, LogfwdrBinding, MediaBinding, type ModuleType, ModuleTypeSchema, MtlsCertificateBinding, OutputContainerSchema, OutputRootConfigSchema, OutputWorkerSchema, type ParsedInputConfig, type ParsedInputContainerConfig, type ParsedInputSettingsConfig, type ParsedInputWorkerConfig, type ParsedOutputContainerConfig, type ParsedOutputRootConfig, type ParsedOutputWorkerConfig, PipelineBinding, QueueBinding, QueueBindingSchema, QueueConsumerTrigger, R2Binding, R2BindingSchema, RateLimitBinding, ScheduledTrigger, SecretBinding, SecretsStoreSecretBinding, SendEmailBinding, Settings, StreamBinding, TailConsumerSchema, TextBinding, Triggers, TypedAiBinding, TypedKvBinding, TypedPipelineBinding, TypedQueueBinding, UnsafeBinding, UnsafeBindingSchema, UnwrapConfig, VectorizeBinding, VersionMetadataBinding, VpcNetworkBinding, VpcServiceBinding, WorkerBinding, WorkerBindingSchema, WorkerConfig, WorkerDefinition, WorkerEntrypointExport, WorkerEntrypointExportOptions, WorkerEntrypointExportSchema, WorkerLoaderBinding, WorkerReference, WorkflowBinding, bindings, convertToWranglerConfig, defineConfig, defineContainer, defineWorker, exports, generateTypes, loadAndParseConfig, loadAndParseConfigSettings, loadConfig, registerConfigHooks, resolveAndParseConfig, resolveAndParseConfigSettings, triggers, validateSingletonBindings };
+export { AgentMemoryBinding, AiBinding, AiSearchBinding, AiSearchNamespaceBinding, AnalyticsEngineDatasetBinding, AnalyticsEngineDatasetBindingSchema, ArtifactsBinding, AssetsBinding, AssetsSchema, BindingDevOptions, BindingSchema, Bindings, BrowserBinding, BrowserBindingSchema, CloudflareConfig, ConfigContext, type ConfigParseResult, type ConfigSettingsParseResult, ConnectTrigger, ContainerConfig, ContainerDefinition, D1Binding, D1BindingSchema, DispatchNamespaceBinding, DurableObjectBinding, DurableObjectCreatedExport, DurableObjectCreatedExportSchema, DurableObjectDeletedExport, DurableObjectDeletedExportSchema, DurableObjectExpectingTransferExport, DurableObjectExpectingTransferExportSchema, DurableObjectRenamedExport, DurableObjectRenamedExportSchema, DurableObjectTransferredExport, DurableObjectTransferredExportSchema, EmailTrigger, ExportSchema, Exports, FetchTrigger, FlagshipBinding, FlagshipBindingSchema, HyperdriveBinding, HyperdriveBindingSchema, ImagesBinding, InferDurableNamespaces, InferEnv, InferMainModule, InputConfigSchema, InputContainerSchema, InputSettingsSchema, type InputWorkerConfig, InputWorkerSchema, JsonBinding, KVBindingSchema, KnownBindingSchema, KvBinding, type LoadAndParseConfigResult, type LoadAndParseConfigSettingsResult, type LoadConfigResult, LogfwdrBinding, MediaBinding, type ModuleType, ModuleTypeSchema, MtlsCertificateBinding, OutputContainerSchema, OutputRootConfigSchema, OutputWorkerSchema, type ParsedInputConfig, type ParsedInputContainerConfig, type ParsedInputSettingsConfig, type ParsedInputWorkerConfig, type ParsedOutputContainerConfig, type ParsedOutputRootConfig, type ParsedOutputWorkerConfig, PipelineBinding, QueueBinding, QueueBindingSchema, QueueConsumerTrigger, R2Binding, R2BindingSchema, RateLimitBinding, ScheduledTrigger, SecretBinding, SecretsStoreSecretBinding, SendEmailBinding, Settings, StreamBinding, TailConsumerSchema, TextBinding, Triggers, TypedAiBinding, TypedKvBinding, TypedPipelineBinding, TypedQueueBinding, UnsafeBinding, UnsafeBindingSchema, UnwrapConfig, VectorizeBinding, VersionMetadataBinding, VpcNetworkBinding, VpcServiceBinding, WorkerBinding, WorkerBindingSchema, WorkerConfig, WorkerDefinition, WorkerEntrypointExport, WorkerEntrypointExportOptions, WorkerEntrypointExportSchema, WorkerLoaderBinding, WorkerReference, WorkflowBinding, bindings, convertToWranglerConfig, defineConfig, defineContainer, defineWorker, exports, generateTypes, loadAndParseConfig, loadAndParseConfigSettings, loadConfig, registerConfigHooks, resolveAndParseConfig, resolveAndParseConfigSettings, triggers, validateSingletonBindings };

package/dist/index.mjs

@@ -549,10 +549,10 @@ const BaseWorkerSchema = z.strictObject({
 });
 /**
 * Input Worker schema — parses Worker definitions from user-authored
-* `cloudflare.config.ts` files. Adds an optional `entrypoint` field to the base
-* schema.
+* `cloudflare.config.ts` files. Adds an optional string `entrypoint` field to
+* the base schema.
 */
-const InputWorkerSchema = BaseWorkerSchema.extend({ entrypoint: z.union([z.string(), z.strictObject({ default: z.string() })]).transform((value) => typeof value === "string" ? value : value.default).optional() });
+const InputWorkerSchema = BaseWorkerSchema.extend({ entrypoint: z.string().optional() });
 /**
 * Input settings schema — parses the account settings at the top level of
 * `cloudflare.config.ts`.
@@ -1530,6 +1530,13 @@ async function normalizeWorkerReferences(resolved, resolveDefinition) {
 		env
 	};
 }
+function normalizeWorkerEntrypoint(resolved) {
+	if (!isRecord(resolved) || !isRecord(resolved.entrypoint) || !("default" in resolved.entrypoint)) return resolved;
+	return {
+		...resolved,
+		entrypoint: resolved.entrypoint.default
+	};
+}
 async function normalizeContainerReferences(resolved, resolveDefinition, containers) {
 	const issues = [];
 	if (!isRecord(resolved) || !isRecord(resolved.exports)) return {
@@ -1589,7 +1596,7 @@ async function normalizeContainerReferences(resolved, resolveDefinition, contain
 	};
 }
 async function normalizeWorkerConfig(resolved, resolveDefinition, containers) {
-	return normalizeContainerReferences(await normalizeWorkerReferences(resolved, resolveDefinition), resolveDefinition, containers);
+	return normalizeContainerReferences(await normalizeWorkerReferences(normalizeWorkerEntrypoint(resolved), resolveDefinition), resolveDefinition, containers);
 }
 function prefixIssues(issues, prefix) {
 	return issues.map((issue) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/config",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "Definitions and utilities for configuring Cloudflare Workers and related products. This is not yet stable enough for external use — APIs may change without notice.",
   "homepage": "https://github.com/cloudflare/workers-sdk/tree/main/packages/config#readme",
   "bugs": {
@@ -36,8 +36,8 @@
     "tsdown": "0.16.3",
     "typescript": "5.8.3",
     "vitest": "4.1.0",
-    "@cloudflare/workers-tsconfig": "0.0.0",
-    "@cloudflare/workers-utils": "0.41.0"
+    "@cloudflare/workers-utils": "0.41.0",
+    "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "workers-sdk": {
     "prerelease": true