@zeltjs/adapter-cloudflare-workers 0.6.1 → 0.8.0

package/README.md

@@ -46,25 +46,24 @@ onCloudflareWorkers(app, {
 
 ## Environment Variables
 
-When using `EnvConfig`, it is automatically replaced with `CloudflareWorkersEnvConfig` which reads from `cloudflare:workers` env:
+`onCloudflareWorkers()` automatically registers `CloudflareWorkersEnvAdaptor`, which reads from the `cloudflare:workers` env. Use `inject(Env)` to access environment variables:
 
 ```typescript
-import { createApp, Controller, Get, EnvConfig, EnvService, inject } from '@zeltjs/core';
+import { createApp, Controller, Get, Env, inject } from '@zeltjs/core';
 import { onCloudflareWorkers } from '@zeltjs/adapter-cloudflare-workers';
 
 @Controller('/config')
 class ConfigController {
-  constructor(private env = inject(EnvService)) {}
+  constructor(private env = inject(Env)) {}
 
   @Get('/')
   getApiHost() {
-    return { apiHost: this.env.get('API_HOST') };
+    return { apiHost: this.env.getString('API_HOST', 'localhost') };
   }
 }
 
 const app = createApp({
-  controllers: [ConfigController],
-  configs: [EnvConfig],
+  http: { controllers: [ConfigController] },
 });
 
 const workers = await onCloudflareWorkers(app);

package/dist/index.d.ts

@@ -1,24 +1,19 @@
-import { ControllerRouteInfo, EnvConfig, HttpApp, HttpMetadata, ReadyResult } from "@zeltjs/core";
+import { EnvAdaptor, HttpApp, ReadyResult } from "@zeltjs/core";
 
-//#region src/cloudflare-workers-env.config.d.ts
-declare class CloudflareWorkersEnvConfig extends EnvConfig {
+//#region src/cloudflare-workers-env.adaptor.d.ts
+declare class CloudflareWorkersEnvAdaptor extends EnvAdaptor {
   get(key: string): string | undefined;
 }
 //#endregion
 //#region src/on-cloudflare-workers.d.ts
-type DynamicMeta = HttpMetadata;
 type CloudflareWorkersOptions = {
   readonly warmup?: boolean;
-  readonly dynamic?: boolean;
 };
-type BaseCloudflareWorkersApp = ReadyResult & {
+type CloudflareWorkersApp = ReadyResult & {
   readonly fetch: (request: Request, env: unknown, ctx: ExecutionContext) => Promise<Response>;
   readonly shutdown: () => Promise<void>;
 };
-type CloudflareWorkersApp = BaseCloudflareWorkersApp & {
-  readonly __dynamicMeta?: DynamicMeta;
-};
 declare const onCloudflareWorkers: (app: HttpApp, options?: CloudflareWorkersOptions) => Promise<CloudflareWorkersApp>;
 //#endregion
-export { type CloudflareWorkersApp, CloudflareWorkersEnvConfig, type CloudflareWorkersOptions, type ControllerRouteInfo, type DynamicMeta, type HttpMetadata, onCloudflareWorkers };
+export { type CloudflareWorkersApp, CloudflareWorkersEnvAdaptor, type CloudflareWorkersOptions, onCloudflareWorkers };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/cloudflare-workers-env.config.ts","../src/on-cloudflare-workers.ts"],"mappings":";;;cAIa,0BAAA,SAAmC,SAAA;EACrC,GAAA,CAAI,GAAA;AAAA;;;KCOH,WAAA,GAAc,YAAA;AAAA,KAEd,wBAAA;EAAA,SACD,MAAA;EAAA,SACA,OAAA;AAAA;AAAA,KAGN,wBAAA,GAA2B,WAAA;EAAA,SACrB,KAAA,GAAQ,OAAA,EAAS,OAAA,EAAS,GAAA,WAAc,GAAA,EAAK,gBAAA,KAAqB,OAAA,CAAQ,QAAA;EAAA,SAC1E,QAAA,QAAgB,OAAA;AAAA;AAAA,KAGf,oBAAA,GAAuB,wBAAA;EAAA,SACxB,aAAA,GAAgB,WAAA;AAAA;AAAA,cAGd,mBAAA,GACX,GAAA,EAAK,OAAA,EACL,OAAA,GAAS,wBAAA,KACR,OAAA,CAAQ,oBAAA"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/cloudflare-workers-env.adaptor.ts","../src/on-cloudflare-workers.ts"],"mappings":";;;cAIa,2BAAA,SAAoC,UAAA;EACtC,GAAA,CAAI,GAAA;AAAA;;;KCDH,wBAAA;EAAA,SACD,MAAA;AAAA;AAAA,KAGC,oBAAA,GAAuB,WAAA;EAAA,SACxB,KAAA,GAAQ,OAAA,EAAS,OAAA,EAAS,GAAA,WAAc,GAAA,EAAK,gBAAA,KAAqB,OAAA,CAAQ,QAAA;EAAA,SAC1E,QAAA,QAAgB,OAAA;AAAA;AAAA,cAGd,mBAAA,GACX,GAAA,EAAK,OAAA,EACL,OAAA,GAAS,wBAAA,KACR,OAAA,CAAQ,oBAAA"}

package/dist/index.js

@@ -1,23 +1,23 @@
 import { env } from "cloudflare:workers";
-import { Config, EnvConfig } from "@zeltjs/core";
-//#region src/cloudflare-workers-env.config.ts
+import { Config, EnvAdaptor } from "@zeltjs/core";
+//#region src/cloudflare-workers-env.adaptor.ts
 function _ts_decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
 	else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
 	return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var CloudflareWorkersEnvConfig = class extends EnvConfig {
+var CloudflareWorkersEnvAdaptor = class extends EnvAdaptor {
 	get(key) {
-		const value = env[key];
+		const value = Reflect.get(env, key);
 		return typeof value === "string" ? value : void 0;
 	}
 };
-CloudflareWorkersEnvConfig = _ts_decorate([Config], CloudflareWorkersEnvConfig);
+CloudflareWorkersEnvAdaptor = _ts_decorate([Config], CloudflareWorkersEnvAdaptor);
 //#endregion
 //#region src/on-cloudflare-workers.ts
 const onCloudflareWorkers = async (app, options = {}) => {
-	app.addFallbackConfig(CloudflareWorkersEnvConfig);
+	app.addFallbackConfig(CloudflareWorkersEnvAdaptor);
 	const readyOptions = { warmup: options.warmup ?? false };
 	const resolver = await app.ready(readyOptions);
 	const fetch = async (request, _env, ctx) => {
@@ -25,21 +25,13 @@ const onCloudflareWorkers = async (app, options = {}) => {
 		ctx.waitUntil(response.then(() => {}));
 		return response;
 	};
-	const base = {
+	return {
 		...resolver,
 		fetch,
 		shutdown: app.shutdown
 	};
-	if (options.dynamic) {
-		const __dynamicMeta = app.getMetadata();
-		return {
-			...base,
-			__dynamicMeta
-		};
-	}
-	return base;
 };
 //#endregion
-export { CloudflareWorkersEnvConfig, onCloudflareWorkers };
+export { CloudflareWorkersEnvAdaptor, onCloudflareWorkers };
 
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["env","Config","EnvConfig","CloudflareWorkersEnvConfig","get","key","value","undefined","CloudflareWorkersEnvConfig","onCloudflareWorkers","app","options","addFallbackConfig","readyOptions","warmup","resolver","ready","fetch","request","_env","ctx","response","waitUntil","then","base","shutdown","dynamic","__dynamicMeta","getMetadata"],"sources":["../src/cloudflare-workers-env.config.ts","../src/on-cloudflare-workers.ts"],"sourcesContent":["import { env } from 'cloudflare:workers';\nimport { Config, EnvConfig } from '@zeltjs/core';\n\n@Config\nexport class CloudflareWorkersEnvConfig extends EnvConfig {\n  override get(key: string): string | undefined {\n    const value: unknown = (env as Record<string, unknown>)[key];\n    return typeof value === 'string' ? value : undefined;\n  }\n}\n","import type {\n  ControllerRouteInfo,\n  HttpApp,\n  HttpMetadata,\n  ReadyOptions,\n  ReadyResult,\n} from '@zeltjs/core';\n\nimport { CloudflareWorkersEnvConfig } from './cloudflare-workers-env.config';\n\nexport type { ControllerRouteInfo, HttpMetadata };\n\nexport type DynamicMeta = HttpMetadata;\n\nexport type CloudflareWorkersOptions = {\n  readonly warmup?: boolean;\n  readonly dynamic?: boolean;\n};\n\ntype BaseCloudflareWorkersApp = ReadyResult & {\n  readonly fetch: (request: Request, env: unknown, ctx: ExecutionContext) => Promise<Response>;\n  readonly shutdown: () => Promise<void>;\n};\n\nexport type CloudflareWorkersApp = BaseCloudflareWorkersApp & {\n  readonly __dynamicMeta?: DynamicMeta;\n};\n\nexport const onCloudflareWorkers = async (\n  app: HttpApp,\n  options: CloudflareWorkersOptions = {},\n): Promise<CloudflareWorkersApp> => {\n  app.addFallbackConfig(CloudflareWorkersEnvConfig);\n\n  const readyOptions: ReadyOptions = { warmup: options.warmup ?? false };\n  const resolver = await app.ready(readyOptions);\n\n  const fetch = async (\n    request: Request,\n    _env: unknown,\n    ctx: ExecutionContext,\n  ): Promise<Response> => {\n    const response = app.fetch(request);\n    ctx.waitUntil(response.then(() => {}));\n    return response;\n  };\n\n  const base: BaseCloudflareWorkersApp = { ...resolver, fetch, shutdown: app.shutdown };\n\n  if (options.dynamic) {\n    const __dynamicMeta = app.getMetadata();\n    return { ...base, __dynamicMeta };\n  }\n\n  return base;\n};\n"],"mappings":";;;;;;;;;AAIA,IAAaG,6BAAb,cAAgDD,UAAAA;CACrCE,IAAIC,KAAiC;EAC5C,MAAMC,QAAiB,IAAiCD;AACxD,SAAO,OAAOC,UAAU,WAAWA,QAAQC,KAAAA;;;;;;ACqB/C,MAAaE,sBAAsB,OACjCC,KACAC,UAAoC,EAAE,KAAA;AAEtCD,KAAIE,kBAAkBJ,2BAAAA;CAEtB,MAAMK,eAA6B,EAAEC,QAAQH,QAAQG,UAAU,OAAM;CACrE,MAAMC,WAAW,MAAML,IAAIM,MAAMH,aAAAA;CAEjC,MAAMI,QAAQ,OACZC,SACAC,MACAC,QAAAA;EAEA,MAAMC,WAAWX,IAAIO,MAAMC,QAAAA;AAC3BE,MAAIE,UAAUD,SAASE,WAAK,GAAO,CAAA;AACnC,SAAOF;;CAGT,MAAMG,OAAiC;EAAE,GAAGT;EAAUE;EAAOQ,UAAUf,IAAIe;EAAS;AAEpF,KAAId,QAAQe,SAAS;EACnB,MAAMC,gBAAgBjB,IAAIkB,aAAW;AACrC,SAAO;GAAE,GAAGJ;GAAMG;GAAc;;AAGlC,QAAOH"}
+{"version":3,"file":"index.js","names":["env","Config","EnvAdaptor","CloudflareWorkersEnvAdaptor","get","key","value","Reflect","undefined","CloudflareWorkersEnvAdaptor","onCloudflareWorkers","app","options","addFallbackConfig","readyOptions","warmup","resolver","ready","fetch","request","_env","ctx","response","waitUntil","then","shutdown"],"sources":["../src/cloudflare-workers-env.adaptor.ts","../src/on-cloudflare-workers.ts"],"sourcesContent":["import { env } from 'cloudflare:workers';\nimport { Config, EnvAdaptor } from '@zeltjs/core';\n\n@Config\nexport class CloudflareWorkersEnvAdaptor extends EnvAdaptor {\n  override get(key: string): string | undefined {\n    const value: unknown = Reflect.get(env, key);\n    return typeof value === 'string' ? value : undefined;\n  }\n}\n","import type { HttpApp, ReadyOptions, ReadyResult } from '@zeltjs/core';\n\nimport { CloudflareWorkersEnvAdaptor } from './cloudflare-workers-env.adaptor';\n\nexport type CloudflareWorkersOptions = {\n  readonly warmup?: boolean;\n};\n\nexport type CloudflareWorkersApp = ReadyResult & {\n  readonly fetch: (request: Request, env: unknown, ctx: ExecutionContext) => Promise<Response>;\n  readonly shutdown: () => Promise<void>;\n};\n\nexport const onCloudflareWorkers = async (\n  app: HttpApp,\n  options: CloudflareWorkersOptions = {},\n): Promise<CloudflareWorkersApp> => {\n  app.addFallbackConfig(CloudflareWorkersEnvAdaptor);\n\n  const readyOptions: ReadyOptions = { warmup: options.warmup ?? false };\n  const resolver = await app.ready(readyOptions);\n\n  const fetch = async (\n    request: Request,\n    _env: unknown,\n    ctx: ExecutionContext,\n  ): Promise<Response> => {\n    const response = app.fetch(request);\n    ctx.waitUntil(response.then(() => {}));\n    return response;\n  };\n\n  return { ...resolver, fetch, shutdown: app.shutdown };\n};\n"],"mappings":";;;;;;;;;AAIA,IAAaG,8BAAb,cAAiDD,WAAAA;CACtCE,IAAIC,KAAiC;EAC5C,MAAMC,QAAiBC,QAAQH,IAAIJ,KAAKK,IAAAA;AACxC,SAAO,OAAOC,UAAU,WAAWA,QAAQE,KAAAA;;;;;;ACM/C,MAAaE,sBAAsB,OACjCC,KACAC,UAAoC,EAAE,KAAA;AAEtCD,KAAIE,kBAAkBJ,4BAAAA;CAEtB,MAAMK,eAA6B,EAAEC,QAAQH,QAAQG,UAAU,OAAM;CACrE,MAAMC,WAAW,MAAML,IAAIM,MAAMH,aAAAA;CAEjC,MAAMI,QAAQ,OACZC,SACAC,MACAC,QAAAA;EAEA,MAAMC,WAAWX,IAAIO,MAAMC,QAAAA;AAC3BE,MAAIE,UAAUD,SAASE,WAAK,GAAO,CAAA;AACnC,SAAOF;;AAGT,QAAO;EAAE,GAAGN;EAAUE;EAAOO,UAAUd,IAAIc;EAAS"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeltjs/adapter-cloudflare-workers",
-  "version": "0.6.1",
+  "version": "0.8.0",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -21,7 +21,7 @@
     "dist"
   ],
   "dependencies": {
-    "@zeltjs/core": "0.6.1"
+    "@zeltjs/core": "0.8.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "4.20250523.0"