openapi-sync 1.0.21 → 1.0.22

package/dist/Openapi-sync/components/helpers.js

@@ -106,7 +106,7 @@ const getEndpointDetails = (path, method) => {
 };
 exports.getEndpointDetails = getEndpointDetails;
 const parseSchemaToType = (apiDoc, schema, name, isRequired, options) => {
-    let typeName = name ? `\t${name}${isRequired ? "" : "?"}: ` : "";
+    let typeName = name ? `\t"${name}"${isRequired ? "" : "?"}: ` : "";
     let type = "";
     if (schema) {
         if (schema.$ref) {
@@ -142,6 +142,25 @@ const parseSchemaToType = (apiDoc, schema, name, isRequired, options) => {
                 .map((v) => (0, exports.parseSchemaToType)(apiDoc, v, "", isRequired, options))
                 .join("&")})`;
         }
+        else if (schema.items) {
+            type += `${(0, exports.parseSchemaToType)(apiDoc, schema.items, "", false, options)}[]`;
+        }
+        else if (schema.properties) {
+            //parse object key one at a time
+            const objKeys = Object.keys(schema.properties);
+            const requiredKeys = schema.required || [];
+            let typeCnt = "";
+            objKeys.forEach((key) => {
+                var _a;
+                typeCnt += `${(0, exports.parseSchemaToType)(apiDoc, (_a = schema.properties) === null || _a === void 0 ? void 0 : _a[key], key, requiredKeys.includes(key), options)}`;
+            });
+            if (typeCnt.length > 0) {
+                type += `{\n${typeCnt}}`;
+            }
+            else {
+                type += "{[k: string]: any}";
+            }
+        }
         else if (schema.type) {
             if (schema.enum && schema.enum.length > 0) {
                 if (schema.enum.length > 1)
@@ -158,36 +177,31 @@ const parseSchemaToType = (apiDoc, schema, name, isRequired, options) => {
                     type += `number`;
                 }
                 else if (schema.type === "array") {
-                    if (schema.items) {
-                        type += `${(0, exports.parseSchemaToType)(apiDoc, schema.items, "", false, options)}[]`;
-                    }
-                    else {
-                        type += "any[]";
-                    }
+                    //Since we would have already parsed the arrays keys above "schema.items" if it exists
+                    type += "any[]";
+                    /* if (schema.items) {
+                      type += `${parseSchemaToType(
+                        apiDoc,
+                        schema.items,
+                        "",
+                        false,
+                        options
+                      )}[]`;
+                    } else {
+                      type += "any[]";
+                    } */
                 }
                 else {
                     type += schema.type;
                 }
             }
             else if (schema.type === "object") {
-                if (schema.properties) {
-                    //parse object key one at a time
-                    const objKeys = Object.keys(schema.properties);
-                    const requiredKeys = schema.required || [];
-                    let typeCnt = "";
-                    objKeys.forEach((key) => {
-                        var _a;
-                        typeCnt += `${(0, exports.parseSchemaToType)(apiDoc, (_a = schema.properties) === null || _a === void 0 ? void 0 : _a[key], key, requiredKeys.includes(key), options)}`;
-                    });
-                    if (typeCnt.length > 0) {
-                        type += `{\n${typeCnt}}`;
-                    }
-                    else {
-                        type += "object";
-                    }
+                //Since we would have already parsed the object keys above "schema.properties" if it exists
+                if (schema.additionalProperties) {
+                    type += `{[k: string]: ${(0, exports.parseSchemaToType)(apiDoc, schema.additionalProperties, "", true, options)}}`;
                 }
                 else {
-                    type += "object";
+                    type += "{[k: string]: any}";
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-sync",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "description": "A developer-friendly tool designed to keep your API up-to-date by leveraging OpenAPI schemas. It automates the generation of endpoint URIs and type definitions, including shared types, directly from your OpenAPI specification.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",