@nestledjs/api 2.6.1 → 2.7.0

package/package.json

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

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

@@ -197,7 +197,11 @@ function generateModels(models: readonly any[], enums: readonly any[]): string {
   const usesBigInt = models.some(model =>
     model.fields.some((field: { type: string }) => field.type === 'BigInt'),
   )
-  let output = `import { Field, ObjectType${usesFloat ? ', Float' : ''}, Int } from '@nestjs/graphql';\n`
+  // Check if any model field uses DateTime
+  const usesDateTime = models.some(model =>
+    model.fields.some((field: { type: string }) => field.type === 'DateTime'),
+  )
+  let output = `import { Field, ObjectType${usesFloat ? ', Float' : ''}${usesDateTime ? ', GraphQLISODateTime' : ''}, Int } from '@nestjs/graphql';\n`
   output += `import { GraphQLJSONObject } from 'graphql-type-json';\n`
 
   // Check if any model field uses Decimal
@@ -281,7 +285,7 @@ function generateModels(models: readonly any[], enums: readonly any[]): string {
         else if (originalType === 'Json') listItemGraphQLType = 'GraphQLJSONObject'
         else if (isEnum || isRelation)
           listItemGraphQLType = originalType // Assumes enum/type is registered with GraphQL
-        else if (originalType === 'DateTime') listItemGraphQLType = 'Date'
+        else if (originalType === 'DateTime') listItemGraphQLType = 'GraphQLISODateTime'
         else if (originalType === 'Boolean') listItemGraphQLType = 'Boolean'
         else if (originalType.toLowerCase() === 'string' || originalType === 'ID') {
           listItemGraphQLType = 'String'
@@ -297,7 +301,7 @@ function generateModels(models: readonly any[], enums: readonly any[]): string {
         else if (originalType === 'BigInt') decoratorType = '() => GraphQLBigInt'
         else if (originalType === 'Json') decoratorType = '() => GraphQLJSONObject'
         else if (isEnum || isRelation) decoratorType = `() => ${originalType}`
-        else if (originalType === 'DateTime') decoratorType = '() => Date'
+        else if (originalType === 'DateTime') decoratorType = '() => GraphQLISODateTime'
         else if (originalType === 'Boolean') decoratorType = '() => Boolean'
         else if (originalType.toLowerCase() === 'string' || originalType === 'ID')
           decoratorType = '() => String'

package/src/generate-crud/files/data-access/src/lib/dto/index.ts__tmpl__

@@ -3,6 +3,7 @@
 let gqlImports = new Set(['Field', 'InputType'])
 let usesGraphQLJSON = false
 let usesGraphQLBigInt = false
+let usesDateTime = false
 let usesInt = false
 let usesFloat = false
 let usesID = false
@@ -72,6 +73,7 @@ for (const model of models) {
         if (field.type === 'Float' || field.type === 'Decimal') usesFloat = true
         if (field.type === 'Json') usesGraphQLJSON = true
         if (field.type === 'BigInt') usesGraphQLBigInt = true
+        if (field.type === 'DateTime') usesDateTime = true
         if (field.type === 'ID') usesID = true
         if (field.kind === 'enum') {
             enumNames.add(field.type)
@@ -82,6 +84,7 @@ for (const model of models) {
 if (usesInt) gqlImports.add('Int')
 if (usesFloat) gqlImports.add('Float')
 if (usesID) gqlImports.add('ID')
+if (usesDateTime) gqlImports.add('GraphQLISODateTime')
 usesPartialType = models.length > 0 // If we generate any Update input, we need PartialType
 %>
 import { <%= Array.from(gqlImports).join(', ') %> } from '@nestjs/graphql'
@@ -109,7 +112,7 @@ export class Create<%= model.modelName %>Input {
     else if (field.type === 'Float') { baseGqlType = 'Float'; tsType = 'number'; }
     else if (field.type === 'Decimal') { baseGqlType = 'Float'; tsType = 'number'; }
     else if (field.type === 'Boolean') { baseGqlType = 'Boolean'; tsType = 'boolean'; }
-    else if (field.type === 'DateTime') { baseGqlType = 'Date'; tsType = 'Date'; }
+    else if (field.type === 'DateTime') { baseGqlType = 'GraphQLISODateTime'; tsType = 'Date'; }
     else if (field.type === 'Json') { baseGqlType = 'GraphQLJSON'; tsType = 'typeof GraphQLJSON'; }
     else if (field.type === 'ID') { baseGqlType = 'ID'; tsType = 'string'; }
     else if (field.kind === 'enum') {
@@ -153,7 +156,7 @@ export class Update<%= model.modelName %>Input {
     else if (field.type === 'Float') { baseGqlType = 'Float'; tsType = 'number'; }
     else if (field.type === 'Decimal') { baseGqlType = 'Float'; tsType = 'number'; }
     else if (field.type === 'Boolean') { baseGqlType = 'Boolean'; tsType = 'boolean'; }
-    else if (field.type === 'DateTime') { baseGqlType = 'Date'; tsType = 'Date'; }
+    else if (field.type === 'DateTime') { baseGqlType = 'GraphQLISODateTime'; tsType = 'Date'; }
     else if (field.type === 'Json') { baseGqlType = 'GraphQLJSON'; tsType = 'typeof GraphQLJSON'; }
     else if (field.type === 'ID') { baseGqlType = 'ID'; tsType = 'string'; }
     else if (field.kind === 'enum') {
@@ -190,7 +193,7 @@ export class List<%= model.modelName %>Input extends CorePagingInput {
     else if (field.type === 'Float') { baseGqlType = 'Float'; tsType = 'number'; }
     else if (field.type === 'Decimal') { baseGqlType = 'Float'; tsType = 'number'; }
     else if (field.type === 'Boolean') { baseGqlType = 'Boolean'; tsType = 'boolean'; }
-    else if (field.type === 'DateTime') { baseGqlType = 'Date'; tsType = 'Date'; }
+    else if (field.type === 'DateTime') { baseGqlType = 'GraphQLISODateTime'; tsType = 'Date'; }
     else if (field.type === 'Json') { baseGqlType = 'GraphQLJSON'; tsType = 'typeof GraphQLJSON'; }
     else if (field.type === 'ID') { baseGqlType = 'ID'; tsType = 'string'; }
     else if (field.kind === 'enum') {