sasat 0.21.1 → 0.21.3

package/dist/cli/cli.cjs

@@ -2,11 +2,10 @@
 '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 fs = require('fs');
+const path = require('path');
 const chalk = require('chalk');
 const console$1 = require('console');
 const esbuild = require('esbuild');
@@ -14,7 +13,6 @@ 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');
@@ -33,8 +31,8 @@ function _interopNamespaceCompat(e) {
   return n;
 }
 
-const fs__namespace = /*#__PURE__*/_interopNamespaceCompat(fs);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
+const fs__namespace = /*#__PURE__*/_interopNamespaceCompat(fs);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const path__namespace = /*#__PURE__*/_interopNamespaceCompat(path);
 const chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
@@ -44,233 +42,6 @@ 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);
-const camelize = (str) => str.replace(
-  /(?:^\w|[A-Z]|_\w|\b\w)/g,
-  (word, index) => index == 0 ? word.toLowerCase() : word.toUpperCase()
-).replace(/\s|_|-+/g, "");
-
-const Console = {
-  success: (msg) => {
-    console__namespace.log(chalk__default.green(msg));
-  },
-  error: (msg) => {
-    console__namespace.error(chalk__default.bold.red(msg));
-  },
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  log: (msg) => {
-    console__namespace.log(msg);
-  },
-  debug: (msg) => {
-    console__namespace.debug("debug:: " + msg);
-  }
-};
-
-const getMigrationFile = (className) => `import { SasatMigration, MigrationStore } from "sasat";
-
-export default class ${capitalizeFirstLetter(
-  className
-)} implements SasatMigration {
-
-  up: (store: MigrationStore) => void = store => {
-
-  };
-
-  down: (store: MigrationStore) => void = store => {
-    throw new Error('Down is not implemented on ${className}');
-  };
-}
-`;
-const createMigrationFile = (migrationName) => {
-  const date = /* @__PURE__ */ new Date();
-  const pad = (val) => val.toString().padStart(2, "0");
-  const now = date.getFullYear() + pad(date.getMonth() + 1) + pad(date.getDate()) + `_` + pad(date.getHours()) + pad(date.getMinutes()) + pad(date.getSeconds());
-  const fileName = now + migrationName;
-  const outDir = path.join(error.config().migration.dir);
-  error.mkDirIfNotExist(outDir);
-  fs__namespace.writeFileSync(
-    path.join(outDir, fileName) + ".ts",
-    getMigrationFile(migrationName)
-  );
-  return fileName;
-};
-const createMigration = (args) => {
-  if (!args) {
-    Console.error("missing argument migration name");
-    return;
-  }
-  if (!/^[$A-Za-z_][0-9A-Za-z_]+$/.test(args)) {
-    Console.error("migration name should be match /^[$A-Za-z_][0-9A-Za-z_]+$/");
-    return;
-  }
-  Console.success(createMigrationFile(args) + " Successfully created");
-  return;
-};
-
-const getMigrationFileDir = () => {
-  return path__default.join(process.cwd(), error.config().migration.dir);
-};
-const getMigrationFileNames = () => {
-  return fs__default.readdirSync(getMigrationFileDir()).filter((it) => it.split(".").pop() === "ts");
-};
-
-var Direction = /* @__PURE__ */ ((Direction2) => {
-  Direction2["Up"] = "up";
-  Direction2["Down"] = "down";
-  return Direction2;
-})(Direction || {});
-const calcRunMigrationFileNames = (records) => {
-  const result = [];
-  records.forEach((it) => {
-    if (it.direction === "down" /* Down */) {
-      if (result[result.length] !== it.name)
-        throw new Error(
-          "Invalid migration history: `down` migration must be the same migration as the last `up` migration "
-        );
-      result.pop();
-      return;
-    }
-    result.push(it.name);
-  });
-  return result;
-};
-const getCurrentMigration = async (options) => {
-  const migrationTable = error.SqlString.escapeId(error.config().migration.table);
-  const files = getMigrationFileNames();
-  const client = error.getDbClient();
-  const query = `CREATE TABLE IF NOT EXISTS ${migrationTable} (id int auto_increment primary key , name varchar(100) not null,direction enum('up', 'down') not null, migrated_at timestamp default current_timestamp)`;
-  if (!options.silent) {
-    Console.log(
-      `creating migration table: ${migrationTable} :: ${Buffer.from(
-        migrationTable
-      ).toString("base64")}`
-    );
-    Console.log(query);
-  }
-  await client.rawQuery(query);
-  const q = `SELECT name, direction FROM ${migrationTable} ORDER BY id ASC`;
-  if (!options.silent) {
-    Console.debug(q);
-  }
-  const result = await client.rawQuery(q);
-  console.debug(result);
-  if (!result.length)
-    return;
-  const runs = calcRunMigrationFileNames(
-    result
-  );
-  if (runs.length === 0)
-    return;
-  runs.forEach((run, i) => {
-    if (files[i] !== run)
-      throw new Error(`Invalid migration order: Migration must be performed in the same order 
-Found               : ${files[i]} 
-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(),
-    error.config().migration.dir,
-    changeExtTsToJs(tsFileName)
-  );
-  const module = await import(file);
-  const instance = new module.default();
-  if (direction === Direction.Up) {
-    if (instance.beforeUp)
-      await instance.beforeUp();
-    await instance.up(store);
-    if (instance.afterUp)
-      await instance.afterUp();
-  } else {
-    if (instance.beforeDown)
-      await instance.beforeDown();
-    await instance.down(store);
-    if (instance.afterDown)
-      await instance.afterDown();
-  }
-  return store;
-};
-
-const runMigration = async (store, migrationName, direction, options) => {
-  const sqls = store.getSql();
-  store.resetQueue();
-  if (!options.silent) {
-    sqls.forEach(Console.log);
-  }
-  if (options.dry) {
-    return;
-  }
-  const transaction = await error.getDbClient().transaction();
-  try {
-    for (const sql of sqls) {
-      await transaction.rawQuery(sql).catch((e) => {
-        Console.error(`ERROR ON ${migrationName}`);
-        Console.error(`SQL: ${sql}`);
-        Console.error(`MESSAGE: ${e.message}`);
-        process.exit(1);
-      });
-    }
-    await transaction.query`insert into ${() => error.config().migration.table} (name, direction) values (${[
-      migrationName,
-      direction
-    ]})`;
-    return await transaction.commit();
-  } catch (e) {
-    await transaction.rollback();
-    throw e;
-  }
-};
-
-const getMigrationTargets = (files, current) => {
-  const currentIndex = current ? files.indexOf(current) + 1 : 0;
-  const targetIndex = files.indexOf(error.config().migration.target || files[files.length - 1]) + 1;
-  if (currentIndex === -1 || targetIndex === -1)
-    throw new Error("migration target not found");
-  if (targetIndex >= currentIndex)
-    return {
-      direction: Direction.Up,
-      files: files.slice(currentIndex, targetIndex)
-    };
-  return {
-    direction: Direction.Down,
-    files: files.slice(targetIndex, currentIndex).reverse()
-  };
-};
-
 var DBColumnTypes = /* @__PURE__ */ ((DBColumnTypes2) => {
   DBColumnTypes2["char"] = "char";
   DBColumnTypes2["varchar"] = "varchar";
@@ -518,6 +289,13 @@ const assembleColumn = (data, table) => {
   return new NormalColumn(data, table);
 };
 
+const capitalizeFirstLetter = (str) => str.slice(0, 1).toUpperCase() + str.slice(1);
+const lowercaseFirstLetter = (str) => str.slice(0, 1).toLowerCase() + str.slice(1);
+const camelize = (str) => str.replace(
+  /(?:^\w|[A-Z]|_\w|\b\w)/g,
+  (word, index) => index == 0 ? word.toLowerCase() : word.toUpperCase()
+).replace(/\s|_|-+/g, "");
+
 class EntityName {
   constructor(name) {
     this.name = name;
@@ -1404,7 +1182,140 @@ class StoreMigrator {
       tables: this.tables.map((it) => it.serialize())
     };
   }
-}
+}
+
+const getMigrationFileDir = () => {
+  return path__default.join(process.cwd(), error.config().migration.dir);
+};
+const getMigrationFileNames = () => {
+  return fs__default.readdirSync(getMigrationFileDir()).filter((it) => it.split(".").pop() === "ts");
+};
+
+const Console = {
+  success: (msg) => {
+    console__namespace.log(chalk__default.green(msg));
+  },
+  error: (msg) => {
+    console__namespace.error(chalk__default.bold.red(msg));
+  },
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  log: (msg) => {
+    console__namespace.log(msg);
+  },
+  debug: (msg) => {
+    console__namespace.debug("debug:: " + msg);
+  }
+};
+
+var Direction = /* @__PURE__ */ ((Direction2) => {
+  Direction2["Up"] = "up";
+  Direction2["Down"] = "down";
+  return Direction2;
+})(Direction || {});
+const calcRunMigrationFileNames = (records) => {
+  const result = [];
+  records.forEach((it) => {
+    if (it.direction === "down" /* Down */) {
+      if (result[result.length] !== it.name)
+        throw new Error(
+          "Invalid migration history: `down` migration must be the same migration as the last `up` migration "
+        );
+      result.pop();
+      return;
+    }
+    result.push(it.name);
+  });
+  return result;
+};
+const getCurrentMigration = async (options) => {
+  const migrationTable = error.SqlString.escapeId(error.config().migration.table);
+  const files = getMigrationFileNames();
+  const client = error.getDbClient();
+  const query = `CREATE TABLE IF NOT EXISTS ${migrationTable} (id int auto_increment primary key , name varchar(100) not null,direction enum('up', 'down') not null, migrated_at timestamp default current_timestamp)`;
+  if (!options.silent) {
+    Console.log(
+      `creating migration table: ${migrationTable} :: ${Buffer.from(
+        migrationTable
+      ).toString("base64")}`
+    );
+    Console.log(query);
+  }
+  await client.rawQuery(query);
+  const q = `SELECT name, direction FROM ${migrationTable} ORDER BY id ASC`;
+  if (!options.silent) {
+    Console.debug(q);
+  }
+  const result = await client.rawQuery(q);
+  console.debug(result);
+  if (!result.length)
+    return;
+  const runs = calcRunMigrationFileNames(
+    result
+  );
+  if (runs.length === 0)
+    return;
+  runs.forEach((run, i) => {
+    if (files[i] !== run)
+      throw new Error(`Invalid migration order: Migration must be performed in the same order 
+Found               : ${files[i]} 
+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(),
+    error.config().migration.dir,
+    changeExtTsToJs(tsFileName)
+  );
+  const module = await import(file);
+  const instance = new module.default();
+  if (direction === Direction.Up) {
+    if (instance.beforeUp)
+      await instance.beforeUp();
+    await instance.up(store);
+    if (instance.afterUp)
+      await instance.afterUp();
+  } else {
+    if (instance.beforeDown)
+      await instance.beforeDown();
+    await instance.down(store);
+    if (instance.afterDown)
+      await instance.afterDown();
+  }
+  return store;
+};
 
 const createCurrentMigrationDataStore = async (targetMigrationName) => {
   const allFiles = getMigrationFileNames();
@@ -1419,28 +1330,38 @@ const createCurrentMigrationDataStore = async (targetMigrationName) => {
   return store;
 };
 
-class MigrationController {
-  async migrate(options) {
-    const fileNames = getMigrationFileNames();
-    const currentMigration = await getCurrentMigration(options);
-    Console.log("--current migration--: " + currentMigration);
-    let store = await createCurrentMigrationDataStore(currentMigration);
-    const target = getMigrationTargets(fileNames, currentMigration);
-    for (const tsFileName of target.files) {
-      if (!options.silent) {
-        Console.log("---------\n" + tsFileName);
-      }
-      store = await readMigration(store, tsFileName, target.direction);
-      await runMigration(store, tsFileName, target.direction, options);
-      store.resetQueue();
-    }
-    return {
-      store: store.serialize(),
-      currentMigration: error.config().migration.target || fileNames[fileNames.length - 1]
-    };
-  }
+async function getCurrentStore() {
+  await compileMigrationFiles();
+  const files = getMigrationFileNames();
+  const targetFile = files.find((it) => it === error.config().migration.target) || files[files.length - 1];
+  return (await createCurrentMigrationDataStore(targetFile)).serialize();
 }
 
+const GeneratedDirName = "__generated__";
+const EntityDirName = "entities";
+const DataSourceDirName = "dataSources";
+const relative = (from, to) => {
+  const result = path__namespace.posix.relative(from, to);
+  if (result.startsWith("../"))
+    return result;
+  return "./" + result;
+};
+const GENERATED_PATH = `/${GeneratedDirName}/`;
+const paths = {
+  BASE: "/",
+  GENERATED: GENERATED_PATH,
+  ENTITIES: `${GENERATED_PATH}${EntityDirName}/`,
+  DATA_SOURCES: `/${DataSourceDirName}/db/`,
+  GENERATED_DS: `${GENERATED_PATH}${DataSourceDirName}/db/`
+};
+const resolve = (from, source, fileName) => {
+  return relative(paths[from], paths[source] + fileName);
+};
+const Directory = {
+  paths,
+  resolve
+};
+
 var __defProp$k = Object.defineProperty;
 var __defNormalProp$k = (obj, key, value) => key in obj ? __defProp$k(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$k = (obj, key, value) => {
@@ -1472,6 +1393,164 @@ class DataStoreHandler {
   }
 }
 
+const writeDiagram = async () => {
+  try {
+    const store = new DataStoreHandler(await getCurrentStore());
+    const entities = store.tables.map((it) => processTable(store, it));
+    const result = `erDiagram
+${entities.join("\n")}
+`;
+    console.log();
+    fs__default.writeFileSync(
+      path__default.join(
+        error.config().migration.out,
+        Directory.paths.GENERATED,
+        "er-diagram.mermaid"
+      ),
+      result
+    );
+  } catch (e) {
+    Console.error(e.message);
+    throw e;
+  }
+};
+function getRefType(parent, rel) {
+  const left = parent.isNullable() ? "|o" : "||";
+  const getRight = () => {
+    switch (rel) {
+      case "One":
+        return "||";
+      case "Many":
+        return "o{";
+      case "OneOrZero":
+        return "|o";
+    }
+  };
+  return `${left} -- ${getRight()}`;
+}
+function processTable(store, table) {
+  const rel = table.columns.filter((it) => it.isReference()).map((it) => {
+    const rel2 = it;
+    const ref = rel2.data.reference;
+    const parent = store.table(ref.parentTable).column(ref.parentColumn);
+    return `${ref.parentTable} ${getRefType(parent, ref.relation)} ${table.tableName} : ${ref.relationName}`;
+  });
+  return `${table.tableName} {
+${table.columns.map((it) => `  ${it.columnName()} ${it.dataType()}`).join("\n")}
+}
+${rel.join("\n")}
+`;
+}
+
+const getMigrationFile = (className) => `import { SasatMigration, MigrationStore } from "sasat";
+
+export default class ${capitalizeFirstLetter(
+  className
+)} implements SasatMigration {
+
+  up: (store: MigrationStore) => void = store => {
+
+  };
+
+  down: (store: MigrationStore) => void = store => {
+    throw new Error('Down is not implemented on ${className}');
+  };
+}
+`;
+const createMigrationFile = (migrationName) => {
+  const date = /* @__PURE__ */ new Date();
+  const pad = (val) => val.toString().padStart(2, "0");
+  const now = date.getFullYear() + pad(date.getMonth() + 1) + pad(date.getDate()) + `_` + pad(date.getHours()) + pad(date.getMinutes()) + pad(date.getSeconds());
+  const fileName = now + migrationName;
+  const outDir = path.join(error.config().migration.dir);
+  error.mkDirIfNotExist(outDir);
+  fs__namespace.writeFileSync(
+    path.join(outDir, fileName) + ".ts",
+    getMigrationFile(migrationName)
+  );
+  return fileName;
+};
+const createMigration = (args) => {
+  if (!args) {
+    Console.error("missing argument migration name");
+    return;
+  }
+  if (!/^[$A-Za-z_][0-9A-Za-z_]+$/.test(args)) {
+    Console.error("migration name should be match /^[$A-Za-z_][0-9A-Za-z_]+$/");
+    return;
+  }
+  Console.success(createMigrationFile(args) + " Successfully created");
+  return;
+};
+
+const runMigration = async (store, migrationName, direction, options) => {
+  const sqls = store.getSql();
+  store.resetQueue();
+  if (!options.silent) {
+    sqls.forEach(Console.log);
+  }
+  if (options.dry) {
+    return;
+  }
+  const transaction = await error.getDbClient().transaction();
+  try {
+    for (const sql of sqls) {
+      await transaction.rawQuery(sql).catch((e) => {
+        Console.error(`ERROR ON ${migrationName}`);
+        Console.error(`SQL: ${sql}`);
+        Console.error(`MESSAGE: ${e.message}`);
+        process.exit(1);
+      });
+    }
+    await transaction.query`insert into ${() => error.config().migration.table} (name, direction) values (${[
+      migrationName,
+      direction
+    ]})`;
+    return await transaction.commit();
+  } catch (e) {
+    await transaction.rollback();
+    throw e;
+  }
+};
+
+const getMigrationTargets = (files, current) => {
+  const currentIndex = current ? files.indexOf(current) + 1 : 0;
+  const targetIndex = files.indexOf(error.config().migration.target || files[files.length - 1]) + 1;
+  if (currentIndex === -1 || targetIndex === -1)
+    throw new Error("migration target not found");
+  if (targetIndex >= currentIndex)
+    return {
+      direction: Direction.Up,
+      files: files.slice(currentIndex, targetIndex)
+    };
+  return {
+    direction: Direction.Down,
+    files: files.slice(targetIndex, currentIndex).reverse()
+  };
+};
+
+class MigrationController {
+  async migrate(options) {
+    const fileNames = getMigrationFileNames();
+    const currentMigration = await getCurrentMigration(options);
+    Console.log("--current migration--: " + currentMigration);
+    let store = await createCurrentMigrationDataStore(currentMigration);
+    const target = getMigrationTargets(fileNames, currentMigration);
+    for (const tsFileName of target.files) {
+      if (!options.silent) {
+        Console.log("---------\n" + tsFileName);
+      }
+      store = await readMigration(store, tsFileName, target.direction);
+      await runMigration(store, tsFileName, target.direction, options);
+      store.resetQueue();
+    }
+    return {
+      store: store.serialize(),
+      currentMigration: error.config().migration.target || fileNames[fileNames.length - 1]
+    };
+  }
+}
+
 class ImportDeclaration {
   constructor(types, module) {
     this.types = types;
@@ -2792,31 +2871,6 @@ const makeSubscription = (subscriptions) => {
   );
 };
 
-const GeneratedDirName = "__generated__";
-const EntityDirName = "entities";
-const DataSourceDirName = "dataSources";
-const relative = (from, to) => {
-  const result = path__namespace.posix.relative(from, to);
-  if (result.startsWith("../"))
-    return result;
-  return "./" + result;
-};
-const GENERATED_PATH = `/${GeneratedDirName}/`;
-const paths = {
-  BASE: "/",
-  GENERATED: GENERATED_PATH,
-  ENTITIES: `${GENERATED_PATH}${EntityDirName}/`,
-  DATA_SOURCES: `/${DataSourceDirName}/db/`,
-  GENERATED_DS: `${GENERATED_PATH}${DataSourceDirName}/db/`
-};
-const resolve = (from, source, fileName) => {
-  return relative(paths[from], paths[source] + fileName);
-};
-const Directory = {
-  paths,
-  resolve
-};
-
 const typeRefs = {
   entity: {
     name: (entity) => entity.name,
@@ -5239,7 +5293,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 getCurrentStore.getCurrentStore();
+    const store = await getCurrentStore();
     const storeHandler = new DataStoreHandler(store);
     error.writeCurrentSchema(store);
     await new CodeGen_v2(storeHandler).generate();
@@ -5805,7 +5859,7 @@ try {
   });
   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("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);

package/dist/cli/cli.mjs

@@ -1,12 +1,11 @@
 #!/usr/bin/env node
 import { cac } from 'cac';
-import { writeDiagram } from 'cli/commands/erDiagram';
+import { S as SqlString, a as SasatError, c as config, r as readInitialSchema, g as getDbClient, m as mkDirIfNotExist, n as nonNullable, u as unique, C as Conditions, w as writeFileIfNotExist, b as writeCurrentSchema, d as writeYmlFile, e as defaultConf } from '../shared/sasat.01289068.mjs';
+import 'pluralize';
 import * as fs from 'fs';
 import fs__default from 'fs';
 import * as path from 'path';
 import path__default, { join } from 'path';
-import { c as config, m as mkDirIfNotExist, S as SqlString, g as getDbClient, a as SasatError, r as readInitialSchema, n as nonNullable, u as unique, C as Conditions, w as writeFileIfNotExist, b as writeCurrentSchema, d as writeYmlFile, e as defaultConf } from '../shared/sasat.01289068.mjs';
-import 'pluralize';
 import chalk from 'chalk';
 import * as console$1 from 'console';
 import * as esbuild from 'esbuild';
@@ -14,238 +13,10 @@ 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';
 
-const capitalizeFirstLetter = (str) => str.slice(0, 1).toUpperCase() + str.slice(1);
-const lowercaseFirstLetter = (str) => str.slice(0, 1).toLowerCase() + str.slice(1);
-const camelize = (str) => str.replace(
-  /(?:^\w|[A-Z]|_\w|\b\w)/g,
-  (word, index) => index == 0 ? word.toLowerCase() : word.toUpperCase()
-).replace(/\s|_|-+/g, "");
-
-const Console = {
-  success: (msg) => {
-    console$1.log(chalk.green(msg));
-  },
-  error: (msg) => {
-    console$1.error(chalk.bold.red(msg));
-  },
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  log: (msg) => {
-    console$1.log(msg);
-  },
-  debug: (msg) => {
-    console$1.debug("debug:: " + msg);
-  }
-};
-
-const getMigrationFile = (className) => `import { SasatMigration, MigrationStore } from "sasat";
-
-export default class ${capitalizeFirstLetter(
-  className
-)} implements SasatMigration {
-
-  up: (store: MigrationStore) => void = store => {
-
-  };
-
-  down: (store: MigrationStore) => void = store => {
-    throw new Error('Down is not implemented on ${className}');
-  };
-}
-`;
-const createMigrationFile = (migrationName) => {
-  const date = /* @__PURE__ */ new Date();
-  const pad = (val) => val.toString().padStart(2, "0");
-  const now = date.getFullYear() + pad(date.getMonth() + 1) + pad(date.getDate()) + `_` + pad(date.getHours()) + pad(date.getMinutes()) + pad(date.getSeconds());
-  const fileName = now + migrationName;
-  const outDir = join(config().migration.dir);
-  mkDirIfNotExist(outDir);
-  fs.writeFileSync(
-    join(outDir, fileName) + ".ts",
-    getMigrationFile(migrationName)
-  );
-  return fileName;
-};
-const createMigration = (args) => {
-  if (!args) {
-    Console.error("missing argument migration name");
-    return;
-  }
-  if (!/^[$A-Za-z_][0-9A-Za-z_]+$/.test(args)) {
-    Console.error("migration name should be match /^[$A-Za-z_][0-9A-Za-z_]+$/");
-    return;
-  }
-  Console.success(createMigrationFile(args) + " Successfully created");
-  return;
-};
-
-const getMigrationFileDir = () => {
-  return path__default.join(process.cwd(), config().migration.dir);
-};
-const getMigrationFileNames = () => {
-  return fs__default.readdirSync(getMigrationFileDir()).filter((it) => it.split(".").pop() === "ts");
-};
-
-var Direction = /* @__PURE__ */ ((Direction2) => {
-  Direction2["Up"] = "up";
-  Direction2["Down"] = "down";
-  return Direction2;
-})(Direction || {});
-const calcRunMigrationFileNames = (records) => {
-  const result = [];
-  records.forEach((it) => {
-    if (it.direction === "down" /* Down */) {
-      if (result[result.length] !== it.name)
-        throw new Error(
-          "Invalid migration history: `down` migration must be the same migration as the last `up` migration "
-        );
-      result.pop();
-      return;
-    }
-    result.push(it.name);
-  });
-  return result;
-};
-const getCurrentMigration = async (options) => {
-  const migrationTable = SqlString.escapeId(config().migration.table);
-  const files = getMigrationFileNames();
-  const client = getDbClient();
-  const query = `CREATE TABLE IF NOT EXISTS ${migrationTable} (id int auto_increment primary key , name varchar(100) not null,direction enum('up', 'down') not null, migrated_at timestamp default current_timestamp)`;
-  if (!options.silent) {
-    Console.log(
-      `creating migration table: ${migrationTable} :: ${Buffer.from(
-        migrationTable
-      ).toString("base64")}`
-    );
-    Console.log(query);
-  }
-  await client.rawQuery(query);
-  const q = `SELECT name, direction FROM ${migrationTable} ORDER BY id ASC`;
-  if (!options.silent) {
-    Console.debug(q);
-  }
-  const result = await client.rawQuery(q);
-  console.debug(result);
-  if (!result.length)
-    return;
-  const runs = calcRunMigrationFileNames(
-    result
-  );
-  if (runs.length === 0)
-    return;
-  runs.forEach((run, i) => {
-    if (files[i] !== run)
-      throw new Error(`Invalid migration order: Migration must be performed in the same order 
-Found               : ${files[i]} 
-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(),
-    config().migration.dir,
-    changeExtTsToJs(tsFileName)
-  );
-  const module = await import(file);
-  const instance = new module.default();
-  if (direction === Direction.Up) {
-    if (instance.beforeUp)
-      await instance.beforeUp();
-    await instance.up(store);
-    if (instance.afterUp)
-      await instance.afterUp();
-  } else {
-    if (instance.beforeDown)
-      await instance.beforeDown();
-    await instance.down(store);
-    if (instance.afterDown)
-      await instance.afterDown();
-  }
-  return store;
-};
-
-const runMigration = async (store, migrationName, direction, options) => {
-  const sqls = store.getSql();
-  store.resetQueue();
-  if (!options.silent) {
-    sqls.forEach(Console.log);
-  }
-  if (options.dry) {
-    return;
-  }
-  const transaction = await getDbClient().transaction();
-  try {
-    for (const sql of sqls) {
-      await transaction.rawQuery(sql).catch((e) => {
-        Console.error(`ERROR ON ${migrationName}`);
-        Console.error(`SQL: ${sql}`);
-        Console.error(`MESSAGE: ${e.message}`);
-        process.exit(1);
-      });
-    }
-    await transaction.query`insert into ${() => config().migration.table} (name, direction) values (${[
-      migrationName,
-      direction
-    ]})`;
-    return await transaction.commit();
-  } catch (e) {
-    await transaction.rollback();
-    throw e;
-  }
-};
-
-const getMigrationTargets = (files, current) => {
-  const currentIndex = current ? files.indexOf(current) + 1 : 0;
-  const targetIndex = files.indexOf(config().migration.target || files[files.length - 1]) + 1;
-  if (currentIndex === -1 || targetIndex === -1)
-    throw new Error("migration target not found");
-  if (targetIndex >= currentIndex)
-    return {
-      direction: Direction.Up,
-      files: files.slice(currentIndex, targetIndex)
-    };
-  return {
-    direction: Direction.Down,
-    files: files.slice(targetIndex, currentIndex).reverse()
-  };
-};
-
 var DBColumnTypes = /* @__PURE__ */ ((DBColumnTypes2) => {
   DBColumnTypes2["char"] = "char";
   DBColumnTypes2["varchar"] = "varchar";
@@ -493,6 +264,13 @@ const assembleColumn = (data, table) => {
   return new NormalColumn(data, table);
 };
 
+const capitalizeFirstLetter = (str) => str.slice(0, 1).toUpperCase() + str.slice(1);
+const lowercaseFirstLetter = (str) => str.slice(0, 1).toLowerCase() + str.slice(1);
+const camelize = (str) => str.replace(
+  /(?:^\w|[A-Z]|_\w|\b\w)/g,
+  (word, index) => index == 0 ? word.toLowerCase() : word.toUpperCase()
+).replace(/\s|_|-+/g, "");
+
 class EntityName {
   constructor(name) {
     this.name = name;
@@ -1379,7 +1157,140 @@ class StoreMigrator {
       tables: this.tables.map((it) => it.serialize())
     };
   }
-}
+}
+
+const getMigrationFileDir = () => {
+  return path__default.join(process.cwd(), config().migration.dir);
+};
+const getMigrationFileNames = () => {
+  return fs__default.readdirSync(getMigrationFileDir()).filter((it) => it.split(".").pop() === "ts");
+};
+
+const Console = {
+  success: (msg) => {
+    console$1.log(chalk.green(msg));
+  },
+  error: (msg) => {
+    console$1.error(chalk.bold.red(msg));
+  },
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  log: (msg) => {
+    console$1.log(msg);
+  },
+  debug: (msg) => {
+    console$1.debug("debug:: " + msg);
+  }
+};
+
+var Direction = /* @__PURE__ */ ((Direction2) => {
+  Direction2["Up"] = "up";
+  Direction2["Down"] = "down";
+  return Direction2;
+})(Direction || {});
+const calcRunMigrationFileNames = (records) => {
+  const result = [];
+  records.forEach((it) => {
+    if (it.direction === "down" /* Down */) {
+      if (result[result.length] !== it.name)
+        throw new Error(
+          "Invalid migration history: `down` migration must be the same migration as the last `up` migration "
+        );
+      result.pop();
+      return;
+    }
+    result.push(it.name);
+  });
+  return result;
+};
+const getCurrentMigration = async (options) => {
+  const migrationTable = SqlString.escapeId(config().migration.table);
+  const files = getMigrationFileNames();
+  const client = getDbClient();
+  const query = `CREATE TABLE IF NOT EXISTS ${migrationTable} (id int auto_increment primary key , name varchar(100) not null,direction enum('up', 'down') not null, migrated_at timestamp default current_timestamp)`;
+  if (!options.silent) {
+    Console.log(
+      `creating migration table: ${migrationTable} :: ${Buffer.from(
+        migrationTable
+      ).toString("base64")}`
+    );
+    Console.log(query);
+  }
+  await client.rawQuery(query);
+  const q = `SELECT name, direction FROM ${migrationTable} ORDER BY id ASC`;
+  if (!options.silent) {
+    Console.debug(q);
+  }
+  const result = await client.rawQuery(q);
+  console.debug(result);
+  if (!result.length)
+    return;
+  const runs = calcRunMigrationFileNames(
+    result
+  );
+  if (runs.length === 0)
+    return;
+  runs.forEach((run, i) => {
+    if (files[i] !== run)
+      throw new Error(`Invalid migration order: Migration must be performed in the same order 
+Found               : ${files[i]} 
+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(),
+    config().migration.dir,
+    changeExtTsToJs(tsFileName)
+  );
+  const module = await import(file);
+  const instance = new module.default();
+  if (direction === Direction.Up) {
+    if (instance.beforeUp)
+      await instance.beforeUp();
+    await instance.up(store);
+    if (instance.afterUp)
+      await instance.afterUp();
+  } else {
+    if (instance.beforeDown)
+      await instance.beforeDown();
+    await instance.down(store);
+    if (instance.afterDown)
+      await instance.afterDown();
+  }
+  return store;
+};
 
 const createCurrentMigrationDataStore = async (targetMigrationName) => {
   const allFiles = getMigrationFileNames();
@@ -1394,28 +1305,38 @@ const createCurrentMigrationDataStore = async (targetMigrationName) => {
   return store;
 };
 
-class MigrationController {
-  async migrate(options) {
-    const fileNames = getMigrationFileNames();
-    const currentMigration = await getCurrentMigration(options);
-    Console.log("--current migration--: " + currentMigration);
-    let store = await createCurrentMigrationDataStore(currentMigration);
-    const target = getMigrationTargets(fileNames, currentMigration);
-    for (const tsFileName of target.files) {
-      if (!options.silent) {
-        Console.log("---------\n" + tsFileName);
-      }
-      store = await readMigration(store, tsFileName, target.direction);
-      await runMigration(store, tsFileName, target.direction, options);
-      store.resetQueue();
-    }
-    return {
-      store: store.serialize(),
-      currentMigration: config().migration.target || fileNames[fileNames.length - 1]
-    };
-  }
+async function getCurrentStore() {
+  await compileMigrationFiles();
+  const files = getMigrationFileNames();
+  const targetFile = files.find((it) => it === config().migration.target) || files[files.length - 1];
+  return (await createCurrentMigrationDataStore(targetFile)).serialize();
 }
 
+const GeneratedDirName = "__generated__";
+const EntityDirName = "entities";
+const DataSourceDirName = "dataSources";
+const relative = (from, to) => {
+  const result = path.posix.relative(from, to);
+  if (result.startsWith("../"))
+    return result;
+  return "./" + result;
+};
+const GENERATED_PATH = `/${GeneratedDirName}/`;
+const paths = {
+  BASE: "/",
+  GENERATED: GENERATED_PATH,
+  ENTITIES: `${GENERATED_PATH}${EntityDirName}/`,
+  DATA_SOURCES: `/${DataSourceDirName}/db/`,
+  GENERATED_DS: `${GENERATED_PATH}${DataSourceDirName}/db/`
+};
+const resolve = (from, source, fileName) => {
+  return relative(paths[from], paths[source] + fileName);
+};
+const Directory = {
+  paths,
+  resolve
+};
+
 var __defProp$k = Object.defineProperty;
 var __defNormalProp$k = (obj, key, value) => key in obj ? __defProp$k(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$k = (obj, key, value) => {
@@ -1447,6 +1368,164 @@ class DataStoreHandler {
   }
 }
 
+const writeDiagram = async () => {
+  try {
+    const store = new DataStoreHandler(await getCurrentStore());
+    const entities = store.tables.map((it) => processTable(store, it));
+    const result = `erDiagram
+${entities.join("\n")}
+`;
+    console.log();
+    fs__default.writeFileSync(
+      path__default.join(
+        config().migration.out,
+        Directory.paths.GENERATED,
+        "er-diagram.mermaid"
+      ),
+      result
+    );
+  } catch (e) {
+    Console.error(e.message);
+    throw e;
+  }
+};
+function getRefType(parent, rel) {
+  const left = parent.isNullable() ? "|o" : "||";
+  const getRight = () => {
+    switch (rel) {
+      case "One":
+        return "||";
+      case "Many":
+        return "o{";
+      case "OneOrZero":
+        return "|o";
+    }
+  };
+  return `${left} -- ${getRight()}`;
+}
+function processTable(store, table) {
+  const rel = table.columns.filter((it) => it.isReference()).map((it) => {
+    const rel2 = it;
+    const ref = rel2.data.reference;
+    const parent = store.table(ref.parentTable).column(ref.parentColumn);
+    return `${ref.parentTable} ${getRefType(parent, ref.relation)} ${table.tableName} : ${ref.relationName}`;
+  });
+  return `${table.tableName} {
+${table.columns.map((it) => `  ${it.columnName()} ${it.dataType()}`).join("\n")}
+}
+${rel.join("\n")}
+`;
+}
+
+const getMigrationFile = (className) => `import { SasatMigration, MigrationStore } from "sasat";
+
+export default class ${capitalizeFirstLetter(
+  className
+)} implements SasatMigration {
+
+  up: (store: MigrationStore) => void = store => {
+
+  };
+
+  down: (store: MigrationStore) => void = store => {
+    throw new Error('Down is not implemented on ${className}');
+  };
+}
+`;
+const createMigrationFile = (migrationName) => {
+  const date = /* @__PURE__ */ new Date();
+  const pad = (val) => val.toString().padStart(2, "0");
+  const now = date.getFullYear() + pad(date.getMonth() + 1) + pad(date.getDate()) + `_` + pad(date.getHours()) + pad(date.getMinutes()) + pad(date.getSeconds());
+  const fileName = now + migrationName;
+  const outDir = join(config().migration.dir);
+  mkDirIfNotExist(outDir);
+  fs.writeFileSync(
+    join(outDir, fileName) + ".ts",
+    getMigrationFile(migrationName)
+  );
+  return fileName;
+};
+const createMigration = (args) => {
+  if (!args) {
+    Console.error("missing argument migration name");
+    return;
+  }
+  if (!/^[$A-Za-z_][0-9A-Za-z_]+$/.test(args)) {
+    Console.error("migration name should be match /^[$A-Za-z_][0-9A-Za-z_]+$/");
+    return;
+  }
+  Console.success(createMigrationFile(args) + " Successfully created");
+  return;
+};
+
+const runMigration = async (store, migrationName, direction, options) => {
+  const sqls = store.getSql();
+  store.resetQueue();
+  if (!options.silent) {
+    sqls.forEach(Console.log);
+  }
+  if (options.dry) {
+    return;
+  }
+  const transaction = await getDbClient().transaction();
+  try {
+    for (const sql of sqls) {
+      await transaction.rawQuery(sql).catch((e) => {
+        Console.error(`ERROR ON ${migrationName}`);
+        Console.error(`SQL: ${sql}`);
+        Console.error(`MESSAGE: ${e.message}`);
+        process.exit(1);
+      });
+    }
+    await transaction.query`insert into ${() => config().migration.table} (name, direction) values (${[
+      migrationName,
+      direction
+    ]})`;
+    return await transaction.commit();
+  } catch (e) {
+    await transaction.rollback();
+    throw e;
+  }
+};
+
+const getMigrationTargets = (files, current) => {
+  const currentIndex = current ? files.indexOf(current) + 1 : 0;
+  const targetIndex = files.indexOf(config().migration.target || files[files.length - 1]) + 1;
+  if (currentIndex === -1 || targetIndex === -1)
+    throw new Error("migration target not found");
+  if (targetIndex >= currentIndex)
+    return {
+      direction: Direction.Up,
+      files: files.slice(currentIndex, targetIndex)
+    };
+  return {
+    direction: Direction.Down,
+    files: files.slice(targetIndex, currentIndex).reverse()
+  };
+};
+
+class MigrationController {
+  async migrate(options) {
+    const fileNames = getMigrationFileNames();
+    const currentMigration = await getCurrentMigration(options);
+    Console.log("--current migration--: " + currentMigration);
+    let store = await createCurrentMigrationDataStore(currentMigration);
+    const target = getMigrationTargets(fileNames, currentMigration);
+    for (const tsFileName of target.files) {
+      if (!options.silent) {
+        Console.log("---------\n" + tsFileName);
+      }
+      store = await readMigration(store, tsFileName, target.direction);
+      await runMigration(store, tsFileName, target.direction, options);
+      store.resetQueue();
+    }
+    return {
+      store: store.serialize(),
+      currentMigration: config().migration.target || fileNames[fileNames.length - 1]
+    };
+  }
+}
+
 class ImportDeclaration {
   constructor(types, module) {
     this.types = types;
@@ -2767,31 +2846,6 @@ const makeSubscription = (subscriptions) => {
   );
 };
 
-const GeneratedDirName = "__generated__";
-const EntityDirName = "entities";
-const DataSourceDirName = "dataSources";
-const relative = (from, to) => {
-  const result = path.posix.relative(from, to);
-  if (result.startsWith("../"))
-    return result;
-  return "./" + result;
-};
-const GENERATED_PATH = `/${GeneratedDirName}/`;
-const paths = {
-  BASE: "/",
-  GENERATED: GENERATED_PATH,
-  ENTITIES: `${GENERATED_PATH}${EntityDirName}/`,
-  DATA_SOURCES: `/${DataSourceDirName}/db/`,
-  GENERATED_DS: `${GENERATED_PATH}${DataSourceDirName}/db/`
-};
-const resolve = (from, source, fileName) => {
-  return relative(paths[from], paths[source] + fileName);
-};
-const Directory = {
-  paths,
-  resolve
-};
-
 const typeRefs = {
   entity: {
     name: (entity) => entity.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasat",
-  "version": "0.21.1",
+  "version": "0.21.3",
   "repository": "https://github.com/nin138/sasat.git",
   "author": "nin138 <ninian138@gmail.com>",
   "license": "MIT",