feat(internals): fix getSchemaPathInternal

prisma · May 3, 2024 · d03f376 · d03f376
1 parent 89ed276
commit d03f376
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 27 deletions.
diff --git a/packages/internals/src/__tests__/getSchema.test.ts b/packages/internals/src/__tests__/getSchema.test.ts
@@ -92,9 +92,8 @@ it('reads from --schema args first even if package.json is provided', async () =
   `)
 })
 
-// TODO: this fails.
 it('throws if schema args path is invalid', async () => {
-  const res = await testSchemaPath('pkg-json-with-schema-args', path.resolve(FIXTURE_CWD, 'wrong_path'))
+  const res = await testSchemaPath('pkg-json-with-schema-args-no-package-json', path.resolve(FIXTURE_CWD, 'wrong_path'))
 
   expect(res).toMatchInlineSnapshot(`
     {

diff --git a/packages/internals/src/cli/getSchema.ts b/packages/internals/src/cli/getSchema.ts
@@ -61,31 +61,51 @@ async function readSchemaFromMultiFiles(schemaPath: string): Promise<GetSchemaRe
   return null
 }
 
+// This function only throws when `schemaPathFromArgs` is provided, yet the schema doesn't exist.
 export async function getSchemaPathInternal(
   schemaPathFromArgs?: string,
   opts: { cwd: string } = {
     cwd: process.cwd(),
   },
 ): Promise<GetSchemaResult | null> {
-  const trials = (
-    [
-      // 1. try the user custom path
-      {
-        strategy: 'absolute',
-        fn: getAbsoluteSchemaPath,
-        sourcePath: schemaPathFromArgs ? path.resolve(schemaPathFromArgs) : null,
-      },
-
-      // 2. Try the package.json `prisma.schema` custom path
-      { strategy: 'package.json', fn: getSchemaPathFromPackageJson, sourcePath: opts.cwd },
-
-      // 3. Try the conventional ./schema.prisma or ./prisma/schema.prisma paths
-      { strategy: 'relative', fn: getRelativeSchemaPath, sourcePath: opts.cwd },
-
-      // 4. Try resolving yarn workspaces and looking for a schema.prisma file there
-      { strategy: 'yarn', fn: resolveYarnSchema, sourcePath: opts.cwd },
-    ] as const
-  ).filter(({ sourcePath }) => sourcePath !== null)
+  async function getSchemaPathResult(schemaPath: string) {
+    // a. If it's a single file, read it and return it
+    return (
+      readSchemaFromSingleFile(schemaPath)
+        // b. If it's a directory, load all files and return them, but only if the `prismaSchemaFolder` preview feature is used.
+        .catch(() => readSchemaFromMultiFiles(schemaPath))
+        // c. If it's neither, return null
+        .catch(() => null)
+    )
+  }
+
+  // 1. Try the user custom path, when provided.
+  if (schemaPathFromArgs) {
+    const customSchemaPath = await getAbsoluteSchemaPath(path.resolve(schemaPathFromArgs))
+    const onError = () => {
+      throw new Error(`Provided --schema at ${schemaPathFromArgs} doesn't exist.`)
+    }
+
+    if (!customSchemaPath) {
+      return onError()
+    }
+
+    const customSchemaResult = await getSchemaPathResult(customSchemaPath)
+    if (!customSchemaResult) {
+      return onError()
+    }
+
+    return customSchemaResult
+  }
+
+  const trials = [
+    // 2. Try the package.json `prisma.schema` custom path.
+    { strategy: 'package.json', fn: getSchemaPathFromPackageJson, sourcePath: opts.cwd },
+    // 3. Try the conventional ./schema.prisma or ./prisma/schema.prisma paths.
+    { strategy: 'relative', fn: getRelativeSchemaPath, sourcePath: opts.cwd },
+    // 4. Try resolving yarn workspaces and looking for a schema.prisma file there.
+    { strategy: 'yarn', fn: resolveYarnSchema, sourcePath: opts.cwd },
+  ]
 
   for (const { strategy, sourcePath, fn } of trials) {
     debug(`Trying ${strategy}...`)
@@ -97,12 +117,7 @@ export async function getSchemaPathInternal(
       continue
     }
 
-    const schemaPathResult = await // 1. If it's a single file, read it and return it
-    readSchemaFromSingleFile(schemaPath)
-      // 2. If it's a directory, load all files and return them, but only if the `prismaSchemaFolder` preview feature is used.
-      .catch(() => readSchemaFromMultiFiles(schemaPath))
-      // 3. If it's neither, return null
-      .catch(() => null)
+    const schemaPathResult = await getSchemaPathResult(schemaPath)
 
     if (schemaPathResult) {
       return schemaPathResult
@@ -138,6 +153,7 @@ export async function getPrismaConfigFromPackageJson(cwd: string) {
 
 async function getSchemaPathFromPackageJson(cwd: string): Promise<string | null> {
   const prismaConfig = await getPrismaConfigFromPackageJson(cwd)
+  debug('prismaConfig', prismaConfig)
 
   if (!prismaConfig || !prismaConfig.data?.schema) {
     return null