openapi-jsonrpc-jsdoc 1.2.4 → 1.2.6

package/index.js

@@ -147,6 +147,9 @@ async function openapiJsonrpcJsdoc({ files, securitySchemes = {}, packageUrl, se
 
       const propertiesParameters = module.params.reduce(
         (accumulator, parameter) => {
+          if (parameter.name.startsWith('_')) {
+            return accumulator;
+          }
           if (!parameter.type) {
             throw new Error('JSDoc parameter error: ' + apiName);
           }
@@ -164,20 +167,30 @@ async function openapiJsonrpcJsdoc({ files, securitySchemes = {}, packageUrl, se
           }
           let items;
           let enumData;
+          let oneOf;
+
           switch (type) {
             case 'Array.<string>': {
               type = 'array';
-              items = { type: 'number' };
+              items = { type: 'string' };
               break;
             }
             case 'Array.<number>': {
               type = 'array';
-              items = { type: 'string' };
+              items = { type: 'number' };
               break;
             }
             case 'enum': {
               enumData = parameter.type.names;
-              if (parameter.type.names.every(n => !Number.isNaN(Number(n)))) {
+              oneOf = parameter.type.names.map((n) => {
+                if (!Number.isNaN(Number(n))) {
+                  return Number(n);
+                }
+                return n;
+              });
+              if (parameter.type.names.every(n => Number.isInteger(Number(n)))) {
+                type = 'integer';
+              } else if (parameter.type.names.every(n => !Number.isNaN(Number(n)))) {
                 type = 'number';
               } else {
                 type = 'string';
@@ -198,15 +211,23 @@ async function openapiJsonrpcJsdoc({ files, securitySchemes = {}, packageUrl, se
           if (!parameter.optional) {
             accumulator.required.push(name);
           }
-          accumulator.properties = {
-            ...accumulator.properties,
-            [name]: {
-              type,
-              description,
-              items,
-              enum: enumData,
-            },
-          };
+          accumulator.properties[name] = accumulator.properties[name] ?? {};
+          if (type) {
+            accumulator.properties[name].type = type;
+          }
+          if (description) {
+            accumulator.properties[name].description = description;
+          }
+          if (items) {
+            accumulator.properties[name].items = items;
+          }
+          if (enumData) {
+            accumulator.properties[name].enum = enumData;
+          }
+          if (oneOf) {
+            accumulator.properties[name].oneOf = oneOf;
+          }
+
           return accumulator;
         },
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-jsonrpc-jsdoc",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "Transform JSDoc-annotated JSON-RPC 2.0 methods into OpenAPI 3.0 specifications. Auto-generates REST API documentation with complete schemas, parameters, and endpoint definitions.",
   "main": "index.js",
   "scripts": {