sasat 0.21.7 → 0.21.9

package/dist/cli/cli.cjs

@@ -2,7 +2,7 @@
 'use strict';
 
 const cac = require('cac');
-const error = require('../shared/sasat.f544328b.cjs');
+const error = require('../shared/sasat.19043592.cjs');
 require('pluralize');
 const fs = require('fs');
 const path = require('path');
@@ -1398,7 +1398,6 @@ const writeDiagram = async () => {
     const result = `erDiagram
 ${entities.join("\n")}
 `;
-    console.log();
     fs__default.writeFileSync(
       path__default.join(
         error.config().migration.out,
@@ -1431,7 +1430,7 @@ function processTable(store, table) {
     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 `${ref.parentTable} ${getRefType(parent, ref.relation)} ${table.tableName} : ${ref.relationName ?? rel2.data.reference.parentTable + "<->" + rel2.table.tableName}`;
   });
   return `${table.tableName} {
 ${table.columns.map((it) => `  ${it.columnName()} ${it.dataType()}`).join("\n")}
@@ -3565,6 +3564,8 @@ const makeJoinConditionThrowExpressions = (cv) => {
 const makeThrowExpressions = (condition) => {
   if (condition.kind === "custom")
     return [];
+  if (condition.kind === "isNull")
+    return [makeJoinConditionThrowExpressions(condition.value)];
   if (condition.operator === "BETWEEN") {
     return [
       makeJoinConditionThrowExpressions(condition.left),
@@ -3625,6 +3626,9 @@ const makeConditionExpr = (entity, condition) => {
   if (condition.kind === "custom") {
     return tsg.identifier(condition.conditionName).importFrom("../conditions").call(tsg.identifier("arg"));
   }
+  if (condition.kind === "isNull") {
+    return qExpr.property(condition.not ? "isNotNull" : "isNull").call(makeJoinConditionValueQExpr(entity, condition.value));
+  }
   if (condition.operator === "BETWEEN") {
     return qExpr.property("between").call(
       makeJoinConditionValueQExpr(entity, condition.left),
@@ -3669,6 +3673,8 @@ const getChildConditionValue = (cv) => {
 const getConditionChildColumnNames = (getConditionValue) => (c) => {
   if (c.kind === "custom")
     return c.childRequiredFields || [];
+  if (c.kind === "isNull")
+    return [];
   const result = [getConditionValue(c.left)];
   if (c.operator === "IN") {
     result.push(getConditionValue(c.left));
@@ -4850,6 +4856,12 @@ const reverseConditionNode = (condition) => {
       parentRequiredFields: condition.childRequiredFields,
       childRequiredFields: condition.parentRequiredFields
     };
+  if (condition.kind === "isNull") {
+    if (condition.not) {
+      return error.Conditions.rel.isNotNull(reverseConditionValue(condition.value));
+    }
+    return error.Conditions.rel.isNull(reverseConditionValue(condition.value));
+  }
   if (condition.operator === "BETWEEN") {
     return error.Conditions.rel.between(
       reverseConditionValue(condition.left),

package/dist/cli/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { cac } from 'cac';
-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 { 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.f15e60f6.mjs';
 import 'pluralize';
 import * as fs from 'fs';
 import fs__default from 'fs';
@@ -1373,7 +1373,6 @@ const writeDiagram = async () => {
     const result = `erDiagram
 ${entities.join("\n")}
 `;
-    console.log();
     fs__default.writeFileSync(
       path__default.join(
         config().migration.out,
@@ -1406,7 +1405,7 @@ function processTable(store, table) {
     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 `${ref.parentTable} ${getRefType(parent, ref.relation)} ${table.tableName} : ${ref.relationName ?? rel2.data.reference.parentTable + "<->" + rel2.table.tableName}`;
   });
   return `${table.tableName} {
 ${table.columns.map((it) => `  ${it.columnName()} ${it.dataType()}`).join("\n")}
@@ -3540,6 +3539,8 @@ const makeJoinConditionThrowExpressions = (cv) => {
 const makeThrowExpressions = (condition) => {
   if (condition.kind === "custom")
     return [];
+  if (condition.kind === "isNull")
+    return [makeJoinConditionThrowExpressions(condition.value)];
   if (condition.operator === "BETWEEN") {
     return [
       makeJoinConditionThrowExpressions(condition.left),
@@ -3600,6 +3601,9 @@ const makeConditionExpr = (entity, condition) => {
   if (condition.kind === "custom") {
     return tsg.identifier(condition.conditionName).importFrom("../conditions").call(tsg.identifier("arg"));
   }
+  if (condition.kind === "isNull") {
+    return qExpr.property(condition.not ? "isNotNull" : "isNull").call(makeJoinConditionValueQExpr(entity, condition.value));
+  }
   if (condition.operator === "BETWEEN") {
     return qExpr.property("between").call(
       makeJoinConditionValueQExpr(entity, condition.left),
@@ -3644,6 +3648,8 @@ const getChildConditionValue = (cv) => {
 const getConditionChildColumnNames = (getConditionValue) => (c) => {
   if (c.kind === "custom")
     return c.childRequiredFields || [];
+  if (c.kind === "isNull")
+    return [];
   const result = [getConditionValue(c.left)];
   if (c.operator === "IN") {
     result.push(getConditionValue(c.left));
@@ -4825,6 +4831,12 @@ const reverseConditionNode = (condition) => {
       parentRequiredFields: condition.childRequiredFields,
       childRequiredFields: condition.parentRequiredFields
     };
+  if (condition.kind === "isNull") {
+    if (condition.not) {
+      return Conditions.rel.isNotNull(reverseConditionValue(condition.value));
+    }
+    return Conditions.rel.isNull(reverseConditionValue(condition.value));
+  }
   if (condition.operator === "BETWEEN") {
     return Conditions.rel.between(
       reverseConditionValue(condition.left),

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const error = require('./shared/sasat.f544328b.cjs');
+const error = require('./shared/sasat.19043592.cjs');
 const SqlString = require('sqlstring');
 require('mysql2');
 require('util');

package/dist/index.d.cts

@@ -514,6 +514,10 @@ type JoinConditionNode = {
     left: JoinConditionValue;
     operator: 'IN';
     right: JoinConditionValue[];
+} | {
+    kind: 'isNull';
+    value: JoinConditionValue;
+    not: boolean;
 } | JoinCustomConditionNode;
 type JoinCustomConditionNode = {
     kind: 'custom';
@@ -717,6 +721,8 @@ declare const Conditions: {
         readonly between: (left: JoinConditionValue, range: JoinConditionRangeValue) => JoinConditionNode;
         readonly comparison: (left: JoinConditionValue, operator: ComparisonOperators, right: JoinConditionValue) => JoinConditionNode;
         readonly in: (left: JoinConditionValue, right: JoinConditionValue[]) => JoinConditionNode;
+        readonly isNull: (value: JoinConditionValue) => JoinConditionNode;
+        readonly isNotNull: (value: JoinConditionValue) => JoinConditionNode;
     };
     readonly query: {
         readonly between: (left: QueryConditionValue, begin: QueryConditionValue, end: QueryConditionValue) => QueryConditionNode;
@@ -1086,4 +1092,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, queryToSql };
+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, SQLClient, type SQLExecutor, 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

@@ -514,6 +514,10 @@ type JoinConditionNode = {
     left: JoinConditionValue;
     operator: 'IN';
     right: JoinConditionValue[];
+} | {
+    kind: 'isNull';
+    value: JoinConditionValue;
+    not: boolean;
 } | JoinCustomConditionNode;
 type JoinCustomConditionNode = {
     kind: 'custom';
@@ -717,6 +721,8 @@ declare const Conditions: {
         readonly between: (left: JoinConditionValue, range: JoinConditionRangeValue) => JoinConditionNode;
         readonly comparison: (left: JoinConditionValue, operator: ComparisonOperators, right: JoinConditionValue) => JoinConditionNode;
         readonly in: (left: JoinConditionValue, right: JoinConditionValue[]) => JoinConditionNode;
+        readonly isNull: (value: JoinConditionValue) => JoinConditionNode;
+        readonly isNotNull: (value: JoinConditionValue) => JoinConditionNode;
     };
     readonly query: {
         readonly between: (left: QueryConditionValue, begin: QueryConditionValue, end: QueryConditionValue) => QueryConditionNode;
@@ -1086,4 +1092,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, queryToSql };
+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, SQLClient, type SQLExecutor, 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

@@ -514,6 +514,10 @@ type JoinConditionNode = {
     left: JoinConditionValue;
     operator: 'IN';
     right: JoinConditionValue[];
+} | {
+    kind: 'isNull';
+    value: JoinConditionValue;
+    not: boolean;
 } | JoinCustomConditionNode;
 type JoinCustomConditionNode = {
     kind: 'custom';
@@ -717,6 +721,8 @@ declare const Conditions: {
         readonly between: (left: JoinConditionValue, range: JoinConditionRangeValue) => JoinConditionNode;
         readonly comparison: (left: JoinConditionValue, operator: ComparisonOperators, right: JoinConditionValue) => JoinConditionNode;
         readonly in: (left: JoinConditionValue, right: JoinConditionValue[]) => JoinConditionNode;
+        readonly isNull: (value: JoinConditionValue) => JoinConditionNode;
+        readonly isNotNull: (value: JoinConditionValue) => JoinConditionNode;
     };
     readonly query: {
         readonly between: (left: QueryConditionValue, begin: QueryConditionValue, end: QueryConditionValue) => QueryConditionNode;
@@ -1086,4 +1092,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, queryToSql };
+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, SQLClient, type SQLExecutor, 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,5 +1,5 @@
-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 { S as SqlString$1, n as nonNullable, u as unique, g as getDbClient, a as SasatError } from './shared/sasat.f15e60f6.mjs';
+export { C as Conditions, p as pick } from './shared/sasat.f15e60f6.mjs';
 import * as SqlString from 'sqlstring';
 import 'mysql2';
 import 'util';

package/dist/shared/{sasat.f544328b.cjs → sasat.19043592.cjs}

@@ -119,6 +119,16 @@ const inRel = (left, right) => ({
   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,
@@ -132,7 +142,9 @@ const Conditions = {
   rel: {
     between: betweenRel,
     comparison: comparisonRel,
-    in: inRel
+    in: inRel,
+    isNull: isNullRel,
+    isNotNull: isNotNullRel
   },
   query: {
     between: betweenQuery,

package/dist/shared/{sasat.01289068.mjs → sasat.f15e60f6.mjs}

@@ -97,6 +97,16 @@ const inRel = (left, right) => ({
   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,
@@ -110,7 +120,9 @@ const Conditions = {
   rel: {
     between: betweenRel,
     comparison: comparisonRel,
-    in: inRel
+    in: inRel,
+    isNull: isNullRel,
+    isNotNull: isNotNullRel
   },
   query: {
     between: betweenQuery,

package/package.json

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