@telia-ace/widget-services 1.0.1 → 1.0.2

package/LICENSE.txt

@@ -1,6 +1,6 @@
-Copyright © 2021, Telia Company AB. All rights reserved.
-
-THIS PACKAGE AND CONTAINING SOFTWARE IS PART OF
-THE HUMANY SERVICE. BY USING THIS SOFTWARE YOU
-AGREE TO THE FOLLOWING TERMS AND CONDITIONS:
+Copyright © 2021, Telia Company AB. All rights reserved.
+
+THIS PACKAGE AND CONTAINING SOFTWARE IS PART OF
+THE HUMANY SERVICE. BY USING THIS SOFTWARE YOU
+AGREE TO THE FOLLOWING TERMS AND CONDITIONS:
 http://www.humany.com/legal

package/README.md

@@ -1,3 +1,3 @@
-# `@telia-ace/widget-services`
-
-Services for ACE Widgets.
+# `@telia-ace/widget-services`
+
+Services for ACE Widgets.

package/lib/storage/storage.d.ts

@@ -5,7 +5,7 @@ import { StorageCategory, StorageMedium, StorageWriter, StorageWriterOptions } f
  * @param container Widget Container.
  * @param key Key to use when writing.
  * @param category StorageCategory to use when writing.
- * @param options StorageWriterOptions to use when writing default {scope: StorageScope.Widget, medium = StorageMedium.Session, duration = {days: 30}}.
+ * @param options StorageWriterOptions to use when writing default {scope: StorageScope.Widget, medium = StorageMedium.Session, duration = infinite }.
  * @returns a function to be used to write a value to the storage using given settings.
  */
 export declare const createStorageWriter: (container: Container, key: string, category: StorageCategory, options?: StorageWriterOptions) => Promise<StorageWriter>;

package/lib/storage/storage.js

@@ -9,7 +9,7 @@ var utils_1 = require("./utils");
  * @param container Widget Container.
  * @param key Key to use when writing.
  * @param category StorageCategory to use when writing.
- * @param options StorageWriterOptions to use when writing default {scope: StorageScope.Widget, medium = StorageMedium.Session, duration = {days: 30}}.
+ * @param options StorageWriterOptions to use when writing default {scope: StorageScope.Widget, medium = StorageMedium.Session, duration = infinite }.
  * @returns a function to be used to write a value to the storage using given settings.
  */
 var createStorageWriter = function (container, key, category, options) {
@@ -29,7 +29,7 @@ var createStorageWriter = function (container, key, category, options) {
                     }
                     return;
                 }
-                var _a = options.scope, scope = _a === void 0 ? types_1.StorageScope.Widget : _a, _b = options.medium, medium = _b === void 0 ? types_1.StorageMedium.Session : _b, _c = options.duration, duration = _c === void 0 ? { days: 30 } : _c;
+                var _a = options.scope, scope = _a === void 0 ? types_1.StorageScope.Widget : _a, _b = options.medium, medium = _b === void 0 ? types_1.StorageMedium.Session : _b, duration = options.duration;
                 var store = (0, utils_1.createEmptyStore)();
                 store[scope][key] = (0, utils_1.createValue)(value, category, duration);
                 if (medium === types_1.StorageMedium.Cookie)

package/lib/storage/types.d.ts

@@ -18,7 +18,7 @@ export declare type StorageContainer = {
 };
 export declare type StoredValue = {
     value: any;
-    expiration: string;
+    expiration?: string;
     category: StorageCategory;
 };
 export declare enum StorageCategory {

package/lib/storage/utils.d.ts

@@ -1,9 +1,9 @@
 import { Container } from '@webprovisions/platform';
 import { Duration, StorageCategory, StorageMedium, Store, StoredValue } from './types';
 export declare const createEmptyStore: () => Store;
-export declare const isExpired: (isoDateString: string) => boolean;
+export declare const isExpired: (isoDateString?: string | undefined) => boolean;
 export declare const getValue: <Type>(store: Store, key: string) => Type | undefined;
-export declare const createValue: (value: any, category: StorageCategory, duration: Duration | string) => StoredValue;
+export declare const createValue: (value: any, category: StorageCategory, duration?: string | Duration | undefined) => StoredValue;
 export declare const processStore: (store: Store, policy?: StorageCategory[] | undefined) => Store;
 /**
  * @param category Storage Category.

package/lib/storage/utils.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -40,7 +51,11 @@ var cleanUndefined = function (object) {
     });
 };
 var mergeAndClean = function (target, source) {
-    var merged = (0, widget_utilities_1.mergeDeep)(target, source);
+    var merged = {
+        tenant: __assign(__assign({}, target.tenant), source.tenant),
+        implementation: __assign(__assign({}, target.implementation), source.implementation),
+        widget: __assign(__assign({}, target.widget), source.widget)
+    };
     cleanUndefined(merged.tenant);
     cleanUndefined(merged.implementation);
     cleanUndefined(merged.widget);
@@ -51,7 +66,8 @@ var getLongestExpirationDate = function (store) {
         var _a = __read(storeEntry, 2), _ = _a[0], container = _a[1];
         Object.entries(container).forEach(function (containerEntry) {
             var _a = __read(containerEntry, 2), _ = _a[0], expiration = _a[1].expiration;
-            acc.push(expiration);
+            if (expiration)
+                acc.push(expiration);
         });
         return acc;
     }, []);
@@ -131,6 +147,8 @@ var setApplicationStore = function (container, applicationStorage, store) {
 var createEmptyStore = function () { return ({ tenant: {}, implementation: {}, widget: {} }); };
 exports.createEmptyStore = createEmptyStore;
 var isExpired = function (isoDateString) {
+    if (!isoDateString)
+        return false;
     return !!isoDateString && new Date() > new Date(isoDateString);
 };
 exports.isExpired = isExpired;
@@ -140,10 +158,16 @@ var getValue = function (store, key) {
 };
 exports.getValue = getValue;
 var createValue = function (value, category, duration) {
+    if (duration) {
+        return {
+            value: value,
+            category: category,
+            expiration: typeof duration === 'object' ? (0, exports.createExpirationDate)(duration) : duration,
+        };
+    }
     return {
         value: value,
         category: category,
-        expiration: typeof duration === 'object' ? (0, exports.createExpirationDate)(duration) : duration,
     };
 };
 exports.createValue = createValue;

package/lib-esm/storage/storage.d.ts

@@ -5,7 +5,7 @@ import { StorageCategory, StorageMedium, StorageWriter, StorageWriterOptions } f
  * @param container Widget Container.
  * @param key Key to use when writing.
  * @param category StorageCategory to use when writing.
- * @param options StorageWriterOptions to use when writing default {scope: StorageScope.Widget, medium = StorageMedium.Session, duration = {days: 30}}.
+ * @param options StorageWriterOptions to use when writing default {scope: StorageScope.Widget, medium = StorageMedium.Session, duration = infinite }.
  * @returns a function to be used to write a value to the storage using given settings.
  */
 export declare const createStorageWriter: (container: Container, key: string, category: StorageCategory, options?: StorageWriterOptions) => Promise<StorageWriter>;

package/lib-esm/storage/storage.js

@@ -6,7 +6,7 @@ import { createEmptyStore, createValue, getApplicationStoreAsync, getCookieStore
  * @param container Widget Container.
  * @param key Key to use when writing.
  * @param category StorageCategory to use when writing.
- * @param options StorageWriterOptions to use when writing default {scope: StorageScope.Widget, medium = StorageMedium.Session, duration = {days: 30}}.
+ * @param options StorageWriterOptions to use when writing default {scope: StorageScope.Widget, medium = StorageMedium.Session, duration = infinite }.
  * @returns a function to be used to write a value to the storage using given settings.
  */
 export var createStorageWriter = function (container, key, category, options) {
@@ -26,7 +26,7 @@ export var createStorageWriter = function (container, key, category, options) {
                     }
                     return;
                 }
-                var _a = options.scope, scope = _a === void 0 ? StorageScope.Widget : _a, _b = options.medium, medium = _b === void 0 ? StorageMedium.Session : _b, _c = options.duration, duration = _c === void 0 ? { days: 30 } : _c;
+                var _a = options.scope, scope = _a === void 0 ? StorageScope.Widget : _a, _b = options.medium, medium = _b === void 0 ? StorageMedium.Session : _b, duration = options.duration;
                 var store = createEmptyStore();
                 store[scope][key] = createValue(value, category, duration);
                 if (medium === StorageMedium.Cookie)

package/lib-esm/storage/types.d.ts

@@ -18,7 +18,7 @@ export declare type StorageContainer = {
 };
 export declare type StoredValue = {
     value: any;
-    expiration: string;
+    expiration?: string;
     category: StorageCategory;
 };
 export declare enum StorageCategory {

package/lib-esm/storage/utils.d.ts

@@ -1,9 +1,9 @@
 import { Container } from '@webprovisions/platform';
 import { Duration, StorageCategory, StorageMedium, Store, StoredValue } from './types';
 export declare const createEmptyStore: () => Store;
-export declare const isExpired: (isoDateString: string) => boolean;
+export declare const isExpired: (isoDateString?: string | undefined) => boolean;
 export declare const getValue: <Type>(store: Store, key: string) => Type | undefined;
-export declare const createValue: (value: any, category: StorageCategory, duration: Duration | string) => StoredValue;
+export declare const createValue: (value: any, category: StorageCategory, duration?: string | Duration | undefined) => StoredValue;
 export declare const processStore: (store: Store, policy?: StorageCategory[] | undefined) => Store;
 /**
  * @param category Storage Category.

package/lib-esm/storage/utils.js

@@ -1,3 +1,14 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -14,7 +25,7 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-import { deepClone, hash, lock, mergeDeep } from '@telia-ace/widget-utilities';
+import { deepClone, hash, lock } from '@telia-ace/widget-utilities';
 import { readStorage } from './storage';
 import { StorageCategory, StorageMedium, } from './types';
 var hasEntries = function (object) {
@@ -37,7 +48,11 @@ var cleanUndefined = function (object) {
     });
 };
 var mergeAndClean = function (target, source) {
-    var merged = mergeDeep(target, source);
+    var merged = {
+        tenant: __assign(__assign({}, target.tenant), source.tenant),
+        implementation: __assign(__assign({}, target.implementation), source.implementation),
+        widget: __assign(__assign({}, target.widget), source.widget)
+    };
     cleanUndefined(merged.tenant);
     cleanUndefined(merged.implementation);
     cleanUndefined(merged.widget);
@@ -48,7 +63,8 @@ var getLongestExpirationDate = function (store) {
         var _a = __read(storeEntry, 2), _ = _a[0], container = _a[1];
         Object.entries(container).forEach(function (containerEntry) {
             var _a = __read(containerEntry, 2), _ = _a[0], expiration = _a[1].expiration;
-            acc.push(expiration);
+            if (expiration)
+                acc.push(expiration);
         });
         return acc;
     }, []);
@@ -127,6 +143,8 @@ var setApplicationStore = function (container, applicationStorage, store) {
 };
 export var createEmptyStore = function () { return ({ tenant: {}, implementation: {}, widget: {} }); };
 export var isExpired = function (isoDateString) {
+    if (!isoDateString)
+        return false;
     return !!isoDateString && new Date() > new Date(isoDateString);
 };
 export var getValue = function (store, key) {
@@ -134,10 +152,16 @@ export var getValue = function (store, key) {
     return storedValue === null || storedValue === void 0 ? void 0 : storedValue.value;
 };
 export var createValue = function (value, category, duration) {
+    if (duration) {
+        return {
+            value: value,
+            category: category,
+            expiration: typeof duration === 'object' ? createExpirationDate(duration) : duration,
+        };
+    }
     return {
         value: value,
         category: category,
-        expiration: typeof duration === 'object' ? createExpirationDate(duration) : duration,
     };
 };
 export var processStore = function (store, policy) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@telia-ace/widget-services",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "Services for ACE Widgets.",
     "license": "SEE LICENSE IN LICENSE.txt",
     "author": "Telia Company AB",
@@ -30,5 +30,5 @@
     "devDependencies": {
         "@webprovisions/platform": "^1.1.2"
     },
-    "gitHead": "988b0637c7ecce474bf92cb793007f9f5b5fcd13"
+    "gitHead": "be897e98ff1107e9f7ccf62c3a79d331ad0a03a6"
 }