@gadmin2n/prisma-react-generator 0.0.44 → 0.0.46

package/dist/generator/generate-resources.js

@@ -5,7 +5,7 @@ const case_1 = require("case");
 const generateResources = ({ models, templateHelpers: t, }) => `
 import { ResourceProps } from "@refinedev/core";
 
-${t.each(models, (model) => `import { ${model.name}List, ${model.name}Create, ${model.name}Edit, ${model.name}Show  } from "../pages/${(0, case_1.camel)(model.name)}";`, '\n')}
+${t.each(models, (model) => `import { ${model.name}List, ${model.name}Create, ${model.name}Edit, ${model.name}Show  } from "../routes/${(0, case_1.camel)(model.name)}";`, '\n')}
 
 const resources: ResourceProps[] = [
   ${t.each(models, (model) => `{ 

package/dist/generator/generate-ui-config.js

@@ -260,7 +260,7 @@ function getModelConfigStruct(model, enums = []) {
     const editableFields = [...relationFields, ...relationsFields].reduce((acc, cur) => {
         acc.push(`!${cur}.*`);
         return acc;
-    }, ['*', '!creator', '!createdAt', '!updatedAt']);
+    }, ['*', '!creator', '!createdAt', '!updatedAt', '!created_at', '!updated_at']);
     const textFieldsExclude = model.fields
         .filter((field) => {
         const { formItem: { type }, } = (0, helpers_1.parseDocumentation)(field.documentation || '', field);
@@ -272,7 +272,7 @@ function getModelConfigStruct(model, enums = []) {
         acc.push(`!${cur}.*`);
         acc.push(`_count.${cur}`);
         return acc;
-    }, ['*', '!createdAt', ...textFieldsExclude])
+    }, ['*', '!createdAt', '!created_at', ...textFieldsExclude])
         .concat(relationFields.reduce((acc, cur) => {
         acc.push(`!${cur}.*`);
         acc.push(`${cur}`);

package/dist/generator/helpers.d.ts

@@ -50,6 +50,7 @@ declare type UiType = {
         type: 'String' | 'Boolean' | 'Int' | 'BigInt' | 'Float' | 'Decimal' | 'DateTime' | 'Markdown' | 'Html' | 'Url' | 'Email' | 'Other';
         args: {};
     };
+    tooltip?: string;
 };
 export declare function parseDocumentation(documentation: string, field: DMMF.Field): UiType;
 export {};

package/dist/generator/helpers.js

@@ -281,15 +281,21 @@ function getModelsEnum(enumTypesModel) {
 exports.getModelsEnum = getModelsEnum;
 function parseDocumentation(documentation, field) {
     var _a;
-    const formFieldRe = /@FormItem\(([^\)]+)\)/gi;
-    const matches = formFieldRe.exec(documentation);
     let fieldType = 'String';
     let args = [];
-    if (matches) {
-        [fieldType, ...args] = matches[1].split(',').map((arg) => arg.trim());
+    let tooltip = undefined;
+    const lineMatch = /@FormItem\(([^\n]+)/i.exec(documentation);
+    if (lineMatch) {
+        let content = lineMatch[1].replace(/\)\s*$/, '');
+        const tooltipIdx = content.indexOf('tooltip=');
+        if (tooltipIdx !== -1) {
+            tooltip = content.slice(tooltipIdx + 'tooltip='.length).trim();
+            content = content.slice(0, tooltipIdx).replace(/,\s*$/, '');
+        }
+        [fieldType, ...args] = content.split(',').map((arg) => arg.trim());
         args = args.map(arg => arg.trim());
     }
-    else {
+    if (!fieldType) {
         if ([
             'String',
             'Boolean',
@@ -315,6 +321,7 @@ function parseDocumentation(documentation, field) {
                     sizeLimit: Number(args[2]) || 1024 * 1024 * 10,
                 },
             },
+            ...(tooltip && { tooltip }),
         };
     }
     else if (fieldType === 'Text') {
@@ -323,6 +330,7 @@ function parseDocumentation(documentation, field) {
                 type: fieldType,
                 args: { rows: Number(args[0] || '5') },
             },
+            ...(tooltip && { tooltip }),
         };
     }
     else if (['CheckBox', 'Radio'].includes(fieldType)) {
@@ -331,6 +339,7 @@ function parseDocumentation(documentation, field) {
                 type: fieldType,
                 args: { options: (args[0] || '').split('|').map((arg) => arg.trim()) },
             },
+            ...(tooltip && { tooltip }),
         };
     }
     else if (fieldType === 'Select') {
@@ -342,6 +351,7 @@ function parseDocumentation(documentation, field) {
                     mode: args[1],
                 },
             },
+            ...(tooltip && { tooltip }),
         };
     }
     else {
@@ -350,6 +360,7 @@ function parseDocumentation(documentation, field) {
                 type: fieldType,
                 args: {},
             },
+            ...(tooltip && { tooltip }),
         };
     }
 }

package/dist/generator/index.js

@@ -73,11 +73,11 @@ const run = ({ output, dmmf, ...options }) => {
             }),
         };
         if (existingPageModels === null || existingPageModels === void 0 ? void 0 : existingPageModels.has(modelDirName)) {
-            sdk_1.logger.info(`Skipping page generation for Model ${model.name} (already exists in pages/)`);
+            sdk_1.logger.info(`Skipping page generation for Model ${model.name} (already exists in routes/)`);
             return [configFile, modelFile];
         }
         const createPageFile = {
-            fileName: node_path_1.default.join(output, 'pages', modelDirName, `create.tsx`),
+            fileName: node_path_1.default.join(output, 'routes', modelDirName, `create.tsx`),
             content: (0, generate_create_page_1.generateCreatePage)({
                 model,
                 templateHelpers,
@@ -86,7 +86,7 @@ const run = ({ output, dmmf, ...options }) => {
             }),
         };
         const editPageFile = {
-            fileName: node_path_1.default.join(output, 'pages', modelDirName, `edit.tsx`),
+            fileName: node_path_1.default.join(output, 'routes', modelDirName, `edit.tsx`),
             content: (0, generate_edit_page_1.generateEditPage)({
                 model,
                 templateHelpers,
@@ -95,7 +95,7 @@ const run = ({ output, dmmf, ...options }) => {
             }),
         };
         const indexPageFile = {
-            fileName: node_path_1.default.join(output, 'pages', modelDirName, `index.tsx`),
+            fileName: node_path_1.default.join(output, 'routes', modelDirName, `index.tsx`),
             content: (0, generate_index_page_1.generateIndexPage)({
                 model,
                 templateHelpers,
@@ -104,7 +104,7 @@ const run = ({ output, dmmf, ...options }) => {
             }),
         };
         const listPageFile = {
-            fileName: node_path_1.default.join(output, 'pages', modelDirName, `list.tsx`),
+            fileName: node_path_1.default.join(output, 'routes', modelDirName, `list.tsx`),
             content: (0, generate_list_page_1.generateListPage)({
                 model,
                 templateHelpers,
@@ -113,7 +113,7 @@ const run = ({ output, dmmf, ...options }) => {
             }),
         };
         const showPageFile = {
-            fileName: node_path_1.default.join(output, 'pages', modelDirName, `show.tsx`),
+            fileName: node_path_1.default.join(output, 'routes', modelDirName, `show.tsx`),
             content: (0, generate_show_page_1.generatePageShow)({
                 model,
                 templateHelpers,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gadmin2n/prisma-react-generator",
   "description": "Generates react props and components from Prisma Schema for Tea/Antd ui lib.",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "license": "Apache-2.0",
   "author": {
     "name": "kavenma",