generate-dac 1.0.5 → 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',
@@ -455,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 = [];

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.5",
+  "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)
+        }
       }
     }