@poap-xyz/utils - npm Package Compare versions

Comparing version 0.2.3 to 0.2.4-beta-v0

dist/cjs/index.d.ts

 export * from './types';
+export * from './constants';
 export * from './functions';
@@ -3,0 +4,0 @@ export * from './queries';

dist/cjs/queries/order.d.ts

 import { Order, FieldOrderBy } from '../types/order';
-export declare function createOrderBy<E extends string = string>(key: E | undefined, value?: Order | undefined): FieldOrderBy;
+export declare function createOrderBy<E extends string = string>(key: E | undefined, value?: Order): FieldOrderBy;

dist/cjs/types/filter.d.ts

@@ -31,3 +31,3 @@ export type Value = string | number | boolean;
 export type FieldFilter<F = AnyFilter> = {
-    [key: string]: F;
+    [key: string]: FieldFilter<F> | F;
 };
@@ -39,4 +39,4 @@ export interface ConditionFilter {
 }
-export type Filter = FieldFilter | ConditionFilter | {
-    [key: string]: Filter;
+export type Filter = ConditionFilter | FieldFilter | {
+    [key: string]: ConditionFilter | FieldFilter;
 };
@@ -43,0 +43,0 @@ export interface FilterVariables {

dist/cjs/types/order.d.ts

@@ -5,10 +5,8 @@ export declare enum Order {
 }
-export interface FieldOrderBy {
-    [key: string]: Order;
-}
-export type OrderBy = FieldOrderBy | {
-    [key: string]: FieldOrderBy;
-} | Array<OrderBy>;
+export type FieldOrderBy = {
+    [key: string]: FieldOrderBy | Order;
+};
+export type OrderBy = FieldOrderBy | Array<FieldOrderBy>;
 export interface OrderByVariables {
     orderBy: OrderBy;
 }

dist/esm/index.d.ts

 export * from './types';
+export * from './constants';
 export * from './functions';
@@ -3,0 +4,0 @@ export * from './queries';

dist/esm/queries/order.d.ts

 import { Order, FieldOrderBy } from '../types/order';
-export declare function createOrderBy<E extends string = string>(key: E | undefined, value?: Order | undefined): FieldOrderBy;
+export declare function createOrderBy<E extends string = string>(key: E | undefined, value?: Order): FieldOrderBy;

dist/esm/types/filter.d.ts

@@ -31,3 +31,3 @@ export type Value = string | number | boolean;
 export type FieldFilter<F = AnyFilter> = {
-    [key: string]: F;
+    [key: string]: FieldFilter<F> | F;
 };
@@ -39,4 +39,4 @@ export interface ConditionFilter {
 }
-export type Filter = FieldFilter | ConditionFilter | {
-    [key: string]: Filter;
+export type Filter = ConditionFilter | FieldFilter | {
+    [key: string]: ConditionFilter | FieldFilter;
 };
@@ -43,0 +43,0 @@ export interface FilterVariables {

dist/esm/types/order.d.ts

@@ -5,10 +5,8 @@ export declare enum Order {
 }
-export interface FieldOrderBy {
-    [key: string]: Order;
-}
-export type OrderBy = FieldOrderBy | {
-    [key: string]: FieldOrderBy;
-} | Array<OrderBy>;
+export type FieldOrderBy = {
+    [key: string]: FieldOrderBy | Order;
+};
+export type OrderBy = FieldOrderBy | Array<FieldOrderBy>;
 export interface OrderByVariables {
     orderBy: OrderBy;
 }

dist/umd/index.d.ts

 export * from './types';
+export * from './constants';
 export * from './functions';
@@ -3,0 +4,0 @@ export * from './queries';

dist/umd/index.js

@@ -34,2 +34,5 @@ (function (global, factory) {
 
+  const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
+  const DEAD_ADDRESS = '0x000000000000000000000000000000000000dead';
+
   function nextCursor(length, limit, offset) {
@@ -40,14 +43,24 @@ const endIndex = offset + length;
 
+  function createField(keys, value) {
+      return keys.split('.').reduceRight((prev, key) => ({
+          [key]: prev,
+      }), value);
+  }
+
   function createLikeFilter(key, value) {
-      return value ? { [key]: { _ilike: `%${value}%` } } : {};
+      return value
+          ? createField(key, { _ilike: `%${value}%` })
+          : {};
   }
   function createEqFilter(key, value) {
-      return value ? { [key]: { _eq: value } } : {};
+      return value ? createField(key, { _eq: value }) : {};
   }
   function createNeqFilter(key, value) {
-      return value ? { [key]: { _neq: value } } : {};
+      return value ? createField(key, { _neq: value }) : {};
   }
   function createBoolFilter(key, value) {
       return typeof value === 'boolean'
-          ? { [key]: { _eq: value ? 'true' : 'false' } }
+          ? createField(key, {
+              _eq: value ? 'true' : 'false',
+          })
           : {};
@@ -57,25 +70,20 @@ }
       return value
-          ? {
-              [key]: {
-                  _eq: value.toLowerCase(),
-              },
-          }
+          ? createField(key, { _eq: value.toLowerCase() })
           : {};
   }
-  function createNotNullAddressFilter(key, filterZeroAddress, filterDeadAddress) {
+  function createNotNullAddressFilter(key, filterZeroAddress = true, filterDeadAddress = true) {
       if (filterZeroAddress && filterDeadAddress) {
-          return {
-              [key]: {
-                  _nin: [
-                      '0x0000000000000000000000000000000000000000',
-                      '0x000000000000000000000000000000000000dead',
-                  ],
-              },
-          };
+          return createField(key, {
+              _nin: [ZERO_ADDRESS, DEAD_ADDRESS],
+          });
       }
       if (filterZeroAddress) {
-          return { [key]: { _neq: '0x0000000000000000000000000000000000000000' } };
+          return createField(key, {
+              _neq: ZERO_ADDRESS,
+          });
       }
       if (filterDeadAddress) {
-          return { [key]: { _neq: '0x000000000000000000000000000000000000dead' } };
+          return createField(key, {
+              _neq: DEAD_ADDRESS,
+          });
       }
@@ -85,18 +93,22 @@ return {};
   function createInFilter(key, values) {
-      return values && values.length > 0 ? { [key]: { _in: values } } : {};
+      return values && values.length > 0
+          ? createField(key, { _in: values })
+          : {};
   }
   function createNinFilter(key, values) {
-      return values && values.length > 0 ? { [key]: { _nin: values } } : {};
+      return values && values.length > 0
+          ? createField(key, { _nin: values })
+          : {};
   }
   function createLtFilter(key, value) {
-      return value ? { [key]: { _lt: value } } : {};
+      return value ? createField(key, { _lt: value }) : {};
   }
   function createLteFilter(key, value) {
-      return value ? { [key]: { _lte: value } } : {};
+      return value ? createField(key, { _lte: value }) : {};
   }
   function createGtFilter(key, value) {
-      return value ? { [key]: { _gt: value } } : {};
+      return value ? createField(key, { _gt: value }) : {};
   }
   function createGteFilter(key, value) {
-      return value ? { [key]: { _gte: value } } : {};
+      return value ? createField(key, { _gte: value }) : {};
   }
@@ -111,7 +123,9 @@ function createBetweenFilter(key, from, to) {
       }
-      return from || to ? { [key]: betweenFilter } : {};
+      return from || to
+          ? createField(key, betweenFilter)
+          : {};
   }
 
   function createOrderBy(key, value) {
-      return key && value ? { [key]: value } : {};
+      return key && value ? createField(key, value) : {};
   }
@@ -133,3 +147,5 @@
 
+  exports.DEAD_ADDRESS = DEAD_ADDRESS;
   exports.PaginatedResult = PaginatedResult;
+  exports.ZERO_ADDRESS = ZERO_ADDRESS;
   exports.createAddressFilter = createAddressFilter;
@@ -136,0 +152,0 @@ exports.createBetweenFilter = createBetweenFilter;

dist/umd/queries/order.d.ts

 import { Order, FieldOrderBy } from '../types/order';
-export declare function createOrderBy<E extends string = string>(key: E | undefined, value?: Order | undefined): FieldOrderBy;
+export declare function createOrderBy<E extends string = string>(key: E | undefined, value?: Order): FieldOrderBy;

dist/umd/types/filter.d.ts

@@ -31,3 +31,3 @@ export type Value = string | number | boolean;
 export type FieldFilter<F = AnyFilter> = {
-    [key: string]: F;
+    [key: string]: FieldFilter<F> | F;
 };
@@ -39,4 +39,4 @@ export interface ConditionFilter {
 }
-export type Filter = FieldFilter | ConditionFilter | {
-    [key: string]: Filter;
+export type Filter = ConditionFilter | FieldFilter | {
+    [key: string]: ConditionFilter | FieldFilter;
 };
@@ -43,0 +43,0 @@ export interface FilterVariables {

dist/umd/types/order.d.ts

@@ -5,10 +5,8 @@ export declare enum Order {
 }
-export interface FieldOrderBy {
-    [key: string]: Order;
-}
-export type OrderBy = FieldOrderBy | {
-    [key: string]: FieldOrderBy;
-} | Array<OrderBy>;
+export type FieldOrderBy = {
+    [key: string]: FieldOrderBy | Order;
+};
+export type OrderBy = FieldOrderBy | Array<FieldOrderBy>;
 export interface OrderByVariables {
     orderBy: OrderBy;
 }

package.json

 {
   "name": "@poap-xyz/utils",
-  "version": "0.2.3",
+  "version": "0.2.4-beta-v0",
   "description": "Utils module for the poap.js library",
@@ -30,3 +30,4 @@ "main": "dist/cjs/index.cjs",
     "node": ">=18"
-  }
+  },
+  "stableVersion": "0.2.4"
 }

No alert changes

Improved metrics

Total package byte prevSize

67248

increased by10.58%

Number of package files

65

increased by16.07%

Lines of code

784

increased by8.44%

No dependency changes