@riordanpawley/effect-prisma-generator 0.6.6 → 0.6.8

package/dist/index.js

@@ -550,7 +550,7 @@ async function generateUnifiedService(models, outputDir, clientImportPath, error
 function generateCustomErrorService(customError, clientImportPath, rawSqlOperations, modelTypeAliases, prismaInterface, modelOperations, enableTelemetry) {
     const _errorType = customError.className;
     return `${header}
-import { Context, Effect, Exit, Layer, Option } from "effect"
+import { Context, Effect, Exit, Layer, Option, Scope } from "effect"
 import { Prisma as PrismaNamespace, PrismaClient as BasePrismaClient } from "${clientImportPath}"
 import { ${customError.className}, mapPrismaError } from "${customError.path}"
 
@@ -622,10 +622,10 @@ export class PrismaClient extends Context.Tag("PrismaClient")<
    */
   static layer = (
     ...args: ConstructorParameters<typeof BasePrismaClient>
-  ) => Layer.scoped(
+  ): Layer.Layer<PrismaClient, never, never> => Layer.scoped(
     PrismaClient,
     Effect.gen(function* () {
-      const prisma = new BasePrismaClient(...args)
+      const prisma: BasePrismaClient = new BasePrismaClient(...args)
       yield* Effect.addFinalizer(() => Effect.promise(() => prisma.$disconnect()))
       return prisma
     })
@@ -657,11 +657,11 @@ export class PrismaClient extends Context.Tag("PrismaClient")<
    */
   static layerEffect = <R, E>(
     optionsEffect: Effect.Effect<ConstructorParameters<typeof BasePrismaClient>[0], E, R>
-  ) => Layer.scoped(
+  ): Layer.Layer<PrismaClient, E, Exclude<R, Scope.Scope>> => Layer.scoped(
     PrismaClient,
     Effect.gen(function* () {
-      const options = yield* optionsEffect
-      const prisma = new BasePrismaClient(options)
+      const options: ConstructorParameters<typeof BasePrismaClient>[0] = yield* optionsEffect
+      const prisma: BasePrismaClient = new BasePrismaClient(options)
       yield* Effect.addFinalizer(() => Effect.promise(() => prisma.$disconnect()))
       return prisma
     })
@@ -1026,7 +1026,7 @@ export class Prisma extends Context.Tag("Prisma")<Prisma, IPrismaService>() {
    * Used internally by layer constructors.
    */
   static make: Effect.Effect<IPrismaService, never, PrismaClient> = makePrismaService;
-  static Default = Layer.effect(Prisma, this.make);
+  static Default: Layer.Layer<Prisma, never, PrismaClient> = Layer.effect(Prisma, this.make);
 
   /**
    * Create a complete Prisma layer with the given PrismaClient options.
@@ -1055,7 +1055,7 @@ export class Prisma extends Context.Tag("Prisma")<Prisma, IPrismaService>() {
    */
   static layer = (
     ...args: ConstructorParameters<typeof BasePrismaClient>
-  ) => this.Default.pipe(
+  ): Layer.Layer<Prisma | PrismaClient, never, never> => this.Default.pipe(
     Layer.provideMerge(PrismaClient.layer(...args))
   );
 
@@ -1084,7 +1084,7 @@ export class Prisma extends Context.Tag("Prisma")<Prisma, IPrismaService>() {
    */
   static layerEffect = <R, E>(
     optionsEffect: Effect.Effect<ConstructorParameters<typeof BasePrismaClient>[0], E, R>
-  ) => this.Default.pipe(
+  ): Layer.Layer<Prisma | PrismaClient, E, Exclude<R, Scope.Scope>> => this.Default.pipe(
     Layer.provideMerge(PrismaClient.layerEffect(optionsEffect))
   );
 }
@@ -1098,7 +1098,7 @@ export class Prisma extends Context.Tag("Prisma")<Prisma, IPrismaService>() {
 function generateDefaultErrorService(clientImportPath, rawSqlOperations, modelTypeAliases, prismaInterface, modelOperations, enableTelemetry) {
     const _errorType = "PrismaError";
     return `${header}
-import { Context, Data, Effect, Exit, Layer, Option } from "effect"
+import { Context, Data, Effect, Exit, Layer, Option, Scope } from "effect"
 import { Prisma as PrismaNamespace, PrismaClient as BasePrismaClient } from "${clientImportPath}"
 
 // Create local reference to error class for proper type narrowing
@@ -1178,10 +1178,10 @@ export class PrismaClient extends Context.Tag("PrismaClient")<
    */
   static layer = (
     ...args: ConstructorParameters<typeof BasePrismaClient>
-  ) => Layer.scoped(
+  ): Layer.Layer<PrismaClient, never, never> => Layer.scoped(
     PrismaClient,
     Effect.gen(function* () {
-      const prisma = new BasePrismaClient(...args)
+      const prisma: BasePrismaClient = new BasePrismaClient(...args)
       yield* Effect.addFinalizer(() => Effect.promise(() => prisma.$disconnect()))
       return prisma
     })
@@ -1213,11 +1213,11 @@ export class PrismaClient extends Context.Tag("PrismaClient")<
    */
   static layerEffect = <R, E>(
     optionsEffect: Effect.Effect<ConstructorParameters<typeof BasePrismaClient>[0], E, R>
-  ) => Layer.scoped(
+  ): Layer.Layer<PrismaClient, E, Exclude<R, Scope.Scope>> => Layer.scoped(
     PrismaClient,
     Effect.gen(function* () {
-      const options = yield* optionsEffect
-      const prisma = new BasePrismaClient(options)
+      const options: ConstructorParameters<typeof BasePrismaClient>[0] = yield* optionsEffect
+      const prisma: BasePrismaClient = new BasePrismaClient(options)
       yield* Effect.addFinalizer(() => Effect.promise(() => prisma.$disconnect()))
       return prisma
     })
@@ -1926,6 +1926,7 @@ export class Prisma extends Context.Tag("Prisma")<Prisma, IPrismaService>() {
    * Used internally by layer constructors.
    */
   static make: Effect.Effect<IPrismaService, never, PrismaClient> = makePrismaService;
+  static Default: Layer.Layer<Prisma, never, PrismaClient> = Layer.effect(Prisma, this.make);
 
   /**
    * Create a complete Prisma layer with the given PrismaClient options.
@@ -1954,8 +1955,8 @@ export class Prisma extends Context.Tag("Prisma")<Prisma, IPrismaService>() {
    */
   static layer = (
     ...args: ConstructorParameters<typeof BasePrismaClient>
-  ) => Layer.effect(Prisma, this.make).pipe(
-    Layer.provide(PrismaClient.layer(...args))
+  ): Layer.Layer<Prisma | PrismaClient, never, never> => this.Default.pipe(
+    Layer.provideMerge(PrismaClient.layer(...args))
   );
 
   /**
@@ -1983,8 +1984,8 @@ export class Prisma extends Context.Tag("Prisma")<Prisma, IPrismaService>() {
    */
   static layerEffect = <R, E>(
     optionsEffect: Effect.Effect<ConstructorParameters<typeof BasePrismaClient>[0], E, R>
-  ) => Layer.effect(Prisma, this.make).pipe(
-    Layer.provide(PrismaClient.layerEffect(optionsEffect))
+  ): Layer.Layer<Prisma | PrismaClient, E, Exclude<R, Scope.Scope>> => this.Default.pipe(
+    Layer.provideMerge(PrismaClient.layerEffect(optionsEffect))
   );
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riordanpawley/effect-prisma-generator",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "description": "Prisma generator for Effect (fork with Prisma 7 support)",
   "main": "dist/index.js",
   "bin": {
@@ -10,11 +10,6 @@
     "dist",
     "README.md"
   ],
-  "scripts": {
-    "build": "tsc && chmod +x dist/index.js",
-    "test": "tsx scripts/runTests.ts",
-    "prepublishOnly": "pnpm run build"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/riordanpawley/effect-prisma-generator.git"
@@ -43,5 +38,9 @@
     "prisma": "^6.19.0",
     "tsx": "^4.20.6",
     "vitest": "^3.0.7"
+  },
+  "scripts": {
+    "build": "tsc && chmod +x dist/index.js",
+    "test": "tsx scripts/runTests.ts"
   }
-}
+}