From 0ff142467ea4a96195ed4b9528c531a4c3c70d92 Mon Sep 17 00:00:00 2001 From: Luis Rudge Date: Thu, 25 Jan 2024 13:45:09 -0700 Subject: [PATCH] fix: Correctly generate import path --- bun.lockb | Bin 239984 -> 239288 bytes example/prisma/schema.prisma | 4 +++- example/yarn.lock | 17 +++++++++++------ package.json | 8 ++++---- src/utils/generatorUtils.ts | 20 +++++++++++++++----- 5 files changed, 33 insertions(+), 16 deletions(-) diff --git a/bun.lockb b/bun.lockb index ec5246e9fd449a4913a8d5b2eb2ce1688097b549..56072c82d75c467b04723b82f4653a65872b32c7 100755 GIT binary patch delta 29963 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 diff --git a/example/prisma/schema.prisma b/example/prisma/schema.prisma index bcea436..cd13353 100644 --- a/example/prisma/schema.prisma +++ b/example/prisma/schema.prisma @@ -3,7 +3,9 @@ generator client { } generator custom_generator { - provider = "prisma-generator-fake-data" + ///in your project, you'll use it like this + ///provider = "prisma-generator-fake-data" + provider = "ts-node ../src/bin.ts" extraImport = "import {fakeSettings} from './fakeData.utils'" extraExport = "export * from './fakeData.utils'" } diff --git a/example/yarn.lock b/example/yarn.lock index 64c7978..0c561b4 100644 --- a/example/yarn.lock +++ b/example/yarn.lock @@ -39,6 +39,11 @@ dependencies: "@prisma/engines-version" "4.17.0-26.6b0aef69b7cdfc787f822ecd7cdc76d5f1991584" +"@prisma/client@^5.8.1": + version "5.8.1" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.8.1.tgz#7815ec51c0ca2a6de219c02e7846701ae3baf240" + integrity sha512-xQtMPfbIwLlbm0VVIVQY2yqQVOxPwRQhvIp7Z3m2900g1bu/zRHKhYZJQWELqmjl6d8YwBy0K2NvMqh47v1ubw== + "@prisma/debug@5.8.1": version "5.8.1" resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.8.1.tgz#704daa36919b0fc4d227260ecebfa1c94b155b07" @@ -78,7 +83,7 @@ "@prisma/engines-version" "5.8.1-1.78caf6feeaed953168c64e15a249c3e9a033ebe2" "@prisma/get-platform" "5.8.1" -"@prisma/generator-helper@5.8.1", "@prisma/generator-helper@^5.0.0": +"@prisma/generator-helper@5.8.1", "@prisma/generator-helper@^5.8.1": version "5.8.1" resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-5.8.1.tgz#11d226bf004839763375303a7a081913796df06b" integrity sha512-2EDd0o+GHfbX1dtw5BnfOz3hQB7AtYrwe4YNiKfo2UDBvB/ne/ChZa3b/vBm/GKpjW2Xaymct8D9oIHev3juzQ== @@ -92,7 +97,7 @@ dependencies: "@prisma/debug" "5.8.1" -"@prisma/internals@^5.0.0": +"@prisma/internals@^5.8.1": version "5.8.1" resolved "https://registry.yarnpkg.com/@prisma/internals/-/internals-5.8.1.tgz#cb73784f64846a65efe74f5f563ec8908ac857e9" integrity sha512-9okoCgLeMqql58IbEG3YmzgNLRUQdN+qZUYp2DojWC7VAmL9TSOKQ5Dcc0588cKAsCBBDUQ2jfdflorYkzeFKw== @@ -182,12 +187,12 @@ make-error@^1.1.1: integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== "prisma-generator-fake-data@file:..": - version "0.13.0" + version "0.14.0" dependencies: "@faker-js/faker" "^8.0.2" - "@prisma/client" "^5.0.0" - "@prisma/generator-helper" "^5.0.0" - "@prisma/internals" "^5.0.0" + "@prisma/client" "^5.8.1" + "@prisma/generator-helper" "^5.8.1" + "@prisma/internals" "^5.8.1" decimal.js "^10.4.3" tiny-invariant "^1.3.1" diff --git a/package.json b/package.json index 8c6f850..9273f51 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,9 @@ }, "dependencies": { "@faker-js/faker": "^8.0.2", - "@prisma/client": "^5.0.0", - "@prisma/generator-helper": "^5.0.0", - "@prisma/internals": "^5.0.0", + "@prisma/client": "^5.8.1", + "@prisma/generator-helper": "^5.8.1", + "@prisma/internals": "^5.8.1", "decimal.js": "^10.4.3", "tiny-invariant": "^1.3.1" }, @@ -32,7 +32,7 @@ "generate-changelog": "^1.8.0", "prettier": "^2.8.7", "pretty-quick": "^3.1.3", - "prisma": "^5.0.0", + "prisma": "^5.8.1", "release-it": "^15.9.3", "typescript": "^5.0.2", "vitest": "^0.29.8" diff --git a/src/utils/generatorUtils.ts b/src/utils/generatorUtils.ts index 3c6de4c..db6871b 100644 --- a/src/utils/generatorUtils.ts +++ b/src/utils/generatorUtils.ts @@ -1,9 +1,19 @@ import { GeneratorOptions } from '@prisma/generator-helper'; export function extractClientPath(options: GeneratorOptions) { - return ( - options.otherGenerators.find( - (g) => g?.provider?.value === 'prisma-client-js', - )?.output?.value || undefined - ); + const clientPath = options.otherGenerators.find( + (g) => g?.provider?.value === 'prisma-client-js', + )?.output?.value; + + /** + * not sure what changed, but this value was undefined before + * and now it's set to the full path of the client (including + * the user folder etc). If we detect that, we just return + * the @prisma/client string + */ + if (clientPath?.includes('node_modules/@prisma/client')) { + return '@prisma/client'; + } + + return clientPath || undefined; }