@joktec/mysql 0.0.84 → 0.0.86

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joktec/mysql",
   "description": "JokTec - MySql Service",
-  "version": "0.0.84",
+  "version": "0.0.86",
   "private": false,
   "license": "MIT",
   "author": "JokTec",
@@ -39,7 +39,7 @@
     "prepublishOnly": "yarn build",
     "format": "prettier \"./src/**/*.ts\" --ignore-path ./.prettierignore --write",
     "lint": "eslint --fix \"./src/**/*.ts\"",
-    "dep:upgrade": "ncu -p yarn -f /^@joktec*/ -u",
+    "dep:upgrade": "ncu -p yarn -u",
     "gen:entity": "./bin/generate-entity.sh && yarn format && yarn lint",
     "test": "jest",
     "test:watch": "jest --watch",
@@ -48,17 +48,17 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@joktec/core": "0.0.83",
+    "@joktec/core": "0.0.85",
     "lodash": "^4.17.21",
     "mysql": "2.18.1",
-    "mysql2": "^3.1.2",
+    "mysql2": "^3.6.0",
     "reflect-metadata": "*",
-    "sequelize": "^6.28.0",
+    "sequelize": "^6.32.1",
     "sequelize-typescript": "^2.1.5"
   },
   "devDependencies": {
-    "@types/mysql": "^2.15.17",
-    "@types/validator": "^13.7.12"
+    "@types/mysql": "^2.15.21",
+    "@types/validator": "^13.11.1"
   },
   "lint-staged": {
     "*.ts": [
@@ -85,5 +85,5 @@
       "!**/*.{d,enum}.ts"
     ]
   },
-  "gitHead": "ca5cddaa27792a85f6b053a8168531f89b45b0fc"
+  "gitHead": "cf28d274a91ee7ddd3dcb5ef278af177ab791751"
 }

package/bin/generate-entity.sh

@@ -1,189 +0,0 @@
-#!/usr/bin/env node
-
-const { camelCase, upperFirst, kebabCase, filter, orderBy } = require('lodash');
-const fs = require('fs');
-const knex = require('knex');
-const pluralize = require('pluralize');
-const schemaInspector = require('knex-schema-inspector');
-const { Command } = require('commander');
-
-const program = new Command();
-program
-  .version('0.0.1')
-  .option('-m, --mysql-url <string>', 'MySQL URL')
-  .option('-t, --table-name <string>', 'Table name')
-  .option('-e, --only-entity', 'Only Entity');
-
-program.parse(process.argv);
-const options = program.opts();
-
-// Connect to DB and get inspector
-const connUrl = options.mysqlUrl;
-const database = knex({ client: 'mysql', connection: connUrl });
-const inspector = schemaInspector.SchemaInspector(database);
-
-// Generate Entity
-const writeEntity = async (tableName) => {
-  const entityPrefix = pluralize(tableName.split('_')[0]);
-  const dir = `./src/entities/${entityPrefix}`;
-  if (!fs.existsSync(dir)) fs.mkdirSync(dir);
-  const filePath = `${dir}/${kebabCase(tableName)}.entity.ts`;
-
-  const columns = await inspector.columnInfo(tableName);
-  const className = upperFirst(camelCase(tableName + 'Entity'));
-  const classMapper = upperFirst(camelCase(tableName + 'Mapper'));
-
-  const lines = [
-    `import { BaseEntity, MysqlMapper, linkTransform, toBool } from '@joktec/core';`,
-    `import { ClassTransformOptions, Expose, instanceToPlain, plainToInstance, Transform } from 'class-transformer';`,
-    `import { IsBoolean, IsDate, IsInt, IsNotEmpty, IsOptional, IsString } from 'class-validator';`,
-    ``,
-    `@Expose({ name: '${tableName}' })`,
-    `export class ${className} extends BaseEntity {`,
-    `\tconstructor(payload: Partial<${className}>) {`,
-    `\t\tsuper(payload);`,
-    `\t\tObject.assign(this, { ...payload });`,
-    `\t}`,
-  ];
-
-  columns.map(column => {
-    const { name, data_type, is_nullable, is_primary_key } = column;
-    lines.push(`\t@Expose({ name: '${name}' })`);
-    lines.push(is_nullable ? '\n@IsOptional()' : `\t@IsNotEmpty()`);
-    const optional = is_nullable ? '?' : '!';
-    const tsType =
-      (['bit', 'boolean'].includes(data_type) && 'boolean') ||
-      (['varchar', 'text', 'longtext'].includes(data_type) && 'string') ||
-      (['int', 'tinyint', 'bigint', 'decimal', 'double'].includes(data_type) && 'number') ||
-      (data_type.includes('unsigned') && 'number') ||
-      (['datetime', 'date', 'timestamp', 'time'].includes(data_type) && 'Date') ||
-      (['json'].includes(data_type) && 'any') ||
-      'unknown';
-
-    const validator =
-      (tsType == 'string' && `\t@IsString()`) ||
-      (tsType == 'number' && `\t@IsInt()`) ||
-      (tsType == 'Date' && `\t@IsDate()`) ||
-      (tsType == 'boolean' && `\t@IsBoolean()\n\t@Transform(({ value }) => toBool(value), { toClassOnly: true })`) ||
-      (tsType == 'any' && `\t@Transform(({ value }) => JSON.parse(value), { toClassOnly: true })\n\t@Transform(({ value }) => JSON.stringify(value), { toPlainOnly: true })`) ||
-      undefined;
-
-    if (validator) {
-      lines.push(validator);
-    }
-
-    if (is_primary_key) {
-      lines.push(`\t_id: ${tsType};`);
-    } else {
-      lines.push(`\t${camelCase(name)}${optional}: ${tsType};`);
-    }
-
-    lines.push('');
-  });
-  lines.push(`@Expose({ name: 'sqlId', toClassOnly: true })\nget sqlId() {return this._id;}`);
-  lines.push('}');
-
-  // Generate Mapper
-  const mapperContent = `
-    export class ${classMapper} extends MysqlMapper<${className}> {
-        toPersistence = (domainModel: ${className}, opts?: ClassTransformOptions) => instanceToPlain<${className}>(domainModel, opts);
-        toDomain = (persistenceModel: any, opts?: ClassTransformOptions): ${className} => plainToInstance<${className}, any>(${className}, persistenceModel, opts);
-    }
-  `;
-  lines.push(mapperContent);
-
-  // Create file
-  fs.writeFileSync(filePath, lines.join('\n'));
-  console.log('CREATE FILE:', filePath);
-
-  // Update sub index
-  const appendContent = `export * from './${kebabCase(tableName)}.entity';`;
-  const indexPath = `${dir}/index.ts`;
-  if (!fs.existsSync(indexPath)) {
-    fs.closeSync(fs.openSync(indexPath, 'w'));
-    console.log('CREATE FILE:', indexPath);
-  }
-
-  const indexContent = fs.readFileSync(indexPath).toString();
-  if (!indexContent.includes(appendContent)) {
-    fs.appendFileSync(indexPath, appendContent);
-    console.log('UPDATE FILE:', indexPath);
-  }
-
-  // Update entity index
-  const appendIndex = `export * from './${entityPrefix}';`;
-  const rootIndexPath = `./src/entities/index.ts`;
-  const rootIndexContent = fs.readFileSync(rootIndexPath).toString();
-  if (!rootIndexContent.includes(appendIndex)) {
-    fs.appendFileSync(rootIndexPath, appendIndex);
-    console.log('UPDATE FILE:', rootIndexPath);
-  }
-};
-
-const writeRepo = async (tableName) => {
-  const entityPrefix = pluralize(tableName.split('_')[0]);
-  const dir = `./src/repositories/${entityPrefix}`;
-  if (!fs.existsSync(dir)) fs.mkdirSync(dir);
-  const filePath = `${dir}/${kebabCase(tableName)}.repo.ts`;
-
-  // Check primary key
-  const columns = await inspector.columnInfo(tableName);
-  const primaryKey = filter(columns, c => c.is_primary_key).pop();
-  const tsType =
-    (['varchar', 'text', 'longtext'].includes(primaryKey?.data_type) && 'string') ||
-    (['int', 'tinyint', 'bigint', 'decimal', 'double', 'bit'].includes(primaryKey?.data_type) && 'number') ||
-    (primaryKey?.data_type.includes('unsigned') && 'number') ||
-    'any';
-
-  // Create file
-  const entityName = upperFirst(camelCase(tableName + 'Entity'));
-  const className = upperFirst(camelCase(tableName + 'Repo'));
-  const classMapper = upperFirst(camelCase(tableName + 'Mapper'));
-
-  const fileContent = `
-      import { Injectable, MysqlRepo, MysqlService } from '@joktec/core';
-      import { ${entityName}, ${classMapper} } from '../../entities';
-
-      @Injectable()
-      export class ${className} extends MysqlRepo<${entityName}, ${tsType}> {
-        constructor(protected mysqlService: MysqlService) {
-          super('${tableName}', mysqlService, new ${classMapper}());
-        }
-      }
-    `;
-  fs.writeFileSync(filePath, fileContent);
-  console.log('CREATE FILE:', filePath);
-
-  // Update index
-  const appendContent = `export * from './${kebabCase(tableName)}.repo';`;
-  const indexPath = `${dir}/index.ts`;
-  if (!fs.existsSync(indexPath)) {
-    fs.closeSync(fs.openSync(indexPath, 'w'));
-    console.log('CREATE FILE:', indexPath);
-  }
-
-  const indexContent = fs.readFileSync(indexPath).toString();
-  if (!indexContent.includes(appendContent)) {
-    fs.appendFileSync(indexPath, appendContent);
-    console.log('UPDATE FILE:', indexPath);
-  }
-
-  // Update repositories index
-  const appendIndex = `export * from './${entityPrefix}';`;
-  const rootIndexPath = `./src/repositories/index.ts`;
-  const rootIndexContent = fs.readFileSync(rootIndexPath).toString();
-  if (!rootIndexContent.includes(appendIndex)) {
-    fs.appendFileSync(rootIndexPath, appendIndex);
-    console.log('UPDATE FILE:', rootIndexPath);
-  }
-};
-
-(async () => {
-  console.log(`Generate from table:`, options.tableName);
-
-  if (!fs.existsSync('./src/entities/')) fs.mkdirSync('./src/entities/');
-  await writeEntity(options.tableName);
-
-  if (!fs.existsSync('./src/repositories/')) fs.mkdirSync('./src/repositories/');
-  await writeRepo(options.tableName);
-})().then(() => process.exit(0));