fix: add dts plugin to roll-up definition files (#320)

re #319
privacy-scaling-explorations · Sep 13, 2024 · 500d240 · 500d240
1 parent de43718
commit 500d240
Show file tree

Hide file tree

Showing 33 changed files with 290 additions and 121 deletions.
diff --git a/package.json b/package.json
@@ -62,6 +62,7 @@
         "lint-staged": "^15.2.2",
         "prettier": "^3.2.5",
         "rimraf": "^5.0.5",
+        "rollup-plugin-dts": "^6.1.1",
         "ts-jest": "^29.1.2",
         "ts-node": "^10.9.2",
         "tslib": "^2.6.2",

diff --git a/packages/baby-jubjub/build.tsconfig.json b/packages/baby-jubjub/build.tsconfig.json
@@ -1,8 +1,7 @@
 {
     "extends": "../../tsconfig.json",
     "compilerOptions": {
-        "baseUrl": ".",
-        "declarationDir": "dist/types"
+        "baseUrl": "."
     },
     "include": ["src"]
 }
diff --git a/packages/baby-jubjub/package.json b/packages/baby-jubjub/package.json
@@ -8,10 +8,10 @@
     "unpkg": "dist/index.iife.min.js",
     "jsdelivr": "dist/index.iife.min.js",
     "main": "dist/index.js",
-    "types": "dist/types/index.d.ts",
+    "types": "dist/index.d.ts",
     "exports": {
         ".": {
-            "types": "./dist/types/index.d.ts",
+            "types": "./dist/index.d.ts",
             "require": "./dist/index.cjs",
             "default": "./dist/index.js"
         }
@@ -43,6 +43,7 @@
         "rimraf": "^5.0.5",
         "rollup": "^4.12.0",
         "rollup-plugin-cleanup": "^3.2.1",
+        "rollup-plugin-dts": "^6.1.1",
         "rollup-plugin-polyfill-node": "^0.13.0"
     },
     "dependencies": {

diff --git a/packages/baby-jubjub/rollup.config.ts b/packages/baby-jubjub/rollup.config.ts
@@ -3,6 +3,7 @@ import terser from "@rollup/plugin-terser"
 import typescript from "@rollup/plugin-typescript"
 import fs from "fs"
 import cleanup from "rollup-plugin-cleanup"
+import { dts } from "rollup-plugin-dts"
 import nodePolyfills from "rollup-plugin-polyfill-node"
 
 const pkg = JSON.parse(fs.readFileSync("./package.json", "utf8"))
@@ -57,5 +58,11 @@ export default [
             nodePolyfills(),
             cleanup({ comments: "jsdoc" })
         ]
+    },
+    {
+        input: "src/index.ts",
+        output: [{ file: "dist/index.d.ts", format: "es" }],
+        external: ["@zk-kit/utils/f1-field"],
+        plugins: [dts()]
     }
 ]
diff --git a/packages/eddsa-poseidon/build.tsconfig.json b/packages/eddsa-poseidon/build.tsconfig.json
@@ -1,8 +1,7 @@
 {
     "extends": "../../tsconfig.json",
     "compilerOptions": {
-        "baseUrl": ".",
-        "declarationDir": "dist/types"
+        "baseUrl": "."
     },
     "include": ["src"]
 }
diff --git a/packages/eddsa-poseidon/package.json b/packages/eddsa-poseidon/package.json
@@ -8,10 +8,10 @@
     "unpkg": "dist/index.iife.min.js",
     "jsdelivr": "dist/index.iife.min.js",
     "main": "dist/index.js",
-    "types": "dist/types/index.d.ts",
+    "types": "dist/index.d.ts",
     "exports": {
         ".": {
-            "types": "./dist/types/index.d.ts",
+            "types": "./dist/index.d.ts",
             "require": "./dist/index.cjs",
             "default": "./dist/index.js"
         }
@@ -45,6 +45,7 @@
         "rimraf": "^5.0.5",
         "rollup": "^4.12.0",
         "rollup-plugin-cleanup": "^3.2.1",
+        "rollup-plugin-dts": "^6.1.1",
         "rollup-plugin-polyfill-node": "^0.13.0"
     },
     "dependencies": {

diff --git a/packages/eddsa-poseidon/rollup.config.ts b/packages/eddsa-poseidon/rollup.config.ts
@@ -1,5 +1,6 @@
 import commonjs from "@rollup/plugin-commonjs"
 import { nodeResolve } from "@rollup/plugin-node-resolve"
+import { dts } from "rollup-plugin-dts"
 import terser from "@rollup/plugin-terser"
 import typescript from "@rollup/plugin-typescript"
 import fs from "fs"
@@ -64,5 +65,10 @@ export default [
             nodePolyfills(),
             cleanup({ comments: "jsdoc" })
         ]
+    },
+    {
+        input: "src/index.ts",
+        output: [{ file: "dist/index.d.ts", format: "es" }],
+        plugins: [dts()]
     }
 ]
diff --git a/packages/imt/build.tsconfig.json b/packages/imt/build.tsconfig.json
@@ -1,8 +1,7 @@
 {
     "extends": "../../tsconfig.json",
     "compilerOptions": {
-        "baseUrl": ".",
-        "declarationDir": "dist/types"
+        "baseUrl": "."
     },
     "include": ["src"]
 }
diff --git a/packages/imt/package.json b/packages/imt/package.json
@@ -8,10 +8,10 @@
     "unpkg": "dist/index.iife.min.js",
     "jsdelivr": "dist/index.iife.min.js",
     "main": "dist/index.js",
-    "types": "dist/types/index.d.ts",
+    "types": "dist/index.d.ts",
     "exports": {
         ".": {
-            "types": "./dist/types/index.d.ts",
+            "types": "./dist/index.d.ts",
             "require": "./dist/index.cjs",
             "default": "./dist/index.js"
         }
@@ -43,6 +43,7 @@
         "rimraf": "^5.0.5",
         "rollup": "^4.12.0",
         "rollup-plugin-cleanup": "^3.2.1",
+        "rollup-plugin-dts": "^6.1.1",
         "rollup-plugin-polyfill-node": "^0.13.0"
     },
     "dependencies": {

diff --git a/packages/imt/rollup.config.ts b/packages/imt/rollup.config.ts
@@ -1,5 +1,6 @@
 import { nodeResolve } from "@rollup/plugin-node-resolve"
 import terser from "@rollup/plugin-terser"
+import { dts } from "rollup-plugin-dts"
 import typescript from "@rollup/plugin-typescript"
 import fs from "fs"
 import cleanup from "rollup-plugin-cleanup"
@@ -52,5 +53,10 @@ export default [
             nodePolyfills(),
             cleanup({ comments: "jsdoc" })
         ]
+    },
+    {
+        input: "src/index.ts",
+        output: [{ file: "dist/index.d.ts", format: "es" }],
+        plugins: [dts()]
     }
 ]
diff --git a/packages/lazytower/build.tsconfig.json b/packages/lazytower/build.tsconfig.json
@@ -1,8 +1,7 @@
 {
     "extends": "../../tsconfig.json",
     "compilerOptions": {
-        "baseUrl": ".",
-        "declarationDir": "dist/types"
+        "baseUrl": "."
     },
     "include": ["src"]
 }
diff --git a/packages/lazytower/package.json b/packages/lazytower/package.json
@@ -8,10 +8,10 @@
     "unpkg": "dist/index.iife.min.js",
     "jsdelivr": "dist/index.iife.min.js",
     "main": "dist/index.js",
-    "types": "dist/types/index.d.ts",
+    "types": "dist/index.d.ts",
     "exports": {
         ".": {
-            "types": "./dist/types/index.d.ts",
+            "types": "./dist/index.d.ts",
             "require": "./dist/index.cjs",
             "default": "./dist/index.js"
         }
@@ -41,7 +41,8 @@
         "@rollup/plugin-typescript": "^11.1.6",
         "rimraf": "^5.0.5",
         "rollup": "^4.12.0",
-        "rollup-plugin-cleanup": "^3.2.1"
+        "rollup-plugin-cleanup": "^3.2.1",
+        "rollup-plugin-dts": "^6.1.1"
     },
     "dependencies": {
         "poseidon-lite": "^0.2.0"

diff --git a/packages/lazytower/rollup.config.ts b/packages/lazytower/rollup.config.ts
@@ -1,5 +1,6 @@
 import terser from "@rollup/plugin-terser"
 import typescript from "@rollup/plugin-typescript"
+import { dts } from "rollup-plugin-dts"
 import fs from "fs"
 import cleanup from "rollup-plugin-cleanup"
 
@@ -14,23 +15,30 @@ const banner = `/**
 */`
 const name = pkg.name.substr(1).replace(/[-/]./g, (x: string) => x.toUpperCase()[1])
 
-export default {
-    input: "src/index.ts",
-    output: [
-        {
-            file: pkg.iife,
-            name,
-            format: "iife",
-            banner
-        },
-        {
-            file: pkg.unpkg,
-            name,
-            format: "iife",
-            plugins: [terser({ output: { preamble: banner } })]
-        },
-        { file: pkg.exports["."].require, format: "cjs", banner },
-        { file: pkg.exports["."].default, format: "es", banner }
-    ],
-    plugins: [typescript({ tsconfig: "./build.tsconfig.json" }), cleanup({ comments: "jsdoc" })]
-}
+export default [
+    {
+        input: "src/index.ts",
+        output: [
+            {
+                file: pkg.iife,
+                name,
+                format: "iife",
+                banner
+            },
+            {
+                file: pkg.unpkg,
+                name,
+                format: "iife",
+                plugins: [terser({ output: { preamble: banner } })]
+            },
+            { file: pkg.exports["."].require, format: "cjs", banner },
+            { file: pkg.exports["."].default, format: "es", banner }
+        ],
+        plugins: [typescript({ tsconfig: "./build.tsconfig.json" }), cleanup({ comments: "jsdoc" })]
+    },
+    {
+        input: "src/index.ts",
+        output: [{ file: "dist/index.d.ts", format: "es" }],
+        plugins: [dts()]
+    }
+]
diff --git a/packages/lean-imt/build.tsconfig.json b/packages/lean-imt/build.tsconfig.json
@@ -1,8 +1,7 @@
 {
     "extends": "../../tsconfig.json",
     "compilerOptions": {
-        "baseUrl": ".",
-        "declarationDir": "dist/types"
+        "baseUrl": "."
     },
     "include": ["src"]
 }
diff --git a/packages/lean-imt/package.json b/packages/lean-imt/package.json
@@ -8,10 +8,10 @@
     "unpkg": "dist/index.iife.min.js",
     "jsdelivr": "dist/index.iife.min.js",
     "main": "dist/index.js",
-    "types": "dist/types/index.d.ts",
+    "types": "dist/index.d.ts",
     "exports": {
         ".": {
-            "types": "./dist/types/index.d.ts",
+            "types": "./dist/index.d.ts",
             "require": "./dist/index.cjs",
             "default": "./dist/index.js"
         }
@@ -43,6 +43,7 @@
         "rimraf": "^5.0.5",
         "rollup": "^4.12.0",
         "rollup-plugin-cleanup": "^3.2.1",
+        "rollup-plugin-dts": "^6.1.1",
         "rollup-plugin-polyfill-node": "^0.13.0"
     },
     "dependencies": {

diff --git a/packages/lean-imt/rollup.config.ts b/packages/lean-imt/rollup.config.ts
@@ -3,6 +3,7 @@ import terser from "@rollup/plugin-terser"
 import typescript from "@rollup/plugin-typescript"
 import fs from "fs"
 import cleanup from "rollup-plugin-cleanup"
+import { dts } from "rollup-plugin-dts"
 import nodePolyfills from "rollup-plugin-polyfill-node"
 
 const pkg = JSON.parse(fs.readFileSync("./package.json", "utf8"))
@@ -52,5 +53,10 @@ export default [
             nodePolyfills(),
             cleanup({ comments: "jsdoc" })
         ]
+    },
+    {
+        input: "src/index.ts",
+        output: [{ file: "dist/index.d.ts", format: "es" }],
+        plugins: [dts()]
     }
 ]
diff --git a/packages/logical-expressions/build.tsconfig.json b/packages/logical-expressions/build.tsconfig.json
@@ -2,7 +2,6 @@
     "extends": "../../tsconfig.json",
     "compilerOptions": {
         "baseUrl": ".",
-        "declarationDir": "dist/types",
         "resolveJsonModule": true
     },
     "include": ["src"]

diff --git a/packages/logical-expressions/package.json b/packages/logical-expressions/package.json
@@ -5,10 +5,10 @@
     "type": "module",
     "license": "MIT",
     "main": "dist/index.js",
-    "types": "dist/types/index.d.ts",
+    "types": "dist/index.d.ts",
     "exports": {
         ".": {
-            "types": "./dist/types/index.d.ts",
+            "types": "./dist/index.d.ts",
             "require": "./dist/index.cjs",
             "default": "./dist/index.js"
         }
@@ -38,6 +38,7 @@
         "@rollup/plugin-typescript": "^11.1.6",
         "rimraf": "^5.0.5",
         "rollup": "^4.12.0",
-        "rollup-plugin-cleanup": "^3.2.1"
+        "rollup-plugin-cleanup": "^3.2.1",
+        "rollup-plugin-dts": "^6.1.1"
     }
 }
diff --git a/packages/logical-expressions/rollup.config.ts b/packages/logical-expressions/rollup.config.ts
@@ -1,4 +1,5 @@
 import typescript from "@rollup/plugin-typescript"
+import { dts } from "rollup-plugin-dts"
 import fs from "fs"
 import cleanup from "rollup-plugin-cleanup"
 
@@ -12,11 +13,18 @@ const banner = `/**
  * @see [Github]{@link ${pkg.homepage}}
 */`
 
-export default {
-    input: "src/index.ts",
-    output: [
-        { file: pkg.exports["."].require, format: "cjs", banner },
-        { file: pkg.exports["."].default, format: "es", banner }
-    ],
-    plugins: [typescript({ tsconfig: "./build.tsconfig.json" }), cleanup({ comments: "jsdoc" })]
-}
+export default [
+    {
+        input: "src/index.ts",
+        output: [
+            { file: pkg.exports["."].require, format: "cjs", banner },
+            { file: pkg.exports["."].default, format: "es", banner }
+        ],
+        plugins: [typescript({ tsconfig: "./build.tsconfig.json" }), cleanup({ comments: "jsdoc" })]
+    },
+    {
+        input: "src/index.ts",
+        output: [{ file: "dist/index.d.ts", format: "es" }],
+        plugins: [dts()]
+    }
+]
diff --git a/packages/poseidon-cipher/build.tsconfig.json b/packages/poseidon-cipher/build.tsconfig.json
@@ -1,8 +1,7 @@
 {
     "extends": "../../tsconfig.json",
     "compilerOptions": {
-        "baseUrl": ".",
-        "declarationDir": "dist/types"
+        "baseUrl": "."
     },
     "include": ["src"]
 }
diff --git a/packages/poseidon-cipher/package.json b/packages/poseidon-cipher/package.json
@@ -17,10 +17,10 @@
     "unpkg": "dist/index.iife.min.js",
     "jsdelivr": "dist/index.iife.min.js",
     "main": "dist/index.js",
-    "types": "dist/types/index.d.ts",
+    "types": "dist/index.d.ts",
     "exports": {
         ".": {
-            "types": "./dist/types/index.d.ts",
+            "types": "./dist/index.d.ts",
             "require": "./dist/index.cjs",
             "default": "./dist/index.js"
         }
@@ -46,7 +46,8 @@
         "circomlibjs": "^0.0.8",
         "rimraf": "^5.0.5",
         "rollup": "^4.12.0",
-        "rollup-plugin-cleanup": "^3.2.1"
+        "rollup-plugin-cleanup": "^3.2.1",
+        "rollup-plugin-dts": "^6.1.1"
     },
     "dependencies": {
         "@zk-kit/baby-jubjub": "1.0.1",