arcway 0.1.29 → 0.1.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arcway",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "description": "A convention-based framework for building modular monoliths with strict domain boundaries.",
   "license": "MIT",
   "type": "module",
@@ -137,5 +137,12 @@
     "react-dom": "^19.2.4",
     "storybook": "^10.2.8",
     "vitest": "^4.0.18"
+  },
+  "pnpm": {
+    "onlyBuiltDependencies": [
+      "better-sqlite3",
+      "esbuild",
+      "sharp"
+    ]
   }
 }

package/server/boot/index.js

@@ -29,7 +29,6 @@ async function boot(options) {
   const config = await makeConfig(rootDir, { overrides: options.configOverrides, mode });
 
   const plugins = await createPluginManager(config.plugins, { runLifecycle: false });
-  config.database.pluginMigrations = plugins.migrations();
 
   const infrastructure = await createInfrastructure(config, { runMigrations: true });
   const { db, redis, queue, cache, files, mail, events, log } = infrastructure;

package/server/db/index.js

@@ -6,9 +6,8 @@ import { loadModule } from '../module-loader.js';
 import { introspectSchema, generateSchemaMarkdown } from './schema/index.js';
 
 class MigrationSource {
-  constructor(directory, pluginMigrations = []) {
+  constructor(directory) {
     this.directory = directory;
-    this.pluginMigrations = pluginMigrations;
     this.migrationPaths = new Map();
   }
   async getMigrations() {
@@ -23,15 +22,6 @@ class MigrationSource {
       }
     }
 
-    for (const plugin of this.pluginMigrations ?? []) {
-      const files = await discoverFiles(plugin.dir, { skipUnderscore: false });
-      for (const file of files) {
-        const name = `plugins/${plugin.pluginId}/${file.name}`;
-        migrations.push(name);
-        this.migrationPaths.set(name, file.filePath);
-      }
-    }
-
     return migrations;
   }
   getMigrationName(migration) {
@@ -98,10 +88,9 @@ async function createDB(config, { log } = {}) {
 
   db.runMigrations = async () => {
     const migrationsDir = config.dir;
-    const pluginMigrations = config.pluginMigrations ?? [];
-    if (!migrationsDir && pluginMigrations.length === 0) return;
+    if (!migrationsDir) return;
     const [batch, migrations] = await db.migrate.latest({
-      migrationSource: new MigrationSource(migrationsDir, pluginMigrations),
+      migrationSource: new MigrationSource(migrationsDir),
     });
     if (migrations.length > 0) {
       log?.info(`Migrations (batch ${batch}): ${migrations.join(', ')}`);
@@ -112,12 +101,11 @@ async function createDB(config, { log } = {}) {
 
   db.runRollback = async () => {
     const migrationsDir = config.dir;
-    const pluginMigrations = config.pluginMigrations ?? [];
-    if (!migrationsDir && pluginMigrations.length === 0) {
+    if (!migrationsDir) {
       throw new Error('No migrations dir configured');
     }
     const [batch, entries] = await db.migrate.rollback({
-      migrationSource: new MigrationSource(migrationsDir, pluginMigrations),
+      migrationSource: new MigrationSource(migrationsDir),
     });
     return { batch, log: entries };
   };

package/server/plugins/discovery.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { discoverPackageDirectories } from '../discovery.js';
+import { discoverModules, discoverPackageDirectories } from '../discovery.js';
 import { loadModule } from '../module-loader.js';
 import { validateManifest } from './manifest.js';
 
@@ -30,6 +30,19 @@ function getManifest(module, manifestPath) {
   return manifest;
 }
 
+// Load every `<dir>/<name>.js` and key the default export by file basename.
+// Used for the capabilities/ and hooks/ folder conventions.
+async function loadConventionModules(dir, label) {
+  if (!(await exists(dir))) return {};
+  const modules = await discoverModules(dir, { label: `plugin ${label}` });
+  const map = {};
+  for (const entry of modules) {
+    const name = path.basename(entry.name, path.extname(entry.name));
+    map[name] = entry.module.default ?? entry.module;
+  }
+  return map;
+}
+
 async function loadPluginPackage(packageDir) {
   const packageJsonPath = path.join(packageDir, 'package.json');
   if (!(await exists(packageJsonPath))) {
@@ -50,14 +63,24 @@ async function loadPluginPackage(packageDir) {
   } else if (await exists(pluginJson)) {
     manifestPath = pluginJson;
     rawManifest = await readJson(pluginJson, 'plugin.json');
+  } else if (packageJson.arcway && typeof packageJson.arcway === 'object') {
+    // Metadata-only plugin: the manifest lives in package.json's "arcway" block,
+    // and code is discovered by folder convention (routes/, jobs/, capabilities/, hooks/).
+    manifestPath = packageJsonPath;
+    rawManifest = {};
   } else {
-    throw new Error(`Plugin package at ${packageDir} must include plugin.js or plugin.json`);
+    // A package without plugin.js/plugin.json and without an "arcway" block is
+    // not a plugin — skip it rather than failing discovery.
+    return null;
   }
 
+  // package.json "arcway" supplies the base metadata; an explicit plugin.js/plugin.json
+  // manifest (legacy) wins on conflict so existing plugins behave identically.
   const manifest = validateManifest(
     {
       version: packageJson.version,
       name: packageJson.name,
+      ...packageJson.arcway,
       ...rawManifest,
     },
     { packageName: packageJson.name },
@@ -65,10 +88,6 @@ async function loadPluginPackage(packageDir) {
 
   const routesDir = path.join(packageDir, 'routes');
   const jobsDir = path.join(packageDir, 'jobs');
-  const migrationsDir =
-    typeof manifest.contributes.migrations === 'string'
-      ? path.join(packageDir, manifest.contributes.migrations)
-      : path.join(packageDir, 'migrations');
 
   return {
     id: manifest.id,
@@ -79,7 +98,8 @@ async function loadPluginPackage(packageDir) {
     manifestPath,
     routesDir: (await exists(routesDir)) ? routesDir : null,
     jobsDir: (await exists(jobsDir)) ? jobsDir : null,
-    migrationsDir: (await exists(migrationsDir)) ? migrationsDir : null,
+    capabilities: await loadConventionModules(path.join(packageDir, 'capabilities'), 'capability'),
+    hooks: await loadConventionModules(path.join(packageDir, 'hooks'), 'lifecycle hook'),
   };
 }
 
@@ -89,11 +109,12 @@ async function discoverPlugins(dirs) {
 
   for (const dir of dirs ?? []) {
     const packages = await discoverPackageDirectories(dir, {
-      markerFiles: ['plugin.js', 'plugin.json'],
+      markerFiles: ['package.json'],
       label: 'plugin',
     });
     for (const entry of packages) {
       const plugin = await loadPluginPackage(entry.dir);
+      if (!plugin) continue;
       if (seen.has(plugin.id)) {
         throw new Error(
           `Duplicate plugin id ${plugin.id} in ${seen.get(plugin.id)} and ${plugin.dir}`,

package/server/plugins/manager.js

@@ -19,6 +19,7 @@ function pluginEnabledByDefault(plugin, enablements) {
 
 function capabilityFactory(plugin, capability) {
   return (
+    plugin.capabilities?.[capability] ??
     plugin.module.capabilities?.[capability] ??
     plugin.module.default?.capabilities?.[capability] ??
     plugin.module[`create${capability[0]?.toUpperCase() ?? ''}${capability.slice(1)}`]
@@ -132,16 +133,6 @@ class PluginManager {
     return jobs;
   }
 
-  migrations() {
-    return this.enabledPlugins
-      .filter((plugin) => plugin.migrationsDir)
-      .map((plugin) => ({
-        pluginId: plugin.id,
-        dir: plugin.migrationsDir,
-        contributes: plugin.manifest.contributes.migrations,
-      }));
-  }
-
   #rebuildGraph() {
     const providers = buildProviderMap(this.plugins);
     for (const plugin of this.plugins) {
@@ -190,7 +181,7 @@ class PluginManager {
   }
 
   async #runLifecycle(plugin, name) {
-    const hook = plugin.manifest.lifecycle?.[name];
+    const hook = plugin.hooks?.[name] ?? plugin.manifest.lifecycle?.[name];
     if (!hook) return;
     const fn =
       typeof hook === 'function' ? hook : (plugin.module[hook] ?? plugin.module.default?.[hook]);

package/server/plugins/manifest.js

@@ -30,7 +30,6 @@ function normalizeContributes(value) {
     tools: value.tools ?? [],
     routes: value.routes ?? [],
     jobs: value.jobs ?? [],
-    migrations: value.migrations,
     ui: value.ui,
   };
 }