@genesislcap/foundation-comms 14.187.1-alpha-3406925.0 → 14.187.1

package/dist/dts/testing/mocks/connect/socket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../../../../src/testing/mocks/connect/socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAQ,UAAU,EAAE,MAAM,MAAM,CAAC;AACzD,OAAO,KAAK,EACV,OAAO,EACP,MAAM,EACN,oBAAoB,EACpB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD;;GAEG;AACH,qBAAa,UAAW,YAAW,MAAM;IAChC,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,sBAAsB,EAAE,OAAO,CAAC;IAChC,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,kBAAkB,EAAE,eAAe,CAAC,OAAO,CAAC,CAA6B;IACzE,cAAc,EAAE,OAAO,CAAC;IACxB,IAAI,EAAE,MAAM,CAAe;IAE3B,WAAW,EAAE,OAAO,CAAC;IACrB,qBAAqB,8BAAgC;IAErD,OAAO,CACZ,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,oBAAoB,EAC9B,gBAAgB,CAAC,EAAE,sBAAsB,GACxC,OAAO,CAAC,OAAO,CAAC;IAKZ,UAAU,IAAI,IAAI;IAElB,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,OAAO,GAAG,GAAG,CAAC;IAItD,aAAa,CAAC,CAAC,EACpB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EACrB,SAAS,EAAE,QAAQ,EACnB,OAAO,EAAE,QAAQ,EACjB,UAAU,CAAC,EAAE,QAAQ,GACpB,UAAU,CAAC,OAAO,CAAC;IAItB,4BAA4B,CAAC,CAAC,EAC5B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EACrB,SAAS,EAAE,QAAQ,EACnB,OAAO,EAAE,QAAQ,GAChB,UAAU,CAAC,OAAO,CAAC;IAIf,cAAc,IAAI,aAAa,CAAC,OAAO,CAAC;IAI/C,KAAK,IAAI,IAAI;CAGd"}
+{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../../../../src/testing/mocks/connect/socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAQ,UAAU,EAAE,MAAM,MAAM,CAAC;AACzD,OAAO,KAAK,EACV,OAAO,EACP,MAAM,EACN,oBAAoB,EACpB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD;;GAEG;AACH,qBAAa,UAAW,YAAW,MAAM;IAChC,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,sBAAsB,EAAE,OAAO,CAAC;IAChC,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,kBAAkB,EAAE,eAAe,CAAC,OAAO,CAAC,CAA6B;IACzE,cAAc,EAAE,OAAO,CAAC;IAExB,WAAW,EAAE,OAAO,CAAC;IACrB,qBAAqB,8BAAgC;IAErD,OAAO,CACZ,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,oBAAoB,EAC9B,gBAAgB,CAAC,EAAE,sBAAsB,GACxC,OAAO,CAAC,OAAO,CAAC;IAIZ,UAAU,IAAI,IAAI;IAElB,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,OAAO,GAAG,GAAG,CAAC;IAItD,aAAa,CAAC,CAAC,EACpB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EACrB,SAAS,EAAE,QAAQ,EACnB,OAAO,EAAE,QAAQ,EACjB,UAAU,CAAC,EAAE,QAAQ,GACpB,UAAU,CAAC,OAAO,CAAC;IAItB,4BAA4B,CAAC,CAAC,EAC5B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EACrB,SAAS,EAAE,QAAQ,EACnB,OAAO,EAAE,QAAQ,GAChB,UAAU,CAAC,OAAO,CAAC;IAIf,cAAc,IAAI,aAAa,CAAC,OAAO,CAAC;IAI/C,KAAK,IAAI,IAAI;CAGd"}

package/dist/dts/testing/mocks/datasource/datasource.d.ts

@@ -1,34 +1,16 @@
-import { Message, SocketObservable } from '../../../connect';
-import type { Datasource, DatasourceOptions, DatasourceStatus, Dataview, ResourceType } from '../../../datasource';
-import { FieldMetadata, FilteredDataServerResult, IndexDetail, Metadata, MetadataDetail, RequestServerResult } from '../../../metadata';
+import { SocketObservable } from '../../../connect';
+import type { Datasource, DatasourceOptions, Dataview, ResourceType } from '../../../datasource';
+import { FieldMetadata, FilteredDataServerResult, RequestServerResult } from '../../../metadata';
 /**
  * @internal
  */
 export declare class DatasourceMock implements Datasource {
-    status: DatasourceStatus;
-    fetchMetadataRequired: boolean;
-    protected fetchingMetadata: boolean;
-    originalFieldDef: MetadataDetail[];
-    fieldMetadata: FieldMetadata[];
-    requestFields: MetadataDetail[];
-    availableIndexes: IndexDetail[];
     initialized: boolean;
+    fieldMetadata: FieldMetadata[];
     readOnly: boolean;
     resourceType: ResourceType;
     stream: SocketObservable<FilteredDataServerResult | RequestServerResult>;
     init(options: DatasourceOptions, fetchMeta: boolean): Promise<boolean>;
-    /**
-     * Convenience method to avoid you having to prime connect etc.
-     * @param meta - The metadata to set.
-     */
-    setMetadata(meta: Metadata): void;
-    unsetMedata(): void;
-    /**
-     * Convenience method to avoid you having to prime connect etc.
-     * @param message - The Message to stream.
-     */
-    setStream(message: Message): void;
-    unsetStream(): void;
     deinit(): void;
     destroy(): void;
     validResourceName(resourceName: string): boolean;

package/dist/dts/testing/mocks/datasource/datasource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../../../../src/testing/mocks/datasource/datasource.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,KAAK,EACV,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,QAAQ,EACR,YAAY,EACb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,aAAa,EACb,wBAAwB,EACxB,WAAW,EACX,QAAQ,EACR,cAAc,EACd,mBAAmB,EAEpB,MAAM,mBAAmB,CAAC;AAE3B;;GAEG;AACH,qBAAa,cAAe,YAAW,UAAU;IACnC,MAAM,EAAE,gBAAgB,CAAC;IACzB,qBAAqB,UAAQ;IACzC,SAAS,CAAC,gBAAgB,UAAS;IACvB,gBAAgB,EAAE,cAAc,EAAE,CAAM;IACxC,aAAa,EAAE,aAAa,EAAE,CAAM;IACpC,aAAa,EAAE,cAAc,EAAE,CAAM;IACrC,gBAAgB,EAAE,WAAW,EAAE,CAAM;IAEjD,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,gBAAgB,CAAC,wBAAwB,GAAG,mBAAmB,CAAC,CAAC;IAEzE,IAAI,CAAC,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAItE;;;OAGG;IACH,WAAW,CAAC,IAAI,EAAE,QAAQ;IAQ1B,WAAW;IAQX;;;OAGG;IACH,SAAS,CAAC,OAAO,EAAE,OAAO;IAI1B,WAAW;IAIX,MAAM;IAEN,OAAO;IAEP,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO;IAMhD,WAAW,CAAC,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAI5D,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG;IAErB,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM;IAE/B,UAAU,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvC,WAAW,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,EAAE;IAIhC,OAAO,CAAC,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAE9B,QAAQ,CAAC,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAE/B,SAAS,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlE,WAAW,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzC,UAAU,CAAC,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAIvC,UAAU,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1C,UAAU,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CAGtD"}
+{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../../../../src/testing/mocks/datasource/datasource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACjG,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAEjG;;GAEG;AACH,qBAAa,cAAe,YAAW,UAAU;IAC/C,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,aAAa,EAAE,CAAC;IAC/B,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,gBAAgB,CAAC,wBAAwB,GAAG,mBAAmB,CAAC,CAAC;IAEzE,IAAI,CAAC,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAItE,MAAM;IAEN,OAAO;IAEP,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO;IAMhD,WAAW,CAAC,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAI5D,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG;IAErB,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM;IAE/B,UAAU,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvC,WAAW,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,EAAE;IAIhC,OAAO,CAAC,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAE9B,QAAQ,CAAC,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAE/B,SAAS,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlE,WAAW,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzC,UAAU,CAAC,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAIvC,UAAU,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1C,UAAU,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CAGtD"}

package/dist/dts/testing/mocks/index.d.ts

@@ -1,6 +1,5 @@
 export * from './auth';
 export * from './connect';
 export * from './datasource';
-export * from './resources';
 export * from './session';
 //# sourceMappingURL=index.d.ts.map

package/dist/dts/testing/mocks/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/testing/mocks/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/testing/mocks/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC"}

package/dist/esm/connect/connect.js

@@ -1,6 +1,6 @@
 import { __awaiter, __decorate, __param } from "tslib";
-import { FORCE_HTTP, GENESIS_SOCKET_URL } from '@genesislcap/foundation-utils';
-import { observable } from '@microsoft/fast-element';
+import { FORCE_HTTP } from '@genesislcap/foundation-utils';
+import { observable, volatile } from '@microsoft/fast-element';
 import { DI } from '@microsoft/fast-foundation';
 import { scan } from 'rxjs';
 import { MetaCache } from '../metadata';
@@ -8,7 +8,7 @@ import { logger } from '../utils';
 import { ConnectEventsEmitter } from './connect.events';
 import { ConnectConfig } from './connect.types';
 import { HttpConnect } from './http.connect';
-import { EventMessageType, MessageBuilder, } from './message';
+import { EventMessageType, MessageBuilder } from './message';
 import { Socket } from './socket';
 import { updateState } from './updateState';
 /**
@@ -26,9 +26,6 @@ let DefaultConnect = class DefaultConnect {
         var _a;
         return (_a = this.socket.isConnectedSubject) === null || _a === void 0 ? void 0 : _a.asObservable();
     }
-    get host() {
-        return this.socket.host;
-    }
     constructor(socket, messageBuilder, metaCache, events, config) {
         this.socket = socket;
         this.messageBuilder = messageBuilder;
@@ -49,9 +46,14 @@ let DefaultConnect = class DefaultConnect {
     send(message, needsHandling) {
         return this.socket.send(message, needsHandling);
     }
-    connect(host = GENESIS_SOCKET_URL) {
+    connect(host) {
         return __awaiter(this, void 0, void 0, function* () {
             this.socket.reset();
+            if (!this.config.isWebSocketExpression.test(host)) {
+                logger.error(`Specified host (${host}) is not valid WebSocket url. Connection will not proceed.`);
+                logger.warn(`Make sure the host url starts with wss:// or ws://`);
+                return;
+            }
             return this.socket.connect(host, this.config.connect, this.config.reconnect);
         });
     }
@@ -184,11 +186,9 @@ let DefaultConnect = class DefaultConnect {
         return this.socket.send(requestMessage);
     }
     getAvailableResources(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const requestMessage = this.messageBuilder.createResourcesMessage(params);
-            logger.debug(`${requestMessage.MESSAGE_TYPE} (resources) message created -> `, requestMessage);
-            return this.socket.send(requestMessage);
-        });
+        const requestMessage = this.messageBuilder.createResourcesMessage(params);
+        logger.debug(`${requestMessage.MESSAGE_TYPE} (resources) message created -> `, requestMessage);
+        return this.socket.send(requestMessage);
     }
     commitEvent(eventName, params) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -203,6 +203,9 @@ let DefaultConnect = class DefaultConnect {
 __decorate([
     observable
 ], DefaultConnect.prototype, "isWorking", void 0);
+__decorate([
+    volatile
+], DefaultConnect.prototype, "isConnected", null);
 DefaultConnect = __decorate([
     __param(0, Socket),
     __param(1, MessageBuilder),

package/dist/esm/connect/http.connect.js

@@ -192,11 +192,9 @@ let DefaultHttpConnect = class DefaultHttpConnect {
         return this.send(requestMessage);
     }
     getAvailableResources(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const requestMessage = this.messageBuilder.createResourcesMessage(params);
-            logger.debug(`HTTP MODE! - ${requestMessage.MESSAGE_TYPE} (getResources) message created -> `, requestMessage);
-            return this.send(requestMessage);
-        });
+        const requestMessage = this.messageBuilder.createResourcesMessage(params);
+        logger.debug(`HTTP MODE! - ${requestMessage.MESSAGE_TYPE} (getResources) message created -> `, requestMessage);
+        return this.send(requestMessage);
     }
     commitEvent(eventName, params) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/esm/connect/message.js

@@ -39,8 +39,6 @@ export var EventMessageType;
     EventMessageType["META_REQUEST"] = "META_REQUEST";
     EventMessageType["JSON_SCHEMA_REQUEST"] = "JSON_SCHEMA_REQUEST";
     EventMessageType["RESOURCES_REQUEST"] = "RESOURCES_REQUEST";
-    EventMessageType["RESOURCES_REQUEST_ACK"] = "RESOURCES_REQUEST_ACK";
-    EventMessageType["RESOURCES_REQUEST_NACK"] = "RESOURCES_REQUEST_NACK";
     EventMessageType["EVENT_CHANGE_USER_PASSWORD"] = "EVENT_CHANGE_USER_PASSWORD";
     EventMessageType["EVENT_SELF_SERVICE_PASSWORD_RESET"] = "EVENT_SELF_SERVICE_PASSWORD_RESET";
     EventMessageType["EVENT_PASSWORD_RESET_ACTION"] = "EVENT_PASSWORD_RESET_ACTION";

package/dist/esm/connect/socket.js

@@ -1,6 +1,6 @@
 import { __awaiter, __decorate, __param } from "tslib";
 import { User } from '@genesislcap/foundation-user';
-import { GENESIS_SOCKET_URL, JSONSerializer, UUID } from '@genesislcap/foundation-utils';
+import { JSONSerializer, UUID } from '@genesislcap/foundation-utils';
 import { DOM, observable } from '@microsoft/fast-element';
 import { DI } from '@microsoft/fast-foundation';
 import { Observable, of, Subject, Subscription, takeUntil, throwError } from 'rxjs';
@@ -8,7 +8,6 @@ import { filter, mergeMap, switchMap, takeWhile } from 'rxjs/operators';
 import { WebSocketSubject } from 'rxjs/webSocket';
 import { Session } from '../session';
 import { logger } from '../utils';
-import { ConnectConfig } from './connect.types';
 import { EventMessageType, MessageBuilder, MessageType, } from './message';
 import { exponentialScheduler, linearScheduler, MAX_RECONNECT_ATTEMPTS, retryInterval, SocketReconnectStrategy, } from './reconnectStrategy';
 import { SocketStatus } from './socket.status';
@@ -112,22 +111,17 @@ let DefaultSocket = class DefaultSocket {
     set hasValidSession(value) {
         logger.deprecated('set hasValidSession', 'Please refrain from calling this API as this state is managed internally.', '15.0.0');
     }
-    get host() {
-        var _a;
-        return (_a = this.url) !== null && _a !== void 0 ? _a : GENESIS_SOCKET_URL;
-    }
     constructor(messageBuilder, session, serializer, uuid, status, 
     /**
      * Temp putting the user in place to bridge the hasValidSession logic.
      */
-    user, config) {
+    user) {
         this.messageBuilder = messageBuilder;
         this.session = session;
         this.serializer = serializer;
         this.uuid = uuid;
         this.status = status;
         this.user = user;
-        this.config = config;
         this.defaultInterval = 10000;
         this.secondsMultiplier = 1000;
         this.heartbeatIsEnabled = true;
@@ -142,16 +136,10 @@ let DefaultSocket = class DefaultSocket {
         var _a, _b;
         return (_b = (_a = this.connectOptions) === null || _a === void 0 ? void 0 : _a.enableMessageLogging) !== null && _b !== void 0 ? _b : false;
     }
-    connect(host = GENESIS_SOCKET_URL, connectOptions, reconnectOptions) {
-        var _a;
+    connect(host, connectOptions, reconnectOptions) {
         this.url = host;
-        this.connectOptions = connectOptions !== null && connectOptions !== void 0 ? connectOptions : this.config.connect;
-        this.reconnectOptions = reconnectOptions !== null && reconnectOptions !== void 0 ? reconnectOptions : this.config.reconnect;
-        if (!((_a = this.config.isWebSocketExpression) === null || _a === void 0 ? void 0 : _a.test(this.host))) {
-            logger.error(`Specified host (${this.host}) is not valid WebSocket url. Connection will not proceed.`);
-            logger.warn(`Make sure the host url starts with wss:// or ws://`);
-            return;
-        }
+        this.connectOptions = connectOptions;
+        this.reconnectOptions = reconnectOptions;
         return new Promise((resolve) => {
             var _a, _b, _c, _d;
             logger.info(`${this.isReconnecting ? 'Reconnecting' : 'Connecting'} to ${this.url}`);
@@ -505,8 +493,7 @@ DefaultSocket = __decorate([
     __param(2, JSONSerializer),
     __param(3, UUID),
     __param(4, SocketStatus),
-    __param(5, User),
-    __param(6, ConnectConfig)
+    __param(5, User)
 ], DefaultSocket);
 export { DefaultSocket };
 /**

package/dist/esm/datasource/datasource.js

@@ -1,47 +1,51 @@
 import { __awaiter, __decorate, __param, __rest } from "tslib";
 import { observable } from '@microsoft/fast-element';
-import { DI } from '@microsoft/fast-foundation';
+import { DI, optional } from '@microsoft/fast-foundation';
 import { combineLatest, from, timer } from 'rxjs';
 import { switchMap, takeWhile } from 'rxjs/operators';
 import { Auth } from '../auth';
 import { Connect } from '../connect';
 import { extractFieldDefinitions, toFieldMetadata } from '../metadata/metadata.utils';
-import { GenesisResources } from '../resources';
 import { logger } from '../utils';
-import { DatasourceConfig } from './datasource.config';
-import { DatasourceStatusChanged, ResourceType } from './datasource.types';
+import { criteriaFiltersToFields } from './criteriaFiltersToFields';
+import { dataServerResultFilter } from './dataServerResultFilter';
+import { DatasourceConfig, DatasourceDefaults, ResourceType } from './datasource.types';
+/**
+ * The default configuration for the Datasource service.
+ * @public
+ */
+export const defaultDatasourceConfig = {
+    options: {
+        criteria: '',
+        isSnapshot: false,
+        maxRows: DatasourceDefaults.MAX_ROWS_250,
+        maxView: DatasourceDefaults.MAX_VIEW_1000,
+        pollingInterval: DatasourceDefaults.REQ_REP_POLLING_INTERVAL_MS,
+        movingView: false,
+        orderBy: '',
+        resourceName: '',
+        reverse: false,
+    },
+    criteriaToFields: criteriaFiltersToFields,
+    dataServerResultFilter: dataServerResultFilter,
+};
 /**
  * The default implementation for the Datasource interface.
  * @public
  */
 let DefaultDatasource = class DefaultDatasource {
-    /** {@inheritDoc Datasource.initialized} */
-    get initialized() {
-        var _a;
-        return !!((_a = this.status) === null || _a === void 0 ? void 0 : _a.isInitialized);
-    }
-    constructor(connect, auth, resources, config) {
+    constructor(connect, auth, config = defaultDatasourceConfig) {
         this.connect = connect;
         this.auth = auth;
-        this.resources = resources;
         this.config = config;
-        /** {@inheritDoc DatasourceMetadata.fetchMetadataRequired} */
-        this.fetchMetadataRequired = true;
-        /** {@inheritDoc DatasourceMetadata.originalFieldDef} */
+        this.initialized = false;
+        this.readOnly = true;
         this.originalFieldDef = [];
-        /** {@inheritDoc DatasourceMetadata.fieldMetadata} */
-        this.fieldMetadata = [];
-        /** {@inheritDoc DatasourceMetadata.requestFields} */
         this.requestFields = [];
-        /** {@inheritDoc DatasourceMetadata.availableIndexes} */
+        this.fieldMetadata = [];
         this.availableIndexes = [];
-        this.readOnly = true;
     }
-    /**
-     * @deprecated - Please use {@link (GenesisResources:interface).isValidResource} instead.
-     */
     validResourceName(resourceName) {
-        logger.deprecated('Datasource.validResourceName', 'Use `GenesisResources.isValidResource` instead.');
         if (!resourceName)
             return false;
         if (!resourceName.trim().length)
@@ -49,46 +53,41 @@ let DefaultDatasource = class DefaultDatasource {
         // additional checks? regex? or maybe we can ask the server if it's a valid resource in the future
         return true;
     }
-    init(options, fetchMeta = this.fetchMetadataRequired) {
+    init(options, fetchMeta = true) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.fetchMetadataRequired = fetchMeta;
-            this.options = Object.assign(Object.assign({}, this.config.options), options);
-            const resourceName = this.options.resourceName;
-            const connected = this.connect.isConnected || (yield this.connect.connect());
-            if (!connected) {
-                logger.error(`Unable to connect to ${this.connect.host} to get ${resourceName} datasource`);
-                this.reportStatus();
-                return false;
-            }
-            const isValidResource = yield this.resources.isValidResource(resourceName);
-            if (!isValidResource) {
-                logger.error(`${resourceName} datasource does not exist on ${this.connect.host}`);
-                this.reportStatus();
+            if (!this.validResourceName(options === null || options === void 0 ? void 0 : options.resourceName)) {
                 return false;
             }
-            this.resourceType = yield this.resources.getResourceTypeFor(resourceName);
-            if (!this.resourceType) {
-                logger.error(`Unable to get the resource type for ${resourceName} datasource from ${this.connect.host}`);
-                this.reportStatus();
-                return false;
+            this.options = Object.assign(Object.assign({}, this.config.options), options);
+            const resourceName = this.options.resourceName;
+            if (fetchMeta) {
+                logger.debug(`Initializing ${resourceName} Datasource`);
+                const meta = yield this.connect
+                    .getMetadata(resourceName)
+                    .catch((e) => logger.error(`Metadata Fetch failed for ${resourceName}:`, e));
+                if (!meta) {
+                    this.deinit();
+                    return false;
+                }
+                this.resourceType = meta.TYPE;
+                this.availableIndexes = (_a = meta.INDEXES) !== null && _a !== void 0 ? _a : [];
+                this.originalFieldDef = extractFieldDefinitions(meta);
+                this.fieldMetadata = toFieldMetadata(this.originalFieldDef);
+                this.requestFields = meta.REQUEST_FIELD || [];
+                logger.debug(`Datasource for ${resourceName} is ready`);
             }
-            logger.debug(`Initializing ${resourceName} datasource from ${this.connect.host}`);
             if (!this.options.isSnapshot) {
-                this.stream = yield this.createStream();
-            }
-            if (this.fetchMetadataRequired) {
-                yield this.fetchAndApplyMetadata(this.options.resourceName);
+                this._stream = yield this.createStream();
             }
-            logger.debug(`${resourceName} datasource initialization ${this.initialized ? `success` : 'failed'}`);
-            this.reportStatus();
+            this.initialized = true;
             return this.initialized;
         });
     }
     deinit() {
         var _a;
         logger.debug('Datasource.deinit', (_a = this.options) === null || _a === void 0 ? void 0 : _a.resourceName);
-        this.status = undefined;
-        this.fetchMetadataRequired = undefined;
+        this.initialized = false;
         this.options = {};
         this.resourceType = undefined;
         this.availableIndexes = [];
@@ -101,11 +100,12 @@ let DefaultDatasource = class DefaultDatasource {
         var _a;
         logger.debug('Datasource.destroy', (_a = this.options) === null || _a === void 0 ? void 0 : _a.resourceName);
         this.deinit();
-        delete this.stream;
-        this.status = undefined;
+        delete this._stream;
+    }
+    get stream() {
+        return this._stream;
     }
     get params() {
-        var _a;
         const params = {
             CRITERIA_MATCH: this.options.criteria,
             FIELDS: this.options.fields,
@@ -118,7 +118,7 @@ let DefaultDatasource = class DefaultDatasource {
             REVERSE: this.options.reverse,
         };
         if (this.options.orderBy) {
-            if (((_a = this.availableIndexes) === null || _a === void 0 ? void 0 : _a.findIndex((i) => i.NAME === this.options.orderBy)) > -1) {
+            if (this.availableIndexes.findIndex((i) => i.NAME === this.options.orderBy) > -1) {
                 params.ORDER_BY = this.options.orderBy;
             }
             else {
@@ -192,95 +192,20 @@ let DefaultDatasource = class DefaultDatasource {
             switchMap(() => from(this.snapshot())));
         }));
     }
-    fetchAndApplyMetadata(resourceName) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                logger.debug(`Requesting metadata for ${this.options.resourceName} Datasource`);
-                const meta = yield this.connect.getMetadata(this.options.resourceName);
-                if (meta) {
-                    this.availableIndexes = (_a = meta.INDEXES) !== null && _a !== void 0 ? _a : [];
-                    this.originalFieldDef = extractFieldDefinitions(meta);
-                    this.fieldMetadata = toFieldMetadata(this.originalFieldDef);
-                    this.requestFields = meta.REQUEST_FIELD || [];
-                    this.fetchMetadataRequired = false;
-                }
-                this.status = this.normaliseStatus({
-                    isInitialized: true,
-                    metadataRequired: true,
-                    hasMetadata: ((_b = this.fieldMetadata) === null || _b === void 0 ? void 0 : _b.length) > 0,
-                });
-            }
-            catch (e) {
-                logger.error(`Metadata Fetch failed for ${resourceName}:`, e);
-                this.status = this.normaliseStatus({
-                    isInitialized: false,
-                    metadataRequired: true,
-                    hasMetadata: false,
-                });
-            }
-        });
-    }
-    /**
-     * @internal
-     */
-    reportStatus(detail = {}) {
-        var _a;
-        const eventEmitter = (_a = this.config.eventEmitter) !== null && _a !== void 0 ? _a : document;
-        this.status = this.normaliseStatus(detail);
-        logger.debug(`Dispatching '${DatasourceStatusChanged}'`, this.status);
-        eventEmitter === null || eventEmitter === void 0 ? void 0 : eventEmitter.dispatchEvent(new CustomEvent(DatasourceStatusChanged, {
-            detail: this.status,
-            bubbles: eventEmitter !== document,
-            composed: true,
-        }));
-    }
-    /**
-     * @internal
-     */
-    normaliseStatus(status) {
-        var _a, _b, _c, _d, _e;
-        const isInitialized = (_a = status.isInitialized) !== null && _a !== void 0 ? _a : this.initialized;
-        const metadataRequired = (_b = status.metadataRequired) !== null && _b !== void 0 ? _b : this.fetchMetadataRequired;
-        const hasMetadata = (_c = status.hasMetadata) !== null && _c !== void 0 ? _c : ((_d = this.fieldMetadata) === null || _d === void 0 ? void 0 : _d.length) > 0;
-        return {
-            name: (_e = this.options) === null || _e === void 0 ? void 0 : _e.resourceName,
-            type: this.resourceType,
-            isInitialized,
-            metadataRequired,
-            hasMetadata,
-        };
-    }
 };
 __decorate([
     observable
-], DefaultDatasource.prototype, "status", void 0);
-__decorate([
-    observable
-], DefaultDatasource.prototype, "fetchMetadataRequired", void 0);
-__decorate([
-    observable
-], DefaultDatasource.prototype, "originalFieldDef", void 0);
-__decorate([
-    observable
-], DefaultDatasource.prototype, "fieldMetadata", void 0);
-__decorate([
-    observable
-], DefaultDatasource.prototype, "requestFields", void 0);
-__decorate([
-    observable
-], DefaultDatasource.prototype, "availableIndexes", void 0);
+], DefaultDatasource.prototype, "initialized", void 0);
 __decorate([
     observable
 ], DefaultDatasource.prototype, "readOnly", void 0);
 __decorate([
     observable
-], DefaultDatasource.prototype, "stream", void 0);
+], DefaultDatasource.prototype, "_stream", void 0);
 DefaultDatasource = __decorate([
     __param(0, Connect),
     __param(1, Auth),
-    __param(2, GenesisResources),
-    __param(3, DatasourceConfig)
+    __param(2, optional(DatasourceConfig))
 ], DefaultDatasource);
 export { DefaultDatasource };
 /**

package/dist/esm/datasource/datasource.types.js

@@ -1,3 +1,4 @@
+import { DI } from '@microsoft/fast-foundation';
 /**
  * Types of Genesis resources.
  * @public
@@ -9,7 +10,22 @@ export var ResourceType;
     ResourceType["REQUEST_SERVER"] = "REQUEST_SERVER";
 })(ResourceType || (ResourceType = {}));
 /**
- * DatasourceStatusChanged.
+ * Default values for a DatasourceConfig
  * @public
  */
-export const DatasourceStatusChanged = 'datasource-status-changed';
+export class DatasourceDefaults {
+}
+DatasourceDefaults.MAX_ROWS_250 = 250;
+DatasourceDefaults.MAX_VIEW_1000 = 1000;
+DatasourceDefaults.REQ_REP_POLLING_INTERVAL_MS = 10000;
+DatasourceDefaults.DATASERVER_ROW_ID = 'ROW_REF';
+DatasourceDefaults.REQUEST_SERVER_ROW_ID = 'RECORD_ID';
+/**
+ * The DI token for the DatasourceConfig interface.
+ *
+ * @privateRemarks
+ * Marked as internal to stop api-extractor becoming confused cross-linking tokens with the same name.
+ *
+ * @internal
+ */
+export const DatasourceConfig = DI.createInterface();

package/dist/esm/datasource/entityDatasource.js

@@ -42,12 +42,6 @@ export class DefaultEntityDatasource extends DefaultDatasource {
             this.entityCache = [];
         };
     }
-    get initialized() {
-        return this._initialized;
-    }
-    set initialized(value) {
-        this._initialized = value;
-    }
     /** {@inheritDoc EntityDatasource.cache} */
     get cache() {
         if (!this.initialized) {

package/dist/esm/datasource/index.js

@@ -1,7 +1,5 @@
 export * from './criteriaFiltersToFields';
 export * from './dataServerResultFilter';
-export * from './datasource.config';
-export * from './datasource.mixins';
 export * from './datasource';
 export * from './datasource.types';
 export * from './entityDatasource';

package/dist/esm/index.js

@@ -5,7 +5,6 @@ export * from './credentialManager';
 export * from './datasource';
 export * from './metadata';
 export * from './networkMonitor';
-export * from './resources';
 export * from './session';
 export * from './storage';
 export * from './testing';

package/dist/esm/testing/mocks/auth/auth.js

@@ -1,5 +1,4 @@
 import { __awaiter, __decorate } from "tslib";
-import { DefaultUser } from '@genesislcap/foundation-user';
 import { observable } from '@microsoft/fast-element';
 /**
  * @internal
@@ -26,15 +25,6 @@ export class AuthMock {
             return Promise.resolve(this.nextReAuthResult);
         });
     }
-    setTestUser(properties = {}) {
-        this.currentUser = new DefaultUser();
-        this.currentUser.set(Object.assign({ userName: 'JaneDee', profile: ['USER'], permission: ['CreateRules'] }, properties));
-        this.isLoggedIn = true;
-    }
-    resetTestUser() {
-        this.currentUser = null;
-        this.isLoggedIn = false;
-    }
 }
 __decorate([
     observable

package/dist/esm/testing/mocks/connect/connect.js

@@ -1,4 +1,3 @@
-import { __awaiter } from "tslib";
 import { from } from 'rxjs';
 /**
  * @internal
@@ -8,9 +7,6 @@ export class ConnectMock {
         this.isConnected = true;
         this.isWorking = false;
     }
-    get host() {
-        return this.socket.host;
-    }
     get isConnectedSubject() {
         return this.socket.isConnectedSubject;
     }
@@ -31,7 +27,6 @@ export class ConnectMock {
         return Promise.resolve(this.nextMessage);
     }
     connect(host) {
-        this.socket.host = host;
         return Promise.resolve(this.isConnected);
     }
     disconnect() { }
@@ -43,10 +38,8 @@ export class ConnectMock {
         return Promise.resolve(this.nextMessage);
     }
     getAvailableResources(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.requestParams = params;
-            return Promise.resolve(this.nextMessage);
-        });
+        this.requestParams = params;
+        return Promise.resolve(this.nextMessage);
     }
     snapshot(resourceName, params) {
         return Promise.resolve(this.nextMessage);

package/dist/esm/testing/mocks/connect/socket.js

@@ -6,11 +6,9 @@ import { SocketSubject } from '../../../connect/socket';
 export class SocketMock {
     constructor() {
         this.isConnectedSubject = new BehaviorSubject(true);
-        this.host = 'mock-host';
         this.socketMessagesSubject = new SocketSubject();
     }
     connect(host, options, reconnectOptions) {
-        this.host = host;
         return Promise.resolve(true);
     }
     disconnect() { }