Merge pull request #12 from Beyond-Better/dev

Fixed plugin loading of AppleScript files inJSR context

Author: cngarrison

.gitignore

@@ -20,4 +20,6 @@ docs/.obsidian
 playground/
 
 # Generated files for JSR (created by build:jsr task)
+# - scripts/index.ts files with inlined AppleScript content
+# - Modified plugin.ts files with injected static imports
 server/src/plugins/**/scripts/index.ts

deno.jsonc

@@ -1,6 +1,6 @@
 {
   "name": "@beyondbetter/bb-applescript-mcp-server",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "MCP server interact with macOS applications through AppleScript",
   "license": "MIT",
   "copyright": "2025 - Beyond Better <charlie@beyondbetter.app>",

scripts/inline-applescripts.ts

@@ -119,6 +119,50 @@ async function processScriptsDirectory(scriptsDir: string): Promise<void> {
   console.log(`  ✓ Generated index.ts with ${scriptCount} script(s)`);
 }
 
+/**
+ * Inject static imports into plugin files for JSR tree-shaking
+ * Replaces comment markers with actual import statements
+ */
+async function injectStaticImports(): Promise<void> {
+  console.log('\nInjecting static imports into plugin files...');
+
+  // Find all plugin.ts files in the plugins directory
+  const pluginFiles: string[] = [];
+  for await (
+    const entry of walk(SERVER_ROOT, {
+      exts: ['.ts'],
+      match: [/\/plugin\.ts$/],
+    })
+  ) {
+    pluginFiles.push(entry.path);
+  }
+
+  for (const pluginFile of pluginFiles) {
+    const content = await Deno.readTextFile(pluginFile);
+
+    // Check if file contains injection marker
+    const markerRegex = /^\/\/ INJECT_STATIC_IMPORT: (.+)$/gm;
+    const matches = content.match(markerRegex);
+
+    if (matches) {
+      let modified = content;
+
+      // Replace each marker with actual import
+      for (const match of matches) {
+        const pathMatch = match.match(/INJECT_STATIC_IMPORT: (.+)$/);
+        if (pathMatch) {
+          const importPath = pathMatch[1];
+          const importStatement = `import '${importPath}';`;
+          modified = modified.replace(match, importStatement);
+        }
+      }
+
+      await Deno.writeTextFile(pluginFile, modified);
+      console.log(`  ✓ Injected imports in ${relative('.', pluginFile)}`);
+    }
+  }
+}
+
 async function main() {
   console.log('\n🔨 Inlining AppleScript files for JSR compatibility...\n');
 
@@ -133,7 +177,10 @@ async function main() {
     await processScriptsDirectory(dir);
   }
 
-  console.log('\n✅ Done! Generated index.ts files are ready for JSR publishing.\n');
+  // Inject static imports into plugin files
+  await injectStaticImports();
+
+  console.log('\n✅ Done! Generated index.ts files and injected imports are ready for JSR publishing.\n');
 }
 
 if (import.meta.main) {

server/src/plugins/bbedit.plugin/plugin.ts

@@ -3,6 +3,7 @@
  * Provides tools for working with BBEdit notebooks and projects
  */
 
+// INJECT_STATIC_IMPORT: ./scripts/index.ts
 import { AppPlugin, ToolRegistration, ToolRegistry, WorkflowBase, WorkflowRegistry } from '@beyondbetter/bb-mcp-server';
 import { z } from 'zod';
 import { findAndExecuteScript } from '../../utils/scriptLoader.ts';

server/src/plugins/standard.plugin/plugin.ts

@@ -4,6 +4,7 @@
  * and Finder operations that don't have simple CLI equivalents
  */
 
+// INJECT_STATIC_IMPORT: ./scripts/index.ts
 import { AppPlugin, ToolRegistration, ToolRegistry, WorkflowBase, WorkflowRegistry } from '@beyondbetter/bb-mcp-server';
 import { getTools as getRunScriptTools } from './tools/runScript.ts';
 import { getTools as getReadDictionaryTools } from './tools/readDictionary.ts';