@dcupl/common 0.0.81-beta.0 → 0.0.81-beta.2

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

@@ -50,26 +50,59 @@ 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;
+type DcuplQueryFindOperator = 'find';
+type DcuplQueryGeneralOperators = 'eq' | 'gt' | 'gte' | 'lt' | 'lte';
+type DcuplQuerySpecialOperator = 'typeof' | 'isTruthy' | 'size';
+export type DcuplQueryOperator = DcuplQueryGeneralOperators | DcuplQueryFindOperator | DcuplQuerySpecialOperator;
 export type DcuplQueryType = 'and' | 'or';
-export type DcuplQuery = {
+type DcuplQueryBase = {
+    /**
+     * title, something.key someArray[0].key
+     * */
     attribute: string;
-    operator: DcuplQueryOperator;
-    value: any;
     options?: DcuplQueryOptions;
 };
+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?: DcuplQueryType;
     queryKey?: string;
-    query: Array<DcuplQuery> | Array<DcuplQueryGroup>;
+    query: Array<DcuplQuery | DcuplQueryGroup>;
     options?: DcuplQueryOptions;
 };
 export type DcuplGlobalQueryOptionsNew<T> = DcuplItemsOptions<T> & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcupl/common",
-  "version": "0.0.81-beta.0",
+  "version": "0.0.81-beta.2",
   "description": "Dcupl Common Code",
   "main": "dist/lib-cjs/index.js",
   "module": "dist/lib-esm/index.js",
@@ -21,7 +21,7 @@
   "author": "dcupl Team",
   "license": "ISC",
   "dependencies": {
-    "date-fns": "^2.28.x",
+    "date-fns": "^2.29.x",
     "lodash": "4.17.x"
   },
   "peerDependencies": {