@mirascript/mirascript 0.1.1 → 0.1.3

package/dist/vm/types/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/vm/types/module.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,oBAAoB;AACpB,qBAAa,QAAQ,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAE,SAAQ,SAAS,CAAC,CAAC,CAAC;IAErG,WAAW;IACX,QAAQ,CAAC,IAAI,EAAE,MAAM;;IADrB,WAAW;IACF,IAAI,EAAE,MAAM;IACrB,WAAW;IACX,KAAK,EAAE,CAAC;IAIZ,kBAAkB;IACT,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAGlC,kBAAkB;IACT,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK;IAIhC,kBAAkB;IACT,IAAI,IAAI,MAAM,EAAE;IAGzB,kBAAkB;IACT,IAAI,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAGpC,kBAAkB;IAClB,IAAa,IAAI,IAAI,QAAQ,CAE5B;IACD,kBAAkB;IAClB,IAAa,QAAQ,IAAI,MAAM,CAE9B;CACJ"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/vm/types/module.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,oBAAoB;AACpB,qBAAa,QAAQ,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAE,SAAQ,SAAS,CAAC,CAAC,CAAC;IAErG,WAAW;IACX,QAAQ,CAAC,IAAI,EAAE,MAAM;;IADrB,WAAW;IACF,IAAI,EAAE,MAAM;IACrB,WAAW;IACX,KAAK,EAAE,CAAC;IAIZ,kBAAkB;IACT,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAGlC,kBAAkB;IACT,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK;IAIhC,kBAAkB;IACT,IAAI,IAAI,MAAM,EAAE;IAGzB,kBAAkB;IACT,IAAI,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAGpC,kBAAkB;IAClB,IAAa,IAAI,IAAI,QAAQ,CAE5B;IACD,kBAAkB;IAClB,IAAa,QAAQ,IAAI,MAAM,CAE9B;CACJ;AAID,2BAA2B;AAC3B,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC,CAElG"}

package/dist/vm/types/wrapper.d.ts

@@ -22,4 +22,6 @@ export declare abstract class VmWrapper<T extends object> {
     /** 转为字符串 */
     toString(): string;
 }
+/** 检查值是否为 MiraScript 包装器 */
+export declare function isVmWrapper<T extends object>(value: unknown): value is VmWrapper<T>;
 //# sourceMappingURL=wrapper.d.ts.map

package/dist/vm/types/wrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/vm/types/wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAElD;;GAEG;AACH,8BAAsB,SAAS,CAAC,CAAC,SAAS,MAAM;IAChC,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAAR,KAAK,EAAE,CAAC;IAC7B,cAAc;IACd,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAClC,cAAc;IACd,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK;IAChC,WAAW;IACX,QAAQ,CAAC,IAAI,IAAI,MAAM,EAAE;IACzB,aAAa;IACb,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IACpC,WAAW;IACX,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC;IAC9B,WAAW;IACX,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC;IAChC,iCAAiC;IACjC,MAAM,IAAI,SAAS;IAGnB,YAAY;IACZ,QAAQ,IAAI,MAAM;CAGrB"}
+{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/vm/types/wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAElD;;GAEG;AACH,8BAAsB,SAAS,CAAC,CAAC,SAAS,MAAM;IAChC,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAAR,KAAK,EAAE,CAAC;IAC7B,cAAc;IACd,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAClC,cAAc;IACd,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK;IAChC,WAAW;IACX,QAAQ,CAAC,IAAI,IAAI,MAAM,EAAE;IACzB,aAAa;IACb,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IACpC,WAAW;IACX,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC;IAC9B,WAAW;IACX,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC;IAChC,iCAAiC;IACjC,MAAM,IAAI,SAAS;IAGnB,YAAY;IACZ,QAAQ,IAAI,MAAM;CAGrB;AAID,4BAA4B;AAC5B,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,CAAC,CAAC,CAAC,CAEnF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mirascript/mirascript",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "type": "module",
   "description": "An expression based scripting language.",
   "main": "./dist/index.js",
@@ -35,11 +35,11 @@
     "ansi-styles": "^6.2.3",
     "commander": "^14.0.2",
     "js-base64": "^3.7.8",
-    "@mirascript/napi": "~0.1.1",
-    "@mirascript/wasm": "~0.1.1"
+    "@mirascript/napi": "~0.1.3",
+    "@mirascript/wasm": "~0.1.3"
   },
   "devDependencies": {
-    "@types/node": "^24.9.1",
+    "@types/node": "^24.10.0",
     "@types/sinon": "^17.0.4",
     "ava": "^6.4.1",
     "c8": "^10.1.3",

package/src/compiler/diagnostic.ts

@@ -60,20 +60,27 @@ export interface SourceReference<T extends DiagnosticCode = DiagnosticCode> exte
     readonly diagnostic: SourceDiagnostic<T>;
 }
 
-/** 分析诊断信息 */
-export function parseDiagnostics(
-    source: ScriptInput,
-    diagnostics: Uint32Array,
-): {
+/** 解析后的诊断信息 */
+interface ParsedDiagnostics {
+    /** 错误诊断信息 */
     errors: SourceDiagnostic[];
+    /** 警告诊断信息 */
     warnings: SourceDiagnostic[];
+    /** 信息诊断信息 */
     infos: SourceDiagnostic[];
+    /** 提示诊断信息 */
     hints: SourceDiagnostic[];
+    /** 标签诊断信息 */
     tags: SourceDiagnostic[];
 
+    /** 引用诊断信息 */
     references: SourceReference[];
+    /** 标签引用诊断信息 */
     tagsReferences: SourceReference[];
-} {
+}
+
+/** 分析诊断信息，{@link diagnostic_position_encoding} 不能设为 `None` */
+export function parseDiagnostics(source: ScriptInput, diagnostics: Uint32Array): ParsedDiagnostics {
     const parsed = [];
     const bufLen = diagnostics.length;
     for (let i = 0; i < bufLen; i += 5) {
@@ -148,12 +155,7 @@ export function parseDiagnostics(
 }
 
 /** 生成诊断 range 的字符串 */
-function formatRange(range: {
-    startLineNumber: number;
-    startColumn: number;
-    endLineNumber: number;
-    endColumn: number;
-}): string {
+function formatRange(range: IRange): string {
     if (range.startLineNumber === range.endLineNumber) {
         if (range.startColumn === range.endColumn) {
             return `${range.startLineNumber}:${range.startColumn}`;

package/src/helpers/utils.ts

@@ -1,6 +1,7 @@
 export const { isArray } = Array;
 export const { isFinite, isNaN, isInteger, isSafeInteger } = Number;
 export const { hasOwn, keys, values, entries, create, getPrototypeOf, fromEntries, defineProperty } = Object;
+export const { apply } = Reflect;
 
 /**
  * Determines whether an object has an enumerable property with the specified name.

package/src/vm/error.ts

@@ -14,9 +14,21 @@ export class VmError extends Error {
 
     /** 从其他错误构造 */
     static from(prefix: string, error: unknown, recovered: VmAny): VmError {
-        if (prefix && !prefix.endsWith(': ')) prefix += ': ';
-        const vmError = new VmError(`${prefix}${error instanceof Error ? error.message : String(error)}`, recovered);
-        vmError.stack = error instanceof Error ? error.stack : undefined;
+        if (prefix) {
+            if (prefix.endsWith(':')) {
+                prefix += ' ';
+            } else if (!prefix.endsWith(': ')) {
+                prefix += ': ';
+            }
+        }
+        let vmError: VmError;
+        if (error instanceof Error) {
+            vmError = new VmError(`${prefix}${error.message}`, recovered);
+            vmError.stack = error.stack;
+        } else {
+            vmError = new VmError(`${prefix}${String(error)}`, recovered);
+        }
+        vmError.cause = error;
         return vmError;
     }
 }

package/src/vm/lib/_helpers.ts

@@ -3,7 +3,6 @@ import { VmError } from '../error.js';
 import { $ToNumber, $Type } from '../operations.js';
 import {
     isVmArray,
-    isVmExtern,
     isVmFunction,
     type VmExtern,
     type VmFunction,
@@ -17,6 +16,7 @@ import {
     type VmConst,
     isVmConst,
     VM_ARRAY_MAX_LENGTH,
+    isVmCallable,
 } from '../types/index.js';
 import type { VmFunctionLike, VmFunctionOption } from '../types/function.js';
 import { Cp } from '../helpers.js';
@@ -127,8 +127,7 @@ export function expectCallable(
     recovered: VmAny | (() => VmAny),
 ): asserts value is VmFunction | VmExtern {
     required(name, value, recovered);
-    const callable = isVmFunction(value) || isVmExtern(value);
-    if (!callable) {
+    if (!isVmCallable(value)) {
         throwUnexpectedTypeError(name, 'callable', value, recovered);
     }
 }
@@ -168,11 +167,7 @@ export function map(
             Cp();
             const ret = mapper(data[i] ?? null, i, data);
             if (ret === undefined) continue;
-            if (isVmConst(ret)) {
-                result.push(ret);
-            } else {
-                result.push(null);
-            }
+            result.push(ret);
         }
         return result;
     } else {
@@ -181,11 +176,7 @@ export function map(
             Cp();
             const ret = mapper(value ?? null, key, data);
             if (ret === undefined) continue;
-            if (isVmConst(ret)) {
-                e.push([key, ret]);
-            } else {
-                e.push([key, null]);
-            }
+            e.push([key, ret]);
         }
         return fromEntries(e);
     }

package/src/vm/lib/_loader.ts

@@ -6,7 +6,7 @@ import type { VmLib, VmLibOption } from './_helpers.js';
 import * as global from './global/index.js';
 
 for (const [name, value] of entries(global)) {
-    VmSharedContext[name] = wrapEntry(name, value as RawValue);
+    VmSharedContext[name] = wrapEntry(name, value as RawValue, 'global');
 }
 
 /** 原始值 */
@@ -14,7 +14,7 @@ type RawValue = VmLib | VmConst | VmModule;
 /** 包装值 */
 type ToWrappedValue<V extends RawValue> = V extends VmFunctionLike ? VmFunction<V> : V;
 /** 包装值 */
-function wrapEntry<const T extends RawValue>(name: string, value: T): ToWrappedValue<T> {
+function wrapEntry<const T extends RawValue>(name: string, value: T, module: string): ToWrappedValue<T> {
     if (typeof value == 'function') {
         if (value.name !== name) {
             // 如果函数名和导出名不一致，则重命名
@@ -26,7 +26,7 @@ function wrapEntry<const T extends RawValue>(name: string, value: T): ToWrappedV
         return VmFunction(value, {
             isLib: true,
             injectCp: true,
-            fullName: `global.${name}`,
+            fullName: `${module}.${name}`,
             ...(value as VmLibOption),
         }) as ToWrappedValue<T>;
     } else {
@@ -43,7 +43,7 @@ export type ToWrappedModule<T extends Record<string, RawValue>> = VmModule<{
 export function createModule<const T extends Record<string, RawValue>>(name: string, lib: T): ToWrappedModule<T> {
     const mod = create(null) as Record<string, VmImmutable>;
     for (const [key, value] of entries(lib)) {
-        mod[key] = wrapEntry(key, value);
+        mod[key] = wrapEntry(key, value, name);
     }
     return new VmModule(name, mod) as ToWrappedModule<T>;
 }

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

@@ -15,7 +15,7 @@ export const pow = VmLib((x, y) => _pow($ToNumber(x), $ToNumber(y)), {
     returnsType: 'number',
 });
 export const random = VmLib(Math.random, {
-    summary: '返回 0 到 1 之间的伪随机数',
+    summary: '返回 [0, 1) 之间的伪随机数',
     params: {},
     paramsType: {},
     returnsType: 'number',

package/src/vm/lib/global/sequence/find.ts

@@ -1,17 +1,19 @@
 import { entries } from '../../../../helpers/utils.js';
 import { Cp } from '../../../helpers.js';
-import { $Call, $ToBoolean } from '../../../operations.js';
-import { type VmValue, isVmArray } from '../../../types/index.js';
-import { VmLib, expectArrayOrRecord, expectCallable } from '../../_helpers.js';
+import { $Call, $Same, $ToBoolean } from '../../../operations.js';
+import { type VmValue, isVmArray, isVmCallable } from '../../../types/index.js';
+import { VmLib, expectArrayOrRecord, required } from '../../_helpers.js';
 
 export const find = VmLib(
     (data, predicate) => {
         expectArrayOrRecord('data', data, null);
-        expectCallable('predicate', predicate, data);
-        const p = (value: VmValue, key: string | number, data: VmValue) => {
-            const ret = $Call(predicate, [value, key, data]);
-            return $ToBoolean(ret);
-        };
+        required('predicate', predicate, null);
+        const p = isVmCallable(predicate)
+            ? (value: VmValue, key: string | number, data: VmValue) => {
+                  const ret = $Call(predicate, [value, key, data]);
+                  return $ToBoolean(ret);
+              }
+            : (value: VmValue) => $Same(predicate, value);
         if (isVmArray(data)) {
             const { length } = data;
             for (let i = 0; i < length; i++) {
@@ -37,13 +39,13 @@ export const find = VmLib(
         summary: '查找数组或记录中的键值对，返回第一个满足条件的键值对',
         params: {
             data: '查的数组或记录',
-            predicate: '用于测试每个键值对的函数，返回 true 或 false',
+            predicate: '用于测试每个键值对的函数，或要查找的值',
         },
         paramsType: {
             data: 'array | record',
-            predicate: 'fn(value: any, key: number | string | nil, input: type(data)) -> boolean',
+            predicate: '(fn(value: any, key: number | string | nil, input: type(data)) -> boolean) | any',
         },
         returnsType: '(string | number, any) | nil',
-        examples: ['find([3, 5, 8], fn (v) { v % 2 == 0 }) // (2, 8)'],
+        examples: ['find([3, 5, 8], fn (v) { v % 2 == 0 }) // (2, 8)', `find((x: 1, y: 2, z: 3), 2) // ('y', 2)`],
     },
 );

package/src/vm/lib/global/sequence/map-filter.ts

@@ -49,7 +49,7 @@ export const filter = VmLib(
         summary: '过滤数组或记录中的元素，返回满足条件的元素',
         params: {
             data: '要过滤的数组或记录',
-            predicate: '用于测试每个元素的函数，返回 true 或 false',
+            predicate: '用于测试每个元素的函数',
         },
         paramsType: {
             data: 'array | record',
@@ -70,7 +70,7 @@ export const filter_map = VmLib(
         summary: '对数组或记录中的每个元素应用函数，并返回非 nil 的结果',
         params: {
             data: '要映射的数组或记录',
-            f: '应用于每个元素的函数，返回 nil 或非 nil 的值',
+            f: '应用于每个元素的函数',
         },
         paramsType: {
             data: 'array | record',

package/src/vm/lib/global/sequence/with.ts

@@ -1,43 +1,137 @@
+import { isArray, isSafeInteger } from '../../../../helpers/utils.js';
 import { Element } from '../../../helpers.js';
 import { $ToNumber, $ToString } from '../../../operations.js';
-import { isVmArray, type VmConst } from '../../../types/index.js';
-import { VmLib, expectArrayOrRecord, throwError } from '../../_helpers.js';
-import { isSafeInteger } from '../../../../helpers/utils.js';
+import {
+    isVmArray,
+    isVmRecord,
+    VM_ARRAY_MAX_LENGTH,
+    type VmArray,
+    type VmConst,
+    type VmValue,
+} from '../../../types/index.js';
+import { VmLib, expectArrayOrRecord, expectConst, throwError } from '../../_helpers.js';
+
+const arrIndex = (index: NonNullable<VmConst>): number => {
+    const idx = Math.trunc($ToNumber(index));
+    if (!isSafeInteger(idx) || idx < 0 || idx >= VM_ARRAY_MAX_LENGTH) {
+        return -1;
+    }
+    return idx;
+};
+
+const withInner = (obj: VmConst | undefined, key: VmArray, keyIndex: number, value: VmConst): VmConst => {
+    if (keyIndex >= key.length) {
+        return value;
+    }
+    const k = key[keyIndex]!;
+    let result: Array<VmConst | undefined> | Record<string, VmConst | undefined>;
+    if (isVmArray(obj)) {
+        result = [...obj];
+    } else if (isVmRecord(obj)) {
+        result = { ...obj };
+    } else if (arrIndex(k) === k) {
+        result = [];
+    } else {
+        result = {};
+    }
+    if (isArray(result)) {
+        const index = arrIndex(k);
+        while (index > result.length) {
+            result.push(null);
+        }
+        result[index] = withInner(result[index], key, keyIndex + 1, value);
+    } else {
+        const prop = $ToString(k);
+        result[prop] = withInner(result[prop], key, keyIndex + 1, value);
+    }
+    return result;
+};
+
+const normalizeEntries = (data: VmConst, entries: Array<VmValue | undefined>): Map<NonNullable<VmConst>, VmConst> => {
+    if (entries.length % 2 !== 0) {
+        throwError('Expected even number of entries', data);
+    }
+    const entryData = new Map<NonNullable<VmConst>, VmConst>();
+    for (let i = 0; i < entries.length; i += 2) {
+        let key = entries[i]!;
+        expectConst('key', key, data);
+        if (key == null) {
+            continue;
+        }
+        if (isVmArray(key)) {
+            if (key.length === 0 || key.includes(null) || key.includes(undefined)) {
+                continue;
+            } else if (key.length === 1) {
+                key = key[0]!;
+            }
+        }
+        const value = entries[i + 1]!;
+        entryData.set(key, Element(value));
+    }
+    return entryData;
+};
 
 const _with = VmLib(
     (data, ...entries) => {
         expectArrayOrRecord('data', data, data);
-        if (entries.length % 2 !== 0) {
-            throwError('Expected even number of entries', data);
+        if (entries.length === 0) {
+            return data;
         }
+
+        const entryData = normalizeEntries(data, entries);
         if (isVmArray(data)) {
             const result: Array<VmConst | undefined> = [...data];
-            for (let i = 0; i < entries.length; i += 2) {
-                const index = Math.trunc($ToNumber(entries[i]));
-                if (!isSafeInteger(index) || index < 0) continue;
-                const value = entries[i + 1];
+            for (const [key, value] of entryData) {
+                let index: number;
+                let val: VmConst;
+                if (isVmArray(key)) {
+                    index = arrIndex(key[0]!);
+                    if (index < 0) continue;
+                    val = withInner(result[index], key, 1, value);
+                } else {
+                    index = arrIndex(key);
+                    if (index < 0) continue;
+                    val = value;
+                }
                 while (index > result.length) {
                     result.push(null);
                 }
-                result[index] = Element(value);
+                result[index] = val;
             }
             return result;
         } else {
             const result: Record<string, VmConst | undefined> = { ...data };
-            for (let i = 0; i < entries.length; i += 2) {
-                const key = $ToString(entries[i]);
-                const value = entries[i + 1];
-                result[key] = Element(value);
+            for (const [key, value] of entryData) {
+                let prop: string;
+                let val: VmConst;
+                if (isVmArray(key)) {
+                    const firstKey = key[0]!;
+                    prop = $ToString(firstKey);
+                    val = withInner(result[prop], key, 1, value);
+                } else {
+                    prop = $ToString(key);
+                    val = value;
+                }
+                result[prop] = val;
             }
             return result;
         }
     },
     {
         summary: '在数组或记录中设置多个键值对',
-        params: { data: '要设置的数组或记录', '..entries': '要设置的键值对，成对出现' },
-        paramsType: { data: 'array | record', '..entries': '[..[string | number, any][]]' },
+        params: {
+            data: '要设置的数组或记录',
+            '..entries': '要设置的键值对，成对出现',
+        },
+        paramsType: {
+            data: 'array | record',
+            '..entries': `[..[string | number | (string | number)[], any][]]`,
+        },
         returnsType: 'type(data)',
-        examples: ['with([10, 20], 2, 99) // [10, 20, 99]', 'with((a: 1), "b", 2) // (a: 1, b: 2)'],
+        examples: [
+            `with([10, 20], 2, 99, 3 ,100) // [10, 20, 99, 100]`,
+            `(a: 1)::with(["b", 1], 2) // (a: 1, b: [nil, 2])`,
+        ],
     },
 );
 export { _with as 'with' };

package/src/vm/operations.ts

@@ -1,24 +1,23 @@
 import { VmError } from './error.js';
 import {
+    isVmPrimitive,
     isVmArray,
-    VmModule,
-    VmExtern,
     isVmRecord,
+    isVmFunction,
+    isVmExtern,
+    isVmModule,
+    isVmWrapper,
     getVmFunctionInfo,
-    isVmPrimitive,
     type TypeName,
     type VmAny,
     type VmImmutable,
     type VmRecord,
     type VmValue,
-    isVmFunction,
     type VmArray,
     type VmConst,
-    isVmExtern,
     type VmPrimitive,
     type VmFunction,
 } from './types/index.js';
-import { VmWrapper } from './types/wrapper.js';
 import { hasOwnEnumerable, isNaN, isSafeInteger, keys, create } from '../helpers/utils.js';
 
 const { abs, min, trunc, ceil } = Math;
@@ -33,8 +32,8 @@ const isSame = (a: VmValue, b: VmValue): boolean => {
     // Any primitives and functions arrive here are not equal
     if (a == null || typeof a != 'object' || b == null || typeof b != 'object') return false;
     // Handle wrapper values
-    if (a instanceof VmWrapper) return a.same(b);
-    if (b instanceof VmWrapper) return b.same(a);
+    if (isVmWrapper(a)) return a.same(b);
+    if (isVmWrapper(b)) return b.same(a);
     // Handle array values
     if (isVmArray(a) && isVmArray(b)) {
         const len = a.length;
@@ -141,11 +140,6 @@ export const $Eq = (a: VmAny, b: VmAny): boolean => {
 export const $Neq = (a: VmAny, b: VmAny): boolean => {
     return !$Eq(a, b);
 };
-const stringComparer = new Intl.Collator('en', {
-    usage: 'sort',
-    numeric: false,
-    sensitivity: 'base',
-});
 export const $Aeq = (a: VmAny, b: VmAny): boolean => {
     if (overloadNumberString(a, b)) {
         const an = $ToNumber(a);
@@ -159,11 +153,16 @@ export const $Aeq = (a: VmAny, b: VmAny): boolean => {
         const base = min(abs(an), abs(bn));
         return absoluteDifference < base * EPS;
     } else {
-        // For strings, we use localeCompare for case-insensitive accent-insensitive comparison
+        // For strings, we use normalized case-insensitive comparison
         const as = $ToString(a);
         const bs = $ToString(b);
         if (as === bs) return true;
-        return stringComparer.compare(as, bs) === 0;
+        const ai = as.toLowerCase();
+        const bi = bs.toLowerCase();
+        if (ai === bi) return true;
+        const an = ai.normalize('NFC');
+        const bn = bi.normalize('NFC');
+        return an === bn;
     }
 };
 export const $Naeq = (a: VmAny, b: VmAny): boolean => {
@@ -196,7 +195,7 @@ export const $In = (value: VmAny, iterable: VmAny): boolean => {
         return iterable.some((item = null) => isSame(item, value));
     }
     // iterable is a record or an extern here, value should be a string
-    if (iterable instanceof VmWrapper) return iterable.has($ToString(value));
+    if (isVmWrapper(iterable)) return iterable.has($ToString(value));
     if (typeof iterable == 'object') return hasOwnEnumerable(iterable, $ToString(value));
     iterable satisfies VmPrimitive | VmFunction;
     return false;
@@ -217,7 +216,7 @@ export const $Length = (value: VmAny): number => {
     $AssertInit(value);
     if (isVmArray(value)) return value.length;
     if (isVmRecord(value)) return keys(value).length;
-    if (value instanceof VmWrapper) {
+    if (isVmWrapper(value)) {
         return value.keys().length;
     }
     return Number.NaN;
@@ -285,7 +284,7 @@ export const $Call = (func: VmValue, args: readonly VmAny[]): VmValue => {
     for (const a of args) {
         $AssertInit(a);
     }
-    if (func instanceof VmExtern) {
+    if (isVmExtern(func)) {
         return func.call(args as readonly VmValue[]) ?? null;
     }
     if (isVmFunction(func)) {
@@ -295,8 +294,8 @@ export const $Call = (func: VmValue, args: readonly VmAny[]): VmValue => {
 };
 export const $Type = (value: VmAny): TypeName => {
     if (value === undefined || value === null) return 'nil';
-    if (value instanceof VmExtern) return 'extern';
-    if (value instanceof VmModule) return 'module';
+    if (isVmExtern(value)) return 'extern';
+    if (isVmModule(value)) return 'module';
     if (isVmArray(value)) return 'array';
     if (typeof value == 'object') return 'record';
     return typeof value as TypeName;
@@ -316,7 +315,7 @@ function numberToString(value: number): string {
 /** 将值转为字符串 */
 function innerToString(value: VmAny, useBraces: boolean): string {
     if (value == null) return 'nil';
-    if (value instanceof VmWrapper) return value.toString();
+    if (isVmWrapper(value)) return value.toString();
     if (typeof value == 'function') {
         const name = getVmFunctionInfo(value)?.fullName;
         return name ? `<function ${name}>` : `<function>`;
@@ -397,7 +396,7 @@ export const $Has = (obj: VmAny, key: VmAny): boolean => {
     $AssertInit(obj);
     const pk = $ToString(key);
     if (obj == null || typeof obj != 'object') return false;
-    if (obj instanceof VmWrapper) return obj.has(pk);
+    if (isVmWrapper(obj)) return obj.has(pk);
     return hasOwnEnumerable(obj, pk);
 };
 export const $Get = (obj: VmAny, key: VmAny): VmValue => {
@@ -409,7 +408,7 @@ export const $Get = (obj: VmAny, key: VmAny): VmValue => {
     }
     const pk = $ToString(key);
     if (obj == null || typeof obj != 'object') return null;
-    if (obj instanceof VmWrapper) return obj.get(pk) ?? null;
+    if (isVmWrapper(obj)) return obj.get(pk) ?? null;
     if (!hasOwnEnumerable(obj, pk)) return null;
     return (obj as Record<string, VmImmutable>)[pk] ?? null;
 };
@@ -423,7 +422,7 @@ export const $Set = (obj: VmAny, key: VmAny, value: VmAny): void => {
 };
 export const $Iterable = (value: VmAny): Iterable<VmValue | undefined> => {
     $AssertInit(value);
-    if (value instanceof VmWrapper) return value.keys();
+    if (isVmWrapper(value)) return value.keys();
     if (isVmArray(value)) return value;
     if (value != null && typeof value == 'object') return keys(value);
     throw new VmError(`Value is not iterable`, isVmFunction(value) ? [] : [value]);