swagger-typescript-api 11.0.0--alpha-2 → 11.0.0--alpha-5

package/cli/execute.js

@@ -1,7 +1,9 @@
 const _ = require("lodash");
 const { root_command, skip_command } = require("./constants");
 const { parseArgs } = require("./parse-args");
-const didyoumean = require("didyoumean");
+const didYouMean = require("didyoumean");
+
+didYouMean.threshold = 0.5;
 
 const execute = (params, commands, instance) => {
   const args = parseArgs(params.args, params.from);
@@ -96,7 +98,8 @@ const processArgs = (commands, args) => {
       const option = command.options.find((option) => option.flags.keys.includes(arg));
 
       if (!option) {
-        error = `unknown option ${arg}\n(Did you mean ${didyoumean(arg, allFlagKeys)} ?)`;
+        const tip = didYouMean(arg, allFlagKeys);
+        error = `unknown option ${arg}${tip ? `\n(Did you mean ${tip} ?)` : ""}`;
       }
 
       if (option) {

package/index.js

@@ -191,51 +191,66 @@ const program = cli({
       description: "generate array types as Array<Type> (by default Type[])",
       default: false,
     },
+    {
+      flags: "--sort-types",
+      description: "sort fields and types",
+      default: false,
+    },
   ],
 });
 
 const main = async () => {
   const { command, options } = await program.execute({ args: process.argv });
-  if (command === "generate-templates") {
-  } else if (command === null) {
-    await generateApi({
-      name: options.name,
-      url: options.path,
-      generateRouteTypes: options.routeTypes,
-      generateClient: !!(options.axios || options.client),
-      httpClientType: options.axios ? HTTP_CLIENT.AXIOS : HTTP_CLIENT.FETCH,
-      defaultResponseAsSuccess: options.defaultAsSuccess,
-      defaultResponseType: options.defaultResponse,
-      unwrapResponseData: options.unwrapResponseData,
-      disableThrowOnError: options.disableThrowOnError,
-      sortTypes: options.sortTypes,
-      generateUnionEnums: options.unionEnums,
-      addReadonly: options.addReadonly,
-      generateResponses: options.responses,
-      extractRequestParams: !!options.extractRequestParams,
-      extractRequestBody: !!options.extractRequestBody,
-      extractResponseBody: !!options.extractResponseBody,
-      extractResponseError: !!options.extractResponseError,
-      input: resolve(process.cwd(), options.path),
-      output: resolve(process.cwd(), options.output || "."),
-      templates: options.templates,
-      modular: !!options.modular,
-      toJS: !!options.js,
-      enumNamesAsValues: options.enumNamesAsValues,
-      moduleNameIndex: +(options.moduleNameIndex || 0),
-      moduleNameFirstTag: options.moduleNameFirstTag,
-      disableStrictSSL: !!options.disableStrictSSL,
-      disableProxy: !!options.disableProxy,
-      singleHttpClient: !!options.singleHttpClient,
-      cleanOutput: !!options.cleanOutput,
-      silent: !!options.silent,
-      typePrefix: options.typePrefix,
-      typeSuffix: options.typeSuffix,
-      patch: !!options.patch,
-      apiClassName: options.apiClassName,
-      debug: options.debug,
-      anotherArrayType: options.anotherArrayType,
-    });
+
+  switch (command) {
+    case null: {
+      await generateApi({
+        name: options.name,
+        url: options.path,
+        generateRouteTypes: options.routeTypes,
+        generateClient: !!(options.axios || options.client),
+        httpClientType: options.axios ? HTTP_CLIENT.AXIOS : HTTP_CLIENT.FETCH,
+        defaultResponseAsSuccess: options.defaultAsSuccess,
+        defaultResponseType: options.defaultResponse,
+        unwrapResponseData: options.unwrapResponseData,
+        disableThrowOnError: options.disableThrowOnError,
+        sortTypes: options.sortTypes,
+        generateUnionEnums: options.unionEnums,
+        addReadonly: options.addReadonly,
+        generateResponses: options.responses,
+        extractRequestParams: !!options.extractRequestParams,
+        extractRequestBody: !!options.extractRequestBody,
+        extractResponseBody: !!options.extractResponseBody,
+        extractResponseError: !!options.extractResponseError,
+        input: resolve(process.cwd(), options.path),
+        output: resolve(process.cwd(), options.output || "."),
+        templates: options.templates,
+        modular: !!options.modular,
+        toJS: !!options.js,
+        enumNamesAsValues: options.enumNamesAsValues,
+        moduleNameIndex: +(options.moduleNameIndex || 0),
+        moduleNameFirstTag: options.moduleNameFirstTag,
+        disableStrictSSL: !!options.disableStrictSSL,
+        disableProxy: !!options.disableProxy,
+        singleHttpClient: !!options.singleHttpClient,
+        cleanOutput: !!options.cleanOutput,
+        silent: !!options.silent,
+        typePrefix: options.typePrefix,
+        typeSuffix: options.typeSuffix,
+        patch: !!options.patch,
+        apiClassName: options.apiClassName,
+        debug: options.debug,
+        anotherArrayType: options.anotherArrayType,
+      });
+      break;
+    }
+    case "generate-templates": {
+      console.info("todo");
+      break;
+    }
+    default: {
+      break;
+    }
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-typescript-api",
-  "version": "11.0.0--alpha-2",
+  "version": "11.0.0--alpha-5",
   "description": "Generate typescript/javascript api from swagger schema",
   "scripts": {
     "cli:json": "node index.js -r -d -p ./swagger-test-cli.json -n swagger-test-cli.ts",

package/src/code-gen-process.js

@@ -53,6 +53,10 @@ class CodeGenProcess {
    */
   codeFormatter;
 
+  /**
+   *
+   * @param config {Partial<import("../index.d.ts").GenerateApiConfiguration['config']>}
+   */
   constructor(config) {
     this.config = new Configuration(config);
     this.logger = new Logger(this.config);

package/src/configuration.js

@@ -293,52 +293,17 @@ class Configuration {
 
   templateExtensions = [".eta", ".ejs"];
 
+  /**
+   * @param config {Partial<GenerateApiConfiguration['config']>}
+   */
   constructor({
-    input,
-    output,
-    url,
-    spec,
-    name: fileName,
-    toJS,
-    modular,
-    templates,
-    generateResponses,
-    defaultResponseAsSuccess,
-    generateRouteTypes,
-    generateClient,
-    httpClientType,
-    generateUnionEnums,
-    addReadonly,
-    moduleNameIndex,
-    moduleNameFirstTag,
-    extractRequestParams,
-    extractRequestBody,
-    extractResponseBody,
-    extractResponseError,
-    defaultResponseType,
-    unwrapResponseData,
-    disableThrowOnError,
-    sortTypes,
-    singleHttpClient,
-    prettier: prettierOptions = getDefaultPrettierOptions(),
-    hooks: rawHooks,
-    extraTemplates,
-    enumNamesAsValues,
-    disableStrictSSL,
-    disableProxy,
-    cleanOutput,
-    silent,
-    typePrefix,
-    typeSuffix,
-    patch,
-    authorizationToken,
-    apiClassName,
-    debug,
-    anotherArrayType,
+    prettierOptions = getDefaultPrettierOptions(),
     codeGenConstructs,
     primitiveTypeConstructs,
     constants,
     templateInfos,
+    hooks,
+    ...params
   }) {
     objectAssign(this.Ts, codeGenConstructs);
     objectAssign(this.primitiveTypes, primitiveTypeConstructs);
@@ -346,52 +311,14 @@ class Configuration {
     this.defaultResponseType = this.Ts.Keyword.Void;
 
     this.update({
-      input,
-      output,
-      url,
-      spec,
-      fileName,
-      extraTemplates,
-      defaultResponseAsSuccess,
-      generateRouteTypes,
-      generateClient,
-      httpClientType,
-      generateResponses,
-      templates,
-      generateUnionEnums,
-      addReadonly,
-      moduleNameIndex,
-      moduleNameFirstTag,
-      prettierOptions,
-      modular,
-      extractRequestParams,
-      extractRequestBody,
-      extractResponseBody,
-      extractResponseError,
-      hooks: _.merge(this.hooks, rawHooks || {}),
-      enumNamesAsValues,
-      disableStrictSSL,
-      disableProxy,
-      cleanOutput,
-      defaultResponseType,
-      unwrapResponseData,
-      disableThrowOnError,
-      sortTypes,
-      singleHttpClient,
+      ...params,
+      prettierOptions: prettierOptions === undefined ? getDefaultPrettierOptions() : prettierOptions,
+      hooks: _.merge(this.hooks, hooks || {}),
       constants: {
         ...constantsBase,
         ...constants,
       },
-      authorizationToken,
-      silent,
-      toJS,
-      typePrefix,
-      typeSuffix,
-      patch,
-      apiClassName,
-      debug,
-      anotherArrayType,
-      templateInfos,
+      templateInfos: templateInfos || this.templateInfos,
     });
 
     this.jsPrimitiveTypes = [this.Ts.Keyword.Number, this.Ts.Keyword.String, this.Ts.Keyword.Boolean];

package/src/index.js

@@ -12,8 +12,12 @@ const { CodeGenProcess } = require("./code-gen-process.js");
 
 module.exports = {
   constants: constants,
-  generateApi: async (config) => {
-    const codeGenProcess = new CodeGenProcess(config);
+  generateApi: async ({ name, prettier, ...config }) => {
+    const codeGenProcess = new CodeGenProcess({
+      ...config,
+      fileName: name,
+      prettierOptions: prettier,
+    });
     return await codeGenProcess.start();
   },
   generateTemplates: (config) => {},

package/src/util/object-assign.js

@@ -2,8 +2,12 @@ const _ = require("lodash");
 
 const objectAssign = (target, updaterFn) => {
   if (!updaterFn) return;
-  const updated = typeof updaterFn === "function" ? updaterFn(target) : updaterFn;
-  Object.assign(target, _.merge(target, updated));
+  const update = typeof updaterFn === "function" ? updaterFn(target) : updaterFn;
+  const undefinedKeys = _.map(update, (value, key) => value === undefined && key).filter(Boolean);
+  Object.assign(target, _.merge(target, update));
+  undefinedKeys.forEach((key) => {
+    target[key] = undefined;
+  });
 };
 
 module.exports = {

package/templates/base/interface-data-contract.ejs

@@ -1,7 +1,6 @@
 <%
 const { contract, utils } = it;
 const { formatDescription, require, _ } = utils;
-console.info('contract', contract.name, contract)
 %>
 export interface <%~ contract.name %> {
   <% _.forEach(contract.$content, (field) => { %>