fix: 🐛 Fixed typescript declarations bundling

prc5 · prc5 · commit 323d7d030b5d · 2023-01-25T14:39:35.000+01:00
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -31,6 +31,18 @@
     "airbnb-typescript",
     "plugin:prettier/recommended"
   ],
+  "ignorePatterns": [
+    "dist",
+    "node_modules",
+    "jest.config.ts",
+    "babel.config.js",
+    "rollup.config.js",
+    "jest.config.js",
+    "tsconfig.json",
+    "coverage",
+    "temp",
+    "release.config.js"
+  ],
   "rules": {
     "react-hooks/rules-of-hooks": "error",
     "react-hooks/exhaustive-deps": "warn",
diff --git a/examples/nextjs/api/files/files.api.ts b/examples/nextjs/api/files/files.api.ts
@@ -1,4 +1,4 @@
-import { client } from "api/client";
+import { client } from "api/builder";
 
 export const postFile = client
   .createRequest<{ response: string }, { file: File }>()({
diff --git a/examples/nextjs/api/index.ts b/examples/nextjs/api/index.ts
@@ -2,7 +2,7 @@ import { setupWorker } from "msw";
 import { setupServer } from "msw/lib/node";
 import { handlers } from "./mocks";
 
-export * from "./client";
+export * from "./builder";
 
 export * from "./files/files.api";
 export * from "./users/users.api";
diff --git a/examples/nextjs/api/mocks.ts b/examples/nextjs/api/mocks.ts
@@ -1,8 +1,8 @@
 import { rest } from "msw";
 import { RequestInstance, DateInterval } from "@hyper-fetch/core";
 
-import { getRandomUser, getRandomUsers } from "utils";
-import { client } from "./client";
+import { getRandomUser, getRandomUsers } from "../utils";
+import { client } from "./builder";
 import { deleteUser, getUser, getUsers, patchUser, postUser } from "./users/users.api";
 import { postFile } from "./files/files.api";
 
diff --git a/examples/nextjs/api/users/users.api.ts b/examples/nextjs/api/users/users.api.ts
@@ -1,7 +1,7 @@
 import { DateInterval } from "@hyper-fetch/core";
 
-import { PostUserModel, UserModel } from "models";
-import { client } from "../client";
+import { PostUserModel, UserModel } from "../../models";
+import { client } from "../builder";
 
 export const getUser = client.createRequest<UserModel>()({
   endpoint: "/api/user/:userId",
diff --git a/examples/nextjs/pages/details/details.page.tsx b/examples/nextjs/pages/details/details.page.tsx
@@ -18,7 +18,7 @@ export const DetailsPage: React.FC = () => {
   const [dep, setDep] = useState(initialDate);
   const [disabled, setDisabled] = useState(true);
 
-  const result = useFetch(getUser.setQueryParams({ date: dep } as any), {
+  const result = useFetch(getUser.setQueryParams({ date: dep }), {
     disabled,
     dependencies: [dep],
     refresh: true,
diff --git a/examples/nextjs/pages/form/form.page.tsx b/examples/nextjs/pages/form/form.page.tsx
@@ -11,6 +11,8 @@ export const FormPage: React.FC = () => {
   // Post
   const result = useSubmit(postUser.setData({ email: "test", age: 12, name: "name" }));
 
+  const { data } = result;
+
   // Patch
   const resultPatch = useSubmit(patchUser.setData({ email: "test", age: 12, name: "name" }));
 
diff --git a/examples/nextjs/tsconfig.json b/examples/nextjs/tsconfig.json
@@ -16,7 +16,8 @@
     "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
     "skipLibCheck": true,
-    "module": "esnext"
+    "module": "esnext",
+    "baseUrl": "."
   },
   "include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx", "next-env.d.ts"],
   "exclude": ["node_modules", "jest.config.ts"]
diff --git a/examples/reactjs/src/api/client.ts b/examples/reactjs/src/api/client.ts
diff --git a/package.json b/package.json
@@ -80,11 +80,12 @@
     "react-countdown": "^2.3.2",
     "react-dom": "18.2.0",
     "react-router-dom": "^6.3.0",
+    "rollup": "^3.10.1",
+    "rollup-plugin-dts": "^5.1.1",
     "semantic-release": "^19.0.5",
     "ts-jest": "^29.0.3",
     "ts-node": "~10.9.1",
     "tslib": "^2.3.0",
-    "ttypescript": "^1.5.13",
     "typescript": "~4.9.3"
   },
   "config": {
diff --git a/packages/core/.eslintrc.json b/packages/core/.eslintrc.json
@@ -2,6 +2,5 @@
   "extends": ["../../.eslintrc.json"],
   "parserOptions": {
     "project": ["./tsconfig.json", "./__tests__/tsconfig.json"]
-  },
-  "ignorePatterns": ["dist/"]
+  }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -17,7 +17,7 @@
     "test-pipeline": "jest --watchAll=false --maxWorkers=1 --no-cache",
     "start": "yarn build && npx run-when-changed --watch 'src/**/*.ts' --exec 'yarn build'",
     "build": "yarn clean && node ../../scripts/build.js",
-    "postbuild": "ttsc --project tsconfig.json --outDir dist",
+    "postbuild": "rollup -c '../../rollup.config.js'",
     "lint": "eslint . --ext .js,.jsx,.tsx,.ts --fix",
     "format": "prettier --write .",
     "typecheck": "tsc --noEmit --emitDeclarationOnly false",
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -4,5 +4,6 @@
     "rootDir": "./src",
     "baseUrl": "./src"
   },
+  "include": ["./src/index.ts"],
   "exclude": ["dist", "__tests__", "jest.config.ts"]
 }
diff --git a/packages/react/.eslintrc.json b/packages/react/.eslintrc.json
@@ -2,6 +2,5 @@
   "extends": ["../../.eslintrc.json"],
   "parserOptions": {
     "project": ["./tsconfig.json", "./__tests__/tsconfig.json"]
-  },
-  "ignorePatterns": ["dist/"]
+  }
 }
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -17,7 +17,7 @@
     "test-pipeline": "jest --watchAll=false --maxWorkers=1 --no-cache",
     "start": "yarn build && npx run-when-changed --watch 'src/**/*.ts' --exec 'yarn build'",
     "build": "yarn clean && node ../../scripts/build.js",
-    "postbuild": "ttsc --project tsconfig.json --outDir dist",
+    "postbuild": "rollup -c '../../rollup.config.js'",
     "lint": "eslint . --ext .js,.jsx,.tsx,.ts --fix",
     "format": "prettier --write .",
     "typecheck": "tsc --noEmit --emitDeclarationOnly false",
diff --git a/packages/react/src/hooks/use-event-messages/use-event-messages.hooks.ts b/packages/react/src/hooks/use-event-messages/use-event-messages.hooks.ts
@@ -12,7 +12,7 @@ import { useConfigProvider } from "config-provider";
  * @param options
  * @returns
  */
-export const useEventMessages = <ResponsesType>(
+export const useEventMessages = <ResponsesType extends { name: string }>(
   socket: SocketInstance,
   options: UseEventMessagesOptionsType<ResponsesType>,
 ) => {
@@ -24,7 +24,7 @@ export const useEventMessages = <ResponsesType>(
 
   useDidUpdate(
     () => {
-      const unmountListener = socket.events.onListenerEvent((data, event) => {
+      const unmountListener = socket.events.onListenerEvent<ResponsesType>((data, event) => {
         const filterFn = typeof filter === "function" ? () => filter(data, event) : () => filter.includes(data.name);
         const isFiltered = filter ? filterFn() : false;
         if (!isFiltered) {
diff --git a/packages/react/src/hooks/use-fetch/use-fetch.hooks.ts b/packages/react/src/hooks/use-fetch/use-fetch.hooks.ts
@@ -15,10 +15,10 @@ import { InvalidationKeyType } from "types";
  * @param options Hook options
  * @returns
  */
-export const useFetch = <T extends RequestInstance>(
-  request: T,
-  options: UseFetchOptionsType<T> = useFetchDefaultOptions,
-): UseFetchReturnType<T> => {
+export const useFetch = <RequestType extends RequestInstance>(
+  request: RequestType,
+  options: UseFetchOptionsType<RequestType> = useFetchDefaultOptions,
+): UseFetchReturnType<RequestType> => {
   // Build the configuration options
   const [globalConfig] = useConfigProvider();
   const {
@@ -59,7 +59,7 @@ export const useFetch = <T extends RequestInstance>(
   /**
    * State handler with optimization for rerendering, that hooks into the cache state and dispatchers queues
    */
-  const [state, actions, { setRenderKey, setCacheData, getStaleStatus }] = useTrackedState<T>({
+  const [state, actions, { setRenderKey, setCacheData, getStaleStatus }] = useTrackedState<RequestType>({
     logger,
     request,
     dispatcher,
diff --git a/packages/sockets/.eslintrc.json b/packages/sockets/.eslintrc.json
@@ -2,6 +2,5 @@
   "extends": ["../../.eslintrc.json"],
   "parserOptions": {
     "project": ["./tsconfig.json", "./__tests__/tsconfig.json"]
-  },
-  "ignorePatterns": ["dist/"]
+  }
 }
diff --git a/packages/sockets/package.json b/packages/sockets/package.json
@@ -17,7 +17,7 @@
     "test-pipeline": "jest --watchAll=false --maxWorkers=1 --no-cache",
     "start": "yarn build && npx run-when-changed --watch 'src/**/*.ts' --exec 'yarn build'",
     "build": "yarn clean && node ../../scripts/build.js",
-    "postbuild": "ttsc --project tsconfig.json --outDir dist",
+    "postbuild": "rollup -c '../../rollup.config.js'",
     "lint": "eslint . --ext .js,.jsx,.tsx,.ts --fix",
     "format": "prettier --write .",
     "typecheck": "tsc --noEmit --emitDeclarationOnly false",
diff --git a/packages/sockets/src/listener/listener.ts b/packages/sockets/src/listener/listener.ts
@@ -28,7 +28,7 @@ export class Listener<Response, Adapter extends AdapterType> {
     });
   }
 
-  listen(callback: (data: ListenerCallbackType<Response>) => void) {
+  listen(callback: ListenerCallbackType<Response>) {
     const instance = this.clone();
 
     this.socket.adapter.listen(instance, callback);
diff --git a/rollup.config.js b/rollup.config.js
@@ -0,0 +1,17 @@
+const dts = require("rollup-plugin-dts").default;
+
+const config = [
+  {
+    input: "./src/index.ts",
+    output: [{ file: "dist/index.d.ts", format: "es" }],
+    plugins: [
+      dts({
+        compilerOptions: {
+          baseUrl: "./src",
+        },
+      }),
+    ],
+  },
+];
+
+module.exports.default = config;
diff --git a/scripts/build.js b/scripts/build.js
@@ -1,11 +1,12 @@
 /* eslint-disable */
 const { build } = require("esbuild");
+const { rollup } = require("rollup");
 const { nodeExternalsPlugin } = require("esbuild-node-externals");
+const dts = require("rollup-plugin-dts").default;
 
 const pkg = require(`${process.cwd()}/package.json`);
-const entryPath = `${process.cwd()}/index.ts`;
 
-const buildPackage = () => {
+const buildPackage = async () => {
   const options = {
     target: "es6",
     entryPoints: [pkg.source],
diff --git a/tsconfig.json b/tsconfig.json
@@ -4,6 +4,7 @@
     "rootDir": ".",
     "sourceMap": true,
     "declaration": true,
+    "declarationMap": true,
     "emitDeclarationOnly": true,
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
@@ -25,11 +26,7 @@
     "allowSyntheticDefaultImports": true,
     "baseUrl": ".",
     "paths": {},
-    "plugins": [
-      {
-        "transform": "@zerollup/ts-transform-paths"
-      }
-    ]
+    "plugins": []
   },
   "exclude": ["node_modules", "tmp"]
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { client } from "api/client";`
	`1`	`+import { client } from "api/builder";`
`2`	`2`
`3`	`3`	`export const postFile = client`
`4`	`4`	`.createRequest<{ response: string }, { file: File }>()({`