@dcupl/common 0.0.81-beta.1 → 0.0.81-beta.3

package/dist/lib-esm/types/dcupl.types.d.ts

@@ -50,29 +50,60 @@ export type DcuplGlobalQueryOptions<T> = DcuplItemsOptions<T> & {
     listKey: string;
     query: FilterOptions[];
 };
-type DcuplQueryTransformOptions = 'none' | 'lowercase' | 'uppercase' | 'trim' | 'removeWhitespace';
+export type DcuplQueryTransformOptions = 'lowercase' | 'trim' | 'removeWhitespace';
 type DcuplQueryOptions = {
-    transform: DcuplQueryTransformOptions[];
+    transform?: DcuplQueryTransformOptions[];
+    /**
+     * Invert possible for eq, typeof
+     */
+    invert?: boolean;
 };
-type DcuplQueryArrayOperators = 'in' | 'nin';
-type DcuplQueryStringOperators = 'startsWith' | 'endsWith' | 'includes' | 'notIncludes';
-type DcuplQueryGeneralOperators = 'eq' | 'neq' | 'gt' | 'gte' | 'lt' | 'lte';
-type DcuplQueryFalsy = 'isUndefined' | 'isNotUndefined' | 'isNull' | 'isNotNull' | 'isFalsy' | 'isTruthy';
-export type DcuplQueryOperator = DcuplQueryGeneralOperators | DcuplQueryArrayOperators | DcuplQueryFalsy | DcuplQueryStringOperators;
+export declare const DcuplQueryOperatorsAsArray: readonly ["eq", "find", "gt", "gte", "lt", "lte", "typeof", "isTruthy", "size"];
+export type DcuplQueryOperator = (typeof DcuplQueryOperatorsAsArray)[number];
 export type DcuplQueryType = 'and' | 'or';
-export type DcuplQuery = {
+type DcuplQueryBase = {
+    /**
+     * title, something.key someArray[0].key
+     * */
     attribute: string;
-    operator: DcuplQueryOperator;
-    value: any;
     options?: DcuplQueryOptions;
 };
-export type DcuplQueryGroup = {
+type DcuplQueryEq = DcuplQueryBase & {
+    operator: 'eq';
+    /**
+     * You may search for any value but
+     * only values of type string and { key:string } may be used for indexed search
+     */
+    value: any;
+};
+type DcuplQueryFind = DcuplQueryBase & {
+    operator: 'find';
+    value: Record<string, unknown> | string;
+};
+type DcuplQueryNumbers = DcuplQueryBase & {
+    operator: 'gt' | 'lt' | 'gte' | 'lte';
+    value: string | number | Date;
+};
+type DcuplQueryTypeOf = DcuplQueryBase & {
+    operator: 'typeof';
+    value: string;
+};
+type DcuplQueryIsTruthy = DcuplQueryBase & {
+    operator: 'isTruthy';
+    value: boolean;
+};
+type DcuplQuerySize = DcuplQueryBase & {
+    operator: 'size';
+    value: number;
+};
+export type DcuplQuery = DcuplQueryEq | DcuplQueryNumbers | DcuplQueryTypeOf | DcuplQueryIsTruthy | DcuplQuerySize | DcuplQueryFind;
+export type DcuplQueryGroup<QueryType extends DcuplQuery | DcuplQueryGroup = DcuplQuery> = {
     queryType?: DcuplQueryType;
     queryKey?: string;
-    query: Array<DcuplQuery> | Array<DcuplQueryGroup>;
+    query: Array<QueryType>;
     options?: DcuplQueryOptions;
 };
 export type DcuplGlobalQueryOptionsNew<T> = DcuplItemsOptions<T> & {
     listKey: string;
-} & DcuplQueryGroup;
+} & DcuplQueryGroup<DcuplQueryGroup<DcuplQuery>>;
 export {};

package/dist/lib-esm/types/dcupl.types.js

@@ -1,2 +1,12 @@
-export {};
+export var DcuplQueryOperatorsAsArray = [
+    'eq',
+    'find',
+    'gt',
+    'gte',
+    'lt',
+    'lte',
+    'typeof',
+    'isTruthy',
+    'size',
+];
 //# sourceMappingURL=dcupl.types.js.map

package/dist/lib-esm/types/dcupl.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"dcupl.types.js","sourceRoot":"","sources":["../../../src/types/dcupl.types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"dcupl.types.js","sourceRoot":"","sources":["../../../src/types/dcupl.types.ts"],"names":[],"mappings":"AAkEA,MAAM,CAAC,IAAM,0BAA0B,GAAG;IACxC,IAAI;IACJ,MAAM;IACN,IAAI;IACJ,KAAK;IACL,IAAI;IACJ,KAAK;IACL,QAAQ;IACR,UAAU;IACV,MAAM;CACE,CAAC"}

package/dist/lib-esm/types/filter.types.d.ts

@@ -1,4 +1,4 @@
-import { ListItem } from '.';
+import { DcuplQueryGroup, ListItem } from '.';
 import { CatalogApiOptions } from './list.types';
 import { FilterComparisonType } from './model.types';
 export type ConstraintTypes = 'referenceConstraint' | 'textConstraint' | 'numberConstraint' | 'dateConstraint' | 'booleanConstraint';
@@ -7,6 +7,7 @@ export type ConstraintBase = {
     filterKey: string;
     attributeKey: string;
     type: ConstraintTypes;
+    query?: any;
 };
 export type ReferenceConstraint = ConstraintBase & {
     type: 'referenceConstraint';
@@ -90,12 +91,12 @@ export type BooleanFilterItem = FilterItemBase & {
 export type FilterItemNumberRangeValue = {
     available: FilterEntryNumberRange;
     initial: FilterEntryNumberRange;
-    selected: NumberConstraintOperators[];
+    relatedQuery: DcuplQueryGroup | undefined;
 };
 export type FilterItemDateRangeValue = {
     available: FilterEntryDateRange;
     initial: FilterEntryDateRange;
-    selected: DateConstraintOperators[];
+    relatedQuery: DcuplQueryGroup | undefined;
 };
 export type ReferenceFilterItem = FilterItemBase & {
     type: 'reference';

package/dist/lib-esm/types/filter.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter.types.js","sourceRoot":"","sources":["../../../src/types/filter.types.ts"],"names":[],"mappings":"AAoDA,MAAM,CAAC,IAAM,eAAe,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC"}
+{"version":3,"file":"filter.types.js","sourceRoot":"","sources":["../../../src/types/filter.types.ts"],"names":[],"mappings":"AAqDA,MAAM,CAAC,IAAM,eAAe,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC"}

package/dist/lib-esm/types/list.types.d.ts

@@ -1,4 +1,4 @@
-import { FilterConstraint } from './filter.types';
+import { DcuplGlobalQueryOptionsNew } from './dcupl.types';
 import { ViewDefinition, ModelAttribute } from './model.types';
 import { Projection, SortingProjection } from './projection.types';
 export type DcuplItemsOptions<T> = {
@@ -52,7 +52,7 @@ export type ListMetadata = {
     key: string;
     currentSize: number;
     initialSize: number;
-    appliedFilters: FilterConstraint[];
+    appliedQuery: DcuplGlobalQueryOptionsNew<any>;
     attributes: ModelAttribute[];
     itemOptions: DcuplItemsOptions<any>;
     views: ViewDefinition[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcupl/common",
-  "version": "0.0.81-beta.1",
+  "version": "0.0.81-beta.3",
   "description": "Dcupl Common Code",
   "main": "dist/lib-cjs/index.js",
   "module": "dist/lib-esm/index.js",