@lenne.tech/ng-base 0.0.9 → 0.2.1

package/bundles/lenne.tech-ng-base-src-lib-base.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('apollo-angular'), require('apollo-angular/http'), require('@angular/core'), require('rxjs'), require('@apollo/client/core'), require('@apollo/client/cache'), require('@angular/platform-browser'), require('@angular/router'), require('graphql'), require('rxjs/operators')) :
-    typeof define === 'function' && define.amd ? define('@lenne.tech/ng-base/src/lib/base', ['exports', 'apollo-angular', 'apollo-angular/http', '@angular/core', 'rxjs', '@apollo/client/core', '@apollo/client/cache', '@angular/platform-browser', '@angular/router', 'graphql', 'rxjs/operators'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.lenne = global.lenne || {}, global.lenne.tech = global.lenne.tech || {}, global.lenne.tech['ng-base'] = global.lenne.tech['ng-base'] || {}, global.lenne.tech['ng-base'].src = global.lenne.tech['ng-base'].src || {}, global.lenne.tech['ng-base'].src.lib = global.lenne.tech['ng-base'].src.lib || {}, global.lenne.tech['ng-base'].src.lib.base = {}), global.i1$1, global.http, global.ng.core, global.rxjs, global.core, global.cache, global.ng.platformBrowser, global.ng.router, global.graphql, global.rxjs.operators));
-}(this, (function (exports, i1$1, http, i0, rxjs, core, cache, i1, i1$2, graphql, operators) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('apollo-angular'), require('apollo-angular/http'), require('@angular/core'), require('rxjs'), require('@apollo/client/core'), require('@apollo/client/cache'), require('@apollo/client/link/ws'), require('@apollo/client/utilities'), require('@angular/platform-browser'), require('@angular/router'), require('graphql'), require('rxjs/operators')) :
+    typeof define === 'function' && define.amd ? define('@lenne.tech/ng-base/src/lib/base', ['exports', 'apollo-angular', 'apollo-angular/http', '@angular/core', 'rxjs', '@apollo/client/core', '@apollo/client/cache', '@apollo/client/link/ws', '@apollo/client/utilities', '@angular/platform-browser', '@angular/router', 'graphql', 'rxjs/operators'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.lenne = global.lenne || {}, global.lenne.tech = global.lenne.tech || {}, global.lenne.tech["ng-base"] = global.lenne.tech["ng-base"] || {}, global.lenne.tech["ng-base"].src = global.lenne.tech["ng-base"].src || {}, global.lenne.tech["ng-base"].src.lib = global.lenne.tech["ng-base"].src.lib || {}, global.lenne.tech["ng-base"].src.lib.base = {}), global.i1$1, global.http, global.ng.core, global.rxjs, global.core, global.cache, global.ws, global.utilities, global.ng.platformBrowser, global.ng.router, global.graphql, global.rxjs.operators));
+})(this, (function (exports, i1$1, http, i0, rxjs, core, cache, ws, utilities, i1, i1$2, graphql, operators) { 'use strict';
 
     function _interopNamespace(e) {
         if (e && e.__esModule) return e;
@@ -13,14 +13,12 @@
                     var d = Object.getOwnPropertyDescriptor(e, k);
                     Object.defineProperty(n, k, d.get ? d : {
                         enumerable: true,
-                        get: function () {
-                            return e[k];
-                        }
+                        get: function () { return e[k]; }
                     });
                 }
             });
         }
-        n['default'] = e;
+        n["default"] = e;
         return Object.freeze(n);
     }
 
@@ -573,7 +571,8 @@
      * Factory for apollo-angular options
      */
     function apolloOptionsFactory(baseModuleConfig, httpLink, authService) {
-        var link = httpLink.create({
+        var links = [];
+        var http = httpLink.create({
             uri: baseModuleConfig.apiUrl,
         });
         var authMiddleware = new core.ApolloLink(function (operation, forward) {
@@ -587,8 +586,45 @@
             }
             return forward(operation);
         });
+        if (baseModuleConfig.wsUrl) {
+            var wsClient = void 0;
+            if (localStorage) {
+                var token = authService.token || null;
+                wsClient = new ws.WebSocketLink({
+                    uri: baseModuleConfig.wsUrl,
+                    options: {
+                        reconnect: true,
+                        connectionParams: {
+                            authToken: token,
+                        },
+                    },
+                });
+            }
+            else {
+                wsClient = new ws.WebSocketLink({
+                    uri: baseModuleConfig.wsUrl,
+                    options: {
+                        reconnect: true,
+                    },
+                });
+            }
+            // using the ability to split links, you can send data to each link
+            // depending on what kind of operation is being sent
+            links.push(core.split(
+            // split based on operation type
+            function (_a) {
+                var query = _a.query;
+                // @ts-ignore
+                var _b = utilities.getMainDefinition(query), kind = _b.kind, operation = _b.operation;
+                return kind === 'OperationDefinition' && operation === 'subscription';
+            }, wsClient, core.concat(authMiddleware, http)));
+        }
+        else {
+            links.push(http);
+            links.push(authMiddleware);
+        }
         return {
-            link: core.ApolloLink.from([authMiddleware, link]),
+            link: core.ApolloLink.from(links),
             cache: new cache.InMemoryCache(),
             defaultOptions: {
                 query: {
@@ -945,7 +981,7 @@
         ResizableDirective,
         // Pipes
         EllipsesPipe,
-        SafeHtmlPipe
+        SafeHtmlPipe,
     ];
     /**
      * Base module
@@ -959,20 +995,29 @@
         BaseModule.forRoot = function (baseModuleConfig) {
             if (baseModuleConfig === void 0) { baseModuleConfig = {}; }
             // Default config
-            var config = Object.assign({ apiUrl: 'localhost:300', authGuardRedirectUrl: '/auth', version: null, prefix: null, scrollDetectionOffset: 200, scrollOffset: 100, storageType: 'local' }, baseModuleConfig);
+            var config = Object.assign({ apiUrl: 'localhost:3000', authGuardRedirectUrl: '/auth', logging: false, version: null, prefix: null, scrollDetectionOffset: 200, scrollOffset: 100, storageType: 'local' }, baseModuleConfig);
+            // Prepare providers
+            var providers = [
+                {
+                    provide: BASE_MODULE_CONFIG,
+                    useValue: baseModuleConfig,
+                },
+            ];
+            // Add apollo features if API URL is set
+            if (baseModuleConfig.apiUrl) {
+                providers.push({
+                    provide: i1$1.APOLLO_OPTIONS,
+                    useFactory: apolloOptionsFactory,
+                    deps: [BASE_MODULE_CONFIG, http.HttpLink, AuthService],
+                });
+            }
+            else if (config.logging) {
+                console.log('apiUrl is missing, ApolloLink is not initialized');
+            }
+            // Return root module
             return {
                 ngModule: BaseModule,
-                providers: [
-                    {
-                        provide: BASE_MODULE_CONFIG,
-                        useValue: baseModuleConfig
-                    },
-                    {
-                        provide: i1$1.APOLLO_OPTIONS,
-                        useFactory: apolloOptionsFactory,
-                        deps: [BASE_MODULE_CONFIG, http.HttpLink, AuthService],
-                    }
-                ]
+                providers: providers,
             };
         };
         return BaseModule;
@@ -980,7 +1025,7 @@
     BaseModule.decorators = [
         { type: i0.NgModule, args: [{
                     declarations: elements,
-                    exports: elements
+                    exports: elements,
                 },] }
     ];
 
@@ -2061,13 +2106,29 @@
                     var documentNode = fields
                         ? i1$1.gql(config.type + '{\n' + graphql + args + fields + '\n}')
                         : i1$1.gql(config.type + '{\n' + graphql + args + '\n}');
+                    // Log
+                    if (config.log) {
+                        console.log({ documentNode: documentNode });
+                    }
                     var request = {};
                     request[config.type] = documentNode;
                     // Log
                     if (config.log) {
                         console.log({ request: request });
                     }
-                    var func = config.type === exports.GraphQLRequestType.MUTATION ? 'mutate' : config.type;
+                    var func;
+                    if (config.type === exports.GraphQLRequestType.MUTATION) {
+                        func = 'mutate';
+                        request[config.type] = documentNode;
+                    }
+                    else if (config.type === exports.GraphQLRequestType.SUBSCRIPTION) {
+                        func = 'subscribe';
+                        request.query = documentNode;
+                    }
+                    else {
+                        func = config.type;
+                        request[config.type] = documentNode;
+                    }
                     _this.apollo[func](request).subscribe(function (result) {
                         var _a;
                         var data = ((_a = result === null || result === void 0 ? void 0 : result.data) === null || _a === void 0 ? void 0 : _a[graphql]) !== undefined ? result.data[graphql] : result;
@@ -2085,8 +2146,10 @@
                         else {
                             subscriber.next(config.model.map(data));
                         }
-                        // Done
-                        subscriber.complete();
+                        if (config.type !== exports.GraphQLRequestType.SUBSCRIPTION) {
+                            // Done
+                            subscriber.complete();
+                        }
                     }, function (error) {
                         subscriber.error(error);
                         subscriber.complete();
@@ -2097,19 +2160,29 @@
         /**
          * Get fields / args from IGraphQLTypeCollection
          */
-        GraphQLService.prototype.graphQLTypeCollectionToStringArray = function (collection, current, result) {
+        GraphQLService.prototype.graphQLTypeCollectionToStringArray = function (collection, current, result, cacheNode) {
             var e_1, _b;
             if (current === void 0) { current = ''; }
             if (result === void 0) { result = []; }
+            if (cacheNode === void 0) { cacheNode = []; }
             if (collection) {
                 if (collection instanceof GraphQLType) {
                     result.push(current);
                 }
                 else {
+                    if (current === null || current === void 0 ? void 0 : current.includes('.')) {
+                        cacheNode.push(current.split('.')[1]);
+                    }
+                    else if (current) {
+                        cacheNode.push(current);
+                    }
                     try {
                         for (var _c = __values(Object.keys(collection)), _d = _c.next(); !_d.done; _d = _c.next()) {
                             var key = _d.value;
-                            this.graphQLTypeCollectionToStringArray(collection[key], current ? current + '.' + key : key, result);
+                            if (current === key || cacheNode.includes(key)) {
+                                continue;
+                            }
+                            this.graphQLTypeCollectionToStringArray(collection[key], current ? current + '.' + key : key, result, cacheNode);
                         }
                     }
                     catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -2130,13 +2203,13 @@
             var e_2, _b, e_3, _c;
             var _this = this;
             if (options === void 0) { options = {}; }
-            // Config
+            // Init config variables
             var _d = Object.assign({ allowed: null, level: 1, parent: '', schemaArgs: [], usedArgs: [] }, options), allowed = _d.allowed, level = _d.level, parent = _d.parent, schemaArgs = _d.schemaArgs, usedArgs = _d.usedArgs;
             // Check args
-            if (!args) {
+            if (args === undefined || args === null) {
                 return { argsString: '', schemaArgs: schemaArgs, usedArgs: usedArgs };
             }
-            // Process args
+            // Init args
             var result = [];
             // Process array
             if (Array.isArray(args)) {
@@ -2151,6 +2224,7 @@
                             }
                             key = allowedKeys === null || allowedKeys === void 0 ? void 0 : allowedKeys.shift();
                         }
+                        // Process value
                         result.push(this.prepareArguments(item, {
                             allowed: key ? allowed[key] : null,
                             level: level + 1,
@@ -2167,10 +2241,13 @@
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
+                // Encapsulation of the array result
                 if (result.length) {
+                    // Complete result, encapsulated via round brackets
                     if (level === 1) {
                         return { argsString: '(' + result.join(', ') + ')', schemaArgs: schemaArgs, usedArgs: usedArgs };
                     }
+                    // Deeper result part, encapsulated via square brackets
                     else {
                         return { argsString: '[' + result.join(', ') + ']', schemaArgs: schemaArgs, usedArgs: usedArgs };
                     }
@@ -2178,54 +2255,81 @@
             }
             // Process object
             else if (typeof args === 'object') {
+                // Check object is empty
+                if (args && Object.keys(args).length === 0 && Object.getPrototypeOf(args) === Object.prototype) {
+                    return { argsString: '{}', schemaArgs: schemaArgs, usedArgs: usedArgs };
+                }
                 var _loop_1 = function (key, value) {
+                    // Init data for current entry
                     var currentKey = parent + key;
                     schemaArgs.push(currentKey);
+                    // If the allowed key handling is enabled and the current key is not included in the list of allowed keys,
+                    // the current key will be skipped
                     if (allowed && !allowed[key]) {
                         return "continue";
                     }
-                    if (value !== undefined && value !== null) {
-                        usedArgs.push(currentKey);
-                        if (value instanceof GraphQLEnum) {
-                            result.push(key + ':' + value.value);
-                            return "continue";
+                    // Skip value if not exists
+                    if (value === undefined && value === null) {
+                        return "continue";
+                    }
+                    // Add current key to metadata
+                    usedArgs.push(currentKey);
+                    // Process GraphQLEnum
+                    if (value instanceof GraphQLEnum) {
+                        result.push(key + ':' + value.value);
+                        return "continue";
+                    }
+                    // Process array
+                    else if (Array.isArray(value)) {
+                        result.push(key +
+                            ': [' +
+                            value.map(function (item) { return _this.prepareArguments(item, {
+                                allowed: allowed[key],
+                                level: level + 1,
+                                parent: currentKey + '.',
+                                schemaArgs: schemaArgs,
+                                usedArgs: usedArgs,
+                            }).argsString; }) +
+                            ']');
+                        return "continue";
+                    }
+                    // Prepare additional result string
+                    var additionalResult = key + ': ';
+                    // Value is a date object
+                    if (typeof value === 'object' && Object.prototype.toString.call(value) === '[object Date]') {
+                        additionalResult += "\"\"\"" + value.toString() + "\"\"\"";
+                    }
+                    // Value is a string
+                    else if (typeof value === 'string') {
+                        // Enum (doesn't need quotation marks)
+                        if (allowed[key].isEnum) {
+                            additionalResult += value;
                         }
-                        if (Array.isArray(value)) {
-                            result.push(key +
-                                ': [' +
-                                value.map(function (item) { return _this.prepareArguments(item, {
-                                    allowed: allowed[key],
-                                    level: level + 1,
-                                    parent: currentKey + '.',
-                                    schemaArgs: schemaArgs,
-                                    usedArgs: usedArgs,
-                                }).argsString; }) +
-                                ']');
-                            return "continue";
+                        // String
+                        else {
+                            additionalResult += "\"\"\"" + value.replace(/"/g, '\\"') + "\"\"\"";
                         }
-                        result.push(key +
-                            ': ' +
-                            (typeof value === 'string' ||
-                                typeof value === 'boolean' ||
-                                Object.prototype.toString.call(value) === '[object Date]'
-                                ? allowed[key].isEnum
-                                    ? value
-                                    : typeof value === 'string'
-                                        ? "\"\"\"" + value.replace(/"/g, '\\"') + "\"\"\""
-                                        : Object.prototype.toString.call(value) === '[object Date]'
-                                            ? "\"\"\"" + value.toString() + "\"\"\""
-                                            : value
-                                : this_1.prepareArguments(value, {
-                                    allowed: allowed[key],
-                                    level: level + 1,
-                                    parent: currentKey + '.',
-                                    schemaArgs: schemaArgs,
-                                    usedArgs: usedArgs,
-                                }).argsString));
                     }
+                    // Value is a simple boolean or a number
+                    else if (typeof value === 'boolean' || typeof value === 'number') {
+                        additionalResult += value;
+                    }
+                    // Others
+                    else {
+                        additionalResult += this_1.prepareArguments(value, {
+                            allowed: allowed[key],
+                            level: level + 1,
+                            parent: currentKey + '.',
+                            schemaArgs: schemaArgs,
+                            usedArgs: usedArgs,
+                        }).argsString;
+                    }
+                    // Push deeper part into result array
+                    result.push(additionalResult);
                 };
                 var this_1 = this;
                 try {
+                    // Process all object entries
                     for (var _e = __values(Object.entries(args)), _f = _e.next(); !_f.done; _f = _e.next()) {
                         var _g = __read(_f.value, 2), key = _g[0], value = _g[1];
                         _loop_1(key, value);
@@ -2238,16 +2342,19 @@
                     }
                     finally { if (e_3) throw e_3.error; }
                 }
+                // Encapsulation of the object result
                 if (result.length) {
+                    // Complete result, encapsulated via round brackets
                     if (level === 1) {
                         return { argsString: '(' + result.join(', ') + ')', schemaArgs: schemaArgs, usedArgs: usedArgs };
                     }
+                    // Deeper result part, encapsulated via curly brackets
                     else {
                         return { argsString: '{' + result.join(', ') + '}', schemaArgs: schemaArgs, usedArgs: usedArgs };
                     }
                 }
             }
-            // Others
+            // Prepare and process other / unknown values as JSON
             else {
                 return { argsString: JSON.stringify(args), schemaArgs: schemaArgs, usedArgs: usedArgs };
             }
@@ -2432,7 +2539,9 @@
                     }
                     subscriber.next(response);
                     _this.handleLoader('stop', options);
-                    subscriber.complete();
+                    if (options.type !== exports.GraphQLRequestType.SUBSCRIPTION) {
+                        subscriber.complete();
+                    }
                 }, function (error) {
                     if (!options.ignoreErrors) {
                         _this.handleError(error, options.excludedErrors);
@@ -2668,5 +2777,5 @@
 
     Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
 //# sourceMappingURL=lenne.tech-ng-base-src-lib-base.umd.js.map