@mirascript/monaco 0.1.9 → 0.1.11

package/dist/lsp/index.js

@@ -1,10 +1,9 @@
 import {
-  DOC_HEADER,
   REG_IDENTIFIER,
   REG_ORDINAL,
   keywords,
   reservedKeywords
-} from "../chunk-OTLGDSYY.js";
+} from "../chunk-LWDQEIU4.js";
 import {
   Emitter,
   MarkerSeverity,
@@ -20,7 +19,7 @@ import {
 import { DefaultVmContext } from "@mirascript/mirascript/subtle";
 
 // src/lsp/utils.ts
-import { DiagnosticCode } from "@mirascript/wasm";
+import { DiagnosticCode } from "@mirascript/bindings/wasm";
 import {
   getVmFunctionInfo,
   isVmArray,
@@ -110,22 +109,23 @@ function globalFnDoc(info) {
     paramDoc.push(`- **返回值**: ${info.returns}`);
   }
   if (paramDoc.length) {
-    doc.push(paramDoc.join("\n"));
+    doc.push("", paramDoc.join("\n"));
   }
   if (info.examples?.length) {
     let exp = `### 示例`;
     for (const example of info.examples) {
       exp += codeblock(example);
     }
-    doc.push(exp);
+    doc.push("", exp);
   }
   return doc;
 }
 function codeblock(value) {
+  const lang = value.startsWith("\0") ? "mirascript-doc" : "mirascript";
   const includeFences = /`{3,}/.exec(value);
   const CODEBLOCK_FENCE = includeFences ? "`".repeat(includeFences[0].length + 1) : "```";
   return `
-${CODEBLOCK_FENCE}mirascript
+${CODEBLOCK_FENCE}${lang}
 ${value}
 ${CODEBLOCK_FENCE}
 `;
@@ -160,6 +160,9 @@ function serializeForDisplayInner(value, maxWidth) {
     if (!len) return "()";
     return `(../* x${len} */)`;
   }
+  if (isVmExtern(value)) {
+    return `/* <extern ${value.describe}> */`;
+  }
   return `/* ${operations.$ToString(value)} */`;
 }
 function serializeForDisplay(value, maxEntries = 100, maxWidth = 40) {
@@ -197,10 +200,20 @@ function serializeForDisplay(value, maxEntries = 100, maxWidth = 40) {
     }
   } else {
     const hint = serializeForDisplayInner(value, 100);
-    const isArray = isVmExtern(value) && Array.isArray(value.value);
+    const isArray = Array.isArray(value.value);
     begin = `${hint} ${isArray ? "[" : "("}`;
     end = isArray ? "]" : ")";
     const keys = value.keys();
+    if (keys.length === 0 && !isArray) {
+      if (typeof value.value == "object") {
+        for (const key of Object.getOwnPropertyNames(value.value)) {
+          if (value.has(key)) keys.push(key);
+        }
+      } else {
+        begin = hint;
+        end = "";
+      }
+    }
     for (const [index, key] of keys.entries()) {
       if (entries.length > maxEntries) {
         entries.push(`../* x${keys.length - entries.length} */`);
@@ -224,6 +237,13 @@ ${end}`;
   }
   return `${begin}${entries.join(", ")}${end}`;
 }
+function docComment(doc) {
+  const lines = doc.flatMap((sec) => sec.split("\n").map((s) => s.trimEnd()));
+  const firstLine = lines.findIndex((line) => line.length > 0);
+  const lastLine = lines.findLastIndex((line) => line.length > 0);
+  if (firstLine < 0 || lastLine < 0) return [];
+  return [`/**`, ...lines.slice(firstLine, lastLine + 1).map((line) => ` * ${line}`), ` */`];
+}
 function valueDoc(name, value, type) {
   const info = getVmFunctionInfo(value);
   if (info) {
@@ -257,14 +277,7 @@ function valueDoc(name, value, type) {
       for (const k of exports) {
         const v = value.get(k);
         const vDoc = valueDoc(k, v, isVmModule(v) ? "field" : "declare");
-        const code = [
-          `/**`,
-          ...vDoc.doc.flatMap((sec) => sec.split("\n")).map((line) => ` * ${line}`),
-          ` */`,
-          "export " + vDoc.script,
-          "",
-          ""
-        ];
+        const code = [...docComment(vDoc.doc), "export " + vDoc.script, "", ""];
         script += code.join("\n");
       }
       script = script.trimEnd();
@@ -287,10 +300,11 @@ function valueDoc(name, value, type) {
 function getDeep(value, path) {
   let current = value;
   for (const key of path) {
-    if (current == null) return null;
+    if (current == null) return current;
+    if (!operations.$Has(current, key)) return void 0;
     current = operations.$Get(current, key);
   }
-  return current ?? null;
+  return current;
 }
 
 // src/lsp/compile-result.ts
@@ -789,10 +803,14 @@ async function compileWorker(req) {
   });
   return new CompileResult(key, version, source, result);
 }
+var compileImpl;
 async function compileSync(req) {
   const [key, version, script, mode] = req;
-  const { compile: compile2 } = await import("./worker.js");
-  const result = compile2(script, mode);
+  if (compileImpl == null) {
+    const mod = await import("./worker.js");
+    compileImpl = mod.compile;
+  }
+  const result = compileImpl(script, mode);
   return new CompileResult(key, version, script, result);
 }
 var USE_WORKER = typeof Worker === "function";
@@ -849,6 +867,22 @@ var Provider = class {
   async getContext(model) {
     return await contextProvider?.(model) ?? DefaultVmContext;
   }
+  /** 获取当前位置的值 */
+  async getValueAt(model, position) {
+    const compiled = await this.getCompileResult(model);
+    if (!compiled) return void 0;
+    const d = compiled.variableAccessAt(model, position);
+    if (d) return { range: d.range, variable: d };
+    const word = wordAt(model, position);
+    if (word) {
+      const a = compiled.fieldAccessAt(model, {
+        lineNumber: position.lineNumber,
+        column: word.range.endColumn
+      });
+      if (a) return { range: word.range, fields: a };
+    }
+    return void 0;
+  }
   /** @inheritdoc */
   get onDidChange() {
     this._onDidChange ??= new Emitter();
@@ -876,7 +910,7 @@ var CodeActionProvider = class extends Provider {
 };
 
 // src/lsp/providers/color-provider.ts
-import { DiagnosticCode as DiagnosticCode4 } from "@mirascript/wasm";
+import { DiagnosticCode as DiagnosticCode4 } from "@mirascript/bindings/wasm";
 var REG_COLOR_STR = /^(@*)(['"`])(#(?:[0-9a-f]{6}|[0-9a-f]{3}|[0-9a-f]{8}|[0-9a-f]{4}))\2\1$/iu;
 function parseColorString(text) {
   const colorMatch = REG_COLOR_STR.exec(text);
@@ -1124,7 +1158,9 @@ function kwSuggestion(kw, range) {
 }
 function filterText(key, char) {
   if (char == null || key.startsWith(char)) return key;
-  return key.startsWith("@") || key.startsWith("$") ? key.slice(1) : key;
+  if (key.startsWith("@")) return key.replace(/^@+/, "");
+  if (key.startsWith("$")) return key.replace(/^\$+/, "");
+  return key;
 }
 function completion(model, description, key, value, fn, field) {
   let detail = "";
@@ -1222,11 +1258,9 @@ var CompletionItemProvider = class extends Provider {
     const locals = /* @__PURE__ */ new Set();
     while (scope) {
       for (const { definition, fn } of scope.locals) {
-        const name = model.getValueInRange(definition.range);
+        const name = definition.code === DiagnosticCode5.ParameterIt ? "it" : model.getValueInRange(definition.range);
+        if (char && !name.toLowerCase().includes(char)) continue;
         if (locals.has(name)) continue;
-        if (char && !name.toLowerCase().includes(char)) {
-          continue;
-        }
         locals.add(name);
         suggestions.push({
           insertText: name,
@@ -1378,23 +1412,24 @@ ${vmDescribe ?? ""}`
 
 // src/lsp/providers/definition-reference-provider.ts
 var DefinitionReferenceProvider = class extends Provider {
-  constructor(globalModel = editor.createModel(``, "mirascript", Uri.parse("mirascript:///lib/global.mira"))) {
+  constructor(globalModel = editor.createModel(
+    ``,
+    "mirascript-doc",
+    Uri.parse("mirascript:///lib/global.mira")
+  )) {
     super();
     this.globalModel = globalModel;
   }
   /** 准备要显示的定义 */
-  prepareGlobal(name, value) {
+  async prepareGlobal(model, path) {
     const { globalModel } = this;
-    const { script, doc } = valueDoc(name, value, "declare");
-    const code = [
-      `/**${DOC_HEADER}**/`,
-      "",
-      `/**`,
-      ...doc.flatMap((sec) => sec.split("\n")).map((line) => ` * ${line}`),
-      ` */`,
-      script,
-      ""
-    ];
+    const globals = await this.getContext(model);
+    const [name, ...access] = path;
+    if (!globals.has(name)) return void 0;
+    const value = getDeep(globals.get(name), access);
+    if (value === void 0) return void 0;
+    const { script, doc } = valueDoc(path.at(-1), value, "declare");
+    const code = ["", ...docComment(doc), script, ""];
     globalModel.setValue(code.join("\n"));
     return {
       uri: globalModel.uri,
@@ -1408,50 +1443,54 @@ var DefinitionReferenceProvider = class extends Provider {
   }
   /** @inheritdoc */
   async provideDefinition(model, position, token) {
-    const compiled = await this.getCompileResult(model);
-    if (!compiled) return void 0;
-    const globals = await this.getContext(model);
-    const d = compiled.variableAccessAt(model, position);
-    if (!d) return [];
-    const { def, ref } = d;
-    let originSelectionRange;
-    if (ref != null) {
-      originSelectionRange = def.references[ref]?.range;
-    } else if ("definition" in def) {
-      originSelectionRange = def.definition.range;
-    }
-    let link;
-    if ("name" in def) {
-      link = this.prepareGlobal(def.name, globals.get(def.name));
+    const value = await this.getValueAt(model, position);
+    if (!value) return void 0;
+    if ("variable" in value) {
+      const { def } = value.variable;
+      let link;
+      if ("name" in def) {
+        link = await this.prepareGlobal(model, [def.name]);
+      } else {
+        link = { uri: model.uri, range: def.definition.range };
+      }
+      if (!link) return void 0;
+      link.originSelectionRange = value.range;
+      return [link];
     } else {
-      link = { uri: model.uri, range: def.definition.range };
+      const {
+        def: { def },
+        fields
+      } = value.fields;
+      if ("name" in def) {
+        const link = await this.prepareGlobal(model, [def.name, ...fields]);
+        if (!link) return void 0;
+        link.originSelectionRange = value.range;
+        return [link];
+      }
     }
-    link.originSelectionRange = originSelectionRange;
-    return [link];
+    return void 0;
   }
   /** @inheritdoc */
   async provideReferences(model, position, context, token) {
-    const compiled = await this.getCompileResult(model);
-    if (!compiled) return void 0;
-    const globals = await this.getContext(model);
-    const d = compiled.variableAccessAt(model, position);
-    if (!d) return [];
-    const { def } = d;
-    const links = def.references.map((u) => ({
-      uri: model.uri,
-      range: u.range
-    }));
-    if (context.includeDeclaration) {
-      if ("name" in def) {
-        links.push(this.prepareGlobal(def.name, globals.get(def.name)));
-      } else if (!Range.isEmpty(def.definition.range)) {
-        links.push({
-          uri: model.uri,
-          range: def.definition.range
-        });
+    const value = await this.getValueAt(model, position);
+    if (!value) return void 0;
+    if ("variable" in value) {
+      const { def } = value.variable;
+      const links = def.references.map((u) => ({
+        uri: model.uri,
+        range: u.range
+      }));
+      if (context.includeDeclaration) {
+        if ("name" in def) {
+          const link = await this.prepareGlobal(model, [def.name]);
+          if (link) links.push(link);
+        } else if (!Range.isEmpty(def.definition.range)) {
+          links.push({ uri: model.uri, range: def.definition.range });
+        }
       }
+      return links;
     }
-    return links;
+    return void 0;
   }
 };
 
@@ -1506,7 +1545,7 @@ var DocumentHighlightProvider = class extends Provider {
 };
 
 // src/lsp/providers/document-symbol-provider.ts
-import { DiagnosticCode as DiagnosticCode7 } from "@mirascript/wasm";
+import { DiagnosticCode as DiagnosticCode7 } from "@mirascript/bindings/wasm";
 var DocumentSymbolProvider = class extends Provider {
   /** 构建树 */
   handleScope(model, scope) {
@@ -1605,7 +1644,7 @@ var FormatterProvider = class extends Provider {
 };
 
 // src/lsp/providers/hover-provider.ts
-import { DiagnosticCode as DiagnosticCode8 } from "@mirascript/wasm";
+import { DiagnosticCode as DiagnosticCode8 } from "@mirascript/bindings/wasm";
 var HoverProvider = class extends Provider {
   /** 变量提示 */
   async provideVariableHover(model, { def, ref }) {
@@ -1718,30 +1757,18 @@ var HoverProvider = class extends Provider {
   }
   /** @inheritdoc */
   async provideHover(model, position, token, context) {
-    const compiled = await this.getCompileResult(model);
-    if (!compiled) {
-      return void 0;
-    }
-    const d = compiled.variableAccessAt(model, position);
-    if (d) {
-      return this.provideVariableHover(model, d);
-    }
-    const word = wordAt(model, position);
-    if (word) {
-      const a = compiled.fieldAccessAt(model, {
-        lineNumber: position.lineNumber,
-        column: word.range.endColumn
-      });
-      if (a) {
-        return this.provideFieldHover(model, word.range, a);
-      }
+    const value = await this.getValueAt(model, position);
+    if (!value) return void 0;
+    if ("fields" in value) {
+      return this.provideFieldHover(model, value.range, value.fields);
+    } else {
+      return this.provideVariableHover(model, value.variable);
     }
-    return void 0;
   }
 };
 
 // src/lsp/providers/inlay-hints-provider.ts
-import { DiagnosticCode as DiagnosticCode9 } from "@mirascript/wasm";
+import { DiagnosticCode as DiagnosticCode9 } from "@mirascript/bindings/wasm";
 var InlayHintsProvider = class extends Provider {
   /** @inheritdoc */
   get onDidChangeInlayHints() {
@@ -1873,7 +1900,7 @@ var RangeProvider = class extends Provider {
 };
 
 // src/lsp/providers/rename-provider.ts
-import { DiagnosticCode as DiagnosticCode10 } from "@mirascript/wasm";
+import { DiagnosticCode as DiagnosticCode10 } from "@mirascript/bindings/wasm";
 var RenameProvider = class extends Provider {
   /** 重命名推断字段 */
   provideRenameEditsOmitNameFields(model, compiled, edits, ref, oldName) {
@@ -1990,16 +2017,16 @@ var RenameProvider = class extends Provider {
 
 // src/lsp/providers/semantic-tokens-provider.ts
 import { isVmFunction as isVmFunction2, isVmModule as isVmModule3 } from "@mirascript/mirascript";
-import { DiagnosticCode as DiagnosticCode11 } from "@mirascript/wasm";
+import { DiagnosticCode as DiagnosticCode11 } from "@mirascript/bindings/wasm";
 var TOKEN_TYPES = {
   [0 /* VARIABLE */]: "variable.other.constant",
   [1 /* VARIABLE_MUTABLE */]: "variable",
   [2 /* CONSTANT */]: "variable.other.constant",
   [3 /* GLOBAL */]: "variable",
   [4 /* FUNCTION */]: "entity.name.function",
-  [5 /* MODULE */]: "entity.name.namespace",
-  [6 /* PROPERTY */]: "support.type.property-name",
-  [7 /* KEYWORD_CONTROL */]: "keyword.control",
+  [5 /* MODULE */]: "type",
+  [6 /* PROPERTY */]: "variable.other.property",
+  [7 /* KEYWORD_CONTROL */]: "keyword.flow",
   [8 /* PARAM */]: "variable.other.constant.emphasis",
   [9 /* PARAM_MUTABLE */]: "variable.emphasis"
 };
@@ -2130,7 +2157,7 @@ var DocumentSemanticTokensProvider = class extends Provider {
 };
 
 // src/lsp/providers/signature-help-provider.ts
-import { DiagnosticCode as DiagnosticCode12 } from "@mirascript/wasm";
+import { DiagnosticCode as DiagnosticCode12 } from "@mirascript/bindings/wasm";
 import { getVmFunctionInfo as getVmFunctionInfo3 } from "@mirascript/mirascript";
 var SignatureHelpProvider = class extends Provider {
   constructor() {
@@ -2234,10 +2261,10 @@ var SignatureHelpProvider = class extends Provider {
 };
 
 // src/lsp/index.ts
-import { ready } from "@mirascript/wasm";
 async function registerLSP(contextProvider2) {
   setContextProvider(contextProvider2);
-  await ready;
+  const { loadModule } = await import("@mirascript/bindings/wasm");
+  await loadModule();
   const codeActionProvider = new CodeActionProvider();
   const colorProvider = new ColorProvider();
   const completionItemProvider = new CompletionItemProvider();