sasat 0.20.5 → 0.21.1

package/dist/cli/cli.cjs

@@ -2,16 +2,19 @@
 'use strict';
 
 const cac = require('cac');
+const erDiagram = require('cli/commands/erDiagram');
 const fs = require('fs');
 const path = require('path');
 const error = require('../shared/sasat.f544328b.cjs');
 require('pluralize');
 const chalk = require('chalk');
 const console$1 = require('console');
-const ts = require('typescript');
+const esbuild = require('esbuild');
 const fs$1 = require('fs-extra');
 require('js-yaml');
 const prettier = require('prettier');
+const typescript = require('typescript');
+const getCurrentStore = require('cli/commands/getCurrentStore');
 require('sqlstring');
 require('mysql2');
 require('util');
@@ -36,9 +39,10 @@ const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const path__namespace = /*#__PURE__*/_interopNamespaceCompat(path);
 const chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 const console__namespace = /*#__PURE__*/_interopNamespaceCompat(console$1);
-const ts__default = /*#__PURE__*/_interopDefaultCompat(ts);
+const esbuild__namespace = /*#__PURE__*/_interopNamespaceCompat(esbuild);
 const fs__default$1 = /*#__PURE__*/_interopDefaultCompat(fs$1);
 const prettier__namespace = /*#__PURE__*/_interopNamespaceCompat(prettier);
+const typescript__default = /*#__PURE__*/_interopDefaultCompat(typescript);
 
 const capitalizeFirstLetter = (str) => str.slice(0, 1).toUpperCase() + str.slice(1);
 const lowercaseFirstLetter = (str) => str.slice(0, 1).toLowerCase() + str.slice(1);
@@ -54,7 +58,7 @@ const Console = {
   error: (msg) => {
     console__namespace.error(chalk__default.bold.red(msg));
   },
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/explicit-module-boundary-types
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   log: (msg) => {
     console__namespace.log(msg);
   },
@@ -111,35 +115,6 @@ const getMigrationFileNames = () => {
   return fs__default.readdirSync(getMigrationFileDir()).filter((it) => it.split(".").pop() === "ts");
 };
 
-const getTsConfig = () => {
-  const configFileName = ts__default.findConfigFile(
-    "./",
-    ts__default.sys.fileExists,
-    "tsconfig.json"
-  );
-  if (!configFileName)
-    return {
-      module: ts__default.ModuleKind.ESNext
-    };
-  const configFile = ts__default.readConfigFile(configFileName, ts__default.sys.readFile);
-  return {
-    ...ts__default.parseJsonConfigFileContent(configFile.config, ts__default.sys, "./").options,
-    module: ts__default.ModuleKind.ESNext
-  };
-};
-const changeExtTsToJs = (fileName) => fileName.slice(0, -3) + ".mjs";
-const compileMigrationFiles = () => {
-  const tsFiles = getMigrationFileNames();
-  const compiles = tsFiles.map(async (fileName) => {
-    const filePath = path__default.join(getMigrationFileDir(), fileName);
-    const file = await fs__default$1.readFile(filePath);
-    const src = ts__default.transpile(file.toString(), getTsConfig()).trim();
-    await fs__default$1.outputFile(changeExtTsToJs(filePath), src);
-    return fileName;
-  });
-  return Promise.all(compiles);
-};
-
 var Direction = /* @__PURE__ */ ((Direction2) => {
   Direction2["Up"] = "up";
   Direction2["Down"] = "down";
@@ -196,6 +171,36 @@ in migration history: ${run}`);
   return runs[runs.length - 1];
 };
 
+const changeExtTsToJs = (fileName) => fileName.slice(0, -3) + ".mjs";
+const compileMigrationFiles = () => {
+  const tsFiles = getMigrationFileNames();
+  const compiles = tsFiles.map(async (fileName) => {
+    const filePath = path__default.join(getMigrationFileDir(), fileName);
+    const r = await esbuild__namespace.build({
+      entryPoints: [filePath],
+      bundle: true,
+      // loader: 'ts',
+      outfile: changeExtTsToJs(filePath),
+      platform: "node",
+      format: "esm",
+      outExtension: {
+        ".js": ".mjs"
+      },
+      banner: {
+        js: `
+import { createRequire as topLevelCreateRequire } from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+`
+      }
+    });
+    if (r.errors.length !== 0) {
+      throw r.errors;
+    }
+    return fileName;
+  });
+  return Promise.all(compiles);
+};
+
 const readMigration = async (store, tsFileName, direction) => {
   const file = path__default.join(
     process.cwd(),
@@ -1343,7 +1348,6 @@ var __publicField$l = (obj, key, value) => {
   return value;
 };
 class StoreMigrator {
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
   constructor() {
     __publicField$l(this, "tables", []);
     __publicField$l(this, "migrationQueue", []);
@@ -1417,7 +1421,7 @@ const createCurrentMigrationDataStore = async (targetMigrationName) => {
 
 class MigrationController {
   async migrate(options) {
-    const fileNames = await compileMigrationFiles();
+    const fileNames = getMigrationFileNames();
     const currentMigration = await getCurrentMigration(options);
     Console.log("--current migration--: " + currentMigration);
     let store = await createCurrentMigrationDataStore(currentMigration);
@@ -3040,7 +3044,9 @@ const getHashIdArgs = (entity, query) => {
   }
   const getHashIdArg = (arg, field) => {
     const columnName = field.column;
-    const hashIdOpt = entity.fields.find((e) => e.columnName === columnName)?.hashId;
+    const hashIdOpt = entity.fields.find(
+      (e) => e.columnName === columnName
+    )?.hashId;
     if (!hashIdOpt)
       return null;
     return {
@@ -4322,7 +4328,7 @@ const makeWithFilter = (event, filters) => {
   );
 };
 
-const { SyntaxKind: SyntaxKind$1 } = ts__default;
+const { SyntaxKind: SyntaxKind$1 } = typescript__default;
 const isImported = (sourceFile, type, paths) => {
   const importDeclarations = sourceFile.statements.filter(
     (it) => it.kind === SyntaxKind$1.ImportDeclaration
@@ -4344,7 +4350,7 @@ const isImported = (sourceFile, type, paths) => {
   });
 };
 
-const { SyntaxKind } = ts__default;
+const { SyntaxKind } = typescript__default;
 const getExportedVariables = (sourceFile) => {
   return sourceFile.statements.filter(
     (it) => it.kind === SyntaxKind.VariableStatement && it.modifiers?.some(
@@ -4353,7 +4359,7 @@ const getExportedVariables = (sourceFile) => {
   );
 };
 
-const { createSourceFile: createSourceFile$2, ScriptTarget: ScriptTarget$2 } = ts__default;
+const { createSourceFile: createSourceFile$2, ScriptTarget: ScriptTarget$2 } = typescript__default;
 const generateUserDefinedCondition = (root, content) => {
   const customConditionNames = error.unique(
     root.entities.flatMap((it) => [
@@ -4413,7 +4419,7 @@ const generateUserDefinedCondition = (root, content) => {
   return context + condition + content + addition;
 };
 
-const { createSourceFile: createSourceFile$1, ScriptTarget: ScriptTarget$1 } = ts__default;
+const { createSourceFile: createSourceFile$1, ScriptTarget: ScriptTarget$1 } = typescript__default;
 const hashIds = "HashIds";
 const generateIDEncoder = (root, content) => {
   const fields = root.entities.map((it) => it.fields.find((it2) => it2.column.option.autoIncrementHashId)).filter(error.nonNullable);
@@ -4456,7 +4462,7 @@ const generateIDEncoder = (root, content) => {
   return imports + makeEncoder + content + addition;
 };
 
-const { createSourceFile, ScriptTarget } = ts__default;
+const { createSourceFile, ScriptTarget } = typescript__default;
 const generateMiddlewares = (root, content) => {
   const middlewares = error.unique(
     root.entities.flatMap((it) => [
@@ -5201,6 +5207,7 @@ const migrate = async (options) => {
   let current;
   Console.log("--migration started--");
   try {
+    await compileMigrationFiles();
     const migration = new MigrationController();
     const result = await migration.migrate(options);
     current = result.currentMigration;
@@ -5232,7 +5239,7 @@ const generate = async () => {
     await compileMigrationFiles();
     const files = getMigrationFileNames();
     const targetFile = files.find((it) => it === error.config().migration.target) || files[files.length - 1];
-    const store = (await createCurrentMigrationDataStore(targetFile)).serialize();
+    const store = await getCurrentStore.getCurrentStore();
     const storeHandler = new DataStoreHandler(store);
     error.writeCurrentSchema(store);
     await new CodeGen_v2(storeHandler).generate();
@@ -5782,15 +5789,23 @@ const dumpDB = async () => {
   }
 };
 
+const migrationBuild = async () => {
+  Console.log("--migration build started--");
+  await compileMigrationFiles();
+  Console.success("Done!");
+};
+
 const cli = cac.cac();
 try {
-  cli.usage("yarn sasat <command> [options]\n").command("migrate", "execute migration").option("-g, --generateFiles", "migrate with generate files").option("-d, --dry", "dry run").option("-s, --silent", "do not print logs").action(async (options) => {
+  cli.usage("yarn sasat <command> [options]\n").command("migrate", "execute migration").option("-g, --generateFiles", "migrate with generate files").option("-d, --dry", "dry run").option("-s, --silent", "do not print logs").option("-b, --skipBuild", "skip compile migration files").action(async (options) => {
     await migrate(options).catch((e) => {
-      console__namespace.error(e);
+      console.error(e);
       process.exit(1);
     });
   });
+  cli.command("migration:build", "compile migration files").action(migrationBuild);
   cli.command("generate", "generate files").action(generate);
+  cli.command("generate:er", "generate mermaid er diagram").action(erDiagram.writeDiagram);
   cli.command("migration:create [name]", "generate new migration file").action(createMigration);
   cli.command("dump-db", "dump database schema").action(dumpDB);
   cli.command("init").action(init);
@@ -5798,6 +5813,6 @@ try {
   if (!cli.matchedCommand)
     cli.outputHelp();
 } catch (e) {
-  console__namespace.error(e);
+  console.error(e);
   process.exit(1);
 }

package/dist/cli/cli.mjs

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import { cac } from 'cac';
+import { writeDiagram } from 'cli/commands/erDiagram';
 import * as fs from 'fs';
 import fs__default from 'fs';
 import * as path from 'path';
@@ -8,10 +9,12 @@ import { c as config, m as mkDirIfNotExist, S as SqlString, g as getDbClient, a
 import 'pluralize';
 import chalk from 'chalk';
 import * as console$1 from 'console';
-import ts from 'typescript';
+import * as esbuild from 'esbuild';
 import fs$1 from 'fs-extra';
 import 'js-yaml';
 import * as prettier from 'prettier';
+import typescript from 'typescript';
+import { getCurrentStore } from 'cli/commands/getCurrentStore';
 import 'sqlstring';
 import 'mysql2';
 import 'util';
@@ -30,7 +33,7 @@ const Console = {
   error: (msg) => {
     console$1.error(chalk.bold.red(msg));
   },
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/explicit-module-boundary-types
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   log: (msg) => {
     console$1.log(msg);
   },
@@ -87,35 +90,6 @@ const getMigrationFileNames = () => {
   return fs__default.readdirSync(getMigrationFileDir()).filter((it) => it.split(".").pop() === "ts");
 };
 
-const getTsConfig = () => {
-  const configFileName = ts.findConfigFile(
-    "./",
-    ts.sys.fileExists,
-    "tsconfig.json"
-  );
-  if (!configFileName)
-    return {
-      module: ts.ModuleKind.ESNext
-    };
-  const configFile = ts.readConfigFile(configFileName, ts.sys.readFile);
-  return {
-    ...ts.parseJsonConfigFileContent(configFile.config, ts.sys, "./").options,
-    module: ts.ModuleKind.ESNext
-  };
-};
-const changeExtTsToJs = (fileName) => fileName.slice(0, -3) + ".mjs";
-const compileMigrationFiles = () => {
-  const tsFiles = getMigrationFileNames();
-  const compiles = tsFiles.map(async (fileName) => {
-    const filePath = path__default.join(getMigrationFileDir(), fileName);
-    const file = await fs$1.readFile(filePath);
-    const src = ts.transpile(file.toString(), getTsConfig()).trim();
-    await fs$1.outputFile(changeExtTsToJs(filePath), src);
-    return fileName;
-  });
-  return Promise.all(compiles);
-};
-
 var Direction = /* @__PURE__ */ ((Direction2) => {
   Direction2["Up"] = "up";
   Direction2["Down"] = "down";
@@ -172,6 +146,36 @@ in migration history: ${run}`);
   return runs[runs.length - 1];
 };
 
+const changeExtTsToJs = (fileName) => fileName.slice(0, -3) + ".mjs";
+const compileMigrationFiles = () => {
+  const tsFiles = getMigrationFileNames();
+  const compiles = tsFiles.map(async (fileName) => {
+    const filePath = path__default.join(getMigrationFileDir(), fileName);
+    const r = await esbuild.build({
+      entryPoints: [filePath],
+      bundle: true,
+      // loader: 'ts',
+      outfile: changeExtTsToJs(filePath),
+      platform: "node",
+      format: "esm",
+      outExtension: {
+        ".js": ".mjs"
+      },
+      banner: {
+        js: `
+import { createRequire as topLevelCreateRequire } from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+`
+      }
+    });
+    if (r.errors.length !== 0) {
+      throw r.errors;
+    }
+    return fileName;
+  });
+  return Promise.all(compiles);
+};
+
 const readMigration = async (store, tsFileName, direction) => {
   const file = path__default.join(
     process.cwd(),
@@ -1319,7 +1323,6 @@ var __publicField$l = (obj, key, value) => {
   return value;
 };
 class StoreMigrator {
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
   constructor() {
     __publicField$l(this, "tables", []);
     __publicField$l(this, "migrationQueue", []);
@@ -1393,7 +1396,7 @@ const createCurrentMigrationDataStore = async (targetMigrationName) => {
 
 class MigrationController {
   async migrate(options) {
-    const fileNames = await compileMigrationFiles();
+    const fileNames = getMigrationFileNames();
     const currentMigration = await getCurrentMigration(options);
     Console.log("--current migration--: " + currentMigration);
     let store = await createCurrentMigrationDataStore(currentMigration);
@@ -3016,7 +3019,9 @@ const getHashIdArgs = (entity, query) => {
   }
   const getHashIdArg = (arg, field) => {
     const columnName = field.column;
-    const hashIdOpt = entity.fields.find((e) => e.columnName === columnName)?.hashId;
+    const hashIdOpt = entity.fields.find(
+      (e) => e.columnName === columnName
+    )?.hashId;
     if (!hashIdOpt)
       return null;
     return {
@@ -4298,7 +4303,7 @@ const makeWithFilter = (event, filters) => {
   );
 };
 
-const { SyntaxKind: SyntaxKind$1 } = ts;
+const { SyntaxKind: SyntaxKind$1 } = typescript;
 const isImported = (sourceFile, type, paths) => {
   const importDeclarations = sourceFile.statements.filter(
     (it) => it.kind === SyntaxKind$1.ImportDeclaration
@@ -4320,7 +4325,7 @@ const isImported = (sourceFile, type, paths) => {
   });
 };
 
-const { SyntaxKind } = ts;
+const { SyntaxKind } = typescript;
 const getExportedVariables = (sourceFile) => {
   return sourceFile.statements.filter(
     (it) => it.kind === SyntaxKind.VariableStatement && it.modifiers?.some(
@@ -4329,7 +4334,7 @@ const getExportedVariables = (sourceFile) => {
   );
 };
 
-const { createSourceFile: createSourceFile$2, ScriptTarget: ScriptTarget$2 } = ts;
+const { createSourceFile: createSourceFile$2, ScriptTarget: ScriptTarget$2 } = typescript;
 const generateUserDefinedCondition = (root, content) => {
   const customConditionNames = unique(
     root.entities.flatMap((it) => [
@@ -4389,7 +4394,7 @@ const generateUserDefinedCondition = (root, content) => {
   return context + condition + content + addition;
 };
 
-const { createSourceFile: createSourceFile$1, ScriptTarget: ScriptTarget$1 } = ts;
+const { createSourceFile: createSourceFile$1, ScriptTarget: ScriptTarget$1 } = typescript;
 const hashIds = "HashIds";
 const generateIDEncoder = (root, content) => {
   const fields = root.entities.map((it) => it.fields.find((it2) => it2.column.option.autoIncrementHashId)).filter(nonNullable);
@@ -4432,7 +4437,7 @@ const generateIDEncoder = (root, content) => {
   return imports + makeEncoder + content + addition;
 };
 
-const { createSourceFile, ScriptTarget } = ts;
+const { createSourceFile, ScriptTarget } = typescript;
 const generateMiddlewares = (root, content) => {
   const middlewares = unique(
     root.entities.flatMap((it) => [
@@ -5177,6 +5182,7 @@ const migrate = async (options) => {
   let current;
   Console.log("--migration started--");
   try {
+    await compileMigrationFiles();
     const migration = new MigrationController();
     const result = await migration.migrate(options);
     current = result.currentMigration;
@@ -5208,7 +5214,7 @@ const generate = async () => {
     await compileMigrationFiles();
     const files = getMigrationFileNames();
     const targetFile = files.find((it) => it === config().migration.target) || files[files.length - 1];
-    const store = (await createCurrentMigrationDataStore(targetFile)).serialize();
+    const store = await getCurrentStore();
     const storeHandler = new DataStoreHandler(store);
     writeCurrentSchema(store);
     await new CodeGen_v2(storeHandler).generate();
@@ -5758,15 +5764,23 @@ const dumpDB = async () => {
   }
 };
 
+const migrationBuild = async () => {
+  Console.log("--migration build started--");
+  await compileMigrationFiles();
+  Console.success("Done!");
+};
+
 const cli = cac();
 try {
-  cli.usage("yarn sasat <command> [options]\n").command("migrate", "execute migration").option("-g, --generateFiles", "migrate with generate files").option("-d, --dry", "dry run").option("-s, --silent", "do not print logs").action(async (options) => {
+  cli.usage("yarn sasat <command> [options]\n").command("migrate", "execute migration").option("-g, --generateFiles", "migrate with generate files").option("-d, --dry", "dry run").option("-s, --silent", "do not print logs").option("-b, --skipBuild", "skip compile migration files").action(async (options) => {
     await migrate(options).catch((e) => {
-      console$1.error(e);
+      console.error(e);
       process.exit(1);
     });
   });
+  cli.command("migration:build", "compile migration files").action(migrationBuild);
   cli.command("generate", "generate files").action(generate);
+  cli.command("generate:er", "generate mermaid er diagram").action(writeDiagram);
   cli.command("migration:create [name]", "generate new migration file").action(createMigration);
   cli.command("dump-db", "dump database schema").action(dumpDB);
   cli.command("init").action(init);
@@ -5774,6 +5788,6 @@ try {
   if (!cli.matchedCommand)
     cli.outputHelp();
 } catch (e) {
-  console$1.error(e);
+  console.error(e);
   process.exit(1);
 }

package/dist/index.d.cts

@@ -1062,7 +1062,7 @@ declare const getTodayDateTimeString: (timeZoneHour?: number) => string;
 declare const getDayRange: (date: Date, timeZoneHour?: number) => [string, string];
 declare const getDayRangeQExpr: (date: Date, timeZoneHour?: number) => [Literal, Literal];
 
-declare const pick: <T extends object>(target: T, keys: (keyof T)[]) => {
+declare const pick: <T extends object>(target: T, keys: Array<keyof T>) => {
     [k: string]: T[keyof T];
 };
 

package/dist/index.d.mts

@@ -1062,7 +1062,7 @@ declare const getTodayDateTimeString: (timeZoneHour?: number) => string;
 declare const getDayRange: (date: Date, timeZoneHour?: number) => [string, string];
 declare const getDayRangeQExpr: (date: Date, timeZoneHour?: number) => [Literal, Literal];
 
-declare const pick: <T extends object>(target: T, keys: (keyof T)[]) => {
+declare const pick: <T extends object>(target: T, keys: Array<keyof T>) => {
     [k: string]: T[keyof T];
 };
 

package/dist/index.d.ts

@@ -1062,7 +1062,7 @@ declare const getTodayDateTimeString: (timeZoneHour?: number) => string;
 declare const getDayRange: (date: Date, timeZoneHour?: number) => [string, string];
 declare const getDayRangeQExpr: (date: Date, timeZoneHour?: number) => [Literal, Literal];
 
-declare const pick: <T extends object>(target: T, keys: (keyof T)[]) => {
+declare const pick: <T extends object>(target: T, keys: Array<keyof T>) => {
     [k: string]: T[keyof T];
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasat",
-  "version": "0.20.5",
+  "version": "0.21.1",
   "repository": "https://github.com/nin138/sasat.git",
   "author": "nin138 <ninian138@gmail.com>",
   "license": "MIT",
@@ -17,12 +17,13 @@
     "test:base": "node --experimental-vm-modules node_modules/.bin/jest",
     "resetdb": "docker-compose exec db sh -c \"mysql -u root < /docker-entrypoint-initdb.d/temp.sql\"",
     "prepare": "yarn build && husky install",
-    "sasat": "yarn env-cmd ts-node-esm ./src/cli/cli.ts",
+    "sasat": "yarn env-cmd tsx ./src/cli/cli.ts",
     "server": "yarn env-cmd ts-node-esm -r tsconfig-paths/register ./test/testServer.ts"
   },
   "dependencies": {
     "cac": "^6.7.14",
     "chalk": "^5.3.0",
+    "esbuild": "^0.21.5",
     "fs-extra": "^11.1.1",
     "graphql": "^16.8.1",
     "graphql-subscriptions": "^2.0.0",
@@ -36,27 +37,29 @@
   },
   "devDependencies": {
     "@apollo/server": "^4.9.3",
+    "@eslint/js": "^9.4.0",
+    "@types/eslint__js": "^8.42.3",
     "@types/fs-extra": "11.0.4",
     "@types/jest": "29.5.12",
     "@types/js-yaml": "4.0.9",
-    "@types/node": "20.10.5",
+    "@types/node": "20.14.2",
     "@types/pluralize": "0.0.33",
-    "@types/prettier": "2.7.3",
+    "@types/prettier": "3.0.0",
     "@types/sqlstring": "2.3.2",
-    "@typescript-eslint/eslint-plugin": "6.21.0",
-    "@typescript-eslint/parser": "6.21.0",
     "env-cmd": "10.1.0",
-    "eslint": "8.56.0",
-    "eslint-config-prettier": "9.1.0",
+    "eslint": "^9.4.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-prettier": "5.1.3",
+    "eslint-plugin-prettier": "^5.1.3",
     "husky": "8.0.3",
     "jest": "29.7.0",
-    "lint-staged": "13.2.3",
-    "sasat": "link:./lib",
+    "lint-staged": "13.3.0",
+    "sasat": "link:./dist",
     "ts-jest": "29.1.4",
     "ts-node": "10.9.2",
     "tsconfig-paths": "4.2.0",
+    "tsx": "^4.15.2",
+    "typescript-eslint": "^7.13.0",
     "unbuild": "^2.0.0"
   },
   "peerDependencies": {
@@ -69,7 +72,7 @@
     ]
   },
   "type": "module",
-  "packageManager": "yarn@3.6.1",
+  "packageManager": "yarn@3.8.2",
   "exports": {
     ".": {
       "import": "./dist/index.mjs",