@holo-js/cli 0.1.3 → 0.1.5

package/dist/{chunk-VT5IDQG6.mjs → chunk-UZTDQKIY.mjs}

@@ -1,8 +1,7 @@
-#!/usr/bin/env node
 import {
   loadGeneratedProjectRegistry,
   writeGeneratedProjectRegistry
-} from "./chunk-3OTCSFDG.mjs";
+} from "./chunk-MXKNQACM.mjs";
 import {
   COMMAND_FILE_PATTERN,
   MIGRATION_NAME_PATTERN,
@@ -18,15 +17,18 @@ import {
   pathExists,
   readTextFile,
   toPosixPath
-} from "./chunk-66FHW725.mjs";
+} from "./chunk-R6BWRY3E.mjs";
 
 // src/project/discovery.ts
-import { readdir } from "fs/promises";
-import { basename, dirname, extname, join, relative, resolve } from "path";
+import { resolve as resolve2 } from "path";
 import { loadConfigDirectory } from "@holo-js/config";
 import {
   normalizeHoloProjectConfig
 } from "@holo-js/db";
+
+// src/project/discovery-helpers.ts
+import { readdir } from "fs/promises";
+import { basename, dirname, extname, join, relative, resolve } from "path";
 async function collectFiles(root) {
   if (!await pathExists(root)) {
     return [];
@@ -337,23 +339,44 @@ function resolveBroadcastArtifactsPath(config, key) {
   const configuredPaths = config.paths;
   return configuredPaths[key] ?? `server/${key}`;
 }
+function inferMigrationNameFromEntry(entry) {
+  const fileName = basename(entry, extname(entry));
+  return validateMigrationName(
+    fileName,
+    `Registered migration "${entry}" must use a timestamped file name matching YYYY_MM_DD_HHMMSS_description.`
+  );
+}
+function validateMigrationName(name, message) {
+  if (!MIGRATION_NAME_PATTERN.test(name)) {
+    throw new Error(
+      message ?? `Migration name "${name}" must match YYYY_MM_DD_HHMMSS_description.`
+    );
+  }
+  return name;
+}
+
+// src/project/discovery.ts
 async function prepareProjectDiscovery(projectRoot, config = normalizeHoloProjectConfig()) {
   const loadedConfig = await loadConfigDirectory(projectRoot, {
     processEnv: process.env
   });
-  const modelsRoot = resolve(projectRoot, config.paths.models);
-  const migrationsRoot = resolve(projectRoot, config.paths.migrations);
-  const seedersRoot = resolve(projectRoot, config.paths.seeders);
-  const commandsRoot = resolve(projectRoot, config.paths.commands);
-  const jobsRoot = resolve(projectRoot, config.paths.jobs);
-  const eventsRoot = resolve(projectRoot, config.paths.events);
-  const listenersRoot = resolve(projectRoot, config.paths.listeners);
+  const modelsRoot = resolve2(projectRoot, config.paths.models);
+  const migrationsRoot = resolve2(projectRoot, config.paths.migrations);
+  const seedersRoot = resolve2(projectRoot, config.paths.seeders);
+  const commandsRoot = resolve2(projectRoot, config.paths.commands);
+  const jobsRoot = resolve2(projectRoot, config.paths.jobs);
+  const eventsRoot = resolve2(projectRoot, config.paths.events);
+  const listenersRoot = resolve2(projectRoot, config.paths.listeners);
   const broadcastPath = resolveBroadcastArtifactsPath(config, "broadcast");
   const channelsPath = resolveBroadcastArtifactsPath(config, "channels");
-  const broadcastRoot = resolve(projectRoot, broadcastPath);
-  const channelsRoot = resolve(projectRoot, channelsPath);
-  const policiesRoot = resolve(projectRoot, config.paths.authorizationPolicies ?? "server/policies");
-  const abilitiesRoot = resolve(projectRoot, config.paths.authorizationAbilities ?? "server/abilities");
+  const broadcastRoot = resolve2(projectRoot, broadcastPath);
+  const channelsRoot = resolve2(projectRoot, channelsPath);
+  const policiesRoot = resolve2(projectRoot, config.paths.authorizationPolicies ?? "server/policies");
+  const abilitiesRoot = resolve2(projectRoot, config.paths.authorizationAbilities ?? "server/abilities");
+  const generatedSchemaPath = resolve2(projectRoot, config.paths.generatedSchema);
+  if (await pathExists(generatedSchemaPath)) {
+    await importProjectModule(projectRoot, generatedSchemaPath);
+  }
   const [modelFiles, migrationFiles, seederFiles, commandFiles, jobFiles, eventFiles, listenerFiles, broadcastFiles, channelFiles] = await Promise.all([
     collectFiles(modelsRoot),
     collectFiles(migrationsRoot),
@@ -374,8 +397,8 @@ async function prepareProjectDiscovery(projectRoot, config = normalizeHoloProjec
     const relativePath = makeProjectRelativePath(projectRoot, filePath);
     try {
       const moduleValue = await importProjectModule(projectRoot, filePath);
-      const model = resolveNamedExport(moduleValue, isCliModelReference);
-      if (!model) {
+      const exportedModel = resolveNamedExportEntry(moduleValue, isCliModelReference);
+      if (!exportedModel) {
         if (isInactiveGeneratedModelModule(moduleValue)) {
           continue;
         }
@@ -383,8 +406,10 @@ async function prepareProjectDiscovery(projectRoot, config = normalizeHoloProjec
       }
       models.push({
         sourcePath: relativePath,
-        name: model.definition.name,
-        prunable: Boolean(model.definition.prunable)
+        name: exportedModel.value.definition.name,
+        tableName: exportedModel.value.definition.table.tableName,
+        prunable: Boolean(exportedModel.value.definition.prunable),
+        ...exportedModel.exportName === "default" ? {} : { exportName: exportedModel.exportName }
       });
     } catch (error) {
       if (!isMissingGeneratedSchemaModelError(error)) {
@@ -410,15 +435,21 @@ async function prepareProjectDiscovery(projectRoot, config = normalizeHoloProjec
   const seeders = [];
   for (const filePath of seederFiles) {
     const relativePath = makeProjectRelativePath(projectRoot, filePath);
-    const moduleValue = await importProjectModule(projectRoot, filePath);
-    const seeder = resolveNamedExport(moduleValue, isSeederDefinition);
-    if (!seeder) {
-      throw new Error(`Discovered seeder "${relativePath}" does not export a Holo seeder.`);
+    try {
+      const moduleValue = await importProjectModule(projectRoot, filePath);
+      const seeder = resolveNamedExport(moduleValue, isSeederDefinition);
+      if (!seeder) {
+        throw new Error(`Discovered seeder "${relativePath}" does not export a Holo seeder.`);
+      }
+      seeders.push({
+        sourcePath: relativePath,
+        name: seeder.name
+      });
+    } catch (error) {
+      if (!isMissingGeneratedSchemaModelError(error)) {
+        throw error;
+      }
     }
-    seeders.push({
-      sourcePath: relativePath,
-      name: seeder.name
-    });
   }
   assertUniqueEntries("seeder", seeders);
   const commands = [];
@@ -709,7 +740,7 @@ async function discoverAppCommands(projectRoot, config = normalizeHoloProjectCon
     description: entry.description,
     ...entry.usage ? { usage: entry.usage } : {},
     async load() {
-      const moduleValue = await importProjectModule(projectRoot, resolve(projectRoot, entry.sourcePath));
+      const moduleValue = await importProjectModule(projectRoot, resolve2(projectRoot, entry.sourcePath));
       const command = resolveCommandExport(moduleValue);
       if (!command) {
         throw new Error(`Discovered command "${entry.sourcePath}" does not export a Holo command.`);
@@ -745,21 +776,6 @@ async function loadRegisteredMigrations(projectRoot, config) {
   }
   return migrations;
 }
-function inferMigrationNameFromEntry(entry) {
-  const fileName = basename(entry, extname(entry));
-  return validateMigrationName(
-    fileName,
-    `Registered migration "${entry}" must use a timestamped file name matching YYYY_MM_DD_HHMMSS_description.`
-  );
-}
-function validateMigrationName(name, message) {
-  if (!MIGRATION_NAME_PATTERN.test(name)) {
-    throw new Error(
-      message ?? `Migration name "${name}" must match YYYY_MM_DD_HHMMSS_description.`
-    );
-  }
-  return name;
-}
 async function loadRegisteredSeeders(projectRoot, config) {
   const seeders = [];
   for (const entry of config.seeders) {
@@ -774,6 +790,7 @@ async function loadRegisteredSeeders(projectRoot, config) {
 }
 
 export {
+  collectFiles,
   resolveNamedExport,
   resolveNamedExportEntry,
   resolveListenerEventNamesForDiscovery,