@mirascript/monaco 0.1.83 → 0.1.84

package/src/basic/tokens-provider.ts

@@ -1,5 +1,5 @@
-import type { HighlighterCore, Grammar } from '@shikijs/core';
-import type { StateStack } from '@shikijs/vscode-textmate';
+import type { HighlighterCore, Grammar } from 'shiki/core';
+import type { StateStack } from 'shiki/textmate';
 import { languages, type IDisposable } from '../monaco-api.js';
 import { CONTRIBUTE_IDS } from '../contribute.js';
 
@@ -35,29 +35,35 @@ function tokenScope(scopes: string[]): string {
 /** Shared instance of highlighter. */
 class HighlighterManager implements IDisposable {
     private highlighterPromise: Promise<HighlighterCore> | null = null;
-
+    private INITIAL!: StateStack;
     /**
-     * Get the shared highlighter instance.
+     * Load the shared highlighter instance.
      */
-    private async getHighlighter(): Promise<HighlighterCore> {
-        if (this.highlighterPromise) return this.highlighterPromise;
-
+    private async loadHighlighter(): Promise<HighlighterCore> {
         const [
             { createHighlighterCore },
-            { createOnigurumaEngine },
-            wasm,
+            { createJavaScriptRegexEngine },
+            { INITIAL },
             { mirascript, mirascriptDoc, mirascriptTemplate },
         ] = await Promise.all([
-            import('@shikijs/core'),
-            import('@shikijs/engine-oniguruma'),
-            import('@shikijs/engine-oniguruma/wasm-inlined'),
+            import('shiki/core'),
+            import('shiki/engine-javascript.mjs'),
+            import('shiki/textmate'),
             import('@mirascript/textmate'),
         ]);
-        this.highlighterPromise = createHighlighterCore({
+        this.INITIAL = INITIAL;
+        return await createHighlighterCore({
             langs: [mirascript, mirascriptDoc, mirascriptTemplate],
             themes: [],
-            engine: createOnigurumaEngine(wasm),
+            engine: createJavaScriptRegexEngine(),
         });
+    }
+
+    /**
+     * Get the shared highlighter instance.
+     */
+    private async getHighlighter(): Promise<HighlighterCore> {
+        this.highlighterPromise ??= this.loadHighlighter();
         return this.highlighterPromise;
     }
 
@@ -66,9 +72,8 @@ class HighlighterManager implements IDisposable {
         return {
             create: async () => {
                 const highlighter = await this.getHighlighter();
-                const { INITIAL } = await import('@shikijs/vscode-textmate');
                 const grammar = highlighter.getLanguage(languageId);
-                return new TokensProvider(grammar, INITIAL);
+                return new TokensProvider(grammar, this.INITIAL);
             },
         };
     }
@@ -91,11 +96,11 @@ class HighlighterManager implements IDisposable {
 class TokensProvider implements languages.TokensProvider {
     constructor(
         private readonly grammar: Grammar,
-        private readonly initialState: StateStack,
+        private readonly INITIAL: StateStack,
     ) {}
     /** @inheritdoc */
     getInitialState(): StateStack {
-        return this.initialState;
+        return this.INITIAL;
     }
     /** @inheritdoc */
     tokenize(line: string, state: StateStack): languages.ILineTokens {

package/src/lsp/compile-result.ts

@@ -2,7 +2,7 @@ import type { Writable } from 'type-fest';
 import { type editor, Range, type IRange, type IPosition, Position } from '../monaco-api.js';
 import { strictContainsPosition } from './monaco-utils.js';
 import { REG_IDENTIFIER_FULL, REG_ORDINAL_FULL } from '../constants.js';
-import type { CacheKey, MonacoResult } from './worker.js';
+import type { CacheKey, MonacoResult } from './worker-core.js';
 import {
     parseDiagnostics,
     DiagnosticCode,

package/src/lsp/providers/color-provider.ts

@@ -5,6 +5,15 @@ import { DiagnosticCode } from '@mirascript/constants';
 const REG_COLOR_STR = /^(@*)(['"`])(#(?:[0-9a-f]{6}|[0-9a-f]{3}|[0-9a-f]{8}|[0-9a-f]{4}))\2\1$/iu;
 const { parseInt } = Number;
 
+/** 解析颜色 */
+function parseColorPart(text: string): number {
+    if (text.length === 1) {
+        // 处理单字符的情况，例如 #f00 -> #ff0000
+        text = text + text;
+    }
+    return parseInt(text, 16) / 255;
+}
+
 /** 解析颜色 */
 function parseColorString(text: string):
     | {
@@ -25,36 +34,21 @@ function parseColorString(text: string):
     if (colorString.startsWith('#')) {
         const colorCode = colorString.slice(1);
 
-        if (colorCode.length === 3) {
-            // 处理 #RGB 格式
-            color = {
-                red: parseInt(colorCode[0]! + colorCode[0]!, 16) / 255,
-                green: parseInt(colorCode[1]! + colorCode[1]!, 16) / 255,
-                blue: parseInt(colorCode[2]! + colorCode[2]!, 16) / 255,
-                alpha: 1,
-            };
-        } else if (colorCode.length === 6) {
-            color = {
-                red: parseInt(colorCode.slice(0, 2), 16) / 255,
-                green: parseInt(colorCode.slice(2, 4), 16) / 255,
-                blue: parseInt(colorCode.slice(4, 6), 16) / 255,
-                alpha: 1, // 假设不透明
-            };
-        } else if (colorCode.length === 8) {
-            // 处理 #RRGGBBAA 格式
+        if (colorCode.length === 3 || colorCode.length === 4) {
+            // 处理短格式的颜色代码，例如 #f00 或 #f00f
             color = {
-                red: parseInt(colorCode.slice(0, 2), 16) / 255,
-                green: parseInt(colorCode.slice(2, 4), 16) / 255,
-                blue: parseInt(colorCode.slice(4, 6), 16) / 255,
-                alpha: parseInt(colorCode.slice(6, 8), 16) / 255,
+                red: parseColorPart(colorCode[0]!),
+                green: parseColorPart(colorCode[1]!),
+                blue: parseColorPart(colorCode[2]!),
+                alpha: colorCode[3] ? parseColorPart(colorCode[3]) : 1, // 如果没有 alpha，则假设不透明
             };
-        } else if (colorCode.length === 4) {
-            // 处理 #RGBA 格式
+        } else if (colorCode.length === 6 || colorCode.length === 8) {
+            // 处理长格式的颜色代码，例如 #ff0000 或 #ff0000ff
             color = {
-                red: parseInt(colorCode[0]! + colorCode[0]!, 16) / 255,
-                green: parseInt(colorCode[1]! + colorCode[1]!, 16) / 255,
-                blue: parseInt(colorCode[2]! + colorCode[2]!, 16) / 255,
-                alpha: parseInt(colorCode[3]! + colorCode[3]!, 16) / 255,
+                red: parseColorPart(colorCode.slice(0, 2)),
+                green: parseColorPart(colorCode.slice(2, 4)),
+                blue: parseColorPart(colorCode.slice(4, 6)),
+                alpha: colorCode.length === 8 ? parseColorPart(colorCode.slice(6, 8)) : 1, // 如果没有 alpha，则假设不透明
             };
         } else {
             return undefined; // 不支持的颜色格式
@@ -71,6 +65,26 @@ function parseColorString(text: string):
     };
 }
 
+/** 生成颜色 */
+function serializeColorPart(part: number): string {
+    const intPart = Math.round(part * 255);
+    const hex = intPart.toString(16).padStart(2, '0');
+    return hex;
+}
+
+/** 生成颜色 */
+function serializeColor(color: languages.IColor): string {
+    const r = serializeColorPart(color.red);
+    const g = serializeColorPart(color.green);
+    const b = serializeColorPart(color.blue);
+    if (color.alpha >= 1) {
+        return `#${r}${g}${b}`;
+    } else {
+        const a = serializeColorPart(color.alpha);
+        return `#${r}${g}${b}${a}`;
+    }
+}
+
 /** @inheritdoc */
 export class ColorProvider extends Provider implements languages.DocumentColorProvider {
     /** @inheritdoc */
@@ -109,22 +123,6 @@ export class ColorProvider extends Provider implements languages.DocumentColorPr
         token: CancellationToken,
     ): languages.ProviderResult<languages.IColorPresentation[]> {
         const { color } = colorInfo;
-        return [
-            {
-                label: `#${Math.round(color.red * 255)
-                    .toString(16)
-                    .padStart(2, '0')}${Math.round(color.green * 255)
-                    .toString(16)
-                    .padStart(2, '0')}${Math.round(color.blue * 255)
-                    .toString(16)
-                    .padStart(2, '0')}${
-                    color.alpha >= 1
-                        ? ''
-                        : Math.round(color.alpha * 255)
-                              .toString(16)
-                              .padStart(2, '0')
-                }`,
-            },
-        ];
+        return [{ label: serializeColor(color) }];
     }
 }

package/src/lsp/providers/hover-provider.ts

@@ -6,7 +6,7 @@ import type { editor, CancellationToken, IMarkdownString, IRange, languages, Pos
 import { codeblock, getDeep, valueDoc, paramsList, serializeNumber, serializeInteger } from '../utils.js';
 import { tokenAt } from '../monaco-private.js';
 import { rangeAt } from '../monaco-utils.js';
-import type { FieldsAccessAt, VariableAccessAt } from '../compile-result.js';
+import type { FieldsAccessAt, LocalDefinition, VariableAccessAt } from '../compile-result.js';
 import { Provider } from './base.js';
 
 const OPERATOR_TOKENS_DESC = Object.keys(HELP_OPERATORS).sort((a, b) => b.length - a.length);
@@ -44,6 +44,25 @@ function operatorAt(lineContent: string, column: number): { token: string; range
     return undefined;
 }
 
+const LOCAL_HOVER = {
+    [DiagnosticCode.ParameterSubPatternImmutable]: '(parameter pattern) ',
+    [DiagnosticCode.ParameterSubPatternMutable]: '(parameter pattern) mut ',
+    [DiagnosticCode.ParameterImmutable]: '(parameter) ',
+    [DiagnosticCode.ParameterMutable]: '(parameter) mut ',
+    [DiagnosticCode.ParameterIt]: '(parameter) it',
+    [DiagnosticCode.ParameterImmutableRest]: '(parameter) ..',
+    [DiagnosticCode.ParameterMutableRest]: '(parameter) ..mut ',
+    [DiagnosticCode.LocalModule]: 'mod ',
+    [DiagnosticCode.LocalImmutable]: 'let ',
+    [DiagnosticCode.LocalConst]: 'const ',
+    [DiagnosticCode.LocalMutable]: 'let mut ',
+    [DiagnosticCode.LocalFunction]: (text: string, model: editor.ITextModel, def: LocalDefinition): string => {
+        return `fn ${text}${paramsList(model, def.fn)}`;
+    },
+} satisfies Partial<
+    Record<DiagnosticCode, string | ((text: string, model: editor.ITextModel, def: LocalDefinition) => string)>
+>;
+
 /** @inheritdoc */
 export class HoverProvider extends Provider implements languages.HoverProvider {
     /** 变量提示 */
@@ -65,69 +84,18 @@ export class HoverProvider extends Provider implements languages.HoverProvider {
         } else {
             let content: IMarkdownString | undefined;
             const tag = def.definition;
-            switch (tag.code) {
-                case DiagnosticCode.ParameterSubPatternImmutable:
-                    content = {
-                        value: codeblock(`\0(parameter pattern) ${model.getValueInRange(tag.range)}`),
-                    };
-                    break;
-                case DiagnosticCode.ParameterSubPatternMutable:
-                    content = {
-                        value: codeblock(`\0(parameter pattern) mut ${model.getValueInRange(tag.range)}`),
-                    };
-                    break;
-                case DiagnosticCode.ParameterImmutable:
-                    content = {
-                        value: codeblock(`\0(parameter) ${model.getValueInRange(tag.range)}`),
-                    };
-                    break;
-                case DiagnosticCode.ParameterMutable:
-                    content = {
-                        value: codeblock(`\0(parameter) mut ${model.getValueInRange(tag.range)}`),
-                    };
-                    break;
-                case DiagnosticCode.ParameterIt:
-                    content = {
-                        value: codeblock(`\0(parameter) it`),
-                    };
-                    break;
-                case DiagnosticCode.ParameterImmutableRest:
+            if (tag.code in LOCAL_HOVER) {
+                const hover = LOCAL_HOVER[tag.code];
+                const text = model.getValueInRange(tag.range);
+                if (typeof hover == 'string') {
                     content = {
-                        value: codeblock(`\0(parameter) ..${model.getValueInRange(tag.range)}`),
+                        value: codeblock(`\0${hover}${text}`),
                     };
-                    break;
-                case DiagnosticCode.ParameterMutableRest:
-                    content = {
-                        value: codeblock(`\0(parameter) ..mut ${model.getValueInRange(tag.range)}`),
-                    };
-                    break;
-                case DiagnosticCode.LocalFunction: {
-                    const params = paramsList(model, def.fn);
+                } else {
                     content = {
-                        value: codeblock(`\0fn ${model.getValueInRange(tag.range)}${params}`),
+                        value: codeblock(`\0${hover(text, model, def)}`),
                     };
-                    break;
                 }
-                case DiagnosticCode.LocalModule:
-                    content = {
-                        value: codeblock(`\0mod ${model.getValueInRange(tag.range)}`),
-                    };
-                    break;
-                case DiagnosticCode.LocalImmutable:
-                    content = {
-                        value: codeblock(`\0let ${model.getValueInRange(tag.range)}`),
-                    };
-                    break;
-                case DiagnosticCode.LocalConst:
-                    content = {
-                        value: codeblock(`\0const ${model.getValueInRange(tag.range)}`),
-                    };
-                    break;
-                case DiagnosticCode.LocalMutable:
-                    content = {
-                        value: codeblock(`\0let mut ${model.getValueInRange(tag.range)}`),
-                    };
-                    break;
             }
             if (ref == null) {
                 range = tag.range;

package/src/lsp/providers/inlay-hints-provider.ts

@@ -1,7 +1,96 @@
 import { languages, Range, type CancellationToken, type editor, type IEvent } from '../../monaco-api.js';
+import type { SourceDiagnostic } from '../compile-result.js';
 import { Provider } from './base.js';
 import { DiagnosticCode } from '@mirascript/constants';
 
+/** 生成 hint */
+function provideInlayHint(tag: SourceDiagnostic, model: editor.ITextModel): languages.InlayHint | null {
+    let lineNumber = 0;
+    let column = 0;
+    let label = '';
+    const kind = languages.InlayHintKind.Parameter;
+    let paddingLeft = true;
+    let paddingRight = false;
+    const edits: languages.TextEdit[] = [];
+    // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
+    switch (tag.code) {
+        case DiagnosticCode.ParameterIt: {
+            if (!tag.references.length) {
+                // 没有引用，隐藏该隐式参数
+                return null;
+            }
+            lineNumber = tag.range.endLineNumber;
+            column = tag.range.endColumn;
+            label = '(it)';
+            paddingLeft = /\bfn$/u.test(model.getValueInRange(new Range(lineNumber, column - 3, lineNumber, column)));
+            paddingRight = model.getValueInRange(new Range(lineNumber, column, lineNumber, column + 1)) === '{';
+            edits.push({
+                range: new Range(lineNumber, column, lineNumber, column),
+                text: `${paddingLeft ? ' ' : ''}${label}${paddingRight ? ' ' : ''}`,
+            });
+            break;
+        }
+        case DiagnosticCode.UnnamedRecordField0:
+        case DiagnosticCode.UnnamedRecordField1:
+        case DiagnosticCode.UnnamedRecordField2:
+        case DiagnosticCode.UnnamedRecordField3:
+        case DiagnosticCode.UnnamedRecordField4:
+        case DiagnosticCode.UnnamedRecordField5:
+        case DiagnosticCode.UnnamedRecordField6:
+        case DiagnosticCode.UnnamedRecordField7:
+        case DiagnosticCode.UnnamedRecordField8:
+        case DiagnosticCode.UnnamedRecordField9:
+        case DiagnosticCode.UnnamedRecordFieldN: {
+            const index = tag.code - DiagnosticCode.UnnamedRecordField0;
+            if (index > 9) break;
+            lineNumber = tag.range.startLineNumber;
+            column = tag.range.startColumn;
+            label = `${index}:`;
+            paddingLeft = /[^\s(]/u.test(model.getValueInRange(new Range(lineNumber, column - 1, lineNumber, column)));
+            paddingRight = true;
+            break;
+        }
+        case DiagnosticCode.OmitNamedRecordField: {
+            const ref = tag.references[0];
+            if (ref?.code !== DiagnosticCode.OmitNamedRecordFieldName) {
+                return null;
+            }
+            lineNumber = tag.range.startLineNumber;
+            column = tag.range.startColumn;
+            label = model.getValueInRange(ref.range);
+            paddingLeft = /[^\s(]/u.test(model.getValueInRange(new Range(lineNumber, column - 1, lineNumber, column)));
+            paddingRight = false;
+
+            const insertRight = !/\s/u.test(
+                model.getValueInRange(
+                    new Range(
+                        tag.range.endLineNumber,
+                        tag.range.endColumn,
+                        tag.range.endLineNumber,
+                        tag.range.endColumn + 1,
+                    ),
+                ),
+            );
+            edits.push({
+                range: tag.range,
+                text: `${paddingLeft ? ' ' : ''}${label}${model.getValueInRange(tag.range)}${insertRight ? ' ' : ''}`,
+            });
+            break;
+        }
+    }
+    if (!label) {
+        return null;
+    }
+    return {
+        position: { lineNumber, column },
+        label,
+        kind,
+        paddingLeft,
+        paddingRight,
+        textEdits: edits,
+    };
+}
+
 /** @inheritdoc */
 export class InlayHintsProvider extends Provider implements languages.InlayHintsProvider {
     /** @inheritdoc */
@@ -23,99 +112,14 @@ export class InlayHintsProvider extends Provider implements languages.InlayHints
             if (!range.containsRange(tag.range)) {
                 continue;
             }
-            let lineNumber = 0;
-            let column = 0;
-            let label = '';
-            const kind = languages.InlayHintKind.Parameter;
-            let paddingLeft = true;
-            let paddingRight = false;
-            const edits: languages.TextEdit[] = [];
-            // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
-            switch (tag.code) {
-                case DiagnosticCode.ParameterIt: {
-                    if (!tag.references.length) {
-                        // 没有引用，隐藏该隐式参数
-                        continue;
-                    }
-                    lineNumber = tag.range.endLineNumber;
-                    column = tag.range.endColumn;
-                    label = '(it)';
-                    paddingLeft = /\bfn$/u.test(
-                        model.getValueInRange(new Range(lineNumber, column - 3, lineNumber, column)),
-                    );
-                    paddingRight = model.getValueInRange(new Range(lineNumber, column, lineNumber, column + 1)) === '{';
-                    edits.push({
-                        range: new Range(lineNumber, column, lineNumber, column),
-                        text: `${paddingLeft ? ' ' : ''}${label}${paddingRight ? ' ' : ''}`,
-                    });
-                    break;
-                }
-                case DiagnosticCode.UnnamedRecordField0:
-                case DiagnosticCode.UnnamedRecordField1:
-                case DiagnosticCode.UnnamedRecordField2:
-                case DiagnosticCode.UnnamedRecordField3:
-                case DiagnosticCode.UnnamedRecordField4:
-                case DiagnosticCode.UnnamedRecordField5:
-                case DiagnosticCode.UnnamedRecordField6:
-                case DiagnosticCode.UnnamedRecordField7:
-                case DiagnosticCode.UnnamedRecordField8:
-                case DiagnosticCode.UnnamedRecordField9:
-                case DiagnosticCode.UnnamedRecordFieldN: {
-                    const index = tag.code - DiagnosticCode.UnnamedRecordField0;
-                    if (index > 9) break;
-                    lineNumber = tag.range.startLineNumber;
-                    column = tag.range.startColumn;
-                    label = `${index}:`;
-                    paddingLeft = /[^\s(]/u.test(
-                        model.getValueInRange(new Range(lineNumber, column - 1, lineNumber, column)),
-                    );
-                    paddingRight = true;
-                    break;
-                }
-                case DiagnosticCode.OmitNamedRecordField: {
-                    const ref = tag.references[0];
-                    if (ref?.code !== DiagnosticCode.OmitNamedRecordFieldName) continue;
-                    lineNumber = tag.range.startLineNumber;
-                    column = tag.range.startColumn;
-                    label = model.getValueInRange(ref.range);
-                    paddingLeft = /[^\s(]/u.test(
-                        model.getValueInRange(new Range(lineNumber, column - 1, lineNumber, column)),
-                    );
-                    paddingRight = false;
-
-                    const insertRight = !/\s/u.test(
-                        model.getValueInRange(
-                            new Range(
-                                tag.range.endLineNumber,
-                                tag.range.endColumn,
-                                tag.range.endLineNumber,
-                                tag.range.endColumn + 1,
-                            ),
-                        ),
-                    );
-                    edits.push({
-                        range: tag.range,
-                        text: `${paddingLeft ? ' ' : ''}${label}${model.getValueInRange(tag.range)}${insertRight ? ' ' : ''}`,
-                    });
-                    break;
-                }
+            const hint = provideInlayHint(tag, model);
+            if (hint) {
+                hints.push(hint);
             }
-            if (!label) continue;
-            const hint: languages.InlayHint = {
-                position: { lineNumber, column },
-                label,
-                kind,
-                paddingLeft,
-                paddingRight,
-                textEdits: edits,
-            };
-            hints.push(hint);
         }
         return {
             hints,
-            dispose: () => {
-                // Cleanup if necessary
-            },
+            dispose: () => undefined,
         };
     }
 }

package/src/lsp/utils.ts

@@ -400,10 +400,8 @@ export function valueDoc(
             prefix = `let ${name} = `;
         }
         suffix = ';';
-    } else if (/^\d/.test(name)) {
-        prefix = `[${name}]: `;
     } else {
-        prefix = `${name}: `;
+        prefix = `${serializeRecordKey(name)}: `;
     }
     if (isVmModule(value)) {
         let script;

package/src/lsp/worker-core.ts

@@ -0,0 +1,68 @@
+import type { InputMode } from '@mirascript/mirascript';
+import type { BcModule } from '@mirascript/bindings/wasm';
+import type { Tagged } from 'type-fest';
+
+const { loadModule } = await import('@mirascript/bindings/wasm');
+const mod = await loadModule();
+const { wasm, createConfig } = mod;
+
+/** Monaco 编译结果 */
+export interface MonacoResult extends BcModule.CompileResult {
+    /** 格式化结果 */
+    formatted?: string;
+}
+
+/** 缓存 Key (model id) */
+export type CacheKey = Tagged<string, 'modelId'>;
+/** 请求参数 */
+export type Req = [key: CacheKey, version: number, script: string, mode: InputMode];
+/** 编译结果 */
+export type ResOk = [key: CacheKey, version: number, result: MonacoResult];
+/** 编译结果 */
+export type ResErr = [key: CacheKey, version: number, error: Error];
+/** 编译结果 */
+export type Res = ResOk | ResErr;
+/** Ready */
+export type Ready = 'mirascript lsp ready';
+
+const configTemplate = createConfig({
+    diagnostic_position_encoding: 'Utf16',
+    diagnostic_tag: true,
+    diagnostic_sourcemap: true,
+    trivia: true,
+    input_mode: 'Template',
+});
+const configScript = createConfig({
+    diagnostic_position_encoding: 'Utf16',
+    diagnostic_tag: true,
+    diagnostic_sourcemap: true,
+    trivia: true,
+    input_mode: 'Script',
+});
+
+/** 编译 */
+export function compile(script: string, mode: InputMode): MonacoResult {
+    const config = mode === 'Script' ? configScript : configTemplate;
+    const compiler = new wasm.MonacoCompiler(script, config);
+    try {
+        const parseOk = compiler.parse();
+        if (!parseOk) {
+            return { diagnostics: compiler.diagnostics(), chunk: undefined };
+        }
+        const chunk = compiler.emit();
+        const formatted = compiler.format();
+        return {
+            diagnostics: compiler.diagnostics(),
+            chunk,
+            formatted,
+        };
+    } finally {
+        try {
+            compiler.free();
+        } catch (ex) {
+            /* 忽略错误 */
+            // eslint-disable-next-line no-console
+            console.error(ex);
+        }
+    }
+}

package/src/lsp/worker-helper.ts

@@ -1,6 +1,6 @@
 import type { InputMode } from '@mirascript/constants';
 import { editor } from '../monaco-api.js';
-import type { Ready, CacheKey, Req, Res, ResOk } from './worker.js';
+import type { Ready, CacheKey, Req, Res, ResOk } from './worker-core.js';
 import { CompileResult } from './compile-result.js';
 import { makeModelMarkers } from './diagnostics.js';
 
@@ -89,12 +89,12 @@ async function compileWorker(req: Req): Promise<CompileResult> {
     return new CompileResult(key, version, source, result);
 }
 
-let compileImpl: typeof import('./worker.js').compile;
+let compileImpl: typeof import('./worker-core.js').compile;
 /** 使用当前线程编译 */
 async function compileSync(req: Req): Promise<CompileResult> {
     const [key, version, script, mode] = req;
     if (compileImpl == null) {
-        const mod = await import('./worker.js');
+        const mod = await import('./worker-core.js');
         compileImpl = mod.compile;
     }
     const result = compileImpl(script, mode);