@esri/hub-common 9.48.0 → 9.49.2

package/dist/node/search/hubSearch.js

@@ -63,7 +63,7 @@ async function hubSearch(query, options) {
     };
     const fn = objects_1.getProp(fnHash, `${apiType}.${filterType}`);
     if (!fn) {
-        throw new HubError_1.default(`hubSearch`, `Search via "${filterType}" filter against "${apiType}" api is not implemented`);
+        throw new HubError_1.default(`hubSearch`, `Search via "${filterType}" filter against "${apiType}" api is not implemented. Please ensure "targetEntity" is defined on the query.`);
     }
     return fn(util_1.cloneObject(query), options);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"hubSearch.js","sourceRoot":"","sources":["../../../src/search/hubSearch.ts"],"names":[],"mappings":";;;AAAA,0CAAmC;AACnC,wCAAqC;AACrC,kCAAsC;AAQtC,mCAAoC;AACpC,2CAKqB;AAErB;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,cAAc,CAClC,KAAa,EACb,OAA0B;IAE1B,WAAW;IACX,OAAO,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AACnC,CAAC;AAND,wCAMC;AAED;;;;;;;;GAQG;AACI,KAAK,UAAU,SAAS,CAC7B,KAAa,EACb,OAA0B;IAE1B,kBAAkB;IAClB,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,kBAAQ,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;KACvD;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE;QAC3C,MAAM,IAAI,kBAAQ,CAAC,WAAW,EAAE,yCAAyC,CAAC,CAAC;KAC5E;IAED,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,iDAAiD,CAClD,CAAC;KACH;IAED,8BAA8B;IAC9B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;KACtB;IAED,wCAAwC;IACxC,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC;IACtC,cAAc;IACd,MAAM,OAAO,GAAG,iBAAS,CAAC,OAAO,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,IAAI,CAAC;IAExD,MAAM,MAAM,GAAG;QACb,MAAM,EAAE;YACN,IAAI,EAAE,6BAAiB;YACvB,KAAK,EAAE,8BAAkB;YACzB,IAAI,EAAE,6BAAiB;SACxB;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,0BAAc;SACrB;KACF,CAAC;IAEF,MAAM,EAAE,GAAG,iBAAO,CAAC,MAAM,EAAE,GAAG,OAAO,IAAI,UAAU,EAAE,CAAC,CAAC;IACvD,IAAI,CAAC,EAAE,EAAE;QACP,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,eAAe,UAAU,qBAAqB,OAAO,0BAA0B,CAChF,CAAC;KACH;IACD,OAAO,EAAE,CAAC,kBAAW,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AAhDD,8BAgDC"}
+{"version":3,"file":"hubSearch.js","sourceRoot":"","sources":["../../../src/search/hubSearch.ts"],"names":[],"mappings":";;;AAAA,0CAAmC;AACnC,wCAAqC;AACrC,kCAAsC;AAQtC,mCAAoC;AACpC,2CAKqB;AAErB;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,cAAc,CAClC,KAAa,EACb,OAA0B;IAE1B,WAAW;IACX,OAAO,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AACnC,CAAC;AAND,wCAMC;AAED;;;;;;;;GAQG;AACI,KAAK,UAAU,SAAS,CAC7B,KAAa,EACb,OAA0B;IAE1B,kBAAkB;IAClB,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,kBAAQ,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;KACvD;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE;QAC3C,MAAM,IAAI,kBAAQ,CAAC,WAAW,EAAE,yCAAyC,CAAC,CAAC;KAC5E;IAED,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,iDAAiD,CAClD,CAAC;KACH;IAED,8BAA8B;IAC9B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;KACtB;IAED,wCAAwC;IACxC,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC;IACtC,cAAc;IACd,MAAM,OAAO,GAAG,iBAAS,CAAC,OAAO,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,IAAI,CAAC;IAExD,MAAM,MAAM,GAAG;QACb,MAAM,EAAE;YACN,IAAI,EAAE,6BAAiB;YACvB,KAAK,EAAE,8BAAkB;YACzB,IAAI,EAAE,6BAAiB;SACxB;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,0BAAc;SACrB;KACF,CAAC;IAEF,MAAM,EAAE,GAAG,iBAAO,CAAC,MAAM,EAAE,GAAG,OAAO,IAAI,UAAU,EAAE,CAAC,CAAC;IACvD,IAAI,CAAC,EAAE,EAAE;QACP,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,eAAe,UAAU,qBAAqB,OAAO,iFAAiF,CACvI,CAAC;KACH;IACD,OAAO,EAAE,CAAC,kBAAW,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AAhDD,8BAgDC"}

package/dist/node/search/index.js

@@ -11,8 +11,10 @@ tslib_1.__exportStar(require("./_searchGroups"), exports);
 tslib_1.__exportStar(require("./_searchUsers"), exports);
 tslib_1.__exportStar(require("./types"), exports);
 tslib_1.__exportStar(require("./collectionState"), exports);
-tslib_1.__exportStar(require("./convertCatalog"), exports);
+tslib_1.__exportStar(require("./upgradeCatalogSchema"), exports);
 tslib_1.__exportStar(require("./filter-utils"), exports);
 tslib_1.__exportStar(require("./serializeQueryForPortal"), exports);
 tslib_1.__exportStar(require("./hubSearch"), exports);
+tslib_1.__exportStar(require("./Catalog"), exports);
+tslib_1.__exportStar(require("./Collection"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/search/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiC;AACjC,0DAAgC;AAChC,wDAA8B;AAC9B,uDAA6B;AAC7B,kDAAwB;AACxB,2DAAiC;AACjC,0DAAgC;AAChC,yDAA+B;AAC/B,kDAAwB;AACxB,4DAAkC;AAClC,2DAAiC;AACjC,yDAA+B;AAC/B,oEAA0C;AAC1C,sDAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/search/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiC;AACjC,0DAAgC;AAChC,wDAA8B;AAC9B,uDAA6B;AAC7B,kDAAwB;AACxB,2DAAiC;AACjC,0DAAgC;AAChC,yDAA+B;AAC/B,kDAAwB;AACxB,4DAAkC;AAClC,iEAAuC;AACvC,yDAA+B;AAC/B,oEAA0C;AAC1C,sDAA4B;AAC5B,oDAA0B;AAC1B,uDAA6B"}

package/dist/node/search/serializeQueryForPortal.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializeQueryForPortal = void 0;
-const ipredicate_utils_1 = require("./_internal/ipredicate-utils");
+const expandPredicate_1 = require("./_internal/expandPredicate");
 /**
  * Serialize IQuery into ISearchOptions for ArcGIS Portal
  * @param query
@@ -50,7 +50,7 @@ function mergeSearchOptions(options, operation) {
  */
 function serializeFilter(filter) {
     const operation = filter.operation || "AND";
-    const predicates = filter.predicates.map(ipredicate_utils_1.expandPredicate);
+    const predicates = filter.predicates.map(expandPredicate_1.expandPredicate);
     const predicateSearchOptions = predicates
         .map(serializePredicate)
         .filter((e) => e !== undefined && e !== null);
@@ -81,6 +81,7 @@ function serializePredicate(predicate) {
     const portalAllowList = [
         "access",
         "categories",
+        "capabilities",
         "created",
         "description",
         "disabled",
@@ -149,7 +150,7 @@ function serializePredicate(predicate) {
     // merge up all the searchOptions
     if (opts.length) {
         const searchOptions = mergeSearchOptions(opts, "AND");
-        if (qCount > 1) {
+        if (searchOptions.q) {
             searchOptions.q = `(${searchOptions.q})`;
         }
         return searchOptions;

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

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

package/dist/node/search/upgradeCatalogSchema.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertCatalog = exports.upgradeCatalogSchema = void 0;
+const objects_1 = require("../objects");
+const util_1 = require("../util");
+const CATALOG_SCHEMA_VERSION = 1.0;
+/**
+ * Apply schema upgrades to Catalog objects
+ * @param catalog
+ * @returns
+ */
+function upgradeCatalogSchema(catalog) {
+    let clone = util_1.cloneObject(catalog);
+    if (objects_1.getProp(clone, "schemaVersion") === CATALOG_SCHEMA_VERSION) {
+        return clone;
+    }
+    else {
+        // apply migrations in order
+        clone = applyCatalogSchema(clone);
+        return clone;
+    }
+}
+exports.upgradeCatalogSchema = upgradeCatalogSchema;
+/**
+ * Apply the Catalog schema to the original, unversioned
+ * site catalog objects
+ * @param original
+ * @returns
+ */
+function applyCatalogSchema(original) {
+    if (objects_1.getProp(original, "schemaVersion") > 1.0) {
+        return original;
+    }
+    else {
+        const catalog = {
+            schemaVersion: 1,
+            title: "Default Catalog",
+            scopes: {
+                item: {
+                    targetEntity: "item",
+                    filters: [],
+                },
+            },
+            collections: [],
+        };
+        const rawGroups = objects_1.getProp(original, "groups");
+        let groups = [];
+        if (Array.isArray(rawGroups) && rawGroups.length) {
+            groups = rawGroups;
+        }
+        else if (typeof rawGroups === "string") {
+            groups = [rawGroups];
+        }
+        if (groups.length) {
+            catalog.scopes.item.filters.push({
+                predicates: [{ group: groups }],
+            });
+        }
+        return catalog;
+    }
+}
+/**
+ * DEPRECATED: Use upgradeCatalogSchema(...)
+ * @param original
+ */
+/* istanbul ignore next */
+function convertCatalog(original) {
+    return upgradeCatalogSchema(original);
+}
+exports.convertCatalog = convertCatalog;
+//# sourceMappingURL=upgradeCatalogSchema.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"upgradeCatalogSchema.js","sourceRoot":"","sources":["../../../src/search/upgradeCatalogSchema.ts"],"names":[],"mappings":";;;AAAA,wCAAqC;AACrC,kCAAsC;AAGtC,MAAM,sBAAsB,GAAG,GAAG,CAAC;AAEnC;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,OAAY;IAC/C,IAAI,KAAK,GAAG,kBAAW,CAAC,OAAO,CAAC,CAAC;IACjC,IAAI,iBAAO,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,sBAAsB,EAAE;QAC9D,OAAO,KAAK,CAAC;KACd;SAAM;QACL,4BAA4B;QAC5B,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAElC,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAVD,oDAUC;AAED;;;;;GAKG;AACH,SAAS,kBAAkB,CAAC,QAAa;IACvC,IAAI,iBAAO,CAAC,QAAQ,EAAE,eAAe,CAAC,GAAG,GAAG,EAAE;QAC5C,OAAO,QAAuB,CAAC;KAChC;SAAM;QACL,MAAM,OAAO,GAAgB;YAC3B,aAAa,EAAE,CAAC;YAChB,KAAK,EAAE,iBAAiB;YACxB,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,YAAY,EAAE,MAAM;oBACpB,OAAO,EAAE,EAAE;iBACZ;aACF;YACD,WAAW,EAAE,EAAE;SAChB,CAAC;QAEF,MAAM,SAAS,GAAG,iBAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC9C,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,EAAE;YAChD,MAAM,GAAG,SAAS,CAAC;SACpB;aAAM,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YACxC,MAAM,GAAG,CAAC,SAAS,CAAC,CAAC;SACtB;QAED,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC/B,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;aAChC,CAAC,CAAC;SACJ;QAED,OAAO,OAAO,CAAC;KAChB;AACH,CAAC;AAED;;;GAGG;AACH,0BAA0B;AAC1B,SAAgB,cAAc,CAAC,QAAa;IAC1C,OAAO,oBAAoB,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAFD,wCAEC"}

package/dist/node/types/IMessage.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=IMessage.js.map

package/dist/node/types/IMessage.js.map

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

package/dist/node/types/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./IMessage"), exports);
+//# sourceMappingURL=index.js.map

package/dist/node/types/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":";;;AAAA,qDAA2B"}

package/dist/types/core/traits/WithCatalog.d.ts

@@ -0,0 +1,7 @@
+import { Catalog } from "../../search/Catalog";
+export interface IWithCatalog {
+    /**
+     * Catalog
+     */
+    catalog: Catalog;
+}

package/dist/types/index.d.ts

@@ -27,6 +27,7 @@ export * from "./Hub";
 export * from "./pages";
 export * from "./org";
 export * from "./users";
+export * from "./types";
 import OperationStack from "./OperationStack";
 import OperationError from "./OperationError";
 import HubError from "./HubError";

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

@@ -0,0 +1,143 @@
+import { IArcGISContext } from "../ArcGISContext";
+import { Collection } from "./Collection";
+import { IHubSearchOptions, IHubSearchResponse, IHubSearchResult } from "./types";
+import { EntityType, ICatalogScope, IHubCatalog, IQuery } from "./types/IHubCatalog";
+/**
+ * Response from a Catalog search operation where the responses for different collections
+ * or entities are grouped into a single object.
+ */
+export interface ISearchResponseHash extends Record<string, IHubSearchResponse<IHubSearchResult>> {
+}
+/**
+ * Catalog Class
+ *
+ * Abstracts working with Catalogs and fetching collections with
+ * the correct scope applied.
+ *
+ * For more information, check out the [Catalog & Collection Guide](/hub.js/guides/concepts/catalog-collection/)
+ */
+export declare class Catalog implements IHubCatalog {
+    private _context;
+    private _catalog;
+    private constructor();
+    /**
+     * Create a Collection instance from a Catalog json object, a site url or itemId
+     * '''js
+     * const catalog = await Catalog.create('https://site-org.hub.arcgis.com', context);
+     * '''
+     *
+     * @param identifier
+     * @param context
+     * @returns
+     */
+    static init(identifier: string, context?: IArcGISContext): Promise<Catalog>;
+    /**
+     * Create a Catalog instance from a Catalog Json object
+     * @param json
+     * @param context
+     * @returns
+     */
+    static fromJson(json: any, context?: IArcGISContext): Catalog;
+    /**
+     * Return the JSON object backing the instance
+     * @returns
+     */
+    toJson(): IHubCatalog;
+    /**
+     * Return the schema version
+     */
+    get schemaVersion(): number;
+    /**
+     * Title getter
+     */
+    get title(): string;
+    /**
+     * Title setter
+     */
+    set title(v: string);
+    /**
+     * Return the existing scopes hash
+     */
+    get scopes(): ICatalogScope;
+    /**
+     * Return an array of the entity types available in this Catalog
+     */
+    get availableScopes(): EntityType[];
+    /**
+     * Get the scope's query for a particular entity type
+     * @param type
+     * @returns
+     */
+    getScope(type: EntityType): IQuery | undefined;
+    /**
+     * Set the scope for a specific entity type
+     * @param type
+     * @param query
+     */
+    setScope(type: EntityType, query: IQuery): void;
+    /**
+     * Get the collections array. Returns simple objects not Collection instances
+     */
+    get collections(): import("./types").IHubCollection[];
+    /**
+     * Get the names of the collections
+     */
+    get collectionNames(): string[];
+    /**
+     * Get a Collection instance by name
+     * @param name
+     * @returns
+     */
+    getCollection(name: string): Collection;
+    /**
+     * Search for Items
+     * Will throw if the Catalog does not have a scope defined for items
+     * @param query
+     * @param options
+     * @returns
+     */
+    searchItems(query: string | IQuery, options?: IHubSearchOptions): Promise<IHubSearchResponse<IHubSearchResult>>;
+    /**
+     * Search for Groups
+     * Will throw if the Catalog does not have a scope defined for groups
+     * @param query
+     * @param options
+     * @returns
+     */
+    searchGroups(query: string | IQuery, options?: IHubSearchOptions): Promise<IHubSearchResponse<IHubSearchResult>>;
+    /**
+     * Search for Users
+     * Will throw if the Catalog does not have a scope defined for users
+     * @param query
+     * @param options
+     * @returns
+     */
+    searchUsers(query: string | IQuery, options?: IHubSearchOptions): Promise<IHubSearchResponse<IHubSearchResult>>;
+    /**
+     * Execute a search against all the collections in the Catalog
+     * @param query
+     * @param options
+     * @returns
+     */
+    searchCollections(query: string, options?: IHubSearchOptions): Promise<ISearchResponseHash>;
+    /**
+     * Execute a search against all the scopes in the Catalog
+     * @param query
+     * @param options
+     * @returns
+     */
+    searchScopes(query: string, options?: IHubSearchOptions): Promise<ISearchResponseHash>;
+    /**
+     * Execute a search against the Catalog as a whole
+     * @param query
+     * @param targetEntity
+     * @returns
+     */
+    private search;
+    /**
+     * Construct an empty result. Returned when a search is performed against an entity type that
+     * does not have a scope defined.
+     * @returns
+     */
+    private getEmptyResult;
+}

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

@@ -1,13 +1,28 @@
 import { IArcGISContext } from "..";
 import { EntityType, IHubCollection, IHubSearchOptions, IHubSearchResponse, IHubSearchResult, IQuery } from "./types";
 /**
- * Implements Collection behavior
+ * Collection Class
+ *
+ * Abstracts searching a Collection
+ *
+ * For more information, check out the [Catalog & Collection Guide](/hub.js/guides/concepts/catalog-collection/)
  */
 export declare class Collection implements IHubCollection {
     private _context;
     private _collection;
     private constructor();
-    static create(collection: IHubCollection, context?: IArcGISContext): Promise<Collection>;
+    /**
+     * Create an instance of a Collection from a JSON object
+     * @param collection
+     * @param context
+     * @returns
+     */
+    static fromJson(collection: IHubCollection, context: IArcGISContext): Collection;
+    /**
+     * Return the JSON object backing the instance
+     * @returns
+     */
+    toJson(): IHubCollection;
     get label(): string;
     get key(): string;
     get include(): string[];
@@ -15,5 +30,11 @@ export declare class Collection implements IHubCollection {
     get sortField(): string;
     get sortDirection(): "asc" | "desc";
     get targetEntity(): EntityType;
+    /**
+     * Search the collection using a string or IQuery
+     * @param query
+     * @param options
+     * @returns
+     */
     search(query: string | IQuery, options?: IHubSearchOptions): Promise<IHubSearchResponse<IHubSearchResult>>;
 }

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

@@ -0,0 +1,10 @@
+import { IHubRequestOptions } from "../types";
+import { IHubCatalog } from "./types/IHubCatalog";
+/**
+ * Fetch a IHubCatalog from a backing item.
+ * This will apply schema upgrades to the structure
+ * @param identifier
+ * @param requestOptions
+ * @returns
+ */
+export declare function fetchCatalog(identifier: string, requestOptions: IHubRequestOptions): Promise<IHubCatalog>;

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

@@ -8,7 +8,9 @@ export * from "./_searchGroups";
 export * from "./_searchUsers";
 export * from "./types";
 export * from "./collectionState";
-export * from "./convertCatalog";
+export * from "./upgradeCatalogSchema";
 export * from "./filter-utils";
 export * from "./serializeQueryForPortal";
 export * from "./hubSearch";
+export * from "./Catalog";
+export * from "./Collection";

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

@@ -1,5 +1,5 @@
 import { UserSession } from "@esri/arcgis-rest-auth";
-import { IHubRequestOptions, IModel } from "../..";
+import { EntityType, IHubRequestOptions, IModel } from "../../index";
 import { NamedApis, IApiDefinition } from "./types";
 export declare type Enrichments = "data" | "metadata" | "org" | "service" | "layers";
 /**
@@ -42,6 +42,10 @@ export interface IHubSearchOptions {
      * DEPRECATED: Use `include` instead
      */
     enrichments?: Enrichments[];
+    /**
+     * Specify what entity to search for; For use with hubSearch
+     */
+    targetEntity?: EntityType;
     /**
      * Maximum number of results to return, per-page
      */

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

@@ -1,3 +1,4 @@
+import { IMessage } from "../../types/IMessage";
 import { IFacet } from "./IFacet";
 import { IHubAggregation } from "./IHubAggregation";
 /**
@@ -30,6 +31,10 @@ export interface IHubSearchResponse<T> {
      * Array of requested aggregations
      */
     aggregations?: IHubAggregation[];
+    /**
+     * Array of messages / warnings
+     */
+    messages?: IMessage[];
     /**
      * DEPRECATED - hub.js no longer computes facets; consumers need to construct them from aggregations
      */

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

@@ -0,0 +1,12 @@
+import { IHubCatalog } from "./types";
+/**
+ * Apply schema upgrades to Catalog objects
+ * @param catalog
+ * @returns
+ */
+export declare function upgradeCatalogSchema(catalog: any): IHubCatalog;
+/**
+ * DEPRECATED: Use upgradeCatalogSchema(...)
+ * @param original
+ */
+export declare function convertCatalog(original: any): IHubCatalog;

package/dist/types/types/IMessage.d.ts

@@ -0,0 +1,32 @@
+/**
+ * Generic structure for returning a translatable message from
+ * one package to another, such that the calling package is responsible
+ * for the translation
+ *
+ * @export
+ * @interface IMessage
+ */
+export interface IMessage {
+    /**
+     * Unique key that can be used with a i18n system in a consuming application
+     *
+     * @type {string}
+     * @memberof IMessage
+     */
+    code: string;
+    /**
+     * English message describing the issue, for debugging only. Not intended to be shown
+     * in an application interface.
+     *
+     * @type {string}
+     * @memberof IMessage
+     */
+    message: string;
+    /**
+     * Optional data that can be sent along
+     *
+     * @type {Record<string, unknown>}
+     * @memberof IMessage
+     */
+    data?: Record<string, unknown>;
+}

package/dist/types/types/index.d.ts

@@ -0,0 +1 @@
+export * from "./IMessage";