@fraym/projections 0.1.0 → 0.3.0

package/README.md

@@ -1,6 +1,6 @@
 # projections-nodejs
 
-Client implementation in javascript for the projections service [streams](https://github.com/fraym/projections).
+Client implementation in javascript for the [projections service](https://github.com/fraym/projections).
 
 ## Installation
 
@@ -112,6 +112,59 @@ const page = 1; // number of the page you want to select, first page starts at:
 const data = await deliveryClient.getDataList("tenantId", "YourProjection", limit, page);
 ```
 
+With filter:
+
+```typescript
+const data = await deliveryClient.getDataList("tenantId", "YourProjection", undefined, undefined, {
+    fields: {
+        fieldName: {
+            operation: "equals",
+            type: "Int",
+            value: 123,
+        },
+    },
+});
+```
+
+All `Filter`s are evaluated by:
+
+-   checking that all field filters match
+-   checking that all `and` filters match
+-   checking that one of the `or` filters match
+
+Avaliable types:
+
+-   `String`
+-   `ID`
+-   `DateTime`
+-   `Int`
+-   `Float`
+-   `Boolean`
+
+Avaliable operators for all types:
+
+-   `equals`
+-   `notEquals`
+
+Avaliable options for the filter type `DateTime`:
+
+-   `inArray`
+-   `notInArray`
+-   `after`
+-   `before`
+
+Avaliable options for the filter type `String` and `ID`:
+
+-   `inArray`
+-   `notInArray`
+
+Avaliable options for the filter type `Int` and `Float`:
+
+-   `lessThan`
+-   `greaterThan`
+-   `lessThanOrEqual`
+-   `greaterThanOrEqual`
+
 ### Gracefully close the clients
 
 You won't lose any data if you don't. Use it for your peace of mind.

package/dist/cmd/projections.js

@@ -71,7 +71,7 @@ const getTypeDefinitionFromGraphQLObjectType = (t) => {
     let isProjection = false;
     if (((_a = t.astNode) === null || _a === void 0 ? void 0 : _a.directives) && ((_b = t.astNode) === null || _b === void 0 ? void 0 : _b.directives.length) > 0) {
         const directiveNames = t.astNode.directives.map(directive => directive.name.value);
-        isProjection = directiveNames.includes("identifyBy");
+        isProjection = directiveNames.includes("upsertOn");
     }
     const name = t.toString();
     let objectDirectivesString = "";
@@ -121,7 +121,8 @@ const getTypeData = (t) => {
                 name === "ID" ||
                 name === "Boolean" ||
                 name === "Int" ||
-                name === "DateTime"
+                name === "DateTime" ||
+                name === "EventEnvelope"
                 ? {
                     str: name,
                 }

package/dist/config/config.js

@@ -28,7 +28,6 @@ const useConfigDefaults = (config) => {
     if (!config) {
         config = (0, exports.getEnvConfig)();
     }
-    console.log(config);
     return {
         serverAddress: config.serverAddress,
         keepaliveTimeout: (_a = config.keepaliveTimeout) !== null && _a !== void 0 ? _a : 3 * 1000,

package/dist/delivery/client.d.ts

@@ -1,9 +1,9 @@
 import { ClientConfig } from "../config/config";
 import { GetProjectionData } from "./getData";
-import { GetProjectionDataList } from "./getDataList";
+import { Filter, GetProjectionDataList } from "./getDataList";
 export interface DeliveryClient {
     getData: (tenantId: string, type: string, id: string, returnEmptyDataIfNotFound?: boolean) => Promise<GetProjectionData | null>;
-    getDataList: (tenantId: string, type: string, limit?: number, page?: number) => Promise<GetProjectionDataList | null>;
+    getDataList: (tenantId: string, type: string, limit?: number, page?: number, filter?: Filter) => Promise<GetProjectionDataList | null>;
     close: () => Promise<void>;
 }
 export declare const newDeliveryClient: (config?: ClientConfig) => Promise<DeliveryClient>;

package/dist/delivery/client.js

@@ -16,8 +16,8 @@ const newDeliveryClient = async (config) => {
     const getData = async (tenantId, projection, id, returnEmptyDataIfNotFound = false) => {
         return await (0, getData_1.getProjectionData)(tenantId, projection, id, returnEmptyDataIfNotFound, serviceClient);
     };
-    const getDataList = async (tenantId, projection, limit = 0, page = 1) => {
-        return await (0, getDataList_1.getProjectionDataList)(tenantId, projection, limit, page, serviceClient);
+    const getDataList = async (tenantId, projection, limit = 0, page = 1, filter = { fields: {}, and: [], or: [] }) => {
+        return await (0, getDataList_1.getProjectionDataList)(tenantId, projection, limit, page, filter, serviceClient);
     };
     const close = async () => {
         serviceClient.close();

package/dist/delivery/getData.js

@@ -10,6 +10,7 @@ const getProjectionData = async (tenantId, projection, dataId, returnEmptyDataIf
             limit: 0,
             page: 0,
             returnEmptyDataIfNotFound,
+            filter: { fields: {}, and: [], or: [] },
         }, (error, response) => {
             if (error) {
                 reject(error.message);

package/dist/delivery/getDataList.d.ts

@@ -4,4 +4,14 @@ export interface GetProjectionDataList {
     page: number;
     data: Record<string, any>[];
 }
-export declare const getProjectionDataList: (tenantId: string, projection: string, limit: number, page: number, serviceClient: DeliveryServiceClient) => Promise<GetProjectionDataList | null>;
+export interface Filter {
+    fields: Record<string, FieldFilter>;
+    and: Filter[];
+    or: Filter[];
+}
+export interface FieldFilter {
+    type: string;
+    operation: string;
+    value: any;
+}
+export declare const getProjectionDataList: (tenantId: string, projection: string, limit: number, page: number, filter: Filter, serviceClient: DeliveryServiceClient) => Promise<GetProjectionDataList | null>;

package/dist/delivery/getDataList.js

@@ -1,7 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProjectionDataList = void 0;
-const getProjectionDataList = async (tenantId, projection, limit, page, serviceClient) => {
+const getProtobufDataFilter = (filter) => {
+    const fields = {};
+    for (const fieldName in filter.fields) {
+        const field = filter.fields[fieldName];
+        let value = "";
+        if (field.type === "String" && typeof field.value == "string") {
+            value = field.value;
+        }
+        else {
+            value = JSON.stringify(field.value);
+        }
+        fields[fieldName] = {
+            operation: field.operation,
+            type: field.type,
+            value,
+        };
+    }
+    return {
+        fields: fields,
+        and: filter.and.map(and => getProtobufDataFilter(and)),
+        or: filter.or.map(or => getProtobufDataFilter(or)),
+    };
+};
+const getProjectionDataList = async (tenantId, projection, limit, page, filter, serviceClient) => {
     return new Promise((resolve, reject) => {
         serviceClient.getData({
             tenantId,
@@ -10,6 +33,7 @@ const getProjectionDataList = async (tenantId, projection, limit, page, serviceC
             limit,
             page,
             returnEmptyDataIfNotFound: false,
+            filter: getProtobufDataFilter(filter),
         }, (error, response) => {
             if (error) {
                 reject(error.message);

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./management/client";
 export * from "./delivery/client";
+export { Filter, FieldFilter } from "./delivery/getDataList";
 export { ClientConfig } from "./config/config";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fraym/projections",
-    "version": "0.1.0",
+    "version": "0.3.0",
     "license": "UNLICENSED",
     "homepage": "https://github.com/fraym/projections-nodejs",
     "repository": {
@@ -27,7 +27,7 @@
         "projections": "dist/cmd/projections.js"
     },
     "dependencies": {
-        "@fraym/projections-proto": "^1.0.0-alpha.9",
+        "@fraym/projections-proto": "^1.0.0-alpha.11",
         "@graphql-tools/graphql-file-loader": "^7.5.11",
         "@graphql-tools/load": "^7.8.6",
         "@grpc/grpc-js": "^1.7.2",