orval-labs · codebutler · Jan 23, 2024 · Jan 23, 2024
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -45,8 +45,7 @@
     "lodash.uniqby": "^4.7.0",
     "lodash.uniqwith": "^4.5.0",
     "micromatch": "^4.0.5",
-    "openapi-types": "^12.1.3",
-    "openapi3-ts": "^3.2.0",
+    "openapi3-ts": "4.2.1",
     "swagger2openapi": "^7.0.8"
   }
 }
diff --git a/packages/core/src/generators/component-definition.ts b/packages/core/src/generators/component-definition.ts
@@ -4,7 +4,7 @@ import {
   ReferenceObject,
   RequestBodyObject,
   ResponseObject,
-} from 'openapi3-ts';
+} from 'openapi3-ts/oas30';
 import { getResReqTypes } from '../getters';
 import { ContextSpecs, GeneratorSchema } from '../types';
 import { jsDoc, pascal, sanitize } from '../utils';

diff --git a/packages/core/src/generators/interface.ts b/packages/core/src/generators/interface.ts
@@ -1,4 +1,4 @@
-import { SchemaObject } from 'openapi3-ts';
+import { SchemaObject } from 'openapi3-ts/oas30';
 import { generalJSTypesWithArray } from '../constants';
 import { getScalar } from '../getters';
 import { ContextSpecs } from '../types';

diff --git a/packages/core/src/generators/parameter-definition.ts b/packages/core/src/generators/parameter-definition.ts
@@ -1,4 +1,4 @@
-import { ComponentsObject, ParameterObject } from 'openapi3-ts';
+import { ComponentsObject, ParameterObject } from 'openapi3-ts/oas30';
 import { resolveObject, resolveRef } from '../resolvers';
 import { ContextSpecs, GeneratorSchema } from '../types';
 import { jsDoc, pascal, sanitize } from '../utils';

diff --git a/packages/core/src/generators/schema-definition.ts b/packages/core/src/generators/schema-definition.ts
@@ -1,5 +1,5 @@
 import isEmpty from 'lodash.isempty';
-import { SchemaObject, SchemasObject } from 'openapi3-ts';
+import { SchemaObject, SchemasObject } from 'openapi3-ts/oas30';
 import { getEnum, resolveDiscriminators } from '../getters';
 import { resolveRef, resolveValue } from '../resolvers';
 import { ContextSpecs, GeneratorSchema } from '../types';

diff --git a/packages/core/src/generators/verbs-options.ts b/packages/core/src/generators/verbs-options.ts
@@ -4,7 +4,7 @@ import {
   ParameterObject,
   PathItemObject,
   ReferenceObject,
-} from 'openapi3-ts';
+} from 'openapi3-ts/oas30';
 import {
   getBody,
   getOperationId,

diff --git a/packages/core/src/getters/array.ts b/packages/core/src/getters/array.ts
@@ -1,4 +1,5 @@
-import { SchemaObject } from 'openapi3-ts';
+import { SchemaObject } from 'openapi3-ts/oas30';
+import { SchemaObject as SchemaObject31 } from 'openapi3-ts/oas31';
 import { ContextSpecs, ScalarValue } from '../types';
 import { resolveObject } from '../resolvers/object';
 import { resolveExampleRefs } from '../resolvers';
@@ -18,6 +19,13 @@ export const getArray = ({
   context: ContextSpecs;
 }): ScalarValue => {
   if (schema.items) {
+    const schema31 = schema as SchemaObject31;
+    if (schema31.prefixItems) {
+      // TODO: https://github.com/anymaniax/orval/issues/890
+      throw new Error(
+        `prefixItems is not supported (name=${name}, schema=${JSON.stringify(schema)})`,
+      );
+    }
     const resolvedObject = resolveObject({
       schema: schema.items,
       propName: name + context.output.override.components.schemas.itemSuffix,
@@ -39,6 +47,8 @@ export const getArray = ({
       examples: resolveExampleRefs(schema.examples, context),
     };
   } else {
-    throw new Error('All arrays must have an `items` key define');
+    throw new Error(
+      `All arrays must have an \`items\` key defined (name=${name}, schema=${JSON.stringify(schema)})`,
+    );
   }
 };
diff --git a/packages/core/src/getters/body.ts b/packages/core/src/getters/body.ts
@@ -1,4 +1,4 @@
-import { ReferenceObject, RequestBodyObject } from 'openapi3-ts';
+import { ReferenceObject, RequestBodyObject } from 'openapi3-ts/oas30';
 import { generalJSTypesWithArray } from '../constants';
 import { ContextSpecs, GetterBody, OverrideOutputContentType } from '../types';
 import { camel, sanitize } from '../utils';

diff --git a/packages/core/src/getters/combine.ts b/packages/core/src/getters/combine.ts
@@ -1,5 +1,5 @@
 import omit from 'lodash.omit';
-import { SchemaObject } from 'openapi3-ts';
+import { SchemaObject } from 'openapi3-ts/oas30';
 import { resolveExampleRefs, resolveObject } from '../resolvers';
 import {
   ContextSpecs,

diff --git a/packages/core/src/getters/discriminators.ts b/packages/core/src/getters/discriminators.ts
@@ -1,4 +1,4 @@
-import { SchemasObject } from 'openapi3-ts';
+import { SchemasObject } from 'openapi3-ts/oas30';
 import { ContextSpecs } from '../types';
 import { getRefInfo } from './ref';
 import { pascal } from '../utils';

diff --git a/packages/core/src/getters/object.ts b/packages/core/src/getters/object.ts
@@ -1,4 +1,4 @@
-import { ReferenceObject, SchemaObject } from 'openapi3-ts';
+import { ReferenceObject, SchemaObject } from 'openapi3-ts/oas30';
 import { resolveExampleRefs, resolveObject, resolveValue } from '../resolvers';
 import { ContextSpecs, ScalarValue, SchemaType } from '../types';
 import { isBoolean, isReference, jsDoc, pascal } from '../utils';

diff --git a/packages/core/src/getters/operation.test.ts b/packages/core/src/getters/operation.test.ts
@@ -1,4 +1,4 @@
-import { OperationObject } from 'openapi3-ts';
+import { OperationObject } from 'openapi3-ts/oas30';
 import { getOperationId } from './operation';
 
 describe('getOperationId getter', () => {

diff --git a/packages/core/src/getters/operation.ts b/packages/core/src/getters/operation.ts
@@ -1,4 +1,4 @@
-import { OperationObject } from 'openapi3-ts';
+import { OperationObject } from 'openapi3-ts/oas30';
 import { Verbs } from '../types';
 import { pascal, sanitize } from '../utils';
 

diff --git a/packages/core/src/getters/parameters.ts b/packages/core/src/getters/parameters.ts
@@ -1,4 +1,4 @@
-import { ParameterObject, ReferenceObject } from 'openapi3-ts';
+import { ParameterObject, ReferenceObject } from 'openapi3-ts/oas30';
 import { resolveRef } from '../resolvers/ref';
 import { ContextSpecs, GetterParameters } from '../types';
 import { isReference } from '../utils';

diff --git a/packages/core/src/getters/query-params.test.ts b/packages/core/src/getters/query-params.test.ts
@@ -1,4 +1,4 @@
-import { ParameterObject } from 'openapi3-ts';
+import { ParameterObject } from 'openapi3-ts/oas30';
 import { describe, expect, it } from 'vitest';
 import { ContextSpecs } from '../types';
 import { getQueryParams } from './query-params';

diff --git a/packages/core/src/getters/query-params.ts b/packages/core/src/getters/query-params.ts
@@ -1,4 +1,4 @@
-import { ContentObject, SchemaObject } from 'openapi3-ts';
+import { ContentObject, SchemaObject } from 'openapi3-ts/oas30';
 import { resolveValue } from '../resolvers';
 import {
   ContextSpecs,

diff --git a/packages/core/src/getters/ref.ts b/packages/core/src/getters/ref.ts
@@ -1,5 +1,5 @@
 import get from 'lodash.get';
-import { ReferenceObject } from 'openapi3-ts';
+import { ReferenceObject } from 'openapi3-ts/oas30';
 import { ContextSpecs } from '../types';
 import { getFileInfo, isUrl, pascal, upath } from '../utils';
 

diff --git a/packages/core/src/getters/res-req-types.ts b/packages/core/src/getters/res-req-types.ts
@@ -6,7 +6,7 @@ import {
   RequestBodyObject,
   ResponseObject,
   SchemaObject,
-} from 'openapi3-ts';
+} from 'openapi3-ts/oas30';
 import { resolveObject } from '../resolvers/object';
 import { resolveExampleRefs, resolveRef } from '../resolvers/ref';
 import { ContextSpecs, ResReqTypesValue } from '../types';

diff --git a/packages/core/src/getters/response.ts b/packages/core/src/getters/response.ts
@@ -1,4 +1,4 @@
-import { ResponsesObject } from 'openapi3-ts';
+import { ResponsesObject } from 'openapi3-ts/oas30';
 import {
   ContextSpecs,
   GetterResponse,

diff --git a/packages/core/src/getters/scalar.ts b/packages/core/src/getters/scalar.ts
@@ -1,4 +1,4 @@
-import { SchemaObject } from 'openapi3-ts';
+import { SchemaObject } from 'openapi3-ts/oas30';
 import { ContextSpecs, ScalarValue } from '../types';
 import { escape, isString } from '../utils';
 import { getArray } from './array';

diff --git a/packages/core/src/resolvers/object.ts b/packages/core/src/resolvers/object.ts
@@ -1,4 +1,4 @@
-import { ReferenceObject, SchemaObject } from 'openapi3-ts';
+import { ReferenceObject, SchemaObject } from 'openapi3-ts/oas30';
 import { getEnum } from '../getters/enum';
 import { ContextSpecs, ResolverValue } from '../types';
 import { jsDoc } from '../utils';

diff --git a/packages/core/src/resolvers/ref.ts b/packages/core/src/resolvers/ref.ts
@@ -6,7 +6,7 @@ import {
   RequestBodyObject,
   ResponseObject,
   SchemaObject,
-} from 'openapi3-ts';
+} from 'openapi3-ts/oas30';
 import { RefInfo, getRefInfo } from '../getters/ref';
 import { ContextSpecs, GeneratorImport } from '../types';
 import { isReference } from '../utils';

diff --git a/packages/core/src/resolvers/value.ts b/packages/core/src/resolvers/value.ts
@@ -1,4 +1,4 @@
-import { ReferenceObject, SchemaObject } from 'openapi3-ts';
+import { ReferenceObject, SchemaObject } from 'openapi3-ts/oas30';
 import { getScalar } from '../getters';
 import { ContextSpecs, ResolverValue, SchemaType } from '../types';
 import { isReference } from '../utils';

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -8,7 +8,7 @@ import {
   RequestBodyObject,
   ResponsesObject,
   SchemaObject,
-} from 'openapi3-ts';
+} from 'openapi3-ts/oas30';
 // @ts-ignore // FIXME when running `yarn test` getting `orval:test: ../core/src/types.ts(12,34): error TS7016: Could not find a declaration file for module 'swagger2openapi'. '/home/maxim/orval/node_modules/swagger2openapi/index.js' implicitly has an 'any' type.`
 import swagger2openapi from 'swagger2openapi';
 import type { allLocales } from '@faker-js/faker';

diff --git a/packages/core/src/utils/assertion.ts b/packages/core/src/utils/assertion.ts
@@ -1,4 +1,4 @@
-import { ReferenceObject, SchemaObject } from 'openapi3-ts';
+import { ReferenceObject, SchemaObject } from 'openapi3-ts/oas30';
 import { SchemaType, Verbs } from '../types';
 import { extname } from './path';
 

diff --git a/packages/core/src/utils/logger.ts b/packages/core/src/utils/logger.ts
@@ -22,7 +22,7 @@ export const logError = (err: unknown, tag?: string) =>
     chalk.red(
       [
         '🛑',
-        tag ? `${tag} - ` : undefined,
+        tag ? `${tag} -` : undefined,
         err instanceof Error ? err.stack : err,
       ]
         .filter(Boolean)

diff --git a/packages/core/src/utils/open-api-converter.ts b/packages/core/src/utils/open-api-converter.ts
@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import { OpenAPIObject } from 'openapi3-ts';
+import { OpenAPIObject } from 'openapi3-ts/oas30';
 import swagger2openapi from 'swagger2openapi';
 import { log } from './logger';
 

diff --git a/packages/core/src/utils/validator.ts b/packages/core/src/utils/validator.ts
@@ -1,4 +1,4 @@
-import { OpenAPIObject } from 'openapi3-ts';
+import { OpenAPIObject } from 'openapi3-ts/oas30';
 import {
   ibmOpenapiValidatorErrors,
   ibmOpenapiValidatorWarnings,

diff --git a/packages/mock/package.json b/packages/mock/package.json
@@ -16,6 +16,6 @@
     "@orval/core": "6.23.0",
     "lodash.get": "^4.4.2",
     "lodash.omit": "^4.5.0",
-    "openapi3-ts": "^3.0.0"
+    "openapi3-ts": "^4.2.1"
   }
 }
diff --git a/packages/mock/src/faker/constants.ts b/packages/mock/src/faker/constants.ts
@@ -1,4 +1,4 @@
-import { SchemaObject } from 'openapi3-ts';
+import { SchemaObject } from 'openapi3-ts/oas30';
 
 export const DEFAULT_FORMAT_MOCK: Record<
   Required<SchemaObject>['format'],

diff --git a/packages/mock/src/faker/getters/object.ts b/packages/mock/src/faker/getters/object.ts
@@ -7,7 +7,7 @@ import {
   isReference,
   MockOptions,
 } from '@orval/core';
-import { ReferenceObject, SchemaObject } from 'openapi3-ts';
+import { ReferenceObject, SchemaObject } from 'openapi3-ts/oas30';
 import { resolveMockValue } from '../resolvers/value';
 import { MockDefinition, MockSchemaObject } from '../../types';
 import { combineSchemasMock } from './combine';

diff --git a/packages/mock/src/faker/resolvers/value.ts b/packages/mock/src/faker/resolvers/value.ts
@@ -6,7 +6,7 @@ import {
   MockOptions,
 } from '@orval/core';
 import get from 'lodash.get';
-import { SchemaObject } from 'openapi3-ts';
+import { SchemaObject } from 'openapi3-ts/oas30';
 import { getMockScalar } from '../getters/scalar';
 import { MockDefinition, MockSchemaObject } from '../../types';
 

diff --git a/packages/mock/src/msw/mocks.ts b/packages/mock/src/msw/mocks.ts
@@ -10,7 +10,7 @@ import {
   resolveRef,
   stringify,
 } from '@orval/core';
-import { OpenAPIObject, SchemaObject } from 'openapi3-ts';
+import { OpenAPIObject, SchemaObject } from 'openapi3-ts/oas30';
 import { getMockScalar } from '../faker/getters';
 
 const getMockPropertiesWithoutFunc = (properties: any, spec: OpenAPIObject) =>

diff --git a/packages/mock/src/types.ts b/packages/mock/src/types.ts
@@ -1,5 +1,5 @@
 import { GeneratorImport } from '@orval/core';
-import { SchemaObject } from 'openapi3-ts';
+import { SchemaObject } from 'openapi3-ts/oas30';
 
 export interface MockDefinition {
   value: string;

diff --git a/packages/orval/package.json b/packages/orval/package.json
@@ -70,8 +70,7 @@
     "find-up": "5.0.0",
     "fs-extra": "^11.2.0",
     "lodash.uniq": "^4.5.0",
-    "openapi-types": "^12.1.3",
-    "openapi3-ts": "^3.2.0",
+    "openapi3-ts": "4.2.1",
     "string-argv": "^0.3.2",
     "tsconfck": "^2.0.1"
   }

diff --git a/packages/orval/src/api.ts b/packages/orval/src/api.ts
@@ -13,7 +13,7 @@ import {
   resolveRef,
 } from '@orval/core';
 import { generateMockImports } from '@orval/mock';
-import { PathItemObject } from 'openapi3-ts';
+import { PathItemObject } from 'openapi3-ts/oas30';
 import {
   generateClientFooter,
   generateClientHeader,

diff --git a/packages/orval/src/import-open-api.ts b/packages/orval/src/import-open-api.ts
@@ -18,7 +18,7 @@ import {
   WriteSpecsBuilder,
 } from '@orval/core';
 import omit from 'lodash.omit';
-import { OpenAPIObject, SchemasObject } from 'openapi3-ts';
+import { OpenAPIObject, SchemasObject } from 'openapi3-ts/oas30';
 import { getApiBuilder } from './api';
 
 export const importOpenApi = async ({

diff --git a/packages/orval/src/utils/options.ts b/packages/orval/src/utils/options.ts
@@ -29,7 +29,7 @@ import {
 } from '@orval/core';
 import { DEFAULT_MOCK_OPTIONS } from '@orval/mock';
 import chalk from 'chalk';
-import { InfoObject } from 'openapi3-ts';
+import { InfoObject } from 'openapi3-ts/oas30';
 import pkg from '../../package.json';
 import { githubResolver } from './github';
 import { loadPackageJson } from './package-json';

diff --git a/packages/orval/src/write-specs.ts b/packages/orval/src/write-specs.ts
@@ -19,7 +19,7 @@ import chalk from 'chalk';
 import execa from 'execa';
 import fs from 'fs-extra';
 import uniq from 'lodash.uniq';
-import { InfoObject } from 'openapi3-ts';
+import { InfoObject } from 'openapi3-ts/oas30';
 import { executeHook } from './utils';
 
 const getHeader = (

diff --git a/packages/zod/src/index.ts b/packages/zod/src/index.ts
@@ -5,7 +5,7 @@ import {
   RequestBodyObject,
   ResponseObject,
   SchemaObject,
-} from 'openapi3-ts';
+} from 'openapi3-ts/oas30';
 import {
   camel,
   ClientBuilder,