@mikezimm/fps-library-v2 1.0.148 → 1.0.150

package/lib/logic/Strings/getStringArrayBasic.d.ts

@@ -0,0 +1,26 @@
+/**
+ *
+ *  get array of strings only (aka words) from the item proprty
+ Original code:
+ const keyVals: string[] = item[key].replace(/[0-9]/g, " ").split(/\b([a-z]+)\b/gi);
+ *
+ https://github.com/mikezimm/Compliance/issues/138
+ *
+ Test code:  resulting in ["test","i","ng","as","dfasd","asdf"]
+  const item = 'test1234~321i~ng as?!_$dfasd. -++[asdf];?~!&^$%...,;'
+  const keyVals = item.replace(/[0-9.,;:?~!&^$%+_[\]-]/g, " ").replace(/\s\s+/g, ' ').split(/\b([a-z]+)\b/gi).filter( v => v.trim() !== '' );
+  console.log( keyVals )
+
+
+ * getStringArrayBasic is a simpler variation of getArrayOfWordsFromString
+ * This will use exact case and not filter duplicates .
+ * Finally it does not do any sorting.
+ *
+ * You can use getArrayOfWordsFromString IF YOU NEED any of those advanced options.
+ *
+ * @param baseStr
+ * @param removeDigits
+ * @returns
+ */
+export declare function getStringArrayBasic(baseStr: string, removeDigits: boolean): string[];
+//# sourceMappingURL=getStringArrayBasic.d.ts.map

package/lib/logic/Strings/getStringArrayBasic.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getStringArrayBasic.d.ts","sourceRoot":"","sources":["../../../src/logic/Strings/getStringArrayBasic.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,mBAAmB,CAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,GAAI,MAAM,EAAE,CAqBtF"}

package/lib/logic/Strings/getStringArrayBasic.js

@@ -0,0 +1,42 @@
+/**
+ *
+ *  get array of strings only (aka words) from the item proprty
+ Original code:
+ const keyVals: string[] = item[key].replace(/[0-9]/g, " ").split(/\b([a-z]+)\b/gi);
+ *
+ https://github.com/mikezimm/Compliance/issues/138
+ *
+ Test code:  resulting in ["test","i","ng","as","dfasd","asdf"]
+  const item = 'test1234~321i~ng as?!_$dfasd. -++[asdf];?~!&^$%...,;'
+  const keyVals = item.replace(/[0-9.,;:?~!&^$%+_[\]-]/g, " ").replace(/\s\s+/g, ' ').split(/\b([a-z]+)\b/gi).filter( v => v.trim() !== '' );
+  console.log( keyVals )
+
+
+ * getStringArrayBasic is a simpler variation of getArrayOfWordsFromString
+ * This will use exact case and not filter duplicates .
+ * Finally it does not do any sorting.
+ *
+ * You can use getArrayOfWordsFromString IF YOU NEED any of those advanced options.
+ *
+ * @param baseStr
+ * @param removeDigits
+ * @returns
+ */
+export function getStringArrayBasic(baseStr, removeDigits) {
+    if (!baseStr)
+        return [];
+    if (removeDigits === true)
+        baseStr = baseStr.replace(/[0-9]/g, ' ');
+    baseStr = baseStr.replace(/[.,;:?~!&^$%+_[\]-]+/g, ' '); // Replace most common special characters
+    baseStr = baseStr.replace(/[()]+/g, ' '); // Replace most common special characters
+    baseStr = baseStr.replace(/[/\\]+/g, ' '); // Replace most common special characters
+    baseStr = baseStr.replace(/[']+/g, ' '); // Replace most common special characters
+    baseStr = baseStr.replace(/\s\s+/g, ' '); // Replace multiple spaces with just one
+    // get array of original trimmed words and exclude empties
+    const originalWords = baseStr.split(/\b([a-z]+)\b/gi)
+        .map(word => { return word.trim(); }).filter(word => { return word; });
+    // NOTE:  getSuggestionsByKeys used this code which may also be valid... seemed to work in testing
+    // .filter( ( v: string ) => v.trim() !== '' ); // then remove spaces and empties
+    return originalWords;
+}
+//# sourceMappingURL=getStringArrayBasic.js.map

package/lib/logic/Strings/getStringArrayBasic.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getStringArrayBasic.js","sourceRoot":"","sources":["../../../src/logic/Strings/getStringArrayBasic.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,UAAU,mBAAmB,CAAE,OAAe,EAAE,YAAqB;IAEzE,IAAK,CAAC,OAAO;QAAG,OAAO,EAAE,CAAC;IAE1B,IAAK,YAAY,KAAK,IAAI;QAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACtE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAE,uBAAuB,EAAE,GAAG,CAAE,CAAC,CAAC,yCAAyC;IACpG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAE,QAAQ,EAAE,GAAG,CAAE,CAAC,CAAC,yCAAyC;IACrF,OAAO,GAAG,OAAO,CAAC,OAAO,CAAE,SAAS,EAAE,GAAG,CAAE,CAAC,CAAC,yCAAyC;IACtF,OAAO,GAAG,OAAO,CAAC,OAAO,CAAE,OAAO,EAAE,GAAG,CAAE,CAAC,CAAC,yCAAyC;IAEpF,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,wCAAwC;IAElF,0DAA0D;IAC1D,MAAM,aAAa,GAAa,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC;SAC5D,GAAG,CAAE,IAAI,CAAC,EAAE,GAAG,OAAO,IAAI,CAAC,IAAI,EAAE,CAAA,CAAC,CAAC,CAAE,CAAC,MAAM,CAAE,IAAI,CAAC,EAAE,GAAG,OAAO,IAAI,CAAA,CAAC,CAAC,CAAE,CAAC;IAEzE,kGAAkG;IAClG,iFAAiF;IAEnF,OAAO,aAAa,CAAC;AAEvB,CAAC"}

package/lib/logic/Strings/getWordsFromString.d.ts

@@ -2,12 +2,27 @@ import { ISeriesSort } from "../../logic/Arrays/sorting/Interfaces";
 /**
  *
  * Originally used in Compliance to get list of words from a string
+ * Updated 2023-03-28
  *
  * @param str
  * @param removeDigits
  * @returns array of words found
  */
 export declare function mergeArrayOfWordsFromString(str: string, intoThese: string[], removeDigits: boolean, removeDups: boolean, ignoreCase: boolean, order: ISeriesSort, localLanguage?: string): string[];
+/**
+ * getArrayOfWordsFromString is a more advanced variation of getStringArrayBasic
+ * This will check for duplicates and also allow for using or ignoring case.
+ * Finally it also provides a built in option to sort.
+ *
+ * You can use getStringArrayBasic if you do not need any of those advanced options but to just split into words.
+ * @param str
+ * @param removeDigits
+ * @param removeDups
+ * @param ignoreCase
+ * @param order
+ * @param localLanguage
+ * @returns
+ */
 export declare function getArrayOfWordsFromString(str: string, removeDigits: boolean, removeDups: boolean, ignoreCase: boolean, order: ISeriesSort, localLanguage?: string): string[];
 export declare function mergeWordArrays(mergeThese: string[], intoThese: string[], ignoreCase: boolean, order: ISeriesSort, localLanguage?: string): string[];
 //# sourceMappingURL=getWordsFromString.d.ts.map

package/lib/logic/Strings/getWordsFromString.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getWordsFromString.d.ts","sourceRoot":"","sources":["../../../src/logic/Strings/getWordsFromString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAIpE;;;;;;;GAOG;AAEH,wBAAgB,2BAA2B,CAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,GAAE,MAAa,GAAI,MAAM,EAAE,CAO3M;AAGD,wBAAgB,yBAAyB,CAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,GAAE,MAAa,GAAI,MAAM,EAAE,CAwCpL;AAED,wBAAgB,eAAe,CAAE,UAAU,EAAE,MAAM,EAAE,EAAE,SAAS,EAAC,MAAM,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,GAAE,MAAa,GAAI,MAAM,EAAE,CAiB3J"}
+{"version":3,"file":"getWordsFromString.d.ts","sourceRoot":"","sources":["../../../src/logic/Strings/getWordsFromString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAIpE;;;;;;;;GAQG;AAEH,wBAAgB,2BAA2B,CAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,GAAE,MAAa,GAAI,MAAM,EAAE,CAO3M;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,yBAAyB,CAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,GAAE,MAAa,GAAI,MAAM,EAAE,CAiDpL;AAED,wBAAgB,eAAe,CAAE,UAAU,EAAE,MAAM,EAAE,EAAE,SAAS,EAAC,MAAM,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,GAAE,MAAa,GAAI,MAAM,EAAE,CAiB3J"}

package/lib/logic/Strings/getWordsFromString.js

@@ -1,7 +1,9 @@
 import { sortStringArrayCollator } from "../../logic/Arrays/sorting/strings";
+import { getStringArrayBasic } from "./getStringArrayBasic";
 /**
  *
  * Originally used in Compliance to get list of words from a string
+ * Updated 2023-03-28
  *
  * @param str
  * @param removeDigits
@@ -14,14 +16,34 @@ export function mergeArrayOfWordsFromString(str, intoThese, removeDigits, remove
     const results = mergeWordArrays(theseWords, intoThese, ignoreCase, order, localLanguage);
     return results;
 }
+/**
+ * getArrayOfWordsFromString is a more advanced variation of getStringArrayBasic
+ * This will check for duplicates and also allow for using or ignoring case.
+ * Finally it also provides a built in option to sort.
+ *
+ * You can use getStringArrayBasic if you do not need any of those advanced options but to just split into words.
+ * @param str
+ * @param removeDigits
+ * @param removeDups
+ * @param ignoreCase
+ * @param order
+ * @param localLanguage
+ * @returns
+ */
 export function getArrayOfWordsFromString(str, removeDigits, removeDups, ignoreCase, order, localLanguage = 'en') {
     const results = [];
     if (!str)
         return results;
-    let baseStr = `${str}`;
-    if (removeDigits === true)
-        baseStr = baseStr.replace(/[0-9]/g, " ");
-    const originalWords = baseStr.split(/\b([a-z]+)\b/gi);
+    // let baseStr = `${str}`;
+    // if ( removeDigits === true ) baseStr = baseStr.replace(/[0-9]/g, ' ');
+    // baseStr = baseStr.replace( /[-_,&[\]]+/g, ' ' ); // Replace most common special characters
+    // baseStr = baseStr.replace( /[()]+/g, ' ' ); // Replace most common special characters
+    // baseStr = baseStr.replace( /[/\\]+/g, ' ' ); // Replace most common special characters
+    // baseStr = baseStr.replace( /[']+/g, ' ' ); // Replace most common special characters
+    // baseStr = baseStr.replace(/\s\s+/g, ' '); // Replace multiple spaces with just one
+    // // get array of original trimmed words and exclude empties
+    // const originalWords: string[] = baseStr.split(/\b([a-z]+)\b/gi).map( word => { return word.trim() } ).filter( word => { return word } );
+    const originalWords = getStringArrayBasic(`${str}`, removeDigits);
     // Correct case of compare array of strings from str
     let originalCompareWords = ignoreCase === true ? originalWords.map(item => { return item.toLocaleLowerCase(); }) : originalWords;
     originalCompareWords = removeDups === true ? originalCompareWords.filter(item => { return item.toLocaleLowerCase(); }) : originalCompareWords;
@@ -49,9 +71,9 @@ export function getArrayOfWordsFromString(str, removeDigits, removeDups, ignoreC
     return finalVals;
 }
 export function mergeWordArrays(mergeThese, intoThese, ignoreCase, order, localLanguage = 'en') {
-    let finalWords = [...intoThese];
-    const finalCompareWords = ignoreCase === true ? finalWords.map(item => { return item.toLocaleLowerCase(); }) : [...finalWords];
-    const mergeTheseCompare = ignoreCase === true ? mergeThese.map(item => { return item.toLocaleLowerCase(); }) : [...mergeThese];
+    let finalWords = intoThese;
+    const finalCompareWords = ignoreCase === true ? finalWords.map(item => { return item.toLocaleLowerCase(); }) : finalWords;
+    const mergeTheseCompare = ignoreCase === true ? mergeThese.map(item => { return item.toLocaleLowerCase(); }) : mergeThese;
     // Now compare the filteredNewWords with the finalWords and only add ones that are not a duplicate.
     mergeTheseCompare.map((compareWord, index) => {
         if (finalCompareWords.indexOf(compareWord) === -1) {

package/lib/logic/Strings/getWordsFromString.js.map

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

package/lib/logic/Time/getFPSPrefNavLang.js

@@ -6,7 +6,7 @@ export function getFPSPrefNavLang() {
     let found = false; // Only get first one of preferences
     navigatorLanguages.map((lang) => {
         if (found === false && DateLanguageKeys.indexOf(lang.toLocaleLowerCase()) > -1) {
-            pref = lang;
+            pref = lang.toLowerCase();
             found = true;
         }
     });

package/lib/logic/Time/getFPSPrefNavLang.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFPSPrefNavLang.js","sourceRoot":"","sources":["../../../src/logic/Time/getFPSPrefNavLang.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,sBAAsB,CAAC;AAI5E,MAAM,UAAU,iBAAiB;IAC/B,MAAM,kBAAkB,GAAG,SAAS,CAAC,SAAS,CAAC;IAC/C,2DAA2D;IAC3D,IAAI,IAAI,GAAuB,OAAO,CAAC;IACvC,IAAI,KAAK,GAAG,KAAK,CAAC,CAAC,oCAAoC;IAEvD,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAwB,EAAE,EAAE;QAClD,IAAI,KAAK,KAAK,KAAK,IAAI,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAwB,CAAC,GAAG,CAAC,CAAC,EAAE;YACpG,IAAI,GAAG,IAAI,CAAC;YACZ,KAAK,GAAG,IAAI,CAAC;SACd;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AAEd,CAAC"}
+{"version":3,"file":"getFPSPrefNavLang.js","sourceRoot":"","sources":["../../../src/logic/Time/getFPSPrefNavLang.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,sBAAsB,CAAC;AAI5E,MAAM,UAAU,iBAAiB;IAC/B,MAAM,kBAAkB,GAAG,SAAS,CAAC,SAAS,CAAC;IAC/C,2DAA2D;IAC3D,IAAI,IAAI,GAAuB,OAAO,CAAC;IACvC,IAAI,KAAK,GAAG,KAAK,CAAC,CAAC,oCAAoC;IAEvD,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAwB,EAAE,EAAE;QAClD,IAAI,KAAK,KAAK,KAAK,IAAI,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAwB,CAAC,GAAG,CAAC,CAAC,EAAE;YACpG,IAAI,GAAG,IAAI,CAAC,WAAW,EAAwB,CAAC;YAChD,KAAK,GAAG,IAAI,CAAC;SACd;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AAEd,CAAC"}

package/lib/pnpjs/SourceItems/Interface.d.ts

@@ -14,6 +14,9 @@ export interface IMinSourceWPProps {
     orderByProp?: string;
     orderByAsc?: boolean;
 }
+export interface ISourceInfo {
+    history: ISourceProps;
+}
 export interface ISourceProps extends IMinSourceFetchProps {
     webUrl: string;
     absoluteWebUrl?: string;

package/lib/pnpjs/SourceItems/Interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Interface.d.ts","sourceRoot":"","sources":["../../../src/pnpjs/SourceItems/Interface.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAG,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,GAAG,EAAE,CAAC;IACb,SAAS,EAAE,eAAe,CAAC;CAC5B;AAID,MAAM,WAAW,iBAAiB;IAEhC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;CAEtB;AAID,MAAM,WAAW,YAAa,SAAQ,oBAAoB;IAGxD,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAG5B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAEhB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;IAEtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAGnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAEjB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAE5B;AAED,MAAM,WAAW,mBAAoB,SAAQ,YAAY;IACvD,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,CAAC,EAAE,GAAG,CAAC;CACxB"}
+{"version":3,"file":"Interface.d.ts","sourceRoot":"","sources":["../../../src/pnpjs/SourceItems/Interface.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAG,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,GAAG,EAAE,CAAC;IACb,SAAS,EAAE,eAAe,CAAC;CAC5B;AAID,MAAM,WAAW,iBAAiB;IAEhC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;CAEtB;AAGD,MAAM,WAAW,WAAW;IAe1B,OAAO,EAAE,YAAY,CAAC;CACvB;AAED,MAAM,WAAW,YAAa,SAAQ,oBAAoB;IAGxD,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAG5B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAEhB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;IAEtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAGnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAEjB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAE5B;AAED,MAAM,WAAW,mBAAoB,SAAQ,YAAY;IACvD,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,CAAC,EAAE,GAAG,CAAC;CACxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikezimm/fps-library-v2",
-  "version": "1.0.148",
+  "version": "1.0.150",
   "description": "Library of reusable typescript/javascript functions, interfaces and constants",
   "license": "MIT",
   "main": "./lib/index.js",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@microsoft/sp-property-pane": "^1.15.2",
     "@mikezimm/fps-pnp2": "^1.0.40",
-    "@mikezimm/fps-styles": "^1.0.16",
+    "@mikezimm/fps-styles": "^1.0.18",
     "@pnp/spfx-controls-react": "3.12.0",
     "@pnp/spfx-property-controls": "^3.6.0",
     "office-ui-fabric-react": "^7.199.1",