keryx 0.2.1 → 0.3.0

package/initializers/actionts.ts

@@ -604,24 +604,7 @@ export class Actions extends Initializer {
   };
 
   async initialize() {
-    // Load framework actions from the package directory
-    const frameworkActions = await globLoader<Action>(
-      path.join(api.packageDir, "actions"),
-    );
-
-    // Load user project actions (if rootDir differs from packageDir)
-    let userActions: Action[] = [];
-    if (api.rootDir !== api.packageDir) {
-      try {
-        userActions = await globLoader<Action>(
-          path.join(api.rootDir, "actions"),
-        );
-      } catch {
-        // user project may not have actions, that's fine
-      }
-    }
-
-    const actions = [...frameworkActions, ...userActions];
+    const actions = await globLoader<Action>(path.join(api.rootDir, "actions"));
 
     for (const a of actions) {
       if (!a.description) a.description = `An Action: ${a.name}`;

package/initializers/swagger.ts

@@ -179,11 +179,8 @@ export class SwaggerInitializer extends Initializer {
     const cacheDir = path.join(api.rootDir, ".cache");
     const cacheFile = path.join(cacheDir, "swagger-schemas.json");
 
-    // Hash action source files to detect changes (scan both packageDir and rootDir)
-    const actionsDirs = [path.join(api.packageDir, "actions")];
-    if (api.rootDir !== api.packageDir) {
-      actionsDirs.push(path.join(api.rootDir, "actions"));
-    }
+    // Hash action source files to detect changes
+    const actionsDirs = [path.join(api.rootDir, "actions")];
     const glob = new Bun.Glob("**/*.ts");
     const hasher = new Bun.CryptoHasher("sha256");
     for (const actionsDir of actionsDirs) {

package/keryx.ts

@@ -19,13 +19,14 @@ program
   .command("new [project-name]")
   .summary("Create a new Keryx project")
   .description("Scaffold a new Keryx application with project boilerplate")
+  .option("-y, --yes", "Skip prompts and use defaults")
   .option("--no-interactive", "Skip prompts and use defaults")
   .option("--no-db", "Skip database setup files")
   .option("--no-example", "Skip example action")
   .action(async (projectName: string | undefined, opts) => {
     let options: ScaffoldOptions;
 
-    if (opts.interactive === false) {
+    if (opts.yes || opts.interactive === false) {
       // --no-interactive: use defaults
       projectName = projectName || "my-keryx-app";
       options = {
@@ -64,22 +65,13 @@ program
     await api.start();
   });
 
-// Load framework actions from the package directory
-const frameworkActions = await globLoader<Action>(
-  path.join(api.packageDir, "actions"),
-);
-
-// Load user project actions (if rootDir differs from packageDir)
-let userActions: Action[] = [];
-if (api.rootDir !== api.packageDir) {
-  try {
-    userActions = await globLoader<Action>(path.join(api.rootDir, "actions"));
-  } catch {
-    // user project may not have actions, that's fine
-  }
+// Load actions from the project directory
+let actions: Action[] = [];
+try {
+  actions = await globLoader<Action>(path.join(api.rootDir, "actions"));
+} catch {
+  // project may not have actions yet
 }
-
-const actions = [...frameworkActions, ...userActions];
 actions.forEach((action) => addActionToProgram(program, action));
 
 program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keryx",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "module": "index.ts",
   "type": "module",
   "license": "MIT",

package/templates/scaffold/keryx.ts.mustache

@@ -20,20 +20,13 @@ program
     await api.start();
   });
 
-// Load framework actions from the package directory
-const frameworkActions = await globLoader<Action>(
-  path.join(api.packageDir, "actions"),
-);
-
-// Load user project actions
-let userActions: Action[] = [];
+// Load actions from the project directory
+let actions: Action[] = [];
 try {
-  userActions = await globLoader<Action>(path.join(api.rootDir, "actions"));
+  actions = await globLoader<Action>(path.join(api.rootDir, "actions"));
 } catch {
-  // user project may not have actions, that's fine
+  // project may not have actions yet
 }
-
-const actions = [...frameworkActions, ...userActions];
 actions.forEach((action) => addActionToProgram(program, action));
 
 program

package/util/scaffold.ts

@@ -199,12 +199,31 @@ export async function scaffoldProject(
     await write("drizzle/.gitkeep", "");
   }
 
+  // --- Built-in actions (always included) ---
+  // Copy status and swagger actions from the framework, adjusting imports
+  const builtinActions = ["status.ts", "swagger.ts"];
+  const actionsDir = path.join(import.meta.dir, "..", "actions");
+  for (const file of builtinActions) {
+    let content = await Bun.file(path.join(actionsDir, file)).text();
+
+    // Rewrite relative imports to package imports
+    content = content.replace(/from ["']\.\.\/api["']/g, 'from "keryx"');
+    content = content.replace(
+      /from ["']\.\.\/classes\/Action["']/g,
+      'from "keryx/classes/Action.ts"',
+    );
+    content = content.replace(
+      /from ["']\.\.\/package\.json["']/g,
+      'from "../package.json"',
+    );
+
+    await write(`actions/${file}`, content);
+  }
+
   // --- Example action ---
 
   if (options.includeExample) {
     await writeTemplate("actions/hello.ts", "hello-action.ts.mustache");
-  } else {
-    await write("actions/.gitkeep", "");
   }
 
   return createdFiles;