@mikezimm/fps-library-v2 1.0.123 → 1.0.124

package/CHANGELOG.md

@@ -5,13 +5,21 @@ npm run build
 npm version major/minor/patch
 npm publish --access=public
 
-npm install @mikezimm/fps-library-v2@1.0.123
+npm install @mikezimm/fps-library-v2@1.0.124
 
 # Changelog
 
 NOTE:  TURN BACK ON STRICT NULL CHECKS - turned off for PropPaneCols
 
-## 1.0.123 - 2023-Feb-09: build performance right into getSourceItems
+## 1.0.124 - 2023-Feb-13: SearchPage and Teaching Bubbles
+- Updates to components/molecules/SearchPage:
+-   create addDateTimeFileInfoSearch, addSearchMeta1, addSearchMeta2 in SearchPage - tied with IAnySourceItem
+-   create SearchTypes object
+-   create ISearchObject, ISearchBucket, ISourceSearch
+- Add NewsLinksSource and NewsSource - similar to SitePagesSource
+- fix getTeachBubbles
+
+## 1.0.123 - 2023-Feb-11: Teaching Bubbles and build performance right into getSourceItems
 - add getTeachBubbles for Teaching Bubbles
 - update AllTeachBubbles sample
 - update makeBubbleElementFromBubbles to not error out when TeachBubbleArray.length === 0

package/lib/components/atoms/TeachBubble/getTeacher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTeacher.d.ts","sourceRoot":"","sources":["../../../../src/components/atoms/TeachBubble/getTeacher.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAe,MAAM,mBAAmB,CAAC;AAEjE;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAE,eAAe,EAAE,eAAe,EAAE,EAAG,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAI,eAAe,EAAE,CAKrH"}
+{"version":3,"file":"getTeacher.d.ts","sourceRoot":"","sources":["../../../../src/components/atoms/TeachBubble/getTeacher.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAe,MAAM,mBAAmB,CAAC;AAEjE;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAE,eAAe,EAAE,eAAe,EAAE,EAAG,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAI,eAAe,EAAE,CAWrH"}

package/lib/components/atoms/TeachBubble/getTeacher.js

@@ -8,8 +8,14 @@ import { ReplaceWpId } from "./IMinTeachBubble";
  * @returns
  */
 export function getTeachBubbles(AllTeachBubbles, wpId, teach) {
-    const theseBubbles = AllTeachBubbles.filter(bubble => { return bubble.target.indexOf(`#${teach}`) === 0; });
-    theseBubbles.map(bubble => { bubble.target.replace(ReplaceWpId, wpId); });
+    let theseBubbles = AllTeachBubbles.filter(bubble => { return bubble.target.indexOf(`#${teach}`) === 0; });
+    theseBubbles = theseBubbles.map(bubble => {
+        // const newBubble = bubble;
+        // newBubble.target = newBubble.target.replace( ReplaceWpId, wpId );
+        // return newBubble;
+        bubble.target = bubble.target.replace(ReplaceWpId, wpId);
+        return bubble;
+    });
     if (check4Gulp() === true)
         console.log(console.log('getTeachBubbles', theseBubbles));
     return theseBubbles;

package/lib/components/atoms/TeachBubble/getTeacher.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTeacher.js","sourceRoot":"","sources":["../../../../src/components/atoms/TeachBubble/getTeacher.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,iDAAiD,CAAC;AAC7E,OAAO,EAAmB,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEjE;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAE,eAAkC,EAAG,IAAY,EAAE,KAAa;IAC/F,MAAM,YAAY,GAAsB,eAAe,CAAC,MAAM,CAAE,MAAM,CAAC,EAAE,GAAG,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAE,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,CAAA,CAAC,CAAC,CAAE,CAAC;IACjI,YAAY,CAAC,GAAG,CAAE,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAE,WAAW,EAAE,IAAI,CAAE,CAAA,CAAA,CAAC,CAAC,CAAC;IAC3E,IAAK,UAAU,EAAE,KAAK,IAAI;QAAG,OAAO,CAAC,GAAG,CAAE,OAAO,CAAC,GAAG,CAAE,iBAAiB,EAAE,YAAY,CAAE,CAAE,CAAC;IAC3F,OAAO,YAAY,CAAC;AACtB,CAAC"}
+{"version":3,"file":"getTeacher.js","sourceRoot":"","sources":["../../../../src/components/atoms/TeachBubble/getTeacher.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,iDAAiD,CAAC;AAC7E,OAAO,EAAmB,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEjE;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAE,eAAkC,EAAG,IAAY,EAAE,KAAa;IAC/F,IAAI,YAAY,GAAsB,eAAe,CAAC,MAAM,CAAE,MAAM,CAAC,EAAE,GAAG,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAE,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,CAAA,CAAC,CAAC,CAAE,CAAC;IAC/H,YAAY,GAAG,YAAY,CAAC,GAAG,CAAE,MAAM,CAAC,EAAE;QACxC,4BAA4B;QAC5B,oEAAoE;QACpE,oBAAoB;QACpB,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAE,WAAW,EAAE,IAAI,CAAE,CAAC;QAC3D,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IACH,IAAK,UAAU,EAAE,KAAK,IAAI;QAAG,OAAO,CAAC,GAAG,CAAE,OAAO,CAAC,GAAG,CAAE,iBAAiB,EAAE,YAAY,CAAE,CAAE,CAAC;IAC3F,OAAO,YAAY,CAAC;AACtB,CAAC"}

package/lib/components/molecules/SearchPage/Interfaces/ISearchTypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ISearchTypes.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/Interfaces/ISearchTypes.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,WAAW,EAAE,CAAC;CACrB"}

package/lib/components/molecules/SearchPage/Interfaces/ISearchTypes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ISearchTypes.js","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/Interfaces/ISearchTypes.ts"],"names":[],"mappings":""}

package/lib/components/molecules/SearchPage/Interfaces/ISourceSearch.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Originally copied from ALVFM, just removed specific source item keys.
+ * Those can be added when extending the main search.
+ */
+import { IAnySourceItem } from "../../SourceList/IAnyContent";
+/**
+ * Used to create Search Buttons ( aka ALV Fin Man source search page )
+ */
+export interface ISearchObject {
+    Search: string;
+    SearchLC: string;
+    SearchCount: number;
+}
+export interface ISearchBucket {
+    SearchFixed: boolean;
+    SearchStr: string;
+    Search: string[];
+    SearchLC: string[];
+    SearchCount: number[];
+    Objects: ISearchObject[];
+    items: IAnySourceItem[];
+}
+export interface ISourceSearch {
+    left: ISearchBucket;
+    top: ISearchBucket;
+    type: ISearchBucket;
+    searchPlural: boolean;
+    searchType: boolean;
+    showDetails: boolean;
+    itemsPerPage: number;
+    showItemType: boolean;
+}
+//# sourceMappingURL=ISourceSearch.d.ts.map

package/lib/components/molecules/SearchPage/Interfaces/ISourceSearch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ISourceSearch.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/Interfaces/ISourceSearch.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAI9D;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAGD,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,EAAE,MAAM,EAAE,CAAC;IAEtB,OAAO,EAAE,aAAa,EAAE,CAAC;IAEzB,KAAK,EAAE,cAAc,EAAE,CAAC;CAczB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,aAAa,CAAC;IACpB,GAAG,EAAE,aAAa,CAAC;IACnB,IAAI,EAAE,aAAa,CAAC;IAEpB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IAerB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;CACvB"}

package/lib/components/molecules/SearchPage/Interfaces/ISourceSearch.js

@@ -0,0 +1,6 @@
+/**
+ * Originally copied from ALVFM, just removed specific source item keys.
+ * Those can be added when extending the main search.
+ */
+export {};
+//# sourceMappingURL=ISourceSearch.js.map

package/lib/components/molecules/SearchPage/Interfaces/ISourceSearch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ISourceSearch.js","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/Interfaces/ISourceSearch.ts"],"names":[],"mappings":"AAAA;;;GAGG"}

package/lib/components/molecules/SearchPage/Interfaces/StandardTypes.d.ts

@@ -0,0 +1,11 @@
+import { ISearchType, ISearchTypes } from "./ISearchTypes";
+export declare const StdFileKeys: string[];
+export declare const StdFileSearchTypes: ISearchType[];
+export declare const StdSharePointKeys: string[];
+export declare const StdSharePointSearchTypes: ISearchType[];
+/**
+ * Use SearchTypes for addSearchMeta1 && addSearchMeta2 function
+ *   -- if you do not have a consolidated search page (with multiple sources)
+ */
+export declare const SearchTypes: ISearchTypes;
+//# sourceMappingURL=StandardTypes.d.ts.map

package/lib/components/molecules/SearchPage/Interfaces/StandardTypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"StandardTypes.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/Interfaces/StandardTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG3D,eAAO,MAAM,WAAW,EAAE,MAAM,EAM/B,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,WAAW,EAiB3C,CAAC;AAGF,eAAO,MAAM,iBAAiB,EAAE,MAAM,EAErC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,WAAW,EAGjD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,EAAE,YASzB,CAAA"}

package/lib/components/molecules/SearchPage/{StandardTypes.js → Interfaces/StandardTypes.js}

@@ -27,4 +27,18 @@ export const StdSharePointSearchTypes = [
     { key: "page", title: "page", icon: "KnowledgeArticle", style: "", count: 0 },
     { key: "news", title: "news", icon: "News", style: "", count: 0 },
 ];
+/**
+ * Use SearchTypes for addSearchMeta1 && addSearchMeta2 function
+ *   -- if you do not have a consolidated search page (with multiple sources)
+ */
+export const SearchTypes = {
+    keys: [
+        ...StdSharePointKeys,
+        ...StdFileKeys,
+    ],
+    objs: [
+        ...StdSharePointSearchTypes,
+        ...StdFileSearchTypes,
+    ]
+};
 //# sourceMappingURL=StandardTypes.js.map

package/lib/components/molecules/SearchPage/Interfaces/StandardTypes.js.map

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

package/lib/components/molecules/SearchPage/functions/addSearchMeta2.d.ts

@@ -0,0 +1,10 @@
+import { IAnySourceItem } from "../../SourceList/IAnyContent";
+import { ISearchTypes } from "../Interfaces/ISearchTypes";
+/**
+ *
+ * @param items
+ * @param SearchTypes - Pass in
+ * @returns
+ */
+export declare function addSearchMeta2(items: IAnySourceItem[], SearchTypes: ISearchTypes): IAnySourceItem[];
+//# sourceMappingURL=addSearchMeta2.d.ts.map

package/lib/components/molecules/SearchPage/functions/addSearchMeta2.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"addSearchMeta2.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/functions/addSearchMeta2.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D;;;;;GAKG;AAEH,wBAAgB,cAAc,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,WAAW,EAAE,YAAY,GAAG,cAAc,EAAE,CAyCnG"}

package/lib/components/molecules/SearchPage/functions/addSearchMeta2.js

@@ -0,0 +1,50 @@
+/**
+ *
+ * @param items
+ * @param SearchTypes - Pass in
+ * @returns
+ */
+export function addSearchMeta2(items, SearchTypes) {
+    items.map((item) => {
+        let { searchTitle, searchDesc, searchHref } = item;
+        /**
+         * This could be added as secondary function after adding custom search code to catch any loose ends.
+         */
+        //This if was added for the Standards Wiki Library where the title column is actually Title0
+        if (!searchTitle && item.Title0) {
+            searchTitle = item.Title0;
+        }
+        if (!searchTitle && item.FileLeafRef) {
+            searchTitle = item.FileLeafRef.substr(0, item.FileLeafRef.lastIndexOf('.'));
+        } //Added for Std #139 which does not have a Title value.
+        if (!searchDesc) {
+            searchDesc = '';
+        }
+        if (!searchHref) {
+            if (item.ServerRedirectedEmbedUri) {
+                searchHref = item.ServerRedirectedEmbedUri;
+            }
+            else if (item.FileRef) {
+                searchHref = item.FileRef;
+            }
+            else if (item['File/ServerRelativeUrl']) {
+                searchHref = item['File/ServerRelativeUrl'];
+            }
+        }
+        let searchTypeIdx = SearchTypes.keys.indexOf(item.type);
+        if (searchTypeIdx === -1) {
+            console.log('Invalid searchTypeIdx not found:', item.type, SearchTypes.keys);
+        }
+        const adjustIdx = SearchTypes.objs[searchTypeIdx].adjust ? SearchTypes.objs[searchTypeIdx].adjust : 0;
+        searchTypeIdx = searchTypeIdx + adjustIdx;
+        // if ( item.type === 'entity' ) {
+        //   // console.log('found Entity:', item.type, item.typeIdx, item );
+        // }
+        item.typeIdx = searchTypeIdx > -1 ? searchTypeIdx : SearchTypes.keys.length - 1;
+        item.searchTitle = `${searchTitle}`;
+        item.searchDesc = `${searchDesc}`;
+        item.searchHref = `${searchHref}`;
+    });
+    return items;
+}
+//# sourceMappingURL=addSearchMeta2.js.map

package/lib/components/molecules/SearchPage/functions/addSearchMeta2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"addSearchMeta2.js","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/functions/addSearchMeta2.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AAEH,MAAM,UAAU,cAAc,CAAC,KAAuB,EAAE,WAAyB;IAE/E,KAAK,CAAC,GAAG,CAAC,CAAC,IAAoB,EAAE,EAAE;QAEjC,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QACnD;;WAEG;QACH,4FAA4F;QAC5F,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,MAAM,EAAE;YAAE,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC;SAAE;QAC/D,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,EAAE;YAAE,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;SAAE,CAAC,uDAAuD;QAC9K,IAAI,CAAC,UAAU,EAAE;YAAE,UAAU,GAAG,EAAE,CAAC;SAAE;QAErC,IAAI,CAAC,UAAU,EAAE;YACf,IAAI,IAAI,CAAC,wBAAwB,EAAE;gBAAE,UAAU,GAAG,IAAI,CAAC,wBAAwB,CAAC;aAAE;iBAC7E,IAAI,IAAI,CAAC,OAAO,EAAE;gBAAE,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC;aAAE;iBAChD,IAAI,IAAI,CAAC,wBAAwB,CAAC,EAAE;gBAAE,UAAU,GAAG,IAAI,CAAC,wBAAwB,CAAC,CAAC;aAAE;SAE1F;QAED,IAAI,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,aAAa,KAAK,CAAC,CAAC,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,kCAAkC,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;SAC9E;QAED,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACtG,aAAa,GAAG,aAAa,GAAG,SAAS,CAAC;QAE1C,kCAAkC;QAClC,qEAAqE;QACrE,IAAI;QACJ,IAAI,CAAC,OAAO,GAAG,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAEhF,IAAI,CAAC,WAAW,GAAG,GAAG,WAAW,EAAE,CAAC;QACpC,IAAI,CAAC,UAAU,GAAG,GAAG,UAAU,EAAE,CAAC;QAClC,IAAI,CAAC,UAAU,GAAG,GAAG,UAAU,EAAE,CAAC;IAEpC,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AAEf,CAAC"}

package/lib/components/molecules/SearchPage/functions/addSourceMeta1.d.ts

@@ -0,0 +1,6 @@
+import { ISourceProps } from "../../../../pnpjs/SourceItems/Interface";
+import { IAnySourceItem } from "../../SourceList/IAnyContent";
+import { ISourceSearch } from "../Interfaces/ISourceSearch";
+export declare function addDateTimeFileInfoSearch(item: IAnySourceItem): IAnySourceItem;
+export declare function addSearchMeta1(items: IAnySourceItem[], sourceProps: ISourceProps, search: ISourceSearch): IAnySourceItem[];
+//# sourceMappingURL=addSourceMeta1.d.ts.map

package/lib/components/molecules/SearchPage/functions/addSourceMeta1.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"addSourceMeta1.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/functions/addSourceMeta1.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,wBAAgB,yBAAyB,CAAG,IAAI,EAAE,cAAc,GAAI,cAAc,CAoCjF;AAED,wBAAgB,cAAc,CAAG,KAAK,EAAE,cAAc,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,GAAI,cAAc,EAAE,CA6Q7H"}

package/lib/components/molecules/SearchPage/functions/addSourceMeta1.js

@@ -0,0 +1,253 @@
+export function addDateTimeFileInfoSearch(item) {
+    //https://stackoverflow.com/a/15191245
+    if (item.Created) {
+        item.createdMS = Date.parse(item.Created);
+        item.createdLoc = item.Created.toLocaleString();
+    }
+    if (item.Modified) {
+        item.modifiedMS = Date.parse(item.Modified);
+        item.modifiedLoc = item.Modified.toLocaleString();
+    }
+    if (item.FirstPublishedDate) {
+        item.publishedMS = Date.parse(item.FirstPublishedDate);
+        item.publishedLoc = item.publishedMS.toLocaleString();
+    }
+    //Added this to flatten file url for easier use
+    if (item.File && item.File.ServerRelativeUrl) {
+        item['File/ServerRelativeUrl'] = item.File.ServerRelativeUrl;
+    }
+    item.searchText = '';
+    item.searchTextLC = '';
+    // Create empty search arrays
+    item.leftSearch = [];
+    item.leftSearchLC = [];
+    item.topSearch = [];
+    item.topSearchLC = [];
+    item.sourceSearch = [];
+    item.sourceSearchLC = [];
+    return item;
+}
+export function addSearchMeta1(items, sourceProps, search) {
+    //searchNest will be an array of prop key arrays... so [ 'Author/Title' ] => [ ["Author","Title"] ]
+    const searchNest = [];
+    sourceProps.searchProps.map(prop => {
+        if (prop.indexOf('.') > -1 || prop.indexOf('/') > -1) {
+            searchNest.push(prop.trim().replace(' ', '').split(/[./]/gm));
+        }
+        else {
+            searchNest.push([prop.trim().replace(' ', '')]);
+        }
+    });
+    // debugger;
+    items.map((item) => {
+        let searchTitle = '';
+        let searchDesc = '';
+        const searchHref = '';
+        item = addDateTimeFileInfoSearch(item);
+        if (item.ReportingSections) {
+            item.Reporting = item.ReportingSections;
+        }
+        const meta = [];
+        //This is for display purposes so user can see what property the search criteria is found in
+        const searchText = searchNest.map((propArray, idx) => {
+            if (propArray.length === 1) {
+                item[sourceProps.searchProps[idx]] = item[propArray[0]]; //Add flattened value - item["Author/Title"]= item.Author.Title
+                if (Array.isArray(item[propArray[0]])) {
+                    return `${sourceProps.searchProps[idx]}=${item[propArray[0]].join(';')}`;
+                }
+                else {
+                    return `${sourceProps.searchProps[idx]}=${item[propArray[0]]}`;
+                }
+            }
+            else if (propArray.length === 2) {
+                //Add flatened value for people/expanded columns
+                let hasError = false;
+                try {
+                    if (Array.isArray(item[propArray[0]])) {
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        item[sourceProps.searchProps[idx]] = item[propArray[0]].map((itemX) => { return itemX[propArray[1]]; }); //Add flattened value - item["Author/Title"]= [ item.Author[0].Title, item.Author[1].Title]
+                    }
+                    else {
+                        if (item[propArray[0]]) {
+                            item[sourceProps.searchProps[idx]] = item[propArray[0]][propArray[1]]; //Add flattened value - item["Author/Title"]= item.Author.Title
+                        }
+                        else {
+                            // Need to add this in if the value was not found.  Like the column had no value and was undefined or null... aka Acronyms Standards lookup
+                            item[sourceProps.searchProps[idx]] = 'UNK';
+                            hasError = true;
+                        }
+                    }
+                    /**
+                     * This section was specific to ALVFM columns
+                     */
+                    //Manually copy ReportingSections/Title over to Reporting/Title
+                    // if ( sourceProps.searchProps[ idx ] === 'ReportingSections/Title' ) { item[ 'Reporting/Title'] = item[ sourceProps.searchProps[ idx ] ]; }
+                }
+                catch (e) {
+                    // alert('Error doing search props');
+                    const lastPart = item[propArray[0]] ? item[propArray[0]][propArray[1]] : 'UNK';
+                    item[sourceProps.searchProps[idx]] = lastPart;
+                    console.log('Search Error: ~ `77', item, sourceProps.searchProps, idx, item[propArray[0]], lastPart);
+                    hasError = true;
+                }
+                if (hasError === true) {
+                    return `${sourceProps.searchProps[idx]}=UNK`;
+                }
+                else {
+                    //This first loop never gets triggered with multi-select lookups because the array is really item [ propArray[0] ]
+                    if (Array.isArray(item[propArray[0]][propArray[1]])) {
+                        let result = `${sourceProps.searchProps[idx]}=${item[propArray[0]][propArray[1]].join(';')}`;
+                        if (sourceProps.searchProps[idx] === 'ReportingSections/Title') {
+                            result += ` || Reporting/Title=${item[propArray[0]][propArray[1]].join(';')}`;
+                        }
+                        return result;
+                    }
+                    else if (Array.isArray(item[propArray[0]])) { //As in Controller2/Title
+                        /**
+                         * NEED TO ADD LOOP HERE TO CHECK FOR MULTI-SELECT Lookups like ReportingSections/Titles.
+                         * They don't get caught in the above one because the logic does not work that way
+                         */
+                        if (item[sourceProps.searchProps[idx]]) {
+                            const result = `${sourceProps.searchProps[idx]}=${item[sourceProps.searchProps[idx]].join(';')}`;
+                            return result;
+                        }
+                    }
+                    else {
+                        let result = `${sourceProps.searchProps[idx]}=${item[propArray[0]][propArray[1]]}`;
+                        if (sourceProps.searchProps[idx] === 'ReportingSections/Title') {
+                            result += ` || Reporting/Title=${item[propArray[0]][propArray[1]]}`;
+                        }
+                        return result;
+                    }
+                }
+            }
+        }).join(' || ');
+        //Get rid of any empty strings
+        searchText.split(' || ').map(text => {
+            if (text) {
+                meta.push(text);
+            }
+        });
+        //searchTextLC is used for actual search function - removes Column Titles from searchable text
+        const searchTextLC = sourceProps.searchProps.map(prop => {
+            if (Array.isArray(item[prop])) {
+                return `${item[prop].join(';')}`;
+            }
+            else {
+                return `${item[prop]}`;
+            }
+        }).join(' || ');
+        item.searchText = searchText;
+        item.searchTextLC = searchTextLC.toLocaleLowerCase();
+        //update item's left search string arrays
+        search.left.Search.map((keyWord, idx) => {
+            const keyWordLC = search.left.SearchLC[idx];
+            if (item.searchTextLC.indexOf(keyWordLC) > -1) {
+                item.leftSearch.push(keyWord);
+                item.leftSearchLC.push(keyWordLC);
+            }
+        });
+        //update item's top search string arrays
+        search.top.Search.map((keyWord, idx) => {
+            const keyWordLC = search.top.SearchLC[idx];
+            if (item.searchTextLC.indexOf(keyWordLC) > -1) {
+                item.topSearch.push(keyWord);
+                item.topSearchLC.push(keyWordLC);
+            }
+        });
+        //update item's top search string arrays
+        search.top.Search.map((keyWord, idx) => {
+            const keyWordLC = search.top.SearchLC[idx];
+            if (item.searchTextLC.indexOf(keyWordLC) > -1) {
+                item.topSearch.push(keyWord);
+                item.topSearchLC.push(keyWordLC);
+            }
+        });
+        item.meta = [...meta, ...item.leftSearch, ...item.topSearch];
+        item.fileDisplayName = ''; //Basically the file name but without extension
+        const extIdx = item.FileRef ? item.FileRef.lastIndexOf('.') : -1;
+        if (item['File_x0020_Type']) { // eslint-disable-line dot-notation
+            item.type = item['File_x0020_Type']; // eslint-disable-line dot-notation
+            searchTitle = item['FileLeafRef'] ? item['FileLeafRef'] : 'No Filename to show'; // eslint-disable-line dot-notation
+            item.fileDisplayName = item['FileLeafRef'].replace(`.${item.type}`, ''); // eslint-disable-line dot-notation
+            searchDesc = '';
+        }
+        else if (extIdx > -1) {
+            item.type = item.FileRef.substring(extIdx + 1);
+            if (item.type === 'aspx') {
+                item.type = 'page';
+                searchTitle = item.Title;
+                item.fileDisplayName = item['FileLeafRef'].replace(`.aspx`, ''); // eslint-disable-line dot-notation
+                searchDesc = item.Description;
+            }
+        }
+        else {
+            item.type = sourceProps.defType;
+            searchTitle = item.Title;
+            searchDesc = 'Other Type Search Desc';
+        }
+        item.searchTitle = `${searchTitle}`;
+        item.searchDesc = `${searchDesc}`;
+        item.searchHref = `${searchHref}`;
+        /**
+         * This section was specific to ALVFM columns
+         */
+        // if ( sourceProps.key === 'manual' ||  sourceProps.key === 'help' || sourceProps.key === 'news' ) {
+        //   item.searchTitle = item.Title;
+        // }
+        item.format = sourceProps.key;
+        // if ( item.Tab && item.LinkColumn ) {
+        //   console.log('DataFetch.ts ~ 493');
+        // }
+        /**
+         * This section was specific to ALVFM columns
+         */
+        // if ( !searchDesc && item.SearchWords ) { searchDesc = item.SearchWords; }
+        // if ( !searchHref && item.LinkColumn ) { 
+        //   searchHref = item.LinkColumn.Url;
+        //   if ( !searchDesc && item.SearchWords ) { searchDesc = item.LinkColumn.Description; }
+        // }
+        // //Just add this prop to everything for ease of use.
+        // if ( item.ReportingForms ) {
+        //   if ( Array.isArray( item.ReportingForms) === true ) {
+        //     item.ReportingFormsStr = item.ReportingForms.map( ( form: any ) => { return form.Title ; } ).join('; ');
+        //   } else { item.ReportingFormsStr = item.ReportingForms; }
+        // } else {
+        //   item.ReportingForms = [];
+        //   item.ReportingFormsStr = '';
+        // }
+        // if ( item.type === 'account' ) {
+        //   searchTitle = '';
+        //   searchDesc = [ item.type, item.ReportingForms.Title, item.SubCategory, item.Name1, item.Description ] .join ('<>');
+        //   if ( item.Description && ( item.Description.indexOf('&quot;') > -1 || item.Description.indexOf('</') > -1 ) ) { item.descIsHTML = true ; }
+        //   searchHref = '';
+        // }
+        /**
+         * This could be added as secondary function after adding custom search code to catch any loose ends.
+         */
+        //This if was added for the Standards Wiki Library where the title column is actually Title0
+        // if ( !searchTitle && item.Title0 ) { searchTitle = item.Title0 ; } 
+        // if ( !searchTitle && item.FileLeafRef ) { searchTitle = item.FileLeafRef.substr(0, item.FileLeafRef.lastIndexOf('.') ) ; } //Added for Std #139 which does not have a Title value.
+        // if ( !searchDesc ) { searchDesc = '' ; }
+        // if ( !searchHref ) { 
+        //   if ( item.ServerRedirectedEmbedUri ) { searchHref = item.ServerRedirectedEmbedUri ;  }
+        //   else if ( item.FileRef ) { searchHref = item.FileRef ;  }
+        //   else if ( item[ 'File/ServerRelativeUrl' ] ) { searchHref = item[ 'File/ServerRelativeUrl' ] ;  }
+        // }
+        // let searchTypeIdx = SearchTypes.keys.indexOf( item.type ) ;
+        // if ( searchTypeIdx === -1 ) {
+        //   console.log('Invalid searchTypeIdx not found:', item.type, SearchTypes.keys );
+        // }
+        // const adjustIdx = SearchTypes.objs[ searchTypeIdx ].adjust ? SearchTypes.objs[ searchTypeIdx ].adjust : 0;
+        // searchTypeIdx = searchTypeIdx + adjustIdx;
+        // if ( item.type === 'entity' ) {
+        //   // console.log('found Entity:', item.type, item.typeIdx, item );
+        // }
+        // item.typeIdx = searchTypeIdx > -1 ? searchTypeIdx : SearchTypes.keys.length -1 ;
+        // item.searchTitle = `${searchTitle}`;
+        // item.searchDesc = `${searchDesc}`;
+        // item.searchHref = `${searchHref}`;
+    });
+    return items;
+}
+//# sourceMappingURL=addSourceMeta1.js.map

package/lib/components/molecules/SearchPage/functions/addSourceMeta1.js.map

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

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

@@ -23,6 +23,7 @@ export interface ISourceProps extends IMinSourceFetchProps {
     expandThese?: string[];
     restFilter?: string;
     orderBy?: ISeriesSortObject;
+    key: string;
     defType: string;
     webRelativeLink: string;
     viewItemLink?: 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,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;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"}

package/lib/pnpjs/SourceItems/SitePages/ModernSitePagesColumns.d.ts

@@ -0,0 +1,5 @@
+export declare const ModernSitePagesColumns: string[];
+export declare const ModernSitePagesSearch: string[];
+export declare const ExtraFetchClassicWiki: string[];
+export declare const ExtraFetchModernPage: string[];
+//# sourceMappingURL=ModernSitePagesColumns.d.ts.map

package/lib/pnpjs/SourceItems/SitePages/ModernSitePagesColumns.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModernSitePagesColumns.d.ts","sourceRoot":"","sources":["../../../../src/pnpjs/SourceItems/SitePages/ModernSitePagesColumns.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,sBAAsB,EAAE,MAAM,EAEd,CAAC;AAG9B,eAAO,MAAM,qBAAqB,EAAE,MAAM,EAAqG,CAAC;AAEhJ,eAAO,MAAM,qBAAqB,UAAgB,CAAC;AAGnD,eAAO,MAAM,oBAAoB,UAA8E,CAAC"}

package/lib/pnpjs/SourceItems/SitePages/ModernSitePagesColumns.js

@@ -0,0 +1,8 @@
+export const ModernSitePagesColumns = ['ID', 'Title', 'Description', 'Author/Title', 'Editor/Title', 'File/ServerRelativeUrl', 'BannerImageUrl',
+    'FileSystemObjectType', 'Modified', 'Created', 'FirstPublishedDate', 'PromotedState', 'FileSizeDisplay', 'OData__UIVersion', 'OData__UIVersionString', 'DocIcon',
+    'OData__OriginalSourceUrl']; //Added this for news links
+export const ModernSitePagesSearch = ['Title', 'Description', 'Author/Title', 'Editor/Title', 'FirstPublishedDate', 'PromotedState',];
+export const ExtraFetchClassicWiki = ['WikiField'];
+//Added ,'BannerImageUrl' even though it's elsewhere to be sure it's included in all use cases
+export const ExtraFetchModernPage = ['WikiField', 'CanvasContent1', 'LayoutsWebpartsContent', 'BannerImageUrl'];
+//# sourceMappingURL=ModernSitePagesColumns.js.map

package/lib/pnpjs/SourceItems/SitePages/ModernSitePagesColumns.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModernSitePagesColumns.js","sourceRoot":"","sources":["../../../../src/pnpjs/SourceItems/SitePages/ModernSitePagesColumns.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,sBAAsB,GAAa,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,EAAE,wBAAwB,EAAE,gBAAgB;IACvJ,sBAAsB,EAAE,UAAU,EAAE,SAAS,EAAE,oBAAoB,EAAE,eAAe,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,SAAS;IAChK,0BAA0B,CAAC,CAAC,CAAC,2BAA2B;AAG1D,MAAM,CAAC,MAAM,qBAAqB,GAAa,CAAC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,EAAE,oBAAoB,EAAE,eAAe,EAAE,CAAC;AAEhJ,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,WAAW,CAAC,CAAC;AACnD,8FAA8F;AAE9F,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,WAAW,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,gBAAgB,CAAC,CAAC"}

package/lib/pnpjs/SourceItems/SitePages/NewsLinksSource.d.ts

@@ -0,0 +1,3 @@
+import { ISourceProps } from "../Interface";
+export declare const NewsLinksSource: ISourceProps;
+//# sourceMappingURL=NewsLinksSource.d.ts.map

package/lib/pnpjs/SourceItems/SitePages/NewsLinksSource.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NewsLinksSource.d.ts","sourceRoot":"","sources":["../../../../src/pnpjs/SourceItems/SitePages/NewsLinksSource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG5C,eAAO,MAAM,eAAe,EAAE,YAiC7B,CAAC"}

package/lib/pnpjs/SourceItems/SitePages/NewsLinksSource.js

@@ -0,0 +1,35 @@
+import { ModernSitePagesColumns, ModernSitePagesSearch, ExtraFetchModernPage } from "./ModernSitePagesColumns";
+export const NewsLinksSource = {
+    key: 'news',
+    defType: 'news',
+    webUrl: ``,
+    listTitle: "Site Pages",
+    webRelativeLink: "SitePages",
+    searchSource: '',
+    searchSourceDesc: '',
+    columns: ModernSitePagesColumns,
+    searchProps: ModernSitePagesSearch,
+    selectThese: [...ModernSitePagesColumns],
+    itemFetchCol: ExtraFetchModernPage,
+    isModern: true,
+    // https://sharepoint.stackexchange.com/a/284672
+    // NOTE:  This may need to be encoded if you are not using pnp.... https://sharepoint.stackexchange.com/a/273356 
+    //    you'll need to encode this to use it. Change your spaces to %20 and your single quotes to %27
+    //    restFilter: `PromotedState%20eq%202%20and%20ContentType%20eq%20%27Repost%20Page%27`,
+    restFilter: `PromotedState eq 2 and ContentType eq 'Repost Page'`,
+    evalFilter: ``,
+    defSearchButtons: [],
+    fetchCount: 200,
+    //Might be best to sort by Published Date
+    orderBy: {
+        prop: 'Title',
+        order: 'asc',
+        asc: true,
+    },
+    meta0: [],
+    meta1: [],
+    meta2: [],
+    meta3: [],
+    metaX: [],
+};
+//# sourceMappingURL=NewsLinksSource.js.map

package/lib/pnpjs/SourceItems/SitePages/NewsLinksSource.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NewsLinksSource.js","sourceRoot":"","sources":["../../../../src/pnpjs/SourceItems/SitePages/NewsLinksSource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAE/G,MAAM,CAAC,MAAM,eAAe,GAAiB;IAC3C,GAAG,EAAE,MAAM;IACX,OAAO,EAAE,MAAM;IACf,MAAM,EAAE,EAAE;IACV,SAAS,EAAE,YAAY;IACvB,eAAe,EAAE,WAAW;IAC5B,YAAY,EAAE,EAAE;IAChB,gBAAgB,EAAE,EAAE;IACpB,OAAO,EAAE,sBAAsB;IAC/B,WAAW,EAAE,qBAAqB;IAClC,WAAW,EAAE,CAAC,GAAG,sBAAsB,CAAC;IAExC,YAAY,EAAE,oBAAoB;IAClC,QAAQ,EAAE,IAAI;IACd,gDAAgD;IAChD,iHAAiH;IACjH,mGAAmG;IACnG,0FAA0F;IAC1F,UAAU,EAAE,qDAAqD;IACjE,UAAU,EAAE,EAAE;IACd,gBAAgB,EAAE,EAAE;IACpB,UAAU,EAAE,GAAG;IACf,yCAAyC;IACzC,OAAO,EAAE;QACP,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,KAAK;QACZ,GAAG,EAAE,IAAI;KACV;IACD,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;CACV,CAAC"}

package/lib/pnpjs/SourceItems/SitePages/NewsSource.d.ts

@@ -0,0 +1,3 @@
+import { ISourceProps } from "../Interface";
+export declare const NewsSource: ISourceProps;
+//# sourceMappingURL=NewsSource.d.ts.map

package/lib/pnpjs/SourceItems/SitePages/NewsSource.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NewsSource.d.ts","sourceRoot":"","sources":["../../../../src/pnpjs/SourceItems/SitePages/NewsSource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG5C,eAAO,MAAM,UAAU,EAAE,YA6BxB,CAAC"}

package/lib/pnpjs/SourceItems/SitePages/NewsSource.js

@@ -0,0 +1,31 @@
+import { ModernSitePagesColumns, ModernSitePagesSearch, ExtraFetchModernPage } from "./ModernSitePagesColumns";
+export const NewsSource = {
+    key: 'news',
+    defType: 'news',
+    webUrl: ``,
+    listTitle: "Site Pages",
+    webRelativeLink: "SitePages",
+    searchSource: '',
+    searchSourceDesc: '',
+    columns: ModernSitePagesColumns,
+    searchProps: ModernSitePagesSearch,
+    selectThese: [...ModernSitePagesColumns],
+    itemFetchCol: ExtraFetchModernPage,
+    isModern: true,
+    restFilter: `PromotedState eq 2`,
+    evalFilter: ``,
+    defSearchButtons: [],
+    fetchCount: 200,
+    //Might be best to sort by Published Date
+    orderBy: {
+        prop: 'Title',
+        order: 'asc',
+        asc: true,
+    },
+    meta0: [],
+    meta1: [],
+    meta2: [],
+    meta3: [],
+    metaX: [],
+};
+//# sourceMappingURL=NewsSource.js.map

package/lib/pnpjs/SourceItems/SitePages/NewsSource.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NewsSource.js","sourceRoot":"","sources":["../../../../src/pnpjs/SourceItems/SitePages/NewsSource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAE/G,MAAM,CAAC,MAAM,UAAU,GAAiB;IACtC,GAAG,EAAE,MAAM;IACX,OAAO,EAAE,MAAM;IACf,MAAM,EAAE,EAAE;IACV,SAAS,EAAE,YAAY;IACvB,eAAe,EAAE,WAAW;IAC5B,YAAY,EAAE,EAAE;IAChB,gBAAgB,EAAE,EAAE;IACpB,OAAO,EAAE,sBAAsB;IAC/B,WAAW,EAAE,qBAAqB;IAClC,WAAW,EAAE,CAAC,GAAG,sBAAsB,CAAC;IAExC,YAAY,EAAE,oBAAoB;IAClC,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE,oBAAoB;IAChC,UAAU,EAAE,EAAE;IACd,gBAAgB,EAAE,EAAE;IACpB,UAAU,EAAE,GAAG;IACf,yCAAyC;IACzC,OAAO,EAAE;QACP,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,KAAK;QACZ,GAAG,EAAE,IAAI;KACV;IACD,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;CACV,CAAC"}

package/lib/pnpjs/SourceItems/SitePages/SitePagesSource.d.ts

@@ -1,7 +1,3 @@
 import { ISourceProps } from "../../../pnpjs/SourceItems/Interface";
-export declare const ModernSitePagesColumns: string[];
-export declare const ModernSitePagesSearch: string[];
-export declare const ExtraFetchClassicWiki: string[];
-export declare const ExtraFetchModernPage: string[];
 export declare const SitePagesSource: ISourceProps;
 //# sourceMappingURL=SitePagesSource.d.ts.map

package/lib/pnpjs/SourceItems/SitePages/SitePagesSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SitePagesSource.d.ts","sourceRoot":"","sources":["../../../../src/pnpjs/SourceItems/SitePages/SitePagesSource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEpE,eAAO,MAAM,sBAAsB,EAAE,MAAM,EAEd,CAAC;AAE9B,eAAO,MAAM,qBAAqB,EAAE,MAAM,EAAqG,CAAC;AAEhJ,eAAO,MAAM,qBAAqB,UAAgB,CAAC;AAGnD,eAAO,MAAM,oBAAoB,UAA8E,CAAC;AAIhH,eAAO,MAAM,eAAe,EAAE,YA4B7B,CAAC"}
+{"version":3,"file":"SitePagesSource.d.ts","sourceRoot":"","sources":["../../../../src/pnpjs/SourceItems/SitePages/SitePagesSource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAKpE,eAAO,MAAM,eAAe,EAAE,YA6B7B,CAAC"}

package/lib/pnpjs/SourceItems/SitePages/SitePagesSource.js

@@ -1,12 +1,7 @@
-export const ModernSitePagesColumns = ['ID', 'Title', 'Description', 'Author/Title', 'Editor/Title', 'File/ServerRelativeUrl', 'BannerImageUrl',
-    'FileSystemObjectType', 'Modified', 'Created', 'FirstPublishedDate', 'PromotedState', 'FileSizeDisplay', 'OData__UIVersion', 'OData__UIVersionString', 'DocIcon',
-    'OData__OriginalSourceUrl']; //Added this for news links
-export const ModernSitePagesSearch = ['Title', 'Description', 'Author/Title', 'Editor/Title', 'FirstPublishedDate', 'PromotedState',];
-export const ExtraFetchClassicWiki = ['WikiField'];
-//Added ,'BannerImageUrl' even though it's elsewhere to be sure it's included in all use cases
-export const ExtraFetchModernPage = ['WikiField', 'CanvasContent1', 'LayoutsWebpartsContent', 'BannerImageUrl'];
+import { ModernSitePagesColumns, ModernSitePagesSearch, ExtraFetchModernPage } from "./ModernSitePagesColumns";
 // Set webUrl and EasyPageOverflowTab string | undefined to solve lint errors
 export const SitePagesSource = {
+    key: 'pages',
     defType: 'pages',
     webUrl: ``,
     listTitle: "Site Pages",

package/lib/pnpjs/SourceItems/SitePages/SitePagesSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"SitePagesSource.js","sourceRoot":"","sources":["../../../../src/pnpjs/SourceItems/SitePages/SitePagesSource.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,sBAAsB,GAAa,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,EAAE,wBAAwB,EAAE,gBAAgB;IACvJ,sBAAsB,EAAE,UAAU,EAAE,SAAS,EAAE,oBAAoB,EAAE,eAAe,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,SAAS;IAChK,0BAA0B,CAAC,CAAC,CAAC,2BAA2B;AAE1D,MAAM,CAAC,MAAM,qBAAqB,GAAa,CAAC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,EAAE,oBAAoB,EAAE,eAAe,EAAE,CAAC;AAEhJ,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,WAAW,CAAC,CAAC;AAEnD,8FAA8F;AAC9F,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,WAAW,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,gBAAgB,CAAC,CAAC;AAEhH,6EAA6E;AAE7E,MAAM,CAAC,MAAM,eAAe,GAAiB;IAC3C,OAAO,EAAE,OAAO;IAChB,MAAM,EAAE,EAAE;IACV,SAAS,EAAE,YAAY;IACvB,eAAe,EAAE,WAAW;IAC5B,YAAY,EAAE,EAAE;IAChB,gBAAgB,EAAE,EAAE;IACpB,OAAO,EAAE,sBAAsB;IAC/B,WAAW,EAAE,qBAAqB;IAClC,WAAW,EAAE,CAAC,GAAG,sBAAsB,CAAC;IAExC,YAAY,EAAE,oBAAoB;IAClC,QAAQ,EAAE,IAAI;IACd,+GAA+G;IAC/G,UAAU,EAAE,2EAA2E;IACvF,UAAU,EAAE,EAAE;IACd,gBAAgB,EAAE,EAAE;IACpB,UAAU,EAAE,GAAG;IACf,OAAO,EAAE;QACP,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,KAAK;QACZ,GAAG,EAAE,IAAI;KACV;IACD,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;CACV,CAAC"}
+{"version":3,"file":"SitePagesSource.js","sourceRoot":"","sources":["../../../../src/pnpjs/SourceItems/SitePages/SitePagesSource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAE/G,6EAA6E;AAE7E,MAAM,CAAC,MAAM,eAAe,GAAiB;IAC3C,GAAG,EAAE,OAAO;IACZ,OAAO,EAAE,OAAO;IAChB,MAAM,EAAE,EAAE;IACV,SAAS,EAAE,YAAY;IACvB,eAAe,EAAE,WAAW;IAC5B,YAAY,EAAE,EAAE;IAChB,gBAAgB,EAAE,EAAE;IACpB,OAAO,EAAE,sBAAsB;IAC/B,WAAW,EAAE,qBAAqB;IAClC,WAAW,EAAE,CAAC,GAAG,sBAAsB,CAAC;IAExC,YAAY,EAAE,oBAAoB;IAClC,QAAQ,EAAE,IAAI;IACd,+GAA+G;IAC/G,UAAU,EAAE,2EAA2E;IACvF,UAAU,EAAE,EAAE;IACd,gBAAgB,EAAE,EAAE;IACpB,UAAU,EAAE,GAAG;IACf,OAAO,EAAE;QACP,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,KAAK;QACZ,GAAG,EAAE,IAAI;KACV;IACD,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;CACV,CAAC"}

package/lib/pnpjs/SourceItems/SitePages/createPivotTilesPagesSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createPivotTilesPagesSource.d.ts","sourceRoot":"","sources":["../../../../src/pnpjs/SourceItems/SitePages/createPivotTilesPagesSource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG5C,eAAO,MAAM,gCAAgC,EAAE,MAAM,EACJ,CAAC;AAElD,wBAAgB,2BAA2B,IAAI,YAAY,CAM1D"}
+{"version":3,"file":"createPivotTilesPagesSource.d.ts","sourceRoot":"","sources":["../../../../src/pnpjs/SourceItems/SitePages/createPivotTilesPagesSource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI5C,eAAO,MAAM,gCAAgC,EAAE,MAAM,EACJ,CAAC;AAElD,wBAAgB,2BAA2B,IAAI,YAAY,CAM1D"}

package/lib/pnpjs/SourceItems/SitePages/createPivotTilesPagesSource.js

@@ -1,4 +1,5 @@
-import { ModernSitePagesColumns, SitePagesSource } from "./SitePagesSource";
+import { SitePagesSource } from "./SitePagesSource";
+import { ModernSitePagesColumns } from "./ModernSitePagesColumns";
 export const ModernSitePagesColumnsPivotTiles = [...ModernSitePagesColumns, 'Author/Name', 'Editor/Name', 'FileRef',
     'CheckoutUserId', 'FieldValuesAsText/MetaInfo'];
 export function createPivotTilesPagesSource() {

package/lib/pnpjs/SourceItems/SitePages/createPivotTilesPagesSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"createPivotTilesPagesSource.js","sourceRoot":"","sources":["../../../../src/pnpjs/SourceItems/SitePages/createPivotTilesPagesSource.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAE5E,MAAM,CAAC,MAAM,gCAAgC,GAAa,CAAC,GAAG,sBAAsB,EAAE,aAAa,EAAE,aAAa,EAAE,SAAS;IAC3H,gBAAgB,EAAE,4BAA4B,CAAC,CAAC;AAElD,MAAM,UAAU,2BAA2B;IACzC,MAAM,MAAM,GAAiB,eAAe,CAAC;IAC7C,MAAM,CAAC,OAAO,GAAG,gCAAgC,CAAC;IAClD,MAAM,CAAC,WAAW,GAAG,CAAC,GAAG,gCAAgC,CAAC,CAAC;IAC3D,OAAO,MAAM,CAAC;AAEhB,CAAC"}
+{"version":3,"file":"createPivotTilesPagesSource.js","sourceRoot":"","sources":["../../../../src/pnpjs/SourceItems/SitePages/createPivotTilesPagesSource.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,MAAM,CAAC,MAAM,gCAAgC,GAAa,CAAC,GAAG,sBAAsB,EAAE,aAAa,EAAE,aAAa,EAAE,SAAS;IAC3H,gBAAgB,EAAE,4BAA4B,CAAC,CAAC;AAElD,MAAM,UAAU,2BAA2B;IACzC,MAAM,MAAM,GAAiB,eAAe,CAAC;IAC7C,MAAM,CAAC,OAAO,GAAG,gCAAgC,CAAC;IAClD,MAAM,CAAC,WAAW,GAAG,CAAC,GAAG,gCAAgC,CAAC,CAAC;IAC3D,OAAO,MAAM,CAAC;AAEhB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikezimm/fps-library-v2",
-  "version": "1.0.123",
+  "version": "1.0.124",
   "description": "Library of reusable typescript/javascript functions, interfaces and constants",
   "license": "MIT",
   "main": "./lib/index.js",

package/lib/components/molecules/SearchPage/ISearchTypes.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ISearchTypes.d.ts","sourceRoot":"","sources":["../../../../src/components/molecules/SearchPage/ISearchTypes.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,WAAW,EAAE,CAAC;CACrB"}

package/lib/components/molecules/SearchPage/ISearchTypes.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ISearchTypes.js","sourceRoot":"","sources":["../../../../src/components/molecules/SearchPage/ISearchTypes.ts"],"names":[],"mappings":""}

package/lib/components/molecules/SearchPage/StandardTypes.d.ts

@@ -1,6 +0,0 @@
-import { ISearchType } from "./ISearchTypes";
-export declare const StdFileKeys: string[];
-export declare const StdFileSearchTypes: ISearchType[];
-export declare const StdSharePointKeys: string[];
-export declare const StdSharePointSearchTypes: ISearchType[];
-//# sourceMappingURL=StandardTypes.d.ts.map

package/lib/components/molecules/SearchPage/StandardTypes.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"StandardTypes.d.ts","sourceRoot":"","sources":["../../../../src/components/molecules/SearchPage/StandardTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,eAAO,MAAM,WAAW,EAAE,MAAM,EAM/B,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,WAAW,EAiB3C,CAAC;AAGF,eAAO,MAAM,iBAAiB,EAAE,MAAM,EAErC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,WAAW,EAGjD,CAAC"}

package/lib/components/molecules/SearchPage/StandardTypes.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"StandardTypes.js","sourceRoot":"","sources":["../../../../src/components/molecules/SearchPage/StandardTypes.ts"],"names":[],"mappings":"AAEA,sDAAsD;AACtD,MAAM,CAAC,MAAM,WAAW,GAAc;IACpC,KAAK;IACL,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM,EAAG,MAAM;IACtB,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK;IAC3B,KAAK;CACN,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAkB;IAC/C,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IAE9D,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,oBAAoB,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IAC7E,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,oBAAoB,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE;IAE1F,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IACxE,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE;IACrF,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE;IAErF,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IACvE,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE;IACpF,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IACpE,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE;IAEnF,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;CAEhE,CAAC;AAEF,4DAA4D;AAC5D,MAAM,CAAC,MAAM,iBAAiB,GAAc;IAC1C,MAAM,EAAE,MAAM;CACf,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAkB;IACrD,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IAC7E,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;CAClE,CAAC"}