@huanlin/dsh-plugin-interpreters 0.2.2 → 0.2.3

package/lib/client.js

@@ -905,13 +905,23 @@ var dicts = {
 var inject = ["slots", "locale", "connection"];
 function apply(ctx) {
   ctx.effect(() => ctx.locale.register(NS, { zh, en }), "dsh-interpreters: dictionaries");
-  const betterLocale = ctx.get("betterLocale");
-  if (betterLocale) {
-    ctx.effect(
-      () => betterLocale.register(NS, dicts),
-      "interpreters: better-locale override dicts"
-    );
-  }
+  ctx.effect(() => {
+    let dispose;
+    const sync = () => {
+      dispose?.();
+      dispose = void 0;
+      const store = ctx.get("betterLocale");
+      if (store !== void 0) {
+        dispose = store.register(NS, dicts);
+      }
+    };
+    sync();
+    const unsubscribe = ctx.locale.subscribe(sync);
+    return () => {
+      unsubscribe();
+      dispose?.();
+    };
+  }, "interpreters: better-locale override dicts");
   const controller = new InterpretersCardController();
   const useSnapshot = bindSnapshotSelector(controller.store);
   ctx.effect(() => {

package/lib/types/client/index.js

@@ -32,14 +32,28 @@ export const inject = ['slots', 'locale', 'connection'];
  */
 export function apply(ctx) {
     ctx.effect(() => ctx.locale.register(NS, { zh, en }), 'dsh-interpreters: dictionaries');
-    // Opt-in third-language overrides through @huanlin/dsh-plugin-better-locale:
-    // when installed it publishes `ctx.betterLocale` (the override store) and
-    // patches LocaleRuntime.lookup to consult it. `ctx.get` is a non-reactive
-    // read of an optional service, so an absent plugin is a plain no-op.
-    const betterLocale = ctx.get('betterLocale');
-    if (betterLocale) {
-        ctx.effect(() => betterLocale.register(NS, dicts), 'interpreters: better-locale override dicts');
-    }
+    // Opt-in third-language overrides through @huanlin/dsh-plugin-better-locale.
+    // Activation-order-safe: ctx.get('betterLocale') is a non-reactive read, so
+    // if better-locale activates after us, the initial read returns undefined.
+    // We subscribe to ctx.locale — better-locale bumps its revision on activation
+    // (persisted override) and on every override switch — and re-check on each bump.
+    ctx.effect(() => {
+        let dispose;
+        const sync = () => {
+            dispose?.();
+            dispose = undefined;
+            const store = ctx.get('betterLocale');
+            if (store !== undefined) {
+                dispose = store.register(NS, dicts);
+            }
+        };
+        sync();
+        const unsubscribe = ctx.locale.subscribe(sync);
+        return () => {
+            unsubscribe();
+            dispose?.();
+        };
+    }, 'interpreters: better-locale override dicts');
     // The store reads/writes the interpreters config over the plugin's
     // self-hosted HTTP route (`/interpreters/api/get` + `/interpreters/api/set`).
     const controller = new InterpretersCardController();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huanlin/dsh-plugin-interpreters",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "publishConfig": {
     "access": "public"
   },