@mirascript/mirascript 0.1.63 → 0.1.65

package/src/vm/lib/global/string/index.ts

@@ -10,9 +10,8 @@ export const chars = VmLib(
     },
     {
         summary: '将字符串转换为字符数组',
-        params: { str: '要转换的字符串' },
-        paramsType: { str: 'string' },
-        returnsType: 'string[]',
+        params: { str: { type: 'string', description: '要转换的字符串' } },
+        returns: { type: 'string[]' },
         examples: ['chars("Mira") // ["M", "i", "r", "a"]'],
     },
 );
@@ -26,9 +25,12 @@ export const replace = VmLib(
     },
     {
         summary: '替换字符串中的指定子串',
-        params: { str: '要处理的字符串', search: '要替换的子串', replacement: '替换后的字符串' },
-        paramsType: { str: 'string', search: 'string', replacement: 'string' },
-        returnsType: 'string',
+        params: {
+            str: { type: 'string', description: '要处理的字符串' },
+            search: { type: 'string', description: '要替换的子串' },
+            replacement: { type: 'string', description: '替换后的字符串' },
+        },
+        returns: { type: 'string' },
         examples: ['replace("foo bar foo", "foo", "baz") // "baz bar baz"'],
     },
 );
@@ -42,9 +44,11 @@ export const split = VmLib(
     },
     {
         summary: '将字符串拆分为子串数组',
-        params: { str: '要拆分的字符串', separator: '分隔符' },
-        paramsType: { str: 'string', separator: 'string' },
-        returnsType: 'string[]',
+        params: {
+            str: { type: 'string', description: '要拆分的字符串' },
+            separator: { type: 'string', description: '分隔符' },
+        },
+        returns: { type: 'string[]' },
         examples: ['split("a,b,c", ",") // ["a", "b", "c"]'],
     },
 );
@@ -57,9 +61,11 @@ export const join = VmLib(
     },
     {
         summary: '将字符串数组连接为单个字符串',
-        params: { arr: '要连接的字符串数组', separator: '分隔符' },
-        paramsType: { arr: 'string[]', separator: 'string' },
-        returnsType: 'string',
+        params: {
+            arr: { type: 'string[]', description: '要连接的字符串数组' },
+            separator: { type: 'string', description: '分隔符' },
+        },
+        returns: { type: 'string' },
         examples: ['join(["a", "b", "c"], "-") // "a-b-c"'],
     },
 );

package/src/vm/lib/global/string/search.ts

@@ -6,9 +6,11 @@ export const starts_with = VmLib(
     },
     {
         summary: '检查字符串是否以指定子串开头',
-        params: { str: '要检查的字符串', search: '要匹配的子串' },
-        paramsType: { str: 'string', search: 'string' },
-        returnsType: 'boolean',
+        params: {
+            str: { type: 'string', description: '要检查的字符串' },
+            search: { type: 'string', description: '要匹配的子串' },
+        },
+        returns: { type: 'boolean' },
         examples: ['starts_with("mira", "mi") // true'],
     },
 );
@@ -18,9 +20,11 @@ export const ends_with = VmLib(
     },
     {
         summary: '检查字符串是否以指定子串结尾',
-        params: { str: '要检查的字符串', search: '要匹配的子串' },
-        paramsType: { str: 'string', search: 'string' },
-        returnsType: 'boolean',
+        params: {
+            str: { type: 'string', description: '要检查的字符串' },
+            search: { type: 'string', description: '要匹配的子串' },
+        },
+        returns: { type: 'boolean' },
         examples: ['ends_with("mira", "ra") // true'],
     },
 );
@@ -31,9 +35,11 @@ export const contains = VmLib(
     },
     {
         summary: '检查字符串是否包含指定子串',
-        params: { str: '要检查的字符串', search: '要匹配的子串' },
-        paramsType: { str: 'string', search: 'string' },
-        returnsType: 'boolean',
+        params: {
+            str: { type: 'string', description: '要检查的字符串' },
+            search: { type: 'string', description: '要匹配的子串' },
+        },
+        returns: { type: 'boolean' },
         examples: ['contains("hello", "ll") // true'],
     },
 );

package/src/vm/lib/global/string/trim.ts

@@ -6,9 +6,8 @@ export const trim_start = VmLib(
     },
     {
         summary: '去除字符串开头的空白字符',
-        params: { str: '要处理的字符串' },
-        paramsType: { str: 'string' },
-        returnsType: 'string',
+        params: { str: { type: 'string', description: '要处理的字符串' } },
+        returns: { type: 'string' },
         examples: ['trim_start("  mira") // "mira"'],
     },
 );
@@ -19,9 +18,8 @@ export const trim_end = VmLib(
     },
     {
         summary: '去除字符串结尾的空白字符',
-        params: { str: '要处理的字符串' },
-        paramsType: { str: 'string' },
-        returnsType: 'string',
+        params: { str: { type: 'string', description: '要处理的字符串' } },
+        returns: { type: 'string' },
         examples: ['trim_end("mira  ") // "mira"'],
     },
 );
@@ -32,9 +30,8 @@ export const trim = VmLib(
     },
     {
         summary: '去除字符串两端的空白字符',
-        params: { str: '要处理的字符串' },
-        paramsType: { str: 'string' },
-        returnsType: 'string',
+        params: { str: { type: 'string', description: '要处理的字符串' } },
+        returns: { type: 'string' },
         examples: ['trim("  mira  ") // "mira"'],
     },
 );

package/src/vm/lib/global/time.ts

@@ -41,11 +41,10 @@ export const to_timestamp = VmLib(
     {
         summary: '将数据转换为 Unix 毫秒时间戳',
         params: {
-            datetime: '要转换的数据，默认为当前时间',
-            fallback: '转换失败时的返回值',
+            datetime: { type: 'number | string | nil', description: '要转换的数据，默认为当前时间' },
+            fallback: { type: 'any', description: '转换失败时的返回值' },
         },
-        paramsType: { datetime: 'number | string | nil', fallback: 'any' },
-        returnsType: 'number | type(fallback)',
+        returns: { type: 'number | type(fallback)' },
         examples: ['to_timestamp("1970-01-01T00:00:00Z") // 0'],
     },
 );
@@ -71,12 +70,11 @@ export const to_datetime = VmLib(
     {
         summary: '将数据转换为 DateTime 记录',
         params: {
-            datetime: '要转换的数据，默认为当前时间',
-            offset: '时区偏移量（单位：小时），默认为 0',
-            fallback: '转换失败时的返回值',
+            datetime: { type: 'number | string | nil', description: '要转换的数据，默认为当前时间' },
+            offset: { type: 'number | nil', description: '时区偏移量（单位：小时），默认为 0' },
+            fallback: { type: 'any', description: '转换失败时的返回值' },
         },
-        paramsType: { datetime: 'number | string | nil', offset: 'number | nil', fallback: 'any' },
-        returnsType: 'DateTime | type(fallback)',
+        returns: { type: 'DateTime | type(fallback)' },
         examples: [
             `
 to_datetime(0)
@@ -100,11 +98,10 @@ export const to_iso8601 = VmLib(
     {
         summary: '将数据转换为 ISO 8601 格式的字符串',
         params: {
-            datetime: '要转换的数据，默认为当前时间',
-            fallback: '转换失败时的返回值',
+            datetime: { type: 'number | string | nil', description: '要转换的数据，默认为当前时间' },
+            fallback: { type: 'any', description: '转换失败时的返回值' },
         },
-        paramsType: { datetime: 'number | string | nil', fallback: 'any' },
-        returnsType: 'string | type(fallback)',
+        returns: { type: 'string | type(fallback)' },
         examples: ['to_iso8601(0) // "1970-01-01T00:00:00.000Z"'],
     },
 );

package/src/vm/lib/global/to-primitive.ts

@@ -10,11 +10,10 @@ export const to_string = VmLib(
     {
         summary: '将数据转换为字符串',
         params: {
-            data: '要转换的数据',
-            fallback: '转换失败时的返回值',
+            data: { type: 'any', description: '要转换的数据' },
+            fallback: { type: 'any', description: '转换失败时的返回值' },
         },
-        paramsType: { data: 'any', fallback: 'any' },
-        returnsType: 'string | type(fallback)',
+        returns: { type: 'string | type(fallback)' },
         examples: ['to_string([1, 2]) // "1, 2"'],
     },
 );
@@ -27,11 +26,10 @@ export const to_number = VmLib(
     {
         summary: '将数据转换为数字',
         params: {
-            data: '要转换的数据',
-            fallback: '转换失败时的返回值',
+            data: { type: 'string | number | boolean', description: '要转换的数据' },
+            fallback: { type: 'any', description: '转换失败时的返回值' },
         },
-        paramsType: { data: 'string | number | boolean', fallback: 'any' },
-        returnsType: 'number | type(fallback)',
+        returns: { type: 'number | type(fallback)' },
         examples: ['to_number("1.5") // 1.5'],
     },
 );
@@ -44,11 +42,11 @@ export const to_number = VmLib(
 //     {
 //         summary: '将布尔值标准化',
 //         params: {
-//             data: '要转换的数据，仅当为布尔类型时才会参与转换',
-//             fallback: '当输入不是布尔值时返回的值',
+//             data: { type: 'boolean', description: '要转换的数据，仅当为布尔类型时才会参与转换' },
+//             fallback: { type: 'any', description: '当输入不是布尔值时返回的值' },
 //         },
-//         paramsType: { data: 'boolean', fallback: 'any' },
-//         returnsType: 'boolean | type(fallback)',
+//
+//         returns: { type: 'boolean | type(fallback)' },
 //         examples: [
 //             'to_boolean(true, false)   // true',
 //             'to_boolean(nil, "failed") // "failed"',
@@ -64,9 +62,11 @@ export const format = VmLib(
     },
     {
         summary: '将数据格式化为指定格式的字符串',
-        params: { data: '要格式化的数据', format: '格式字符串' },
-        paramsType: { data: 'any', format: 'string' },
-        returnsType: 'string',
+        params: {
+            data: { type: 'any', description: '要格式化的数据' },
+            format: { type: 'string', description: '格式字符串' },
+        },
+        returns: { type: 'string' },
         examples: ['format(12, ".3") // "12.000"'],
     },
 );

package/src/vm/lib/helpers.ts

@@ -271,10 +271,7 @@ export function map(
 }
 
 /** 库函数选项 */
-export type VmLibOption = Pick<
-    VmFunctionOption,
-    'summary' | 'params' | 'paramsType' | 'returns' | 'returnsType' | 'examples' | 'deprecated'
->;
+export type VmLibOption = Pick<VmFunctionOption, 'summary' | 'params' | 'returns' | 'examples' | 'deprecated'>;
 /** 库函数 */
 export type VmLib<T extends VmFunctionLike | VmConst = VmFunctionLike> = (T extends VmFunctionLike ? T : { value: T }) &
     VmLibOption;
@@ -291,9 +288,7 @@ export function VmLib<
     Object.defineProperties(ret, {
         summary: { enumerable: true, value: option.summary },
         params: { enumerable: true, value: option.params },
-        paramsType: { enumerable: true, value: option.paramsType },
         returns: { enumerable: true, value: option.returns },
-        returnsType: { enumerable: true, value: option.returnsType },
         examples: { enumerable: true, value: option.examples },
         deprecated: { enumerable: true, value: option.deprecated ?? undefined },
     });

package/src/vm/lib/mod/matrix.ts

@@ -47,9 +47,8 @@ export const size = VmLib(
     },
     {
         summary: '获取矩阵尺寸',
-        params: { matrix: '要获取尺寸的矩阵' },
-        paramsType: { matrix: 'any[][]' },
-        returnsType: '[number, number]',
+        params: { matrix: { type: 'any[][]', description: '要获取尺寸的矩阵' } },
+        returns: { type: '[number, number]' },
         examples: ['matrix.size([[1, 2], [3, 4]]) // [2, 2]'],
     },
 );
@@ -75,9 +74,8 @@ export const transpose = VmLib(
     },
     {
         summary: '转置矩阵',
-        params: { matrix: '要转置的矩阵' },
-        paramsType: { matrix: 'any[][]' },
-        returnsType: 'any[][]',
+        params: { matrix: { type: 'any[][]', description: '要转置的矩阵' } },
+        returns: { type: 'any[][]' },
         examples: ['matrix.transpose([[1, 2], [3, 4]]) // [[1, 3], [2, 4]]'],
     },
 );
@@ -220,9 +218,12 @@ export const entrywise = VmLib(
     },
     {
         summary: '逐项操作',
-        params: { a: '第一个操作数', b: '第二个操作数', f: '操作函数' },
-        paramsType: { a: 'any | any[] | any[][]', b: 'any | any[] | any[][]', f: 'fn(a: any, b: any) -> any' },
-        returnsType: 'any | any[] | any[][]',
+        params: {
+            a: { type: 'any | any[] | any[][]', description: '第一个操作数' },
+            b: { type: 'any | any[] | any[][]', description: '第二个操作数' },
+            f: { type: 'fn(a: any, b: any) -> any', description: '操作函数' },
+        },
+        returns: { type: 'any | any[] | any[][]' },
         examples: [`matrix.entrywise([1, 2], [3, 4], fn (x, y) { x + y }) // [4, 6]`],
     },
 );
@@ -235,9 +236,11 @@ export const add = VmLib(
     },
     {
         summary: '逐项相加',
-        params: { a: '第一个操作数', b: '第二个操作数' },
-        paramsType: { a: 'number | number[] | number[][]', b: 'number | number[] | number[][]' },
-        returnsType: 'number | number[] | number[][]',
+        params: {
+            a: { type: 'number | number[] | number[][]', description: '第一个操作数' },
+            b: { type: 'number | number[] | number[][]', description: '第二个操作数' },
+        },
+        returns: { type: 'number | number[] | number[][]' },
         examples: ['matrix.add([1, 2], [3, 4]) // [4, 6]'],
     },
 );
@@ -250,9 +253,11 @@ export const subtract = VmLib(
     },
     {
         summary: '逐项相减',
-        params: { a: '第一个操作数', b: '第二个操作数' },
-        paramsType: { a: 'number | number[] | number[][]', b: 'number | number[] | number[][]' },
-        returnsType: 'number | number[] | number[][]',
+        params: {
+            a: { type: 'number | number[] | number[][]', description: '第一个操作数' },
+            b: { type: 'number | number[] | number[][]', description: '第二个操作数' },
+        },
+        returns: { type: 'number | number[] | number[][]' },
         examples: ['matrix.subtract([3, 4], [1, 2]) // [2, 2]'],
     },
 );
@@ -265,9 +270,11 @@ export const entrywise_multiply = VmLib(
     },
     {
         summary: '逐项相乘',
-        params: { a: '第一个操作数', b: '第二个操作数' },
-        paramsType: { a: 'number | number[] | number[][]', b: 'number | number[] | number[][]' },
-        returnsType: 'number | number[] | number[][]',
+        params: {
+            a: { type: 'number | number[] | number[][]', description: '第一个操作数' },
+            b: { type: 'number | number[] | number[][]', description: '第二个操作数' },
+        },
+        returns: { type: 'number | number[] | number[][]' },
         examples: ['matrix.entrywise_multiply([1, 2], [3, 4]) // [3, 8]'],
     },
 );
@@ -280,9 +287,11 @@ export const entrywise_divide = VmLib(
     },
     {
         summary: '逐项相除',
-        params: { a: '第一个操作数', b: '第二个操作数' },
-        paramsType: { a: 'number | number[] | number[][]', b: 'number | number[] | number[][]' },
-        returnsType: 'number | number[] | number[][]',
+        params: {
+            a: { type: 'number | number[] | number[][]', description: '第一个操作数' },
+            b: { type: 'number | number[] | number[][]', description: '第二个操作数' },
+        },
+        returns: { type: 'number | number[] | number[][]' },
         examples: ['matrix.entrywise_divide([4, 6], [2, 3]) // [2, 2]'],
     },
 );
@@ -347,9 +356,11 @@ export const multiply = VmLib(
     },
     {
         summary: '矩阵相乘',
-        params: { a: '第一个操作数', b: '第二个操作数' },
-        paramsType: { a: 'number | number[] | number[][]', b: 'number | number[] | number[][]' },
-        returnsType: 'number | number[] | number[][]',
+        params: {
+            a: { type: 'number | number[] | number[][]', description: '第一个操作数' },
+            b: { type: 'number | number[] | number[][]', description: '第二个操作数' },
+        },
+        returns: { type: 'number | number[] | number[][]' },
         examples: ['matrix.multiply([[1, 2], [3, 4]], [5, 6]) // [17, 39]'],
     },
 );
@@ -467,9 +478,8 @@ export const invert = VmLib(
     },
     {
         summary: '矩阵求逆',
-        params: { a: '待求逆的矩阵' },
-        paramsType: { a: 'number | number[][]' },
-        returnsType: 'number | number[][]',
+        params: { a: { type: 'number | number[][]', description: '待求逆的矩阵' } },
+        returns: { type: 'number | number[][]' },
         examples: ['matrix.invert([[1, 2], [3, 4]]) // [[-2, 1], [1.5, -0.5]]'],
     },
 );
@@ -492,17 +502,15 @@ function filled(size: readonly VmAny[], value: VmConst): VmArray {
 
 export const zeros = VmLib((...size) => filled(size, 0), {
     summary: '创建一个全零的矩阵',
-    params: { '..size': '矩阵的维度' },
-    paramsType: { '..size': 'number[]' },
-    returnsType: 'number[][]',
+    params: { '..size': { type: 'number[]', description: '矩阵的维度' } },
+    returns: { type: 'number[][]' },
     examples: ['matrix.zeros(2, 3) // [[0, 0, 0], [0, 0, 0]]'],
 });
 
 export const ones = VmLib((...size) => filled(size, 1), {
     summary: '创建一个全一的矩阵',
-    params: { '..size': '矩阵的维度' },
-    paramsType: { '..size': 'number[]' },
-    returnsType: 'number[][]',
+    params: { '..size': { type: 'number[]', description: '矩阵的维度' } },
+    returns: { type: 'number[][]' },
     examples: ['matrix.ones(2, 2) // [[1, 1], [1, 1]]'],
 });
 
@@ -527,9 +535,8 @@ export const identity = VmLib(
     },
     {
         summary: '创建一个单位矩阵',
-        params: { '..size': '矩阵的维度' },
-        paramsType: { '..size': '[number] | [number, number]' },
-        returnsType: 'number[][]',
+        params: { '..size': { type: '[number] | [number, number]', description: '矩阵的维度' } },
+        returns: { type: 'number[][]' },
         examples: ['matrix.identity(3) // [[1, 0, 0], [0, 1, 0], [0, 0, 1]]'],
     },
 );
@@ -570,9 +577,11 @@ export const diagonal = VmLib(
     },
     {
         summary: '创建一个对角矩阵或获取矩阵的对角线',
-        params: { x: '对角线元素或要获取对角线的矩阵', k: '对角线偏移量，默认为 0' },
-        paramsType: { x: 'number[] | number[][]', k: 'number' },
-        returnsType: 'number[][] | number[]',
+        params: {
+            x: { type: 'number[] | number[][]', description: '对角线元素或要获取对角线的矩阵' },
+            k: { type: 'number', description: '对角线偏移量，默认为 0' },
+        },
+        returns: { type: 'number[][] | number[]' },
         examples: [
             'matrix.diagonal([1, 2, 3]) // [[1, 0, 0], [0, 2, 0], [0, 0, 3]]',
             'matrix.diagonal([[1, 2], [3, 4]]) // [1, 4]',

package/src/vm/operations/compound.ts

@@ -1,5 +1,5 @@
 import { VmError } from '../../helpers/error.js';
-import { hasOwnEnumerable, NotNumber, keys, create, isFinite } from '../../helpers/utils.js';
+import { hasOwnEnumerable, NotNumber, keys, create, isFinite, keysLength } from '../../helpers/utils.js';
 import { toNumber, toString } from '../../helpers/convert/index.js';
 import { display } from '../../helpers/serialize.js';
 import {
@@ -48,7 +48,7 @@ export const $In = (value: VmAny, iterable: VmAny): boolean => {
 export const $Length = (value: VmAny): number => {
     $AssertInit(value);
     if (isVmArray(value)) return value.length;
-    if (isVmRecord(value)) return keys(value).length;
+    if (isVmRecord(value)) return keysLength(value);
     if (isVmWrapper(value)) return value.keys().length;
 
     throw new VmError(`Value has no length: ${display(value)}`, 0);

package/src/vm/types/context.ts

@@ -90,21 +90,19 @@ class ValueVmContext implements VmContext {
     }
     /** @inheritdoc */
     get(key: string): VmValue {
-        if (hasOwn(this.env, key)) return this.env[key] ?? null;
-        {
-            const val = VM_SHARED_CONTEXT[key];
-            if (val !== undefined) return val;
-            return globalVarNotFound(key);
+        if (hasOwn(this.env, key)) {
+            return this.env[key] ?? null;
         }
+        return DefaultVmContext.get(key);
     }
     /** @inheritdoc */
     has(key: string): boolean {
-        return hasOwn(this.env, key) || key in VM_SHARED_CONTEXT;
+        return hasOwn(this.env, key) || DefaultVmContext.has(key);
     }
     /** @inheritdoc */
     describe(key: string): string | undefined {
         if (hasOwn(this.env, key)) return this.describer?.(key);
-        return VM_SHARED_CONTEXT_DESCRIPTIONS[key];
+        return DefaultVmContext.describe(key);
     }
     constructor(
         private readonly env: VmContextRecord,
@@ -123,7 +121,9 @@ class Value2VmContext implements VmContext {
     }
     /** @inheritdoc */
     get(key: string): VmValue {
-        if (this.env != null && hasOwn(this.env, key)) return this.env[key] ?? null;
+        if (this.env != null && hasOwn(this.env, key)) {
+            return this.env[key] ?? null;
+        }
         if (hasOwn(this.extern, key)) {
             const val = this.extern[key];
             if (val == null) return null;
@@ -138,18 +138,18 @@ class Value2VmContext implements VmContext {
             return cached;
         }
 
-        const val = VM_SHARED_CONTEXT[key];
-        if (val !== undefined) return val;
-        return globalVarNotFound(key);
+        return DefaultVmContext.get(key);
     }
     /** @inheritdoc */
     has(key: string): boolean {
-        return (this.env != null && hasOwn(this.env, key)) || hasOwn(this.extern, key) || key in VM_SHARED_CONTEXT;
+        return (this.env != null && hasOwn(this.env, key)) || hasOwn(this.extern, key) || DefaultVmContext.has(key);
     }
     /** @inheritdoc */
     describe(key: string): string | undefined {
-        if ((this.env != null && hasOwn(this.env, key)) || hasOwn(this.extern, key)) return this.describer?.(key);
-        return VM_SHARED_CONTEXT_DESCRIPTIONS[key];
+        if ((this.env != null && hasOwn(this.env, key)) || hasOwn(this.extern, key)) {
+            return this.describer?.(key);
+        }
+        return DefaultVmContext.describe(key);
     }
     private readonly externCache = new WeakMap<object, VmValue>();
     constructor(
@@ -173,19 +173,16 @@ class FactoryVmContext implements VmContext {
     get(key: string): VmValue {
         const value = this.getter(key);
         if (value !== undefined) return value;
-
-        const val = VM_SHARED_CONTEXT[key];
-        if (val !== undefined) return val;
-        return globalVarNotFound(key);
+        return DefaultVmContext.get(key);
     }
     /** @inheritdoc */
     has(key: string): boolean {
-        return this.getter(key) !== undefined || key in VM_SHARED_CONTEXT;
+        return this.getter(key) !== undefined || DefaultVmContext.has(key);
     }
     /** @inheritdoc */
     describe(key: string): string | undefined {
         if (this.getter(key) !== undefined) return this.describer?.(key);
-        return VM_SHARED_CONTEXT_DESCRIPTIONS[key];
+        return DefaultVmContext.describe(key);
     }
     constructor(
         private readonly getter: (key: string) => VmValue | undefined,

package/src/vm/types/function.ts

@@ -18,6 +18,11 @@ export type VmFunctionLike = (...args: ReadonlyArray<VmValue | undefined>) => Vm
 /** Mirascript 函数 */
 export type VmFunction<T extends VmFunctionLike = VmFunctionLike> = T & { readonly [kVmFunction]: VmFunctionInfo };
 
+/** Mirascript 值信息 */
+export type VmValueInfo = {
+    readonly type: string;
+    readonly description?: string;
+};
 /** Mirascript 函数信息 */
 export type VmFunctionInfo = {
     /** 完整名称 */
@@ -27,13 +32,9 @@ export type VmFunctionInfo = {
     /** 文档字符串 */
     readonly summary?: string;
     /** 文档字符串 */
-    readonly params?: Record<string, string>;
-    /** 文档字符串 */
-    readonly paramsType?: Record<string, string>;
-    /** 文档字符串 */
-    readonly returns?: string;
+    readonly params?: Record<string, VmValueInfo>;
     /** 文档字符串 */
-    readonly returnsType?: string;
+    readonly returns?: VmValueInfo;
     /** 文档字符串 */
     readonly examples?: string[];
     /** 标记为弃用 */
@@ -41,7 +42,7 @@ export type VmFunctionInfo = {
 };
 
 /** Mirascript 函数创建选项 */
-export type VmFunctionOption = Partial<Omit<VmFunctionInfo, 'original'>> & {
+export type VmFunctionOption = Partial<VmFunctionInfo> & {
     /** 函数名称 */
     readonly name?: string | null | undefined;
 };
@@ -83,9 +84,7 @@ export function VmFunction<T extends VmFunctionLike>(
         isLib: opt.isLib ?? false,
         summary: opt.summary || undefined,
         params: opt.params,
-        paramsType: opt.paramsType,
-        returns: opt.returns || undefined,
-        returnsType: opt.returnsType || undefined,
+        returns: opt.returns ?? undefined,
         examples: opt.examples?.length ? opt.examples : undefined,
         deprecated: opt.deprecated ?? undefined,
     };