generate-dac 1.0.4 → 1.0.6

package/dist/DAC_Utils.js

@@ -36,6 +36,14 @@ function get_SqlDbType(type) {
             sqlType: 'int'
         };
     }
+    if (type === 'date') {
+        return {
+            type: 'Date',
+            codeType: 'DateTime',
+            codeGetMethodType: 'GetDateTime',
+            sqlType: 'date'
+        };
+    }
     if (type === 'money') {
         return {
             type: 'Money',
@@ -64,6 +72,18 @@ function get_SqlDbType(type) {
             sqlType: "nvarchar(".concat(length_1, ")")
         };
     }
+    var decimalReg = /Decimal\(([^\(\)]+)\)/i;
+    if (decimalReg.test(type)) {
+        var match = decimalReg.exec(type);
+        var length_2 = match ? match[1] : 250;
+        return {
+            type: 'Decimal',
+            option: length_2,
+            codeType: 'decimal',
+            codeGetMethodType: 'GetDecimal',
+            sqlType: "decimal(".concat(length_2, ")")
+        };
+    }
     if (/DateTime/i.test(type)) {
         return {
             type: 'DateTime',
@@ -114,6 +134,7 @@ function dac_generate_data_access(tableName, schemas) {
         var createUserStr = createUserFields.map(function (e, i) { return "".concat(e, " = ").concat(schemas.length + i); }).join(",\n\t\t\t");
         columnEnumStr += ",\n\t\t\t" + createUserStr;
     }
+    var tableNamePlural = (0, str_utils_1.str_plural)(tableName);
     var insertParamsStart = schemas.filter(function (e) {
         return e.col_name !== 'ID'
             && e.col_name !== 'Create_DateTime'
@@ -121,9 +142,9 @@ function dac_generate_data_access(tableName, schemas) {
     }).map(function (e, i) {
         var types = get_SqlDbType(e.type);
         if (types.type === 'DateTime') {
-            return "CreateParameter(dbCommand, \"@".concat(e.col_name, "\", SqlDbType.").concat(types.type, ", FixDBDateTime(obj").concat(tableName, "s.Collection[i].").concat(e.col_name, "));");
+            return "CreateParameter(dbCommand, \"@".concat(e.col_name, "\", SqlDbType.").concat(types.type, ", FixDBDateTime(obj").concat(tableNamePlural, ".Collection[i].").concat(e.col_name, "));");
         }
-        return "CreateParameter(dbCommand, \"@".concat(e.col_name, "\", SqlDbType.").concat(types.type, ", obj").concat(tableName, "s.Collection[i].").concat(e.col_name, ");");
+        return "CreateParameter(dbCommand, \"@".concat(e.col_name, "\", SqlDbType.").concat(types.type, ", obj").concat(tableNamePlural, ".Collection[i].").concat(e.col_name, ");");
     }).join("\n" + repeat("\t", 5));
     var updateParamsStart = schemas.filter(function (e) {
         return e.col_name !== 'Create_DateTime'
@@ -132,9 +153,9 @@ function dac_generate_data_access(tableName, schemas) {
     }).map(function (e, i) {
         var types = get_SqlDbType(e.type);
         if (types.type === 'DateTime') {
-            return "CreateParameter(dbCommand, \"@".concat(e.col_name, "\", SqlDbType.").concat(types.type, ", FixDBDateTime(obj").concat(tableName, "s.Collection[i].").concat(e.col_name, "));");
+            return "CreateParameter(dbCommand, \"@".concat(e.col_name, "\", SqlDbType.").concat(types.type, ", FixDBDateTime(obj").concat(tableNamePlural, ".Collection[i].").concat(e.col_name, "));");
         }
-        return "CreateParameter(dbCommand, \"@".concat(e.col_name, "\", SqlDbType.").concat(types.type, ", obj").concat(tableName, "s.Collection[i].").concat(e.col_name, ");");
+        return "CreateParameter(dbCommand, \"@".concat(e.col_name, "\", SqlDbType.").concat(types.type, ", obj").concat(tableNamePlural, ".Collection[i].").concat(e.col_name, ");");
     }).join("\n" + repeat("\t", 5));
     var fillStr = schemas.map(function (e, i) {
         return "\t\t\tif (!objDataReader.IsDBNull((int)".concat(tableName, "Column.").concat(e.col_name, "))\n\t\t\t\tobj").concat(tableName, ".").concat(e.col_name, " = objDataReader.").concat(get_SqlDbType(e.type).codeGetMethodType, "((int)").concat(tableName, "Column.").concat(e.col_name, ");");
@@ -150,6 +171,7 @@ function dac_generate_data_access(tableName, schemas) {
     }
     var dacTemplateGeneratedContentOutput = binding_template(dacTemplateGeneratedContent, {
         Table_Name: tableName,
+        Table_Name_Plural: tableNamePlural,
         table_name_lower: tableName.toLowerCase(),
         table_column_enum: columnEnumStr,
         insert_params: insertParamsStart,
@@ -245,7 +267,7 @@ function dac_generate_dataServiceObject(tableName, schemas) {
     };
     var classTemplate = (0, file_utils_1.text_from_file)("".concat(TEMPLATE_DIR, "/templates/DataServiceObjects_Class_Template.cs"));
     var strProperties = schemas.map(function (e, i) {
-        return "public ".concat(get_SqlDbType(e.type).codeType, " ").concat(e.col_name.replace(/[ _]+/g, ''), " { get; set; }");
+        return "public ".concat(e.enum || get_SqlDbType(e.type).codeType, " ").concat(e.col_name.replace(/[ _]+/g, ''), " { get; set; }");
     }).join('\n' + repeat("\t", 2));
     var created_by_user = '';
     var updated_by_user = '';
@@ -256,10 +278,13 @@ function dac_generate_dataServiceObject(tableName, schemas) {
         updated_by_user = "public RPMAdminUser UpdatedByUser { get; set; }";
     }
     var className = get_className(tableName);
+    var tableNameLower = tableName.toLowerCase();
+    var classNamePlural = (0, str_utils_1.str_plural)(className);
     var classStr = binding_template(classTemplate, {
         table_name: tableName,
-        table_name_lower: tableName.toLowerCase(),
+        table_name_lower: tableNameLower,
         class_name: className,
+        class_name_plural: classNamePlural,
         properties: strProperties,
         created_by_user: created_by_user,
         updated_by_user: updated_by_user,
@@ -268,8 +293,9 @@ function dac_generate_dataServiceObject(tableName, schemas) {
     result.classes.push(classStr);
     var content = binding_template(DataServiceObjects_Template, {
         table_name: tableName,
-        table_name_lower: tableName.toLowerCase(),
+        table_name_lower: tableNameLower,
         class_name: className,
+        class_name_plural: classNamePlural,
         datetime: CREATED_DATETIME,
         content: classStr
     });
@@ -286,7 +312,7 @@ function dac_generate_conversions(tableName, schemas) {
     var className = get_className(tableName);
     var methodTemplate = (0, file_utils_1.text_from_file)("".concat(TEMPLATE_DIR, "/templates/MakeDSO_Template_Method.cs"));
     var dsoFields = schemas.map(function (e, i) {
-        return "ds".concat(className, ".").concat(e.colName, " = db").concat(className, ".").concat(e.col_name, ";");
+        return "ds".concat(className, ".").concat(e.colName, " =").concat(e.enum ? "(".concat(e.enum, ")") : '', " db").concat(className, ".").concat(e.col_name, ";");
     }).join('\n' + repeat("\t", 3));
     var dbFields = schemas.map(function (e, i) {
         var type = get_SqlDbType(e.type);
@@ -296,7 +322,7 @@ function dac_generate_conversions(tableName, schemas) {
         if (type.codeType === 'DateTime') {
             return "db".concat(className, ".").concat(e.col_name, " = DateTimeHelper.MakeDBDefaultValue(ds").concat(className, ".").concat(e.colName, ");");
         }
-        return "db".concat(className, ".").concat(e.col_name, " = ds").concat(className, ".").concat(e.colName, ";");
+        return "db".concat(className, ".").concat(e.col_name, " = ds").concat(className, ".").concat(e.colName).concat(e.enum ? ".GetHashCode()" : '', ";");
     }).join('\n' + repeat("\t", 3));
     var created_by_user = '';
     var updated_by_user = '';
@@ -449,6 +475,7 @@ function DAC_Generate_From_XLSX(filePath, sheetIndex) {
     var outputFolder = (0, file_utils_1.get_filename_without_extension)(filePath);
     console.log("DAC_Generate_From_XLSX: ".concat(outputFolder).yellow);
     var sheets = (0, excel_utils_1.json_read_all_sheets_from_excel)(filePath, { sheetIndex: sheetIndex, transformColumnName: true });
+    (0, excel_utils_1.json_to_file)(filePath.replace('xlsx', 'json'), sheets);
     var schemas = [];
     var stores = [];
     var dropTables = [];
@@ -540,7 +567,7 @@ function DAC_Generate_From_XLSX(filePath, sheetIndex) {
             name: 'table_schema.sql',
             content: schemas.join("\n\n\n")
         });
-        var content = "\n".concat(dropConstrains.join("\n"), "\n    \n").concat(dropTables.join("\n"));
+        var content = "".concat(dropConstrains.filter(function (e) { return e; }).join("\nGO\n"), "\n    \n").concat(dropTables.join("\nGO\n"));
         files.push({
             name: 'table_schema_reset.sql',
             content: content

package/dist/generate-table-dac/index.js

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.start_generate_dac_for_new_table = void 0;
+var dayjs_1 = __importDefault(require("dayjs"));
+var DAC_Utils_1 = require("../DAC_Utils");
+var file_utils_1 = require("../utils/file_utils");
+function start_generate_dac_for_new_table(INPUT_DIR) {
+    if (!(0, file_utils_1.file_exists)(INPUT_DIR)) {
+        console.log("There's no input folder. Please create input folder and put excel file to generate.".red);
+        return;
+    }
+    var files = (0, file_utils_1.fileName_in_folder)(INPUT_DIR);
+    if (!files || !files.length) {
+        console.log("No input files.".red);
+        return;
+    }
+    var now = (0, dayjs_1.default)().format('DD-ddd-YYYY HH:mm');
+    console.log("Process Generate DAC ".concat(now).green);
+    files.forEach(function (file, i) {
+        console.log("Begin to process file ".concat(file.name).yellow);
+        (0, DAC_Utils_1.DAC_Generate_From_XLSX)(file.path);
+    });
+}
+exports.start_generate_dac_for_new_table = start_generate_dac_for_new_table;

package/dist/handle-command-line.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startProcess = void 0;
+var command_line_args_1 = __importDefault(require("command-line-args"));
+function startProcess(options) {
+    var optionDefinitions = [
+        { name: 'args', type: String, multiple: true, defaultOption: true }
+    ];
+    var commands = (0, command_line_args_1.default)(optionDefinitions);
+    console.log(commands);
+}
+exports.startProcess = startProcess;

package/dist/index.js

@@ -5,26 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var colors_1 = __importDefault(require("colors"));
-var DAC_Utils_1 = require("./DAC_Utils");
-var dayjs_1 = __importDefault(require("dayjs"));
-var file_utils_1 = require("./utils/file_utils");
+var generate_table_dac_1 = require("./generate-table-dac");
 colors_1.default.enable();
 var INPUT_DIR = './input/';
-start();
-function start() {
-    if (!(0, file_utils_1.file_exists)(INPUT_DIR)) {
-        console.log("There's no input folder. Please create input folder and put excel file to generate.".red);
-        return;
-    }
-    var files = (0, file_utils_1.fileName_in_folder)(INPUT_DIR);
-    if (!files || !files.length) {
-        console.log("No input files.".red);
-        return;
-    }
-    var now = (0, dayjs_1.default)().format('DD-ddd-YYYY HH:mm');
-    console.log("Process Generate DAC ".concat(now).green);
-    files.forEach(function (file, i) {
-        console.log("Begin to process file ".concat(file.name).yellow);
-        (0, DAC_Utils_1.DAC_Generate_From_XLSX)(file.path);
-    });
-}
+(0, generate_table_dac_1.start_generate_dac_for_new_table)(INPUT_DIR);

package/dist/package-interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/utils/excel-utils.js

@@ -86,9 +86,15 @@ function json_read_all_sheets_from_excel(path, options) {
                     }
                     tmps_2.push(tmp);
                 });
+                if (options && options.disableClean) {
+                    return {
+                        name: sheetName,
+                        data: tmps_2
+                    };
+                }
                 return {
                     name: sheetName,
-                    data: tmps_2
+                    data: array_clean_data(tmps_2)
                 };
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generate-dac",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/DAC_Utils.ts

@@ -1,5 +1,5 @@
 import dayjs from "dayjs";
-import { SheetData, json_read_all_sheets_from_excel} from "./utils/excel-utils";
+import { SheetData, json_read_all_sheets_from_excel, json_to_file} from "./utils/excel-utils";
 import { str_className, str_plural } from "./utils/str-utils";
 import { ColumnSchema } from "./interface";
 import { __parent_dir, dir_create, file_exists, get_filename_without_extension, str_to_file, text_from_file } from "./utils/file_utils";
@@ -27,7 +27,7 @@ export function binding_template(content: string, data: any){
   return result;
 }
 
-export type SqlDbTypeType = '' | 'Int' | 'TinyInt' | 'NVarChar' | 'DateTime' | 'Bit' | 'Money';
+export type SqlDbTypeType = '' | 'Int' | 'TinyInt' | 'NVarChar' | 'DateTime' | 'Bit' | 'Money' | 'Decimal' | 'Date';
 export type CSharpType = 'int' | 'string' | 'DateTime' | 'bool' | 'decimal';
 export type CShareGetMethodType = '' | 'GetDateTime' | 'GetInt32' | 'GetBoolean' | 'GetString' | 'GetByte' | 'GetDecimal';
 
@@ -52,6 +52,15 @@ export function get_SqlDbType(type: string): SqlDbType{
     };
   }
 
+  if(type === 'date'){
+    return {
+      type: 'Date',
+      codeType: 'DateTime',
+      codeGetMethodType: 'GetDateTime',
+      sqlType: 'date'
+    };
+  }
+
   if(type === 'money'){
     return {
       type: 'Money',
@@ -82,6 +91,19 @@ export function get_SqlDbType(type: string): SqlDbType{
     };
   }
 
+  const decimalReg = /Decimal\(([^\(\)]+)\)/i;
+  if(decimalReg.test(type)){
+    const match = decimalReg.exec(type);
+    const length = match ? match[1] : 250;
+    return {
+      type: 'Decimal',
+      option: length,
+      codeType: 'decimal',
+      codeGetMethodType: 'GetDecimal',
+      sqlType: `decimal(${length})`
+    };
+  }
+
   if(/DateTime/i.test(type)){
     return {
       type: 'DateTime',
@@ -600,6 +622,8 @@ export function DAC_Generate_From_XLSX(filePath: string, sheetIndex: number = 0)
 
   const sheets: SheetData[] = json_read_all_sheets_from_excel(filePath, { sheetIndex: sheetIndex, transformColumnName: true });
 
+  json_to_file(filePath.replace('xlsx', 'json'), sheets);
+
   const schemas: string[] = [];
   const stores: string[] = [];
   const dropTables: string[] = [];

package/src/utils/excel-utils.ts

@@ -113,10 +113,17 @@ export function json_read_all_sheets_from_excel(path: string, options?: Json_rea
           tmps.push(tmp);
         });
   
+        if(options && options.disableClean){
+          return {
+            name: sheetName,
+            data: tmps
+          };
+        }
+
         return {
           name: sheetName,
-          data: tmps
-        };
+          data: array_clean_data(tmps)
+        }
       }
     }