fix: ESM module types

.changeset/friendly-cherries-divide.md

@@ -0,0 +1,5 @@
+---
+"@fuel-ts/abi-typegen": minor
+---
+
+fix: ESM module types

.github/workflows/pr-release.yaml

@@ -8,7 +8,7 @@ jobs:
     name: "Release PR to npm"
     runs-on: ubuntu-latest
     # comment out if:false to enable release PR to npm
-    if: false
+    # if: false
     permissions: write-all
     steps:
       - name: Checkout

internal/tsup/package.json

@@ -3,12 +3,10 @@
   "name": "@internal/tsup",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
   "exports": {
     ".": {
       "require": "./dist/index.js",
-      "import": "./dist/index.mjs",
-      "types": "./dist/index.d.ts"
+      "import": "./dist/index.mjs"
     }
   },
   "files": [
@@ -18,7 +16,7 @@
     "preinstall": "pnpm build",
     "build": "tsup",
     "build:watch": "tsup --watch",
-    "postbuild": "tsx ../../scripts/postbuild.ts"
+    "postbuild": "tsup --config tsup.config.dts.ts"
   },
   "license": "Apache-2.0"
 }

internal/tsup/src/index.ts

@@ -47,3 +47,10 @@ export const binAndCli: Options = {
     cli: 'src/cli.ts',
   },
 };
+
+export const tsupDtsDefaults: Options = {
+  tsconfig: 'tsconfig.dts.json',
+  sourcemap: true,
+  dts: true,
+  clean: false,
+}

internal/tsup/tsconfig.dts.json

@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist",
+    "rootDir": "./src"
+  },
+  "include": ["src"],
+  "exclude": ["**/*.test.ts"]
+}

internal/tsup/tsup.config.dts.ts

@@ -0,0 +1,11 @@
+import type { Options } from 'tsup';
+
+import { tsupDtsDefaults } from './src';
+import tsupPkg from './tsup.config';
+
+const configs: Options = {
+  ...tsupPkg,
+  ...tsupDtsDefaults
+};
+
+export default configs;

package.json

@@ -31,6 +31,7 @@
     "lint:package-jsons": "tsx ./scripts/lint-package-jsons",
     "prettier:check": "prettier --check packages",
     "prettier:format": "prettier --write packages",
+    "verify:package-distro": "tsx ./scripts/verify-package-distro",
     "changeset:publish": "tsx ./scripts/changeset/changeset-publish",
     "changeset:next": "tsx ./scripts/changeset/changeset-next",
     "changeset:version-with-docs": "tsx ./scripts/changeset/changeset-version-with-docs",
@@ -99,7 +100,7 @@
     "textlint": "^13.3.2",
     "textlint-rule-no-dead-link": "^5.1.2",
     "ts-generator": "^0.1.1",
-    "tsup": "^6.7.0",
+    "tsup": "^8.0.0",
     "tsx": "^4.7.0",
     "turbo": "^1.8.8",
     "typescript": "~5.2.2",

packages/abi-coder/package.json

@@ -5,15 +5,13 @@
   "author": "Fuel Labs <contact@fuel.sh> (https://fuel.network/)",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
   "engines": {
     "node": "^18.18.2 || ^20.0.0"
   },
   "exports": {
     ".": {
       "require": "./dist/index.js",
-      "import": "./dist/index.mjs",
-      "types": "./dist/index.d.ts"
+      "import": "./dist/index.mjs"
     }
   },
   "files": [
@@ -23,7 +21,7 @@
     "pretest": "pnpm build:forc",
     "build:forc": "pnpm fuels-forc build -p test/fixtures/forc-projects --release",
     "build": "tsup",
-    "postbuild": "tsx ../../scripts/postbuild.ts"
+    "postbuild": "tsup --config tsup.config.dts.ts"
   },
   "license": "Apache-2.0",
   "dependencies": {

packages/abi-coder/tsup.config.dts.ts

@@ -0,0 +1,11 @@
+import { tsupDtsDefaults } from '@internal/tsup';
+import type { Options } from 'tsup';
+
+import tsupPkg from './tsup.config';
+
+const configs: Options = {
+  ...tsupPkg,
+  ...tsupDtsDefaults,
+};
+
+export default configs;

packages/abi-typegen/package.json

@@ -8,25 +8,21 @@
   },
   "main": "dist/index.js",
   "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
   "engines": {
     "node": "^18.18.2 || ^20.0.0"
   },
   "exports": {
     ".": {
       "require": "./dist/index.js",
-      "import": "./dist/index.mjs",
-      "types": "./dist/index.d.ts"
+      "import": "./dist/index.mjs"
     },
     "./cli": {
       "require": "./dist/cli.js",
-      "import": "./dist/cli.mjs",
-      "types": "./dist/cli.d.ts"
+      "import": "./dist/cli.mjs"
     },
     "./runTypegen": {
       "require": "./dist/runTypegen.js",
-      "import": "./dist/runTypegen.mjs",
-      "types": "./dist/runTypegen.d.ts"
+      "import": "./dist/runTypegen.mjs"
     }
   },
   "typesVersions": {
@@ -46,7 +42,7 @@
     "pretest": "pnpm build:forc",
     "build": "tsup",
     "build:forc": "pnpm fuels-forc build -p test/fixtures/forc-projects --release",
-    "postbuild": "tsx ../../scripts/postbuild.ts"
+    "postbuild": "tsup --config tsup.config.dts.ts"
   },
   "license": "Apache-2.0",
   "dependencies": {

packages/abi-typegen/src/templates/renderHbsTemplate.ts

@@ -1,5 +1,5 @@
 import { versions } from '@fuel-ts/versions';
-import { compile } from 'handlebars';
+import Handlebars from 'handlebars';
 
 import headerTemplate from './common/_header.hbs';
 
@@ -15,8 +15,8 @@ export function renderHbsTemplate(params: { template: string; data?: Record<stri
     noEscape: true,
   };
 
-  const renderTemplate = compile(template, options);
-  const renderHeaderTemplate = compile(headerTemplate, options);
+  const renderTemplate = Handlebars.compile(template, options);
+  const renderHeaderTemplate = Handlebars.compile(headerTemplate, options);
 
   const text = renderTemplate({
     ...data,

packages/abi-typegen/tsup.config.dts.ts

@@ -0,0 +1,11 @@
+import { tsupDtsDefaults } from '@internal/tsup';
+import type { Options } from 'tsup';
+
+import tsupPkg from './tsup.config';
+
+const configs: Options = {
+  ...tsupPkg,
+  ...tsupDtsDefaults,
+};
+
+export default configs;

packages/account/package.json

@@ -5,25 +5,21 @@
   "author": "Fuel Labs <contact@fuel.sh> (https://fuel.network/)",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
   "engines": {
     "node": "^18.18.2 || ^20.0.0"
   },
   "exports": {
     ".": {
       "require": "./dist/index.js",
-      "import": "./dist/index.mjs",
-      "types": "./dist/index.d.ts"
+      "import": "./dist/index.mjs"
     },
     "./configs": {
       "require": "./dist/configs.js",
-      "import": "./dist/configs.mjs",
-      "types": "./dist/configs.d.ts"
+      "import": "./dist/configs.mjs"
     },
     "./test-utils": {
       "require": "./dist/test-utils.js",
-      "import": "./dist/test-utils.mjs",
-      "types": "./dist/test-utils.d.ts"
+      "import": "./dist/test-utils.mjs"
     }
   },
   "typesVersions": {
@@ -32,7 +28,7 @@
         "./dist/configs.d.ts"
       ],
       "test-utils": [
-        "./dist/test-utils/index.d.ts"
+        "./dist/test-utils.d.ts"
       ]
     }
   },
@@ -44,7 +40,7 @@
     "prebuild": "pnpm build:operations",
     "build:schema": "get-graphql-schema http://localhost:4000/graphql > src/providers/fuel-core-schema.graphql && prettier --write src/providers/fuel-core-schema.graphql",
     "build:operations": "pnpm graphql-codegen",
-    "postbuild": "tsx ../../scripts/postbuild.ts"
+    "postbuild": "tsup --config tsup.config.dts.ts"
   },
   "license": "Apache-2.0",
   "dependencies": {

packages/account/src/providers/provider.test.ts

@@ -1173,7 +1173,7 @@ describe('Provider', () => {
   test('custom fetch works with requestMiddleware', async () => {
     let requestHeaders: HeadersInit | undefined;
     await Provider.create(FUEL_NETWORK_URL, {
-      fetch: async (url, requestInit) => {
+      fetch: (url, requestInit): Promise<Response> => {
         requestHeaders = requestInit?.headers;
         return fetch(url, requestInit);
       },
@@ -1192,7 +1192,7 @@ describe('Provider', () => {
   test('custom fetch works with timeout', async () => {
     const timeout = 500;
     const provider = await Provider.create(FUEL_NETWORK_URL, {
-      fetch: async (url, requestInit) => fetch(url, requestInit),
+      fetch: (url, requestInit): Promise<Response> => fetch(url, requestInit),
       timeout,
     });
     vi.spyOn(global, 'fetch').mockImplementationOnce((...args: unknown[]) =>

packages/account/src/providers/utils/json.ts

@@ -1,5 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable no-param-reassign */
+import { Address } from '@fuel-ts/address';
+import { BN } from '@fuel-ts/math';
 import { hexlify } from '@fuel-ts/utils';
 import { clone } from 'ramda';
 
@@ -10,21 +12,23 @@ import { clone } from 'ramda';
 /** @hidden */
 function normalize(object: any) {
   Object.keys(object).forEach((key) => {
-    switch (object[key]?.constructor.name) {
-      case 'Uint8Array':
-        object[key] = hexlify(object[key]);
+    const obj = object[key];
+
+    switch (true) {
+      case obj instanceof BN:
+        object[key] = obj.toHex();
         break;
-      case 'Array':
-        object[key] = normalize(object[key]);
+      case obj instanceof Address:
+        object[key] = obj.toB256();
         break;
-      case 'BN':
-        object[key] = object[key].toHex();
+      case obj instanceof Uint8Array:
+        object[key] = hexlify(obj);
         break;
-      case 'Address':
-        object[key] = object[key].toB256();
+      case Array.isArray(obj):
+        object[key] = normalize(obj);
         break;
-      case 'Object':
-        object[key] = normalize(object[key]);
+      case obj instanceof Object:
+        object[key] = normalize(obj);
         break;
       default:
         break;

packages/account/tsup.config.dts.ts

@@ -0,0 +1,11 @@
+import { tsupDtsDefaults } from '@internal/tsup';
+import type { Options } from 'tsup';
+
+import tsupPkg from './tsup.config';
+
+const configs: Options = {
+  ...tsupPkg,
+  ...tsupDtsDefaults,
+};
+
+export default configs;

packages/address/package.json

@@ -5,20 +5,17 @@
   "author": "Fuel Labs <contact@fuel.sh> (https://fuel.network/)",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
   "engines": {
     "node": "^18.18.2 || ^20.0.0"
   },
   "exports": {
     ".": {
       "require": "./dist/index.js",
-      "import": "./dist/index.mjs",
-      "types": "./dist/index.d.ts"
+      "import": "./dist/index.mjs"
     },
     "./configs": {
       "require": "./dist/configs.js",
-      "import": "./dist/configs.mjs",
-      "types": "./dist/configs.d.ts"
+      "import": "./dist/configs.mjs"
     }
   },
   "typesVersions": {
@@ -33,7 +30,7 @@
   ],
   "scripts": {
     "build": "tsup",
-    "postbuild": "tsx ../../scripts/postbuild.ts"
+    "postbuild": "tsup --config tsup.config.dts.ts"
   },
   "license": "Apache-2.0",
   "dependencies": {

packages/address/tsup.config.dts.ts

@@ -0,0 +1,11 @@
+import { tsupDtsDefaults } from '@internal/tsup';
+import type { Options } from 'tsup';
+
+import tsupPkg from './tsup.config';
+
+const configs: Options = {
+  ...tsupPkg,
+  ...tsupDtsDefaults,
+};
+
+export default configs;

packages/contract/package.json

@@ -5,23 +5,21 @@
   "author": "Fuel Labs <contact@fuel.sh> (https://fuel.network/)",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
   "engines": {
     "node": "^18.18.2 || ^20.0.0"
   },
   "exports": {
     ".": {
       "require": "./dist/index.js",
-      "import": "./dist/index.mjs",
-      "types": "./dist/index.d.ts"
+      "import": "./dist/index.mjs"
     }
   },
   "files": [
     "dist"
   ],
   "scripts": {
     "build": "tsup",
-    "postbuild": "tsx ../../scripts/postbuild.ts"
+    "postbuild": "tsup --config tsup.config.dts.ts"
   },
   "license": "Apache-2.0",
   "dependencies": {

packages/contract/tsup.config.dts.ts

@@ -0,0 +1,11 @@
+import { tsupDtsDefaults } from '@internal/tsup';
+import type { Options } from 'tsup';
+
+import tsupPkg from './tsup.config';
+
+const configs: Options = {
+  ...tsupPkg,
+  ...tsupDtsDefaults,
+};
+
+export default configs;