sasat 0.22.8 → 0.22.9

package/dist/testing/index.cjs

@@ -1,3 +1,72 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_migrate = require("../migrate-COeYPag2.cjs");
+const require_util = require("../util-C5Jevn5B.cjs");
+const require_src = require("../src-CdwAbJV0.cjs");
+const require_migrate = require("../migrate-iJE4FjRh.cjs");
+let node_fs = require("node:fs");
+let node_path = require("node:path");
+node_path = require_util.__toESM(node_path, 1);
+let node_crypto = require("node:crypto");
+//#region src/testing/readTestMigration.ts
+async function readTestMigration() {
+	let d = readTestMigFile();
+	if (!d) {
+		const conf = require_util.config();
+		if (conf.migration.db) require_util.setConfig({ db: conf.migration.db });
+		const client = new require_src.MysqlClient({ ...require_util.config().migration.db ?? require_util.config().db });
+		await require_migrate.generateTestMigrationFile(client).catch(async (e) => {
+			await client.release();
+			require_migrate.Console.error(e);
+			process.exit(1);
+		});
+		await client.release();
+		d = readTestMigFile();
+	}
+	return JSON.parse(d.toString());
+}
+function readTestMigFile() {
+	return (0, node_fs.readFileSync)(node_path.default.join(require_util.config().migration.dir, "test.migration.json"));
+}
+//#endregion
+//#region src/testing/testDBClient.ts
+var TestDBClient = class extends require_src.MysqlClient {
+	static async create(data, logger) {
+		const c = new require_src.MysqlClient({
+			host: data.host,
+			port: data.port,
+			user: data.user
+		});
+		await c.rawQuery(`CREATE DATABASE ${data.database}`);
+		await c.release();
+		return new this({
+			...data,
+			multipleStatements: true
+		}, logger);
+	}
+	constructor(connectionOption, logger) {
+		super(connectionOption, logger);
+	}
+	async release() {
+		await this.execSql(`DROP DATABASE ${this.connectionOption.database}`);
+		await super.release();
+	}
+};
+//#endregion
+//#region src/testing/makeTestDB.ts
+const S = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+const N = 8;
+async function makeTestDB(conf) {
+	const c = conf ?? require_util.config().db.testing ?? require_util.config().db;
+	const client = await TestDBClient.create({
+		host: c.host,
+		port: +c.port,
+		user: c.user,
+		password: c.password,
+		database: "sasat_test_" + Array.from((0, node_crypto.randomFillSync)(new Uint8Array(N))).map((n) => S[n % 62]).join("")
+	});
+	const migration = await readTestMigration();
+	await client.rawQuery(migration.join(";"));
+	return client;
+}
+//#endregion
+exports.makeTestDB = makeTestDB;
 exports.migrate = require_migrate.migrate;

package/dist/testing/index.d.cts

@@ -1,4 +1,5 @@
-import { n as DBClient } from "../dbClient-Bnk1JKBU.cjs";
+import { d as SasatDBConfigBase, i as DBClient } from "../comparison-Bkk-qNRi.cjs";
+import { z as MysqlClient } from "../index-lrk3IfPF.cjs";
 
 //#region src/cli/commands/migrate.d.ts
 type MigrateCommandOption = {
@@ -9,4 +10,20 @@ type MigrateCommandOption = {
 };
 declare const migrate: (client: DBClient, options: MigrateCommandOption) => Promise<void>;
 //#endregion
-export { migrate };
+//#region src/testing/testDBClient.d.ts
+declare class TestDBClient extends MysqlClient {
+  static create(data: {
+    host: string;
+    port: number;
+    user: string;
+    password?: string;
+    database: string;
+  }, logger?: (query: string) => void): Promise<TestDBClient>;
+  private constructor();
+  release(): Promise<void>;
+}
+//#endregion
+//#region src/testing/makeTestDB.d.ts
+declare function makeTestDB(conf?: SasatDBConfigBase): Promise<TestDBClient>;
+//#endregion
+export { makeTestDB, migrate };

package/dist/testing/index.d.mts

@@ -1,4 +1,5 @@
-import { n as DBClient } from "../dbClient-TBYnlvTc.mjs";
+import { d as SasatDBConfigBase, i as DBClient } from "../comparison-HpKmxsjs.mjs";
+import { z as MysqlClient } from "../index-1a8KLRT7.mjs";
 
 //#region src/cli/commands/migrate.d.ts
 type MigrateCommandOption = {
@@ -9,4 +10,20 @@ type MigrateCommandOption = {
 };
 declare const migrate: (client: DBClient, options: MigrateCommandOption) => Promise<void>;
 //#endregion
-export { migrate };
+//#region src/testing/testDBClient.d.ts
+declare class TestDBClient extends MysqlClient {
+  static create(data: {
+    host: string;
+    port: number;
+    user: string;
+    password?: string;
+    database: string;
+  }, logger?: (query: string) => void): Promise<TestDBClient>;
+  private constructor();
+  release(): Promise<void>;
+}
+//#endregion
+//#region src/testing/makeTestDB.d.ts
+declare function makeTestDB(conf?: SasatDBConfigBase): Promise<TestDBClient>;
+//#endregion
+export { makeTestDB, migrate };

package/dist/testing/index.mjs

@@ -1,2 +1,69 @@
-import { t as migrate } from "../migrate-mh3DLqgw.mjs";
-export { migrate };
+import { f as setConfig, u as config } from "../util-Dkw5bD7a.mjs";
+import { b as MysqlClient } from "../src-DebKrtYl.mjs";
+import { p as Console, r as generateTestMigrationFile, t as migrate } from "../migrate-D-XR7Z0F.mjs";
+import { readFileSync } from "node:fs";
+import path from "node:path";
+import { randomFillSync } from "node:crypto";
+//#region src/testing/readTestMigration.ts
+async function readTestMigration() {
+	let d = readTestMigFile();
+	if (!d) {
+		const conf = config();
+		if (conf.migration.db) setConfig({ db: conf.migration.db });
+		const client = new MysqlClient({ ...config().migration.db ?? config().db });
+		await generateTestMigrationFile(client).catch(async (e) => {
+			await client.release();
+			Console.error(e);
+			process.exit(1);
+		});
+		await client.release();
+		d = readTestMigFile();
+	}
+	return JSON.parse(d.toString());
+}
+function readTestMigFile() {
+	return readFileSync(path.join(config().migration.dir, "test.migration.json"));
+}
+//#endregion
+//#region src/testing/testDBClient.ts
+var TestDBClient = class extends MysqlClient {
+	static async create(data, logger) {
+		const c = new MysqlClient({
+			host: data.host,
+			port: data.port,
+			user: data.user
+		});
+		await c.rawQuery(`CREATE DATABASE ${data.database}`);
+		await c.release();
+		return new this({
+			...data,
+			multipleStatements: true
+		}, logger);
+	}
+	constructor(connectionOption, logger) {
+		super(connectionOption, logger);
+	}
+	async release() {
+		await this.execSql(`DROP DATABASE ${this.connectionOption.database}`);
+		await super.release();
+	}
+};
+//#endregion
+//#region src/testing/makeTestDB.ts
+const S = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+const N = 8;
+async function makeTestDB(conf) {
+	const c = conf ?? config().db.testing ?? config().db;
+	const client = await TestDBClient.create({
+		host: c.host,
+		port: +c.port,
+		user: c.user,
+		password: c.password,
+		database: "sasat_test_" + Array.from(randomFillSync(new Uint8Array(N))).map((n) => S[n % 62]).join("")
+	});
+	const migration = await readTestMigration();
+	await client.rawQuery(migration.join(";"));
+	return client;
+}
+//#endregion
+export { makeTestDB, migrate };

package/dist/{util-IRlTD1y7.cjs → util-C5Jevn5B.cjs}

@@ -26,6 +26,7 @@ node_path = __toESM(node_path, 1);
 let node_fs_promises = require("node:fs/promises");
 let js_yaml = require("js-yaml");
 js_yaml = __toESM(js_yaml, 1);
+let mysql2_promise = require("mysql2/promise");
 let sqlstring = require("sqlstring");
 sqlstring = __toESM(sqlstring, 1);
 //#region src/util/assignDeep.ts
@@ -137,6 +138,111 @@ const SqlString = {
 	escapeId: (name) => escapeId(name)
 };
 //#endregion
+//#region src/db/formatQuery.ts
+const formatQuery = (str, ...params) => {
+	let ret = str[0];
+	for (let i = 0; i < params.length; i++) {
+		if (typeof params[i] === "function") ret += params[i]();
+		else if (Array.isArray(params[i])) ret += params[i].map((it) => SqlString.escape(it)).join(", ");
+		else ret += SqlString.escape(params[i]);
+		ret += str[i + 1];
+	}
+	return ret;
+};
+//#endregion
+//#region src/db/connectors/dbClient.ts
+const noop = () => {};
+var SQLClient = class {
+	constructor() {
+		this.logger = noop;
+	}
+	rawQuery(sql) {
+		this.logger(sql);
+		return this.execSql(sql);
+	}
+	rawCommand(sql) {
+		this.logger(sql);
+		return this.execSql(sql);
+	}
+	query(templateString, ...params) {
+		return this.rawQuery(formatQuery(templateString, ...params));
+	}
+	command(templateString, ...params) {
+		return this.rawCommand(formatQuery(templateString, ...params));
+	}
+};
+var SQLTransaction = class extends SQLClient {};
+var DBClient = class extends SQLClient {
+	constructor(logger = noop) {
+		super();
+		this._released = false;
+		this.logger = logger;
+	}
+	isReleased() {
+		return this._released;
+	}
+};
+//#endregion
+//#region src/db/connectors/mysql/transaction.ts
+var MySqlTransaction = class extends SQLTransaction {
+	constructor(connection) {
+		super();
+		this.connection = connection;
+	}
+	async commit() {
+		const result = await this.connection.commit();
+		await this.connection.end();
+		return result;
+	}
+	async rollback() {
+		await this.connection.rollback();
+		await this.connection.end();
+	}
+	async execSql(sql) {
+		return (await this.connection.query(sql))[0];
+	}
+};
+//#endregion
+//#region src/db/connectors/mysql/poolClient.ts
+var MysqlPoolClient = class extends DBClient {
+	constructor(poolOption, logger) {
+		super(logger);
+		this.poolOption = poolOption;
+		this.pool = (0, mysql2_promise.createPool)({
+			dateStrings: true,
+			...poolOption
+		});
+		this.release = this.release.bind(this);
+	}
+	async transaction() {
+		const connection = await (0, mysql2_promise.createConnection)({
+			...config().db,
+			dateStrings: true,
+			...this.poolOption
+		});
+		await connection.beginTransaction();
+		return new MySqlTransaction(connection);
+	}
+	async release() {
+		await this.pool.end();
+		this._released = true;
+	}
+	async execSql(sql) {
+		return (await this.pool.query(sql))[0];
+	}
+};
+//#endregion
+//#region src/db/getDbClient.ts
+let client;
+const getDbClient = (option, logger) => {
+	if (client && !client.isReleased()) return client;
+	client = new MysqlPoolClient({
+		...config().db,
+		...option
+	}, logger);
+	return client;
+};
+//#endregion
 //#region src/error.ts
 var SasatError = class extends Error {
 	constructor(message) {
@@ -155,6 +261,18 @@ const unique = (array) => {
 };
 const nonNullable = (value) => value != null;
 //#endregion
+Object.defineProperty(exports, "DBClient", {
+	enumerable: true,
+	get: function() {
+		return DBClient;
+	}
+});
+Object.defineProperty(exports, "MySqlTransaction", {
+	enumerable: true,
+	get: function() {
+		return MySqlTransaction;
+	}
+});
 Object.defineProperty(exports, "SasatError", {
 	enumerable: true,
 	get: function() {
@@ -191,6 +309,18 @@ Object.defineProperty(exports, "defaultConf", {
 		return defaultConf;
 	}
 });
+Object.defineProperty(exports, "formatQuery", {
+	enumerable: true,
+	get: function() {
+		return formatQuery;
+	}
+});
+Object.defineProperty(exports, "getDbClient", {
+	enumerable: true,
+	get: function() {
+		return getDbClient;
+	}
+});
 Object.defineProperty(exports, "mkDirIfNotExist", {
 	enumerable: true,
 	get: function() {

package/dist/{util-BcMcffJ8.mjs → util-Dkw5bD7a.mjs}

@@ -2,6 +2,7 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import path, { join } from "node:path";
 import { writeFile } from "node:fs/promises";
 import yaml from "js-yaml";
+import { createConnection, createPool } from "mysql2/promise";
 import pkg from "sqlstring";
 //#region src/util/assignDeep.ts
 const assignDeep = (base, ...objects) => {
@@ -112,6 +113,111 @@ const SqlString = {
 	escapeId: (name) => escapeId(name)
 };
 //#endregion
+//#region src/db/formatQuery.ts
+const formatQuery = (str, ...params) => {
+	let ret = str[0];
+	for (let i = 0; i < params.length; i++) {
+		if (typeof params[i] === "function") ret += params[i]();
+		else if (Array.isArray(params[i])) ret += params[i].map((it) => SqlString.escape(it)).join(", ");
+		else ret += SqlString.escape(params[i]);
+		ret += str[i + 1];
+	}
+	return ret;
+};
+//#endregion
+//#region src/db/connectors/dbClient.ts
+const noop = () => {};
+var SQLClient = class {
+	constructor() {
+		this.logger = noop;
+	}
+	rawQuery(sql) {
+		this.logger(sql);
+		return this.execSql(sql);
+	}
+	rawCommand(sql) {
+		this.logger(sql);
+		return this.execSql(sql);
+	}
+	query(templateString, ...params) {
+		return this.rawQuery(formatQuery(templateString, ...params));
+	}
+	command(templateString, ...params) {
+		return this.rawCommand(formatQuery(templateString, ...params));
+	}
+};
+var SQLTransaction = class extends SQLClient {};
+var DBClient = class extends SQLClient {
+	constructor(logger = noop) {
+		super();
+		this._released = false;
+		this.logger = logger;
+	}
+	isReleased() {
+		return this._released;
+	}
+};
+//#endregion
+//#region src/db/connectors/mysql/transaction.ts
+var MySqlTransaction = class extends SQLTransaction {
+	constructor(connection) {
+		super();
+		this.connection = connection;
+	}
+	async commit() {
+		const result = await this.connection.commit();
+		await this.connection.end();
+		return result;
+	}
+	async rollback() {
+		await this.connection.rollback();
+		await this.connection.end();
+	}
+	async execSql(sql) {
+		return (await this.connection.query(sql))[0];
+	}
+};
+//#endregion
+//#region src/db/connectors/mysql/poolClient.ts
+var MysqlPoolClient = class extends DBClient {
+	constructor(poolOption, logger) {
+		super(logger);
+		this.poolOption = poolOption;
+		this.pool = createPool({
+			dateStrings: true,
+			...poolOption
+		});
+		this.release = this.release.bind(this);
+	}
+	async transaction() {
+		const connection = await createConnection({
+			...config().db,
+			dateStrings: true,
+			...this.poolOption
+		});
+		await connection.beginTransaction();
+		return new MySqlTransaction(connection);
+	}
+	async release() {
+		await this.pool.end();
+		this._released = true;
+	}
+	async execSql(sql) {
+		return (await this.pool.query(sql))[0];
+	}
+};
+//#endregion
+//#region src/db/getDbClient.ts
+let client;
+const getDbClient = (option, logger) => {
+	if (client && !client.isReleased()) return client;
+	client = new MysqlPoolClient({
+		...config().db,
+		...option
+	}, logger);
+	return client;
+};
+//#endregion
 //#region src/error.ts
 var SasatError = class extends Error {
 	constructor(message) {
@@ -130,4 +236,4 @@ const unique = (array) => {
 };
 const nonNullable = (value) => value != null;
 //#endregion
-export { SqlString as a, setConfig as c, writeCurrentSchema as d, writeFileIfNotExist as f, SasatError as i, mkDirIfNotExist as l, assignDeep as m, pick as n, config as o, writeYmlFile as p, unique as r, defaultConf as s, nonNullable as t, readInitialSchema as u };
+export { writeYmlFile as _, getDbClient as a, formatQuery as c, defaultConf as d, setConfig as f, writeFileIfNotExist as g, writeCurrentSchema as h, SasatError as i, SqlString as l, readInitialSchema as m, pick as n, MySqlTransaction as o, mkDirIfNotExist as p, unique as r, DBClient as s, nonNullable as t, config as u, assignDeep as v };

package/package.json

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

package/dist/comparison-CEpYTo3e.d.mts

@@ -1,42 +0,0 @@
-//#region src/util/type.d.ts
-type NestedPartial<T> = { [K in keyof T]?: T[K] extends Array<infer R> ? Array<NestedPartial<R>> : NestedPartial<T[K]> };
-//#endregion
-//#region src/config/config.d.ts
-interface SasatConfigDb {
-  host: string;
-  port: number;
-  user: string;
-  password?: string;
-  database: string;
-  ssl?: {
-    ca?: string[];
-  };
-}
-interface SasatConfigMigration {
-  table: string;
-  dir: string;
-  out: string;
-  target?: string;
-  db?: SasatConfigDb;
-}
-interface SasatConfigGenerator {
-  addJsExtToImportStatement: boolean;
-  gql: {
-    subscription: boolean;
-  };
-}
-interface SasatConfig {
-  db: SasatConfigDb;
-  migration: SasatConfigMigration;
-  generator: SasatConfigGenerator;
-}
-declare function setConfig(update: NestedPartial<SasatConfig>): SasatConfig;
-//#endregion
-//#region src/db/sql/expression/comparison.d.ts
-type ComparisonOperators = "=" | ">" | "<" | ">=" | "<=" | "<>";
-type AndOr = "AND" | "OR";
-type ComparisonExpression<T> = Partial<{ [P in keyof T]: T[P] | [ComparisonOperators | "LIKE" | "NOT LIKE", T[P]] | ["BETWEEN", T[P], T[P]] | ["IN", ...T[P][]] | ["IS NULL"] | ["IS NOT NULL"] }> & {
-  __type?: AndOr;
-};
-//#endregion
-export { NestedPartial as a, setConfig as i, ComparisonOperators as n, SasatConfig as r, ComparisonExpression as t };

package/dist/comparison-CIb9xu5T.d.cts

@@ -1,42 +0,0 @@
-//#region src/util/type.d.ts
-type NestedPartial<T> = { [K in keyof T]?: T[K] extends Array<infer R> ? Array<NestedPartial<R>> : NestedPartial<T[K]> };
-//#endregion
-//#region src/config/config.d.ts
-interface SasatConfigDb {
-  host: string;
-  port: number;
-  user: string;
-  password?: string;
-  database: string;
-  ssl?: {
-    ca?: string[];
-  };
-}
-interface SasatConfigMigration {
-  table: string;
-  dir: string;
-  out: string;
-  target?: string;
-  db?: SasatConfigDb;
-}
-interface SasatConfigGenerator {
-  addJsExtToImportStatement: boolean;
-  gql: {
-    subscription: boolean;
-  };
-}
-interface SasatConfig {
-  db: SasatConfigDb;
-  migration: SasatConfigMigration;
-  generator: SasatConfigGenerator;
-}
-declare function setConfig(update: NestedPartial<SasatConfig>): SasatConfig;
-//#endregion
-//#region src/db/sql/expression/comparison.d.ts
-type ComparisonOperators = "=" | ">" | "<" | ">=" | "<=" | "<>";
-type AndOr = "AND" | "OR";
-type ComparisonExpression<T> = Partial<{ [P in keyof T]: T[P] | [ComparisonOperators | "LIKE" | "NOT LIKE", T[P]] | ["BETWEEN", T[P], T[P]] | ["IN", ...T[P][]] | ["IS NULL"] | ["IS NOT NULL"] }> & {
-  __type?: AndOr;
-};
-//#endregion
-export { NestedPartial as a, setConfig as i, ComparisonOperators as n, SasatConfig as r, ComparisonExpression as t };

package/dist/dbClient-Bnk1JKBU.d.cts

@@ -1,35 +0,0 @@
-//#region src/db/connectors/dbClient.d.ts
-type QueryResponse = Array<{
-  [key: string]: SqlValueType;
-}>;
-interface CommandResponse {
-  insertId: number;
-  affectedRows: number;
-  changedRows: number;
-}
-type SqlValueType = string | number | boolean | null;
-interface SQLExecutor {
-  rawQuery(sql: string): Promise<QueryResponse>;
-  rawCommand(sql: string): Promise<CommandResponse>;
-}
-declare abstract class SQLClient implements SQLExecutor {
-  protected logger: (query: string) => void;
-  rawQuery(sql: string): Promise<QueryResponse>;
-  rawCommand(sql: string): Promise<CommandResponse>;
-  query(templateString: TemplateStringsArray, ...params: any[]): Promise<QueryResponse>;
-  command(templateString: TemplateStringsArray, ...params: any[]): Promise<CommandResponse>;
-  protected abstract execSql(sql: string): Promise<QueryResponse | CommandResponse>;
-}
-declare abstract class SQLTransaction extends SQLClient {
-  abstract commit(): Promise<void>;
-  abstract rollback(): Promise<void>;
-}
-declare abstract class DBClient extends SQLClient {
-  protected _released: boolean;
-  protected constructor(logger?: (query: string) => void);
-  isReleased(): boolean;
-  abstract transaction(): Promise<SQLTransaction>;
-  abstract release(): Promise<void>;
-}
-//#endregion
-export { SQLExecutor as a, SQLClient as i, DBClient as n, SQLTransaction as o, QueryResponse as r, SqlValueType as s, CommandResponse as t };

package/dist/dbClient-TBYnlvTc.d.mts

@@ -1,35 +0,0 @@
-//#region src/db/connectors/dbClient.d.ts
-type QueryResponse = Array<{
-  [key: string]: SqlValueType;
-}>;
-interface CommandResponse {
-  insertId: number;
-  affectedRows: number;
-  changedRows: number;
-}
-type SqlValueType = string | number | boolean | null;
-interface SQLExecutor {
-  rawQuery(sql: string): Promise<QueryResponse>;
-  rawCommand(sql: string): Promise<CommandResponse>;
-}
-declare abstract class SQLClient implements SQLExecutor {
-  protected logger: (query: string) => void;
-  rawQuery(sql: string): Promise<QueryResponse>;
-  rawCommand(sql: string): Promise<CommandResponse>;
-  query(templateString: TemplateStringsArray, ...params: any[]): Promise<QueryResponse>;
-  command(templateString: TemplateStringsArray, ...params: any[]): Promise<CommandResponse>;
-  protected abstract execSql(sql: string): Promise<QueryResponse | CommandResponse>;
-}
-declare abstract class SQLTransaction extends SQLClient {
-  abstract commit(): Promise<void>;
-  abstract rollback(): Promise<void>;
-}
-declare abstract class DBClient extends SQLClient {
-  protected _released: boolean;
-  protected constructor(logger?: (query: string) => void);
-  isReleased(): boolean;
-  abstract transaction(): Promise<SQLTransaction>;
-  abstract release(): Promise<void>;
-}
-//#endregion
-export { SQLExecutor as a, SQLClient as i, DBClient as n, SQLTransaction as o, QueryResponse as r, SqlValueType as s, CommandResponse as t };