@mirascript/mirascript 0.1.19 → 0.1.21

package/src/compiler/emit/sourcemap.ts

@@ -1,8 +1,8 @@
 import type { IRange } from '../diagnostic.js';
 import type { ScriptInput, TranspileOptions } from '../types.js';
 import { SourceMapGenerator } from 'source-map-js';
-import { GLOBAL_HINT, SCRIPT_PREFIX } from './constants.js';
-import type { GlobalMap } from './globals.js';
+import { SCRIPT_PREFIX } from './constants.js';
+import { toJsLiteral } from './consts.js';
 
 const ORIGIN = `mira://MiraScript/`;
 const { SOURCE_URL, SOURCE_MAPPING_URL } = ((source, mapping, url) => {
@@ -13,10 +13,11 @@ const { SOURCE_URL, SOURCE_MAPPING_URL } = ((source, mapping, url) => {
         SOURCE_MAPPING_URL: prefix.concat(source, mapping, url),
     };
 })(`source`, `Mapping`, `URL`);
-// 前两行固定为：
+// 前 3 行固定为：
 // (function anonymous($Add,$Aeq, ...
 // ) {
-const SOURCE_OFFSET = 3;
+// 'use strict';
+const SOURCE_OFFSET = 4;
 
 /**
  * Node.js Buffer 类型的简易声明，@mirascript/playground 调试环境下会直接加载此文件
@@ -33,79 +34,15 @@ const toDataUrl: (json: string) => string =
         ? (s) => `data:application/json;base64,${Buffer.from(s, 'utf8').toString('base64')}`
         : (s) => `data:application/json;charset=utf-8,${encodeURIComponent(s)}`;
 
-/** 添加全局变量的源映射 */
-function addGlobalMappings(globalLine: string, fileName: string, map: SourceMapGenerator, globals: GlobalMap) {
-    let globalFile = `global;\n`;
-    map.addMapping({
-        generated: {
-            line: 3,
-            column: globalLine.indexOf(`global = `),
-        },
-        original: {
-            line: 1,
-            column: 0,
-        },
-        source: fileName,
-        name: 'global',
-    });
-    map.addMapping({
-        generated: {
-            line: 3,
-            column: SCRIPT_PREFIX.length,
-        },
-        original: {
-            line: 1,
-            column: 7,
-        },
-        source: fileName,
-        name: '',
-    });
-    let i = 1;
-    let pos = globalLine.indexOf(GLOBAL_HINT, SCRIPT_PREFIX.length) + GLOBAL_HINT.length;
-    for (const p of globals.values()) {
-        i++;
-        if (pos < 0) break;
-        const { v, n } = p;
-        pos = globalLine.indexOf(v, pos);
-        if (pos < 0) break;
-        map.addMapping({
-            generated: {
-                line: 3,
-                column: pos,
-            },
-            original: {
-                line: i,
-                column: 0,
-            },
-            source: fileName,
-            name: n,
-        });
-        globalFile += `${n};\n`;
-    }
-    map.addMapping({
-        generated: {
-            line: 3,
-            column: pos,
-        },
-        original: {
-            line: i,
-            column: 0,
-        },
-        source: fileName,
-        name: '',
-    });
-    map.setSourceContent(fileName, globalFile);
-}
-
 let sourceId = 1;
 /** 创建源映射 */
 export function createSourceMap(
     source: ScriptInput | undefined,
     sourcemaps: readonly IRange[],
-    codeLines: readonly string[],
-    globals: GlobalMap,
+    codeLines: string[],
+    functions: readonly number[],
     options: TranspileOptions,
-): [string, string] {
+): void {
     let fileName = (options.fileName ?? '').trim();
     const hasSchema = /^\w+:/.test(fileName);
     if (!hasSchema) {
@@ -154,15 +91,23 @@ export function createSourceMap(
             source: fileName,
         });
     }
-    const globalLine = codeLines[0];
-    if (globalLine?.includes(GLOBAL_HINT)) {
-        addGlobalMappings(globalLine, `${fileName} <globals>`, map, globals);
+    let fnNames = `'use strict';`;
+    if (typeof source === 'string') {
+        const lines = source.split(/\r?\n/);
+        for (let i = 0; i < functions.length; i++) {
+            const index = functions[i]!;
+            const mapping = sourcemaps[index];
+            const line = mapping ? lines[mapping.startLineNumber - 1] : undefined;
+            const fnName = mapping && line ? line.slice(mapping.startColumn - 1, mapping.endColumn - 1) : '';
+            fnNames += `var fnName_${i} = ${fnName ? toJsLiteral(fnName) : 'null'};`;
+        }
     }
     const sourceURL = hasSchema ? fileName : `${ORIGIN}${fileName}`;
     const dataUrl = toDataUrl(map.toString());
-    return [
+    codeLines.unshift(fnNames);
+    codeLines.push(
         // Prevent source map from being recognized as of this file
         `${SOURCE_URL}=${sourceURL}.js`,
         `${SOURCE_MAPPING_URL}=${dataUrl}`,
-    ];
+    );
 }

package/src/compiler/emit-script.ts

@@ -0,0 +1,30 @@
+import type { ScriptInput, TranspileOptions } from './types.js';
+import type { VmBytecodeResult } from './generate-bytecode.js';
+import { emit } from './emit/index.js';
+import { createScript, type VmScript } from './create-script.js';
+import { DiagnosticCode, formatDiagnostics, parseDiagnostics } from './diagnostic.js';
+
+/** 报告编译错误 */
+export function reportDiagnostic(source: ScriptInput, diagnostics: Uint32Array, fileName: string | undefined): never {
+    const parsed = parseDiagnostics(source, diagnostics);
+    const messages = formatDiagnostics(parsed.errors, source, fileName);
+    throw new Error(`Failed to compile:\n${messages.join('\n')}`);
+}
+
+/**
+ * 生成 MiraScript 对应的 JavaScript 代码
+ */
+export function emitScript(
+    source: ScriptInput,
+    [code, diagnostics]: VmBytecodeResult,
+    options: TranspileOptions,
+): VmScript {
+    if (!code) {
+        reportDiagnostic(source, diagnostics, options.fileName);
+    }
+    const sourcemaps = options.sourceMap
+        ? parseDiagnostics(source, diagnostics, (c) => c === DiagnosticCode.SourceMap).sourcemaps
+        : [];
+    const target = emit(source, code, sourcemaps, options);
+    return createScript(source, options.input_mode ?? 'Script', target);
+}

package/src/compiler/generate-bytecode.ts

@@ -1,13 +1,13 @@
 import { getModule, loadModule } from '@mirascript/bindings';
 import type { CompileOptions, ScriptInput } from './types.js';
 
+/** MiraScript 字节码 */
+export type VmBytecodeResult = [code: Uint8Array | undefined, diagnostics: Uint32Array];
+
 /**
  * 生成 MiraScript 字节码
  */
-export function generateBytecodeSync(
-    script: ScriptInput,
-    options: CompileOptions,
-): [Uint8Array | undefined, Uint32Array] {
+export function generateBytecodeSync(script: ScriptInput, options: CompileOptions): VmBytecodeResult {
     const module = getModule();
     const result = module.compileSync(script, options);
     return [result.chunk, result.diagnostics];
@@ -16,10 +16,7 @@ export function generateBytecodeSync(
 /**
  * 生成 MiraScript 字节码
  */
-export async function generateBytecode(
-    script: ScriptInput,
-    options: CompileOptions,
-): Promise<[Uint8Array | undefined, Uint32Array]> {
+export async function generateBytecode(script: ScriptInput, options: CompileOptions): Promise<VmBytecodeResult> {
     if (options == null) {
         throw new TypeError('options must be provided');
     }

package/src/compiler/index.ts

@@ -1,54 +1,34 @@
-import { loadModule } from '@mirascript/bindings';
+import './load-module.js';
 import type { ScriptInput, TranspileOptions } from './types.js';
-import { emit } from './emit/index.js';
 import { createScript, type VmScript } from './create-script.js';
 import { compileFast } from './compile-fast.js';
-import { DiagnosticCode, formatDiagnostics, parseDiagnostics } from './diagnostic.js';
 import { generateBytecode, generateBytecodeSync } from './generate-bytecode.js';
 import { compileWorker } from './worker-manager.js';
-await loadModule();
+import { emitScript, reportDiagnostic } from './emit-script.js';
 
-export { generateBytecode, generateBytecodeSync };
 export * from './types.js';
 export type { VmScript };
 
 // 目前编译速度约 2000kB/s
 const WORKER_MIN_LEN = typeof Worker != 'function' ? Number.MAX_VALUE : 1024;
 
-/** 报告编译错误 */
-function reportDiagnostic(source: ScriptInput, diagnostics: Uint32Array, fileName: string | undefined): never {
-    const parsed = parseDiagnostics(source, diagnostics);
-    const messages = formatDiagnostics(parsed.errors, source, fileName);
-    throw new Error(`Failed to compile:\n${messages.join('\n')}`);
-}
-
-/**
- * 生成 MiraScript 对应的 JavaScript 代码
- */
-export function emitScript(
-    source: ScriptInput,
-    [code, diagnostics]: [Uint8Array | undefined, Uint32Array],
-    options: TranspileOptions,
-): VmScript {
-    if (!code) {
-        reportDiagnostic(source, diagnostics, options.fileName);
+/** 设置 options */
+function getOptions(options: TranspileOptions | undefined): TranspileOptions {
+    options ??= {};
+    if (options.sourceMap) {
+        options.diagnostic_sourcemap = true;
+        // https://tc39.es/ecma426/#sec-terms-and-definitions-colun
+        options.diagnostic_position_encoding ??= 'Utf16';
     }
-    const sourcemaps = options.sourceMap
-        ? parseDiagnostics(source, diagnostics, (c) => c === DiagnosticCode.SourceMap).sourcemaps
-        : [];
-    const target = emit(source, code, sourcemaps, options);
-    return createScript(source, target);
+    options.input_mode ??= 'Script';
+    return options;
 }
 
 /**
  * 生成 MiraScript 对应的 JavaScript 代码
  */
-export async function compile(this: void, source: ScriptInput, options: TranspileOptions = {}): Promise<VmScript> {
-    if (options.sourceMap) {
-        options.diagnostic_sourcemap = true;
-        // https://tc39.es/ecma426/#sec-terms-and-definitions-colun
-        options.diagnostic_position_encoding ??= 'Utf16';
-    }
+export async function compile(this: void, source: ScriptInput, options?: TranspileOptions): Promise<VmScript> {
+    options = getOptions(options);
     if (typeof source == 'string') {
         const result = compileFast(source, options);
         if (result) return result;
@@ -61,12 +41,13 @@ export async function compile(this: void, source: ScriptInput, options: Transpil
     if (target == null) {
         reportDiagnostic(source, diagnostics, options.fileName);
     }
-    return createScript(source, target);
+    return createScript(source, options.input_mode ?? 'Script', target);
 }
 /**
  * 生成 MiraScript 对应的 JavaScript 代码
  */
-export function compileSync(this: void, source: ScriptInput, options: TranspileOptions = {}): VmScript {
+export function compileSync(this: void, source: ScriptInput, options?: TranspileOptions): VmScript {
+    options = getOptions(options);
     if (typeof source == 'string') {
         const result = compileFast(source, options);
         if (result) return result;

package/src/compiler/keywords.ts

@@ -0,0 +1,9 @@
+import './load-module.js';
+
+import { getModule } from '@mirascript/bindings';
+/** 所有 MiraScript 关键字 */
+export let keywords: () => readonly string[] = () => {
+    const kw = Object.freeze(getModule().keywords());
+    keywords = () => kw;
+    return kw;
+};

package/src/compiler/load-module.ts

@@ -0,0 +1,3 @@
+import { loadModule } from '@mirascript/bindings';
+
+await loadModule();

package/src/helpers/constants.ts

@@ -1,6 +1,8 @@
 export const REG_IDENTIFIER = /(?:_+|@+|\$+|\p{XID_Start})\p{XID_Continue}*/u;
 export const REG_ORDINAL =
     /(?:214748364[0-7]|21474836[0-3]\d|2147483[0-5]\d{2}|214748[0-2]\d{3}|21474[0-7]\d{4}|2147[0-3]\d{5}|214[0-6]\d{6}|21[0-3]\d{7}|20\d{8}|1\d{9}|[1-9]\d{0,8}|0)/;
+export const REG_IDENTIFIER_FULL = new RegExp(`^${REG_IDENTIFIER.source}$`, REG_IDENTIFIER.flags);
+export const REG_ORDINAL_FULL = new RegExp(`^${REG_ORDINAL.source}$`, REG_ORDINAL.flags);
 export const REG_WHITESPACE = /[ \t\v\f\r\n]/u;
 export const REG_HEX = /0[xX][a-fA-F0-9_]*[a-fA-F0-9]/;
 export const REG_OCT = /0[oO][0-7_]*[0-7]/;

package/src/helpers/serialize.ts

@@ -1,5 +1,5 @@
 import type { VmArray, VmExtern, VmFunction, VmModule, VmAny, VmRecord } from '../vm/index.js';
-import { REG_IDENTIFIER, REG_ORDINAL } from './constants.js';
+import { REG_IDENTIFIER_FULL, REG_ORDINAL_FULL } from './constants.js';
 import { entries, hasOwn, isFinite, isNaN } from '../helpers/utils.js';
 import {
     getVmFunctionInfo,
@@ -12,9 +12,6 @@ import {
 } from './types.js';
 import type { VmWrapper } from '../vm/types/wrapper.js';
 
-const REG_IDENTIFIER_FULL = new RegExp(`^${REG_IDENTIFIER.source}$`, REG_IDENTIFIER.flags);
-const REG_ORDINAL_FULL = new RegExp(`^${REG_ORDINAL.source}$`, REG_ORDINAL.flags);
-
 /** 序列化设置 */
 export interface SerializeOptions {
     /** 最大递归深度，超过该深度的值将被序列化为 `nil`，默认值为 128 */

package/src/helpers/utils.ts

@@ -6,12 +6,7 @@ export const { apply } = Reflect;
 /**
  * Determines whether an object has an enumerable property with the specified name.
  */
-export const hasOwnEnumerable = Function.call.bind<
-    object['propertyIsEnumerable'],
-    [],
-    [o: object, v: PropertyKey],
-    boolean
->(
+export const hasOwnEnumerable = Function.call.bind(
     // eslint-disable-next-line @typescript-eslint/unbound-method
     Object.prototype.propertyIsEnumerable,
-);
+) as (o: object, v: PropertyKey) => boolean;

package/src/index.ts

@@ -1,3 +1,5 @@
+import './compiler/load-module.js';
+
 export { serialize } from './helpers/serialize.js';
 export * from './compiler/index.js';
 export * from './vm/index.js';

package/src/subtle.ts

@@ -1,9 +1,11 @@
-import { getModule } from '@mirascript/bindings';
+import './compiler/load-module.js';
 
+export { keywords } from './compiler/keywords.js';
 export * as constants from './helpers/constants.js';
 export * as convert from './helpers/convert/index.js';
 export { DefaultVmContext } from './vm/types/context.js';
 export * as operations from './vm/operations.js';
+export * as helpers from './vm/helpers.js';
 export {
     display as serializeForDisplay,
     serialize,
@@ -18,11 +20,5 @@ export {
 } from './helpers/serialize.js';
 export { lib } from './vm/lib/index.js';
 export * from './compiler/diagnostic.js';
-export { generateBytecode, generateBytecodeSync, emitScript } from './compiler/index.js';
-
-/** 所有 MiraScript 关键字 */
-export let keywords: () => readonly string[] = () => {
-    const kw = Object.freeze(getModule().keywords());
-    keywords = () => kw;
-    return kw;
-};
+export { emitScript } from './compiler/emit-script.js';
+export { generateBytecode, generateBytecodeSync, type VmBytecodeResult } from './compiler/generate-bytecode.js';

package/src/vm/checkpoint.ts

@@ -1,32 +1,44 @@
+/* eslint-disable unicorn/prefer-math-trunc */
 import { isNaN } from '../helpers/utils.js';
 // 不使用 performance.now()，精度够即可，且性能开销更小
 const { now } = Date;
-const TIME_ORIGIN = now() - 1000 * 3600 * 24; // 减去一天，防止系统时间被调整到过去时出问题
-const timestamp = () => now() - TIME_ORIGIN;
+const TIME_ORIGIN = now() - 1000 * 3600 * 12; // 防止系统时间被调整到过去时出问题
+const timestamp = () => (now() - TIME_ORIGIN) | 0;
 
+const CP_DEFAULT_INTERVAL = 100; // 每 100 次调用检查一次
 const MAX_DEPTH = 128;
 const CP_UNSET = -1;
 /** Default timeout in milliseconds */
 const CP_DEFAULT_TIMEOUT = 100;
 
 let cpDepth = 0;
-let cp = CP_UNSET;
-let cpTimeout = CP_DEFAULT_TIMEOUT;
+let cp = CP_UNSET | 0;
+let cpTimeout = CP_DEFAULT_TIMEOUT | 0;
+let cpInterval = CP_DEFAULT_INTERVAL | 0;
+let cpCounter = 0;
 /** 检查点 */
 export function Cp(): void {
-    if (cp === CP_UNSET) {
-        cp = timestamp();
-    } else if (timestamp() - cp > cpTimeout) {
-        throw new RangeError('Execution timeout');
+    if ((cp | 0) === (CP_UNSET | 0)) {
+        cpCounter = 0;
+        cp = timestamp() | 0;
+        return;
+    }
+    // 不是每次都查时间
+    if ((cpCounter = (cpCounter + 1) | 0) % (cpInterval | 0) !== 0) {
+        return;
+    }
+    cpCounter = 0;
+    if ((timestamp() | 0) - (cp | 0) >= (cpTimeout | 0)) {
+        throw new RangeError('Execution timed out');
     }
 }
 /** 检查点 */
 export function CpEnter(): void {
-    cpDepth++;
-    if (cpDepth <= 1) {
-        cp = timestamp();
+    cpDepth = (cpDepth | 0) + 1;
+    if ((cpDepth | 0) <= 1) {
+        cp = timestamp() | 0;
         cpDepth = 1;
-    } else if (cpDepth > MAX_DEPTH) {
+    } else if ((cpDepth | 0) > MAX_DEPTH) {
         throw new RangeError('Maximum call depth exceeded');
     } else {
         Cp();
@@ -34,18 +46,31 @@ export function CpEnter(): void {
 }
 /** 检查点 */
 export function CpExit(): void {
-    cpDepth--;
-    if (cpDepth < 1) {
-        cp = CP_UNSET;
+    cpDepth = (cpDepth | 0) - 1;
+    if ((cpDepth | 0) < 1) {
+        cp = CP_UNSET | 0;
         cpDepth = 0;
     } else {
         Cp();
     }
 }
+
+const INT_MAX = 0x7fff_ffff;
 /** 设置检查点超时时间 */
-export function configCheckpoint(timeout = CP_DEFAULT_TIMEOUT): void {
+export function configCheckpoint(
+    timeout: number = CP_DEFAULT_TIMEOUT,
+    checkInterval: number = CP_DEFAULT_INTERVAL,
+): void {
     if (typeof timeout !== 'number' || timeout <= 0 || isNaN(timeout)) {
         throw new RangeError('Invalid timeout value');
+    } else if (timeout > INT_MAX) {
+        timeout = INT_MAX;
+    }
+    if (typeof checkInterval !== 'number' || checkInterval <= 0 || isNaN(checkInterval)) {
+        throw new RangeError('Invalid check interval value');
+    } else if (checkInterval > INT_MAX) {
+        checkInterval = INT_MAX;
     }
-    cpTimeout = Math.ceil(timeout);
+    cpTimeout = timeout | 0;
+    cpInterval = checkInterval | 0;
 }

package/src/vm/helpers.ts

@@ -1,4 +1,4 @@
-import { defineProperty, isFinite } from '../helpers/utils.js';
+import { create, defineProperty, isFinite } from '../helpers/utils.js';
 import { VM_ARRAY_MAX_LENGTH, VM_FUNCTION_ANONYMOUS_NAME } from '../helpers/constants.js';
 import { isVmConst } from '../helpers/types.js';
 import { $AssertInit, $ToNumber } from './operations.js';
@@ -9,6 +9,7 @@ import { VmFunction } from './types/function.js';
 
 export { Cp, CpEnter, CpExit } from './checkpoint.js';
 
+/** 过滤剩余参数数组 */
 export const Vargs = (varags: VmAny[]): VmArray => {
     for (let i = 0, l = varags.length; i < l; i++) {
         const el = varags[i];
@@ -18,23 +19,29 @@ export const Vargs = (varags: VmAny[]): VmArray => {
     }
     return varags as VmArray;
 };
+
+/** 构造 record | array 元素 */
 export const Element = (value: VmAny): VmConst => {
     $AssertInit(value);
     if (!isVmConst(value)) return null;
     return value;
 };
 
+const EMPTY = create(null);
+/** 构造 record 可选元素 */
 export const ElementOpt = (key: string, value: VmAny): VmConst => {
     $AssertInit(value);
-    if (value == null || !isVmConst(value)) return {};
-    return { [key]: value };
+    if (value == null || !isVmConst(value)) return EMPTY;
+    return { __proto__: null, [key]: value };
 };
 
-export const Function = (fn: VmFunctionLike, name: string = VM_FUNCTION_ANONYMOUS_NAME): VmFunction => {
-    defineProperty(fn, 'name', { value: name });
+/** 构造函数和函数表达式 */
+export const Function = (name: string | null | undefined, fn: VmFunctionLike): VmFunction => {
+    defineProperty(fn, 'name', { value: name || VM_FUNCTION_ANONYMOUS_NAME });
     return VmFunction(fn, { isLib: false, injectCp: false });
 };
 
+/** 读取闭包上值 */
 export const Upvalue = (value: VmAny): VmValue => {
     $AssertInit(value);
     return value;

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

@@ -21,6 +21,7 @@ export const to_json = VmLib(
         paramsType: { data: 'any' },
         returnsType: 'string',
         examples: ['to_json([1, 2, 3]) // "[1,2,3]"'],
+        injectCp: true,
     },
 );
 
@@ -40,5 +41,6 @@ export const from_json = VmLib(
         paramsType: { json: 'string', fallback: 'any' },
         returnsType: 'any',
         examples: [`from_json('{"a":1}') // (a: 1)`],
+        injectCp: true,
     },
 );

package/src/vm/lib/helpers.ts

@@ -274,7 +274,7 @@ export function map(
 /** 库函数选项 */
 export type VmLibOption = Pick<
     VmFunctionOption,
-    'summary' | 'params' | 'paramsType' | 'returns' | 'returnsType' | 'examples'
+    'summary' | 'params' | 'paramsType' | 'returns' | 'returnsType' | 'examples' | 'injectCp'
 >;
 /** 库函数 */
 export type VmLib<T extends VmFunctionLike | VmConst = VmFunctionLike> = (T extends VmFunctionLike ? T : { value: T }) &
@@ -295,5 +295,6 @@ export function VmLib<
     ret.returnsType = option.returnsType;
     ret.summary = option.summary;
     ret.examples = option.examples;
+    ret.injectCp = option.injectCp ?? false;
     return ret as VmLib<T> & P;
 }