@famgia/omnify-cli 0.0.144 → 0.0.146

package/dist/index.js

@@ -105,7 +105,8 @@ async function resolveConfig(userConfig, configPath) {
     plugins,
     verbose: userConfig.verbose ?? false,
     lockFilePath: userConfig.lockFilePath ?? ".omnify.lock",
-    ...userConfig.locale && { locale: userConfig.locale }
+    ...userConfig.locale && { locale: userConfig.locale },
+    ...userConfig.additionalSchemaPaths && { additionalSchemaPaths: userConfig.additionalSchemaPaths }
   };
   return result;
 }
@@ -708,8 +709,9 @@ function registerInitCommand(program) {
 }
 
 // src/commands/validate.ts
+import { existsSync as existsSync4 } from "fs";
 import { resolve as resolve4, dirname as dirname2 } from "path";
-import { loadSchemas, validateSchemas, OmnifyError as OmnifyError2 } from "@famgia/omnify-core";
+import { loadSchemas, mergePartialSchemas, validateSchemas, OmnifyError as OmnifyError2 } from "@famgia/omnify-core";
 async function runValidate(options) {
   logger.setVerbose(options.verbose ?? false);
   logger.header("Validating Schemas");
@@ -722,14 +724,38 @@ async function runValidate(options) {
   const schemaPath = resolve4(rootDir, config.schemasDir);
   logger.step(`Loading schemas from ${schemaPath}`);
   logger.timing("Schema load start");
-  const schemas = await loadSchemas(schemaPath);
-  const schemaCount = Object.keys(schemas).length;
+  let schemas = await loadSchemas(schemaPath);
+  logger.debug(`Found ${Object.keys(schemas).length} schema(s) in main directory`);
+  const additionalPaths = config.additionalSchemaPaths ?? [];
+  let hasPackageSchemas = false;
+  if (additionalPaths.length > 0) {
+    logger.step(`Loading schemas from ${additionalPaths.length} additional path(s)`);
+    for (const entry of additionalPaths) {
+      const absolutePath = resolve4(rootDir, entry.path);
+      logger.debug(`  Checking: ${entry.path} \u2192 ${absolutePath}`);
+      if (existsSync4(absolutePath)) {
+        const packageSchemas = await loadSchemas(absolutePath, { skipPartialResolution: true });
+        const count = Object.keys(packageSchemas).filter((k) => !k.startsWith("__partial__")).length;
+        const partialCount = Object.keys(packageSchemas).filter((k) => k.startsWith("__partial__")).length;
+        const nsInfo = entry.namespace ? ` [${entry.namespace}]` : "";
+        logger.info(`  \u2022 ${entry.path}${nsInfo}: ${count} schema(s)${partialCount > 0 ? ` + ${partialCount} partial(s)` : ""}`);
+        schemas = { ...packageSchemas, ...schemas };
+        hasPackageSchemas = true;
+      } else {
+        logger.warn(`  \u2022 ${entry.path}: directory not found (skipped)`);
+      }
+    }
+  }
+  if (hasPackageSchemas) {
+    schemas = mergePartialSchemas(schemas);
+  }
   logger.timing("Schemas loaded");
+  const schemaCount = Object.keys(schemas).length;
   if (schemaCount === 0) {
     logger.warn("No schema files found");
     return;
   }
-  logger.debug(`Found ${schemaCount} schema(s)`);
+  logger.debug(`Total: ${schemaCount} schema(s)`);
   logger.step("Validating schemas...");
   logger.timing("Validation start");
   const result = validateSchemas(schemas);
@@ -765,8 +791,9 @@ function registerValidateCommand(program) {
 }
 
 // src/commands/diff.ts
+import { existsSync as existsSync5 } from "fs";
 import { resolve as resolve5, dirname as dirname3 } from "path";
-import { loadSchemas as loadSchemas2, validateSchemas as validateSchemas2, OmnifyError as OmnifyError3 } from "@famgia/omnify-core";
+import { loadSchemas as loadSchemas2, mergePartialSchemas as mergePartialSchemas2, validateSchemas as validateSchemas2, OmnifyError as OmnifyError3 } from "@famgia/omnify-core";
 
 // src/operations/diff.ts
 import {
@@ -805,13 +832,37 @@ async function runDiff(options) {
   requireDevUrl(config);
   const schemaPath = resolve5(rootDir, config.schemasDir);
   logger.step(`Loading schemas from ${schemaPath}`);
-  const schemas = await loadSchemas2(schemaPath);
+  let schemas = await loadSchemas2(schemaPath);
+  logger.debug(`Found ${Object.keys(schemas).length} schema(s) in main directory`);
+  const additionalPaths = config.additionalSchemaPaths ?? [];
+  let hasPackageSchemas = false;
+  if (additionalPaths.length > 0) {
+    logger.step(`Loading schemas from ${additionalPaths.length} additional path(s)`);
+    for (const entry of additionalPaths) {
+      const absolutePath = resolve5(rootDir, entry.path);
+      logger.debug(`  Checking: ${entry.path} \u2192 ${absolutePath}`);
+      if (existsSync5(absolutePath)) {
+        const packageSchemas = await loadSchemas2(absolutePath, { skipPartialResolution: true });
+        const count = Object.keys(packageSchemas).filter((k) => !k.startsWith("__partial__")).length;
+        const partialCount = Object.keys(packageSchemas).filter((k) => k.startsWith("__partial__")).length;
+        const nsInfo = entry.namespace ? ` [${entry.namespace}]` : "";
+        logger.info(`  \u2022 ${entry.path}${nsInfo}: ${count} schema(s)${partialCount > 0 ? ` + ${partialCount} partial(s)` : ""}`);
+        schemas = { ...packageSchemas, ...schemas };
+        hasPackageSchemas = true;
+      } else {
+        logger.warn(`  \u2022 ${entry.path}: directory not found (skipped)`);
+      }
+    }
+  }
+  if (hasPackageSchemas) {
+    schemas = mergePartialSchemas2(schemas);
+  }
   const schemaCount = Object.keys(schemas).length;
   if (schemaCount === 0) {
     logger.warn("No schema files found");
     return;
   }
-  logger.debug(`Found ${schemaCount} schema(s)`);
+  logger.debug(`Total: ${schemaCount} schema(s)`);
   logger.step("Validating schemas...");
   const validationResult = validateSchemas2(schemas);
   if (!validationResult.valid) {
@@ -869,11 +920,11 @@ function registerDiffCommand(program) {
 }
 
 // src/commands/generate.ts
-import { existsSync as existsSync5, mkdirSync as mkdirSync3, writeFileSync as writeFileSync4, readdirSync as readdirSync2, readFileSync as readFileSync3 } from "fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync3, writeFileSync as writeFileSync4, readdirSync as readdirSync2 } from "fs";
 import { resolve as resolve7, dirname as dirname5, relative } from "path";
 import {
   loadSchemas as loadSchemas3,
-  mergePartialSchemas,
+  mergePartialSchemas as mergePartialSchemas3,
   validateSchemas as validateSchemas3,
   OmnifyError as OmnifyError4,
   PluginManager,
@@ -903,7 +954,7 @@ import {
 import { generateTypeScript, copyStubs, generateAIGuides as generateTypescriptAIGuides, shouldGenerateAIGuides as shouldGenerateTypescriptAIGuides } from "@famgia/omnify-typescript";
 
 // src/guides/index.ts
-import { existsSync as existsSync4, writeFileSync as writeFileSync3, mkdirSync as mkdirSync2, readdirSync, readFileSync as readFileSync2 } from "fs";
+import { existsSync as existsSync6, writeFileSync as writeFileSync3, mkdirSync as mkdirSync2, readdirSync, readFileSync as readFileSync2 } from "fs";
 import { resolve as resolve6, dirname as dirname4, join } from "path";
 import "url";
 var CLAUDE_MD = `# Omnify Project
@@ -968,19 +1019,19 @@ function copyOmnifyGuides(rootDir) {
   for (const pkgPath of omnifyPkgPaths) {
     if (pkgPath.includes("*")) {
       const parentDir = dirname4(dirname4(pkgPath));
-      if (existsSync4(parentDir)) {
+      if (existsSync6(parentDir)) {
         const entries = readdirSync(parentDir);
         for (const entry of entries) {
           if (entry.startsWith("@famgia+omnify@")) {
             const testPath = join(parentDir, entry, "node_modules", "@famgia", "omnify", "stubs", "ai-guides", "omnify");
-            if (existsSync4(testPath)) {
+            if (existsSync6(testPath)) {
               stubsDir = testPath;
               break;
             }
           }
         }
       }
-    } else if (existsSync4(pkgPath)) {
+    } else if (existsSync6(pkgPath)) {
       stubsDir = pkgPath;
       break;
     }
@@ -989,7 +1040,7 @@ function copyOmnifyGuides(rootDir) {
     try {
       const omnifyPath = dirname4(__require.resolve("@famgia/omnify/package.json", { paths: [rootDir] }));
       const testPath = join(omnifyPath, "stubs", "ai-guides", "omnify");
-      if (existsSync4(testPath)) {
+      if (existsSync6(testPath)) {
         stubsDir = testPath;
       }
     } catch {
@@ -1013,7 +1064,7 @@ function copyOmnifyGuides(rootDir) {
 function generateAIGuides(rootDir, _plugins) {
   let filesWritten = 0;
   const claudeMdPath = resolve6(rootDir, "CLAUDE.md");
-  if (!existsSync4(claudeMdPath)) {
+  if (!existsSync6(claudeMdPath)) {
     writeFileSync3(claudeMdPath, CLAUDE_MD);
     filesWritten++;
   }
@@ -1022,33 +1073,12 @@ function generateAIGuides(rootDir, _plugins) {
 }
 
 // src/commands/generate.ts
-async function loadRegisteredSchemaPaths(rootDir) {
-  const schemaPathsFile = resolve7(rootDir, "storage/omnify/schema-paths.json");
-  logger.debug(`Checking for registered schema paths at: ${schemaPathsFile}`);
-  if (!existsSync5(schemaPathsFile)) {
-    logger.debug("No registered schema paths file found");
-    return [];
-  }
-  try {
-    const content = readFileSync3(schemaPathsFile, "utf-8");
-    const data = JSON.parse(content);
-    if (!data.paths || data.paths.length === 0) {
-      logger.debug("No paths defined in schema-paths.json");
-      return [];
-    }
-    logger.debug(`Found ${data.paths.length} registered schema path(s) in schema-paths.json`);
-    return data.paths;
-  } catch (error) {
-    logger.warn(`Could not read schema-paths.json: ${error.message}`);
-    return [];
-  }
-}
 function hasPluginGenerators(plugins) {
   return plugins.some((p) => p.generators && p.generators.length > 0);
 }
 function getExistingMigrationTables(migrationsDir) {
   const existingTables = /* @__PURE__ */ new Set();
-  if (!existsSync5(migrationsDir)) {
+  if (!existsSync7(migrationsDir)) {
     return existingTables;
   }
   try {
@@ -1243,11 +1273,11 @@ function writeGeneratorOutputs(outputs, rootDir) {
   for (const output of outputs) {
     const filePath = resolve7(rootDir, output.path);
     const dir = dirname5(filePath);
-    if (!existsSync5(dir)) {
+    if (!existsSync7(dir)) {
       mkdirSync3(dir, { recursive: true });
       logger.debug(`Created directory: ${dir}`);
     }
-    if (output.skipIfExists && existsSync5(filePath)) {
+    if (output.skipIfExists && existsSync7(filePath)) {
       logger.debug(`Skipped (exists): ${output.path}`);
       continue;
     }
@@ -1308,7 +1338,7 @@ function runDirectGeneration(schemas, config, rootDir, options, changes) {
   if (!options.typesOnly && config.output.laravel) {
     logger.step("Generating Laravel migrations...");
     const migrationsDir = resolve7(rootDir, config.output.laravel.migrationsPath);
-    if (!existsSync5(migrationsDir)) {
+    if (!existsSync7(migrationsDir)) {
       mkdirSync3(migrationsDir, { recursive: true });
       logger.debug(`Created directory: ${migrationsDir}`);
     }
@@ -1353,10 +1383,10 @@ function runDirectGeneration(schemas, config, rootDir, options, changes) {
     const baseModelsPath = config.output.laravel.baseModelsPath ?? `${modelsPath}/OmnifyBase`;
     const modelsDir = resolve7(rootDir, modelsPath);
     const baseModelsDir = resolve7(rootDir, baseModelsPath);
-    if (!existsSync5(modelsDir)) {
+    if (!existsSync7(modelsDir)) {
       mkdirSync3(modelsDir, { recursive: true });
     }
-    if (!existsSync5(baseModelsDir)) {
+    if (!existsSync7(baseModelsDir)) {
       mkdirSync3(baseModelsDir, { recursive: true });
     }
     const providersPath = config.output.laravel.providersPath ?? "app/Providers";
@@ -1369,10 +1399,10 @@ function runDirectGeneration(schemas, config, rootDir, options, changes) {
     for (const model of models) {
       const filePath = resolve7(rootDir, getModelPath(model));
       const fileDir = dirname5(filePath);
-      if (!existsSync5(fileDir)) {
+      if (!existsSync7(fileDir)) {
         mkdirSync3(fileDir, { recursive: true });
       }
-      if (!model.overwrite && existsSync5(filePath)) {
+      if (!model.overwrite && existsSync7(filePath)) {
         logger.debug(`Skipped (exists): ${getModelPath(model)}`);
         continue;
       }
@@ -1386,7 +1416,7 @@ function runDirectGeneration(schemas, config, rootDir, options, changes) {
     logger.step("Generating Laravel factories...");
     const factoriesPath = config.output.laravel.factoriesPath;
     const factoriesDir = resolve7(rootDir, factoriesPath);
-    if (!existsSync5(factoriesDir)) {
+    if (!existsSync7(factoriesDir)) {
       mkdirSync3(factoriesDir, { recursive: true });
     }
     const factories = generateFactories(schemas, {
@@ -1395,10 +1425,10 @@ function runDirectGeneration(schemas, config, rootDir, options, changes) {
     for (const factory of factories) {
       const filePath = resolve7(rootDir, getFactoryPath(factory));
       const fileDir = dirname5(filePath);
-      if (!existsSync5(fileDir)) {
+      if (!existsSync7(fileDir)) {
         mkdirSync3(fileDir, { recursive: true });
       }
-      if (!factory.overwrite && existsSync5(filePath)) {
+      if (!factory.overwrite && existsSync7(filePath)) {
         logger.debug(`Skipped (exists): ${getFactoryPath(factory)}`);
         continue;
       }
@@ -1415,11 +1445,11 @@ function runDirectGeneration(schemas, config, rootDir, options, changes) {
     const schemasDir = resolve7(basePath, tsConfig.schemasDir ?? "schemas");
     const enumDir = resolve7(basePath, tsConfig.enumDir ?? "enum");
     const enumImportPrefix = relative(schemasDir, enumDir).replace(/\\/g, "/");
-    if (!existsSync5(schemasDir)) {
+    if (!existsSync7(schemasDir)) {
       mkdirSync3(schemasDir, { recursive: true });
       logger.debug(`Created directory: ${schemasDir}`);
     }
-    if (!existsSync5(enumDir)) {
+    if (!existsSync7(enumDir)) {
       mkdirSync3(enumDir, { recursive: true });
       logger.debug(`Created directory: ${enumDir}`);
     }
@@ -1437,10 +1467,10 @@ function runDirectGeneration(schemas, config, rootDir, options, changes) {
       const outputDir = file.category === "enum" ? enumDir : schemasDir;
       const filePath = resolve7(outputDir, file.filePath);
       const fileDir = dirname5(filePath);
-      if (!existsSync5(fileDir)) {
+      if (!existsSync7(fileDir)) {
         mkdirSync3(fileDir, { recursive: true });
       }
-      if (!file.overwrite && existsSync5(filePath)) {
+      if (!file.overwrite && existsSync7(filePath)) {
         logger.debug(`Skipped (exists): ${file.filePath}`);
         continue;
       }
@@ -1477,18 +1507,19 @@ async function runGenerate(options) {
   logger.step(`Loading schemas from ${schemaPath}`);
   let schemas = await loadSchemas3(schemaPath);
   logger.debug(`Found ${Object.keys(schemas).length} schema(s) in main directory`);
-  const additionalPaths = await loadRegisteredSchemaPaths(rootDir);
+  const additionalPaths = config.additionalSchemaPaths ?? [];
   let hasPackageSchemas = false;
   if (additionalPaths.length > 0) {
-    logger.step(`Loading schemas from ${additionalPaths.length} registered path(s)`);
+    logger.step(`Loading schemas from ${additionalPaths.length} additional path(s)`);
     for (const entry of additionalPaths) {
       const absolutePath = resolve7(rootDir, entry.path);
       logger.debug(`  Checking: ${entry.path} \u2192 ${absolutePath}`);
-      if (existsSync5(absolutePath)) {
+      if (existsSync7(absolutePath)) {
         const packageSchemas = await loadSchemas3(absolutePath, { skipPartialResolution: true });
         const count = Object.keys(packageSchemas).filter((k) => !k.startsWith("__partial__")).length;
         const partialCount = Object.keys(packageSchemas).filter((k) => k.startsWith("__partial__")).length;
-        logger.info(`  \u2022 ${entry.path}: ${count} schema(s)${partialCount > 0 ? ` + ${partialCount} partial(s)` : ""}`);
+        const nsInfo = entry.namespace ? ` [${entry.namespace}]` : "";
+        logger.info(`  \u2022 ${entry.path}${nsInfo}: ${count} schema(s)${partialCount > 0 ? ` + ${partialCount} partial(s)` : ""}`);
         schemas = { ...packageSchemas, ...schemas };
         hasPackageSchemas = true;
       } else {
@@ -1498,7 +1529,7 @@ async function runGenerate(options) {
     }
   }
   if (hasPackageSchemas) {
-    schemas = mergePartialSchemas(schemas);
+    schemas = mergePartialSchemas3(schemas);
   }
   const schemaCount = Object.keys(schemas).length;
   if (schemaCount === 0) {
@@ -1697,11 +1728,11 @@ async function runGenerate(options) {
       const schemasDir2 = resolve7(basePath2, tsConfig2.schemasDir ?? "schemas");
       const enumDir2 = resolve7(basePath2, tsConfig2.enumDir ?? "enum");
       const enumImportPrefix2 = relative(schemasDir2, enumDir2).replace(/\\/g, "/");
-      if (!existsSync5(schemasDir2)) {
+      if (!existsSync7(schemasDir2)) {
         mkdirSync3(schemasDir2, { recursive: true });
         logger.debug(`Created directory: ${schemasDir2}`);
       }
-      if (!existsSync5(enumDir2)) {
+      if (!existsSync7(enumDir2)) {
         mkdirSync3(enumDir2, { recursive: true });
         logger.debug(`Created directory: ${enumDir2}`);
       }
@@ -1719,10 +1750,10 @@ async function runGenerate(options) {
         const outputDir2 = file.category === "enum" ? enumDir2 : schemasDir2;
         const filePath = resolve7(outputDir2, file.filePath);
         const fileDir = dirname5(filePath);
-        if (!existsSync5(fileDir)) {
+        if (!existsSync7(fileDir)) {
           mkdirSync3(fileDir, { recursive: true });
         }
-        if (!file.overwrite && existsSync5(filePath)) {
+        if (!file.overwrite && existsSync7(filePath)) {
           logger.debug(`Skipped (exists): ${file.filePath}`);
           continue;
         }