alchemy 2.0.0-beta.60 → 2.0.0-beta.62

package/src/Cloudflare/Containers/LocalContainerProvider.ts

@@ -1,10 +1,10 @@
 import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
-import { AlchemyContext } from "../../AlchemyContext.ts";
+import * as Redacted from "effect/Redacted";
 import * as Artifacts from "../../Artifacts.ts";
-import { getStableContextDir } from "../../Bundle/TempRoot.ts";
+import { hashDirectory } from "../../Command/Memo.ts";
 import { isResolved } from "../../Diff.ts";
-import { Docker } from "../../Docker/Docker.ts";
 import * as RpcProvider from "../../Local/RpcProvider.ts";
 import { sha256Object } from "../../Util/sha256.ts";
 import { normalizeNulls } from "../../Util/stable.ts";
@@ -13,12 +13,12 @@ import { generateLocalId, LOCAL_ENTRY_URL } from "../LocalRuntime.ts";
 import type {
   ContainerApplication,
   ContainerApplicationProps,
+  DevContainerImage,
 } from "./ContainerApplication.ts";
 import {
-  buildFinalDockerfile,
-  bundleContainerProgram,
   createContainerApplicationName,
-  foldEnvIntoEnvironmentVariables,
+  makeContainerEnv,
+  prepareContainerBuildContext,
 } from "./ContainerBundle.ts";
 import { ContainerPlatform } from "./ContainerPlatform.ts";
 
@@ -26,9 +26,10 @@ import { ContainerPlatform } from "./ContainerPlatform.ts";
  * Local (dev) provider for Cloudflare Container applications.
  *
  * The Docker build/run is owned by `@distilled.cloud/cloudflare-runtime`; this
- * provider's only job is to bundle the container program once and materialize
- * it into a stable Docker build context, then surface that context as a
- * `dev: ContainerImage.Build` output so the runtime can `docker build` it.
+ * provider's only job is to resolve the `dev` image the runtime should use —
+ * a build context to `docker build` (Effect-native `main` or a user-supplied
+ * Dockerfile) or a remote image to `docker pull` — mirroring the three image
+ * variants of the live provider's `computeImage`.
  *
  * Everything else on the attributes is a placeholder: the real
  * `applicationId`/`configuration`/etc. only exist once the live provider
@@ -41,68 +42,72 @@ export const LocalContainerProvider = () =>
     ContainerPlatform,
     LOCAL_ENTRY_URL,
     Effect.gen(function* () {
-      const { dotAlchemy } = yield* AlchemyContext;
-      const docker = yield* Docker;
+      const fs = yield* FileSystem.FileSystem;
       const path = yield* Path.Path;
 
-      // Bundle the container entrypoint and write it (plus the generated
-      // Dockerfile) into a stable build context directory. `Docker.build` in
-      // cloudflare-runtime reads `dockerfile` as a file path and uses
-      // `context` as the build context, so we point `dev` at both.
-      const prepareImage = Effect.fn(function* (
-        id: string,
-        news: ContainerApplicationProps,
-      ) {
-        const main = news.main;
-        if (!main) {
-          return yield* Effect.die(
-            new Error("Container requires a `main` entrypoint."),
-          );
-        }
-        const runtime = news.runtime ?? "bun";
-        const context = yield* getStableContextDir(
-          process.cwd(),
-          dotAlchemy,
-          `${id}-container`,
-        );
-        const dockerfileContent = buildFinalDockerfile(
-          news.dockerfile,
-          runtime,
-          news.external,
-          news.autoInstallExternals,
-        );
-        const [bundle] = yield* Effect.all(
-          [
-            bundleContainerProgram({
-              id,
-              main,
-              runtime,
-              handler: news.handler,
-              isExternal: news.isExternal,
-              external: news.external,
-              outdir: context,
-            }),
-            docker.materialize({
-              context: context,
+      // Resolve the `dev` image plus a content hash for change detection.
+      // Cached per run (`Artifacts.cached`, keyed by resource id) so repeated
+      // diffs/reconciles in a single dev session don't re-bundle or re-hash.
+      //
+      // IMPORTANT: the cached result must stay env-free. The cache is warmed
+      // by `precreate`, which runs against unresolved props — binding-derived
+      // env values (e.g. an ApiToken's value/accountId) are still unresolved
+      // `Output`s there and get skipped. Caching env here would freeze that
+      // incomplete env and start the container without its bindings;
+      // `makeAttributes` attaches the freshly-computed env instead.
+      const prepareImage = (id: string, news: ContainerApplicationProps) =>
+        Effect.gen(function* () {
+          // Variant 1 — Effect-native program. Bundle `main` and write it
+          // (plus the generated Dockerfile) into a stable build context
+          // directory. `Docker.build` in cloudflare-runtime reads `dockerfile`
+          // as a file path and uses `context` as the build context, so we
+          // point `dev` at both. The build-context materialization is shared
+          // with the live provider (see `prepareContainerBuildContext`).
+          if (news.main) {
+            const { context, dockerfile, hash } =
+              yield* prepareContainerBuildContext(id, news);
+            return {
+              dev: {
+                context: path.relative(process.cwd(), context),
+                dockerfile: path.relative(context, dockerfile),
+              } as DevContainerImage,
+              hash,
+            };
+          }
+
+          // Variant 2 — pre-built remote image. The runtime pulls it
+          // directly; there is nothing to build.
+          if (news.image) {
+            return {
+              dev: { imageUri: news.image } as DevContainerImage,
+              hash: yield* sha256Object({ image: news.image }),
+            };
+          }
+
+          // Variant 3 — user-supplied Dockerfile + build context directory.
+          // The runtime builds the user's Dockerfile against the (real-path'd)
+          // context, exactly like the live provider's `external` variant.
+          const context = yield* fs.realPath(news.context ?? ".");
+          const dockerfile = news.dockerfile
+            ? yield* fs.realPath(news.dockerfile)
+            : path.join(context, "Dockerfile");
+          const contextHash = yield* hashDirectory({ cwd: context });
+          const dockerfileContent = yield* fs.readFileString(dockerfile);
+          return {
+            dev: {
+              context: path.relative(process.cwd(), context),
+              dockerfile: path.relative(context, dockerfile),
+            } as DevContainerImage,
+            hash: yield* sha256Object({
+              contextHash,
               dockerfile: dockerfileContent,
-              files: [],
             }),
-          ],
-          { concurrency: "unbounded" },
-        );
-        return {
-          context,
-          dockerfile: path.join(context, "Dockerfile"),
-          hash: yield* sha256Object({
-            bundle: bundle.hash,
-            dockerfileContent,
-          }),
-        };
-      }, Artifacts.cached("container-image"));
+          };
+        }).pipe(Artifacts.cached(`container-image:${id}`));
 
       const placeholderConfiguration = (
         props: ContainerApplicationProps,
-        accountId: string,
+        env: Record<string, string | Redacted.Redacted<string>>,
       ) =>
         normalizeNulls({
           image: "local",
@@ -113,10 +118,10 @@ export const LocalContainerProvider = () =>
           vcpu: props.vcpu,
           memory: props.memory,
           disk: props.disk,
-          environmentVariables: foldEnvIntoEnvironmentVariables(
-            props,
-            accountId,
-          ),
+          environmentVariables: Object.entries(env).map(([name, value]) => ({
+            name,
+            value: Redacted.isRedacted(value) ? Redacted.value(value) : value,
+          })),
           labels: props.labels,
           network: props.network,
           command: props.command,
@@ -136,7 +141,8 @@ export const LocalContainerProvider = () =>
         output: ContainerApplication["Attributes"] | undefined;
       }) {
         const { accountId } = yield* yield* CloudflareEnvironment;
-        const { context, hash, dockerfile } = yield* prepareImage(id, news);
+        const env = makeContainerEnv(news, accountId);
+        const { dev, hash } = yield* prepareImage(id, news);
         return {
           applicationId: output?.applicationId ?? generateLocalId(),
           applicationName: yield* createContainerApplicationName(id, news.name),
@@ -146,11 +152,11 @@ export const LocalContainerProvider = () =>
           maxInstances: news.maxInstances ?? 1,
           constraints: news.constraints,
           affinities: news.affinities,
-          configuration: placeholderConfiguration(news, accountId),
+          configuration: placeholderConfiguration(news, env),
           durableObjects: undefined,
           createdAt: new Date().toISOString(),
           version: 1,
-          dev: { context, dockerfile },
+          dev: { ...dev, env },
           hash: { image: hash },
         } satisfies ContainerApplication["Attributes"];
       });
@@ -164,7 +170,7 @@ export const LocalContainerProvider = () =>
           if (!output) return { action: "update" };
           if (!isResolved(news)) return undefined;
           const input = yield* prepareImage(id, news);
-          return input.hash !== output.hash?.image
+          return input.hash !== output.hash?.image || !output.dev
             ? { action: "update" }
             : undefined;
         }),

package/src/Cloudflare/ContentScanning/ContentScanning.ts

@@ -107,7 +107,9 @@ export type ContentScanning = Resource<
  *
  * @see https://developers.cloudflare.com/waf/detections/malicious-uploads/
  */
-export const ContentScanning = Resource<ContentScanning>(TypeId);
+export const ContentScanning = Resource<ContentScanning>(TypeId, {
+  aliases: ["Cloudflare.ContentScanning"],
+});
 
 /**
  * Returns true if the given value is a ContentScanning resource.

package/src/Cloudflare/CustomCertificate/CustomCertificate.ts

@@ -244,7 +244,9 @@ export type CustomCertificate = Resource<
  *
  * @see https://developers.cloudflare.com/ssl/edge-certificates/custom-certificates/
  */
-export const CustomCertificate = Resource<CustomCertificate>(TypeId);
+export const CustomCertificate = Resource<CustomCertificate>(TypeId, {
+  aliases: ["Cloudflare.CustomCertificate"],
+});
 
 /**
  * Returns true if the given value is a CustomCertificate resource.

package/src/Cloudflare/CustomHostname/CustomHostname.ts

@@ -280,6 +280,7 @@ export type CustomHostname = Resource<
  */
 export const CustomHostname = Resource<CustomHostname>(
   "Cloudflare.CustomHostname.CustomHostname",
+  { aliases: ["Cloudflare.CustomHostname"] },
 );
 
 export const isCustomHostname = (value: unknown): value is CustomHostname =>

package/src/Cloudflare/CustomHostname/FallbackOrigin.ts

@@ -78,6 +78,7 @@ export type FallbackOrigin = Resource<
  */
 export const FallbackOrigin = Resource<FallbackOrigin>(
   "Cloudflare.CustomHostname.FallbackOrigin",
+  { aliases: ["Cloudflare.FallbackOrigin"] },
 );
 
 export const isFallbackOrigin = (value: unknown): value is FallbackOrigin =>

package/src/Cloudflare/CustomNameserver/CustomNameserver.ts

@@ -132,7 +132,9 @@ export type CustomNameserver = Resource<
  *
  * @see https://developers.cloudflare.com/dns/nameservers/custom-nameservers/account-custom-nameservers/
  */
-export const CustomNameserver = Resource<CustomNameserver>(TypeId);
+export const CustomNameserver = Resource<CustomNameserver>(TypeId, {
+  aliases: ["Cloudflare.CustomNameserver"],
+});
 
 /**
  * Returns true if the given value is a CustomNameserver resource.

package/src/Cloudflare/D1/Database.ts

@@ -6,7 +6,7 @@ import type { HttpClient } from "effect/unstable/http/HttpClient";
 import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
-import { Resource } from "../../Resource.ts";
+import { isResourceOfType, Resource } from "../../Resource.ts";
 import { listSqlFiles, readSqlFile } from "../../Sql/SqlFile.ts";
 import { recordsEqual } from "../../Util/equal.ts";
 import { CloudflareEnvironment } from "../CloudflareEnvironment.ts";
@@ -17,7 +17,7 @@ import { cloneDatabase } from "./CloneDatabase.ts";
 import { importD1Database } from "./ImportDatabase.ts";
 
 export const isDatabase = (value: unknown): value is Database =>
-  typeof value === "object" && (value as any)?.Type === "Cloudflare.D1Database";
+  isResourceOfType(value, "Cloudflare.D1Database");
 
 export type Jurisdiction = "default" | "eu" | "fedramp";
 export type PrimaryLocationHint =

package/src/Cloudflare/DNS/AccountSettings.ts

@@ -228,7 +228,9 @@ export type AccountDnsSettings = Resource<
  * });
  * ```
  */
-export const AccountDnsSettings = Resource<AccountDnsSettings>(TypeId);
+export const AccountDnsSettings = Resource<AccountDnsSettings>(TypeId, {
+  aliases: ["Cloudflare.Dns.AccountSettings"],
+});
 
 /**
  * Returns true if the given value is an AccountDnsSettings resource.

package/src/Cloudflare/DNS/Dnssec.ts

@@ -190,7 +190,9 @@ export type Dnssec = Resource<
  * });
  * ```
  */
-export const Dnssec = Resource<Dnssec>(TypeId);
+export const Dnssec = Resource<Dnssec>(TypeId, {
+  aliases: ["Cloudflare.Dns.Dnssec"],
+});
 
 /**
  * Returns true if the given value is a Dnssec resource.

package/src/Cloudflare/DNS/Firewall.ts

@@ -238,7 +238,9 @@ export type Firewall = Resource<
  *
  * @see https://developers.cloudflare.com/dns/dns-firewall/
  */
-export const Firewall = Resource<Firewall>(TypeId);
+export const Firewall = Resource<Firewall>(TypeId, {
+  aliases: ["Cloudflare.DnsFirewall"],
+});
 
 /**
  * Returns true if the given value is a DnsFirewall resource.

package/src/Cloudflare/DNS/Record.ts

@@ -163,7 +163,9 @@ export type Record = Resource<
  * });
  * ```
  */
-export const Record = Resource<Record>("Cloudflare.DNS.Record");
+export const Record = Resource<Record>("Cloudflare.DNS.Record", {
+  aliases: ["Cloudflare.Dns.Record"],
+});
 
 export const RecordProvider = () =>
   Provider.succeed(Record, {

package/src/Cloudflare/DNS/View.ts

@@ -83,7 +83,9 @@ export type View = Resource<
  *
  * @see https://developers.cloudflare.com/dns/internal-dns/
  */
-export const View = Resource<View>(DnsViewTypeId);
+export const View = Resource<View>(DnsViewTypeId, {
+  aliases: ["Cloudflare.Dns.View"],
+});
 
 /**
  * Returns true if the given value is a View resource.

package/src/Cloudflare/DNS/ZoneSettings.ts

@@ -252,7 +252,9 @@ export type ZoneDnsSettings = Resource<
  * });
  * ```
  */
-export const ZoneDnsSettings = Resource<ZoneDnsSettings>(TypeId);
+export const ZoneDnsSettings = Resource<ZoneDnsSettings>(TypeId, {
+  aliases: ["Cloudflare.Dns.ZoneSettings"],
+});
 
 /**
  * Returns true if the given value is a ZoneDnsSettings resource.

package/src/Cloudflare/DNS/ZoneTransferAcl.ts

@@ -84,7 +84,9 @@ export type ZoneTransferAcl = Resource<
  *
  * @see https://developers.cloudflare.com/dns/zone-setups/zone-transfers/
  */
-export const ZoneTransferAcl = Resource<ZoneTransferAcl>(TypeId);
+export const ZoneTransferAcl = Resource<ZoneTransferAcl>(TypeId, {
+  aliases: ["Cloudflare.Dns.ZoneTransferAcl"],
+});
 
 /**
  * Returns true if the given value is a ZoneTransferAcl resource.

package/src/Cloudflare/DNS/ZoneTransferIncoming.ts

@@ -100,7 +100,9 @@ export type ZoneTransferIncoming = Resource<
  *
  * @see https://developers.cloudflare.com/dns/zone-setups/zone-transfers/setup/
  */
-export const ZoneTransferIncoming = Resource<ZoneTransferIncoming>(TypeId);
+export const ZoneTransferIncoming = Resource<ZoneTransferIncoming>(TypeId, {
+  aliases: ["Cloudflare.Dns.ZoneTransferIncoming"],
+});
 
 /**
  * Returns true if the given value is a ZoneTransferIncoming resource.

package/src/Cloudflare/DNS/ZoneTransferOutgoing.ts

@@ -112,7 +112,9 @@ export type ZoneTransferOutgoing = Resource<
  *
  * @see https://developers.cloudflare.com/dns/zone-setups/zone-transfers/setup/
  */
-export const ZoneTransferOutgoing = Resource<ZoneTransferOutgoing>(TypeId);
+export const ZoneTransferOutgoing = Resource<ZoneTransferOutgoing>(TypeId, {
+  aliases: ["Cloudflare.Dns.ZoneTransferOutgoing"],
+});
 
 /**
  * Returns true if the given value is a ZoneTransferOutgoing resource.

package/src/Cloudflare/DNS/ZoneTransferPeer.ts

@@ -119,7 +119,9 @@ export type ZoneTransferPeer = Resource<
  *
  * @see https://developers.cloudflare.com/dns/zone-setups/zone-transfers/
  */
-export const ZoneTransferPeer = Resource<ZoneTransferPeer>(TypeId);
+export const ZoneTransferPeer = Resource<ZoneTransferPeer>(TypeId, {
+  aliases: ["Cloudflare.Dns.ZoneTransferPeer"],
+});
 
 /**
  * Returns true if the given value is a ZoneTransferPeer resource.

package/src/Cloudflare/DNS/ZoneTransferTsig.ts

@@ -91,7 +91,9 @@ export type ZoneTransferTsig = Resource<
  *
  * @see https://developers.cloudflare.com/dns/zone-setups/zone-transfers/
  */
-export const ZoneTransferTsig = Resource<ZoneTransferTsig>(TypeId);
+export const ZoneTransferTsig = Resource<ZoneTransferTsig>(TypeId, {
+  aliases: ["Cloudflare.Dns.ZoneTransferTsig"],
+});
 
 /**
  * Returns true if the given value is a ZoneTransferTsig resource.

package/src/Cloudflare/Diagnostics/EndpointHealthcheck.ts

@@ -260,9 +260,10 @@ const observeExisting = (accountId: string, id: string) =>
     Effect.map((hc): ObservedHealthcheck => ({ ...hc, accountId })),
     Effect.retry({
       while: (e) => e._tag === "EndpointHealthcheckNotFound",
-      schedule: Schedule.exponential("500 millis").pipe(
-        Schedule.both(Schedule.recurs(6)),
-      ),
+      schedule: Schedule.max([
+        Schedule.exponential("500 millis"),
+        Schedule.recurs(6),
+      ]),
     }),
     Effect.catchTag("EndpointHealthcheckNotFound", () =>
       Effect.succeed(undefined),

package/src/Cloudflare/Email/Address.ts

@@ -55,7 +55,9 @@ export type Address = Resource<
  * Cloudflare sends a verification email when the address is first created.
  * The address must be verified before it can receive routed mail.
  */
-export const Address = Resource<Address>("Cloudflare.Email.Address");
+export const Address = Resource<Address>("Cloudflare.Email.Address", {
+  aliases: ["Cloudflare.EmailAddress"],
+});
 
 const toAttrs = (
   accountId: string,

package/src/Cloudflare/Email/AllowPolicy.ts

@@ -144,6 +144,7 @@ export type AllowPolicy = Resource<
  */
 export const AllowPolicy = Resource<AllowPolicy>(
   EmailSecurityAllowPolicyTypeId,
+  { aliases: ["Cloudflare.EmailSecurity.AllowPolicy"] },
 );
 
 /**

package/src/Cloudflare/Email/BlockSender.ts

@@ -104,6 +104,7 @@ export type BlockSender = Resource<
  */
 export const BlockSender = Resource<BlockSender>(
   EmailSecurityBlockSenderTypeId,
+  { aliases: ["Cloudflare.EmailSecurity.BlockSender"] },
 );
 
 /**

package/src/Cloudflare/Email/CatchAll.ts

@@ -124,7 +124,9 @@ export type CatchAll = Resource<
  * });
  * ```
  */
-export const CatchAll = Resource<CatchAll>(CatchAllTypeId);
+export const CatchAll = Resource<CatchAll>(CatchAllTypeId, {
+  aliases: ["Cloudflare.EmailCatchAll"],
+});
 
 /**
  * Returns true if the given value is an CatchAll resource.
@@ -178,7 +180,10 @@ export const CatchAllProvider = () =>
 
     read: Effect.fn(function* ({ output, olds }) {
       const zoneId =
-        output?.zoneId ?? (olds ? yield* resolve(olds.zone) : undefined);
+        // `olds.zone` may be `undefined` when a `creating` row was persisted
+        // before upstream Outputs resolved — report "not found" then.
+        output?.zoneId ??
+        (olds?.zone !== undefined ? yield* resolve(olds.zone) : undefined);
       if (!zoneId) return undefined;
       const observed = yield* emailRouting.getRuleCatchAll({ zoneId }).pipe(
         // Zone deleted out-of-band (or the token can no longer see it) —

package/src/Cloudflare/Email/Domain.ts

@@ -170,7 +170,9 @@ export type Domain = Resource<
  *
  * @see https://developers.cloudflare.com/cloudflare-one/email-security/
  */
-export const Domain = Resource<Domain>(EmailSecurityDomainTypeId);
+export const Domain = Resource<Domain>(EmailSecurityDomainTypeId, {
+  aliases: ["Cloudflare.EmailSecurity.Domain"],
+});
 
 /**
  * Returns true if the given value is an Domain resource.

package/src/Cloudflare/Email/ImpersonationRegistryEntry.ts

@@ -107,6 +107,7 @@ export type ImpersonationRegistryEntry = Resource<
  */
 export const ImpersonationRegistryEntry = Resource<ImpersonationRegistryEntry>(
   EmailSecurityImpersonationRegistryEntryTypeId,
+  { aliases: ["Cloudflare.EmailSecurity.ImpersonationRegistryEntry"] },
 );
 
 /**

package/src/Cloudflare/Email/Routing.ts

@@ -71,7 +71,9 @@ export type Routing = Resource<
  * });
  * ```
  */
-export const Routing = Resource<Routing>("Cloudflare.Email.Routing");
+export const Routing = Resource<Routing>("Cloudflare.Email.Routing", {
+  aliases: ["Cloudflare.EmailRouting"],
+});
 
 const resolve = Effect.fn(function* (zone: Reference) {
   const { accountId } = yield* yield* CloudflareEnvironment;

package/src/Cloudflare/Email/Rule.ts

@@ -84,7 +84,9 @@ export type Rule = Resource<
  * });
  * ```
  */
-export const Rule = Resource<Rule>("Cloudflare.Email.Rule");
+export const Rule = Resource<Rule>("Cloudflare.Email.Rule", {
+  aliases: ["Cloudflare.EmailRule"],
+});
 
 export const RuleProvider = () =>
   Provider.succeed(Rule, {

package/src/Cloudflare/Email/SendingSubdomain.ts

@@ -113,6 +113,7 @@ export type SendingSubdomain = Resource<
  */
 export const SendingSubdomain = Resource<SendingSubdomain>(
   SendingSubdomainTypeId,
+  { aliases: ["Cloudflare.EmailSendingSubdomain"] },
 );
 
 /**

package/src/Cloudflare/Email/TrustedDomain.ts

@@ -106,6 +106,7 @@ export type TrustedDomain = Resource<
  */
 export const TrustedDomain = Resource<TrustedDomain>(
   EmailSecurityTrustedDomainTypeId,
+  { aliases: ["Cloudflare.EmailSecurity.TrustedDomain"] },
 );
 
 /**

package/src/Cloudflare/Fetcher.ts

@@ -70,11 +70,18 @@ export const fromCloudflareFetcher = (
   fetcher: cf.Fetcher | globalThis.Fetcher,
 ): Fetcher => {
   const fetch = (request: Request) =>
-    Effect.promise((signal) =>
-      (fetcher as globalThis.Fetcher).fetch(request, {
-        signal: signal,
-      }),
-    ).pipe(
+    Effect.suspend(() => {
+      // Clone per attempt, keeping `request` pristine: the HandlerNotReady
+      // retry below re-runs this suspend, and replaying a Request whose body
+      // the failed attempt already consumed makes workerd reject with
+      // "TypeError: Cannot reconstruct a Request with a used body".
+      const attempt = request.clone() as Request;
+      return Effect.promise((signal) =>
+        (fetcher as globalThis.Fetcher).fetch(attempt, {
+          signal: signal,
+        }),
+      );
+    }).pipe(
       // The "Handler does not export a fetch()" window is a property of
       // invoking a freshly-deployed Cloudflare binding, so it is ridden out
       // HERE — the one adapter every binding flows through — rather than in any

package/src/Cloudflare/Flagship/App.ts

@@ -1,10 +1,9 @@
 import * as flagship from "@distilled.cloud/cloudflare/flagship";
 import * as Effect from "effect/Effect";
-import * as Predicate from "effect/Predicate";
 import * as Stream from "effect/Stream";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
-import { Resource } from "../../Resource.ts";
+import { isResourceOfType, Resource } from "../../Resource.ts";
 import { CloudflareEnvironment } from "../CloudflareEnvironment.ts";
 import type { Providers } from "../Providers.ts";
 
@@ -150,7 +149,7 @@ export const App = Resource<App>(TypeId);
  * Returns true if the given value is a Flagship App resource.
  */
 export const isApp = (value: unknown): value is App =>
-  Predicate.hasProperty(value, "Type") && value.Type === TypeId;
+  isResourceOfType(value, TypeId);
 
 export const AppProvider = () =>
   Provider.succeed(App, {

package/src/Cloudflare/Fraud/DetectionSettings.ts

@@ -157,7 +157,9 @@ export type DetectionSettings = Resource<
  *
  * @see https://developers.cloudflare.com/bots/additional-configurations/fraud-detection/
  */
-export const DetectionSettings = Resource<DetectionSettings>(TypeId);
+export const DetectionSettings = Resource<DetectionSettings>(TypeId, {
+  aliases: ["Cloudflare.FraudDetectionSettings"],
+});
 
 /**
  * Returns true if the given value is a DetectionSettings resource.

package/src/Cloudflare/GoogleTagGateway/GoogleTagGateway.ts

@@ -129,7 +129,9 @@ export type GoogleTagGateway = Resource<
  *
  * @see https://developers.cloudflare.com/google-tag-gateway/
  */
-export const GoogleTagGateway = Resource<GoogleTagGateway>(TypeId);
+export const GoogleTagGateway = Resource<GoogleTagGateway>(TypeId, {
+  aliases: ["Cloudflare.GoogleTagGateway"],
+});
 
 /**
  * Returns true if the given value is a GoogleTagGateway resource.
@@ -187,7 +189,10 @@ export const GoogleTagGatewayProvider = () =>
 
     read: Effect.fn(function* ({ output, olds }) {
       const zoneId =
-        output?.zoneId ?? (olds ? yield* resolve(olds.zone) : undefined);
+        // `olds.zone` may be `undefined` when a `creating` row was persisted
+        // before upstream Outputs resolved — report "not found" then.
+        output?.zoneId ??
+        (olds?.zone !== undefined ? yield* resolve(olds.zone) : undefined);
       if (!zoneId) return undefined;
       const observed = yield* googleTagGateway.getConfig({ zoneId }).pipe(
         // Zone deleted out-of-band — the config is gone with it.