Cleanup

packages/plugs/plugmanager/plugmanager.plug.yaml

@@ -1,25 +1,25 @@
-name: plugmd
+name: plugmanager
 functions:
   updatePlugsCommand:
-    path: ./plugmd.ts:updatePlugsCommand
+    path: ./plugmanager.ts:updatePlugsCommand
     command:
       name: "Plugs: Update"
       key: "Ctrl-Shift-p"
       mac: "Cmd-Shift-p"
   updatePlugs:
-    path: ./plugmd.ts:updatePlugs
+    path: ./plugmanager.ts:updatePlugs
     env: server
   compile:
-    path: "./plugmd.ts:compileCommand"
+    path: "./plugmanager.ts:compileCommand"
     command:
       name: "Plug: Compile"
       mac: "Cmd-Shift-c"
       key: "Ctrl-Shift-c"
   compileJS:
-    path: "./plugmd.ts:compileJS"
+    path: "./plugmanager.ts:compileJS"
     env: server
 
   getPlugPlugMd:
-    path: "./plugmd.ts:getPlugPlugMd"
+    path: "./plugmanager.ts:getPlugPlugMd"
     events:
     - get-plug:plugmd

packages/plugs/plugmanager/plugmanager.ts

@@ -1,12 +1,10 @@
 import { dispatch } from "@plugos/plugos-syscall/event";
-import type { Manifest } from "@silverbulletmd/common/manifest";
 import {
   addParentPointers,
   collectNodesOfType,
   findNodeOfType,
 } from "@silverbulletmd/common/tree";
 import {
-  getCurrentPage,
   getText,
   hideBhs,
   showBhs,
@@ -23,8 +21,11 @@ import {
   reloadPlugs,
 } from "@silverbulletmd/plugos-silverbullet-syscall/system";
 import YAML from "yaml";
+
 import { extractMeta } from "../query/data";
 
+import type { Manifest } from "@silverbulletmd/common/manifest";
+
 export async function compileCommand() {
   let text = await getText();
   try {
@@ -139,7 +140,7 @@ export async function updatePlugs() {
   }
   let plugYaml = codeTextNode.children![0].text;
   let plugList = YAML.parse(plugYaml!);
-  console.log("Plug YAML", plugList);
+  // console.log("Plug YAML", plugList);
   let allPlugNames: string[] = [];
   for (let plugUri of plugList) {
     let [protocol, ...rest] = plugUri.split(":");
@@ -164,11 +165,11 @@ export async function updatePlugs() {
       await deletePage(`_plug/${existingPlug}`);
     }
   }
-  // Important not to await!
-  reloadPlugs();
+  await reloadPlugs();
 }
 
 export async function getPlugPlugMd(pageName: string): Promise<Manifest> {
   let { text } = await readPage(pageName);
+  console.log("Compiling", pageName);
   return compileDefinition(text);
 }