@holo-js/cli 0.1.4 → 0.1.6

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,

package/dist/{config-LS5USBRB.mjs → config-5JSC6KJG.mjs}

@@ -7,11 +7,11 @@ import {
   serializeDatabaseConfig,
   serializeProjectConfig,
   writeProjectConfig
-} from "./chunk-GSQ3HTRO.mjs";
-import "./chunk-H7TJ4FB3.mjs";
+} from "./chunk-5BLEC66P.mjs";
+import "./chunk-MXKNQACM.mjs";
 import {
   readTextFile
-} from "./chunk-G5ADO27Q.mjs";
+} from "./chunk-R6BWRY3E.mjs";
 export {
   defaultProjectConfig,
   ensureGeneratedSchemaPlaceholder,

package/dist/{dev-LZ3O2E3U.mjs → dev-F6QUWNCR.mjs}

@@ -13,16 +13,16 @@ import {
   runProjectLifecycleScript,
   runProjectPrepare,
   toPosixSlashes
-} from "./chunk-ZLRO7HXY.mjs";
+} from "./chunk-ODJA3TFG.mjs";
 import {
   hasProjectDependency
-} from "./chunk-CUL4RJTG.mjs";
+} from "./chunk-F4MT6GBK.mjs";
 import "./chunk-D7O4SU6N.mjs";
-import "./chunk-S7P7EBM3.mjs";
-import "./chunk-MZXN2YMI.mjs";
-import "./chunk-GSQ3HTRO.mjs";
-import "./chunk-H7TJ4FB3.mjs";
-import "./chunk-G5ADO27Q.mjs";
+import "./chunk-UZTDQKIY.mjs";
+import "./chunk-USACXIIB.mjs";
+import "./chunk-5BLEC66P.mjs";
+import "./chunk-MXKNQACM.mjs";
+import "./chunk-R6BWRY3E.mjs";
 export {
   collectDirectoryTree,
   collectDiscoveryWatchRoots,

package/dist/{discovery-GBLAUTXS.mjs → discovery-JLT2EOGH.mjs}

@@ -10,9 +10,9 @@ import {
   resolveListenerEventNamesFromSource,
   resolveNamedExport,
   resolveNamedExportEntry
-} from "./chunk-S7P7EBM3.mjs";
-import "./chunk-H7TJ4FB3.mjs";
-import "./chunk-G5ADO27Q.mjs";
+} from "./chunk-UZTDQKIY.mjs";
+import "./chunk-MXKNQACM.mjs";
+import "./chunk-R6BWRY3E.mjs";
 export {
   collectImportedBindingsBySource,
   discoverAppCommands,

package/dist/{generators-DSN4GWJI.mjs → generators-WVKJLAYB.mjs}

@@ -1,31 +1,32 @@
+import {
+  resolveStringFlag
+} from "./chunk-5EU32E7X.mjs";
+import {
+  runProjectPrepare
+} from "./chunk-ODJA3TFG.mjs";
+import "./chunk-F4MT6GBK.mjs";
 import {
   hasRegisteredCreateTableMigration,
   hasRegisteredMigrationSlug,
   nextMigrationTemplate
-} from "./chunk-Q5F6C2D4.mjs";
-import {
-  resolveStringFlag
-} from "./chunk-JX2ZH6XY.mjs";
+} from "./chunk-BAFQ2GOA.mjs";
 import {
   writeLine
 } from "./chunk-ZXDU7RHU.mjs";
 import {
   ensureAbsent,
   fileExists
-} from "./chunk-EUIVXVJL.mjs";
-import {
-  runProjectPrepare
-} from "./chunk-ZLRO7HXY.mjs";
-import "./chunk-CUL4RJTG.mjs";
+} from "./chunk-57SJ566R.mjs";
 import "./chunk-D7O4SU6N.mjs";
 import {
+  collectFiles,
   prepareProjectDiscovery
-} from "./chunk-S7P7EBM3.mjs";
-import "./chunk-MZXN2YMI.mjs";
+} from "./chunk-UZTDQKIY.mjs";
+import "./chunk-USACXIIB.mjs";
 import {
   ensureGeneratedSchemaPlaceholder,
   ensureProjectConfig
-} from "./chunk-GSQ3HTRO.mjs";
+} from "./chunk-5BLEC66P.mjs";
 import {
   ensureSuffix,
   loadGeneratedProjectRegistry,
@@ -47,22 +48,127 @@ import {
   toKebabCase,
   toPascalCase,
   toSnakeCase
-} from "./chunk-H7TJ4FB3.mjs";
+} from "./chunk-MXKNQACM.mjs";
 import {
   makeProjectRelativePath,
   resolveDefaultArtifactPath,
   writeTextFile
-} from "./chunk-G5ADO27Q.mjs";
+} from "./chunk-R6BWRY3E.mjs";
 
 // src/generators.ts
 import { createHash } from "crypto";
 import { readFile } from "fs/promises";
-import { resolve } from "path";
+import { basename, extname, resolve } from "path";
 import { normalizeMigrationSlug } from "@holo-js/db";
 var MAIL_VIEW_SCAFFOLDING_UNAVAILABLE_MESSAGE = 'View-backed mail scaffolding requires a renderView runtime binding, which the first-party app scaffolds do not configure yet. Use "--markdown" instead.';
 function hasRegisteredModelName(registry, modelName) {
   return Boolean(registry?.models.some((entry) => entry.name === modelName));
 }
+function findRegisteredModelByTableName(registry, tableName) {
+  return registry?.models.find((entry) => entry.tableName === tableName);
+}
+async function findGeneratedModelSourceByTableName(projectRoot, modelsPath, tableName) {
+  const files = await collectFiles(resolve(projectRoot, modelsPath));
+  const generatedTableReference = tableName;
+  for (const filePath of files) {
+    const contents = await readFile(filePath, "utf8");
+    if (containsDefineModelTableReference(contents, generatedTableReference)) {
+      return basename(filePath, extname(filePath));
+    }
+  }
+  return void 0;
+}
+function containsDefineModelTableReference(contents, tableName) {
+  let index = 0;
+  while (index < contents.length) {
+    const nextReference = contents.indexOf("defineModel", index);
+    if (nextReference === -1) return false;
+    if (isInsideComment(contents, nextReference)) {
+      index = nextReference + "defineModel".length;
+      continue;
+    }
+    const before = contents[nextReference - 1];
+    const after = contents[nextReference + "defineModel".length];
+    const hasIdentifierBoundary = !isIdentifierCharacter(before) && !isIdentifierCharacter(after);
+    if (!hasIdentifierBoundary) {
+      index = nextReference + "defineModel".length;
+      continue;
+    }
+    const openParenIndex = skipWhitespace(contents, nextReference + "defineModel".length);
+    if (contents[openParenIndex] !== "(") {
+      index = nextReference + "defineModel".length;
+      continue;
+    }
+    const firstArgumentIndex = skipWhitespace(contents, openParenIndex + 1);
+    const quote = contents[firstArgumentIndex];
+    if (quote !== "'" && quote !== '"' && quote !== "`") {
+      index = firstArgumentIndex;
+      continue;
+    }
+    const literal = readStringLiteral(contents, firstArgumentIndex, quote);
+    if (literal?.value === tableName) return true;
+    index = literal?.endIndex ?? firstArgumentIndex + 1;
+  }
+  return false;
+}
+function isInsideComment(contents, position) {
+  let index = 0;
+  while (index < position) {
+    const current = contents[index];
+    const next = contents[index + 1];
+    if (current === "'" || current === '"' || current === "`") {
+      index = readStringLiteral(contents, index, current)?.endIndex ?? index + 1;
+      continue;
+    }
+    if (current === "/" && next === "/") {
+      const end = contents.indexOf("\n", index + 2);
+      if (end === -1 || end >= position) return true;
+      index = end + 1;
+      continue;
+    }
+    if (current === "/" && next === "*") {
+      const end = contents.indexOf("*/", index + 2);
+      if (end === -1 || end + 2 >= position) return true;
+      index = end + 2;
+      continue;
+    }
+    index += 1;
+  }
+  return false;
+}
+function isIdentifierCharacter(value) {
+  return typeof value === "string" && /[$\w]/.test(value);
+}
+function skipWhitespace(contents, startIndex) {
+  let index = startIndex;
+  while (/\s/.test(contents[index] ?? "")) {
+    index += 1;
+  }
+  return index;
+}
+function readStringLiteral(contents, startIndex, quote) {
+  let value = "";
+  let index = startIndex + 1;
+  while (index < contents.length) {
+    const current = contents[index];
+    if (current === "\\") {
+      const escaped = contents[index + 1];
+      if (typeof escaped === "string") {
+        value += escaped;
+        index += 2;
+        continue;
+      }
+    }
+    if (current === quote) {
+      return { value, endIndex: index + 1 };
+    }
+    if (typeof current === "string") {
+      value += current;
+    }
+    index += 1;
+  }
+  return void 0;
+}
 function hasRegisteredJobName(registry, jobName) {
   return Boolean(registry?.jobs.some((entry) => entry.name === jobName));
 }
@@ -128,6 +234,7 @@ async function resolveProjectMailViewFramework(projectRoot) {
 }
 async function runMakeModel(io, projectRoot, input) {
   const project = await ensureProjectConfig(projectRoot);
+  const generatedSchemaFilePath = await ensureGeneratedSchemaPlaceholder(projectRoot, project.config);
   const registry = await loadGeneratedProjectRegistry(projectRoot) ?? await prepareProjectDiscovery(projectRoot, project.config);
   const requestedName = String(input.args[0] ?? "");
   const options = {
@@ -146,7 +253,6 @@ async function runMakeModel(io, projectRoot, input) {
   const seederFilePath = resolveArtifactPath(projectRoot, project.config.paths.seeders, seederInfo.directory, `${seederInfo.baseName}.ts`);
   const factoryInfo = resolveNameInfo(`${requestedName}Factory`, { suffix: "Factory" });
   const factoryFilePath = resolveArtifactPath(projectRoot, project.config.paths.factories, factoryInfo.directory, `${factoryInfo.baseName}.ts`);
-  const generatedSchemaFilePath = await ensureGeneratedSchemaPlaceholder(projectRoot, project.config);
   if (await fileExists(modelFilePath) || hasRegisteredModelName(registry, nameInfo.baseName)) {
     throw new Error(`Model with the same name already exists: ${nameInfo.baseName}.`);
   }
@@ -156,6 +262,18 @@ async function runMakeModel(io, projectRoot, input) {
       throw new Error(`A migration for table "${tableName}" already exists.`);
     }
   }
+  const existingTableModel = findRegisteredModelByTableName(registry, tableName);
+  if (existingTableModel) {
+    throw new Error(`Discovered duplicate model "${existingTableModel.name}" for table "${tableName}".`);
+  }
+  const existingGeneratedModelName = await findGeneratedModelSourceByTableName(
+    projectRoot,
+    project.config.paths.models,
+    tableName
+  );
+  if (existingGeneratedModelName) {
+    throw new Error(`Discovered duplicate model "${existingGeneratedModelName}" for table "${tableName}".`);
+  }
   await ensureAbsent(modelFilePath);
   if (options.observer) {
     await ensureAbsent(observerFilePath);

package/dist/index.d.ts

@@ -19,7 +19,7 @@ interface HoloAppCommand {
     readonly usage?: string;
     run(context: CommandExecutionContext): unknown | Promise<unknown>;
 }
-declare function defineCommand<TCommand extends HoloAppCommand>(command: TCommand): TCommand;
+declare function defineCommand(command: HoloAppCommand): Readonly<HoloAppCommand>;
 
 type IoStreams = {
     readonly cwd: string;