@aiao/code-editor-vue 0.0.25 → 0.0.28

package/dist/CodeEditor.vue.d.ts

@@ -12,22 +12,22 @@ declare const __VLS_export: import('vue').DefineComponent<CodeEditorProps, CodeE
     "onLanguage-error"?: ((error: import('@aiao/code-editor').CodeEditorLanguageError) => any) | undefined;
     "onUpdate:value"?: ((value: string) => any) | undefined;
 }>, {
-    readonly autoFocus: boolean;
-    readonly describedBy: string;
-    readonly disabled: boolean;
-    readonly highlightWhitespace: boolean;
-    readonly indentUnit: string;
-    readonly indentWithTab: boolean;
-    readonly language: string;
-    readonly languages: readonly import('@aiao/code-editor').CodeEditorLanguageDescription[];
-    readonly label: string;
-    readonly labelledBy: string;
-    readonly lineWrapping: boolean;
-    readonly placeholder: string;
-    readonly readonly: boolean;
-    readonly setup: CodeEditorSetup;
-    readonly theme: import('@aiao/code-editor').CodeEditorTheme;
-    readonly value: string;
+    autoFocus: boolean;
+    describedBy: string;
+    disabled: boolean;
+    highlightWhitespace: boolean;
+    indentUnit: string;
+    indentWithTab: boolean;
+    language: string;
+    languages: readonly import('@aiao/code-editor').CodeEditorLanguageDescription[];
+    label: string;
+    labelledBy: string;
+    lineWrapping: boolean;
+    placeholder: string;
+    readonly: boolean;
+    setup: CodeEditorSetup;
+    theme: import('@aiao/code-editor').CodeEditorTheme;
+    value: string;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/CodeEditor.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CodeEditor.vue.d.ts","sourceRoot":"","sources":["../src/CodeEditor.vue"],"names":[],"mappings":"AAuVA,OAAO,KAAK,EAAmB,gBAAgB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AA8UlH,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6EAKhB,CAAC;wBACkB,OAAO,YAAY;AAAxC,wBAAyC"}
+{"version":3,"file":"CodeEditor.vue.d.ts","sourceRoot":"","sources":["../src/CodeEditor.vue"],"names":[],"mappings":"AAwWA,OAAO,KAAK,EAAmB,gBAAgB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAwVlH,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6EAKhB,CAAC;wBACkB,OAAO,YAAY;AAAxC,wBAAyC"}

package/dist/index.js

@@ -1,5 +1,5 @@
-import { computed as e, createElementBlock as t, defineComponent as n, mergeProps as r, onMounted as ee, onUnmounted as te, openBlock as i, ref as ne, shallowRef as re, watch as a } from "vue";
-import { SUPPORT_LANGUAGES as o, buildCodeEditorContentAttributes as s, codeEditorLanguageLoadFailed as ie, codeEditorLanguageNotFound as c, computeMinimalDocumentChange as ae, isSameResolvedLanguage as l, resolveCodeEditorLanguage as u, shouldAutoFocusCodeEditor as d } from "@aiao/code-editor";
+import { computed as e, createElementBlock as t, defineComponent as n, mergeProps as r, onMounted as i, onUnmounted as ee, openBlock as a, ref as o, shallowRef as te, watch as s } from "vue";
+import { SUPPORT_LANGUAGES as c, buildCodeEditorContentAttributes as ne, codeEditorLanguageLoadFailed as re, codeEditorLanguageNotFound as l, computeMinimalDocumentChange as ie, isSameResolvedLanguage as ae, resolveCodeEditorLanguage as u, shouldAutoFocusCodeEditor as d } from "@aiao/code-editor";
 import { indentWithTab as f } from "@codemirror/commands";
 import { indentUnit as oe } from "@codemirror/language";
 import { Annotation as se, Compartment as p, EditorState as m, Transaction as h } from "@codemirror/state";
@@ -30,7 +30,7 @@ var C = /* @__PURE__ */ n({
 			default: !1
 		},
 		language: { default: "sql" },
-		languages: { default: () => o },
+		languages: { default: () => c },
 		label: { default: "" },
 		labelledBy: { default: "" },
 		lineWrapping: {
@@ -54,8 +54,8 @@ var C = /* @__PURE__ */ n({
 		"language-error",
 		"update:value"
 	],
-	setup(n, { expose: o, emit: C }) {
-		let w = n, T = C, E = ne(null), D = re(null), ce = e(() => ({
+	setup(n, { expose: c, emit: C }) {
+		let w = n, T = C, E = o(null), D = te(null), ce = e(() => ({
 			"aria-disabled": w.disabled || void 0,
 			class: "aiao-code-editor",
 			style: {
@@ -69,7 +69,7 @@ var C = /* @__PURE__ */ n({
 			basic: x,
 			minimal: S
 		}, V = 0, H;
-		ee(() => {
+		i(() => {
 			let e = E.value;
 			if (!e) return;
 			let t = m.create({
@@ -118,20 +118,20 @@ var C = /* @__PURE__ */ n({
 				...w.root ? { root: w.root } : {}
 			});
 			D.value = n, G(), K(), J(), X(), Z(), Q(), $(), Y(), w.autoFocus && d(w) && n.focus();
-		}), te(() => {
+		}), ee(() => {
 			V += 1;
 			let e = D.value;
 			D.value = null, e?.destroy();
-		}), a(() => w.value, (e) => {
+		}), s(() => w.value, (e) => {
 			let t = D.value;
 			if (!t) return;
-			let n = ae(t.state.doc.toString(), e ?? "");
+			let n = ie(t.state.doc.toString(), e ?? "");
 			n && t.dispatch({
 				annotations: [z.of(!0), h.addToHistory.of(!1)],
 				changes: n,
 				scrollIntoView: !1
 			});
-		}), a(() => w.setup, U), a(() => w.theme, G), a([() => w.language, () => w.languages], le), a([() => w.readonly, () => w.disabled], J), a(() => w.placeholder, X), a([() => w.indentWithTab, () => w.indentUnit], Z), a(() => w.lineWrapping, Q), a(() => w.highlightWhitespace, $), a([
+		}), s(() => w.setup, U), s(() => w.theme, G), s([() => w.language, () => w.languages], le), s([() => w.readonly, () => w.disabled], J), s(() => w.placeholder, X), s([() => w.indentWithTab, () => w.indentUnit], Z), s(() => w.lineWrapping, Q), s(() => w.highlightWhitespace, $), s([
 			() => w.describedBy,
 			() => w.disabled,
 			() => w.label,
@@ -148,20 +148,26 @@ var C = /* @__PURE__ */ n({
 		}
 		function le() {
 			let e = u(w.language, w.languages);
-			l(H, e) || K();
+			ae(H, e) || K();
 		}
 		function K() {
 			let e = ++V, t = D.value;
 			if (!t) return;
 			let n = w.language, r = u(n, w.languages);
 			if (H = r, r.kind !== "found") {
-				t.dispatch({ effects: k.reconfigure([]) }), r.kind === "not-found" && (console.error(`[CodeEditor] Language '${n}' not found.`), T("language-error", c(n)));
+				t.dispatch({ effects: k.reconfigure([]) }), r.kind === "not-found" && (console.error(`[CodeEditor] Language '${n}' not found.`), T("language-error", l(n)));
 				return;
 			}
-			r.description.load().then((n) => {
+			let i;
+			try {
+				i = Promise.resolve(r.description.load());
+			} catch (e) {
+				i = Promise.reject(e);
+			}
+			i.then((n) => {
 				q(e, t) && t.dispatch({ effects: k.reconfigure(n.extension) });
 			}, (r) => {
-				q(e, t) && (t.dispatch({ effects: k.reconfigure([]) }), console.error(`[CodeEditor] Failed to load language '${n}':`, r), T("language-error", ie(n, r)));
+				q(e, t) && (t.dispatch({ effects: k.reconfigure([]) }), console.error(`[CodeEditor] Failed to load language '${n}':`, r), T("language-error", re(n, r)));
 			});
 		}
 		function q(e, t) {
@@ -174,7 +180,7 @@ var C = /* @__PURE__ */ n({
 			e.dispatch({ effects: [j.reconfigure(m.readOnly.of(t)), M.reconfigure(_.editable.of(!t))] });
 		}
 		function Y() {
-			let e = s(w);
+			let e = ne(w);
 			D.value?.dispatch({ effects: R.reconfigure(_.contentAttributes.of(e)) });
 		}
 		function X() {
@@ -189,7 +195,7 @@ var C = /* @__PURE__ */ n({
 		function $() {
 			D.value?.dispatch({ effects: L.reconfigure(w.highlightWhitespace ? v() : []) });
 		}
-		return o({
+		return c({
 			get view() {
 				return D.value;
 			},
@@ -198,7 +204,7 @@ var C = /* @__PURE__ */ n({
 			},
 			blur: () => D.value?.contentDOM.blur(),
 			focus: () => D.value?.focus()
-		}), (e, n) => (i(), t("div", r(ce.value, {
+		}), (e, n) => (a(), t("div", r(ce.value, {
 			ref_key: "editorRef",
 			ref: E
 		}), null, 16));

package/package.json

@@ -1,6 +1,19 @@
 {
   "name": "@aiao/code-editor-vue",
-  "version": "0.0.25",
+  "version": "0.0.28",
+  "description": "Vue integration for the Aiao CodeMirror 6 editor.",
+  "homepage": "https://rxdb.aiao.io/docs/code-editor",
+  "bugs": {
+    "url": "https://github.com/aiao-io/rxdb/issues"
+  },
+  "keywords": [
+    "aiao",
+    "rxdb",
+    "vue",
+    "codemirror",
+    "code-editor",
+    "typescript"
+  ],
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -8,6 +21,7 @@
     "directory": "packages/code-editor-vue"
   },
   "type": "module",
+  "sideEffects": false,
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -37,15 +51,18 @@
     ]
   },
   "peerDependencies": {
-    "vue": "^3.5.41"
+    "vue": "^3.5.43"
+  },
+  "devDependencies": {
+    "vue": "^3.5.44"
   },
   "dependencies": {
-    "@codemirror/commands": "^6.10.4",
-    "@codemirror/language": "6.12.4",
-    "@codemirror/state": "6.7.1",
+    "@codemirror/commands": "^6.11.1",
+    "@codemirror/language": "^6.13.1",
+    "@codemirror/state": "^6.7.6",
     "@codemirror/theme-one-dark": "^6.1.3",
-    "@codemirror/view": "6.43.8",
-    "codemirror": "^6.0.1",
-    "@aiao/code-editor": "0.0.25"
+    "@codemirror/view": "^6.43.14",
+    "codemirror": "^6.0.2",
+    "@aiao/code-editor": "^0.0.28"
   }
 }

package/src/CodeEditor.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { ResolvedCodeEditorLanguage } from '@aiao/code-editor';
+import type { CodeEditorLanguageSupport, ResolvedCodeEditorLanguage } from '@aiao/code-editor';
 import {
   buildCodeEditorContentAttributes,
   codeEditorLanguageLoadFailed,
@@ -224,7 +224,24 @@ function updateLanguage() {
 
   // 解析结果里已经带着命中的 description —— 早先这里又 `findLanguageByName` 查了一遍，
   // 同一份查找逻辑跑两次，两处结果分叉时没有任何信号。
-  void resolved.description.load().then(
+  //
+  // RV-056：`description.load()` 承诺返回 Promise，但不保证工厂函数在创建 Promise
+  // 前不抛同步异常——`.then(success, failure)` 的第二个 handler 只接 Promise
+  // rejection，接不到这种同步 throw。`updateLanguage()` 在 `onMounted` 里是同步调用
+  // 的一环，异常会中断后面 updateReadonly/placeholder/indent 等访问状态初始化，
+  // 真实 createApp 的 errorHandler 才收到它。用 try/catch 把「调用本身」同步兜住，
+  // 捕到的同步异常转成已 reject 的 Promise，与 `load()` 正常返回的 Promise 走
+  // 同一个 `.then(success, failure)`，`updateLanguage()` 本身永远同步正常返回。
+  // 不能像 `Promise.resolve().then(() => resolved.description.load())` 那样多包一层
+  // ——`load()` 内部自己还会再 `.then()` 一次（见 CodeMirror 源码），多包的那层会让
+  // 本就要经过两次微任务才能结算的 rejection 再推迟两轮才报出去。
+  let loadPromise: Promise<CodeEditorLanguageSupport>;
+  try {
+    loadPromise = Promise.resolve(resolved.description.load());
+  } catch (error) {
+    loadPromise = Promise.reject(error);
+  }
+  void loadPromise.then(
     support => {
       if (!isCurrentLanguageRequest(request, view)) return;
       view.dispatch({ effects: languageConf.reconfigure(support.extension as Extension) });