@gearbox-protocol/sdk 3.0.0-vfourabi.3 → 3.0.0-vfourabi.5

package/package.json

@@ -1,20 +1,15 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-vfourabi.3",
+  "version": "3.0.0-vfourabi.5",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.cjs",
   "module": "./dist/esm/sdk/index.mjs",
   "types": "./dist/cjs/sdk/index.d.ts",
-  "typings": "./dist/cjs/sdk/index.d.ts",
   "sideEffects": false,
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "default": {
-        "types": "./dist/cjs/sdk/index.d.ts",
-        "default": "./dist/cjs/sdk/index.cjs"
-      },
       "import": {
         "types": "./dist/esm/sdk/index.d.mts",
         "default": "./dist/esm/sdk/index.mjs"
@@ -25,10 +20,6 @@
       }
     },
     "./dev": {
-      "default": {
-        "types": "./dist/cjs/dev/index.d.ts",
-        "default": "./dist/cjs/dev/index.cjs"
-      },
       "import": {
         "types": "./dist/esm/dev/index.d.mts",
         "default": "./dist/esm/dev/index.mjs"
@@ -39,10 +30,6 @@
       }
     },
     "./adapters": {
-      "default": {
-        "types": "./dist/cjs/adapters/index.d.ts",
-        "default": "./dist/cjs/adapters/index.cjs"
-      },
       "import": {
         "types": "./dist/esm/adapters/index.d.mts",
         "default": "./dist/esm/adapters/index.mjs"
@@ -53,10 +40,6 @@
       }
     },
     "./abi/*": {
-      "default": {
-        "types": "./dist/cjs/abi/*.d.ts",
-        "default": "./dist/cjs/abi/*.cjs"
-      },
       "import": {
         "types": "./dist/esm/abi/*.d.mts",
         "default": "./dist/esm/abi/*.mjs"
@@ -70,19 +53,6 @@
   "files": [
     "*"
   ],
-  "typesVersions": {
-    "*": {
-      "dev": [
-        "./dist/cjs/dev/index.d.ts"
-      ],
-      "adapters": [
-        "./dist/cjs/adapters/index.d.ts"
-      ],
-      "abi/*": [
-        "./dist/cjs/abi/*.d.ts"
-      ]
-    }
-  },
   "scripts": {
     "clean": "rm -rf dist",
     "build": "tsup",

package/src/abi/index.ts

@@ -0,0 +1,11 @@
+export * from "./compressors";
+export * from "./errors";
+export * from "./iERC20";
+export * from "./iPausable";
+export * from "./iPriceFeedStore";
+export * from "./iUpdatablePriceFeed";
+export * from "./iVersion";
+export * from "./iZapper";
+export * from "./routerV300";
+export * from "./v300";
+export * from "./v310";

package/src/sdk/index.ts

@@ -1,4 +1,3 @@
-export * from "./abi";
 export * from "./accounts";
 export * from "./base";
 export * from "./bots";

package/tsconfig.abi.json

@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.json",
+  "include": ["src/abi/**/*.ts"]
+}

package/tsup.config.ts

@@ -1,17 +1,29 @@
-import { readFile, writeFile } from "node:fs/promises";
+import { glob, mkdir, readFile, rename, writeFile } from "node:fs/promises";
 
 import { sync as spawnSync } from "cross-spawn";
 import type { Options } from "tsup";
 import { defineConfig } from "tsup";
 
+/**
+ * Write package.json for subpath with CJS or ESM type
+ * @param subpath
+ * @param type
+ */
 async function writeDummyPackage(subpath: string, type: "cjs" | "esm") {
   const body =
     type === "cjs"
       ? `{"type": "commonjs"}`
       : `{"type": "module","sideEffects":false}`;
+  await mkdir(`./dist/${type}/${subpath}`, { recursive: true });
   await writeFile(`./dist/${type}/${subpath}/package.json`, body, "utf-8");
 }
 
+/**
+ * When building ESM modules from subpath that import core SDK, such as dev
+ * they'll have `import {...} from "../sdk"` line
+ * This method fixes it by replacing `../sdk` with `../sdk/index.mjs`
+ * @param subpath
+ */
 async function fixRelativeImports(subpath: string) {
   for (const ext of ["d.mts", "mjs"]) {
     let raw = await readFile(`./dist/esm/${subpath}/index.${ext}`, "utf-8");
@@ -20,15 +32,50 @@ async function fixRelativeImports(subpath: string) {
   }
 }
 
+/**
+ * Abis are built separately by tsc
+ * @param type
+ */
+async function buildAbi(type: "cjs" | "esm") {
+  const options =
+    type === "cjs"
+      ? ["--module", "commonjs", "--moduleResolution", "node"]
+      : [];
+  spawnSync(
+    "yarn",
+    [
+      "tsc",
+      "--project",
+      "tsconfig.abi.json",
+      "--outDir",
+      `./dist/${type}/abi`,
+      ...options,
+    ],
+    {
+      stdio: "inherit",
+    },
+  );
+  // rename extensions
+  const extensions =
+    type === "esm"
+      ? [
+          ["d.ts", "d.mts"],
+          ["js", "mjs"],
+        ]
+      : [["js", "cjs"]];
+  for (const [from, to] of extensions) {
+    const files = glob(`./dist/${type}/abi/*.${from}`);
+    for await (const file of files) {
+      const newFile = file.replace(new RegExp(`\\.${from}$`), `.${to}`);
+      await rename(file, newFile);
+    }
+  }
+}
+
 export default defineConfig(options => {
   const commonOptions: Partial<Options> = {
-    entry: [
-      "src/sdk/index.ts",
-      "src/dev/index.ts",
-      "src/adapters/index.ts",
-      "src/abi/**/*.ts",
-    ],
-    clean: true,
+    entry: ["src/sdk/index.ts", "src/dev/index.ts", "src/adapters/index.ts"],
+    clean: !options.watch, // cleaning in watch mode causes problems with turborepo
     splitting: false,
     treeshake: true,
     sourcemap: false,
@@ -50,6 +97,7 @@ export default defineConfig(options => {
             writeDummyPackage(subpath, "cjs"),
           ),
         );
+        await buildAbi("cjs");
       },
     },
     {
@@ -71,6 +119,8 @@ export default defineConfig(options => {
             writeDummyPackage(subpath, "esm"),
           ),
         );
+
+        await buildAbi("esm");
       },
     },
   ];

package/tsconfig.build.json

@@ -1,4 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "exclude": ["scripts", "tsup.config.ts"]
-}