sasat 0.22.4 → 0.22.6

package/dist/cli/index.cjs

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
-const require_migrate = require("../migrate-BRNxkHCx.cjs");
+const require_util = require("../util-C5Jevn5B.cjs");
+const require_migrate = require("../migrate-BDE07ocG.cjs");
 let node_fs = require("node:fs");
-node_fs = require_migrate.__toESM(node_fs, 1);
+node_fs = require_util.__toESM(node_fs, 1);
 let node_path = require("node:path");
-node_path = require_migrate.__toESM(node_path, 1);
+node_path = require_util.__toESM(node_path, 1);
 let cac = require("cac");
 //#region src/cli/commands/createMigration.ts
 const getMigrationFile = (className) => `import { SasatMigration, MigrationStore } from "sasat";
@@ -23,8 +24,8 @@ const createMigrationFile = (migrationName) => {
 	const date = /* @__PURE__ */ new Date();
 	const pad = (val) => val.toString().padStart(2, "0");
 	const fileName = date.getFullYear() + pad(date.getMonth() + 1) + pad(date.getDate()) + `_` + pad(date.getHours()) + pad(date.getMinutes()) + pad(date.getSeconds()) + migrationName;
-	const outDir = (0, node_path.join)(require_migrate.config().migration.dir);
-	require_migrate.mkDirIfNotExist(outDir);
+	const outDir = (0, node_path.join)(require_util.config().migration.dir);
+	require_util.mkDirIfNotExist(outDir);
 	node_fs.writeFileSync((0, node_path.join)(outDir, fileName) + ".ts", getMigrationFile(migrationName));
 	return fileName;
 };
@@ -471,11 +472,11 @@ const serializeCreateTable = (str) => {
 //#endregion
 //#region src/cli/commands/dumpDb.ts
 const dumpDB = async () => {
-	const con = require_migrate.getDbClient();
+	const con = require_util.getDbClient();
 	try {
 		const tables = await con.rawQuery("show tables").then((it) => it.flatMap((it) => Object.values(it)));
 		const serialized = await Promise.all(tables.map((table) => {
-			return con.rawQuery("show create table " + require_migrate.SqlString.escapeId(table)).then((it) => it[0]["Create Table"]).then(serializeCreateTable);
+			return con.rawQuery("show create table " + require_util.SqlString.escapeId(table)).then((it) => it[0]["Create Table"]).then(serializeCreateTable);
 		}));
 		const supportedTypes = Object.values(require_migrate.DBColumnTypes);
 		const store = { tables: serialized.filter((it) => {
@@ -490,7 +491,7 @@ const dumpDB = async () => {
 			}
 			return true;
 		}) };
-		require_migrate.writeYmlFile(require_migrate.config().migration.dir, "initialSchema.yml", store);
+		require_util.writeYmlFile(require_util.config().migration.dir, "initialSchema.yml", store);
 	} catch (e) {
 		require_migrate.Console.error(e.message);
 		throw e;
@@ -503,7 +504,7 @@ const dumpDB = async () => {
 async function getCurrentStore() {
 	await require_migrate.compileMigrationFiles();
 	const files = require_migrate.getMigrationFileNames();
-	return (await require_migrate.createCurrentMigrationDataStore(files.find((it) => it === require_migrate.config().migration.target) || files[files.length - 1])).serialize();
+	return (await require_migrate.createCurrentMigrationDataStore(files.find((it) => it === require_util.config().migration.target) || files[files.length - 1])).serialize();
 }
 //#endregion
 //#region src/cli/commands/erDiagram.ts
@@ -513,7 +514,7 @@ const writeDiagram = async () => {
 		const result = `erDiagram
 ${store.tables.map((it) => processTable(store, it)).join("\n")}
 `;
-		node_fs.default.writeFileSync(node_path.default.join(require_migrate.config().migration.out, require_migrate.Directory.paths.GENERATED, "er-diagram.mermaid"), result);
+		node_fs.default.writeFileSync(node_path.default.join(require_util.config().migration.out, require_migrate.Directory.paths.GENERATED, "er-diagram.mermaid"), result);
 	} catch (e) {
 		require_migrate.Console.error(e.message);
 		throw e;
@@ -549,12 +550,12 @@ const generate = async () => {
 	try {
 		await require_migrate.compileMigrationFiles();
 		const files = require_migrate.getMigrationFileNames();
-		const targetFile = files.find((it) => it === require_migrate.config().migration.target) || files[files.length - 1];
+		const targetFile = files.find((it) => it === require_util.config().migration.target) || files[files.length - 1];
 		const store = await getCurrentStore();
 		const storeHandler = new require_migrate.DataStoreHandler(store);
-		require_migrate.writeCurrentSchema(store);
+		require_util.writeCurrentSchema(store);
 		await new require_migrate.CodeGen_v2(storeHandler).generate();
-		require_migrate.Console.success(`code generated. DIR: ${require_migrate.config().migration.out}\nmigration target: ${targetFile}`);
+		require_migrate.Console.success(`code generated. DIR: ${require_util.config().migration.out}\nmigration target: ${targetFile}`);
 	} catch (e) {
 		require_migrate.Console.error(e.message);
 		throw e;
@@ -567,7 +568,7 @@ const init = () => {
 		require_migrate.Console.error("sasat.yml already exist");
 		return;
 	}
-	require_migrate.writeYmlFile("./", "sasat.yml", require_migrate.defaultConf);
+	require_util.writeYmlFile("./", "sasat.yml", require_util.defaultConf);
 	require_migrate.Console.success("sasat.yml created");
 };
 //#endregion
@@ -582,7 +583,7 @@ const migrationBuild = async () => {
 const index = (0, cac.cac)();
 try {
 	index.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) => {
-		const client = require_migrate.getDbClient();
+		const client = require_util.getDbClient();
 		await require_migrate.migrate(client, options).catch((e) => {
 			console.error(e);
 			process.exit(1);

package/dist/cli/index.mjs

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
-import { A as writeYmlFile, C as Directory, E as defaultConf, O as mkDirIfNotExist, S as capitalizeFirstLetter, T as config, _ as Console, a as getDbClient, f as getMigrationFileNames, g as defaultGQLOption, h as columnTypeToGqlPrimitive, i as compileMigrationFiles, k as writeCurrentSchema, l as defaultColumnOption, n as DataStoreHandler, p as CodeGen_v2, r as createCurrentMigrationDataStore, t as migrate, u as SqlString, w as DBColumnTypes, x as camelize } from "../migrate-Cbj2OVbY.mjs";
+import { _ as writeYmlFile, a as getDbClient, d as defaultConf, h as writeCurrentSchema, l as SqlString, p as mkDirIfNotExist, u as config } from "../util-Dkw5bD7a.mjs";
+import { a as getMigrationFileNames, c as defaultColumnOption, d as DBColumnTypes, f as Console, i as compileMigrationFiles, l as defaultGQLOption, m as capitalizeFirstLetter, n as CodeGen_v2, o as DataStoreHandler, p as camelize, r as createCurrentMigrationDataStore, s as Directory, t as migrate, u as columnTypeToGqlPrimitive } from "../migrate-DnqBdQ6r.mjs";
 import * as fs$1 from "node:fs";
 import fs from "node:fs";
 import path, { join } from "node:path";

package/dist/comparison-BpTtc1iD.d.mts

@@ -0,0 +1,42 @@
+//#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

@@ -0,0 +1,42 @@
+//#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-2mFJTQw7.d.mts

@@ -0,0 +1,35 @@
+//#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-Bnk1JKBU.d.cts

@@ -0,0 +1,35 @@
+//#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/index.cjs

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_migrate = require("./migrate-BRNxkHCx.cjs");
-let sqlstring = require("sqlstring");
-sqlstring = require_migrate.__toESM(sqlstring, 1);
+const require_util = require("./util-C5Jevn5B.cjs");
 let mysql2_promise = require("mysql2/promise");
+let sqlstring = require("sqlstring");
+sqlstring = require_util.__toESM(sqlstring, 1);
 //#region src/db/connectors/mysql/client.ts
-var MysqlClient = class extends require_migrate.DBClient {
+var MysqlClient = class extends require_util.DBClient {
 	async release() {}
 	constructor(connectionOption, logger) {
 		super(logger);
@@ -19,7 +19,7 @@ var MysqlClient = class extends require_migrate.DBClient {
 	async transaction() {
 		const connection = await this.getConnection();
 		await connection.beginTransaction();
-		return new require_migrate.MySqlTransaction(connection);
+		return new require_util.MySqlTransaction(connection);
 	}
 	async execSql(sql) {
 		const connection = await this.getConnection();
@@ -60,14 +60,14 @@ const Sql = {
 			case 1: return Sql.fn(expr);
 		}
 	},
-	literal: (literal) => require_migrate.SqlString.escape(literal.value),
-	fieldInCondition: (identifier) => require_migrate.SqlString.escapeId(identifier.table) + "." + require_migrate.SqlString.escapeId(identifier.name),
+	literal: (literal) => require_util.SqlString.escape(literal.value),
+	fieldInCondition: (identifier) => require_util.SqlString.escapeId(identifier.table) + "." + require_util.SqlString.escapeId(identifier.name),
 	fieldInSelect: (identifier) => {
-		const alias = identifier.alias && identifier.name !== identifier.alias ? " AS " + require_migrate.SqlString.escapeId(identifier.alias) : "";
-		return require_migrate.SqlString.escapeId(identifier.table) + "." + require_migrate.SqlString.escapeId(identifier.name) + alias;
+		const alias = identifier.alias && identifier.name !== identifier.alias ? " AS " + require_util.SqlString.escapeId(identifier.alias) : "";
+		return require_util.SqlString.escapeId(identifier.table) + "." + require_util.SqlString.escapeId(identifier.name) + alias;
 	},
 	identifier: (ident) => {
-		return require_migrate.SqlString.escapeId(ident.identifier);
+		return require_util.SqlString.escapeId(ident.identifier);
 	},
 	fn: (fn) => `${fn.fnName}(${fn.args.map(Sql.value).join(",")})${over(fn.over)}${fn.alias ? ` AS ${fn.alias}` : ""}`,
 	value: (v) => {
@@ -84,7 +84,7 @@ const Sql = {
 			if (type === "start") return "%" + value;
 			return value + "%";
 		};
-		return `${Sql.value(expr.left)} ${operator} ${require_migrate.SqlString.escape(val(expr.right, expr.type))}`;
+		return `${Sql.value(expr.left)} ${operator} ${require_util.SqlString.escape(val(expr.right, expr.type))}`;
 	},
 	in: (expr) => {
 		if ("right" in expr) return `${Sql.value(expr.left)} ${expr.operator} (${expr.right.map(Sql.value).join(", ")})`;
@@ -96,10 +96,10 @@ const Sql = {
 	paren: (expr) => "(" + Sql.booleanValue(expr.expression) + ")",
 	table: (table) => {
 		if (!table.subquery) {
-			if (table.alias === table.name) return require_migrate.SqlString.escapeId(table.name);
-			return require_migrate.SqlString.escapeId(table.name) + " AS " + require_migrate.SqlString.escapeId(table.alias);
+			if (table.alias === table.name) return require_util.SqlString.escapeId(table.name);
+			return require_util.SqlString.escapeId(table.name) + " AS " + require_util.SqlString.escapeId(table.alias);
 		}
-		return `(${queryToSql(table.query)}) AS ${require_migrate.SqlString.escapeId(table.alias)}`;
+		return `(${queryToSql(table.query)}) AS ${require_util.SqlString.escapeId(table.alias)}`;
 	},
 	join: (join) => `${join.type ? join.type + " " : ""}JOIN ${Sql.table(join.table)} ON ` + Sql.booleanValue(join.conditions),
 	booleanValue: (expr) => {
@@ -112,6 +112,7 @@ const Sql = {
 			case 8: return Sql.in(expr);
 			case 6: return Sql.isNull(expr);
 			case 14: return Sql.exists(expr);
+			case 15: return expr.expr;
 		}
 	},
 	exists: (expr) => {
@@ -182,7 +183,7 @@ const comparisonExpressionToSql = (exp) => {
 		}
 		if (value[0] === "BETWEEN") return `${column} BETWEEN ${sqlstring.escape(value[1])} AND ${sqlstring.escape(value[2])}`;
 		if (Object.keys(Comparison).includes(value[0])) return `${column} ${value[0]} ${sqlstring.escape(value[1])}`;
-		throw new require_migrate.SasatError("SQL PARSE ERROR");
+		throw new require_util.SasatError("SQL PARSE ERROR");
 	}).join(` ${type} `);
 };
 //#endregion
@@ -210,65 +211,6 @@ var CompositeCondition = class CompositeCondition {
 	}
 };
 //#endregion
-//#region src/migration/makeMutaion.ts
-const formatSubscription = (subscription) => {
-	if (subscription === void 0 || subscription === false) return {
-		enabled: false,
-		subscriptionFilter: []
-	};
-	if (subscription === true) return {
-		enabled: true,
-		subscriptionFilter: []
-	};
-	return {
-		enabled: subscription.enabled,
-		subscriptionFilter: subscription.subscriptionFilter || []
-	};
-};
-const formatOptions = (type, option) => ({
-	type,
-	noReFetch: option?.noRefetch || false,
-	middlewares: option?.middlewares || [],
-	contextFields: option?.contextFields || [],
-	subscription: formatSubscription(option?.subscription)
-});
-const Mutations = {
-	create: (options) => formatOptions("create", options),
-	update: (options) => formatOptions("update", options),
-	delete: (options) => formatOptions("delete", options)
-};
-//#endregion
-//#region src/migration/makeQuery.ts
-const single = (name, options) => ({
-	type: "single",
-	name,
-	conditions: options?.conditions || [],
-	middlewares: options?.middlewares || []
-});
-const listAll = (name, options) => ({
-	type: "list-all",
-	name,
-	conditions: options?.conditions || [],
-	middlewares: options?.middlewares || []
-});
-const paging = (name, options) => ({
-	type: "list-paging",
-	name,
-	conditions: options?.conditions || [],
-	middlewares: options?.middlewares || []
-});
-const primary = (middlewares = []) => ({
-	type: "primary",
-	conditions: [],
-	middlewares
-});
-const Queries = {
-	single,
-	listAll,
-	paging,
-	primary
-};
-//#endregion
 //#region src/runtime/createTypeDef.ts
 const makeArgs = (args) => {
 	if (!args || args.length === 0) return "";
@@ -294,7 +236,7 @@ const createTypeDef = (typeDefs, inputs) => {
 //#endregion
 //#region src/runtime/dsl/factory.ts
 const compound = (expr, operator) => {
-	const active = expr.filter(require_migrate.nonNullable);
+	const active = expr.filter(require_util.nonNullable);
 	if (active.length === 0) return conditions.eq(literal(1), literal(1));
 	return active.reduce((acc, current) => ({
 		kind: 4,
@@ -564,19 +506,19 @@ const makeParamsMiddleware = (update) => {
 };
 //#endregion
 //#region src/runtime/dsl/mutation/mutation.ts
-const escapeId = require_migrate.SqlString.escapeId;
+const escapeId = require_util.SqlString.escapeId;
 const onDuplicateKeyUpdate = (columns) => {
 	if (!columns || columns.length === 0) return "";
 	return " ON DUPLICATE KEY UPDATE " + columns.map(escapeId).map((it) => `${it} = VALUES(${it})`).join(",");
 };
 const createToSql = (dsl, tableInfo) => {
 	const map = tableInfo[dsl.table].columnMap;
-	const values = dsl.entities.map((it) => `(${it.map((it) => require_migrate.SqlString.escape(it)).join(",")})`).join(",");
+	const values = dsl.entities.map((it) => `(${it.map((it) => require_util.SqlString.escape(it)).join(",")})`).join(",");
 	return `INSERT ${dsl.ignore ? "IGNORE " : ""}INTO ${escapeId(dsl.table)}(${dsl.fields.map((it) => escapeId(map[it]))}) VALUES ${values} ${onDuplicateKeyUpdate(dsl.upsert)}`;
 };
 const updateToSql = (dsl, tableInfo) => {
 	const map = tableInfo[dsl.table].columnMap;
-	return `UPDATE ${escapeId(dsl.table)} SET ${dsl.values.map((it) => escapeId(map[it.field]) + " = " + require_migrate.SqlString.escape(it.value)).join(", ")} WHERE ${Sql.booleanValue(dsl.where)}`;
+	return `UPDATE ${escapeId(dsl.table)} SET ${dsl.values.map((it) => escapeId(map[it.field]) + " = " + require_util.SqlString.escape(it.value)).join(", ")} WHERE ${Sql.booleanValue(dsl.where)}`;
 };
 const deleteToSql = (dsl) => {
 	return `DELETE FROM ${escapeId(dsl.table)} WHERE ${Sql.booleanValue(dsl.where)}`;
@@ -590,7 +532,7 @@ const joinToQueryResolveInfo = (parentTableAlias, property, fields, map, tableIn
 		tableAlias: fields.tableAlias || info.table,
 		isArray: info.array,
 		keyAliases: tableInfo[info.table].identifiableFields,
-		joins: Object.entries(fields.relations || {}).filter(([, value]) => value).map(([key, value]) => joinToQueryResolveInfo(info.table, key, value, map, tableInfo)).filter(require_migrate.nonNullable),
+		joins: Object.entries(fields.relations || {}).filter(([, value]) => value).map(([key, value]) => joinToQueryResolveInfo(info.table, key, value, map, tableInfo)).filter(require_util.nonNullable),
 		property
 	};
 };
@@ -599,7 +541,7 @@ const createQueryResolveInfo = (tableName, fields, map, tableInfo) => {
 		tableAlias: fields.tableAlias || tableName,
 		isArray: true,
 		keyAliases: tableInfo[tableName].identifiableFields,
-		joins: Object.entries(fields.relations || {}).filter(([, value]) => value).map(([key, value]) => joinToQueryResolveInfo(tableName, key, value, map, tableInfo)).filter(require_migrate.nonNullable),
+		joins: Object.entries(fields.relations || {}).filter(([, value]) => value).map(([key, value]) => joinToQueryResolveInfo(tableName, key, value, map, tableInfo)).filter(require_util.nonNullable),
 		property: ""
 	};
 };
@@ -671,7 +613,7 @@ const createQuery = (baseTableName, fields, options, tableInfo, relationMap, con
 		table.tableAlias = tableAlias;
 		tableCount++;
 		const info = tableInfo[tableName];
-		select.push(...require_migrate.unique([...table.fields.filter((it) => {
+		select.push(...require_util.unique([...table.fields.filter((it) => {
 			return notTypeName(it) && info.columnMap[it];
 		}), ...info.identifiableFields]).map((it) => {
 			const realName = info.columnMap[it] || it;
@@ -685,8 +627,8 @@ const createQuery = (baseTableName, fields, options, tableInfo, relationMap, con
 				parentTableAlias: tableAlias,
 				childTableAlias: table.tableAlias || "t" + current,
 				context
-			}), table.joinOn), "LEFT");
-		}).filter(require_migrate.nonNullable), tableAlias);
+			}), table.joinOn), table.joinType ?? "LEFT");
+		}).filter(require_util.nonNullable), tableAlias);
 	};
 	return {
 		select,
@@ -697,7 +639,7 @@ const createQuery = (baseTableName, fields, options, tableInfo, relationMap, con
 const createPagingInnerQuery = (tableName, tableAlias, fields, option, tableInfo, relationMap) => {
 	const map = tableInfo[tableName].columnMap;
 	return {
-		select: require_migrate.unique([
+		select: require_util.unique([
 			...tableInfo[tableName].identifiableKeys,
 			...Object.keys(fields.relations || {}).flatMap((key) => {
 				return relationMap[tableName][key]?.requiredColumns || [];
@@ -726,7 +668,7 @@ const createPagingFieldQuery = ({ baseTableName, fields, queryOption, pagingOpti
 //#endregion
 //#region src/runtime/sasatDBDatasource.ts
 var SasatDBDatasource = class {
-	constructor(client = require_migrate.getDbClient()) {
+	constructor(client = require_util.getDbClient()) {
 		this.client = client;
 	}
 	async create(entity, option) {
@@ -863,33 +805,29 @@ const pagingOption = (option) => {
 };
 //#endregion
 exports.CompositeCondition = CompositeCondition;
-exports.Conditions = require_migrate.Conditions;
-exports.Mutations = Mutations;
 exports.MysqlClient = MysqlClient;
 exports.QExpr = QExpr;
-exports.Queries = Queries;
 exports.SasatDBDatasource = SasatDBDatasource;
 exports.Sql = Sql;
-exports.SqlString = require_migrate.SqlString;
-exports.assignDeep = require_migrate.assignDeep;
+exports.SqlString = require_util.SqlString;
+exports.assignDeep = require_util.assignDeep;
 exports.createTypeDef = createTypeDef;
 exports.dateOffset = dateOffset;
 exports.dateToDateString = dateToDateString;
 exports.dateToDatetimeString = dateToDatetimeString;
-exports.formatQuery = require_migrate.formatQuery;
+exports.formatQuery = require_util.formatQuery;
 exports.getCurrentDateTimeString = getCurrentDateTimeString;
 exports.getDayRange = getDayRange;
 exports.getDayRangeQExpr = getDayRangeQExpr;
-exports.getDbClient = require_migrate.getDbClient;
+exports.getDbClient = require_util.getDbClient;
 exports.getTodayDateString = getTodayDateString;
 exports.getTodayDateTimeString = getTodayDateTimeString;
 exports.gqlResolveInfoToField = gqlResolveInfoToField;
 exports.makeNumberIdEncoder = makeNumberIdEncoder;
 exports.makeParamsMiddleware = makeParamsMiddleware;
 exports.makeResolver = makeResolver;
-exports.migrate = require_migrate.migrate;
 exports.pagingOption = pagingOption;
-exports.pick = require_migrate.pick;
+exports.pick = require_util.pick;
 exports.qe = QExpr;
 exports.queryToSql = queryToSql;
-exports.setConfig = require_migrate.setConfig;
+exports.setConfig = require_util.setConfig;