fix(prisma): resolve multiple enums on model not correctly imported

Closes: #2939

packages/orm/prisma/package.json

@@ -24,6 +24,7 @@
     "build": "rm -rf lib && yarn build:ts && monorepo build-hybrid",
     "build:ts": "tsc --build tsconfig.json",
     "test": "vitest run",
+    "generate:enums": "yarn build && cd test/enums && prisma -v && prisma generate",
     "generate:postgres:esm": "yarn build && cd test/postgres-esm && prisma -v && prisma generate",
     "generate:mongo:esm": "yarn build && cd test/mongo-esm && prisma -v && prisma generate",
     "generate:circular:esm": "yarn build && cd test/circular-ref && prisma -v && prisma generate",

packages/orm/prisma/src/generator/domain/DmmfModel.ts

@@ -67,9 +67,9 @@ export class DmmfModel {
   }
 
   addImportDeclaration(moduleSpecifier: string, name: string, isTypeOnly = false) {
-    if (!this.#imports.has(moduleSpecifier)) {
-      moduleSpecifier = resolveExtension(moduleSpecifier);
+    moduleSpecifier = resolveExtension(moduleSpecifier);
 
+    if (!this.#imports.has(moduleSpecifier)) {
       this.#imports.set(moduleSpecifier, {
         kind: StructureKind.ImportDeclaration,
         moduleSpecifier: moduleSpecifier,
@@ -79,10 +79,11 @@ export class DmmfModel {
     }
 
     const moduleDeclaration = this.#imports.get(moduleSpecifier)!;
-    const nameImports = moduleDeclaration.namedImports as any[];
+    const nameImports = moduleDeclaration.namedImports as string[];
 
     if (!nameImports.includes(name)) {
       nameImports.push(name);
+      moduleDeclaration.namedImports = nameImports.sort();
     }
 
     return this;

packages/orm/prisma/src/generator/utils/__snapshots__/generateModels.spec.ts.snap

@@ -2,7 +2,7 @@
 
 exports[`generateModels > should generate models (info) 1`] = `
 "import { Info } from "../client/index.js";
-import { Required, Property } from "@tsed/schema";
+import { Property, Required } from "@tsed/schema";
 
 export class InfoModel implements Info {
   @Property(String)
@@ -19,7 +19,7 @@ export class InfoModel implements Info {
 
 exports[`generateModels > should generate models (post) 1`] = `
 "import { Post } from "../client/index.js";
-import { Integer, Required, Property, Allow } from "@tsed/schema";
+import { Allow, Integer, Property, Required } from "@tsed/schema";
 import { UserModel } from "./UserModel.js";
 import type { Relation } from "@tsed/core";
 
@@ -44,7 +44,7 @@ export class PostModel implements Post {
 
 exports[`generateModels > should generate models (user) 1`] = `
 "import { User } from "../client/index.js";
-import { Integer, Required, Property, Groups, Format, Email, Description, Allow, Enum, CollectionOf } from "@tsed/schema";
+import { Allow, CollectionOf, Description, Email, Enum, Format, Groups, Integer, Property, Required } from "@tsed/schema";
 import type { Relation } from "@tsed/core";
 import { Role } from "../enums/index.js";
 import { PostModel } from "./PostModel.js";

packages/orm/prisma/test/postgres/package.json → packages/orm/prisma/test/enums/package.json

@@ -1,5 +1,6 @@
 {
   "name": "@tsed/prisma-test",
+  "type": "module",
   "devDependencies": {
     "prisma": "^4.0.0"
   },

packages/orm/prisma/test/enums/prisma/schema.prisma

@@ -0,0 +1,38 @@
+
+datasource db {
+  provider = "postgresql"
+  url      = env("DATABASE_URL")
+}
+
+generator client {
+  provider        = "prisma-client-js"
+  binaryTargets   = ["native", "windows", "debian-openssl-1.1.x"]
+  output          = "../prisma/generated/client"
+}
+
+generator tsed {
+  provider                 = "node ../../lib/esm/generator.js"
+  output                   = "../prisma/generated/tsed"
+  emitDMMF                 = true
+}
+
+model User {
+  id       Int      @id @default(autoincrement())
+  email    String   @unique
+  name     String?
+  role     Role     @default(USER)
+  provider Provider @default(EMAIL)
+}
+
+enum Role {
+  USER
+  ADMIN
+}
+
+enum Provider {
+  EMAIL
+  FACEBOOK
+  GOOGLE
+  GITHUB
+  MICROSOFT
+}

packages/orm/prisma/test/mongo-esm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/prisma-test",
-  "type": "commonjs",
+  "type": "module",
   "devDependencies": {
     "prisma": "^4.0.0"
   },

packages/orm/prisma/test/snapshots/generate_code/models/PostModel.ts

@@ -1,5 +1,5 @@
 import { Post } from "../client/index.js";
-import { Integer, Required, Property, Allow } from "@tsed/schema";
+import { Allow, Integer, Property, Required } from "@tsed/schema";
 import { UserModel } from "./UserModel.js";
 import type { Relation } from "@tsed/core";
 

packages/orm/prisma/test/snapshots/generate_code/models/UserModel.ts

@@ -1,5 +1,5 @@
 import { User } from "../client/index.js";
-import { Integer, Required, Property, Groups, Format, Email, Description, Allow, Enum, CollectionOf } from "@tsed/schema";
+import { Allow, CollectionOf, Description, Email, Enum, Format, Groups, Integer, Property, Required } from "@tsed/schema";
 import type { Relation } from "@tsed/core";
 import { Role } from "../enums/index.js";
 import { PostModel } from "./PostModel.js";