@nestledjs/api 0.0.6 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestledjs/api",
-  "version": "0.0.6",
+  "version": "0.0.9",
   "generators": "./generators.json",
   "type": "commonjs",
   "main": "./src/index.js",
@@ -25,6 +25,6 @@
     "pg": "^8.13.0"
   },
   "peerDependencies": {
-    "@nestledjs/utils": "0.0.2"
+    "@nestledjs/utils": "0.0.9"
   }
 }

package/src/account/generator.d.ts

@@ -0,0 +1,3 @@
+import { GeneratorCallback, Tree } from '@nx/devkit';
+import { ApiAccountGeneratorSchema } from './schema';
+export default function generateLibraries(tree: Tree, options?: ApiAccountGeneratorSchema): Promise<GeneratorCallback>;

package/src/account/generator.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = generateLibraries;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const utils_1 = require("@nestledjs/utils");
+function generateLibraries(tree_1) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* (tree, options = {}) {
+        const templateRootPath = (0, devkit_1.joinPathFragments)(__dirname, './files');
+        const overwrite = options.overwrite === true;
+        yield (0, utils_1.apiLibraryGenerator)(tree, { name: 'account', overwrite }, templateRootPath, 'data-access');
+        yield (0, utils_1.apiLibraryGenerator)(tree, { name: 'account', overwrite }, templateRootPath, 'feature', true);
+        yield (0, devkit_1.formatFiles)(tree);
+        return () => {
+            (0, devkit_1.installPackagesTask)(tree);
+        };
+    });
+}
+//# sourceMappingURL=generator.js.map

package/src/account/generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../generators/api/src/account/generator.ts"],"names":[],"mappings":";;AAIA,oCAeC;;AAnBD,uCAAyG;AACzG,4CAAsD;AAGtD,SAA8B,iBAAiB;iEAC7C,IAAU,EACV,UAAqC,EAAE;QAEvC,MAAM,gBAAgB,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,SAAS,CAAC,CAAA;QAChE,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,KAAK,IAAI,CAAA;QAE5C,MAAM,IAAA,2BAAmB,EAAC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAA;QAChG,MAAM,IAAA,2BAAmB,EAAC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,gBAAgB,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;QAElG,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAA;QAEvB,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAA;QAC3B,CAAC,CAAA;IACH,CAAC;CAAA"}

package/src/app/generator.d.ts

@@ -0,0 +1,6 @@
+import { Tree } from '@nx/devkit';
+interface Schema {
+    [key: string]: unknown;
+}
+export default function (tree: Tree, schema: Schema): Promise<void>;
+export {};

package/src/app/generator.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const child_process_1 = require("child_process");
+const path = tslib_1.__importStar(require("path"));
+const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
+/**
+ * Removes specific compiler options from tsconfig.app.json to use the settings from tsconfig.base.json
+ * @param tree The file system tree
+ */
+function updateAppTsConfig(tree) {
+    const tsConfigPath = 'apps/api/tsconfig.app.json';
+    if (tree.exists(tsConfigPath)) {
+        (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
+            if (json.compilerOptions) {
+                // Remove specific options to use the ones from tsconfig.base.json
+                delete json.compilerOptions.module;
+                delete json.compilerOptions.moduleResolution;
+                delete json.compilerOptions.emitDecoratorMetadata;
+                delete json.compilerOptions.experimentalDecorators;
+            }
+            return json;
+        });
+    }
+    else {
+        console.warn(`tsconfig.app.json not found at: ${tsConfigPath}`);
+    }
+}
+function default_1(tree, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        try {
+            // Get the workspace root directory
+            const workspaceRoot = tree.root;
+            // Create apps directory if it doesn't exist
+            if (!tree.exists('apps')) {
+                tree.write('apps/.gitkeep', '');
+            }
+            // Run the Nx generator command directly from the workspace root with proper workspace layout
+            (0, child_process_1.execSync)('nx g @nx/nest:application --name api --directory apps/api --no-interactive', {
+                stdio: 'inherit',
+                cwd: workspaceRoot,
+            });
+            // Wait a bit for files to be created
+            yield new Promise((resolve) => setTimeout(resolve, 2000));
+            // Update tsconfig.app.json to remove specific compiler options
+            updateAppTsConfig(tree);
+            // Generate all files according to the template folder structure
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files'), path.join('apps', 'api'), Object.assign(Object.assign({}, schema), { tmpl: '', npmScope: (0, get_npm_scope_1.getNpmScope)(tree) }));
+            // Add dev:api script to package.json
+            (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+                if (!json.scripts) {
+                    json.scripts = {};
+                }
+                json.scripts['dev:api'] = 'nx serve api --skip-nx-cache';
+                return json;
+            });
+            // Update the build target in apps/api/project.json to use custom webpack command
+            const projectJsonPath = path.join('apps', 'api', 'project.json');
+            if (tree.exists(projectJsonPath)) {
+                (0, devkit_1.updateJson)(tree, projectJsonPath, (json) => {
+                    json.targets = json.targets || {};
+                    json.targets.build = {
+                        executor: 'nx:run-commands',
+                        options: {
+                            command: 'NODE_ENV=production webpack-cli --config apps/api/webpack.config.js',
+                        },
+                        configurations: {
+                            development: {
+                                command: 'NODE_ENV=development webpack-cli --config apps/api/webpack.config.js',
+                            },
+                        },
+                    };
+                    return json;
+                });
+            }
+            else {
+                console.warn(`project.json not found at: ${projectJsonPath}`);
+            }
+            // Optionally, delete the unused default app files if they exist
+            const targetPath = path.join('apps', 'api', 'src');
+            const filesToDelete = [path.join(targetPath, 'assets'), path.join(targetPath, 'app')];
+            filesToDelete.forEach((filePath) => {
+                if (tree.exists(filePath)) {
+                    tree.delete(filePath);
+                }
+            });
+        }
+        catch (error) {
+            console.error('Error generating API app:', error);
+            throw error;
+        }
+    });
+}
+//# sourceMappingURL=generator.js.map

package/src/app/generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../generators/api/src/app/generator.ts"],"names":[],"mappings":"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"}

package/src/config/files/src/index.ts__tmpl__

@@ -1,3 +1,4 @@
+export * from './lib/config.module'
 export * from './lib/config.service'
 export * from './lib/configuration'
 export * from './lib/validation'

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

@@ -0,0 +1,8 @@
+import { Module } from '@nestjs/common'
+import { ConfigService } from './config.service'
+
+@Module({
+  providers: [ConfigService],
+  exports: [ConfigService],
+})
+export class ConfigModule {}

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

@@ -1,10 +1,10 @@
 import { Injectable } from '@nestjs/common'
-import { ConfigService } from '@nestjs/config'
+import { ConfigService as NestConfigService } from '@nestjs/config'
 import { CookieOptions } from 'express'
 
 @Injectable()
-export class ApiConfigService {
-  constructor(public readonly config: ConfigService) {}
+export class ConfigService {
+  constructor(public readonly config: NestConfigService) {}
 
   get apiUrl(): string {
     return this.config.getOrThrow<string>('apiUrl')

package/src/config/generator.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+import { ApiConfigGeneratorSchema } from './schema';
+export default function generateLibraries(tree: Tree, options?: ApiConfigGeneratorSchema): Promise<() => void>;

package/src/config/generator.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = generateLibraries;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const utils_1 = require("@nestledjs/utils");
+function generateLibraries(tree_1) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* (tree, options = {}) {
+        const templateRootPath = (0, devkit_1.joinPathFragments)(__dirname, './files');
+        const overwrite = options.overwrite === true;
+        yield (0, utils_1.apiLibraryGenerator)(tree, { name: 'config', overwrite }, templateRootPath);
+        yield (0, devkit_1.formatFiles)(tree);
+        return () => {
+            (0, devkit_1.installPackagesTask)(tree);
+        };
+    });
+}
+//# sourceMappingURL=generator.js.map

package/src/config/generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../generators/api/src/config/generator.ts"],"names":[],"mappings":";;AAIA,oCAWC;;AAfD,uCAAsF;AACtF,4CAAsD;AAGtD,SAA8B,iBAAiB;iEAAC,IAAU,EAAE,UAAoC,EAAE;QAChG,MAAM,gBAAgB,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,SAAS,CAAC,CAAA;QAChE,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,KAAK,IAAI,CAAA;QAE5C,MAAM,IAAA,2BAAmB,EAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,gBAAgB,CAAC,CAAA;QAEhF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAA;QAEvB,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAA;QAC3B,CAAC,CAAA;IACH,CAAC;CAAA"}

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

@@ -30,7 +30,10 @@ function getPrismaImportPath(): string {
     const schemaPathSetting = packageJson.prisma?.schema || ''
 
     // Updated logic: if the schema path includes 'libs/api/prisma' (or similar new structure)
-    if (schemaPathSetting.includes('libs/api/prisma') || schemaPathSetting.includes('prisma/src/lib')) {
+    if (
+      schemaPathSetting.includes('libs/api/prisma') ||
+      schemaPathSetting.includes('prisma/src/lib')
+    ) {
       return '@<%= npmScope %>/api/prisma'
     }
 
@@ -101,7 +104,7 @@ async function main() {
 
   // Read and parse all schema files for DMMF
   console.log('Reading Prisma schema files for DMMF generation...')
-  const schemaFiles = readdirSync(schemaDir).filter((file) => file.endsWith('.prisma'))
+  const schemaFiles = readdirSync(schemaDir).filter(file => file.endsWith('.prisma'))
 
   if (schemaFiles.length === 0) {
     console.error(`Error: No .prisma files found in directory ${schemaDir}`)
@@ -142,21 +145,25 @@ async function main() {
 
 function generateModels(models: readonly any[], enums: readonly any[]): string {
   // Check if any model field uses Float
-  const usesFloat = models.some(model => model.fields.some((field: { type: string }) => field.type === 'Float'));
+  const usesFloat = models.some(model =>
+    model.fields.some((field: { type: string }) => field.type === 'Float'),
+  )
   let output = `import { Field, ObjectType${usesFloat ? ', Float' : ''}, Int } from '@nestjs/graphql';\n`
   output += `import { GraphQLJSONObject } from 'graphql-type-json';\n`
 
   // Check if any model field uses Decimal
-  const usesDecimal = models.some(model => model.fields.some((field: { type: string }) => field.type === 'Decimal'));
+  const usesDecimal = models.some(model =>
+    model.fields.some((field: { type: string }) => field.type === 'Decimal'),
+  )
   if (usesDecimal) {
-    output += `import { Decimal } from '@prisma/client/runtime/library';\n`;
-    output += `import { GraphQLDecimal } from 'prisma-graphql-type-decimal';\n`;
+    output += `import { Decimal } from '@prisma/client/runtime/library';\n`
+    output += `import { GraphQLDecimal } from 'prisma-graphql-type-decimal';\n`
   }
   // Ensure Prisma and enums are imported correctly
-  const enumNames = enums.map((e) => e.name)
+  const enumNames = enums.map(e => e.name)
   output += `import { Prisma } from '${prismaImportPath}';\n`
   if (enumNames.length > 0) {
-    output += `import { ${enumNames.join(', ')} } from './enums';\n`;
+    output += `import { ${enumNames.join(', ')} } from './enums';\n`
   }
   output += `\n`
 
@@ -168,6 +175,7 @@ function generateModels(models: readonly any[], enums: readonly any[]): string {
       const isEnum = field.kind === 'enum'
       const isRelation = field.kind === 'object'
       const originalType = field.type
+      const isFieldRequired = isRelation ? false : field.isRequired
       // const isRequired = field.isRequired // Natively supported by DMMF
 
       // ALWAYS LOG: Print every field processed for debugging
@@ -178,7 +186,7 @@ function generateModels(models: readonly any[], enums: readonly any[]): string {
         type: field.type,
         isList: field.isList,
         isRequired: field.isRequired,
-      });
+      })
 
       let tsType = originalType
 
@@ -208,8 +216,10 @@ function generateModels(models: readonly any[], enums: readonly any[]): string {
 
       let decorator = '@Field('
       const options: string[] = []
-      // Always add nullable: true for all fields
-      options.push('nullable: true')
+      // Only add nullable: true for optional fields
+      if (!isFieldRequired) {
+        options.push('nullable: true')
+      }
 
       // Always declare the type in the decorator
       let decoratorType = ''
@@ -238,26 +248,26 @@ function generateModels(models: readonly any[], enums: readonly any[]): string {
         else if (isEnum || isRelation) decoratorType = `() => ${originalType}`
         else if (originalType === 'DateTime') decoratorType = '() => Date'
         else if (originalType === 'Boolean') decoratorType = '() => Boolean'
-        else if (originalType.toLowerCase() === 'string' || originalType === 'ID') decoratorType = '() => String'
+        else if (originalType.toLowerCase() === 'string' || originalType === 'ID')
+          decoratorType = '() => String'
         else decoratorType = `() => ${originalType}`
       }
 
       decorator += decoratorType
-      decorator += `, { ${options.join(', ')} }`
+      if (options.length > 0) {
+        decorator += `, { ${options.join(', ')} }`
+      }
       decorator += ')'
 
       output += `  ${decorator}\n`
-      // Make all fields optional regardless of isRequired value
-      const optionalMarker = '?' // Always add a question mark
+      // Add optional marker (?) for non-required fields, or ! for required fields
+      const typeMarker = isFieldRequired ? '!' : '?'
 
       // For relations, use Partial<Type> only if it's not required and can be partially loaded
-      // Otherwise, if it's a relation, it's either the full Type or Type[] or null/undefined.
-      // 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) {
         // For relations, always use Partial<Type> (for both single and list)
-        finalTsType = `Partial<${tsType}>`;
+        finalTsType = `Partial<${tsType}>`
         // DEBUG: Log relation fields
         console.log('DEBUG: Relation field detected:', {
           model: model.name,
@@ -266,11 +276,12 @@ function generateModels(models: readonly any[], enums: readonly any[]): string {
           type: field.type,
           isList: field.isList,
           isRequired: field.isRequired,
-        });
+        })
       }
 
-      // Never add '| null' to any field
-      output += `  ${field.name}${optionalMarker}: ${finalTsType}${isList ? '[]' : ''} | null;\n\n`
+      // Add null union type only for non-required fields
+      const nullUnion = isFieldRequired ? '' : ' | null'
+      output += `  ${field.name}${typeMarker}: ${finalTsType}${isList ? '[]' : ''}${nullUnion};\n\n`
     }
     output += `}\n\n`
   }
@@ -282,11 +293,11 @@ function generateEnums(enums: readonly any[]): string {
   output += "import { registerEnumType } from '@nestjs/graphql';\n"
 
   if (enums.length > 0) {
-    const enumNames = enums.map((e) => e.name).join(', ')
+    const enumNames = enums.map(e => e.name).join(', ')
     output += `import { ${enumNames} } from '${prismaImportPath}';\n\n`
     output += `export { ${enumNames} };\n\n`
 
-    enums.forEach((enumType) => {
+    enums.forEach(enumType => {
       output += `registerEnumType(${enumType.name}, { name: '${enumType.name}' });\n\n`
     })
   } else {
@@ -304,7 +315,7 @@ export * from './core-paging.model'
 `
 }
 
-main().catch((e) => {
+main().catch(e => {
   console.error('Error during generation:', e)
   process.exit(1)
 })

package/src/core/generator.d.ts

@@ -0,0 +1,3 @@
+import { GeneratorCallback, Tree } from '@nx/devkit';
+import { ApiCoreGeneratorSchema } from './schema';
+export default function generateLibraries(tree: Tree, options?: ApiCoreGeneratorSchema): Promise<GeneratorCallback>;

package/src/core/generator.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = generateLibraries;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const utils_1 = require("@nestledjs/utils");
+function generateLibraries(tree_1) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* (tree, options = {}) {
+        const templateRootPath = (0, devkit_1.joinPathFragments)(__dirname, './files');
+        const overwrite = options.overwrite === true;
+        const dependencies = {
+            'graphql-type-json': '^0.3.2',
+            '@nestjs/graphql': '^12.0.0',
+            '@nestjs/common': '^10.0.0',
+            '@nestjs/passport': '^10.0.0',
+            '@nestjs/axios': '^3.0.0',
+            '@prisma/client': '^6.9.0',
+            '@apollo/server': '^4.9.0',
+        };
+        const devDependencies = {};
+        yield (0, utils_1.installPlugins)(tree, dependencies, devDependencies);
+        yield (0, utils_1.apiLibraryGenerator)(tree, { name: 'core', overwrite }, templateRootPath, 'data-access');
+        yield (0, utils_1.apiLibraryGenerator)(tree, { name: 'core', overwrite }, templateRootPath, 'feature', true);
+        yield (0, utils_1.apiLibraryGenerator)(tree, { name: 'core', overwrite }, templateRootPath, 'models');
+        yield (0, devkit_1.formatFiles)(tree);
+        return () => {
+            (0, devkit_1.installPackagesTask)(tree);
+        };
+    });
+}
+//# sourceMappingURL=generator.js.map

package/src/core/generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../generators/api/src/core/generator.ts"],"names":[],"mappings":";;AAIA,oCA8BC;;AAlCD,uCAAyG;AACzG,4CAAsE;AAGtE,SAA8B,iBAAiB;iEAC7C,IAAU,EACV,UAAkC,EAAE;QAEpC,MAAM,gBAAgB,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,SAAS,CAAC,CAAA;QAChE,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,KAAK,IAAI,CAAA;QAE5C,MAAM,YAAY,GAAG;YACnB,mBAAmB,EAAE,QAAQ;YAC7B,iBAAiB,EAAE,SAAS;YAC5B,gBAAgB,EAAE,SAAS;YAC3B,kBAAkB,EAAE,SAAS;YAC7B,eAAe,EAAE,QAAQ;YACzB,gBAAgB,EAAE,QAAQ;YAC1B,gBAAgB,EAAE,QAAQ;SAC3B,CAAA;QAED,MAAM,eAAe,GAAG,EAAE,CAAA;QAE1B,MAAM,IAAA,sBAAc,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAA;QAEzD,MAAM,IAAA,2BAAmB,EAAC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAA;QAC7F,MAAM,IAAA,2BAAmB,EAAC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,gBAAgB,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;QAC/F,MAAM,IAAA,2BAAmB,EAAC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAA;QAExF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAA;QAEvB,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAA;QAC3B,CAAC,CAAA;IACH,CAAC;CAAA"}

package/src/custom/generator.d.ts

@@ -0,0 +1,24 @@
+import { formatFiles, installPackagesTask, Tree } from '@nx/devkit';
+import { getDMMF } from '@prisma/internals';
+import { addToModules, apiLibraryGenerator, getPrismaSchemaPath, readPrismaSchema } from '@nestledjs/utils';
+import { GenerateCustomGeneratorSchema } from './schema';
+import { execSync } from 'child_process';
+import { getNpmScope } from '@nx/js/src/utils/package-json/get-npm-scope';
+import pluralize from 'pluralize';
+declare const defaultDependencies: {
+    formatFiles: typeof formatFiles;
+    installPackagesTask: typeof installPackagesTask;
+    getDMMF: typeof getDMMF;
+    addToModules: typeof addToModules;
+    apiLibraryGenerator: typeof apiLibraryGenerator;
+    getPrismaSchemaPath: typeof getPrismaSchemaPath;
+    readPrismaSchema: typeof readPrismaSchema;
+    execSync: typeof execSync;
+    getNpmScope: typeof getNpmScope;
+    pluralize: typeof pluralize;
+    join: (...paths: string[]) => string;
+};
+export type CustomGeneratorDependencies = typeof defaultDependencies;
+export declare function customGeneratorLogic(tree: Tree, schema: GenerateCustomGeneratorSchema, dependencies?: CustomGeneratorDependencies): Promise<() => void>;
+export default function (tree: Tree, schema: GenerateCustomGeneratorSchema): Promise<() => void>;
+export {};

package/src/custom/generator.js

@@ -0,0 +1,199 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.customGeneratorLogic = customGeneratorLogic;
+exports.default = default_1;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const internals_1 = require("@prisma/internals");
+const utils_1 = require("@nestledjs/utils");
+const child_process_1 = require("child_process");
+const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
+const pluralize_1 = tslib_1.__importDefault(require("pluralize"));
+const path_1 = require("path");
+// Group all dependencies into a single object
+const defaultDependencies = {
+    formatFiles: devkit_1.formatFiles,
+    installPackagesTask: devkit_1.installPackagesTask,
+    getDMMF: internals_1.getDMMF,
+    addToModules: utils_1.addToModules,
+    apiLibraryGenerator: utils_1.apiLibraryGenerator,
+    getPrismaSchemaPath: utils_1.getPrismaSchemaPath,
+    readPrismaSchema: utils_1.readPrismaSchema,
+    execSync: child_process_1.execSync,
+    getNpmScope: get_npm_scope_1.getNpmScope,
+    pluralize: pluralize_1.default,
+    join: path_1.join,
+};
+function getAllPrismaModels(tree, dependencies) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const prismaPath = dependencies.getPrismaSchemaPath(tree);
+        const prismaSchema = dependencies.readPrismaSchema(tree, prismaPath);
+        if (!prismaSchema) {
+            console.error(`No Prisma schema found at ${prismaPath}`);
+            return [];
+        }
+        try {
+            const dmmf = yield dependencies.getDMMF({ datamodel: prismaSchema });
+            return dmmf.datamodel.models.map((model) => {
+                var _a;
+                const singularPropertyName = model.name.charAt(0).toLowerCase() + model.name.slice(1);
+                const pluralPropertyName = dependencies.pluralize(singularPropertyName);
+                // Create a properly typed fields array
+                const fields = model.fields.map((field) => (Object.assign({ name: field.name, type: field.type, isId: field.isId, isRequired: field.isRequired, isList: field.isList, isUnique: field.isUnique, isReadOnly: field.isReadOnly, isGenerated: field.isGenerated, isUpdatedAt: field.isUpdatedAt, documentation: field.documentation }, field)));
+                // Create and return the model
+                const modelData = {
+                    name: model.name,
+                    pluralName: dependencies.pluralize(model.name),
+                    fields,
+                    primaryField: ((_a = model.fields.find((f) => !f.isId && f.type === 'String')) === null || _a === void 0 ? void 0 : _a.name) || 'name',
+                    modelName: model.name,
+                    modelPropertyName: singularPropertyName,
+                    pluralModelName: dependencies.pluralize(model.name),
+                    pluralModelPropertyName: pluralPropertyName,
+                };
+                return modelData;
+            });
+        }
+        catch (error) {
+            console.error('Error parsing Prisma schema:', error);
+            return [];
+        }
+    });
+}
+function ensureDirExists(tree, path) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        if (!tree.exists(path)) {
+            // Only create the directory, do not write .gitkeep
+            // Directory will be created when a file is written into it
+        }
+    });
+}
+function toKebabCase(str) {
+    return str
+        .replace(/([a-z])([A-Z])/g, '$1-$2')
+        .replace(/([A-Z])([A-Z][a-z])/g, '$1-$2')
+        .toLowerCase();
+}
+function generateCustomFiles(tree, customLibraryRoot, models, npmScope, dependencies) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const defaultDir = dependencies.join(customLibraryRoot, 'src/lib/default');
+        const pluginsDir = dependencies.join(customLibraryRoot, 'src/lib/plugins');
+        yield ensureDirExists(tree, defaultDir);
+        yield ensureDirExists(tree, pluginsDir);
+        // Only write .gitkeep in pluginsDir
+        tree.write(dependencies.join(pluginsDir, '.gitkeep'), '');
+        for (const model of models) {
+            const kebabModel = toKebabCase(model.modelName);
+            const modelFolder = dependencies.join(defaultDir, kebabModel);
+            if (tree.exists(modelFolder)) {
+                // Skip if model folder already exists
+                continue;
+            }
+            yield ensureDirExists(tree, modelFolder);
+            // Generate service.ts
+            const serviceContent = `import { Injectable } from '@nestjs/common'
+
+@Injectable()
+export class ${model.modelName}Service {
+  // Empty for now; will override or extend later if needed
+}
+`;
+            tree.write(dependencies.join(modelFolder, `${kebabModel}.service.ts`), serviceContent);
+            // Generate resolver.ts
+            const resolverContent = `
+import { ApiCrudDataAccessService } from '${npmScope}/api/generated-crud/data-access'
+import { Generated${model.modelName}Resolver } from '${npmScope}/api/generated-crud/feature'
+import { Injectable } from '@nestjs/common'
+import { Resolver } from '@nestjs/graphql'
+import { ${model.modelName} } from '${npmScope}/api/core/models'
+
+@Resolver(() => ${model.modelName})
+@Injectable()
+export class ${model.modelName}Resolver extends Generated${model.modelName}Resolver {
+  constructor(
+    // private readonly customService: ${model.modelName}Service,
+    generatedService: ApiCrudDataAccessService,
+  ) {
+    super(generatedService)
+  }
+}
+`;
+            tree.write(dependencies.join(modelFolder, `${kebabModel}.resolver.ts`), resolverContent);
+            // Generate module.ts
+            const moduleContent = `import { Module } from '@nestjs/common'
+import { ${model.modelName}Service } from './${kebabModel}.service'
+import { ${model.modelName}Resolver } from './${kebabModel}.resolver'
+import { ApiCrudDataAccessModule } from '${npmScope}/api/generated-crud/data-access'
+
+@Module({
+  imports: [ApiCrudDataAccessModule],
+  providers: [${model.modelName}Service, ${model.modelName}Resolver],
+  exports: [${model.modelName}Service, ${model.modelName}Resolver],
+})
+export class ${model.modelName}Module {}
+`;
+            tree.write(dependencies.join(modelFolder, `${kebabModel}.module.ts`), moduleContent);
+            // Add to defaultModules in app.module.ts__tmpl__
+            dependencies.addToModules({
+                tree,
+                modulePath: 'apps/api/src/app.module.ts',
+                moduleArrayName: 'defaultModules',
+                moduleToAdd: `${model.modelName}Module`,
+                importPath: `${npmScope}/api/custom`,
+            });
+        }
+        // Update index.ts to export all model modules
+        const modelFolders = models.map((m) => toKebabCase(m.modelName));
+        const indexContent = modelFolders.map((m) => `export * from './lib/default/${m}/${m}.module'`).join('\n');
+        tree.write(dependencies.join(customLibraryRoot, 'src/index.ts'), indexContent);
+    });
+}
+function customGeneratorLogic(tree_1, schema_1) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* (tree, schema, dependencies = defaultDependencies) {
+        try {
+            const name = schema.name || 'custom';
+            const customLibraryRoot = schema.directory ? `libs/api/${schema.directory}/${name}` : `libs/api/${name}`;
+            const projectName = schema.directory ? `api-${schema.directory.replace(/\//g, '-')}-${name}` : `api-${name}`;
+            // Overwrite logic
+            if (schema.overwrite && tree.exists(customLibraryRoot)) {
+                try {
+                    dependencies.execSync(`nx g @nx/workspace:remove ${projectName} --forceRemove`, {
+                        stdio: 'inherit',
+                        cwd: tree.root,
+                    });
+                }
+                catch (error) {
+                    console.warn(`Failed to remove existing library ${projectName}:`, error);
+                }
+            }
+            // Use the shared apiLibraryGenerator
+            yield dependencies.apiLibraryGenerator(tree, { name }, '', undefined, false);
+            yield ensureDirExists(tree, dependencies.join(customLibraryRoot, 'src/lib/default'));
+            yield ensureDirExists(tree, dependencies.join(customLibraryRoot, 'src/lib/plugins'));
+            // Get all Prisma models
+            const models = yield getAllPrismaModels(tree, dependencies);
+            if (models.length === 0) {
+                console.error('No Prisma models found');
+                return;
+            }
+            // Generate custom files per model
+            const npmScope = `@${dependencies.getNpmScope(tree)}`;
+            yield generateCustomFiles(tree, customLibraryRoot, models, npmScope, dependencies);
+            // Format files
+            yield dependencies.formatFiles(tree);
+            return () => {
+                dependencies.installPackagesTask(tree);
+            };
+        }
+        catch (error) {
+            console.error('Error in Custom generator:', error);
+            throw error;
+        }
+    });
+}
+function default_1(tree, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return customGeneratorLogic(tree, schema);
+    });
+}
+//# sourceMappingURL=generator.js.map