@cryptorobot.ai/client 1.26.0-dev.1030 → 1.26.0-dev.1032

package/lib/src/services/advisor/advisor.class.d.ts

@@ -1,12 +1,12 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../declarations';
 import type { Advisor, AdvisorData, AdvisorPatch, AdvisorQuery } from './advisor.schema';
 export type { Advisor, AdvisorData, AdvisorPatch, AdvisorQuery };
 export interface AdvisorParams extends MongoDBAdapterParams<AdvisorQuery> {
     user?: any;
 }
-export declare class AdvisorService<ServiceParams extends Params = AdvisorParams> extends FlexibleMongoDBService<Advisor, AdvisorData, AdvisorParams, AdvisorPatch> {
+export declare class AdvisorService<ServiceParams extends Params = AdvisorParams> extends MongoDBService<Advisor, AdvisorData, AdvisorParams, AdvisorPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/advisor/messages/messages.class.d.ts

@@ -1,11 +1,11 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../declarations';
 import type { AdvisorMessages, AdvisorMessagesData, AdvisorMessagesPatch, AdvisorMessagesQuery } from './messages.schema';
 export type { AdvisorMessages, AdvisorMessagesData, AdvisorMessagesPatch, AdvisorMessagesQuery };
 export interface AdvisorMessagesParams extends MongoDBAdapterParams<AdvisorMessagesQuery> {
 }
-export declare class AdvisorMessagesService<ServiceParams extends Params = AdvisorMessagesParams> extends FlexibleMongoDBService<AdvisorMessages, AdvisorMessagesData, AdvisorMessagesParams, AdvisorMessagesPatch> {
+export declare class AdvisorMessagesService<ServiceParams extends Params = AdvisorMessagesParams> extends MongoDBService<AdvisorMessages, AdvisorMessagesData, AdvisorMessagesParams, AdvisorMessagesPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/affiliates/affiliates.class.d.ts

@@ -1,13 +1,13 @@
 import type { Id, Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../declarations';
 import type { Affiliates, AffiliatesData, AffiliatesPatch, AffiliatesQuery } from './affiliates.schema';
 export type { Affiliates, AffiliatesData, AffiliatesPatch, AffiliatesQuery };
 export interface AffiliatesParams extends MongoDBAdapterParams<AffiliatesQuery> {
     user?: any;
 }
-export declare class AffiliatesService<ServiceParams extends Params = AffiliatesParams> extends FlexibleMongoDBService<Affiliates, AffiliatesData, AffiliatesParams, AffiliatesPatch> {
+export declare class AffiliatesService<ServiceParams extends Params = AffiliatesParams> extends MongoDBService<Affiliates, AffiliatesData, AffiliatesParams, AffiliatesPatch> {
     app: Application;
     setup(app: Application): void;
     dashboard(affiliateId: Id, params?: ServiceParams): Promise<any>;

package/lib/src/services/affiliates/clicks/clicks.class.d.ts

@@ -1,11 +1,11 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../declarations';
 import type { AffiliatesClicks, AffiliatesClicksData, AffiliatesClicksPatch, AffiliatesClicksQuery } from './clicks.schema';
 export type { AffiliatesClicks, AffiliatesClicksData, AffiliatesClicksPatch, AffiliatesClicksQuery };
 export interface AffiliatesClicksParams extends MongoDBAdapterParams<AffiliatesClicksQuery> {
 }
-export declare class AffiliatesClicksService<ServiceParams extends Params = AffiliatesClicksParams> extends FlexibleMongoDBService<AffiliatesClicks, AffiliatesClicksData, AffiliatesClicksParams, AffiliatesClicksPatch> {
+export declare class AffiliatesClicksService<ServiceParams extends Params = AffiliatesClicksParams> extends MongoDBService<AffiliatesClicks, AffiliatesClicksData, AffiliatesClicksParams, AffiliatesClicksPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/affiliates/comissions/comissions.class.d.ts

@@ -1,11 +1,11 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../declarations';
 import type { AffiliatesComissions, AffiliatesComissionsData, AffiliatesComissionsPatch, AffiliatesComissionsQuery } from './comissions.schema';
 export type { AffiliatesComissions, AffiliatesComissionsData, AffiliatesComissionsPatch, AffiliatesComissionsQuery };
 export interface AffiliatesComissionsParams extends MongoDBAdapterParams<AffiliatesComissionsQuery> {
 }
-export declare class AffiliatesComissionsService<ServiceParams extends Params = AffiliatesComissionsParams> extends FlexibleMongoDBService<AffiliatesComissions, AffiliatesComissionsData, AffiliatesComissionsParams, AffiliatesComissionsPatch> {
+export declare class AffiliatesComissionsService<ServiceParams extends Params = AffiliatesComissionsParams> extends MongoDBService<AffiliatesComissions, AffiliatesComissionsData, AffiliatesComissionsParams, AffiliatesComissionsPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/affiliates/contracts/contracts.class.d.ts

@@ -1,11 +1,11 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../declarations';
 import type { AffiliatesContracts, AffiliatesContractsData, AffiliatesContractsPatch, AffiliatesContractsQuery } from './contracts.schema';
 export type { AffiliatesContracts, AffiliatesContractsData, AffiliatesContractsPatch, AffiliatesContractsQuery };
 export interface AffiliatesContractsParams extends MongoDBAdapterParams<AffiliatesContractsQuery> {
 }
-export declare class AffiliatesContractsService<ServiceParams extends Params = AffiliatesContractsParams> extends FlexibleMongoDBService<AffiliatesContracts, AffiliatesContractsData, AffiliatesContractsParams, AffiliatesContractsPatch> {
+export declare class AffiliatesContractsService<ServiceParams extends Params = AffiliatesContractsParams> extends MongoDBService<AffiliatesContracts, AffiliatesContractsData, AffiliatesContractsParams, AffiliatesContractsPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/affiliates/coupons/coupons.class.d.ts

@@ -1,11 +1,11 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../declarations';
 import type { AffiliatesCoupons, AffiliatesCouponsData, AffiliatesCouponsPatch, AffiliatesCouponsQuery } from './coupons.schema';
 export type { AffiliatesCoupons, AffiliatesCouponsData, AffiliatesCouponsPatch, AffiliatesCouponsQuery };
 export interface AffiliatesCouponsParams extends MongoDBAdapterParams<AffiliatesCouponsQuery> {
 }
-export declare class AffiliatesCouponsService<ServiceParams extends Params = AffiliatesCouponsParams> extends FlexibleMongoDBService<AffiliatesCoupons, AffiliatesCouponsData, AffiliatesCouponsParams, AffiliatesCouponsPatch> {
+export declare class AffiliatesCouponsService<ServiceParams extends Params = AffiliatesCouponsParams> extends MongoDBService<AffiliatesCoupons, AffiliatesCouponsData, AffiliatesCouponsParams, AffiliatesCouponsPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/affiliates/links/links.class.d.ts

@@ -1,11 +1,11 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../declarations';
 import type { AffiliatesLinks, AffiliatesLinksData, AffiliatesLinksPatch, AffiliatesLinksQuery } from './links.schema';
 export type { AffiliatesLinks, AffiliatesLinksData, AffiliatesLinksPatch, AffiliatesLinksQuery };
 export interface AffiliatesLinksParams extends MongoDBAdapterParams<AffiliatesLinksQuery> {
 }
-export declare class AffiliatesLinksService<ServiceParams extends Params = AffiliatesLinksParams> extends FlexibleMongoDBService<AffiliatesLinks, AffiliatesLinksData, AffiliatesLinksParams, AffiliatesLinksPatch> {
+export declare class AffiliatesLinksService<ServiceParams extends Params = AffiliatesLinksParams> extends MongoDBService<AffiliatesLinks, AffiliatesLinksData, AffiliatesLinksParams, AffiliatesLinksPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/affiliates/payouts/payouts.class.d.ts

@@ -1,11 +1,11 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../declarations';
 import type { AffiliatesPayouts, AffiliatesPayoutsData, AffiliatesPayoutsPatch, AffiliatesPayoutsQuery } from './payouts.schema';
 export type { AffiliatesPayouts, AffiliatesPayoutsData, AffiliatesPayoutsPatch, AffiliatesPayoutsQuery };
 export interface AffiliatesPayoutsParams extends MongoDBAdapterParams<AffiliatesPayoutsQuery> {
 }
-export declare class AffiliatesPayoutsService<ServiceParams extends Params = AffiliatesPayoutsParams> extends FlexibleMongoDBService<AffiliatesPayouts, AffiliatesPayoutsData, AffiliatesPayoutsParams, AffiliatesPayoutsPatch> {
+export declare class AffiliatesPayoutsService<ServiceParams extends Params = AffiliatesPayoutsParams> extends MongoDBService<AffiliatesPayouts, AffiliatesPayoutsData, AffiliatesPayoutsParams, AffiliatesPayoutsPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/agents/agents.class.d.ts

@@ -1,12 +1,12 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../declarations';
 import type { Agents, AgentsData, AgentsPatch, AgentsQuery } from './agents.schema';
 export type { Agents, AgentsData, AgentsPatch, AgentsQuery };
 export interface AgentsParams extends MongoDBAdapterParams<AgentsQuery> {
     user?: any;
 }
-export declare class AgentsService<ServiceParams extends Params = AgentsParams> extends FlexibleMongoDBService<Agents, AgentsData, AgentsParams, AgentsPatch> {
+export declare class AgentsService<ServiceParams extends Params = AgentsParams> extends MongoDBService<Agents, AgentsData, AgentsParams, AgentsPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/agents/sessions/conversations/conversations.class.d.ts

@@ -1,12 +1,12 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../../declarations';
 import type { AgentsSessionsConversations, AgentsSessionsConversationsData, AgentsSessionsConversationsPatch, AgentsSessionsConversationsQuery } from './conversations.schema';
 export type { AgentsSessionsConversations, AgentsSessionsConversationsData, AgentsSessionsConversationsPatch, AgentsSessionsConversationsQuery };
 export interface AgentsSessionsConversationsParams extends MongoDBAdapterParams<AgentsSessionsConversationsQuery> {
     user?: any;
 }
-export declare class AgentsSessionsConversationsService<ServiceParams extends Params = AgentsSessionsConversationsParams> extends FlexibleMongoDBService<AgentsSessionsConversations, AgentsSessionsConversationsData, AgentsSessionsConversationsParams, AgentsSessionsConversationsPatch> {
+export declare class AgentsSessionsConversationsService<ServiceParams extends Params = AgentsSessionsConversationsParams> extends MongoDBService<AgentsSessionsConversations, AgentsSessionsConversationsData, AgentsSessionsConversationsParams, AgentsSessionsConversationsPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/agents/sessions/sessions.class.d.ts

@@ -1,12 +1,12 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../declarations';
 import type { AgentsSessions, AgentsSessionsData, AgentsSessionsPatch, AgentsSessionsQuery } from './sessions.schema';
 export type { AgentsSessions, AgentsSessionsData, AgentsSessionsPatch, AgentsSessionsQuery };
 export interface AgentsSessionsParams extends MongoDBAdapterParams<AgentsSessionsQuery> {
     user?: any;
 }
-export declare class AgentsSessionsService<ServiceParams extends Params = AgentsSessionsParams> extends FlexibleMongoDBService<AgentsSessions, AgentsSessionsData, AgentsSessionsParams, AgentsSessionsPatch> {
+export declare class AgentsSessionsService<ServiceParams extends Params = AgentsSessionsParams> extends MongoDBService<AgentsSessions, AgentsSessionsData, AgentsSessionsParams, AgentsSessionsPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/autotune/studies/studies.class.d.ts

@@ -1,12 +1,12 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../declarations';
 import type { AutotuneStudy, AutotuneStudyData, AutotuneStudyPatch, AutotuneStudyQuery } from './studies.schema';
 export type { AutotuneStudy, AutotuneStudyData, AutotuneStudyPatch, AutotuneStudyQuery };
 export interface AutotuneStudiesParams extends MongoDBAdapterParams<AutotuneStudyQuery> {
     user?: any;
 }
-export declare class AutotuneStudiesService<ServiceParams extends Params = AutotuneStudiesParams> extends FlexibleMongoDBService<AutotuneStudy, AutotuneStudyData, AutotuneStudiesParams, AutotuneStudyPatch> {
+export declare class AutotuneStudiesService<ServiceParams extends Params = AutotuneStudiesParams> extends MongoDBService<AutotuneStudy, AutotuneStudyData, AutotuneStudiesParams, AutotuneStudyPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/autotune/trials/trials.class.d.ts

@@ -1,12 +1,12 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../declarations';
 import type { AutotuneTrial, AutotuneTrialData, AutotuneTrialPatch, AutotuneTrialQuery } from './trials.schema';
 export type { AutotuneTrial, AutotuneTrialData, AutotuneTrialPatch, AutotuneTrialQuery };
 export interface AutotuneTrialsParams extends MongoDBAdapterParams<AutotuneTrialQuery> {
     user?: any;
 }
-export declare class AutotuneTrialsService<ServiceParams extends Params = AutotuneTrialsParams> extends FlexibleMongoDBService<AutotuneTrial, AutotuneTrialData, AutotuneTrialsParams, AutotuneTrialPatch> {
+export declare class AutotuneTrialsService<ServiceParams extends Params = AutotuneTrialsParams> extends MongoDBService<AutotuneTrial, AutotuneTrialData, AutotuneTrialsParams, AutotuneTrialPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/autotune/usage/usage.class.d.ts

@@ -1,11 +1,11 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../declarations';
 import type { AutotuneUsage, AutotuneUsageData, AutotuneUsagePatch, AutotuneUsageQuery } from './usage.schema';
 export type { AutotuneUsage, AutotuneUsageData, AutotuneUsagePatch, AutotuneUsageQuery };
 export interface AutotuneUsageParams extends MongoDBAdapterParams<AutotuneUsageQuery> {
 }
-export declare class AutotuneUsageService<ServiceParams extends Params = AutotuneUsageParams> extends FlexibleMongoDBService<AutotuneUsage, AutotuneUsageData, AutotuneUsageParams, AutotuneUsagePatch> {
+export declare class AutotuneUsageService<ServiceParams extends Params = AutotuneUsageParams> extends MongoDBService<AutotuneUsage, AutotuneUsageData, AutotuneUsageParams, AutotuneUsagePatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/blog/calendar/calendar.class.d.ts

@@ -1,11 +1,11 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../declarations';
 import type { BlogCalendar, BlogCalendarData, BlogCalendarPatch, BlogCalendarQuery } from './calendar.schema';
 export type { BlogCalendar, BlogCalendarData, BlogCalendarPatch, BlogCalendarQuery };
 export interface BlogCalendarParams extends MongoDBAdapterParams<BlogCalendarQuery> {
 }
-export declare class BlogCalendarService<ServiceParams extends Params = BlogCalendarParams> extends FlexibleMongoDBService<BlogCalendar, BlogCalendarData, BlogCalendarParams, BlogCalendarPatch> {
+export declare class BlogCalendarService<ServiceParams extends Params = BlogCalendarParams> extends MongoDBService<BlogCalendar, BlogCalendarData, BlogCalendarParams, BlogCalendarPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/blog/integrations/integrations.class.d.ts

@@ -1,11 +1,11 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../declarations';
 import type { BlogIntegrations, BlogIntegrationsData, BlogIntegrationsPatch, BlogIntegrationsQuery } from './integrations.schema';
 export type { BlogIntegrations, BlogIntegrationsData, BlogIntegrationsPatch, BlogIntegrationsQuery };
 export interface BlogIntegrationsParams extends MongoDBAdapterParams<BlogIntegrationsQuery> {
 }
-export declare class BlogIntegrationsService<ServiceParams extends Params = BlogIntegrationsParams> extends FlexibleMongoDBService<BlogIntegrations, BlogIntegrationsData, BlogIntegrationsParams, BlogIntegrationsPatch> {
+export declare class BlogIntegrationsService<ServiceParams extends Params = BlogIntegrationsParams> extends MongoDBService<BlogIntegrations, BlogIntegrationsData, BlogIntegrationsParams, BlogIntegrationsPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/blog/posts/posts.class.d.ts

@@ -1,11 +1,11 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../declarations';
 import type { BlogPosts, BlogPostsData, BlogPostsPatch, BlogPostsQuery } from './posts.schema';
 export type { BlogPosts, BlogPostsData, BlogPostsPatch, BlogPostsQuery };
 export interface BlogPostsParams extends MongoDBAdapterParams<BlogPostsQuery> {
 }
-export declare class BlogPostsService<ServiceParams extends Params = BlogPostsParams> extends FlexibleMongoDBService<BlogPosts, BlogPostsData, BlogPostsParams, BlogPostsPatch> {
+export declare class BlogPostsService<ServiceParams extends Params = BlogPostsParams> extends MongoDBService<BlogPosts, BlogPostsData, BlogPostsParams, BlogPostsPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/blog/queries/queries.class.d.ts

@@ -1,11 +1,11 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../declarations';
 import type { BlogQueries, BlogQueriesData, BlogQueriesPatch, BlogQueriesQuery } from './queries.schema';
 export type { BlogQueries, BlogQueriesData, BlogQueriesPatch, BlogQueriesQuery };
 export interface BlogQueriesParams extends MongoDBAdapterParams<BlogQueriesQuery> {
 }
-export declare class BlogQueriesService<ServiceParams extends Params = BlogQueriesParams> extends FlexibleMongoDBService<BlogQueries, BlogQueriesData, BlogQueriesParams, BlogQueriesPatch> {
+export declare class BlogQueriesService<ServiceParams extends Params = BlogQueriesParams> extends MongoDBService<BlogQueries, BlogQueriesData, BlogQueriesParams, BlogQueriesPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/blog/sitemaps/pages/pages.class.d.ts

@@ -1,11 +1,11 @@
 import type { Params } from '@feathersjs/feathers';
 import type { MongoDBAdapterOptions, MongoDBAdapterParams } from '@feathersjs/mongodb';
-import { FlexibleMongoDBService } from '../../../../helpers/flexible-objectid';
+import { MongoDBService } from '@feathersjs/mongodb';
 import type { Application } from '../../../../declarations';
 import type { BlogSitemapsPages, BlogSitemapsPagesData, BlogSitemapsPagesPatch, BlogSitemapsPagesQuery } from './pages.schema';
 export type { BlogSitemapsPages, BlogSitemapsPagesData, BlogSitemapsPagesPatch, BlogSitemapsPagesQuery };
 export interface BlogSitemapsPagesParams extends MongoDBAdapterParams<BlogSitemapsPagesQuery> {
 }
-export declare class BlogSitemapsPagesService<ServiceParams extends Params = BlogSitemapsPagesParams> extends FlexibleMongoDBService<BlogSitemapsPages, BlogSitemapsPagesData, BlogSitemapsPagesParams, BlogSitemapsPagesPatch> {
+export declare class BlogSitemapsPagesService<ServiceParams extends Params = BlogSitemapsPagesParams> extends MongoDBService<BlogSitemapsPages, BlogSitemapsPagesData, BlogSitemapsPagesParams, BlogSitemapsPagesPatch> {
 }
 export declare const getOptions: (app: Application) => MongoDBAdapterOptions;

package/lib/src/services/blog/sitemaps/pages/pages.schema.d.ts

@@ -3,7 +3,7 @@ import type { HookContext } from '../../../../declarations';
 import type { BlogSitemapsPagesService } from './pages.class';
 export declare const blogSitemapsPagesSchema: import("@feathersjs/typebox").TObject<{
     _id: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-    snapshotId: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
+    snapshotId: import("@feathersjs/typebox").TString<string>;
     crawledAt: import("@feathersjs/typebox").TString<"date-time">;
     url: import("@feathersjs/typebox").TString<string>;
     httpStatus: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TNumber, import("@feathersjs/typebox").TNull]>;
@@ -37,7 +37,7 @@ export type BlogSitemapsPages = Static<typeof blogSitemapsPagesSchema>;
 export declare const blogSitemapsPagesValidator: import("@feathersjs/schema").Validator<any, any>;
 export declare const blogSitemapsPagesResolver: import("@feathersjs/schema").Resolver<{
     _id: string | {};
-    snapshotId: string | {};
+    snapshotId: string;
     crawledAt: string;
     url: string;
     httpStatus: number | null;
@@ -69,7 +69,7 @@ export declare const blogSitemapsPagesResolver: import("@feathersjs/schema").Res
 }, HookContext<BlogSitemapsPagesService<import("./pages.class").BlogSitemapsPagesParams>>>;
 export declare const blogSitemapsPagesExternalResolver: import("@feathersjs/schema").Resolver<{
     _id: string | {};
-    snapshotId: string | {};
+    snapshotId: string;
     crawledAt: string;
     url: string;
     httpStatus: number | null;
@@ -101,7 +101,7 @@ export declare const blogSitemapsPagesExternalResolver: import("@feathersjs/sche
 }, HookContext<BlogSitemapsPagesService<import("./pages.class").BlogSitemapsPagesParams>>>;
 export declare const blogSitemapsPagesDataSchema: import("@feathersjs/typebox").TPick<import("@feathersjs/typebox").TObject<{
     _id: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-    snapshotId: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
+    snapshotId: import("@feathersjs/typebox").TString<string>;
     crawledAt: import("@feathersjs/typebox").TString<"date-time">;
     url: import("@feathersjs/typebox").TString<string>;
     httpStatus: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TNumber, import("@feathersjs/typebox").TNull]>;
@@ -135,7 +135,7 @@ export type BlogSitemapsPagesData = Static<typeof blogSitemapsPagesDataSchema>;
 export declare const blogSitemapsPagesDataValidator: import("@feathersjs/schema").Validator<any, any>;
 export declare const blogSitemapsPagesDataResolver: import("@feathersjs/schema").Resolver<{
     _id: string | {};
-    snapshotId: string | {};
+    snapshotId: string;
     crawledAt: string;
     url: string;
     httpStatus: number | null;
@@ -167,7 +167,7 @@ export declare const blogSitemapsPagesDataResolver: import("@feathersjs/schema")
 }, HookContext<BlogSitemapsPagesService<import("./pages.class").BlogSitemapsPagesParams>>>;
 export declare const blogSitemapsPagesPatchSchema: import("@feathersjs/typebox").TPartial<import("@feathersjs/typebox").TObject<{
     _id: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-    snapshotId: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
+    snapshotId: import("@feathersjs/typebox").TString<string>;
     crawledAt: import("@feathersjs/typebox").TString<"date-time">;
     url: import("@feathersjs/typebox").TString<string>;
     httpStatus: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TNumber, import("@feathersjs/typebox").TNull]>;
@@ -201,7 +201,7 @@ export type BlogSitemapsPagesPatch = Static<typeof blogSitemapsPagesPatchSchema>
 export declare const blogSitemapsPagesPatchValidator: import("@feathersjs/schema").Validator<any, any>;
 export declare const blogSitemapsPagesPatchResolver: import("@feathersjs/schema").Resolver<{
     _id: string | {};
-    snapshotId: string | {};
+    snapshotId: string;
     crawledAt: string;
     url: string;
     httpStatus: number | null;
@@ -233,7 +233,7 @@ export declare const blogSitemapsPagesPatchResolver: import("@feathersjs/schema"
 }, HookContext<BlogSitemapsPagesService<import("./pages.class").BlogSitemapsPagesParams>>>;
 export declare const blogSitemapsPagesQueryProperties: import("@feathersjs/typebox").TPick<import("@feathersjs/typebox").TObject<{
     _id: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-    snapshotId: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
+    snapshotId: import("@feathersjs/typebox").TString<string>;
     crawledAt: import("@feathersjs/typebox").TString<"date-time">;
     url: import("@feathersjs/typebox").TString<string>;
     httpStatus: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TNumber, import("@feathersjs/typebox").TNull]>;
@@ -321,14 +321,14 @@ export declare const blogSitemapsPagesQuerySchema: import("@feathersjs/typebox")
         }>, import("@feathersjs/typebox").TObject<{
             [key: string]: import("@feathersjs/typebox").TSchema;
         } | undefined>]>>]>>;
-        snapshotId: import("@feathersjs/typebox").TOptional<import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>, import("@feathersjs/typebox").TPartial<import("@feathersjs/typebox").TIntersect<[import("@feathersjs/typebox").TObject<{
-            $gt: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-            $gte: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-            $lt: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-            $lte: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-            $ne: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-            $in: import("@feathersjs/typebox").TArray<import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>> | import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-            $nin: import("@feathersjs/typebox").TArray<import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>> | import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
+        snapshotId: import("@feathersjs/typebox").TOptional<import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TPartial<import("@feathersjs/typebox").TIntersect<[import("@feathersjs/typebox").TObject<{
+            $gt: import("@feathersjs/typebox").TString<string>;
+            $gte: import("@feathersjs/typebox").TString<string>;
+            $lt: import("@feathersjs/typebox").TString<string>;
+            $lte: import("@feathersjs/typebox").TString<string>;
+            $ne: import("@feathersjs/typebox").TString<string>;
+            $in: import("@feathersjs/typebox").TArray<import("@feathersjs/typebox").TString<string>> | import("@feathersjs/typebox").TString<string>;
+            $nin: import("@feathersjs/typebox").TArray<import("@feathersjs/typebox").TString<string>> | import("@feathersjs/typebox").TString<string>;
         }>, import("@feathersjs/typebox").TObject<{
             [key: string]: import("@feathersjs/typebox").TSchema;
         } | undefined>]>>]>>;
@@ -400,14 +400,14 @@ export declare const blogSitemapsPagesQuerySchema: import("@feathersjs/typebox")
             }>, import("@feathersjs/typebox").TObject<{
                 [key: string]: import("@feathersjs/typebox").TSchema;
             } | undefined>]>>]>>;
-            snapshotId: import("@feathersjs/typebox").TOptional<import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>, import("@feathersjs/typebox").TPartial<import("@feathersjs/typebox").TIntersect<[import("@feathersjs/typebox").TObject<{
-                $gt: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-                $gte: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-                $lt: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-                $lte: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-                $ne: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-                $in: import("@feathersjs/typebox").TArray<import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>> | import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-                $nin: import("@feathersjs/typebox").TArray<import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>> | import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
+            snapshotId: import("@feathersjs/typebox").TOptional<import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TPartial<import("@feathersjs/typebox").TIntersect<[import("@feathersjs/typebox").TObject<{
+                $gt: import("@feathersjs/typebox").TString<string>;
+                $gte: import("@feathersjs/typebox").TString<string>;
+                $lt: import("@feathersjs/typebox").TString<string>;
+                $lte: import("@feathersjs/typebox").TString<string>;
+                $ne: import("@feathersjs/typebox").TString<string>;
+                $in: import("@feathersjs/typebox").TArray<import("@feathersjs/typebox").TString<string>> | import("@feathersjs/typebox").TString<string>;
+                $nin: import("@feathersjs/typebox").TArray<import("@feathersjs/typebox").TString<string>> | import("@feathersjs/typebox").TString<string>;
             }>, import("@feathersjs/typebox").TObject<{
                 [key: string]: import("@feathersjs/typebox").TSchema;
             } | undefined>]>>]>>;
@@ -480,14 +480,14 @@ export declare const blogSitemapsPagesQuerySchema: import("@feathersjs/typebox")
         }>, import("@feathersjs/typebox").TObject<{
             [key: string]: import("@feathersjs/typebox").TSchema;
         } | undefined>]>>]>>;
-        snapshotId: import("@feathersjs/typebox").TOptional<import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>, import("@feathersjs/typebox").TPartial<import("@feathersjs/typebox").TIntersect<[import("@feathersjs/typebox").TObject<{
-            $gt: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-            $gte: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-            $lt: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-            $lte: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-            $ne: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-            $in: import("@feathersjs/typebox").TArray<import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>> | import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-            $nin: import("@feathersjs/typebox").TArray<import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>> | import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
+        snapshotId: import("@feathersjs/typebox").TOptional<import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TPartial<import("@feathersjs/typebox").TIntersect<[import("@feathersjs/typebox").TObject<{
+            $gt: import("@feathersjs/typebox").TString<string>;
+            $gte: import("@feathersjs/typebox").TString<string>;
+            $lt: import("@feathersjs/typebox").TString<string>;
+            $lte: import("@feathersjs/typebox").TString<string>;
+            $ne: import("@feathersjs/typebox").TString<string>;
+            $in: import("@feathersjs/typebox").TArray<import("@feathersjs/typebox").TString<string>> | import("@feathersjs/typebox").TString<string>;
+            $nin: import("@feathersjs/typebox").TArray<import("@feathersjs/typebox").TString<string>> | import("@feathersjs/typebox").TString<string>;
         }>, import("@feathersjs/typebox").TObject<{
             [key: string]: import("@feathersjs/typebox").TSchema;
         } | undefined>]>>]>>;
@@ -559,14 +559,14 @@ export declare const blogSitemapsPagesQuerySchema: import("@feathersjs/typebox")
     }>, import("@feathersjs/typebox").TObject<{
         [key: string]: import("@feathersjs/typebox").TSchema;
     } | undefined>]>>]>>;
-    snapshotId: import("@feathersjs/typebox").TOptional<import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>, import("@feathersjs/typebox").TPartial<import("@feathersjs/typebox").TIntersect<[import("@feathersjs/typebox").TObject<{
-        $gt: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-        $gte: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-        $lt: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-        $lte: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-        $ne: import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-        $in: import("@feathersjs/typebox").TArray<import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>> | import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
-        $nin: import("@feathersjs/typebox").TArray<import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>> | import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TObject<{}>]>;
+    snapshotId: import("@feathersjs/typebox").TOptional<import("@feathersjs/typebox").TUnion<[import("@feathersjs/typebox").TString<string>, import("@feathersjs/typebox").TPartial<import("@feathersjs/typebox").TIntersect<[import("@feathersjs/typebox").TObject<{
+        $gt: import("@feathersjs/typebox").TString<string>;
+        $gte: import("@feathersjs/typebox").TString<string>;
+        $lt: import("@feathersjs/typebox").TString<string>;
+        $lte: import("@feathersjs/typebox").TString<string>;
+        $ne: import("@feathersjs/typebox").TString<string>;
+        $in: import("@feathersjs/typebox").TArray<import("@feathersjs/typebox").TString<string>> | import("@feathersjs/typebox").TString<string>;
+        $nin: import("@feathersjs/typebox").TArray<import("@feathersjs/typebox").TString<string>> | import("@feathersjs/typebox").TString<string>;
     }>, import("@feathersjs/typebox").TObject<{
         [key: string]: import("@feathersjs/typebox").TSchema;
     } | undefined>]>>]>>;
@@ -646,14 +646,14 @@ export declare const blogSitemapsPagesQueryResolver: import("@feathersjs/schema"
             $nin: number | (number | null)[] | null;
         } & {}> | null | undefined;
         snapshotId?: string | Partial<{
-            $gt: string | {};
-            $gte: string | {};
-            $lt: string | {};
-            $lte: string | {};
-            $ne: string | {};
-            $in: string | (string | {})[] | {};
-            $nin: string | (string | {})[] | {};
-        } & {}> | {} | undefined;
+            $gt: string;
+            $gte: string;
+            $lt: string;
+            $lte: string;
+            $ne: string;
+            $in: string | string[];
+            $nin: string | string[];
+        } & {}> | undefined;
         tier?: 1 | 2 | Partial<{
             $gt: 1 | 2;
             $gte: 1 | 2;
@@ -711,14 +711,14 @@ export declare const blogSitemapsPagesQueryResolver: import("@feathersjs/schema"
                 $nin: number | (number | null)[] | null;
             } & {}> | null | undefined;
             snapshotId?: string | Partial<{
-                $gt: string | {};
-                $gte: string | {};
-                $lt: string | {};
-                $lte: string | {};
-                $ne: string | {};
-                $in: string | (string | {})[] | {};
-                $nin: string | (string | {})[] | {};
-            } & {}> | {} | undefined;
+                $gt: string;
+                $gte: string;
+                $lt: string;
+                $lte: string;
+                $ne: string;
+                $in: string | string[];
+                $nin: string | string[];
+            } & {}> | undefined;
             tier?: 1 | 2 | Partial<{
                 $gt: 1 | 2;
                 $gte: 1 | 2;
@@ -777,14 +777,14 @@ export declare const blogSitemapsPagesQueryResolver: import("@feathersjs/schema"
             $nin: number | (number | null)[] | null;
         } & {}> | null | undefined;
         snapshotId?: string | Partial<{
-            $gt: string | {};
-            $gte: string | {};
-            $lt: string | {};
-            $lte: string | {};
-            $ne: string | {};
-            $in: string | (string | {})[] | {};
-            $nin: string | (string | {})[] | {};
-        } & {}> | {} | undefined;
+            $gt: string;
+            $gte: string;
+            $lt: string;
+            $lte: string;
+            $ne: string;
+            $in: string | string[];
+            $nin: string | string[];
+        } & {}> | undefined;
         tier?: 1 | 2 | Partial<{
             $gt: 1 | 2;
             $gte: 1 | 2;
@@ -842,14 +842,14 @@ export declare const blogSitemapsPagesQueryResolver: import("@feathersjs/schema"
         $nin: number | (number | null)[] | null;
     } & {}> | null | undefined;
     snapshotId?: string | Partial<{
-        $gt: string | {};
-        $gte: string | {};
-        $lt: string | {};
-        $lte: string | {};
-        $ne: string | {};
-        $in: string | (string | {})[] | {};
-        $nin: string | (string | {})[] | {};
-    } & {}> | {} | undefined;
+        $gt: string;
+        $gte: string;
+        $lt: string;
+        $lte: string;
+        $ne: string;
+        $in: string | string[];
+        $nin: string | string[];
+    } & {}> | undefined;
     tier?: 1 | 2 | Partial<{
         $gt: 1 | 2;
         $gte: 1 | 2;