sasat 0.21.6 → 0.21.7

package/dist/index.cjs

@@ -1,6 +1,5 @@
 'use strict';
 
-const queryToSql_js = require('runtime/dsl/query/sql/queryToSql.js');
 const error = require('./shared/sasat.f544328b.cjs');
 const SqlString = require('sqlstring');
 require('mysql2');
@@ -44,30 +43,6 @@ var QueryNodeKind = /* @__PURE__ */ ((QueryNodeKind2) => {
   return QueryNodeKind2;
 })(QueryNodeKind || {});
 
-const getJoin = (from) => {
-  return from.joins.flatMap((join) => [join, ...getJoin(join.table)]);
-};
-const getLock = (lock) => {
-  if (!lock)
-    return "";
-  if (lock === "FOR UPDATE")
-    return " FOR UPDATE";
-  return " FOR SHARE";
-};
-const queryToSql = (query) => {
-  const select = query.select.map(Sql.select).join(", ");
-  const join = getJoin(query.from).map(Sql.join).join(" ");
-  const where = query.where ? " WHERE " + Sql.booleanValue(query.where) : "";
-  const groupBy = query.groupBy ? " GROUP BY" + query.groupBy.cols.map(Sql.value).join(",") : "";
-  const having = query.having ? "HAVING " + Sql.booleanValue(query.having) : "";
-  const sort = query.sort && query.sort.length !== 0 ? " ORDER BY " + Sql.sorts(query.sort) : "";
-  const limit = query.limit ? " LIMIT " + query.limit : "";
-  const offset = query.offset ? " OFFSET " + query.offset : "";
-  if (offset && !limit)
-    throw new Error("LIMIT is required to use OFFSET.");
-  return `SELECT ${select} FROM ${Sql.table(query.from)}` + join + where + groupBy + having + sort + limit + offset + getLock(query.lock);
-};
-
 const SELECT_ALIAS_SEPARATOR = "__";
 const Sql = {
   select: (expr) => {
@@ -184,6 +159,30 @@ const Sql = {
   }
 };
 
+const getJoin = (from) => {
+  return from.joins.flatMap((join) => [join, ...getJoin(join.table)]);
+};
+const getLock = (lock) => {
+  if (!lock)
+    return "";
+  if (lock === "FOR UPDATE")
+    return " FOR UPDATE";
+  return " FOR SHARE";
+};
+const queryToSql = (query) => {
+  const select = query.select.map(Sql.select).join(", ");
+  const join = getJoin(query.from).map(Sql.join).join(" ");
+  const where = query.where ? " WHERE " + Sql.booleanValue(query.where) : "";
+  const groupBy = query.groupBy ? " GROUP BY" + query.groupBy.cols.map(Sql.value).join(",") : "";
+  const having = query.having ? "HAVING " + Sql.booleanValue(query.having) : "";
+  const sort = query.sort && query.sort.length !== 0 ? " ORDER BY " + Sql.sorts(query.sort) : "";
+  const limit = query.limit ? " LIMIT " + query.limit : "";
+  const offset = query.offset ? " OFFSET " + query.offset : "";
+  if (offset && !limit)
+    throw new Error("LIMIT is required to use OFFSET.");
+  return `SELECT ${select} FROM ${Sql.table(query.from)}` + join + where + groupBy + having + sort + limit + offset + getLock(query.lock);
+};
+
 const makeParamsMiddleware = (update) => {
   return (args) => {
     args[1] = update(args[1]);
@@ -1042,7 +1041,6 @@ const pagingOption = (option) => {
   return { numberOfItem: option.numberOfItem, offset: option.offset, sort };
 };
 
-exports.queryToSql = queryToSql_js.queryToSql;
 exports.Conditions = error.Conditions;
 exports.SqlString = error.SqlString;
 exports.getDbClient = error.getDbClient;
@@ -1069,3 +1067,4 @@ exports.makeParamsMiddleware = makeParamsMiddleware;
 exports.makeResolver = makeResolver;
 exports.pagingOption = pagingOption;
 exports.qe = QExpr;
+exports.queryToSql = queryToSql;

package/dist/index.d.cts

@@ -1,4 +1,3 @@
-export { queryToSql } from 'runtime/dsl/query/sql/queryToSql.js';
 import pkg from 'sqlstring';
 import { GraphQLResolveInfo } from 'graphql/type';
 import Hashids from 'hashids';
@@ -149,6 +148,8 @@ type Sort = {
     direction?: SortDirection;
 };
 
+declare const queryToSql: (query: Query) => string;
+
 type QueryResponse = Array<{
     [key: string]: SqlValueType;
 }>;
@@ -1085,4 +1086,4 @@ declare const pagingOption: (option: ListQueryOption) => DsPagingOption;
 
 type PagingOption = ListQueryOption;
 
-export { type BooleanValueExpression, type CommandResponse, type ComparisonOperators, CompositeCondition, Conditions, type CustomCondition, type EntityResult, type EntityType, type Fields, type ListQueryOption, type LockMode, type MigrationStore, Mutations, type PagingOption, QExpr, Queries, type Query, type QueryOptions, type QueryResponse, type Relation, type RelationMap, type ResolverMiddleware, SQLTransaction, SasatDBDatasource, type SasatMigration, Sql, SqlString, type TableInfo, type TypeFieldDefinition, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, pick, QExpr as qe };
+export { type BooleanValueExpression, type CommandResponse, type ComparisonOperators, CompositeCondition, Conditions, type CustomCondition, type EntityResult, type EntityType, type Fields, type ListQueryOption, type LockMode, type MigrationStore, Mutations, type PagingOption, QExpr, Queries, type Query, type QueryOptions, type QueryResponse, type Relation, type RelationMap, type ResolverMiddleware, SQLTransaction, SasatDBDatasource, type SasatMigration, Sql, SqlString, type TableInfo, type TypeFieldDefinition, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, pick, QExpr as qe, queryToSql };

package/dist/index.d.mts

@@ -1,4 +1,3 @@
-export { queryToSql } from 'runtime/dsl/query/sql/queryToSql.js';
 import pkg from 'sqlstring';
 import { GraphQLResolveInfo } from 'graphql/type';
 import Hashids from 'hashids';
@@ -149,6 +148,8 @@ type Sort = {
     direction?: SortDirection;
 };
 
+declare const queryToSql: (query: Query) => string;
+
 type QueryResponse = Array<{
     [key: string]: SqlValueType;
 }>;
@@ -1085,4 +1086,4 @@ declare const pagingOption: (option: ListQueryOption) => DsPagingOption;
 
 type PagingOption = ListQueryOption;
 
-export { type BooleanValueExpression, type CommandResponse, type ComparisonOperators, CompositeCondition, Conditions, type CustomCondition, type EntityResult, type EntityType, type Fields, type ListQueryOption, type LockMode, type MigrationStore, Mutations, type PagingOption, QExpr, Queries, type Query, type QueryOptions, type QueryResponse, type Relation, type RelationMap, type ResolverMiddleware, SQLTransaction, SasatDBDatasource, type SasatMigration, Sql, SqlString, type TableInfo, type TypeFieldDefinition, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, pick, QExpr as qe };
+export { type BooleanValueExpression, type CommandResponse, type ComparisonOperators, CompositeCondition, Conditions, type CustomCondition, type EntityResult, type EntityType, type Fields, type ListQueryOption, type LockMode, type MigrationStore, Mutations, type PagingOption, QExpr, Queries, type Query, type QueryOptions, type QueryResponse, type Relation, type RelationMap, type ResolverMiddleware, SQLTransaction, SasatDBDatasource, type SasatMigration, Sql, SqlString, type TableInfo, type TypeFieldDefinition, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, pick, QExpr as qe, queryToSql };

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-export { queryToSql } from 'runtime/dsl/query/sql/queryToSql.js';
 import pkg from 'sqlstring';
 import { GraphQLResolveInfo } from 'graphql/type';
 import Hashids from 'hashids';
@@ -149,6 +148,8 @@ type Sort = {
     direction?: SortDirection;
 };
 
+declare const queryToSql: (query: Query) => string;
+
 type QueryResponse = Array<{
     [key: string]: SqlValueType;
 }>;
@@ -1085,4 +1086,4 @@ declare const pagingOption: (option: ListQueryOption) => DsPagingOption;
 
 type PagingOption = ListQueryOption;
 
-export { type BooleanValueExpression, type CommandResponse, type ComparisonOperators, CompositeCondition, Conditions, type CustomCondition, type EntityResult, type EntityType, type Fields, type ListQueryOption, type LockMode, type MigrationStore, Mutations, type PagingOption, QExpr, Queries, type Query, type QueryOptions, type QueryResponse, type Relation, type RelationMap, type ResolverMiddleware, SQLTransaction, SasatDBDatasource, type SasatMigration, Sql, SqlString, type TableInfo, type TypeFieldDefinition, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, pick, QExpr as qe };
+export { type BooleanValueExpression, type CommandResponse, type ComparisonOperators, CompositeCondition, Conditions, type CustomCondition, type EntityResult, type EntityType, type Fields, type ListQueryOption, type LockMode, type MigrationStore, Mutations, type PagingOption, QExpr, Queries, type Query, type QueryOptions, type QueryResponse, type Relation, type RelationMap, type ResolverMiddleware, SQLTransaction, SasatDBDatasource, type SasatMigration, Sql, SqlString, type TableInfo, type TypeFieldDefinition, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, pick, QExpr as qe, queryToSql };

package/dist/index.mjs

@@ -1,4 +1,3 @@
-export { queryToSql } from 'runtime/dsl/query/sql/queryToSql.js';
 import { S as SqlString$1, n as nonNullable, u as unique, g as getDbClient, a as SasatError } from './shared/sasat.01289068.mjs';
 export { C as Conditions, p as pick } from './shared/sasat.01289068.mjs';
 import * as SqlString from 'sqlstring';
@@ -29,30 +28,6 @@ var QueryNodeKind = /* @__PURE__ */ ((QueryNodeKind2) => {
   return QueryNodeKind2;
 })(QueryNodeKind || {});
 
-const getJoin = (from) => {
-  return from.joins.flatMap((join) => [join, ...getJoin(join.table)]);
-};
-const getLock = (lock) => {
-  if (!lock)
-    return "";
-  if (lock === "FOR UPDATE")
-    return " FOR UPDATE";
-  return " FOR SHARE";
-};
-const queryToSql = (query) => {
-  const select = query.select.map(Sql.select).join(", ");
-  const join = getJoin(query.from).map(Sql.join).join(" ");
-  const where = query.where ? " WHERE " + Sql.booleanValue(query.where) : "";
-  const groupBy = query.groupBy ? " GROUP BY" + query.groupBy.cols.map(Sql.value).join(",") : "";
-  const having = query.having ? "HAVING " + Sql.booleanValue(query.having) : "";
-  const sort = query.sort && query.sort.length !== 0 ? " ORDER BY " + Sql.sorts(query.sort) : "";
-  const limit = query.limit ? " LIMIT " + query.limit : "";
-  const offset = query.offset ? " OFFSET " + query.offset : "";
-  if (offset && !limit)
-    throw new Error("LIMIT is required to use OFFSET.");
-  return `SELECT ${select} FROM ${Sql.table(query.from)}` + join + where + groupBy + having + sort + limit + offset + getLock(query.lock);
-};
-
 const SELECT_ALIAS_SEPARATOR = "__";
 const Sql = {
   select: (expr) => {
@@ -169,6 +144,30 @@ const Sql = {
   }
 };
 
+const getJoin = (from) => {
+  return from.joins.flatMap((join) => [join, ...getJoin(join.table)]);
+};
+const getLock = (lock) => {
+  if (!lock)
+    return "";
+  if (lock === "FOR UPDATE")
+    return " FOR UPDATE";
+  return " FOR SHARE";
+};
+const queryToSql = (query) => {
+  const select = query.select.map(Sql.select).join(", ");
+  const join = getJoin(query.from).map(Sql.join).join(" ");
+  const where = query.where ? " WHERE " + Sql.booleanValue(query.where) : "";
+  const groupBy = query.groupBy ? " GROUP BY" + query.groupBy.cols.map(Sql.value).join(",") : "";
+  const having = query.having ? "HAVING " + Sql.booleanValue(query.having) : "";
+  const sort = query.sort && query.sort.length !== 0 ? " ORDER BY " + Sql.sorts(query.sort) : "";
+  const limit = query.limit ? " LIMIT " + query.limit : "";
+  const offset = query.offset ? " OFFSET " + query.offset : "";
+  if (offset && !limit)
+    throw new Error("LIMIT is required to use OFFSET.");
+  return `SELECT ${select} FROM ${Sql.table(query.from)}` + join + where + groupBy + having + sort + limit + offset + getLock(query.lock);
+};
+
 const makeParamsMiddleware = (update) => {
   return (args) => {
     args[1] = update(args[1]);
@@ -1027,4 +1026,4 @@ const pagingOption = (option) => {
   return { numberOfItem: option.numberOfItem, offset: option.offset, sort };
 };
 
-export { CompositeCondition, Mutations, QExpr, Queries, SasatDBDatasource, Sql, SqlString$1 as SqlString, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, QExpr as qe };
+export { CompositeCondition, Mutations, QExpr, Queries, SasatDBDatasource, Sql, SqlString$1 as SqlString, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, QExpr as qe, queryToSql };

package/package.json

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