@orbitalhq/orbital-client - npm Package Compare versions

Comparing version 0.1.0-alpha.1 to 0.1.0-alpha.2

bin/orbital-generate.js

@@ -0,0 +0,0 @@ #! /usr/bin/env node

build/main/lib/client.d.ts

@@ -27,3 +27,3 @@ import 'reflect-metadata';
             as: <Mapping extends DatatypeMapping>(asParams: { [key in keyof Mapping]: Mapping[key]; }) => {
-                execute: () => Observable<{ [field in keyof { [key in keyof Mapping]: Mapping[key]; }]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; }>;
+                execute: () => Observable<{ [key in keyof Mapping]: Mapping[key]; } extends infer T_1 ? { [field in keyof T_1]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; } : never>;
                 toTaxiQl: () => string;
@@ -36,3 +36,3 @@ };
             as: <Mapping extends DatatypeMapping>(asParams: { [key in keyof Mapping]: Mapping[key]; }) => {
-                execute: () => Observable<{ [field in keyof { [key in keyof Mapping]: Mapping[key]; }]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; }>;
+                execute: () => Observable<{ [key in keyof Mapping]: Mapping[key]; } extends infer T_1 ? { [field in keyof T_1]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; } : never>;
                 toTaxiQl: () => string;
@@ -43,6 +43,6 @@ };
         };
-        and: <K_1, T_1 extends DatatypeContainer<K_1>>(type: T_1, criteria: T_1["value"] | ((criteriaBuilder: ComposingCriteriaBuilder<T_1>) => CriteriaElement)) => {
+        and: <K_1, T_2 extends DatatypeContainer<K_1>>(type: T_2, criteria: T_2["value"] | ((criteriaBuilder: ComposingCriteriaBuilder<T_2>) => CriteriaElement)) => {
             find: <Type, Container extends DatatypeContainer<Type>, Param extends FindParam<Type, Container>>(findParameter: Param) => {
                 as: <Mapping extends DatatypeMapping>(asParams: { [key in keyof Mapping]: Mapping[key]; }) => {
-                    execute: () => Observable<{ [field in keyof { [key in keyof Mapping]: Mapping[key]; }]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; }>;
+                    execute: () => Observable<{ [key in keyof Mapping]: Mapping[key]; } extends infer T_1 ? { [field in keyof T_1]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; } : never>;
                     toTaxiQl: () => string;
@@ -55,3 +55,3 @@ };
                 as: <Mapping extends DatatypeMapping>(asParams: { [key in keyof Mapping]: Mapping[key]; }) => {
-                    execute: () => Observable<{ [field in keyof { [key in keyof Mapping]: Mapping[key]; }]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; }>;
+                    execute: () => Observable<{ [key in keyof Mapping]: Mapping[key]; } extends infer T_1 ? { [field in keyof T_1]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; } : never>;
                     toTaxiQl: () => string;
@@ -67,3 +67,3 @@ };
         as: <Mapping extends DatatypeMapping>(asParams: { [key in keyof Mapping]: Mapping[key]; }) => {
-            execute: () => Observable<{ [field in keyof { [key in keyof Mapping]: Mapping[key]; }]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; }>;
+            execute: () => Observable<{ [key in keyof Mapping]: Mapping[key]; } extends infer T_1 ? { [field in keyof T_1]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; } : never>;
             toTaxiQl: () => string;
@@ -76,3 +76,3 @@ };
         as: <Mapping extends DatatypeMapping>(asParams: { [key in keyof Mapping]: Mapping[key]; }) => {
-            execute: () => Observable<{ [field in keyof { [key in keyof Mapping]: Mapping[key]; }]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; }>;
+            execute: () => Observable<{ [key in keyof Mapping]: Mapping[key]; } extends infer T_1 ? { [field in keyof T_1]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; } : never>;
             toTaxiQl: () => string;
@@ -79,0 +79,0 @@ };

build/main/lib/client.js

@@ -24,3 +24,5 @@ "use strict";
     function getDatatype(key) {
-        const container = key.split('.').reduce((obj, field) => obj[field], taxonomy);
+        const container = key
+            .split('.')
+            .reduce((obj, field) => obj[field], taxonomy);
         return container.name;
@@ -33,3 +35,5 @@ }
         const givenBlock = Object.entries(criteriaParams)
+            /* eslint-disable @typescript-eslint/no-non-null-assertion */
             .map(([key, value]) => [getDatatype(key), value.value])
+            /* eslint-enable @typescript-eslint/no-non-null-assertion */
             .map(([key, value]) => {
@@ -44,3 +48,4 @@ if (typeof value !== 'function') {
             }
-        }).join('\n');
+        })
+            .join('\n');
         return `given {\n${givenBlock}\n}\n`;
@@ -52,3 +57,5 @@ }
         }
-        const asBlock = asParameters.map(([key, value]) => `\t${key} : ${value}`).join('\n');
+        const asBlock = asParameters
+            .map(([key, value]) => `\t${key} : ${value}`)
+            .join('\n');
         return `as {\n${asBlock}\n}\n`;
@@ -59,3 +66,5 @@ }
         const asBlock = generateAs(asParameters);
-        const findBlock = isArray(findParameter) ? `${findParameter[0].name}[]` : findParameter.name;
+        const findBlock = isArray(findParameter)
+            ? `${findParameter[0].name}[]`
+            : findParameter.name;
         const arrayNotifier = isArray(findParameter) ? `[]` : '';
@@ -79,3 +88,3 @@ const asString = asParameters !== null ? `\n${asBlock}${arrayNotifier}` : '';
                     return generateQuery(method, givenParams, findParameter, asParameters);
-                }
+                },
             };
@@ -94,3 +103,3 @@ };
                     return generateQuery(method, givenParams, findParameter, null);
-                }
+                },
             };
@@ -127,2 +136,2 @@ };
 exports.buildClient = buildClient;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNEJBQTBCLENBQUMsc0RBQXNEO0FBQ2pGLG1DQUFnQztBQUdoQyx5Q0FLb0I7QUFDcEIscUNBQThDO0FBRzlDLFNBQVMsT0FBTyxDQUFDLEtBQVU7SUFDekIsT0FBTyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO0FBQzlCLENBQUM7QUFJRCxTQUFnQixPQUFPLENBQVEsS0FBK0I7SUFDNUQsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO0FBQ2pCLENBQUM7QUFGRCwwQkFFQztBQWVELFNBQVMsZ0JBQWdCO0lBQ3ZCLE9BQU8sSUFBQSxlQUFNLEdBQUUsQ0FBQztBQUNsQixDQUFDO0FBTUQsTUFBTSxjQUFjLEdBQTRCO0lBQzlDLE1BQU0sRUFBRSxtQkFBVTtDQUNuQixDQUFDO0FBUUYsU0FBZ0IsV0FBVyxDQUEwRixRQUFrQixFQUFFLFdBQXdCLEVBQUUsT0FBc0I7SUFDdkwsTUFBTSxhQUFhLG1DQUFRLGNBQWMsR0FBSyxPQUFPLENBQUUsQ0FBQztJQXFCeEQsU0FBUyxXQUFXLENBQUMsR0FBVztRQUM5QixNQUFNLFNBQVMsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLEdBQUcsRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFFLEdBQUcsQ0FBQyxLQUFLLENBQVMsRUFBRSxRQUFRLENBQXNDLENBQUM7UUFDNUgsT0FBTyxTQUFTLENBQUMsSUFBSSxDQUFDO0lBQ3hCLENBQUM7SUFFRCxTQUFTLGFBQWEsQ0FBQyxjQUFxQztRQUMxRCxJQUFJLGNBQWMsS0FBSyxJQUFJLEVBQUU7WUFDM0IsT0FBTyxFQUFFLENBQUM7U0FDWDtRQUNELE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDO2FBQzlD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNEJBQTBCLENBQUMsc0RBQXNEO0FBQ2pGLG1DQUFnQztBQUdoQyx5Q0FLb0I7QUFDcEIscUNBQThDO0FBRzlDLFNBQVMsT0FBTyxDQUFDLEtBQVU7SUFDekIsT0FBTyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO0FBQzlCLENBQUM7QUFJRCxTQUFnQixPQUFPLENBQ3JCLEtBQStCO0lBRS9CLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUNqQixDQUFDO0FBSkQsMEJBSUM7QUFlRCxTQUFTLGdCQUFnQjtJQUN2QixPQUFPLElBQUEsZUFBTSxHQUFFLENBQUM7QUFDbEIsQ0FBQztBQU1ELE1BQU0sY0FBYyxHQUE0QjtJQUM5QyxNQUFNLEVBQUUsbUJBQVU7Q0FDbkIsQ0FBQztBQU1GLFNBQWdCLFdBQVcsQ0FHekIsUUFBa0IsRUFBRSxXQUF3QixFQUFFLE9BQXNCO0lBQ3BFLE1BQU0sYUFBYSxtQ0FBUSxjQUFjLEdBQUssT0FBTyxDQUFFLENBQUM7SUE0QnhELFNBQVMsV0FBVyxDQUFDLEdBQVc7UUFDOUIsTUFBTSxTQUFTLEdBQUcsR0FBRzthQUNsQixLQUFLLENBQUMsR0FBRyxDQUFDO2FBQ1YsTUFBTSxDQUNMLENBQUMsR0FBRyxFQUFFLEtBQUssRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBUSxFQUNqQyxRQUFRLENBQzRCLENBQUM7UUFDekMsT0FBTyxTQUFTLENBQUMsSUFBSSxDQUFDO0lBQ3hCLENBQUM7SUFFRCxTQUFTLGFBQWEsQ0FBQyxjQUFxQztRQUMxRCxJQUFJLGNBQWMsS0FBSyxJQUFJLEVBQUU7WUFDM0IsT0FBTyxFQUFFLENBQUM7U0FDWDtRQUNELE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDO1lB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

build/main/lib/criteria.js

@@ -19,7 +19,11 @@ "use strict";
         if (criteriaElement.and.length > 0) {
-            const criteriaString = criteriaElement.and.map((element) => generateCriteriaString(datatype, element)).join(') && (');
+            const criteriaString = criteriaElement.and
+                .map((element) => generateCriteriaString(datatype, element))
+                .join(') && (');
             return `(${criteriaString})`;
         }
         else {
-            const criteriaString = criteriaElement.or.map((element) => generateCriteriaString(datatype, element)).join(' || ');
+            const criteriaString = criteriaElement.or
+                .map((element) => generateCriteriaString(datatype, element))
+                .join(' || ');
             return `(${criteriaString})`;
@@ -32,11 +36,11 @@ }
     return {
-        eq: value => ({ operator: '=', value }),
-        notEq: value => ({ operator: '!=', value }),
-        gt: value => ({ operator: '>', value }),
-        gte: value => ({ operator: '>=', value }),
-        lt: value => ({ operator: '<', value }),
-        lte: value => ({ operator: '<=', value }),
-        in: values => ({ operator: 'in', values }),
-        notIn: values => ({ operator: 'not in', values }),
-        like: value => ({ operator: 'like', value }),
+        eq: (value) => ({ operator: '=', value }),
+        notEq: (value) => ({ operator: '!=', value }),
+        gt: (value) => ({ operator: '>', value }),
+        gte: (value) => ({ operator: '>=', value }),
+        lt: (value) => ({ operator: '<', value }),
+        lte: (value) => ({ operator: '<=', value }),
+        in: (values) => ({ operator: 'in', values }),
+        notIn: (values) => ({ operator: 'not in', values }),
+        like: (value) => ({ operator: 'like', value }),
         and: (...items) => ({ and: items, or: [] }),
@@ -47,2 +51,2 @@ or: (...items) => ({ and: [], or: items }),
 exports.createCriteriaBuilder = createCriteriaBuilder;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JpdGVyaWEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL2NyaXRlcmlhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQTJCQSxTQUFTLDhCQUE4QixDQUFDLEtBQVU7SUFDaEQsT0FBTyxLQUFLLENBQUMsUUFBUSxJQUFJLEtBQUssQ0FBQyxLQUFLLENBQUM7QUFDdkMsQ0FBQztBQUVELFNBQVMsNkJBQTZCLENBQUMsS0FBVTtJQUMvQyxPQUFPLEtBQUssQ0FBQyxRQUFRLElBQUksS0FBSyxDQUFDLE1BQU0sQ0FBQztBQUN4QyxDQUFDO0FBeUJELFNBQWdCLHNCQUFzQixDQUFDLFFBQWdCLEVBQUUsZUFBZ0M7SUFDdkYsSUFBSSw4QkFBOEIsQ0FBQyxlQUFlLENBQUMsRUFBRTtRQUNuRCxPQUFPLEdBQUcsUUFBUSxJQUFJLGVBQWUsQ0FBQyxRQUFRLEtBQUssZUFBZSxDQUFDLEtBQUssR0FBRyxDQUFDO0tBQzdFO1NBQU0sSUFBSSw2QkFBNkIsQ0FBQyxlQUFlLENBQUMsRUFBRTtRQUN6RCxPQUFPLEdBQUcsUUFBUSxJQUFJLGVBQWUsQ0FBQyxRQUFRLE1BQU0sZUFBZSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQztLQUM3RjtTQUFNO1FBQ0wsSUFBSSxlQUFlLENBQUMsR0FBRyxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7WUFDbEMsTUFBTSxjQUFjLEdBQUcsZUFBZSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLHNCQUFzQixDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUN0SCxPQUFPLElBQUksY0FBYyxHQUFHLENBQUM7U0FDOUI7YUFBTTtZQUNMLE1BQU0sY0FBYyxHQUFHLGVBQWUsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDbkgsT0FBTyxJQUFJLGNBQWMsR0FBRyxDQUFDO1NBQzlCO0tBQ0Y7QUFDSCxDQUFDO0FBZEQsd0RBY0M7QUFFRCxTQUFnQixxQkFBcUI7SUFDbkMsT0FBTztRQUNMLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQ3ZDLEtBQUssRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQzNDLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQ3ZDLEdBQUcsRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQ3pDLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQ3ZDLEdBQUcsRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQ3pDLEVBQUUsRUFBRSxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDO1FBQzFDLEtBQUssRUFBRSxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxDQUFDO1FBQ2pELElBQUksRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQzVDLEdBQUcsRUFBRSxDQUFDLEdBQUcsS0FBMEIsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQ2hFLEVBQUUsRUFBRSxDQUFDLEdBQUcsS0FBMEIsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEdBQUcsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxDQUFDO0tBQ2hFLENBQUM7QUFDSixDQUFDO0FBZEQsc0RBY0MifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JpdGVyaWEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL2NyaXRlcmlhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQTJCQSxTQUFTLDhCQUE4QixDQUNyQyxLQUFVO0lBRVYsT0FBTyxLQUFLLENBQUMsUUFBUSxJQUFJLEtBQUssQ0FBQyxLQUFLLENBQUM7QUFDdkMsQ0FBQztBQUVELFNBQVMsNkJBQTZCLENBQ3BDLEtBQVU7SUFFVixPQUFPLEtBQUssQ0FBQyxRQUFRLElBQUksS0FBSyxDQUFDLE1BQU0sQ0FBQztBQUN4QyxDQUFDO0FBOEJELFNBQWdCLHNCQUFzQixDQUNwQyxRQUFnQixFQUNoQixlQUFnQztJQUVoQyxJQUFJLDhCQUE4QixDQUFDLGVBQWUsQ0FBQyxFQUFFO1FBQ25ELE9BQU8sR0FBRyxRQUFRLElBQUksZUFBZSxDQUFDLFFBQVEsS0FBSyxlQUFlLENBQUMsS0FBSyxHQUFHLENBQUM7S0FDN0U7U0FBTSxJQUFJLDZCQUE2QixDQUFDLGVBQWUsQ0FBQyxFQUFFO1FBQ3pELE9BQU8sR0FBRyxRQUFRLElBQ2hCLGVBQWUsQ0FBQyxRQUNsQixNQUFNLGVBQWUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUM7S0FDL0M7U0FBTTtRQUNMLElBQUksZUFBZSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1lBQ2xDLE1BQU0sY0FBYyxHQUFHLGVBQWUsQ0FBQyxHQUFHO2lCQUN2QyxHQUFHLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLHNCQUFzQixDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQztpQkFDM0QsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ2xCLE9BQU8sSUFBSSxjQUFjLEdBQUcsQ0FBQztTQUM5QjthQUFNO1lBQ0wsTUFBTSxjQUFjLEdBQUcsZUFBZSxDQUFDLEVBQUU7aUJBQ3RDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsc0JBQXNCLENBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFDO2lCQUMzRCxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDaEIsT0FBTyxJQUFJLGNBQWMsR0FBRyxDQUFDO1NBQzlCO0tBQ0Y7QUFDSCxDQUFDO0FBdkJELHdEQXVCQztBQUVELFNBQWdCLHFCQUFxQjtJQUNuQyxPQUFPO1FBQ0wsRUFBRSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsUUFBUSxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQUUsQ0FBQztRQUN6QyxLQUFLLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQzdDLEVBQUUsRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLFFBQVEsRUFBRSxHQUFHLEVBQUUsS0FBSyxFQUFFLENBQUM7UUFDekMsR0FBRyxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsQ0FBQztRQUMzQyxFQUFFLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQ3pDLEdBQUcsRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLENBQUM7UUFDM0MsRUFBRSxFQUFFLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsQ0FBQztRQUM1QyxLQUFLLEVBQUUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxDQUFDO1FBQ25ELElBQUksRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLENBQUM7UUFDOUMsR0FBRyxFQUFFLENBQUMsR0FBRyxLQUF3QixFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUM7UUFDOUQsRUFBRSxFQUFFLENBQUMsR0FBRyxLQUF3QixFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFFLENBQUM7S0FDOUQsQ0FBQztBQUNKLENBQUM7QUFkRCxzREFjQyJ9

build/main/lib/logger.js

 "use strict";
-/* eslint @typescript-eslint/no-empty-function: "off", functional/no-return-void: "off" */
+/* eslint @typescript-eslint/no-empty-function: "off" */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.consoleLogger = exports.noopLogger = void 0;
 exports.noopLogger = {
-    error: () => {
-    },
-    info: () => {
-    },
-    warn: () => {
-    },
+    error: () => { },
+    info: () => { },
+    warn: () => { },
 };
@@ -24,2 +21,2 @@ exports.consoleLogger = {
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9sb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBGQUEwRjs7O0FBUTdFLFFBQUEsVUFBVSxHQUFXO0lBQ2hDLEtBQUssRUFBRSxHQUFHLEVBQUU7SUFDWixDQUFDO0lBRUQsSUFBSSxFQUFFLEdBQUcsRUFBRTtJQUNYLENBQUM7SUFFRCxJQUFJLEVBQUUsR0FBRyxFQUFFO0lBQ1gsQ0FBQztDQUNGLENBQUM7QUFFVyxRQUFBLGFBQWEsR0FBVztJQUNuQyxLQUFLLEVBQUUsQ0FBQyxPQUFlLEVBQUUsRUFBRTtRQUN6QixPQUFPLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3pCLENBQUM7SUFFRCxJQUFJLEVBQUUsQ0FBQyxPQUFlLEVBQUUsRUFBRTtRQUN4QixPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3ZCLENBQUM7SUFFRCxJQUFJLEVBQUUsQ0FBQyxPQUFlLEVBQUUsRUFBRTtRQUN4QixPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3hCLENBQUM7Q0FDRixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9sb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdEQUF3RDs7O0FBUTNDLFFBQUEsVUFBVSxHQUFXO0lBQ2hDLEtBQUssRUFBRSxHQUFHLEVBQUUsR0FBRSxDQUFDO0lBRWYsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFFLENBQUM7SUFFZCxJQUFJLEVBQUUsR0FBRyxFQUFFLEdBQUUsQ0FBQztDQUNmLENBQUM7QUFFVyxRQUFBLGFBQWEsR0FBVztJQUNuQyxLQUFLLEVBQUUsQ0FBQyxPQUFlLEVBQUUsRUFBRTtRQUN6QixPQUFPLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3pCLENBQUM7SUFFRCxJQUFJLEVBQUUsQ0FBQyxPQUFlLEVBQUUsRUFBRTtRQUN4QixPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3ZCLENBQUM7SUFFRCxJQUFJLEVBQUUsQ0FBQyxPQUFlLEVBQUUsRUFBRTtRQUN4QixPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3hCLENBQUM7Q0FDRixDQUFDIn0=

build/main/lib/query-client.d.ts

@@ -9,4 +9,6 @@ import { Observable } from 'rxjs';
     constructor(host: string);
-    query<T>(query: string, clientQueryId: string): Observable<T>;
-    stream<T>(query: string, clientQueryId: string): Observable<T>;
+    queryEventStream<T>(query: string, clientQueryId?: string): Observable<T>;
+    query<T>(query: string, clientQueryId?: string): Observable<T>;
+    stream<T>(query: string, clientQueryId?: string): Observable<T>;
+    private getEventStream;
 }

build/main/lib/query-client.js

@@ -8,2 +8,3 @@ "use strict";
 const axios_1 = __importDefault(require("axios"));
+const nanoid_1 = require("nanoid");
 const rxjs_1 = require("rxjs");
@@ -14,13 +15,21 @@ class HttpQueryClient {
     }
+    queryEventStream(query, clientQueryId) {
+        const clientId = clientQueryId || (0, nanoid_1.nanoid)();
+        const url = `${this.host}/api/taxiql?clientQueryId=${clientId}&query=${encodeURIComponent(query)}`;
+        return this.getEventStream(url);
+    }
     query(query, clientQueryId) {
-        return (0, rxjs_1.from)(axios_1.default.post(`${this.host}/api/taxiql?resultMode=RAW&clientQueryId=${clientQueryId}`, query, {
+        const clientId = clientQueryId || (0, nanoid_1.nanoid)();
+        return (0, rxjs_1.from)(axios_1.default.post(`${this.host}/api/taxiql?clientQueryId=${clientId}`, query, {
             headers: {
                 'Content-Type': 'text/plain',
-                'Accept': 'application/json',
+                Accept: 'application/json',
             },
-        })).pipe((0, rxjs_1.map)(response => response.data), (0, rxjs_1.catchError)(error => {
-            return error.response ? (0, rxjs_1.of)({
-                error: error.response.data,
-                query,
-            }) : (0, rxjs_1.of)({ error: 'UNKNOWN_ERROR' });
+        })).pipe((0, rxjs_1.map)((response) => response.data), (0, rxjs_1.catchError)((error) => {
+            return error.response
+                ? (0, rxjs_1.of)({
+                    error: error.response.data,
+                    query,
+                })
+                : (0, rxjs_1.of)({ error: 'UNKNOWN_ERROR' });
         }));
@@ -30,28 +39,59 @@ }
     stream(query, clientQueryId) {
-        const obs1 = (0, rxjs_1.from)(axios_1.default.post(`${this.host}/api/taxiql?resultMode=RAW&clientQueryId=${clientQueryId}`, query, {
+        const clientId = clientQueryId || (0, nanoid_1.nanoid)();
+        const obs1 = (0, rxjs_1.from)(axios_1.default.post(`${this.host}/api/taxiql?clientQueryId=${clientId}`, query, {
             headers: {
                 'Content-Type': 'text/plain',
-                'Accept': 'application/json',
+                Accept: 'application/json',
             },
-        })).pipe((0, rxjs_1.map)(response => response.data), (0, rxjs_1.catchError)(error => {
-            return error.response ? (0, rxjs_1.of)({
-                error: error.response.data,
-                query,
-            }) : (0, rxjs_1.of)({ error: 'UNKNOWN_ERROR' });
+        })).pipe((0, rxjs_1.map)((response) => response.data), (0, rxjs_1.catchError)((error) => {
+            return error.response
+                ? (0, rxjs_1.of)({
+                    error: error.response.data,
+                    query,
+                })
+                : (0, rxjs_1.of)({ error: 'UNKNOWN_ERROR' });
         }));
-        const obs2 = (0, rxjs_1.from)(axios_1.default.post(`${this.host}/api/taxiql?resultMode=RAW&clientQueryId=${clientQueryId}`, query, {
+        const obs2 = (0, rxjs_1.from)(axios_1.default.post(`${this.host}/api/taxiql?clientQueryId=${clientQueryId}`, query, {
             headers: {
                 'Content-Type': 'text/plain',
-                'Accept': 'application/json',
+                Accept: 'application/json',
             },
-        })).pipe((0, rxjs_1.map)(response => response.data), (0, rxjs_1.catchError)(error => {
-            return error.response ? (0, rxjs_1.of)({
-                error: error.response.data,
-                query,
-            }) : (0, rxjs_1.of)({ error: 'UNKNOWN_ERROR' });
+        })).pipe((0, rxjs_1.map)((response) => response.data), (0, rxjs_1.catchError)((error) => {
+            return error.response
+                ? (0, rxjs_1.of)({
+                    error: error.response.data,
+                    query,
+                })
+                : (0, rxjs_1.of)({ error: 'UNKNOWN_ERROR' });
         }));
         return (0, rxjs_1.zip)(obs1, obs2);
     }
+    getEventStream(url) {
+        return new rxjs_1.Observable((observer) => {
+            console.log(`Initiating event stream at ${url}`);
+            const eventSource = new EventSource(url);
+            eventSource.onmessage = (event) => {
+                // Check for errors:
+                const payload = JSON.parse(event.data);
+                observer.next(payload);
+            };
+            eventSource.onerror = () => {
+                // Note: We're now sending errors down as an error message, so
+                // assume that all onerror signals are just completion.
+                // if (messageReceived && errorAfterMessageIndicatesClosed) {
+                console.log('Received error event  - treating this as a close signal');
+                observer.complete();
+                // } else {
+                //   console.log('Received error event' + JSON.stringify(error));
+                // observer.error(error);
+                // }
+            };
+            observer.add(() => {
+                console.log(`Closing event stream at ${url}`);
+                eventSource.close();
+            });
+        });
+    }
 }
 exports.HttpQueryClient = HttpQueryClient;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9xdWVyeS1jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsa0RBQTBCO0FBQzFCLCtCQUFrRTtBQVFsRSxNQUFhLGVBQWU7SUFDMUIsWUFBNkIsSUFBWTtRQUFaLFNBQUksR0FBSixJQUFJLENBQVE7SUFDekMsQ0FBQztJQUVELEtBQUssQ0FBSSxLQUFhLEVBQUUsYUFBcUI7UUFDM0MsT0FBTyxJQUFBLFdBQUksRUFBQyxlQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLElBQUksNENBQTRDLGFBQWEsRUFBRSxFQUFFLEtBQUssRUFBRTtZQUNyRyxPQUFPLEVBQUU7Z0JBQ1AsY0FBYyxFQUFFLFlBQVk7Z0JBQzVCLFFBQVEsRUFBRSxrQkFBa0I7YUFDN0I7U0FDRixDQUFDLENBQUMsQ0FBQyxJQUFJLENBQ04sSUFBQSxVQUFHLEVBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQzlCLElBQUEsaUJBQVUsRUFBQyxLQUFLLENBQUMsRUFBRTtZQUNqQixPQUFPLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUEsU0FBRSxFQUFDO2dCQUN6QixLQUFLLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFJO2dCQUMxQixLQUFLO2FBQ04sQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFBLFNBQUUsRUFBQyxFQUFFLEtBQUssRUFBRSxlQUFlLEVBQUUsQ0FBQyxDQUFDO1FBQ3RDLENBQUMsQ0FBQyxDQUFrQixDQUFDO0lBQ3pCLENBQUM7SUFFRCwwQkFBMEI7SUFDMUIsTUFBTSxDQUFJLEtBQWEsRUFBRSxhQUFxQjtRQUM1QyxNQUFNLElBQUksR0FBRyxJQUFBLFdBQUksRUFBQyxlQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLElBQUksNENBQTRDLGFBQWEsRUFBRSxFQUFFLEtBQUssRUFBRTtZQUMzRyxPQUFPLEVBQUU7Z0JBQ1AsY0FBYyxFQUFFLFlBQVk7Z0JBQzVCLFFBQVEsRUFBRSxrQkFBa0I7YUFDN0I7U0FDRixDQUFDLENBQUMsQ0FBQyxJQUFJLENBQ04sSUFBQSxVQUFHLEVBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQzlCLElBQUEsaUJBQVUsRUFBQyxLQUFLLENBQUMsRUFBRTtZQUNqQixPQUFPLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUEsU0FBRSxFQUFDO2dCQUN6QixLQUFLLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFJO2dCQUMxQixLQUFLO2FBQ04sQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFBLFNBQUUsRUFBQyxFQUFFLEtBQUssRUFBRSxlQUFlLEVBQUUsQ0FBQyxDQUFDO1FBQ3RDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDTixNQUFNLElBQUksR0FBRyxJQUFBLFdBQUksRUFBQyxlQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLElBQUksNENBQTRDLGFBQWEsRUFBRSxFQUFFLEtBQUssRUFBRTtZQUMzRyxPQUFPLEVBQUU7Z0JBQ1AsY0FBYyxFQUFFLFlBQVk7Z0JBQzVCLFFBQVEsRUFBRSxrQkFBa0I7YUFDN0I7U0FDRixDQUFDLENBQUMsQ0FBQyxJQUFJLENBQ04sSUFBQSxVQUFHLEVBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQzlCLElBQUEsaUJBQVUsRUFBQyxLQUFLLENBQUMsRUFBRTtZQUNqQixPQUFPLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUEsU0FBRSxFQUFDO2dCQUN6QixLQUFLLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFJO2dCQUMxQixLQUFLO2FBQ04sQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFBLFNBQUUsRUFBQyxFQUFFLEtBQUssRUFBRSxlQUFlLEVBQUUsQ0FBQyxDQUFDO1FBQ3RDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDTixPQUFPLElBQUEsVUFBRyxFQUFDLElBQUksRUFBRSxJQUFJLENBQW9CLENBQUM7SUFDNUMsQ0FBQztDQUNGO0FBbERELDBDQWtEQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9xdWVyeS1jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsa0RBQTBCO0FBQzFCLG1DQUFnQztBQUNoQywrQkFBa0U7QUFRbEUsTUFBYSxlQUFlO0lBQzFCLFlBQTZCLElBQVk7UUFBWixTQUFJLEdBQUosSUFBSSxDQUFRO0lBQUcsQ0FBQztJQUU3QyxnQkFBZ0IsQ0FBSSxLQUFhLEVBQUUsYUFBc0I7UUFDdkQsTUFBTSxRQUFRLEdBQUcsYUFBYSxJQUFJLElBQUEsZUFBTSxHQUFFLENBQUM7UUFDM0MsTUFBTSxHQUFHLEdBQUcsR0FDVixJQUFJLENBQUMsSUFDUCw2QkFBNkIsUUFBUSxVQUFVLGtCQUFrQixDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7UUFDM0UsT0FBTyxJQUFJLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ2xDLENBQUM7SUFFRCxLQUFLLENBQUksS0FBYSxFQUFFLGFBQXNCO1FBQzVDLE1BQU0sUUFBUSxHQUFHLGFBQWEsSUFBSSxJQUFBLGVBQU0sR0FBRSxDQUFDO1FBRTNDLE9BQU8sSUFBQSxXQUFJLEVBQ1QsZUFBSyxDQUFDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxJQUFJLDZCQUE2QixRQUFRLEVBQUUsRUFBRSxLQUFLLEVBQUU7WUFDckUsT0FBTyxFQUFFO2dCQUNQLGNBQWMsRUFBRSxZQUFZO2dCQUM1QixNQUFNLEVBQUUsa0JBQWtCO2FBQzNCO1NBQ0YsQ0FBQyxDQUNILENBQUMsSUFBSSxDQUNKLElBQUEsVUFBRyxFQUFDLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQ2hDLElBQUEsaUJBQVUsRUFBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ25CLE9BQU8sS0FBSyxDQUFDLFFBQVE7Z0JBQ25CLENBQUMsQ0FBQyxJQUFBLFNBQUUs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

build/module/lib/client.d.ts

@@ -27,3 +27,3 @@ import 'reflect-metadata';
             as: <Mapping extends DatatypeMapping>(asParams: { [key in keyof Mapping]: Mapping[key]; }) => {
-                execute: () => Observable<{ [field in keyof { [key in keyof Mapping]: Mapping[key]; }]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; }>;
+                execute: () => Observable<{ [key in keyof Mapping]: Mapping[key]; } extends infer T_1 ? { [field in keyof T_1]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; } : never>;
                 toTaxiQl: () => string;
@@ -36,3 +36,3 @@ };
             as: <Mapping extends DatatypeMapping>(asParams: { [key in keyof Mapping]: Mapping[key]; }) => {
-                execute: () => Observable<{ [field in keyof { [key in keyof Mapping]: Mapping[key]; }]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; }>;
+                execute: () => Observable<{ [key in keyof Mapping]: Mapping[key]; } extends infer T_1 ? { [field in keyof T_1]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; } : never>;
                 toTaxiQl: () => string;
@@ -43,6 +43,6 @@ };
         };
-        and: <K_1, T_1 extends DatatypeContainer<K_1>>(type: T_1, criteria: T_1["value"] | ((criteriaBuilder: ComposingCriteriaBuilder<T_1>) => CriteriaElement)) => {
+        and: <K_1, T_2 extends DatatypeContainer<K_1>>(type: T_2, criteria: T_2["value"] | ((criteriaBuilder: ComposingCriteriaBuilder<T_2>) => CriteriaElement)) => {
             find: <Type, Container extends DatatypeContainer<Type>, Param extends FindParam<Type, Container>>(findParameter: Param) => {
                 as: <Mapping extends DatatypeMapping>(asParams: { [key in keyof Mapping]: Mapping[key]; }) => {
-                    execute: () => Observable<{ [field in keyof { [key in keyof Mapping]: Mapping[key]; }]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; }>;
+                    execute: () => Observable<{ [key in keyof Mapping]: Mapping[key]; } extends infer T_1 ? { [field in keyof T_1]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; } : never>;
                     toTaxiQl: () => string;
@@ -55,3 +55,3 @@ };
                 as: <Mapping extends DatatypeMapping>(asParams: { [key in keyof Mapping]: Mapping[key]; }) => {
-                    execute: () => Observable<{ [field in keyof { [key in keyof Mapping]: Mapping[key]; }]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; }>;
+                    execute: () => Observable<{ [key in keyof Mapping]: Mapping[key]; } extends infer T_1 ? { [field in keyof T_1]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; } : never>;
                     toTaxiQl: () => string;
@@ -67,3 +67,3 @@ };
         as: <Mapping extends DatatypeMapping>(asParams: { [key in keyof Mapping]: Mapping[key]; }) => {
-            execute: () => Observable<{ [field in keyof { [key in keyof Mapping]: Mapping[key]; }]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; }>;
+            execute: () => Observable<{ [key in keyof Mapping]: Mapping[key]; } extends infer T_1 ? { [field in keyof T_1]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; } : never>;
             toTaxiQl: () => string;
@@ -76,3 +76,3 @@ };
         as: <Mapping extends DatatypeMapping>(asParams: { [key in keyof Mapping]: Mapping[key]; }) => {
-            execute: () => Observable<{ [field in keyof { [key in keyof Mapping]: Mapping[key]; }]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; }>;
+            execute: () => Observable<{ [key in keyof Mapping]: Mapping[key]; } extends infer T_1 ? { [field in keyof T_1]: { [key in keyof Mapping]: Mapping[key]; }[field]["value"]; } : never>;
             toTaxiQl: () => string;
@@ -79,0 +79,0 @@ };

build/module/lib/client.js

@@ -20,3 +20,5 @@ import 'reflect-metadata'; // TODO Does this belong here or to the consumer code?
     function getDatatype(key) {
-        const container = key.split('.').reduce((obj, field) => obj[field], taxonomy);
+        const container = key
+            .split('.')
+            .reduce((obj, field) => obj[field], taxonomy);
         return container.name;
@@ -29,3 +31,5 @@ }
         const givenBlock = Object.entries(criteriaParams)
+            /* eslint-disable @typescript-eslint/no-non-null-assertion */
             .map(([key, value]) => [getDatatype(key), value.value])
+            /* eslint-enable @typescript-eslint/no-non-null-assertion */
             .map(([key, value]) => {
@@ -40,3 +44,4 @@ if (typeof value !== 'function') {
             }
-        }).join('\n');
+        })
+            .join('\n');
         return `given {\n${givenBlock}\n}\n`;
@@ -48,3 +53,5 @@ }
         }
-        const asBlock = asParameters.map(([key, value]) => `\t${key} : ${value}`).join('\n');
+        const asBlock = asParameters
+            .map(([key, value]) => `\t${key} : ${value}`)
+            .join('\n');
         return `as {\n${asBlock}\n}\n`;
@@ -55,3 +62,5 @@ }
         const asBlock = generateAs(asParameters);
-        const findBlock = isArray(findParameter) ? `${findParameter[0].name}[]` : findParameter.name;
+        const findBlock = isArray(findParameter)
+            ? `${findParameter[0].name}[]`
+            : findParameter.name;
         const arrayNotifier = isArray(findParameter) ? `[]` : '';
@@ -75,3 +84,3 @@ const asString = asParameters !== null ? `\n${asBlock}${arrayNotifier}` : '';
                     return generateQuery(method, givenParams, findParameter, asParameters);
-                }
+                },
             };
@@ -90,3 +99,3 @@ };
                     return generateQuery(method, givenParams, findParameter, null);
-                }
+                },
             };
@@ -131,2 +140,2 @@ };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxrQkFBa0IsQ0FBQyxDQUFDLHNEQUFzRDtBQUNqRixPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBR2hDLE9BQU8sRUFFTCxxQkFBcUIsRUFFckIsc0JBQXNCLEdBQ3ZCLE1BQU0sWUFBWSxDQUFDO0FBQ3BCLE9BQU8sRUFBVSxVQUFVLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFHOUMsU0FBUyxPQUFPLENBQUMsS0FBVTtJQUN6QixPQUFPLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDOUIsQ0FBQztBQUlELE1BQU0sVUFBVSxPQUFPLENBQVEsS0FBK0I7SUFDNUQsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO0FBQ2pCLENBQUM7QUFlRCxTQUFTLGdCQUFnQjtJQUN2QixPQUFPLE1BQU0sRUFBRSxDQUFDO0FBQ2xCLENBQUM7QUFNRCxNQUFNLGNBQWMsR0FBNEI7SUFDOUMsTUFBTSxFQUFFLFVBQVU7Q0FDbkIsQ0FBQztBQVFGLE1BQU0sVUFBVSxXQUFXLENBQTBGLFFBQWtCLEVBQUUsV0FBd0IsRUFBRSxPQUFzQjtJQUN2TCxNQUFNLGFBQWEsR0FBRyxFQUFFLEdBQUcsY0FBYyxFQUFFLEdBQUcsT0FBTyxFQUFFLENBQUM7SUFxQnhELFNBQVMsV0FBVyxDQUFDLEdBQVc7UUFDOUIsTUFBTSxTQUFTLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxHQUFHLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBRSxHQUFHLENBQUMsS0FBSyxDQUFTLEVBQUUsUUFBUSxDQUFzQyxDQUFDO1FBQzVILE9BQU8sU0FBUyxDQUFDLElBQUksQ0FBQztJQUN4QixDQUFDO0lBRUQsU0FBUyxhQUFhLENBQUMsY0FBcUM7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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxrQkFBa0IsQ0FBQyxDQUFDLHNEQUFzRDtBQUNqRixPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBR2hDLE9BQU8sRUFFTCxxQkFBcUIsRUFFckIsc0JBQXNCLEdBQ3ZCLE1BQU0sWUFBWSxDQUFDO0FBQ3BCLE9BQU8sRUFBVSxVQUFVLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFHOUMsU0FBUyxPQUFPLENBQUMsS0FBVTtJQUN6QixPQUFPLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDOUIsQ0FBQztBQUlELE1BQU0sVUFBVSxPQUFPLENBQ3JCLEtBQStCO0lBRS9CLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUNqQixDQUFDO0FBZUQsU0FBUyxnQkFBZ0I7SUFDdkIsT0FBTyxNQUFNLEVBQUUsQ0FBQztBQUNsQixDQUFDO0FBTUQsTUFBTSxjQUFjLEdBQTRCO0lBQzlDLE1BQU0sRUFBRSxVQUFVO0NBQ25CLENBQUM7QUFNRixNQUFNLFVBQVUsV0FBVyxDQUd6QixRQUFrQixFQUFFLFdBQXdCLEVBQUUsT0FBc0I7SUFDcEUsTUFBTSxhQUFhLEdBQUcsRUFBRSxHQUFHLGNBQWMsRUFBRSxHQUFHLE9BQU8sRUFBRSxDQUFDO0lBNEJ4RCxTQUFTLFdBQVcsQ0FBQyxHQUFXO1FBQzlCLE1BQU0sU0FBUyxHQUFHLEdBQUc7YUFDbEIsS0FBSyxDQUFDLEdBQUcsQ0FBQzthQUNWLE1BQU0sQ0FDTCxDQUFDLEdBQUcsRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQVEsRUFDakMsUUFBUSxDQUM0QixDQUFDO1FBQ3pDLE9BQU8sU0FBUyxDQUFDLElBQUksQ0FBQztJQUN4QixDQUFDO0lBRUQsU0FBUyxhQUFhLENBQUMsY0FB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

build/module/lib/criteria.js

@@ -16,7 +16,11 @@ function isSingleValueCriteriaPredicate(input) {
         if (criteriaElement.and.length > 0) {
-            const criteriaString = criteriaElement.and.map((element) => generateCriteriaString(datatype, element)).join(') && (');
+            const criteriaString = criteriaElement.and
+                .map((element) => generateCriteriaString(datatype, element))
+                .join(') && (');
             return `(${criteriaString})`;
         }
         else {
-            const criteriaString = criteriaElement.or.map((element) => generateCriteriaString(datatype, element)).join(' || ');
+            const criteriaString = criteriaElement.or
+                .map((element) => generateCriteriaString(datatype, element))
+                .join(' || ');
             return `(${criteriaString})`;
@@ -28,11 +32,11 @@ }
     return {
-        eq: value => ({ operator: '=', value }),
-        notEq: value => ({ operator: '!=', value }),
-        gt: value => ({ operator: '>', value }),
-        gte: value => ({ operator: '>=', value }),
-        lt: value => ({ operator: '<', value }),
-        lte: value => ({ operator: '<=', value }),
-        in: values => ({ operator: 'in', values }),
-        notIn: values => ({ operator: 'not in', values }),
-        like: value => ({ operator: 'like', value }),
+        eq: (value) => ({ operator: '=', value }),
+        notEq: (value) => ({ operator: '!=', value }),
+        gt: (value) => ({ operator: '>', value }),
+        gte: (value) => ({ operator: '>=', value }),
+        lt: (value) => ({ operator: '<', value }),
+        lte: (value) => ({ operator: '<=', value }),
+        in: (values) => ({ operator: 'in', values }),
+        notIn: (values) => ({ operator: 'not in', values }),
+        like: (value) => ({ operator: 'like', value }),
         and: (...items) => ({ and: items, or: [] }),
@@ -42,2 +46,2 @@ or: (...items) => ({ and: [], or: items }),
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JpdGVyaWEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL2NyaXRlcmlhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQTJCQSxTQUFTLDhCQUE4QixDQUFDLEtBQVU7SUFDaEQsT0FBTyxLQUFLLENBQUMsUUFBUSxJQUFJLEtBQUssQ0FBQyxLQUFLLENBQUM7QUFDdkMsQ0FBQztBQUVELFNBQVMsNkJBQTZCLENBQUMsS0FBVTtJQUMvQyxPQUFPLEtBQUssQ0FBQyxRQUFRLElBQUksS0FBSyxDQUFDLE1BQU0sQ0FBQztBQUN4QyxDQUFDO0FBeUJELE1BQU0sVUFBVSxzQkFBc0IsQ0FBQyxRQUFnQixFQUFFLGVBQWdDO0lBQ3ZGLElBQUksOEJBQThCLENBQUMsZUFBZSxDQUFDLEVBQUU7UUFDbkQsT0FBTyxHQUFHLFFBQVEsSUFBSSxlQUFlLENBQUMsUUFBUSxLQUFLLGVBQWUsQ0FBQyxLQUFLLEdBQUcsQ0FBQztLQUM3RTtTQUFNLElBQUksNkJBQTZCLENBQUMsZUFBZSxDQUFDLEVBQUU7UUFDekQsT0FBTyxHQUFHLFFBQVEsSUFBSSxlQUFlLENBQUMsUUFBUSxNQUFNLGVBQWUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUM7S0FDN0Y7U0FBTTtRQUNMLElBQUksZUFBZSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1lBQ2xDLE1BQU0sY0FBYyxHQUFHLGVBQWUsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDdEgsT0FBTyxJQUFJLGNBQWMsR0FBRyxDQUFDO1NBQzlCO2FBQU07WUFDTCxNQUFNLGNBQWMsR0FBRyxlQUFlLENBQUMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsc0JBQXNCLENBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ25ILE9BQU8sSUFBSSxjQUFjLEdBQUcsQ0FBQztTQUM5QjtLQUNGO0FBQ0gsQ0FBQztBQUVELE1BQU0sVUFBVSxxQkFBcUI7SUFDbkMsT0FBTztRQUNMLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQ3ZDLEtBQUssRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQzNDLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQ3ZDLEdBQUcsRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQ3pDLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQ3ZDLEdBQUcsRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQ3pDLEVBQUUsRUFBRSxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDO1FBQzFDLEtBQUssRUFBRSxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxDQUFDO1FBQ2pELElBQUksRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQzVDLEdBQUcsRUFBRSxDQUFDLEdBQUcsS0FBMEIsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQ2hFLEVBQUUsRUFBRSxDQUFDLEdBQUcsS0FBMEIsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEdBQUcsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxDQUFDO0tBQ2hFLENBQUM7QUFDSixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JpdGVyaWEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL2NyaXRlcmlhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQTJCQSxTQUFTLDhCQUE4QixDQUNyQyxLQUFVO0lBRVYsT0FBTyxLQUFLLENBQUMsUUFBUSxJQUFJLEtBQUssQ0FBQyxLQUFLLENBQUM7QUFDdkMsQ0FBQztBQUVELFNBQVMsNkJBQTZCLENBQ3BDLEtBQVU7SUFFVixPQUFPLEtBQUssQ0FBQyxRQUFRLElBQUksS0FBSyxDQUFDLE1BQU0sQ0FBQztBQUN4QyxDQUFDO0FBOEJELE1BQU0sVUFBVSxzQkFBc0IsQ0FDcEMsUUFBZ0IsRUFDaEIsZUFBZ0M7SUFFaEMsSUFBSSw4QkFBOEIsQ0FBQyxlQUFlLENBQUMsRUFBRTtRQUNuRCxPQUFPLEdBQUcsUUFBUSxJQUFJLGVBQWUsQ0FBQyxRQUFRLEtBQUssZUFBZSxDQUFDLEtBQUssR0FBRyxDQUFDO0tBQzdFO1NBQU0sSUFBSSw2QkFBNkIsQ0FBQyxlQUFlLENBQUMsRUFBRTtRQUN6RCxPQUFPLEdBQUcsUUFBUSxJQUNoQixlQUFlLENBQUMsUUFDbEIsTUFBTSxlQUFlLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDO0tBQy9DO1NBQU07UUFDTCxJQUFJLGVBQWUsQ0FBQyxHQUFHLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRTtZQUNsQyxNQUFNLGNBQWMsR0FBRyxlQUFlLENBQUMsR0FBRztpQkFDdkMsR0FBRyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDLENBQUM7aUJBQzNELElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUNsQixPQUFPLElBQUksY0FBYyxHQUFHLENBQUM7U0FDOUI7YUFBTTtZQUNMLE1BQU0sY0FBYyxHQUFHLGVBQWUsQ0FBQyxFQUFFO2lCQUN0QyxHQUFHLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLHNCQUFzQixDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQztpQkFDM0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ2hCLE9BQU8sSUFBSSxjQUFjLEdBQUcsQ0FBQztTQUM5QjtLQUNGO0FBQ0gsQ0FBQztBQUVELE1BQU0sVUFBVSxxQkFBcUI7SUFDbkMsT0FBTztRQUNMLEVBQUUsRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLFFBQVEsRUFBRSxHQUFHLEVBQUUsS0FBSyxFQUFFLENBQUM7UUFDekMsS0FBSyxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsQ0FBQztRQUM3QyxFQUFFLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQ3pDLEdBQUcsRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLENBQUM7UUFDM0MsRUFBRSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsUUFBUSxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQUUsQ0FBQztRQUN6QyxHQUFHLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQzNDLEVBQUUsRUFBRSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQUM7UUFDNUMsS0FBSyxFQUFFLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsQ0FBQztRQUNuRCxJQUFJLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQzlDLEdBQUcsRUFBRSxDQUFDLEdBQUcsS0FBd0IsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQzlELEVBQUUsRUFBRSxDQUFDLEdBQUcsS0FBd0IsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEdBQUcsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxDQUFDO0tBQzlELENBQUM7QUFDSixDQUFDIn0=

build/module/lib/logger.js

@@ -1,9 +0,6 @@
-/* eslint @typescript-eslint/no-empty-function: "off", functional/no-return-void: "off" */
+/* eslint @typescript-eslint/no-empty-function: "off" */
 export const noopLogger = {
-    error: () => {
-    },
-    info: () => {
-    },
-    warn: () => {
-    },
+    error: () => { },
+    info: () => { },
+    warn: () => { },
 };
@@ -21,2 +18,2 @@ export const consoleLogger = {
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9sb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsMEZBQTBGO0FBUTFGLE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBVztJQUNoQyxLQUFLLEVBQUUsR0FBRyxFQUFFO0lBQ1osQ0FBQztJQUVELElBQUksRUFBRSxHQUFHLEVBQUU7SUFDWCxDQUFDO0lBRUQsSUFBSSxFQUFFLEdBQUcsRUFBRTtJQUNYLENBQUM7Q0FDRixDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sYUFBYSxHQUFXO0lBQ25DLEtBQUssRUFBRSxDQUFDLE9BQWUsRUFBRSxFQUFFO1FBQ3pCLE9BQU8sQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDekIsQ0FBQztJQUVELElBQUksRUFBRSxDQUFDLE9BQWUsRUFBRSxFQUFFO1FBQ3hCLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDdkIsQ0FBQztJQUVELElBQUksRUFBRSxDQUFDLE9BQWUsRUFBRSxFQUFFO1FBQ3hCLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDeEIsQ0FBQztDQUNGLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9sb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsd0RBQXdEO0FBUXhELE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBVztJQUNoQyxLQUFLLEVBQUUsR0FBRyxFQUFFLEdBQUUsQ0FBQztJQUVmLElBQUksRUFBRSxHQUFHLEVBQUUsR0FBRSxDQUFDO0lBRWQsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFFLENBQUM7Q0FDZixDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sYUFBYSxHQUFXO0lBQ25DLEtBQUssRUFBRSxDQUFDLE9BQWUsRUFBRSxFQUFFO1FBQ3pCLE9BQU8sQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDekIsQ0FBQztJQUVELElBQUksRUFBRSxDQUFDLE9BQWUsRUFBRSxFQUFFO1FBQ3hCLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDdkIsQ0FBQztJQUVELElBQUksRUFBRSxDQUFDLE9BQWUsRUFBRSxFQUFFO1FBQ3hCLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDeEIsQ0FBQztDQUNGLENBQUMifQ==

build/module/lib/query-client.d.ts

@@ -9,4 +9,6 @@ import { Observable } from 'rxjs';
     constructor(host: string);
-    query<T>(query: string, clientQueryId: string): Observable<T>;
-    stream<T>(query: string, clientQueryId: string): Observable<T>;
+    queryEventStream<T>(query: string, clientQueryId?: string): Observable<T>;
+    query<T>(query: string, clientQueryId?: string): Observable<T>;
+    stream<T>(query: string, clientQueryId?: string): Observable<T>;
+    private getEventStream;
 }

build/module/lib/query-client.js

 import axios from 'axios';
-import { catchError, from, map, of, zip } from 'rxjs';
+import { nanoid } from 'nanoid';
+import { catchError, from, map, Observable, of, zip } from 'rxjs';
 export class HttpQueryClient {
@@ -8,13 +9,21 @@ host;
     }
+    queryEventStream(query, clientQueryId) {
+        const clientId = clientQueryId || nanoid();
+        const url = `${this.host}/api/taxiql?clientQueryId=${clientId}&query=${encodeURIComponent(query)}`;
+        return this.getEventStream(url);
+    }
     query(query, clientQueryId) {
-        return from(axios.post(`${this.host}/api/taxiql?resultMode=RAW&clientQueryId=${clientQueryId}`, query, {
+        const clientId = clientQueryId || nanoid();
+        return from(axios.post(`${this.host}/api/taxiql?clientQueryId=${clientId}`, query, {
             headers: {
                 'Content-Type': 'text/plain',
-                'Accept': 'application/json',
+                Accept: 'application/json',
             },
-        })).pipe(map(response => response.data), catchError(error => {
-            return error.response ? of({
-                error: error.response.data,
-                query,
-            }) : of({ error: 'UNKNOWN_ERROR' });
+        })).pipe(map((response) => response.data), catchError((error) => {
+            return error.response
+                ? of({
+                    error: error.response.data,
+                    query,
+                })
+                : of({ error: 'UNKNOWN_ERROR' });
         }));
@@ -24,27 +33,58 @@ }
     stream(query, clientQueryId) {
-        const obs1 = from(axios.post(`${this.host}/api/taxiql?resultMode=RAW&clientQueryId=${clientQueryId}`, query, {
+        const clientId = clientQueryId || nanoid();
+        const obs1 = from(axios.post(`${this.host}/api/taxiql?clientQueryId=${clientId}`, query, {
             headers: {
                 'Content-Type': 'text/plain',
-                'Accept': 'application/json',
+                Accept: 'application/json',
             },
-        })).pipe(map(response => response.data), catchError(error => {
-            return error.response ? of({
-                error: error.response.data,
-                query,
-            }) : of({ error: 'UNKNOWN_ERROR' });
+        })).pipe(map((response) => response.data), catchError((error) => {
+            return error.response
+                ? of({
+                    error: error.response.data,
+                    query,
+                })
+                : of({ error: 'UNKNOWN_ERROR' });
         }));
-        const obs2 = from(axios.post(`${this.host}/api/taxiql?resultMode=RAW&clientQueryId=${clientQueryId}`, query, {
+        const obs2 = from(axios.post(`${this.host}/api/taxiql?clientQueryId=${clientQueryId}`, query, {
             headers: {
                 'Content-Type': 'text/plain',
-                'Accept': 'application/json',
+                Accept: 'application/json',
             },
-        })).pipe(map(response => response.data), catchError(error => {
-            return error.response ? of({
-                error: error.response.data,
-                query,
-            }) : of({ error: 'UNKNOWN_ERROR' });
+        })).pipe(map((response) => response.data), catchError((error) => {
+            return error.response
+                ? of({
+                    error: error.response.data,
+                    query,
+                })
+                : of({ error: 'UNKNOWN_ERROR' });
         }));
         return zip(obs1, obs2);
     }
+    getEventStream(url) {
+        return new Observable((observer) => {
+            console.log(`Initiating event stream at ${url}`);
+            const eventSource = new EventSource(url);
+            eventSource.onmessage = (event) => {
+                // Check for errors:
+                const payload = JSON.parse(event.data);
+                observer.next(payload);
+            };
+            eventSource.onerror = () => {
+                // Note: We're now sending errors down as an error message, so
+                // assume that all onerror signals are just completion.
+                // if (messageReceived && errorAfterMessageIndicatesClosed) {
+                console.log('Received error event  - treating this as a close signal');
+                observer.complete();
+                // } else {
+                //   console.log('Received error event' + JSON.stringify(error));
+                // observer.error(error);
+                // }
+            };
+            observer.add(() => {
+                console.log(`Closing event stream at ${url}`);
+                eventSource.close();
+            });
+        });
+    }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9xdWVyeS1jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE1BQU0sT0FBTyxDQUFDO0FBQzFCLE9BQU8sRUFBRSxVQUFVLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBYyxFQUFFLEVBQUUsR0FBRyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBUWxFLE1BQU0sT0FBTyxlQUFlO0lBQ0c7SUFBN0IsWUFBNkIsSUFBWTtRQUFaLFNBQUksR0FBSixJQUFJLENBQVE7SUFDekMsQ0FBQztJQUVELEtBQUssQ0FBSSxLQUFhLEVBQUUsYUFBcUI7UUFDM0MsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxJQUFJLDRDQUE0QyxhQUFhLEVBQUUsRUFBRSxLQUFLLEVBQUU7WUFDckcsT0FBTyxFQUFFO2dCQUNQLGNBQWMsRUFBRSxZQUFZO2dCQUM1QixRQUFRLEVBQUUsa0JBQWtCO2FBQzdCO1NBQ0YsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUNOLEdBQUcsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFDOUIsVUFBVSxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ2pCLE9BQU8sS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO2dCQUN6QixLQUFLLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFJO2dCQUMxQixLQUFLO2FBQ04sQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsZUFBZSxFQUFFLENBQUMsQ0FBQztRQUN0QyxDQUFDLENBQUMsQ0FBa0IsQ0FBQztJQUN6QixDQUFDO0lBRUQsMEJBQTBCO0lBQzFCLE1BQU0sQ0FBSSxLQUFhLEVBQUUsYUFBcUI7UUFDNUMsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSw0Q0FBNEMsYUFBYSxFQUFFLEVBQUUsS0FBSyxFQUFFO1lBQzNHLE9BQU8sRUFBRTtnQkFDUCxjQUFjLEVBQUUsWUFBWTtnQkFDNUIsUUFBUSxFQUFFLGtCQUFrQjthQUM3QjtTQUNGLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FDTixHQUFHLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQzlCLFVBQVUsQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUNqQixPQUFPLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztnQkFDekIsS0FBSyxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsSUFBSTtnQkFDMUIsS0FBSzthQUNOLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsS0FBSyxFQUFFLGVBQWUsRUFBRSxDQUFDLENBQUM7UUFDdEMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNOLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLElBQUksNENBQTRDLGFBQWEsRUFBRSxFQUFFLEtBQUssRUFBRTtZQUMzRyxPQUFPLEVBQUU7Z0JBQ1AsY0FBYyxFQUFFLFlBQVk7Z0JBQzVCLFFBQVEsRUFBRSxrQkFBa0I7YUFDN0I7U0FDRixDQUFDLENBQUMsQ0FBQyxJQUFJLENBQ04sR0FBRyxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUM5QixVQUFVLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDakIsT0FBTyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7Z0JBQ3pCLEtBQUssRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLElBQUk7Z0JBQzFCLEtBQUs7YUFDTixDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxlQUFlLEVBQUUsQ0FBQyxDQUFDO1FBQ3RDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDTixPQUFPLEdBQUcsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFvQixDQUFDO0lBQzVDLENBQUM7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9xdWVyeS1jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE1BQU0sT0FBTyxDQUFDO0FBQzFCLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFDaEMsT0FBTyxFQUFFLFVBQVUsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLFVBQVUsRUFBRSxFQUFFLEVBQUUsR0FBRyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBUWxFLE1BQU0sT0FBTyxlQUFlO0lBQ0c7SUFBN0IsWUFBNkIsSUFBWTtRQUFaLFNBQUksR0FBSixJQUFJLENBQVE7SUFBRyxDQUFDO0lBRTdDLGdCQUFnQixDQUFJLEtBQWEsRUFBRSxhQUFzQjtRQUN2RCxNQUFNLFFBQVEsR0FBRyxhQUFhLElBQUksTUFBTSxFQUFFLENBQUM7UUFDM0MsTUFBTSxHQUFHLEdBQUcsR0FDVixJQUFJLENBQUMsSUFDUCw2QkFBNkIsUUFBUSxVQUFVLGtCQUFrQixDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7UUFDM0UsT0FBTyxJQUFJLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ2xDLENBQUM7SUFFRCxLQUFLLENBQUksS0FBYSxFQUFFLGFBQXNCO1FBQzVDLE1BQU0sUUFBUSxHQUFHLGFBQWEsSUFBSSxNQUFNLEVBQUUsQ0FBQztRQUUzQyxPQUFPLElBQUksQ0FDVCxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLElBQUksNkJBQTZCLFFBQVEsRUFBRSxFQUFFLEtBQUssRUFBRTtZQUNyRSxPQUFPLEVBQUU7Z0JBQ1AsY0FBYyxFQUFFLFlBQVk7Z0JBQzVCLE1BQU0sRUFBRSxrQkFBa0I7YUFDM0I7U0FDRixDQUFDLENBQ0gsQ0FBQyxJQUFJLENBQ0osR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxRQUFRLENB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

package.json

 {
   "name": "@orbitalhq/orbital-client",
-  "version": "0.1.0-alpha.1",
-  "description": "A library to execute TaxiQL queries against the Orbital query server",
+  "version": "0.1.0-alpha.2",
+  "description": "A library to execute TaxiQL queries against an Orbital query server",
   "main": "build/main/index.js",
@@ -10,6 +10,8 @@ "typings": "build/main/index.d.ts",
   "license": "MIT",
-  "keywords": [],
+  "keywords": [
+    "orbital"
+  ],
   "scripts": {
     "build": "run-p build:*",
-    "build:main": "cp -r bin/ build/bin && tsc -p tsconfig.json",
+    "build:main": "mkdir -p build && cp -r bin/ build/bin && tsc -p tsconfig.json",
     "build:module": "tsc -p tsconfig.module.json",
@@ -22,3 +24,2 @@ "fix": "run-s fix:*",
     "test:prettier": "prettier \"src/**/*.ts\" --list-different",
-    "test:unit": "nyc --silent ava",
     "check-cli": "run-s test diff-integration-tests check-integration-tests",
@@ -28,8 +29,2 @@ "check-integration-tests": "run-s check-integration-test:*",
     "watch:build": "tsc -p tsconfig.json -w",
-    "watch:test": "nyc --silent ava --watch",
-    "cov": "run-s build test:unit cov:html cov:lcov && open-cli coverage/index.html",
-    "cov:html": "nyc report --reporter=html",
-    "cov:lcov": "nyc report --reporter=lcov",
-    "cov:send": "run-s cov:lcov && codecov",
-    "cov:check": "nyc report && nyc check-coverage --lines 100 --functions 100 --branches 100",
     "doc": "run-s doc:html && open-cli build/docs/index.html",
@@ -41,3 +36,3 @@ "doc:html": "typedoc src/ --exclude **/*.spec.ts --out build/docs",
     "reset-hard": "git clean -dfx && git reset --hard && npm i",
-    "prepare-release": "run-s reset-hard test cov:check doc:html version doc:publish",
+    "prepare-release": "run-s reset-hard test doc:html version doc:publish",
     "release": "npm publish --access public"
@@ -48,8 +43,11 @@ },
   },
-  "dependencies": {
+  "dependencies": {},
+  "peerDependencies": {
     "axios": "^0.27.2",
     "nanoid": "^3.3.4",
-    "rxjs": "^7.5.5"
+    "rxjs": "^7.x",
+    "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
+    "reflect-metadata": "^0.1.13",
     "@ava/typescript": "^3.0.1",
@@ -84,3 +82,3 @@ "@istanbuljs/nyc-config-typescript": "^1.0.1",
     "LICENSE",
-    "README.md",
+    "../README.md",
     "bin/orbital-generate.js"
@@ -87,0 +85,0 @@ ],

New alerts

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

No README

Quality

Package does not have a README. This may indicate a failed publish or a low quality package.

Found 1 instance in 1 package

Fixed alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

73954

increased by7.42%

Lines of code

908

increased by12.94%

Worsened metrics

Dependency count

4

increased by33.33%

Dev dependency count

22

increased by4.76%

Number of package files

23

decreased by-4.17%

Number of medium quality alerts

2

increased by100%

Number of lines in readme file

0

decreased by-100%

Dependency changes

• + Addedreflect-metadata@0.1.14(transitive)

• - Removedaxios@^0.27.2

• - Removednanoid@^3.3.4

• - Removedrxjs@^7.5.5