orval 6.8.1 → 6.9.2

package/dist/index.d.ts

@@ -54,6 +54,14 @@ declare type GetterParams = GetterParam[];
 declare type GetterQueryParam = {
     schema: GeneratorSchema;
     deps: GeneratorSchema[];
+    isOptional: boolean;
+};
+declare type GetterPropType = 'param' | 'body' | 'queryParam' | 'header';
+declare const GetterPropType: {
+    PARAM: GetterPropType;
+    BODY: GetterPropType;
+    QUERY_PARAM: GetterPropType;
+    HEADER: GetterPropType;
 };
 declare type GetterProp = {
     name: string;
@@ -61,7 +69,7 @@ declare type GetterProp = {
     implementation: string;
     default: boolean;
     required: boolean;
-    type: 'param' | 'body' | 'queryParam';
+    type: GetterPropType;
 };
 declare type GetterProps = GetterProp[];
 
@@ -124,6 +132,9 @@ declare type GeneratorOperation = {
     formData?: GeneratorMutator;
     formUrlEncoded?: GeneratorMutator;
     operationName: string;
+    types?: {
+        result: (title?: string) => string;
+    };
 };
 declare type GeneratorVerbOptions = {
     verb: Verbs;
@@ -134,13 +145,14 @@ declare type GeneratorVerbOptions = {
     operationName: string;
     response: GetterResponse;
     body: GetterBody;
+    headers?: GetterQueryParam;
     queryParams?: GetterQueryParam;
     params: GetterParams;
     props: GetterProps;
     mutator?: GeneratorMutator;
     formData?: GeneratorMutator;
     formUrlEncoded?: GeneratorMutator;
-    override: NormalizedOperationOptions;
+    override: NormalizedOverrideOutput;
 };
 declare type GeneratorVerbsOptions = GeneratorVerbOptions[];
 declare type GeneratorOptions = {
@@ -153,6 +165,9 @@ declare type GeneratorOptions = {
 declare type GeneratorClient = {
     implementation: string;
     imports: GeneratorImport[];
+    types?: {
+        result: (title?: string) => string;
+    };
 };
 declare type GeneratorClientExtra = {
     implementation: string;
@@ -179,7 +194,6 @@ declare type ClientHeaderBuilder = (params: {
     isMutator: boolean;
     noFunction?: boolean;
     isGlobalMutator: boolean;
-    provideInRoot: boolean;
     provideIn: boolean | 'root' | 'any';
     hasAwaitedType: boolean;
 }) => string;
@@ -191,7 +205,7 @@ declare type ClientFooterBuilder = (params: {
     hasMutator: boolean;
 }) => string;
 declare type ClientTitleBuilder = (title: string) => string;
-declare type ClientDependenciesBuilder = (hasGlobalMutator: boolean) => GeneratorDependency[];
+declare type ClientDependenciesBuilder = (hasGlobalMutator: boolean, packageJson?: PackageJson) => GeneratorDependency[];
 declare type ClientMSWBuilder = (verbOptions: GeneratorVerbOptions, generatorOptions: GeneratorOptions) => {
     imports: string[];
     implementation: string;
@@ -208,6 +222,7 @@ declare type GeneratorClients = Record<OutputClient, ClientGeneratorsBuilder>;
 interface Options {
     output?: string | OutputOptions;
     input?: string | InputOptions;
+    hooks?: Partial<HooksOptions>;
 }
 declare type OptionsFn = () => Options | Promise<Options>;
 declare type OptionsExport = Options | Promise<Options> | OptionsFn;
@@ -233,7 +248,9 @@ declare type NormalizedOverrideOutput = {
         };
         required?: boolean;
         baseUrl?: string;
+        delay?: number;
     };
+    contentType?: OverrideOutputContentType;
     header: false | ((info: InfoObject) => string[] | string);
     formData: boolean | NormalizedMutator;
     formUrlEncoded: boolean | NormalizedMutator;
@@ -252,10 +269,14 @@ declare type NormalizedOverrideOutput = {
         };
     };
     query: QueryOptions;
-    angular: Omit<Required<AngularOptions>, 'provideInRoot'>;
+    angular: Required<AngularOptions>;
+    swr: {
+        options?: any;
+    };
     operationName?: (operation: OperationObject, route: string, verb: Verbs) => string;
     requestOptions: Record<string, any> | boolean;
     useDates?: boolean;
+    useTypeOverInterfaces?: boolean;
 };
 declare type NormalizedMutator = {
     path: string;
@@ -270,11 +291,16 @@ declare type NormalizedOperationOptions = {
         data?: MockProperties;
         properties?: MockProperties;
     };
+    contentType?: OverrideOutputContentType;
     query?: QueryOptions;
+    angular?: Required<AngularOptions>;
+    swr?: {
+        options?: any;
+    };
     operationName?: (operation: OperationObject, route: string, verb: Verbs) => string;
-    formData: boolean | NormalizedMutator;
-    formUrlEncoded: boolean | NormalizedMutator;
-    requestOptions: object | boolean;
+    formData?: boolean | NormalizedMutator;
+    formUrlEncoded?: boolean | NormalizedMutator;
+    requestOptions?: object | boolean;
 };
 declare type OutputClientFunc = (clients: GeneratorClients) => ClientGeneratorsBuilder;
 declare type OutputOptions = {
@@ -290,6 +316,7 @@ declare type OutputOptions = {
     tslint?: boolean;
     tsconfig?: string | Tsconfig;
     packageJson?: string;
+    headers?: boolean;
 };
 declare type SwaggerParserOptions = Omit<SwaggerParser.Options, 'validate'> & {
     validate?: boolean;
@@ -349,6 +376,7 @@ declare type OverrideOutput = {
         required?: boolean;
         baseUrl?: string;
     };
+    contentType?: OverrideOutputContentType;
     header?: boolean | ((info: InfoObject) => string[] | string);
     formData?: boolean | Mutator;
     formUrlEncoded?: boolean | Mutator;
@@ -367,19 +395,27 @@ declare type OverrideOutput = {
         };
     };
     query?: QueryOptions;
+    swr?: {
+        options?: any;
+    };
     angular?: AngularOptions;
     operationName?: (operation: OperationObject, route: string, verb: Verbs) => string;
     requestOptions?: Record<string, any> | boolean;
     useDates?: boolean;
+    useTypeOverInterfaces?: boolean;
+};
+declare type OverrideOutputContentType = {
+    include?: string[];
+    exclude?: string[];
 };
 declare type QueryOptions = {
     useQuery?: boolean;
     useInfinite?: boolean;
     useInfiniteQueryParam?: string;
     options?: any;
+    signal?: boolean;
 };
 declare type AngularOptions = {
-    provideInRoot?: boolean;
     provideIn?: 'root' | 'any' | boolean;
 };
 declare type InputTransformerFn = (spec: OpenAPIObject) => OpenAPIObject;
@@ -395,11 +431,20 @@ declare type OperationOptions = {
         properties?: MockProperties;
     };
     query?: QueryOptions;
+    angular?: Required<AngularOptions>;
+    swr?: {
+        options?: any;
+    };
     operationName?: (operation: OperationObject, route: string, verb: Verbs) => string;
     formData?: boolean | Mutator;
     formUrlEncoded?: boolean | Mutator;
     requestOptions?: object | boolean;
 };
+declare type Hook = 'afterAllFilesWrite';
+declare type HookFunction = (...args: any[]) => void | Promise<void>;
+declare type HookCommand = string | HookFunction | (string | HookFunction)[];
+declare type NormalizedHookCommand = HookCommand[];
+declare type HooksOptions<T = HookCommand | NormalizedHookCommand> = Partial<Record<Hook, T>>;
 declare type Verbs = 'post' | 'put' | 'get' | 'patch' | 'delete' | 'head';
 declare const Verbs: {
     POST: Verbs;
@@ -436,11 +481,13 @@ interface Tsconfig {
     compilerOptions?: {
         esModuleInterop?: boolean;
         allowSyntheticDefaultImports?: boolean;
+        exactOptionalPropertyTypes?: boolean;
         paths?: Record<string, string[]>;
     };
 }
 interface PackageJson {
     dependencies?: Record<string, string>;
+    devDependencies?: Record<string, string>;
 }
 
 /**
@@ -460,7 +507,11 @@ declare const generateImports: ({ imports, target, isRootKey, specsName, }: {
     isRootKey: boolean;
     specsName: Record<string, string>;
 }) => string;
-declare const generateMutatorImports: (mutators: GeneratorMutator[], oneMore?: boolean | undefined) => string;
+declare const generateMutatorImports: ({ mutators, implementation, oneMore, }: {
+    mutators: GeneratorMutator[];
+    implementation?: string | undefined;
+    oneMore?: boolean | undefined;
+}) => string;
 declare const addDependency: ({ implementation, exports, dependency, specsName, hasSchemaDir, isAllowSyntheticDefaultImports, }: {
     implementation: string;
     exports: GeneratorImport[];
@@ -473,13 +524,21 @@ declare const generateDependencyImports: (implementation: string, imports: {
     exports: GeneratorImport[];
     dependency: string;
 }[], specsName: Record<string, string>, hasSchemaDir: boolean, isAllowSyntheticDefaultImports: boolean) => string;
-declare const generateVerbImports: ({ response, body, queryParams, params, }: GeneratorVerbOptions) => GeneratorImport[];
+declare const generateVerbImports: ({ response, body, queryParams, headers, params, }: GeneratorVerbOptions) => GeneratorImport[];
 
 declare const generateBodyOptions: (body: GetterBody, isFormData: boolean, isFormUrlEncoded: boolean) => string;
-declare const generateAxiosOptions: (response: GetterResponse, queryParams?: GeneratorSchema | undefined, requestOptions?: boolean | object | undefined) => string;
-declare const generateOptions: ({ route, body, queryParams, response, verb, requestOptions, isFormData, isFormUrlEncoded, isAngular, }: {
+declare const generateAxiosOptions: ({ response, isExactOptionalPropertyTypes, queryParams, headers, requestOptions, hasSignal, }: {
+    response: GetterResponse;
+    isExactOptionalPropertyTypes: boolean;
+    queryParams?: GeneratorSchema | undefined;
+    headers?: GeneratorSchema | undefined;
+    requestOptions?: boolean | object | undefined;
+    hasSignal: boolean;
+}) => string;
+declare const generateOptions: ({ route, body, headers, queryParams, response, verb, requestOptions, isFormData, isFormUrlEncoded, isAngular, isExactOptionalPropertyTypes, hasSignal, }: {
     route: string;
     body: GetterBody;
+    headers?: GetterQueryParam | undefined;
     queryParams?: GetterQueryParam | undefined;
     response: GetterResponse;
     verb: Verbs;
@@ -487,12 +546,15 @@ declare const generateOptions: ({ route, body, queryParams, response, verb, requ
     isFormData: boolean;
     isFormUrlEncoded: boolean;
     isAngular?: boolean | undefined;
+    isExactOptionalPropertyTypes: boolean;
+    hasSignal: boolean;
 }) => string;
 declare const generateBodyMutatorConfig: (body: GetterBody, isFormData: boolean, isFormUrlEncoded: boolean) => string;
-declare const generateQueryParamsAxiosConfig: (response: GetterResponse, queryParams?: GeneratorSchema | undefined) => string;
-declare const generateMutatorConfig: ({ route, body, queryParams, response, verb, isFormData, isFormUrlEncoded, isBodyVerb, hasSignal, }: {
+declare const generateQueryParamsAxiosConfig: (response: GetterResponse, queryParams?: GetterQueryParam | undefined) => string;
+declare const generateMutatorConfig: ({ route, body, headers, queryParams, response, verb, isFormData, isFormUrlEncoded, isBodyVerb, hasSignal, isExactOptionalPropertyTypes, }: {
     route: string;
     body: GetterBody;
+    headers?: GetterQueryParam | undefined;
     queryParams?: GetterQueryParam | undefined;
     response: GetterResponse;
     verb: Verbs;
@@ -500,6 +562,7 @@ declare const generateMutatorConfig: ({ route, body, queryParams, response, verb
     isFormUrlEncoded: boolean;
     isBodyVerb: boolean;
     hasSignal: boolean;
+    isExactOptionalPropertyTypes: boolean;
 }) => string;
 declare const generateMutatorRequestOptions: (requestOptions: boolean | object | undefined, hasSecondArgument: boolean) => string | undefined;
 declare const generateFormDataAndUrlEncodedFunction: ({ body, formData, formUrlEncoded, isFormData, isFormUrlEncoded, }: {
@@ -522,6 +585,7 @@ declare const sanitize: (value: string, options?: {
     dot?: string | true | undefined;
     dash?: string | true | undefined;
     es5keyword?: boolean | undefined;
+    special?: boolean | undefined;
 } | undefined) => string;
 declare const toObjectString: <T>(props: T[], path?: keyof T | undefined) => string;
 declare const getNumberWord: (num: number) => string;

package/dist/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _chunkW5UA6U5Ajs = require('./chunk-W5UA6U5A.js');_chunkW5UA6U5Ajs.b.call(void 0, );var _chalk = require('chalk'); var _chalk2 = _interopRequireDefault(_chalk);_chunkW5UA6U5Ajs.b.call(void 0, );var c=async(r,o=process.cwd(),e)=>{if(!r||_chunkW5UA6U5Ajs.c.call(void 0, r))return _chunkW5UA6U5Ajs.M.call(void 0, r,e);let n=await _chunkW5UA6U5Ajs.H.call(void 0, r,o,e);if(e!=null&&e.watch)_chunkW5UA6U5Ajs.K.call(void 0, e==null?void 0:e.watch,async()=>{try{await _chunkW5UA6U5Ajs.L.call(void 0, o,n)}catch(a){_chunkW5UA6U5Ajs.d.call(void 0, _chalk2.default.red(`\u{1F6D1}  ${e!=null&&e.projectName?`${e==null?void 0:e.projectName} - `:""}${a}`))}},n.input.target);else try{return await _chunkW5UA6U5Ajs.L.call(void 0, o,n)}catch(a){_chunkW5UA6U5Ajs.d.call(void 0, _chalk2.default.red(`\u{1F6D1}  ${e!=null&&e.projectName?`${e==null?void 0:e.projectName} - `:""}${a}`))}};var re=c;exports.URL_REGEX = _chunkW5UA6U5Ajs.s; exports.VERBS_WITH_BODY = _chunkW5UA6U5Ajs.r; exports.addDependency = _chunkW5UA6U5Ajs.v; exports.camel = _chunkW5UA6U5Ajs.g; exports.default = re; exports.defineConfig = _chunkW5UA6U5Ajs.G; exports.escape = _chunkW5UA6U5Ajs.o; exports.generalJSTypes = _chunkW5UA6U5Ajs.p; exports.generalJSTypesWithArray = _chunkW5UA6U5Ajs.q; exports.generate = c; exports.generateAxiosOptions = _chunkW5UA6U5Ajs.z; exports.generateBodyMutatorConfig = _chunkW5UA6U5Ajs.B; exports.generateBodyOptions = _chunkW5UA6U5Ajs.y; exports.generateDependencyImports = _chunkW5UA6U5Ajs.w; exports.generateFormDataAndUrlEncodedFunction = _chunkW5UA6U5Ajs.F; exports.generateImports = _chunkW5UA6U5Ajs.t; exports.generateMutatorConfig = _chunkW5UA6U5Ajs.D; exports.generateMutatorImports = _chunkW5UA6U5Ajs.u; exports.generateMutatorRequestOptions = _chunkW5UA6U5Ajs.E; exports.generateOptions = _chunkW5UA6U5Ajs.A; exports.generateQueryParamsAxiosConfig = _chunkW5UA6U5Ajs.C; exports.generateVerbImports = _chunkW5UA6U5Ajs.x; exports.getNumberWord = _chunkW5UA6U5Ajs.n; exports.isSyntheticDefaultImportsAllow = _chunkW5UA6U5Ajs.J; exports.kebab = _chunkW5UA6U5Ajs.i; exports.loadTsconfig = _chunkW5UA6U5Ajs.I; exports.pascal = _chunkW5UA6U5Ajs.f; exports.sanitize = _chunkW5UA6U5Ajs.l; exports.snake = _chunkW5UA6U5Ajs.h; exports.stringify = _chunkW5UA6U5Ajs.k; exports.toObjectString = _chunkW5UA6U5Ajs.m; exports.upper = _chunkW5UA6U5Ajs.j;
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }"use strict";var _chunkZZ3APSABjs = require('./chunk-ZZ3APSAB.js');_chunkZZ3APSABjs.b.call(void 0, );var _chalk = require('chalk'); var _chalk2 = _interopRequireDefault(_chalk);_chunkZZ3APSABjs.b.call(void 0, );var c=async(t,o=process.cwd(),e)=>{if(!t||_chunkZZ3APSABjs.c.call(void 0, t))return _chunkZZ3APSABjs.M.call(void 0, t,e);let n=await _chunkZZ3APSABjs.H.call(void 0, t,o,e);if(e!=null&&e.watch)_chunkZZ3APSABjs.K.call(void 0, e==null?void 0:e.watch,async()=>{try{await _chunkZZ3APSABjs.L.call(void 0, o,n)}catch(a){_chunkZZ3APSABjs.d.call(void 0, _chalk2.default.red(`\u{1F6D1}  ${e!=null&&e.projectName?`${e==null?void 0:e.projectName} - `:""}${a}`))}},n.input.target);else try{return await _chunkZZ3APSABjs.L.call(void 0, o,n)}catch(a){_chunkZZ3APSABjs.d.call(void 0, _chalk2.default.red(`\u{1F6D1}  ${e!=null&&e.projectName?`${e==null?void 0:e.projectName} - `:""}${a}`))}};var te=c;exports.URL_REGEX = _chunkZZ3APSABjs.s; exports.VERBS_WITH_BODY = _chunkZZ3APSABjs.r; exports.addDependency = _chunkZZ3APSABjs.v; exports.camel = _chunkZZ3APSABjs.g; exports.default = te; exports.defineConfig = _chunkZZ3APSABjs.G; exports.escape = _chunkZZ3APSABjs.o; exports.generalJSTypes = _chunkZZ3APSABjs.p; exports.generalJSTypesWithArray = _chunkZZ3APSABjs.q; exports.generate = c; exports.generateAxiosOptions = _chunkZZ3APSABjs.z; exports.generateBodyMutatorConfig = _chunkZZ3APSABjs.B; exports.generateBodyOptions = _chunkZZ3APSABjs.y; exports.generateDependencyImports = _chunkZZ3APSABjs.w; exports.generateFormDataAndUrlEncodedFunction = _chunkZZ3APSABjs.F; exports.generateImports = _chunkZZ3APSABjs.t; exports.generateMutatorConfig = _chunkZZ3APSABjs.D; exports.generateMutatorImports = _chunkZZ3APSABjs.u; exports.generateMutatorRequestOptions = _chunkZZ3APSABjs.E; exports.generateOptions = _chunkZZ3APSABjs.A; exports.generateQueryParamsAxiosConfig = _chunkZZ3APSABjs.C; exports.generateVerbImports = _chunkZZ3APSABjs.x; exports.getNumberWord = _chunkZZ3APSABjs.n; exports.isSyntheticDefaultImportsAllow = _chunkZZ3APSABjs.J; exports.kebab = _chunkZZ3APSABjs.i; exports.loadTsconfig = _chunkZZ3APSABjs.I; exports.pascal = _chunkZZ3APSABjs.f; exports.sanitize = _chunkZZ3APSABjs.l; exports.snake = _chunkZZ3APSABjs.h; exports.stringify = _chunkZZ3APSABjs.k; exports.toObjectString = _chunkZZ3APSABjs.m; exports.upper = _chunkZZ3APSABjs.j;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "orval",
   "description": "A swagger client generator for typescript",
-  "version": "6.8.1",
+  "version": "6.9.2",
   "license": "MIT",
   "files": [
     "dist"
@@ -56,10 +56,10 @@
     "update-samples": "zx ./scripts/update-samples.mjs"
   },
   "devDependencies": {
-    "@commitlint/cli": "^16.2.1",
-    "@commitlint/config-conventional": "^16.2.1",
-    "@faker-js/faker": "^6.1.1",
-    "@release-it/conventional-changelog": "^4.2.0",
+    "@commitlint/cli": "^17.0.2",
+    "@commitlint/config-conventional": "^17.0.3",
+    "@faker-js/faker": "^7.3.0",
+    "@release-it/conventional-changelog": "^5.0.0",
     "@types/chalk": "^2.2.0",
     "@types/commander": "^2.12.2",
     "@types/fs-extra": "^9.0.12",
@@ -71,30 +71,30 @@
     "@types/lodash.uniqby": "^4.7.6",
     "@types/lodash.uniqwith": "^4.5.6",
     "@types/micromatch": "^4.0.2",
-    "@types/node": "^17.0.21",
+    "@types/node": "^18.0.0",
     "@types/prettier": "^2.4.4",
     "@types/request": "^2.48.8",
     "@types/validator": "^13.7.1",
     "@typescript-eslint/eslint-plugin": "^5.14.0",
     "@typescript-eslint/parser": "^5.14.0",
-    "dotenv-cli": "^4.0.0",
+    "dotenv-cli": "^5.1.0",
     "eslint": "^8.10.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "husky": "^7.0.2",
-    "lint-staged": "^12.3.5",
+    "husky": "^8.0.1",
+    "lint-staged": "^13.0.3",
     "npm-run-all": "^4.1.5",
     "prettier": "2.6.2",
     "pretty-quick": "^3.1.3",
-    "release-it": "^14.12.5",
+    "release-it": "^15.1.0",
     "rimraf": "^3.0.2",
     "tsup": "^5.12.0",
     "typescript": "^4.6.2",
     "vitest": "^0.6.0",
-    "zx": "^5.2.0"
+    "zx": "^7.0.2"
   },
   "dependencies": {
-    "@apidevtools/swagger-parser": "^10.0.3",
+    "@apidevtools/swagger-parser": "^10.1.0",
     "acorn": "^8.7.0",
     "cac": "^6.7.12",
     "chalk": "^4.1.2",
@@ -108,7 +108,7 @@
     "find-up": "5.0.0",
     "fs-extra": "^10.0.1",
     "globby": "11.0.4",
-    "ibm-openapi-validator": "^0.57.4",
+    "ibm-openapi-validator": "^0.83.0",
     "inquirer": "^8.2.0",
     "lodash.get": "^4.4.2",
     "lodash.omit": "^4.5.0",
@@ -118,8 +118,9 @@
     "lodash.uniqwith": "^4.5.0",
     "micromatch": "^4.0.4",
     "openapi3-ts": "^2.0.2",
+    "string-argv": "^0.3.1",
     "swagger2openapi": "^7.0.8",
-    "tsconfck": "^1.2.0",
+    "tsconfck": "^2.0.1",
     "upath": "^2.0.1",
     "url": "^0.11.0",
     "validator": "^13.7.0"