@airalogy/aimd-editor 1.7.1 → 1.8.0

package/dist/embedded.js

@@ -1,5 +1,5 @@
-import { _ as s } from "./AimdSourceEditor.vue_vue_type_script_setup_true_lang-t_sUoXky.js";
-import { _ as i, D as d, i as o, j as t, k as A, r as m } from "./AimdWysiwygEditor.vue_vue_type_script_setup_true_lang-B8o1VbUH.js";
+import { _ as s } from "./AimdSourceEditor.vue_vue_type_script_setup_true_lang-ttzw5IdG.js";
+import { _ as i, D as d, i as o, j as t, k as A, r as m } from "./AimdWysiwygEditor.vue_vue_type_script_setup_true_lang-tRm4S2Nv.js";
 export {
   s as AimdSourceEditor,
   i as AimdWysiwygEditor,

package/dist/index.js

@@ -1,7 +1,7 @@
 import { A as i, a as s, b as d, D as o, K as m, M as r, c as t, d as A, e as n, f as l, g as D, l as E, s as T } from "./theme-B8dCnOx-.js";
-import { _, a as c, b as f, c as u, u as M } from "./AimdEditorTopBar.vue_vue_type_script_setup_true_lang-gbfMDZSh.js";
-import { _ as p } from "./AimdSourceEditor.vue_vue_type_script_setup_true_lang-t_sUoXky.js";
-import { A as k, a as x, _ as L, D as O, M as S, b as y, c as b, d as N, e as P, f as R, g as w, h, i as B, j as C, k as v, l as K, m as V, n as Y, r as j } from "./AimdWysiwygEditor.vue_vue_type_script_setup_true_lang-B8o1VbUH.js";
+import { _, a as c, b as f, c as u, u as M } from "./AimdEditorTopBar.vue_vue_type_script_setup_true_lang-yYY-Yq1g.js";
+import { _ as p } from "./AimdSourceEditor.vue_vue_type_script_setup_true_lang-ttzw5IdG.js";
+import { A as k, a as x, _ as L, D as O, M as S, b as y, c as b, d as N, e as P, f as R, g as w, h, i as B, j as C, k as v, l as K, m as V, n as Y, r as j } from "./AimdWysiwygEditor.vue_vue_type_script_setup_true_lang-tRm4S2Nv.js";
 export {
   k as AIMD_FIELD_TYPES,
   x as AIMD_FIELD_TYPE_DEFINITIONS,

package/dist/vue.js

@@ -1,6 +1,6 @@
-import { _ as e, a as d, b as s, c as r, u as o } from "./AimdEditorTopBar.vue_vue_type_script_setup_true_lang-gbfMDZSh.js";
-import { _ as m } from "./AimdSourceEditor.vue_vue_type_script_setup_true_lang-t_sUoXky.js";
-import { A as E, a as l, _ as I, D as _, M as T, b as D, c as F, d as M, e as u, f as c, g as n, h as g, i as L, j as O, k as p, l as S, m as y, n as b, r as f } from "./AimdWysiwygEditor.vue_vue_type_script_setup_true_lang-B8o1VbUH.js";
+import { _ as e, a as d, b as s, c as r, u as o } from "./AimdEditorTopBar.vue_vue_type_script_setup_true_lang-yYY-Yq1g.js";
+import { _ as m } from "./AimdSourceEditor.vue_vue_type_script_setup_true_lang-ttzw5IdG.js";
+import { A as E, a as l, _ as I, D as _, M as T, b as D, c as F, d as M, e as u, f as c, g as n, h as g, i as L, j as O, k as p, l as S, m as y, n as b, r as f } from "./AimdWysiwygEditor.vue_vue_type_script_setup_true_lang-tRm4S2Nv.js";
 export {
   E as AIMD_FIELD_TYPES,
   l as AIMD_FIELD_TYPE_DEFINITIONS,

package/dist/wysiwyg.js

@@ -1,4 +1,4 @@
-import { _ as a, D as r, i, j as d, k as t, r as A } from "./AimdWysiwygEditor.vue_vue_type_script_setup_true_lang-B8o1VbUH.js";
+import { _ as a, D as r, i, j as d, k as t, r as A } from "./AimdWysiwygEditor.vue_vue_type_script_setup_true_lang-tRm4S2Nv.js";
 export {
   a as AimdWysiwygEditor,
   r as DEFAULT_AIMD_EDITOR_LOCALE,

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@airalogy/aimd-editor",
   "type": "module",
-  "version": "1.7.1",
-  "description": "AIMD editor with Monaco source mode and Milkdown WYSIWYG mode",
+  "version": "1.8.0",
+  "description": "AIMD (Airalogy Markdown) editor with Monaco source mode and Milkdown WYSIWYG mode",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -53,20 +53,14 @@
     "dist",
     "src"
   ],
-  "scripts": {
-    "type-check": "tsc --noEmit",
-    "build": "vite build",
-    "dev": "vite build --watch",
-    "test": "node --test ./tests/*.test.mjs"
-  },
   "dependencies": {
-    "@airalogy/aimd-core": "workspace:^",
-    "@airalogy/aimd-renderer": "workspace:^",
     "@codingame/monaco-vscode-editor-api": "^20.2.1",
     "@codingame/monaco-vscode-standalone-languages": "^20.2.1",
     "@milkdown/kit": "^7.18.0",
     "@milkdown/theme-nord": "^7.18.0",
-    "@milkdown/vue": "^7.18.0"
+    "@milkdown/vue": "^7.18.0",
+    "@airalogy/aimd-core": "^2.6.0",
+    "@airalogy/aimd-renderer": "^2.5.0"
   },
   "peerDependencies": {
     "monaco-editor": ">=0.50.0",
@@ -86,5 +80,11 @@
     "vite-tsconfig-paths": "^5.1.4",
     "vue": "^3.5.17",
     "@vitejs/plugin-vue": "^6.0.1"
+  },
+  "scripts": {
+    "type-check": "tsc --noEmit",
+    "build": "vite build",
+    "dev": "vite build --watch",
+    "test": "node --test ./tests/*.test.mjs"
   }
-}
+}

package/src/vue/AimdSourceEditor.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { ref, onMounted, onBeforeUnmount, watch } from 'vue'
 import type { AimdEditorMessages } from './locales'
+import { collectAimdDiagnostics } from './aimdDiagnostics'
 
 const props = defineProps<{
   content: string
@@ -22,6 +23,7 @@ const SERVER_ASSIGNER_FENCE = /^\s*(```|~~~)\s*assigner(?:\s+.*)?\s*$/
 const QUIZ_FENCE = /^\s*(```|~~~)\s*quiz(?:\s+.*)?\s*$/
 const GENERIC_CODE_FENCE = /^\s*(```|~~~)\s*((?:\w|[/#-])+)(?:\s+.*)?\s*$/
 const EMPTY_CODE_FENCE = /^\s*(```|~~~)\s*$/
+const AIMD_DIAGNOSTIC_OWNER = 'airalogy-aimd'
 
 const editorContainer = ref<HTMLElement | null>(null)
 
@@ -207,6 +209,40 @@ function registerAimdLanguage(monaco: any) {
   })
 }
 
+function updateAimdDiagnostics() {
+  if (!monacoModule || !monacoEditorInstance) return
+
+  const model = monacoEditorInstance.getModel()
+  if (!model) return
+
+  const markers = collectAimdDiagnostics(model.getValue()).map((diagnostic) => {
+    const start = model.getPositionAt(diagnostic.startOffset)
+    const end = model.getPositionAt(diagnostic.endOffset)
+    return {
+      severity: diagnostic.severity === 'error'
+        ? monacoModule.MarkerSeverity.Error
+        : monacoModule.MarkerSeverity.Warning,
+      message: diagnostic.message,
+      source: 'AIMD',
+      startLineNumber: start.lineNumber,
+      startColumn: start.column,
+      endLineNumber: end.lineNumber,
+      endColumn: end.column,
+    }
+  })
+
+  monacoModule.editor.setModelMarkers(model, AIMD_DIAGNOSTIC_OWNER, markers)
+}
+
+function clearAimdDiagnostics() {
+  if (!monacoModule || !monacoEditorInstance) return
+
+  const model = monacoEditorInstance.getModel()
+  if (model) {
+    monacoModule.editor.setModelMarkers(model, AIMD_DIAGNOSTIC_OWNER, [])
+  }
+}
+
 function createEditor(monaco: any) {
   if (!editorContainer.value || monacoEditorInstance) return
   const MONACO_OPTIONS_BLACKLIST = new Set(['value', 'language', 'model'])
@@ -230,10 +266,12 @@ function createEditor(monaco: any) {
     ...safeMonacoOptions,
   })
   monacoEditorInstance.onDidChangeModelContent(() => {
+    updateAimdDiagnostics()
     if (!isSyncing) {
       emit('content-change', monacoEditorInstance.getValue())
     }
   })
+  updateAimdDiagnostics()
   emit('ready', monacoEditorInstance)
   emit('monaco-loaded', monaco, monacoEditorInstance)
 }
@@ -251,6 +289,7 @@ onMounted(async () => {
 })
 
 onBeforeUnmount(() => {
+  clearAimdDiagnostics()
   monacoEditorInstance?.dispose()
 })
 

package/src/vue/aimdDiagnostics.ts

@@ -0,0 +1,39 @@
+import { parseVarDefinition, validateVarDefinition } from '@airalogy/aimd-core/parser'
+
+export type AimdDiagnosticSeverity = 'warning' | 'error'
+
+export interface AimdDiagnostic {
+  message: string
+  severity: AimdDiagnosticSeverity
+  startOffset: number
+  endOffset: number
+}
+
+const AIMD_VAR_TEMPLATE_PATTERN = /\{\{\s*(var_table|var)\s*\|([\s\S]*?)\}\}/g
+
+export function collectAimdDiagnostics(content: string): AimdDiagnostic[] {
+  const diagnostics: AimdDiagnostic[] = []
+
+  for (const match of content.matchAll(AIMD_VAR_TEMPLATE_PATTERN)) {
+    const startOffset = match.index ?? 0
+    const raw = match[0]
+    const fieldContent = match[2] ?? ''
+
+    try {
+      const warnings = validateVarDefinition(parseVarDefinition(fieldContent))
+      if (warnings.length > 0) {
+        diagnostics.push({
+          message: warnings.join('\n'),
+          severity: 'warning',
+          startOffset,
+          endOffset: startOffset + raw.length,
+        })
+      }
+    } catch {
+      // Keep source editing permissive; syntax-level parser failures should not
+      // block Monaco from rendering or reporting other diagnostics.
+    }
+  }
+
+  return diagnostics
+}

package/src/vue/aimdInlineMarkdownNormalization.ts

@@ -1,4 +1,5 @@
-const AIMD_INLINE_TEMPLATE_PATTERN = /\{\{(var_table|var|step|check|ref_step|ref_var|ref_fig|cite)\s*\|[^}]+?\}\}/g
+const AIMD_INLINE_TEMPLATE_TYPE_PATTERN = String.raw`(?:var(?:\\?_table)?|step|check|ref\\?_(?:step|var|fig)|cite)`
+const AIMD_INLINE_TEMPLATE_PATTERN = new RegExp(String.raw`\{\{${AIMD_INLINE_TEMPLATE_TYPE_PATTERN}\s*\|[^}]+?\}\}`, 'g')
 const MARKDOWN_ESCAPABLE_PATTERN = /\\([\\!"#$%&'()*+,./:;<=>?@[\\\]^_`{|}~-])/g
 
 function normalizeSingleAimdInlineTemplate(template: string): string {

package/dist/AimdSourceEditor.vue_vue_type_script_setup_true_lang-t_sUoXky.js

@@ -1,274 +0,0 @@
-import { defineComponent as V, ref as p, onMounted as q, onBeforeUnmount as F, watch as u, openBlock as k, createElementBlock as b, normalizeStyle as P, toDisplayString as R, createCommentVNode as D, createElementVNode as K } from "vue";
-const Z = {
-  key: 0,
-  class: "aimd-editor-loading"
-}, G = /* @__PURE__ */ V({
-  __name: "AimdSourceEditor",
-  props: {
-    content: {},
-    theme: {},
-    minHeight: {},
-    readonly: { type: Boolean },
-    monacoOptions: {},
-    resolvedMessages: {}
-  },
-  emits: ["content-change", "ready", "monaco-loaded"],
-  setup(l, { expose: _, emit: y }) {
-    const n = l, c = y, x = /^\s*(```|~~~)\s*assigner(?:\s+.*\bruntime\s*=\s*(?:"client"|'client'|client)\b.*)\s*$/, h = /^\s*(```|~~~)\s*assigner(?:\s+.*)?\s*$/, E = /^\s*(```|~~~)\s*quiz(?:\s+.*)?\s*$/, v = /^\s*(```|~~~)\s*((?:\w|[/#-])+)(?:\s+.*)?\s*$/, C = /^\s*(```|~~~)\s*$/, m = p(null);
-    let t = null, r = null, i = !1;
-    const d = p(!0);
-    function S(e) {
-      const o = n.resolvedMessages;
-      e.languages.getLanguages().some((s) => s.id === "aimd") || (e.languages.register({
-        id: "aimd",
-        extensions: [".aimd"],
-        aliases: ["AIMD", "aimd"],
-        mimetypes: ["text/x-aimd"]
-      }), e.languages.setLanguageConfiguration("aimd", {
-        brackets: [
-          ["{", "}"],
-          ["[", "]"],
-          ["(", ")"]
-        ],
-        autoClosingPairs: [
-          { open: "{", close: "}" },
-          { open: "[", close: "]" },
-          { open: "(", close: ")" },
-          { open: '"', close: '"' },
-          { open: "'", close: "'" },
-          { open: "`", close: "`" },
-          { open: "{{", close: "}}" }
-        ],
-        surroundingPairs: [
-          { open: "{", close: "}" },
-          { open: "[", close: "]" },
-          { open: "(", close: ")" },
-          { open: '"', close: '"' },
-          { open: "'", close: "'" },
-          { open: "`", close: "`" }
-        ]
-      }), e.languages.setMonarchTokensProvider("aimd", {
-        defaultToken: "",
-        tokenPostfix: ".aimd",
-        tokenizer: {
-          root: [
-            [/\{\{/, { token: "delimiter.bracket.aimd", next: "@aimdField" }],
-            [/^#{1,6}\s.*$/, "keyword.md"],
-            [E, { token: "string.code", next: "@embeddedCodeblock", nextEmbedded: "yaml" }],
-            [x, { token: "string.code", next: "@embeddedCodeblock", nextEmbedded: "javascript" }],
-            [h, { token: "string.code", next: "@embeddedCodeblock", nextEmbedded: "python" }],
-            [v, { token: "string.code", next: "@embeddedCodeblock", nextEmbedded: "$2" }],
-            [C, { token: "string.code", next: "@codeblock" }],
-            [/`[^`]+`/, "string.code"],
-            [/\*\*[^*]+\*\*/, "strong"],
-            [/__[^_]+__/, "strong"],
-            [/\*[^*]+\*/, "emphasis"],
-            [/_[^_]+_/, "emphasis"],
-            [/\[[^\]]+\]\([^)]+\)/, "string.link"],
-            [/!\[[^\]]*\]\([^)]+\)/, "string.link"],
-            [/^>.*$/, "comment.quote"],
-            [/^\s*[-*+]\s/, "keyword.list"],
-            [/^\s*\d+\.\s/, "keyword.list"],
-            [/^[-*_]{3,}\s*$/, "keyword.hr"],
-            [/<\/?[\w-][^>]*>/, "tag"]
-          ],
-          aimdField: [
-            [/\}\}/, { token: "delimiter.bracket.aimd", next: "@pop" }],
-            [/\b(var_table|var|step|check|ref_step|ref_var|ref_fig|cite)\b/, "keyword.aimd"],
-            [/\|/, "delimiter.aimd"],
-            [/:/, "delimiter"],
-            [/\b(str|int|float|bool|list|dict|any)\b/, "type.aimd"],
-            [/\b[A-Z][A-Za-z0-9_]*(?:\[[A-Za-z0-9_,\s]+\])?\b/, "type.aimd"],
-            [/[[\]()]/, "delimiter.bracket"],
-            [/=/, "delimiter"],
-            [/"[^"]*"/, "string"],
-            [/'[^']*'/, "string"],
-            [/-?\d+\.?\d*/, "number"],
-            [/\b(true|false|True|False|null|None)\b/, "constant"],
-            [/\bsubvars\b/, "keyword"],
-            [/,/, "delimiter"],
-            [/[A-Za-z_]\w*/, "variable.aimd"],
-            [/\s+/, ""]
-          ],
-          codeblock: [
-            [/^```\s*$/, { token: "string.code", next: "@pop" }],
-            [/^~~~\s*$/, { token: "string.code", next: "@pop" }],
-            [/.*$/, "string.code"]
-          ],
-          embeddedCodeblock: [
-            [/^```\s*$/, { token: "string.code", next: "@pop", nextEmbedded: "@pop" }],
-            [/^~~~\s*$/, { token: "string.code", next: "@pop", nextEmbedded: "@pop" }],
-            [/.*$/, ""]
-          ]
-        }
-      }), e.languages.registerCompletionItemProvider("aimd", {
-        provideCompletionItems: () => {
-          const s = ["var", "var_table", "step", "check", "ref_step", "ref_var", "ref_fig", "cite"], L = {
-            var: "var_id",
-            var_table: "table_id",
-            step: "step_id",
-            check: "check_id",
-            ref_step: "step_id",
-            ref_var: "var_id",
-            ref_fig: "fig_id",
-            cite: "ref_id"
-          }, f = s.map((a) => ({
-            label: `{{${a}|}}`,
-            kind: e.languages.CompletionItemKind.Snippet,
-            insertText: `{{${a}|\${1:${L[a] ?? "id"}}}}`,
-            insertTextRules: e.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-            documentation: o.completions.insertAimdField(a)
-          }));
-          return f.push({
-            label: o.completions.quizBlockLabel,
-            kind: e.languages.CompletionItemKind.Snippet,
-            insertText: [
-              "```quiz",
-              "id: ${1:quiz_choice_1}",
-              "type: choice",
-              "mode: single",
-              "stem: |",
-              `  \${2:${o.defaults.questionStem}}`,
-              "options:",
-              "  - key: A",
-              `    text: ${o.defaults.optionText("A")}`,
-              "  - key: B",
-              `    text: ${o.defaults.optionText("B")}`,
-              "answer: A",
-              "```"
-            ].join(`
-`),
-            insertTextRules: e.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-            documentation: o.completions.quizBlock
-          }), { suggestions: f };
-        }
-      }), e.editor.defineTheme("aimd-light", {
-        base: "vs",
-        inherit: !0,
-        rules: [
-          { token: "delimiter.bracket.aimd", foreground: "2563eb" },
-          { token: "keyword.aimd", foreground: "2563eb", fontStyle: "bold" },
-          { token: "delimiter.aimd", foreground: "6b7280" },
-          { token: "type.aimd", foreground: "7c3aed" },
-          { token: "variable.aimd", foreground: "059669" },
-          { token: "keyword.md", foreground: "1e40af" },
-          { token: "string.code", foreground: "be185d" },
-          { token: "strong", fontStyle: "bold" },
-          { token: "emphasis", fontStyle: "italic" },
-          { token: "string.link", foreground: "2563eb" },
-          { token: "comment.quote", foreground: "6b7280", fontStyle: "italic" }
-        ],
-        colors: {}
-      }), e.editor.defineTheme("aimd-dark", {
-        base: "vs-dark",
-        inherit: !0,
-        rules: [
-          { token: "delimiter.bracket.aimd", foreground: "60a5fa" },
-          { token: "keyword.aimd", foreground: "60a5fa", fontStyle: "bold" },
-          { token: "delimiter.aimd", foreground: "9ca3af" },
-          { token: "type.aimd", foreground: "a78bfa" },
-          { token: "variable.aimd", foreground: "34d399" },
-          { token: "keyword.md", foreground: "93c5fd" },
-          { token: "string.code", foreground: "f472b6" },
-          { token: "strong", fontStyle: "bold" },
-          { token: "emphasis", fontStyle: "italic" },
-          { token: "string.link", foreground: "60a5fa" },
-          { token: "comment.quote", foreground: "9ca3af", fontStyle: "italic" }
-        ],
-        colors: {}
-      }));
-    }
-    function $(e) {
-      if (!m.value || t) return;
-      const o = /* @__PURE__ */ new Set(["value", "language", "model"]), g = Object.fromEntries(
-        Object.entries(n.monacoOptions).filter(([s]) => !o.has(s))
-      );
-      t = e.editor.create(m.value, {
-        value: n.content,
-        language: "aimd",
-        theme: n.theme,
-        minimap: { enabled: !1 },
-        fontSize: 14,
-        lineNumbers: "on",
-        wordWrap: "on",
-        scrollBeyondLastLine: !1,
-        automaticLayout: !0,
-        tabSize: 2,
-        padding: { top: 12 },
-        readOnly: n.readonly,
-        ...g
-      }), t.onDidChangeModelContent(() => {
-        i || c("content-change", t.getValue());
-      }), c("ready", t), c("monaco-loaded", e, t);
-    }
-    q(async () => {
-      try {
-        d.value = !0;
-        const e = await import("monaco-editor");
-        r = e, S(e), $(e);
-      } finally {
-        d.value = !1;
-      }
-    }), F(() => {
-      t?.dispose();
-    }), u(() => n.content, (e) => {
-      !t || e === t.getValue() || (i = !0, t.setValue(e), i = !1);
-    }), u(() => n.theme, (e) => {
-      r && r.editor.setTheme(e);
-    }), u(() => n.readonly, (e) => {
-      t?.updateOptions({ readOnly: e });
-    });
-    function I() {
-      return t;
-    }
-    function T() {
-      return r;
-    }
-    function w(e) {
-      t && (i = !0, t.setValue(e), i = !1);
-    }
-    function A() {
-      return t?.getSelection();
-    }
-    function N(e, o) {
-      t?.executeEdits(e, o);
-    }
-    function M() {
-      t?.focus();
-    }
-    function O() {
-      return t?.getModel();
-    }
-    function z() {
-      return t?.getPosition();
-    }
-    function B() {
-      return t?.getValue();
-    }
-    return _({
-      getEditor: I,
-      getMonaco: T,
-      setValue: w,
-      getSelection: A,
-      executeEdits: N,
-      focus: M,
-      getModel: O,
-      getPosition: z,
-      getValue: B,
-      loading: d
-    }), (e, o) => (k(), b("div", {
-      class: "aimd-editor-source-mode",
-      style: P({ height: l.minHeight + "px" })
-    }, [
-      d.value ? (k(), b("div", Z, R(l.resolvedMessages.common.loadingEditor), 1)) : D("", !0),
-      K("div", {
-        ref_key: "editorContainer",
-        ref: m,
-        class: "aimd-editor-container"
-      }, null, 512)
-    ], 4));
-  }
-});
-export {
-  G as _
-};