alchemy 2.0.0-beta.57 → 2.0.0-beta.59

package/lib/Cloudflare/ClientCertificate/ClientCertificate.js

@@ -8,7 +8,7 @@ import * as Provider from "../../Provider.js";
 import { Resource } from "../../Resource.js";
 import { CloudflareEnvironment } from "../CloudflareEnvironment.js";
 import { listAllZones } from "../Zone/lookup.js";
-const ClientCertificateTypeId = "Cloudflare.ClientCertificate";
+const TypeId = "Cloudflare.ClientCertificate.ClientCertificate";
 /**
  * A zone-level API Shield mTLS client certificate signed by the Cloudflare
  * Managed CA.
@@ -32,7 +32,7 @@ const ClientCertificateTypeId = "Cloudflare.ClientCertificate";
  * @section Issuing a client certificate
  * @example Sign a CSR with the Cloudflare Managed CA
  * ```typescript
- * const cert = yield* Cloudflare.ClientCertificate("ApiClient", {
+ * const cert = yield* Cloudflare.ClientCertificate.ClientCertificate("ApiClient", {
  *   zoneId: zone.zoneId,
  *   csr: clientCsrPem,
  *   validityDays: 365,
@@ -45,7 +45,7 @@ const ClientCertificateTypeId = "Cloudflare.ClientCertificate";
  * const fs = yield* FileSystem.FileSystem;
  * const csr = yield* fs.readFileString("certs/client.csr");
  *
- * const cert = yield* Cloudflare.ClientCertificate("ApiClient", {
+ * const cert = yield* Cloudflare.ClientCertificate.ClientCertificate("ApiClient", {
  *   zoneId: zone.zoneId,
  *   csr,
  *   validityDays: 90,
@@ -57,7 +57,7 @@ const ClientCertificateTypeId = "Cloudflare.ClientCertificate";
  * ```typescript
  * // csr and validityDays are immutable — changing either replaces the
  * // certificate: a new one is signed and the old one is revoked.
- * const cert = yield* Cloudflare.ClientCertificate("ApiClient", {
+ * const cert = yield* Cloudflare.ClientCertificate.ClientCertificate("ApiClient", {
  *   zoneId: zone.zoneId,
  *   csr: rotatedCsrPem,
  *   validityDays: 365,
@@ -66,12 +66,11 @@ const ClientCertificateTypeId = "Cloudflare.ClientCertificate";
  *
  * @see https://developers.cloudflare.com/ssl/client-certificates/
  */
-export const ClientCertificate = Resource(ClientCertificateTypeId);
+export const ClientCertificate = Resource(TypeId);
 /**
  * Returns true if the given value is a ClientCertificate resource.
  */
-export const isClientCertificate = (value) => Predicate.hasProperty(value, "Type") &&
-    value.Type === ClientCertificateTypeId;
+export const isClientCertificate = (value) => Predicate.hasProperty(value, "Type") && value.Type === TypeId;
 export const ClientCertificateProvider = () => Provider.succeed(ClientCertificate, {
     // Everything Cloudflare returns at issuance is fixed for the lifetime of
     // the certificate — only `status` changes (revocation/reactivation).
@@ -108,7 +107,7 @@ export const ClientCertificateProvider = () => Provider.succeed(ClientCertificat
         const rows = yield* Effect.forEach(zones, (zone) => clientCertificates.listClientCertificates
             .pages({ zoneId: zone.id, status: "all" })
             .pipe(Stream.runCollect, Effect.map((chunk) => Array.from(chunk).flatMap((page) => (page.result ?? [])
-            .filter((cert) => cert.status !== "revoked")
+            .filter((cert) => !isGone(cert.status))
             .map((cert) => toAttributes(cert, zone.id)))), Effect.catchTag("Forbidden", () => Effect.succeed([]))), { concurrency: 10 });
         return rows.flat();
     }),
@@ -137,12 +136,12 @@ export const ClientCertificateProvider = () => Provider.succeed(ClientCertificat
         const zoneId = output?.zoneId ?? olds?.zoneId;
         if (zoneId === undefined)
             return undefined;
-        // Owned path: refresh by our persisted certificate id. A revoked
-        // certificate stays listed on the zone forever — revocation is the
-        // delete semantic, so report it as gone.
+        // Owned path: refresh by our persisted certificate id. A revoked (or
+        // asynchronously revoking) certificate stays listed on the zone forever
+        // — revocation is the delete semantic, so report it as gone.
         if (output?.clientCertificateId) {
             const observed = yield* getCertificate(zoneId, output.clientCertificateId);
-            if (observed && observed.status !== "revoked") {
+            if (observed && !isGone(observed.status)) {
                 return toAttributes(observed, zoneId);
             }
             return undefined;
@@ -169,7 +168,7 @@ export const ClientCertificateProvider = () => Provider.succeed(ClientCertificat
         let observed = output?.clientCertificateId
             ? yield* getCertificate(zoneId, output.clientCertificateId)
             : undefined;
-        if (observed?.status === "revoked")
+        if (observed && isGone(observed.status))
             observed = undefined;
         // 2. Fall back to scanning the zone for a non-revoked certificate
         //    issued from the same CSR with the same validity. Matching on
@@ -201,9 +200,7 @@ export const ClientCertificateProvider = () => Provider.succeed(ClientCertificat
         // on the zone — observe first and treat already-revoked (or already
         // revoking) as done so delete is idempotent.
         const observed = yield* getCertificate(output.zoneId, output.clientCertificateId);
-        if (!observed ||
-            observed.status === "revoked" ||
-            observed.status === "pending_revocation") {
+        if (!observed || isGone(observed.status)) {
             return;
         }
         yield* clientCertificates
@@ -233,10 +230,19 @@ const getCertificate = (zoneId, clientCertificateId) => clientCertificates.getCl
  */
 const findByCsr = (zoneId, csr, validityDays) => clientCertificates.listClientCertificates
     .items({ zoneId, status: "all" })
-    .pipe(Stream.filter((cert) => cert.status !== "revoked" &&
+    .pipe(Stream.filter((cert) => !isGone(cert.status) &&
     cert.validityDays === validityDays &&
     typeof cert.csr === "string" &&
     normalizePem(cert.csr) === normalizePem(csr)), Stream.runHead, Effect.map(Option.getOrUndefined), Effect.map((cert) => cert));
+/**
+ * A certificate is "gone" once it is `revoked` or asynchronously transitioning
+ * to it (`pending_revocation`). Revocation is the delete semantic, and a
+ * revoking certificate can no longer serve mTLS — so it must never be adopted,
+ * reused, listed, or treated as live. Without this, a prior run's async revoke
+ * leaves a `pending_revocation` certificate that a fresh deploy would otherwise
+ * mistake for an existing live certificate matching the CSR.
+ */
+const isGone = (status) => status === "revoked" || status === "pending_revocation";
 /** Normalize PEM content for comparison (CRLF + trailing-newline noise). */
 const normalizePem = (pem) => pem?.replace(/\r\n/g, "\n").trim();
 const toAttributes = (cert, zoneId) => ({

package/lib/Cloudflare/ClientCertificate/ClientCertificate.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClientCertificate.js","sourceRoot":"","sources":["../../../src/Cloudflare/ClientCertificate/ClientCertificate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ClientCertificate.js","sourceRoot":"","sources":["../../../src/Cloudflare/ClientCertificate/ClientCertificate.ts"],"names":[],"mappings":"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"}

package/lib/Cloudflare/CloudConnector/Rules.d.ts

@@ -2,8 +2,8 @@ import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import { CloudflareEnvironment } from "../CloudflareEnvironment.ts";
 import type { Providers } from "../Providers.ts";
-declare const CloudConnectorRulesTypeId: "Cloudflare.CloudConnector.Rules";
-type CloudConnectorRulesTypeId = typeof CloudConnectorRulesTypeId;
+declare const TypeId: "Cloudflare.CloudConnector.Rules";
+type TypeId = typeof TypeId;
 /**
  * The cloud-provider object storage a Cloud Connector rule routes matching
  * traffic to.
@@ -13,7 +13,7 @@ export type CloudConnectorProvider = "aws_s3" | "cloudflare_r2" | "gcp_storage"
  * A single Cloud Connector rule routing matching traffic directly to a
  * cloud-provider object-storage bucket.
  */
-export interface CloudConnectorRule {
+export interface Rule {
     /**
      * The cloud provider hosting the bucket the rule routes traffic to.
      */
@@ -26,7 +26,7 @@ export interface CloudConnectorRule {
     /**
      * Host of the target bucket — e.g. `mybucket.s3.amazonaws.com` for S3,
      * or an R2 bucket's public host. Accepts an `Input` so it can reference
-     * another resource's output (commonly an `R2Bucket`).
+     * another resource's output (commonly an `Bucket`).
      */
     host: string;
     /**
@@ -39,7 +39,7 @@ export interface CloudConnectorRule {
      */
     description?: string;
 }
-export interface CloudConnectorRulesProps {
+export interface RulesProps {
     /**
      * Zone the rules apply to. Stable — changing the zone triggers
      * replacement.
@@ -50,12 +50,12 @@ export interface CloudConnectorRulesProps {
      * this resource and replaced atomically on every change — rules
      * managed elsewhere in the zone will be overwritten on deploy.
      */
-    rules: CloudConnectorRule[];
+    rules: Rule[];
 }
 /**
  * A Cloud Connector rule as Cloudflare reports it.
  */
-export interface CloudConnectorRuleAttribute {
+export interface RuleAttribute {
     /** Cloudflare-assigned identifier of the rule. */
     id: string | undefined;
     /** The cloud provider the rule routes traffic to. */
@@ -69,13 +69,13 @@ export interface CloudConnectorRuleAttribute {
     /** Informative description of the rule. */
     description: string | undefined;
 }
-export interface CloudConnectorRulesAttributes {
+export interface RulesAttributes {
     /** Zone that owns the rule list. */
     zoneId: string;
     /** The ordered rule list as Cloudflare reports it. */
-    rules: CloudConnectorRuleAttribute[];
+    rules: RuleAttribute[];
 }
-export type CloudConnectorRules = Resource<CloudConnectorRulesTypeId, CloudConnectorRulesProps, CloudConnectorRulesAttributes, never, Providers>;
+export type Rules = Resource<TypeId, RulesProps, RulesAttributes, never, Providers>;
 /**
  * The ordered list of Cloud Connector rules for a Cloudflare zone.
  *
@@ -86,7 +86,7 @@ export type CloudConnectorRules = Resource<CloudConnectorRulesTypeId, CloudConne
  *
  * The zone has exactly one rule list — the API only supports replacing the
  * whole list — so this resource owns it in its entirety (PUT-replace
- * semantics) and there should be at most one `CloudConnectorRules`
+ * semantics) and there should be at most one `Rules`
  * resource per zone. Destroying the resource clears the list.
  *
  * Safety: when there is no prior state and the zone already has a
@@ -101,7 +101,7 @@ export type CloudConnectorRules = Resource<CloudConnectorRulesTypeId, CloudConne
  * @section Routing to object storage
  * @example Serve a path prefix from an S3 bucket
  * ```typescript
- * yield* Cloudflare.CloudConnectorRules("Rules", {
+ * yield* Cloudflare.CloudConnector.Rules("Rules", {
  *   zoneId: zone.zoneId,
  *   rules: [
  *     {
@@ -116,9 +116,9 @@ export type CloudConnectorRules = Resource<CloudConnectorRulesTypeId, CloudConne
  *
  * @example Serve static assets from an R2 bucket
  * ```typescript
- * const bucket = yield* Cloudflare.R2Bucket("Assets", {});
+ * const bucket = yield* Cloudflare.R2.Bucket("Assets", {});
  *
- * yield* Cloudflare.CloudConnectorRules("Rules", {
+ * yield* Cloudflare.CloudConnector.Rules("Rules", {
  *   zoneId: zone.zoneId,
  *   rules: [
  *     {
@@ -134,11 +134,11 @@ export type CloudConnectorRules = Resource<CloudConnectorRulesTypeId, CloudConne
  *
  * @see https://developers.cloudflare.com/rules/cloud-connector/
  */
-export declare const CloudConnectorRules: import("../../Resource.ts").ResourceClass<CloudConnectorRules>;
+export declare const Rules: import("../../Resource.ts").ResourceClass<Rules>;
 /**
- * Returns true if the given value is a CloudConnectorRules resource.
+ * Returns true if the given value is a Rules resource.
  */
-export declare const isCloudConnectorRules: (value: unknown) => value is CloudConnectorRules;
-export declare const CloudConnectorRulesProvider: () => import("effect/Layer").Layer<Provider.Provider<CloudConnectorRules>, never, CloudflareEnvironment | import("@distilled.cloud/cloudflare").Credentials | import("effect/unstable/http/HttpClient").HttpClient>;
+export declare const isRules: (value: unknown) => value is Rules;
+export declare const RulesProvider: () => import("effect/Layer").Layer<Provider.Provider<Rules>, never, CloudflareEnvironment | import("@distilled.cloud/cloudflare").Credentials | import("effect/unstable/http/HttpClient").HttpClient>;
 export {};
 //# sourceMappingURL=Rules.d.ts.map

package/lib/Cloudflare/CloudConnector/Rules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Rules.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/CloudConnector/Rules.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,QAAA,MAAM,yBAAyB,EAAG,iCAA0C,CAAC;AAC7E,KAAK,yBAAyB,GAAG,OAAO,yBAAyB,CAAC;AAElE;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAC9B,QAAQ,GACR,eAAe,GACf,aAAa,GACb,eAAe,CAAC;AAEpB;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,QAAQ,EAAE,sBAAsB,CAAC;IACjC;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB;IACvC;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,KAAK,EAAE,kBAAkB,EAAE,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,kDAAkD;IAClD,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IACvB,qDAAqD;IACrD,QAAQ,EAAE,MAAM,CAAC;IACjB,4DAA4D;IAC5D,UAAU,EAAE,MAAM,CAAC;IACnB,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,mCAAmC;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,2CAA2C;IAC3C,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAED,MAAM,WAAW,6BAA6B;IAC5C,oCAAoC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,sDAAsD;IACtD,KAAK,EAAE,2BAA2B,EAAE,CAAC;CACtC;AAED,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CACxC,yBAAyB,EACzB,wBAAwB,EACxB,6BAA6B,EAC7B,KAAK,EACL,SAAS,CACV,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AACH,eAAO,MAAM,mBAAmB,gEAE/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB,UACzB,OAAO,KACb,KAAK,IAAI,mBAE8B,CAAC;AAE3C,eAAO,MAAM,2BAA2B,qNAqGpC,CAAC"}
+{"version":3,"file":"Rules.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/CloudConnector/Rules.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,QAAA,MAAM,MAAM,EAAG,iCAA0C,CAAC;AAC1D,KAAK,MAAM,GAAG,OAAO,MAAM,CAAC;AAE5B;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAC9B,QAAQ,GACR,eAAe,GACf,aAAa,GACb,eAAe,CAAC;AAEpB;;;GAGG;AACH,MAAM,WAAW,IAAI;IACnB;;OAEG;IACH,QAAQ,EAAE,sBAAsB,CAAC;IACjC;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,KAAK,EAAE,IAAI,EAAE,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,kDAAkD;IAClD,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IACvB,qDAAqD;IACrD,QAAQ,EAAE,MAAM,CAAC;IACjB,4DAA4D;IAC5D,UAAU,EAAE,MAAM,CAAC;IACnB,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,mCAAmC;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,2CAA2C;IAC3C,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAED,MAAM,WAAW,eAAe;IAC9B,oCAAoC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,sDAAsD;IACtD,KAAK,EAAE,aAAa,EAAE,CAAC;CACxB;AAED,MAAM,MAAM,KAAK,GAAG,QAAQ,CAC1B,MAAM,EACN,UAAU,EACV,eAAe,EACf,KAAK,EACL,SAAS,CACV,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AACH,eAAO,MAAM,KAAK,kDAA0B,CAAC;AAE7C;;GAEG;AACH,eAAO,MAAM,OAAO,UAAW,OAAO,KAAG,KAAK,IAAI,KACa,CAAC;AAEhE,eAAO,MAAM,aAAa,uMAmGtB,CAAC"}

package/lib/Cloudflare/CloudConnector/Rules.js

@@ -6,7 +6,7 @@ import * as Provider from "../../Provider.js";
 import { Resource } from "../../Resource.js";
 import { CloudflareEnvironment } from "../CloudflareEnvironment.js";
 import { listAllZones } from "../Zone/lookup.js";
-const CloudConnectorRulesTypeId = "Cloudflare.CloudConnector.Rules";
+const TypeId = "Cloudflare.CloudConnector.Rules";
 /**
  * The ordered list of Cloud Connector rules for a Cloudflare zone.
  *
@@ -17,7 +17,7 @@ const CloudConnectorRulesTypeId = "Cloudflare.CloudConnector.Rules";
  *
  * The zone has exactly one rule list — the API only supports replacing the
  * whole list — so this resource owns it in its entirety (PUT-replace
- * semantics) and there should be at most one `CloudConnectorRules`
+ * semantics) and there should be at most one `Rules`
  * resource per zone. Destroying the resource clears the list.
  *
  * Safety: when there is no prior state and the zone already has a
@@ -32,7 +32,7 @@ const CloudConnectorRulesTypeId = "Cloudflare.CloudConnector.Rules";
  * @section Routing to object storage
  * @example Serve a path prefix from an S3 bucket
  * ```typescript
- * yield* Cloudflare.CloudConnectorRules("Rules", {
+ * yield* Cloudflare.CloudConnector.Rules("Rules", {
  *   zoneId: zone.zoneId,
  *   rules: [
  *     {
@@ -47,9 +47,9 @@ const CloudConnectorRulesTypeId = "Cloudflare.CloudConnector.Rules";
  *
  * @example Serve static assets from an R2 bucket
  * ```typescript
- * const bucket = yield* Cloudflare.R2Bucket("Assets", {});
+ * const bucket = yield* Cloudflare.R2.Bucket("Assets", {});
  *
- * yield* Cloudflare.CloudConnectorRules("Rules", {
+ * yield* Cloudflare.CloudConnector.Rules("Rules", {
  *   zoneId: zone.zoneId,
  *   rules: [
  *     {
@@ -65,13 +65,12 @@ const CloudConnectorRulesTypeId = "Cloudflare.CloudConnector.Rules";
  *
  * @see https://developers.cloudflare.com/rules/cloud-connector/
  */
-export const CloudConnectorRules = Resource(CloudConnectorRulesTypeId);
+export const Rules = Resource(TypeId);
 /**
- * Returns true if the given value is a CloudConnectorRules resource.
+ * Returns true if the given value is a Rules resource.
  */
-export const isCloudConnectorRules = (value) => Predicate.hasProperty(value, "Type") &&
-    value.Type === CloudConnectorRulesTypeId;
-export const CloudConnectorRulesProvider = () => Provider.succeed(CloudConnectorRules, {
+export const isRules = (value) => Predicate.hasProperty(value, "Type") && value.Type === TypeId;
+export const RulesProvider = () => Provider.succeed(Rules, {
     stables: ["zoneId"],
     list: Effect.fn(function* () {
         const { accountId } = yield* yield* CloudflareEnvironment;

package/lib/Cloudflare/CloudConnector/Rules.js.map

@@ -1 +1 @@
-{"version":3,"file":"Rules.js","sourceRoot":"","sources":["../../../src/Cloudflare/CloudConnector/Rules.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Rules.js","sourceRoot":"","sources":["../../../src/Cloudflare/CloudConnector/Rules.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,6CAA6C,CAAC;AAC9E,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,MAAM,GAAG,iCAA0C,CAAC;AA2F1D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,QAAQ,CAAQ,MAAM,CAAC,CAAC;AAE7C;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,KAAc,EAAkB,EAAE,CACxD,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC;AAEhE,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,EAAE,CAChC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE;IACtB,OAAO,EAAE,CAAC,QAAQ,CAAC;IAEnB,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC;QACvB,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,qBAAqB,CAAC;QAC1D,mEAAmE;QACnE,mEAAmE;QACnE,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAChC,KAAK,EACL,CAAC,IAAI,EAAE,EAAE,CACP,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAC7B,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAA+B,EAAE;QAChD,uDAAuD;QACvD,kDAAkD;QAClD,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAC5D;QACD,gDAAgD;QAChD,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAC9D,EACH,EAAE,WAAW,EAAE,EAAE,EAAE,CACpB,CAAC;QACF,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAA0B,EAAE,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC;IACzE,CAAC,CAAC;IAEF,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE;QAC/C,MAAM,CAAC,GAAG,IAAkB,CAAC;QAC7B,MAAM,CAAC,GAAG,IAAkB,CAAC;QAC7B,kEAAkE;QAClE,gBAAgB;QAChB,MAAM,SAAS,GACb,MAAM,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC1E,IACE,OAAO,CAAC,CAAC,MAAM,KAAK,QAAQ;YAC5B,SAAS,KAAK,SAAS;YACvB,SAAS,KAAK,CAAC,CAAC,MAAM,EACtB,CAAC;YACD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAW,CAAC;QACxC,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QACzC,MAAM,MAAM,GAAG,MAAM,EAAE,MAAM,IAAK,IAAI,EAAE,MAA6B,CAAC;QACtE,IAAI,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QAC9B,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAClD,kEAAkE;QAClE,sCAAsC;QACtC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QAC5C,MAAM,KAAK,GAAoB,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;QAC3D,kEAAkE;QAClE,iEAAiE;QACjE,yCAAyC;QACzC,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QAC9C,wDAAwD;QACxD,MAAM,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,IAAI,IAAI,CAAC,MAAM,CAAW,CAAC;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACxC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,IAAI,EAAE,IAAI,CAAC,IAAc;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI;YAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC,CAAC,CAAC;QAEJ,8DAA8D;QAC9D,iEAAiE;QACjE,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;YACnC,KAAK,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC5B,MAAM;gBACN,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAC5B,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,UAAU,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE;oBAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,WAAW,EAAE,IAAI,CAAC,WAAW;iBAC9B,CAAC,CAAC;aACJ,CAAC,CAAC;QACL,CAAC;QAED,2DAA2D;QAC3D,sCAAsC;QACtC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAChD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAA4B,CAAC;IAC7D,CAAC,CAAC;IAEF,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE;QACrC,mEAAmE;QACnE,qEAAqE;QACrE,oEAAoE;QACpE,0BAA0B;QAC1B,KAAK,CAAC,CAAC,cAAc;aAClB,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;aAC7C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC;CACH,CAAC,CAAC;AAEL,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,EAAE,CAC3C,cAAc,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI;AACvC,qEAAqE;AACrE,oEAAoE;AACpE,cAAc;AACd,MAAM,CAAC,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE,CAClD,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAC/B,EACD,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAmB,EAAE,CACvC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAC/B,IAAI,CAAC,UAAU,IAAI,IAAI;IACvB,IAAI,CAAC,QAAQ,IAAI,IAAI;IACrB,IAAI,CAAC,UAAU,EAAE,IAAI,IAAI,IAAI;IAC3B,CAAC,CAAC,EAAE;IACJ,CAAC,CAAC;QACE;YACE,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,SAAS;YACxB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI;YAC1B,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI;YAC7B,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,SAAS;SAC3C;KACF,CACN,CACF,CACF,CAAC;AAEJ,MAAM,UAAU,GAAG,CACjB,OAME,EACF,QAAsC,EAC7B,EAAE,CACX,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM;IAClC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACrB,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtB,OAAO,CACL,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ;YACzB,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,UAAU;YAC7B,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;YACjB,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,OAAO;YACvB,CAAC,CAAC,CAAC,WAAW,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,WAAW,CAC/C,CAAC;IACJ,CAAC,CAAC,CAAC"}

package/lib/Cloudflare/CloudflareEnvironment.d.ts

@@ -6,6 +6,7 @@ import { AlchemyProfile } from "../Auth/Profile.ts";
 import { type CloudflareResolvedCredentials } from "./Auth/AuthProvider.ts";
 declare const CloudflareEnvironment_base: Context.ServiceClass<CloudflareEnvironment, "Cloudflare::CloudflareEnvironment", Effect.Effect<CloudflareResolvedCredentials, never, never>>;
 export declare class CloudflareEnvironment extends CloudflareEnvironment_base {
+    readonly kind: "Environment";
 }
 export declare const fromEnv: () => Layer.Layer<CloudflareEnvironment, Config.ConfigError, never>;
 export declare const fromProfile: () => Layer.Layer<CloudflareEnvironment, import("../Auth/AuthProvider.ts").AuthError | Config.ConfigError, AlchemyProfile | import("../index.ts").AuthProviders>;

package/lib/Cloudflare/CloudflareEnvironment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CloudflareEnvironment.d.ts","sourceRoot":"","sources":["../../src/Cloudflare/CloudflareEnvironment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAGtC,OAAO,EAAmB,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,wBAAwB,CAAC;;AAEhC,qBAAa,qBAAsB,SAAQ,0BAGH;CAAG;AAI3C,eAAO,MAAM,OAAO,qEAUjB,CAAC;AAEJ,eAAO,MAAM,WAAW,kKAsBrB,CAAC"}
+{"version":3,"file":"CloudflareEnvironment.d.ts","sourceRoot":"","sources":["../../src/Cloudflare/CloudflareEnvironment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAGtC,OAAO,EAAmB,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,wBAAwB,CAAC;;AAEhC,qBAAa,qBAAsB,SAAQ,0BAGH;IACtC,QAAQ,CAAC,IAAI,EAAG,aAAa,CAAU;CACxC;AAID,eAAO,MAAM,OAAO,qEAUjB,CAAC;AAEJ,eAAO,MAAM,WAAW,kKAsBrB,CAAC"}

package/lib/Cloudflare/CloudflareEnvironment.js

@@ -7,6 +7,7 @@ import { getAuthProvider } from "../Auth/AuthProvider.js";
 import { ALCHEMY_PROFILE, AlchemyProfile } from "../Auth/Profile.js";
 import { CLOUDFLARE_AUTH_PROVIDER_NAME, } from "./Auth/AuthProvider.js";
 export class CloudflareEnvironment extends Context.Service()("Cloudflare::CloudflareEnvironment") {
+    kind = "Environment";
 }
 const CLOUDFLARE_ACCOUNT_ID = Config.string("CLOUDFLARE_ACCOUNT_ID");
 export const fromEnv = () => Layer.effect(CloudflareEnvironment, Effect.gen(function* () {

package/lib/Cloudflare/CloudflareEnvironment.js.map

@@ -1 +1 @@
-{"version":3,"file":"CloudflareEnvironment.js","sourceRoot":"","sources":["../../src/Cloudflare/CloudflareEnvironment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EACL,6BAA6B,GAG9B,MAAM,wBAAwB,CAAC;AAEhC,MAAM,OAAO,qBAAsB,SAAQ,OAAO,CAAC,OAAO,EAGvD,CAAC,mCAAmC,CAAC;CAAG;AAE3C,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;AAErE,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,EAAE,CAC1B,KAAK,CAAC,MAAM,CACV,qBAAqB,EACrB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,qBAAqB,CAAC,IAAI,CACjD,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAClC,CAAC;IACF,OAAO,EAAE,OAAO,EAAE,SAAS,EAAS,CAAC;AACvC,CAAC,CAAC,CACH,CAAC;AAEJ,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE,CAC9B,KAAK,CAAC,MAAM,CACV,qBAAqB,EACrB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC;IACtC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,eAAe,CAGjC,6BAA6B,CAAC,CAAC;IACjC,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,eAAe,CAAC;IAC3C,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IACvE,mEAAmE;IACnE,wEAAwE;IACxE,sCAAsC;IACtC,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,CACnE,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CACxB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAA8B,CAAC,CACvD,EACD,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,MAAM,CACd,CAAC;AACJ,CAAC,CAAC,CACH,CAAC"}
+{"version":3,"file":"CloudflareEnvironment.js","sourceRoot":"","sources":["../../src/Cloudflare/CloudflareEnvironment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EACL,6BAA6B,GAG9B,MAAM,wBAAwB,CAAC;AAEhC,MAAM,OAAO,qBAAsB,SAAQ,OAAO,CAAC,OAAO,EAGvD,CAAC,mCAAmC,CAAC;IAC7B,IAAI,GAAG,aAAsB,CAAC;CACxC;AAED,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;AAErE,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,EAAE,CAC1B,KAAK,CAAC,MAAM,CACV,qBAAqB,EACrB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,qBAAqB,CAAC,IAAI,CACjD,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAClC,CAAC;IACF,OAAO,EAAE,OAAO,EAAE,SAAS,EAAS,CAAC;AACvC,CAAC,CAAC,CACH,CAAC;AAEJ,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE,CAC9B,KAAK,CAAC,MAAM,CACV,qBAAqB,EACrB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC;IACtC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,eAAe,CAGjC,6BAA6B,CAAC,CAAC;IACjC,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,eAAe,CAAC;IAC3C,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IACvE,mEAAmE;IACnE,wEAAwE;IACxE,sCAAsC;IACtC,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,CACnE,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CACxB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAA8B,CAAC,CACvD,EACD,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,MAAM,CACd,CAAC;AACJ,CAAC,CAAC,CACH,CAAC"}

package/lib/Cloudflare/CloudforceOne/ScanConfig.d.ts

@@ -2,8 +2,8 @@ import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import { CloudflareEnvironment } from "../CloudflareEnvironment.ts";
 import type { Providers } from "../Providers.ts";
-declare const ScanConfigTypeId: "Cloudflare.CloudforceOne.ScanConfig";
-type ScanConfigTypeId = typeof ScanConfigTypeId;
+declare const TypeId: "Cloudflare.CloudforceOne.ScanConfig";
+type TypeId = typeof TypeId;
 export type ScanConfigProps = {
     /**
      * IP addresses or CIDR blocks to scan. The maximum number of total IP
@@ -44,7 +44,7 @@ export type ScanConfigAttributes = {
      */
     ports: string[];
 };
-export type CloudforceOneScanConfig = Resource<ScanConfigTypeId, ScanConfigProps, ScanConfigAttributes, never, Providers>;
+export type ScanConfig = Resource<TypeId, ScanConfigProps, ScanConfigAttributes, never, Providers>;
 /**
  * A Cloudforce One attack-surface scan configuration.
  *
@@ -63,7 +63,7 @@ export type CloudforceOneScanConfig = Resource<ScanConfigTypeId, ScanConfigProps
  * @section Creating a Scan Config
  * @example One-off scan of a single address
  * ```typescript
- * const scan = yield* Cloudflare.CloudforceOneScanConfig("edge-scan", {
+ * const scan = yield* Cloudflare.CloudforceOne.ScanConfig("edge-scan", {
  *   ips: ["203.0.113.7/32"],
  *   frequency: 0,
  * });
@@ -71,7 +71,7 @@ export type CloudforceOneScanConfig = Resource<ScanConfigTypeId, ScanConfigProps
  *
  * @example Weekly scan of a CIDR block on specific ports
  * ```typescript
- * const scan = yield* Cloudflare.CloudforceOneScanConfig("perimeter", {
+ * const scan = yield* Cloudflare.CloudforceOne.ScanConfig("perimeter", {
  *   ips: ["203.0.113.0/24"],
  *   frequency: 7,
  *   ports: ["1-80", "443"],
@@ -81,7 +81,7 @@ export type CloudforceOneScanConfig = Resource<ScanConfigTypeId, ScanConfigProps
  * @section Updating
  * @example Change the schedule and port list in place
  * ```typescript
- * const scan = yield* Cloudflare.CloudforceOneScanConfig("perimeter", {
+ * const scan = yield* Cloudflare.CloudforceOne.ScanConfig("perimeter", {
  *   ips: ["203.0.113.0/24"],
  *   frequency: 30,
  *   ports: ["all"],
@@ -90,11 +90,11 @@ export type CloudforceOneScanConfig = Resource<ScanConfigTypeId, ScanConfigProps
  *
  * @see https://developers.cloudflare.com/security-center/intel-apis/attack-surface-scans/
  */
-export declare const CloudforceOneScanConfig: import("../../Resource.ts").ResourceClass<CloudforceOneScanConfig>;
+export declare const ScanConfig: import("../../Resource.ts").ResourceClass<ScanConfig>;
 /**
- * Returns true if the given value is a CloudforceOneScanConfig resource.
+ * Returns true if the given value is a ScanConfig resource.
  */
-export declare const isCloudforceOneScanConfig: (value: unknown) => value is CloudforceOneScanConfig;
-export declare const CloudforceOneScanConfigProvider: () => import("effect/Layer").Layer<Provider.Provider<CloudforceOneScanConfig>, never, CloudflareEnvironment | import("@distilled.cloud/cloudflare").Credentials | import("effect/unstable/http/HttpClient").HttpClient>;
+export declare const isScanConfig: (value: unknown) => value is ScanConfig;
+export declare const ScanConfigProvider: () => import("effect/Layer").Layer<Provider.Provider<ScanConfig>, never, CloudflareEnvironment | import("@distilled.cloud/cloudflare").Credentials | import("effect/unstable/http/HttpClient").HttpClient>;
 export {};
 //# sourceMappingURL=ScanConfig.d.ts.map

package/lib/Cloudflare/CloudforceOne/ScanConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScanConfig.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/CloudforceOne/ScanConfig.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,QAAA,MAAM,gBAAgB,EAAG,qCAA8C,CAAC;AACxE,KAAK,gBAAgB,GAAG,OAAO,gBAAgB,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG;IAC5B;;;OAGG;IACH,GAAG,EAAE,MAAM,EAAE,CAAC;IACd;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,GAAG,EAAE,MAAM,EAAE,CAAC;IACd;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAC5C,gBAAgB,EAChB,eAAe,EACf,oBAAoB,EACpB,KAAK,EACL,SAAS,CACV,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,eAAO,MAAM,uBAAuB,oEACiB,CAAC;AAEtD;;GAEG;AACH,eAAO,MAAM,yBAAyB,UAC7B,OAAO,KACb,KAAK,IAAI,uBAC6D,CAAC;AAE1E,eAAO,MAAM,+BAA+B,yNAoGxC,CAAC"}
+{"version":3,"file":"ScanConfig.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/CloudforceOne/ScanConfig.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,QAAA,MAAM,MAAM,EAAG,qCAA8C,CAAC;AAC9D,KAAK,MAAM,GAAG,OAAO,MAAM,CAAC;AAE5B,MAAM,MAAM,eAAe,GAAG;IAC5B;;;OAGG;IACH,GAAG,EAAE,MAAM,EAAE,CAAC;IACd;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,GAAG,EAAE,MAAM,EAAE,CAAC;IACd;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,QAAQ,CAC/B,MAAM,EACN,eAAe,EACf,oBAAoB,EACpB,KAAK,EACL,SAAS,CACV,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,eAAO,MAAM,UAAU,uDAA+B,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,YAAY,UAAW,OAAO,KAAG,KAAK,IAAI,UACQ,CAAC;AAEhE,eAAO,MAAM,kBAAkB,4MAoG3B,CAAC"}

package/lib/Cloudflare/CloudforceOne/ScanConfig.js

@@ -6,7 +6,7 @@ import { isResolved } from "../../Diff.js";
 import * as Provider from "../../Provider.js";
 import { Resource } from "../../Resource.js";
 import { CloudflareEnvironment } from "../CloudflareEnvironment.js";
-const ScanConfigTypeId = "Cloudflare.CloudforceOne.ScanConfig";
+const TypeId = "Cloudflare.CloudforceOne.ScanConfig";
 /**
  * A Cloudforce One attack-surface scan configuration.
  *
@@ -25,7 +25,7 @@ const ScanConfigTypeId = "Cloudflare.CloudforceOne.ScanConfig";
  * @section Creating a Scan Config
  * @example One-off scan of a single address
  * ```typescript
- * const scan = yield* Cloudflare.CloudforceOneScanConfig("edge-scan", {
+ * const scan = yield* Cloudflare.CloudforceOne.ScanConfig("edge-scan", {
  *   ips: ["203.0.113.7/32"],
  *   frequency: 0,
  * });
@@ -33,7 +33,7 @@ const ScanConfigTypeId = "Cloudflare.CloudforceOne.ScanConfig";
  *
  * @example Weekly scan of a CIDR block on specific ports
  * ```typescript
- * const scan = yield* Cloudflare.CloudforceOneScanConfig("perimeter", {
+ * const scan = yield* Cloudflare.CloudforceOne.ScanConfig("perimeter", {
  *   ips: ["203.0.113.0/24"],
  *   frequency: 7,
  *   ports: ["1-80", "443"],
@@ -43,7 +43,7 @@ const ScanConfigTypeId = "Cloudflare.CloudforceOne.ScanConfig";
  * @section Updating
  * @example Change the schedule and port list in place
  * ```typescript
- * const scan = yield* Cloudflare.CloudforceOneScanConfig("perimeter", {
+ * const scan = yield* Cloudflare.CloudforceOne.ScanConfig("perimeter", {
  *   ips: ["203.0.113.0/24"],
  *   frequency: 30,
  *   ports: ["all"],
@@ -52,12 +52,12 @@ const ScanConfigTypeId = "Cloudflare.CloudforceOne.ScanConfig";
  *
  * @see https://developers.cloudflare.com/security-center/intel-apis/attack-surface-scans/
  */
-export const CloudforceOneScanConfig = Resource(ScanConfigTypeId);
+export const ScanConfig = Resource(TypeId);
 /**
- * Returns true if the given value is a CloudforceOneScanConfig resource.
+ * Returns true if the given value is a ScanConfig resource.
  */
-export const isCloudforceOneScanConfig = (value) => Predicate.hasProperty(value, "Type") && value.Type === ScanConfigTypeId;
-export const CloudforceOneScanConfigProvider = () => Provider.succeed(CloudforceOneScanConfig, {
+export const isScanConfig = (value) => Predicate.hasProperty(value, "Type") && value.Type === TypeId;
+export const ScanConfigProvider = () => Provider.succeed(ScanConfig, {
     stables: ["configId", "accountId"],
     diff: Effect.fn(function* ({ news, output }) {
         const { accountId } = yield* yield* CloudflareEnvironment;

package/lib/Cloudflare/CloudforceOne/ScanConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"ScanConfig.js","sourceRoot":"","sources":["../../../src/Cloudflare/CloudforceOne/ScanConfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ScanConfig.js","sourceRoot":"","sources":["../../../src/Cloudflare/CloudforceOne/ScanConfig.ts"],"names":[],"mappings":"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"}

package/lib/Cloudflare/Connectivity/DirectoryService.d.ts

@@ -2,8 +2,8 @@ import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import { CloudflareEnvironment } from "../CloudflareEnvironment.ts";
 import type { Providers } from "../Providers.ts";
-declare const DirectoryServiceTypeId: "Cloudflare.Connectivity.DirectoryService";
-type DirectoryServiceTypeId = typeof DirectoryServiceTypeId;
+declare const TypeId: "Cloudflare.Connectivity.DirectoryService";
+type TypeId = typeof TypeId;
 /**
  * Protocol of a Connectivity Directory service.
  */
@@ -20,7 +20,7 @@ export declare namespace DirectoryService {
     interface Network {
         /**
          * UUID of the `cfd_tunnel` that provides connectivity to the host.
-         * Accepts a reference to a `Cloudflare.Tunnel` output.
+         * Accepts a reference to a `Cloudflare.Tunnel.Tunnel` output.
          */
         tunnelId: string;
     }
@@ -30,7 +30,7 @@ export declare namespace DirectoryService {
     interface ResolverNetwork {
         /**
          * UUID of the `cfd_tunnel` that provides connectivity to the host.
-         * Accepts a reference to a `Cloudflare.Tunnel` output.
+         * Accepts a reference to a `Cloudflare.Tunnel.Tunnel` output.
          */
         tunnelId: string;
         /**
@@ -205,7 +205,7 @@ export type DirectoryServiceAttributes = {
      */
     updatedAt: string | undefined;
 };
-export type DirectoryService = Resource<DirectoryServiceTypeId, DirectoryServiceProps, DirectoryServiceAttributes, never, Providers>;
+export type DirectoryService = Resource<TypeId, DirectoryServiceProps, DirectoryServiceAttributes, never, Providers>;
 /**
  * A Cloudflare Connectivity Directory service — a named entry in the
  * account's private-network service directory that maps a service name to
@@ -225,10 +225,10 @@ export type DirectoryService = Resource<DirectoryServiceTypeId, DirectoryService
  * @section Creating a Directory Service
  * @example TCP database service through a tunnel
  * ```typescript
- * const tunnel = yield* Cloudflare.Tunnel("DbTunnel", {
+ * const tunnel = yield* Cloudflare.Tunnel.Tunnel("DbTunnel", {
  *   ingress: [{ service: "tcp://localhost:5432" }],
  * });
- * const db = yield* Cloudflare.DirectoryService("Postgres", {
+ * const db = yield* Cloudflare.Connectivity.DirectoryService("Postgres", {
  *   type: "tcp",
  *   tcpPort: 5432,
  *   appProtocol: "postgresql",
@@ -238,7 +238,7 @@ export type DirectoryService = Resource<DirectoryServiceTypeId, DirectoryService
  *
  * @example HTTP service on a private hostname
  * ```typescript
- * const api = yield* Cloudflare.DirectoryService("InternalApi", {
+ * const api = yield* Cloudflare.Connectivity.DirectoryService("InternalApi", {
  *   type: "http",
  *   httpPort: 8080,
  *   httpsPort: 8443,
@@ -254,7 +254,7 @@ export type DirectoryService = Resource<DirectoryServiceTypeId, DirectoryService
  * ```typescript
  * // Host, ports, name, and TLS settings are all mutable — the service
  * // keeps its serviceId across updates.
- * const db = yield* Cloudflare.DirectoryService("Postgres", {
+ * const db = yield* Cloudflare.Connectivity.DirectoryService("Postgres", {
  *   type: "tcp",
  *   tcpPort: 5432,
  *   host: {