@zenorm/generate 1.3.1 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [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 换行符问题
 

package/dist/generate.js

@@ -43,12 +43,12 @@ async function generate(tables, cfg) {
         const name = (0, snake_case_1.snakeCase)(tableName);
         const outputFilename = path.join(outputDir, name + '.ts');
         console.log('table:', tableName);
-        let pk = 'id';
-        let pkType = 'number';
+        let pk;
+        let pkType = 'never';
         const props = [];
         const columns = [];
         for (const c of t.columns) {
-            if (c.pk) {
+            if (!pk && c.pk) {
                 pk = c.name;
                 pkType = c.type;
             }
@@ -74,7 +74,7 @@ async function generate(tables, cfg) {
                 `import { ${className}Table } from './${config.tablesFilename}';`,
                 '',
                 `@model({`,
-                `  pk: '${pk}',`,
+                pk ? `  pk: '${pk}',` : null,
                 name != tableName ? `  name: '${name}',` : null,
                 `  table: '${tableName}',`,
                 `})`,
@@ -90,7 +90,8 @@ async function generate(tables, cfg) {
     await fs_1.promises.writeFile(tablesFilename, structs.filter(i => i !== null).join('\n'));
     const repositories = [
         ...remark,
-        `import { ${(config.generateRepositories || config.bindQuery) ? `QueryParam, ` : ''}createRepositoryQuery } from '${zenormName}';`,
+        `import { ${(config.generateRepositories || config.bindQuery) ? `QueryParam, UpdateRow, ` : ''}createRepositoryQuery } from '${zenormName}';`,
+        `import * as _tables from './_tables';`,
         ...models.map(({ name, className }) => `import _${className} from './${name}';`),
     ];
     // 绑定静态 Query
@@ -99,7 +100,7 @@ async function generate(tables, cfg) {
     }
     // static
     models.forEach(({ className, pkType }) => {
-        repositories.push('', `export class ${className} extends _${className} {`, `  /** 使用指定 Query 对象查询 ${className}Repository */`, `  static query = createRepositoryQuery<${className}, ${pkType}>(${className});`);
+        repositories.push('', `export class ${className} extends _${className} {`, `  /** 使用指定 Query 对象查询 ${className}Repository */`, `  static query = createRepositoryQuery<${className}, _tables.${className}Table, ${pkType}>(${className});`);
         if (config.bindQuery) {
             repositories.push(`  /** Query 绑定的 ${className}Repository */`);
             repositories.push(`  static repository = ${className}.query(_query);`);
@@ -120,7 +121,7 @@ async function generate(tables, cfg) {
             repositories.push(`  /** 保存当前实例数据 */`);
             repositories.push(`  save() { return ${className}.repository.save(this); }`);
             repositories.push(`  /** 更新当前实例数据 */`);
-            repositories.push(`  update(data: Partial<${className}>) { return ${className}.repository.update(this, data); }`);
+            repositories.push(`  update(data: UpdateRow<${className}>) { return ${className}.repository.update(this, data); }`);
             repositories.push(`  /** 删除当前实例数据 */`);
             repositories.push(`  delete() { return ${className}.repository.delete(this); }`);
         }

package/dist/utils.js

@@ -15,7 +15,7 @@ function checkFileDir(dir) {
 }
 exports.checkFileDir = checkFileDir;
 function fileExists(f) {
-    return fs_1.promises.access(f).then(() => true, e => false);
+    return fs_1.promises.access(f).then(() => true, () => false);
 }
 exports.fileExists = fileExists;
 /**

package/package.json

@@ -1,17 +1,16 @@
 {
   "name": "@zenorm/generate",
   "description": "Easy ORM, easy query. easy typing! Auto generate typescript declaration.",
-  "version": "1.3.1",
+  "version": "1.5.0",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
-  "repository": "https://github.com/yefei/zenorm-generate",
+  "homepage": "https://zenorm.node.ltd",
   "author": "YeFei <316606233@qq.com>",
   "license": "MIT",
   "bin": {
     "zenorm-generate": "./dist/bin/zenorm-generate.js"
   },
   "files": [
-    "docs",
     "dist"
   ],
   "scripts": {
@@ -30,13 +29,13 @@
   ],
   "devDependencies": {
     "@types/node": "^12.20.41",
-    "@zenorm/generate-mysql": "^1.2.0",
+    "@zenorm/generate-mysql": "^1.3.0",
     "cross-env": "^7.0.3",
-    "mysql-easy-query": "^3.12.0",
+    "mysql-easy-query": "^3.13.0",
     "rimraf": "^4.4.1",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.5",
-    "zenorm": "^3.27.0"
+    "typescript": "^5.0.4",
+    "zenorm": "^3.31.0"
   },
   "dependencies": {
     "pascal-case": "^3.1.2",