Chore: clean up some internal type errors (#1559)

drwpow · web-flow · commit 6fe2c856331e · 2024-02-21T09:58:41.000-07:00
diff --git a/.changeset/olive-dots-sing.md b/.changeset/olive-dots-sing.md
diff --git a/.changeset/selfish-olives-kiss.md b/.changeset/selfish-olives-kiss.md
@@ -0,0 +1,5 @@
+---
+"openapi-typescript-helpers": patch
+---
+
+Simplify build
diff --git a/packages/openapi-fetch/examples/nextjs/tsconfig.json b/packages/openapi-fetch/examples/nextjs/tsconfig.json
@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "allowJs": true,
+    "baseUrl": ".",
     "esModuleInterop": true,
     "incremental": true,
     "isolatedModules": true,
diff --git a/packages/openapi-fetch/examples/react-query/package.json b/packages/openapi-fetch/examples/react-query/package.json
@@ -6,15 +6,17 @@
     "dev": "vite dev"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.13.4",
+    "@tanstack/react-query": "^5.22.2",
     "openapi-fetch": "workspace:^",
     "openapi-typescript": "workspace:^",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@vitejs/plugin-react-swc": "^3.5.0",
+    "@types/react": "18.2.20",
+    "@types/react-dom": "18.2.7",
+    "@vitejs/plugin-react-swc": "^3.6.0",
     "typescript": "^5.3.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.4"
   }
 }
diff --git a/packages/openapi-fetch/examples/react-query/src/hooks/queries.ts b/packages/openapi-fetch/examples/react-query/src/hooks/queries.ts
@@ -27,13 +27,13 @@ export function getFact({
       // add any other hook dependencies here
     ],
     queryFn: async ({ signal }) => {
-      const { data, error } = await client.GET(GET_FACT, {
+      const { data } = await client.GET(GET_FACT, {
         params,
         // body - isn’t used for GET, but needed for other request types
         signal, // allows React Query to cancel request
       });
-      if (data) return data;
-      throw new Error(error); // React Query expects errors to be thrown to show a message
+      return data;
+      // Note: Error throwing handled automatically via middleware
     },
   });
 }
diff --git a/packages/openapi-fetch/examples/react-query/src/index.tsx b/packages/openapi-fetch/examples/react-query/src/index.tsx
@@ -14,13 +14,16 @@ function Fact() {
     <div>
       {fact.isLoading && <div>Loading...</div>}
       {fact.error ? (
-        <div>There was an error: {fact.error}</div>
+        <div>There was an error: {fact.error.message}</div>
       ) : (
         <pre>
           <code>{JSON.stringify(fact.data, undefined, 2)}</code>
         </pre>
       )}
-      <button type="button" onClick={() => fact.refetch()}>
+      <button
+        type="button"
+        onClick={() => fact.refetch()}
+      >
         Another fact!
       </button>
     </div>
@@ -45,6 +48,6 @@ function App() {
   );
 }
 
-const domNode = document.getElementById("app");
+const domNode = document.getElementById("app")!;
 const root = createRoot(domNode);
 root.render(<App />);
diff --git a/packages/openapi-fetch/examples/react-query/tsconfig.json b/packages/openapi-fetch/examples/react-query/tsconfig.json
@@ -1,3 +1,10 @@
 {
-  "extends": "../../tsconfig.json"
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "jsx": "preserve",
+    "module": "ESNext",
+    "moduleResolution": "Node"
+  },
+  "include": ["src"]
 }
diff --git a/packages/openapi-fetch/examples/sveltekit/package.json b/packages/openapi-fetch/examples/sveltekit/package.json
@@ -14,10 +14,11 @@
   "devDependencies": {
     "@sveltejs/adapter-auto": "^3.1.1",
     "@sveltejs/kit": "^2.5.0",
-    "svelte": "^4.2.9",
-    "svelte-check": "^3.6.3",
+    "@sveltejs/vite-plugin-svelte": "^3.0.2",
+    "svelte": "^4.2.11",
+    "svelte-check": "^3.6.4",
     "tslib": "^2.6.2",
     "typescript": "^5.3.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.4"
   }
 }
diff --git a/packages/openapi-fetch/examples/sveltekit/svelte.config.js b/packages/openapi-fetch/examples/sveltekit/svelte.config.js
@@ -1,5 +1,5 @@
 import adapter from "@sveltejs/adapter-auto";
-import { vitePreprocess } from "@sveltejs/kit/vite";
+import { vitePreprocess } from "@sveltejs/vite-plugin-svelte";
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
diff --git a/packages/openapi-fetch/examples/sveltekit/tsconfig.json b/packages/openapi-fetch/examples/sveltekit/tsconfig.json
@@ -1,17 +1,18 @@
 {
-	"extends": "./.svelte-kit/tsconfig.json",
-	"compilerOptions": {
-		"allowJs": true,
-		"checkJs": true,
-		"esModuleInterop": true,
-		"forceConsistentCasingInFileNames": true,
-		"resolveJsonModule": true,
-		"skipLibCheck": true,
-		"sourceMap": true,
-		"strict": true
-	}
-	// Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
-	//
-	// If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
-	// from the referenced tsconfig.json - TypeScript does not merge them in
+  "extends": "./.svelte-kit/tsconfig.json",
+  "compilerOptions": {
+    "allowJs": true,
+    "checkJs": true,
+    "lib": ["DOM"],
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "strict": true
+  }
+  // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
+  //
+  // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
+  // from the referenced tsconfig.json - TypeScript does not merge them in
 }
diff --git a/packages/openapi-typescript-helpers/.gitignore b/packages/openapi-typescript-helpers/.gitignore
@@ -0,0 +1 @@
+index.d.cts
diff --git a/packages/openapi-typescript-helpers/index.cjs b/packages/openapi-typescript-helpers/index.cjs
@@ -0,0 +1,4 @@
+/**
+ * Stub file to allow importing from the root of the package.
+ */
+module.exports = null;
diff --git a/packages/openapi-typescript-helpers/package.json b/packages/openapi-typescript-helpers/package.json
@@ -13,12 +13,12 @@
   "exports": {
     ".": {
       "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
+        "types": "./index.d.ts",
+        "default": "./index.js"
       },
       "require": {
-        "types": "./dist/cjs/index.d.cts",
-        "default": "./dist/cjs/index.cjs"
+        "types": "./index.d.cts",
+        "default": "./index.cjs"
       }
     },
     "./*": "./*"
@@ -33,9 +33,7 @@
     "url": "https://github.com/drwpow/openapi-typescript/issues"
   },
   "scripts": {
-    "build": "pnpm run build:clean && pnpm run build:js",
-    "build:clean": "del dist",
-    "build:js": "node ./scripts/build.js",
+    "build": "cp index.d.ts index.d.cts",
     "lint": "pnpm run lint:js",
     "lint:js": "eslint \"*.{js,ts}\"",
     "lint:prettier": "prettier --check \"{src,test}/**/*\"",
diff --git a/packages/openapi-typescript-helpers/scripts/build.js b/packages/openapi-typescript-helpers/scripts/build.js
diff --git a/packages/openapi-typescript/CHANGELOG.md b/packages/openapi-typescript/CHANGELOG.md
@@ -71,6 +71,8 @@
 
 - [#1374](https://github.com/drwpow/openapi-typescript/pull/1374) [`7ac5174`](https://github.com/drwpow/openapi-typescript/commit/7ac5174a1f767c1103573543bb17622ac8d25fe4) Thanks [@ElForastero](https://github.com/ElForastero)! - Add support for x-enum-varnames and x-enum-descriptions
 
+- [#1545](https://github.com/drwpow/openapi-typescript/pull/1545) [`9158b81`](https://github.com/drwpow/openapi-typescript/commit/9158b81e8fdd45491afde8e291a786d7b2abc154) Thanks [@jaredLunde](https://github.com/drwpow/openapi-typescript/commits?author=jaredLunde)! - Replace # characters in operation IDs with a slash
+
 ### Patch Changes
 
 - [`6d1eb32`](https://github.com/drwpow/openapi-typescript/commit/6d1eb32e610cb62effbd1a817ae8fc93337126a6) Thanks [@drwpow](https://github.com/drwpow)! - Refactor internals to use TypeScript AST rather than string mashing
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,10 @@`
`1`	`1`	`{`
`2`		`- "extends": "../../tsconfig.json"`
	`2`	`+ "extends": "../../tsconfig.json",`
	`3`	`+ "compilerOptions": {`
	`4`	`+ "baseUrl": ".",`
	`5`	`+ "jsx": "preserve",`
	`6`	`+ "module": "ESNext",`
	`7`	`+ "moduleResolution": "Node"`
	`8`	`+ },`
	`9`	`+ "include": ["src"]`
`3`	`10`	`}`