devflare 1.0.0-next.3 → 1.0.0-next.30

package/dist/index-pmeashfz.js

@@ -0,0 +1,476 @@
+import {
+  mergeConfigForEnvironment
+} from "./index-2sc756r1.js";
+import {
+  createD1Database,
+  createKVNamespace,
+  createQueue,
+  createR2Bucket,
+  createVectorizeIndex,
+  deleteD1Database,
+  deleteHyperdrive,
+  deleteKVNamespace,
+  deleteQueue,
+  deleteR2Bucket,
+  deleteVectorizeIndex,
+  getEffectiveAccountId,
+  getPrimaryAccount,
+  listD1Databases,
+  listHyperdrives,
+  listKVNamespaces,
+  listQueues,
+  listR2Buckets,
+  listVectorizeIndexes
+} from "./index-1d4jg11n.js";
+import {
+  isPreviewScopedName,
+  materializePreviewScopedConfig,
+  materializePreviewScopedString
+} from "./index-c8p4njqy.js";
+
+// src/config/preview-resources.ts
+var defaultPreviewScopedResourceLifecycleApi = {
+  getPrimaryAccount,
+  getEffectiveAccountId,
+  listKVNamespaces,
+  createKVNamespace,
+  deleteKVNamespace,
+  listD1Databases,
+  createD1Database,
+  deleteD1Database,
+  listR2Buckets,
+  createR2Bucket,
+  deleteR2Bucket,
+  listQueues,
+  createQueue,
+  deleteQueue,
+  listVectorizeIndexes,
+  createVectorizeIndex,
+  deleteVectorizeIndex,
+  listHyperdrives,
+  deleteHyperdrive
+};
+function resolvePreviewScopedResourceLifecycleApi(overrides) {
+  return {
+    ...defaultPreviewScopedResourceLifecycleApi,
+    ...overrides ?? {}
+  };
+}
+function createEmptyPreviewScopedResourceNames() {
+  return {
+    kv: [],
+    d1: [],
+    r2: [],
+    queues: [],
+    vectorize: [],
+    hyperdrive: [],
+    analyticsEngine: [],
+    browser: []
+  };
+}
+function createEmptyPreviewScopedResourcePlan() {
+  return {
+    kv: [],
+    d1: [],
+    r2: [],
+    queues: [],
+    vectorize: [],
+    hyperdrive: [],
+    analyticsEngine: [],
+    browser: []
+  };
+}
+function createPreviewScopedResourceRef(value, bindingName, options) {
+  if (!isPreviewScopedName(value)) {
+    return null;
+  }
+  const baseName = materializePreviewScopedString(value, {
+    env: {}
+  });
+  const previewName = materializePreviewScopedString(value, options);
+  if (!baseName || !previewName || baseName === previewName) {
+    return null;
+  }
+  return {
+    ...bindingName ? { bindingName } : {},
+    baseName,
+    previewName
+  };
+}
+function upsertPreviewScopedQueueRef(queueRefs, value, options) {
+  const ref = createPreviewScopedResourceRef(value, undefined, options);
+  if (!ref) {
+    return;
+  }
+  if (!queueRefs.has(ref.previewName)) {
+    queueRefs.set(ref.previewName, ref);
+  }
+}
+function applyHyperdriveBindingFallbacks(config, hyperdriveBindingFallbacks) {
+  if (!config.bindings?.hyperdrive || Object.keys(hyperdriveBindingFallbacks).length === 0) {
+    return config;
+  }
+  return {
+    ...config,
+    bindings: {
+      ...config.bindings,
+      hyperdrive: Object.fromEntries(Object.entries(config.bindings.hyperdrive).map(([bindingName, bindingConfig]) => {
+        const fallbackName = hyperdriveBindingFallbacks[bindingName];
+        if (!fallbackName) {
+          return [bindingName, bindingConfig];
+        }
+        return [bindingName, fallbackName];
+      }))
+    }
+  };
+}
+function resolvePreviewScopedResourceLifecycleWarnings(plan) {
+  const warnings = [];
+  if (plan.analyticsEngine.length > 0) {
+    warnings.push("Workers Analytics Engine datasets are created automatically on first write, so Devflare does not provision or delete preview-scoped analytics datasets.");
+  }
+  if (plan.browser.length > 0) {
+    warnings.push("Browser Rendering bindings do not own account-scoped resources, so Devflare does not provision or delete preview-scoped browser bindings.");
+  }
+  return warnings;
+}
+function hasPreviewScopedLifecycleResources(plan) {
+  return plan.kv.length > 0 || plan.d1.length > 0 || plan.r2.length > 0 || plan.queues.length > 0 || plan.vectorize.length > 0 || plan.hyperdrive.length > 0;
+}
+async function resolveLifecycleAccountId(config, options, cloudflareApi) {
+  if (options.accountId?.trim()) {
+    return options.accountId.trim();
+  }
+  if (config.accountId?.trim()) {
+    return config.accountId.trim();
+  }
+  const primaryAccount = await cloudflareApi.getPrimaryAccount();
+  if (!primaryAccount) {
+    throw new Error("Could not resolve a Cloudflare account for preview-scoped resource lifecycle management. Set accountId in devflare.config.ts, pass --account, or authenticate with Wrangler.");
+  }
+  const effective = await cloudflareApi.getEffectiveAccountId(primaryAccount.id);
+  return effective.accountId;
+}
+async function loadPreviewScopedResourceLifecycleState(accountId, plan, cloudflareApi) {
+  const [namespaces, databases, buckets, queues, vectorizeIndexes, hyperdrives] = await Promise.all([
+    plan.kv.length > 0 ? cloudflareApi.listKVNamespaces(accountId) : Promise.resolve([]),
+    plan.d1.length > 0 ? cloudflareApi.listD1Databases(accountId) : Promise.resolve([]),
+    plan.r2.length > 0 ? cloudflareApi.listR2Buckets(accountId) : Promise.resolve([]),
+    plan.queues.length > 0 ? cloudflareApi.listQueues(accountId) : Promise.resolve([]),
+    plan.vectorize.length > 0 ? cloudflareApi.listVectorizeIndexes(accountId) : Promise.resolve([]),
+    plan.hyperdrive.length > 0 ? cloudflareApi.listHyperdrives(accountId) : Promise.resolve([])
+  ]);
+  return {
+    namespaces,
+    databases,
+    buckets,
+    queues,
+    vectorizeIndexes,
+    hyperdrives
+  };
+}
+function createPreviewScopedResourceResolutionCloudflareApi(state) {
+  return {
+    listKVNamespaces: async () => state.namespaces,
+    listD1Databases: async () => state.databases,
+    listHyperdrives: async () => state.hyperdrives
+  };
+}
+function findVectorizeIndexByName(indexes, name) {
+  return indexes.find((index) => index.name === name);
+}
+function findKVNamespaceByName(namespaces, name) {
+  return namespaces.find((namespace) => namespace.name === name);
+}
+function findD1DatabaseByName(databases, name) {
+  return databases.find((database) => database.name === name);
+}
+function findR2BucketByName(buckets, name) {
+  return buckets.find((bucket) => bucket.name === name);
+}
+function findQueueByName(queues, name) {
+  return queues.find((queue) => queue.name === name);
+}
+function findHyperdriveByName(hyperdrives, name) {
+  return hyperdrives.find((hyperdrive) => hyperdrive.name === name);
+}
+function collectPreviewScopedResourcePlan(config, options = {}) {
+  const mergedConfig = mergeConfigForEnvironment(config, options.environment);
+  const plan = createEmptyPreviewScopedResourcePlan();
+  const bindings = mergedConfig.bindings;
+  if (!bindings) {
+    return plan;
+  }
+  if (bindings.kv) {
+    plan.kv = Object.entries(bindings.kv).map(([bindingName, bindingConfig]) => {
+      return typeof bindingConfig === "string" ? createPreviewScopedResourceRef(bindingConfig, bindingName, options) : null;
+    }).filter((ref) => ref !== null);
+  }
+  if (bindings.d1) {
+    plan.d1 = Object.entries(bindings.d1).map(([bindingName, bindingConfig]) => {
+      return typeof bindingConfig === "string" ? createPreviewScopedResourceRef(bindingConfig, bindingName, options) : null;
+    }).filter((ref) => ref !== null);
+  }
+  if (bindings.r2) {
+    plan.r2 = Object.entries(bindings.r2).map(([bindingName, bindingConfig]) => {
+      return createPreviewScopedResourceRef(bindingConfig, bindingName, options);
+    }).filter((ref) => ref !== null);
+  }
+  if (bindings.queues) {
+    const queueRefs = new Map;
+    for (const queueName of Object.values(bindings.queues.producers ?? {})) {
+      upsertPreviewScopedQueueRef(queueRefs, queueName, options);
+    }
+    for (const consumer of bindings.queues.consumers ?? []) {
+      upsertPreviewScopedQueueRef(queueRefs, consumer.queue, options);
+      if (consumer.deadLetterQueue) {
+        upsertPreviewScopedQueueRef(queueRefs, consumer.deadLetterQueue, options);
+      }
+    }
+    plan.queues = Array.from(queueRefs.values());
+  }
+  if (bindings.vectorize) {
+    plan.vectorize = Object.entries(bindings.vectorize).map(([bindingName, bindingConfig]) => {
+      return createPreviewScopedResourceRef(bindingConfig.indexName, bindingName, options);
+    }).filter((ref) => ref !== null);
+  }
+  if (bindings.hyperdrive) {
+    plan.hyperdrive = Object.entries(bindings.hyperdrive).map(([bindingName, bindingConfig]) => {
+      if (typeof bindingConfig === "string") {
+        return createPreviewScopedResourceRef(bindingConfig, bindingName, options);
+      }
+      if (bindingConfig && typeof bindingConfig === "object" && "name" in bindingConfig && typeof bindingConfig.name === "string") {
+        if ("previewId" in bindingConfig && typeof bindingConfig.previewId === "string" && bindingConfig.previewId.trim()) {
+          return null;
+        }
+        const ref = createPreviewScopedResourceRef(bindingConfig.name, bindingName, options);
+        if (ref && bindingConfig.previewFallback === "base") {
+          ref.allowBaseFallback = true;
+        }
+        return ref;
+      }
+      return null;
+    }).filter((ref) => ref !== null);
+  }
+  if (bindings.analyticsEngine) {
+    plan.analyticsEngine = Object.entries(bindings.analyticsEngine).map(([bindingName, bindingConfig]) => {
+      return createPreviewScopedResourceRef(bindingConfig.dataset, bindingName, options);
+    }).filter((ref) => ref !== null);
+  }
+  if (bindings.browser) {
+    plan.browser = Object.entries(bindings.browser).map(([bindingName, bindingConfig]) => {
+      if (typeof bindingConfig !== "string") {
+        return null;
+      }
+      return createPreviewScopedResourceRef(bindingConfig, bindingName, options);
+    }).filter((ref) => ref !== null);
+  }
+  return plan;
+}
+async function preparePreviewScopedResourcesForDeploy(config, options = {}) {
+  const mergedConfig = mergeConfigForEnvironment(config, options.environment);
+  const plan = collectPreviewScopedResourcePlan(config, options);
+  const created = createEmptyPreviewScopedResourceNames();
+  const existing = createEmptyPreviewScopedResourceNames();
+  const warnings = resolvePreviewScopedResourceLifecycleWarnings(plan);
+  if (!hasPreviewScopedLifecycleResources(plan)) {
+    return {
+      config: materializePreviewScopedConfig(mergedConfig, options),
+      plan,
+      created,
+      existing,
+      warnings
+    };
+  }
+  const cloudflareApi = resolvePreviewScopedResourceLifecycleApi(options.cloudflare);
+  const accountId = await resolveLifecycleAccountId(config, options, cloudflareApi);
+  const {
+    namespaces,
+    databases,
+    buckets,
+    queues,
+    vectorizeIndexes,
+    hyperdrives
+  } = await loadPreviewScopedResourceLifecycleState(accountId, plan, cloudflareApi);
+  for (const ref of plan.kv) {
+    if (findKVNamespaceByName(namespaces, ref.previewName)) {
+      existing.kv.push(ref.previewName);
+      continue;
+    }
+    const namespace = await cloudflareApi.createKVNamespace(accountId, ref.previewName);
+    created.kv.push(ref.previewName);
+    namespaces.push(namespace);
+  }
+  for (const ref of plan.d1) {
+    if (findD1DatabaseByName(databases, ref.previewName)) {
+      existing.d1.push(ref.previewName);
+      continue;
+    }
+    const database = await cloudflareApi.createD1Database(accountId, ref.previewName);
+    created.d1.push(ref.previewName);
+    databases.push(database);
+  }
+  for (const ref of plan.r2) {
+    if (findR2BucketByName(buckets, ref.previewName)) {
+      existing.r2.push(ref.previewName);
+      continue;
+    }
+    const bucket = await cloudflareApi.createR2Bucket(accountId, ref.previewName);
+    created.r2.push(ref.previewName);
+    buckets.push(bucket);
+  }
+  for (const ref of plan.queues) {
+    if (findQueueByName(queues, ref.previewName)) {
+      existing.queues.push(ref.previewName);
+      continue;
+    }
+    const queue = await cloudflareApi.createQueue(accountId, ref.previewName);
+    created.queues.push(ref.previewName);
+    queues.push(queue);
+  }
+  for (const ref of plan.vectorize) {
+    if (findVectorizeIndexByName(vectorizeIndexes, ref.previewName)) {
+      existing.vectorize.push(ref.previewName);
+      continue;
+    }
+    const baseIndex = findVectorizeIndexByName(vectorizeIndexes, ref.baseName);
+    if (!baseIndex) {
+      throw new Error(`Could not provision preview Vectorize index "${ref.previewName}" because the base index "${ref.baseName}" was not found.`);
+    }
+    const createdIndex = await cloudflareApi.createVectorizeIndex(accountId, {
+      name: ref.previewName,
+      dimensions: baseIndex.dimensions,
+      metric: baseIndex.metric,
+      description: baseIndex.description
+    });
+    created.vectorize.push(ref.previewName);
+    vectorizeIndexes.push(createdIndex);
+  }
+  const hyperdriveBindingFallbacks = {};
+  for (const ref of plan.hyperdrive) {
+    if (findHyperdriveByName(hyperdrives, ref.previewName)) {
+      existing.hyperdrive.push(ref.previewName);
+      continue;
+    }
+    if (!findHyperdriveByName(hyperdrives, ref.baseName)) {
+      throw new Error(`Could not resolve preview Hyperdrive "${ref.previewName}" because neither the preview config nor the base config "${ref.baseName}" exists in this account.`);
+    }
+    if (!ref.allowBaseFallback) {
+      const bindingLabel = ref.bindingName ? `"${ref.bindingName}"` : `for preview name "${ref.previewName}"`;
+      throw new Error(`Preview Hyperdrive binding ${bindingLabel} has no dedicated preview Hyperdrive configuration "${ref.previewName}" in this account. ` + "Either provision a dedicated preview Hyperdrive (or set `previewId` on the binding), " + "or opt in to reusing the base Hyperdrive by setting `previewFallback: 'base'` on the binding.");
+    }
+    if (ref.bindingName) {
+      hyperdriveBindingFallbacks[ref.bindingName] = ref.baseName;
+    }
+    warnings.push(`Preview Hyperdrive "${ref.previewName}" is not auto-provisioned because Cloudflare does not expose stored Hyperdrive credentials for cloning. Devflare will reuse the base Hyperdrive "${ref.baseName}" for binding ${ref.bindingName ?? ref.previewName}.`);
+  }
+  const preparedConfig = applyHyperdriveBindingFallbacks(mergedConfig, hyperdriveBindingFallbacks);
+  return {
+    accountId,
+    config: materializePreviewScopedConfig(preparedConfig, options),
+    resourceResolutionCloudflare: createPreviewScopedResourceResolutionCloudflareApi({
+      namespaces,
+      databases,
+      hyperdrives
+    }),
+    plan,
+    created,
+    existing,
+    warnings
+  };
+}
+async function cleanupPreviewScopedResources(config, options = {}) {
+  const plan = collectPreviewScopedResourcePlan(config, options);
+  const candidates = createEmptyPreviewScopedResourceNames();
+  const deleted = createEmptyPreviewScopedResourceNames();
+  const warnings = resolvePreviewScopedResourceLifecycleWarnings(plan);
+  if (!hasPreviewScopedLifecycleResources(plan)) {
+    return {
+      plan,
+      candidates,
+      deleted,
+      warnings
+    };
+  }
+  const cloudflareApi = resolvePreviewScopedResourceLifecycleApi(options.cloudflare);
+  const accountId = await resolveLifecycleAccountId(config, options, cloudflareApi);
+  const apply = options.apply === true;
+  const {
+    namespaces,
+    databases,
+    buckets,
+    queues,
+    vectorizeIndexes,
+    hyperdrives
+  } = await loadPreviewScopedResourceLifecycleState(accountId, plan, cloudflareApi);
+  const kvCandidates = plan.kv.map((ref) => findKVNamespaceByName(namespaces, ref.previewName)).filter((namespace) => namespace !== undefined);
+  for (const namespace of kvCandidates) {
+    candidates.kv.push(namespace.name);
+    if (!apply) {
+      continue;
+    }
+    await cloudflareApi.deleteKVNamespace(accountId, namespace.id);
+    deleted.kv.push(namespace.name);
+  }
+  const d1Candidates = plan.d1.map((ref) => findD1DatabaseByName(databases, ref.previewName)).filter((database) => database !== undefined);
+  for (const database of d1Candidates) {
+    candidates.d1.push(database.name);
+    if (!apply) {
+      continue;
+    }
+    await cloudflareApi.deleteD1Database(accountId, database.id);
+    deleted.d1.push(database.name);
+  }
+  const r2Candidates = plan.r2.map((ref) => findR2BucketByName(buckets, ref.previewName)).filter((bucket) => bucket !== undefined);
+  for (const bucket of r2Candidates) {
+    candidates.r2.push(bucket.name);
+    if (!apply) {
+      continue;
+    }
+    await cloudflareApi.deleteR2Bucket(accountId, bucket.name);
+    deleted.r2.push(bucket.name);
+  }
+  const queueCandidates = plan.queues.map((ref) => findQueueByName(queues, ref.previewName)).filter((queue) => queue !== undefined);
+  for (const queue of queueCandidates) {
+    candidates.queues.push(queue.name);
+    if (!apply) {
+      continue;
+    }
+    if (!queue.id) {
+      warnings.push(`Skipping queue deletion for "${queue.name}" because Cloudflare did not return a queue id.`);
+      continue;
+    }
+    await cloudflareApi.deleteQueue(accountId, queue.id);
+    deleted.queues.push(queue.name);
+  }
+  const vectorizeCandidates = plan.vectorize.map((ref) => findVectorizeIndexByName(vectorizeIndexes, ref.previewName)).filter((index) => index !== undefined);
+  for (const index of vectorizeCandidates) {
+    candidates.vectorize.push(index.name);
+    if (!apply) {
+      continue;
+    }
+    await cloudflareApi.deleteVectorizeIndex(accountId, index.name);
+    deleted.vectorize.push(index.name);
+  }
+  const hyperdriveCandidates = plan.hyperdrive.map((ref) => findHyperdriveByName(hyperdrives, ref.previewName)).filter((hyperdrive) => hyperdrive !== undefined);
+  for (const hyperdrive of hyperdriveCandidates) {
+    candidates.hyperdrive.push(hyperdrive.name);
+    if (!apply) {
+      continue;
+    }
+    await cloudflareApi.deleteHyperdrive(accountId, hyperdrive.id);
+    deleted.hyperdrive.push(hyperdrive.name);
+  }
+  if (plan.hyperdrive.length > 0) {
+    warnings.push("Preview-scoped Hyperdrive cleanup only deletes preview configs that already exist. Devflare does not auto-provision preview Hyperdrives because Cloudflare does not expose stored Hyperdrive credentials for cloning.");
+  }
+  return {
+    accountId,
+    plan,
+    candidates,
+    deleted,
+    warnings
+  };
+}
+
+export { preparePreviewScopedResourcesForDeploy, cleanupPreviewScopedResources };

package/dist/{index-07q6yxyc.js → index-q8f4kawk.js}

@@ -13,15 +13,44 @@ function defineConfig(config) {
 // src/config/ref.ts
 var resolvedCache = new WeakMap;
 var pendingResolutions = new WeakMap;
+var PENDING_REF_VALUE = "<pending>";
+function extractConfigPathFromImportFn(fn) {
+  let source;
+  try {
+    source = Function.prototype.toString.call(fn);
+  } catch {
+    return PENDING_REF_VALUE;
+  }
+  if (!/import\s*\(/.test(source)) {
+    return PENDING_REF_VALUE;
+  }
+  const match = source.match(/import\s*\(\s*(['"`])([^'"`]+)\1\s*\)/);
+  const raw = match?.[2];
+  if (!raw || raw.length === 0) {
+    throw new Error("ref() could not extract a config path from the import function source. " + "The specifier must be a static string literal — dynamic or computed " + "specifiers (e.g. template literals with expressions) are not supported. " + "If this input has been minified, pass an unminified config source.");
+  }
+  if (match?.[1] === "`" && /\$\{/.test(raw)) {
+    throw new Error("ref() import specifier is a template literal with an embedded expression. " + "The specifier must be a static string literal so the config path can " + "be resolved ahead of time.");
+  }
+  if (raw.length < 2 && !/[./]/.test(raw)) {
+    throw new Error(`ref() extracted a suspiciously short config path (${JSON.stringify(raw)}). ` + "This usually indicates a minified bundle where the original specifier " + "was rewritten. Pass an unminified config source.");
+  }
+  return raw;
+}
 function ref(nameOrImport, maybeImport) {
   const nameOverride = typeof nameOrImport === "string" ? nameOrImport : undefined;
-  const importFn = typeof nameOrImport === "function" ? nameOrImport : maybeImport;
+  let importFn;
+  if (typeof nameOrImport === "function") {
+    importFn = nameOrImport;
+  } else if (typeof maybeImport === "function") {
+    importFn = maybeImport;
+  }
   if (!importFn) {
     throw new Error("ref() requires an import function");
   }
-  const fnSource = importFn.toString();
-  const importMatch = fnSource.match(/import\s*\(\s*['"]([^'"]+)['"]\s*\)/);
-  const configPath = importMatch?.[1] ?? "<pending>";
+  const resolvedImportFn = importFn;
+  const configPath = extractConfigPathFromImportFn(resolvedImportFn);
+  const doBindingCache = new Map;
   async function doResolve() {
     const cached = resolvedCache.get(proxy);
     if (cached)
@@ -30,7 +59,7 @@ function ref(nameOrImport, maybeImport) {
     if (pending)
       return pending;
     const promise = (async () => {
-      const module = await importFn();
+      const module = await resolvedImportFn();
       const config = "default" in module ? module.default : module;
       if (!config.name && !nameOverride) {
         throw new Error('Referenced config must have a "name" property');
@@ -43,8 +72,11 @@ function ref(nameOrImport, maybeImport) {
       resolvedCache.set(proxy, resolved);
       return resolved;
     })();
-    pendingResolutions.set(proxy, promise);
-    return promise;
+    const trackedPromise = promise.finally(() => {
+      pendingResolutions.delete(proxy);
+    });
+    pendingResolutions.set(proxy, trackedPromise);
+    return trackedPromise;
   }
   function getResolved() {
     const cached = resolvedCache.get(proxy);
@@ -60,7 +92,7 @@ function ref(nameOrImport, maybeImport) {
           return cached.name;
         if (nameOverride)
           return nameOverride;
-        return "<pending>";
+        return PENDING_REF_VALUE;
       },
       entrypoint,
       __ref: proxy
@@ -74,7 +106,7 @@ function ref(nameOrImport, maybeImport) {
           return cached.name;
         if (nameOverride)
           return nameOverride;
-        return "<pending>";
+        return PENDING_REF_VALUE;
       }
       if (prop === "entrypoint")
         return;
@@ -84,7 +116,11 @@ function ref(nameOrImport, maybeImport) {
     }
   });
   function createDOBinding(bindingName) {
-    return {
+    const cachedBinding = doBindingCache.get(bindingName);
+    if (cachedBinding) {
+      return cachedBinding;
+    }
+    const doBinding = {
       get className() {
         const cached = resolvedCache.get(proxy);
         if (cached?.config.bindings?.durableObjects) {
@@ -96,7 +132,7 @@ function ref(nameOrImport, maybeImport) {
             return doConfig.className;
           }
         }
-        return bindingName;
+        return PENDING_REF_VALUE;
       },
       get scriptName() {
         const cached = resolvedCache.get(proxy);
@@ -104,10 +140,13 @@ function ref(nameOrImport, maybeImport) {
           return cached.name;
         if (nameOverride)
           return nameOverride;
-        return "<pending>";
+        return PENDING_REF_VALUE;
       },
+      kind: "cross-worker",
       __ref: proxy
     };
+    doBindingCache.set(bindingName, doBinding);
+    return doBinding;
   }
   const knownProps = new Set(["name", "config", "configPath", "worker", "__import", "__nameOverride", "resolve", "then"]);
   const proxyTarget = {
@@ -119,7 +158,7 @@ function ref(nameOrImport, maybeImport) {
     },
     configPath,
     worker: workerAccessor,
-    __import: importFn,
+    __import: resolvedImportFn,
     __nameOverride: nameOverride,
     resolve: doResolve
   };
@@ -132,6 +171,13 @@ function ref(nameOrImport, maybeImport) {
         return Reflect.get(target, prop);
       }
       if (typeof prop === "string" && /^[A-Z][A-Z0-9_]*$/.test(prop)) {
+        const cached = resolvedCache.get(proxy);
+        if (cached) {
+          const doBindings = cached.config.bindings?.durableObjects;
+          if (!doBindings || !(prop in doBindings)) {
+            return;
+          }
+        }
         return createDOBinding(prop);
       }
       return Reflect.get(target, prop);
@@ -140,29 +186,19 @@ function ref(nameOrImport, maybeImport) {
       if (typeof prop === "string") {
         if (knownProps.has(prop))
           return true;
-        if (/^[A-Z][A-Z0-9_]*$/.test(prop))
+        if (/^[A-Z][A-Z0-9_]*$/.test(prop)) {
+          const cached = resolvedCache.get(proxy);
+          if (cached) {
+            const doBindings = cached.config.bindings?.durableObjects;
+            return !!doBindings && prop in doBindings;
+          }
           return true;
+        }
       }
       return Reflect.has(target, prop);
     }
   });
   return proxy;
 }
-async function resolveRef(configImport, options) {
-  const result = options?.workerName ? ref(options.workerName, configImport) : ref(configImport);
-  await result.resolve();
-  return result;
-}
-function serviceBinding(refOrLegacy, options) {
-  if ("worker" in refOrLegacy) {
-    const entrypoint2 = options?.entrypoint;
-    return entrypoint2 ? refOrLegacy.worker(entrypoint2) : refOrLegacy.worker;
-  }
-  const entrypoint = options?.entrypoint ?? refOrLegacy.entrypoint;
-  return {
-    service: refOrLegacy.name,
-    ...entrypoint && { entrypoint },
-    __ref: refOrLegacy
-  };
-}
-export { defineConfig, ref, resolveRef, serviceBinding };
+
+export { defineConfig, ref };