@mrnafisia/type-query 1.1.1 → 1.2.0

package/dist/entity.js

@@ -23,7 +23,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cast = exports.stringify = exports.partialQuery = exports.resolveColumn = exports.getTableDataOfJoinSelectColumn = exports.resolveExpression = exports.resolveReturning = exports.resolveResult = exports.createQueryResult = exports.createJoinSelectEntity = exports.createEntity = void 0;
+exports.partialQuery = exports.resolveColumn = exports.getTableDataOfJoinSelectColumn = exports.resolveExpression = exports.resolveReturning = exports.resolveResult = exports.createQueryResult = exports.ReservedExpressionKeys = exports.createJoinSelectEntity = exports.createEntity = void 0;
+var U_1 = require("./U");
 var decimal_js_1 = __importDefault(require("decimal.js"));
 var context_1 = require("./context");
 var never_catch_1 = require("never-catch");
@@ -57,7 +58,7 @@ var createEntity = function (table) {
                     return (0, never_catch_1.err)("<select> -> ".concat(resolvedReturning.error));
                 }
                 params.push.apply(params, resolvedReturning.value.params);
-                tokens.push(resolvedReturning.value.sql);
+                tokens.push(resolvedReturning.value.text);
                 // from
                 tokens.push("FROM \"".concat(table.schema, "\".\"").concat(table.title, "\""));
                 // where
@@ -65,11 +66,11 @@ var createEntity = function (table) {
                 if (!resolvedWhereResult.ok) {
                     return (0, never_catch_1.err)("<select>[where] -> ".concat(resolvedWhereResult.error));
                 }
-                if (resolvedWhereResult.value.sql === '' && !ignoreInWhere) {
+                if (resolvedWhereResult.value.text === '' && !ignoreInWhere) {
                     return (0, never_catch_1.err)("<select>[where] -> neutral");
                 }
                 params.push.apply(params, resolvedWhereResult.value.params);
-                tokens.push('WHERE', resolvedWhereResult.value.sql === '' ? 'TRUE' : resolvedWhereResult.value.sql);
+                tokens.push('WHERE', resolvedWhereResult.value.text === '' ? 'TRUE' : resolvedWhereResult.value.text);
                 // groupBy
                 var _groupBy = typeof groupBy === 'function' ? groupBy(_this.context) : groupBy;
                 if (_groupBy.length !== 0) {
@@ -81,7 +82,7 @@ var createEntity = function (table) {
                             return (0, never_catch_1.err)("<select> -> ".concat(resolvedGroupBy.error));
                         }
                         params.push.apply(params, resolvedGroupBy.value.params);
-                        groupByTextArray.push(resolvedGroupBy.value.sql);
+                        groupByTextArray.push(resolvedGroupBy.value.text);
                     }
                     tokens.push('GROUP BY', groupByTextArray.join(', '));
                 }
@@ -148,7 +149,7 @@ var createEntity = function (table) {
                             var column = table.columns[insertingColumn];
                             switch (column.default) {
                                 case 'value':
-                                    rowTokens.push(stringify(column.value, true));
+                                    rowTokens.push(U_1.U.stringify(column.value, true));
                                     continue;
                                 case true:
                                 case 'auto-increment':
@@ -156,11 +157,11 @@ var createEntity = function (table) {
                                     continue;
                                 case 'created-at':
                                 case 'updated-at':
-                                    rowTokens.push(stringify(new Date(), true));
+                                    rowTokens.push(U_1.U.stringify(new Date(), true));
                                     continue;
                             }
                             if (column.nullable) {
-                                rowTokens.push(stringify(null));
+                                rowTokens.push(U_1.U.stringify(null));
                                 continue;
                             }
                             // never going to happen!
@@ -171,11 +172,11 @@ var createEntity = function (table) {
                             if (!resolvedExpressionResult.ok) {
                                 return (0, never_catch_1.err)("<insert>[rows][".concat(_rows.indexOf(_row), "][").concat(insertingColumn, "] -> ").concat(resolvedExpressionResult.error));
                             }
-                            if (resolvedExpressionResult.value.sql === '') {
+                            if (resolvedExpressionResult.value.text === '') {
                                 return (0, never_catch_1.err)("<insert>[rows][".concat(_rows.indexOf(_row), "][").concat(insertingColumn, "] -> neutral"));
                             }
                             params.push.apply(params, resolvedExpressionResult.value.params);
-                            rowTokens.push(resolvedExpressionResult.value.sql);
+                            rowTokens.push(resolvedExpressionResult.value.text);
                         }
                     }
                     valuesTextArray.push("( ".concat(rowTokens.join(', '), " )"));
@@ -188,7 +189,7 @@ var createEntity = function (table) {
                         return (0, never_catch_1.err)("<insert> -> ".concat(resolvedReturning.error));
                     }
                     params.push.apply(params, resolvedReturning.value.params);
-                    tokens.push('RETURNING', resolvedReturning.value.sql);
+                    tokens.push('RETURNING', resolvedReturning.value.text);
                 }
                 tokens.push(';');
                 var sql = tokens.join(' ');
@@ -214,7 +215,7 @@ var createEntity = function (table) {
                     if (!setExpressionResult.ok) {
                         return (0, never_catch_1.err)("<update>[sets][".concat(key, "] -> ").concat(setExpressionResult.error));
                     }
-                    if (setExpressionResult.value.sql === '') {
+                    if (setExpressionResult.value.text === '') {
                         if (ignoreInSets) {
                             continue;
                         }
@@ -223,12 +224,12 @@ var createEntity = function (table) {
                         }
                     }
                     params.push.apply(params, setExpressionResult.value.params);
-                    setsTextArray.push("".concat(resolveColumn(table, key, false), " = ").concat(setExpressionResult.value.sql));
+                    setsTextArray.push("".concat(resolveColumn(table, key, false), " = ").concat(setExpressionResult.value.text));
                 }
                 for (var column in table.columns) {
                     switch (table.columns[column].default) {
                         case 'updated-at':
-                            setsTextArray.push("".concat(resolveColumn(table, column, false), " = ").concat(stringify(new Date(), true)));
+                            setsTextArray.push("".concat(resolveColumn(table, column, false), " = ").concat(U_1.U.stringify(new Date(), true)));
                             break;
                     }
                 }
@@ -241,11 +242,11 @@ var createEntity = function (table) {
                 if (!resolvedWhereResult.ok) {
                     return (0, never_catch_1.err)("<update>[where] -> ".concat(resolvedWhereResult.error));
                 }
-                if (resolvedWhereResult.value.sql === '' && !ignoreInWhere) {
+                if (resolvedWhereResult.value.text === '' && !ignoreInWhere) {
                     return (0, never_catch_1.err)("<update>[where] -> neutral");
                 }
                 params.push.apply(params, resolvedWhereResult.value.params);
-                tokens.push('WHERE', resolvedWhereResult.value.sql === '' ? 'FALSE' : resolvedWhereResult.value.sql);
+                tokens.push('WHERE', resolvedWhereResult.value.text === '' ? 'FALSE' : resolvedWhereResult.value.text);
                 // returning
                 if (_returning.length !== 0) {
                     var resolvedReturning = resolveReturning(function (column) { return ({ type: table.columns[column].type, title: table.columns[column].title }); }, _returning, params.length + 1, ignoreInReturning);
@@ -253,7 +254,7 @@ var createEntity = function (table) {
                         return (0, never_catch_1.err)("<update> -> ".concat(resolvedReturning.error));
                     }
                     params.push.apply(params, resolvedReturning.value.params);
-                    tokens.push('RETURNING', resolvedReturning.value.sql);
+                    tokens.push('RETURNING', resolvedReturning.value.text);
                 }
                 tokens.push(';');
                 var sql = tokens.join(' ');
@@ -274,11 +275,11 @@ var createEntity = function (table) {
                 if (!resolvedWhereResult.ok) {
                     return (0, never_catch_1.err)("<delete>[where] -> ".concat(resolvedWhereResult.error));
                 }
-                if (resolvedWhereResult.value.sql === '' && !ignoreInWhere) {
+                if (resolvedWhereResult.value.text === '' && !ignoreInWhere) {
                     return (0, never_catch_1.err)("<delete>[where] -> neutral");
                 }
                 params.push.apply(params, resolvedWhereResult.value.params);
-                tokens.push('WHERE', resolvedWhereResult.value.sql === '' ? 'FALSE' : resolvedWhereResult.value.sql);
+                tokens.push('WHERE', resolvedWhereResult.value.text === '' ? 'FALSE' : resolvedWhereResult.value.text);
                 // returning
                 if (_returning.length !== 0) {
                     var resolvedReturning = resolveReturning(function (column) { return ({ type: table.columns[column].type, title: table.columns[column].title }); }, _returning, params.length + 1, ignoreInReturning);
@@ -286,7 +287,7 @@ var createEntity = function (table) {
                         return (0, never_catch_1.err)("<delete> -> ".concat(resolvedReturning.error));
                     }
                     params.push.apply(params, resolvedReturning.value.params);
-                    tokens.push('RETURNING', resolvedReturning.value.sql);
+                    tokens.push('RETURNING', resolvedReturning.value.text);
                 }
                 tokens.push(';');
                 var sql = tokens.join(' ');
@@ -337,7 +338,7 @@ var createJoinSelectEntity = function (main, joinTables, contexts) {
                     return (0, never_catch_1.err)("<join-select>[columns] -> ".concat(resolvedReturning.error));
                 }
                 params.push.apply(params, resolvedReturning.value.params);
-                tokens.push(resolvedReturning.value.sql, "FROM \"".concat(main.table.schema, "\".\"").concat(main.table.title, "\" \"").concat(main.alias, "\""));
+                tokens.push(resolvedReturning.value.text, "FROM \"".concat(main.table.schema, "\".\"").concat(main.table.title, "\" \"").concat(main.alias, "\""));
                 // join
                 for (var _i = 0, joinTables_1 = joinTables; _i < joinTables_1.length; _i++) {
                     var joinTable = joinTables_1[_i];
@@ -345,22 +346,22 @@ var createJoinSelectEntity = function (main, joinTables, contexts) {
                     if (!onExpressionResult.ok) {
                         return (0, never_catch_1.err)("<join-select>[join][".concat(joinTables.indexOf(joinTable), "] -> ").concat(onExpressionResult.error));
                     }
-                    if (onExpressionResult.value.sql === '' && !ignoreInJoin) {
+                    if (onExpressionResult.value.text === '' && !ignoreInJoin) {
                         return (0, never_catch_1.err)("<join-select>[join][".concat(joinTables.indexOf(joinTable), "] -> neutral"));
                     }
                     params.push.apply(params, onExpressionResult.value.params);
-                    tokens.push("".concat((0, dictionary_1.toJoinType)(joinTable.joinType), " \"").concat(joinTable.table.schema, "\".\"").concat(joinTable.table.title, "\" \"").concat(joinTable.alias, "\" ON ").concat(onExpressionResult.value.sql));
+                    tokens.push("".concat((0, dictionary_1.toJoinType)(joinTable.joinType), " \"").concat(joinTable.table.schema, "\".\"").concat(joinTable.table.title, "\" \"").concat(joinTable.alias, "\" ON ").concat(onExpressionResult.value.text));
                 }
                 // where
                 var resolvedWhereResult = resolveExpression(typeof where === 'function' ? where(_this.contexts) : where, params.length + 1, ignoreInWhere);
                 if (!resolvedWhereResult.ok) {
                     return (0, never_catch_1.err)("<join-select>[where] -> ".concat(resolvedWhereResult.error));
                 }
-                if (resolvedWhereResult.value.sql === '' && !ignoreInWhere) {
+                if (resolvedWhereResult.value.text === '' && !ignoreInWhere) {
                     return (0, never_catch_1.err)("<join-select>[where] -> neutral");
                 }
                 params.push.apply(params, resolvedWhereResult.value.params);
-                tokens.push('WHERE', resolvedWhereResult.value.sql === '' ? 'FALSE' : resolvedWhereResult.value.sql);
+                tokens.push('WHERE', resolvedWhereResult.value.text === '' ? 'FALSE' : resolvedWhereResult.value.text);
                 // groupBy
                 var _groupBy = typeof groupBy === 'function' ? groupBy(_this.contexts) : groupBy;
                 if (_groupBy.length !== 0) {
@@ -372,7 +373,7 @@ var createJoinSelectEntity = function (main, joinTables, contexts) {
                             return (0, never_catch_1.err)("<join-select> -> ".concat(resolvedGroupBy.error));
                         }
                         params.push.apply(params, resolvedGroupBy.value.params);
-                        groupByTextArray.push(resolvedGroupBy.value.sql);
+                        groupByTextArray.push(resolvedGroupBy.value.text);
                     }
                     tokens.push('GROUP BY', groupByTextArray.join(', '));
                 }
@@ -418,6 +419,48 @@ var createJoinSelectEntity = function (main, joinTables, contexts) {
 };
 exports.createJoinSelectEntity = createJoinSelectEntity;
 // utils
+var ReservedExpressionKeys = [
+    'val',
+    '=n',
+    '!=n',
+    '=t',
+    '=f',
+    'not',
+    '+',
+    '-',
+    '*',
+    '/',
+    '||',
+    'and',
+    'or',
+    '**',
+    'fun',
+    'swt',
+    'col',
+    'raw',
+    '=',
+    '!=',
+    '>',
+    '>=',
+    '<',
+    '<=',
+    'lk',
+    '@>',
+    '<@',
+    '?',
+    'j-',
+    'in',
+    'nin',
+    'lka',
+    'lks',
+    '?|',
+    '?&',
+    'j-a',
+    'bt',
+    'qry',
+    'exists'
+];
+exports.ReservedExpressionKeys = ReservedExpressionKeys;
 var createQueryResult = function (getColumnType, createQuery, returning) {
     var query = undefined;
     return {
@@ -472,7 +515,7 @@ var resolveResult = function (getColumnType, columns, rows, mode) {
     rows.forEach(function (_, i) {
         columns.forEach(function (column) {
             if (typeof column !== 'object') {
-                rows[i][column] = cast(rows[i][column], getColumnType(column));
+                rows[i][column] = U_1.U.cast(rows[i][column], getColumnType(column));
             }
         });
     });
@@ -499,12 +542,12 @@ var resolveReturning = function (getColumnTypeTitleAlias, columns, paramsStart,
             if (!resolvedExpResult.ok) {
                 return (0, never_catch_1.err)("<returning>[".concat(column.as, "] -> ").concat(resolvedExpResult.error));
             }
-            if (resolvedExpResult.value.sql === '') {
+            if (resolvedExpResult.value.text === '') {
                 return (0, never_catch_1.err)("<returning>[".concat(column.as, "] -> neutral"));
             }
             params.push.apply(params, resolvedExpResult.value.params);
             paramsStart += resolvedExpResult.value.params.length;
-            tokens.push("( ".concat(resolvedExpResult.value.sql, " ) AS \"").concat(column.as, "\""));
+            tokens.push("( ".concat(resolvedExpResult.value.text, " ) AS \"").concat(column.as, "\""));
         }
         else {
             var _a = getColumnTypeTitleAlias(column), _type = _a.type, title = _a.title, alias = _a.alias;
@@ -551,13 +594,13 @@ var resolveExpression = function (expression, paramsStart, ignore) {
         expression instanceof Date ||
         typeof expression === 'number' ||
         typeof expression === 'bigint') {
-        return (0, never_catch_1.ok)(partialQuery("".concat(stringify(expression, true))));
+        return (0, never_catch_1.ok)(partialQuery("".concat(U_1.U.stringify(expression, true))));
     }
     if (typeof expression === 'string') {
-        return (0, never_catch_1.ok)(partialQuery("$".concat(paramsStart++), [stringify(expression, false)]));
+        return (0, never_catch_1.ok)(partialQuery("$".concat(paramsStart++), [U_1.U.stringify(expression, false)]));
     }
-    if (!(Array.isArray(expression) && dictionary_1.ReservedExpressionKeys.includes(expression[0]))) {
-        return (0, never_catch_1.ok)(partialQuery("$".concat(paramsStart++, "::jsonb"), [stringify(expression, false)]));
+    if (!(Array.isArray(expression) && ReservedExpressionKeys.includes(expression[0]))) {
+        return (0, never_catch_1.ok)(partialQuery("$".concat(paramsStart++, "::jsonb"), [U_1.U.stringify(expression, false)]));
     }
     // wrapped expression
     var tokens = [];
@@ -568,7 +611,7 @@ var resolveExpression = function (expression, paramsStart, ignore) {
             if (expression[1] === undefined) {
                 return ignore ? (0, never_catch_1.ok)(partialQuery()) : (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)('val'), "> -> undefined"));
             }
-            params.push(stringify(expression[1], false));
+            params.push(U_1.U.stringify(expression[1], false));
             return (0, never_catch_1.ok)(partialQuery("$".concat(paramsStart++), params));
         case '=n':
         case '!=n':
@@ -579,21 +622,21 @@ var resolveExpression = function (expression, paramsStart, ignore) {
             if (!e1Result.ok) {
                 return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), "> -> ").concat(e1Result.error));
             }
-            if (e1Result.value.sql === '') {
+            if (e1Result.value.text === '') {
                 return ignore ? (0, never_catch_1.ok)(partialQuery()) : (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), "> -> neutral"));
             }
             params.push.apply(params, e1Result.value.params);
             paramsStart += e1Result.value.params.length;
             switch (expression[0]) {
                 case '=n':
-                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " IS NULL"), params));
+                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " IS NULL"), params));
                 case '!=n':
-                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " IS NOT NULL"), params));
+                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " IS NOT NULL"), params));
                 case '=t':
-                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql), params));
+                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text), params));
                 case '=f':
                 case 'not':
-                    return (0, never_catch_1.ok)(partialQuery("NOT ".concat(e1Result.value.sql), params));
+                    return (0, never_catch_1.ok)(partialQuery("NOT ".concat(e1Result.value.text), params));
             }
         case '+':
         case '-':
@@ -603,13 +646,16 @@ var resolveExpression = function (expression, paramsStart, ignore) {
         case 'and':
         case 'or':
         case '**':
+            if (expression[1] === undefined) {
+                return ignore ? (0, never_catch_1.ok)(partialQuery()) : (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), "> -> undefined"));
+            }
             for (var _i = 0, _a = expression[1]; _i < _a.length; _i++) {
                 var v1 = _a[_i];
                 var v1Result = resolveExpression(v1, paramsStart, ignore);
                 if (!v1Result.ok) {
                     return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[").concat(expression[1].indexOf(v1), "] -> ").concat(v1Result.error));
                 }
-                if (v1Result.value.sql === '') {
+                if (v1Result.value.text === '') {
                     if (ignore) {
                         continue;
                     }
@@ -619,7 +665,7 @@ var resolveExpression = function (expression, paramsStart, ignore) {
                 }
                 params.push.apply(params, v1Result.value.params);
                 paramsStart += v1Result.value.params.length;
-                tokens.push(v1Result.value.sql);
+                tokens.push(v1Result.value.text);
             }
             switch (tokens.length) {
                 case 0:
@@ -645,76 +691,92 @@ var resolveExpression = function (expression, paramsStart, ignore) {
                         case '**':
                             var tmp = tokens.pop();
                             tokens.splice(0, 0, 'a');
-                            return (0, never_catch_1.ok)(partialQuery(tokens.join(', power( ').substring(3) + ', ' + tmp + ' )'.repeat(tokens.length - 1), params));
+                            return (0, never_catch_1.ok)({
+                                text: tokens.join(', power( ').substring(3) + ', ' + tmp + ' )'.repeat(tokens.length - 1),
+                                params: params
+                            });
                     }
             }
         case 'fun':
+            if (expression[1] === undefined) {
+                return ignore ? (0, never_catch_1.ok)(partialQuery()) : (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[name] -> undefined"));
+            }
+            if (expression[2] === undefined) {
+                return ignore ? (0, never_catch_1.ok)(partialQuery()) : (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[parameters] -> undefined"));
+            }
             for (var _b = 0, _c = expression[2]; _b < _c.length; _b++) {
                 var v2 = _c[_b];
                 var v2Result = resolveExpression(v2, paramsStart, ignore);
                 if (!v2Result.ok) {
                     return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[parameters][").concat(expression[2].indexOf(v2), "] -> ").concat(v2Result.error));
                 }
-                if (v2Result.value.sql === '') {
+                if (v2Result.value.text === '') {
                     return ignore
                         ? (0, never_catch_1.ok)(partialQuery())
                         : (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[parameters][").concat(expression[2].indexOf(v2), "] -> neutral"));
                 }
                 params.push.apply(params, v2Result.value.params);
                 paramsStart += v2Result.value.params.length;
-                tokens.push(v2Result.value.sql);
+                tokens.push(v2Result.value.text);
             }
             return (0, never_catch_1.ok)(partialQuery("".concat(expression[1], "( ").concat(tokens.join(', '), " )").concat(expression[3]), params));
         case 'swt':
             var cases = expression[1];
             var otherwise = expression[2];
-            for (var _d = 0, cases_1 = cases; _d < cases_1.length; _d++) {
-                var caseElement = cases_1[_d];
-                if (caseElement === undefined) {
-                    if (ignore) {
-                        continue;
+            if (cases === undefined) {
+                if (!ignore) {
+                    return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[cases] -> undefined"));
+                }
+            }
+            else {
+                for (var _d = 0, cases_1 = cases; _d < cases_1.length; _d++) {
+                    var caseElement = cases_1[_d];
+                    if (caseElement === undefined) {
+                        if (ignore) {
+                            continue;
+                        }
+                        else {
+                            return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[cases][").concat(cases.indexOf(caseElement), "] -> undefined"));
+                        }
                     }
-                    else {
-                        return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[cases][").concat(cases.indexOf(caseElement), "] -> undefined"));
+                    var whenResult = resolveExpression(caseElement.when, paramsStart, ignore);
+                    if (!whenResult.ok) {
+                        return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[cases][").concat(cases.indexOf(caseElement), "][when] -> ").concat(whenResult.error));
                     }
-                }
-                var whenResult = resolveExpression(caseElement.when, paramsStart, ignore);
-                if (!whenResult.ok) {
-                    return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[cases][").concat(cases.indexOf(caseElement), "][when] -> ").concat(whenResult.error));
-                }
-                if (whenResult.value.sql === '') {
-                    if (ignore) {
-                        continue;
+                    if (whenResult.value.text === '') {
+                        if (ignore) {
+                            continue;
+                        }
+                        else {
+                            return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[cases][").concat(cases.indexOf(caseElement), "][when] -> neutral"));
+                        }
                     }
-                    else {
-                        return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[cases][").concat(cases.indexOf(caseElement), "][when] -> neutral"));
+                    params.push.apply(params, whenResult.value.params);
+                    paramsStart += whenResult.value.params.length;
+                    var thenResult = resolveExpression(caseElement.then, paramsStart, ignore);
+                    if (!thenResult.ok) {
+                        return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[cases][").concat(cases.indexOf(caseElement), "][then] -> ").concat(thenResult.error));
                     }
-                }
-                params.push.apply(params, whenResult.value.params);
-                paramsStart += whenResult.value.params.length;
-                var thenResult = resolveExpression(caseElement.then, paramsStart, ignore);
-                if (!thenResult.ok) {
-                    return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[cases][").concat(cases.indexOf(caseElement), "][then] -> ").concat(thenResult.error));
-                }
-                if (thenResult.value.sql === '') {
-                    if (ignore) {
-                        continue;
+                    if (thenResult.value.text === '') {
+                        if (ignore) {
+                            continue;
+                        }
+                        else {
+                            return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[cases][").concat(cases.indexOf(caseElement), "][then] -> neutral"));
+                        }
                     }
-                    else {
-                        return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[cases][").concat(cases.indexOf(caseElement), "][then] -> neutral"));
+                    params.push.apply(params, thenResult.value.params);
+                    paramsStart += thenResult.value.params.length;
+                    if (tokens.length === 0) {
+                        tokens.push('CASE');
                     }
+                    tokens.push("WHEN ".concat(whenResult.value.text, " THEN ").concat(thenResult.value.text));
                 }
-                params.push.apply(params, thenResult.value.params);
-                paramsStart += thenResult.value.params.length;
-                if (tokens.length === 0) {
-                    tokens.push('CASE');
-                }
-                tokens.push("WHEN ".concat(whenResult.value.sql, " THEN ").concat(thenResult.value.sql));
+            }
+            if (tokens.length === 0 && !ignore) {
+                return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[cases] -> empty"));
             }
             if (otherwise === undefined) {
-                if (!ignore) {
-                    return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[otherwise] -> undefined"));
-                }
                 if (tokens.length === 0) {
                     return (0, never_catch_1.ok)(partialQuery());
                 }
@@ -728,7 +790,7 @@ var resolveExpression = function (expression, paramsStart, ignore) {
                 if (!otherwiseResult.ok) {
                     return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[otherwise] -> ").concat(otherwiseResult.error));
                 }
-                if (otherwiseResult.value.sql === '') {
+                if (otherwiseResult.value.text === '') {
                     if (ignore) {
                         isOtherwiseNeutral = true;
                     }
@@ -743,12 +805,12 @@ var resolveExpression = function (expression, paramsStart, ignore) {
                         return (0, never_catch_1.ok)(partialQuery());
                     }
                     else {
-                        tokens.push(otherwiseResult.value.sql);
+                        tokens.push(otherwiseResult.value.text);
                     }
                 }
                 else {
                     if (!isOtherwiseNeutral) {
-                        tokens.push('ELSE', otherwiseResult.value.sql);
+                        tokens.push('ELSE', otherwiseResult.value.text);
                     }
                     tokens.push('END');
                 }
@@ -764,6 +826,7 @@ var resolveExpression = function (expression, paramsStart, ignore) {
                 return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), "> -> ").concat(subQueryDataResult.error));
             }
             paramsStart += subQueryDataResult.value.params.length;
+            subQueryDataResult.value.sql = subQueryDataResult.value.sql.substring(0, subQueryDataResult.value.sql.length - 1);
             switch (expression[0]) {
                 case 'qry':
                     return (0, never_catch_1.ok)(partialQuery("( ".concat(subQueryDataResult.value.sql, " )"), params));
@@ -785,7 +848,7 @@ var resolveExpression = function (expression, paramsStart, ignore) {
             if (!e1Result.ok) {
                 return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[first operand] -> ").concat(e1Result.error));
             }
-            if (e1Result.value.sql === '') {
+            if (e1Result.value.text === '') {
                 return ignore ? (0, never_catch_1.ok)(partialQuery()) : (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[first operand] -> netural"));
             }
             params.push.apply(params, e1Result.value.params);
@@ -794,7 +857,7 @@ var resolveExpression = function (expression, paramsStart, ignore) {
             if (!e2Result.ok) {
                 return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[second operand] -> ").concat(e2Result.error));
             }
-            if (e2Result.value.sql === '') {
+            if (e2Result.value.text === '') {
                 return ignore
                     ? (0, never_catch_1.ok)(partialQuery())
                     : (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[second operand] -> netural"));
@@ -803,27 +866,27 @@ var resolveExpression = function (expression, paramsStart, ignore) {
             paramsStart += e2Result.value.params.length;
             switch (expression[0]) {
                 case '=':
-                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " = ").concat(e2Result.value.sql), params));
+                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " = ").concat(e2Result.value.text), params));
                 case '!=':
-                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " <> ").concat(e2Result.value.sql), params));
+                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " <> ").concat(e2Result.value.text), params));
                 case '>':
-                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " > ").concat(e2Result.value.sql), params));
+                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " > ").concat(e2Result.value.text), params));
                 case '>=':
-                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " >= ").concat(e2Result.value.sql), params));
+                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " >= ").concat(e2Result.value.text), params));
                 case '<':
-                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " < ").concat(e2Result.value.sql), params));
+                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " < ").concat(e2Result.value.text), params));
                 case '<=':
-                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " <= ").concat(e2Result.value.sql), params));
+                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " <= ").concat(e2Result.value.text), params));
                 case 'lk':
-                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " LIKE ").concat(e2Result.value.sql), params));
+                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " LIKE ").concat(e2Result.value.text), params));
                 case '@>':
-                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " @> ").concat(e2Result.value.sql), params));
+                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " @> ").concat(e2Result.value.text), params));
                 case '<@':
-                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " <@ ").concat(e2Result.value.sql), params));
+                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " <@ ").concat(e2Result.value.text), params));
                 case '?':
-                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " ? ").concat(e2Result.value.sql), params));
+                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " ? ").concat(e2Result.value.text), params));
                 case 'j-':
-                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " - ").concat(e2Result.value.sql), params));
+                    return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " - ").concat(e2Result.value.text), params));
             }
         case 'in':
         case 'nin':
@@ -836,18 +899,23 @@ var resolveExpression = function (expression, paramsStart, ignore) {
             if (!e1Result.ok) {
                 return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[first operand] -> ").concat(e1Result.error));
             }
-            if (e1Result.value.sql === '') {
+            if (e1Result.value.text === '') {
                 return ignore ? (0, never_catch_1.ok)(partialQuery()) : (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[first operand] -> netural"));
             }
             params.push.apply(params, e1Result.value.params);
             paramsStart += e1Result.value.params.length;
+            if (expression[2] === undefined) {
+                return ignore
+                    ? (0, never_catch_1.ok)(partialQuery())
+                    : (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[second operand] -> undefined"));
+            }
             for (var _e = 0, _f = expression[2]; _e < _f.length; _e++) {
                 var v2 = _f[_e];
                 var v2Result = resolveExpression(v2, paramsStart, ignore);
                 if (!v2Result.ok) {
                     return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[second operand][").concat(expression[2].indexOf(v2), "] -> ").concat(v2Result.error));
                 }
-                if (v2Result.value.sql === '') {
+                if (v2Result.value.text === '') {
                     if (ignore) {
                         continue;
                     }
@@ -857,7 +925,7 @@ var resolveExpression = function (expression, paramsStart, ignore) {
                 }
                 params.push.apply(params, v2Result.value.params);
                 paramsStart += v2Result.value.params.length;
-                tokens.push(v2Result.value.sql);
+                tokens.push(v2Result.value.text);
             }
             switch (tokens.length) {
                 case 0:
@@ -867,36 +935,36 @@ var resolveExpression = function (expression, paramsStart, ignore) {
                 case 1:
                     switch (expression[0]) {
                         case 'in':
-                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " = ").concat(tokens[0]), params));
+                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " = ").concat(tokens[0]), params));
                         case 'nin':
-                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " <> ").concat(tokens[0]), params));
+                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " <> ").concat(tokens[0]), params));
                         case 'lka':
-                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " LIKE ").concat(tokens[0]), params));
+                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " LIKE ").concat(tokens[0]), params));
                         case 'lks':
-                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " LIKE ").concat(tokens[0]), params));
+                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " LIKE ").concat(tokens[0]), params));
                         case '?|':
-                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " ? ").concat(tokens[0]), params));
+                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " ? ").concat(tokens[0]), params));
                         case '?&':
-                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " ? ").concat(tokens[0]), params));
+                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " ? ").concat(tokens[0]), params));
                         case 'j-a':
-                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " - ").concat(tokens[0]), params));
+                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " - ").concat(tokens[0]), params));
                     }
                 default:
                     switch (expression[0]) {
                         case 'in':
-                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " IN ( ").concat(tokens.join(', '), " )"), params));
+                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " IN ( ").concat(tokens.join(', '), " )"), params));
                         case 'nin':
-                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " NOT IN ( ").concat(tokens.join(', '), " )"), params));
+                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " NOT IN ( ").concat(tokens.join(', '), " )"), params));
                         case 'lka':
-                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " LIKE ALL( ARRAY[ ").concat(tokens.join(', '), " ] )"), params));
+                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " LIKE ALL( ARRAY[ ").concat(tokens.join(', '), " ] )"), params));
                         case 'lks':
-                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " LIKE SOME( ARRAY[ ").concat(tokens.join(', '), " ] )"), params));
+                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " LIKE SOME( ARRAY[ ").concat(tokens.join(', '), " ] )"), params));
                         case '?|':
-                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " ?| ARRAY[ ").concat(tokens.join(', '), " ]"), params));
+                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " ?| ARRAY[ ").concat(tokens.join(', '), " ]"), params));
                         case '?&':
-                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " ?& ARRAY[ ").concat(tokens.join(', '), " ]"), params));
+                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " ?& ARRAY[ ").concat(tokens.join(', '), " ]"), params));
                         case 'j-a':
-                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " - ARRAY[ ").concat(tokens.join(', '), " ]"), params));
+                            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " - ARRAY[ ").concat(tokens.join(', '), " ]"), params));
                     }
             }
         case 'bt':
@@ -904,7 +972,7 @@ var resolveExpression = function (expression, paramsStart, ignore) {
             if (!e1Result.ok) {
                 return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[first operand] -> ").concat(e1Result.error));
             }
-            if (e1Result.value.sql === '') {
+            if (e1Result.value.text === '') {
                 return ignore ? (0, never_catch_1.ok)(partialQuery()) : (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[first operand] -> netural"));
             }
             params.push.apply(params, e1Result.value.params);
@@ -913,7 +981,7 @@ var resolveExpression = function (expression, paramsStart, ignore) {
             if (!e2Result.ok) {
                 return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[second operand] -> ").concat(e2Result.error));
             }
-            if (e2Result.value.sql === '') {
+            if (e2Result.value.text === '') {
                 return ignore
                     ? (0, never_catch_1.ok)(partialQuery())
                     : (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[second operand] -> netural"));
@@ -924,12 +992,12 @@ var resolveExpression = function (expression, paramsStart, ignore) {
             if (!e3Result.ok) {
                 return (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[third operand] -> ").concat(e3Result.error));
             }
-            if (e3Result.value.sql === '') {
+            if (e3Result.value.text === '') {
                 return ignore ? (0, never_catch_1.ok)(partialQuery()) : (0, never_catch_1.err)("<".concat((0, dictionary_1.toReservedExpressionKeyDescription)(expression[0]), ">[third operand] -> netural"));
             }
             params.push.apply(params, e3Result.value.params);
             paramsStart += e3Result.value.params.length;
-            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.sql, " BETWEEN ").concat(e2Result.value.sql, " AND ").concat(e3Result.value.sql), params));
+            return (0, never_catch_1.ok)(partialQuery("".concat(e1Result.value.text, " BETWEEN ").concat(e2Result.value.text, " AND ").concat(e3Result.value.text), params));
         default:
             throw 'unexpected error. expect first element to be reserved key.';
     }
@@ -978,52 +1046,10 @@ var resolveColumn = function (table, column, full, alias) {
     return prefix + "\"".concat((_a = table.columns[column].title) !== null && _a !== void 0 ? _a : column, "\"");
 };
 exports.resolveColumn = resolveColumn;
-var partialQuery = function (sql, params) {
-    if (sql === void 0) { sql = ''; }
+var partialQuery = function (text, params) {
+    if (text === void 0) { text = ''; }
     if (params === void 0) { params = []; }
-    return ({ sql: sql, params: params });
+    return ({ text: text, params: params });
 };
 exports.partialQuery = partialQuery;
-var stringify = function (v, inline) {
-    if (inline === void 0) { inline = false; }
-    var result;
-    if (v === null) {
-        result = 'NULL';
-    }
-    else if (typeof v === 'boolean') {
-        result = v ? 'TRUE' : 'FALSE';
-    }
-    else if (typeof v === 'number' || typeof v === 'bigint') {
-        result = v;
-    }
-    else if (v instanceof decimal_js_1.default) {
-        result = "".concat(v);
-    }
-    else if (v instanceof Date) {
-        result = inline ? "'".concat(v.toISOString(), "'") : v.toISOString();
-    }
-    else if (typeof v === 'object') {
-        result = inline ? "'".concat(JSON.stringify(v), "'::JSONB") : JSON.stringify(v);
-    }
-    else {
-        result = inline ? "'".concat(v, "'") : "".concat(v);
-    }
-    return result;
-};
-exports.stringify = stringify;
-var cast = function (v, _a) {
-    var type = _a[0], nullable = _a[1];
-    if (nullable && v === null) {
-        return null;
-    }
-    switch (type) {
-        case 'bigint':
-            return BigInt(v);
-        case 'numeric':
-            return new decimal_js_1.default(v);
-        default:
-            return v;
-    }
-};
-exports.cast = cast;
 //# sourceMappingURL=entity.js.map