prismadoc 1.0.37 → 1.0.39

package/dist/entities/dto-generator.js

@@ -13,6 +13,7 @@ export class DocGenDto {
     ]);
     classValidators = new Set();
     enums = new Set();
+    hasJson = false;
     enumImportPath;
     mainEnumNames;
     constructor(model, enumImportPath, mainEnumNames) {
@@ -40,6 +41,8 @@ export class DocGenDto {
             else if (field.isEnum) {
                 this.enums.add(field.type);
             }
+            if (field.isJson)
+                this.hasJson = true;
             return `class ${Helper.capitalizeFirstSafe(field.name)}Dto {
           ${field.build()}
         }`;
@@ -52,10 +55,14 @@ export class DocGenDto {
             if (localEnums.length > 0) {
                 this.imports.add(`import { ${localEnums.join(", ")} } from '${this.enumImportPath}';`);
             }
-            if (prismaEnums.length > 0) {
-                this.imports.add(`import { ${prismaEnums.join(", ")} } from '@prisma/client';`);
+            const prismaNamedImports = [...prismaEnums, ...(this.hasJson ? ["Prisma"] : [])];
+            if (prismaNamedImports.length > 0) {
+                this.imports.add(`import { ${prismaNamedImports.join(", ")} } from '@prisma/client';`);
             }
         }
+        else if (this.hasJson) {
+            this.imports.add(`import { Prisma } from '@prisma/client';`);
+        }
         this.imports.add(`import { ${Array.from(this.classValidators)} } from '${config.validatorPath}';`);
         const intersections = this.fields.map((field) => Helper.capitalizeFirstSafe(field.name) + "Dto");
         const intersectionClassName = `class ${this.name}Dto`;

package/dist/entities/field.js

@@ -12,6 +12,7 @@ export class DocGenField {
     type;
     fieldType;
     isEnum = false;
+    isJson = false;
     isResponse = false;
     isUpdatedAt = false;
     isRequired;
@@ -43,12 +44,15 @@ export class DocGenField {
         if (this.scalarType === "DateTime") {
             this.processValidator({ name: "IsDateString" });
         }
-        else if (this.scalarType === "String" || this.scalarType === "Json") {
+        else if (this.scalarType === "String") {
             this.processValidator({ name: "IsString" });
             if (this.isRequired) {
                 this.processValidator({ name: "IsNotEmpty" });
             }
         }
+        else if (this.scalarType === "Json") {
+            this.processValidator({ name: "IsJSON" });
+        }
         else if (this.scalarType === "Boolean") {
             this.processValidator({ name: "IsBoolean" });
         }
@@ -92,7 +96,13 @@ export class DocGenField {
             this.type = `${this.scalarType}Res`;
         }
         else if (this.kind === "scalar") {
-            this.type = Helper.prismaScalarToTs(this.scalarType);
+            if (this.scalarType === "Json") {
+                this.isJson = true;
+                this.type = "Prisma.JsonValue";
+            }
+            else {
+                this.type = Helper.prismaScalarToTs(this.scalarType);
+            }
         }
     }
     getRuledExample(fieldName) {
@@ -136,7 +146,7 @@ export class DocGenField {
         else if (this.scalarField.type === "String") {
             props.push(`example: 'ordinary string'`);
         }
-        if (this.type === "object") {
+        if (this.isJson) {
             props.push(`additionalProperties: true`);
         }
         else {
@@ -153,6 +163,8 @@ export class DocGenField {
     buildInfos() {
         const key = this.isEnum ? "enum" : "type";
         const apiType = () => {
+            if (this.isJson)
+                return `'object'`;
             if (this.type === "Date")
                 return `'string'`;
             if (this.isArray && this.isResponse) {
@@ -170,11 +182,16 @@ export class DocGenField {
             if (this.isArray) {
                 return `${this.type}[]`;
             }
+            else if (!this.isRequired && this.fieldType === "res") {
+                return `${this.type} | null`;
+            }
             else {
                 return this.type;
             }
         };
-        const optionalFlag = this.isRequired ? "!" : "?";
+        let optionalFlag = "?";
+        if (this.isRequired || this.fieldType === "res")
+            optionalFlag = "!";
         const validators = this.sanitizeValidators();
         const apiExample = this.buildApiExample().join(", ");
         return {

package/dist/entities/model.js

@@ -68,6 +68,8 @@ export class DocGenModel {
         for (const e of this.response.enums) {
             this.dto.enums.add(e);
         }
+        if (this.response.hasJson)
+            this.dto.hasJson = true;
         const dtoResult = this.dto.build();
         const data = [dtoResult, responseResult, intaaa].join("");
         const fileDir = servicePrefix ? `/${servicePrefix}/types` : "/types";

package/dist/entities/response-generator.js

@@ -5,6 +5,7 @@ export class DocGenResponse {
     // file: DocGenFile;
     fields = [];
     enums = new Set();
+    hasJson = false;
     constructor(model) {
         this.name = model.name;
         for (const field of model.fields) {
@@ -19,6 +20,8 @@ export class DocGenResponse {
             if (field.isEnum) {
                 this.enums.add(field.type);
             }
+            if (field.isJson)
+                this.hasJson = true;
             return `class ${Helper.capitalizeFirstSafe(field.name)}Res {
           ${field.build()}
         }`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prismadoc",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "description": "Auto generates ApiProperties from schema.prisma",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",