@distilled.cloud/cloudflare 0.18.0 → 0.18.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -18,9 +18,9 @@ export interface OAuthConfig {
18
18
  readonly refreshToken?: string;
19
19
  readonly expiresAt?: number;
20
20
  }
21
- export interface OAuthProvider<R = never> {
22
- readonly load: Effect.Effect<OAuthConfig, unknown, R>;
23
- readonly refresh: (credentials: OAuthConfig) => Effect.Effect<OAuthConfig, unknown, R>;
21
+ export interface OAuthProvider {
22
+ readonly load: Effect.Effect<OAuthConfig, unknown>;
23
+ readonly refresh: (credentials: OAuthConfig) => Effect.Effect<OAuthConfig, unknown>;
24
24
  readonly apiBaseUrl?: string;
25
25
  }
26
26
  export interface ApiTokenCredentials {
@@ -51,7 +51,7 @@ export declare class OAuthRefreshError extends OAuthRefreshError_base<{
51
51
  }> {
52
52
  }
53
53
  export type CredentialsError = ConfigError | OAuthRefreshError;
54
- declare const Credentials_base: Context.ServiceClass<Credentials, "CloudflareCredentials", Effect.Effect<ResolvedCredentials, CredentialsError, any>>;
54
+ declare const Credentials_base: Context.ServiceClass<Credentials, "CloudflareCredentials", Effect.Effect<ResolvedCredentials, CredentialsError, never>>;
55
55
  export declare class Credentials extends Credentials_base {
56
56
  }
57
57
  export declare const apiTokenCredentials: (config: ApiTokenConfig) => ApiTokenCredentials;
@@ -59,7 +59,7 @@ export declare const apiKeyCredentials: (config: ApiKeyConfig) => ApiKeyCredenti
59
59
  export declare const oauthCredentials: (config: OAuthConfig, apiBaseUrl?: string) => OAuthCredentials;
60
60
  export declare const fromApiToken: (config: ApiTokenConfig) => Layer.Layer<Credentials>;
61
61
  export declare const fromApiKey: (config: ApiKeyConfig) => Layer.Layer<Credentials>;
62
- export declare const fromOAuth: <R>(provider: OAuthProvider<R>) => Layer.Layer<Credentials, never, R>;
62
+ export declare const fromOAuth: (provider: OAuthProvider) => Layer.Layer<Credentials>;
63
63
  export declare const resolveFromEnv: Effect.Effect<ResolvedCredentials, ConfigError>;
64
64
  export declare const fromEnv: () => Layer.Layer<Credentials>;
65
65
  export declare const CredentialsFromEnv: Layer.Layer<Credentials, never, never>;
@@ -1 +1 @@
1
- {"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAG3D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,eAAO,MAAM,oBAAoB,yCAAyC,CAAC;AAI3E,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACnD,QAAQ,CAAC,OAAO,EAAE,CAChB,WAAW,EAAE,WAAW,KACrB,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACzC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC3C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAChD,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;IAC7D,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,MAAM,mBAAmB,GAC3B,mBAAmB,GACnB,iBAAiB,GACjB,gBAAgB,CAAC;;;;AAErB,qBAAa,iBAAkB,SAAQ,uBAErC;IACA,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;CAAG;AAEL,MAAM,MAAM,gBAAgB,GAAG,WAAW,GAAG,iBAAiB,CAAC;;AAE/D,qBAAa,WAAY,SAAQ,gBAGL;CAAG;AAK/B,eAAO,MAAM,mBAAmB,WACtB,cAAc,KACrB,mBAID,CAAC;AAEH,eAAO,MAAM,iBAAiB,WAAY,YAAY,KAAG,iBAKvD,CAAC;AAEH,eAAO,MAAM,gBAAgB,WACnB,WAAW,eACN,MAAM,KAClB,gBAQD,CAAC;AAiDH,eAAO,MAAM,YAAY,WACf,cAAc,KACrB,KAAK,CAAC,KAAK,CAAC,WAAW,CAC+C,CAAC;AAE1E,eAAO,MAAM,UAAU,WAAY,YAAY,KAAG,KAAK,CAAC,KAAK,CAAC,WAAW,CACF,CAAC;AAExE,eAAO,MAAM,SAAS,aACV,aAAa,KACtB,KAAK,CAAC,KAAK,CAAC,WAAW,CAuBzB,CAAC;AAgBF,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,WAAW,CAwCvE,CAAC;AAEL,eAAO,MAAM,OAAO,QAAO,KAAK,CAAC,KAAK,CAAC,WAAW,CACN,CAAC;AAE7C,eAAO,MAAM,kBAAkB,wCAAY,CAAC;AAE5C,eAAO,MAAM,aAAa,gBACX,mBAAmB,KAC/B,MAAM,CAAC,MAAM,EAAE,MAAM,CAgBvB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"credentials.js","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"credentials.js","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@distilled.cloud/cloudflare",
3
- "version": "0.18.0",
3
+ "version": "0.18.1",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "https://github.com/alchemy-run/distilled",
@@ -63,7 +63,7 @@
63
63
  "specs:update": "git -C specs/cloudflare-typescript fetch && git -C specs/cloudflare-typescript checkout main && git -C specs/cloudflare-typescript pull"
64
64
  },
65
65
  "dependencies": {
66
- "@distilled.cloud/core": "0.18.0"
66
+ "@distilled.cloud/core": "0.18.1"
67
67
  },
68
68
  "devDependencies": {
69
69
  "@effect/platform-node": ">=4.0.0-beta.60 || >=4.0.0",
@@ -28,11 +28,11 @@ export interface OAuthConfig {
28
28
  readonly expiresAt?: number;
29
29
  }
30
30
 
31
- export interface OAuthProvider<R = never> {
32
- readonly load: Effect.Effect<OAuthConfig, unknown, R>;
31
+ export interface OAuthProvider {
32
+ readonly load: Effect.Effect<OAuthConfig, unknown>;
33
33
  readonly refresh: (
34
34
  credentials: OAuthConfig,
35
- ) => Effect.Effect<OAuthConfig, unknown, R>;
35
+ ) => Effect.Effect<OAuthConfig, unknown>;
36
36
  readonly apiBaseUrl?: string;
37
37
  }
38
38
 
@@ -73,7 +73,7 @@ export type CredentialsError = ConfigError | OAuthRefreshError;
73
73
 
74
74
  export class Credentials extends Context.Service<
75
75
  Credentials,
76
- Effect.Effect<ResolvedCredentials, CredentialsError, any>
76
+ Effect.Effect<ResolvedCredentials, CredentialsError, never>
77
77
  >()("CloudflareCredentials") {}
78
78
 
79
79
  const resolveApiBaseUrl = (apiBaseUrl?: string): string =>
@@ -120,9 +120,9 @@ const isExpired = (expiresAt?: number): boolean =>
120
120
  expiresAt !== undefined &&
121
121
  Date.now() >= expiresAt - CREDENTIAL_REFRESH_WINDOW_MS;
122
122
 
123
- const createCachedCredentialsEffect = <E, R>(
124
- resolve: Effect.Effect<ResolvedCredentials, E, R>,
125
- ): Effect.Effect<ResolvedCredentials, E, R> => {
123
+ const createCachedCredentialsEffect = <E>(
124
+ resolve: Effect.Effect<ResolvedCredentials, E>,
125
+ ): Effect.Effect<ResolvedCredentials, E> => {
126
126
  let cachedCreds: ResolvedCredentials | undefined;
127
127
  let refreshAt = 0;
128
128
 
@@ -140,10 +140,10 @@ const createCachedCredentialsEffect = <E, R>(
140
140
  });
141
141
  };
142
142
 
143
- const wrapOAuthError = <A, R>(
143
+ const wrapOAuthError = <A>(
144
144
  message: string,
145
- effect: Effect.Effect<A, unknown, R>,
146
- ): Effect.Effect<A, OAuthRefreshError, R> =>
145
+ effect: Effect.Effect<A, unknown>,
146
+ ): Effect.Effect<A, OAuthRefreshError> =>
147
147
  effect.pipe(
148
148
  Effect.mapError(
149
149
  (cause) =>
@@ -162,9 +162,9 @@ export const fromApiToken = (
162
162
  export const fromApiKey = (config: ApiKeyConfig): Layer.Layer<Credentials> =>
163
163
  Layer.succeed(Credentials, Effect.succeed(apiKeyCredentials(config)));
164
164
 
165
- export const fromOAuth = <R>(
166
- provider: OAuthProvider<R>,
167
- ): Layer.Layer<Credentials, never, R> => {
165
+ export const fromOAuth = (
166
+ provider: OAuthProvider,
167
+ ): Layer.Layer<Credentials> => {
168
168
  let currentCredentials: OAuthConfig | undefined;
169
169
 
170
170
  const resolve = Effect.gen(function* () {