Tweaking

packages/plugs/package.json

@@ -8,7 +8,7 @@
   "license": "MIT",
   "scripts": {
     "generate": "lezer-generator query/query.grammar -o query/parse-query.js",
-    "watch": "plugos-bundle --dist ../common/dist global.plug.yaml && plugos-bundle -w --dist dist --exclude @lezer/lr yaml handlebars -- */*.plug.yaml",
+    "watch": "plugos-bundle --dist ../common/dist global.plug.yaml && plugos-bundle --debug -w --dist dist --exclude @lezer/lr yaml handlebars -- */*.plug.yaml",
     "build": "plugos-bundle --dist ../common/dist global.plug.yaml && plugos-bundle --dist dist --exclude @lezer/lr yaml handlebars -- */*.plug.yaml",
     "test": "jest build/test"
   },

packages/plugs/plugmanager/plugmanager.plug.yaml

@@ -24,8 +24,10 @@ functions:
   compileJS:
     path: "./plugmanager.ts:compileJS"
     env: server
-
+  compileModule:
+    path: "./plugmanager.ts:compileModule"
+    env: server
   getPlugPlugMd:
     path: "./plugmanager.ts:getPlugPlugMd"
     events:
-    - get-plug:plugmd
+      - get-plug:plugmd

packages/plugs/plugmanager/plugmanager.ts

@@ -5,6 +5,7 @@ import {
   findNodeOfType,
 } from "@silverbulletmd/common/tree";
 import {
+  flashNotification,
   getText,
   hideBhs,
   showBhs,
@@ -84,6 +85,13 @@ async function compileDefinition(text: string): Promise<Manifest> {
     throw new Error("No code found");
   }
 
+  manifest.dependencies = manifest.dependencies || {};
+
+  for (let [dep, depSpec] of Object.entries(manifest.dependencies)) {
+    let compiled = await invokeFunction("server", "compileModule", depSpec);
+    manifest.dependencies![dep] = compiled;
+  }
+
   manifest.functions = manifest.functions || {};
 
   for (let [name, func] of Object.entries(manifest.functions)) {
@@ -92,7 +100,8 @@ async function compileDefinition(text: string): Promise<Manifest> {
       "compileJS",
       `file.${language}`,
       code,
-      name
+      name,
+      Object.keys(manifest.dependencies)
     );
     func.code = compiled;
   }
@@ -105,9 +114,21 @@ async function compileDefinition(text: string): Promise<Manifest> {
 export async function compileJS(
   filename: string,
   code: string,
-  functionName: string
+  functionName: string,
+  excludeModules: string[]
 ): Promise<string> {
-  return self.syscall("esbuild.compile", filename, code, functionName);
+  // console.log("Compiling JS", filename, excludeModules);
+  return self.syscall(
+    "esbuild.compile",
+    filename,
+    code,
+    functionName,
+    excludeModules
+  );
+}
+
+export async function compileModule(moduleName: string): Promise<string> {
+  return self.syscall("esbuild.compileModule", moduleName);
 }
 
 async function listPlugs(): Promise<string[]> {
@@ -122,7 +143,9 @@ export async function listCommand() {
 }
 
 export async function updatePlugsCommand() {
+  flashNotification("Updating plugs...");
   await invokeFunction("server", "updatePlugs");
+  flashNotification("And... done!");
   await reloadPlugs();
 }
 
@@ -137,7 +160,6 @@ export async function updatePlugs() {
     return;
   }
   let plugYaml = codeTextNode.children![0].text;
-  console.log("YAML", YAML);
   let plugList = YAML.parse(plugYaml!);
   console.log("Plug YAML", plugList);
   let allPlugNames: string[] = [];