@vicinae/api 0.8.3 → 0.8.4

package/dist/api/context/navigation-provider.js

@@ -14,9 +14,10 @@ const View = ({ children }) => {
 const NavigationProvider = ({ root }) => {
     const [navStack, setNavStack] = (0, react_1.useState)([root]);
     const pop = () => {
-        bus_1.bus.turboRequest("ui.popView", {}).then(() => {
-            setNavStack((cur) => cur.slice(0, -1));
-        });
+        // we ask Vicinae to pop the current view, but we need to wait
+        // for the pop-view event to be fired in order to dismount it from
+        // our local view stack: otherwise Vicinae might miss a render.
+        bus_1.bus.turboRequest("ui.popView", {});
     };
     const push = (node) => {
         bus_1.bus.turboRequest("ui.pushView", {}).then(() => {

package/dist/commands/develop/index.js

@@ -67,17 +67,20 @@ class Develop extends core_1.Command {
         const { flags } = await this.parse(Develop);
         const logger = new logger_js_1.Logger();
         const pkgPath = (0, node_path_1.join)(flags.target, "package.json");
-        if (!(0, node_fs_1.existsSync)(pkgPath)) {
-            logger.logError(`No package.json found at ${pkgPath}. Does this location point to a valid extension repository?`);
-            process.exit(1);
-        }
-        const json = JSON.parse((0, node_fs_1.readFileSync)(pkgPath, "utf8"));
-        const e = manifest_js_1.default.safeParse(json);
-        if (e.error) {
-            logger.logError(`${pkgPath} is not a valid extension manifest: ${e.error}`);
-            process.exit(1);
-        }
-        const manifest = e.data;
+        const parseManifest = () => {
+            if (!(0, node_fs_1.existsSync)(pkgPath)) {
+                logger.logError(`No package.json found at ${pkgPath}. Does this location point to a valid extension repository?`);
+                process.exit(1);
+            }
+            const json = JSON.parse((0, node_fs_1.readFileSync)(pkgPath, "utf8"));
+            const e = manifest_js_1.default.safeParse(json);
+            if (e.error) {
+                logger.logError(`${pkgPath} is not a valid extension manifest: ${e.error}`);
+                process.exit(1);
+            }
+            return e.data;
+        };
+        let manifest = parseManifest();
         const vicinae = new vicinae_js_1.VicinaeClient();
         const typeCheck = async () => {
             const spawned = (0, node_child_process_1.spawn)("npx", ["tsc", "--noEmit"]);
@@ -90,14 +93,17 @@ class Develop extends core_1.Command {
             });
         };
         const build = async (outDir) => {
+            /*
             logger.logInfo("Started type checking in background thread");
             typeCheck().then(({ error, ok }) => {
-                if (!ok) {
-                    logger.logInfo(`Type checking error: ${error}`);
-                }
-                logger.logInfo("Done type checking");
+              if (!ok) {
+                logger.logInfo(`Type checking error: ${error}`);
+              }
+      
+              logger.logInfo("Done type checking");
             });
-            const entryPoints = manifest.commands.map((cmd) => (0, node_path_1.join)("src", `${cmd.name}.tsx`));
+            */
+            const entryPoints = manifest.commands.map((cmd) => (0, node_path_1.join)("src", `${cmd.name}.tsx`)).filter(node_fs_1.existsSync);
             logger.logInfo(`entrypoints [${entryPoints.join(", ")}]`);
             const promises = manifest.commands.map((cmd) => {
                 const base = (0, node_path_1.join)(process.cwd(), "src", `${cmd.name}`);
@@ -105,14 +111,14 @@ class Develop extends core_1.Command {
                 const tsSource = `${base}.ts`;
                 let source = tsxSource;
                 if (cmd.mode == "view" && !(0, node_fs_1.existsSync)(tsxSource)) {
-                    throw new Error(`Unable to find view command ${cmd.name} at ${tsxSource}`);
+                    throw new Error(`could not find entrypoint src/${cmd.name}.tsx for command ${cmd.name}.`);
                 }
                 // we allow .ts or .tsx for no-view
                 if (cmd.mode == "no-view") {
                     if (!(0, node_fs_1.existsSync)(tsxSource)) {
                         source = tsSource;
                         if (!(0, node_fs_1.existsSync)(tsSource)) {
-                            throw new Error(`Unable to find no-view command ${cmd.name} at ${base}.{ts,tsx}`);
+                            throw new Error(`could not find entrypoint src/${cmd.name}.{ts,tsx} for command ${cmd.name}.`);
                         }
                     }
                 }
@@ -141,6 +147,23 @@ class Develop extends core_1.Command {
             console.error(`Failed to ping vicinae\n`, pingError.message);
             return;
         }
+        const safeBuild = async (extensionDir) => {
+            try {
+                const start = performance.now();
+                await build(extensionDir);
+                const time = performance.now() - start;
+                logger.logReady(`Extension built in ${Math.round(time)}ms 🚀`);
+                vicinae.refreshDevSession(id);
+            }
+            catch (error) {
+                if (error instanceof Error) {
+                    logger.logError(`Failed to build extension: ${error.message}`);
+                }
+                else {
+                    logger.logError(`Failed to build extension: ${error}`);
+                }
+            }
+        };
         process.chdir(flags.target);
         const dataDir = (0, utils_js_1.extensionDataDir)();
         const id = `${manifest.name}`;
@@ -148,10 +171,9 @@ class Develop extends core_1.Command {
         const logFile = (0, node_path_1.join)(extensionDir, "dev.log");
         const pidFile = (0, node_path_1.join)(extensionDir, "cli.pid");
         (0, node_fs_1.mkdirSync)(extensionDir, { recursive: true });
-        await build(extensionDir);
-        logger.logReady("built extension successfully");
         (0, node_fs_1.writeFileSync)(pidFile, `${process.pid}`);
         (0, node_fs_1.writeFileSync)(logFile, "");
+        await safeBuild(extensionDir);
         process.on("SIGINT", () => {
             logger.logInfo("Shutting down...");
             vicinae.stopDevSession(id);
@@ -167,16 +189,12 @@ class Develop extends core_1.Command {
             awaitWriteFinish: { pollInterval: 100, stabilityThreshold: 100 },
             ignoreInitial: true,
         })
-            .on("all", (_, path) => {
-            logger.logEvent(`changed file ${path}:`);
-            try {
-                build(extensionDir);
-                logger.logReady("built extension successfully");
-                vicinae.refreshDevSession(id);
-            }
-            catch (error) {
-                logger.logEvent(`Failed to build extension: ${error}`);
+            .on("all", async (_, path) => {
+            if (path.endsWith('package.json')) {
+                manifest = parseManifest();
             }
+            logger.logEvent(`changed file ${path}`);
+            await safeBuild(extensionDir);
         });
         const logFiles = new Map();
         chokidar.watch(logFile).on("all", async (_, path) => {
@@ -184,7 +202,7 @@ class Develop extends core_1.Command {
             if (!stats.isFile())
                 return;
             if (!logFiles.has(path)) {
-                logger.logInfo(`Monitoring new log file at ${path}`);
+                //logger.logInfo(`Monitoring new log file at ${path}`);
                 logFiles.set(path, { cursor: 0, path });
             }
             const info = logFiles.get(path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vicinae/api",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "TypeScript SDK to build Vicinae extensions",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",