feat(nuxt): fix schema import and add missing newline at end of file

oku-ui · Dec 21, 2023 · b60bb60 · b60bb60
1 parent 7f2ecb7
commit b60bb60
Showing 5 changed files with 10 additions and 20 deletions.
diff --git a/packages/nuxt/playground/pergel/test/drizzle/migrations/meta/0000_snapshot.json b/packages/nuxt/playground/pergel/test/drizzle/migrations/meta/0000_snapshot.json
@@ -98,4 +98,4 @@
     "tables": {},
     "columns": {}
   }
-}
+}
diff --git a/packages/nuxt/playground/pergel/test/drizzle/migrations/meta/_journal.json b/packages/nuxt/playground/pergel/test/drizzle/migrations/meta/_journal.json
@@ -10,4 +10,4 @@
       "breakpoints": true
     }
   ]
-}
+}
diff --git a/packages/nuxt/playground/pergel/test/drizzle/seeds/index.ts b/packages/nuxt/playground/pergel/test/drizzle/seeds/index.ts
@@ -29,7 +29,7 @@ async function runMigrationsAndSeed() {
 
   if (dbDrop) {
     console.warn('Dropping database...')
-    await db.execute(sql/* SQL */ `
+    await db.execute(sql/* SQL */`
 DROP SCHEMA IF EXISTS drizzle CASCADE;
 DROP SCHEMA IF EXISTS public CASCADE;
 CREATE SCHEMA public;
@@ -51,4 +51,3 @@ CREATE EXTENSION IF NOT EXISTS "uuid-ossp" SCHEMA "public";
 }
 
 runMigrationsAndSeed()
-
diff --git a/packages/nuxt/playground/server/api/pg.ts b/packages/nuxt/playground/server/api/pg.ts
@@ -1,7 +1,6 @@
 export default defineEventHandler(async () => {
   const connect = await pergelTest().drizzle().postgresjs().connect({})
-  const result = await connect.execute(sql`SELECT * FROM users`)
-
+  const result = await connect.select().from(tablesTest.user)
   return {
     statusCode: 200,
     body: JSON.stringify(result),

diff --git a/packages/nuxt/src/runtime/modules/drizzle/index.ts b/packages/nuxt/src/runtime/modules/drizzle/index.ts
@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync } from 'node:fs'
-import { join, resolve } from 'node:path'
-import { addImportsDir, addServerImportsDir, addTemplate, createResolver } from '@nuxt/kit'
-import { camelCase } from 'scule'
+import { resolve } from 'node:path'
+import { addImportsDir, addServerImportsDir, createResolver } from '@nuxt/kit'
+import { camelCase, pascalCase } from 'scule'
 import { definePergelModule } from '../../core/definePergel'
 import { useNitroImports } from '../../core/utils/useImports'
 import type { ResolvedDrizzleConfig } from './types'
@@ -88,24 +88,16 @@ export default definePergelModule<ResolvedDrizzleConfig>({
       moduleOptions.options.schemaPath,
     )
 
-    const template = addTemplate({
-      filename: join(nuxt._pergel._module.dir.module, 'index.ts'),
-      write: true,
-      getContents: () => /* ts */`// Pergel Drizzle Schema - oku-ui.com
-       export * from '${join(moduleOptions.options.schemaPath)}'
-    `,
-    })
-
     addImportsDir(resolver.resolve('./drivers/postgres'))
     addServerImportsDir(resolver.resolve('./drivers/postgres'))
 
     useNitroImports(nuxt, {
       presets: [
         {
-          from: template.dst,
+          from: `${nuxt._pergel._module.options.schemaPath}`,
           imports: [
             {
-              as: `tables${projectName}`,
+              as: `tables${pascalCase(projectName)}`,
               name: '*',
             },
           ],
@@ -169,7 +161,7 @@ export default definePergelModule<ResolvedDrizzleConfig>({
           function drizzle() {
             return {
               ${returnDriver}
-              schema: tables${projectName},
+              schema: tables${pascalCase(projectName)},
             }
           }
         `,
-Original file line number
+Diff line change
@@ @@ -98,4 +98,4 @@ @@
         "tables": {},
         "columns": {}
       }
-    }
+    }