omni-rest 0.2.4 → 0.2.6

package/dist/cli.js

@@ -554,9 +554,14 @@ Please check that the path is correct and the file is readable.`
   }
   let current = path__namespace.resolve(startDir);
   while (true) {
-    const candidate = path__namespace.join(current, "schema.prisma");
-    if (fs3__namespace.existsSync(candidate)) {
-      return candidate;
+    const candidates = [
+      path__namespace.join(current, "prisma", "schema.prisma"),
+      path__namespace.join(current, "schema.prisma")
+    ];
+    for (const candidate of candidates) {
+      if (fs3__namespace.existsSync(candidate)) {
+        return candidate;
+      }
     }
     const parent = path__namespace.dirname(current);
     if (parent === current) {
@@ -568,20 +573,36 @@ Please run this command from within your Prisma project, or specify the path wit
     current = parent;
   }
 }
-async function loadDMMF(prismaClientPath) {
+async function loadDMMF(frontendDir, schemaPath) {
+  let clientPath = null;
+  try {
+    const schemaContent = fs3__namespace.readFileSync(schemaPath, "utf-8");
+    const outputMatch = schemaContent.match(/output\s*=\s*["']([^"']+)["']/);
+    if (outputMatch) {
+      const schemaDir = path__namespace.dirname(schemaPath);
+      const customOutput = path__namespace.resolve(schemaDir, outputMatch[1]);
+      if (fs3__namespace.existsSync(customOutput)) {
+        clientPath = customOutput;
+      }
+    }
+  } catch {
+  }
+  if (!clientPath) {
+    clientPath = path__namespace.join(frontendDir, "node_modules", "@prisma", "client");
+  }
   let prismaClientModule;
   try {
-    prismaClientModule = __require(prismaClientPath);
+    prismaClientModule = __require(clientPath);
   } catch (err) {
     throw new Error(
-      `[omni-rest] Could not load "@prisma/client" from "${prismaClientPath}".
+      `[omni-rest] Could not load "@prisma/client" from "${clientPath}".
 Please run "npx prisma generate" to generate the Prisma client, then try again.`
     );
   }
   const prismaNamespace = prismaClientModule?.Prisma ?? prismaClientModule?.default?.Prisma;
   if (!prismaNamespace?.dmmf?.datamodel?.models) {
     throw new Error(
-      `[omni-rest] Could not read DMMF from "@prisma/client" at "${prismaClientPath}".
+      `[omni-rest] Could not read DMMF from "@prisma/client" at "${clientPath}".
 Please run "npx prisma generate" to regenerate the Prisma client, then try again.`
     );
   }
@@ -1459,10 +1480,9 @@ async function run(argv) {
     console.error(COLORS.red(`  \u2717 ${err.message}`));
     process.exit(1);
   }
-  const prismaClientPath = path__namespace.join(frontendDir, "node_modules", "@prisma", "client");
   let allModels;
   try {
-    allModels = await loadDMMF(prismaClientPath);
+    allModels = await loadDMMF(frontendDir, resolvedSchemaPath);
     console.log(COLORS.cyan(`  \u2192 Found ${allModels.length} model(s): ${allModels.map((m) => m.name).join(", ")}`));
   } catch (err) {
     console.error(COLORS.red(`  \u2717 ${err.message}`));