@mirascript/mirascript 0.1.15 → 0.1.16

package/src/vm/operations.ts

@@ -1,28 +1,12 @@
-import { VmError } from './error.js';
-import {
-    isVmPrimitive,
-    isVmArray,
-    isVmRecord,
-    isVmFunction,
-    isVmExtern,
-    isVmModule,
-    isVmWrapper,
-    getVmFunctionInfo,
-    type TypeName,
-    type VmAny,
-    type VmImmutable,
-    type VmRecord,
-    type VmValue,
-    type VmArray,
-    type VmConst,
-    type VmPrimitive,
-    type VmFunction,
-} from './types/index.js';
+import { VmError } from '../helpers/error.js';
 import { hasOwnEnumerable, isNaN, isSafeInteger, keys, create } from '../helpers/utils.js';
+import { toNumber, toString, toBoolean, toFormat } from '../helpers/convert.js';
+import { display } from '../helpers/serialize.js';
+import { isVmPrimitive, isVmArray, isVmRecord, isVmFunction, isVmExtern, isVmWrapper } from '../helpers/types.js';
+import type { TypeName, VmAny, VmImmutable, VmRecord, VmValue, VmArray, VmConst } from './types/index.js';
 
 const { abs, min, trunc, ceil } = Math;
 const { slice, at } = Array.prototype;
-const { POSITIVE_INFINITY, NEGATIVE_INFINITY } = Number;
 
 const isSame = (a: VmValue, b: VmValue): boolean => {
     // Check for NaN
@@ -60,7 +44,10 @@ const isSame = (a: VmValue, b: VmValue): boolean => {
             if (!hasOwnEnumerable(b, key)) {
                 return false;
             }
-            if (!isSame(a[key] ?? null, b[key] ?? null)) {
+            /* c8 ignore next 2 */
+            const av = a[key] ?? null;
+            const bv = b[key] ?? null;
+            if (!isSame(av, bv)) {
                 return false;
             }
         }
@@ -180,28 +167,25 @@ export const $In = (value: VmAny, iterable: VmAny): boolean => {
     $AssertInit(value);
     $AssertInit(iterable);
     if (iterable == null) return false;
+    if (typeof iterable != 'object') return false;
     if (isVmArray(iterable)) {
         if (value == null) {
             // array may have empty slots
-            for (const item of iterable) {
-                if (item == null) return true;
-            }
+            for (const item of iterable) if (item == null) return true;
             return false;
         }
         // JS %SameValueZero is same with `isSame` in this context
         if (isVmPrimitive(value)) return iterable.includes(value);
         // value is not null here, so it's ok to skip empty slots, since `isSame(null, something)` is always false
-        value satisfies NonNullable<VmValue>;
-        return iterable.some((item = null) => isSame(item, value));
+        return iterable.some((item = null) => isSame(item, value satisfies NonNullable<VmValue>));
     }
     // iterable is a record or an extern here, value should be a string
-    if (isVmWrapper(iterable)) return iterable.has($ToString(value));
-    if (typeof iterable == 'object') return hasOwnEnumerable(iterable, $ToString(value));
-    iterable satisfies VmPrimitive | VmFunction;
-    return false;
+    const key = toString(value, undefined);
+    if (isVmWrapper(iterable)) return iterable.has(key);
+    return hasOwnEnumerable(iterable satisfies VmRecord, key);
 };
-export const $Concat = (...args: string[]): string => {
-    return args.map($Format).join('');
+export const $Concat = (...args: readonly string[]): string => {
+    return args.map((a) => toFormat(a, null)).join('');
 };
 export const $Pos = (a: VmAny): number => {
     return $ToNumber(a);
@@ -229,6 +213,7 @@ export const $Omit = (value: VmAny, omitted: ReadonlyArray<number | string>): Vm
     const omittedSet = new Set(omitted.map($ToString));
     for (const key of valueKeys) {
         if (!omittedSet.has(key)) {
+            /* c8 ignore next */
             result[key] = value[key] ?? null;
         }
     }
@@ -290,82 +275,30 @@ export const $Call = (func: VmValue, args: readonly VmAny[]): VmValue => {
     if (isVmFunction(func)) {
         return func(...(args as readonly VmValue[])) ?? null;
     }
-    throw new VmError(`Expected callable, got ${$Type(func)}`, null);
+    throw new VmError(`Value is not callable: ${display(func)}`, null);
 };
 export const $Type = (value: VmAny): TypeName => {
-    if (value === undefined || value === null) return 'nil';
-    if (isVmExtern(value)) return 'extern';
-    if (isVmModule(value)) return 'module';
+    // 允许未初始化值通过
+    if (value == null) return 'nil';
+    if (isVmWrapper(value)) return value.type;
     if (isVmArray(value)) return 'array';
     if (typeof value == 'object') return 'record';
     return typeof value as TypeName;
 };
 export const $ToBoolean = (value: VmAny): boolean => {
+    if (typeof value == 'boolean') return value;
     $AssertInit(value);
-    return value != null && value !== false;
-};
-/** 将值转为字符串 */
-function numberToString(value: number): string {
-    if (isNaN(value)) return 'nan';
-    if (value === Infinity) return 'inf';
-    if (value === -Infinity) return '-inf';
-    return String(value);
-}
-
-/** 将值转为字符串 */
-export function $InnerToString(value: VmAny, useBraces: boolean): string {
-    if (value == null) return 'nil';
-    if (isVmWrapper(value)) return value.toString(useBraces);
-    if (typeof value == 'function') {
-        const name = getVmFunctionInfo(value)?.fullName;
-        return name ? `<function ${name}>` : `<function>`;
-    }
-    if (isVmArray(value)) {
-        const strings: string[] = [];
-        for (const item of value) {
-            strings.push($InnerToString(item, true));
-        }
-        // 在 join 过程中会自动把 null/undefined 和 empty slot 转为 ''
-        // 与 innerToString 行为不一致
-        const results = strings.join(', ');
-        if (!useBraces) return results;
-        return `[${results}]`;
-    }
-    if (typeof value == 'object') {
-        const entries = keys(value)
-            .map((key) => `${key}: ${$InnerToString(value[key], true)}`)
-            .join(', ');
-        if (!useBraces) return entries;
-        return `(${entries})`;
-    }
-    if (typeof value == 'number') {
-        return numberToString(value);
-    }
-    return String(value);
-}
+    return toBoolean(value, undefined);
+};
 export const $ToString = (value: VmAny): string => {
-    $AssertInit(value);
     if (typeof value == 'string') return value;
-    if (value === null) return '';
-    return $InnerToString(value, false);
+    $AssertInit(value);
+    return toString(value, undefined);
 };
 export const $ToNumber = (value: VmAny): number => {
-    $AssertInit(value);
     if (typeof value == 'number') return value;
-    if (value == null) return 0;
-    if (typeof value == 'string') {
-        value = value.trim();
-        if (value === '') return 0;
-        if (value === 'inf' || value === '+inf' || value === 'Infinity' || value === '+Infinity') {
-            return POSITIVE_INFINITY;
-        }
-        if (value === '-inf' || value === '-Infinity') {
-            return NEGATIVE_INFINITY;
-        }
-        return Number(value);
-    }
-    if (typeof value == 'boolean') return value ? 1 : 0;
-    return Number.NaN;
+    $AssertInit(value);
+    return toNumber(value, undefined);
 };
 export const $IsBoolean = (value: VmAny): value is boolean => {
     $AssertInit(value);
@@ -473,36 +406,8 @@ export const $ArraySpread = (array: VmAny): Iterable<VmConst | undefined> => {
     throw new VmError(`Expected array, iterable extern or nil, got ${$Type(array)}`, []);
 };
 
-/** 渲染数字 */
-function formatNumber(value: number): string {
-    if (!Number.isFinite(value)) return numberToString(value);
-    if (value === 0) return '0';
-    const s = value.toString();
-    let ps;
-    const abs = Math.abs(value);
-    if (abs >= 1000 || abs < 0.001) {
-        const ps1 = value.toExponential();
-        const ps2 = value.toExponential(5);
-        ps = ps1.length < ps2.length ? ps1 : ps2;
-    } else {
-        ps = value.toPrecision(6);
-    }
-    return ps.length < s.length ? ps : s;
-}
-
 export const $Format = (value: VmAny, format: VmAny): string => {
     $AssertInit(value);
-    const f = format == null ? '' : typeof format == 'string' ? format.trim() : $ToString(format);
-
-    if (typeof value == 'number') {
-        if (/^\.\d+$/.test(f)) {
-            let digits = Math.trunc(Number(f.slice(1)));
-            if (!(digits <= 100)) digits = 100;
-            return value.toFixed(digits);
-        } else {
-            return formatNumber(value);
-        }
-    }
-
-    return $ToString(value);
+    const f = format == null ? '' : $ToString(format);
+    return toFormat(value, f);
 };

package/src/vm/types/boundary.ts

@@ -1,17 +1,14 @@
-import { isVmFunction, type VmFunctionLike, type VmFunction } from './function.js';
-import { isVmExtern, VmExtern } from './extern.js';
-import { isVmWrapper } from './wrapper.js';
+import { defineProperty, apply } from '../../helpers/utils.js';
+import { isVmExtern, isVmFunction, isVmWrapper } from '../../helpers/types.js';
+import { kVmFunctionProxy } from '../../helpers/constants.js';
+import type { VmFunctionLike, VmFunction } from './function.js';
+import { VmExtern } from './extern.js';
 import type { VmAny, VmConst, VmModule, VmPrimitive, VmValue } from './index.js';
 import { $Call } from '../operations.js';
-import { defineProperty, apply } from '../../helpers/utils.js';
-
-const kProxy = Symbol.for('mirascript.vm.function.proxy');
 
 /** 创建 Mirascript 函数在宿主语言运行的代理 */
 export function toVmFunctionProxy<T extends VmFunctionLike>(fn: VmFunction<T>): T {
-    if (!isVmFunction(fn)) return fn;
-
-    const cached = (fn as unknown as { [kProxy]?: T })[kProxy];
+    const cached = (fn as unknown as { [kVmFunctionProxy]?: T })[kVmFunctionProxy];
     if (cached != null) return cached;
 
     const proxy = (...args: unknown[]) => {
@@ -22,8 +19,8 @@ export function toVmFunctionProxy<T extends VmFunctionLike>(fn: VmFunction<T>):
         );
         return unwrapFromVmValue(ret);
     };
-    defineProperty(fn, kProxy, { value: proxy });
-    defineProperty(proxy, kProxy, { value: fn });
+    defineProperty(fn, kVmFunctionProxy, { value: proxy });
+    defineProperty(proxy, kVmFunctionProxy, { value: fn });
     defineProperty(proxy, 'name', {
         value: fn.name,
         configurable: true,
@@ -35,7 +32,7 @@ export function toVmFunctionProxy<T extends VmFunctionLike>(fn: VmFunction<T>):
 export function fromVmFunctionProxy<T extends VmFunctionLike>(fn: T): VmFunction<T> | undefined {
     if (isVmFunction(fn)) return fn;
 
-    const original = (fn as unknown as { [kProxy]?: VmFunction<T> })[kProxy];
+    const original = (fn as unknown as { [kVmFunctionProxy]?: VmFunction<T> })[kVmFunctionProxy];
     if (original && isVmFunction(original)) return original;
 
     return undefined;
@@ -76,7 +73,7 @@ export function wrapToVmValue(
 
 /** 取消宿主语言的值的 Mirascript 包装  */
 export function unwrapFromVmValue(value: VmAny): unknown {
-    if (typeof value == 'function') {
+    if (isVmFunction(value)) {
         return toVmFunctionProxy(value);
     }
     if (value == null || typeof value != 'object') return value;

package/src/vm/types/context.ts

@@ -1,27 +1,26 @@
-import {
-    VmFunction,
-    type VmAny,
-    type VmImmutable,
-    type VmValue,
-    wrapToVmValue,
-    isVmAny,
-    type VmFunctionLike,
-} from './index.js';
 import { create, entries, keys } from '../../helpers/utils.js';
-import type * as global from '../lib/global/index.js';
-import { VmError } from '../error.js';
+import { isVmAny } from '../../helpers/types.js';
+import { VmError } from '../../helpers/error.js';
+import { kVmContext } from '../../helpers/constants.js';
+import type { lib } from '../lib/index.js';
+import type { VmAny, VmImmutable, VmValue, VmFunctionLike, VmModule } from './index.js';
+import { wrapToVmValue } from './boundary.js';
+import { VmFunction } from './function.js';
 
-/** 全局导入的标准库 */
-type GlobalKeys = keyof typeof global;
 /** 全局导入的标准库值 */
-type ToGlobalValue<T extends GlobalKeys> = (typeof global)[T] extends VmFunctionLike
-    ? VmFunction<(typeof global)[T]>
-    : (typeof global)[T];
+type ToLibValue<V> = V extends VmFunctionLike
+    ? VmFunction<V>
+    : V extends Record<string, VmImmutable | VmFunctionLike>
+      ? ToLibModule<V>
+      : V;
+/** 全局导入的标准库值 */
+type ToLibModule<V extends Record<string, VmImmutable | VmFunctionLike>> = VmModule<{
+    [key in keyof V]: ToLibValue<V[key]>;
+}>;
 /** 全局导入的标准库 */
 type VmContextBase = {
-    [key in GlobalKeys]: ToGlobalValue<key>;
+    [key in keyof typeof lib]: ToLibValue<(typeof lib)[key]>;
 };
-const kVmContext = Symbol.for('mirascript.vm.context');
 /** MiraScript 执行上下文的基础，仅包含标准库 */
 export type VmSharedContext = VmContextBase & Record<string, VmImmutable>;
 /** MiraScript 执行上下文 */
@@ -184,9 +183,3 @@ export function createVmContext(...args: CreateVmContextWithValues | CreateVmCon
     }
     return new ValueVmContext(env, describer ?? undefined);
 }
-
-/** 检查是否为执行上下文 */
-export function isVmContext(context: unknown): context is VmContext {
-    if (context == null || typeof context != 'object') return false;
-    return (context as VmContext)[kVmContext] === true;
-}

package/src/vm/types/extern.ts

@@ -1,9 +1,11 @@
-import { VmError } from '../error.js';
-import { VmWrapper } from './wrapper.js';
-import type { TypeName, VmAny, VmConst, VmPrimitive, VmValue } from './index.js';
+import { VmError } from '../../helpers/error.js';
 import { getPrototypeOf, hasOwn, apply, isArray } from '../../helpers/utils.js';
+import { innerToString } from '../../helpers/convert.js';
+import { isVmExtern } from '../../helpers/types.js';
+import { kVmExtern } from '../../helpers/constants.js';
+import type { TypeName, VmAny, VmConst, VmPrimitive, VmValue } from './index.js';
+import { VmWrapper } from './wrapper.js';
 import { unwrapFromVmValue, wrapToVmValue } from './boundary.js';
-import { $InnerToString } from '../operations.js';
 
 const ObjectPrototype = Object.prototype;
 // eslint-disable-next-line @typescript-eslint/unbound-method
@@ -100,17 +102,13 @@ export class VmExtern<const T extends object = object> extends VmWrapper<T> {
         if (toString === ArrayToString && isArray(this.value)) {
             const mapped = ArrayMap.call(this.value, (item: unknown) => {
                 if (item === undefined) return '';
-                return $InnerToString(wrapToVmValue(item ?? null, null), true);
+                return innerToString(wrapToVmValue(item ?? null, null), true);
             });
             const str = mapped.join(', ');
             if (useBraces) return `[${str}]`;
             return str;
         }
-        try {
-            return String(this.value);
-        } catch {
-            return super.toString(useBraces);
-        }
+        return String(this.value);
     }
     /** @inheritdoc */
     override get type(): TypeName {
@@ -157,9 +155,4 @@ export class VmExtern<const T extends object = object> extends VmWrapper<T> {
     }
 }
 
-const kVmExtern = Symbol.for('mirascript.vm.extern');
 Object.defineProperty(VmExtern.prototype, kVmExtern, { value: true });
-/** 检查值是否为 Mirascript 外部值 */
-export function isVmExtern<T extends object>(value: unknown): value is VmExtern<T> {
-    return value != null && typeof value == 'object' && kVmExtern in value;
-}

package/src/vm/types/function.ts

@@ -1,10 +1,9 @@
 import type { Writable } from 'type-fest';
 import { defineProperty } from '../../helpers/utils.js';
-import { CpEnter, CpExit } from '../helpers.js';
+import { kVmFunction, VM_FUNCTION_ANONYMOUS_NAME } from '../../helpers/constants.js';
 import type { VmAny, VmValue } from './index.js';
 import { fromVmFunctionProxy } from './boundary.js';
-
-const kVmFunction = Symbol.for('mirascript.vm.function');
+import { CpEnter, CpExit } from '../checkpoint.js';
 
 /**
  * Mirascript 函数签名
@@ -46,17 +45,6 @@ export type VmFunctionOption = Partial<
     }
 >;
 
-/** 检查是否为 Mirascript 函数 */
-export function isVmFunction<T extends VmFunctionLike>(value: unknown): value is VmFunction<T> {
-    return getVmFunctionInfo(value) != null;
-}
-
-/** 检查是否为 Mirascript 函数，并获取其信息 */
-export function getVmFunctionInfo(value: unknown): VmFunctionInfo | undefined {
-    if (typeof value != 'function') return undefined;
-    return (value as VmFunction)[kVmFunction];
-}
-
 /** 创建 Mirascript 函数 */
 export function VmFunction<T extends VmFunctionLike>(fn: T, option: VmFunctionOption = {}): VmFunction<T> {
     if (typeof fn != 'function') {
@@ -68,7 +56,7 @@ export function VmFunction<T extends VmFunctionLike>(fn: T, option: VmFunctionOp
     if (exists) return exists;
 
     const info: Writable<VmFunctionInfo> = {
-        fullName: option.fullName ?? fn.name,
+        fullName: option.fullName ?? (fn.name === VM_FUNCTION_ANONYMOUS_NAME ? '' : fn.name),
         isLib: option.isLib ?? false,
         summary: option.summary || undefined,
         params: option.params,
@@ -89,10 +77,7 @@ export function VmFunction<T extends VmFunctionLike>(fn: T, option: VmFunctionOp
                 CpExit();
             }
         }) as typeof fn;
-        defineProperty(fn, 'name', {
-            value: original.name,
-            configurable: true,
-        });
+        defineProperty(fn, 'name', { value: original.name });
     }
     defineProperty(fn, kVmFunction, {
         value: Object.freeze(info),

package/src/vm/types/index.ts

@@ -1,12 +1,36 @@
-import type { VmArray } from './array.js';
 import type { VmExtern } from './extern.js';
 import type { VmFunction } from './function.js';
 import type { VmModule } from './module.js';
-import type { VmRecord } from './record.js';
 
 /** 类型名称 */
 export type TypeName = keyof VmValueMap;
 
+/** Mirascript 虚拟机内的未初始化变量 */
+export type VmUninitialized = undefined;
+/** Mirascript 原始值 */
+export type VmPrimitive = null | number | string | boolean;
+/**
+ * Mirascript 数组
+ * 数组中的 `undefined`、`null` 及 <empty slot> 均视作 `nil`
+ */
+export type VmArray = ReadonlyArray<VmConst | undefined>;
+/**
+ * Mirascript 记录
+ * 仅拥有且可枚举的字符串键视作存在
+ * 字段值 `undefined` 和 `null` 均视作 `nil`
+ */
+export type VmRecord = {
+    readonly [key: string]: VmConst | undefined;
+};
+/** Mirascript 虚拟机内的值语义值 */
+export type VmConst = VmPrimitive | VmRecord | VmArray;
+/** Mirascript 虚拟机内的不可变值 */
+export type VmImmutable = VmConst | VmFunction | VmModule;
+/** Mirascript 虚拟机内的合法值 */
+export type VmValue = VmImmutable | VmExtern;
+/** Mirascript 虚拟机内的值（包括未初始化变量） */
+export type VmAny = VmValue | VmUninitialized;
+
 /** 类型名称映射 */
 export interface VmValueMap {
     /** 空值 */
@@ -29,32 +53,30 @@ export interface VmValueMap {
     module: VmModule;
 }
 
-export { wrapToVmValue, unwrapFromVmValue, toVmFunctionProxy, fromVmFunctionProxy } from './boundary.js';
-export { type VmContext, type VmSharedContext, isVmContext, defineVmContextValue, createVmContext } from './context.js';
-export { type VmScript, isVmScript } from './script.js';
-export { isVmCallable } from './callable.js';
-
-export { type VmArray, VM_ARRAY_MAX_LENGTH, isVmArray } from './array.js';
 export {
-    type VmRecord,
-    isVmRecord,
+    isVmAny,
+    isVmArray,
     isVmArrayLikeRecord,
     isVmArrayLikeRecordByEntires,
     isVmArrayLikeRecordByKeys,
-} from './record.js';
-export { type VmPrimitive, isVmPrimitive } from './primitive.js';
-export { type VmConst, isVmConst } from './const.js';
-export { type VmImmutable, isVmImmutable } from './immutable.js';
-export { VmExtern, isVmExtern } from './extern.js';
-export {
-    VmFunction,
+    isVmCallable,
+    isVmConst,
+    isVmContext,
+    isVmExtern,
     isVmFunction,
+    isVmImmutable,
+    isVmModule,
+    isVmPrimitive,
+    isVmRecord,
+    isVmScript,
+    isVmValue,
+    isVmWrapper,
     getVmFunctionInfo,
-    type VmFunctionInfo,
-    type VmFunctionLike,
-    type VmFunctionOption,
-} from './function.js';
-export { VmModule, isVmModule } from './module.js';
-export { isVmWrapper } from './wrapper.js';
-export { type VmValue, isVmValue } from './value.js';
-export { type VmAny, type VmUninitialized, isVmAny } from './any.js';
+} from '../../helpers/types.js';
+
+export { wrapToVmValue, unwrapFromVmValue } from './boundary.js';
+
+export { type VmContext, type VmSharedContext, defineVmContextValue, createVmContext } from './context.js';
+export { VmExtern } from './extern.js';
+export { VmFunction, type VmFunctionInfo, type VmFunctionLike, type VmFunctionOption } from './function.js';
+export { VmModule } from './module.js';

package/src/vm/types/module.ts

@@ -1,9 +1,10 @@
+import { kVmModule } from '../../helpers/constants.js';
 import { hasOwnEnumerable, keys } from '../../helpers/utils.js';
-import type { TypeName, VmAny, VmValue } from './index.js';
+import type { TypeName, VmAny, VmImmutable } from './index.js';
 import { VmWrapper } from './wrapper.js';
 
 /** Mirascript 模块 */
-export class VmModule<const T extends Record<string, VmValue> = Record<string, VmValue>> extends VmWrapper<T> {
+export class VmModule<const T extends Record<string, VmImmutable> = Record<string, VmImmutable>> extends VmWrapper<T> {
     constructor(
         /** 模块名称 */
         readonly name: string,
@@ -39,9 +40,4 @@ export class VmModule<const T extends Record<string, VmValue> = Record<string, V
     }
 }
 
-const kVmModule = Symbol.for('mirascript.vm.module');
 Object.defineProperty(VmModule.prototype, kVmModule, { value: true });
-/** 检查值是否为 Mirascript 模块 */
-export function isVmModule<T extends Record<string, VmValue>>(value: unknown): value is VmModule<T> {
-    return value != null && typeof value == 'object' && kVmModule in value;
-}

package/src/vm/types/wrapper.ts

@@ -1,3 +1,4 @@
+import { kVmWrapper } from '../../helpers/constants.js';
 import type { TypeName, VmAny } from './index.js';
 
 /**
@@ -29,9 +30,4 @@ export abstract class VmWrapper<T extends object> {
     }
 }
 
-const kVmWrapper = Symbol.for('mirascript.vm.wrapper');
 Object.defineProperty(VmWrapper.prototype, kVmWrapper, { value: true });
-/** 检查值是否为 MiraScript 包装器 */
-export function isVmWrapper<T extends object>(value: unknown): value is VmWrapper<T> {
-    return value != null && typeof value == 'object' && kVmWrapper in value;
-}

package/dist/chunk-35JGBXRE.js

@@ -1 +0,0 @@
-//# sourceMappingURL=chunk-35JGBXRE.js.map