From 8a87f868d091dc811ada9ab21e988a5d6a08287f Mon Sep 17 00:00:00 2001 From: snebjorn Date: Mon, 10 Nov 2025 22:03:56 +0100 Subject: [PATCH 1/5] devExports --- packages/angular/package.json | 19 +++++++++++++------ packages/axios/package.json | 19 +++++++++++++------ packages/core/package.json | 19 +++++++++++++------ packages/fetch/package.json | 19 +++++++++++++------ packages/hono/package.json | 19 +++++++++++++------ packages/mcp/package.json | 19 +++++++++++++------ packages/mock/package.json | 19 +++++++++++++------ packages/orval/package.json | 20 ++++++++++++++++---- packages/query/package.json | 19 +++++++++++++------ packages/swr/package.json | 19 +++++++++++++------ packages/tsdown.base.ts | 6 ++++-- packages/zod/package.json | 19 +++++++++++++------ yarn.lock | 2 +- 13 files changed, 151 insertions(+), 67 deletions(-) diff --git a/packages/angular/package.json b/packages/angular/package.json index 99a508ffc..95903e444 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -3,17 +3,24 @@ "version": "8.0.0-rc.2", "license": "MIT", "type": "module", - "exports": { - "import": { - "types": "./dist/index.d.mts", - "import": "./dist/index.mjs" - } - }, "files": [ "dist", "!dist/**/*.d.ts.map", "!dist/**/*.d.mts.map" ], + "exports": { + ".": "./src/index.ts", + "./package.json": "./package.json" + }, + "main": "./dist/index.mjs", + "module": "./dist/index.mjs", + "types": "./dist/index.d.mts", + "publishConfig": { + "exports": { + ".": "./dist/index.mjs", + "./package.json": "./package.json" + } + }, "scripts": { "build": "tsdown --config-loader unrun", "dev": "tsdown --config-loader unrun --watch src", diff --git a/packages/axios/package.json b/packages/axios/package.json index ae8cdf490..d151a15df 100644 --- a/packages/axios/package.json +++ b/packages/axios/package.json @@ -3,17 +3,24 @@ "version": "8.0.0-rc.2", "license": "MIT", "type": "module", - "exports": { - "import": { - "types": "./dist/index.d.mts", - "import": "./dist/index.mjs" - } - }, "files": [ "dist", "!dist/**/*.d.ts.map", "!dist/**/*.d.mts.map" ], + "exports": { + ".": "./src/index.ts", + "./package.json": "./package.json" + }, + "main": "./dist/index.mjs", + "module": "./dist/index.mjs", + "types": "./dist/index.d.mts", + "publishConfig": { + "exports": { + ".": "./dist/index.mjs", + "./package.json": "./package.json" + } + }, "scripts": { "build": "tsdown --config-loader unrun", "dev": "tsdown --config-loader unrun --watch src", diff --git a/packages/core/package.json b/packages/core/package.json index b83e31db3..bbdb93c49 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,17 +3,24 @@ "version": "8.0.0-rc.2", "license": "MIT", "type": "module", - "exports": { - ".": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - } - }, "files": [ "dist", "!dist/**/*.d.ts.map", "!dist/**/*.d.mts.map" ], + "exports": { + ".": "./src/index.ts", + "./package.json": "./package.json" + }, + "main": "./dist/index.mjs", + "module": "./dist/index.mjs", + "types": "./dist/index.d.mts", + "publishConfig": { + "exports": { + ".": "./dist/index.mjs", + "./package.json": "./package.json" + } + }, "scripts": { "build": "tsdown --config-loader unrun", "dev": "tsdown --config-loader unrun --watch src", diff --git a/packages/fetch/package.json b/packages/fetch/package.json index dfe1a98ab..98a78fb63 100644 --- a/packages/fetch/package.json +++ b/packages/fetch/package.json @@ -3,17 +3,24 @@ "version": "8.0.0-rc.2", "license": "MIT", "type": "module", - "exports": { - "import": { - "types": "./dist/index.d.mts", - "import": "./dist/index.mjs" - } - }, "files": [ "dist", "!dist/**/*.d.ts.map", "!dist/**/*.d.mts.map" ], + "exports": { + ".": "./src/index.ts", + "./package.json": "./package.json" + }, + "main": "./dist/index.mjs", + "module": "./dist/index.mjs", + "types": "./dist/index.d.mts", + "publishConfig": { + "exports": { + ".": "./dist/index.mjs", + "./package.json": "./package.json" + } + }, "scripts": { "build": "tsdown --config-loader unrun", "dev": "tsdown --config-loader unrun --watch src", diff --git a/packages/hono/package.json b/packages/hono/package.json index 779084d00..492cff37d 100644 --- a/packages/hono/package.json +++ b/packages/hono/package.json @@ -3,17 +3,24 @@ "version": "8.0.0-rc.2", "license": "MIT", "type": "module", - "exports": { - "import": { - "types": "./dist/index.d.mts", - "import": "./dist/index.mjs" - } - }, "files": [ "dist", "!dist/**/*.d.ts.map", "!dist/**/*.d.mts.map" ], + "exports": { + ".": "./src/index.ts", + "./package.json": "./package.json" + }, + "main": "./dist/index.mjs", + "module": "./dist/index.mjs", + "types": "./dist/index.d.mts", + "publishConfig": { + "exports": { + ".": "./dist/index.mjs", + "./package.json": "./package.json" + } + }, "scripts": { "build": "tsdown --config-loader unrun", "dev": "tsdown --config-loader unrun --watch src", diff --git a/packages/mcp/package.json b/packages/mcp/package.json index f3dbc6b7d..b09756ca1 100644 --- a/packages/mcp/package.json +++ b/packages/mcp/package.json @@ -3,17 +3,24 @@ "version": "8.0.0-rc.2", "license": "MIT", "type": "module", - "exports": { - "import": { - "types": "./dist/index.d.mts", - "import": "./dist/index.mjs" - } - }, "files": [ "dist", "!dist/**/*.d.ts.map", "!dist/**/*.d.mts.map" ], + "exports": { + ".": "./src/index.ts", + "./package.json": "./package.json" + }, + "main": "./dist/index.mjs", + "module": "./dist/index.mjs", + "types": "./dist/index.d.mts", + "publishConfig": { + "exports": { + ".": "./dist/index.mjs", + "./package.json": "./package.json" + } + }, "scripts": { "build": "tsdown --config-loader unrun", "dev": "tsdown --config-loader unrun --watch src", diff --git a/packages/mock/package.json b/packages/mock/package.json index 4dd8004c8..461d10e17 100644 --- a/packages/mock/package.json +++ b/packages/mock/package.json @@ -3,17 +3,24 @@ "version": "8.0.0-rc.2", "license": "MIT", "type": "module", - "exports": { - "import": { - "types": "./dist/index.d.mts", - "import": "./dist/index.mjs" - } - }, "files": [ "dist", "!dist/**/*.d.ts.map", "!dist/**/*.d.mts.map" ], + "exports": { + ".": "./src/index.ts", + "./package.json": "./package.json" + }, + "main": "./dist/index.mjs", + "module": "./dist/index.mjs", + "types": "./dist/index.d.mts", + "publishConfig": { + "exports": { + ".": "./dist/index.mjs", + "./package.json": "./package.json" + } + }, "scripts": { "build": "tsdown --config-loader unrun", "dev": "tsdown --config-loader unrun --watch src", diff --git a/packages/orval/package.json b/packages/orval/package.json index 2504d6de5..6ce456555 100644 --- a/packages/orval/package.json +++ b/packages/orval/package.json @@ -9,11 +9,23 @@ "!dist/**/*.d.ts.map", "!dist/**/*.d.mts.map" ], - "bin": "./dist/bin/orval.mjs", + "bin": "./src/bin/orval.ts", "exports": { - ".": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" + ".": "./src/index.ts", + "./bin/orval": "./src/bin/orval.ts", + "./package.json": "./package.json" + }, + "main": "./dist/index.mjs", + "module": "./dist/index.mjs", + "types": "./dist/index.d.mts", + "publishConfig": { + "bin": { + "orval": "./dist/bin/orval.mjs" + }, + "exports": { + ".": "./dist/index.mjs", + "./bin/orval": "./dist/bin/orval.mjs", + "./package.json": "./package.json" } }, "engines": { diff --git a/packages/query/package.json b/packages/query/package.json index 899a728c8..bad0fa8c8 100644 --- a/packages/query/package.json +++ b/packages/query/package.json @@ -3,17 +3,24 @@ "version": "8.0.0-rc.2", "license": "MIT", "type": "module", - "exports": { - "import": { - "types": "./dist/index.d.mts", - "import": "./dist/index.mjs" - } - }, "files": [ "dist", "!dist/**/*.d.ts.map", "!dist/**/*.d.mts.map" ], + "exports": { + ".": "./src/index.ts", + "./package.json": "./package.json" + }, + "main": "./dist/index.mjs", + "module": "./dist/index.mjs", + "types": "./dist/index.d.mts", + "publishConfig": { + "exports": { + ".": "./dist/index.mjs", + "./package.json": "./package.json" + } + }, "scripts": { "build": "tsdown --config-loader unrun", "dev": "tsdown --config-loader unrun --watch src", diff --git a/packages/swr/package.json b/packages/swr/package.json index a7f72565d..4e580887c 100644 --- a/packages/swr/package.json +++ b/packages/swr/package.json @@ -3,17 +3,24 @@ "version": "8.0.0-rc.2", "license": "MIT", "type": "module", - "exports": { - "import": { - "types": "./dist/index.d.mts", - "import": "./dist/index.mjs" - } - }, "files": [ "dist", "!dist/**/*.d.ts.map", "!dist/**/*.d.mts.map" ], + "exports": { + ".": "./src/index.ts", + "./package.json": "./package.json" + }, + "main": "./dist/index.mjs", + "module": "./dist/index.mjs", + "types": "./dist/index.d.mts", + "publishConfig": { + "exports": { + ".": "./dist/index.mjs", + "./package.json": "./package.json" + } + }, "scripts": { "build": "tsdown --config-loader unrun", "dev": "tsdown --config-loader unrun --watch src", diff --git a/packages/tsdown.base.ts b/packages/tsdown.base.ts index 6009e4590..e9290223f 100644 --- a/packages/tsdown.base.ts +++ b/packages/tsdown.base.ts @@ -6,7 +6,9 @@ export const baseConfig: UserConfig = { platform: 'node', format: 'esm', tsconfig: 'tsconfig.build.json', - dts: { - sourcemap: true, + dts: true, + exports: { + // https://tsdown.dev/options/package-exports#dev-exports + devExports: true, }, }; diff --git a/packages/zod/package.json b/packages/zod/package.json index de10c25c2..a535dce74 100644 --- a/packages/zod/package.json +++ b/packages/zod/package.json @@ -3,17 +3,24 @@ "version": "8.0.0-rc.2", "license": "MIT", "type": "module", - "exports": { - "import": { - "types": "./dist/index.d.mts", - "import": "./dist/index.mjs" - } - }, "files": [ "dist", "!dist/**/*.d.ts.map", "!dist/**/*.d.mts.map" ], + "exports": { + ".": "./src/index.ts", + "./package.json": "./package.json" + }, + "main": "./dist/index.mjs", + "module": "./dist/index.mjs", + "types": "./dist/index.d.mts", + "publishConfig": { + "exports": { + ".": "./dist/index.mjs", + "./package.json": "./package.json" + } + }, "scripts": { "build": "tsdown --config-loader unrun", "dev": "tsdown --config-loader unrun --watch src", diff --git a/yarn.lock b/yarn.lock index 1e4d38878..9c9548e2c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18676,7 +18676,7 @@ __metadata: typescript: "catalog:" vitest: "catalog:" bin: - orval: ./dist/bin/orval.mjs + orval: ./src/bin/orval.ts languageName: unknown linkType: soft From 5b3c7044f6b3c90eafbd4fdf286260b354dde2d8 Mon Sep 17 00:00:00 2001 From: snebjorn Date: Mon, 10 Nov 2025 22:04:42 +0100 Subject: [PATCH 2/5] import with file extensions --- .vscode/settings.json | 4 +- packages/angular/tsdown.config.ts | 2 +- packages/axios/tsdown.config.ts | 2 +- packages/core/src/constants.ts | 2 +- .../src/generators/component-definition.ts | 6 +-- packages/core/src/generators/imports.ts | 4 +- packages/core/src/generators/index.ts | 16 +++---- .../core/src/generators/interface.test.ts | 4 +- packages/core/src/generators/interface.ts | 6 +-- packages/core/src/generators/models-inline.ts | 2 +- .../core/src/generators/mutator-info.test.ts | 4 +- packages/core/src/generators/mutator-info.ts | 2 +- packages/core/src/generators/mutator.ts | 10 +++-- packages/core/src/generators/options.test.ts | 2 +- packages/core/src/generators/options.ts | 4 +- .../generators/parameter-definition.test.ts | 4 +- .../src/generators/parameter-definition.ts | 6 +-- .../src/generators/schema-definition.test.ts | 4 +- .../core/src/generators/schema-definition.ts | 10 ++--- .../core/src/generators/verbs-options.test.ts | 4 +- packages/core/src/generators/verbs-options.ts | 8 ++-- packages/core/src/getters/array.ts | 8 ++-- packages/core/src/getters/body.ts | 10 ++--- packages/core/src/getters/combine.ts | 12 ++--- packages/core/src/getters/discriminators.ts | 6 +-- packages/core/src/getters/enum.ts | 4 +- packages/core/src/getters/imports.test.ts | 4 +- packages/core/src/getters/imports.ts | 6 +-- packages/core/src/getters/index.ts | 34 +++++++------- packages/core/src/getters/object.ts | 16 +++---- packages/core/src/getters/operation.test.ts | 2 +- packages/core/src/getters/operation.ts | 4 +- packages/core/src/getters/parameters.ts | 6 +-- packages/core/src/getters/params.ts | 6 +-- packages/core/src/getters/props.test.ts | 4 +- packages/core/src/getters/props.ts | 4 +- .../core/src/getters/query-params.test.ts | 4 +- packages/core/src/getters/query-params.ts | 10 ++--- packages/core/src/getters/ref.ts | 4 +- .../core/src/getters/res-req-types.test.ts | 2 +- packages/core/src/getters/res-req-types.ts | 14 +++--- packages/core/src/getters/response.test.ts | 2 +- packages/core/src/getters/response.ts | 4 +- packages/core/src/getters/route.test.ts | 4 +- packages/core/src/getters/route.ts | 6 +-- packages/core/src/getters/scalar.ts | 12 ++--- packages/core/src/index.ts | 14 +++--- packages/core/src/resolvers/index.ts | 6 +-- packages/core/src/resolvers/object.ts | 8 ++-- packages/core/src/resolvers/ref.ts | 6 +-- packages/core/src/resolvers/value.ts | 8 ++-- packages/core/src/utils/assertion.test.ts | 2 +- packages/core/src/utils/assertion.ts | 4 +- packages/core/src/utils/case.test.ts | 4 +- packages/core/src/utils/case.ts | 2 +- packages/core/src/utils/doc.ts | 2 +- packages/core/src/utils/dynamic-import.ts | 2 +- packages/core/src/utils/file-extensions.ts | 4 +- packages/core/src/utils/file.ts | 2 +- packages/core/src/utils/index.ts | 44 +++++++++---------- packages/core/src/utils/is-body-verb.ts | 4 +- packages/core/src/utils/open-api-converter.ts | 2 +- packages/core/src/utils/path.ts | 6 +-- packages/core/src/utils/string.ts | 2 +- packages/core/src/utils/tsconfig.ts | 2 +- packages/core/src/utils/validator.ts | 2 +- .../writers/generate-imports-for-builder.ts | 4 +- packages/core/src/writers/index.ts | 16 +++---- packages/core/src/writers/schemas.ts | 6 +-- packages/core/src/writers/single-mode.ts | 15 ++++--- packages/core/src/writers/split-mode.ts | 17 ++++--- packages/core/src/writers/split-tags-mode.ts | 17 ++++--- packages/core/src/writers/tags-mode.ts | 15 ++++--- packages/core/src/writers/target-tags.ts | 4 +- packages/core/src/writers/target.ts | 4 +- packages/core/tsdown.config.ts | 2 +- packages/fetch/tsdown.config.ts | 2 +- packages/hono/src/index.ts | 2 +- packages/hono/tsdown.config.ts | 2 +- packages/mcp/tsdown.config.ts | 2 +- packages/mock/src/faker/compatible-v9.test.ts | 2 +- packages/mock/src/faker/getters/combine.ts | 4 +- packages/mock/src/faker/getters/index.ts | 8 ++-- packages/mock/src/faker/getters/object.ts | 8 ++-- packages/mock/src/faker/getters/route.test.ts | 2 +- .../mock/src/faker/getters/scalar.test.ts | 2 +- packages/mock/src/faker/getters/scalar.ts | 10 ++--- packages/mock/src/faker/resolvers/index.ts | 2 +- packages/mock/src/faker/resolvers/value.ts | 6 +-- packages/mock/src/index.ts | 2 +- packages/mock/src/msw/index.ts | 6 +-- packages/mock/src/msw/mocks.ts | 2 +- packages/mock/tsdown.config.ts | 2 +- packages/orval/src/api.ts | 2 +- packages/orval/src/bin/orval.ts | 10 ++--- packages/orval/src/generate-spec.ts | 4 +- packages/orval/src/generate.ts | 8 ++-- packages/orval/src/import-open-api.ts | 2 +- packages/orval/src/import-specs.ts | 2 +- packages/orval/src/index.ts | 4 +- packages/orval/src/utils/github.ts | 2 +- packages/orval/src/utils/index.ts | 14 +++--- packages/orval/src/utils/options.ts | 10 ++--- packages/orval/src/utils/package-json.ts | 2 +- packages/orval/src/utils/tsconfig.ts | 2 +- packages/orval/src/write-specs.ts | 2 +- packages/orval/tsdown.config.ts | 2 +- packages/query/src/client.ts | 2 +- packages/query/src/index.test.ts | 2 +- packages/query/src/index.ts | 4 +- packages/query/src/utils.test.ts | 2 +- packages/query/tsdown.config.ts | 2 +- packages/swr/src/index.ts | 2 +- packages/swr/tsdown.config.ts | 2 +- packages/zod/src/compatible-v4.test.ts | 2 +- packages/zod/src/index.ts | 2 +- packages/zod/src/zod.test.ts | 2 +- packages/zod/tsdown.config.ts | 2 +- tsconfig.base.json | 3 +- 119 files changed, 348 insertions(+), 329 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 68105a85b..90deda787 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -30,5 +30,7 @@ }, "[yaml]": { "editor.defaultFormatter": "esbenp.prettier-vscode" - } + }, + "typescript.preferences.preferTypeOnlyAutoImports": true, + "typescript.preferences.importModuleSpecifierEnding": "js" } diff --git a/packages/angular/tsdown.config.ts b/packages/angular/tsdown.config.ts index 0bc3d7780..b44ce16a6 100644 --- a/packages/angular/tsdown.config.ts +++ b/packages/angular/tsdown.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from 'tsdown'; -import { baseConfig } from '../tsdown.base'; +import { baseConfig } from '../tsdown.base.ts'; export default defineConfig(baseConfig); diff --git a/packages/axios/tsdown.config.ts b/packages/axios/tsdown.config.ts index 0bc3d7780..b44ce16a6 100644 --- a/packages/axios/tsdown.config.ts +++ b/packages/axios/tsdown.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from 'tsdown'; -import { baseConfig } from '../tsdown.base'; +import { baseConfig } from '../tsdown.base.ts'; export default defineConfig(baseConfig); diff --git a/packages/core/src/constants.ts b/packages/core/src/constants.ts index c43407f0e..475158651 100644 --- a/packages/core/src/constants.ts +++ b/packages/core/src/constants.ts @@ -1,4 +1,4 @@ -import { Verbs } from './types'; +import { Verbs } from './types.ts'; export const generalJSTypes = [ 'number', diff --git a/packages/core/src/generators/component-definition.ts b/packages/core/src/generators/component-definition.ts index 048af4ae1..b5e256dab 100644 --- a/packages/core/src/generators/component-definition.ts +++ b/packages/core/src/generators/component-definition.ts @@ -6,9 +6,9 @@ import type { } from 'openapi3-ts/oas30'; import { isEmptyish } from 'remeda'; -import { getResReqTypes } from '../getters'; -import type { ContextSpecs, GeneratorSchema } from '../types'; -import { jsDoc, pascal, sanitize } from '../utils'; +import { getResReqTypes } from '../getters/index.ts'; +import type { ContextSpecs, GeneratorSchema } from '../types.ts'; +import { jsDoc, pascal, sanitize } from '../utils/index.ts'; export const generateComponentDefinition = ( responses: diff --git a/packages/core/src/generators/imports.ts b/packages/core/src/generators/imports.ts index d5978077c..dfe1f4bc6 100644 --- a/packages/core/src/generators/imports.ts +++ b/packages/core/src/generators/imports.ts @@ -6,8 +6,8 @@ import { type GeneratorVerbOptions, GetterPropType, NamingConvention, -} from '../types'; -import { conventionName, upath } from '../utils'; +} from '../types.ts'; +import { conventionName, upath } from '../utils/index.ts'; export const generateImports = ({ imports = [], diff --git a/packages/core/src/generators/index.ts b/packages/core/src/generators/index.ts index 28f312d75..ef49d2b6e 100644 --- a/packages/core/src/generators/index.ts +++ b/packages/core/src/generators/index.ts @@ -1,8 +1,8 @@ -export * from './component-definition'; -export * from './imports'; -export * from './models-inline'; -export * from './mutator'; -export * from './options'; -export * from './parameter-definition'; -export * from './schema-definition'; -export * from './verbs-options'; +export * from './component-definition.ts'; +export * from './imports.ts'; +export * from './models-inline.ts'; +export * from './mutator.ts'; +export * from './options.ts'; +export * from './parameter-definition.ts'; +export * from './schema-definition.ts'; +export * from './verbs-options.ts'; diff --git a/packages/core/src/generators/interface.test.ts b/packages/core/src/generators/interface.test.ts index b93465f74..201d3c8dc 100644 --- a/packages/core/src/generators/interface.test.ts +++ b/packages/core/src/generators/interface.test.ts @@ -2,8 +2,8 @@ import type { SchemaObject as SchemaObject30 } from 'openapi3-ts/oas30'; import type { SchemaObject as SchemaObject31 } from 'openapi3-ts/oas31'; import { describe, expect, it } from 'vitest'; -import type { ContextSpecs, GeneratorSchema } from '../types'; -import { generateInterface } from './interface'; +import type { ContextSpecs, GeneratorSchema } from '../types.ts'; +import { generateInterface } from './interface.ts'; describe('generateInterface', () => { const context: ContextSpecs = { diff --git a/packages/core/src/generators/interface.ts b/packages/core/src/generators/interface.ts index de9e5f7e9..8a798a2a7 100644 --- a/packages/core/src/generators/interface.ts +++ b/packages/core/src/generators/interface.ts @@ -1,8 +1,8 @@ import type { SchemaObject } from 'openapi3-ts/oas30'; -import { getScalar } from '../getters'; -import type { ContextSpecs } from '../types'; -import { jsDoc } from '../utils'; +import { getScalar } from '../getters/index.ts'; +import type { ContextSpecs } from '../types.ts'; +import { jsDoc } from '../utils/index.ts'; /** * Generate the interface string diff --git a/packages/core/src/generators/models-inline.ts b/packages/core/src/generators/models-inline.ts index 58b22d969..a1f43f500 100644 --- a/packages/core/src/generators/models-inline.ts +++ b/packages/core/src/generators/models-inline.ts @@ -1,4 +1,4 @@ -import type { GeneratorSchema } from '../types'; +import type { GeneratorSchema } from '../types.ts'; export const generateModelInline = (acc: string, model: string): string => acc + `${model}\n`; diff --git a/packages/core/src/generators/mutator-info.test.ts b/packages/core/src/generators/mutator-info.test.ts index 121aec92a..cf1513160 100644 --- a/packages/core/src/generators/mutator-info.test.ts +++ b/packages/core/src/generators/mutator-info.test.ts @@ -17,8 +17,8 @@ import { nestedLambda1Param, nestedLambda2Param, nestedLambda3Param, -} from './__tests__/mutator-test-files/named-export-tests'; -import { getMutatorInfo } from './mutator-info'; +} from './__tests__/mutator-test-files/named-export-tests.ts'; +import { getMutatorInfo } from './mutator-info.ts'; const basePath = path.join(import.meta.dirname, '__tests__/mutator-test-files'); diff --git a/packages/core/src/generators/mutator-info.ts b/packages/core/src/generators/mutator-info.ts index 67ad0de27..f1d778bb5 100644 --- a/packages/core/src/generators/mutator-info.ts +++ b/packages/core/src/generators/mutator-info.ts @@ -8,7 +8,7 @@ import type { GeneratorMutatorParsingInfo, Tsconfig, TsConfigTarget, -} from '../types'; +} from '../types.ts'; export async function getMutatorInfo( filePath: string, diff --git a/packages/core/src/generators/mutator.ts b/packages/core/src/generators/mutator.ts index 2658c960b..c0af314fa 100644 --- a/packages/core/src/generators/mutator.ts +++ b/packages/core/src/generators/mutator.ts @@ -3,9 +3,13 @@ import path from 'node:path'; import chalk from 'chalk'; import fs from 'fs-extra'; -import type { GeneratorMutator, NormalizedMutator, Tsconfig } from '../types'; -import { getFileInfo, pascal, upath } from '../utils'; -import { getMutatorInfo } from './mutator-info'; +import type { + GeneratorMutator, + NormalizedMutator, + Tsconfig, +} from '../types.ts'; +import { getFileInfo, pascal, upath } from '../utils/index.ts'; +import { getMutatorInfo } from './mutator-info.ts'; export const BODY_TYPE_NAME = 'BodyType'; diff --git a/packages/core/src/generators/options.test.ts b/packages/core/src/generators/options.test.ts index e2b167d0e..0ef5144d2 100644 --- a/packages/core/src/generators/options.test.ts +++ b/packages/core/src/generators/options.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import { generateAxiosOptions } from './options'; +import { generateAxiosOptions } from './options.ts'; describe('generateAxiosOptions', () => { it('should return "...options"', () => { diff --git a/packages/core/src/generators/options.ts b/packages/core/src/generators/options.ts index b354b6fdf..f279f7981 100644 --- a/packages/core/src/generators/options.ts +++ b/packages/core/src/generators/options.ts @@ -6,8 +6,8 @@ import { type GetterResponse, type ParamsSerializerOptions, Verbs, -} from '../types'; -import { getIsBodyVerb, isObject, stringify } from '../utils'; +} from '../types.ts'; +import { getIsBodyVerb, isObject, stringify } from '../utils/index.ts'; export const generateBodyOptions = ( body: GetterBody, diff --git a/packages/core/src/generators/parameter-definition.test.ts b/packages/core/src/generators/parameter-definition.test.ts index 61733ba24..0c65f95af 100644 --- a/packages/core/src/generators/parameter-definition.test.ts +++ b/packages/core/src/generators/parameter-definition.test.ts @@ -1,8 +1,8 @@ import type { ComponentsObject } from 'openapi3-ts/oas30'; import { describe, expect, it } from 'vitest'; -import type { ContextSpecs } from '../types'; -import { generateParameterDefinition } from './parameter-definition'; +import type { ContextSpecs } from '../types.ts'; +import { generateParameterDefinition } from './parameter-definition.ts'; describe('generateParameterDefinition', () => { const context: ContextSpecs = { diff --git a/packages/core/src/generators/parameter-definition.ts b/packages/core/src/generators/parameter-definition.ts index 1d73447ca..34ee6fb50 100644 --- a/packages/core/src/generators/parameter-definition.ts +++ b/packages/core/src/generators/parameter-definition.ts @@ -1,8 +1,8 @@ import type { ComponentsObject, ParameterObject } from 'openapi3-ts/oas30'; -import { resolveObject, resolveRef } from '../resolvers'; -import type { ContextSpecs, GeneratorSchema } from '../types'; -import { jsDoc, pascal, sanitize } from '../utils'; +import { resolveObject, resolveRef } from '../resolvers/index.ts'; +import type { ContextSpecs, GeneratorSchema } from '../types.ts'; +import { jsDoc, pascal, sanitize } from '../utils/index.ts'; export const generateParameterDefinition = ( parameters: ComponentsObject['parameters'] = {}, diff --git a/packages/core/src/generators/schema-definition.test.ts b/packages/core/src/generators/schema-definition.test.ts index 44c8b1fd9..507ccaa42 100644 --- a/packages/core/src/generators/schema-definition.test.ts +++ b/packages/core/src/generators/schema-definition.test.ts @@ -1,8 +1,8 @@ import type { SchemasObject } from 'openapi3-ts/oas30'; import { describe, expect, it } from 'vitest'; -import type { ContextSpecs, InputFiltersOption } from '../types'; -import { generateSchemasDefinition } from './schema-definition'; +import type { ContextSpecs, InputFiltersOption } from '../types.ts'; +import { generateSchemasDefinition } from './schema-definition.ts'; describe('generateSchemasDefinition', () => { const context: ContextSpecs = { diff --git a/packages/core/src/generators/schema-definition.ts b/packages/core/src/generators/schema-definition.ts index 721fff337..124b7981b 100644 --- a/packages/core/src/generators/schema-definition.ts +++ b/packages/core/src/generators/schema-definition.ts @@ -6,13 +6,13 @@ import { getEnumDescriptions, getEnumNames, resolveDiscriminators, -} from '../getters'; -import { resolveRef, resolveValue } from '../resolvers'; +} from '../getters/index.ts'; +import { resolveRef, resolveValue } from '../resolvers/index.ts'; import type { ContextSpecs, GeneratorSchema, InputFiltersOption, -} from '../types'; +} from '../types.ts'; import { conventionName, isReference, @@ -21,8 +21,8 @@ import { pascal, sanitize, upath, -} from '../utils'; -import { generateInterface } from './interface'; +} from '../utils/index.ts'; +import { generateInterface } from './interface.ts'; /** * Extract all types from #/components/schemas diff --git a/packages/core/src/generators/verbs-options.test.ts b/packages/core/src/generators/verbs-options.test.ts index 553074831..29e96253c 100644 --- a/packages/core/src/generators/verbs-options.test.ts +++ b/packages/core/src/generators/verbs-options.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest'; -import type { NormalizedInputOptions } from '../types'; -import { _filteredVerbs } from './verbs-options'; +import type { NormalizedInputOptions } from '../types.ts'; +import { _filteredVerbs } from './verbs-options.ts'; describe('_filteredVerbs', () => { it('should return all verbs if filters.tags is undefined', () => { diff --git a/packages/core/src/generators/verbs-options.ts b/packages/core/src/generators/verbs-options.ts index ab54e19ff..3e9d93234 100644 --- a/packages/core/src/generators/verbs-options.ts +++ b/packages/core/src/generators/verbs-options.ts @@ -14,7 +14,7 @@ import { getProps, getQueryParams, getResponse, -} from '../getters'; +} from '../getters/index.ts'; import type { ContextSpecs, GeneratorVerbOptions, @@ -24,7 +24,7 @@ import type { NormalizedOperationOptions, NormalizedOutputOptions, Verbs, -} from '../types'; +} from '../types.ts'; import { asyncReduce, camel, @@ -35,8 +35,8 @@ import { jsDoc, mergeDeep, sanitize, -} from '../utils'; -import { generateMutator } from './mutator'; +} from '../utils/index.ts'; +import { generateMutator } from './mutator.ts'; const generateVerbOptions = async ({ verb, diff --git a/packages/core/src/getters/array.ts b/packages/core/src/getters/array.ts index c062f795f..80cef1149 100644 --- a/packages/core/src/getters/array.ts +++ b/packages/core/src/getters/array.ts @@ -1,10 +1,10 @@ import type { ReferenceObject, SchemaObject } from 'openapi3-ts/oas30'; import type { SchemaObject as SchemaObject31 } from 'openapi3-ts/oas31'; -import { resolveExampleRefs } from '../resolvers'; -import { resolveObject } from '../resolvers/object'; -import type { ContextSpecs, ScalarValue } from '../types'; -import { compareVersions } from '../utils'; +import { resolveExampleRefs } from '../resolvers/index.ts'; +import { resolveObject } from '../resolvers/object.ts'; +import type { ContextSpecs, ScalarValue } from '../types.ts'; +import { compareVersions } from '../utils/index.ts'; /** * Return the output type from an array diff --git a/packages/core/src/getters/body.ts b/packages/core/src/getters/body.ts index 82bd17c46..5bcd39257 100644 --- a/packages/core/src/getters/body.ts +++ b/packages/core/src/getters/body.ts @@ -1,14 +1,14 @@ import type { ReferenceObject, RequestBodyObject } from 'openapi3-ts/oas30'; -import { generalJSTypesWithArray } from '../constants'; -import { resolveRef } from '../resolvers'; +import { generalJSTypesWithArray } from '../constants.ts'; +import { resolveRef } from '../resolvers/index.ts'; import type { ContextSpecs, GetterBody, OverrideOutputContentType, -} from '../types'; -import { camel, isReference, sanitize } from '../utils'; -import { getResReqTypes } from './res-req-types'; +} from '../types.ts'; +import { camel, isReference, sanitize } from '../utils/index.ts'; +import { getResReqTypes } from './res-req-types.ts'; export const getBody = ({ requestBody, diff --git a/packages/core/src/getters/combine.ts b/packages/core/src/getters/combine.ts index ee5fdd005..a5be343d1 100644 --- a/packages/core/src/getters/combine.ts +++ b/packages/core/src/getters/combine.ts @@ -1,22 +1,22 @@ import type { SchemaObject } from 'openapi3-ts/oas30'; import { unique } from 'remeda'; -import { resolveExampleRefs, resolveObject } from '../resolvers'; +import { resolveExampleRefs, resolveObject } from '../resolvers/index.ts'; import { type ContextSpecs, type GeneratorImport, type GeneratorSchema, type ScalarValue, SchemaType, -} from '../types'; -import { getNumberWord, isSchema, pascal } from '../utils'; +} from '../types.ts'; +import { getNumberWord, isSchema, pascal } from '../utils/index.ts'; import { getEnumDescriptions, getEnumImplementation, getEnumNames, -} from './enum'; -import { getAliasedImports, getImportAliasForRefOrValue } from './imports'; -import { getScalar } from './scalar'; +} from './enum.ts'; +import { getAliasedImports, getImportAliasForRefOrValue } from './imports.ts'; +import { getScalar } from './scalar.ts'; type CombinedData = { imports: GeneratorImport[]; diff --git a/packages/core/src/getters/discriminators.ts b/packages/core/src/getters/discriminators.ts index 5339bb328..7a8d645b8 100644 --- a/packages/core/src/getters/discriminators.ts +++ b/packages/core/src/getters/discriminators.ts @@ -1,8 +1,8 @@ import type { SchemaObject, SchemasObject } from 'openapi3-ts/oas30'; -import type { ContextSpecs } from '../types'; -import { pascal } from '../utils'; -import { getRefInfo } from './ref'; +import type { ContextSpecs } from '../types.ts'; +import { pascal } from '../utils/index.ts'; +import { getRefInfo } from './ref.ts'; export const resolveDiscriminators = ( schemas: SchemasObject, diff --git a/packages/core/src/getters/enum.ts b/packages/core/src/getters/enum.ts index b6dbe7f21..f005e812e 100644 --- a/packages/core/src/getters/enum.ts +++ b/packages/core/src/getters/enum.ts @@ -1,8 +1,8 @@ import { keyword } from 'esutils'; import type { SchemaObject } from 'openapi3-ts/oas30'; -import { EnumGeneration, NamingConvention } from '../types'; -import { conventionName, isNumeric, sanitize } from '../utils'; +import { EnumGeneration, NamingConvention } from '../types.ts'; +import { conventionName, isNumeric, sanitize } from '../utils/index.ts'; export const getEnumNames = (schemaObject: SchemaObject | undefined) => { return ( diff --git a/packages/core/src/getters/imports.test.ts b/packages/core/src/getters/imports.test.ts index 6444d8c01..0e4bb8588 100644 --- a/packages/core/src/getters/imports.test.ts +++ b/packages/core/src/getters/imports.test.ts @@ -1,11 +1,11 @@ import { describe, expect, it } from 'vitest'; -import type { ContextSpecs, GeneratorImport, ResolverValue } from '../types'; +import type { ContextSpecs, GeneratorImport, ResolverValue } from '../types.ts'; import { getAliasedImports, getImportAliasForRefOrValue, needCreateImportAlias, -} from './imports'; +} from './imports.ts'; const baseContext: Omit = { specKey: 'spec', diff --git a/packages/core/src/getters/imports.ts b/packages/core/src/getters/imports.ts index 67373731f..cd25abc87 100644 --- a/packages/core/src/getters/imports.ts +++ b/packages/core/src/getters/imports.ts @@ -1,6 +1,6 @@ -import type { ContextSpecs, GeneratorImport, ResolverValue } from '../types'; -import { pascal } from '../utils'; -import { getSpecName } from '../utils/path'; +import type { ContextSpecs, GeneratorImport, ResolverValue } from '../types.ts'; +import { pascal } from '../utils/index.ts'; +import { getSpecName } from '../utils/path.ts'; export const getAliasedImports = ({ name, diff --git a/packages/core/src/getters/index.ts b/packages/core/src/getters/index.ts index 411143437..8554f42b5 100644 --- a/packages/core/src/getters/index.ts +++ b/packages/core/src/getters/index.ts @@ -1,17 +1,17 @@ -export * from './array'; -export * from './body'; -export * from './combine'; -export * from './discriminators'; -export * from './enum'; -export * from './keys'; -export * from './object'; -export * from './operation'; -export * from './parameters'; -export * from './params'; -export * from './props'; -export * from './query-params'; -export * from './ref'; -export * from './res-req-types'; -export * from './response'; -export * from './route'; -export * from './scalar'; +export * from './array.ts'; +export * from './body.ts'; +export * from './combine.ts'; +export * from './discriminators.ts'; +export * from './enum.ts'; +export * from './keys.ts'; +export * from './object.ts'; +export * from './operation.ts'; +export * from './parameters.ts'; +export * from './params.ts'; +export * from './props.ts'; +export * from './query-params.ts'; +export * from './ref.ts'; +export * from './res-req-types.ts'; +export * from './response.ts'; +export * from './route.ts'; +export * from './scalar.ts'; diff --git a/packages/core/src/getters/object.ts b/packages/core/src/getters/object.ts index 93988a1b8..9ab4942c1 100644 --- a/packages/core/src/getters/object.ts +++ b/packages/core/src/getters/object.ts @@ -1,20 +1,20 @@ import type { ReferenceObject, SchemaObject } from 'openapi3-ts/oas30'; import type { SchemaObject as SchemaObject31 } from 'openapi3-ts/oas31'; -import { resolveExampleRefs, resolveValue } from '../resolvers'; -import { resolveObject } from '../resolvers/object'; +import { resolveExampleRefs, resolveValue } from '../resolvers/index.ts'; +import { resolveObject } from '../resolvers/object.ts'; import { type ContextSpecs, PropertySortOrder, type ScalarValue, SchemaType, type SchemaWithConst, -} from '../types'; -import { isBoolean, isReference, jsDoc, pascal } from '../utils'; -import { combineSchemas } from './combine'; -import { getAliasedImports, getImportAliasForRefOrValue } from './imports'; -import { getKey } from './keys'; -import { getRefInfo } from './ref'; +} from '../types.ts'; +import { isBoolean, isReference, jsDoc, pascal } from '../utils/index.ts'; +import { combineSchemas } from './combine.ts'; +import { getAliasedImports, getImportAliasForRefOrValue } from './imports.ts'; +import { getKey } from './keys.ts'; +import { getRefInfo } from './ref.ts'; /** * Extract enum values from propertyNames schema (OpenAPI 3.1) diff --git a/packages/core/src/getters/operation.test.ts b/packages/core/src/getters/operation.test.ts index a688e3da1..bbb304c0e 100644 --- a/packages/core/src/getters/operation.test.ts +++ b/packages/core/src/getters/operation.test.ts @@ -1,7 +1,7 @@ import type { OperationObject } from 'openapi3-ts/oas30'; import { describe, expect, it } from 'vitest'; -import { getOperationId } from './operation'; +import { getOperationId } from './operation.ts'; describe('getOperationId getter', () => { for (const [input, expected] of [ diff --git a/packages/core/src/getters/operation.ts b/packages/core/src/getters/operation.ts index 9aef25ebc..64e648635 100644 --- a/packages/core/src/getters/operation.ts +++ b/packages/core/src/getters/operation.ts @@ -1,7 +1,7 @@ import type { OperationObject } from 'openapi3-ts/oas30'; -import { Verbs } from '../types'; -import { pascal, sanitize } from '../utils'; +import { Verbs } from '../types.ts'; +import { pascal, sanitize } from '../utils/index.ts'; export const getOperationId = ( operation: OperationObject, diff --git a/packages/core/src/getters/parameters.ts b/packages/core/src/getters/parameters.ts index 6219a01b6..27ef73755 100644 --- a/packages/core/src/getters/parameters.ts +++ b/packages/core/src/getters/parameters.ts @@ -1,8 +1,8 @@ import type { ParameterObject, ReferenceObject } from 'openapi3-ts/oas30'; -import { resolveRef } from '../resolvers/ref'; -import type { ContextSpecs, GetterParameters } from '../types'; -import { isReference } from '../utils'; +import { resolveRef } from '../resolvers/ref.ts'; +import type { ContextSpecs, GetterParameters } from '../types.ts'; +import { isReference } from '../utils/index.ts'; export const getParameters = ({ parameters = [], diff --git a/packages/core/src/getters/params.ts b/packages/core/src/getters/params.ts index 2d87a9ca2..71c88db1e 100644 --- a/packages/core/src/getters/params.ts +++ b/packages/core/src/getters/params.ts @@ -1,11 +1,11 @@ -import { resolveValue } from '../resolvers'; +import { resolveValue } from '../resolvers/index.ts'; import type { ContextSpecs, GetterParameters, GetterParams, NormalizedOutputOptions, -} from '../types'; -import { camel, sanitize, stringify } from '../utils'; +} from '../types.ts'; +import { camel, sanitize, stringify } from '../utils/index.ts'; /** * Return every params in a path diff --git a/packages/core/src/getters/props.test.ts b/packages/core/src/getters/props.test.ts index 11b05805d..63fd773be 100644 --- a/packages/core/src/getters/props.test.ts +++ b/packages/core/src/getters/props.test.ts @@ -1,8 +1,8 @@ import type { ReferenceObject, RequestBodyObject } from 'openapi3-ts/oas30'; import { describe, expect, it } from 'vitest'; -import type { ContextSpecs, GetterQueryParam } from '../types'; -import { getProps } from './props'; +import type { ContextSpecs, GetterQueryParam } from '../types.ts'; +import { getProps } from './props.ts'; describe('getProps', () => { it('should generate DeepNonNullable props for query params type definition when client is angular', () => { diff --git a/packages/core/src/getters/props.ts b/packages/core/src/getters/props.ts index 1b8d8822f..ad60b5ead 100644 --- a/packages/core/src/getters/props.ts +++ b/packages/core/src/getters/props.ts @@ -6,8 +6,8 @@ import { GetterPropType, type GetterQueryParam, OutputClient, -} from '../types'; -import { isUndefined, pascal, sortByPriority } from '../utils'; +} from '../types.ts'; +import { isUndefined, pascal, sortByPriority } from '../utils/index.ts'; export const getProps = ({ body, diff --git a/packages/core/src/getters/query-params.test.ts b/packages/core/src/getters/query-params.test.ts index 82611bdc9..b4df7e08c 100644 --- a/packages/core/src/getters/query-params.test.ts +++ b/packages/core/src/getters/query-params.test.ts @@ -1,8 +1,8 @@ import type { ParameterObject } from 'openapi3-ts/oas30'; import { describe, expect, it } from 'vitest'; -import type { ContextSpecs } from '../types'; -import { getQueryParams } from './query-params'; +import type { ContextSpecs } from '../types.ts'; +import { getQueryParams } from './query-params.ts'; // Mock context for getQueryParams const context: ContextSpecs = { diff --git a/packages/core/src/getters/query-params.ts b/packages/core/src/getters/query-params.ts index 64498b334..c355d66b9 100644 --- a/packages/core/src/getters/query-params.ts +++ b/packages/core/src/getters/query-params.ts @@ -1,16 +1,16 @@ import type { ContentObject, SchemaObject } from 'openapi3-ts/oas30'; -import { resolveValue } from '../resolvers'; +import { resolveValue } from '../resolvers/index.ts'; import type { ContextSpecs, GeneratorImport, GeneratorSchema, GetterParameters, GetterQueryParam, -} from '../types'; -import { jsDoc, pascal, sanitize } from '../utils'; -import { getEnum, getEnumDescriptions, getEnumNames } from './enum'; -import { getKey } from './keys'; +} from '../types.ts'; +import { jsDoc, pascal, sanitize } from '../utils/index.ts'; +import { getEnum, getEnumDescriptions, getEnumNames } from './enum.ts'; +import { getKey } from './keys.ts'; type QueryParamsType = { definition: string; diff --git a/packages/core/src/getters/ref.ts b/packages/core/src/getters/ref.ts index ec701a9b9..a2e64364e 100644 --- a/packages/core/src/getters/ref.ts +++ b/packages/core/src/getters/ref.ts @@ -1,7 +1,7 @@ import type { ReferenceObject } from 'openapi3-ts/oas30'; -import type { ContextSpecs, NormalizedOverrideOutput } from '../types'; -import { getFileInfo, isUrl, pascal, sanitize, upath } from '../utils'; +import type { ContextSpecs, NormalizedOverrideOutput } from '../types.ts'; +import { getFileInfo, isUrl, pascal, sanitize, upath } from '../utils/index.ts'; type RefComponent = 'schemas' | 'responses' | 'parameters' | 'requestBodies'; diff --git a/packages/core/src/getters/res-req-types.test.ts b/packages/core/src/getters/res-req-types.test.ts index 18a841b35..bc0210170 100644 --- a/packages/core/src/getters/res-req-types.test.ts +++ b/packages/core/src/getters/res-req-types.test.ts @@ -1,7 +1,7 @@ import type { RequestBodyObject, SchemaObject } from 'openapi3-ts/oas30'; import { describe, expect, it } from 'vitest'; -import { getResReqTypes } from './res-req-types'; +import { getResReqTypes } from './res-req-types.ts'; // Simulates an OpenAPI schema with a readOnly property const schemaWithReadOnly: SchemaObject = { diff --git a/packages/core/src/getters/res-req-types.ts b/packages/core/src/getters/res-req-types.ts index b78a26958..a07afa3bf 100644 --- a/packages/core/src/getters/res-req-types.ts +++ b/packages/core/src/getters/res-req-types.ts @@ -8,18 +8,18 @@ import type { } from 'openapi3-ts/oas30'; import { uniqueBy } from 'remeda'; -import { resolveObject } from '../resolvers/object'; -import { resolveExampleRefs, resolveRef } from '../resolvers/ref'; +import { resolveObject } from '../resolvers/object.ts'; +import { resolveExampleRefs, resolveRef } from '../resolvers/ref.ts'; import { type ContextSpecs, FormDataArrayHandling, type GeneratorImport, type ResReqTypesValue, -} from '../types'; -import { camel } from '../utils'; -import { isReference } from '../utils/assertion'; -import { pascal } from '../utils/case'; -import { getNumberWord } from '../utils/string'; +} from '../types.ts'; +import { isReference } from '../utils/assertion.ts'; +import { pascal } from '../utils/case.ts'; +import { camel } from '../utils/index.ts'; +import { getNumberWord } from '../utils/string.ts'; const formDataContentTypes = new Set(['multipart/form-data']); diff --git a/packages/core/src/getters/response.test.ts b/packages/core/src/getters/response.test.ts index 69154d196..a8b7efa5f 100644 --- a/packages/core/src/getters/response.test.ts +++ b/packages/core/src/getters/response.test.ts @@ -1,7 +1,7 @@ import type { ResponsesObject } from 'openapi3-ts/oas30'; import { describe, expect, it } from 'vitest'; -import { getResponse } from './response'; +import { getResponse } from './response.ts'; const context = { output: { diff --git a/packages/core/src/getters/response.ts b/packages/core/src/getters/response.ts index b8c9f553a..5098c301a 100644 --- a/packages/core/src/getters/response.ts +++ b/packages/core/src/getters/response.ts @@ -5,8 +5,8 @@ import type { GetterResponse, OverrideOutputContentType, ResReqTypesValue, -} from '../types'; -import { getResReqTypes } from './res-req-types'; +} from '../types.ts'; +import { getResReqTypes } from './res-req-types.ts'; export const getResponse = ({ responses, diff --git a/packages/core/src/getters/route.test.ts b/packages/core/src/getters/route.test.ts index c428e41aa..e67639d0c 100644 --- a/packages/core/src/getters/route.test.ts +++ b/packages/core/src/getters/route.test.ts @@ -1,8 +1,8 @@ import type { ServerObject } from 'openapi3-ts/oas30'; import { describe, expect, it, test } from 'vitest'; -import type { BaseUrlFromConstant, BaseUrlFromSpec } from '../types'; -import { getFullRoute, getRoute, getRouteAsArray } from './route'; +import type { BaseUrlFromConstant, BaseUrlFromSpec } from '../types.ts'; +import { getFullRoute, getRoute, getRouteAsArray } from './route.ts'; describe('getRoute getter', () => { for (const [input, expected] of [ diff --git a/packages/core/src/getters/route.ts b/packages/core/src/getters/route.ts index 023a3440c..825bd23ba 100644 --- a/packages/core/src/getters/route.ts +++ b/packages/core/src/getters/route.ts @@ -1,8 +1,8 @@ import type { ServerObject } from 'openapi3-ts/oas31'; -import { TEMPLATE_TAG_REGEX } from '../constants'; -import type { BaseUrlFromConstant, BaseUrlFromSpec } from '../types'; -import { camel, sanitize } from '../utils'; +import { TEMPLATE_TAG_REGEX } from '../constants.ts'; +import type { BaseUrlFromConstant, BaseUrlFromSpec } from '../types.ts'; +import { camel, sanitize } from '../utils/index.ts'; const TEMPLATE_TAG_IN_PATH_REGEX = /\/([\w]+)(?:\$\{)/g; // all dynamic parts of path diff --git a/packages/core/src/getters/scalar.ts b/packages/core/src/getters/scalar.ts index c0008c99b..180d3e7c6 100644 --- a/packages/core/src/getters/scalar.ts +++ b/packages/core/src/getters/scalar.ts @@ -1,11 +1,11 @@ import type { SchemaObject } from 'openapi3-ts/oas30'; -import { resolveExampleRefs } from '../resolvers'; -import type { ContextSpecs, ScalarValue, SchemaWithConst } from '../types'; -import { escape, isString } from '../utils'; -import { getArray } from './array'; -import { combineSchemas } from './combine'; -import { getObject } from './object'; +import { resolveExampleRefs } from '../resolvers/index.ts'; +import type { ContextSpecs, ScalarValue, SchemaWithConst } from '../types.ts'; +import { escape, isString } from '../utils/index.ts'; +import { getArray } from './array.ts'; +import { combineSchemas } from './combine.ts'; +import { getObject } from './object.ts'; /** * Return the typescript equivalent of open-api data type diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index ca1730bf9..664189902 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -1,7 +1,7 @@ -export * from './constants'; -export * from './generators'; -export * from './getters'; -export * from './resolvers'; -export * from './types'; -export * from './utils'; -export * from './writers'; +export * from './constants.ts'; +export * from './generators/index.ts'; +export * from './getters/index.ts'; +export * from './resolvers/index.ts'; +export * from './types.ts'; +export * from './utils/index.ts'; +export * from './writers/index.ts'; diff --git a/packages/core/src/resolvers/index.ts b/packages/core/src/resolvers/index.ts index ef9b94b63..e178d609f 100644 --- a/packages/core/src/resolvers/index.ts +++ b/packages/core/src/resolvers/index.ts @@ -1,3 +1,3 @@ -export * from './object'; -export * from './ref'; -export * from './value'; +export * from './object.ts'; +export * from './ref.ts'; +export * from './value.ts'; diff --git a/packages/core/src/resolvers/object.ts b/packages/core/src/resolvers/object.ts index f6feec449..8329cf923 100644 --- a/packages/core/src/resolvers/object.ts +++ b/packages/core/src/resolvers/object.ts @@ -1,9 +1,9 @@ import type { ReferenceObject, SchemaObject } from 'openapi3-ts/oas30'; -import { getEnum, getEnumDescriptions, getEnumNames } from '../getters/enum'; -import type { ContextSpecs, ResolverValue } from '../types'; -import { jsDoc } from '../utils'; -import { resolveValue } from './value'; +import { getEnum, getEnumDescriptions, getEnumNames } from '../getters/enum.ts'; +import type { ContextSpecs, ResolverValue } from '../types.ts'; +import { jsDoc } from '../utils/index.ts'; +import { resolveValue } from './value.ts'; const resolveObjectOriginal = ({ schema, diff --git a/packages/core/src/resolvers/ref.ts b/packages/core/src/resolvers/ref.ts index 40ff0b3c5..468f8865f 100644 --- a/packages/core/src/resolvers/ref.ts +++ b/packages/core/src/resolvers/ref.ts @@ -7,9 +7,9 @@ import type { SchemaObject, } from 'openapi3-ts/oas30'; -import { getRefInfo, type RefInfo } from '../getters/ref'; -import type { ContextSpecs, GeneratorImport } from '../types'; -import { isReference } from '../utils'; +import { getRefInfo, type RefInfo } from '../getters/ref.ts'; +import type { ContextSpecs, GeneratorImport } from '../types.ts'; +import { isReference } from '../utils/index.ts'; type ComponentObject = | SchemaObject diff --git a/packages/core/src/resolvers/value.ts b/packages/core/src/resolvers/value.ts index 78a2373a6..1c1290327 100644 --- a/packages/core/src/resolvers/value.ts +++ b/packages/core/src/resolvers/value.ts @@ -1,9 +1,9 @@ import type { ReferenceObject, SchemaObject } from 'openapi3-ts/oas30'; -import { getScalar } from '../getters'; -import { type ContextSpecs, type ResolverValue, SchemaType } from '../types'; -import { isReference } from '../utils'; -import { resolveRef } from './ref'; +import { getScalar } from '../getters/index.ts'; +import { type ContextSpecs, type ResolverValue, SchemaType } from '../types.ts'; +import { isReference } from '../utils/index.ts'; +import { resolveRef } from './ref.ts'; export const resolveValue = ({ schema, diff --git a/packages/core/src/utils/assertion.test.ts b/packages/core/src/utils/assertion.test.ts index 5d7416f60..388752d6f 100644 --- a/packages/core/src/utils/assertion.test.ts +++ b/packages/core/src/utils/assertion.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import { isUrl } from './assertion'; +import { isUrl } from './assertion.ts'; describe('assertion testing', () => { it('check for valid URLs', () => { diff --git a/packages/core/src/utils/assertion.ts b/packages/core/src/utils/assertion.ts index 8648cc0a4..261d89f3d 100644 --- a/packages/core/src/utils/assertion.ts +++ b/packages/core/src/utils/assertion.ts @@ -1,7 +1,7 @@ import type { ReferenceObject, SchemaObject } from 'openapi3-ts/oas30'; -import { SchemaType, Verbs } from '../types'; -import { extname } from './path'; +import { SchemaType, Verbs } from '../types.ts'; +import { extname } from './path.ts'; /** * Discriminator helper for `ReferenceObject` diff --git a/packages/core/src/utils/case.test.ts b/packages/core/src/utils/case.test.ts index 069e2b6a0..5d1b063c4 100644 --- a/packages/core/src/utils/case.test.ts +++ b/packages/core/src/utils/case.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest'; -import { camel, pascal } from './case'; -import { kebab } from './case'; +import { camel, pascal } from './case.ts'; +import { kebab } from './case.ts'; describe('pascal case testing', () => { it('should convert to pascal case', () => { diff --git a/packages/core/src/utils/case.ts b/packages/core/src/utils/case.ts index a1e050ce0..def56ccbd 100644 --- a/packages/core/src/utils/case.ts +++ b/packages/core/src/utils/case.ts @@ -1,4 +1,4 @@ -import { NamingConvention } from '../types'; +import { NamingConvention } from '../types.ts'; const unicodes = function (s: string, prefix: string) { prefix = prefix || ''; diff --git a/packages/core/src/utils/doc.ts b/packages/core/src/utils/doc.ts index 7381cb7f4..67933cf96 100644 --- a/packages/core/src/utils/doc.ts +++ b/packages/core/src/utils/doc.ts @@ -1,4 +1,4 @@ -import type { ContextSpecs } from '../types'; +import type { ContextSpecs } from '../types.ts'; const search = String.raw`\*/`; // Find '*/' const replacement = String.raw`*\/`; // Replace With '*\/' diff --git a/packages/core/src/utils/dynamic-import.ts b/packages/core/src/utils/dynamic-import.ts index 49d552d26..a61c391ab 100644 --- a/packages/core/src/utils/dynamic-import.ts +++ b/packages/core/src/utils/dynamic-import.ts @@ -1,7 +1,7 @@ import path from 'node:path'; import { pathToFileURL } from 'node:url'; -import { isModule, isObject, isString } from './assertion'; +import { isModule, isObject, isString } from './assertion.ts'; export const dynamicImport = async ( toImport: T | string, diff --git a/packages/core/src/utils/file-extensions.ts b/packages/core/src/utils/file-extensions.ts index 83c77f67b..ee83c0181 100644 --- a/packages/core/src/utils/file-extensions.ts +++ b/packages/core/src/utils/file-extensions.ts @@ -1,5 +1,5 @@ -import type { ClientMockBuilder, GlobalMockOptions } from '../types'; -import { isFunction } from './assertion'; +import type { ClientMockBuilder, GlobalMockOptions } from '../types.ts'; +import { isFunction } from './assertion.ts'; export const getMockFileExtensionByTypeName = ( mock: GlobalMockOptions | ClientMockBuilder, diff --git a/packages/core/src/utils/file.ts b/packages/core/src/utils/file.ts index 4f0b2324b..e4384b69c 100644 --- a/packages/core/src/utils/file.ts +++ b/packages/core/src/utils/file.ts @@ -3,7 +3,7 @@ import path from 'node:path'; import { globby } from 'globby'; -import { isDirectory } from './assertion'; +import { isDirectory } from './assertion.ts'; export const getFileInfo = ( target = '', diff --git a/packages/core/src/utils/index.ts b/packages/core/src/utils/index.ts index a2afb4b97..6dd194a2d 100644 --- a/packages/core/src/utils/index.ts +++ b/packages/core/src/utils/index.ts @@ -1,22 +1,22 @@ -export * from './assertion'; -export * from './async-reduce'; -export * from './case'; -export * from './compare-version'; -export * from './debug'; -export * from './deep-non-nullable'; -export * from './doc'; -export * from './dynamic-import'; -export * from './extension'; -export * from './file'; -export * from './file-extensions'; -export * from './get-property-safe'; -export * from './is-body-verb'; -export * from './logger'; -export * from './merge-deep'; -export * from './occurrence'; -export * from './open-api-converter'; -export * as upath from './path'; -export * from './sort'; -export * from './string'; -export * from './tsconfig'; -export * from './validator'; +export * from './assertion.ts'; +export * from './async-reduce.ts'; +export * from './case.ts'; +export * from './compare-version.ts'; +export * from './debug.ts'; +export * from './deep-non-nullable.ts'; +export * from './doc.ts'; +export * from './dynamic-import.ts'; +export * from './extension.ts'; +export * from './file.ts'; +export * from './file-extensions.ts'; +export * from './get-property-safe.ts'; +export * from './is-body-verb.ts'; +export * from './logger.ts'; +export * from './merge-deep.ts'; +export * from './occurrence.ts'; +export * from './open-api-converter.ts'; +export * as upath from './path.ts'; +export * from './sort.ts'; +export * from './string.ts'; +export * from './tsconfig.ts'; +export * from './validator.ts'; diff --git a/packages/core/src/utils/is-body-verb.ts b/packages/core/src/utils/is-body-verb.ts index 587cff584..bbb5efb6f 100644 --- a/packages/core/src/utils/is-body-verb.ts +++ b/packages/core/src/utils/is-body-verb.ts @@ -1,4 +1,4 @@ -import { VERBS_WITH_BODY } from '../constants'; -import { Verbs } from '../types'; +import { VERBS_WITH_BODY } from '../constants.ts'; +import { Verbs } from '../types.ts'; export const getIsBodyVerb = (verb: Verbs) => VERBS_WITH_BODY.includes(verb); diff --git a/packages/core/src/utils/open-api-converter.ts b/packages/core/src/utils/open-api-converter.ts index b2eddd4c0..b9fc5cc01 100644 --- a/packages/core/src/utils/open-api-converter.ts +++ b/packages/core/src/utils/open-api-converter.ts @@ -2,7 +2,7 @@ import chalk from 'chalk'; import type { OpenAPIObject } from 'openapi3-ts/oas30'; import { type ConvertInputOptions, convertObj } from 'swagger2openapi'; -import { log } from './logger'; +import { log } from './logger.ts'; export const openApiConverter = async ( schema: any, diff --git a/packages/core/src/utils/path.ts b/packages/core/src/utils/path.ts index 7007df566..dab27f6a9 100644 --- a/packages/core/src/utils/path.ts +++ b/packages/core/src/utils/path.ts @@ -1,8 +1,8 @@ import basepath from 'node:path'; -import { isUrl } from './assertion'; -import { getExtension } from './extension'; -import { getFileInfo } from './file'; +import { isUrl } from './assertion.ts'; +import { getExtension } from './extension.ts'; +import { getFileInfo } from './file.ts'; // override path to support windows paths // https://github.com/anodynos/upath/blob/master/source/code/upath.coffee diff --git a/packages/core/src/utils/string.ts b/packages/core/src/utils/string.ts index 224b64933..00094ef85 100644 --- a/packages/core/src/utils/string.ts +++ b/packages/core/src/utils/string.ts @@ -7,7 +7,7 @@ import { isNumber, isString, isUndefined, -} from './assertion'; +} from './assertion.ts'; export const stringify = ( data?: string | any[] | Record, diff --git a/packages/core/src/utils/tsconfig.ts b/packages/core/src/utils/tsconfig.ts index 7bb603fa4..e1e391042 100644 --- a/packages/core/src/utils/tsconfig.ts +++ b/packages/core/src/utils/tsconfig.ts @@ -1,4 +1,4 @@ -import type { Tsconfig } from '../types'; +import type { Tsconfig } from '../types.ts'; export const isSyntheticDefaultImportsAllow = (config?: Tsconfig) => { if (!config) { diff --git a/packages/core/src/utils/validator.ts b/packages/core/src/utils/validator.ts index 14ac7447a..0fc0e5f9a 100644 --- a/packages/core/src/utils/validator.ts +++ b/packages/core/src/utils/validator.ts @@ -6,7 +6,7 @@ import type { OpenAPIObject } from 'openapi3-ts/oas30'; import { ibmOpenapiValidatorErrors, ibmOpenapiValidatorWarnings, -} from './logger'; +} from './logger.ts'; /** * Validate the spec with ibm-openapi-validator (with a custom pretty logger). diff --git a/packages/core/src/writers/generate-imports-for-builder.ts b/packages/core/src/writers/generate-imports-for-builder.ts index e9d6485c5..0e7dc00e0 100644 --- a/packages/core/src/writers/generate-imports-for-builder.ts +++ b/packages/core/src/writers/generate-imports-for-builder.ts @@ -1,7 +1,7 @@ import { uniqueBy } from 'remeda'; -import type { GeneratorImport, NormalizedOutputOptions } from '../types'; -import { conventionName, upath } from '../utils'; +import type { GeneratorImport, NormalizedOutputOptions } from '../types.ts'; +import { conventionName, upath } from '../utils/index.ts'; export const generateImportsForBuilder = ( output: NormalizedOutputOptions, diff --git a/packages/core/src/writers/index.ts b/packages/core/src/writers/index.ts index 1b378f732..f78a720be 100644 --- a/packages/core/src/writers/index.ts +++ b/packages/core/src/writers/index.ts @@ -1,8 +1,8 @@ -export * from './schemas'; -export * from './single-mode'; -export * from './split-mode'; -export * from './split-tags-mode'; -export * from './tags-mode'; -export * from './target'; -export * from './target-tags'; -export * from './types'; +export * from './schemas.ts'; +export * from './single-mode.ts'; +export * from './split-mode.ts'; +export * from './split-tags-mode.ts'; +export * from './tags-mode.ts'; +export * from './target.ts'; +export * from './target-tags.ts'; +export * from './types.ts'; diff --git a/packages/core/src/writers/schemas.ts b/packages/core/src/writers/schemas.ts index 81dddf961..f6c635cd0 100644 --- a/packages/core/src/writers/schemas.ts +++ b/packages/core/src/writers/schemas.ts @@ -1,8 +1,8 @@ import fs from 'fs-extra'; -import { generateImports } from '../generators'; -import { type GeneratorSchema, NamingConvention } from '../types'; -import { conventionName, upath } from '../utils'; +import { generateImports } from '../generators/index.ts'; +import { type GeneratorSchema, NamingConvention } from '../types.ts'; +import { conventionName, upath } from '../utils/index.ts'; const getSchema = ({ schema: { imports, model }, diff --git a/packages/core/src/writers/single-mode.ts b/packages/core/src/writers/single-mode.ts index 84b8885ee..7655170fd 100644 --- a/packages/core/src/writers/single-mode.ts +++ b/packages/core/src/writers/single-mode.ts @@ -1,17 +1,20 @@ import fs from 'fs-extra'; -import { generateModelsInline, generateMutatorImports } from '../generators'; -import type { WriteModeProps } from '../types'; +import { + generateModelsInline, + generateMutatorImports, +} from '../generators/index.ts'; +import type { WriteModeProps } from '../types.ts'; import { conventionName, getFileInfo, isFunction, isSyntheticDefaultImportsAllow, upath, -} from '../utils'; -import { generateImportsForBuilder } from './generate-imports-for-builder'; -import { generateTarget } from './target'; -import { getOrvalGeneratedTypes, getTypedResponse } from './types'; +} from '../utils/index.ts'; +import { generateImportsForBuilder } from './generate-imports-for-builder.ts'; +import { generateTarget } from './target.ts'; +import { getOrvalGeneratedTypes, getTypedResponse } from './types.ts'; export const writeSingleMode = async ({ builder, diff --git a/packages/core/src/writers/split-mode.ts b/packages/core/src/writers/split-mode.ts index 5b69c65d6..a000eb0d6 100644 --- a/packages/core/src/writers/split-mode.ts +++ b/packages/core/src/writers/split-mode.ts @@ -1,18 +1,21 @@ import fs from 'fs-extra'; -import { generateModelsInline, generateMutatorImports } from '../generators'; -import { OutputClient, type WriteModeProps } from '../types'; +import { + generateModelsInline, + generateMutatorImports, +} from '../generators/index.ts'; +import { OutputClient, type WriteModeProps } from '../types.ts'; +import { getMockFileExtensionByTypeName } from '../utils/file-extensions.ts'; import { conventionName, getFileInfo, isFunction, isSyntheticDefaultImportsAllow, upath, -} from '../utils'; -import { getMockFileExtensionByTypeName } from '../utils/file-extensions'; -import { generateImportsForBuilder } from './generate-imports-for-builder'; -import { generateTarget } from './target'; -import { getOrvalGeneratedTypes, getTypedResponse } from './types'; +} from '../utils/index.ts'; +import { generateImportsForBuilder } from './generate-imports-for-builder.ts'; +import { generateTarget } from './target.ts'; +import { getOrvalGeneratedTypes, getTypedResponse } from './types.ts'; export const writeSplitMode = async ({ builder, diff --git a/packages/core/src/writers/split-tags-mode.ts b/packages/core/src/writers/split-tags-mode.ts index a523e2c80..cb37191e5 100644 --- a/packages/core/src/writers/split-tags-mode.ts +++ b/packages/core/src/writers/split-tags-mode.ts @@ -1,7 +1,11 @@ import fs from 'fs-extra'; -import { generateModelsInline, generateMutatorImports } from '../generators'; -import { OutputClient, type WriteModeProps } from '../types'; +import { + generateModelsInline, + generateMutatorImports, +} from '../generators/index.ts'; +import { OutputClient, type WriteModeProps } from '../types.ts'; +import { getMockFileExtensionByTypeName } from '../utils/file-extensions.ts'; import { camel, getFileInfo, @@ -9,11 +13,10 @@ import { isSyntheticDefaultImportsAllow, pascal, upath, -} from '../utils'; -import { getMockFileExtensionByTypeName } from '../utils/file-extensions'; -import { generateImportsForBuilder } from './generate-imports-for-builder'; -import { generateTargetForTags } from './target-tags'; -import { getOrvalGeneratedTypes, getTypedResponse } from './types'; +} from '../utils/index.ts'; +import { generateImportsForBuilder } from './generate-imports-for-builder.ts'; +import { generateTargetForTags } from './target-tags.ts'; +import { getOrvalGeneratedTypes, getTypedResponse } from './types.ts'; export const writeSplitTagsMode = async ({ builder, diff --git a/packages/core/src/writers/tags-mode.ts b/packages/core/src/writers/tags-mode.ts index e7d582024..7c63f1a4b 100644 --- a/packages/core/src/writers/tags-mode.ts +++ b/packages/core/src/writers/tags-mode.ts @@ -1,7 +1,10 @@ import fs from 'fs-extra'; -import { generateModelsInline, generateMutatorImports } from '../generators'; -import type { WriteModeProps } from '../types'; +import { + generateModelsInline, + generateMutatorImports, +} from '../generators/index.ts'; +import type { WriteModeProps } from '../types.ts'; import { camel, getFileInfo, @@ -9,10 +12,10 @@ import { isSyntheticDefaultImportsAllow, kebab, upath, -} from '../utils'; -import { generateImportsForBuilder } from './generate-imports-for-builder'; -import { generateTargetForTags } from './target-tags'; -import { getOrvalGeneratedTypes, getTypedResponse } from './types'; +} from '../utils/index.ts'; +import { generateImportsForBuilder } from './generate-imports-for-builder.ts'; +import { generateTargetForTags } from './target-tags.ts'; +import { getOrvalGeneratedTypes, getTypedResponse } from './types.ts'; export const writeTagsMode = async ({ builder, diff --git a/packages/core/src/writers/target-tags.ts b/packages/core/src/writers/target-tags.ts index 45b35dc36..15d5ebfa4 100644 --- a/packages/core/src/writers/target-tags.ts +++ b/packages/core/src/writers/target-tags.ts @@ -5,8 +5,8 @@ import { type NormalizedOutputOptions, OutputClient, type WriteSpecsBuilder, -} from '../types'; -import { compareVersions, kebab, pascal } from '../utils'; +} from '../types.ts'; +import { compareVersions, kebab, pascal } from '../utils/index.ts'; const addDefaultTagIfEmpty = (operation: GeneratorOperation) => ({ ...operation, diff --git a/packages/core/src/writers/target.ts b/packages/core/src/writers/target.ts index aaed8b843..117864742 100644 --- a/packages/core/src/writers/target.ts +++ b/packages/core/src/writers/target.ts @@ -4,8 +4,8 @@ import { type NormalizedOutputOptions, OutputClient, type WriteSpecsBuilder, -} from '../types'; -import { compareVersions, pascal } from '../utils'; +} from '../types.ts'; +import { compareVersions, pascal } from '../utils/index.ts'; export const generateTarget = ( builder: WriteSpecsBuilder, diff --git a/packages/core/tsdown.config.ts b/packages/core/tsdown.config.ts index 0bc3d7780..b44ce16a6 100644 --- a/packages/core/tsdown.config.ts +++ b/packages/core/tsdown.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from 'tsdown'; -import { baseConfig } from '../tsdown.base'; +import { baseConfig } from '../tsdown.base.ts'; export default defineConfig(baseConfig); diff --git a/packages/fetch/tsdown.config.ts b/packages/fetch/tsdown.config.ts index 0bc3d7780..b44ce16a6 100644 --- a/packages/fetch/tsdown.config.ts +++ b/packages/fetch/tsdown.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from 'tsdown'; -import { baseConfig } from '../tsdown.base'; +import { baseConfig } from '../tsdown.base.ts'; export default defineConfig(baseConfig); diff --git a/packages/hono/src/index.ts b/packages/hono/src/index.ts index 6ceaf4fb2..af8d00292 100644 --- a/packages/hono/src/index.ts +++ b/packages/hono/src/index.ts @@ -25,7 +25,7 @@ import { generateZod } from '@orval/zod'; import fs from 'fs-extra'; import { type InfoObject } from 'openapi3-ts/oas30'; -import { getRoute } from './route'; +import { getRoute } from './route.ts'; const ZVALIDATOR_SOURCE = fs .readFileSync(upath.join(import.meta.dirname, 'zValidator.ts')) diff --git a/packages/hono/tsdown.config.ts b/packages/hono/tsdown.config.ts index cfed198c6..3c3e1481d 100644 --- a/packages/hono/tsdown.config.ts +++ b/packages/hono/tsdown.config.ts @@ -1,6 +1,6 @@ import { defineConfig } from 'tsdown'; -import { baseConfig } from '../tsdown.base'; +import { baseConfig } from '../tsdown.base.ts'; export default defineConfig({ ...baseConfig, diff --git a/packages/mcp/tsdown.config.ts b/packages/mcp/tsdown.config.ts index 0bc3d7780..b44ce16a6 100644 --- a/packages/mcp/tsdown.config.ts +++ b/packages/mcp/tsdown.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from 'tsdown'; -import { baseConfig } from '../tsdown.base'; +import { baseConfig } from '../tsdown.base.ts'; export default defineConfig(baseConfig); diff --git a/packages/mock/src/faker/compatible-v9.test.ts b/packages/mock/src/faker/compatible-v9.test.ts index 808f0029d..8cd92f0aa 100644 --- a/packages/mock/src/faker/compatible-v9.test.ts +++ b/packages/mock/src/faker/compatible-v9.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import { isFakerVersionV9 } from './compatible-v9'; +import { isFakerVersionV9 } from './compatible-v9.ts'; describe('isFakerVersionV9', () => { it('should return false when faker is not in package.json', () => { diff --git a/packages/mock/src/faker/getters/combine.ts b/packages/mock/src/faker/getters/combine.ts index 8041b5281..f727e6a6f 100644 --- a/packages/mock/src/faker/getters/combine.ts +++ b/packages/mock/src/faker/getters/combine.ts @@ -7,8 +7,8 @@ import { pascal, } from '@orval/core'; -import type { MockDefinition, MockSchemaObject } from '../../types'; -import { resolveMockValue } from '../resolvers'; +import type { MockDefinition, MockSchemaObject } from '../../types.ts'; +import { resolveMockValue } from '../resolvers/index.ts'; export const combineSchemasMock = ({ item, diff --git a/packages/mock/src/faker/getters/index.ts b/packages/mock/src/faker/getters/index.ts index b766499b4..ee3bfe9d1 100644 --- a/packages/mock/src/faker/getters/index.ts +++ b/packages/mock/src/faker/getters/index.ts @@ -1,4 +1,4 @@ -export * from './combine'; -export * from './object'; -export * from './route'; -export * from './scalar'; +export * from './combine.ts'; +export * from './object.ts'; +export * from './route.ts'; +export * from './scalar.ts'; diff --git a/packages/mock/src/faker/getters/object.ts b/packages/mock/src/faker/getters/object.ts index c246e575c..3a6773f4d 100644 --- a/packages/mock/src/faker/getters/object.ts +++ b/packages/mock/src/faker/getters/object.ts @@ -10,10 +10,10 @@ import { } from '@orval/core'; import type { ReferenceObject, SchemaObject } from 'openapi3-ts/oas30'; -import type { MockDefinition, MockSchemaObject } from '../../types'; -import { DEFAULT_OBJECT_KEY_MOCK } from '../constants'; -import { resolveMockValue } from '../resolvers/value'; -import { combineSchemasMock } from './combine'; +import type { MockDefinition, MockSchemaObject } from '../../types.ts'; +import { DEFAULT_OBJECT_KEY_MOCK } from '../constants.ts'; +import { resolveMockValue } from '../resolvers/value.ts'; +import { combineSchemasMock } from './combine.ts'; export const overrideVarName = 'overrideResponse'; diff --git a/packages/mock/src/faker/getters/route.test.ts b/packages/mock/src/faker/getters/route.test.ts index 14ea4806f..9b728df59 100644 --- a/packages/mock/src/faker/getters/route.test.ts +++ b/packages/mock/src/faker/getters/route.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import { getRouteMSW } from './route'; +import { getRouteMSW } from './route.ts'; describe('getRoute getter', () => { for (const [input, expected] of [ diff --git a/packages/mock/src/faker/getters/scalar.test.ts b/packages/mock/src/faker/getters/scalar.test.ts index 286e848cc..2805e4588 100644 --- a/packages/mock/src/faker/getters/scalar.test.ts +++ b/packages/mock/src/faker/getters/scalar.test.ts @@ -2,7 +2,7 @@ import type { ContextSpecs } from '@orval/core'; import type { SchemaObjectType } from 'openapi3-ts/oas30'; import { describe, expect, it } from 'vitest'; -import { getMockScalar } from './scalar'; +import { getMockScalar } from './scalar.ts'; describe('getMockScalar (int64 format handling)', () => { const baseArg = { diff --git a/packages/mock/src/faker/getters/scalar.ts b/packages/mock/src/faker/getters/scalar.ts index b9129a209..66d09cb9b 100644 --- a/packages/mock/src/faker/getters/scalar.ts +++ b/packages/mock/src/faker/getters/scalar.ts @@ -10,15 +10,15 @@ import { } from '@orval/core'; import type { SchemaObject as SchemaObject31 } from 'openapi3-ts/oas31'; -import type { MockDefinition, MockSchemaObject } from '../../types'; -import { isFakerVersionV9 } from '../compatible-v9'; -import { DEFAULT_FORMAT_MOCK } from '../constants'; +import type { MockDefinition, MockSchemaObject } from '../../types.ts'; +import { isFakerVersionV9 } from '../compatible-v9.ts'; +import { DEFAULT_FORMAT_MOCK } from '../constants.ts'; import { getNullable, resolveMockOverride, resolveMockValue, -} from '../resolvers'; -import { getMockObject } from './object'; +} from '../resolvers/index.ts'; +import { getMockObject } from './object.ts'; export const getMockScalar = ({ item, diff --git a/packages/mock/src/faker/resolvers/index.ts b/packages/mock/src/faker/resolvers/index.ts index 937b73fd1..53662ca56 100644 --- a/packages/mock/src/faker/resolvers/index.ts +++ b/packages/mock/src/faker/resolvers/index.ts @@ -1 +1 @@ -export * from './value'; +export * from './value.ts'; diff --git a/packages/mock/src/faker/resolvers/value.ts b/packages/mock/src/faker/resolvers/value.ts index 30ffb88ed..ddf7c72dd 100644 --- a/packages/mock/src/faker/resolvers/value.ts +++ b/packages/mock/src/faker/resolvers/value.ts @@ -10,9 +10,9 @@ import { import type { SchemaObject } from 'openapi3-ts/oas30'; import { prop } from 'remeda'; -import type { MockDefinition, MockSchemaObject } from '../../types'; -import { overrideVarName } from '../getters'; -import { getMockScalar } from '../getters/scalar'; +import type { MockDefinition, MockSchemaObject } from '../../types.ts'; +import { overrideVarName } from '../getters/index.ts'; +import { getMockScalar } from '../getters/scalar.ts'; const isRegex = (key: string) => key.startsWith('/') && key.endsWith('/'); diff --git a/packages/mock/src/index.ts b/packages/mock/src/index.ts index cb883b814..2e71c30c6 100644 --- a/packages/mock/src/index.ts +++ b/packages/mock/src/index.ts @@ -5,7 +5,7 @@ import type { GlobalMockOptions, } from '@orval/core'; -import { generateMSW, generateMSWImports } from './msw'; +import { generateMSW, generateMSWImports } from './msw/index.ts'; export const DEFAULT_MOCK_OPTIONS: GlobalMockOptions = { type: 'msw', diff --git a/packages/mock/src/msw/index.ts b/packages/mock/src/msw/index.ts index 5b19917e1..3ac8ff173 100644 --- a/packages/mock/src/msw/index.ts +++ b/packages/mock/src/msw/index.ts @@ -13,9 +13,9 @@ import { type ResReqTypesValue, } from '@orval/core'; -import { getDelay } from '../delay'; -import { getRouteMSW, overrideVarName } from '../faker/getters'; -import { getMockDefinition, getMockOptionsDataOverride } from './mocks'; +import { getDelay } from '../delay.ts'; +import { getRouteMSW, overrideVarName } from '../faker/getters/index.ts'; +import { getMockDefinition, getMockOptionsDataOverride } from './mocks.ts'; const getMSWDependencies = ( options?: GlobalMockOptions, diff --git a/packages/mock/src/msw/mocks.ts b/packages/mock/src/msw/mocks.ts index 1971cad5f..07e675b34 100644 --- a/packages/mock/src/msw/mocks.ts +++ b/packages/mock/src/msw/mocks.ts @@ -12,7 +12,7 @@ import { } from '@orval/core'; import type { OpenAPIObject, SchemaObject } from 'openapi3-ts/oas30'; -import { getMockScalar } from '../faker/getters'; +import { getMockScalar } from '../faker/getters/index.ts'; const getMockPropertiesWithoutFunc = (properties: any, spec: OpenAPIObject) => Object.entries(isFunction(properties) ? properties(spec) : properties).reduce< diff --git a/packages/mock/tsdown.config.ts b/packages/mock/tsdown.config.ts index 0bc3d7780..b44ce16a6 100644 --- a/packages/mock/tsdown.config.ts +++ b/packages/mock/tsdown.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from 'tsdown'; -import { baseConfig } from '../tsdown.base'; +import { baseConfig } from '../tsdown.base.ts'; export default defineConfig(baseConfig); diff --git a/packages/orval/src/api.ts b/packages/orval/src/api.ts index 1dbd43a38..776d28a30 100644 --- a/packages/orval/src/api.ts +++ b/packages/orval/src/api.ts @@ -23,7 +23,7 @@ import { generateClientTitle, generateExtraFiles, generateOperations, -} from './client'; +} from './client.ts'; export const getApiBuilder = async ({ input, diff --git a/packages/orval/src/bin/orval.ts b/packages/orval/src/bin/orval.ts index 6f84c7867..2d8667016 100644 --- a/packages/orval/src/bin/orval.ts +++ b/packages/orval/src/bin/orval.ts @@ -12,11 +12,11 @@ import { startMessage, } from '@orval/core'; -import pkg from '../../package.json'; -import { generateSpec } from '../generate-spec'; -import { findConfigFile, loadConfigFile } from '../utils/config'; -import { normalizeOptions } from '../utils/options'; -import { startWatcher } from '../utils/watcher'; +import pkg from '../../package.json' with { type: 'json' }; +import { generateSpec } from '../generate-spec.ts'; +import { findConfigFile, loadConfigFile } from '../utils/config.ts'; +import { normalizeOptions } from '../utils/options.ts'; +import { startWatcher } from '../utils/watcher.ts'; const orvalMessage = startMessage({ name: pkg.name, diff --git a/packages/orval/src/generate-spec.ts b/packages/orval/src/generate-spec.ts index d28422349..d639abfad 100644 --- a/packages/orval/src/generate-spec.ts +++ b/packages/orval/src/generate-spec.ts @@ -5,8 +5,8 @@ import { removeFilesAndEmptyFolders, } from '@orval/core'; -import { importSpecs } from './import-specs'; -import { writeSpecs } from './write-specs'; +import { importSpecs } from './import-specs.ts'; +import { writeSpecs } from './write-specs.ts'; /** * Generate client/spec files for a single Orval project. diff --git a/packages/orval/src/generate.ts b/packages/orval/src/generate.ts index fb3b404c6..e84c5efa4 100644 --- a/packages/orval/src/generate.ts +++ b/packages/orval/src/generate.ts @@ -5,10 +5,10 @@ import { type OptionsExport, } from '@orval/core'; -import { generateSpec } from './generate-spec'; -import { findConfigFile, loadConfigFile } from './utils/config'; -import { normalizeOptions } from './utils/options'; -import { startWatcher } from './utils/watcher'; +import { generateSpec } from './generate-spec.ts'; +import { findConfigFile, loadConfigFile } from './utils/config.ts'; +import { normalizeOptions } from './utils/options.ts'; +import { startWatcher } from './utils/watcher.ts'; export async function generate( optionsExport?: string | OptionsExport, diff --git a/packages/orval/src/import-open-api.ts b/packages/orval/src/import-open-api.ts index d52524398..495f9631b 100644 --- a/packages/orval/src/import-open-api.ts +++ b/packages/orval/src/import-open-api.ts @@ -20,7 +20,7 @@ import { import type { JSONSchema6, JSONSchema7 } from 'json-schema'; import type { OpenAPIObject, SchemasObject } from 'openapi3-ts/oas30'; -import { getApiBuilder } from './api'; +import { getApiBuilder } from './api.ts'; export const importOpenApi = async ({ data, diff --git a/packages/orval/src/import-specs.ts b/packages/orval/src/import-specs.ts index a8f9abd71..b43347f4c 100644 --- a/packages/orval/src/import-specs.ts +++ b/packages/orval/src/import-specs.ts @@ -12,7 +12,7 @@ import chalk from 'chalk'; import fs from 'fs-extra'; import yaml from 'js-yaml'; -import { importOpenApi } from './import-open-api'; +import { importOpenApi } from './import-open-api.ts'; const resolveSpecs = async ( path: string, diff --git a/packages/orval/src/index.ts b/packages/orval/src/index.ts index e81be90b6..ab0afd976 100644 --- a/packages/orval/src/index.ts +++ b/packages/orval/src/index.ts @@ -1,4 +1,4 @@ -export { generate as default, generate } from './generate'; -export { defineConfig } from './utils/options'; +export { generate as default, generate } from './generate.ts'; +export { defineConfig } from './utils/options.ts'; export type { Options } from '@orval/core'; export * from '@orval/core'; diff --git a/packages/orval/src/utils/github.ts b/packages/orval/src/utils/github.ts index 6348399ba..86828a8d2 100644 --- a/packages/orval/src/utils/github.ts +++ b/packages/orval/src/utils/github.ts @@ -5,7 +5,7 @@ import { upath } from '@orval/core'; import enquirer from 'enquirer'; import fs from 'fs-extra'; -import { request } from './request'; +import { request } from './request.ts'; export const getGithubSpecReq = ({ accessToken, diff --git a/packages/orval/src/utils/index.ts b/packages/orval/src/utils/index.ts index f29d2f9de..a2419fae8 100644 --- a/packages/orval/src/utils/index.ts +++ b/packages/orval/src/utils/index.ts @@ -1,7 +1,7 @@ -export * from './execute-hook'; -export * from './github'; -export * from './options'; -export * from './package-json'; -export * from './request'; -export * from './tsconfig'; -export * from './watcher'; +export * from './execute-hook.ts'; +export * from './github.ts'; +export * from './options.ts'; +export * from './package-json.ts'; +export * from './request.ts'; +export * from './tsconfig.ts'; +export * from './watcher.ts'; diff --git a/packages/orval/src/utils/options.ts b/packages/orval/src/utils/options.ts index b967bf3b2..0e64fca75 100644 --- a/packages/orval/src/utils/options.ts +++ b/packages/orval/src/utils/options.ts @@ -43,11 +43,11 @@ import { import { DEFAULT_MOCK_OPTIONS } from '@orval/mock'; import chalk from 'chalk'; -import pkg from '../../package.json'; -import { githubResolver } from './github'; -import { httpResolver } from './http-resolver'; -import { loadPackageJson } from './package-json'; -import { loadTsconfig } from './tsconfig'; +import pkg from '../../package.json' with { type: 'json' }; +import { githubResolver } from './github.ts'; +import { httpResolver } from './http-resolver.ts'; +import { loadPackageJson } from './package-json.ts'; +import { loadTsconfig } from './tsconfig.ts'; /** * Type helper to make it easier to use orval.config.ts diff --git a/packages/orval/src/utils/package-json.ts b/packages/orval/src/utils/package-json.ts index d60dd3000..0bca6e020 100644 --- a/packages/orval/src/utils/package-json.ts +++ b/packages/orval/src/utils/package-json.ts @@ -4,7 +4,7 @@ import { findUp } from 'find-up'; import fs from 'fs-extra'; import yaml from 'js-yaml'; -import { normalizePath } from './options'; +import { normalizePath } from './options.ts'; export const loadPackageJson = async ( packageJson?: string, diff --git a/packages/orval/src/utils/tsconfig.ts b/packages/orval/src/utils/tsconfig.ts index d8bbb088d..c516e152c 100644 --- a/packages/orval/src/utils/tsconfig.ts +++ b/packages/orval/src/utils/tsconfig.ts @@ -3,7 +3,7 @@ import { findUp } from 'find-up'; import fs from 'fs-extra'; import { parse } from 'tsconfck'; -import { normalizePath } from './options'; +import { normalizePath } from './options.ts'; export const loadTsconfig = async ( tsconfig?: Tsconfig | string, diff --git a/packages/orval/src/write-specs.ts b/packages/orval/src/write-specs.ts index 199f835ab..75f8726bd 100644 --- a/packages/orval/src/write-specs.ts +++ b/packages/orval/src/write-specs.ts @@ -22,7 +22,7 @@ import type { InfoObject } from 'openapi3-ts/oas30'; import { unique } from 'remeda'; import type { TypeDocOptions } from 'typedoc'; -import { executeHook } from './utils'; +import { executeHook } from './utils/index.ts'; const getHeader = ( option: false | ((info: InfoObject) => string | string[]), diff --git a/packages/orval/tsdown.config.ts b/packages/orval/tsdown.config.ts index fece5c14f..34b661e3c 100644 --- a/packages/orval/tsdown.config.ts +++ b/packages/orval/tsdown.config.ts @@ -1,6 +1,6 @@ import { defineConfig } from 'tsdown'; -import { baseConfig } from '../tsdown.base'; +import { baseConfig } from '../tsdown.base.ts'; export default defineConfig({ ...baseConfig, diff --git a/packages/query/src/client.ts b/packages/query/src/client.ts index 01c3332fb..b0de630c8 100644 --- a/packages/query/src/client.ts +++ b/packages/query/src/client.ts @@ -24,7 +24,7 @@ import { makeRouteSafe, vueUnRefParams, vueWrapTypeWithMaybeRef, -} from './utils'; +} from './utils.ts'; export const AXIOS_DEPENDENCIES: GeneratorDependency[] = [ { diff --git a/packages/query/src/index.test.ts b/packages/query/src/index.test.ts index 5dbb963a8..a19aa8e64 100644 --- a/packages/query/src/index.test.ts +++ b/packages/query/src/index.test.ts @@ -5,7 +5,7 @@ import type { } from '@orval/core'; import { describe, expect, it } from 'vitest'; -import { builder } from './index'; +import { builder } from './index.ts'; describe('throws when trying to use named parameters with vue-query client', () => { it('vue-query builder type', () => { diff --git a/packages/query/src/index.ts b/packages/query/src/index.ts index 276e90b9e..da44b94a3 100644 --- a/packages/query/src/index.ts +++ b/packages/query/src/index.ts @@ -44,14 +44,14 @@ import { getQueryErrorType, getQueryHeader, getQueryOptions, -} from './client'; +} from './client.ts'; import { getHasSignal, isVue, normalizeQueryOptions, vueUnRefParams, vueWrapTypeWithMaybeRef, -} from './utils'; +} from './utils.ts'; const REACT_DEPENDENCIES: GeneratorDependency[] = [ { diff --git a/packages/query/src/utils.test.ts b/packages/query/src/utils.test.ts index 082ea7784..78154ed24 100644 --- a/packages/query/src/utils.test.ts +++ b/packages/query/src/utils.test.ts @@ -4,7 +4,7 @@ import { makeRouteSafe, normalizeQueryOptions, wrapRouteParameters, -} from './utils'; +} from './utils.ts'; describe('wrapRouteParameters', () => { it('wraps parameters correctly', () => { diff --git a/packages/query/tsdown.config.ts b/packages/query/tsdown.config.ts index 0bc3d7780..b44ce16a6 100644 --- a/packages/query/tsdown.config.ts +++ b/packages/query/tsdown.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from 'tsdown'; -import { baseConfig } from '../tsdown.base'; +import { baseConfig } from '../tsdown.base.ts'; export default defineConfig(baseConfig); diff --git a/packages/swr/src/index.ts b/packages/swr/src/index.ts index 3c9e6e596..820cacf12 100644 --- a/packages/swr/src/index.ts +++ b/packages/swr/src/index.ts @@ -33,7 +33,7 @@ import { getSwrMutationFetcherType, getSwrRequestOptions, getSwrRequestSecondArg, -} from './client'; +} from './client.ts'; const PARAMS_SERIALIZER_DEPENDENCIES: GeneratorDependency[] = [ { diff --git a/packages/swr/tsdown.config.ts b/packages/swr/tsdown.config.ts index 0bc3d7780..b44ce16a6 100644 --- a/packages/swr/tsdown.config.ts +++ b/packages/swr/tsdown.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from 'tsdown'; -import { baseConfig } from '../tsdown.base'; +import { baseConfig } from '../tsdown.base.ts'; export default defineConfig(baseConfig); diff --git a/packages/zod/src/compatible-v4.test.ts b/packages/zod/src/compatible-v4.test.ts index 8cd00754f..2d9417475 100644 --- a/packages/zod/src/compatible-v4.test.ts +++ b/packages/zod/src/compatible-v4.test.ts @@ -7,7 +7,7 @@ import { getZodDateTimeFormat, getZodTimeFormat, isZodVersionV4, -} from './compatible-v4'; +} from './compatible-v4.ts'; describe('isZodVersionV4', () => { it('should return false when zod is not in package.json', () => { diff --git a/packages/zod/src/index.ts b/packages/zod/src/index.ts index e0c3ff17a..684157e1a 100644 --- a/packages/zod/src/index.ts +++ b/packages/zod/src/index.ts @@ -39,7 +39,7 @@ import { getZodDateTimeFormat, getZodTimeFormat, isZodVersionV4, -} from './compatible-v4'; +} from './compatible-v4.ts'; const ZOD_DEPENDENCIES: GeneratorDependency[] = [ { diff --git a/packages/zod/src/zod.test.ts b/packages/zod/src/zod.test.ts index a7c15537a..56df0966e 100644 --- a/packages/zod/src/zod.test.ts +++ b/packages/zod/src/zod.test.ts @@ -8,7 +8,7 @@ import { generateZodValidationSchemaDefinition, parseZodValidationSchemaDefinition, type ZodValidationSchemaDefinition, -} from '.'; +} from './index.ts'; const queryParams: ZodValidationSchemaDefinition = { functions: [ diff --git a/packages/zod/tsdown.config.ts b/packages/zod/tsdown.config.ts index 0bc3d7780..b44ce16a6 100644 --- a/packages/zod/tsdown.config.ts +++ b/packages/zod/tsdown.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from 'tsdown'; -import { baseConfig } from '../tsdown.base'; +import { baseConfig } from '../tsdown.base.ts'; export default defineConfig(baseConfig); diff --git a/tsconfig.base.json b/tsconfig.base.json index 24b3e28c7..be136eb41 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -20,6 +20,7 @@ "verbatimModuleSyntax": true, "skipLibCheck": true, "preserveWatchOutput": true, - "forceConsistentCasingInFileNames": true + "forceConsistentCasingInFileNames": true, + "allowImportingTsExtensions": true } } From 4e7300fa334f38ec9553ae71bffc5339ac6581f1 Mon Sep 17 00:00:00 2001 From: snebjorn Date: Tue, 11 Nov 2025 21:12:27 +0100 Subject: [PATCH 3/5] give orval.ts chmod +x --- packages/orval/src/bin/orval.ts | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 packages/orval/src/bin/orval.ts diff --git a/packages/orval/src/bin/orval.ts b/packages/orval/src/bin/orval.ts old mode 100644 new mode 100755 From e6cbf74627917f204d7c18b1a14cde05d25f8a74 Mon Sep 17 00:00:00 2001 From: snebjorn Date: Tue, 11 Nov 2025 21:32:53 +0100 Subject: [PATCH 4/5] declarationMap is no longer needed --- tsconfig.base.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tsconfig.base.json b/tsconfig.base.json index be136eb41..c414d8e0b 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -8,19 +8,18 @@ "module": "preserve", "moduleResolution": "bundler", "resolveJsonModule": true, + "allowImportingTsExtensions": true, "types": ["node"], "strict": true, "noUnusedLocals": true, "sourceMap": true, "declaration": true, - "declarationMap": true, "emitDeclarationOnly": true, "esModuleInterop": true, "isolatedModules": true, "verbatimModuleSyntax": true, "skipLibCheck": true, "preserveWatchOutput": true, - "forceConsistentCasingInFileNames": true, - "allowImportingTsExtensions": true + "forceConsistentCasingInFileNames": true } } From f87272765aed55481be5dea3a9b4a228d7695acb Mon Sep 17 00:00:00 2001 From: snebjorn Date: Wed, 12 Nov 2025 22:30:21 +0100 Subject: [PATCH 5/5] fixes type errors when running test:ci --- tests/tsconfig.json | 23 ++++------------------- tsconfig.base.json | 3 +-- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/tests/tsconfig.json b/tests/tsconfig.json index 032c709d7..c8fbe039a 100644 --- a/tests/tsconfig.json +++ b/tests/tsconfig.json @@ -1,24 +1,9 @@ { + "extends": "../tsconfig.base.json", "exclude": ["node_modules", "dist", "__tests__", "**/*.test*", "**/*.spec*"], "compilerOptions": { - "skipLibCheck": true, - "target": "es6", - "module": "preserve", - "lib": ["es2019", "dom", "es2016.array.include", "es2017.object"], - "declaration": true, - "declarationMap": true, - "downlevelIteration": true, - "strict": true, - "noUnusedLocals": true, - "noUnusedParameters": false, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "moduleResolution": "bundler", - "allowSyntheticDefaultImports": true, - "esModuleInterop": true, - "inlineSourceMap": true, - "resolveJsonModule": true, - "experimentalDecorators": true, - "outDir": "./dist" + "lib": ["ESNext", "DOM"], + "verbatimModuleSyntax": false, + "noEmit": true } } diff --git a/tsconfig.base.json b/tsconfig.base.json index c414d8e0b..1ac9263e6 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -3,13 +3,12 @@ "$schema": "https://json.schemastore.org/tsconfig", "compilerOptions": { "target": "esnext", - "lib": ["esnext"], + "lib": ["ESNext"], "moduleDetection": "force", "module": "preserve", "moduleResolution": "bundler", "resolveJsonModule": true, "allowImportingTsExtensions": true, - "types": ["node"], "strict": true, "noUnusedLocals": true, "sourceMap": true,