@zenorm/generate 1.10.0 → 2.0.0

package/dist/bin/zenorm-generate.js

@@ -1,26 +1,27 @@
 #!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-const generate_1 = require("../generate");
-function getConfig(filename) {
+import path from 'node:path';
+import { generate } from '../generate.js';
+async function getConfig(filename) {
     const configFile = path.join(process.cwd(), filename);
-    const config = require(configFile);
+    const config = (await import(configFile)).default;
     return Object.assign({
         backend: '@zenorm/generate-mysql',
     }, config);
 }
 async function main(configFilename) {
     const config = await getConfig(configFilename);
-    const call = require(config.backend).default;
-    await (0, generate_1.generate)(call()(config), config);
+    const call = (await import(config.backend)).default;
+    await generate(call()(config), config);
 }
 if (!process.argv[2]) {
-    console.log('zenorm-generate config.json');
+    console.log('zenorm-generate config.js');
     process.exit(1);
 }
 else {
-    main(process.argv[2]).then(() => process.exit(), e => {
+    await main(process.argv[2]).then(() => {
+        console.log('Done.');
+        process.exit();
+    }, e => {
         console.error(e);
         process.exit(1);
     });

package/dist/generate.d.ts

@@ -1,2 +1,2 @@
-import { GenerateConfig, TabelDescribe } from './types';
+import { GenerateConfig, TabelDescribe } from './types.js';
 export declare function generate(tables: AsyncGenerator<TabelDescribe>, cfg?: GenerateConfig): Promise<void>;

package/dist/generate.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = void 0;
-const fs_1 = require("fs");
-const path = require("path");
-const pascal_case_1 = require("pascal-case");
-const snake_case_1 = require("snake-case");
-const utils_1 = require("./utils");
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
+import { pascalCase } from 'pascal-case';
+import { snakeCase } from 'snake-case';
+import { checkFileDir, currentDatetime, cwdPath, notExistsPut } from './utils.js';
 const zenormName = process.env.ZENORM_NAME || 'zenorm';
-async function generate(tables, cfg) {
+export async function generate(tables, cfg) {
     console.log('generate models...');
     const config = Object.assign({
         outputDir: './src/model',
@@ -16,13 +13,13 @@ async function generate(tables, cfg) {
         staticMethods: true,
         instanceMethods: true,
     }, cfg);
-    const outputDir = (0, utils_1.cwdPath)(config.outputDir);
-    await (0, utils_1.checkFileDir)(outputDir);
+    const outputDir = cwdPath(config.outputDir);
+    await checkFileDir(outputDir);
     console.log('database:', config.database);
     const remark = [
         '// zenorm 自动生成文件',
         '// 请不要修改此文件，因为此文件在每次重新生成数据库结构时会被覆盖',
-        `// create at: ${(0, utils_1.currentDatetime)()}`,
+        `// create at: ${currentDatetime()}`,
         `// create by: ${process.env.USER || process.env.USERNAME || '-'}@${process.env.COMPUTERNAME || '-'}`,
         `// database: ${config.database}`,
     ];
@@ -41,8 +38,8 @@ async function generate(tables, cfg) {
             // console.log('table:', tableName, 'ignore');
             continue;
         }
-        const className = (0, pascal_case_1.pascalCase)(tableName);
-        const name = (0, snake_case_1.snakeCase)(tableName);
+        const className = pascalCase(tableName);
+        const name = snakeCase(tableName);
         const outputFilename = path.join(outputDir, name + '.ts');
         console.log('table:', tableName);
         let pk;
@@ -77,10 +74,10 @@ async function generate(tables, cfg) {
         structs.push('}');
         structs.push('');
         // model class
-        await (0, utils_1.notExistsPut)(outputFilename, () => {
+        await notExistsPut(outputFilename, () => {
             return [
                 `import { model } from '${zenormName}';`,
-                `import { ${className}Table } from './${config.tablesFilename}';`,
+                `import { ${className}Table } from './${config.tablesFilename}.js';`,
                 '',
                 `@model({`,
                 pk ? `  pk: '${pk}',` : null,
@@ -96,12 +93,16 @@ async function generate(tables, cfg) {
     }
     const tablesFilename = path.join(outputDir, config.tablesFilename + '.ts');
     console.log(`write tables file: ${tablesFilename}`);
-    await fs_1.promises.writeFile(tablesFilename, structs.filter(i => i !== null).join('\n'));
+    await fs.writeFile(tablesFilename, structs.filter(i => i !== null).join('\n'));
+    const imports = ['createRepositoryQuery'];
+    if (config.generateRepositories || config.bindQuery) {
+        imports.push('QueryParam');
+    }
     const repositories = [
         ...remark,
-        `import { ${(config.generateRepositories || config.bindQuery) ? `QueryParam, UpdateRow, ` : ''}createRepositoryQuery } from '${zenormName}';`,
-        `import * as _tables from './_tables';`,
-        ...models.map(({ name, className }) => `import _${className} from './${name}';`),
+        `import { ${imports.join(', ')} } from '${zenormName}';`,
+        `import * as _tables from './${config.tablesFilename}.js';`,
+        ...models.map(({ name, className }) => `import _${className} from './${name}.js';`),
     ];
     // 绑定静态 Query
     if (config.bindQuery) {
@@ -135,7 +136,7 @@ async function generate(tables, cfg) {
                 repositories.push(`  /** 保存当前实例数据 */`);
                 repositories.push(`  save() { return ${className}.repository.save(this); }`);
                 repositories.push(`  /** 更新当前实例数据 */`);
-                repositories.push(`  update(data: UpdateRow<${className}>) { return ${className}.repository.update(this, data); }`);
+                repositories.push(`  update(data: Partial<${className}>) { return ${className}.repository.update(this, data); }`);
                 repositories.push(`  /** 删除当前实例数据 */`);
                 repositories.push(`  delete() { return ${className}.repository.delete(this); }`);
             }
@@ -160,23 +161,22 @@ async function generate(tables, cfg) {
     }
     const repositoriesFilename = path.join(outputDir, config.repositoriesFilename + '.ts');
     console.log(`write repositories file: ${repositoriesFilename}`);
-    await fs_1.promises.writeFile(repositoriesFilename, repositories.join('\n'));
+    await fs.writeFile(repositoriesFilename, repositories.join('\n'));
     // 生成 global.ts
     if (config.globalFilename) {
         const globalFilename = path.join(outputDir, config.globalFilename + '.ts');
-        await (0, utils_1.notExistsPut)(globalFilename, () => {
+        await notExistsPut(globalFilename, () => {
             console.log(`write file: ${globalFilename}`);
             return 'export default class Global {}';
         });
     }
     // 生成 index.ts
     const indexFilename = path.join(outputDir, 'index.ts');
-    await (0, utils_1.notExistsPut)(indexFilename, () => {
+    await notExistsPut(indexFilename, () => {
         console.log(`write file: ${indexFilename}`);
         return [
-            `export * from './${config.tablesFilename}';`,
-            `export * from './${config.repositoriesFilename}';`,
+            `export * from './${config.tablesFilename}.js';`,
+            `export * from './${config.repositoriesFilename}.js';`,
         ].join('\n');
     });
 }
-exports.generate = generate;

package/dist/index.d.ts

@@ -1 +1 @@
-export * from './types';
+export * from './types.js';

package/dist/index.js

@@ -1,17 +1 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./types"), exports);
+export * from './types.js';

package/dist/types.js

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

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
 export declare function cwdPath(p: string): string;
-export declare function checkFileDir(dir: string): Promise<void>;
+export declare function checkFileDir(dir: string): Promise<string | undefined>;
 export declare function fileExists(f: string): Promise<boolean>;
 /**
  * 文件不存在则创建并写入内容

package/dist/utils.js

@@ -1,37 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.currentDatetime = exports.notExistsPut = exports.fileExists = exports.checkFileDir = exports.cwdPath = void 0;
-const fs_1 = require("fs");
-const path = require("path");
-function cwdPath(p) {
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
+export function cwdPath(p) {
     if (p.startsWith('./')) {
         return path.join(process.cwd(), p.slice(2));
     }
     return p;
 }
-exports.cwdPath = cwdPath;
-function checkFileDir(dir) {
-    return fs_1.promises.mkdir(dir, { recursive: true });
+export function checkFileDir(dir) {
+    return fs.mkdir(dir, { recursive: true });
 }
-exports.checkFileDir = checkFileDir;
-function fileExists(f) {
-    return fs_1.promises.access(f).then(() => true, () => false);
+export function fileExists(f) {
+    return fs.access(f).then(() => true, () => false);
 }
-exports.fileExists = fileExists;
 /**
  * 文件不存在则创建并写入内容
  * @param filename
  * @param getContent
  */
-async function notExistsPut(filename, getContent) {
+export async function notExistsPut(filename, getContent) {
     if (!await fileExists(filename)) {
-        await fs_1.promises.writeFile(filename, await getContent());
+        await fs.writeFile(filename, await getContent());
         return true;
     }
     return false;
 }
-exports.notExistsPut = notExistsPut;
-function currentDatetime() {
+export function currentDatetime() {
     return new Date().toLocaleString();
 }
-exports.currentDatetime = currentDatetime;

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@zenorm/generate",
+  "type": "module",
   "description": "Easy ORM, easy query. easy typing! Auto generate typescript declaration.",
-  "version": "1.10.0",
+  "version": "2.0.0",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "homepage": "https://zenorm.node.ltd",
@@ -15,9 +16,9 @@
   ],
   "scripts": {
     "build": "rimraf dist && tsc",
-    "prepublishOnly": "npm run build",
-    "gen": "cd test && ts-node ../src/bin/zenorm-generate.ts config.json",
-    "t1": "cd test && cross-env DEBUG=* ts-node t1"
+    "prepack": "npm run build",
+    "gen": "cd test && node --loader ts-node/esm ../src/bin/zenorm-generate.ts config.js",
+    "t1": "cd test && cross-env DEBUG=* node --loader ts-node/esm t1.ts"
   },
   "keywords": [
     "mysql",
@@ -28,14 +29,14 @@
     "database"
   ],
   "devDependencies": {
-    "@types/node": "^12.20.41",
-    "@zenorm/generate-mysql": "^1.3.0",
+    "@types/node": "^16",
+    "@zenorm/generate-mysql": "^2.0.0",
     "cross-env": "^7.0.3",
     "mysql-easy-query": "^3.13.0",
     "rimraf": "^4.4.1",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4",
-    "zenorm": "^3.34.0"
+    "typescript": "^5.6.3",
+    "zenorm": "^4.0.0"
   },
   "dependencies": {
     "pascal-case": "^3.1.2",

package/CHANGELOG.md

@@ -1,52 +0,0 @@
-# Changelog
-
-## [1.10.0] - 2023-8-29
-- getOrCreate
-
-## [1.9.1] - 2023-8-9
-- 默认选项: staticMethods=true
-
-## [1.9.0] - 2023-8-9
-- 增加配置选项: staticMethods instanceMethods
-
-## [1.8.1] - 2023-5-19
-- fix: 使用 global 继承时构造函数缺少 super 调用
-
-## [1.8.0] - 2023-5-18
-- 撤销 [1.6.0] 的修改，动态 as 功能无法满足需求
-
-## [1.7.0] - 2023-5-18
-- 构造器增加 pkval 参数
-
-## [1.6.0] - 2023-5-18
-- 使用构造器提前初始化对象的属性，用于优化 v8 对象缓存机制
-
-## [1.5.0] - 2023-4-19
-- 更新: update 方法使用 UpdateRow<M>
-
-## [1.4.0] - 2023-3-29
-- createRepositoryQuery 添加表描述
-- 如果没有主键 pkType = never
-
-## [1.3.1] - 2023-3-27
-- fix: windows 换行符问题
-
-## [1.3.0] - 2023-3-25
-- update: bindQuery 增加 save, update, delete
-
-## [1.2.0] - 2023-3-24
-- update: bindQuery 改为函数形式
-
-## [1.1.1] - 2023-3-24
-- fix: 生成格式少个空格和空行
-- update: bindQuery 增加 count 和 exists
-- 补充注释说明
-
-## [1.1.0] - 2023-3-24
-- 新增: 绑定静态 Query
-
-## [1.0.0] - 2023-3-23
-- 完善
-
-## [0.0.1] - 2023-3-23
-- 从 zenorm@3.25.0 分离为独立项目