diff --git a/packages/downgrader/src/v3.1-to-v3.0.test.ts b/packages/downgrader/src/v3.1-to-v3.0.test.ts index b7f7462..76faed0 100644 --- a/packages/downgrader/src/v3.1-to-v3.0.test.ts +++ b/packages/downgrader/src/v3.1-to-v3.0.test.ts @@ -1,4 +1,4 @@ -import type { OpenAPIV3_1 } from '@openapi-spec/types' +import type * as OpenAPIV3_1 from '@openapi-spec/types/v3.1' import { dig } from '../tests/helpers' import { downgradeSchemaV31ToV30, downgradeSpecV31ToV30 } from './v3.1-to-v3.0' diff --git a/packages/downgrader/src/v3.1-to-v3.0.ts b/packages/downgrader/src/v3.1-to-v3.0.ts index 4736ff0..f76b995 100644 --- a/packages/downgrader/src/v3.1-to-v3.0.ts +++ b/packages/downgrader/src/v3.1-to-v3.0.ts @@ -1,4 +1,5 @@ -import type { OpenAPIV3_0, OpenAPIV3_1 } from '@openapi-spec/types' +import type * as OpenAPIV3_0 from '@openapi-spec/types/v3.0' +import type * as OpenAPIV3_1 from '@openapi-spec/types/v3.1' import type { FieldConverter, FieldTable } from './shared' import { diff --git a/packages/downgrader/src/v3.2-to-v3.1.test.ts b/packages/downgrader/src/v3.2-to-v3.1.test.ts index ec73a91..e17a07b 100644 --- a/packages/downgrader/src/v3.2-to-v3.1.test.ts +++ b/packages/downgrader/src/v3.2-to-v3.1.test.ts @@ -1,4 +1,4 @@ -import type { OpenAPIV3_2 } from '@openapi-spec/types' +import type * as OpenAPIV3_2 from '@openapi-spec/types/v3.2' import { dig } from '../tests/helpers' import { downgradeSchemaV32ToV31, downgradeSpecV32ToV31 } from './v3.2-to-v3.1' diff --git a/packages/downgrader/src/v3.2-to-v3.1.ts b/packages/downgrader/src/v3.2-to-v3.1.ts index d2a66a2..5d210cb 100644 --- a/packages/downgrader/src/v3.2-to-v3.1.ts +++ b/packages/downgrader/src/v3.2-to-v3.1.ts @@ -1,4 +1,5 @@ -import type { OpenAPIV3_1, OpenAPIV3_2 } from '@openapi-spec/types' +import type * as OpenAPIV3_1 from '@openapi-spec/types/v3.1' +import type * as OpenAPIV3_2 from '@openapi-spec/types/v3.2' import type { FieldConverter } from './shared' import { diff --git a/packages/downgrader/tests/corpus.test.ts b/packages/downgrader/tests/corpus.test.ts index a4de396..c1f923b 100644 --- a/packages/downgrader/tests/corpus.test.ts +++ b/packages/downgrader/tests/corpus.test.ts @@ -1,4 +1,5 @@ -import type { OpenAPIV3_1, OpenAPIV3_2 } from '@openapi-spec/types' +import type * as OpenAPIV3_1 from '@openapi-spec/types/v3.1' +import type * as OpenAPIV3_2 from '@openapi-spec/types/v3.2' import { doc as exampleQueryV32 } from '../../types/tests/examples/3-2-query-example' import { doc as exampleTagsV32 } from '../../types/tests/examples/3-2-tags-example' diff --git a/packages/downgrader/tests/e2e.test.ts b/packages/downgrader/tests/e2e.test.ts index e88b5d0..e9f38f2 100644 --- a/packages/downgrader/tests/e2e.test.ts +++ b/packages/downgrader/tests/e2e.test.ts @@ -1,4 +1,5 @@ -import type { OpenAPIV3_1, OpenAPIV3_2 } from '@openapi-spec/types' +import type * as OpenAPIV3_1 from '@openapi-spec/types/v3.1' +import type * as OpenAPIV3_2 from '@openapi-spec/types/v3.2' import { doc as queryExample } from '../../types/tests/examples/3-2-query-example' import { doc as tagsExample } from '../../types/tests/examples/3-2-tags-example' diff --git a/packages/types/README.md b/packages/types/README.md index 687a118..43fd7b1 100644 --- a/packages/types/README.md +++ b/packages/types/README.md @@ -31,10 +31,10 @@ Each version module targets the latest patch release of its minor line: ## Usage ```ts -// Every version as a namespace -import type { OpenAPIV3_0, OpenAPIV3_1, OpenAPIV3_2 } from '@openapi-spec/types' +// A whole version as a namespace, handy when mixing versions in one file +import type * as OpenAPIV3_0 from '@openapi-spec/types/v3.0' -// Or one version directly +// Or the types of one version directly import type { OpenAPIObject, SchemaObject } from '@openapi-spec/types/v3.1' const doc: OpenAPIObject = { diff --git a/packages/types/package.json b/packages/types/package.json index 6c49e44..a6cc834 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -30,7 +30,6 @@ "sideEffects": false, "exports": { "./package.json": "./package.json", - ".": "./src/index.ts", "./v3.0": "./src/v3.0.ts", "./v3.1": "./src/v3.1.ts", "./v3.2": "./src/v3.2.ts" @@ -41,11 +40,6 @@ "publishConfig": { "exports": { "./package.json": "./package.json", - ".": { - "types": "./dist/index.d.mts", - "import": "./dist/index.mjs", - "default": "./dist/index.mjs" - }, "./v3.0": { "types": "./dist/v3.0.d.mts", "import": "./dist/v3.0.mjs", diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts deleted file mode 100644 index a182940..0000000 --- a/packages/types/src/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export type * as OpenAPIV3_0 from './v3.0' -export type * as OpenAPIV3_1 from './v3.1' -export type * as OpenAPIV3_2 from './v3.2'