@distilled.cloud/planetscale 0.17.0 → 0.18.1

package/lib/credentials.d.ts

@@ -1,6 +1,6 @@
+import * as Context from "effect/Context";
 import * as Layer from "effect/Layer";
 import * as Redacted from "effect/Redacted";
-import * as Context from "effect/Context";
 import { ConfigError } from "@distilled.cloud/core/errors";
 export declare const DEFAULT_API_BASE_URL = "https://api.planetscale.com/v1";
 export interface Config {

package/lib/credentials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,eAAO,MAAM,oBAAoB,mCAAmC,CAAC;AAErE,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1C,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;;AAED,qBAAa,WAAY,SAAQ,gBAEhC;CAAG;AAEJ,eAAO,MAAM,kBAAkB,8CAgC9B,CAAC"}
+{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,eAAO,MAAM,oBAAoB,mCAAmC,CAAC;AAErE,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1C,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;;AAED,qBAAa,WAAY,SAAQ,gBAEhC;CAAG;AAQJ,eAAO,MAAM,kBAAkB,8CAiB9B,CAAC"}

package/lib/credentials.js

@@ -1,35 +1,23 @@
+import * as EffectConfig from "effect/Config";
+import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Redacted from "effect/Redacted";
-import * as Context from "effect/Context";
 import { ConfigError } from "@distilled.cloud/core/errors";
 export const DEFAULT_API_BASE_URL = "https://api.planetscale.com/v1";
 export class Credentials extends Context.Service()("PlanetScaleCredentials") {
 }
-export const CredentialsFromEnv = Layer.effect(Credentials, Effect.gen(function* () {
-    const tokenId = process.env.PLANETSCALE_API_TOKEN_ID;
-    const token = process.env.PLANETSCALE_API_TOKEN;
-    const organization = process.env.PLANETSCALE_ORGANIZATION;
-    if (!tokenId) {
-        return yield* new ConfigError({
-            message: "PLANETSCALE_API_TOKEN_ID environment variable is required",
-        });
-    }
-    if (!token) {
-        return yield* new ConfigError({
-            message: "PLANETSCALE_API_TOKEN environment variable is required",
-        });
-    }
-    if (!organization) {
-        return yield* new ConfigError({
-            message: "PLANETSCALE_ORGANIZATION environment variable is required",
-        });
-    }
-    return {
-        tokenId,
-        token: Redacted.make(token),
-        organization,
-        apiBaseUrl: DEFAULT_API_BASE_URL,
-    };
-}));
+const envConfig = EffectConfig.all({
+    tokenId: EffectConfig.string("PLANETSCALE_API_TOKEN_ID"),
+    token: EffectConfig.string("PLANETSCALE_API_TOKEN"),
+    organization: EffectConfig.string("PLANETSCALE_ORGANIZATION"),
+});
+export const CredentialsFromEnv = Layer.effect(Credentials, envConfig.asEffect().pipe(Effect.mapError(() => new ConfigError({
+    message: "PLANETSCALE_API_TOKEN_ID, PLANETSCALE_API_TOKEN, and PLANETSCALE_ORGANIZATION environment variables are required",
+})), Effect.map(({ tokenId, token, organization }) => ({
+    tokenId,
+    token: Redacted.make(token),
+    organization,
+    apiBaseUrl: DEFAULT_API_BASE_URL,
+}))));
 //# sourceMappingURL=credentials.js.map

package/lib/credentials.js.map

@@ -1 +1 @@
-{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,MAAM,CAAC,MAAM,oBAAoB,GAAG,gCAAgC,CAAC;AASrE,MAAM,OAAO,WAAY,SAAQ,OAAO,CAAC,OAAO,EAAuB,CACrE,wBAAwB,CACzB;CAAG;AAEJ,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,CAAC,MAAM,CAC5C,WAAW,EACX,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;IACrD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;IAChD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;IAE1D,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,KAAK,CAAC,CAAC,IAAI,WAAW,CAAC;YAC5B,OAAO,EAAE,2DAA2D;SACrE,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC,CAAC,IAAI,WAAW,CAAC;YAC5B,OAAO,EAAE,wDAAwD;SAClE,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,KAAK,CAAC,CAAC,IAAI,WAAW,CAAC;YAC5B,OAAO,EAAE,2DAA2D;SACrE,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,OAAO;QACP,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;QAC3B,YAAY;QACZ,UAAU,EAAE,oBAAoB;KACjC,CAAC;AACJ,CAAC,CAAC,CACH,CAAC"}
+{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,MAAM,CAAC,MAAM,oBAAoB,GAAG,gCAAgC,CAAC;AASrE,MAAM,OAAO,WAAY,SAAQ,OAAO,CAAC,OAAO,EAAuB,CACrE,wBAAwB,CACzB;CAAG;AAEJ,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC;IACjC,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,0BAA0B,CAAC;IACxD,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,uBAAuB,CAAC;IACnD,YAAY,EAAE,YAAY,CAAC,MAAM,CAAC,0BAA0B,CAAC;CAC9D,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,CAAC,MAAM,CAC5C,WAAW,EACX,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,CACvB,MAAM,CAAC,QAAQ,CACb,GAAG,EAAE,CACH,IAAI,WAAW,CAAC;IACd,OAAO,EACL,kHAAkH;CACrH,CAAC,CACL,EACD,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;IAChD,OAAO;IACP,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;IAC3B,YAAY;IACZ,UAAU,EAAE,oBAAoB;CACjC,CAAC,CAAC,CACJ,CACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@distilled.cloud/planetscale",
-  "version": "0.17.0",
+  "version": "0.18.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/alchemy-run/distilled",
@@ -73,7 +73,7 @@
     "specs:update": "git -C specs/distilled-spec-planetscale fetch && git -C specs/distilled-spec-planetscale checkout main && git -C specs/distilled-spec-planetscale pull"
   },
   "dependencies": {
-    "@distilled.cloud/core": "0.17.0"
+    "@distilled.cloud/core": "0.18.1"
   },
   "devDependencies": {
     "@types/bun": "^1.3.0",

package/src/credentials.ts

@@ -1,7 +1,8 @@
+import * as EffectConfig from "effect/Config";
+import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Redacted from "effect/Redacted";
-import * as Context from "effect/Context";
 import { ConfigError } from "@distilled.cloud/core/errors";
 
 export const DEFAULT_API_BASE_URL = "https://api.planetscale.com/v1";
@@ -17,36 +18,27 @@ export class Credentials extends Context.Service<Credentials, Config>()(
   "PlanetScaleCredentials",
 ) {}
 
+const envConfig = EffectConfig.all({
+  tokenId: EffectConfig.string("PLANETSCALE_API_TOKEN_ID"),
+  token: EffectConfig.string("PLANETSCALE_API_TOKEN"),
+  organization: EffectConfig.string("PLANETSCALE_ORGANIZATION"),
+});
+
 export const CredentialsFromEnv = Layer.effect(
   Credentials,
-  Effect.gen(function* () {
-    const tokenId = process.env.PLANETSCALE_API_TOKEN_ID;
-    const token = process.env.PLANETSCALE_API_TOKEN;
-    const organization = process.env.PLANETSCALE_ORGANIZATION;
-
-    if (!tokenId) {
-      return yield* new ConfigError({
-        message: "PLANETSCALE_API_TOKEN_ID environment variable is required",
-      });
-    }
-
-    if (!token) {
-      return yield* new ConfigError({
-        message: "PLANETSCALE_API_TOKEN environment variable is required",
-      });
-    }
-
-    if (!organization) {
-      return yield* new ConfigError({
-        message: "PLANETSCALE_ORGANIZATION environment variable is required",
-      });
-    }
-
-    return {
+  envConfig.asEffect().pipe(
+    Effect.mapError(
+      () =>
+        new ConfigError({
+          message:
+            "PLANETSCALE_API_TOKEN_ID, PLANETSCALE_API_TOKEN, and PLANETSCALE_ORGANIZATION environment variables are required",
+        }),
+    ),
+    Effect.map(({ tokenId, token, organization }) => ({
       tokenId,
       token: Redacted.make(token),
       organization,
       apiBaseUrl: DEFAULT_API_BASE_URL,
-    };
-  }),
+    })),
+  ),
 );