beech-api 3.9.0-beta.9-rc → 3.9.57

package/README.md

@@ -146,7 +146,15 @@ The following commands are available:
   $ beech make <endpoint>             Create a new Endpoints and unit test file,
                                       You might using [special] `-R, --require`
                                       for choose Model(s) used to endpoint file.
-  $ beech make <model> -M, --model    Create a new Models file.
+
+  $ beech make <model> -M, --model    Create a new Models file, You might using
+                                      [special] `--no-comment` for ignore comment
+                                      Table Property in your Schema.
+
+  $ beech update model <model_name>   Update new Table Structure for latest, You
+                                      might using [special] `--no-comment` for 
+                                      ignore comment Table Property in your Schema.
+
   $ beech make <helper> --helper      Create a new Helpers file.
   $ beech passport init               Initialize authentication with passport-jwt.
   $ beech skd init                    Initialize Job Scheduler file.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beech-api",
-  "version": "3.9.0-beta.9-rc",
+  "version": "3.9.57",
   "description": "Command line interface for rapid Beech API development",
   "keywords": [
     "api",
@@ -32,6 +32,7 @@
   },
   "dependencies": {
     "app-root-path": "^3.0.0",
+    "ast-types": "^0.14.2",
     "axios": "^1.8.4",
     "child-process-promise": "^2.2.1",
     "cli-clear": "^1.0.4",
@@ -56,6 +57,7 @@
     "method-override": "^3.0.0",
     "mkdirp": "^2.1.6",
     "module-alias": "^2.2.2",
+    "multer": "^2.1.1",
     "mysql": "^2.18.1",
     "mysql2": "^3.14.0",
     "node-cmd": "^3.0.0",
@@ -68,6 +70,7 @@
     "passport-local": "^1.0.0",
     "passport-oauth": "^1.0.0",
     "path": "^0.12.7",
+    "recast": "^0.23.11",
     "sequelize": "^6.21.3",
     "tedious": "^18.6.1",
     "walk": "^2.3.14"

package/packages/cli/core/generator/_help

@@ -11,7 +11,15 @@ The following commands are available:
   $ beech make <endpoint>             Create a new Endpoints and unit test file,
                                       You might using [special] `-R, --require`
                                       for choose Model(s) used to endpoint file.
-  $ beech make <model> -M, --model    Create a new Models file.
+
+  $ beech make <model> -M, --model    Create a new Models file, You might using
+                                      [special] `--no-comment` for ignore comment
+                                      Table Property in your Schema.
+
+  $ beech update model <model_name>   Update new Table Structure for latest, You
+                                      might using [special] `--no-comment` for 
+                                      ignore comment Table Property in your Schema.
+
   $ beech make <helper> --helper      Create a new Helpers file.
   $ beech passport init               Initialize authentication with passport-jwt.
   $ beech skd init                    Initialize Job Scheduler file.

package/packages/cli/core/generator/index.js

@@ -2,6 +2,8 @@
 const logUpdate = require("log-update");
 const inquirer = require('inquirer');
 const walk = require("walk");
+const recast = require("recast");
+const { builders } = require("ast-types");
 const { connectForGenerateModel } = require("../databases/test");
 
 class Generator {
@@ -180,16 +182,22 @@ class Generator {
             }
           }
         } else if (this.option == 'update') {
-          console.log('------------------------------');
           if(this.argument == 'model') {
-            // this.special = model name
-            // if (!this.special) {
-            //   resolve("\n [103m [90m Warning  [0m [0m Please specify model name to update.");
-            // } else {
-            //   this.updateModel()
-            //     .then(res => resolve(res))
-            //     .catch(err => reject(err));
-            // }
+            if(this.special) {
+              if (!this.special) {
+                resolve("\n Warning  Please specify model name to update.");
+              } else {
+                this.updateModel()
+                  .then(res => resolve(res))
+                  .catch(err => reject(err));
+              }
+            } else {
+              resolve("\n Warning  Please specify model name to update.");
+            }
+          } else if(this.argument != 'model') {
+            resolve("\n Faltal  commnad it's not available.");
+          } else {
+            resolve("\n Warning  Please specify what you want to update.");
           }
         } else if (this.option == 'passport') {
           if (this.argument == "init") {
@@ -466,60 +474,136 @@ class Generator {
   updateModel() {
     return new Promise((resolve, reject) => {
       try {
-        // 1. อ่านการตั้งค่าจาก global.config และ app.config เหมือนตอนสร้าง Model
         this.fs.readFile("./global.config.js", 'utf8', (err, globalData) => {
-          if (err) return resolve("\n [101m Faltal  [0m Can't read `global.config.js` file.");
-  
+          if (err) return resolve("\n Faltal  Can't read `global.config.js` file.");
           this.fs.readFile("./app.config.js", 'utf8', (appErr, appData) => {
-            if (appErr) return resolve("\n [101m Faltal  [0m Can't read `app.config.js` file.");
-  
-            let appBuf2eval = eval(appData);
-            let modelName = this.special; // <table_name>
-            let modelPath = `./src/models/${modelName.charAt(0).toUpperCase() + modelName.slice(1)}.js`;
-  
-            // ตรวจสอบว่ามีไฟล์ Model เดิมอยู่หรือไม่
+            if (appErr) return resolve("\n Faltal  Can't read `app.config.js` file.");
+            const appConfig = eval(appData);
+            const modelName = this.special; // <table_name>
+            const modelFileName = modelName.charAt(0).toUpperCase() + modelName.slice(1);
+            const modelPath = `./src/models/${modelFileName}.js`;
             if (!this.fs.existsSync(modelPath)) {
-              return resolve(`\n [103m [90m Warning  [0m [0m Model file \`${modelName}\` not found to update.`);
+              return resolve(`\n Warning  Model file \`${modelFileName}\` not found.`);
             }
-  
-            // ให้ผู้ใช้เลือก Connection ที่ต้องการดึง Schema ใหม่
+            // Choose connection for new schema
             inquirer.prompt([{
               type: "list",
               name: "selectDbConnect",
               message: " [93mSelect database connection to sync schema: [0m",
-              choices: appBuf2eval.database_config.map(e => e.name),
+              choices: appConfig.database_config.map(e => e.name),
             }]).then(dbSelected => {
-              
-              // 2. ดึง Schema ใหม่จาก DB
               const { connectForGenerateModel } = require("../databases/test");
-              let newModelClassName = modelName.split("_").map(e => e.charAt(0).toUpperCase() + e.slice(1)).join("");
-  
-              connectForGenerateModel(dbSelected.selectDbConnect, modelName, appBuf2eval.database_config, (err, tableSchema, tableName) => {
-                if (err) return reject(err);
-  
-                // 3. แปลง Schema เป็น Code String
-                this.rawSchemaTable(dbSelected.selectDbConnect, newModelClassName, tableName, tableSchema, (SchemaErr, rawSchema) => {
-                  if (SchemaErr) return reject(SchemaErr);
-  
-                  // 4. อ่านไฟล์เดิมและทำการ Replace เฉพาะส่วน Schema
-                  this.fs.readFile(modelPath, 'utf8', (readErr, currentContent) => {
-                    if (readErr) return reject(readErr);
-  
-                    // ใช้ Regex เพื่อหาช่วงของ Schema(...).define(...) และเปลี่ยนเฉพาะข้างใน
-                    // โดยจะหาตั้งแต่ Schema(sql.db).define("table", { จนถึง });
-                    const regex = /const\s+\w+\s+=\s+Schema\(sql\.\w+\)\.define\([\s\S]*?\}\);/;
-                    
-                    if (regex.test(currentContent)) {
-                      let updatedContent = currentContent.replace(regex, rawSchema);
-  
-                      this.fs.writeFile(modelPath, updatedContent, 'utf8', (writeErr) => {
-                        if (writeErr) return reject(writeErr);
-                        resolve(`\n [102m [90m Passed  [0m [0m The model \`${modelName}\` schema has been updated.`);
-                      });
-                    } else {
-                      resolve("\n [101m Faltal  [0m Could not find Schema definition pattern in the file.");
+              // pull new schema from database
+              connectForGenerateModel(dbSelected.selectDbConnect, modelName, appConfig.database_config, (dbErr, tableSchema, tableName) => {
+                if (dbErr) return reject(dbErr);
+                // read current model file for AST
+                this.fs.readFile(modelPath, 'utf8', (readErr, code) => {
+                  if (readErr) return reject(readErr);
+                  const ast = recast.parse(code);
+                  let isUpdated = false;
+                  // Function for map raw database type to Sequelize DataTypes AST Node
+                  const getDataTypeNode = (rawType) => {
+                    const type = rawType.toUpperCase();
+                    if (type.includes('INT')) return builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('INTEGER'));
+                    if (type.includes('BIGINT')) return builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('BIGINT'));
+                    if (type.includes('FLOAT')) return builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('FLOAT'));
+                    if (type.includes('DOUBLE')) return builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('DOUBLE'));
+                    if (type.includes('DECIMAL')) return builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('DECIMAL'));
+                    if (type.includes('BOOLEAN') || type === 'TINYINT(1)') return builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('BOOLEAN'));
+                    if (type.includes('CHAR') || type.includes('VARCHAR')) {
+                      const match = type.match(/\((\d+)\)/);
+                      const length = match ? match[1] : '255';
+                      return builders.callExpression(
+                        builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('STRING')),
+                        [builders.literal(parseInt(length))]
+                      );
+                    }
+                    if (type.includes('TEXT')) return builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('TEXT'));
+                    if (type.includes('DATE')) return builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('DATE'));
+                    if (type.includes('TIME')) return builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('TIME'));
+                    if (type.includes('JSON')) return builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('JSON'));
+                    if (type.includes('UUID')) return builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('UUID'));
+                    if (type.includes('BLOB')) return builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('BLOB'));
+                    if (type.includes('ENUM')) return builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('ENUM'));
+                    if (type.includes('GEOMETRY')) return builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('GEOMETRY'));
+                    return builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('STRING'));
+                  };
+                  // recast.visit for find position of Schema(...).define() and update fields
+                  recast.visit(ast, {
+                    visitCallExpression(path) {
+                      const node = path.node;
+                      if (node.callee.property && node.callee.property.name === 'define' && node.arguments[1] && node.arguments[1].type === 'ObjectExpression') {
+                        const fieldsObject = node.arguments[1];
+                        const newFieldNames = Object.keys(tableSchema);
+                        const updatedProperties = [];
+                        newFieldNames.forEach(dbFieldName => {
+                          const dbFieldData = tableSchema[dbFieldName];
+                          let existingProperty = fieldsObject.properties.find(p => {
+                            const propName = p.key.name || p.key.value;
+                            if (propName === dbFieldName) return true;
+                            if (p.value && p.value.properties) {
+                              const hasFieldMapping = p.value.properties.find(
+                                innerP => (innerP.key.name === 'field' || innerP.key.value === 'field') &&
+                                          (innerP.value.value === dbFieldName)
+                              );
+                              if (hasFieldMapping) return true;
+                            }
+                            return false;
+                          });
+                          const latestFieldProps = [];
+                          // Prepare properties from Table DB (Type, PK, AI, Default, etc.)
+                          latestFieldProps.push(builders.property('init', builders.identifier('type'), getDataTypeNode(dbFieldData.type)));
+                          latestFieldProps.push(builders.property('init', builders.identifier('allowNull'), builders.literal(dbFieldData.allowNull === 'YES' || dbFieldData.allowNull === true)));
+                          if (dbFieldData.primaryKey) latestFieldProps.push(builders.property('init', builders.identifier('primaryKey'), builders.literal(true)));
+                          if (dbFieldData.autoIncrement) latestFieldProps.push(builders.property('init', builders.identifier('autoIncrement'), builders.literal(true)));
+                          if (dbFieldData.unique) latestFieldProps.push(builders.property('init', builders.identifier('unique'), builders.literal(true)));
+                          if(this.extra != '--no-comment') {
+                            if (dbFieldData.comment) latestFieldProps.push(builders.property('init', builders.identifier('comment'), builders.literal(dbFieldData.comment)));
+                          }
+                          if (dbFieldData.defaultValue !== null && dbFieldData.defaultValue !== undefined) {
+                            const dVal = String(dbFieldData.defaultValue).toUpperCase();
+                            const defaultNode = (dVal === 'CURRENT_TIMESTAMP' || dVal === 'NOW()') 
+                              ? builders.memberExpression(builders.identifier('DataTypes'), builders.identifier('NOW'))
+                              : builders.literal(dbFieldData.defaultValue);
+                            latestFieldProps.push(builders.property('init', builders.identifier('defaultValue'), defaultNode));
+                          }
+                          if (!existingProperty) {
+                            existingProperty = builders.property('init', builders.identifier(dbFieldName), builders.objectExpression(latestFieldProps));
+                            isUpdated = true;
+                          } else {
+                            const currentProps = existingProperty.value.properties;
+                            latestFieldProps.forEach(newProp => {
+                              const oldProp = currentProps.find(p => p.key.name === newProp.key.name);
+                              if (!oldProp || recast.print(oldProp.value).code !== recast.print(newProp.value).code) {
+                                isUpdated = true;
+                                if (!oldProp) currentProps.push(newProp); else oldProp.value = newProp.value;
+                              }
+                            });
+                            const latestPropNames = latestFieldProps.map(p => p.key.name);
+                            latestPropNames.push('field');
+                            existingProperty.value.properties = currentProps.filter(p => latestPropNames.includes(p.key.name));
+                          }
+                          updatedProperties.push(existingProperty);
+                        });
+                        const currentOrder = fieldsObject.properties.map(p => p.key.name || p.key.value).join(',');
+                        const newOrder = updatedProperties.map(p => p.key.name || p.key.value).join(',');
+                        if (currentOrder !== newOrder || fieldsObject.properties.length !== updatedProperties.length) isUpdated = true;
+                        fieldsObject.properties = updatedProperties;
+                      }
+                      return false;
                     }
                   });
+                  // Write back updated AST, Shout updated
+                  if (isUpdated) {
+                    // Write updated AST back to file
+                    const output = recast.print(ast).code;
+                    this.fs.writeFile(modelPath, output, 'utf8', (writeErr) => {
+                      if (writeErr) return reject(writeErr);
+                      resolve(`\n Updated  The model \`${modelFileName}\` has been updated via AST.`);
+                    });
+                  } else {
+                    resolve(`\n Warning  No new fields found to update for \`${modelFileName}\`.`);
+                  }
                 });
               });
             });
@@ -691,21 +775,19 @@ class Generator {
         // Check is primary key
         if (props.primaryKey) lines.push(`    primaryKey: true,`);
         if (props.autoIncrement) lines.push(`    autoIncrement: true,`);
-        //if (props.comment) lines.push(`    comment: '${props.comment}',`);
-
+        // Check <extra> for comment, because some database have extra comment in field but it's not comment for field, so we need to check it first before assign to comment
+        if(this.extra != '--no-comment') {
+          if (props.comment) lines.push(`    comment: "${props.comment}",`);
+        }
         // Handle defaultValue
         if (props.defaultValue !== null && props.defaultValue !== undefined) {
           const defaultVal = String(props.defaultValue).toUpperCase();
-          if (
-            defaultVal === 'CURRENT_TIMESTAMP' ||
-            defaultVal === 'NOW()' ||
-            defaultVal.includes('CURRENT_TIMESTAMP')
-          ) {
+          if (defaultVal === 'CURRENT_TIMESTAMP' || defaultVal === 'NOW()' || defaultVal.includes('CURRENT_TIMESTAMP')) {
             lines.push(`    defaultValue: DataTypes.NOW,`);
           } else if (defaultVal === 'UUID()' || defaultVal === 'uuid()' || defaultVal === 'UUID') {
             lines.push(`    defaultValue: DataTypes.UUIDV4,`);
           } else if (typeof props.defaultValue === 'string') {
-            lines.push(`    defaultValue: '${props.defaultValue}',`);
+            lines.push(`    defaultValue: "${props.defaultValue}",`);
           } else {
             lines.push(`    defaultValue: ${props.defaultValue},`);
           }

package/packages/cli/core/index.js

@@ -43,7 +43,7 @@ const uploadStrategy = multer({
     }
   }
 }).any();
-const jsonLimitSize = _beech_?.payload.json?.limit || "100KB"; // json payload
+const jsonLimitSize = _beech_?.payload?.json?.limit || "100KB"; // json payload
 const urlencodedLimitSize = _beech_?.payload?.urlencoded?.limit || "100KB"; // urlencoded payload (multipart/form-data)
 const urlencodedExtended = !!(_beech_?.payload?.urlencoded?.extended ?? true);
 _app_.use(_express_.urlencoded({ limit: urlencodedLimitSize, extended: urlencodedExtended })); // application/x-www-form-urlencoded payload