fix: tsconfig usage, no default type exports

wanted to try verbatimModuleSyntax but it left a dangling import to a devDependency

Author: TheChristophe

eslint.config.js

@@ -98,6 +98,8 @@ const config = tseslint.config(
       '@typescript-eslint/consistent-type-imports': 'off',
       // broken?
       '@typescript-eslint/no-unnecessary-condition': 'off',
+
+      '@typescript-eslint/no-deprecated': 'warn',
     },
   },
 );

package.json

@@ -14,14 +14,14 @@
   "homepage": "https://github.com/thechristophe/openapi-typebox#readme",
   "scripts": {
     "build": "tsc --project tsconfig.build.json && pnpm copy-files",
-    "copy-files": "copyfiles -f src/output/* ./dist/output/",
+    "copy-files": "copyfiles -f src/output/* ./dist/src/output/",
     "clean": "rimraf dist/",
     "prepublishOnly": "pnpm clean && pnpm build",
     "lint": "eslint src",
     "lint:export": "eslint --output-file eslint_report.json --format json src",
     "lint:formatting": "prettier --check .",
     "lint:types": "tsc --noEmit",
-    "cli": "node ./dist/client-cli.js"
+    "cli": "node ./dist/src/client-cli.js"
   },
   "devDependencies": {
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.1",

src/generation/client.ts

@@ -1,23 +1,25 @@
-import { JSONSchema7 } from 'json-schema';
+import { type JSONSchema7 } from 'json-schema';
 import fs from 'node:fs';
 import YAML from 'yaml';
-import type OpenApiSpec from '../openapi/index.js';
+import { type OpenApiSpecification } from '../openapi/index.js';
 import { OpenApiMethods } from '../openapi/PathItem.js';
-import operationToFunction, { FunctionMetadata } from './function.js';
+import operationToFunction, { type FunctionMetadata } from './function.js';
 import generateModels from './models.js';
 import generateResponses from './responses.js';
 import configuration from './utility/configuration.js';
 import { NotImplementedError } from './utility/errors.js';
 import lintAndCheckFiles from './utility/lintAndCheckFiles.js';
 import { default as rootLogger } from './utility/logger.js';
-import PathInfo, { FileInfo, resolveAbsolutePath } from './utility/PathInfo.js';
+import { type FileInfo, type PathInfo, resolveAbsolutePath } from './utility/PathInfo.js';
 import template from './utility/templater.js';
 import writeSourceFile from './utility/writeSourceFile.js';
 
+import baselineTsConfig from '../../tsconfig.json' with { type: 'json' };
+
 const logger = rootLogger.child({ context: 'client' });
 
 const processPaths = (
-  paths: Required<OpenApiSpec>['paths'],
+  paths: Required<OpenApiSpecification>['paths'],
   outDir: PathInfo,
 ): FunctionMetadata[] => {
   logger.info('Mkdir', resolveAbsolutePath(outDir));
@@ -166,17 +168,16 @@ const generatePackage = (version: string, outDir: PathInfo) => {
     { ...outDir, path: '.', filename: 'tsconfig.json' },
     JSON.stringify(
       {
+        ...baselineTsConfig,
         compilerOptions: {
+          ...baselineTsConfig.compilerOptions,
           declaration: true,
-          target: 'es2020',
-          module: 'nodenext',
-          noImplicitAny: true,
           outDir: 'dist',
           rootDir: '.',
           typeRoots: ['node_modules/@types'],
-          moduleResolution: 'NodeNext',
-          allowSyntheticDefaultImports: true,
+          lib: [...baselineTsConfig.compilerOptions.lib, 'dom', 'dom.iterable'],
         },
+        include: ['**/*.ts'],
         exclude: ['dist', 'node_modules'],
       },
       null,
@@ -187,7 +188,7 @@ const generatePackage = (version: string, outDir: PathInfo) => {
 
 const client = async (specPath: string, outPath: PathInfo) => {
   // TODO: validation
-  let spec: OpenApiSpec;
+  let spec: OpenApiSpecification;
   if (['.yml', '.yaml'].some((e) => specPath.endsWith(e))) {
     const fileContents = fs.readFileSync(specPath).toString();
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment

src/generation/function.ts

@@ -1,7 +1,7 @@
-import type Operation from '../openapi/Operation.js';
-import type Parameter from '../openapi/Parameter.js';
-import type Reference from '../openapi/Reference.js';
-import type RequestBody from '../openapi/RequestBody.js';
+import { type Operation } from '../openapi/Operation.js';
+import { type Parameter } from '../openapi/Parameter.js';
+import { type Reference } from '../openapi/Reference.js';
+import { type RequestBody } from '../openapi/RequestBody.js';
 import writeSourceFile from './utility/writeSourceFile.js';
 
 import buildUrl from './function/buildUrl.js';
@@ -11,11 +11,11 @@ import routeToOperationName from './function/helpers/routeToOperationName.js';
 import destructureParameters from './function/parameterDestructuring.js';
 import generateFunctionParameterType from './function/parameterType.js';
 import buildResponseReturn from './function/returnStatement.js';
-import buildResponseTypes, { ResponseTypes } from './response/responseTypes.js';
+import buildResponseTypes, { type ResponseTypes } from './response/responseTypes.js';
 import { GenerationError } from './utility/errors.js';
-import { ImportCollection, ImportSource, resolveImports } from './utility/importSource.js';
+import { ImportCollection, type ImportSource, resolveImports } from './utility/importSource.js';
 import { default as rootLogger } from './utility/logger.js';
-import PathInfo, { FileInfo } from './utility/PathInfo.js';
+import { type FileInfo, type PathInfo } from './utility/PathInfo.js';
 import { sanitizeVariableName, uppercaseFirst } from './utility/sanitization.js';
 import template from './utility/templater.js';
 

src/generation/function/buildUrl.ts

@@ -1,4 +1,4 @@
-import type Parameter from '../../openapi/Parameter.js';
+import { type Parameter } from '../../openapi/Parameter.js';
 import template from '../utility/templater.js';
 import substituteParams from './helpers/substituteParams.js';
 

src/generation/function/helpers/refUnsupported.ts

@@ -1,4 +1,4 @@
-import type Reference from '../../../openapi/Reference.js';
+import { type Reference } from '../../../openapi/Reference.js';
 import { NotImplementedError } from '../../utility/errors.js';
 
 function refUnsupported<T>(thing: Reference | T): asserts thing is T {

src/generation/function/helpers/substituteParams.ts

@@ -1,4 +1,4 @@
-import type Parameter from '../../../openapi/Parameter.js';
+import { type Parameter } from '../../../openapi/Parameter.js';
 import { InvalidParamError } from '../../function.js';
 
 const substituteParams = (route: string, parameters: Parameter[]) => {

src/generation/function/parameterDestructuring.ts

@@ -1,5 +1,5 @@
-import type Parameter from '../../openapi/Parameter.js';
-import type RequestBody from '../../openapi/RequestBody.js';
+import { type Parameter } from '../../openapi/Parameter.js';
+import { type RequestBody } from '../../openapi/RequestBody.js';
 import { needsSanitization, sanitizeVariableName } from '../utility/sanitization.js';
 import template from '../utility/templater.js';
 

src/generation/function/parameterType.ts

@@ -1,15 +1,15 @@
-import { JSONSchema7Definition } from 'json-schema';
-import Parameter from '../../openapi/Parameter.js';
-import type RequestBody from '../../openapi/RequestBody.js';
+import { type JSONSchema7Definition } from 'json-schema';
+import { type Parameter } from '../../openapi/Parameter.js';
+import { type RequestBody } from '../../openapi/RequestBody.js';
 import schemaToModel from '../model.js';
 import {
   ImportCollection,
-  ImportSource,
+  type ImportSource,
   resolveImports,
   toImportPath,
 } from '../utility/importSource.js';
 import { default as rootLogger } from '../utility/logger.js';
-import { FileInfo } from '../utility/PathInfo.js';
+import { type FileInfo } from '../utility/PathInfo.js';
 import template from '../utility/templater.js';
 import writeSourceFile from '../utility/writeSourceFile.js';
 

src/generation/function/returnStatement.ts

@@ -1,5 +1,6 @@
-import type Responses from '../../openapi/Responses.js';
-import { ResponseType, ResponseTypes } from '../response/responseTypes.js';
+import { type Response } from '../../openapi/Response.js';
+import { type Responses } from '../../openapi/Responses.js';
+import { type ResponseType, type ResponseTypes } from '../response/responseTypes.js';
 import context from '../utility/context.js';
 import template from '../utility/templater.js';
 
@@ -22,7 +23,7 @@ const buildResponseReturn = (
       continue;
     }
 
-    let resolvedResponse;
+    let resolvedResponse: Response;
     if ('$ref' in response) {
       const resolved = context.responses.lookup(response.$ref);
       if (resolved === undefined) {