@cratis/arc 22.0.0 → 22.0.2

package/dist/cjs/queries/ObservableQueryFor.js

@@ -76,9 +76,7 @@ var QueryHttpRequest = require('./QueryHttpRequest.js');
             // Serve the failure through the connection rather than throwing, so a subscriber sees an invalid result
             // on its normal callback path instead of the empty result an unestablished connection would emit.
             this._connection = new NullObservableQueryConnection.NullObservableQueryConnection(this.defaultValue, QueryResult.QueryResult.validationFailed(clientValidationErrors, this));
-        } else if (!this.validateArguments(args)) {
-            this._connection = new NullObservableQueryConnection.NullObservableQueryConnection(this.defaultValue);
-        } else {
+        } else if (this.validateArguments(args)) {
             this._connection = ObservableQueryConnectionFactory.createObservableQueryConnection({
                 route: this.route,
                 queryName: this.queryName ?? this.constructor.name,
@@ -87,6 +85,8 @@ var QueryHttpRequest = require('./QueryHttpRequest.js');
                 microservice: this._microservice,
                 args: args
             });
+        } else {
+            this._connection = new NullObservableQueryConnection.NullObservableQueryConnection(this.defaultValue);
         }
         // Descriptor-backed instance properties provide defaults; fresh args passed to subscribe()
         // must take precedence over any stale instance property values. Spread parameterValues

package/dist/cjs/queries/ObservableQueryFor.js.map

@@ -1 +1 @@
-{"version":3,"file":"ObservableQueryFor.js","sources":["../../../queries/ObservableQueryFor.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\nimport { IObservableQueryFor, OnNextResult } from './IObservableQueryFor';\nimport { ObservableQuerySubscription } from './ObservableQuerySubscription';\nimport { ValidateRequestArguments } from './ValidateRequestArguments';\nimport { QueryValidator } from './QueryValidator';\nimport { IObservableQueryConnection } from './IObservableQueryConnection';\nimport { NullObservableQueryConnection } from './NullObservableQueryConnection';\nimport { createObservableQueryConnection } from './ObservableQueryConnectionFactory';\nimport { Constructor } from '@cratis/fundamentals';\nimport { deserializeQueryModel, deserializeQueryModels } from './deserializeQueryModel';\nimport { QueryResult } from './QueryResult';\nimport { Sorting } from './Sorting';\nimport { Paging } from './Paging';\nimport { SortDirection } from './SortDirection';\nimport { Globals } from '../Globals';\nimport { UrlHelpers } from '../UrlHelpers';\nimport { GetHttpHeaders } from '../GetHttpHeaders';\nimport { ParameterDescriptor } from '../reflection/ParameterDescriptor';\nimport { ParametersHelper } from '../reflection/ParametersHelper';\nimport { QueryHttpMethod } from './QueryHttpMethod';\nimport { executeQueryHttpRequest } from './QueryHttpRequest';\n\n/* eslint-disable @typescript-eslint/no-explicit-any */\n\n/**\n * Represents an implementation of {@link IQueryFor}.\n * @template TDataType Type of data returned by the query.\n */\nexport abstract class ObservableQueryFor<TDataType, TParameters = object> implements IObservableQueryFor<TDataType, TParameters> {\n    private _microservice: string;\n    private _apiBasePath: string;\n    private _origin: string;\n    private _connection?: IObservableQueryConnection<TDataType>;\n    private _httpHeadersCallback: GetHttpHeaders;\n    private _httpMethod?: QueryHttpMethod;\n\n    abstract readonly route: string;\n    abstract readonly defaultValue: TDataType;\n    readonly roles: string[] = [];\n    readonly validation?: QueryValidator<any>;\n    /** Backend fully-qualified query name used when subscribing via the SSE hub. Overridden in generated proxies. */\n    readonly queryName?: string;\n    abstract readonly parameterDescriptors: ParameterDescriptor[];\n    abstract get requiredRequestParameters(): string[];\n    sorting: Sorting;\n    paging: Paging;\n\n    /**\n     * Initializes a new instance of the {@link ObservableQueryFor<,>}} class.\n     * @param modelType Type of model, if an enumerable, this is the instance type.\n     * @param enumerable Whether or not it is an enumerable.\n     */\n    constructor(readonly modelType: Constructor, readonly enumerable: boolean) {\n        this.sorting = Sorting.none;\n        this.paging = Paging.noPaging;\n        this._microservice = Globals.microservice ?? '';\n        this._apiBasePath = Globals.apiBasePath ?? '';\n        this._origin = Globals.origin ?? '';\n        this._httpHeadersCallback = () => ({});\n    }\n\n    /**\n     * Disposes the query.\n     */\n    dispose() {\n        this._connection?.disconnect();\n    }\n\n    /** @inheritdoc */\n    setMicroservice(microservice: string) {\n        this._microservice = microservice;\n    }\n\n    /** @inheritdoc */\n    setApiBasePath(apiBasePath: string): void {\n        this._apiBasePath = apiBasePath;\n    }\n\n    /** @inheritdoc */\n    setOrigin(origin: string): void {\n        this._origin = origin;\n    }\n\n    /** @inheritdoc */\n    setHttpHeadersCallback(callback: GetHttpHeaders): void {\n        this._httpHeadersCallback = callback;\n    }\n\n    /** @inheritdoc */\n    setHttpMethod(method: QueryHttpMethod): void {\n        this._httpMethod = method;\n    }\n\n    /** @inheritdoc */\n    subscribe(callback: OnNextResult<QueryResult<TDataType>>, args?: TParameters): ObservableQuerySubscription<TDataType> {\n        if (this._connection) {\n            this._connection.disconnect();\n        }\n\n        const clientValidationErrors = this.validation?.validate(args as object || {}) || [];\n        if (clientValidationErrors.length > 0) {\n            // Serve the failure through the connection rather than throwing, so a subscriber sees an invalid result\n            // on its normal callback path instead of the empty result an unestablished connection would emit.\n            this._connection = new NullObservableQueryConnection(\n                this.defaultValue,\n                QueryResult.validationFailed(clientValidationErrors, this));\n        } else if (!this.validateArguments(args)) {\n            this._connection = new NullObservableQueryConnection(this.defaultValue);\n        } else {\n            this._connection = createObservableQueryConnection({\n                route: this.route,\n                queryName: this.queryName ?? this.constructor.name,\n                origin: this._origin,\n                apiBasePath: this._apiBasePath,\n                microservice: this._microservice,\n                args: args as object,\n            });\n        }\n\n        // Descriptor-backed instance properties provide defaults; fresh args passed to subscribe()\n        // must take precedence over any stale instance property values. Spread parameterValues\n        // first so that the caller-supplied args can override them.\n        //\n        // In direct mode the route arguments are already embedded in the URL path, so only\n        // the unused (non-route) parameters are appended as additional query arguments.\n        // In multiplexed mode ALL arguments — including route-derived ones — must be included\n        // in the subscribe payload so the server can execute the query correctly.\n        const parameterValues = ParametersHelper.collectParameterValues(this);\n        const { unusedParameters } = UrlHelpers.replaceRouteParameters(this.route, args as object);\n        const connectionQueryArguments: any = {\n            ...parameterValues,\n            ...(Globals.queryDirectMode ? unusedParameters : (args as object) || {}),\n            ...this.buildQueryArguments()\n        };\n\n        const subscriber = new ObservableQuerySubscription(this._connection);\n        this._connection.connect(data => {\n            const result: any = data;\n            try {\n                this.deserializeResult(result);\n                callback(result);\n            } catch (ex) {\n                console.log(ex);\n            }\n        }, connectionQueryArguments);\n        return subscriber;\n    }\n\n    /** @inheritdoc */\n    async perform(args?: TParameters): Promise<QueryResult<TDataType>> {\n        const noSuccess = { ...QueryResult.noSuccess, ...{ data: this.defaultValue } } as QueryResult<TDataType>;\n\n        const clientValidationErrors = this.validation?.validate(args as object || {}) || [];\n        if (clientValidationErrors.length > 0) {\n            return QueryResult.validationFailed(clientValidationErrors, this);\n        }\n\n        if (!this.validateArguments(args)) {\n            return new Promise<QueryResult<TDataType>>((resolve) => {\n                resolve(noSuccess);\n            });\n        }\n\n        // Collect parameter values from parameterDescriptors that are set\n        const parameterValues = ParametersHelper.collectParameterValues(this);\n\n        const headers = {\n            ...(this._httpHeadersCallback?.() || {}),\n            'Accept': 'application/json',\n            'Content-Type': 'application/json'\n        };\n\n        if (this._microservice?.length > 0) {\n            headers[Globals.microserviceHttpHeader] = this._microservice;\n        }\n\n        const response = await executeQueryHttpRequest(this._httpMethod, {\n            route: this.route,\n            apiBasePath: this._apiBasePath,\n            origin: this._origin,\n            args: (args as object) ?? {},\n            parameterValues,\n            paging: this.paging,\n            sorting: this.sorting,\n            headers\n        });\n\n        try {\n            const result = await response.json();\n            return new QueryResult(result, this.modelType, this.enumerable);\n        } catch {\n            return noSuccess;\n        }\n    }\n\n    private validateArguments(args?: TParameters): boolean {\n        const parameterValues = ParametersHelper.collectParameterValues(this);\n        const combinedArgs = { ...(args as object || {}), ...parameterValues };\n        return ValidateRequestArguments(this.constructor.name, this.requiredRequestParameters, combinedArgs as object);\n    }\n\n    private buildQueryArguments(): any {\n        const queryArguments: any = {};\n\n        if (this.paging && this.paging.pageSize > 0) {\n            queryArguments.pageSize = this.paging.pageSize;\n            queryArguments.page = this.paging.page;\n        }\n\n        if (this.sorting.hasSorting) {\n            queryArguments.sortBy = this.sorting.field;\n            queryArguments.sortDirection = (this.sorting.direction === SortDirection.descending) ? 'desc' : 'asc';\n        }\n\n        return queryArguments;\n    }\n\n    private deserializeResult(result: any): void {\n        if (this.enumerable) {\n            result.data = deserializeQueryModels(this.modelType, result.data);\n        } else if (result.data) {\n            result.data = deserializeQueryModel(this.modelType, result.data);\n        }\n    }\n}\n"],"names":["ObservableQueryFor","_microservice","_apiBasePath","_origin","_connection","_httpHeadersCallback","_httpMethod","roles","validation","queryName","sorting","paging","enumerable","modelType","Sorting","none","Paging","noPaging","Globals","microservice","apiBasePath","origin","dispose","disconnect","setMicroservice","setApiBasePath","setOrigin","setHttpHeadersCallback","callback","setHttpMethod","method","subscribe","args","clientValidationErrors","validate","length","NullObservableQueryConnection","defaultValue","QueryResult","validationFailed","validateArguments","createObservableQueryConnection","route","name","parameterValues","ParametersHelper","collectParameterValues","unusedParameters","UrlHelpers","replaceRouteParameters","connectionQueryArguments","queryDirectMode","buildQueryArguments","subscriber","ObservableQuerySubscription","connect","data","result","deserializeResult","ex","console","log","perform","noSuccess","Promise","resolve","headers","microserviceHttpHeader","response","executeQueryHttpRequest","json","combinedArgs","ValidateRequestArguments","requiredRequestParameters","queryArguments","pageSize","page","hasSorting","sortBy","field","sortDirection","direction","SortDirection","descending","deserializeQueryModels","deserializeQueryModel"],"mappings":"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"}
+{"version":3,"file":"ObservableQueryFor.js","sources":["../../../queries/ObservableQueryFor.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\nimport type { IObservableQueryFor, OnNextResult } from './IObservableQueryFor';\nimport { ObservableQuerySubscription } from './ObservableQuerySubscription';\nimport { ValidateRequestArguments } from './ValidateRequestArguments';\nimport type { QueryValidator } from './QueryValidator';\nimport type { IObservableQueryConnection } from './IObservableQueryConnection';\nimport { NullObservableQueryConnection } from './NullObservableQueryConnection';\nimport { createObservableQueryConnection } from './ObservableQueryConnectionFactory';\nimport type { Constructor } from '@cratis/fundamentals';\nimport { deserializeQueryModel, deserializeQueryModels } from './deserializeQueryModel';\nimport { QueryResult } from './QueryResult';\nimport { Sorting } from './Sorting';\nimport { Paging } from './Paging';\nimport { SortDirection } from './SortDirection';\nimport { Globals } from '../Globals';\nimport { UrlHelpers } from '../UrlHelpers';\nimport type { GetHttpHeaders } from '../GetHttpHeaders';\nimport type { ParameterDescriptor } from '../reflection/ParameterDescriptor';\nimport { ParametersHelper } from '../reflection/ParametersHelper';\nimport type { QueryHttpMethod } from './QueryHttpMethod';\nimport { executeQueryHttpRequest } from './QueryHttpRequest';\n\n/* eslint-disable @typescript-eslint/no-explicit-any */\n\n/**\n * Represents an implementation of {@link IQueryFor}.\n * @template TDataType Type of data returned by the query.\n */\nexport abstract class ObservableQueryFor<TDataType, TParameters = object> implements IObservableQueryFor<TDataType, TParameters> {\n    private _microservice: string;\n    private _apiBasePath: string;\n    private _origin: string;\n    private _connection?: IObservableQueryConnection<TDataType>;\n    private _httpHeadersCallback: GetHttpHeaders;\n    private _httpMethod?: QueryHttpMethod;\n\n    abstract readonly route: string;\n    abstract readonly defaultValue: TDataType;\n    readonly roles: string[] = [];\n    readonly validation?: QueryValidator<any>;\n    /** Backend fully-qualified query name used when subscribing via the SSE hub. Overridden in generated proxies. */\n    readonly queryName?: string;\n    abstract readonly parameterDescriptors: ParameterDescriptor[];\n    abstract get requiredRequestParameters(): string[];\n    sorting: Sorting;\n    paging: Paging;\n\n    /**\n     * Initializes a new instance of the {@link ObservableQueryFor<,>}} class.\n     * @param modelType Type of model, if an enumerable, this is the instance type.\n     * @param enumerable Whether or not it is an enumerable.\n     */\n    constructor(readonly modelType: Constructor, readonly enumerable: boolean) {\n        this.sorting = Sorting.none;\n        this.paging = Paging.noPaging;\n        this._microservice = Globals.microservice ?? '';\n        this._apiBasePath = Globals.apiBasePath ?? '';\n        this._origin = Globals.origin ?? '';\n        this._httpHeadersCallback = () => ({});\n    }\n\n    /**\n     * Disposes the query.\n     */\n    dispose() {\n        this._connection?.disconnect();\n    }\n\n    /** @inheritdoc */\n    setMicroservice(microservice: string) {\n        this._microservice = microservice;\n    }\n\n    /** @inheritdoc */\n    setApiBasePath(apiBasePath: string): void {\n        this._apiBasePath = apiBasePath;\n    }\n\n    /** @inheritdoc */\n    setOrigin(origin: string): void {\n        this._origin = origin;\n    }\n\n    /** @inheritdoc */\n    setHttpHeadersCallback(callback: GetHttpHeaders): void {\n        this._httpHeadersCallback = callback;\n    }\n\n    /** @inheritdoc */\n    setHttpMethod(method: QueryHttpMethod): void {\n        this._httpMethod = method;\n    }\n\n    /** @inheritdoc */\n    subscribe(callback: OnNextResult<QueryResult<TDataType>>, args?: TParameters): ObservableQuerySubscription<TDataType> {\n        if (this._connection) {\n            this._connection.disconnect();\n        }\n\n        const clientValidationErrors = this.validation?.validate(args as object || {}) || [];\n        if (clientValidationErrors.length > 0) {\n            // Serve the failure through the connection rather than throwing, so a subscriber sees an invalid result\n            // on its normal callback path instead of the empty result an unestablished connection would emit.\n            this._connection = new NullObservableQueryConnection(\n                this.defaultValue,\n                QueryResult.validationFailed(clientValidationErrors, this));\n        } else if (this.validateArguments(args)) {\n            this._connection = createObservableQueryConnection({\n                route: this.route,\n                queryName: this.queryName ?? this.constructor.name,\n                origin: this._origin,\n                apiBasePath: this._apiBasePath,\n                microservice: this._microservice,\n                args: args as object,\n            });\n        } else {\n            this._connection = new NullObservableQueryConnection(this.defaultValue);\n        }\n\n        // Descriptor-backed instance properties provide defaults; fresh args passed to subscribe()\n        // must take precedence over any stale instance property values. Spread parameterValues\n        // first so that the caller-supplied args can override them.\n        //\n        // In direct mode the route arguments are already embedded in the URL path, so only\n        // the unused (non-route) parameters are appended as additional query arguments.\n        // In multiplexed mode ALL arguments — including route-derived ones — must be included\n        // in the subscribe payload so the server can execute the query correctly.\n        const parameterValues = ParametersHelper.collectParameterValues(this);\n        const { unusedParameters } = UrlHelpers.replaceRouteParameters(this.route, args as object);\n        const connectionQueryArguments: any = {\n            ...parameterValues,\n            ...(Globals.queryDirectMode ? unusedParameters : (args as object) || {}),\n            ...this.buildQueryArguments()\n        };\n\n        const subscriber = new ObservableQuerySubscription(this._connection);\n        this._connection.connect(data => {\n            const result: any = data;\n            try {\n                this.deserializeResult(result);\n                callback(result);\n            } catch (ex) {\n                console.log(ex);\n            }\n        }, connectionQueryArguments);\n        return subscriber;\n    }\n\n    /** @inheritdoc */\n    async perform(args?: TParameters): Promise<QueryResult<TDataType>> {\n        const noSuccess = { ...QueryResult.noSuccess, ...{ data: this.defaultValue } } as QueryResult<TDataType>;\n\n        const clientValidationErrors = this.validation?.validate(args as object || {}) || [];\n        if (clientValidationErrors.length > 0) {\n            return QueryResult.validationFailed(clientValidationErrors, this);\n        }\n\n        if (!this.validateArguments(args)) {\n            return new Promise<QueryResult<TDataType>>((resolve) => {\n                resolve(noSuccess);\n            });\n        }\n\n        // Collect parameter values from parameterDescriptors that are set\n        const parameterValues = ParametersHelper.collectParameterValues(this);\n\n        const headers = {\n            ...(this._httpHeadersCallback?.() || {}),\n            'Accept': 'application/json',\n            'Content-Type': 'application/json'\n        };\n\n        if (this._microservice?.length > 0) {\n            headers[Globals.microserviceHttpHeader] = this._microservice;\n        }\n\n        const response = await executeQueryHttpRequest(this._httpMethod, {\n            route: this.route,\n            apiBasePath: this._apiBasePath,\n            origin: this._origin,\n            args: (args as object) ?? {},\n            parameterValues,\n            paging: this.paging,\n            sorting: this.sorting,\n            headers\n        });\n\n        try {\n            const result = await response.json();\n            return new QueryResult(result, this.modelType, this.enumerable);\n        } catch {\n            return noSuccess;\n        }\n    }\n\n    private validateArguments(args?: TParameters): boolean {\n        const parameterValues = ParametersHelper.collectParameterValues(this);\n        const combinedArgs = { ...(args as object || {}), ...parameterValues };\n        return ValidateRequestArguments(this.constructor.name, this.requiredRequestParameters, combinedArgs as object);\n    }\n\n    private buildQueryArguments(): any {\n        const queryArguments: any = {};\n\n        if (this.paging && this.paging.pageSize > 0) {\n            queryArguments.pageSize = this.paging.pageSize;\n            queryArguments.page = this.paging.page;\n        }\n\n        if (this.sorting.hasSorting) {\n            queryArguments.sortBy = this.sorting.field;\n            queryArguments.sortDirection = (this.sorting.direction === SortDirection.descending) ? 'desc' : 'asc';\n        }\n\n        return queryArguments;\n    }\n\n    private deserializeResult(result: any): void {\n        if (this.enumerable) {\n            result.data = deserializeQueryModels(this.modelType, result.data);\n        } else if (result.data) {\n            result.data = deserializeQueryModel(this.modelType, result.data);\n        }\n    }\n}\n"],"names":["ObservableQueryFor","_microservice","_apiBasePath","_origin","_connection","_httpHeadersCallback","_httpMethod","roles","validation","queryName","sorting","paging","enumerable","modelType","Sorting","none","Paging","noPaging","Globals","microservice","apiBasePath","origin","dispose","disconnect","setMicroservice","setApiBasePath","setOrigin","setHttpHeadersCallback","callback","setHttpMethod","method","subscribe","args","clientValidationErrors","validate","length","NullObservableQueryConnection","defaultValue","QueryResult","validationFailed","validateArguments","createObservableQueryConnection","route","name","parameterValues","ParametersHelper","collectParameterValues","unusedParameters","UrlHelpers","replaceRouteParameters","connectionQueryArguments","queryDirectMode","buildQueryArguments","subscriber","ObservableQuerySubscription","connect","data","result","deserializeResult","ex","console","log","perform","noSuccess","Promise","resolve","headers","microserviceHttpHeader","response","executeQueryHttpRequest","json","combinedArgs","ValidateRequestArguments","requiredRequestParameters","queryArguments","pageSize","page","hasSorting","sortBy","field","sortDirection","direction","SortDirection","descending","deserializeQueryModels","deserializeQueryModel"],"mappings":"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"}

package/dist/esm/queries/ObservableQueryFor.d.ts

@@ -1,13 +1,13 @@
-import { IObservableQueryFor, OnNextResult } from './IObservableQueryFor';
+import type { IObservableQueryFor, OnNextResult } from './IObservableQueryFor';
 import { ObservableQuerySubscription } from './ObservableQuerySubscription';
-import { QueryValidator } from './QueryValidator';
-import { Constructor } from '@cratis/fundamentals';
+import type { QueryValidator } from './QueryValidator';
+import type { Constructor } from '@cratis/fundamentals';
 import { QueryResult } from './QueryResult';
 import { Sorting } from './Sorting';
 import { Paging } from './Paging';
-import { GetHttpHeaders } from '../GetHttpHeaders';
-import { ParameterDescriptor } from '../reflection/ParameterDescriptor';
-import { QueryHttpMethod } from './QueryHttpMethod';
+import type { GetHttpHeaders } from '../GetHttpHeaders';
+import type { ParameterDescriptor } from '../reflection/ParameterDescriptor';
+import type { QueryHttpMethod } from './QueryHttpMethod';
 export declare abstract class ObservableQueryFor<TDataType, TParameters = object> implements IObservableQueryFor<TDataType, TParameters> {
     readonly modelType: Constructor;
     readonly enumerable: boolean;

package/dist/esm/queries/ObservableQueryFor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObservableQueryFor.d.ts","sourceRoot":"","sources":["../../../queries/ObservableQueryFor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AASpD,8BAAsB,kBAAkB,CAAC,SAAS,EAAE,WAAW,GAAG,MAAM,CAAE,YAAW,mBAAmB,CAAC,SAAS,EAAE,WAAW,CAAC;IAwBhH,QAAQ,CAAC,SAAS,EAAE,WAAW;IAAE,QAAQ,CAAC,UAAU,EAAE,OAAO;IAvBzE,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAAC,CAAwC;IAC5D,OAAO,CAAC,oBAAoB,CAAiB;IAC7C,OAAO,CAAC,WAAW,CAAC,CAAkB;IAEtC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC;IAC1C,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAM;IAC9B,QAAQ,CAAC,UAAU,CAAC,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAE1C,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC9D,QAAQ,KAAK,yBAAyB,IAAI,MAAM,EAAE,CAAC;IACnD,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IAOf,YAAqB,SAAS,EAAE,WAAW,EAAW,UAAU,EAAE,OAAO,EAOxE;IAKD,OAAO,SAEN;IAGD,eAAe,CAAC,YAAY,EAAE,MAAM,QAEnC;IAGD,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAExC;IAGD,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAE9B;IAGD,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAErD;IAGD,aAAa,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAE3C;IAGD,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,2BAA2B,CAAC,SAAS,CAAC,CAoDpH;IAGK,OAAO,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CA4CjE;IAED,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,iBAAiB;CAO5B"}
+{"version":3,"file":"ObservableQueryFor.d.ts","sourceRoot":"","sources":["../../../queries/ObservableQueryFor.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AASzD,8BAAsB,kBAAkB,CAAC,SAAS,EAAE,WAAW,GAAG,MAAM,CAAE,YAAW,mBAAmB,CAAC,SAAS,EAAE,WAAW,CAAC;IAwBhH,QAAQ,CAAC,SAAS,EAAE,WAAW;IAAE,QAAQ,CAAC,UAAU,EAAE,OAAO;IAvBzE,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAAC,CAAwC;IAC5D,OAAO,CAAC,oBAAoB,CAAiB;IAC7C,OAAO,CAAC,WAAW,CAAC,CAAkB;IAEtC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC;IAC1C,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAM;IAC9B,QAAQ,CAAC,UAAU,CAAC,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAE1C,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC9D,QAAQ,KAAK,yBAAyB,IAAI,MAAM,EAAE,CAAC;IACnD,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IAOf,YAAqB,SAAS,EAAE,WAAW,EAAW,UAAU,EAAE,OAAO,EAOxE;IAKD,OAAO,SAEN;IAGD,eAAe,CAAC,YAAY,EAAE,MAAM,QAEnC;IAGD,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAExC;IAGD,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAE9B;IAGD,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAErD;IAGD,aAAa,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAE3C;IAGD,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,2BAA2B,CAAC,SAAS,CAAC,CAoDpH;IAGK,OAAO,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CA4CjE;IAED,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,iBAAiB;CAO5B"}

package/dist/esm/queries/ObservableQueryFor.js

@@ -74,9 +74,7 @@ import { executeQueryHttpRequest } from './QueryHttpRequest.js';
             // Serve the failure through the connection rather than throwing, so a subscriber sees an invalid result
             // on its normal callback path instead of the empty result an unestablished connection would emit.
             this._connection = new NullObservableQueryConnection(this.defaultValue, QueryResult.validationFailed(clientValidationErrors, this));
-        } else if (!this.validateArguments(args)) {
-            this._connection = new NullObservableQueryConnection(this.defaultValue);
-        } else {
+        } else if (this.validateArguments(args)) {
             this._connection = createObservableQueryConnection({
                 route: this.route,
                 queryName: this.queryName ?? this.constructor.name,
@@ -85,6 +83,8 @@ import { executeQueryHttpRequest } from './QueryHttpRequest.js';
                 microservice: this._microservice,
                 args: args
             });
+        } else {
+            this._connection = new NullObservableQueryConnection(this.defaultValue);
         }
         // Descriptor-backed instance properties provide defaults; fresh args passed to subscribe()
         // must take precedence over any stale instance property values. Spread parameterValues

package/dist/esm/queries/ObservableQueryFor.js.map

@@ -1 +1 @@
-{"version":3,"file":"ObservableQueryFor.js","sources":["../../../queries/ObservableQueryFor.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\nimport { IObservableQueryFor, OnNextResult } from './IObservableQueryFor';\nimport { ObservableQuerySubscription } from './ObservableQuerySubscription';\nimport { ValidateRequestArguments } from './ValidateRequestArguments';\nimport { QueryValidator } from './QueryValidator';\nimport { IObservableQueryConnection } from './IObservableQueryConnection';\nimport { NullObservableQueryConnection } from './NullObservableQueryConnection';\nimport { createObservableQueryConnection } from './ObservableQueryConnectionFactory';\nimport { Constructor } from '@cratis/fundamentals';\nimport { deserializeQueryModel, deserializeQueryModels } from './deserializeQueryModel';\nimport { QueryResult } from './QueryResult';\nimport { Sorting } from './Sorting';\nimport { Paging } from './Paging';\nimport { SortDirection } from './SortDirection';\nimport { Globals } from '../Globals';\nimport { UrlHelpers } from '../UrlHelpers';\nimport { GetHttpHeaders } from '../GetHttpHeaders';\nimport { ParameterDescriptor } from '../reflection/ParameterDescriptor';\nimport { ParametersHelper } from '../reflection/ParametersHelper';\nimport { QueryHttpMethod } from './QueryHttpMethod';\nimport { executeQueryHttpRequest } from './QueryHttpRequest';\n\n/* eslint-disable @typescript-eslint/no-explicit-any */\n\n/**\n * Represents an implementation of {@link IQueryFor}.\n * @template TDataType Type of data returned by the query.\n */\nexport abstract class ObservableQueryFor<TDataType, TParameters = object> implements IObservableQueryFor<TDataType, TParameters> {\n    private _microservice: string;\n    private _apiBasePath: string;\n    private _origin: string;\n    private _connection?: IObservableQueryConnection<TDataType>;\n    private _httpHeadersCallback: GetHttpHeaders;\n    private _httpMethod?: QueryHttpMethod;\n\n    abstract readonly route: string;\n    abstract readonly defaultValue: TDataType;\n    readonly roles: string[] = [];\n    readonly validation?: QueryValidator<any>;\n    /** Backend fully-qualified query name used when subscribing via the SSE hub. Overridden in generated proxies. */\n    readonly queryName?: string;\n    abstract readonly parameterDescriptors: ParameterDescriptor[];\n    abstract get requiredRequestParameters(): string[];\n    sorting: Sorting;\n    paging: Paging;\n\n    /**\n     * Initializes a new instance of the {@link ObservableQueryFor<,>}} class.\n     * @param modelType Type of model, if an enumerable, this is the instance type.\n     * @param enumerable Whether or not it is an enumerable.\n     */\n    constructor(readonly modelType: Constructor, readonly enumerable: boolean) {\n        this.sorting = Sorting.none;\n        this.paging = Paging.noPaging;\n        this._microservice = Globals.microservice ?? '';\n        this._apiBasePath = Globals.apiBasePath ?? '';\n        this._origin = Globals.origin ?? '';\n        this._httpHeadersCallback = () => ({});\n    }\n\n    /**\n     * Disposes the query.\n     */\n    dispose() {\n        this._connection?.disconnect();\n    }\n\n    /** @inheritdoc */\n    setMicroservice(microservice: string) {\n        this._microservice = microservice;\n    }\n\n    /** @inheritdoc */\n    setApiBasePath(apiBasePath: string): void {\n        this._apiBasePath = apiBasePath;\n    }\n\n    /** @inheritdoc */\n    setOrigin(origin: string): void {\n        this._origin = origin;\n    }\n\n    /** @inheritdoc */\n    setHttpHeadersCallback(callback: GetHttpHeaders): void {\n        this._httpHeadersCallback = callback;\n    }\n\n    /** @inheritdoc */\n    setHttpMethod(method: QueryHttpMethod): void {\n        this._httpMethod = method;\n    }\n\n    /** @inheritdoc */\n    subscribe(callback: OnNextResult<QueryResult<TDataType>>, args?: TParameters): ObservableQuerySubscription<TDataType> {\n        if (this._connection) {\n            this._connection.disconnect();\n        }\n\n        const clientValidationErrors = this.validation?.validate(args as object || {}) || [];\n        if (clientValidationErrors.length > 0) {\n            // Serve the failure through the connection rather than throwing, so a subscriber sees an invalid result\n            // on its normal callback path instead of the empty result an unestablished connection would emit.\n            this._connection = new NullObservableQueryConnection(\n                this.defaultValue,\n                QueryResult.validationFailed(clientValidationErrors, this));\n        } else if (!this.validateArguments(args)) {\n            this._connection = new NullObservableQueryConnection(this.defaultValue);\n        } else {\n            this._connection = createObservableQueryConnection({\n                route: this.route,\n                queryName: this.queryName ?? this.constructor.name,\n                origin: this._origin,\n                apiBasePath: this._apiBasePath,\n                microservice: this._microservice,\n                args: args as object,\n            });\n        }\n\n        // Descriptor-backed instance properties provide defaults; fresh args passed to subscribe()\n        // must take precedence over any stale instance property values. Spread parameterValues\n        // first so that the caller-supplied args can override them.\n        //\n        // In direct mode the route arguments are already embedded in the URL path, so only\n        // the unused (non-route) parameters are appended as additional query arguments.\n        // In multiplexed mode ALL arguments — including route-derived ones — must be included\n        // in the subscribe payload so the server can execute the query correctly.\n        const parameterValues = ParametersHelper.collectParameterValues(this);\n        const { unusedParameters } = UrlHelpers.replaceRouteParameters(this.route, args as object);\n        const connectionQueryArguments: any = {\n            ...parameterValues,\n            ...(Globals.queryDirectMode ? unusedParameters : (args as object) || {}),\n            ...this.buildQueryArguments()\n        };\n\n        const subscriber = new ObservableQuerySubscription(this._connection);\n        this._connection.connect(data => {\n            const result: any = data;\n            try {\n                this.deserializeResult(result);\n                callback(result);\n            } catch (ex) {\n                console.log(ex);\n            }\n        }, connectionQueryArguments);\n        return subscriber;\n    }\n\n    /** @inheritdoc */\n    async perform(args?: TParameters): Promise<QueryResult<TDataType>> {\n        const noSuccess = { ...QueryResult.noSuccess, ...{ data: this.defaultValue } } as QueryResult<TDataType>;\n\n        const clientValidationErrors = this.validation?.validate(args as object || {}) || [];\n        if (clientValidationErrors.length > 0) {\n            return QueryResult.validationFailed(clientValidationErrors, this);\n        }\n\n        if (!this.validateArguments(args)) {\n            return new Promise<QueryResult<TDataType>>((resolve) => {\n                resolve(noSuccess);\n            });\n        }\n\n        // Collect parameter values from parameterDescriptors that are set\n        const parameterValues = ParametersHelper.collectParameterValues(this);\n\n        const headers = {\n            ...(this._httpHeadersCallback?.() || {}),\n            'Accept': 'application/json',\n            'Content-Type': 'application/json'\n        };\n\n        if (this._microservice?.length > 0) {\n            headers[Globals.microserviceHttpHeader] = this._microservice;\n        }\n\n        const response = await executeQueryHttpRequest(this._httpMethod, {\n            route: this.route,\n            apiBasePath: this._apiBasePath,\n            origin: this._origin,\n            args: (args as object) ?? {},\n            parameterValues,\n            paging: this.paging,\n            sorting: this.sorting,\n            headers\n        });\n\n        try {\n            const result = await response.json();\n            return new QueryResult(result, this.modelType, this.enumerable);\n        } catch {\n            return noSuccess;\n        }\n    }\n\n    private validateArguments(args?: TParameters): boolean {\n        const parameterValues = ParametersHelper.collectParameterValues(this);\n        const combinedArgs = { ...(args as object || {}), ...parameterValues };\n        return ValidateRequestArguments(this.constructor.name, this.requiredRequestParameters, combinedArgs as object);\n    }\n\n    private buildQueryArguments(): any {\n        const queryArguments: any = {};\n\n        if (this.paging && this.paging.pageSize > 0) {\n            queryArguments.pageSize = this.paging.pageSize;\n            queryArguments.page = this.paging.page;\n        }\n\n        if (this.sorting.hasSorting) {\n            queryArguments.sortBy = this.sorting.field;\n            queryArguments.sortDirection = (this.sorting.direction === SortDirection.descending) ? 'desc' : 'asc';\n        }\n\n        return queryArguments;\n    }\n\n    private deserializeResult(result: any): void {\n        if (this.enumerable) {\n            result.data = deserializeQueryModels(this.modelType, result.data);\n        } else if (result.data) {\n            result.data = deserializeQueryModel(this.modelType, result.data);\n        }\n    }\n}\n"],"names":["ObservableQueryFor","_microservice","_apiBasePath","_origin","_connection","_httpHeadersCallback","_httpMethod","roles","validation","queryName","sorting","paging","enumerable","modelType","Sorting","none","Paging","noPaging","Globals","microservice","apiBasePath","origin","dispose","disconnect","setMicroservice","setApiBasePath","setOrigin","setHttpHeadersCallback","callback","setHttpMethod","method","subscribe","args","clientValidationErrors","validate","length","NullObservableQueryConnection","defaultValue","QueryResult","validationFailed","validateArguments","createObservableQueryConnection","route","name","parameterValues","ParametersHelper","collectParameterValues","unusedParameters","UrlHelpers","replaceRouteParameters","connectionQueryArguments","queryDirectMode","buildQueryArguments","subscriber","ObservableQuerySubscription","connect","data","result","deserializeResult","ex","console","log","perform","noSuccess","Promise","resolve","headers","microserviceHttpHeader","response","executeQueryHttpRequest","json","combinedArgs","ValidateRequestArguments","requiredRequestParameters","queryArguments","pageSize","page","hasSorting","sortBy","field","sortDirection","direction","SortDirection","descending","deserializeQueryModels","deserializeQueryModel"],"mappings":"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"}
+{"version":3,"file":"ObservableQueryFor.js","sources":["../../../queries/ObservableQueryFor.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\nimport type { IObservableQueryFor, OnNextResult } from './IObservableQueryFor';\nimport { ObservableQuerySubscription } from './ObservableQuerySubscription';\nimport { ValidateRequestArguments } from './ValidateRequestArguments';\nimport type { QueryValidator } from './QueryValidator';\nimport type { IObservableQueryConnection } from './IObservableQueryConnection';\nimport { NullObservableQueryConnection } from './NullObservableQueryConnection';\nimport { createObservableQueryConnection } from './ObservableQueryConnectionFactory';\nimport type { Constructor } from '@cratis/fundamentals';\nimport { deserializeQueryModel, deserializeQueryModels } from './deserializeQueryModel';\nimport { QueryResult } from './QueryResult';\nimport { Sorting } from './Sorting';\nimport { Paging } from './Paging';\nimport { SortDirection } from './SortDirection';\nimport { Globals } from '../Globals';\nimport { UrlHelpers } from '../UrlHelpers';\nimport type { GetHttpHeaders } from '../GetHttpHeaders';\nimport type { ParameterDescriptor } from '../reflection/ParameterDescriptor';\nimport { ParametersHelper } from '../reflection/ParametersHelper';\nimport type { QueryHttpMethod } from './QueryHttpMethod';\nimport { executeQueryHttpRequest } from './QueryHttpRequest';\n\n/* eslint-disable @typescript-eslint/no-explicit-any */\n\n/**\n * Represents an implementation of {@link IQueryFor}.\n * @template TDataType Type of data returned by the query.\n */\nexport abstract class ObservableQueryFor<TDataType, TParameters = object> implements IObservableQueryFor<TDataType, TParameters> {\n    private _microservice: string;\n    private _apiBasePath: string;\n    private _origin: string;\n    private _connection?: IObservableQueryConnection<TDataType>;\n    private _httpHeadersCallback: GetHttpHeaders;\n    private _httpMethod?: QueryHttpMethod;\n\n    abstract readonly route: string;\n    abstract readonly defaultValue: TDataType;\n    readonly roles: string[] = [];\n    readonly validation?: QueryValidator<any>;\n    /** Backend fully-qualified query name used when subscribing via the SSE hub. Overridden in generated proxies. */\n    readonly queryName?: string;\n    abstract readonly parameterDescriptors: ParameterDescriptor[];\n    abstract get requiredRequestParameters(): string[];\n    sorting: Sorting;\n    paging: Paging;\n\n    /**\n     * Initializes a new instance of the {@link ObservableQueryFor<,>}} class.\n     * @param modelType Type of model, if an enumerable, this is the instance type.\n     * @param enumerable Whether or not it is an enumerable.\n     */\n    constructor(readonly modelType: Constructor, readonly enumerable: boolean) {\n        this.sorting = Sorting.none;\n        this.paging = Paging.noPaging;\n        this._microservice = Globals.microservice ?? '';\n        this._apiBasePath = Globals.apiBasePath ?? '';\n        this._origin = Globals.origin ?? '';\n        this._httpHeadersCallback = () => ({});\n    }\n\n    /**\n     * Disposes the query.\n     */\n    dispose() {\n        this._connection?.disconnect();\n    }\n\n    /** @inheritdoc */\n    setMicroservice(microservice: string) {\n        this._microservice = microservice;\n    }\n\n    /** @inheritdoc */\n    setApiBasePath(apiBasePath: string): void {\n        this._apiBasePath = apiBasePath;\n    }\n\n    /** @inheritdoc */\n    setOrigin(origin: string): void {\n        this._origin = origin;\n    }\n\n    /** @inheritdoc */\n    setHttpHeadersCallback(callback: GetHttpHeaders): void {\n        this._httpHeadersCallback = callback;\n    }\n\n    /** @inheritdoc */\n    setHttpMethod(method: QueryHttpMethod): void {\n        this._httpMethod = method;\n    }\n\n    /** @inheritdoc */\n    subscribe(callback: OnNextResult<QueryResult<TDataType>>, args?: TParameters): ObservableQuerySubscription<TDataType> {\n        if (this._connection) {\n            this._connection.disconnect();\n        }\n\n        const clientValidationErrors = this.validation?.validate(args as object || {}) || [];\n        if (clientValidationErrors.length > 0) {\n            // Serve the failure through the connection rather than throwing, so a subscriber sees an invalid result\n            // on its normal callback path instead of the empty result an unestablished connection would emit.\n            this._connection = new NullObservableQueryConnection(\n                this.defaultValue,\n                QueryResult.validationFailed(clientValidationErrors, this));\n        } else if (this.validateArguments(args)) {\n            this._connection = createObservableQueryConnection({\n                route: this.route,\n                queryName: this.queryName ?? this.constructor.name,\n                origin: this._origin,\n                apiBasePath: this._apiBasePath,\n                microservice: this._microservice,\n                args: args as object,\n            });\n        } else {\n            this._connection = new NullObservableQueryConnection(this.defaultValue);\n        }\n\n        // Descriptor-backed instance properties provide defaults; fresh args passed to subscribe()\n        // must take precedence over any stale instance property values. Spread parameterValues\n        // first so that the caller-supplied args can override them.\n        //\n        // In direct mode the route arguments are already embedded in the URL path, so only\n        // the unused (non-route) parameters are appended as additional query arguments.\n        // In multiplexed mode ALL arguments — including route-derived ones — must be included\n        // in the subscribe payload so the server can execute the query correctly.\n        const parameterValues = ParametersHelper.collectParameterValues(this);\n        const { unusedParameters } = UrlHelpers.replaceRouteParameters(this.route, args as object);\n        const connectionQueryArguments: any = {\n            ...parameterValues,\n            ...(Globals.queryDirectMode ? unusedParameters : (args as object) || {}),\n            ...this.buildQueryArguments()\n        };\n\n        const subscriber = new ObservableQuerySubscription(this._connection);\n        this._connection.connect(data => {\n            const result: any = data;\n            try {\n                this.deserializeResult(result);\n                callback(result);\n            } catch (ex) {\n                console.log(ex);\n            }\n        }, connectionQueryArguments);\n        return subscriber;\n    }\n\n    /** @inheritdoc */\n    async perform(args?: TParameters): Promise<QueryResult<TDataType>> {\n        const noSuccess = { ...QueryResult.noSuccess, ...{ data: this.defaultValue } } as QueryResult<TDataType>;\n\n        const clientValidationErrors = this.validation?.validate(args as object || {}) || [];\n        if (clientValidationErrors.length > 0) {\n            return QueryResult.validationFailed(clientValidationErrors, this);\n        }\n\n        if (!this.validateArguments(args)) {\n            return new Promise<QueryResult<TDataType>>((resolve) => {\n                resolve(noSuccess);\n            });\n        }\n\n        // Collect parameter values from parameterDescriptors that are set\n        const parameterValues = ParametersHelper.collectParameterValues(this);\n\n        const headers = {\n            ...(this._httpHeadersCallback?.() || {}),\n            'Accept': 'application/json',\n            'Content-Type': 'application/json'\n        };\n\n        if (this._microservice?.length > 0) {\n            headers[Globals.microserviceHttpHeader] = this._microservice;\n        }\n\n        const response = await executeQueryHttpRequest(this._httpMethod, {\n            route: this.route,\n            apiBasePath: this._apiBasePath,\n            origin: this._origin,\n            args: (args as object) ?? {},\n            parameterValues,\n            paging: this.paging,\n            sorting: this.sorting,\n            headers\n        });\n\n        try {\n            const result = await response.json();\n            return new QueryResult(result, this.modelType, this.enumerable);\n        } catch {\n            return noSuccess;\n        }\n    }\n\n    private validateArguments(args?: TParameters): boolean {\n        const parameterValues = ParametersHelper.collectParameterValues(this);\n        const combinedArgs = { ...(args as object || {}), ...parameterValues };\n        return ValidateRequestArguments(this.constructor.name, this.requiredRequestParameters, combinedArgs as object);\n    }\n\n    private buildQueryArguments(): any {\n        const queryArguments: any = {};\n\n        if (this.paging && this.paging.pageSize > 0) {\n            queryArguments.pageSize = this.paging.pageSize;\n            queryArguments.page = this.paging.page;\n        }\n\n        if (this.sorting.hasSorting) {\n            queryArguments.sortBy = this.sorting.field;\n            queryArguments.sortDirection = (this.sorting.direction === SortDirection.descending) ? 'desc' : 'asc';\n        }\n\n        return queryArguments;\n    }\n\n    private deserializeResult(result: any): void {\n        if (this.enumerable) {\n            result.data = deserializeQueryModels(this.modelType, result.data);\n        } else if (result.data) {\n            result.data = deserializeQueryModel(this.modelType, result.data);\n        }\n    }\n}\n"],"names":["ObservableQueryFor","_microservice","_apiBasePath","_origin","_connection","_httpHeadersCallback","_httpMethod","roles","validation","queryName","sorting","paging","enumerable","modelType","Sorting","none","Paging","noPaging","Globals","microservice","apiBasePath","origin","dispose","disconnect","setMicroservice","setApiBasePath","setOrigin","setHttpHeadersCallback","callback","setHttpMethod","method","subscribe","args","clientValidationErrors","validate","length","NullObservableQueryConnection","defaultValue","QueryResult","validationFailed","validateArguments","createObservableQueryConnection","route","name","parameterValues","ParametersHelper","collectParameterValues","unusedParameters","UrlHelpers","replaceRouteParameters","connectionQueryArguments","queryDirectMode","buildQueryArguments","subscriber","ObservableQuerySubscription","connect","data","result","deserializeResult","ex","console","log","perform","noSuccess","Promise","resolve","headers","microserviceHttpHeader","response","executeQueryHttpRequest","json","combinedArgs","ValidateRequestArguments","requiredRequestParameters","queryArguments","pageSize","page","hasSorting","sortBy","field","sortDirection","direction","SortDirection","descending","deserializeQueryModels","deserializeQueryModel"],"mappings":"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"}

package/dist/esm/queries/for_ObservableQueryFor/given/TestQueries.d.ts

@@ -1,4 +1,5 @@
 import { ObservableQueryFor } from '../../ObservableQueryFor';
+import { DateOnly, TimeOnly } from '@cratis/fundamentals';
 import { ParameterDescriptor } from '../../../reflection/ParameterDescriptor';
 export declare class TestObservableQuery extends ObservableQueryFor<string, {
     id: string;
@@ -18,6 +19,22 @@ export declare class TestEnumerableQuery extends ObservableQueryFor<string[], {
     get requiredRequestParameters(): string[];
     constructor();
 }
+export declare class TestCalendarChild {
+    date: DateOnly;
+    time: TimeOnly;
+}
+export declare class TestCalendarItem {
+    children: TestCalendarChild[];
+}
+export declare class TestCalendarEnumerableQuery extends ObservableQueryFor<TestCalendarItem[], {
+    category: string;
+}> {
+    readonly route = "/api/calendar-items/{category}";
+    readonly defaultValue: TestCalendarItem[];
+    readonly parameterDescriptors: ParameterDescriptor[];
+    get requiredRequestParameters(): string[];
+    constructor();
+}
 export declare class TestObservableQueryWithParameterDescriptorValues extends ObservableQueryFor<string, object> {
     readonly route = "/api/search";
     readonly defaultValue = "";

package/dist/esm/queries/for_ObservableQueryFor/given/TestQueries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TestQueries.d.ts","sourceRoot":"","sources":["../../../../../queries/for_ObservableQueryFor/given/TestQueries.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAE9E,qBAAa,mBAAoB,SAAQ,kBAAkB,CAAC,MAAM,EAAE;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;IAC/E,QAAQ,CAAC,KAAK,oBAAoB;IAClC,QAAQ,CAAC,YAAY,MAAM;IAC3B,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAElD;IAEF,IAAI,yBAAyB,IAAI,MAAM,EAAE,CAExC;IAED,cAEC;CACJ;AAED,qBAAa,mBAAoB,SAAQ,kBAAkB,CAAC,MAAM,EAAE,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;IACvF,QAAQ,CAAC,KAAK,2BAA2B;IACzC,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,CAAM;IACrC,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAElD;IAEF,IAAI,yBAAyB,IAAI,MAAM,EAAE,CAExC;IAED,cAEC;CACJ;AAED,qBAAa,gDAAiD,SAAQ,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC;IACpG,QAAQ,CAAC,KAAK,iBAAiB;IAC/B,QAAQ,CAAC,YAAY,MAAM;IAC3B,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAGlD;IAEF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,IAAI,yBAAyB,IAAI,MAAM,EAAE,CAExC;IAED,cAEC;CACJ;AAED,MAAM,WAAW,wCAAwC;IACrD,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,wCAAyC,SAAQ,kBAAkB,CAAC,MAAM,EAAE,wCAAwC,CAAC;IAC9H,QAAQ,CAAC,KAAK,qBAAqB;IACnC,QAAQ,CAAC,YAAY,MAAM;IAC3B,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAIlD;IAEF,IAAI,yBAAyB,IAAI,MAAM,EAAE,CAExC;IAED,cAEC;CACJ;AAED,MAAM,WAAW,0DAA0D;IACvE,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,iDAAkD,SAAQ,kBAAkB,CAAC,MAAM,EAAE,0DAA0D,CAAC;IACzJ,QAAQ,CAAC,KAAK,qCAAqC;IACnD,QAAQ,CAAC,YAAY,MAAM;IAC3B,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAGlD;IAEF,IAAI,yBAAyB,IAAI,MAAM,EAAE,CAExC;IAED,cAEC;CACJ"}
+{"version":3,"file":"TestQueries.d.ts","sourceRoot":"","sources":["../../../../../queries/for_ObservableQueryFor/given/TestQueries.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAe,QAAQ,EAAS,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAE9E,qBAAa,mBAAoB,SAAQ,kBAAkB,CAAC,MAAM,EAAE;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;IAC/E,QAAQ,CAAC,KAAK,oBAAoB;IAClC,QAAQ,CAAC,YAAY,MAAM;IAC3B,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAElD;IAEF,IAAI,yBAAyB,IAAI,MAAM,EAAE,CAExC;IAED,cAEC;CACJ;AAED,qBAAa,mBAAoB,SAAQ,kBAAkB,CAAC,MAAM,EAAE,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;IACvF,QAAQ,CAAC,KAAK,2BAA2B;IACzC,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,CAAM;IACrC,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAElD;IAEF,IAAI,yBAAyB,IAAI,MAAM,EAAE,CAExC;IAED,cAEC;CACJ;AAED,qBAAa,iBAAiB;IAE1B,IAAI,EAAG,QAAQ,CAAC;IAGhB,IAAI,EAAG,QAAQ,CAAC;CACnB;AAED,qBAAa,gBAAgB;IAEzB,QAAQ,EAAG,iBAAiB,EAAE,CAAC;CAClC;AAED,qBAAa,2BAA4B,SAAQ,kBAAkB,CAAC,gBAAgB,EAAE,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;IACzG,QAAQ,CAAC,KAAK,oCAAoC;IAClD,QAAQ,CAAC,YAAY,EAAE,gBAAgB,EAAE,CAAM;IAC/C,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAElD;IAEF,IAAI,yBAAyB,IAAI,MAAM,EAAE,CAExC;IAED,cAEC;CACJ;AAED,qBAAa,gDAAiD,SAAQ,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC;IACpG,QAAQ,CAAC,KAAK,iBAAiB;IAC/B,QAAQ,CAAC,YAAY,MAAM;IAC3B,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAGlD;IAEF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,IAAI,yBAAyB,IAAI,MAAM,EAAE,CAExC;IAED,cAEC;CACJ;AAED,MAAM,WAAW,wCAAwC;IACrD,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,wCAAyC,SAAQ,kBAAkB,CAAC,MAAM,EAAE,wCAAwC,CAAC;IAC9H,QAAQ,CAAC,KAAK,qBAAqB;IACnC,QAAQ,CAAC,YAAY,MAAM;IAC3B,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAIlD;IAEF,IAAI,yBAAyB,IAAI,MAAM,EAAE,CAExC;IAED,cAEC;CACJ;AAED,MAAM,WAAW,0DAA0D;IACvE,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,iDAAkD,SAAQ,kBAAkB,CAAC,MAAM,EAAE,0DAA0D,CAAC;IACzJ,QAAQ,CAAC,KAAK,qCAAqC;IACnD,QAAQ,CAAC,YAAY,MAAM;IAC3B,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAGlD;IAEF,IAAI,yBAAyB,IAAI,MAAM,EAAE,CAExC;IAED,cAEC;CACJ"}

package/dist/esm/queries/for_ObservableQueryFor/given/TestQueries.js

@@ -1,4 +1,6 @@
+import { __decorate, __metadata } from "tslib";
 import { ObservableQueryFor } from '../../ObservableQueryFor';
+import { DateOnly, field, TimeOnly } from '@cratis/fundamentals';
 import { ParameterDescriptor } from '../../../reflection/ParameterDescriptor';
 export class TestObservableQuery extends ObservableQueryFor {
     route = '/api/test/{id}';
@@ -26,6 +28,38 @@ export class TestEnumerableQuery extends ObservableQueryFor {
         super(String, true);
     }
 }
+export class TestCalendarChild {
+    date;
+    time;
+}
+__decorate([
+    field(DateOnly),
+    __metadata("design:type", DateOnly)
+], TestCalendarChild.prototype, "date", void 0);
+__decorate([
+    field(TimeOnly),
+    __metadata("design:type", TimeOnly)
+], TestCalendarChild.prototype, "time", void 0);
+export class TestCalendarItem {
+    children;
+}
+__decorate([
+    field(TestCalendarChild, true),
+    __metadata("design:type", Array)
+], TestCalendarItem.prototype, "children", void 0);
+export class TestCalendarEnumerableQuery extends ObservableQueryFor {
+    route = '/api/calendar-items/{category}';
+    defaultValue = [];
+    parameterDescriptors = [
+        new ParameterDescriptor('category', String)
+    ];
+    get requiredRequestParameters() {
+        return ['category'];
+    }
+    constructor() {
+        super(TestCalendarItem, true);
+    }
+}
 export class TestObservableQueryWithParameterDescriptorValues extends ObservableQueryFor {
     route = '/api/search';
     defaultValue = '';

package/dist/esm/queries/for_ObservableQueryFor/given/TestQueries.js.map

@@ -1 +1 @@
-{"version":3,"file":"TestQueries.js","sourceRoot":"","sources":["../../../../../queries/for_ObservableQueryFor/given/TestQueries.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAE9E,MAAM,OAAO,mBAAoB,SAAQ,kBAA0C;IACtE,KAAK,GAAG,gBAAgB,CAAC;IACzB,YAAY,GAAG,EAAE,CAAC;IAClB,oBAAoB,GAA0B;QACnD,IAAI,mBAAmB,CAAC,IAAI,EAAE,MAAqB,CAAC;KACvD,CAAC;IAEF,IAAI,yBAAyB;QACzB,OAAO,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IAED;QACI,KAAK,CAAC,MAAqB,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;CACJ;AAED,MAAM,OAAO,mBAAoB,SAAQ,kBAAkD;IAC9E,KAAK,GAAG,uBAAuB,CAAC;IAChC,YAAY,GAAa,EAAE,CAAC;IAC5B,oBAAoB,GAA0B;QACnD,IAAI,mBAAmB,CAAC,UAAU,EAAE,MAAqB,CAAC;KAC7D,CAAC;IAEF,IAAI,yBAAyB;QACzB,OAAO,CAAC,UAAU,CAAC,CAAC;IACxB,CAAC;IAED;QACI,KAAK,CAAC,MAAqB,EAAE,IAAI,CAAC,CAAC;IACvC,CAAC;CACJ;AAED,MAAM,OAAO,gDAAiD,SAAQ,kBAAkC;IAC3F,KAAK,GAAG,aAAa,CAAC;IACtB,YAAY,GAAG,EAAE,CAAC;IAClB,oBAAoB,GAA0B;QACnD,IAAI,mBAAmB,CAAC,QAAQ,EAAE,MAAqB,CAAC;QACxD,IAAI,mBAAmB,CAAC,OAAO,EAAE,MAAqB,CAAC;KAC1D,CAAC;IAEF,MAAM,CAAU;IAChB,KAAK,CAAU;IAEf,IAAI,yBAAyB;QACzB,OAAO,EAAE,CAAC;IACd,CAAC;IAED;QACI,KAAK,CAAC,MAAqB,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;CACJ;AAQD,MAAM,OAAO,wCAAyC,SAAQ,kBAAoE;IACrH,KAAK,GAAG,iBAAiB,CAAC;IAC1B,YAAY,GAAG,EAAE,CAAC;IAClB,oBAAoB,GAA0B;QACnD,IAAI,mBAAmB,CAAC,IAAI,EAAE,MAAqB,CAAC;QACpD,IAAI,mBAAmB,CAAC,QAAQ,EAAE,MAAqB,CAAC;QACxD,IAAI,mBAAmB,CAAC,OAAO,EAAE,MAAqB,CAAC;KAC1D,CAAC;IAEF,IAAI,yBAAyB;QACzB,OAAO,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IAED;QACI,KAAK,CAAC,MAAqB,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;CACJ;AAOD,MAAM,OAAO,iDAAkD,SAAQ,kBAAsF;IAChJ,KAAK,GAAG,iCAAiC,CAAC;IAC1C,YAAY,GAAG,EAAE,CAAC;IAClB,oBAAoB,GAA0B;QACnD,IAAI,mBAAmB,CAAC,QAAQ,EAAE,MAAqB,CAAC;QACxD,IAAI,mBAAmB,CAAC,UAAU,EAAE,MAAqB,CAAC;KAC7D,CAAC;IAEF,IAAI,yBAAyB;QACzB,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAClC,CAAC;IAED;QACI,KAAK,CAAC,MAAqB,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;CACJ"}
+{"version":3,"file":"TestQueries.js","sourceRoot":"","sources":["../../../../../queries/for_ObservableQueryFor/given/TestQueries.ts"],"names":[],"mappings":"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"}

package/dist/esm/queries/for_ObservableQueryFor/given/an_observable_query_for.d.ts

@@ -1,7 +1,8 @@
-import { TestObservableQuery, TestEnumerableQuery, TestObservableQueryWithParameterDescriptorValues, TestObservableQueryWithRouteAndQueryArgs, TestObservableQueryWithMultipleRequiredParameters } from './TestQueries';
+import { TestObservableQuery, TestEnumerableQuery, TestCalendarEnumerableQuery, TestObservableQueryWithParameterDescriptorValues, TestObservableQueryWithRouteAndQueryArgs, TestObservableQueryWithMultipleRequiredParameters } from './TestQueries';
 export declare class an_observable_query_for {
     query: TestObservableQuery;
     enumerableQuery: TestEnumerableQuery;
+    calendarEnumerableQuery: TestCalendarEnumerableQuery;
     queryWithParameterDescriptorValues: TestObservableQueryWithParameterDescriptorValues;
     queryWithRouteAndQueryArgs: TestObservableQueryWithRouteAndQueryArgs;
     queryWithMultipleRequiredParameters: TestObservableQueryWithMultipleRequiredParameters;

package/dist/esm/queries/for_ObservableQueryFor/given/an_observable_query_for.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"an_observable_query_for.d.ts","sourceRoot":"","sources":["../../../../../queries/for_ObservableQueryFor/given/an_observable_query_for.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,mBAAmB,EACnB,mBAAmB,EACnB,gDAAgD,EAChD,wCAAwC,EACxC,iDAAiD,EACpD,MAAM,eAAe,CAAC;AAEvB,qBAAa,uBAAuB;IAChC,KAAK,EAAE,mBAAmB,CAAC;IAC3B,eAAe,EAAE,mBAAmB,CAAC;IACrC,kCAAkC,EAAE,gDAAgD,CAAC;IACrF,0BAA0B,EAAE,wCAAwC,CAAC;IACrE,mCAAmC,EAAE,iDAAiD,CAAC;IAEvF,cAMC;CACJ"}
+{"version":3,"file":"an_observable_query_for.d.ts","sourceRoot":"","sources":["../../../../../queries/for_ObservableQueryFor/given/an_observable_query_for.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,mBAAmB,EACnB,mBAAmB,EACnB,2BAA2B,EAC3B,gDAAgD,EAChD,wCAAwC,EACxC,iDAAiD,EACpD,MAAM,eAAe,CAAC;AAEvB,qBAAa,uBAAuB;IAChC,KAAK,EAAE,mBAAmB,CAAC;IAC3B,eAAe,EAAE,mBAAmB,CAAC;IACrC,uBAAuB,EAAE,2BAA2B,CAAC;IACrD,kCAAkC,EAAE,gDAAgD,CAAC;IACrF,0BAA0B,EAAE,wCAAwC,CAAC;IACrE,mCAAmC,EAAE,iDAAiD,CAAC;IAEvF,cAOC;CACJ"}

package/dist/esm/queries/for_ObservableQueryFor/given/an_observable_query_for.js

@@ -1,13 +1,15 @@
-import { TestObservableQuery, TestEnumerableQuery, TestObservableQueryWithParameterDescriptorValues, TestObservableQueryWithRouteAndQueryArgs, TestObservableQueryWithMultipleRequiredParameters } from './TestQueries';
+import { TestObservableQuery, TestEnumerableQuery, TestCalendarEnumerableQuery, TestObservableQueryWithParameterDescriptorValues, TestObservableQueryWithRouteAndQueryArgs, TestObservableQueryWithMultipleRequiredParameters } from './TestQueries';
 export class an_observable_query_for {
     query;
     enumerableQuery;
+    calendarEnumerableQuery;
     queryWithParameterDescriptorValues;
     queryWithRouteAndQueryArgs;
     queryWithMultipleRequiredParameters;
     constructor() {
         this.query = new TestObservableQuery();
         this.enumerableQuery = new TestEnumerableQuery();
+        this.calendarEnumerableQuery = new TestCalendarEnumerableQuery();
         this.queryWithParameterDescriptorValues = new TestObservableQueryWithParameterDescriptorValues();
         this.queryWithRouteAndQueryArgs = new TestObservableQueryWithRouteAndQueryArgs();
         this.queryWithMultipleRequiredParameters = new TestObservableQueryWithMultipleRequiredParameters();

package/dist/esm/queries/for_ObservableQueryFor/given/an_observable_query_for.js.map

@@ -1 +1 @@
-{"version":3,"file":"an_observable_query_for.js","sourceRoot":"","sources":["../../../../../queries/for_ObservableQueryFor/given/an_observable_query_for.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,mBAAmB,EACnB,mBAAmB,EACnB,gDAAgD,EAChD,wCAAwC,EACxC,iDAAiD,EACpD,MAAM,eAAe,CAAC;AAEvB,MAAM,OAAO,uBAAuB;IAChC,KAAK,CAAsB;IAC3B,eAAe,CAAsB;IACrC,kCAAkC,CAAmD;IACrF,0BAA0B,CAA2C;IACrE,mCAAmC,CAAoD;IAEvF;QACI,IAAI,CAAC,KAAK,GAAG,IAAI,mBAAmB,EAAE,CAAC;QACvC,IAAI,CAAC,eAAe,GAAG,IAAI,mBAAmB,EAAE,CAAC;QACjD,IAAI,CAAC,kCAAkC,GAAG,IAAI,gDAAgD,EAAE,CAAC;QACjG,IAAI,CAAC,0BAA0B,GAAG,IAAI,wCAAwC,EAAE,CAAC;QACjF,IAAI,CAAC,mCAAmC,GAAG,IAAI,iDAAiD,EAAE,CAAC;IACvG,CAAC;CACJ"}
+{"version":3,"file":"an_observable_query_for.js","sourceRoot":"","sources":["../../../../../queries/for_ObservableQueryFor/given/an_observable_query_for.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,mBAAmB,EACnB,mBAAmB,EACnB,2BAA2B,EAC3B,gDAAgD,EAChD,wCAAwC,EACxC,iDAAiD,EACpD,MAAM,eAAe,CAAC;AAEvB,MAAM,OAAO,uBAAuB;IAChC,KAAK,CAAsB;IAC3B,eAAe,CAAsB;IACrC,uBAAuB,CAA8B;IACrD,kCAAkC,CAAmD;IACrF,0BAA0B,CAA2C;IACrE,mCAAmC,CAAoD;IAEvF;QACI,IAAI,CAAC,KAAK,GAAG,IAAI,mBAAmB,EAAE,CAAC;QACvC,IAAI,CAAC,eAAe,GAAG,IAAI,mBAAmB,EAAE,CAAC;QACjD,IAAI,CAAC,uBAAuB,GAAG,IAAI,2BAA2B,EAAE,CAAC;QACjE,IAAI,CAAC,kCAAkC,GAAG,IAAI,gDAAgD,EAAE,CAAC;QACjG,IAAI,CAAC,0BAA0B,GAAG,IAAI,wCAAwC,EAAE,CAAC;QACjF,IAAI,CAAC,mCAAmC,GAAG,IAAI,iDAAiD,EAAE,CAAC;IACvG,CAAC;CACJ"}

package/dist/esm/queries/for_ObservableQueryFor/when_receiving_a_result/and_the_model_has_a_calendar_collection.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=and_the_model_has_a_calendar_collection.d.ts.map

package/dist/esm/queries/for_ObservableQueryFor/when_receiving_a_result/and_the_model_has_a_calendar_collection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"and_the_model_has_a_calendar_collection.d.ts","sourceRoot":"","sources":["../../../../../queries/for_ObservableQueryFor/when_receiving_a_result/and_the_model_has_a_calendar_collection.ts"],"names":[],"mappings":""}

package/dist/esm/queries/for_ObservableQueryFor/when_receiving_a_result/and_the_model_has_a_calendar_collection.js

@@ -0,0 +1,52 @@
+import * as sinon from 'sinon';
+import { DateOnly, TimeOnly } from '@cratis/fundamentals';
+import { an_observable_query_for } from '../given/an_observable_query_for';
+import { given } from '../../../given';
+import { Globals } from '../../../Globals';
+import { QueryTransportMethod } from '../../QueryTransportMethod';
+describe('and the model has a calendar collection', given(an_observable_query_for, context => {
+    let subscription;
+    let fakeEventSource;
+    let received;
+    let originalQueryDirectMode;
+    let originalTransportMethod;
+    let originalFactory;
+    beforeEach(() => {
+        originalQueryDirectMode = Globals.queryDirectMode;
+        originalTransportMethod = Globals.queryTransportMethod;
+        originalFactory = Globals.eventSourceFactory;
+        Globals.queryDirectMode = true;
+        Globals.queryTransportMethod = QueryTransportMethod.ServerSentEvents;
+        fakeEventSource = { onmessage: null, onerror: null, close: sinon.stub() };
+        Globals.eventSourceFactory = (() => fakeEventSource);
+        context.calendarEnumerableQuery.setOrigin('https://example.com');
+        received = [];
+        subscription = context.calendarEnumerableQuery.subscribe(result => received.push(result), { category: 'test-category' });
+        fakeEventSource.onmessage({
+            data: JSON.stringify({
+                data: [{ children: [{ date: '2026-02-03', time: '14:15:16' }] }],
+                isSuccess: true,
+                isAuthorized: true,
+                isValid: true,
+                hasExceptions: false,
+                validationResults: [],
+                exceptionMessages: [],
+                exceptionStackTrace: '',
+                paging: { page: 0, size: 0, totalItems: 1, totalPages: 1 }
+            })
+        });
+    });
+    afterEach(() => {
+        subscription?.unsubscribe();
+        Globals.queryDirectMode = originalQueryDirectMode;
+        Globals.queryTransportMethod = originalTransportMethod;
+        Globals.eventSourceFactory = originalFactory;
+        sinon.restore();
+    });
+    it('should deliver the result to the subscriber', () => received.length.should.equal(1));
+    it('should deserialize the child date', () => received[0].data[0].children[0].date.should.be.instanceOf(DateOnly));
+    it('should preserve the child date', () => received[0].data[0].children[0].date.equals(DateOnly.from(2026, 2, 3)).should.be.true);
+    it('should deserialize the child time', () => received[0].data[0].children[0].time.should.be.instanceOf(TimeOnly));
+    it('should preserve the child time', () => received[0].data[0].children[0].time.equals(TimeOnly.from(14, 15, 16)).should.be.true);
+}));
+//# sourceMappingURL=and_the_model_has_a_calendar_collection.js.map

package/dist/esm/queries/for_ObservableQueryFor/when_receiving_a_result/and_the_model_has_a_calendar_collection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"and_the_model_has_a_calendar_collection.js","sourceRoot":"","sources":["../../../../../queries/for_ObservableQueryFor/when_receiving_a_result/and_the_model_has_a_calendar_collection.ts"],"names":[],"mappings":"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"}