@zenorm/generate 2.0.2 → 2.1.0

package/dist/generate.js

@@ -28,6 +28,8 @@ export async function generate(tables, cfg) {
         config.globalFilename ? `import _Global from './${config.globalFilename}.js';` : null,
         '',
     ];
+    const typesOut = {};
+    const tablesOut = [];
     const models = [];
     const filterRegExp = config.filter ? new RegExp(config.filter) : null;
     const includeRegExp = config.include ? new RegExp(config.include) : null;
@@ -42,6 +44,8 @@ export async function generate(tables, cfg) {
         const name = snakeCase(tableName);
         const outputFilename = path.join(outputDir, name + '.ts');
         console.log('table:', tableName);
+        // 自定义类型
+        Object.assign(typesOut, t.types);
         let pk;
         let pkType = 'never';
         const props = [];
@@ -61,18 +65,18 @@ export async function generate(tables, cfg) {
             props.push(`  ${c.name}${c.required ? '!' : '?'}: ${c.type};`);
             columns.push(c.name);
         }
-        structs.push(`export class ${className}Table${config.globalFilename ? ' extends _Global' : ''} {`);
-        structs.push(`  static columns = ${JSON.stringify(columns)};`);
-        structs.push(...props);
-        structs.push('');
-        structs.push(`  constructor(data?: object) {`);
+        tablesOut.push(`export class ${className}Table${config.globalFilename ? ' extends _Global' : ''} {`);
+        tablesOut.push(`  static columns = ${JSON.stringify(columns)};`);
+        tablesOut.push(...props);
+        tablesOut.push('');
+        tablesOut.push(`  constructor(data?: object) {`);
         if (config.globalFilename) {
-            structs.push(`    super();`);
+            tablesOut.push(`    super();`);
         }
-        structs.push(`    data && Object.assign(this, data);`);
-        structs.push(`  }`);
-        structs.push('}');
-        structs.push('');
+        tablesOut.push(`    data && Object.assign(this, data);`);
+        tablesOut.push(`  }`);
+        tablesOut.push('}');
+        tablesOut.push('');
         // model class
         await notExistsPut(outputFilename, () => {
             return [
@@ -91,6 +95,11 @@ export async function generate(tables, cfg) {
         });
         models.push({ name, className, pkType });
     }
+    // 排序输出自定义类型到文件头部
+    for (const tname of Object.keys(typesOut).sort()) {
+        structs.push(`type ${tname} = ${typesOut[tname]}`);
+    }
+    structs.push(...tablesOut);
     const tablesFilename = path.join(outputDir, config.tablesFilename + '.ts');
     console.log(`write tables file: ${tablesFilename}`);
     await fs.writeFile(tablesFilename, structs.filter(i => i !== null).join('\n'));

package/dist/types.d.ts

@@ -35,6 +35,10 @@ export interface TabelDescribe {
      * 列描述信息
      */
     columns: ColumnDescribe[];
+    /**
+     * 类型定义
+     */
+    types?: Record<string, string>;
 }
 /**
  * 生成配置

package/package.json

@@ -2,7 +2,7 @@
   "name": "@zenorm/generate",
   "type": "module",
   "description": "Easy ORM, easy query. easy typing! Auto generate typescript declaration.",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "homepage": "https://zenorm.node.ltd",