File structure refactoring

src/Express/ExpressApp.ts

@@ -1,6 +1,6 @@
 import { Config, Context, Effect, Layer } from "effect"
 import type { Express } from "express"
-import { ImportError } from "../../ImportError"
+import { ImportError } from "../ImportError"
 
 
 export class ExpressApp extends Context.Tag("ExpressApp")<ExpressApp, Express>() {}

src/Express/ExpressNodeHTTPServer.ts

@@ -1,7 +1,7 @@
 import { Config, Context, Effect, Layer, Match } from "effect"
 import type { Server } from "node:http"
 import type { AddressInfo } from "node:net"
-import { ImportError } from "../../ImportError"
+import { ImportError } from "../ImportError"
 import { ExpressApp } from "./ExpressApp"
 
 

src/JSONWebToken.ts

@@ -1,6 +1,6 @@
 import { Context, Effect, Layer } from "effect"
 import type * as JWT from "jsonwebtoken"
-import { ImportError } from "../ImportError"
+import { ImportError } from "./ImportError"
 
 
 export class JSONWebToken extends Context.Tag("JSONWebToken")<JSONWebToken, {

src/Layers/index.ts

@@ -1,4 +0,0 @@
-export * from "./express"
-export * as JSONWebToken from "./JSONWebToken"
-export * as OpenAIClient from "./OpenAIClient"
-export * from "./trpc"

src/OpenAIClient.ts

@@ -1,6 +1,6 @@
 import { Config, Context, Effect, Layer } from "effect"
 import type { OpenAI } from "openai"
-import { ImportError } from "../ImportError"
+import { ImportError } from "./ImportError"
 
 
 export class OpenAIClient extends Context.Tag("OpenAIClient")<OpenAIClient, OpenAIClientService>() {}

src/TRPC/TRPCExpressRoute.ts

@@ -1,7 +1,7 @@
 import type { AnyRouter } from "@trpc/server"
 import { Config, Context, Effect, Layer } from "effect"
-import { ImportError } from "../../ImportError"
-import { ExpressApp } from "../express"
+import { ExpressApp } from "../Express"
+import { ImportError } from "../ImportError"
 import { TRPCUnknownContextCreator } from "./TRPCContextCreator"
 
 

src/TRPC/TRPCWebSocketServer.ts

@@ -2,8 +2,8 @@ import type { AnyRouter } from "@trpc/server"
 import type { applyWSSHandler } from "@trpc/server/adapters/ws"
 import { Config, Context, Effect, Layer } from "effect"
 import type ws from "ws"
-import { ImportError } from "../../ImportError"
-import { ExpressNodeHTTPServer } from "../express"
+import { ExpressNodeHTTPServer } from "../Express"
+import { ImportError } from "../ImportError"
 import { TRPCUnknownContextCreator } from "./TRPCContextCreator"
 
 

src/TRPC/example.ts

@@ -1,7 +1,6 @@
 import { Config, Effect, Layer } from "effect"
 import * as TRPC from "."
-import { JSONWebToken } from ".."
-import { ExpressApp, ExpressNodeHTTPServer } from "../express"
+import { Express, JSONWebToken } from ".."
 
 
 // Context available to the router procedures
@@ -40,10 +39,10 @@ const ServerLive = Layer.empty.pipe(
     Layer.provideMerge(TRPCBuilderLive),
     Layer.provideMerge(TRPCContextCreatorLive),
 
-    Layer.provideMerge(ExpressNodeHTTPServer.ExpressNodeHTTPServerLive({
+    Layer.provideMerge(Express.ExpressNodeHTTPServer.ExpressNodeHTTPServerLive({
         port: Config.succeed(3000)
     })),
-    Layer.provideMerge(ExpressApp.ExpressAppLive())
+    Layer.provideMerge(Express.ExpressApp.ExpressAppLive())
 )
 
 await Effect.gen(function*() {

src/TRPC/importTRPCServer.ts

@@ -1,5 +1,5 @@
 import { Effect } from "effect"
-import { ImportError } from "../../ImportError"
+import { ImportError } from "../ImportError"
 
 
 export const importTRPCServer = Effect.tryPromise({

src/index.ts

@@ -1,4 +1,6 @@
+export * as Express from "./Express"
 export * from "./ImportError"
-export * as Layers from "./Layers"
+export * as JSONWebToken from "./JSONWebToken"
+export * as OpenAIClient from "./OpenAIClient"
 export * as Schema from "./Schema"
 export * as Types from "./Types"

tsup.config.ts

@@ -10,7 +10,7 @@ export default defineConfig({
         "./src/Schema/TanStackForm/index.ts",
         "./src/Types/index.ts",
     ],
-    format: ["esm", "cjs"],
+    format: ["esm"],
     skipNodeModulesBundle: true,
     dts: true,
     splitting: true,