@esri/hub-common 9.38.0 → 9.39.0

package/dist/es2017/search/collectionState.js

@@ -52,7 +52,7 @@ export function serializeCollectionState(collection) {
     if (collection.sortOption) {
         state.sort = serializeSortState(collection.sortOption);
     }
-    const facetState = collection.facets.reduce((s, facet) => {
+    const facetState = (collection.facets || []).reduce((s, facet) => {
         return Object.assign(Object.assign({}, s), serializeFacetState(facet));
     }, {});
     return Object.assign(Object.assign({}, state), facetState);

package/dist/es2017/search/collectionState.js.map

@@ -1 +1 @@
-{"version":3,"file":"collectionState.js","sourceRoot":"","sources":["../../../src/search/collectionState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,EACL,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;AAE3B;;;;;;;;;GASG;AAEH,MAAM,UAAU,oBAAoB,CAClC,UAAuB,EACvB,KAAuB;IAEvB,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IAExC,sBAAsB;IACtB,IAAI,KAAK,CAAC,KAAK,EAAE;QACf,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC;KACpC;IAED,mBAAmB;IACnB,OAAO,CAAC,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAEpE,qDAAqD;IACrD,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5C,oDAAoD;QACpD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YAC1C,MAAM,UAAU,GAAG,EAAiB,CAAC;YACrC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACzC,OAAO,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;SAC3C;aAAM;YACL,sCAAsC;YACtC,8CAA8C;YAC9C,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC5B,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC;YACvB,CAAC,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;SACd;IACH,CAAC,CAAC,CAAC;IAEH,EAAE;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB,CACtC,UAAuB;IAEvB,MAAM,KAAK,GAAqB,EAAE,CAAC;IAEnC,IAAI,UAAU,CAAC,YAAY,EAAE;QAC3B,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,YAAY,CAAC;KACvC;IAED,IAAI,UAAU,CAAC,UAAU,EAAE;QACzB,KAAK,CAAC,IAAI,GAAG,kBAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;KACxD;IAED,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QACvD,uCAAY,CAAC,GAAK,mBAAmB,CAAC,KAAK,CAAC,EAAG;IACjD,CAAC,EAAE,EAAiB,CAAC,CAAC;IAEtB,uCAAY,KAAK,GAAK,UAAU,EAAG;AACrC,CAAC"}
+{"version":3,"file":"collectionState.js","sourceRoot":"","sources":["../../../src/search/collectionState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,EACL,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;AAE3B;;;;;;;;;GASG;AAEH,MAAM,UAAU,oBAAoB,CAClC,UAAuB,EACvB,KAAuB;IAEvB,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IAExC,sBAAsB;IACtB,IAAI,KAAK,CAAC,KAAK,EAAE;QACf,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC;KACpC;IAED,mBAAmB;IACnB,OAAO,CAAC,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAEpE,qDAAqD;IACrD,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5C,oDAAoD;QACpD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YAC1C,MAAM,UAAU,GAAG,EAAiB,CAAC;YACrC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACzC,OAAO,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;SAC3C;aAAM;YACL,sCAAsC;YACtC,8CAA8C;YAC9C,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC5B,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC;YACvB,CAAC,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;SACd;IACH,CAAC,CAAC,CAAC;IAEH,EAAE;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB,CACtC,UAAuB;IAEvB,MAAM,KAAK,GAAqB,EAAE,CAAC;IAEnC,IAAI,UAAU,CAAC,YAAY,EAAE;QAC3B,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,YAAY,CAAC;KACvC;IAED,IAAI,UAAU,CAAC,UAAU,EAAE;QACzB,KAAK,CAAC,IAAI,GAAG,kBAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;KACxD;IAED,MAAM,UAAU,GAAG,CAAC,UAAU,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QAC/D,uCAAY,CAAC,GAAK,mBAAmB,CAAC,KAAK,CAAC,EAAG;IACjD,CAAC,EAAE,EAAiB,CAAC,CAAC;IAEtB,uCAAY,KAAK,GAAK,UAAU,EAAG;AACrC,CAAC"}

package/dist/es2017/search/convertCatalog.js

@@ -4,19 +4,28 @@ import { getProp } from "..";
  * @param original
  */
 export function convertCatalog(original) {
-    const filter = {
-        filterType: "content",
+    const filterGroup = {
+        filterType: "item",
+        operation: "OR",
+        filters: [],
     };
     const groups = getProp(original, "groups");
     if (Array.isArray(groups) && groups.length) {
-        filter.group = groups;
+        filterGroup.filters.push({
+            filterType: "item",
+            group: groups,
+        });
     }
     else if (typeof groups === "string") {
-        filter.group = [groups];
+        filterGroup.filters.push({
+            filterType: "item",
+            group: [groups],
+        });
     }
     const catalog = {
         title: "Default Catalog",
-        filter,
+        scope: [filterGroup],
+        collections: [],
     };
     return catalog;
 }

package/dist/es2017/search/convertCatalog.js.map

@@ -1 +1 @@
-{"version":3,"file":"convertCatalog.js","sourceRoot":"","sources":["../../../src/search/convertCatalog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAG7B;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,QAAa;IAC1C,MAAM,MAAM,GAAsB;QAChC,UAAU,EAAE,SAAS;KACtB,CAAC;IAEF,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE;QAC1C,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC;KACvB;SAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACrC,MAAM,CAAC,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC;KACzB;IAED,MAAM,OAAO,GAAa;QACxB,KAAK,EAAE,iBAAiB;QACxB,MAAM;KACP,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"convertCatalog.js","sourceRoot":"","sources":["../../../src/search/convertCatalog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAG7B;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,QAAa;IAC1C,MAAM,WAAW,GAAyB;QACxC,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE;QAC1C,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;YACvB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;KACJ;SAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACrC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;YACvB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,CAAC,MAAM,CAAC;SAChB,CAAC,CAAC;KACJ;IAED,MAAM,OAAO,GAAa;QACxB,KAAK,EAAE,iBAAiB;QACxB,KAAK,EAAE,CAAC,WAAW,CAAC;QACpB,WAAW,EAAE,EAAE;KAChB,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/esm/search/collectionState.js

@@ -53,7 +53,7 @@ export function serializeCollectionState(collection) {
     if (collection.sortOption) {
         state.sort = serializeSortState(collection.sortOption);
     }
-    var facetState = collection.facets.reduce(function (s, facet) {
+    var facetState = (collection.facets || []).reduce(function (s, facet) {
         return __assign(__assign({}, s), serializeFacetState(facet));
     }, {});
     return __assign(__assign({}, state), facetState);

package/dist/esm/search/collectionState.js.map

@@ -1 +1 @@
-{"version":3,"file":"collectionState.js","sourceRoot":"","sources":["../../../src/search/collectionState.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,EACL,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;AAE3B;;;;;;;;;GASG;AAEH,MAAM,UAAU,oBAAoB,CAClC,UAAuB,EACvB,KAAuB;IAEvB,IAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IAExC,sBAAsB;IACtB,IAAI,KAAK,CAAC,KAAK,EAAE;QACf,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC;KACpC;IAED,mBAAmB;IACnB,OAAO,CAAC,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAEpE,qDAAqD;IACrD,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,UAAC,KAAK;QACxC,oDAAoD;QACpD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YAC1C,IAAM,UAAU,GAAG,EAAiB,CAAC;YACrC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACzC,OAAO,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;SAC3C;aAAM;YACL,sCAAsC;YACtC,8CAA8C;YAC9C,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAC,GAAG;gBACxB,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC;YACvB,CAAC,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;SACd;IACH,CAAC,CAAC,CAAC;IAEH,EAAE;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB,CACtC,UAAuB;IAEvB,IAAM,KAAK,GAAqB,EAAE,CAAC;IAEnC,IAAI,UAAU,CAAC,YAAY,EAAE;QAC3B,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,YAAY,CAAC;KACvC;IAED,IAAI,UAAU,CAAC,UAAU,EAAE;QACzB,KAAK,CAAC,IAAI,GAAG,kBAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;KACxD;IAED,IAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,UAAC,CAAC,EAAE,KAAK;QACnD,6BAAY,CAAC,GAAK,mBAAmB,CAAC,KAAK,CAAC,EAAG;IACjD,CAAC,EAAE,EAAiB,CAAC,CAAC;IAEtB,6BAAY,KAAK,GAAK,UAAU,EAAG;AACrC,CAAC"}
+{"version":3,"file":"collectionState.js","sourceRoot":"","sources":["../../../src/search/collectionState.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,EACL,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;AAE3B;;;;;;;;;GASG;AAEH,MAAM,UAAU,oBAAoB,CAClC,UAAuB,EACvB,KAAuB;IAEvB,IAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IAExC,sBAAsB;IACtB,IAAI,KAAK,CAAC,KAAK,EAAE;QACf,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC;KACpC;IAED,mBAAmB;IACnB,OAAO,CAAC,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAEpE,qDAAqD;IACrD,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,UAAC,KAAK;QACxC,oDAAoD;QACpD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YAC1C,IAAM,UAAU,GAAG,EAAiB,CAAC;YACrC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACzC,OAAO,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;SAC3C;aAAM;YACL,sCAAsC;YACtC,8CAA8C;YAC9C,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAC,GAAG;gBACxB,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC;YACvB,CAAC,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;SACd;IACH,CAAC,CAAC,CAAC;IAEH,EAAE;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB,CACtC,UAAuB;IAEvB,IAAM,KAAK,GAAqB,EAAE,CAAC;IAEnC,IAAI,UAAU,CAAC,YAAY,EAAE;QAC3B,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,YAAY,CAAC;KACvC;IAED,IAAI,UAAU,CAAC,UAAU,EAAE;QACzB,KAAK,CAAC,IAAI,GAAG,kBAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;KACxD;IAED,IAAM,UAAU,GAAG,CAAC,UAAU,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,UAAC,CAAC,EAAE,KAAK;QAC3D,6BAAY,CAAC,GAAK,mBAAmB,CAAC,KAAK,CAAC,EAAG;IACjD,CAAC,EAAE,EAAiB,CAAC,CAAC;IAEtB,6BAAY,KAAK,GAAK,UAAU,EAAG;AACrC,CAAC"}

package/dist/esm/search/convertCatalog.js

@@ -4,19 +4,28 @@ import { getProp } from "..";
  * @param original
  */
 export function convertCatalog(original) {
-    var filter = {
-        filterType: "content",
+    var filterGroup = {
+        filterType: "item",
+        operation: "OR",
+        filters: [],
     };
     var groups = getProp(original, "groups");
     if (Array.isArray(groups) && groups.length) {
-        filter.group = groups;
+        filterGroup.filters.push({
+            filterType: "item",
+            group: groups,
+        });
     }
     else if (typeof groups === "string") {
-        filter.group = [groups];
+        filterGroup.filters.push({
+            filterType: "item",
+            group: [groups],
+        });
     }
     var catalog = {
         title: "Default Catalog",
-        filter: filter,
+        scope: [filterGroup],
+        collections: [],
     };
     return catalog;
 }

package/dist/esm/search/convertCatalog.js.map

@@ -1 +1 @@
-{"version":3,"file":"convertCatalog.js","sourceRoot":"","sources":["../../../src/search/convertCatalog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAG7B;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,QAAa;IAC1C,IAAM,MAAM,GAAsB;QAChC,UAAU,EAAE,SAAS;KACtB,CAAC;IAEF,IAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE;QAC1C,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC;KACvB;SAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACrC,MAAM,CAAC,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC;KACzB;IAED,IAAM,OAAO,GAAa;QACxB,KAAK,EAAE,iBAAiB;QACxB,MAAM,QAAA;KACP,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"convertCatalog.js","sourceRoot":"","sources":["../../../src/search/convertCatalog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAG7B;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,QAAa;IAC1C,IAAM,WAAW,GAAyB;QACxC,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,IAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE;QAC1C,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;YACvB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;KACJ;SAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACrC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;YACvB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,CAAC,MAAM,CAAC;SAChB,CAAC,CAAC;KACJ;IAED,IAAM,OAAO,GAAa;QACxB,KAAK,EAAE,iBAAiB;QACxB,KAAK,EAAE,CAAC,WAAW,CAAC;QACpB,WAAW,EAAE,EAAE;KAChB,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/node/search/collectionState.js

@@ -56,7 +56,7 @@ function serializeCollectionState(collection) {
     if (collection.sortOption) {
         state.sort = state_1.serializeSortState(collection.sortOption);
     }
-    const facetState = collection.facets.reduce((s, facet) => {
+    const facetState = (collection.facets || []).reduce((s, facet) => {
         return Object.assign(Object.assign({}, s), state_1.serializeFacetState(facet));
     }, {});
     return Object.assign(Object.assign({}, state), facetState);

package/dist/node/search/collectionState.js.map

@@ -1 +1 @@
-{"version":3,"file":"collectionState.js","sourceRoot":"","sources":["../../../src/search/collectionState.ts"],"names":[],"mappings":";;;AACA,kCAAsC;AAEtC,6CAK2B;AAE3B;;;;;;;;;GASG;AAEH,SAAgB,oBAAoB,CAClC,UAAuB,EACvB,KAAuB;IAEvB,MAAM,OAAO,GAAG,kBAAW,CAAC,UAAU,CAAC,CAAC;IAExC,sBAAsB;IACtB,IAAI,KAAK,CAAC,KAAK,EAAE;QACf,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC;KACpC;IAED,mBAAmB;IACnB,OAAO,CAAC,UAAU,GAAG,sBAAc,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAEpE,qDAAqD;IACrD,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5C,oDAAoD;QACpD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YAC1C,MAAM,UAAU,GAAG,EAAiB,CAAC;YACrC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACzC,OAAO,uBAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;SAC3C;aAAM;YACL,sCAAsC;YACtC,8CAA8C;YAC9C,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC5B,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC;YACvB,CAAC,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;SACd;IACH,CAAC,CAAC,CAAC;IAEH,EAAE;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAlCD,oDAkCC;AAED;;;;;GAKG;AACH,SAAgB,wBAAwB,CACtC,UAAuB;IAEvB,MAAM,KAAK,GAAqB,EAAE,CAAC;IAEnC,IAAI,UAAU,CAAC,YAAY,EAAE;QAC3B,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,YAAY,CAAC;KACvC;IAED,IAAI,UAAU,CAAC,UAAU,EAAE;QACzB,KAAK,CAAC,IAAI,GAAG,0BAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;KACxD;IAED,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QACvD,uCAAY,CAAC,GAAK,2BAAmB,CAAC,KAAK,CAAC,EAAG;IACjD,CAAC,EAAE,EAAiB,CAAC,CAAC;IAEtB,uCAAY,KAAK,GAAK,UAAU,EAAG;AACrC,CAAC;AAlBD,4DAkBC"}
+{"version":3,"file":"collectionState.js","sourceRoot":"","sources":["../../../src/search/collectionState.ts"],"names":[],"mappings":";;;AACA,kCAAsC;AAEtC,6CAK2B;AAE3B;;;;;;;;;GASG;AAEH,SAAgB,oBAAoB,CAClC,UAAuB,EACvB,KAAuB;IAEvB,MAAM,OAAO,GAAG,kBAAW,CAAC,UAAU,CAAC,CAAC;IAExC,sBAAsB;IACtB,IAAI,KAAK,CAAC,KAAK,EAAE;QACf,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC;KACpC;IAED,mBAAmB;IACnB,OAAO,CAAC,UAAU,GAAG,sBAAc,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAEpE,qDAAqD;IACrD,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5C,oDAAoD;QACpD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YAC1C,MAAM,UAAU,GAAG,EAAiB,CAAC;YACrC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACzC,OAAO,uBAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;SAC3C;aAAM;YACL,sCAAsC;YACtC,8CAA8C;YAC9C,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC5B,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC;YACvB,CAAC,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;SACd;IACH,CAAC,CAAC,CAAC;IAEH,EAAE;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAlCD,oDAkCC;AAED;;;;;GAKG;AACH,SAAgB,wBAAwB,CACtC,UAAuB;IAEvB,MAAM,KAAK,GAAqB,EAAE,CAAC;IAEnC,IAAI,UAAU,CAAC,YAAY,EAAE;QAC3B,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,YAAY,CAAC;KACvC;IAED,IAAI,UAAU,CAAC,UAAU,EAAE;QACzB,KAAK,CAAC,IAAI,GAAG,0BAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;KACxD;IAED,MAAM,UAAU,GAAG,CAAC,UAAU,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QAC/D,uCAAY,CAAC,GAAK,2BAAmB,CAAC,KAAK,CAAC,EAAG;IACjD,CAAC,EAAE,EAAiB,CAAC,CAAC;IAEtB,uCAAY,KAAK,GAAK,UAAU,EAAG;AACrC,CAAC;AAlBD,4DAkBC"}

package/dist/node/search/convertCatalog.js

@@ -7,19 +7,28 @@ const __1 = require("..");
  * @param original
  */
 function convertCatalog(original) {
-    const filter = {
-        filterType: "content",
+    const filterGroup = {
+        filterType: "item",
+        operation: "OR",
+        filters: [],
     };
     const groups = __1.getProp(original, "groups");
     if (Array.isArray(groups) && groups.length) {
-        filter.group = groups;
+        filterGroup.filters.push({
+            filterType: "item",
+            group: groups,
+        });
     }
     else if (typeof groups === "string") {
-        filter.group = [groups];
+        filterGroup.filters.push({
+            filterType: "item",
+            group: [groups],
+        });
     }
     const catalog = {
         title: "Default Catalog",
-        filter,
+        scope: [filterGroup],
+        collections: [],
     };
     return catalog;
 }

package/dist/node/search/convertCatalog.js.map

@@ -1 +1 @@
-{"version":3,"file":"convertCatalog.js","sourceRoot":"","sources":["../../../src/search/convertCatalog.ts"],"names":[],"mappings":";;;AAAA,0BAA6B;AAG7B;;;GAGG;AACH,SAAgB,cAAc,CAAC,QAAa;IAC1C,MAAM,MAAM,GAAsB;QAChC,UAAU,EAAE,SAAS;KACtB,CAAC;IAEF,MAAM,MAAM,GAAG,WAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE;QAC1C,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC;KACvB;SAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACrC,MAAM,CAAC,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC;KACzB;IAED,MAAM,OAAO,GAAa;QACxB,KAAK,EAAE,iBAAiB;QACxB,MAAM;KACP,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAnBD,wCAmBC"}
+{"version":3,"file":"convertCatalog.js","sourceRoot":"","sources":["../../../src/search/convertCatalog.ts"],"names":[],"mappings":";;;AAAA,0BAA6B;AAG7B;;;GAGG;AACH,SAAgB,cAAc,CAAC,QAAa;IAC1C,MAAM,WAAW,GAAyB;QACxC,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,MAAM,MAAM,GAAG,WAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE;QAC1C,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;YACvB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;KACJ;SAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACrC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;YACvB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,CAAC,MAAM,CAAC;SAChB,CAAC,CAAC;KACJ;IAED,MAAM,OAAO,GAAa;QACxB,KAAK,EAAE,iBAAiB;QACxB,KAAK,EAAE,CAAC,WAAW,CAAC;QACpB,WAAW,EAAE,EAAE;KAChB,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AA5BD,wCA4BC"}

package/dist/types/search/types/ICatalog.d.ts

@@ -1,6 +1,6 @@
 import { ICollection } from "./ICollection";
 import { IFacet } from "./IFacet";
-import { Filter, FilterType, ISortOption } from "./types";
+import { Filter, FilterType, IFilterGroup, ISortOption } from "./types";
 /**
  * Catalog is the definition which powers what options
  * are available in a Gallery. It controls not only
@@ -13,7 +13,11 @@ import { Filter, FilterType, ISortOption } from "./types";
  * ```ts
  * const simpleCatalog:Catalog = {
  *   title: "Select Map",
- *   filter: {
+ *   filters: [
+ *    {
+ *     fitlerType: "item",
+ *      operation: "AND",
+ *      fitlers
  *     filterType: "content",
  *     type: "Web Map",
  *     owner: "jsmith"
@@ -57,10 +61,17 @@ export interface ICatalog {
      * Title for the Gallery
      */
     title?: string;
+    /**
+     * Scope is a set of FilterGroups which define the limits of the Catalog.
+     * Typically it is just a set of group ids, but it may be arbitrarily complex.
+     * If one was to "search a catalog", this is the description of what would be returned.
+     */
+    scope?: Array<IFilterGroup<FilterType>>;
     /**
      * Filter defines the "scope" of the Catalog, typically a set of groups or orgids
+     * DEPRECATED: Use `scope`
      */
-    filter: Filter<FilterType>;
+    filter?: Filter<FilterType>;
     /**
      * Sort options to be shown in the Gallery
      */

package/dist/types/search/types/ICollection.d.ts

@@ -1,5 +1,5 @@
 import { IFacet } from "./IFacet";
-import { Filter, FilterType, ISortOption } from "./types";
+import { Filter, FilterType, IFilterGroup, ISortOption } from "./types";
 /**
  * A Collection is a subset of a Catalog, but can be used independently
  * in Galleries
@@ -11,12 +11,18 @@ export interface ICollection {
      * Filter Type used in this collection
      */
     filterType?: FilterType;
+    /**
+     * Scope is a set of FilterGroups which define the limits of the Collection.
+     * Typically it is just a set of group ids, but it may be arbitrarily complex.
+     * If one was to "search the collection", this is the description of what would be returned.
+     */
+    scope?: Array<IFilterGroup<FilterType>>;
     /**
      * Specify the includes to be requested when working with this collection
      */
     include?: string[];
-    defaultQuery?: string;
     sortOption: ISortOption;
-    filter: Filter<FilterType>;
     facets?: IFacet[];
+    filter?: Filter<FilterType>;
+    defaultQuery?: string;
 }

package/dist/umd/common.umd.js

@@ -1,5 +1,5 @@
 /* @preserve
- * @esri/hub-common - v9.37.0 - Thu Jun 02 2022 20:53:16 GMT+0000 (Coordinated Universal Time)
+ * @esri/hub-common - v9.38.0 - Mon Jun 06 2022 22:49:18 GMT+0000 (Coordinated Universal Time)
  * Copyright (c) 2022 Environmental Systems Research Institute, Inc.
  * Apache-2.0
  */
@@ -14788,7 +14788,7 @@
         if (collection.sortOption) {
             state.sort = serializeSortState(collection.sortOption);
         }
-        var facetState = collection.facets.reduce(function (s, facet) {
+        var facetState = (collection.facets || []).reduce(function (s, facet) {
             return __assign(__assign({}, s), serializeFacetState(facet));
         }, {});
         return __assign(__assign({}, state), facetState);
@@ -14799,19 +14799,28 @@
      * @param original
      */
     function convertCatalog(original) {
-        var filter = {
-            filterType: "content",
+        var filterGroup = {
+            filterType: "item",
+            operation: "OR",
+            filters: [],
         };
         var groups = getProp(original, "groups");
         if (Array.isArray(groups) && groups.length) {
-            filter.group = groups;
+            filterGroup.filters.push({
+                filterType: "item",
+                group: groups,
+            });
         }
         else if (typeof groups === "string") {
-            filter.group = [groups];
+            filterGroup.filters.push({
+                filterType: "item",
+                group: [groups],
+            });
         }
         var catalog = {
             title: "Default Catalog",
-            filter: filter,
+            scope: [filterGroup],
+            collections: [],
         };
         return catalog;
     }