feega 0.1.30 → 0.1.31

package/bin/feega.mjs

@@ -56,6 +56,7 @@ async function chooseVersion(home) {
 }
 
 async function install(dir, version) {
+  console.log(eventLine({ event: 'step', step: 'download' }));
   console.error(`feega: downloading the app ${version} (once per version)…`);
   rmSync(dir, { recursive: true, force: true });
   mkdirSync(dir, { recursive: true });
@@ -66,6 +67,7 @@ async function install(dir, version) {
     throw new Error('could not extract the app bundle');
   }
 
+  console.log(eventLine({ event: 'step', step: 'install' }));
   console.error('feega: installing its dependencies for this machine…');
   const deps = spawnSync('npm', ['ci', '--omit=dev', '--no-audit', '--no-fund', '--loglevel=error'], {
     cwd: dir,
@@ -102,6 +104,10 @@ async function readyApp() {
 
 async function wantsImport(app, file, mode) {
   const step = importStep({ mode, app, fileExists: existsSync(file), tty: Boolean(process.stdin.isTTY && process.stdout.isTTY) });
+  if (step === ImportStep.NoApp) {
+    throw new Error(`nothing to import: ${process.cwd()} has no package.json with a "dev" script`);
+  }
+
   if (step !== ImportStep.Ask) {
     return step === ImportStep.Import;
   }
@@ -155,6 +161,7 @@ async function importFolder(url, folder, { routes, app, file }) {
     throw new Error('could not find the local canvas');
   }
 
+  console.log(eventLine({ event: 'step', step: 'find', state: 'active' }));
   console.log(`feega: looking for the pages of ${basename(folder)}…`);
   const discovered = await discover(url, place, folder, app);
   const plan = routePlan(discovered.found, routes);
@@ -162,6 +169,7 @@ async function importFolder(url, folder, { routes, app, file }) {
     console.log('feega: no router found, importing the home page only');
   }
 
+  console.log(eventLine({ event: 'step', step: 'find', state: 'done', pages: plan.routes.length }));
   console.log(`feega: importing ${basename(folder)}: ${plan.routes.length} pages (starts its dev server, can take a minute)…`);
   const { path, body } = importAsk(place, folder, { routes: plan.routes, app: discovered.app });
   const { res, body: done } = await fetchJson(url, path, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(body) });
@@ -225,6 +233,7 @@ async function main() {
   const port = await freePort(args.port);
 
   const url = boundUrl(port);
+  console.log(eventLine({ event: 'step', step: 'start' }));
   console.log(`feega: saving to ${file}`);
   console.log(`feega: open ${url}`);
 
@@ -239,7 +248,10 @@ async function main() {
   }
 
   if (importing) {
-    await importFolder(url, app, { routes, app: chosenApp, file }).catch((error) => console.error(`feega: ${error.message}`));
+    await importFolder(url, app, { routes, app: chosenApp, file }).catch((error) => {
+      console.error(`feega: ${error.message}`);
+      console.log(eventLine({ event: 'import-failed', message: error.message }));
+    });
   }
 }
 

package/launcher.mjs

@@ -10,7 +10,7 @@ export const MCP_ENTRY = 'mcp.mjs';
 export const USAGE = `usage: feega [file.feega] [--port <n>] [--no-open] [--import | --no-import] [--routes <list|all>] [--app <path>] [--help] [--version]
        feega mcp [--port <n>]   MCP server (stdio) for the local feega on that port (default ${MCP_PORT})`;
 export const FolderImport = { Ask: 'ask', Yes: 'yes', No: 'no' };
-export const ImportStep = { Ask: 'ask', Import: 'import', Skip: 'skip' };
+export const ImportStep = { Ask: 'ask', Import: 'import', Skip: 'skip', NoApp: 'no-app' };
 
 const IMPORT_FLAGS = { '--import': FolderImport.Yes, '--no-import': FolderImport.No };
 const HOME_ROUTE = '/';
@@ -218,7 +218,7 @@ const STEPS = {
 
 export function importStep({ mode, app, fileExists, tty }) {
   if (!app) {
-    return ImportStep.Skip;
+    return mode === FolderImport.Yes ? ImportStep.NoApp : ImportStep.Skip;
   }
 
   return STEPS[mode]({ fileExists, tty });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feega",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "description": "Run feega's infinite canvas locally, saved to a .feega file. No account, no database.",
   "license": "Apache-2.0",
   "type": "module",