@gopowerteam/request-generate 0.1.13 → 0.1.15

package/dist/index.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var _class; var _class2; var _class3;
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } var _class; var _class2; var _class3;
 
 var _chunkXXPGZHWZjs = require('./chunk-XXPGZHWZ.js');
 
@@ -91,8 +91,16 @@ var Field = class {
   }
 };
 
-// src/utils/get-mapped-type.ts
+// src/utils/get-built-in-type.ts
 var TYPE_MAPPINGS = /* @__PURE__ */ new Map([
+  ["MapStringObject", "Record<string, any>"]
+]);
+var getBuiltInType = (ref) => {
+  return TYPE_MAPPINGS.get(ref);
+};
+
+// src/utils/get-mapped-type.ts
+var TYPE_MAPPINGS2 = /* @__PURE__ */ new Map([
   ["file", "binary"],
   ["any", "any"],
   ["object", "any"],
@@ -118,7 +126,7 @@ var getMappedType = (type = "object", format) => {
   if (format === "binary") {
     return "binary";
   }
-  return TYPE_MAPPINGS.get(type) || "any";
+  return TYPE_MAPPINGS2.get(type) || "any";
 };
 
 // src/parse/v2/strip-namespace.ts
@@ -145,10 +153,11 @@ function parseSchemaType(schema) {
   }
   if (!("$ref" in schema) && schema.type === "array" && schema.items && "$ref" in schema.items && schema.items.$ref) {
     const ref = getCamelName(stripNamespace(schema.items.$ref));
+    const type = getBuiltInType(ref);
     return {
       type: "any[]",
-      ref: `${ref}[]`,
-      imports: [ref]
+      ref: `${_nullishCoalesce(type, () => ( ref))}[]`,
+      imports: type ? void 0 : [ref]
     };
   }
   if (!("$ref" in schema) && schema.type === "array" && schema.items && !("$ref" in schema.items)) {
@@ -367,9 +376,7 @@ function parseParametersQuery(parameters) {
       parameter.imports = imports || [];
       parameter.enums = enums;
       if (p.name.includes(".") && !p.name.startsWith(".") && !p.name.endsWith(".")) {
-        const [name, subName] = p.name.split(".");
-        parameter.name = name;
-        parameter.ref = `{ ${subName}${parameter.required ? "?" : ""}: ${ref || "any"} }`;
+        parameter.name = `"${p.name}"`;
       }
       r.push(parameter);
     }
@@ -498,10 +505,11 @@ function parseSchemaType2(schema) {
   }
   if (schema.type === "array" && "$ref" in schema.items) {
     const ref = getCamelName(stripNamespace2(schema.items.$ref));
+    const type = getBuiltInType(ref);
     return {
       type: "any[]",
-      ref: `${ref}[]`,
-      imports: [ref]
+      ref: `${_nullishCoalesce(type, () => ( ref))}[]`,
+      imports: type ? void 0 : [ref]
     };
   }
   if (schema.type === "array" && !("$ref" in schema.items)) {
@@ -635,6 +643,9 @@ function parseParametersQuery2(parameters) {
       parameter.required = p.required;
       parameter.imports = imports || [];
       parameter.enums = enums;
+      if (p.name.includes(".") && !p.name.startsWith(".") && !p.name.endsWith(".")) {
+        parameter.name = `"${p.name}"`;
+      }
       r.push(parameter);
     }
     return r;

package/dist/index.mjs

@@ -92,8 +92,16 @@ var Field = class {
   }
 };
 
-// src/utils/get-mapped-type.ts
+// src/utils/get-built-in-type.ts
 var TYPE_MAPPINGS = /* @__PURE__ */ new Map([
+  ["MapStringObject", "Record<string, any>"]
+]);
+var getBuiltInType = (ref) => {
+  return TYPE_MAPPINGS.get(ref);
+};
+
+// src/utils/get-mapped-type.ts
+var TYPE_MAPPINGS2 = /* @__PURE__ */ new Map([
   ["file", "binary"],
   ["any", "any"],
   ["object", "any"],
@@ -119,7 +127,7 @@ var getMappedType = (type = "object", format) => {
   if (format === "binary") {
     return "binary";
   }
-  return TYPE_MAPPINGS.get(type) || "any";
+  return TYPE_MAPPINGS2.get(type) || "any";
 };
 
 // src/parse/v2/strip-namespace.ts
@@ -146,10 +154,11 @@ function parseSchemaType(schema) {
   }
   if (!("$ref" in schema) && schema.type === "array" && schema.items && "$ref" in schema.items && schema.items.$ref) {
     const ref = getCamelName(stripNamespace(schema.items.$ref));
+    const type = getBuiltInType(ref);
     return {
       type: "any[]",
-      ref: `${ref}[]`,
-      imports: [ref]
+      ref: `${type ?? ref}[]`,
+      imports: type ? void 0 : [ref]
     };
   }
   if (!("$ref" in schema) && schema.type === "array" && schema.items && !("$ref" in schema.items)) {
@@ -368,9 +377,7 @@ function parseParametersQuery(parameters) {
       parameter.imports = imports || [];
       parameter.enums = enums;
       if (p.name.includes(".") && !p.name.startsWith(".") && !p.name.endsWith(".")) {
-        const [name, subName] = p.name.split(".");
-        parameter.name = name;
-        parameter.ref = `{ ${subName}${parameter.required ? "?" : ""}: ${ref || "any"} }`;
+        parameter.name = `"${p.name}"`;
       }
       r.push(parameter);
     }
@@ -499,10 +506,11 @@ function parseSchemaType2(schema) {
   }
   if (schema.type === "array" && "$ref" in schema.items) {
     const ref = getCamelName(stripNamespace2(schema.items.$ref));
+    const type = getBuiltInType(ref);
     return {
       type: "any[]",
-      ref: `${ref}[]`,
-      imports: [ref]
+      ref: `${type ?? ref}[]`,
+      imports: type ? void 0 : [ref]
     };
   }
   if (schema.type === "array" && !("$ref" in schema.items)) {
@@ -636,6 +644,9 @@ function parseParametersQuery2(parameters) {
       parameter.required = p.required;
       parameter.imports = imports || [];
       parameter.enums = enums;
+      if (p.name.includes(".") && !p.name.startsWith(".") && !p.name.endsWith(".")) {
+        parameter.name = `"${p.name}"`;
+      }
       r.push(parameter);
     }
     return r;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gopowerteam/request-generate",
   "private": false,
-  "version": "0.1.13",
+  "version": "0.1.15",
   "type": "commonjs",
   "files": [
     "dist",
@@ -45,7 +45,7 @@
     "tsup": "^6.6.3",
     "typescript": "^4.9.5",
     "vite": "^4.1.4",
-    "@gopowerteam/request": "0.1.12"
+    "@gopowerteam/request": "0.1.15"
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",