opencode-copilot-account-switcher 0.14.34 → 0.14.35

package/dist/wechat/compat/jiti-loader.d.ts

@@ -2,6 +2,7 @@ export type JitiLoader = (path: string) => unknown;
 type CreateJiti = (id: string | URL, options?: Record<string, unknown>) => JitiLoader;
 type JitiImport = (specifier: string) => Promise<unknown> | unknown;
 type JitiResolve = (specifier: string) => string;
+type ModuleImport = (specifier: string) => Promise<unknown>;
 type JitiNamespace = {
     createJiti?: unknown;
     default?: unknown;
@@ -9,8 +10,16 @@ type JitiNamespace = {
 };
 export declare function resolveCreateJiti(namespace: JitiNamespace): CreateJiti;
 export declare function resolveJitiEsmEntry(resolveImpl?: JitiResolve): string;
+export declare function hasBunRuntime(bunVersion?: string | undefined): boolean;
 export declare function wrapCreateJiti(createJiti: CreateJiti): CreateJiti;
 export declare function loadJiti(importImpl?: JitiImport, resolveImpl?: JitiResolve): Promise<{
     createJiti: CreateJiti;
 }>;
+export declare function loadModuleWithTsFallback(modulePath: string, options?: {
+    bunVersion?: string | undefined;
+    importImpl?: ModuleImport;
+    loadJitiImpl?: typeof loadJiti;
+    parentURL?: string | URL;
+    jitiOptions?: Record<string, unknown>;
+}): Promise<unknown>;
 export {};

package/dist/wechat/compat/jiti-loader.js

@@ -32,6 +32,10 @@ function onJitiError(error) {
     throw error;
 }
 const nativeImport = (id) => import(id);
+const DEFAULT_JITI_EXTENSIONS = [".ts", ".tsx", ".mts", ".cts", ".js", ".mjs", ".cjs", ".json"];
+export function hasBunRuntime(bunVersion = process.versions?.bun) {
+    return typeof bunVersion === "string" && bunVersion.length > 0;
+}
 export function wrapCreateJiti(createJiti) {
     const requireFromJiti = createRequire(resolveJitiEsmEntry());
     let transformImpl;
@@ -58,3 +62,17 @@ export async function loadJiti(importImpl = (specifier) => import(specifier), re
         createJiti: wrapCreateJiti(resolveCreateJiti(namespace)),
     };
 }
+export async function loadModuleWithTsFallback(modulePath, options = {}) {
+    const moduleUrl = pathToFileURL(modulePath).href;
+    const importImpl = options.importImpl ?? nativeImport;
+    if (hasBunRuntime(options.bunVersion)) {
+        return await importImpl(moduleUrl);
+    }
+    const { createJiti } = await (options.loadJitiImpl ?? loadJiti)();
+    const loader = createJiti(options.parentURL ?? import.meta.url, {
+        interopDefault: true,
+        extensions: DEFAULT_JITI_EXTENSIONS,
+        ...(options.jitiOptions ?? {}),
+    });
+    return loader(modulePath);
+}

package/dist/wechat/compat/openclaw-account-helpers.js

@@ -1,17 +1,6 @@
 import { createRequire } from "node:module";
-import { loadJiti } from "./jiti-loader.js";
+import { loadModuleWithTsFallback } from "./jiti-loader.js";
 const OPENCLAW_WEIXIN_ACCOUNTS_MODULE = "@tencent-weixin/openclaw-weixin/src/auth/accounts.ts";
-let accountJitiLoader = null;
-async function getAccountJiti() {
-    if (accountJitiLoader) {
-        return accountJitiLoader;
-    }
-    accountJitiLoader = (await loadJiti()).createJiti(import.meta.url, {
-        interopDefault: true,
-        extensions: [".ts", ".tsx", ".mts", ".cts", ".js", ".mjs", ".cjs", ".json"],
-    });
-    return accountJitiLoader;
-}
 function asObject(value) {
     return value && typeof value === "object" ? value : {};
 }
@@ -52,7 +41,7 @@ export function createOpenClawAccountHelpers(input) {
 export async function loadOpenClawAccountHelpers(options = {}) {
     const require = createRequire(import.meta.url);
     const accountsModulePath = require.resolve(options.accountsModulePath ?? OPENCLAW_WEIXIN_ACCOUNTS_MODULE);
-    const accountsModule = (await getAccountJiti())(accountsModulePath);
+    const accountsModule = await loadModuleWithTsFallback(accountsModulePath, { parentURL: import.meta.url });
     if (typeof accountsModule.listIndexedWeixinAccountIds !== "function" || typeof accountsModule.loadWeixinAccount !== "function") {
         throw new Error("[wechat-compat] account source helper unavailable");
     }

package/dist/wechat/compat/openclaw-public-entry.js

@@ -1,23 +1,12 @@
 import { readFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import path from "node:path";
-import { loadJiti } from "./jiti-loader.js";
-let publicJitiLoader = null;
+import { loadModuleWithTsFallback } from "./jiti-loader.js";
 function requireField(condition, message) {
     if (!condition) {
         throw new Error(`[wechat-compat] ${message}`);
     }
 }
-async function getPublicJiti() {
-    if (publicJitiLoader) {
-        return publicJitiLoader;
-    }
-    publicJitiLoader = (await loadJiti()).createJiti(import.meta.url, {
-        interopDefault: true,
-        extensions: [".ts", ".tsx", ".mts", ".cts", ".js", ".mjs", ".cjs", ".json"],
-    });
-    return publicJitiLoader;
-}
 export async function resolveOpenClawWeixinPublicEntry() {
     const require = createRequire(import.meta.url);
     const packageName = "@tencent-weixin/openclaw-weixin";
@@ -42,7 +31,7 @@ export async function resolveOpenClawWeixinPublicEntry() {
 }
 export async function loadOpenClawWeixinDefaultExport() {
     const entry = await resolveOpenClawWeixinPublicEntry();
-    const moduleNamespace = (await getPublicJiti())(entry.entryAbsolutePath);
+    const moduleNamespace = await loadModuleWithTsFallback(entry.entryAbsolutePath, { parentURL: import.meta.url });
     const plugin = moduleNamespace.default;
     if (!plugin || typeof plugin !== "object" || typeof plugin.register !== "function") {
         throw new Error("[wechat-compat] @tencent-weixin/openclaw-weixin public entry default export is missing register(api)");

package/dist/wechat/compat/openclaw-sync-buf.js

@@ -1,20 +1,9 @@
 import { readFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import path from "node:path";
-import { loadJiti } from "./jiti-loader.js";
+import { loadModuleWithTsFallback } from "./jiti-loader.js";
 const OPENCLAW_SYNC_BUF_MODULE = "@tencent-weixin/openclaw-weixin/src/storage/sync-buf.ts";
 const OPENCLAW_STATE_DIR_MODULE = "@tencent-weixin/openclaw-weixin/src/storage/state-dir.ts";
-let syncBufJitiLoader = null;
-async function getSyncBufJiti() {
-    if (syncBufJitiLoader) {
-        return syncBufJitiLoader;
-    }
-    syncBufJitiLoader = (await loadJiti()).createJiti(import.meta.url, {
-        interopDefault: true,
-        extensions: [".ts", ".tsx", ".mts", ".cts", ".js", ".mjs", ".cjs", ".json"],
-    });
-    return syncBufJitiLoader;
-}
 export function createOpenClawSyncBufHelper(input) {
     return {
         async persistGetUpdatesBuf({ accountId, getUpdatesBuf }) {
@@ -29,7 +18,7 @@ export function createOpenClawSyncBufHelper(input) {
 export async function loadOpenClawSyncBufHelper(options = {}) {
     const require = createRequire(import.meta.url);
     const syncBufModulePath = require.resolve(options.syncBufModulePath ?? OPENCLAW_SYNC_BUF_MODULE);
-    const syncBufModule = (await getSyncBufJiti())(syncBufModulePath);
+    const syncBufModule = await loadModuleWithTsFallback(syncBufModulePath, { parentURL: import.meta.url });
     if (typeof syncBufModule.getSyncBufFilePath !== "function" || typeof syncBufModule.saveGetUpdatesBuf !== "function") {
         throw new Error("[wechat-compat] sync-buf source helper unavailable");
     }
@@ -41,7 +30,7 @@ export async function loadOpenClawSyncBufHelper(options = {}) {
 export async function loadLatestWeixinAccountState(options = {}) {
     const require = createRequire(import.meta.url);
     const stateDirModulePath = require.resolve(options.stateDirModulePath ?? OPENCLAW_STATE_DIR_MODULE);
-    const stateDirModule = (await getSyncBufJiti())(stateDirModulePath);
+    const stateDirModule = await loadModuleWithTsFallback(stateDirModulePath, { parentURL: import.meta.url });
     const stateDir = stateDirModule.resolveStateDir?.();
     if (!stateDir) {
         return null;
@@ -67,7 +56,7 @@ export async function loadLatestWeixinAccountState(options = {}) {
         const accountRaw = await readFile(accountFilePath, "utf8");
         const account = JSON.parse(accountRaw);
         const syncBufModulePath = require.resolve(options.syncBufModulePath ?? OPENCLAW_SYNC_BUF_MODULE);
-        const syncBufModule = (await getSyncBufJiti())(syncBufModulePath);
+        const syncBufModule = await loadModuleWithTsFallback(syncBufModulePath, { parentURL: import.meta.url });
         if (typeof account.token !== "string" || account.token.trim().length === 0) {
             return null;
         }

package/dist/wechat/compat/openclaw-updates-send.js

@@ -1,18 +1,7 @@
 import { createRequire } from "node:module";
-import { loadJiti } from "./jiti-loader.js";
+import { loadModuleWithTsFallback } from "./jiti-loader.js";
 const OPENCLAW_UPDATES_MODULE = "@tencent-weixin/openclaw-weixin/src/api/api.ts";
 const OPENCLAW_SEND_MODULE = "@tencent-weixin/openclaw-weixin/src/messaging/send.ts";
-let updatesSendJitiLoader = null;
-async function getUpdatesSendJiti() {
-    if (updatesSendJitiLoader) {
-        return updatesSendJitiLoader;
-    }
-    updatesSendJitiLoader = (await loadJiti()).createJiti(import.meta.url, {
-        interopDefault: true,
-        extensions: [".ts", ".tsx", ".mts", ".cts", ".js", ".mjs", ".cjs", ".json"],
-    });
-    return updatesSendJitiLoader;
-}
 function toObjectInput(input) {
     return input && typeof input === "object" ? input : {};
 }
@@ -34,9 +23,8 @@ export async function loadOpenClawUpdatesAndSendHelpers(options = {}) {
     const require = createRequire(import.meta.url);
     const getUpdatesModulePath = require.resolve(options.getUpdatesModulePath ?? OPENCLAW_UPDATES_MODULE);
     const sendModulePath = require.resolve(options.sendMessageWeixinModulePath ?? OPENCLAW_SEND_MODULE);
-    const jiti = await getUpdatesSendJiti();
-    const getUpdatesModule = jiti(getUpdatesModulePath);
-    const sendModule = jiti(sendModulePath);
+    const getUpdatesModule = await loadModuleWithTsFallback(getUpdatesModulePath, { parentURL: import.meta.url });
+    const sendModule = await loadModuleWithTsFallback(sendModulePath, { parentURL: import.meta.url });
     if (typeof getUpdatesModule.getUpdates !== "function") {
         throw new Error("public getUpdates helper unavailable");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-copilot-account-switcher",
-  "version": "0.14.34",
+  "version": "0.14.35",
   "description": "GitHub Copilot account switcher plugin for OpenCode",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",