@leyyo/query 1.2.2 → 1.3.1

package/dist/error/invalid-query-value.error.d.ts

@@ -1,5 +1,6 @@
 import { QueryErrorCode } from "./index.types";
-export declare class InvalidQueryValueError extends Error {
+import { LeyyoError } from "@leyyo/common";
+export declare class InvalidQueryValueError extends LeyyoError {
     readonly message: string;
     readonly path: string;
     constructor(code: QueryErrorCode, message: string, path: string);

package/dist/error/invalid-query-value.error.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvalidQueryValueError = void 0;
-class InvalidQueryValueError extends Error {
+const common_1 = require("@leyyo/common");
+class InvalidQueryValueError extends common_1.LeyyoError {
     constructor(code, message, path) {
         super(`[${code}] ${message} at ${path}`);
         this.message = message;

package/dist/group-by/index.types.d.ts

@@ -1,4 +1,4 @@
-import type { FieldRaw, FieldRegular } from "../field";
+import { FieldRaw, FieldRegular } from "../field";
 export type GroupByAny<K extends string> = Array<K | GroupByGivenRegular<K> | GroupByGivenRaw>;
 export type GroupByGivenRegular<K extends string> = FieldRegular<K>;
 export type GroupByGivenRaw = FieldRaw;

package/dist/operation/operation-type.d.ts

@@ -1,3 +1,8 @@
-export declare const ConditionTypeItems: readonly ["eq", "ne", "null", "!null", "missing", "!missing", "gt", "gte", "lt", "lte", "between", "!between", "in", "!in", "starts", "!starts", "ends", "!ends", "matches", "!matches", "contains", "!contains", "contained", "!contained", "true", "false", "includes", "!includes", "intersects", "!intersects", "exists", "!exists"];
-export type OperationType = typeof ConditionTypeItems[number];
+declare const literals: readonly ["eq", "ne", "null", "!null", "missing", "!missing", "gt", "gte", "lt", "lte", "between", "!between", "in", "!in", "starts", "!starts", "ends", "!ends", "matches", "!matches", "contains", "!contains", "contained", "!contained", "true", "false", "includes", "!includes", "intersects", "!intersects", "exists", "!exists"];
+/**
+ * Operation Type
+ * */
+export type OperationType = typeof literals[number];
+export declare const OperationTypeItems: ReadonlyArray<OperationType>;
 export declare const OperationTypeMap: Record<string, OperationType>;
+export {};

package/dist/operation/operation-type.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OperationTypeMap = exports.ConditionTypeItems = void 0;
-exports.ConditionTypeItems = [
+exports.OperationTypeMap = exports.OperationTypeItems = void 0;
+const literals = [
     // all
     'eq',
     'ne',
@@ -41,6 +41,7 @@ exports.ConditionTypeItems = [
     'exists',
     '!exists',
 ];
+exports.OperationTypeItems = literals;
 // noinspection JSUnusedGlobalSymbols
 exports.OperationTypeMap = {
     // all

package/dist/order-by/index.types.d.ts

@@ -1,4 +1,4 @@
-import type { FieldRaw, FieldRegular } from "../field";
+import { FieldRaw, FieldRegular } from "../field";
 export type OrderType = 'asc' | 'desc';
 export type OrderByAny<K extends string> = K | Array<OrderByGiven<K> | K | OrderByGivenRaw> | OrderByValue<K>;
 export type OrderByValue<K extends string> = {

package/dist/parser/index.types.d.ts

@@ -1,4 +1,4 @@
-import type { QueryAny, QueryRegular } from "../query";
+import { QueryAny, QueryRegular } from "../query";
 import { BasicType } from "@leyyo/common";
 export interface QueryParserLike {
     exec<K extends string>(query: QueryAny<K>, availableFields: Array<K | string>, name?: string): QueryRegular<K>;

package/dist/parser/query.parser.d.ts

@@ -1,2 +1,2 @@
-import type { QueryParserLike } from "./index.types";
+import { QueryParserLike } from "./index.types";
 export declare const queryParser: QueryParserLike;

package/dist/parser/query.parser.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryParser = void 0;
+const common_1 = require("@leyyo/common");
 const operation_1 = require("../operation");
 const error_1 = require("../error");
 const type_1 = require("@leyyo/type");
@@ -14,7 +15,7 @@ class QueryParser {
         return this._error(code, `It's expected as ${ex}, but it's type: ${typeof value}`, path);
     }
     _emptyOrInvalid(value, path, expected, empty, invalid) {
-        if ((0, type_1.isEmpty)(value)) {
+        if ((0, common_1.isEmpty)(value)) {
             return this._error(empty, `It's empty`, path);
         }
         if (typeof value === 'string' && value.trim() === '') {
@@ -23,13 +24,13 @@ class QueryParser {
         return this._invalid(value, path, expected, invalid);
     }
     _asc(value, path) {
-        if ((0, type_1.isEmpty)(value)) {
+        if ((0, common_1.isEmpty)(value)) {
             return true;
         }
         if (typeof value === 'boolean') {
             return value;
         }
-        else if ((0, type_1.isText)(value)) {
+        else if ((0, common_1.isText)(value)) {
             if (value.toLowerCase() === 'asc') {
                 return true;
             }
@@ -41,33 +42,33 @@ class QueryParser {
         throw this._invalid(value, path, ['boolean', 'string'], 'asc:invalid-type');
     }
     _field(value, path) {
-        if ((0, type_1.isText)(value)) {
+        if ((0, common_1.isText)(value)) {
             return value;
         }
         throw this._emptyOrInvalid(value, path, 'string', 'field:empty', 'field:invalid');
     }
     _raw(value, path) {
-        if ((0, type_1.isText)(value)) {
+        if ((0, common_1.isText)(value)) {
             return value;
         }
         throw this._emptyOrInvalid(value, path, 'string', 'raw:empty', 'raw:invalid');
     }
     _as(value, path) {
-        if ((0, type_1.isEmpty)(value)) {
+        if ((0, common_1.isEmpty)(value)) {
             return undefined;
         }
-        else if ((0, type_1.isText)(value)) {
+        else if ((0, common_1.isText)(value)) {
             return value;
         }
         throw this._invalid(value, path, 'string', 'as:invalid');
     }
     _operation(value, path) {
-        if ((0, type_1.isEmpty)(value)) {
+        if ((0, common_1.isEmpty)(value)) {
             return 'eq';
         }
-        else if ((0, type_1.isText)(value)) {
+        else if ((0, common_1.isText)(value)) {
             const key = value;
-            if ((0, type_1.isLiteral)(key, operation_1.ConditionTypeItems)) {
+            if ((0, common_1.isText)(key) && operation_1.OperationTypeItems.includes(key)) {
                 return key;
             }
             if (operation_1.OperationTypeMap[key] !== undefined) {
@@ -98,7 +99,7 @@ class QueryParser {
                 if (Array.isArray(value)) {
                     let index = 0;
                     for (const item of value) {
-                        if (!(0, type_1.isText)(item) && !(0, type_1.isNumberValid)(item) && typeof value !== 'boolean') {
+                        if (!(0, common_1.isText)(item) && typeof value !== 'number' && typeof value !== 'boolean') {
                             throw this._invalid(item, `${path}[${index}]`, ['string', 'number', 'boolean', 'array', 'number'], 'value:invalid-item');
                         }
                         index++;
@@ -110,10 +111,10 @@ class QueryParser {
         throw this._invalid(value, path, ['string', 'number', 'boolean', 'array', 'number'], 'value:invalid-type');
     }
     _num(value, path, min) {
-        if ((0, type_1.isEmpty)(value)) {
+        if ((0, common_1.isEmpty)(value)) {
             return undefined;
         }
-        else if ((0, type_1.isIntegerValid)(value)) {
+        else if (Number.isSafeInteger(value)) {
             if (value >= min) {
                 return value;
             }
@@ -132,7 +133,7 @@ class QueryParser {
     // endregion private
     // region parts
     _select(given, _availableFields, _name) {
-        if ((0, type_1.isEmpty)(given)) {
+        if ((0, common_1.isEmpty)(given)) {
             return { all: true };
         }
         // Cases:
@@ -151,7 +152,7 @@ class QueryParser {
             const arr = given;
             arr.forEach((item, index) => {
                 // Case 2A: K
-                if ((0, type_1.isText)(item)) {
+                if ((0, common_1.isText)(item)) {
                     newSelect.fields.push({
                         field: item,
                     });
@@ -164,15 +165,15 @@ class QueryParser {
                     newSelect.fields.push({ field, as, });
                 }
                 // Case 2C: SelectGiven<K> | SelectGivenRaw
-                else if ((0, type_1.isObjectBare)(item)) {
+                else if ((0, type_1.isBareObject)(item)) {
                     let as;
                     let field;
                     let raw;
                     const obj = item;
-                    if (!(0, type_1.isEmpty)(obj.raw)) {
+                    if (!(0, common_1.isEmpty)(obj.raw)) {
                         raw = this._raw(obj.raw, `select[${index}].raw`);
                     }
-                    if (!(0, type_1.isEmpty)(obj.field)) {
+                    if (!(0, common_1.isEmpty)(obj.field)) {
                         field = this._field(obj.field, `select[${index}].field`);
                     }
                     this._fieldXorRaw(field, raw, `select[${index}].field`);
@@ -197,7 +198,7 @@ class QueryParser {
         return newSelect;
     }
     _where(scope, given, _availableFields, _name) {
-        if ((0, type_1.isEmpty)(given)) {
+        if ((0, common_1.isEmpty)(given)) {
             return [];
         }
         // Cases:
@@ -205,7 +206,7 @@ class QueryParser {
         // 2 - Array<WhereGiven<K>|WhereGivenRaw|[K, unknown]>
         const newWhere = [];
         // case 1: WhereValue<K>
-        if ((0, type_1.isObjectBare)(given)) {
+        if ((0, type_1.isBareObject)(given)) {
             let index = 0;
             for (let [k, v] of Object.entries(given)) {
                 const field = this._field(k, `${scope}(key=${index})`);
@@ -222,22 +223,22 @@ class QueryParser {
             const arr = given;
             arr.forEach((item, index) => {
                 // Case 2A: WhereGiven<K>|WhereGivenRaw
-                if ((0, type_1.isObjectBare)(item)) {
+                if ((0, type_1.isBareObject)(item)) {
                     let field;
                     let raw;
                     let op;
                     let value;
                     let fullRaw;
                     const obj = item;
-                    if (!(0, type_1.isEmpty)(obj.raw)) {
+                    if (!(0, common_1.isEmpty)(obj.raw)) {
                         raw = this._raw(obj.raw, `${scope}[${index}].raw`);
                     }
-                    if (!(0, type_1.isEmpty)(obj.field)) {
+                    if (!(0, common_1.isEmpty)(obj.field)) {
                         field = this._field(obj.field, `${scope}[${index}].field`);
                     }
                     this._fieldXorRaw(field, raw, `${scope}[${index}].field`);
                     const whereItem = obj;
-                    if (raw && (0, type_1.isEmpty)(whereItem.op) && (0, type_1.isEmpty)(whereItem.value)) {
+                    if (raw && (0, common_1.isEmpty)(whereItem.op) && (0, common_1.isEmpty)(whereItem.value)) {
                         fullRaw = true;
                     }
                     op = this._operation(whereItem.op, `${scope}[${index}].op`);
@@ -269,7 +270,7 @@ class QueryParser {
         return newWhere;
     }
     _groupBy(given, _availableFields, _name) {
-        if ((0, type_1.isEmpty)(given)) {
+        if ((0, common_1.isEmpty)(given)) {
             return [];
         }
         // Cases:
@@ -283,14 +284,14 @@ class QueryParser {
             const arr = given;
             arr.forEach((item, index) => {
                 // Case 2A: GroupByGivenRegular<K> | GroupByGivenRaw
-                if ((0, type_1.isObjectBare)(item)) {
+                if ((0, type_1.isBareObject)(item)) {
                     let field;
                     let raw;
                     const obj = item;
-                    if (!(0, type_1.isEmpty)(obj.raw)) {
+                    if (!(0, common_1.isEmpty)(obj.raw)) {
                         raw = this._raw(obj.raw, `groupBy[${index}].raw`);
                     }
-                    if (!(0, type_1.isEmpty)(obj.field)) {
+                    if (!(0, common_1.isEmpty)(obj.field)) {
                         field = this._field(obj.field, `groupBy[${index}].field`);
                     }
                     this._fieldXorRaw(field, raw, `groupBy[${index}].field`);
@@ -302,7 +303,7 @@ class QueryParser {
                     }
                 }
                 // Case 2B: K
-                else if ((0, type_1.isText)(item)) {
+                else if ((0, common_1.isText)(item)) {
                     newGroup.push({ field: item });
                 }
                 else {
@@ -317,7 +318,7 @@ class QueryParser {
         return newGroup;
     }
     _orderBy(given, _availableFields, _name) {
-        if ((0, type_1.isEmpty)(given)) {
+        if ((0, common_1.isEmpty)(given)) {
             return [];
         }
         // Cases:
@@ -326,7 +327,7 @@ class QueryParser {
         // 3 - OrderByValue<K>
         const newOrder = [];
         // case 1: string as K
-        if ((0, type_1.isText)(given)) {
+        if ((0, common_1.isText)(given)) {
             newOrder.push({ field: given, asc: true });
         }
         // case 2: array as Array<OrderByGiven<K>|K|OrderByGivenRaw>
@@ -337,15 +338,15 @@ class QueryParser {
             const arr = given;
             arr.forEach((item, index) => {
                 // Case 2A: OrderByGiven<K>|OrderByGivenRaw
-                if ((0, type_1.isObjectBare)(item)) {
+                if ((0, type_1.isBareObject)(item)) {
                     let asc;
                     let field;
                     let raw;
                     const obj = item;
-                    if (!(0, type_1.isEmpty)(obj.raw)) {
+                    if (!(0, common_1.isEmpty)(obj.raw)) {
                         raw = this._raw(obj.raw, `orderBy[${index}].raw`);
                     }
-                    if (!(0, type_1.isEmpty)(obj.field)) {
+                    if (!(0, common_1.isEmpty)(obj.field)) {
                         field = this._field(obj.field, `orderBy[${index}].field`);
                     }
                     this._fieldXorRaw(field, raw, `orderBy[${index}].field`);
@@ -358,7 +359,7 @@ class QueryParser {
                     }
                 }
                 // Case 2B: K
-                else if ((0, type_1.isText)(item)) {
+                else if ((0, common_1.isText)(item)) {
                     newOrder.push({ field: this._field(item, ''), asc: true });
                 }
                 // other
@@ -368,7 +369,7 @@ class QueryParser {
             });
         }
         // case 3: {'id': true, name: true, ...} as OrderByValue<K>
-        else if ((0, type_1.isObjectBare)(given)) {
+        else if ((0, type_1.isBareObject)(given)) {
             let index = 0;
             for (let [k, v] of Object.entries(given)) {
                 const field = this._field(k, `orderBy(key=${index})`);
@@ -385,7 +386,7 @@ class QueryParser {
     }
     _pagination(given, _name) {
         var _a;
-        if ((0, type_1.isEmpty)(given)) {
+        if ((0, common_1.isEmpty)(given)) {
             return {};
         }
         // Case 1: PaginationLiteral
@@ -399,16 +400,16 @@ class QueryParser {
             };
         }
         // Case 2: PaginationPage | PaginationLimit
-        else if ((0, type_1.isObjectBare)(given)) {
+        else if ((0, type_1.isBareObject)(given)) {
             if (Object.keys(given).length < 1) {
                 return {};
             }
             const obj = given;
-            if (!(0, type_1.isEmpty)(obj.page)) {
+            if (!(0, common_1.isEmpty)(obj.page)) {
                 const page = this._num(obj.page, `pagination.page`, 1);
                 const size = (_a = this._num(obj.size, `pagination.size`, 1)) !== null && _a !== void 0 ? _a : 50;
                 ['limit', 'offset'].forEach(f => {
-                    if (!(0, type_1.isEmpty)(given[f])) {
+                    if (!(0, common_1.isEmpty)(given[f])) {
                         throw this._error('page:conflict', 'If you give page; limit and offset can not be used anymore', `pagination.page`);
                     }
                 });
@@ -417,9 +418,9 @@ class QueryParser {
                     offset: (page - 1) * size
                 };
             }
-            if (!(0, type_1.isEmpty)(obj.limit)) {
+            if (!(0, common_1.isEmpty)(obj.limit)) {
                 ['page', 'size'].forEach(f => {
-                    if (!(0, type_1.isEmpty)(obj[f])) {
+                    if (!(0, common_1.isEmpty)(obj[f])) {
                         throw this._error('limit:conflict', 'If you give limit; page and size can not be used anymore', `pagination.limit`);
                     }
                 });

package/dist/query/index.types.d.ts

@@ -1,8 +1,8 @@
-import type { Select, SelectAny } from "../select";
-import type { Where, WhereAny } from "../where";
-import type { GroupBy, GroupByAny } from "../group-by";
-import type { OrderBy, OrderByAny } from "../order-by";
-import type { PaginationAny, PaginationLimit } from "../pagination";
+import { Select, SelectAny } from "../select";
+import { Where, WhereAny } from "../where";
+import { GroupBy, GroupByAny } from "../group-by";
+import { OrderBy, OrderByAny } from "../order-by";
+import { PaginationAny, PaginationLimit } from "../pagination";
 export interface QueryAny<K extends string> {
     select?: SelectAny<K>;
     where?: WhereAny<K>;

package/dist/select/index.types.d.ts

@@ -1,4 +1,4 @@
-import type { FieldAs, FieldRaw, FieldRegular } from "../field";
+import { FieldAs, FieldRaw, FieldRegular } from "../field";
 export type SelectAny<K extends string> = '*' | Array<K | [K, string] | SelectGiven<K> | SelectGivenRaw>;
 export type SelectGiven<K extends string> = FieldRegular<K> & FieldAs;
 export type SelectGivenRaw = FieldRaw & FieldAs;

package/dist/where/index.types.d.ts

@@ -1,5 +1,5 @@
-import type { OperationType } from "../operation";
-import type { FieldRaw, FieldRegular } from "../field";
+import { OperationType } from "../operation";
+import { FieldRaw, FieldRegular } from "../field";
 export type WhereValue<K extends string> = {
     [P in K]: unknown;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leyyo/query",
-  "version": "1.2.2",
+  "version": "1.3.1",
   "description": "Query common component",
   "keywords": [
     "Query"
@@ -66,7 +66,7 @@
     }
   },
   "dependencies": {
-    "@leyyo/common": "^1.2.1",
-    "@leyyo/type": "^1.1.1"
+    "@leyyo/common": "^1.3.7",
+    "@leyyo/type": "^1.3.3"
   }
 }