wrangler 0.0.0-e928f94 → 0.0.0-e9a1820

package/src/api/inspect.ts

@@ -140,17 +140,6 @@ export type DtEvent = DtLogEvent | DtExceptionEvent;
  */
 export type DtListener = (event: DtEvent) => void;
 
-interface DtProtocolRequest<T> {
-  id: number;
-  method: string;
-  params?: T;
-}
-
-interface DtProtocolResponse<T> {
-  id: number;
-  result: T;
-}
-
 /**
  * A DevTools inspector that listens to logs and debug events from a Worker.
  *

package/src/api/worker.ts

@@ -62,22 +62,40 @@ export interface CfModule {
   type?: CfModuleType;
 }
 
+/**
+ * A map of variable names to values.
+ */
+interface CfVars {
+  [key: string]: string;
+}
+
 /**
  * A KV namespace.
  */
-export interface CfKvNamespace {
-  /**
-   * The namespace ID.
-   */
-  namespaceId: string;
+interface CfKvNamespace {
+  binding: string;
+  id: string;
 }
 
-export interface CfDurableObject {
+/**
+ * A Durable Object.
+ */
+interface CfDurableObject {
+  name: string;
   class_name: string;
   script_name?: string;
 }
 
-interface CfDOMigrations {
+/**
+ * A Service.
+ */
+interface CfService {
+  name: string;
+  service: string;
+  environment: string;
+}
+
+export interface CfDurableObjectMigrations {
   old_tag?: string;
   new_tag: string;
   steps: {
@@ -87,35 +105,6 @@ interface CfDOMigrations {
   }[];
 }
 
-/**
- * A `WebCrypto` key.
- *
- * @link https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey
- */
-export interface CfCryptoKey {
-  /**
-   * The format.
-   */
-  format: string;
-  /**
-   * The algorithm.
-   */
-  algorithm: string;
-  /**
-   * The usages.
-   */
-  usages: string[];
-  /**
-   * The data.
-   */
-  data: BufferSource | JsonWebKey;
-}
-
-/**
- * A variable (aka. environment variable).
- */
-export type CfVariable = string | CfKvNamespace | CfCryptoKey | CfDurableObject;
-
 /**
  * Options for creating a `CfWorker`.
  */
@@ -133,10 +122,15 @@ export interface CfWorkerInit {
    */
   modules: void | CfModule[];
   /**
-   * The map of names to variables. (aka. environment variables)
+   * All the bindings
    */
-  variables?: { [name: string]: CfVariable };
-  migrations: void | CfDOMigrations;
+  bindings: {
+    kv_namespaces?: CfKvNamespace[];
+    durable_objects?: { bindings: CfDurableObject[] };
+    vars?: CfVars;
+    services?: CfService[];
+  };
+  migrations: void | CfDurableObjectMigrations;
   compatibility_date: string | void;
   compatibility_flags: void | string[];
   usage_model: void | "bundled" | "unbound";

package/src/cli.ts

@@ -1,10 +1,9 @@
+import { hideBin } from "yargs/helpers";
 import { main } from ".";
 
-main(process.argv.slice(2)).catch((cause) => {
-  const { name, message } = cause;
-  if (name === "CloudflareError") {
-    console.error("\x1b[31m", message);
-    return;
-  }
-  throw cause;
+main(hideBin(process.argv)).catch(() => {
+  // The logging of any error that was thrown from `main()` is handled in the `yargs.fail()` handler.
+  // Here we just want to ensure that the process exits with a non-zero code.
+  // We don't want to do this inside the `main()` function, since that would kill the process when running our tests.
+  process.exit(1);
 });

package/src/config.ts

@@ -1,7 +1,7 @@
 // we're going to manually write both the type definition AND
 // the validator for the config, so that we can give better error messages
 
-type DOMigration = {
+type DurableObjectMigration = {
   tag: string;
   new_classes?: string[];
   renamed_classes?: string[];
@@ -25,13 +25,13 @@ type Dev = {
   upstream_protocol?: string;
 };
 
-type Vars = { [key: string]: string };
+export type Vars = { [key: string]: string };
 
 type Cron = string; // TODO: we should be able to parse a cron pattern with ts
 
 type KVNamespace = {
-  binding?: string;
-  preview_id: string;
+  binding: string;
+  preview_id?: string;
   id: string;
 };
 
@@ -41,6 +41,12 @@ type DurableObject = {
   script_name?: string;
 };
 
+type Service = {
+  name: string;
+  service: string;
+  environment: string;
+};
+
 type Build = {
   command?: string;
   cwd?: string;
@@ -86,6 +92,8 @@ type Env = {
   vars?: Vars;
   durable_objects?: { bindings: DurableObject[] };
   kv_namespaces?: KVNamespace[];
+  experimental_services?: Service[];
+  migrations?: DurableObjectMigration[];
   usage_model?: UsageModel; // inherited
 };
 
@@ -108,9 +116,10 @@ export type Config = {
   jsx_factory?: string; // inherited
   jsx_fragment?: string; // inherited
   vars?: Vars;
-  migrations?: DOMigration[];
   durable_objects?: { bindings: DurableObject[] };
   kv_namespaces?: KVNamespace[];
+  experimental_services?: Service[];
+  migrations?: DurableObjectMigration[];
   site?: Site; // inherited
   // we should use typescript to parse cron patterns
   triggers?: { crons: Cron[] }; // inherited