wrangler 0.0.0-bb8dc5c → 0.0.0-c738c6e

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.0-bb8dc5c",
+  "version": "0.0.0-c738c6e",
   "author": "wrangler@cloudflare.com",
   "description": "Command-line interface for all things Cloudflare Workers",
   "bin": {

package/src/api/form_data.ts

@@ -5,6 +5,7 @@ import type {
   CfModule,
   CfKvNamespace,
   CfCryptoKey,
+  CfDurableObject,
 } from "./worker.js";
 import { FormData, Blob } from "formdata-node";
 
@@ -27,9 +28,23 @@ function toBinding(
     return { name, type: "plain_text", text: variable };
   }
 
-  const { namespaceId } = variable as CfKvNamespace;
-  if (namespaceId) {
-    return { name, type: "kv_namespace", namespace_id: namespaceId };
+  if ((variable as CfKvNamespace).namespaceId) {
+    return {
+      name,
+      type: "kv_namespace",
+      namespace_id: (variable as CfKvNamespace).namespaceId,
+    };
+  }
+
+  if ((variable as CfDurableObject).class_name) {
+    return {
+      name,
+      type: "durable_object_namespace",
+      class_name: (variable as CfDurableObject).class_name,
+      ...((variable as CfDurableObject).script_name && {
+        script_name: (variable as CfDurableObject).script_name,
+      }),
+    };
   }
 
   const { format, algorithm, usages, data } = variable as CfCryptoKey;
@@ -84,7 +99,14 @@ function toModule(module: CfModule, entryType?: CfModuleType): Blob {
  */
 export function toFormData(worker: CfWorkerInit): FormData {
   const formData = new FormData();
-  const { main, modules, variables, usage_model, compatibility_date } = worker;
+  const {
+    main,
+    modules,
+    variables,
+    usage_model,
+    compatibility_date,
+    compatibility_flags,
+  } = worker;
   const { name, type: mainType } = main;
 
   const bindings = [];
@@ -103,10 +125,15 @@ export function toFormData(worker: CfWorkerInit): FormData {
     // @ts-expect-error - we should type metadata
     metadata.compatibility_date = compatibility_date;
   }
+  if (compatibility_flags) {
+    // @ts-expect-error - we should type metadata
+    metadata.compatibility_flags = compatibility_flags;
+  }
   if (usage_model) {
     // @ts-expect-error - we should type metadata
     metadata.usage_model = usage_model;
   }
+
   formData.set("metadata", JSON.stringify(metadata));
 
   if (singleton && modules && modules.length > 0) {

package/src/api/worker.ts

@@ -72,6 +72,11 @@ export interface CfKvNamespace {
   namespaceId: string;
 }
 
+export interface CfDurableObject {
+  class_name: string;
+  script_name?: string;
+}
+
 /**
  * A `WebCrypto` key.
  *
@@ -99,7 +104,7 @@ export interface CfCryptoKey {
 /**
  * A variable (aka. environment variable).
  */
-export type CfVariable = string | CfKvNamespace | CfCryptoKey;
+export type CfVariable = string | CfKvNamespace | CfCryptoKey | CfDurableObject;
 
 /**
  * Options for creating a `CfWorker`.
@@ -117,8 +122,9 @@ export interface CfWorkerInit {
    * The map of names to variables. (aka. environment variables)
    */
   variables?: { [name: string]: CfVariable };
-  compatibility_date?: string;
-  usage_model?: void | "bundled" | "unbound";
+  compatibility_date: string | void;
+  compatibility_flags: void | string[];
+  usage_model: void | "bundled" | "unbound";
 }
 
 /**

package/src/config.ts

@@ -28,6 +28,12 @@ type KVNamespace = {
   id: string;
 };
 
+type DurableObject = {
+  name: string;
+  class_name: string;
+  script_name?: string;
+};
+
 type Build = {
   command?: string;
   cwd?: string;
@@ -59,6 +65,8 @@ type Env = {
   name?: string; // inherited
   account_id?: string; // inherited
   workers_dev?: boolean; // inherited
+  compatibility_date?: string; // inherited
+  compatibility_flags?: string[]; // inherited
   zone_id?: string; // inherited
   routes?: string[]; // inherited
   route?: string; // inherited
@@ -69,6 +77,7 @@ type Env = {
   // we should use typescript to parse cron patterns
   triggers?: { crons: Cron[] }; // inherited
   kv_namespaces?: KVNamespace[];
+  usage_model?: UsageModel; // inherited
 };
 
 export type Config = {
@@ -76,6 +85,8 @@ export type Config = {
   account_id?: string; // inherited
   // @deprecated Don't use this
   type?: Project; // top level
+  compatibility_date?: string; // inherited
+  compatibility_flags?: string[]; // inherited
   // -- there's some mutually exclusive logic for this next block,
   // but I didn't bother for now
   workers_dev?: boolean; // inherited
@@ -88,6 +99,7 @@ export type Config = {
   jsxFactory?: string; // inherited
   jsxFragment?: string; // inherited
   vars?: Vars;
+  durable_objects?: { bindings: DurableObject[] };
   kv_namespaces?: KVNamespace[];
   site?: Site; // inherited
   // we should use typescript to parse cron patterns

package/src/dev.tsx

@@ -37,6 +37,9 @@ type Props = {
   variables: { [name: string]: CfVariable };
   public: void | string;
   site: void | string;
+  compatibilityDate: void | string;
+  compatibilityFlags: void | string[];
+  usageModel: void | "bundled" | "unbound";
 };
 
 export function Dev(props: Props): JSX.Element {
@@ -98,6 +101,9 @@ export function Dev(props: Props): JSX.Element {
           site={props.site}
           public={props.public}
           port={props.port}
+          compatibilityDate={props.compatibilityDate}
+          compatibilityFlags={props.compatibilityFlags}
+          usageModel={props.usageModel}
         />
       )}
       <Box borderStyle="round" paddingLeft={1} paddingRight={1}>
@@ -153,6 +159,9 @@ function Remote(props: {
   accountId: void | string;
   apiToken: void | string;
   variables: { [name: string]: CfVariable };
+  compatibilityDate: string | void;
+  compatibilityFlags: void | string[];
+  usageModel: void | "bundled" | "unbound";
 }) {
   assert(props.accountId, "accountId is required");
   assert(props.apiToken, "apiToken is required");
@@ -166,6 +175,9 @@ function Remote(props: {
     variables: props.variables,
     sitesFolder: props.site,
     port: props.port,
+    compatibilityDate: props.compatibilityDate,
+    compatibilityFlags: props.compatibilityFlags,
+    usageModel: props.usageModel,
   });
 
   useProxy({ token, publicRoot: props.public, port: props.port });
@@ -399,6 +411,9 @@ function useWorker(props: {
   variables: { [name: string]: CfVariable };
   sitesFolder: void | string;
   port: number;
+  compatibilityDate: string | void;
+  compatibilityFlags: string[] | void;
+  usageModel: void | "bundled" | "unbound";
 }): CfPreviewToken | void {
   const {
     name,
@@ -447,7 +462,6 @@ function useWorker(props: {
           }; // TODO: cancellable?
 
       const content = await readFile(bundle.path, "utf-8");
-      console.log(content);
       const init: CfWorkerInit = {
         main: {
           name: name || path.basename(bundle.path),
@@ -471,6 +485,9 @@ function useWorker(props: {
               __STATIC_CONTENT: { namespaceId: assets.namespace },
             }
           : variables,
+        compatibility_date: props.compatibilityDate,
+        compatibility_flags: props.compatibilityFlags,
+        usage_model: props.usageModel,
       };
       setToken(
         await createWorker(init, {

package/src/index.tsx

@@ -55,6 +55,44 @@ async function readConfig(path?: string): Promise<Config> {
     Object.assign(config, parsed);
   }
 
+  const inheritedFields = [
+    "name",
+    "account_id",
+    "workers_dev",
+    "compatibility_date",
+    "compatibility_flags",
+    "zone_id",
+    "routes",
+    "route",
+    "jsxFactory",
+    "jsxFragment",
+    "site",
+    "triggers",
+    "usage_model",
+  ];
+
+  Object.keys(config.env || {}).forEach((env) => {
+    inheritedFields.forEach((field) => {
+      if (config[field] !== undefined && config.env[env][field] === undefined) {
+        config.env[env][field] = config[field]; // TODO: - shallow copy?
+      }
+    });
+  });
+
+  const mirroredFields = ["vars", "kv_namespaces", "durable_objects"];
+  Object.keys(config.env || {}).forEach((env) => {
+    mirroredFields.forEach((field) => {
+      // if it exists on top level, it should exist on env defns
+      Object.keys(config[field] || {}).forEach((fieldKey) => {
+        if (!config.env[env][field]?.[fieldKey]) {
+          console.error(
+            `In your configuration, "${field}.${fieldKey}" exists at a top level, but not on "env.${env}". This is not what you probably want, since the field "${field}" is not inherited by environments. Please add "${field}.${fieldKey}" to "env.${env}".`
+          );
+        }
+      });
+    });
+  });
+
   // todo: validate, add defaults
   // let's just do some basics for now
 
@@ -155,8 +193,7 @@ export async function main(argv: string[]): Promise<void> {
         try {
           await writeFile(
             destination,
-            `compatibility_date = "${compatibilityDate}"
-  `
+            `compatibility_date = "${compatibilityDate}"` + "\n"
           );
           console.log(`✨ Succesfully created wrangler.toml`);
           // TODO: suggest next steps?
@@ -410,7 +447,7 @@ export async function main(argv: string[]): Promise<void> {
 
       // -- snip, end --
 
-      const envRootObj = args.env ? config[`env.${args.env}`] : config;
+      const envRootObj: Config = args.env ? config[`env.${args.env}`] : config;
 
       render(
         <Dev
@@ -424,6 +461,9 @@ export async function main(argv: string[]): Promise<void> {
           site={args.site || config.site?.bucket}
           port={args.port || config.dev?.port}
           public={args.public}
+          compatibilityDate={config.compatibility_date}
+          compatibilityFlags={config.compatibility_flags}
+          usageModel={config.usage_model}
           variables={{
             ...(envRootObj?.vars || {}),
             ...(envRootObj?.kv_namespaces || []).reduce(
@@ -439,6 +479,12 @@ export async function main(argv: string[]): Promise<void> {
               },
               {}
             ),
+            ...(envRootObj?.durable_objects?.bindings || []).reduce(
+              (obj, { name, class_name, script_name }) => {
+                return { ...obj, [name]: { class_name, script_name } };
+              },
+              {}
+            ),
           }}
         />
       );

package/src/publish.ts

@@ -160,6 +160,15 @@ export default async function publish(props: Props): Promise<void> {
         },
         {}
       ),
+      ...(envRootObj?.durable_objects?.bindings || []).reduce(
+        (obj, { name, class_name, script_name }) => {
+          return {
+            ...obj,
+            [name]: { class_name, ...(script_name && { script_name }) },
+          };
+        },
+        {}
+      ),
       ...(assets.namespace
         ? { __STATIC_CONTENT: { namespaceId: assets.namespace } }
         : {}),
@@ -171,6 +180,9 @@ export default async function publish(props: Props): Promise<void> {
           type: "text",
         })
       : [],
+    compatibility_date: config.compatibility_date,
+    compatibility_flags: config.compatibility_flags,
+    usage_model: config.usage_model,
   };
 
   const start = Date.now();

package/wrangler-dist/cli.js

@@ -128151,9 +128151,22 @@ function toBinding(name, variable) {
   if (typeof variable === "string") {
     return { name, type: "plain_text", text: variable };
   }
-  const { namespaceId } = variable;
-  if (namespaceId) {
-    return { name, type: "kv_namespace", namespace_id: namespaceId };
+  if (variable.namespaceId) {
+    return {
+      name,
+      type: "kv_namespace",
+      namespace_id: variable.namespaceId
+    };
+  }
+  if (variable.class_name) {
+    return {
+      name,
+      type: "durable_object_namespace",
+      class_name: variable.class_name,
+      ...variable.script_name && {
+        script_name: variable.script_name
+      }
+    };
   }
   const { format: format3, algorithm, usages, data } = variable;
   if (format3) {
@@ -128199,7 +128212,14 @@ function toModule(module2, entryType) {
 }
 function toFormData2(worker) {
   const formData = new FormData3();
-  const { main: main2, modules, variables, usage_model, compatibility_date } = worker;
+  const {
+    main: main2,
+    modules,
+    variables,
+    usage_model,
+    compatibility_date,
+    compatibility_flags
+  } = worker;
   const { name, type: mainType } = main2;
   const bindings = [];
   for (const [name2, variable] of Object.entries(variables ?? {})) {
@@ -128215,6 +128235,9 @@ function toFormData2(worker) {
   if (compatibility_date) {
     metadata.compatibility_date = compatibility_date;
   }
+  if (compatibility_flags) {
+    metadata.compatibility_flags = compatibility_flags;
+  }
   if (usage_model) {
     metadata.usage_model = usage_model;
   }
@@ -128691,7 +128714,10 @@ function Dev(props) {
     variables: props.variables,
     site: props.site,
     public: props.public,
-    port: props.port
+    port: props.port,
+    compatibilityDate: props.compatibilityDate,
+    compatibilityFlags: props.compatibilityFlags,
+    usageModel: props.usageModel
   }), /* @__PURE__ */ import_react2.default.createElement(import_ink2.Box, {
     borderStyle: "round",
     paddingLeft: 1,
@@ -128733,7 +128759,10 @@ function Remote(props) {
     apiToken: props.apiToken,
     variables: props.variables,
     sitesFolder: props.site,
-    port: props.port
+    port: props.port,
+    compatibilityDate: props.compatibilityDate,
+    compatibilityFlags: props.compatibilityFlags,
+    usageModel: props.usageModel
   });
   useProxy({ token, publicRoot: props.public, port: props.port });
   useInspector(token ? token.inspectorUrl.href : void 0);
@@ -128932,7 +128961,6 @@ function useWorker(props) {
         namespace: void 0
       };
       const content = await (0, import_promises3.readFile)(bundle.path, "utf-8");
-      console.log(content);
       const init = {
         main: {
           name: name || import_path.default.basename(bundle.path),
@@ -128947,7 +128975,10 @@ function useWorker(props) {
         variables: assets.namespace ? {
           ...variables,
           __STATIC_CONTENT: { namespaceId: assets.namespace }
-        } : variables
+        } : variables,
+        compatibility_date: props.compatibilityDate,
+        compatibility_flags: props.compatibilityFlags,
+        usage_model: props.usageModel
       };
       setToken(await createWorker(init, {
         accountId,
@@ -134193,7 +134224,7 @@ async function prompt(text, type2 = "text") {
 }
 
 // package.json
-var version = "0.0.0-bb8dc5c";
+var version = "0.0.0-c738c6e";
 
 // src/pages.tsx
 init_import_meta_url();
@@ -134515,13 +134546,22 @@ async function publish(props) {
       ...(envRootObj?.kv_namespaces || []).reduce((obj, { binding, preview_id, id }) => {
         return { ...obj, [binding]: { namespaceId: id } };
       }, {}),
+      ...(envRootObj?.durable_objects?.bindings || []).reduce((obj, { name, class_name, script_name }) => {
+        return {
+          ...obj,
+          [name]: { class_name, ...script_name && { script_name } }
+        };
+      }, {}),
       ...assets.namespace ? { __STATIC_CONTENT: { namespaceId: assets.namespace } } : {}
     },
     modules: assets.manifest ? [].concat({
       name: "__STATIC_CONTENT_MANIFEST",
       content: JSON.stringify(assets.manifest),
       type: "text"
-    }) : []
+    }) : [],
+    compatibility_date: config.compatibility_date,
+    compatibility_flags: config.compatibility_flags,
+    usage_model: config.usage_model
   };
   const start = Date.now();
   function formatTime(duration) {
@@ -134637,6 +134677,38 @@ async function readConfig(path10) {
     const parsed = import_toml2.default.parse(tml);
     Object.assign(config, parsed);
   }
+  const inheritedFields = [
+    "name",
+    "account_id",
+    "workers_dev",
+    "compatibility_date",
+    "compatibility_flags",
+    "zone_id",
+    "routes",
+    "route",
+    "jsxFactory",
+    "jsxFragment",
+    "site",
+    "triggers",
+    "usage_model"
+  ];
+  Object.keys(config.env || {}).forEach((env3) => {
+    inheritedFields.forEach((field) => {
+      if (config[field] !== void 0 && config.env[env3][field] === void 0) {
+        config.env[env3][field] = config[field];
+      }
+    });
+  });
+  const mirroredFields = ["vars", "kv_namespaces", "durable_objects"];
+  Object.keys(config.env || {}).forEach((env3) => {
+    mirroredFields.forEach((field) => {
+      Object.keys(config[field] || {}).forEach((fieldKey) => {
+        if (!config.env[env3][field]?.[fieldKey]) {
+          console.error(`In your configuration, "${field}.${fieldKey}" exists at a top level, but not on "env.${env3}". This is not what you probably want, since the field "${field}" is not inherited by environments. Please add "${field}.${fieldKey}" to "env.${env3}".`);
+        }
+      });
+    });
+  });
   config.__path__ = path10;
   return config;
 }
@@ -134681,7 +134753,7 @@ async function main(argv) {
       const compatibilityDate = new Date().toISOString().substring(0, 10);
       try {
         await (0, import_promises6.writeFile)(destination, `compatibility_date = "${compatibilityDate}"
-  `);
+`);
         console.log(`\u2728 Succesfully created wrangler.toml`);
       } catch (err2) {
         console.error(`Failed to create wrangler.toml`);
@@ -134836,6 +134908,9 @@ async function main(argv) {
       site: args2.site || config.site?.bucket,
       port: args2.port || config.dev?.port,
       public: args2.public,
+      compatibilityDate: config.compatibility_date,
+      compatibilityFlags: config.compatibility_flags,
+      usageModel: config.usage_model,
       variables: {
         ...envRootObj?.vars || {},
         ...(envRootObj?.kv_namespaces || []).reduce((obj, { binding, preview_id }) => {
@@ -134843,6 +134918,9 @@ async function main(argv) {
             throw new Error("kv namespaces need a preview id during dev mode");
           }
           return { ...obj, [binding]: { namespaceId: preview_id } };
+        }, {}),
+        ...(envRootObj?.durable_objects?.bindings || []).reduce((obj, { name, class_name, script_name }) => {
+          return { ...obj, [name]: { class_name, script_name } };
         }, {})
       }
     }));