address dual dts issues

Effect-TS · Mar 27, 2024 · 16a43c1 · 16a43c1
1 parent b6b14f3
commit 16a43c1
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/src/PackV2.ts b/src/PackV2.ts
@@ -71,7 +71,7 @@ export const run = Effect.gen(function*(_) {
     }
 
     if (ctx.hasMain && ctx.hasDts) {
-      out.types = "./dist/dts/index.d.ts"
+      out.types = "./dist/cjs/index.d.ts"
     }
 
     out.exports = {
@@ -80,7 +80,6 @@ export const run = Effect.gen(function*(_) {
 
     if (ctx.hasMain) {
       out.exports["."] = {
-        ...(ctx.hasDts && { types: "./dist/dts/index.d.ts" }),
         ...(ctx.hasMainEsm && { import: "./dist/esm/index.js" }),
         ...(ctx.hasMainCjs && { default: "./dist/cjs/index.js" }),
       }
@@ -91,7 +90,6 @@ export const run = Effect.gen(function*(_) {
         ...out.exports,
         ...ReadonlyRecord.fromEntries(modules.map(_ => {
           const conditions = {
-            ...(ctx.hasDts && { types: `./dist/dts/${_}.d.ts` }),
             ...(ctx.hasEsm && { import: `./dist/esm/${_}.js` }),
             ...(ctx.hasCjs && { default: `./dist/cjs/${_}.js` }),
           }
@@ -110,14 +108,31 @@ export const run = Effect.gen(function*(_) {
     return out
   })
 
+  const manageDTS = Effect.gen(function*($) {
+    const writeFor = (module: string) =>
+      Effect.all([
+        fs.writeFileString(
+          `dist/dist/cjs/${module}.d.ts`,
+          `export * from "../dts/${module}"`,
+        ),
+        fs.writeFileString(
+          `dist/dist/esm/${module}.d.ts`,
+          `export * from "../dts/${module}.js"`,
+        ),
+      ])
+    if (ctx.hasDts) {
+      yield* $(writeFor("index"))
+      yield* $(Effect.forEach(modules, writeFor))
+    }
+  })
+
   const createProxies = Effect.forEach(
     modules,
     _ =>
       fsUtils.mkdirCached(`dist/${_}`).pipe(
         Effect.zipRight(fsUtils.writeJson(`dist/${_}/package.json`, {
           main: path.relative(`dist/${_}`, `dist/dist/cjs/${_}.js`),
           module: path.relative(`dist/${_}`, `dist/dist/esm/${_}.js`),
-          types: path.relative(`dist/${_}`, `dist/dist/dts/${_}.d.ts`),
           sideEffects: [],
         })),
       ),
@@ -177,6 +192,7 @@ export const run = Effect.gen(function*(_) {
     ], { concurrency: "inherit", discard: true }),
     Effect.withConcurrency(10),
   )
+  yield* _(manageDTS)
 }).pipe(
   Effect.provide(
     Layer.mergeAll(