@orval/angular 6.19.1 → 6.21.0

package/dist/index.js

@@ -1,5 +1,68 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _core = require('@orval/core');var V=[{exports:[{name:"HttpClient",values:!0},{name:"HttpHeaders"},{name:"HttpParams"},{name:"HttpContext"}],dependency:"@angular/common/http"},{exports:[{name:"Injectable",values:!0}],dependency:"@angular/core"},{exports:[{name:"Observable",values:!0}],dependency:"rxjs"}],d=new Map,j= exports.getAngularDependencies =()=>V,M= exports.generateAngularTitle =n=>{let t=_core.sanitize.call(void 0, n);return`${_core.pascal.call(void 0, t)}Service`},U= exports.generateAngularHeader =({title:n,isRequestOptions:t,isMutator:a,isGlobalMutator:r,provideIn:s})=>`
-${t&&!r?`type HttpClientOptions = {
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/index.ts
+var src_exports = {};
+__export(src_exports, {
+  builder: () => builder,
+  default: () => src_default,
+  generateAngular: () => generateAngular,
+  generateAngularFooter: () => generateAngularFooter,
+  generateAngularHeader: () => generateAngularHeader,
+  generateAngularTitle: () => generateAngularTitle,
+  getAngularDependencies: () => getAngularDependencies
+});
+module.exports = __toCommonJS(src_exports);
+var import_core = require("@orval/core");
+var ANGULAR_DEPENDENCIES = [
+  {
+    exports: [
+      { name: "HttpClient", values: true },
+      { name: "HttpHeaders" },
+      { name: "HttpParams" },
+      { name: "HttpContext" }
+    ],
+    dependency: "@angular/common/http"
+  },
+  {
+    exports: [{ name: "Injectable", values: true }],
+    dependency: "@angular/core"
+  },
+  {
+    exports: [{ name: "Observable", values: true }],
+    dependency: "rxjs"
+  }
+];
+var returnTypesToWrite = /* @__PURE__ */ new Map();
+var getAngularDependencies = () => ANGULAR_DEPENDENCIES;
+var generateAngularTitle = (title) => {
+  const sanTitle = (0, import_core.sanitize)(title);
+  return `${(0, import_core.pascal)(sanTitle)}Service`;
+};
+var generateAngularHeader = ({
+  title,
+  isRequestOptions,
+  isMutator,
+  isGlobalMutator,
+  provideIn
+}) => `
+${isRequestOptions && !isGlobalMutator ? `type HttpClientOptions = {
   headers?: HttpHeaders | {
       [header: string]: string | string[];
   };
@@ -11,35 +74,145 @@ ${t&&!r?`type HttpClientOptions = {
   reportProgress?: boolean;
   responseType?: any;
   withCredentials?: boolean;
-};`:""}
+};` : ""}
 
-${t&&a?`// eslint-disable-next-line
+${isRequestOptions && isMutator ? `// eslint-disable-next-line
     type ThirdParameter<T extends (...args: any) => any> = T extends (
   config: any,
   httpClient: any,
   args: infer P,
 ) => any
   ? P
-  : never;`:""}
+  : never;` : ""}
 
-@Injectable(${s?`{ providedIn: '${_core.isBoolean.call(void 0, s)?"root":s}' }`:""})
-export class ${n} {
+@Injectable(${provideIn ? `{ providedIn: '${(0, import_core.isBoolean)(provideIn) ? "root" : provideIn}' }` : ""})
+export class ${title} {
   constructor(
     private http: HttpClient,
-  ) {}`,N= exports.generateAngularFooter =({operationNames:n})=>{let t=`};
-
-`;return n.forEach(a=>{d.has(a)&&(t+=d.get(a)+`
-`)}),t},_=({headers:n,queryParams:t,operationName:a,response:r,mutator:s,body:i,props:l,verb:o,override:e,formData:h,formUrlEncoded:O},{route:$,context:B})=>{var f,T;let p=(e==null?void 0:e.requestOptions)!==!1,c=(e==null?void 0:e.formData)!==!1,u=(e==null?void 0:e.formUrlEncoded)!==!1,y=!!((T=(f=B.tsconfig)==null?void 0:f.compilerOptions)!=null&&T.exactOptionalPropertyTypes),D=_core.VERBS_WITH_BODY.includes(o),C=_core.generateFormDataAndUrlEncodedFunction.call(void 0, {formData:h,formUrlEncoded:O,body:i,isFormData:c,isFormUrlEncoded:u}),g=r.definition.success||"unknown";if(d.set(a,`export type ${_core.pascal.call(void 0, a)}ClientResult = NonNullable<${g}>`),s){let b=_core.generateMutatorConfig.call(void 0, {route:$,body:i,headers:n,queryParams:t,response:r,verb:o,isFormData:c,isFormUrlEncoded:u,hasSignal:!1,isBodyVerb:D,isExactOptionalPropertyTypes:y}),A=p?_core.generateMutatorRequestOptions.call(void 0, e==null?void 0:e.requestOptions,s.hasThirdArg):"",E=s.bodyTypeName&&i.definition?_core.toObjectString.call(void 0, l,"implementation").replace(new RegExp(`(\\w*):\\s?${i.definition}`),`$1: ${s.bodyTypeName}<${i.definition}>`):_core.toObjectString.call(void 0, l,"implementation");return` ${a}<TData = ${g}>(
-    ${E}
- ${p&&s.hasThirdArg?`options?: ThirdParameter<typeof ${s.name}>`:""}) {${C}
-      return ${s.name}<TData>(
-      ${b},
+  ) {}`;
+var generateAngularFooter = ({
+  operationNames
+}) => {
+  let footer = "};\n\n";
+  operationNames.forEach((operationName) => {
+    if (returnTypesToWrite.has(operationName)) {
+      footer += returnTypesToWrite.get(operationName) + "\n";
+    }
+  });
+  return footer;
+};
+var generateImplementation = ({
+  headers,
+  queryParams,
+  operationName,
+  response,
+  mutator,
+  body,
+  props,
+  verb,
+  override,
+  formData,
+  formUrlEncoded,
+  paramsSerializer
+}, { route, context }) => {
+  var _a, _b;
+  const isRequestOptions = (override == null ? void 0 : override.requestOptions) !== false;
+  const isFormData = (override == null ? void 0 : override.formData) !== false;
+  const isFormUrlEncoded = (override == null ? void 0 : override.formUrlEncoded) !== false;
+  const isExactOptionalPropertyTypes = !!((_b = (_a = context.tsconfig) == null ? void 0 : _a.compilerOptions) == null ? void 0 : _b.exactOptionalPropertyTypes);
+  const isBodyVerb = import_core.VERBS_WITH_BODY.includes(verb);
+  const bodyForm = (0, import_core.generateFormDataAndUrlEncodedFunction)({
+    formData,
+    formUrlEncoded,
+    body,
+    isFormData,
+    isFormUrlEncoded
+  });
+  const dataType = response.definition.success || "unknown";
+  returnTypesToWrite.set(
+    operationName,
+    `export type ${(0, import_core.pascal)(
+      operationName
+    )}ClientResult = NonNullable<${dataType}>`
+  );
+  if (mutator) {
+    const mutatorConfig = (0, import_core.generateMutatorConfig)({
+      route,
+      body,
+      headers,
+      queryParams,
+      response,
+      verb,
+      isFormData,
+      isFormUrlEncoded,
+      hasSignal: false,
+      isBodyVerb,
+      isExactOptionalPropertyTypes
+    });
+    const requestOptions = isRequestOptions ? (0, import_core.generateMutatorRequestOptions)(
+      override == null ? void 0 : override.requestOptions,
+      mutator.hasThirdArg
+    ) : "";
+    const propsImplementation = mutator.bodyTypeName && body.definition ? (0, import_core.toObjectString)(props, "implementation").replace(
+      new RegExp(`(\\w*):\\s?${body.definition}`),
+      `$1: ${mutator.bodyTypeName}<${body.definition}>`
+    ) : (0, import_core.toObjectString)(props, "implementation");
+    return ` ${operationName}<TData = ${dataType}>(
+    ${propsImplementation}
+ ${isRequestOptions && mutator.hasThirdArg ? `options?: ThirdParameter<typeof ${mutator.name}>` : ""}) {${bodyForm}
+      return ${mutator.name}<TData>(
+      ${mutatorConfig},
       this.http,
-      ${A});
+      ${requestOptions});
     }
-  `}let H=_core.generateOptions.call(void 0, {route:$,body:i,headers:n,queryParams:t,response:r,verb:o,requestOptions:e==null?void 0:e.requestOptions,isFormData:c,isFormUrlEncoded:u,isAngular:!0,isExactOptionalPropertyTypes:y,hasSignal:!1});return` ${a}<TData = ${g}>(
-    ${_core.toObjectString.call(void 0, l,"implementation")} ${p?`options?: HttpClientOptions
-`:""}  ): Observable<TData>  {${C}
-    return this.http.${o}<TData>(${H});
+  `;
+  }
+  const options = (0, import_core.generateOptions)({
+    route,
+    body,
+    headers,
+    queryParams,
+    response,
+    verb,
+    requestOptions: override == null ? void 0 : override.requestOptions,
+    isFormData,
+    isFormUrlEncoded,
+    paramsSerializer,
+    paramsSerializerOptions: override == null ? void 0 : override.paramsSerializerOptions,
+    isAngular: true,
+    isExactOptionalPropertyTypes,
+    hasSignal: false
+  });
+  return ` ${operationName}<TData = ${dataType}>(
+    ${(0, import_core.toObjectString)(
+    props,
+    "implementation"
+  )} ${isRequestOptions ? `options?: HttpClientOptions
+` : ""}  ): Observable<TData>  {${bodyForm}
+    return this.http.${verb}<TData>(${options});
   }
-`},W= exports.generateAngular =(n,t)=>{let a=_core.generateVerbImports.call(void 0, n);return{implementation:_(n,t),imports:a}},k={client:W,header:U,dependencies:j,footer:N,title:M},z= exports.builder =()=>()=>k,ne= exports.default =z;exports.builder = z; exports.default = ne; exports.generateAngular = W; exports.generateAngularFooter = N; exports.generateAngularHeader = U; exports.generateAngularTitle = M; exports.getAngularDependencies = j;
+`;
+};
+var generateAngular = (verbOptions, options) => {
+  const imports = (0, import_core.generateVerbImports)(verbOptions);
+  const implementation = generateImplementation(verbOptions, options);
+  return { implementation, imports };
+};
+var angularClientBuilder = {
+  client: generateAngular,
+  header: generateAngularHeader,
+  dependencies: getAngularDependencies,
+  footer: generateAngularFooter,
+  title: generateAngularTitle
+};
+var builder = () => () => angularClientBuilder;
+var src_default = builder;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  builder,
+  generateAngular,
+  generateAngularFooter,
+  generateAngularHeader,
+  generateAngularTitle,
+  getAngularDependencies
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orval/angular",
-  "version": "6.19.1",
+  "version": "6.21.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -8,11 +8,11 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsup ./src/index.ts --target node12 --minify --clean --dts --splitting",
+    "build": "tsup ./src/index.ts --target node12 --clean --dts",
     "dev": "tsup ./src/index.ts --target node12 --clean --watch src",
     "lint": "eslint src/**/*.ts"
   },
   "dependencies": {
-    "@orval/core": "6.19.1"
+    "@orval/core": "6.21.0"
   }
 }