wormajs 0.2.1 → 0.2.2

package/dist/core/loader/astLoader/generates/tuple.js

@@ -16,8 +16,12 @@ function tupleTypeGenerator(ast, ctx) {
     const spreadParam = ast.spreadParam ?? {
         type: type_1.ASTType.ANY,
     };
-    while (params.length < minItems) {
-        params.push(spreadParam);
+    // 封闭元组（禁止额外项）时不展开剩余项
+    const isClosed = spreadParam.type === type_1.ASTType.NEVER;
+    if (!isClosed) {
+        while (params.length < minItems) {
+            params.push(spreadParam);
+        }
     }
     const lines = [`[`];
     params.forEach((param, idx, arr) => {
@@ -26,12 +30,12 @@ function tupleTypeGenerator(ast, ctx) {
         const endText = idx === arr.length - 1 ? '' : ',';
         `${value}${endText}`.split('\n').forEach(line => lines.push(` ${line}`));
     });
-    if (maxItems < minItems) {
+    if (maxItems < minItems && !isClosed) {
         ctx.pathKey = spreadParam.keyName;
         lines.push(`,\n...Array<${(0, utils_1.getValue)(ctx.next(spreadParam, ctx.options), ctx.options)}>`);
     }
     lines.push(`]`);
-    if (maxItems > minItems) {
+    if (maxItems > minItems && !isClosed) {
         const nextParams = [...params];
         for (let i = 0; i < maxItems - minItems; i += 1) {
             nextParams.push(spreadParam);

package/dist/core/loader/astLoader/parsers/array.js

@@ -6,7 +6,7 @@ const type_1 = require("../../../../type");
 const utils_1 = require("./utils");
 function arrayTypeParser(schema, ctx) {
     ctx.pathKey = '[]';
-    const itemsAst = ctx.next(schema.items, ctx.options);
+    const itemsAst = ctx.next(schema.items || { type: 'any' }, ctx.options);
     const result = {
         ...(0, utils_1.initAST)(schema, ctx),
         type: type_1.ASTType.ARRAY,

package/dist/core/loader/astLoader/parsers/forward/tuple.js

@@ -4,8 +4,13 @@ exports.default = {
     is(schema) {
         // 判断是否为元组类型
         // 1. type 为 'array'
-        // 2. 且 items 是数组（表示固定位置的元素类型）
-        return schema && schema.type === 'array' && Array.isArray(schema.items) && schema.items.length > 0;
+        // 2. 且 items 是数组（老版 JSON Schema 元组语法）或存在 prefixItems（OpenAPI 3.1 / JSON Schema 2020-12 元组语法）
+        if (!schema)
+            return false;
+        const tuple = schema;
+        const isItemsArray = Array.isArray(tuple.items) && tuple.items.length > 0;
+        const isPrefixItems = Array.isArray(tuple.prefixItems) && tuple.prefixItems.length > 0;
+        return schema.type === 'array' && (isItemsArray || isPrefixItems);
     },
     to: 'tuple',
 };

package/dist/core/loader/astLoader/parsers/simple.js

@@ -19,6 +19,10 @@ function stringTypeParser(schema, init) {
 }
 function simpleTypeParser(schema, ctx) {
     const result = (0, utils_1.initAST)(schema, ctx);
+    if (!schema) {
+        result.type = type_1.ASTType.NULL;
+        return result;
+    }
     switch (schema.type) {
         case 'boolean':
             result.type = type_1.ASTType.BOOLEAN;

package/dist/core/loader/astLoader/parsers/tuple.js

@@ -5,13 +5,26 @@ const helper_1 = require("../../../../helper");
 const type_1 = require("../../../../type");
 const utils_1 = require("./utils");
 function tupleTypeParser(schema, ctx) {
-    const params = schema.items.map(item => ctx.next(item, ctx.options));
+    // OpenAPI 3.1 / JSON Schema 2020-12 用 prefixItems 表示固定位置元素，兼容老版 items 数组写法
+    const elementSchemas = (Array.isArray(schema.prefixItems)
+        ? schema.prefixItems
+        : (Array.isArray(schema.items) ? schema.items : []));
+    const params = elementSchemas.map(item => ctx.next(item, ctx.options));
+    // 2020-12：单数 items 表示"剩余项"类型；items:false / additionalItems:false 表示禁止额外项
+    let spreadParam;
+    if (schema.items && !Array.isArray(schema.items)) {
+        spreadParam = ctx.next(schema.items, ctx.options);
+    }
+    else if (schema.additionalItems === false || schema.items === false) {
+        spreadParam = { type: type_1.ASTType.NEVER };
+    }
     const result = {
         ...(0, utils_1.initAST)(schema, ctx),
         type: type_1.ASTType.TUPLE,
         minItems: schema.minItems,
         maxItems: schema.maxItems,
         params,
+        spreadParam,
     };
     const deepCommenter = helper_1.CommentHelper.load({
         type: ctx.options.commentType,

package/dist/core/loader/astLoader/parsers/utils.js

@@ -12,6 +12,9 @@ const forward_1 = require("./forward");
 exports.SchemaPrimitive = ['boolean', 'object', 'number', 'string', 'integer', 'array', 'null'];
 function getCommentBySchema(schema, options) {
     const commenter = helper_1.CommentHelper.load(options);
+    if (!schema) {
+        return commenter.end();
+    }
     if (!(0, utils_1.isReferenceObject)(schema) && schema.title) {
         commenter.add('[title]', schema.title);
     }
@@ -30,7 +33,7 @@ function initAST(schema, ctx) {
             type: ctx.options.commentType,
         }),
         keyName: ctx.keyName,
-        deprecated: (0, utils_1.isReferenceObject)(schema) ? false : schema.deprecated,
+        deprecated: schema && !(0, utils_1.isReferenceObject)(schema) ? schema.deprecated : false,
     };
     ctx.keyName = '';
     return result;
@@ -44,6 +47,9 @@ function parse(schema, options) {
     return null;
 }
 function getParserSchemaType(schema) {
+    if (!schema) {
+        return 'null';
+    }
     if ((0, utils_1.isReferenceObject)(schema)) {
         return 'reference';
     }

package/dist/core/workerPool/worker.js

@@ -55,6 +55,7 @@ node_worker_threads_1.parentPort?.on('message', async (batch) => {
         node_worker_threads_1.parentPort?.postMessage({ type: 'result', data: allResults });
     }
     catch (err) {
-        node_worker_threads_1.parentPort?.postMessage({ type: 'error', message: err.message });
+        const error = err;
+        node_worker_threads_1.parentPort?.postMessage({ type: 'error', message: error.message });
     }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wormajs",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "A modern OpenAPI code generator - Generate type-safe API clients from OpenAPI specs",
   "author": "worma",
   "license": "MIT",