@kwiz/common 1.0.72 → 1.0.74

package/src/helpers/sharepoint.ts

@@ -1,4 +1,6 @@
-import { FieldTypeAsString, FieldTypes, IDictionary, IFieldCalculatedInfo, IFieldInfo, IFieldInfoEX, IFieldJsonSchema, IFieldTaxonomyInfo, PrincipalType, RententionLabelFieldValueType, SPBasePermissionKind, ThumbnailValueType, UrlValueType, UserEntityValueType } from "./_dependencies";
+import { IDictionary } from "../types/common.types";
+import { FieldTypeAsString, FieldTypes, IFieldCalculatedInfo, IFieldInfo, IFieldInfoEX, IFieldJsonSchema, IFieldTaxonomyInfo, PrincipalType, RententionLabelFieldValueType, SPBasePermissionKind, ThumbnailValueType, UrlValueType } from "../types/sharepoint.types";
+import { UserEntityValueType } from "../types/sharepoint.utils.types";
 import { waitFor, waitForWindowObject } from "./browser";
 import { firstOrNull, forEach } from "./collections.base";
 import { deleteCookie, getCookie, setCookie } from "./cookies";

package/src/helpers/strings.ts

@@ -1,4 +1,4 @@
-import { IDictionary } from "./_dependencies";
+import { IDictionary } from "../types/common.types";
 import { makeUniqueArray } from "./collections.base";
 import { isNullOrEmptyString, isNullOrUndefined, isNumber, isString } from "./typecheckers";
 

package/src/helpers/url.ts

@@ -1,4 +1,4 @@
-import { IDictionary } from "./_dependencies";
+import { IDictionary } from "../types/common.types";
 import { ArrayFill, lastOrNull } from "./collections.base";
 import { isNullOrEmptyString, isString } from "./typecheckers";
 import { URLHelper } from "./urlhelper";

package/src/utils/auth/discovery.ts

@@ -1,4 +1,6 @@
-import { AzureEnvironment, ITenantInfo, isNullOrEmptyString, isValidGuid, promiseOnce } from "../_dependencies";
+import { promiseOnce } from "../../helpers/promises";
+import { isNullOrEmptyString, isValidGuid } from "../../helpers/typecheckers";
+import { AzureEnvironment, ITenantInfo } from "../../types/auth";
 import { GetJson, GetJsonSync } from "../rest";
 
 interface IOpenidConfiguration {

package/src/utils/base64.ts

@@ -1,4 +1,5 @@
-import { blobToBase64, isNullOrEmptyString } from "./_dependencies";
+import { blobToBase64 } from "../helpers/base64";
+import { isNullOrEmptyString } from "../helpers/typecheckers";
 import { GetJson } from "./rest";
 import { GetFile } from "./sharepoint.rest/file.folder";
 

package/src/utils/consolelogger.ts

@@ -1,4 +1,10 @@
-import { BuildNumber, IDictionary, ReleaseStatus, consoleLoggerFilter, getGlobal, getSecondsElapsed, isDebug, isFunction, isNullOrEmptyString, isNumber, isNumeric, isString, padLeft, padRight } from "./_dependencies";
+import { BuildNumber, ReleaseStatus } from "../_dependencies";
+import { getSecondsElapsed } from "../helpers/date";
+import { consoleLoggerFilter, isDebug } from "../helpers/debug";
+import { getGlobal } from "../helpers/objects";
+import { padLeft, padRight } from "../helpers/strings";
+import { isFunction, isNullOrEmptyString, isNumber, isNumeric, isString } from "../helpers/typecheckers";
+import { IDictionary } from "../types/common.types";
 
 const DEFAULT_LOGGER_NAME = "DEFAULT";
 const LoggerPrefix = "[kw]";

package/src/utils/date.ts

@@ -1,4 +1,4 @@
-import { isBoolean, isFunction } from "./_dependencies";
+import { isBoolean, isFunction } from "../helpers/typecheckers";
 import { LocaleKnownScript } from "./knownscript";
 
 /** return date format as yyyy-MM-ddTHH:mm:ssZ

package/src/utils/emails.ts

@@ -1,4 +1,4 @@
-import { isValidEmail } from "./_dependencies";
+import { isValidEmail } from "../helpers/emails";
 import { GetJsonSync, longLocalCache } from "./rest";
 
 

package/src/utils/knownscript.ts

@@ -1,5 +1,11 @@
+import { assign } from "../helpers/objects";
+import { isNullOrUndefined } from "../helpers/typecheckers";
+import { IKnownScript, ksGlobal } from "../types/knownscript.types";
+import { IDataJs } from "../types/libs/datajs.types";
+import { ICS } from "../types/libs/ics.types";
+import { IMSAL } from "../types/libs/msal.types";
+import { IKLocales } from "../types/locales";
 import { typeMomentJS, typeMonentJSTimeZone } from "../types/moment";
-import { ICS, IDataJs, IKLocales, IKnownScript, IMSAL, assign, isNullOrUndefined, ksGlobal } from "./_dependencies";
 import script from "./script";
 
 /** /products/common/scripts/ */

package/src/utils/localstoragecache.ts

@@ -1,4 +1,10 @@
-import { $w, ILocalStorageCacheLifetime, flatted, getGlobal, isDate, isDebug, isNullOrEmptyString, isNullOrUndefined, isNumber, jsonParse, sizeOf } from "./_dependencies";
+import { sizeOf } from "../helpers/collections.base";
+import { isDebug } from "../helpers/debug";
+import { flatted } from "../helpers/flatted";
+import { jsonParse } from "../helpers/json";
+import { getGlobal } from "../helpers/objects";
+import { isDate, isNullOrEmptyString, isNullOrUndefined, isNumber } from "../helpers/typecheckers";
+import { ILocalStorageCacheLifetime } from "../types/localstoragecache.types";
 import { ConsoleLogger } from "./consolelogger";
 
 /**key with prefix, value is a date string */
@@ -17,11 +23,30 @@ export const DEFAULT_EXPIRATION = 20 * 60 * 1000; // 20 minutes;
  * and all client side apps will need to be rebuilt */
 export const MODULE_REVISION = "1";
 /** key (no prefix) is kept in lower case. not case sensitive */
-var _cache = getGlobal<{
-    purgeCalled: boolean;
-    expirations: IExpirationsDictionary;
-    [keyNoPrefixToLower: string]: any;
-}>("common_utils_localstoragecache_module_cache");
+
+function _getCache() {
+    let _cache = getGlobal<{
+        purgeCalled: boolean;
+        expirations: IExpirationsDictionary;
+        [keyNoPrefixToLower: string]: any;
+    }>("common_utils_localstoragecache_module_cache");
+
+    if (!_cache.purgeCalled) {
+        //issue 7081 - purge all orphans/expired items
+        _cache.purgeCalled = true;
+        //clear expired cache items.
+        (globalThis || window).setTimeout(() => {
+            purgeCache();
+            if (isDebug()) {
+                let size = _getStoredSize();
+                logger.debug(`Size of items in local storage: ${size}KB`);
+            }
+        }, 5000);
+    }
+
+    return _cache;
+}
+
 var _supportsLocalStorage: boolean = null;
 
 function _parseExpiration(exp: number | ILocalStorageCacheLifetime | Date): Date {
@@ -79,6 +104,7 @@ function _parseExpiration(exp: number | ILocalStorageCacheLifetime | Date): Date
 }
 
 function _getCacheExpirations(): IExpirationsDictionary {
+    let _cache = _getCache();
     if (isNullOrUndefined(_cache.expirations)) {
         _cache.expirations = jsonParse<IExpirationsDictionary>(_getItem(LOCAL_STORGAGE_EXPIRATIONS_KEY));
 
@@ -101,6 +127,7 @@ function _getCacheExpirations(): IExpirationsDictionary {
 }
 
 function _saveCacheExpirations() {
+    let _cache = _getCache();
     if (!isNullOrUndefined(_cache.expirations) && sizeOf(_cache.expirations) > 0) {
         _setItem(LOCAL_STORGAGE_EXPIRATIONS_KEY, JSON.stringify(_cache.expirations));
     }
@@ -108,9 +135,10 @@ function _saveCacheExpirations() {
         _removeItem(LOCAL_STORGAGE_EXPIRATIONS_KEY);
     }
 }
+
 function _setCacheExpiration(keyWithPrefix: string, expireDate: Date) {
     var expirations = _getCacheExpirations();
-    expirations[keyWithPrefix] = expireDate.toString();
+    expirations[keyWithPrefix] = expireDate.toISOString();
     _saveCacheExpirations();
 }
 
@@ -168,7 +196,7 @@ function _getStoredSize() {
     let keys = getCacheKeys();
     let total = 0;
     let length = 0;
-    let useBlob = 'Blob' in $w;
+    let useBlob = 'Blob' in (globalThis || window);
 
     keys.forEach((key) => {
         let v = _getItem(`${keyPrefix}${key}`);
@@ -211,6 +239,8 @@ export function getCacheItem<T>(key: string, options?: {
     key = key.toLowerCase();
     let keyWithPrefix = keyPrefix + key;
 
+    let _cache = _getCache();
+
     if (typeof (_cache[key]) !== "undefined"
         && _cache[key] !== null) {
         return _cache[key] as T;
@@ -269,12 +299,15 @@ export function setCacheItem(key: string, value: any, expiration: number | ILoca
             _setCacheExpiration(keyWithPrefix, expireDate);
         }
 
+        let _cache = _getCache();
+
         _cache[key] = value;
     }
 }
 
 export function removeCacheItem(key: string) {
     key = key.toLowerCase();
+    let _cache = _getCache();
     delete _cache[key];
     let keyWithPrefix = keyPrefix + key;
 
@@ -406,17 +439,4 @@ function purgeCache(removeAll?: boolean) {
 export function clearCache(): void {
     return purgeCache(true);
 }
-
-if (!_cache.purgeCalled) {
-    //issue 7081 - purge all orphans/expired items
-    _cache.purgeCalled = true;
-    //clear expired cache items.
-    $w.setTimeout(() => {
-        purgeCache();
-        if (isDebug()) {
-            let size = _getStoredSize();
-            logger.debug(`Size of items in local storage: ${size}KB`);
-        }
-    }, 3000);
-}
 //#endregion

package/src/utils/rest.ts

@@ -1,4 +1,8 @@
-import { AllRestCacheOptionsKeys, IDictionary, IJsonSyncResult, IRequestBody, IRequestObjects, IRestCacheOptions, IRestError, IRestOptions, IRestRequestOptions, assign, getGlobal, hasOwnProperty, isNullOrEmptyString, isNullOrUndefined, isNumber, isObject, isPrimitiveValue, isString, jsonClone, jsonParse, jsonTypes } from "./_dependencies";
+import { jsonParse } from "../helpers/json";
+import { assign, getGlobal, hasOwnProperty, jsonClone } from "../helpers/objects";
+import { isNullOrEmptyString, isNullOrUndefined, isNumber, isObject, isPrimitiveValue, isString } from "../helpers/typecheckers";
+import { IDictionary } from "../types/common.types";
+import { AllRestCacheOptionsKeys, IJsonSyncResult, IRequestBody, IRequestObjects, IRestCacheOptions, IRestError, IRestOptions, IRestRequestOptions, jsonTypes } from "../types/rest.types";
 import { ConsoleLogger } from "./consolelogger";
 import { getCacheItem, setCacheItem } from "./localstoragecache";
 import { getFormDigest } from "./sharepoint.rest/web";
@@ -36,9 +40,17 @@ interface IPendingRequest<T> {
 }
 
 //if allowCache is true, results will be stored/returned from here
-var _cachedResults = getGlobal<{ [key: string]: IJsonSyncResult<any>; }>("utils_restmodule_cachedResults");
+function _getCachedResults() {
+    var _cachedResults = getGlobal<{ [key: string]: IJsonSyncResult<any>; }>("utils_restmodule_cachedResults");
+    return _cachedResults;
+}
+
 //cannot use from top window, example: DVP, if you open view item popup and close it too fast, there might be a pending request that never resolves since the handler code was unloaded from the window.
-var _pendingRequests = getGlobal<IDictionary<IPendingRequest<any>>>("utils_restmodule_pendingRequests", undefined, true);
+function _getPendingRequests() {
+    var _pendingRequests = getGlobal<IDictionary<IPendingRequest<any>>>("utils_restmodule_pendingRequests", undefined, true);
+    return _pendingRequests;
+}
+
 
 function getDefaultOptions(): IRestOptions {
     return {
@@ -142,6 +154,7 @@ function getCachedResult<T>(objects: IRequestObjects): IJsonSyncResult<T> {
             return null;
         }
 
+        let _cachedResults = _getCachedResults();
         if (isNullOrUndefined(_cachedResults[cacheKey])) {
             //try to load from local storage
             let result = getCacheItem<IJsonSyncResult<T>>('jsr_' + cacheKey);
@@ -191,6 +204,7 @@ function setCachedResult<T>(cacheOptions: IRestCacheOptions & { cacheKey?: strin
     response.cachedTime = new Date().getTime();
     let isResultSerializable = _canSafelyStringify(response.result);
 
+    let _cachedResults = _getCachedResults();
     _cachedResults[cacheOptions.cacheKey] = {
         ...response,
         result: isResultSerializable ? jsonClone(response.result) : response.result
@@ -209,7 +223,9 @@ function getPendingRequest<T = any>(objects: IRequestObjects): IPendingRequest<T
     var cacheKey = objects.cacheOptions.cacheKey;
     // if (isNullOrEmptyString(cacheKey)) {
     //     logger.warn('cache is not supported for this type of request.');
-    // } 
+    // }
+
+    let _pendingRequests = _getPendingRequests();
 
     if (!isNullOrEmptyString(cacheKey) && !isNullOrUndefined(_pendingRequests[cacheKey])) {
         //returned from cache
@@ -240,6 +256,7 @@ function setPendingRequest<T = any>(cacheKey: string, objects: IRequestObjects,
         return null;
     }
 
+    let _pendingRequests = _getPendingRequests();
     _pendingRequests[cacheKey] = { objects: objects, promise: promise, listeners: [] };
     return _pendingRequests[cacheKey];
 }
@@ -250,6 +267,7 @@ function removePendingRequest(cacheKey: string) {
     }
 
     try {
+        let _pendingRequests = _getPendingRequests();
         _pendingRequests[cacheKey] = null;
         delete _pendingRequests[cacheKey];
     } catch (ex) {
@@ -477,6 +495,7 @@ export function GetJson<T>(url: string, body?: IRequestBody, options?: IRestOpti
 
 /** if you detected a change that invalidates all requests stored in memory - this will clear all in-memory cached results */
 export function GetJsonClearCache() {
+    let _cachedResults = _getCachedResults();
     Object.keys(_cachedResults).forEach(key => {
         delete _cachedResults[key];
     });

package/src/utils/script.ts

@@ -1,4 +1,7 @@
-import { IKnownScript, isDebug, isNotEmptyArray, isNullOrEmptyString, isNullOrUndefined, ksGlobal, noop } from "./_dependencies";
+import { isDebug } from "../helpers/debug";
+import { noop } from "../helpers/objects";
+import { isNotEmptyArray, isNullOrEmptyString, isNullOrUndefined } from "../helpers/typecheckers";
+import { IKnownScript, ksGlobal } from "../types/knownscript.types";
 import Sod from "./sod";
 
 export interface IScriptUtils {

package/src/utils/sharepoint.rest/date.ts

@@ -1,4 +1,6 @@
-import { DateOrNull, isDate, isISODate, isISODateUTC, isNullOrEmptyString, isNullOrUndefined } from "../_dependencies";
+import { isISODate, isISODateUTC } from "../../helpers/date";
+import { isDate, isNullOrEmptyString, isNullOrUndefined } from "../../helpers/typecheckers";
+import { DateOrNull } from "../../types/common.types";
 import { toIsoDateFormat } from "../date";
 import { LocaleKnownScript } from "../knownscript";
 import { SPServerLocalTimeToUTCSync } from "./web";

package/src/utils/sharepoint.rest/file.folder.ts

@@ -1,4 +1,10 @@
-import { FileLevel, IDictionary, IFileInfo, IFolderBasicInfo, IFolderInfo, IRequestBody, IRestOptions, IRestResponseType, ModerationStatus, encodeURIComponentEX, isNotEmptyArray, isNullOrEmptyString, isNullOrUndefined, isNumber, isNumeric, jsonStringify, jsonTypes, makeServerRelativeUrl, newGuid, normalizeUrl } from "../_dependencies";
+import { jsonStringify } from "../../helpers/json";
+import { isNotEmptyArray, isNullOrEmptyString, isNullOrUndefined, isNumber, isNumeric, newGuid } from "../../helpers/typecheckers";
+import { encodeURIComponentEX, makeServerRelativeUrl, normalizeUrl } from "../../helpers/url";
+import { IDictionary } from "../../types/common.types";
+import { IRequestBody, IRestOptions, IRestResponseType, jsonTypes } from "../../types/rest.types";
+import { IFolderBasicInfo, IFolderInfo } from "../../types/sharepoint.types";
+import { FileLevel, IFileInfo, ModerationStatus } from "../../types/sharepoint.utils.types";
 import { ConsoleLogger } from "../consolelogger";
 import { GetJson, GetJsonSync, longLocalCache, mediumLocalCache, noLocalCache, shortLocalCache } from "../rest";
 import { GetRestBaseUrl, GetSiteUrl } from "./common";

package/src/utils/sharepoint.rest/item.ts

@@ -1,5 +1,13 @@
+import { chunkArray } from "../../helpers/collections.base";
+import { hasOwnProperty } from "../../helpers/objects";
+import { promiseNParallel } from "../../helpers/promises";
+import { isBoolean, isDate, isNotEmptyArray, isNullOrEmptyArray, isNullOrEmptyString, isNullOrUndefined, isNumber, isObject, isString } from "../../helpers/typecheckers";
+import { encodeURIComponentEX } from "../../helpers/url";
+import { IDictionary } from "../../types/common.types";
+import { jsonTypes } from "../../types/rest.types";
+import { DateTimeFieldFormatType, IAttachmentInfo, IFieldCurrencyInfo, IFieldDateTimeInfo, IFieldInfoEX, IFieldNumberInfo, TaxonomyValueType } from "../../types/sharepoint.types";
+import { IRestItem } from "../../types/sharepoint.utils.types";
 import { LocaleKnownScript } from "../../utils/knownscript";
-import { DateTimeFieldFormatType, IAttachmentInfo, IDictionary, IFieldCurrencyInfo, IFieldDateTimeInfo, IFieldInfoEX, IFieldNumberInfo, IRestItem, TaxonomyValueType, chunkArray, encodeURIComponentEX, hasOwnProperty, isBoolean, isDate, isNotEmptyArray, isNullOrEmptyArray, isNullOrEmptyString, isNullOrUndefined, isNumber, isObject, isString, jsonTypes, promiseNParallel } from "../_dependencies";
 import { ConsoleLogger } from "../consolelogger";
 import { GetJson, GetJsonSync } from "../rest";
 import { GetFieldNameFromRawValues, GetSiteUrl, __getSPRestErrorData, getFieldNameForUpdate } from "./common";

package/src/utils/sharepoint.rest/list.ts

@@ -1,4 +1,13 @@
-import { BaseTypes, FieldTypeAsString, FieldTypes, GeListItemsFoldersBehaviour, IDictionary, IFieldInfo, IFieldInfoEX, IFieldInfoExHash, IFieldJsonSchema, IFieldLookupInfo, IListWorkflowAssociation, IRestItem, IRestOptions, ISPEventReceiver, ListExperienceOptions, ListTemplateTypes, NormalizeListName, PageType, PushNoDuplicate, SPBasePermissionKind, SPBasePermissions, SafeIfElse, SchemaXmlToJson, contentTypes, extendFieldInfo, firstOrNull, iContentType, iList, iListView, isBoolean, isNotEmptyArray, isNullOrEmptyArray, isNullOrEmptyString, isNullOrUndefined, isNumber, isPromise, isString, isValidGuid, jsonStringify, jsonTypes, makeServerRelativeUrl, makeUniqueArray, normalizeGuid, normalizeUrl, toHash } from "../_dependencies";
+import { PushNoDuplicate, firstOrNull, makeUniqueArray, toHash } from "../../helpers/collections.base";
+import { jsonStringify } from "../../helpers/json";
+import { NormalizeListName, SPBasePermissions, SchemaXmlToJson, extendFieldInfo } from "../../helpers/sharepoint";
+import { normalizeGuid } from "../../helpers/strings";
+import { SafeIfElse, isBoolean, isNotEmptyArray, isNullOrEmptyArray, isNullOrEmptyString, isNullOrUndefined, isNumber, isPromise, isString, isValidGuid } from "../../helpers/typecheckers";
+import { makeServerRelativeUrl, normalizeUrl } from "../../helpers/url";
+import { IDictionary } from "../../types/common.types";
+import { IRestOptions, contentTypes, jsonTypes } from "../../types/rest.types";
+import { BaseTypes, FieldTypeAsString, FieldTypes, IFieldInfo, IFieldInfoEX, IFieldInfoExHash, IFieldJsonSchema, IFieldLookupInfo, ISPEventReceiver, ListTemplateTypes, PageType, SPBasePermissionKind } from "../../types/sharepoint.types";
+import { GeListItemsFoldersBehaviour, IListWorkflowAssociation, IRestItem, ListExperienceOptions, iContentType, iList, iListView } from "../../types/sharepoint.utils.types";
 import { ConsoleLogger } from "../consolelogger";
 import { GetJson, GetJsonSync, longLocalCache, shortLocalCache } from "../rest";
 import { GetRestBaseUrl, GetSiteUrl, LIST_EXPAND, LIST_SELECT } from "./common";

package/src/utils/sharepoint.rest/listutils/GetListItemsByCaml.ts

@@ -1,4 +1,12 @@
-import { EnsureViewFields, GeListItemsFoldersBehaviour, GetOrderByFromCaml, IDictionary, IFieldInfoEX, IRestItem, IsLocalDev, RemoveOrderByFromCaml, chunkArray, encodeURIComponentEX, firstIndexOf, firstOrNull, getFieldOutputType, isDate, isNotEmptyArray, isNullOrEmptyArray, isNullOrEmptyString, isNullOrNaN, isNullOrUndefined, isNumeric, jsonTypes, makeUniqueArray, toHash } from "../../_dependencies";
+import { IsLocalDev } from "../../../_dependencies";
+import { chunkArray, firstIndexOf, firstOrNull, makeUniqueArray, toHash } from "../../../helpers/collections.base";
+import { EnsureViewFields, GetOrderByFromCaml, RemoveOrderByFromCaml, getFieldOutputType } from "../../../helpers/sharepoint";
+import { isDate, isNotEmptyArray, isNullOrEmptyArray, isNullOrEmptyString, isNullOrNaN, isNullOrUndefined, isNumeric } from "../../../helpers/typecheckers";
+import { encodeURIComponentEX } from "../../../helpers/url";
+import { IDictionary } from "../../../types/common.types";
+import { jsonTypes } from "../../../types/rest.types";
+import { IFieldInfoEX } from "../../../types/sharepoint.types";
+import { GeListItemsFoldersBehaviour, IRestItem } from "../../../types/sharepoint.utils.types";
 import { ConsoleLogger } from "../../consolelogger";
 import { GetJson } from "../../rest";
 import { GetSiteUrl, __getSPRestErrorData } from "../common";

package/src/utils/sharepoint.rest/listutils/GetListItemsById.ts

@@ -1,10 +1,17 @@
-import { IRestItem, chunkArray, getGlobal, isBoolean, isNotEmptyArray, isNullOrEmptyArray, isNullOrUndefined, isNumber, jsonClone, jsonTypes } from "../../_dependencies";
+import { chunkArray } from "../../../helpers/collections.base";
+import { getGlobal, jsonClone } from "../../../helpers/objects";
+import { isBoolean, isNotEmptyArray, isNullOrEmptyArray, isNullOrUndefined, isNumber } from "../../../helpers/typecheckers";
+import { jsonTypes } from "../../../types/rest.types";
+import { IRestItem } from "../../../types/sharepoint.utils.types";
 import { GetJson, GetJsonSync } from "../../rest";
 import { GetListRestUrl } from "../list";
 
-let g_cache = getGlobal<{ getItemsByIdCache: { [cachekey: string]: IRestItem[]; }; }>("SharePoint_Rest_List_Cache", {
-    getItemsByIdCache: {}
-});
+function _getGlobalCache() {
+    let _cache = getGlobal<{ getItemsByIdCache: { [cachekey: string]: IRestItem[]; }; }>("SharePoint_Rest_List_Cache", {
+        getItemsByIdCache: {}
+    });
+    return _cache;
+}
 
 /** return array will use the item ID as indexer, not a real array */
 export async function GetItemsById<T extends IRestItem>(siteUrl: string, listIdOrTitle: string, itemIds: number[], options?: {
@@ -129,6 +136,7 @@ export function GetItemsByIdSync<T extends IRestItem>(siteUrl: string, listIdOrT
 }
 
 function _addCacheItem<T extends IRestItem>(cacheKey: string, item: T) {
+    let g_cache = _getGlobalCache();
     if (isNullOrUndefined(g_cache.getItemsByIdCache[cacheKey])) {
         g_cache.getItemsByIdCache[cacheKey] = [];
     }
@@ -136,6 +144,7 @@ function _addCacheItem<T extends IRestItem>(cacheKey: string, item: T) {
 }
 
 function _getCacheItem<T extends IRestItem>(cacheKey: string, itemId: number) {
+    let g_cache = _getGlobalCache();
     if (isNullOrUndefined(g_cache.getItemsByIdCache[cacheKey])) {
         g_cache.getItemsByIdCache[cacheKey] = [];
     }
@@ -148,6 +157,7 @@ function _getCacheItem<T extends IRestItem>(cacheKey: string, itemId: number) {
 }
 
 function _refreshCache(cacheKey: string) {
+    let g_cache = _getGlobalCache();
     g_cache.getItemsByIdCache[cacheKey] = [];
 }
 

package/src/utils/sharepoint.rest/listutils/common.ts

@@ -1,4 +1,9 @@
-import { FileSystemObjectTypes, GeListItemsFoldersBehaviour, IDictionary, IFieldInfoEX, IFieldLookupInfo, IRestItem, isNotEmptyArray, isNullOrEmptyString, isNullOrUndefined, isNumber, jsonTypes, lastIndexOf, toHash } from "../../_dependencies";
+import { lastIndexOf, toHash } from "../../../helpers/collections.base";
+import { isNotEmptyArray, isNullOrEmptyString, isNullOrUndefined, isNumber } from "../../../helpers/typecheckers";
+import { IDictionary } from "../../../types/common.types";
+import { jsonTypes } from "../../../types/rest.types";
+import { FileSystemObjectTypes, IFieldInfoEX, IFieldLookupInfo } from "../../../types/sharepoint.types";
+import { GeListItemsFoldersBehaviour, IRestItem } from "../../../types/sharepoint.utils.types";
 import { ConsoleLogger } from "../../consolelogger";
 import { DecodeFieldValuesAsTextKey, GetFieldNameFromRawValues } from "../common";
 import { GetItemsByIdSync } from "./GetListItemsById";

package/src/utils/sharepoint.rest/location.ts

@@ -2,7 +2,7 @@ import { waitFor } from "../../helpers/browser";
 import { isNullOrEmptyArray, isNullOrEmptyString, isNullOrUndefined, isTypeofFullNameUndefined } from "../../helpers/typecheckers";
 import { SPFxAuthTokenType } from "../../types/auth";
 import { IMeetingLocation, IMeetingLocationEntityType } from "../../types/location.types";
-import { jsonTypes } from "../_dependencies";
+import { jsonTypes } from "../../types/rest.types";
 import { GetSPFxClientAuthToken } from "../auth/common";
 import { GetJson, shortLocalCache } from "../rest";
 

package/src/utils/sharepoint.rest/navigation-links.ts

@@ -1,4 +1,5 @@
-import { INavLinkInfo, isNullOrEmptyString, isNullOrUndefined } from "../_dependencies";
+import { isNullOrEmptyString, isNullOrUndefined } from "../../helpers/typecheckers";
+import { INavLinkInfo } from "../../types/sharepoint.types";
 import { ConsoleLogger } from "../consolelogger";
 import { GetJson } from "../rest";
 import { GetRestBaseUrl, GetSiteUrl } from "./common";

package/src/utils/sharepoint.rest/user-search.ts

@@ -1,4 +1,7 @@
-import { IUserInfo, PrincipalType, contentTypes, firstIndexOf, jsonTypes } from "../_dependencies";
+import { firstIndexOf } from "../../helpers/collections.base";
+import { contentTypes, jsonTypes } from "../../types/rest.types";
+import { PrincipalType } from "../../types/sharepoint.types";
+import { IUserInfo } from "../../types/sharepoint.utils.types";
 import { GetJson } from "../rest";
 import { EnsureUser } from "./user";
 

package/src/utils/sharepoint.rest/user.ts

@@ -1,4 +1,10 @@
-import { IGroupInfo, ISPPeoplePickerControlFormEntity, ISiteGroupInfo, IUserInfo, IsSPPeoplePickerControlFormEntity, PrincipalType, contentTypes, encodeURIComponentEX, getPrincipalTypeFromPickerEntity, isNullOrEmptyArray, isNullOrEmptyString, isNullOrNaN, isNullOrUndefined, isNumber, jsonStringify, jsonTypes } from "../_dependencies";
+import { jsonStringify } from "../../helpers/json";
+import { ISPPeoplePickerControlFormEntity, IsSPPeoplePickerControlFormEntity, getPrincipalTypeFromPickerEntity } from "../../helpers/sharepoint";
+import { isNullOrEmptyArray, isNullOrEmptyString, isNullOrNaN, isNullOrUndefined, isNumber } from "../../helpers/typecheckers";
+import { encodeURIComponentEX } from "../../helpers/url";
+import { contentTypes, jsonTypes } from "../../types/rest.types";
+import { ISiteGroupInfo, PrincipalType } from "../../types/sharepoint.types";
+import { IGroupInfo, IUserInfo } from "../../types/sharepoint.utils.types";
 import { ConsoleLogger } from "../consolelogger";
 import { GetJson, GetJsonSync, longLocalCache, shortLocalCache } from "../rest";
 import { GetRestBaseUrl, GetSiteUrl } from "./common";

package/src/utils/sharepoint.rest/web.ts

@@ -1,7 +1,17 @@
-import { IAppTile, IContextWebInformation, IDictionary, IFieldInfoEX, IFolderInfo, IGroupInfo, IRententionLabel, IRestOptions, IRestRoleDefinition, IRootWebInfo, ISiteGroupInfo, ISiteInfo, ITimeZone, IUserCustomActionInfo, IUserInfo, IWebBasicInfo, IWebInfo, IWebRegionalSettings, SPBasePermissionKind, SPBasePermissions, WebTypes, extendFieldInfo, getGlobal, iContentType, iList, isDate, isNotEmptyArray, isNullOrEmptyArray, isNullOrEmptyString, isNullOrNaN, isNullOrUndefined, isNumeric, isString, isTypeofFullNameNullOrUndefined, isValidGuid, jsonStringify, jsonTypes, makeFullUrl, makeServerRelativeUrl, normalizeGuid, normalizeUrl, sortArray } from "../_dependencies";
+import { sortArray } from "../../helpers/collections.base";
+import { jsonStringify } from "../../helpers/json";
+import { getGlobal } from "../../helpers/objects";
+import { SPBasePermissions, extendFieldInfo } from "../../helpers/sharepoint";
+import { normalizeGuid } from "../../helpers/strings";
+import { isDate, isNotEmptyArray, isNullOrEmptyArray, isNullOrEmptyString, isNullOrNaN, isNullOrUndefined, isNumeric, isString, isTypeofFullNameNullOrUndefined, isValidGuid } from "../../helpers/typecheckers";
+import { makeFullUrl, makeServerRelativeUrl, normalizeUrl } from "../../helpers/url";
+import { IDictionary } from "../../types/common.types";
+import { IRestOptions, jsonTypes } from "../../types/rest.types";
+import { IContextWebInformation, IFieldInfoEX, IFolderInfo, IRententionLabel, ISiteGroupInfo, IUserCustomActionInfo, IWebInfo, SPBasePermissionKind } from "../../types/sharepoint.types";
+import { IAppTile, IGroupInfo, IRestRoleDefinition, IRootWebInfo, ISiteInfo, ITimeZone, IUserInfo, IWebBasicInfo, IWebRegionalSettings, WebTypes, iContentType, iList } from "../../types/sharepoint.utils.types";
+import { AutoDiscoverTenantInfo } from "../auth/discovery";
 import { ConsoleLogger } from "../consolelogger";
 import { toIsoDateFormat } from "../date";
-import { AutoDiscoverTenantInfo } from "../exports-index";
 import { GetJson, GetJsonSync, longLocalCache, mediumLocalCache, noLocalCache, shortLocalCache, weeekLongLocalCache } from "../rest";
 import { CONTENT_TYPES_SELECT, CONTENT_TYPES_SELECT_WITH_FIELDS, GetRestBaseUrl, GetSiteUrl, LIST_EXPAND, LIST_SELECT, WEB_SELECT, hasGlobalContext } from "./common";
 import { GetListFields, GetListFieldsSync, GetListRestUrl } from "./list";

package/src/utils/sod.ts

@@ -1,4 +1,6 @@
-import { getFromFullName, isDebug, isFunction, isNullOrEmptyString, isNullOrUndefined, isString, isTypeofFullNameNullOrUndefined, ksGlobal, typeofFullName } from "./_dependencies";
+import { isDebug } from "../helpers/debug";
+import { getFromFullName, isFunction, isNullOrEmptyString, isNullOrUndefined, isString, isTypeofFullNameNullOrUndefined, typeofFullName } from "../helpers/typecheckers";
+import { ksGlobal } from "../types/knownscript.types";
 
 declare global {
     interface Window {

package/dist/_dependencies.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"_dependencies.js","sourceRoot":"","sources":["../src/_dependencies.ts"],"names":[],"mappings":";;;AACW,QAAA,WAAW,GAAG,OAAO,CAAC;AACtB,QAAA,UAAU,GAAG,KAAK,CAAC;AACnB,QAAA,aAAa,GAAG,KAAK,CAAC;AACjC,SAAgB,eAAe,CAAC,MAI/B;IACG,IAAI,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ;QAAE,mBAAW,GAAG,MAAM,CAAC,WAAW,CAAC;IAC7E,IAAI,OAAO,MAAM,CAAC,UAAU,KAAK,SAAS;QAAE,kBAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IAC3E,IAAI,OAAO,MAAM,CAAC,aAAa,KAAK,QAAQ;QAAE,qBAAa,GAAG,MAAM,CAAC,aAAa,CAAC;AACvF,CAAC;AARD,0CAQC"}

package/dist/config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;AAAA,mDAAkD;AAClD,yDAAsD;AAEtD,SAAgB,MAAM,CAAC,MAKtB;IACG,IAAA,+BAAe,EAAC,MAAM,CAAC,CAAC;IACxB,SAAS,SAAS,CAAC,IAAY;QAC3B,OAAO,6BAAa,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IACvD,CAAC;IACD,OAAO;QACH,MAAM,EAAE,SAAS;KACpB,CAAA;AACL,CAAC;AAbD,wBAaC"}

package/dist/exports-index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"exports-index.js","sourceRoot":"","sources":["../src/exports-index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0DAAwC;AACxC,wDAAsC;AACtC,wDAAsC;AACtC,2CAAyB"}

package/dist/helpers/Guid.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Guid.js","sourceRoot":"","sources":["../../src/helpers/Guid.ts"],"names":[],"mappings":"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"}

package/dist/helpers/_dependencies.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"_dependencies.js","sourceRoot":"","sources":["../../src/helpers/_dependencies.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kDAA8C;AAArC,2GAAA,UAAU,OAAA;AACnB,yDAAuC"}

package/dist/helpers/base64.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"base64.js","sourceRoot":"","sources":["../../src/helpers/base64.ts"],"names":[],"mappings":"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"}