feat: add fields to api-crud and web-crud generatorsa

libs/tools/src/generators/api-crud/__snapshots__/api-crud-generator.spec.ts.snap

@@ -155,6 +155,10 @@ exports[`api-crud generator should run successfully 1`] = `
                           "export class AdminCreateCompanyInput {",
                           "@Field()",
                           "name!: string;",
+                          "@Field()",
+                          "location!: string;",
+                          "@Field({ nullable: true })",
+                          "phone?: string;",
                           "}",
                         ],
                         "isBinary": false,
@@ -180,6 +184,10 @@ exports[`api-crud generator should run successfully 1`] = `
                           "export class AdminUpdateCompanyInput {",
                           "@Field({ nullable: true })",
                           "name?: string;",
+                          "@Field({ nullable: true })",
+                          "location?: string;",
+                          "@Field({ nullable: true })",
+                          "phone?: string;",
                           "}",
                         ],
                         "isBinary": false,
@@ -214,6 +222,10 @@ exports[`api-crud generator should run successfully 1`] = `
                           "updatedAt?: Date;",
                           "@Field()",
                           "name!: string;",
+                          "@Field()",
+                          "location!: string;",
+                          "@Field({ nullable: true })",
+                          "phone?: string;",
                           "}",
                         ],
                         "isBinary": false,
@@ -1137,6 +1149,8 @@ exports[`api-crud generator should run successfully 1`] = `
                   "createdAt",
                   "id",
                   "name",
+                  "location",
+                  "phone",
                   "updatedAt",
                   "}",
                   "query adminFindManyCompany($input: AdminFindManyCompanyInput!) {",

libs/tools/src/generators/api-crud/api-crud-generator.spec.ts

@@ -13,7 +13,7 @@ describe('api-crud generator', () => {
   beforeEach(async () => {
     tree = createTreeWithEmptyWorkspace()
     await createMockApiApp(tree, options.app)
-    await apiFeatureGenerator(tree, { app: options.app, model: options.model, name: options.model })
+    await apiFeatureGenerator(tree, { app: options.app, model: options.model })
   })
 
   it('should run successfully', async () => {

libs/tools/src/generators/api-crud/api-crud-schema.d.ts

@@ -8,4 +8,5 @@ export interface ApiCrudGeneratorSchema {
 export interface NormalizedApiCrudSchema extends ApiCrudGeneratorSchema {
   label: string
   npmScope: string
+  fields?: PrismaModelField[]
 }

libs/tools/src/generators/api-feature/__snapshots__/api-feature-generator.spec.ts.snap

@@ -222,6 +222,7 @@ export class Test {
   createdAt?: Date;
   @Field({ nullable: true })
   updatedAt?: Date;
+
   @Field()
   name!: string;
 }

libs/tools/src/generators/api-feature/api-feature-generator.spec.ts

@@ -9,7 +9,7 @@ import { ApiFeatureGeneratorSchema } from './api-feature-schema'
 
 describe('api-feature generator', () => {
   let tree: Tree
-  const options: ApiFeatureGeneratorSchema = { app: 'api', name: 'test', label: 'name' }
+  const options: ApiFeatureGeneratorSchema = { app: 'api', label: 'name', model: 'test' }
 
   beforeEach(() => {
     tree = createTreeWithEmptyWorkspace()
@@ -23,12 +23,12 @@ describe('api-feature generator', () => {
     await apiFeatureGenerator(tree, options)
 
     libs.forEach((lib) => {
-      const config = readProjectConfiguration(tree, `${options.app}-${options.name}-${lib}`)
+      const config = readProjectConfiguration(tree, `${options.app}-${options.model}-${lib}`)
       expect(config).toBeDefined()
     })
 
-    const basePathDataAccess = `libs/${options.app}/${options.name}/data-access/src`
-    const basePathFeature = `libs/${options.app}/${options.name}/feature/src`
+    const basePathDataAccess = `libs/${options.app}/${options.model}/data-access/src`
+    const basePathFeature = `libs/${options.app}/${options.model}/feature/src`
 
     const sourceFilesDataAccess = getRecursiveFileNames({ tree, path: basePathDataAccess })
     const sourceFilesFeature = getRecursiveFileNames({ tree, path: basePathFeature })
@@ -64,12 +64,12 @@ describe('api-feature generator', () => {
     await apiFeatureGenerator(tree, { ...options, crud: 'admin,user' })
 
     libs.forEach((lib) => {
-      const config = readProjectConfiguration(tree, `${options.app}-${options.name}-${lib}`)
+      const config = readProjectConfiguration(tree, `${options.app}-${options.model}-${lib}`)
       expect(config).toBeDefined()
     })
 
-    const basePathDataAccess = `libs/${options.app}/${options.name}/data-access/src`
-    const basePathFeature = `libs/${options.app}/${options.name}/feature/src`
+    const basePathDataAccess = `libs/${options.app}/${options.model}/data-access/src`
+    const basePathFeature = `libs/${options.app}/${options.model}/feature/src`
 
     const sourceFilesDataAccess = getRecursiveFileNames({ tree, path: basePathDataAccess })
     const sourceFilesFeature = getRecursiveFileNames({ tree, path: basePathFeature })
@@ -118,21 +118,21 @@ describe('api-feature generator', () => {
     await apiFeatureGenerator(tree, { ...options, skipUtil: false })
 
     libs.forEach((lib) => {
-      const config = readProjectConfiguration(tree, `${options.app}-${options.name}-${lib}`)
+      const config = readProjectConfiguration(tree, `${options.app}-${options.model}-${lib}`)
       expect(config).toBeDefined()
     })
   })
 
   it('should generate the feature with different name', async () => {
-    const testOptions = { ...options, name: 'company' }
+    const testOptions = { ...options, model: 'company' }
     await createMockApiApp(tree, testOptions.app)
 
     // By default, we generate two libraries: data-access and feature
     const libs = ['data-access', 'feature', 'util']
     await apiFeatureGenerator(tree, { ...testOptions, skipUtil: false })
 
     libs.forEach((lib) => {
-      const config = readProjectConfiguration(tree, `${testOptions.app}-${testOptions.name}-${lib}`)
+      const config = readProjectConfiguration(tree, `${testOptions.app}-${testOptions.model}-${lib}`)
       expect(config).toBeDefined()
     })
   })
@@ -143,7 +143,7 @@ describe('api-feature generator', () => {
     // By default, we generate two libraries: data-access and feature
     const libs = ['data-access', 'feature']
     const customName = 'custom'
-    await apiFeatureGenerator(tree, { ...options, name: customName })
+    await apiFeatureGenerator(tree, { ...options, model: customName })
 
     libs.forEach((lib) => {
       const config = readProjectConfiguration(tree, `${options.app}-${customName}-${lib}`)

libs/tools/src/generators/api-feature/api-feature-schema.d.ts

@@ -1,11 +1,11 @@
 export type ApiFeatureGeneratorSchema = Partial<Omit<NormalizedApiFeatureSchema, 'crud'>> & {
   crud?: string
+  model: string
 }
 
 export interface NormalizedApiFeatureSchema {
   app: string
   crud: string[]
-  name: string
   label: string
   model: string
   npmScope: string

libs/tools/src/generators/api-feature/api-feature-schema.json

@@ -4,14 +4,14 @@
   "title": "",
   "type": "object",
   "properties": {
-    "name": {
+    "model": {
       "type": "string",
-      "description": "The name of the feature.",
+      "description": "The name of the model for this feature.",
+      "x-prompt": "What is the name of the model for this feature?",
       "$default": {
         "$source": "argv",
         "index": 0
-      },
-      "x-prompt": "What name would you like to use?"
+      }
     },
     "app": {
       "type": "string",
@@ -23,10 +23,6 @@
       "description": "The label field for the model. Generally 'name' or 'title'.",
       "default": "name"
     },
-    "model": {
-      "type": "string",
-      "description": "The name of the model for this feature."
-    },
     "crud": {
       "type": "string",
       "description": "Command separated list of actors to create CRUD for.",
@@ -48,5 +44,5 @@
       "default": true
     }
   },
-  "required": ["name"]
+  "required": ["model"]
 }

libs/tools/src/generators/web-crud/web-crud-generator.spec.ts

@@ -12,7 +12,7 @@ describe('web-crud generator', () => {
     tree = createTreeWithEmptyWorkspace()
 
     await createMockWebApp(tree, options.app)
-    await webFeatureGenerator(tree, { app: options.app, model: options.model, name: options.model })
+    await webFeatureGenerator(tree, { app: options.app, model: options.model })
   })
 
   it('should run successfully', async () => {

libs/tools/src/generators/web-crud/web-crud-schema.d.ts

@@ -8,4 +8,5 @@ export interface WebCrudGeneratorSchema {
 export interface NormalizedWebCrudSchema extends WebCrudGeneratorSchema {
   label: string
   npmScope: string
+  fields?: PrismaModelField[]
 }

libs/tools/src/generators/web-feature/__snapshots__/web-feature-generator.spec.ts.snap

@@ -213,6 +213,7 @@ export function useUserFindOneTest({ testId }: { testId: string }) {
 exports[`web-feature generator should run successfully with crud 9`] = `
 "export const AdminTestFeature = lazy(() => import('./lib/admin-test.routes'));
 import { lazy } from 'react';
+
 export const UserTestFeature = lazy(() => import('./lib/user-test.routes'));
 "
 `;
@@ -686,7 +687,7 @@ export function AdminTestUiCreateForm({
   };
 
   const fields: UiFormField<AdminCreateTestInput>[] = [
-    formFieldText('name', { label: 'Name', required: true }),
+    formFieldText('name', { label: 'name', required: true }),
   ];
   return (
     <UiForm
@@ -801,7 +802,7 @@ export function AdminTestUiUpdateForm({
   };
 
   const fields: UiFormField<AdminUpdateTestInput>[] = [
-    formFieldText('name', { label: 'Name' }),
+    formFieldText('name', { label: 'name' }),
   ];
   return (
     <UiForm
@@ -966,7 +967,7 @@ export function UserTestUiCreateForm({
   };
 
   const fields: UiFormField<UserCreateTestInput>[] = [
-    formFieldText('name', { label: 'Name', required: true }),
+    formFieldText('name', { label: 'name', required: true }),
   ];
   return (
     <UiForm
@@ -1081,7 +1082,7 @@ export function UserTestUiUpdateForm({
   };
 
   const fields: UiFormField<UserUpdateTestInput>[] = [
-    formFieldText('name', { label: 'Name' }),
+    formFieldText('name', { label: 'name' }),
   ];
   return (
     <UiForm

libs/tools/src/generators/web-feature/web-feature-generator.spec.ts

@@ -1,20 +1,24 @@
 import { Tree } from '@nx/devkit'
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'
+import { createMockApiApp } from '../../lib/api/create-mock-api-app'
 
 import { getRecursiveFileNames } from '../../lib/utils/get-recursive-file-names'
 import { createMockWebApp, normalizeWebFeatureSchema } from '../../lib/web'
+import apiFeatureGenerator from '../api-feature/api-feature-generator'
 
 import { webFeatureGenerator } from './web-feature-generator'
 import { type NormalizedWebFeatureSchema, WebFeatureGeneratorSchema } from './web-feature-schema'
 
 describe('web-feature generator', () => {
   let tree: Tree
-  const rawOptions: WebFeatureGeneratorSchema = { app: 'web', name: 'test' }
+  const rawOptions: WebFeatureGeneratorSchema = { app: 'web', model: 'test' }
   let options: NormalizedWebFeatureSchema
 
   beforeEach(async () => {
     tree = createTreeWithEmptyWorkspace()
     options = normalizeWebFeatureSchema(tree, rawOptions)
+    await createMockApiApp(tree, 'api')
+    await apiFeatureGenerator(tree, { app: 'api', crud: 'admin,user', model: 'company' })
     await createMockWebApp(tree, options.app)
   })
 

libs/tools/src/generators/web-feature/web-feature-schema.d.ts

@@ -5,7 +5,6 @@ export type WebFeatureGeneratorSchema = Partial<Omit<NormalizedWebFeatureSchema,
 export interface NormalizedWebFeatureSchema {
   app: string
   crud: string[]
-  name: string
   label: string
   model: string
   npmScope: string

libs/tools/src/generators/web-feature/web-feature-schema.json

@@ -4,14 +4,14 @@
   "title": "",
   "type": "object",
   "properties": {
-    "name": {
+    "model": {
       "type": "string",
-      "description": "The name of the feature.",
+      "description": "The name of the model for this feature.",
+      "x-prompt": "What is the name of the model for this feature?",
       "$default": {
         "$source": "argv",
         "index": 0
-      },
-      "x-prompt": "What name would you like to use?"
+      }
     },
     "app": {
       "type": "string",
@@ -23,10 +23,6 @@
       "description": "The label field for the model. Generally 'name' or 'title'.",
       "default": "name"
     },
-    "model": {
-      "type": "string",
-      "description": "The name of the model for this feature."
-    },
     "crud": {
       "type": "string",
       "description": "Command separated list of actors to create CRUD for.",
@@ -48,5 +44,5 @@
       "default": true
     }
   },
-  "required": ["name"]
+  "required": ["model"]
 }

libs/tools/src/lib/api-crud/files/data-access/lib/dto/__actorFileName__-create-__modelFileName__.input.ts.template

@@ -2,6 +2,8 @@ import { Field, InputType } from '@nestjs/graphql'
 
 @InputType()
 export class <%= actor.className %>Create<%= model.className %>Input {
-  @Field()
-  <%= label.propertyName %>!: string
+<% for (let field of fields){ %>
+  @Field(<% if(field.optional){ %>{ nullable: true }<% } %>)
+  <%= field.name %><% if(field.optional){ %>?<% } else { %>!<% } %>: <%= field.type %>
+<% } %>
 }

libs/tools/src/lib/api-crud/files/data-access/lib/dto/__actorFileName__-update-__modelFileName__.input.ts.template

@@ -2,6 +2,8 @@ import { Field, InputType } from '@nestjs/graphql'
 
 @InputType()
 export class <%= actor.className %>Update<%= model.className %>Input {
+<% for (let field of fields){ %>
   @Field({ nullable: true })
-  <%= label.propertyName %>?: string
+  <%= field.name %>?: <%= field.type %>
+<% } %>
 }

libs/tools/src/lib/api-crud/files/entity/lib/entity/__modelFileName__.entity.ts.template

@@ -8,6 +8,8 @@ export class <%= model.className %> {
   createdAt?: Date
   @Field({ nullable: true })
   updatedAt?: Date
-  @Field()
-  <%= label.propertyName %>!: string
+  <% for (let field of fields){ %>
+    @Field(<% if(field.optional){ %>{ nullable: true }<% } %>)
+    <%= field.name %><% if(field.optional){ %>?<% } else { %>!<% } %>: <%= field.type %>
+  <% } %>
 }

libs/tools/src/lib/api-crud/generate-api-crud.ts

@@ -1,10 +1,10 @@
 import { generateFiles, getProjects, type ProjectConfiguration, Tree } from '@nx/devkit'
 import type { NormalizedApiCrudSchema } from '../../generators/api-crud/api-crud-schema'
-import { generateSdkFile } from '../api/generate-sdk-file'
 import { addExports } from '../utils/add-export'
 import { ensureNxProjectExists } from '../utils/ensure-nx-project-exists'
 import { addServiceToClassConstructor } from './add-service-to-class-constructor'
 import { addServiceToModuleDecorator } from './add-service-to-module-decorator'
+import { generateSdkFile } from './generate-sdk-file'
 import { getApiCrudSubstitutions } from './get-api-crud-substitutions'
 
 export function generateApiCrud(tree: Tree, options: NormalizedApiCrudSchema) {
@@ -71,7 +71,11 @@ export function generateApiCrud(tree: Tree, options: NormalizedApiCrudSchema) {
   generateFiles(tree, `${__dirname}/files/feature`, feature.sourceRoot, { ...vars })
 
   // Generate the SDK file
-  generateSdkFile(tree, options)
+  generateSdkFile(
+    tree,
+    options,
+    options.fields?.map((f) => f.name.toString()),
+  )
 
   const e2e = getProjects(tree).get(`${options.app}-e2e`)
   if (!e2e) {