swagger-typescript-api 13.0.7 → 13.0.9

package/src/schema-parser/base-schema-parsers/enum.js

@@ -1,7 +1,7 @@
-const { MonoSchemaParser } = require("../mono-schema-parser");
-const _ = require("lodash");
-const { SCHEMA_TYPES } = require("../../constants");
-const { EnumKeyResolver } = require("../util/enum-key-resolver");
+import _ from "lodash";
+import { SCHEMA_TYPES } from "../../constants.js";
+import { MonoSchemaParser } from "../mono-schema-parser.js";
+import { EnumKeyResolver } from "../util/enum-key-resolver.js";
 
 class EnumSchemaParser extends MonoSchemaParser {
   /** @type {EnumKeyResolver} */
@@ -38,7 +38,7 @@ class EnumSchemaParser extends MonoSchemaParser {
     }
 
     const refType = this.schemaUtils.getSchemaRefType(this.schema);
-    const $ref = (refType && refType.$ref) || null;
+    const $ref = refType?.$ref || null;
 
     // fix schema when enum has length 1+ but value is []
     if (Array.isArray(this.schema.enum)) {
@@ -153,6 +153,4 @@ class EnumSchemaParser extends MonoSchemaParser {
   };
 }
 
-module.exports = {
-  EnumSchemaParser,
-};
+export { EnumSchemaParser };

package/src/schema-parser/base-schema-parsers/object.js

@@ -1,6 +1,6 @@
-const { MonoSchemaParser } = require("../mono-schema-parser");
-const _ = require("lodash");
-const { SCHEMA_TYPES } = require("../../constants");
+import _ from "lodash";
+import { SCHEMA_TYPES } from "../../constants.js";
+import { MonoSchemaParser } from "../mono-schema-parser.js";
 
 class ObjectSchemaParser extends MonoSchemaParser {
   parse() {
@@ -100,6 +100,4 @@ class ObjectSchemaParser extends MonoSchemaParser {
   };
 }
 
-module.exports = {
-  ObjectSchemaParser,
-};
+export { ObjectSchemaParser };

package/src/schema-parser/base-schema-parsers/primitive.js

@@ -1,6 +1,6 @@
-const { MonoSchemaParser } = require("../mono-schema-parser");
-const _ = require("lodash");
-const { SCHEMA_TYPES } = require("../../constants");
+import _ from "lodash";
+import { SCHEMA_TYPES } from "../../constants.js";
+import { MonoSchemaParser } from "../mono-schema-parser.js";
 
 class PrimitiveSchemaParser extends MonoSchemaParser {
   parse() {
@@ -58,6 +58,4 @@ class PrimitiveSchemaParser extends MonoSchemaParser {
   }
 }
 
-module.exports = {
-  PrimitiveSchemaParser,
-};
+export { PrimitiveSchemaParser };

package/src/schema-parser/complex-schema-parsers/all-of.js

@@ -1,5 +1,5 @@
-const { MonoSchemaParser } = require("../mono-schema-parser");
-const _ = require("lodash");
+import _ from "lodash";
+import { MonoSchemaParser } from "../mono-schema-parser.js";
 
 // T1 & T2
 class AllOfSchemaParser extends MonoSchemaParser {
@@ -23,4 +23,4 @@ class AllOfSchemaParser extends MonoSchemaParser {
   }
 }
 
-module.exports = { AllOfSchemaParser };
+export { AllOfSchemaParser };

package/src/schema-parser/complex-schema-parsers/any-of.js

@@ -1,5 +1,5 @@
-const { MonoSchemaParser } = require("../mono-schema-parser");
-const _ = require("lodash");
+import _ from "lodash";
+import { MonoSchemaParser } from "../mono-schema-parser.js";
 
 // T1 | T2
 class AnyOfSchemaParser extends MonoSchemaParser {
@@ -24,4 +24,4 @@ class AnyOfSchemaParser extends MonoSchemaParser {
   }
 }
 
-module.exports = { AnyOfSchemaParser };
+export { AnyOfSchemaParser };

package/src/schema-parser/complex-schema-parsers/not.js

@@ -1,4 +1,4 @@
-const { MonoSchemaParser } = require("../mono-schema-parser");
+import { MonoSchemaParser } from "../mono-schema-parser.js";
 
 class NotSchemaParser extends MonoSchemaParser {
   parse() {
@@ -6,4 +6,4 @@ class NotSchemaParser extends MonoSchemaParser {
   }
 }
 
-module.exports = { NotSchemaParser };
+export { NotSchemaParser };

package/src/schema-parser/complex-schema-parsers/one-of.js

@@ -1,5 +1,5 @@
-const { MonoSchemaParser } = require("../mono-schema-parser");
-const _ = require("lodash");
+import _ from "lodash";
+import { MonoSchemaParser } from "../mono-schema-parser.js";
 
 // T1 | T2
 class OneOfSchemaParser extends MonoSchemaParser {
@@ -24,4 +24,4 @@ class OneOfSchemaParser extends MonoSchemaParser {
   }
 }
 
-module.exports = { OneOfSchemaParser };
+export { OneOfSchemaParser };

package/src/schema-parser/mono-schema-parser.js

@@ -43,6 +43,4 @@ class MonoSchemaParser {
   };
 }
 
-module.exports = {
-  MonoSchemaParser,
-};
+export { MonoSchemaParser };

package/src/schema-parser/schema-formatters.js

@@ -1,5 +1,5 @@
-const { SCHEMA_TYPES } = require("../constants");
-const _ = require("lodash");
+import _ from "lodash";
+import { SCHEMA_TYPES } from "../constants.js";
 
 class SchemaFormatters {
   /** @type {CodeGenConfig} */
@@ -105,7 +105,7 @@ class SchemaFormatters {
       _.get(parsedSchema, ["schemaType"]) ||
       _.get(parsedSchema, ["$parsed", "schemaType"]);
     const formatterFn = _.get(this, [formatType, schemaType]);
-    return (formatterFn && formatterFn(parsedSchema)) || parsedSchema;
+    return formatterFn?.(parsedSchema) || parsedSchema;
   };
 
   formatDescription = (description, inline) => {
@@ -161,6 +161,4 @@ class SchemaFormatters {
   };
 }
 
-module.exports = {
-  SchemaFormatters,
-};
+export { SchemaFormatters };

package/src/schema-parser/schema-parser-fabric.js

@@ -1,7 +1,7 @@
-const _ = require("lodash");
-const { SchemaFormatters } = require("./schema-formatters");
-const { SchemaUtils } = require("./schema-utils");
-const { SchemaParser } = require("./schema-parser");
+import _ from "lodash";
+import { SchemaFormatters } from "./schema-formatters.js";
+import { SchemaParser } from "./schema-parser.js";
+import { SchemaUtils } from "./schema-utils.js";
 
 class SchemaParserFabric {
   /** @type {CodeGenConfig} */
@@ -127,6 +127,4 @@ class SchemaParserFabric {
   };
 }
 
-module.exports = {
-  SchemaParserFabric,
-};
+export { SchemaParserFabric };

package/src/schema-parser/schema-parser.js

@@ -1,21 +1,18 @@
-/* eslint-disable no-unused-vars */
-const { SCHEMA_TYPES } = require("../constants.js");
-const _ = require("lodash");
-const { SchemaFormatters } = require("./schema-formatters");
-const { SchemaUtils } = require("./schema-utils");
-const {
-  DiscriminatorSchemaParser,
-} = require("./base-schema-parsers/discriminator");
-const { EnumSchemaParser } = require("./base-schema-parsers/enum");
-const { ObjectSchemaParser } = require("./base-schema-parsers/object");
-const { PrimitiveSchemaParser } = require("./base-schema-parsers/primitive");
-const { ComplexSchemaParser } = require("./base-schema-parsers/complex");
-const { OneOfSchemaParser } = require("./complex-schema-parsers/one-of");
-const { AllOfSchemaParser } = require("./complex-schema-parsers/all-of");
-const { AnyOfSchemaParser } = require("./complex-schema-parsers/any-of");
-const { NotSchemaParser } = require("./complex-schema-parsers/not");
-const { ArraySchemaParser } = require("./base-schema-parsers/array");
-const { sortByProperty } = require("../util/sort-by-property");
+import _ from "lodash";
+import { SCHEMA_TYPES } from "../constants.js";
+import { sortByProperty } from "../util/sort-by-property.js";
+import { ArraySchemaParser } from "./base-schema-parsers/array.js";
+import { ComplexSchemaParser } from "./base-schema-parsers/complex.js";
+import { DiscriminatorSchemaParser } from "./base-schema-parsers/discriminator.js";
+import { EnumSchemaParser } from "./base-schema-parsers/enum.js";
+import { ObjectSchemaParser } from "./base-schema-parsers/object.js";
+import { PrimitiveSchemaParser } from "./base-schema-parsers/primitive.js";
+import { AllOfSchemaParser } from "./complex-schema-parsers/all-of.js";
+import { AnyOfSchemaParser } from "./complex-schema-parsers/any-of.js";
+import { NotSchemaParser } from "./complex-schema-parsers/not.js";
+import { OneOfSchemaParser } from "./complex-schema-parsers/one-of.js";
+import { SchemaFormatters } from "./schema-formatters.js";
+import { SchemaUtils } from "./schema-utils.js";
 
 class SchemaParser {
   /** @type {SchemaParserFabric} */
@@ -213,10 +210,7 @@ class SchemaParser {
         this.schema = { type: this.config.Ts.Keyword.Null };
       }
       // schema is response schema
-      if (
-        "content" in this.schema &&
-        typeof this.schema["content"] === "object"
-      ) {
+      if ("content" in this.schema && typeof this.schema.content === "object") {
         const schema = this.extractSchemaFromResponseStruct(this.schema);
         const schemaParser = this.schemaParserFabric.createSchemaParser({
           schema,
@@ -298,6 +292,4 @@ class SchemaParser {
   };
 }
 
-module.exports = {
-  SchemaParser,
-};
+export { SchemaParser };

package/src/schema-parser/schema-utils.js

@@ -1,8 +1,7 @@
-const _ = require("lodash");
-const { SCHEMA_TYPES } = require("../constants");
-const { internalCase } = require("../util/internal-case");
-const { pascalCase } = require("../util/pascal-case");
-const { camelCase } = require("lodash");
+import _ from "lodash";
+import { SCHEMA_TYPES } from "../constants.js";
+import { internalCase } from "../util/internal-case.js";
+import { pascalCase } from "../util/pascal-case.js";
 
 class SchemaUtils {
   /** @type {CodeGenConfig} */
@@ -33,13 +32,13 @@ class SchemaUtils {
   };
 
   isRefSchema = (schema) => {
-    return !!(schema && schema["$ref"]);
+    return !!schema?.$ref;
   };
 
   getEnumNames = (schema) => {
     return (
       schema["x-enumNames"] ||
-      schema["xEnumNames"] ||
+      schema.xEnumNames ||
       schema["x-enumnames"] ||
       schema["x-enum-varnames"]
     );
@@ -143,9 +142,7 @@ class SchemaUtils {
     const refData = this.getSchemaRefType(childSchema);
 
     if (refData) {
-      const refObjectProperties = _.keys(
-        (refData.rawTypeData && refData.rawTypeData.properties) || {},
-      );
+      const refObjectProperties = _.keys(refData.rawTypeData?.properties || {});
       const existedRequiredKeys = refObjectProperties.filter((key) =>
         required.includes(key),
       );
@@ -287,7 +284,7 @@ class SchemaUtils {
     if (!schemaPath || !schemaPath[0]) return null;
 
     return pascalCase(
-      camelCase(
+      _.camelCase(
         _.uniq([schemaPath[0], schemaPath[schemaPath.length - 1]]).join("_"),
       ),
     );
@@ -319,6 +316,4 @@ class SchemaUtils {
   };
 }
 
-module.exports = {
-  SchemaUtils,
-};
+export { SchemaUtils };

package/src/schema-parser/util/enum-key-resolver.js

@@ -1,4 +1,4 @@
-const { NameResolver } = require("../../util/name-resolver");
+import { NameResolver } from "../../util/name-resolver.js";
 
 class EnumKeyResolver extends NameResolver {
   counter = 1;
@@ -21,6 +21,4 @@ class EnumKeyResolver extends NameResolver {
   }
 }
 
-module.exports = {
-  EnumKeyResolver,
-};
+export { EnumKeyResolver };

package/src/schema-routes/schema-routes.js

@@ -1,16 +1,13 @@
-const _ = require("lodash");
-const { generateId } = require("../util/id.js");
-const {
-  SpecificArgNameResolver,
-} = require("./util/specific-arg-name-resolver");
-const {
+import _ from "lodash";
+import {
   DEFAULT_BODY_ARG_NAME,
   RESERVED_BODY_ARG_NAMES,
   RESERVED_HEADER_ARG_NAMES,
   RESERVED_PATH_ARG_NAMES,
   RESERVED_QUERY_ARG_NAMES,
-} = require("../constants.js");
-const { camelCase } = require("lodash");
+} from "../constants.js";
+import { generateId } from "../util/id.js";
+import { SpecificArgNameResolver } from "./util/specific-arg-name-resolver.js";
 
 const CONTENT_KIND = {
   JSON: "JSON",
@@ -160,7 +157,7 @@ class SchemaRoutes {
     const queryParamMatches = fixedRoute.match(/(\{\?.*\})/g);
     const queryParams = [];
 
-    if (queryParamMatches && queryParamMatches.length) {
+    if (queryParamMatches?.length) {
       queryParamMatches.forEach((match) => {
         fixedRoute = fixedRoute.replace(match, "");
       });
@@ -220,11 +217,7 @@ class SchemaRoutes {
         this.schemaParserFabric.schemaUtils.getSchemaRefType(parameter);
       let routeParam = null;
 
-      if (
-        refTypeInfo &&
-        refTypeInfo.rawTypeData.in &&
-        refTypeInfo.rawTypeData
-      ) {
+      if (refTypeInfo?.rawTypeData.in && refTypeInfo.rawTypeData) {
         if (!routeParams[refTypeInfo.rawTypeData.in]) {
           routeParams[refTypeInfo.rawTypeData.in] = [];
         }
@@ -345,7 +338,7 @@ class SchemaRoutes {
 
     /* for example: dataType = "multipart/form-data" */
     for (const dataType in content) {
-      if (content[dataType] && content[dataType].schema) {
+      if (content[dataType]?.schema) {
         return {
           ...content[dataType].schema,
           dataType,
@@ -510,9 +503,7 @@ class SchemaRoutes {
       responses: responseInfos,
       success: {
         schema: successResponse,
-        type:
-          (successResponse && successResponse.type) ||
-          this.config.Ts.Keyword.Any,
+        type: successResponse?.type || this.config.Ts.Keyword.Any,
       },
       error: {
         schemas: errorResponses,
@@ -546,7 +537,7 @@ class SchemaRoutes {
         let usageName = `${schemaPart.name}`;
 
         if (usageName.includes(".")) {
-          usageName = camelCase(usageName);
+          usageName = _.camelCase(usageName);
         }
 
         return {
@@ -640,10 +631,7 @@ class SchemaRoutes {
     }
 
     return {
-      paramName:
-        requestBodyName ||
-        (requestBody && requestBody.name) ||
-        DEFAULT_BODY_ARG_NAME,
+      paramName: requestBodyName || requestBody?.name || DEFAULT_BODY_ARG_NAME,
       contentTypes,
       contentKind,
       schema,
@@ -892,7 +880,7 @@ class SchemaRoutes {
       moduleNameFirstTag && firstTag
         ? _.camelCase(firstTag)
         : _.camelCase(_.compact(_.split(route, "/"))[moduleNameIndex]);
-    let hasSecurity = !!(globalSecurity && globalSecurity.length);
+    let hasSecurity = !!globalSecurity?.length;
     if (security) {
       hasSecurity = security.length > 0;
     }
@@ -1217,6 +1205,4 @@ class SchemaRoutes {
   };
 }
 
-module.exports = {
-  SchemaRoutes,
-};
+export { SchemaRoutes };

package/src/schema-routes/util/specific-arg-name-resolver.js

@@ -1,4 +1,4 @@
-const { NameResolver } = require("../../util/name-resolver");
+import { NameResolver } from "../../util/name-resolver.js";
 
 class SpecificArgNameResolver extends NameResolver {
   counter = 1;
@@ -21,6 +21,4 @@ class SpecificArgNameResolver extends NameResolver {
   }
 }
 
-module.exports = {
-  SpecificArgNameResolver,
-};
+export { SpecificArgNameResolver };

package/src/schema-walker.js

@@ -1,4 +1,4 @@
-const _ = require("lodash");
+import _ from "lodash";
 
 // TODO: WIP
 // this class will be needed to walk by schema everywhere
@@ -88,6 +88,4 @@ class SchemaWalker {
   };
 }
 
-module.exports = {
-  SchemaWalker,
-};
+export { SchemaWalker };

package/src/swagger-schema-resolver.js

@@ -1,7 +1,7 @@
-const _ = require("lodash");
-const converter = require("swagger2openapi");
-const yaml = require("js-yaml");
-const { Request } = require("./util/request");
+import yaml from "js-yaml";
+import _ from "lodash";
+import converter from "swagger2openapi";
+import { Request } from "./util/request.js";
 
 class SwaggerSchemaResolver {
   /**
@@ -192,6 +192,4 @@ class SwaggerSchemaResolver {
   }
 }
 
-module.exports = {
-  SwaggerSchemaResolver,
-};
+export { SwaggerSchemaResolver };

package/src/templates-worker.js

@@ -1,7 +1,8 @@
-const { resolve } = require("node:path");
-const _ = require("lodash");
-const Eta = require("eta");
-const path = require("node:path");
+import { resolve } from "node:path";
+import path from "node:path";
+import url from "node:url";
+import * as Eta from "eta";
+import _ from "lodash";
 
 class TemplatesWorker {
   /**
@@ -34,6 +35,7 @@ class TemplatesWorker {
    * @returns {CodeGenConfig.templatePaths}
    */
   getTemplatePaths = (config) => {
+    const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
     const baseTemplatesPath = resolve(__dirname, "../templates/base");
     const defaultTemplatesPath = resolve(__dirname, "../templates/default");
     const modularTemplatesPath = resolve(__dirname, "../templates/modular");
@@ -238,6 +240,4 @@ class TemplatesWorker {
   };
 }
 
-module.exports = {
-  TemplatesWorker,
-};
+export { TemplatesWorker };

package/src/translators/javascript.js

@@ -1,5 +1,5 @@
-const ts = require("typescript");
-const { Translator } = require("./translator");
+import ts from "typescript";
+import { Translator } from "./translator.js";
 
 class JavascriptTranslator extends Translator {
   /**
@@ -78,6 +78,4 @@ class JavascriptTranslator extends Translator {
   };
 }
 
-module.exports = {
-  JavascriptTranslator,
-};
+export { JavascriptTranslator };

package/src/translators/translator.js

@@ -30,6 +30,4 @@ class Translator {
   }
 }
 
-module.exports = {
-  Translator,
-};
+export { Translator };

package/src/type-name-formatter.js

@@ -1,4 +1,4 @@
-const _ = require("lodash");
+import _ from "lodash";
 
 /**
  * @typedef {"enum-key" | "type-name"} FormattingSchemaType
@@ -108,6 +108,4 @@ class TypeNameFormatter {
   };
 }
 
-module.exports = {
-  TypeNameFormatter,
-};
+export { TypeNameFormatter };

package/src/util/file-system.js

@@ -1,7 +1,8 @@
-const fs = require("node:fs");
-const { resolve } = require("node:path");
-const _ = require("lodash");
-const { Logger } = require("./logger");
+import fs from "node:fs";
+import { dirname, resolve } from "node:path";
+import url from "node:url";
+import _ from "lodash";
+import { Logger } from "./logger.js";
 
 const FILE_PREFIX = `/* eslint-disable */
 /* tslint:disable */
@@ -25,7 +26,7 @@ class FileSystem {
   }
 
   getFileContent = (path) => {
-    return fs.readFileSync(path, { encoding: "UTF-8" });
+    return fs.readFileSync(path, { encoding: "utf8" });
   };
 
   readDir = (path) => {
@@ -83,6 +84,7 @@ class FileSystem {
   };
 
   createFile = ({ path, fileName, content, withPrefix }) => {
+    const __dirname = dirname(url.fileURLToPath(import.meta.url));
     const absolutePath = resolve(__dirname, path, `./${fileName}`);
     const fileContent = `${withPrefix ? FILE_PREFIX : ""}${content}`;
 
@@ -90,6 +92,4 @@ class FileSystem {
   };
 }
 
-module.exports = {
-  FileSystem,
-};
+export { FileSystem };

package/src/util/id.js

@@ -1,9 +1,7 @@
-const { customAlphabet } = require("nanoid");
+import { customAlphabet } from "nanoid";
 
 const ALPHABET = "abcdefghijklmnopqrstuvwxyz0123456789";
 
 const generateId = customAlphabet(ALPHABET, 12);
 
-module.exports = {
-  generateId,
-};
+export { generateId };

package/src/util/internal-case.js

@@ -1,5 +1,7 @@
-const _ = require("lodash");
+import _ from "lodash";
 
-module.exports = {
-  internalCase: (value) => _.camelCase(_.lowerCase(value)),
-};
+function internalCase(value) {
+  return _.camelCase(_.lowerCase(value));
+}
+
+export { internalCase };

package/src/util/logger.js

@@ -1,5 +1,5 @@
-const { emojify } = require("node-emoji");
-const _ = require("lodash");
+import _ from "lodash";
+import { emojify } from "node-emoji";
 
 class Logger {
   firstLog = true;
@@ -139,6 +139,4 @@ class Logger {
   };
 }
 
-module.exports = {
-  Logger,
-};
+export { Logger };

package/src/util/name-resolver.js

@@ -1,4 +1,4 @@
-const _ = require("lodash");
+import _ from "lodash";
 
 class NameResolver {
   reservedNames = [];
@@ -100,6 +100,4 @@ class NameResolver {
   }
 }
 
-module.exports = {
-  NameResolver,
-};
+export { NameResolver };

package/src/util/object-assign.js

@@ -1,4 +1,4 @@
-const _ = require("lodash");
+import _ from "lodash";
 
 const objectAssign = (target, updaterFn) => {
   if (!updaterFn) return;
@@ -14,6 +14,4 @@ const objectAssign = (target, updaterFn) => {
   });
 };
 
-module.exports = {
-  objectAssign,
-};
+export { objectAssign };

package/src/util/pascal-case.js

@@ -1,5 +1,7 @@
-const _ = require("lodash");
+import _ from "lodash";
 
-module.exports = {
-  pascalCase: (value) => _.upperFirst(_.camelCase(value)),
-};
+function pascalCase(value) {
+  return _.upperFirst(_.camelCase(value));
+}
+
+export { pascalCase };