zenstack 2.15.0 → 2.16.0

package/cli/actions/generate.js

@@ -55,6 +55,11 @@ function runPlugins(options) {
         var _a, _b, _c;
         const schema = (_a = options.schema) !== null && _a !== void 0 ? _a : (0, cli_util_1.getDefaultSchemaLocation)();
         const model = yield (0, cli_util_1.loadDocument)(schema);
+        const gen = (0, sdk_1.getPrismaClientGenerator)(model);
+        if ((gen === null || gen === void 0 ? void 0 : gen.isNewGenerator) && !options.output) {
+            console.error(colors_1.default.red('When using the "prisma-client" generator, you must provide an explicit output path with the "--output" CLI parameter.'));
+            throw new cli_error_1.CliError('When using with the "prisma-client" generator, you must provide an explicit output path with the "--output" CLI parameter.');
+        }
         for (const name of [...((_b = options.withPlugins) !== null && _b !== void 0 ? _b : []), ...((_c = options.withoutPlugins) !== null && _c !== void 0 ? _c : [])]) {
             const pluginDecl = model.declarations.find((d) => (0, ast_1.isPlugin)(d) && d.name === name);
             if (!pluginDecl) {

package/cli/actions/generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/cli/actions/generate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/cli/actions/generate.ts"],"names":[],"mappings":"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"}

package/cli/actions/init.js

@@ -54,7 +54,7 @@ function init(projectPath, options) {
             }
             else {
                 // create a new model
-                const starterContent = fs_1.default.readFileSync(path_1.default.join(__dirname, '../../res/starter.zmodel'), 'utf-8');
+                const starterContent = fs_1.default.readFileSync(path_1.default.join(__dirname, '../../res/starter.txt'), 'utf-8');
                 fs_1.default.writeFileSync(zmodelFile, starterContent);
                 sampleModelGenerated = true;
             }

package/cli/actions/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/cli/actions/init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/cli/actions/init.ts"],"names":[],"mappings":"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"}

package/cli/plugin-runner.js

@@ -32,7 +32,7 @@ class PluginRunner {
      */
     run(runnerOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             const version = (0, version_utils_1.getVersion)();
             console.log(colors_1.default.bold(`⌛️ ZenStack CLI v${version}, running plugins`));
             (0, plugin_utils_1.ensureDefaultOutputFolder)(runnerOptions);
@@ -79,8 +79,10 @@ class PluginRunner {
                     module: pluginModule,
                 });
             }
+            const preprocessorPlugins = plugins.filter((p) => p.options.preprocessor);
+            const otherPlugins = plugins.filter((p) => !p.options.preprocessor);
             // calculate all plugins (including core plugins implicitly enabled)
-            const { corePlugins, userPlugins } = this.calculateAllPlugins(runnerOptions, plugins);
+            const { corePlugins, userPlugins } = this.calculateAllPlugins(runnerOptions, otherPlugins);
             const allPlugins = [...corePlugins, ...userPlugins];
             // check dependencies
             for (const plugin of allPlugins) {
@@ -102,6 +104,16 @@ class PluginRunner {
             let prismaClientPath = '@prisma/client';
             let prismaClientDtsPath = undefined;
             const project = (0, sdk_1.createProject)();
+            const runUserPlugins = (plugins) => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                for (const { name, description, run, options: pluginOptions } of plugins) {
+                    const options = Object.assign(Object.assign({}, pluginOptions), { prismaClientPath, prismaClientDtsPath });
+                    const r = yield this.runPlugin(name, description, run, runnerOptions, options, dmmf, shortNameMap, project, false);
+                    warnings.push(...((_a = r === null || r === void 0 ? void 0 : r.warnings) !== null && _a !== void 0 ? _a : [])); // the null-check is for backward compatibility
+                }
+            });
+            // run preprocessor plugins
+            yield runUserPlugins(preprocessorPlugins);
             for (const { name, description, run, options: pluginOptions } of corePlugins) {
                 const options = Object.assign(Object.assign({}, pluginOptions), { prismaClientPath });
                 const r = yield this.runPlugin(name, description, run, runnerOptions, options, dmmf, shortNameMap, project, true);
@@ -123,11 +135,7 @@ class PluginRunner {
             // compile code generated by core plugins
             yield compileProject(project, runnerOptions);
             // run user plugins
-            for (const { name, description, run, options: pluginOptions } of userPlugins) {
-                const options = Object.assign(Object.assign({}, pluginOptions), { prismaClientPath, prismaClientDtsPath });
-                const r = yield this.runPlugin(name, description, run, runnerOptions, options, dmmf, shortNameMap, project, false);
-                warnings.push(...((_b = r === null || r === void 0 ? void 0 : r.warnings) !== null && _b !== void 0 ? _b : [])); // the null-check is for backward compatibility
-            }
+            yield runUserPlugins(userPlugins);
             console.log(colors_1.default.green(colors_1.default.bold('\n👻 All plugins completed successfully!')));
             warnings.forEach((w) => console.warn(colors_1.default.yellow(w)));
             console.log(`Don't forget to restart your dev server to let the changes take effect.`);
@@ -324,7 +332,7 @@ class PluginRunner {
 exports.PluginRunner = PluginRunner;
 function compileProject(project, runnerOptions) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (runnerOptions.compile !== false) {
+        if (!runnerOptions.output && runnerOptions.compile !== false) {
             // emit
             yield (0, sdk_1.emitProject)(project);
         }

package/cli/plugin-runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-runner.js","sourceRoot":"","sources":["../../src/cli/plugin-runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin-runner.js","sourceRoot":"","sources":["../../src/cli/plugin-runner.ts"],"names":[],"mappings":"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"}

package/language-server/zmodel-workspace-manager.js

@@ -16,6 +16,7 @@ exports.ZModelWorkspaceManager = void 0;
 const ast_1 = require("@zenstackhq/language/ast");
 const sdk_1 = require("@zenstackhq/sdk");
 const langium_1 = require("langium");
+const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const vscode_languageserver_1 = require("vscode-languageserver");
 const vscode_uri_1 = require("vscode-uri");
@@ -34,7 +35,40 @@ class ZModelWorkspaceManager extends langium_1.DefaultWorkspaceManager {
         });
         return __awaiter(this, void 0, void 0, function* () {
             yield _super.loadAdditionalDocuments.call(this, _folders, _collector);
-            const stdLibUri = vscode_uri_1.URI.file(path_1.default.join(__dirname, '../res', constants_1.STD_LIB_MODULE_NAME));
+            let stdLibPath;
+            // First, try to find the stdlib from an installed zenstack package
+            // in the project's node_modules
+            let installedStdlibPath;
+            for (const folder of _folders) {
+                const folderPath = this.getRootFolder(folder).fsPath;
+                try {
+                    // Try to resolve zenstack from the workspace folder
+                    const languagePackagePath = require.resolve('zenstack/package.json', {
+                        paths: [folderPath]
+                    });
+                    const languagePackageDir = path_1.default.dirname(languagePackagePath);
+                    const candidateStdlibPath = path_1.default.join(languagePackageDir, 'res', constants_1.STD_LIB_MODULE_NAME);
+                    // Check if the stdlib file exists in the installed package
+                    if (fs_1.default.existsSync(candidateStdlibPath)) {
+                        installedStdlibPath = candidateStdlibPath;
+                        console.log(`Found installed zenstack package stdlib at ${installedStdlibPath}`);
+                        break;
+                    }
+                }
+                catch (error) {
+                    // Package not found or other error, continue to next folder
+                    continue;
+                }
+            }
+            if (installedStdlibPath) {
+                stdLibPath = installedStdlibPath;
+            }
+            else {
+                // Fallback to bundled stdlib
+                stdLibPath = path_1.default.join(__dirname, '../res', constants_1.STD_LIB_MODULE_NAME);
+                console.log(`Using bundled stdlib in extension`);
+            }
+            const stdLibUri = vscode_uri_1.URI.file(stdLibPath);
             console.log(`Adding stdlib document from ${stdLibUri}`);
             const stdlib = this.langiumDocuments.getOrCreateDocument(stdLibUri);
             _collector(stdlib);

package/language-server/zmodel-workspace-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"zmodel-workspace-manager.js","sourceRoot":"","sources":["../../src/language-server/zmodel-workspace-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zmodel-workspace-manager.js","sourceRoot":"","sources":["../../src/language-server/zmodel-workspace-manager.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -3,7 +3,7 @@
   "publisher": "zenstack",
   "displayName": "ZenStack Language Tools",
   "description": "FullStack enhancement for Prisma ORM: seamless integration from database to UI",
-  "version": "2.15.0",
+  "version": "2.16.0",
   "author": {
     "name": "ZenStack Team"
   },
@@ -79,24 +79,19 @@
     "@paralleldrive/cuid2": "^2.2.0",
     "@types/node": "^20.12.7",
     "async-exit-hook": "^2.0.1",
-    "change-case": "^4.1.2",
     "colors": "1.4.0",
     "commander": "^8.3.0",
     "deepmerge": "^4.3.1",
     "langium": "1.3.1",
-    "lower-case-first": "^2.0.2",
     "mixpanel": "^0.17.0",
     "ora": "^5.4.1",
     "pluralize": "^8.0.0",
     "pretty-repl": "^4.0.0",
     "semver": "^7.5.2",
-    "sleep-promise": "^9.1.0",
     "strip-color": "^0.1.0",
     "terminal-link": "^2.0.0",
-    "tiny-invariant": "^1.3.1",
     "ts-morph": "^16.0.0",
     "ts-pattern": "^4.3.0",
-    "upper-case-first": "^2.0.2",
     "uuid": "^9.0.0",
     "vscode-jsonrpc": "^8.0.2",
     "vscode-languageclient": "^8.0.2",
@@ -105,14 +100,14 @@
     "vscode-uri": "^3.0.6",
     "zod": "^3.22.4",
     "zod-validation-error": "^1.5.0",
-    "@zenstackhq/language": "2.15.0",
-    "@zenstackhq/sdk": "2.15.0"
+    "@zenstackhq/language": "2.16.0",
+    "@zenstackhq/sdk": "2.16.0"
   },
   "peerDependencies": {
-    "prisma": "5.0.0 - 6.8.x"
+    "prisma": "5.0.0 - 6.10.x"
   },
   "devDependencies": {
-    "@prisma/client": "6.8.x",
+    "@prisma/client": "6.10.x",
     "@types/async-exit-hook": "^2.0.0",
     "@types/pluralize": "^0.0.29",
     "@types/semver": "^7.3.13",
@@ -127,7 +122,7 @@
     "tmp": "^0.2.1",
     "tsc-alias": "^1.7.0",
     "vitest": "^0.29.7",
-    "@zenstackhq/runtime": "2.15.0"
+    "@zenstackhq/runtime": "2.16.0"
   },
   "scripts": {
     "vscode:publish": "vsce publish --no-dependencies",

package/plugins/enhancer/enhance/checker-type-generator.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateCheckerType = generateCheckerType;
 const sdk_1 = require("@zenstackhq/sdk");
-const lower_case_first_1 = require("lower-case-first");
+const local_helpers_1 = require("@zenstackhq/runtime/local-helpers");
 const ts_pattern_1 = require("ts-pattern");
 /**
  * Generates a `ModelCheckers` interface that contains a `check` method for each model in the schema.
@@ -24,7 +24,7 @@ import type { PolicyCrudKind } from '@zenstackhq/runtime';
 
 export interface ModelCheckers {
     ${(0, sdk_1.getDataModels)(model)
-        .map((dataModel) => `\t${(0, lower_case_first_1.lowerCaseFirst)(dataModel.name)}: ${generateDataModelChecker(dataModel)}`)
+        .map((dataModel) => `\t${(0, local_helpers_1.lowerCaseFirst)(dataModel.name)}: ${generateDataModelChecker(dataModel)}`)
         .join(',\n')}
 }
 `;

package/plugins/enhancer/enhance/checker-type-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"checker-type-generator.js","sourceRoot":"","sources":["../../../../src/plugins/enhancer/enhance/checker-type-generator.ts"],"names":[],"mappings":";;AAmBA,kDAUC;AA7BD,yCAAgD;AAEhD,uDAAkD;AAClD,2CAAsC;AAEtC;;;;;;;;;;;;;GAaG;AACH,SAAgB,mBAAmB,CAAC,KAAY;IAC5C,OAAO;;;;MAIL,IAAA,mBAAa,EAAC,KAAK,CAAC;SACjB,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,KAAK,IAAA,iCAAc,EAAC,SAAS,CAAC,IAAI,CAAC,KAAK,wBAAwB,CAAC,SAAS,CAAC,EAAE,CAAC;SACjG,IAAI,CAAC,KAAK,CAAC;;CAEnB,CAAC;AACF,CAAC;AAED,SAAS,wBAAwB,CAAC,SAAoB;IAClD,OAAO;2DACgD,qBAAqB,CAAC,SAAS,CAAC;MACrF,CAAC;AACP,CAAC;AAED,SAAS,qBAAqB,CAAC,SAAoB;IAC/C,OAAO,KAAK,SAAS,CAAC,MAAM;SACvB,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;SAC3C,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,MAAM,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;SACxD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AACxB,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAqB;IAC5C,OAAO,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,YAAY,CAAC,KAAqB;IACvC,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;SACxB,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC;SAChC,IAAI,CAAC,cAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;SAClE,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;SAC9B,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"checker-type-generator.js","sourceRoot":"","sources":["../../../../src/plugins/enhancer/enhance/checker-type-generator.ts"],"names":[],"mappings":";;AAmBA,kDAUC;AA7BD,yCAAgD;AAEhD,qEAAmE;AACnE,2CAAsC;AAEtC;;;;;;;;;;;;;GAaG;AACH,SAAgB,mBAAmB,CAAC,KAAY;IAC5C,OAAO;;;;MAIL,IAAA,mBAAa,EAAC,KAAK,CAAC;SACjB,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,KAAK,IAAA,8BAAc,EAAC,SAAS,CAAC,IAAI,CAAC,KAAK,wBAAwB,CAAC,SAAS,CAAC,EAAE,CAAC;SACjG,IAAI,CAAC,KAAK,CAAC;;CAEnB,CAAC;AACF,CAAC;AAED,SAAS,wBAAwB,CAAC,SAAoB;IAClD,OAAO;2DACgD,qBAAqB,CAAC,SAAS,CAAC;MACrF,CAAC;AACP,CAAC;AAED,SAAS,qBAAqB,CAAC,SAAoB;IAC/C,OAAO,KAAK,SAAS,CAAC,MAAM;SACvB,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;SAC3C,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,MAAM,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;SACxD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AACxB,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAqB;IAC5C,OAAO,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,YAAY,CAAC,KAAqB;IACvC,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;SACxB,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC;SAChC,IAAI,CAAC,cAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;SAClE,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;SAC9B,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;AACpC,CAAC"}

package/plugins/enhancer/enhance/index.d.ts

@@ -30,6 +30,8 @@ export declare class EnhancerGenerator {
     private shouldBeOptional;
     private getPrismaClientGeneratorName;
     private processClientTypes;
+    private processClientTypesLegacyPrismaGenerator;
+    private processClientTypesNewPrismaGenerator;
     private transformPrismaTypes;
     private transformPrismaModule;
     private transformVariableStatement;
@@ -51,4 +53,5 @@ export declare class EnhancerGenerator {
     private get generatePermissionChecker();
     private removeFromSource;
     private trimEmptyLines;
+    private get isNewPrismaClientGenerator();
 }

package/plugins/enhancer/enhance/index.js

@@ -17,11 +17,11 @@ const runtime_1 = require("@zenstackhq/runtime");
 const sdk_1 = require("@zenstackhq/sdk");
 const ast_1 = require("@zenstackhq/sdk/ast");
 const prisma_1 = require("@zenstackhq/sdk/prisma");
+const local_helpers_1 = require("@zenstackhq/runtime/local-helpers");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const semver_1 = __importDefault(require("semver"));
 const ts_morph_1 = require("ts-morph");
-const upper_case_first_1 = require("upper-case-first");
 const __1 = require("..");
 const ast_utils_1 = require("../../../utils/ast-utils");
 const exec_utils_1 = require("../../../utils/exec-utils");
@@ -32,7 +32,7 @@ const enhancer_utils_1 = require("../enhancer-utils");
 const auth_type_generator_1 = require("./auth-type-generator");
 const checker_type_generator_1 = require("./checker-type-generator");
 const model_typedef_generator_1 = require("./model-typedef-generator");
-const LOGICAL_CLIENT_GENERATION_PATH = './.logical-prisma-client';
+const LOGICAL_CLIENT_GENERATION_PATH = './logical-prisma-client';
 class EnhancerGenerator {
     constructor(model, options, project, outDir) {
         this.model = model;
@@ -41,7 +41,7 @@ class EnhancerGenerator {
         this.outDir = outDir;
         // a mapping from shortened names to full names
         this.reversedShortNameMap = new Map();
-        this.CreateUpdateWithoutDelegateRelationRegex = new RegExp(`(.+)(Create|Update)Without${(0, upper_case_first_1.upperCaseFirst)(runtime_1.DELEGATE_AUX_RELATION_PREFIX)}_(.+)Input`);
+        this.CreateUpdateWithoutDelegateRelationRegex = new RegExp(`(.+)(Create|Update)Without${(0, local_helpers_1.upperCaseFirst)(runtime_1.DELEGATE_AUX_RELATION_PREFIX)}_(.+)Input`);
         const modelsWithAuthInDefault = this.model.declarations.filter((d) => (0, ast_1.isDataModel)(d) && d.fields.some((f) => f.attributes.some(enhancer_utils_1.isDefaultWithAuth)));
         this.modelsWithAuthInDefaultCreateInputPattern = new RegExp(`^(${modelsWithAuthInDefault.map((m) => m.name).join('|')})(Unchecked)?Create.*?Input$`);
         this.modelsWithJsonTypeFields = this.model.declarations.filter((d) => (0, ast_1.isDataModel)(d) && d.fields.some((f) => { var _a; return (0, ast_1.isTypeDef)((_a = f.type.reference) === null || _a === void 0 ? void 0 : _a.ref); }));
@@ -65,6 +65,9 @@ class EnhancerGenerator {
             if (this.needsLogicalClient) {
                 prismaTypesFixed = true;
                 resultPrismaTypeImport = LOGICAL_CLIENT_GENERATION_PATH;
+                if (this.isNewPrismaClientGenerator) {
+                    resultPrismaTypeImport += '/client';
+                }
                 const result = yield this.generateLogicalPrisma();
                 dmmf = result.dmmf;
             }
@@ -199,8 +202,8 @@ export function enhance(prisma: any, context?: EnhancementContext<${authTypePara
  * type EnhancedPrismaClient = Enhanced<typeof prisma>;
  */
 export type Enhanced<Client> = 
-    Client extends _PrismaClient<infer _ClientOptions, infer _U, infer ExtArgs> ? PrismaClient :
-    Client extends DynamicClientExtensionThis<infer _TypeMap, infer _TypeMapCb, infer ExtArgs${hasClientOptions ? ', infer ClientOptions' : ''}> ? DynamicClientExtensionThis<Prisma.TypeMap<ExtArgs>, Prisma.TypeMapCb, ExtArgs${hasClientOptions ? ', ClientOptions' : ''}> : Client;
+    Client extends _PrismaClient<any, any, any> ? PrismaClient :
+    Client extends DynamicClientExtensionThis<_Prisma.TypeMap<infer ExtArgs>, infer _TypeMapCb, infer ExtArgs${hasClientOptions ? ', infer ClientOptions' : ''}> ? DynamicClientExtensionThis<Prisma.TypeMap<ExtArgs>, Prisma.TypeMapCb, ExtArgs${hasClientOptions ? ', ClientOptions' : ''}> : Client;
 `;
     }
     get needsLogicalClient() {
@@ -324,18 +327,14 @@ export type Enhanced<Client> =
         return false;
     }
     getPrismaClientGeneratorName(model) {
-        for (const generator of model.declarations.filter(ast_1.isGeneratorDecl)) {
-            if (generator.fields.some((f) => f.name === 'provider' && (0, sdk_1.getLiteral)(f.value) === 'prisma-client-js')) {
-                return generator.name;
-            }
+        const gen = (0, sdk_1.getPrismaClientGenerator)(model);
+        if (!gen) {
+            throw new sdk_1.PluginError(__1.name, `Cannot find "prisma-client-js" or "prisma-client" generator in the schema`);
         }
-        throw new sdk_1.PluginError(__1.name, `Cannot find prisma-client-js generator in the schema`);
+        return gen.name;
     }
     processClientTypes(prismaClientDir) {
         return __awaiter(this, void 0, void 0, function* () {
-            // make necessary updates to the generated `index.d.ts` file and overwrite it
-            const project = new ts_morph_1.Project();
-            const sf = project.addSourceFileAtPath(path_1.default.join(prismaClientDir, 'index.d.ts'));
             // build a map of delegate models and their sub models
             const delegateInfo = [];
             this.model.declarations
@@ -346,6 +345,18 @@ export type Enhanced<Client> =
                     delegateInfo.push([dm, concreteModels]);
                 }
             });
+            if (this.isNewPrismaClientGenerator) {
+                yield this.processClientTypesNewPrismaGenerator(prismaClientDir, delegateInfo);
+            }
+            else {
+                yield this.processClientTypesLegacyPrismaGenerator(prismaClientDir, delegateInfo);
+            }
+        });
+    }
+    processClientTypesLegacyPrismaGenerator(prismaClientDir, delegateInfo) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const project = new ts_morph_1.Project();
+            const sf = project.addSourceFileAtPath(path_1.default.join(prismaClientDir, 'index.d.ts'));
             // transform index.d.ts and write it into a new file (better perf than in-line editing)
             const sfNew = project.createSourceFile(path_1.default.join(prismaClientDir, 'index-fixed.d.ts'), undefined, {
                 overwrite: true,
@@ -358,6 +369,35 @@ export type Enhanced<Client> =
             yield sfNew.save();
         });
     }
+    processClientTypesNewPrismaGenerator(prismaClientDir, delegateInfo) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const project = new ts_morph_1.Project();
+            for (const d of this.model.declarations.filter(ast_1.isDataModel)) {
+                const fileName = `${prismaClientDir}/models/${d.name}.ts`;
+                const sf = project.addSourceFileAtPath(fileName);
+                const sfNew = project.createSourceFile(`${prismaClientDir}/models/${d.name}-fixed.ts`, undefined, {
+                    overwrite: true,
+                });
+                const syntaxList = sf.getChildren()[0];
+                if (!ts_morph_1.Node.isSyntaxList(syntaxList)) {
+                    throw new sdk_1.PluginError(__1.name, `Unexpected syntax list structure in ${fileName}`);
+                }
+                syntaxList.getChildren().forEach((node) => {
+                    if (ts_morph_1.Node.isInterfaceDeclaration(node)) {
+                        sfNew.addInterface(this.transformInterface(node, delegateInfo));
+                    }
+                    else if (ts_morph_1.Node.isTypeAliasDeclaration(node)) {
+                        sfNew.addTypeAlias(this.transformTypeAlias(node, delegateInfo));
+                    }
+                    else {
+                        sfNew.addStatements(node.getText());
+                    }
+                });
+                yield sfNew.move(sf.getFilePath(), { overwrite: true });
+                yield sfNew.save();
+            }
+        });
+    }
     transformPrismaTypes(sf, sfNew, delegateInfo) {
         // copy toplevel imports
         sfNew.addImportDeclarations(sf.getImportDeclarations().map((n) => n.getStructure()));
@@ -466,7 +506,7 @@ export type Enhanced<Client> =
             const discriminatorDecl = (0, ast_utils_1.getDiscriminatorField)(payloadRecord[0]);
             if (discriminatorDecl) {
                 source = `${payloadRecord[1]
-                    .map((concrete) => `($${concrete.name}Payload<ExtArgs> & { scalars: { ${discriminatorDecl.name}: '${concrete.name}' } })`)
+                    .map((concrete) => `(Prisma.$${concrete.name}Payload<ExtArgs> & { scalars: { ${discriminatorDecl.name}: '${concrete.name}' } })`)
                     .join(' | ')}`;
             }
         }
@@ -684,6 +724,10 @@ export type Enhanced<Client> =
     trimEmptyLines(source) {
         return source.replace(/^\s*[\r\n]/gm, '');
     }
+    get isNewPrismaClientGenerator() {
+        const gen = (0, sdk_1.getPrismaClientGenerator)(this.model);
+        return !!(gen === null || gen === void 0 ? void 0 : gen.isNewGenerator);
+    }
 }
 exports.EnhancerGenerator = EnhancerGenerator;
 //# sourceMappingURL=index.js.map