@lumerahq/cli 0.19.9-dev.3 → 0.19.10-dev.0

package/dist/{dev-3SDNIPWA.js → dev-35XSSGOG.js}

@@ -89,7 +89,7 @@ async function isFreshProject(projectRoot) {
 }
 function runApply(projectRoot) {
   try {
-    execFileSync(process.execPath, [...process.execArgv, process.argv[1], "apply"], {
+    execFileSync(process.execPath, [...process.execArgv, process.argv[1], "apply", "--yes"], {
       cwd: projectRoot,
       stdio: "inherit",
       env: process.env

package/dist/index.js

@@ -219,29 +219,29 @@ async function main() {
     switch (command) {
       // Resource commands
       case "plan":
-        await import("./resources-4M4LMSSN.js").then((m) => m.plan(args.slice(1)));
+        await import("./resources-TGVI6SYA.js").then((m) => m.plan(args.slice(1)));
         break;
       case "apply":
-        await import("./resources-4M4LMSSN.js").then((m) => m.apply(args.slice(1)));
+        await import("./resources-TGVI6SYA.js").then((m) => m.apply(args.slice(1)));
         break;
       case "pull":
-        await import("./resources-4M4LMSSN.js").then((m) => m.pull(args.slice(1)));
+        await import("./resources-TGVI6SYA.js").then((m) => m.pull(args.slice(1)));
         break;
       case "destroy":
-        await import("./resources-4M4LMSSN.js").then((m) => m.destroy(args.slice(1)));
+        await import("./resources-TGVI6SYA.js").then((m) => m.destroy(args.slice(1)));
         break;
       case "list":
-        await import("./resources-4M4LMSSN.js").then((m) => m.list(args.slice(1)));
+        await import("./resources-TGVI6SYA.js").then((m) => m.list(args.slice(1)));
         break;
       case "show":
-        await import("./resources-4M4LMSSN.js").then((m) => m.show(args.slice(1)));
+        await import("./resources-TGVI6SYA.js").then((m) => m.show(args.slice(1)));
         break;
       case "diff":
-        await import("./resources-4M4LMSSN.js").then((m) => m.diff(args.slice(1)));
+        await import("./resources-TGVI6SYA.js").then((m) => m.diff(args.slice(1)));
         break;
       // Development
       case "dev":
-        await import("./dev-3SDNIPWA.js").then((m) => m.dev(args.slice(1)));
+        await import("./dev-35XSSGOG.js").then((m) => m.dev(args.slice(1)));
         break;
       case "run":
         await import("./run-YUL73K5O.js").then((m) => m.run(args.slice(1)));

package/dist/{resources-4M4LMSSN.js → resources-TGVI6SYA.js}

@@ -197,14 +197,16 @@ function parseHookFile(content) {
     configFound: false,
     configKeys: [],
     configIssues: [],
-    defaultHandlerFound: false
+    defaultHandlerFound: false,
+    legacyHandlerPattern: false
   };
   let ast;
   try {
     ast = Parser.parse(content, {
       ecmaVersion: "latest",
       sourceType: "module",
-      locations: true
+      locations: true,
+      allowReturnOutsideFunction: true
     });
   } catch (err) {
     const e = err;
@@ -216,7 +218,9 @@ function parseHookFile(content) {
     return finding;
   }
   let configNode;
+  let configExportNode;
   let handlerNode;
+  let topLevelReturnFound = false;
   for (const node of ast.body) {
     if (node.type === "ExportNamedDeclaration") {
       const decl = node.declaration;
@@ -224,6 +228,7 @@ function parseHookFile(content) {
         for (const d of decl.declarations) {
           if (d.id?.type === "Identifier" && d.id.name === "config" && d.init?.type === "ObjectExpression") {
             configNode = d.init;
+            configExportNode = node;
           }
         }
       }
@@ -232,6 +237,8 @@ function parseHookFile(content) {
       if (d.type === "FunctionDeclaration" || d.type === "FunctionExpression" || d.type === "ArrowFunctionExpression") {
         handlerNode = d;
       }
+    } else if (node.type === "ReturnStatement") {
+      topLevelReturnFound = true;
     }
   }
   if (configNode) {
@@ -321,6 +328,13 @@ function parseHookFile(content) {
         finding.scriptBody = `return ${content.slice(body.start, body.end)};`;
       }
     }
+  } else if (topLevelReturnFound) {
+    finding.legacyHandlerPattern = true;
+    if (configExportNode) {
+      finding.scriptBody = (content.slice(0, configExportNode.start) + content.slice(configExportNode.end)).trim();
+    } else {
+      finding.scriptBody = content.trim();
+    }
   }
   return finding;
 }
@@ -343,6 +357,16 @@ function error2(target, message, line) {
     ...line !== void 0 ? { line } : {}
   };
 }
+function warning(target, message, line) {
+  return {
+    ruleId: "hook-verify",
+    target,
+    severity: "warning",
+    message,
+    ...line !== void 0 ? { line } : {}
+  };
+}
+var LEGACY_HANDLER_MIGRATION_HINT = "Hook uses the legacy `async function main(ctx) { \u2026 } return main(ctx);` pattern. This still works, but please migrate to `export default async function handler(ctx) { \u2026 }` \u2014 the legacy pattern is invalid ES module syntax and will be removed in a future CLI release.";
 function messageForIssue(issue) {
   switch (issue.kind) {
     case "missing-required-field":
@@ -364,6 +388,14 @@ var hookVerifyRule = {
   description: "Validates hook file structure (config export, trigger, known keys, default handler) and verifies the script compiles via the backend.",
   appliesTo: ["hook"],
   async check(target, ctx) {
+    if (target.filePath.endsWith(".ts")) {
+      return [
+        error2(
+          target,
+          "TypeScript hook files are not yet supported. Rename to `.js` and remove any TypeScript-specific syntax (type annotations, `as` casts, etc.)."
+        )
+      ];
+    }
     const finding = parseHookFile(target.source);
     if (finding.syntaxError) {
       return [
@@ -383,7 +415,7 @@ var hookVerifyRule = {
       ];
     }
     const errors = [];
-    if (!finding.hook?.external_id && !ctx.appName) {
+    if (finding.hook !== void 0 && !finding.hook.external_id && !ctx.appName) {
       errors.push(
         error2(
           target,
@@ -391,7 +423,7 @@ var hookVerifyRule = {
         )
       );
     }
-    if (!finding.defaultHandlerFound) {
+    if (!finding.defaultHandlerFound && !finding.legacyHandlerPattern) {
       errors.push(
         error2(
           target,
@@ -403,20 +435,24 @@ var hookVerifyRule = {
       errors.push(error2(target, messageForIssue(issue)));
     }
     if (errors.length > 0) return errors;
+    const advisories = [];
+    if (finding.legacyHandlerPattern) {
+      advisories.push(warning(target, LEGACY_HANDLER_MIGRATION_HINT));
+    }
     let script = finding.scriptBody ?? "";
     if (ctx.appName) {
       script = script.replaceAll("{{app}}", ctx.appName);
     }
     if (!ctx.api) {
-      return [];
+      return advisories;
     }
     try {
       await ctx.api.compileHook(script);
     } catch (err) {
       const detail = err instanceof ApiError ? err.body.trim() : err instanceof Error ? err.message : String(err);
-      return [error2(target, `Hook failed to compile on the backend: ${detail}`)];
+      return [...advisories, error2(target, `Hook failed to compile on the backend: ${detail}`)];
     }
-    return [];
+    return advisories;
   }
 };
 
@@ -586,21 +622,34 @@ function safePrintLint(warnings, projectRoot) {
     if (process.env.LUMERA_DEBUG) console.error("[lint] print failed:", err);
   }
 }
+async function safeLintPass(label, build) {
+  try {
+    const issues = await build();
+    const errors = issues.filter((issue) => issue.severity === "error");
+    return { issues, errors };
+  } catch (err) {
+    if (process.env.LUMERA_DEBUG) console.error(`[lint] ${label} pass failed:`, err);
+    return null;
+  }
+}
 async function lintCollectionFiles(projectRoot, platformDir, filterName) {
-  const issues = await runLint({ projectRoot, targets: buildCollectionTargets(platformDir, filterName) });
-  const errors = issues.filter((issue) => issue.severity === "error");
-  if (errors.length === 0) return;
-  printLintWarnings(issues, projectRoot);
-  throw new Error(`Found ${errors.length} collection lint error(s)`);
+  const result = await safeLintPass(
+    "collection",
+    async () => runLint({ projectRoot, targets: buildCollectionTargets(platformDir, filterName) })
+  );
+  if (!result || result.errors.length === 0) return;
+  safePrintLint(result.issues, projectRoot);
+  throw new Error(`Found ${result.errors.length} collection lint error(s)`);
 }
 async function lintHookFiles(api, projectRoot, platformDir, appName, filterName) {
-  const targets = buildHookTargets(platformDir, filterName);
-  if (targets.length === 0) return;
-  const issues = await runLint({ projectRoot, targets, api, appName });
-  const errors = issues.filter((issue) => issue.severity === "error");
-  if (errors.length === 0) return;
-  printLintWarnings(issues, projectRoot);
-  throw new Error(`Found ${errors.length} hook lint error(s)`);
+  const result = await safeLintPass("hook", async () => {
+    const targets = buildHookTargets(platformDir, filterName);
+    if (targets.length === 0) return [];
+    return runLint({ projectRoot, targets, api, appName });
+  });
+  if (!result || result.errors.length === 0) return;
+  safePrintLint(result.issues, projectRoot);
+  throw new Error(`Found ${result.errors.length} hook lint error(s)`);
 }
 var PACKAGE_MANAGERS = ["bun", "pnpm", "yarn", "npm"];
 var PACKAGE_MANAGER_VALUE_FLAGS = /* @__PURE__ */ new Set(["--package-manager"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lumerahq/cli",
-  "version": "0.19.9-dev.3",
+  "version": "0.19.10-dev.0",
   "description": "CLI for building and deploying Lumera apps",
   "type": "module",
   "engines": {