@alteran/astro 0.8.1 → 0.8.3

package/index.d.ts

@@ -1,5 +1,5 @@
 import type { AstroIntegration } from 'astro';
-import type { Env, PdsLocals } from './types/env';
+import type { Env, PdsLocals } from './types/public-env';
 
 export interface PdsIntegrationOptions {
   debugRoutes?: boolean;

package/index.js

@@ -83,6 +83,43 @@ const pkgRoot = new URL('.', import.meta.url);
 
 const resolvePackagePath = (relative) => fileURLToPath(new URL(relative, pkgRoot));
 
+const replaceRequired = (content, search, replacement) => {
+  if (!content.includes(search)) {
+    throw new Error(`[alteran] Unable to derive injected env types: missing marker "${search}"`);
+  }
+
+  return content.replace(search, replacement);
+};
+
+const buildInjectedEnvTypes = () => {
+  const publicEnvTypes = readFileSync(resolvePackagePath('./types/public-env.d.ts'), 'utf-8');
+  const ambientEnvTypes = [
+    ['export type Env = {', 'type AlteranEnv = {'],
+    ['export type PdsLocals = {', 'type AlteranPdsLocals = {'],
+    ['env: Env;', 'env: AlteranEnv;'],
+  ].reduce(
+    (content, [search, replacement]) => replaceRequired(content, search, replacement),
+    publicEnvTypes
+  );
+
+  return `/// <reference types="astro/client" />
+
+${ambientEnvTypes}
+
+declare global {
+  interface Env extends AlteranEnv {}
+
+  namespace App {
+    interface Locals extends AlteranPdsLocals {}
+  }
+}
+
+export type Env = globalThis.Env;
+export type PdsLocals = globalThis.App.Locals;
+export {};
+`;
+};
+
 export default function alteran(options = {}) {
   const {
     debugRoutes = false,
@@ -213,9 +250,7 @@ export default function alteran(options = {}) {
       },
 
       'astro:config:done'({ config, injectTypes, logger }) {
-        const envTypesPath = resolvePackagePath('./types/env.d.ts');
-        const envTypes = readFileSync(envTypesPath, 'utf-8');
-        injectTypes({ filename: 'astro-cloudflare-pds.d.ts', content: envTypes });
+        injectTypes({ filename: 'astro-cloudflare-pds.d.ts', content: buildInjectedEnvTypes() });
 
         const adapterName = config.adapter?.name ?? 'unknown adapter';
         if (!adapterName.toLowerCase().includes('cloudflare')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alteran/astro",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "Astro integration for running a Cloudflare-hosted Bluesky PDS with Alteran.",
   "module": "index.js",
   "types": "index.d.ts",

package/src/env.d.ts

@@ -1,4 +1 @@
-/// <reference path="../.astro/types.d.ts" />
-/// <reference path="../types/env.d.ts" />
-
-export type { Env, PdsLocals } from '../types/env';
+export type { Env, PdsLocals } from '../types/public-env';

package/src/lib/secrets.ts

@@ -1,6 +1,6 @@
 import { setGetEnv } from "astro/env/setup";
 import type { Env } from "../env";
-import type { SecretsStoreSecret } from "../../types/env";
+import type { SecretsStoreSecret } from "../../types/public-env";
 
 const SECRET_KEYS = [
   "PDS_DID",

package/types/public-env.d.ts

@@ -0,0 +1,63 @@
+import type {
+  D1Database,
+  DurableObjectNamespace,
+  ExecutionContext,
+  R2Bucket,
+} from "@cloudflare/workers-types";
+
+export type SecretsStoreSecret = {
+  get(): Promise<string>;
+};
+
+export type Env = {
+  ALTERAN_DB: D1Database;
+  ALTERAN_BLOBS: R2Bucket;
+  ALTERAN_SEQUENCER?: DurableObjectNamespace;
+  ASSETS?: {
+    fetch: (request: Request | string) => Promise<Response>;
+  };
+  PDS_HANDLE?: string | SecretsStoreSecret;
+  PDS_DID?: string | SecretsStoreSecret;
+  PDS_HOSTNAME?: string;
+  PDS_EMAIL?: string;
+  PDS_ALLOWED_MIME?: string;
+  USER_PASSWORD?: string | SecretsStoreSecret;
+  PDS_MAX_BLOB_SIZE?: string;
+  PDS_BLOB_QUOTA_BYTES?: string;
+  REFRESH_TOKEN?: string | SecretsStoreSecret;
+  REFRESH_TOKEN_SECRET?: string | SecretsStoreSecret;
+  SESSION_JWT_SECRET?: string | SecretsStoreSecret;
+  PDS_ACCESS_TTL_SEC?: string;
+  PDS_REFRESH_TTL_SEC?: string;
+  REPO_SIGNING_KEY?: string | SecretsStoreSecret;
+  PDS_PLC_ROTATION_KEY?: string | SecretsStoreSecret;
+  PDS_RATE_LIMIT_PER_MIN?: string;
+  PDS_MAX_JSON_BYTES?: string;
+  PDS_CORS_ORIGIN?: string;
+  PDS_SEQ_WINDOW?: string;
+  PDS_WS_HIBERNATE?: string;
+  ENVIRONMENT?: string;
+  PDS_BSKY_APP_VIEW_URL?: string;
+  PDS_BSKY_APP_VIEW_DID?: string;
+  PDS_BSKY_APP_VIEW_CDN_URL_PATTERN?: string;
+  PDS_APPVIEW_FORCE_FALLBACK?: string;
+  PDS_BSKY_CHAT_URL?: string;
+  PDS_BSKY_CHAT_DID?: string;
+  PDS_OZONE_URL?: string;
+  PDS_OZONE_DID?: string;
+  PDS_LINK_PRIVACY?: string;
+  PDS_LINK_TOS?: string;
+  PDS_CONTACT_EMAIL?: string;
+  PDS_RELAY_HOSTS?: string;
+  PDS_RELAY_NOTIFY?: string;
+  PDS_OAUTH_CLIENT_HOSTS?: string;
+};
+
+export type PdsLocals = {
+  runtime: {
+    env: Env;
+    ctx: ExecutionContext;
+    request: Request;
+  };
+  requestId?: string;
+};

package/types/env.d.ts

@@ -1,81 +0,0 @@
-/// <reference types="astro/client" />
-
-import type {
-  D1Database,
-  DurableObjectNamespace,
-  ExecutionContext,
-  R2Bucket,
-} from "@cloudflare/workers-types";
-
-// Minimal Secret Store binding interface. Cloudflare exposes each bound secret
-// as an object with an async `get()` that returns the secret value.
-// If @cloudflare/workers-types defines this already, our local type is compatible.
-export interface SecretsStoreSecret {
-  get(): Promise<string>;
-}
-
-declare global {
-  interface Env {
-    ALTERAN_DB: D1Database;
-    ALTERAN_BLOBS: R2Bucket;
-    ALTERAN_SEQUENCER?: DurableObjectNamespace;
-    ASSETS?: {
-      fetch: (req: Request | string) => Promise<Response>;
-    };
-    // Secrets can be provided either as Wrangler Secrets (string)
-    // or via Secret Store bindings (SecretsStoreSecret).
-    PDS_HANDLE?: string | SecretsStoreSecret;
-    PDS_DID?: string | SecretsStoreSecret;
-    PDS_HOSTNAME?: string;
-    PDS_EMAIL?: string;
-    PDS_ALLOWED_MIME?: string;
-    USER_PASSWORD?: string | SecretsStoreSecret;
-    PDS_MAX_BLOB_SIZE?: string;
-    PDS_BLOB_QUOTA_BYTES?: string;
-    REFRESH_TOKEN?: string | SecretsStoreSecret;
-    REFRESH_TOKEN_SECRET?: string | SecretsStoreSecret;
-    SESSION_JWT_SECRET?: string | SecretsStoreSecret;
-    PDS_ACCESS_TTL_SEC?: string;
-    PDS_REFRESH_TTL_SEC?: string;
-    // secp256k1 signing private key (hex or base64 32 bytes) used for commits and service-auth
-    REPO_SIGNING_KEY?: string | SecretsStoreSecret;
-    PDS_PLC_ROTATION_KEY?: string | SecretsStoreSecret;
-    PDS_RATE_LIMIT_PER_MIN?: string;
-    PDS_MAX_JSON_BYTES?: string;
-    PDS_CORS_ORIGIN?: string;
-    PDS_SEQ_WINDOW?: string;
-    PDS_WS_HIBERNATE?: string;
-    ENVIRONMENT?: string;
-    PDS_BSKY_APP_VIEW_URL?: string;
-    PDS_BSKY_APP_VIEW_DID?: string;
-    PDS_BSKY_APP_VIEW_CDN_URL_PATTERN?: string;
-    PDS_APPVIEW_FORCE_FALLBACK?: string;
-    PDS_BSKY_CHAT_URL?: string;
-    PDS_BSKY_CHAT_DID?: string;
-    PDS_OZONE_URL?: string;
-    PDS_OZONE_DID?: string;
-    PDS_LINK_PRIVACY?: string;
-    PDS_LINK_TOS?: string;
-    PDS_CONTACT_EMAIL?: string;
-    // Relay crawl configuration
-    PDS_RELAY_HOSTS?: string; // CSV of relay hostnames (no scheme). Default: bsky.network
-    PDS_RELAY_NOTIFY?: string; // 'false' to disable auto notify
-    PDS_OAUTH_CLIENT_HOSTS?: string; // CSV of trusted OAuth client metadata/JWKS hostnames
-  }
-
-  namespace App {
-    interface Locals {
-      runtime: {
-        env: Env;
-        ctx: ExecutionContext;
-        request: Request;
-      };
-      requestId?: string;
-    }
-  }
-}
-
-export {};
-
-export type Env = globalThis.Env;
-export type PdsLocals = globalThis.App.Locals;