@fluid-topics/public-api 1.0.74 → 1.0.75

package/build/cjs/index.js

@@ -46,9 +46,12 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
     function reject(value) { resume("throw", value); }
     function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FluidTopicsApi = exports.HttpErrorEvent = exports.HttpError = void 0;
-require("cross-fetch/polyfill");
+const cross_fetch_1 = __importDefault(require("cross-fetch"));
 const GenAIChunkReader_1 = require("./helpers/GenAIChunkReader");
 const wnd = (typeof window === "undefined" ? globalThis : window);
 __exportStar(require("./types/ft-common/public"), exports);
@@ -416,7 +419,7 @@ class FluidTopicsApi {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const requestInit = init;
-            return yield fetch(this.makeAbsolute(endpoint), Object.assign(Object.assign({}, (requestInit !== null && requestInit !== void 0 ? requestInit : {})), { headers: Object.assign(Object.assign({}, this.defaultHeaders), ((_a = requestInit === null || requestInit === void 0 ? void 0 : requestInit.headers) !== null && _a !== void 0 ? _a : {})) }));
+            return yield (0, cross_fetch_1.default)(this.makeAbsolute(endpoint), Object.assign(Object.assign({}, (requestInit !== null && requestInit !== void 0 ? requestInit : {})), { headers: Object.assign(Object.assign({}, this.defaultHeaders), ((_a = requestInit === null || requestInit === void 0 ? void 0 : requestInit.headers) !== null && _a !== void 0 ? _a : {})) }));
         });
     }
     upload(method, endpoint, body, onProgress = () => undefined) {
@@ -454,7 +457,7 @@ class FluidTopicsApi {
             .then(getBody);
     }
     fetchRawData(endpoint, v) {
-        return fetch(this.withVersion(endpoint, v), {
+        return (0, cross_fetch_1.default)(this.withVersion(endpoint, v), {
             headers: this.defaultHeaders,
             credentials: this.authorization == null ? "include" : undefined
         })

package/build/cjs/types/ft-common/public.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FtPeriodFilterType = exports.isFtSearchPreferencesConfiguration = exports.isFtMetadataPreferenceConfiguration = exports.isFtMapResource = exports.isFtTopicsRatingSummary = exports.isFtTopicRating = exports.isFtRatingSummary = exports.isFtRatingCreation = exports.isFtPublicationRatingSummary = exports.isFtPublicationRating = exports.isFtRatingType = exports.FtRatingType = exports.isFtMySearchRequest = exports.isFtMySearch = exports.isFtMetadataDescriptor = exports.isFtMetadataConfiguration = exports.isFtMetadataSortRule = exports.FtMetadataSortRule = exports.isFtMetadata = exports.isFtFacetType = exports.FtFacetType = exports.isFtUiLocale = exports.isFtMessageContext = exports.isFtSearchLocales = exports.isFtSearchLocale = exports.isFtMetadataHomeLayout = exports.FtMetadataHomeLayout = exports.isFtFeedbackCreation = exports.isFtExternalWebComponentContext = exports.FtExternalWebComponentContext = exports.isFtTopicContentTarget = exports.FtTopicContentTarget = exports.isFtUnstructuredDocument = exports.isFtTopicOrigin = exports.isFtTopic = exports.isFtTocNode = exports.isFtMapStyles = exports.isFtMap = exports.isFtCollectionDocument = exports.isFtBookmark = exports.isFtPersonalBookTopicLinkCreation = exports.isFtPersonalBookNodeCreation = exports.isFtPersonalBookMetadataUpdate = exports.isFtPersonalBookCreation = exports.isFtCredentials = exports.isFtTopicOriginType = exports.FtTopicOriginType = exports.isFtMyLibraryColors = exports.FtMyLibraryColors = exports.isFtHttpErrorDetails = void 0;
-exports.FtUserRole = exports.isFtSuggestResults = exports.isFtSuggestResult = exports.isFtSuggestRequest = exports.isFtTopicResource = exports.isFtSpellcheck = exports.isFtSearchSortCriterion = exports.isFtSearchFacetEntry = exports.isFtSearchFacetConf = exports.isFtSearchFacet = exports.isFtValueFilter = exports.isFtSearchScope = exports.FtSearchScope = exports.isFtSearchResultType = exports.FtSearchResultType = exports.isFtSearchResultTopic = exports.isFtSearchResultMap = exports.isFtSearchResultUnstructuredDocument = exports.isFtSearchResultClusterEntry = exports.isFtSearchResultCluster = exports.isFtSearchRequest = exports.isFtSearchPrior = exports.isFtRangeFilter = exports.isFtPeriod = exports.isFtMetadataFilter = exports.isFtPeriodFilter = exports.isFtLegacyMetadataFilter = exports.isFtLegacyLabeledMetadataFilter = exports.isFtLabeledMetadataFilter = exports.isFtSearchResults = exports.isFtDateFilterType = exports.FtDateFilterType = exports.isFtDateFilter = exports.isFtCollectionDocumentType = exports.FtCollectionDocumentType = exports.isFtPublicClusterSortCriterion = exports.isFtPageRequest = exports.isFtOpenMode = exports.FtOpenMode = exports.isFtEditorialType = exports.FtEditorialType = exports.isFtSearchResultsPageInfo = exports.isFtVirtualField = exports.FtVirtualField = exports.isFtSearchSortCriterionType = exports.FtSearchSortCriterionType = exports.isFtSearchSortCriterionOrder = exports.FtSearchSortCriterionOrder = exports.isFtSearchPreset = exports.isFtPeriodFilterType = void 0;
-exports.isFtWatermark = exports.isFtUserProfile = exports.isFtSession = exports.isFtSearchPreferences = exports.isFtAuthenticatedSession = exports.isFtAuthenticationIdentifier = exports.isFtUserRole = void 0;
+exports.isFtWatermark = exports.isFtUserProfile = exports.isFtSession = exports.isFtSearchPreferences = exports.isFtAuthenticatedSession = exports.isFtAuthenticationIdentifier = exports.isFtUserRole = exports.FtUserRole = exports.isFtSuggestResults = exports.isFtSuggestResult = exports.isFtSuggestRequest = exports.isFtTopicResource = exports.isFtSpellcheck = exports.isFtSearchSortCriterion = exports.isFtSearchFacetEntry = exports.isFtSearchFacetConf = exports.isFtSearchFacet = exports.isFtSearchScope = exports.FtSearchScope = exports.isFtSearchResultType = exports.FtSearchResultType = exports.isFtSearchResultTopic = exports.isFtSearchResultMap = exports.isFtSearchResultUnstructuredDocument = exports.isFtSearchResultClusterEntry = exports.isFtSearchResultCluster = exports.isFtSearchRequest = exports.isFtSearchPrior = exports.isFtPeriodFilter = exports.isFtPeriod = exports.isFtLabeledSearchFilter = exports.isFtSearchResults = exports.isFtCollectionDocumentType = exports.FtCollectionDocumentType = exports.isFtPublicClusterSortCriterion = exports.isFtPageRequest = exports.isFtOpenMode = exports.FtOpenMode = exports.isFtEditorialType = exports.FtEditorialType = exports.isFtSearchResultsPageInfo = exports.isFtVirtualField = exports.FtVirtualField = exports.isFtSearchSortCriterionType = exports.FtSearchSortCriterionType = exports.isFtSearchSortCriterionOrder = exports.FtSearchSortCriterionOrder = exports.isFtSearchPreset = exports.isFtSearchFilter = exports.isFtPeriodFilterType = void 0;
 const isObject = (o) => typeof o === "object" && o != null;
 const isBoolean = (o) => typeof o === "boolean";
 const isNumber = (o) => typeof o === "number";
@@ -338,16 +337,14 @@ const isFtMySearch = (o) => {
 exports.isFtMySearch = isFtMySearch;
 const isFtMySearchRequest = (o) => {
     return isObject(o)
-        && (o.periodFilter == null || o.periodFilter == null || (0, exports.isFtPeriodFilter)(o.periodFilter))
+        && (o.periodFilter == null || (0, exports.isFtPeriodFilter)(o.periodFilter))
         && (isString(o.query))
         && (o.scope == null || (0, exports.isFtSearchScope)(o.scope))
-        && (o.filters == null || (Array.isArray(o.filters)
-            && o.filters.every((v) => (0, exports.isFtLegacyLabeledMetadataFilter)(v))))
+        && ((Array.isArray(o.filters)
+            && o.filters.every((v) => (0, exports.isFtLabeledSearchFilter)(v))))
         && ((Array.isArray(o.sort)
             && o.sort.every((v) => (0, exports.isFtSearchSortCriterion)(v))))
         && (o.virtualField == null || (0, exports.isFtVirtualField)(o.virtualField))
-        && (o.metadataFilters == null || (Array.isArray(o.metadataFilters)
-            && o.metadataFilters.every((v) => (0, exports.isFtLabeledMetadataFilter)(v))))
         && (o.contentLocale == null || isString(o.contentLocale));
 };
 exports.isFtMySearchRequest = isFtMySearchRequest;
@@ -439,13 +436,21 @@ const isFtPeriodFilterType = (o) => {
     return ["LAST_WEEK", "LAST_MONTH", "LAST_QUARTER", "LAST_YEAR", "CUSTOM"].includes(o);
 };
 exports.isFtPeriodFilterType = isFtPeriodFilterType;
+const isFtSearchFilter = (o) => {
+    return isObject(o)
+        && (isBoolean(o.negative))
+        && ((Array.isArray(o.values)
+            && o.values.every((v) => isString(v))))
+        && (isString(o.key));
+};
+exports.isFtSearchFilter = isFtSearchFilter;
 const isFtSearchPreset = (o) => {
     return isObject(o)
         && (isString(o.name))
+        && ((Array.isArray(o.filters)
+            && o.filters.every((v) => (0, exports.isFtSearchFilter)(v))))
         && (isNumber(o.priority))
-        && (o.contentLocale == null || isString(o.contentLocale))
-        && ((Array.isArray(o.metadataFilters)
-            && o.metadataFilters.every((v) => (0, exports.isFtMetadataFilter)(v))));
+        && (o.contentLocale == null || isString(o.contentLocale));
 };
 exports.isFtSearchPreset = isFtSearchPreset;
 // From: SearchSortCriterionOrder
@@ -532,23 +537,6 @@ const isFtCollectionDocumentType = (o) => {
     return ["MAP", "DOCUMENT", "TOPIC", "PERSONAL_BOOK", "SHARED_BOOK"].includes(o);
 };
 exports.isFtCollectionDocumentType = isFtCollectionDocumentType;
-const isFtDateFilter = (o) => {
-    return isObject(o)
-        && ((0, exports.isFtDateFilterType)(o.type));
-};
-exports.isFtDateFilter = isFtDateFilter;
-// From: WsPublicDateFilterType
-var FtDateFilterType;
-(function (FtDateFilterType) {
-    FtDateFilterType["LAST_WEEK"] = "LAST_WEEK";
-    FtDateFilterType["LAST_MONTH"] = "LAST_MONTH";
-    FtDateFilterType["LAST_QUARTER"] = "LAST_QUARTER";
-    FtDateFilterType["LAST_YEAR"] = "LAST_YEAR";
-})(FtDateFilterType = exports.FtDateFilterType || (exports.FtDateFilterType = {}));
-const isFtDateFilterType = (o) => {
-    return ["LAST_WEEK", "LAST_MONTH", "LAST_QUARTER", "LAST_YEAR"].includes(o);
-};
-exports.isFtDateFilterType = isFtDateFilterType;
 const isFtSearchResults = (o) => {
     return isObject(o)
         && (o.spellcheck == null || (0, exports.isFtSpellcheck)(o.spellcheck))
@@ -559,16 +547,7 @@ const isFtSearchResults = (o) => {
             && o.facets.every((v) => (0, exports.isFtSearchFacet)(v))));
 };
 exports.isFtSearchResults = isFtSearchResults;
-const isFtLabeledMetadataFilter = (o) => {
-    return isObject(o)
-        && (o.valueFilter == null || (0, exports.isFtValueFilter)(o.valueFilter))
-        && (o.rangeFilter == null || (0, exports.isFtRangeFilter)(o.rangeFilter))
-        && (isString(o.label))
-        && (isString(o.key))
-        && (o.dateFilter == null || (0, exports.isFtDateFilter)(o.dateFilter));
-};
-exports.isFtLabeledMetadataFilter = isFtLabeledMetadataFilter;
-const isFtLegacyLabeledMetadataFilter = (o) => {
+const isFtLabeledSearchFilter = (o) => {
     return isObject(o)
         && (isBoolean(o.negative))
         && ((Array.isArray(o.values)
@@ -576,15 +555,13 @@ const isFtLegacyLabeledMetadataFilter = (o) => {
         && (isString(o.label))
         && (isString(o.key));
 };
-exports.isFtLegacyLabeledMetadataFilter = isFtLegacyLabeledMetadataFilter;
-const isFtLegacyMetadataFilter = (o) => {
+exports.isFtLabeledSearchFilter = isFtLabeledSearchFilter;
+const isFtPeriod = (o) => {
     return isObject(o)
-        && (isBoolean(o.negative))
-        && ((Array.isArray(o.values)
-            && o.values.every((v) => isString(v))))
-        && (isString(o.key));
+        && (isString(o.from))
+        && (isString(o.to));
 };
-exports.isFtLegacyMetadataFilter = isFtLegacyMetadataFilter;
+exports.isFtPeriod = isFtPeriod;
 const isFtPeriodFilter = (o) => {
     return isObject(o)
         && (o.period == null || (0, exports.isFtPeriod)(o.period))
@@ -592,26 +569,6 @@ const isFtPeriodFilter = (o) => {
         && (o.key == null || isString(o.key));
 };
 exports.isFtPeriodFilter = isFtPeriodFilter;
-const isFtMetadataFilter = (o) => {
-    return isObject(o)
-        && (o.valueFilter == null || (0, exports.isFtValueFilter)(o.valueFilter))
-        && (o.rangeFilter == null || (0, exports.isFtRangeFilter)(o.rangeFilter))
-        && (isString(o.key))
-        && (o.dateFilter == null || (0, exports.isFtDateFilter)(o.dateFilter));
-};
-exports.isFtMetadataFilter = isFtMetadataFilter;
-const isFtPeriod = (o) => {
-    return isObject(o)
-        && (isString(o.from))
-        && (isString(o.to));
-};
-exports.isFtPeriod = isFtPeriod;
-const isFtRangeFilter = (o) => {
-    return isObject(o)
-        && (isString(o.from))
-        && (isString(o.to));
-};
-exports.isFtRangeFilter = isFtRangeFilter;
 const isFtSearchPrior = (o) => {
     return isObject(o)
         && (isNumber(o.weight))
@@ -621,16 +578,14 @@ const isFtSearchPrior = (o) => {
 exports.isFtSearchPrior = isFtSearchPrior;
 const isFtSearchRequest = (o) => {
     return isObject(o)
-        && (o.periodFilter == null || o.periodFilter == null || (0, exports.isFtPeriodFilter)(o.periodFilter))
+        && (o.periodFilter == null || (0, exports.isFtPeriodFilter)(o.periodFilter))
         && (isString(o.query))
         && ((0, exports.isFtPageRequest)(o.paging))
-        && (o.filters == null || (Array.isArray(o.filters)
-            && o.filters.every((v) => (0, exports.isFtLegacyMetadataFilter)(v))))
+        && ((Array.isArray(o.filters)
+            && o.filters.every((v) => (0, exports.isFtSearchFilter)(v))))
         && ((Array.isArray(o.sort)
             && o.sort.every((v) => (0, exports.isFtSearchSortCriterion)(v))))
         && (o.virtualField == null || (0, exports.isFtVirtualField)(o.virtualField))
-        && ((Array.isArray(o.metadataFilters)
-            && o.metadataFilters.every((v) => (0, exports.isFtMetadataFilter)(v))))
         && ((Array.isArray(o.facets)
             && o.facets.every((v) => (0, exports.isFtSearchFacetConf)(v))))
         && (o.scope == null || (0, exports.isFtSearchScope)(o.scope))
@@ -740,13 +695,6 @@ const isFtSearchScope = (o) => {
     return ["DEFAULT", "DOCUMENTS", "ALL_TOPICS"].includes(o);
 };
 exports.isFtSearchScope = isFtSearchScope;
-const isFtValueFilter = (o) => {
-    return isObject(o)
-        && (isBoolean(o.negative))
-        && ((Array.isArray(o.values)
-            && o.values.every((v) => isString(v))));
-};
-exports.isFtValueFilter = isFtValueFilter;
 const isFtSearchFacet = (o) => {
     return isObject(o)
         && (isBoolean(o.hierarchical))
@@ -801,12 +749,12 @@ const isFtSuggestRequest = (o) => {
     return isObject(o)
         && (isString(o.input))
         && (o.scope == null || (0, exports.isFtSearchScope)(o.scope))
+        && ((Array.isArray(o.filters)
+            && o.filters.every((v) => (0, exports.isFtSearchFilter)(v))))
         && ((Array.isArray(o.sort)
             && o.sort.every((v) => (0, exports.isFtSearchSortCriterion)(v))))
         && (o.maxCount == null || isNumber(o.maxCount))
-        && (o.contentLocale == null || isString(o.contentLocale))
-        && ((Array.isArray(o.metadataFilters)
-            && o.metadataFilters.every((v) => (0, exports.isFtMetadataFilter)(v))));
+        && (o.contentLocale == null || isString(o.contentLocale));
 };
 exports.isFtSuggestRequest = isFtSuggestRequest;
 const isFtSuggestResult = (o) => {
@@ -866,10 +814,8 @@ const isFtAuthenticatedSession = (o) => {
 exports.isFtAuthenticatedSession = isFtAuthenticatedSession;
 const isFtSearchPreferences = (o) => {
     return isObject(o)
-        && (o.defaultFilters == null || (Array.isArray(o.defaultFilters)
-            && o.defaultFilters.every((v) => (0, exports.isFtLegacyMetadataFilter)(v))))
-        && ((Array.isArray(o.defaultMetadataFilters)
-            && o.defaultMetadataFilters.every((v) => (0, exports.isFtMetadataFilter)(v))));
+        && ((Array.isArray(o.defaultFilters)
+            && o.defaultFilters.every((v) => (0, exports.isFtSearchFilter)(v))));
 };
 exports.isFtSearchPreferences = isFtSearchPreferences;
 const isFtSession = (o) => {

package/build/mjs/index.d.ts

@@ -1,4 +1,3 @@
-import "cross-fetch/polyfill";
 import { FtAuthenticatedSession, FtBookmark, FtCollectionDocument, FtHttpErrorDetails, FtMap, FtMapResource, FtMessageContext, FtMetadataConfiguration, FtMySearch, FtRatingSummary, FtRatingType, FtRatingTypeKeys, FtSearchLocales, FtSearchRequest, FtSearchResults, FtSession, FtSuggestRequest, FtSuggestResults, FtTocNode, FtTopic, FtTopicContentTarget, FtTopicContentTargetKeys, FtUiLocale, FtUnstructuredDocument } from "./types/ft-common/public";
 import { FtClusteredSemanticSearchReply, FtGenAIRating, FtMapAttachment, FtPaginatedToc, FtRagInput, FtReaderConfiguration, FtSemanticSearchRequest, FtSemanticSearchResponseItem } from "./types/ft-server/public";
 import { GenAIChunk } from "./helpers/GenAIChunkReader";

package/build/mjs/index.js

@@ -1,4 +1,4 @@
-import "cross-fetch/polyfill";
+import fetch from "cross-fetch";
 import { GenAIChunkReader } from "./helpers/GenAIChunkReader";
 const wnd = (typeof window === "undefined" ? globalThis : window);
 export * from "./types/ft-common/public";

package/build/mjs/types/ft-common/public.d.ts

@@ -262,10 +262,9 @@ export interface FtMySearchRequest {
     periodFilter?: FtPeriodFilter;
     query: string;
     scope?: FtSearchScopeKeys;
-    filters?: Array<FtLegacyLabeledMetadataFilter>;
+    filters: Array<FtLabeledSearchFilter>;
     sort: Array<FtSearchSortCriterion>;
     virtualField?: FtVirtualFieldKeys;
-    metadataFilters?: Array<FtLabeledMetadataFilter>;
     contentLocale?: string;
 }
 export declare const isFtMySearchRequest: (o: any) => o is FtMySearchRequest;
@@ -335,11 +334,17 @@ export declare enum FtPeriodFilterType {
 }
 export type FtPeriodFilterTypeKeys = keyof typeof FtPeriodFilterType;
 export declare const isFtPeriodFilterType: (o: any) => o is FtPeriodFilterType;
+export interface FtSearchFilter {
+    negative: boolean;
+    values: Array<string>;
+    key: string;
+}
+export declare const isFtSearchFilter: (o: any) => o is FtSearchFilter;
 export interface FtSearchPreset {
     name: string;
+    filters: Array<FtSearchFilter>;
     priority: number;
     contentLocale?: string;
-    metadataFilters: Array<FtMetadataFilter>;
 }
 export declare const isFtSearchPreset: (o: any) => o is FtSearchPreset;
 export declare enum FtSearchSortCriterionOrder {
@@ -399,18 +404,6 @@ export declare enum FtCollectionDocumentType {
 }
 export type FtCollectionDocumentTypeKeys = keyof typeof FtCollectionDocumentType;
 export declare const isFtCollectionDocumentType: (o: any) => o is FtCollectionDocumentType;
-export interface FtDateFilter {
-    type: FtDateFilterTypeKeys;
-}
-export declare const isFtDateFilter: (o: any) => o is FtDateFilter;
-export declare enum FtDateFilterType {
-    LAST_WEEK = "LAST_WEEK",
-    LAST_MONTH = "LAST_MONTH",
-    LAST_QUARTER = "LAST_QUARTER",
-    LAST_YEAR = "LAST_YEAR"
-}
-export type FtDateFilterTypeKeys = keyof typeof FtDateFilterType;
-export declare const isFtDateFilterType: (o: any) => o is FtDateFilterType;
 export interface FtSearchResults {
     spellcheck?: FtSpellcheck;
     paging: FtSearchResultsPageInfo;
@@ -418,50 +411,24 @@ export interface FtSearchResults {
     facets: Array<FtSearchFacet>;
 }
 export declare const isFtSearchResults: (o: any) => o is FtSearchResults;
-export interface FtLabeledMetadataFilter {
-    valueFilter?: FtValueFilter;
-    rangeFilter?: FtRangeFilter;
-    label: string;
-    key: string;
-    dateFilter?: FtDateFilter;
-}
-export declare const isFtLabeledMetadataFilter: (o: any) => o is FtLabeledMetadataFilter;
-export interface FtLegacyLabeledMetadataFilter {
+export interface FtLabeledSearchFilter {
     negative: boolean;
     values: Array<string>;
     label: string;
     key: string;
 }
-export declare const isFtLegacyLabeledMetadataFilter: (o: any) => o is FtLegacyLabeledMetadataFilter;
-export interface FtLegacyMetadataFilter {
-    negative: boolean;
-    values: Array<string>;
-    key: string;
+export declare const isFtLabeledSearchFilter: (o: any) => o is FtLabeledSearchFilter;
+export interface FtPeriod {
+    from: string;
+    to: string;
 }
-export declare const isFtLegacyMetadataFilter: (o: any) => o is FtLegacyMetadataFilter;
+export declare const isFtPeriod: (o: any) => o is FtPeriod;
 export interface FtPeriodFilter {
     period?: FtPeriod;
     periodType: FtPeriodFilterTypeKeys;
     key?: string;
 }
 export declare const isFtPeriodFilter: (o: any) => o is FtPeriodFilter;
-export interface FtMetadataFilter {
-    valueFilter?: FtValueFilter;
-    rangeFilter?: FtRangeFilter;
-    key: string;
-    dateFilter?: FtDateFilter;
-}
-export declare const isFtMetadataFilter: (o: any) => o is FtMetadataFilter;
-export interface FtPeriod {
-    from: string;
-    to: string;
-}
-export declare const isFtPeriod: (o: any) => o is FtPeriod;
-export interface FtRangeFilter {
-    from: string;
-    to: string;
-}
-export declare const isFtRangeFilter: (o: any) => o is FtRangeFilter;
 export interface FtSearchPrior {
     weight: number;
     value: string;
@@ -472,10 +439,9 @@ export interface FtSearchRequest {
     periodFilter?: FtPeriodFilter;
     query: string;
     paging: FtPageRequest;
-    filters?: Array<FtLegacyMetadataFilter>;
+    filters: Array<FtSearchFilter>;
     sort: Array<FtSearchSortCriterion>;
     virtualField?: FtVirtualFieldKeys;
-    metadataFilters: Array<FtMetadataFilter>;
     facets: Array<FtSearchFacetConf>;
     scope?: FtSearchScopeKeys;
     lastModified?: any;
@@ -566,11 +532,6 @@ export declare enum FtSearchScope {
 }
 export type FtSearchScopeKeys = keyof typeof FtSearchScope;
 export declare const isFtSearchScope: (o: any) => o is FtSearchScope;
-export interface FtValueFilter {
-    negative: boolean;
-    values: Array<string>;
-}
-export declare const isFtValueFilter: (o: any) => o is FtValueFilter;
 export interface FtSearchFacet {
     hierarchical: boolean;
     label: string;
@@ -616,10 +577,10 @@ export declare const isFtTopicResource: (o: any) => o is FtTopicResource;
 export interface FtSuggestRequest {
     input: string;
     scope?: FtSearchScopeKeys;
+    filters: Array<FtSearchFilter>;
     sort: Array<FtSearchSortCriterion>;
     maxCount?: number;
     contentLocale?: string;
-    metadataFilters: Array<FtMetadataFilter>;
 }
 export declare const isFtSuggestRequest: (o: any) => o is FtSuggestRequest;
 export interface FtSuggestResult {
@@ -669,8 +630,7 @@ export interface FtAuthenticatedSession {
 }
 export declare const isFtAuthenticatedSession: (o: any) => o is FtAuthenticatedSession;
 export interface FtSearchPreferences {
-    defaultFilters?: Array<FtLegacyMetadataFilter>;
-    defaultMetadataFilters: Array<FtMetadataFilter>;
+    defaultFilters: Array<FtSearchFilter>;
 }
 export declare const isFtSearchPreferences: (o: any) => o is FtSearchPreferences;
 export interface FtSession {

package/build/mjs/types/ft-common/public.js

@@ -303,16 +303,14 @@ export const isFtMySearch = (o) => {
 };
 export const isFtMySearchRequest = (o) => {
     return isObject(o)
-        && (o.periodFilter == null || o.periodFilter == null || isFtPeriodFilter(o.periodFilter))
+        && (o.periodFilter == null || isFtPeriodFilter(o.periodFilter))
         && (isString(o.query))
         && (o.scope == null || isFtSearchScope(o.scope))
-        && (o.filters == null || (Array.isArray(o.filters)
-            && o.filters.every((v) => isFtLegacyLabeledMetadataFilter(v))))
+        && ((Array.isArray(o.filters)
+            && o.filters.every((v) => isFtLabeledSearchFilter(v))))
         && ((Array.isArray(o.sort)
             && o.sort.every((v) => isFtSearchSortCriterion(v))))
         && (o.virtualField == null || isFtVirtualField(o.virtualField))
-        && (o.metadataFilters == null || (Array.isArray(o.metadataFilters)
-            && o.metadataFilters.every((v) => isFtLabeledMetadataFilter(v))))
         && (o.contentLocale == null || isString(o.contentLocale));
 };
 // From: RatingType
@@ -392,13 +390,20 @@ export var FtPeriodFilterType;
 export const isFtPeriodFilterType = (o) => {
     return ["LAST_WEEK", "LAST_MONTH", "LAST_QUARTER", "LAST_YEAR", "CUSTOM"].includes(o);
 };
+export const isFtSearchFilter = (o) => {
+    return isObject(o)
+        && (isBoolean(o.negative))
+        && ((Array.isArray(o.values)
+            && o.values.every((v) => isString(v))))
+        && (isString(o.key));
+};
 export const isFtSearchPreset = (o) => {
     return isObject(o)
         && (isString(o.name))
+        && ((Array.isArray(o.filters)
+            && o.filters.every((v) => isFtSearchFilter(v))))
         && (isNumber(o.priority))
-        && (o.contentLocale == null || isString(o.contentLocale))
-        && ((Array.isArray(o.metadataFilters)
-            && o.metadataFilters.every((v) => isFtMetadataFilter(v))));
+        && (o.contentLocale == null || isString(o.contentLocale));
 };
 // From: SearchSortCriterionOrder
 export var FtSearchSortCriterionOrder;
@@ -475,21 +480,6 @@ export var FtCollectionDocumentType;
 export const isFtCollectionDocumentType = (o) => {
     return ["MAP", "DOCUMENT", "TOPIC", "PERSONAL_BOOK", "SHARED_BOOK"].includes(o);
 };
-export const isFtDateFilter = (o) => {
-    return isObject(o)
-        && (isFtDateFilterType(o.type));
-};
-// From: WsPublicDateFilterType
-export var FtDateFilterType;
-(function (FtDateFilterType) {
-    FtDateFilterType["LAST_WEEK"] = "LAST_WEEK";
-    FtDateFilterType["LAST_MONTH"] = "LAST_MONTH";
-    FtDateFilterType["LAST_QUARTER"] = "LAST_QUARTER";
-    FtDateFilterType["LAST_YEAR"] = "LAST_YEAR";
-})(FtDateFilterType || (FtDateFilterType = {}));
-export const isFtDateFilterType = (o) => {
-    return ["LAST_WEEK", "LAST_MONTH", "LAST_QUARTER", "LAST_YEAR"].includes(o);
-};
 export const isFtSearchResults = (o) => {
     return isObject(o)
         && (o.spellcheck == null || isFtSpellcheck(o.spellcheck))
@@ -499,15 +489,7 @@ export const isFtSearchResults = (o) => {
         && ((Array.isArray(o.facets)
             && o.facets.every((v) => isFtSearchFacet(v))));
 };
-export const isFtLabeledMetadataFilter = (o) => {
-    return isObject(o)
-        && (o.valueFilter == null || isFtValueFilter(o.valueFilter))
-        && (o.rangeFilter == null || isFtRangeFilter(o.rangeFilter))
-        && (isString(o.label))
-        && (isString(o.key))
-        && (o.dateFilter == null || isFtDateFilter(o.dateFilter));
-};
-export const isFtLegacyLabeledMetadataFilter = (o) => {
+export const isFtLabeledSearchFilter = (o) => {
     return isObject(o)
         && (isBoolean(o.negative))
         && ((Array.isArray(o.values)
@@ -515,12 +497,10 @@ export const isFtLegacyLabeledMetadataFilter = (o) => {
         && (isString(o.label))
         && (isString(o.key));
 };
-export const isFtLegacyMetadataFilter = (o) => {
+export const isFtPeriod = (o) => {
     return isObject(o)
-        && (isBoolean(o.negative))
-        && ((Array.isArray(o.values)
-            && o.values.every((v) => isString(v))))
-        && (isString(o.key));
+        && (isString(o.from))
+        && (isString(o.to));
 };
 export const isFtPeriodFilter = (o) => {
     return isObject(o)
@@ -528,23 +508,6 @@ export const isFtPeriodFilter = (o) => {
         && (isFtPeriodFilterType(o.periodType))
         && (o.key == null || isString(o.key));
 };
-export const isFtMetadataFilter = (o) => {
-    return isObject(o)
-        && (o.valueFilter == null || isFtValueFilter(o.valueFilter))
-        && (o.rangeFilter == null || isFtRangeFilter(o.rangeFilter))
-        && (isString(o.key))
-        && (o.dateFilter == null || isFtDateFilter(o.dateFilter));
-};
-export const isFtPeriod = (o) => {
-    return isObject(o)
-        && (isString(o.from))
-        && (isString(o.to));
-};
-export const isFtRangeFilter = (o) => {
-    return isObject(o)
-        && (isString(o.from))
-        && (isString(o.to));
-};
 export const isFtSearchPrior = (o) => {
     return isObject(o)
         && (isNumber(o.weight))
@@ -553,16 +516,14 @@ export const isFtSearchPrior = (o) => {
 };
 export const isFtSearchRequest = (o) => {
     return isObject(o)
-        && (o.periodFilter == null || o.periodFilter == null || isFtPeriodFilter(o.periodFilter))
+        && (o.periodFilter == null || isFtPeriodFilter(o.periodFilter))
         && (isString(o.query))
         && (isFtPageRequest(o.paging))
-        && (o.filters == null || (Array.isArray(o.filters)
-            && o.filters.every((v) => isFtLegacyMetadataFilter(v))))
+        && ((Array.isArray(o.filters)
+            && o.filters.every((v) => isFtSearchFilter(v))))
         && ((Array.isArray(o.sort)
             && o.sort.every((v) => isFtSearchSortCriterion(v))))
         && (o.virtualField == null || isFtVirtualField(o.virtualField))
-        && ((Array.isArray(o.metadataFilters)
-            && o.metadataFilters.every((v) => isFtMetadataFilter(v))))
         && ((Array.isArray(o.facets)
             && o.facets.every((v) => isFtSearchFacetConf(v))))
         && (o.scope == null || isFtSearchScope(o.scope))
@@ -664,12 +625,6 @@ export var FtSearchScope;
 export const isFtSearchScope = (o) => {
     return ["DEFAULT", "DOCUMENTS", "ALL_TOPICS"].includes(o);
 };
-export const isFtValueFilter = (o) => {
-    return isObject(o)
-        && (isBoolean(o.negative))
-        && ((Array.isArray(o.values)
-            && o.values.every((v) => isString(v))));
-};
 export const isFtSearchFacet = (o) => {
     return isObject(o)
         && (isBoolean(o.hierarchical))
@@ -718,12 +673,12 @@ export const isFtSuggestRequest = (o) => {
     return isObject(o)
         && (isString(o.input))
         && (o.scope == null || isFtSearchScope(o.scope))
+        && ((Array.isArray(o.filters)
+            && o.filters.every((v) => isFtSearchFilter(v))))
         && ((Array.isArray(o.sort)
             && o.sort.every((v) => isFtSearchSortCriterion(v))))
         && (o.maxCount == null || isNumber(o.maxCount))
-        && (o.contentLocale == null || isString(o.contentLocale))
-        && ((Array.isArray(o.metadataFilters)
-            && o.metadataFilters.every((v) => isFtMetadataFilter(v))));
+        && (o.contentLocale == null || isString(o.contentLocale));
 };
 export const isFtSuggestResult = (o) => {
     return isObject(o)
@@ -777,10 +732,8 @@ export const isFtAuthenticatedSession = (o) => {
 };
 export const isFtSearchPreferences = (o) => {
     return isObject(o)
-        && (o.defaultFilters == null || (Array.isArray(o.defaultFilters)
-            && o.defaultFilters.every((v) => isFtLegacyMetadataFilter(v))))
-        && ((Array.isArray(o.defaultMetadataFilters)
-            && o.defaultMetadataFilters.every((v) => isFtMetadataFilter(v))));
+        && ((Array.isArray(o.defaultFilters)
+            && o.defaultFilters.every((v) => isFtSearchFilter(v))));
 };
 export const isFtSession = (o) => {
     return isObject(o)