swagger-typescript-api 13.0.7 → 13.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-typescript-api",
-  "version": "13.0.7",
+  "version": "13.0.8",
   "description": "Generate TypeScript/JavaScript API from Swagger schema",
   "homepage": "https://github.com/acacode/swagger-typescript-api",
   "bugs": "https://github.com/acacode/swagger-typescript-api/issues",
@@ -46,12 +46,15 @@
     "prettier": "~3.3.2",
     "swagger-schema-official": "2.0.0-bab6bed",
     "swagger2openapi": "^7.0.8",
-    "typescript": "~5.4.5"
+    "typescript": "~5.5.2"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.8.1",
+    "@biomejs/biome": "1.8.2",
+    "@types/didyoumean": "1.2.2",
+    "@types/js-yaml": "4.0.9",
     "@types/lodash": "4.17.5",
-    "@types/node": "20.14.5",
+    "@types/node": "20.14.7",
+    "@types/swagger2openapi": "7.0.4",
     "axios": "1.7.2",
     "shx": "0.3.4",
     "vitest": "1.6.0"

package/src/code-formatter.js

@@ -23,7 +23,7 @@ class CodeFormatter {
       { newLineCharacter: ts.sys.newLine },
     )[0];
 
-    if (fileTextChanges && fileTextChanges.textChanges.length) {
+    if (fileTextChanges?.textChanges.length) {
       return _.reduceRight(
         fileTextChanges.textChanges,
         (content, { span, newText }) =>

package/src/code-gen-process.js

@@ -533,7 +533,7 @@ class CodeGenProcess {
 
   createApiConfig = (swaggerSchema) => {
     const { info, servers, host, basePath, externalDocs, tags } = swaggerSchema;
-    const server = (servers && servers[0]) || { url: "" };
+    const server = servers?.[0] || { url: "" };
     const { title = "No title", version } = info || {};
     const { url: serverUrl } = server;
 

package/src/configuration.js

@@ -198,7 +198,7 @@ class CodeGenConfig {
   };
 
   compilerTsConfig = {
-    module: "ESNext",
+    module: ts.ModuleKind.ESNext,
     noImplicitReturns: true,
     alwaysStrict: true,
     target: ts.ScriptTarget.ESNext,

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

@@ -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)) {

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

@@ -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) => {

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

@@ -213,10 +213,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,

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

@@ -33,13 +33,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 +143,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),
       );

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

@@ -160,7 +160,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 +220,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 +341,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 +506,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,
@@ -640,10 +634,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 +883,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;
     }

package/src/util/file-system.js

@@ -25,7 +25,7 @@ class FileSystem {
   }
 
   getFileContent = (path) => {
-    return fs.readFileSync(path, { encoding: "UTF-8" });
+    return fs.readFileSync(path, { encoding: "utf8" });
   };
 
   readDir = (path) => {