@nestledjs/api 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestledjs/api",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "generators": "./generators.json",
   "type": "commonjs",
   "main": "./src/index.js",

package/src/config/files/src/lib/config.service.ts__tmpl__

@@ -62,4 +62,12 @@ export class ConfigService {
       },
     }
   }
+
+  get prismaOptimizeEnabled(): boolean {
+    return this.config.get<boolean>('prisma.optimize.enabled') ?? false
+  }
+
+  get prismaOptimizeApiKey(): string | undefined {
+    return this.config.get<string>('prisma.optimize.apiKey')
+  }
 }

package/src/config/files/src/lib/configuration.ts__tmpl__

@@ -30,4 +30,10 @@ export const configuration = () => ({
     user: process.env['SMTP_USER'],
     pass: process.env['SMTP_PASS'],
   },
+  prisma: {
+    optimize: {
+      enabled: process.env['OPTIMIZE_ENABLED'] === 'true',
+      apiKey: process.env['OPTIMIZE_API_KEY'],
+    },
+  },
 })

package/src/core/files/data-access/src/lib/api-core-data-access.module.ts__tmpl__

@@ -1,8 +1,10 @@
 import { Module } from '@nestjs/common'
+import { ConfigModule } from '@<%= npmScope %>/api/config'
 
 import { ApiCoreDataAccessService } from './api-core-data-access.service'
 
 @Module({
+  imports: [ConfigModule],
   providers: [ApiCoreDataAccessService],
   exports: [ApiCoreDataAccessService],
 })

package/src/core/files/data-access/src/lib/api-core-data-access.service.ts__tmpl__

@@ -1,14 +1,14 @@
 import { Injectable, OnModuleDestroy, OnModuleInit } from '@nestjs/common'
 import { Prisma, PrismaClient } from '@<%= npmScope %>/api/prisma'
+import { ConfigService } from '@<%= npmScope %>/api/config'
 import { CorePagingInput } from './dto/core-paging.input'
-import { withOptimize } from '@prisma/extension-optimize'
 
 @Injectable()
 export class ApiCoreDataAccessService
   extends PrismaClient
   implements OnModuleInit, OnModuleDestroy
 {
-  constructor() {
+  constructor(private readonly configService: ConfigService) {
     const config: Prisma.PrismaClientOptions = {
       datasources: {
         db: { url: `${process.env['DATABASE_URL']}?connection_limit=30` },
@@ -19,18 +19,26 @@ export class ApiCoreDataAccessService
           ? [{ emit: 'event', level: 'query' }]
           : [{ emit: 'event', level: 'warn' }],
     }
+
+    // Must call super first before accessing this
     super(config)
     this.queryCount = 0
 
-    // Only add Prisma Optimize extension in development
-    if (process.env['OPTIMIZE_API_KEY'] && process.env['USE_OPTIMIZE'] === 'true') {
-      const apiKey = process.env['OPTIMIZE_API_KEY']
-      if (!apiKey) {
-        console.warn('Not Running Prisma Optimize - No API Key Set')
-      }
+    // Check for Prisma Optimize setup using config service
+    const optimizeEnabled = configService.prismaOptimizeEnabled
+    const optimizeApiKey = configService.prismaOptimizeApiKey
 
-      const extendedClient = new PrismaClient(config).$extends(withOptimize({ apiKey }))
+    if (optimizeEnabled && optimizeApiKey) {
+      console.log('🚀 Prisma Optimize enabled with API key')
+      const { withOptimize } = require('@prisma/extension-optimize')
+      const extendedClient = new PrismaClient(config).$extends(
+        withOptimize({ apiKey: optimizeApiKey })
+      )
       Object.assign(this, extendedClient)
+    } else {
+      if (optimizeEnabled && !optimizeApiKey) {
+        console.warn('⚠️  OPTIMIZE_ENABLED is true but OPTIMIZE_API_KEY is not set')
+      }
     }
   }
 
@@ -85,8 +93,8 @@ export class ApiCoreDataAccessService
       const terms = trimmedSearch.includes(' ')
         ? trimmedSearch.split(' ')
         : [trimmedSearch].filter(Boolean)
-      const searchFilters = terms.map((term) => ({
-        OR: searchFields.map((field) => ({
+      const searchFilters = terms.map(term => ({
+        OR: searchFields.map(field => ({
           [field]: { contains: term, mode: Prisma.QueryMode.insensitive },
         })),
       }))
@@ -103,3 +111,4 @@ export class ApiCoreDataAccessService
     }
   }
 }
+

package/src/core/files/feature/src/lib/config/configuration.ts__tmpl__

@@ -1,32 +0,0 @@
-export const configuration = () => ({
-  prefix: 'api',
-  environment: process.env['NODE_ENV'],
-  host: process.env['HOST'],
-  port: parseInt(process.env['PORT'] ?? '3000', 10),
-  apiUrl: process.env['API_URL'],
-  api: {
-    cookie: {
-      name: process.env['API_COOKIE_NAME'],
-      options: {
-        domain: process.env['API_COOKIE_DOMAIN'],
-        httpOnly: true,
-      },
-    },
-    cors: {
-      origin: [process.env['WEB_URL']],
-    },
-  },
-  siteUrl: process.env['SITE_URL'] || process.env['API_URL']?.replace('/api', ''),
-  app: {
-    email: process.env['APP_EMAIL'],
-    supportEmail: process.env['APP_SUPPORT_EMAIL'],
-    adminEmails: process.env['APP_ADMIN_EMAILS'],
-    name: process.env['APP_NAME'],
-  },
-  smtp: {
-    host: process.env['SMTP_HOST'],
-    port: process.env['SMTP_PORT'],
-    user: process.env['SMTP_USER'],
-    pass: process.env['SMTP_PASS'],
-  },
-})

package/src/core/files/feature/src/lib/config/validation.ts__tmpl__

@@ -1,25 +0,0 @@
-import * as Joi from 'joi'
-
-export const validationSchema = Joi.object({
-  NODE_ENV: Joi.string().valid('development', 'production', 'test'),
-  HOST: Joi.string().alphanum().default('localhost'),
-  PORT: Joi.number().default(3000),
-  WEB_PORT: Joi.number().default(4200),
-  WEB_URL: Joi.string().default(
-    `http://${process.env['HOST'] || 'localhost'}:${process.env['WEB_PORT']}`
-  ),
-  API_COOKIE_DOMAIN: Joi.string().default('localhost'),
-  API_COOKIE_NAME: Joi.string().default('__session'),
-  API_URL: Joi.string().default(
-    `http://${process.env['HOST'] || 'localhost'}:${process.env['PORT']}/api`
-  ),
-  APP_NAME: Joi.string().required(),
-  APP_EMAIL: Joi.string().email().required(),
-  APP_SUPPORT_EMAIL: Joi.string().email().required(),
-  APP_ADMIN_EMAILS: Joi.string().required(),
-  SITE_URL: Joi.string().uri().required(),
-  SMTP_HOST: Joi.string().required(),
-  SMTP_PORT: Joi.string().required(),
-  SMTP_USER: Joi.string().required(),
-  SMTP_PASS: Joi.string().required(),
-})