omni-rest 0.2.3 → 0.2.5

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) {
@@ -1536,14 +1541,11 @@ function createPrismaClient() {
   if (standardPrismaClient) return standardPrismaClient;
   try {
     const clientPath = __require.resolve("@prisma/client", { paths: [cwd] });
+    const textResult = extractRuntimeDataModelFromFile(clientPath);
+    if (textResult) return textResult;
     const mod = __require(clientPath);
     const PrismaClient = mod.PrismaClient ?? mod.default?.PrismaClient;
     if (!PrismaClient) throw new Error("PrismaClient not found in @prisma/client");
-    const runtimeDataModel = mod?.Prisma?.runtimeDataModel ?? mod?.Prisma?._runtimeDataModel;
-    if (runtimeDataModel?.models) {
-      return { _runtimeDataModel: runtimeDataModel, $disconnect: async () => {
-      } };
-    }
     return new PrismaClient();
   } catch {
     throw new Error(
@@ -1564,32 +1566,8 @@ function tryLoadFromSchemaOutput() {
       if (!match) continue;
       const outputDir = path__namespace.default.resolve(path__namespace.default.dirname(schemaPath), match[1]);
       const indexPath = path__namespace.default.join(outputDir, "index.js");
-      if (!fs3__namespace.default.existsSync(indexPath)) continue;
-      const mod = __require(indexPath);
-      const runtimeDataModel = mod?.Prisma?.runtimeDataModel ?? mod?.Prisma?._runtimeDataModel;
-      if (runtimeDataModel?.models) {
-        return {
-          _runtimeDataModel: runtimeDataModel,
-          $disconnect: async () => {
-          }
-        };
-      }
-      const PrismaClient = mod.PrismaClient ?? mod.default?.PrismaClient;
-      if (!PrismaClient) continue;
-      try {
-        return new PrismaClient();
-      } catch {
-        for (const opt of [
-          { datasourceUrl: "postgresql://x:x@localhost/x" },
-          { datasources: { db: { url: "postgresql://x:x@localhost/x" } } }
-        ]) {
-          try {
-            return new PrismaClient(opt);
-          } catch {
-            continue;
-          }
-        }
-      }
+      const result = extractRuntimeDataModelFromFile(indexPath);
+      if (result) return result;
     } catch {
       continue;
     }
@@ -1599,20 +1577,39 @@ function tryLoadFromSchemaOutput() {
 function tryLoadFromStandardOutput() {
   const candidates = [
     path__namespace.default.resolve(cwd, "node_modules/.prisma/client/index.js"),
-    path__namespace.default.resolve(cwd, "node_modules/.prisma/client/default.js")
+    path__namespace.default.resolve(cwd, "node_modules/@prisma/client/index.js")
   ];
   for (const clientPath of candidates) {
-    if (!fs3__namespace.default.existsSync(clientPath)) continue;
-    try {
-      const mod = __require(clientPath);
-      const runtimeDataModel = mod?.Prisma?.runtimeDataModel ?? mod?.Prisma?._runtimeDataModel;
+    const result = extractRuntimeDataModelFromFile(clientPath);
+    if (result) return result;
+  }
+  return null;
+}
+function extractRuntimeDataModelFromFile(filePath) {
+  if (!fs3__namespace.default.existsSync(filePath)) return null;
+  try {
+    const src = fs3__namespace.default.readFileSync(filePath, "utf-8");
+    const match = src.match(/config\.runtimeDataModel\s*=\s*JSON\.parse\("((?:[^"\\]|\\.)*)"\)/);
+    if (match) {
+      const json = match[1].replace(/\\"/g, '"').replace(/\\\\/g, "\\");
+      const runtimeDataModel = JSON.parse(json);
       if (runtimeDataModel?.models) {
         return { _runtimeDataModel: runtimeDataModel, $disconnect: async () => {
         } };
       }
-    } catch {
-      continue;
     }
+    const match2 = src.match(/runtimeDataModel\s*=\s*(\{[\s\S]*?"models"\s*:\s*\{[\s\S]*?\}\s*\})/);
+    if (match2) {
+      try {
+        const runtimeDataModel = JSON.parse(match2[1]);
+        if (runtimeDataModel?.models) {
+          return { _runtimeDataModel: runtimeDataModel, $disconnect: async () => {
+          } };
+        }
+      } catch {
+      }
+    }
+  } catch {
   }
   return null;
 }