Merge pull request #10 from simplyStyle/main

fix luciaPrisma merge
hyperse-io · May 23, 2024 · e392533 · e392533
2 parents 902701f + f8fa41c
commit e392533
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 23 deletions.
diff --git a/packages/next-auth/flatjs-forge.config.ts b/packages/next-auth/flatjs-forge.config.ts
@@ -1,5 +1,4 @@
 import { defineConfig } from '@flatjs/forge';
-import preserveDirectives from 'rollup-plugin-preserve-directives';
 
 export default defineConfig({
   input: ['src/index.ts', 'src/providers/index.ts'],
@@ -16,15 +15,12 @@ export default defineConfig({
     dtsFilter: (dtsFile) =>
       dtsFile.split('/').length <= 2 && /index.d.ts/.test(dtsFile),
   },
-  externals: ['rollup-plugin-preserve-directives'],
   plugin: {
     pluginConfigs: {
       babelOptions: {
         usePreset: 'react',
       },
     },
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    extraPlugins: [(preserveDirectives as any)()],
   },
   output: {
     format: 'esm',

diff --git a/packages/next-auth/package.json b/packages/next-auth/package.json
@@ -65,7 +65,6 @@
     "prisma": "^5.13.0",
     "react": "^18.3.1",
     "rimraf": "5.0.5",
-    "rollup-plugin-preserve-directives": "0.4.0",
     "ts-node": "10.9.2",
     "typescript": "5.4.5",
     "vite": "5.2.11",

diff --git a/packages/next-demo/prisma-merge.js b/packages/next-demo/prisma-merge.js
@@ -2,7 +2,7 @@ import { prismaMerge } from '@hyperse-io/next-prisma';
 import { luciaPrismaContent } from '@hyperse-io/next-auth';
 
 prismaMerge({
-  prePrismaModel: luciaPrismaContent,
+  luciaPrismaModel: luciaPrismaContent,
   input: ['prisma/base.prisma'],
 })
   .then(() => {

diff --git a/packages/next-prisma/src/merge.ts b/packages/next-prisma/src/merge.ts
@@ -31,7 +31,7 @@ const { getDMMF, getConfig } = getPrismaConfig;
 export interface prismaMergeOptions {
   input: string[];
   output: string;
-  prePrismaModel?: string;
+  luciaPrismaModel?: string;
 }
 
 const readFile = promisify(fs.readFile);
@@ -215,15 +215,10 @@ export async function prismaMerge(options: prismaMergeOptions) {
   const {
     input: inputs,
     output = 'prisma/schema.prisma',
-    prePrismaModel = '',
+    luciaPrismaModel = '',
   } = options;
   const schemasToMix: Schema[] = [];
 
-  if (prePrismaModel) {
-    const luciaSchema = await getSchema(prePrismaModel, 'luciaPrisma');
-    if (luciaSchema) schemasToMix.push(luciaSchema);
-  }
-
   // load the schema data for all inputs
   for (const input of inputs) {
     for (const file of glob.sync(input)) {
@@ -236,6 +231,12 @@ export async function prismaMerge(options: prismaMergeOptions) {
     }
   }
 
+  // load the schema data for the lucia.prisma to cover all models
+  if (luciaPrismaModel) {
+    const luciaSchema = await getSchema(luciaPrismaModel, 'luciaPrisma');
+    if (luciaSchema) schemasToMix.push(luciaSchema);
+  }
+
   // extract all models and mix
   let models: Model[] = [];
   for (const schema of schemasToMix) {

diff --git a/packages/next-prisma/tests/__snapshots__/prisma-merge.spec.ts.snap b/packages/next-prisma/tests/__snapshots__/prisma-merge.spec.ts.snap
@@ -3,10 +3,10 @@
 exports[`merge prisma 1`] = `
 "// *** GENERATED BY next-prisma :: DO NOT EDIT ***
 model User {
-	id Int @unique
-	name String 
+	id String @unique
 	content Int 
 	desc String 
+	name String 
 }
 model Post {
 	id String @unique
@@ -17,10 +17,10 @@ model Post {
 exports[`merge prisma cover 1`] = `
 "// *** GENERATED BY next-prisma :: DO NOT EDIT ***
 model User {
-	id Int @unique
-	name Int 
+	id String @unique
 	content String 
 	desc String 
+	name String 
 }
 model Post {
 	id String @unique

diff --git a/packages/next-prisma/tests/prisma-merge.spec.ts b/packages/next-prisma/tests/prisma-merge.spec.ts
@@ -14,7 +14,7 @@ test('merge prisma', async () => {
 `;
 
   await prismaMerge({
-    prePrismaModel: luciaPrismaContent,
+    luciaPrismaModel: luciaPrismaContent,
     input: ['tests/prisma/test1.prisma'],
     output: 'tests/prisma/testMerge1.prisma',
   });
@@ -34,7 +34,7 @@ test('merge prisma cover', async () => {
   `;
 
   await prismaMerge({
-    prePrismaModel: luciaPrismaContent,
+    luciaPrismaModel: luciaPrismaContent,
     input: ['tests/prisma/test1.prisma', 'tests/prisma/test2.prisma'],
     output: 'tests/prisma/testMerge2.prisma',
   });

diff --git a/packages/next-prisma/tests/prisma/testMerge1.prisma b/packages/next-prisma/tests/prisma/testMerge1.prisma
@@ -1,9 +1,9 @@
 // *** GENERATED BY next-prisma :: DO NOT EDIT ***
 model User {
-	id Int @unique
-	name String 
+	id String @unique
 	content Int 
 	desc String 
+	name String 
 }
 model Post {
 	id String @unique

diff --git a/packages/next-prisma/tests/prisma/testMerge2.prisma b/packages/next-prisma/tests/prisma/testMerge2.prisma
@@ -1,9 +1,9 @@
 // *** GENERATED BY next-prisma :: DO NOT EDIT ***
 model User {
-	id Int @unique
-	name Int 
+	id String @unique
 	content String 
 	desc String 
+	name String 
 }
 model Post {
 	id String @unique