sasat 0.22.4 → 0.22.6

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { D as setConfig, a as getDbClient, b as unique, c as formatQuery, d as SasatError, j as assignDeep, m as Conditions, o as MySqlTransaction, s as DBClient, t as migrate, u as SqlString, v as nonNullable, y as pick } from "./migrate-Cbj2OVbY.mjs";
-import * as SqlString$1 from "sqlstring";
+import { a as getDbClient, c as formatQuery, f as setConfig, i as SasatError, l as SqlString, n as pick, o as MySqlTransaction, r as unique, s as DBClient, t as nonNullable, v as assignDeep } from "./util-Dkw5bD7a.mjs";
 import { createConnection } from "mysql2/promise";
+import * as SqlString$1 from "sqlstring";
 //#region src/db/connectors/mysql/client.ts
 var MysqlClient = class extends DBClient {
 	async release() {}
@@ -110,6 +110,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) => {
@@ -208,65 +209,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 "";
@@ -683,7 +625,7 @@ const createQuery = (baseTableName, fields, options, tableInfo, relationMap, con
 				parentTableAlias: tableAlias,
 				childTableAlias: table.tableAlias || "t" + current,
 				context
-			}), table.joinOn), "LEFT");
+			}), table.joinOn), table.joinType ?? "LEFT");
 		}).filter(nonNullable), tableAlias);
 	};
 	return {
@@ -860,4 +802,4 @@ const pagingOption = (option) => {
 	};
 };
 //#endregion
-export { CompositeCondition, Conditions, Mutations, MysqlClient, QExpr, QExpr as qe, Queries, SasatDBDatasource, Sql, SqlString, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, formatQuery, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, migrate, pagingOption, pick, queryToSql, setConfig };
+export { CompositeCondition, MysqlClient, QExpr, QExpr as qe, SasatDBDatasource, Sql, SqlString, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, formatQuery, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, pick, queryToSql, setConfig };

package/dist/makeCondition-3MdYUm5k.mjs

@@ -0,0 +1,134 @@
+//#region src/migration/makeCondition.ts
+const parent = (field) => ({
+	kind: "parent",
+	field
+});
+const child = (field) => ({
+	kind: "child",
+	field
+});
+const contextOrError = (field, errorMessage) => ({
+	kind: "context",
+	field,
+	onNotDefined: {
+		action: "error",
+		message: errorMessage
+	}
+});
+const contextOrDefault = (field, defaultValue) => ({
+	kind: "context",
+	field,
+	onNotDefined: {
+		action: "defaultValue",
+		value: defaultValue
+	}
+});
+const fixed = (value) => ({
+	kind: "fixed",
+	value
+});
+const today = (thresholdHour, date) => ({
+	kind: "today",
+	type: date ? "date" : "datetime",
+	thresholdHour
+});
+const now = () => ({ kind: "now" });
+const values = (begin, end) => ({
+	kind: "range",
+	begin,
+	end
+});
+const betweenToday = (thresholdHour) => ({
+	kind: "date-range",
+	range: "today",
+	thresholdHour
+});
+const custom = (conditionName, parentRequiredFields, childRequiredFields) => ({
+	kind: "custom",
+	conditionName,
+	parentRequiredFields,
+	childRequiredFields
+});
+const field = (column) => ({
+	kind: "field",
+	column
+});
+const arg = (name, type) => ({
+	kind: "arg",
+	name,
+	type
+});
+const betweenRel = (left, range) => ({
+	kind: "comparison",
+	left,
+	operator: "BETWEEN",
+	right: range
+});
+const betweenQuery = (left, begin, end) => ({
+	kind: "between",
+	operator: "BETWEEN",
+	left,
+	begin,
+	end
+});
+const comparisonRel = (left, operator, right) => ({
+	kind: "comparison",
+	left,
+	right,
+	operator
+});
+const inRel = (left, right) => ({
+	kind: "comparison",
+	left,
+	right,
+	operator: "IN"
+});
+const isNullRel = (value) => ({
+	kind: "isNull",
+	value,
+	not: false
+});
+const isNotNullRel = (value) => ({
+	kind: "isNull",
+	value,
+	not: true
+});
+const comparisonQuery = (left, operator, right) => ({
+	kind: "comparison",
+	left,
+	right,
+	operator
+});
+const Conditions = {
+	betweenRel,
+	betweenQuery,
+	custom,
+	rel: {
+		between: betweenRel,
+		comparison: comparisonRel,
+		in: inRel,
+		isNull: isNullRel,
+		isNotNull: isNotNullRel
+	},
+	query: {
+		between: betweenQuery,
+		comparison: comparisonQuery
+	},
+	value: {
+		parent,
+		child,
+		contextOrError,
+		contextOrDefault,
+		fixed,
+		today,
+		now,
+		field,
+		arg
+	},
+	range: {
+		values,
+		today: betweenToday
+	}
+};
+//#endregion
+export { Conditions as t };

package/dist/makeCondition-DKSyAkri.cjs

@@ -0,0 +1,139 @@
+//#region src/migration/makeCondition.ts
+const parent = (field) => ({
+	kind: "parent",
+	field
+});
+const child = (field) => ({
+	kind: "child",
+	field
+});
+const contextOrError = (field, errorMessage) => ({
+	kind: "context",
+	field,
+	onNotDefined: {
+		action: "error",
+		message: errorMessage
+	}
+});
+const contextOrDefault = (field, defaultValue) => ({
+	kind: "context",
+	field,
+	onNotDefined: {
+		action: "defaultValue",
+		value: defaultValue
+	}
+});
+const fixed = (value) => ({
+	kind: "fixed",
+	value
+});
+const today = (thresholdHour, date) => ({
+	kind: "today",
+	type: date ? "date" : "datetime",
+	thresholdHour
+});
+const now = () => ({ kind: "now" });
+const values = (begin, end) => ({
+	kind: "range",
+	begin,
+	end
+});
+const betweenToday = (thresholdHour) => ({
+	kind: "date-range",
+	range: "today",
+	thresholdHour
+});
+const custom = (conditionName, parentRequiredFields, childRequiredFields) => ({
+	kind: "custom",
+	conditionName,
+	parentRequiredFields,
+	childRequiredFields
+});
+const field = (column) => ({
+	kind: "field",
+	column
+});
+const arg = (name, type) => ({
+	kind: "arg",
+	name,
+	type
+});
+const betweenRel = (left, range) => ({
+	kind: "comparison",
+	left,
+	operator: "BETWEEN",
+	right: range
+});
+const betweenQuery = (left, begin, end) => ({
+	kind: "between",
+	operator: "BETWEEN",
+	left,
+	begin,
+	end
+});
+const comparisonRel = (left, operator, right) => ({
+	kind: "comparison",
+	left,
+	right,
+	operator
+});
+const inRel = (left, right) => ({
+	kind: "comparison",
+	left,
+	right,
+	operator: "IN"
+});
+const isNullRel = (value) => ({
+	kind: "isNull",
+	value,
+	not: false
+});
+const isNotNullRel = (value) => ({
+	kind: "isNull",
+	value,
+	not: true
+});
+const comparisonQuery = (left, operator, right) => ({
+	kind: "comparison",
+	left,
+	right,
+	operator
+});
+const Conditions = {
+	betweenRel,
+	betweenQuery,
+	custom,
+	rel: {
+		between: betweenRel,
+		comparison: comparisonRel,
+		in: inRel,
+		isNull: isNullRel,
+		isNotNull: isNotNullRel
+	},
+	query: {
+		between: betweenQuery,
+		comparison: comparisonQuery
+	},
+	value: {
+		parent,
+		child,
+		contextOrError,
+		contextOrDefault,
+		fixed,
+		today,
+		now,
+		field,
+		arg
+	},
+	range: {
+		values,
+		today: betweenToday
+	}
+};
+//#endregion
+Object.defineProperty(exports, "Conditions", {
+	enumerable: true,
+	get: function() {
+		return Conditions;
+	}
+});