@nestledjs/api 0.0.1 → 0.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestledjs/api",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "generators": "./generators.json",
   "type": "commonjs",
   "main": "./src/index.js",
@@ -16,6 +16,15 @@
     "access": "public"
   },
   "dependencies": {
-    "tslib": "^2.3.0"
+    "tslib": "^2.3.0",
+    "@nx/devkit": "21.2.0",
+    "@nx/js": "21.2.0",
+    "@prisma/internals": "^6.9.0",
+    "pluralize": "^8.0.0",
+    "dotenv": "16.4.5",
+    "pg": "^8.13.0"
+  },
+  "peerDependencies": {
+    "@nestledjs/utils": "0.0.3"
   }
 }

package/src/core/files/models/src/lib/generate-models.ts__tmpl__

@@ -170,8 +170,15 @@ function generateModels(models: readonly any[], enums: readonly any[]): string {
       const originalType = field.type
       // const isRequired = field.isRequired // Natively supported by DMMF
 
-      // DEBUG LINE
-      // console.log(`DEBUG: Processing field: ${model.name}.${field.name}, Kind: ${field.kind}, OriginalType: ${originalType}, IsList: ${isList}, IsRequired: ${isRequired}`);
+      // ALWAYS LOG: Print every field processed for debugging
+      console.log('*** FIELD DEBUG ***', {
+        model: model.name,
+        field: field.name,
+        kind: field.kind,
+        type: field.type,
+        isList: field.isList,
+        isRequired: field.isRequired,
+      });
 
       let tsType = originalType
 
@@ -248,9 +255,18 @@ function generateModels(models: readonly any[], enums: readonly any[]): string {
       // For simplicity, let's assume if it's a relation object, it's the Type itself.
       // Partial is useful for inputs or update DTOs, less so for GQL ObjectTypes unless specifically designed.
       let finalTsType = tsType
-      if (isRelation && !isList) {
-        // Single related object
-        finalTsType = `${tsType}` // Not Partial<Type> by default for GQL object types
+      if (isRelation) {
+        // For relations, always use Partial<Type> (for both single and list)
+        finalTsType = `Partial<${tsType}>`;
+        // DEBUG: Log relation fields
+        console.log('DEBUG: Relation field detected:', {
+          model: model.name,
+          field: field.name,
+          kind: field.kind,
+          type: field.type,
+          isList: field.isList,
+          isRequired: field.isRequired,
+        });
       }
 
       // Never add '| null' to any field

package/src/setup/generator.ts

@@ -93,6 +93,7 @@ export async function apiSetupGenerator(tree: Tree): Promise<GeneratorCallback>
     'type-graphql',
     'express',
     'unrs-resolver',
+    '@swc/core',
   ]
   updatePnpmWorkspaceConfig(tree, { onlyBuiltDependencies: packagesToBuild })
 

package/src/workspace-setup/generator.spec.ts

@@ -9,6 +9,7 @@ const {
   runPrismaSeed,
   runPrismaSetup,
   runGraphQLTypeGeneration,
+  sleep,
 } = vi.hoisted(() => {
   return {
     canConnect: vi.fn(),
@@ -19,6 +20,7 @@ const {
     runPrismaSeed: vi.fn(),
     runPrismaSetup: vi.fn(),
     runGraphQLTypeGeneration: vi.fn(),
+    sleep: vi.fn(),
   }
 })
 
@@ -31,6 +33,7 @@ vi.mock('./lib/helpers', () => ({
   runPrismaSeed,
   runPrismaSetup,
   runGraphQLTypeGeneration,
+  sleep,
 }))
 
 import generator from './generator'
@@ -47,7 +50,7 @@ describe('workspace-setup generator', () => {
 
   it('should throw an error if DATABASE_URL is not on localhost', async () => {
     process.env.DATABASE_URL = 'some-remote-db'
-    await expect(generator()).rejects.toThrow("Can't connect to DATABASE_URL if it's not on localhost")
+    await expect(generator()).rejects.toThrow("Refusing to connect to non-local database: some-remote-db")
   })
 
   it('should run setup without docker if already connected', async () => {
@@ -58,7 +61,7 @@ describe('workspace-setup generator', () => {
 
     expect(ensureDotEnv).toHaveBeenCalled()
     expect(canConnect).toHaveBeenCalledWith('localhost:5432')
-    expect(ensureDockerIsRunning).not.toHaveBeenCalled()
+    expect(ensureDockerIsRunning).toHaveBeenCalled()
     expect(ensureDockerComposeIsRunning).not.toHaveBeenCalled()
     expect(runPrismaSetup).toHaveBeenCalled()
     expect(runGraphQLTypeGeneration).toHaveBeenCalled()
@@ -79,4 +82,4 @@ describe('workspace-setup generator', () => {
     expect(runGraphQLTypeGeneration).toHaveBeenCalled()
     expect(runPrismaSeed).toHaveBeenCalled()
   })
-}) 
+})

package/src/workspace-setup/generator.ts

@@ -5,45 +5,53 @@ import {
   ensureDockerIsRunning,
   ensureDotEnv,
   log,
+  runGraphQLTypeGeneration,
   runPrismaSeed,
   runPrismaSetup,
-  runGraphQLTypeGeneration,
+  sleep,
 } from './lib/helpers'
 
 export default async function () {
-  log('Setting up workspace ')
+  log('Setting up workspace')
 
   ensureDotEnv()
   require('dotenv').config()
-  
+
   const DATABASE_URL = process.env.DATABASE_URL
 
   if (!DATABASE_URL) {
-    throw new Error(`Please provide DATABASE_URL env var`)
+    throw new Error('Please provide DATABASE_URL env var')
   }
 
   if (!DATABASE_URL.includes('localhost')) {
-    throw new Error(`Can't connect to DATABASE_URL if it's not on localhost`)
+    throw new Error(`Refusing to connect to non-local database: ${DATABASE_URL}`)
   }
 
+  ensureDockerIsRunning()
+
   const connected = await canConnect(DATABASE_URL)
 
   if (!connected) {
-    ensureDockerIsRunning()
     await ensureDockerComposeIsRunning()
+    // Extra safety delay — DB might show "healthy" before accepting connections
+    await sleep(2000)
   }
 
   try {
+    log('Applying Prisma migrations...')
     runPrismaSetup()
-    await new Promise(resolve => setTimeout(resolve, 2000))
-    
-    // Generate GraphQL types from Prisma schema
+
+    await sleep(2000)
+
     log('Generating GraphQL types from Prisma schema...')
     runGraphQLTypeGeneration()
-    
+
+    log('Seeding database...')
     runPrismaSeed()
-    log('Workspace setup done!')
+
+    log('✅ Workspace setup complete')
   } catch (error) {
-    console.error('Error during workspace setup:', error.message)
+    console.error('❌ Error during workspace setup:', error.message)
+    process.exit(1)
   }
 }

package/src/workspace-setup/lib/helpers.ts

@@ -2,6 +2,7 @@ import { execSync } from 'child_process'
 import { existsSync, readFileSync, writeFileSync } from 'fs'
 import { basename } from 'path'
 import { Client } from 'pg'
+import { workspaceRoot } from '@nx/devkit'
 
 export const MAX_RETRIES = 30
 export const WORKSPACE_NAME = basename(process.cwd())
@@ -40,10 +41,7 @@ export function ensureDockerIsRunning() {
 
 export function isDockerComposeRunning(): boolean {
   try {
-    const res = execSync(`docker compose -f ${DOCKER_COMPOSE_FILE} top`, {
-      stdio: ['inherit', 'inherit'],
-    })
-
+    const res = execSync('pnpm run docker:ps', { stdio: ['inherit', 'inherit'], cwd: workspaceRoot })
     if (res) {
       log('Docker Compose is Running')
       return true
@@ -57,15 +55,23 @@ export function isDockerComposeRunning(): boolean {
 export async function ensureDockerComposeIsRunning() {
   const isRunning = isDockerComposeRunning()
   if (isRunning) {
+    log('Docker Compose already running')
     return true
   }
 
+  log('Starting Docker Compose...')
+  try {
+    execSync('pnpm run docker:up', { stdio: 'inherit', cwd: workspaceRoot })
+  } catch (e) {
+    throw new Error(`Failed to start Docker Compose: ${e.message}`)
+  }
+
   try {
-    execSync(`docker compose -f ${DOCKER_COMPOSE_FILE} up -d`, { stdio: 'ignore' })
     await waitForConnection()
-    log('Docker Compose Started')
+    log('Docker Compose Started and DB connection confirmed')
   } catch {
-    throw new Error(`Make sure Docker Compose is running`)
+    execSync('pnpm run docker:logs', { stdio: 'inherit', cwd: workspaceRoot })
+    throw new Error(`Database failed to start or respond in time`)
   }
 }
 
@@ -84,11 +90,12 @@ export function ensureDotEnv() {
 
 export function runPrismaSetup() {
   try {
-    execSync('pnpm prisma:apply', { stdio: 'ignore' })
+    execSync('pnpm prisma:apply', { stdio: 'inherit', cwd: workspaceRoot })
     log('Prisma Setup is Done')
     return true
-  } catch {
-    throw new Error(`There was an issue running 'pnpm prisma:apply'`)
+  } catch (e) {
+    execSync('pnpm run docker:logs', { stdio: 'inherit', cwd: workspaceRoot })
+    throw new Error(`There was an issue running 'pnpm prisma:apply': ${e.message}`)
   }
 }
 

package/vite.config.mts

@@ -1,18 +1,12 @@
 /// <reference types="vitest" />
 import { defineConfig } from 'vite'
-import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin'
 import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin'
-import path from 'path'
+import tsconfigPaths from 'vite-tsconfig-paths'
 
 export default defineConfig(() => ({
   root: __dirname,
   cacheDir: '../../node_modules/.vite/generators/api',
-  plugins: [nxCopyAssetsPlugin(['*.md'])],
-  resolve: {
-    alias: {
-      '@nestledjs/utils': path.resolve(__dirname, '../../dist/generators/utils/src/index.js'),
-    },
-  },
+  plugins: [nxCopyAssetsPlugin(['*.md']), tsconfigPaths()],
   // Uncomment this if you are using workers.
   // worker: {
   //  plugins: [ nxViteTsPaths() ],