@toa.io/extensions.exposition 1.0.0-alpha.2 → 1.0.0-alpha.200

package/transpiled/HTTP/formats/text.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encode = exports.decode = exports.multipart = exports.type = void 0;
-const node_buffer_1 = require("node:buffer");
 exports.type = 'text/plain';
 exports.multipart = 'multipart/text';
 function decode(buffer) {
@@ -9,7 +8,7 @@ function decode(buffer) {
 }
 exports.decode = decode;
 function encode(value) {
-    return node_buffer_1.Buffer.from(value.toString());
+    return Buffer.from(value.toString());
 }
 exports.encode = encode;
 //# sourceMappingURL=text.js.map

package/transpiled/HTTP/formats/text.js.map

@@ -1 +1 @@
-{"version":3,"file":"text.js","sourceRoot":"","sources":["../../../source/HTTP/formats/text.ts"],"names":[],"mappings":";;;AAAA,6CAAoC;AAEvB,QAAA,IAAI,GAAG,YAAY,CAAA;AACnB,QAAA,SAAS,GAAG,gBAAgB,CAAA;AAEzC,SAAgB,MAAM,CAAE,MAAc;IACpC,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAA;AAC1B,CAAC;AAFD,wBAEC;AAED,SAAgB,MAAM,CAAE,KAAiC;IACvD,OAAO,oBAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;AACtC,CAAC;AAFD,wBAEC"}
+{"version":3,"file":"text.js","sourceRoot":"","sources":["../../../source/HTTP/formats/text.ts"],"names":[],"mappings":";;;AAAa,QAAA,IAAI,GAAG,YAAY,CAAA;AACnB,QAAA,SAAS,GAAG,gBAAgB,CAAA;AAEzC,SAAgB,MAAM,CAAE,MAAc;IACpC,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAA;AAC1B,CAAC;AAFD,wBAEC;AAED,SAAgB,MAAM,CAAE,KAAiC;IACvD,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;AACtC,CAAC;AAFD,wBAEC"}

package/transpiled/HTTP/formats/yaml.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Buffer } from 'node:buffer';
+/// <reference types="node" />
 export declare const type = "application/yaml";
 export declare const multipart = "multipart/yaml";
 export declare function decode(buffer: Buffer): any;

package/transpiled/HTTP/formats/yaml.js

@@ -24,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encode = exports.decode = exports.multipart = exports.type = void 0;
-const node_buffer_1 = require("node:buffer");
 const yaml = __importStar(require("js-yaml"));
 exports.type = 'application/yaml';
 exports.multipart = 'multipart/yaml';
@@ -35,7 +34,7 @@ function decode(buffer) {
 exports.decode = decode;
 function encode(value) {
     const text = yaml.dump(value, { lineWidth: -1, noRefs: true });
-    return node_buffer_1.Buffer.from(text);
+    return Buffer.from(text);
 }
 exports.encode = encode;
 //# sourceMappingURL=yaml.js.map

package/transpiled/HTTP/formats/yaml.js.map

@@ -1 +1 @@
-{"version":3,"file":"yaml.js","sourceRoot":"","sources":["../../../source/HTTP/formats/yaml.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAoC;AACpC,8CAA+B;AAElB,QAAA,IAAI,GAAG,kBAAkB,CAAA;AACzB,QAAA,SAAS,GAAG,gBAAgB,CAAA;AAEzC,SAAgB,MAAM,CAAE,MAAc;IACpC,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;IAE9B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACxB,CAAC;AAJD,wBAIC;AAED,SAAgB,MAAM,CAAE,KAAU;IAChC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;IAE9D,OAAO,oBAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC1B,CAAC;AAJD,wBAIC"}
+{"version":3,"file":"yaml.js","sourceRoot":"","sources":["../../../source/HTTP/formats/yaml.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAA+B;AAElB,QAAA,IAAI,GAAG,kBAAkB,CAAA;AACzB,QAAA,SAAS,GAAG,gBAAgB,CAAA;AAEzC,SAAgB,MAAM,CAAE,MAAc;IACpC,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;IAE9B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACxB,CAAC;AAJD,wBAIC;AAED,SAAgB,MAAM,CAAE,KAAU;IAChC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;IAE9D,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC1B,CAAC;AAJD,wBAIC"}

package/transpiled/HTTP/index.d.ts

@@ -1,3 +1,4 @@
 export * from './Server';
 export * from './messages';
 export * from './exceptions';
+export * from './Context';

package/transpiled/HTTP/index.js

@@ -17,4 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Server"), exports);
 __exportStar(require("./messages"), exports);
 __exportStar(require("./exceptions"), exports);
+__exportStar(require("./Context"), exports);
 //# sourceMappingURL=index.js.map

package/transpiled/HTTP/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/HTTP/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAwB;AACxB,6CAA0B;AAC1B,+CAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/HTTP/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAwB;AACxB,6CAA0B;AAC1B,+CAA4B;AAC5B,4CAAyB"}

package/transpiled/HTTP/messages.d.ts

@@ -1,33 +1,22 @@
 /// <reference types="node" />
-import { type IncomingHttpHeaders } from 'node:http';
-import { type Request, type Response } from 'express';
-import type { ParsedQs } from 'qs';
-import type { Format } from './formats';
-export declare function write(request: IncomingMessage, response: Response, message: OutgoingMessage): void;
-export declare function read(request: Request): Promise<any>;
-export interface IncomingMessage extends Request {
-    method: string;
-    path: string;
-    url: string;
-    headers: IncomingHttpHeaders;
-    query: Query;
-    parse: <T>() => Promise<T>;
-    encoder: Format | null;
-    subtype: string | null;
-    pipelines: {
-        body: Array<(input: unknown) => unknown>;
-        response: Array<(output: OutgoingMessage) => void>;
-    };
-}
+import type { Context } from './Context';
+import type * as http from 'node:http';
+export declare function write(context: Context, response: http.ServerResponse, message: OutgoingMessage): Promise<void>;
+export declare function read(context: Context): Promise<any>;
+export declare function multipart(message: OutgoingMessage, context: Context, response: http.ServerResponse): void;
 export interface OutgoingMessage {
     status?: number;
     headers?: Headers;
     body?: any;
 }
-export interface Query extends ParsedQs {
+export interface Query {
+    [key: string]: string | number | undefined;
     id?: string;
     criteria?: string;
+    search?: string;
+    sample?: number;
     sort?: string;
     omit?: string;
     limit?: string;
+    version?: number;
 }

package/transpiled/HTTP/messages.js

@@ -1,75 +1,130 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.read = exports.write = void 0;
+exports.multipart = exports.read = exports.write = void 0;
 const node_stream_1 = require("node:stream");
-const streams_1 = require("@toa.io/streams");
+const consumers_1 = require("node:stream/consumers");
+const openspan_1 = require("openspan");
 const formats_1 = require("./formats");
 const exceptions_1 = require("./exceptions");
-function write(request, response, message) {
-    for (const transform of request.pipelines.response)
-        transform(message);
-    message.headers?.forEach((value, key) => response.set(key, value));
+const server = `Exposition/${require('../../package.json').version}` +
+    ((process.env.TOA_CONTEXT === undefined ? '' : ` ${process.env.TOA_CONTEXT}`) +
+        (process.env.TOA_ENV === undefined ? '' : `/${process.env.TOA_ENV}`));
+const pending = new Map();
+async function write(context, response, message) {
+    for (const transform of context.pipelines.response)
+        await transform(message);
+    if (message?.status !== undefined)
+        response.statusCode = message.status;
+    response.setHeader('server', server);
+    message.headers?.forEach((value, key) => response.setHeader(key, value));
+    context.timing.append(response);
+    if (response.destroyed) {
+        openspan_1.console.warn('Request destroyed prematurely', { path: context.url.pathname });
+        return;
+    }
+    response.on('error', (exception) => openspan_1.console.warn('HTTP response error', { path: context.url.pathname, exception }));
     if (message.body instanceof node_stream_1.Readable)
-        stream(message, request, response);
+        stream(message, context, response);
     else
-        send(message, request, response);
+        send(message, context, response);
 }
 exports.write = write;
-async function read(request) {
-    const type = request.headers['content-type'];
+async function read(context) {
+    const type = context.request.headers['content-type'];
     if (type === undefined)
         return undefined;
     if (!(type in formats_1.formats))
         throw new exceptions_1.UnsupportedMediaType();
     const format = formats_1.formats[type];
-    const buf = await (0, streams_1.buffer)(request);
+    const buf = await context.timing.capture('buffer', (0, consumers_1.buffer)(context.request));
     try {
         return format.decode(buf);
     }
-    catch {
+    catch (error) {
+        const entry = { path: context.url.pathname, error: error?.toString?.() };
+        if (context.debug)
+            entry.input = buf.toString('utf-8');
+        openspan_1.console.debug('Failed to decode message', entry);
         throw new exceptions_1.BadRequest();
     }
 }
 exports.read = read;
-function send(message, request, response) {
+function send(message, context, response) {
     if (message.body === undefined || message.body === null) {
+        response.setHeader('content-length', '0');
         response.end();
         return;
     }
-    if (request.encoder === null)
+    if (context.encoder === null)
         throw new exceptions_1.NotAcceptable();
-    const buf = request.encoder.encode(message.body);
+    const buf = context.encoder.encode(message.body);
     response
-        .set('content-type', request.encoder.type)
-        .append('vary', 'accept')
+        .setHeader('content-type', context.encoder.type)
+        .setHeader('content-length', buf.length.toString())
+        .appendHeader('vary', 'accept')
         .end(buf);
 }
-function stream(message, request, response) {
+function stream(message, context, response) {
     const encoded = message.headers !== undefined && message.headers.has('content-type');
     if (encoded)
-        pipe(message, response);
+        message.body.pipe(response);
     else
-        multipart(message, request, response);
-    message.body.on('error', (e) => {
-        console.error(e);
+        multipart(message, context, response);
+    message.body.on('error', (exception) => {
+        openspan_1.console.warn('Message stream error', { path: context.url.pathname, exception });
         response.end();
     });
+    if (context.debug)
+        debugStream(context, response);
 }
-function pipe(message, response) {
-    message.headers?.forEach((value, key) => response.set(key, value));
-    message.body.pipe(response);
-}
-function multipart(message, request, response) {
-    if (request.encoder === null)
+function multipart(message, context, response) {
+    if (context.encoder === null)
         throw new exceptions_1.NotAcceptable();
-    const encoder = request.encoder;
-    response.set('content-type', `${encoder.multipart}; boundary=${BOUNDARY}`);
+    const encoder = context.encoder;
+    response.setHeader('content-type', `${encoder.multipart}; boundary=${BOUNDARY}`);
+    response.write(Buffer.concat([
+        CUT,
+        CRLF,
+        encoder.encode('ACK'),
+        CRLF,
+        CUT
+    ]));
     message.body
-        .map((part) => Buffer.concat([CUT, encoder.encode(part)]))
-        .on('end', () => response.end(FINALCUT))
+        .map((part) => Buffer.concat([
+        CRLF /* indicates no boundary headers */,
+        encoder.encode(part),
+        CRLF,
+        CUT
+    ]))
+        .on('end', () => response.end(Buffer.concat([
+        CRLF,
+        encoder.encode('FIN'),
+        CRLF,
+        FINALCUT
+    ])))
         .pipe(response);
 }
+exports.multipart = multipart;
 const BOUNDARY = 'cut';
 const CUT = Buffer.from(`--${BOUNDARY}\r\n`);
+const CRLF = Buffer.from('\r\n');
 const FINALCUT = Buffer.from(`--${BOUNDARY}--`);
+const PENDING_DEBUG_INTERVAL = 30000;
+let pendingInterval = null;
+function debugStream(context, response) {
+    const ctx = { method: context.request.method, path: context.url.pathname };
+    openspan_1.console.debug('Stream opened', ctx);
+    pending.set(context.id, ctx);
+    response.on('close', () => {
+        openspan_1.console.debug('Stream closed', ctx);
+        pending.delete(context.id);
+        if (pending.size === 0) {
+            if (pendingInterval !== null)
+                clearInterval(pendingInterval);
+            pendingInterval = null;
+        }
+    });
+    if (pendingInterval === null)
+        pendingInterval = setInterval(() => openspan_1.console.debug('Pending streams', { size: pending.size }), PENDING_DEBUG_INTERVAL);
+}
 //# sourceMappingURL=messages.js.map

package/transpiled/HTTP/messages.js.map

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

package/transpiled/Introspection.d.ts

@@ -0,0 +1,9 @@
+import type { Remote } from '@toa.io/core';
+export interface Introspection {
+    route?: Record<string, Schema>;
+    query?: Record<string, Schema>;
+    input?: Schema;
+    output?: Schema;
+    errors?: string[];
+}
+export type Schema = Awaited<ReturnType<Remote['explain']>>['input'];

package/transpiled/Introspection.js

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

package/transpiled/Introspection.js.map

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

package/transpiled/Mapping.d.ts

@@ -1,8 +1,17 @@
 import { type Parameter } from './RTD';
+import { Query } from './Query';
+import type { Introspection, Schema } from './Introspection';
+import type { QueryString } from './Query';
 import type * as http from './HTTP';
 import type * as syntax from './RTD/syntax';
 import type * as core from '@toa.io/core';
 export declare abstract class Mapping {
-    static create(query?: syntax.Query): Mapping;
-    abstract fit(input: any, qs: http.Query, parameters: Parameter[]): core.Request;
+    protected readonly query: Query;
+    abstract readonly queryable: boolean;
+    constructor(query: Query);
+    static create(query?: syntax.Query | null): Mapping;
+    explain(introspection: Introspection): Record<string, Schema> | null;
+    protected assign(input: any, qs: QueryString): void;
+    abstract fit(input: any, query: http.Query, parameters: Parameter[]): core.Request;
 }
+export declare function queryable(query?: syntax.Query | null): boolean;

package/transpiled/Mapping.js

@@ -1,38 +1,70 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Mapping = void 0;
+exports.queryable = exports.Mapping = void 0;
 const Query_1 = require("./Query");
 class Mapping {
+    query;
+    constructor(query) {
+        this.query = query;
+    }
     static create(query) {
-        if (query === undefined || query === null)
-            return new InputMapping();
         const q = new Query_1.Query(query);
-        return new QueryableMapping(q);
+        return queryable(query)
+            ? new QueryableMapping(q)
+            : new InputMapping(q);
+    }
+    explain(introspection) {
+        return this.query.explain(introspection);
+    }
+    assign(input, qs) {
+        if (qs.parameters !== null) {
+            if (typeof input !== 'object' || input === null)
+                throw new Error('Input must be an object to embed query parameters');
+            Object.assign(input, qs.parameters);
+        }
     }
 }
 exports.Mapping = Mapping;
 class QueryableMapping extends Mapping {
-    query;
-    constructor(query) {
-        super();
-        this.query = query;
-    }
-    fit(input, qs, parameters) {
-        const query = this.query.fit(qs, parameters);
-        return { input, query };
+    queryable = true;
+    fit(input, query, parameters) {
+        const request = {};
+        const qs = this.query.fit(query, parameters);
+        if (input === undefined && qs.parameters !== null)
+            input = {};
+        this.assign(input, qs);
+        if (input !== undefined)
+            request.input = input;
+        if (qs.query !== null)
+            request.query = qs.query;
+        return request;
     }
 }
 class InputMapping extends Mapping {
-    fit(input, _, parameters) {
-        if (input === undefined && parameters.length > 0)
+    queryable = false;
+    fit(input, query, parameters) {
+        const request = {};
+        const qs = this.query.fit(query, parameters);
+        if (input === undefined &&
+            (this.query.parameterized || parameters.length > 0 || qs.parameters !== null))
             input = {};
-        if (typeof input === 'object')
-            this.assign(input, parameters);
-        return { input };
-    }
-    assign(input, parameters) {
-        for (const parameter of parameters)
-            input[parameter.name] = parameter.value;
+        if (parameters.length > 0) {
+            if (typeof input !== 'object' || input === null)
+                throw new Error('Input must be an object to embed parameters');
+            for (const parameter of parameters)
+                input[parameter.name] = parameter.value;
+        }
+        this.assign(input, qs);
+        if (input !== undefined)
+            request.input = input;
+        return request;
     }
 }
+function queryable(query) {
+    if (query === undefined || query === null)
+        return false;
+    const keys = Object.keys(query);
+    return !(keys.length === 1 && keys[0] === 'parameters');
+}
+exports.queryable = queryable;
 //# sourceMappingURL=Mapping.js.map

package/transpiled/Mapping.js.map

@@ -1 +1 @@
-{"version":3,"file":"Mapping.js","sourceRoot":"","sources":["../source/Mapping.ts"],"names":[],"mappings":";;;AACA,mCAA+B;AAK/B,MAAsB,OAAO;IACpB,MAAM,CAAC,MAAM,CAAE,KAAoB;QACxC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;YACvC,OAAO,IAAI,YAAY,EAAE,CAAA;QAE3B,MAAM,CAAC,GAAG,IAAI,aAAK,CAAC,KAAK,CAAC,CAAA;QAE1B,OAAO,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAA;IAChC,CAAC;CAGF;AAXD,0BAWC;AAED,MAAM,gBAAiB,SAAQ,OAAO;IACnB,KAAK,CAAO;IAE7B,YAAoB,KAAY;QAC9B,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACpB,CAAC;IAEM,GAAG,CAAE,KAAU,EAAE,EAAc,EAAE,UAAuB;QAC7D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;QAE5C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF;AAED,MAAM,YAAa,SAAQ,OAAO;IACzB,GAAG,CAAE,KAAU,EAAE,CAAU,EAAE,UAAuB;QACzD,IAAI,KAAK,KAAK,SAAS,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;YAC9C,KAAK,GAAG,EAAE,CAAA;QAEZ,IAAI,OAAO,KAAK,KAAK,QAAQ;YAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;QAEhC,OAAO,EAAE,KAAK,EAAE,CAAA;IAClB,CAAC;IAEO,MAAM,CAAE,KAA0B,EAAE,UAAuB;QACjE,KAAK,MAAM,SAAS,IAAI,UAAU;YAChC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,KAAK,CAAA;IAC3C,CAAC;CACF"}
+{"version":3,"file":"Mapping.js","sourceRoot":"","sources":["../source/Mapping.ts"],"names":[],"mappings":";;;AACA,mCAA+B;AAO/B,MAAsB,OAAO;IACR,KAAK,CAAO;IAG/B,YAAoB,KAAY;QAC9B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACpB,CAAC;IAEM,MAAM,CAAC,MAAM,CAAE,KAA2B;QAC/C,MAAM,CAAC,GAAG,IAAI,aAAK,CAAC,KAAM,CAAC,CAAA;QAE3B,OAAO,SAAS,CAAC,KAAK,CAAC;YACrB,CAAC,CAAC,IAAI,gBAAgB,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,CAAA;IACzB,CAAC;IAEM,OAAO,CAAE,aAA4B;QAC1C,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;IAC1C,CAAC;IAES,MAAM,CAAE,KAAU,EAAE,EAAe;QAC3C,IAAI,EAAE,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;YAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;gBAC7C,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAA;YAEtE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,CAAA;QACrC,CAAC;IACH,CAAC;CAGF;AA9BD,0BA8BC;AAED,MAAM,gBAAiB,SAAQ,OAAO;IACX,SAAS,GAAG,IAAI,CAAA;IAElC,GAAG,CAAE,KAAU,EAAE,KAAiB,EAAE,UAAuB;QAChE,MAAM,OAAO,GAAiB,EAAE,CAAA;QAChC,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;QAE5C,IAAI,KAAK,KAAK,SAAS,IAAI,EAAE,CAAC,UAAU,KAAK,IAAI;YAC/C,KAAK,GAAG,EAAE,CAAA;QAEZ,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QAEtB,IAAI,KAAK,KAAK,SAAS;YACrB,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;QAEvB,IAAI,EAAE,CAAC,KAAK,KAAK,IAAI;YACnB,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC,KAAK,CAAA;QAE1B,OAAO,OAAO,CAAA;IAChB,CAAC;CACF;AAED,MAAM,YAAa,SAAQ,OAAO;IACP,SAAS,GAAG,KAAK,CAAA;IAEnC,GAAG,CAAE,KAAU,EAAE,KAAiB,EAAE,UAAuB;QAChE,MAAM,OAAO,GAAiB,EAAE,CAAA;QAChC,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;QAE5C,IAAI,KAAK,KAAK,SAAS;YACrB,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,UAAU,KAAK,IAAI,CAAC;YAC7E,KAAK,GAAG,EAAE,CAAA;QAEZ,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;gBAC7C,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;YAEhE,KAAK,MAAM,SAAS,IAAI,UAAU;gBAChC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,KAAK,CAAA;QAC3C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QAEtB,IAAI,KAAK,KAAK,SAAS;YACrB,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;QAEvB,OAAO,OAAO,CAAA;IAChB,CAAC;CACF;AAED,SAAgB,SAAS,CAAE,KAA2B;IACpD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;QACvC,OAAO,KAAK,CAAA;IAEd,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAE/B,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,YAAY,CAAC,CAAA;AACzD,CAAC;AAPD,8BAOC"}

package/transpiled/Query.d.ts

@@ -1,13 +1,24 @@
 import * as http from './HTTP';
 import { type Parameter } from './RTD';
+import type { Introspection, Schema } from './Introspection';
 import type * as syntax from './RTD/syntax';
 import type * as core from '@toa.io/core';
 export declare class Query {
+    readonly parameterized: boolean;
     private readonly query;
     private readonly closed;
+    private readonly prepend;
+    private readonly queryable;
+    private readonly searchable;
     constructor(query: syntax.Query);
-    fit(query: http.Query, parameters: Parameter[]): core.Query;
+    fit(query: http.Query, parameters: Parameter[]): QueryString;
+    explain(introspection: Introspection): Record<string, Schema> | null;
+    private split;
     private fitCriteria;
     private fitRanges;
     private fitSort;
 }
+export interface QueryString {
+    query: core.Query | null;
+    parameters: Record<string, string> | null;
+}

package/transpiled/Query.js

@@ -22,65 +22,127 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Query = void 0;
+const node_assert_1 = __importDefault(require("node:assert"));
 const http = __importStar(require("./HTTP"));
 const schemas = __importStar(require("./schemas"));
+const Mapping_1 = require("./Mapping");
 class Query {
+    parameterized;
     query;
     closed = false;
+    prepend = ';';
+    queryable;
+    searchable;
     constructor(query) {
-        if (query.criteria !== undefined) {
-            const open = query.criteria[query.criteria.length - 1] === ';';
-            if (open)
-                query.criteria = query.criteria.slice(0, -1);
-            else
-                this.closed = true;
+        this.parameterized = query?.parameters !== undefined;
+        this.queryable = (0, Mapping_1.queryable)(query);
+        this.searchable = query?.search === true;
+        if (this.queryable) {
+            query.omit ??= { value: 0, range: [0, 1000] };
+            query.limit ??= { value: 10, range: [1, 100] };
+            if (query.criteria !== undefined) {
+                // eslint-disable-next-line max-depth
+                if (query.criteria.endsWith(';'))
+                    query.criteria = query.criteria.slice(0, -1);
+                else
+                    this.closed = true;
+                // eslint-disable-next-line max-depth
+                if (query.criteria.startsWith(',') || query.criteria.startsWith(';')) {
+                    this.prepend = query.criteria[0];
+                    query.criteria = query.criteria.slice(1);
+                }
+            }
         }
         this.query = query;
     }
     fit(query, parameters) {
-        const error = schemas.querystring.fit(query);
-        if (error !== null)
-            throw new http.BadRequest('Query ' + error.message);
-        this.fitCriteria(query, parameters);
-        this.fitRanges(query);
-        this.fitSort(query);
+        const qs = this.split(query);
+        if (qs.query !== null) {
+            const error = schemas.querystring.fit(qs.query);
+            if (error !== null)
+                throw new http.BadRequest('Query ' + error.message);
+            this.fitCriteria(qs.query, parameters);
+            this.fitRanges(qs.query);
+            this.fitSort(qs.query);
+        }
+        return {
+            query: qs.query,
+            parameters: qs.parameters
+        };
+    }
+    explain(introspection) {
+        if (this.query?.parameters === undefined || introspection.input?.type !== 'object')
+            return null;
+        let query = null;
+        for (const parameter of this.query.parameters) {
+            const schema = introspection.input.properties[parameter];
+            if (schema !== undefined) {
+                query ??= {};
+                query[parameter] = schema;
+            }
+            delete introspection.input.properties[parameter];
+        }
         return query;
     }
+    split(query) {
+        let parameters = null;
+        if (this.query?.parameters !== undefined)
+            for (const key in query)
+                // eslint-disable-next-line max-depth
+                if (this.query.parameters.includes(key)) {
+                    parameters ??= {};
+                    parameters[key] = query[key];
+                    delete query[key];
+                }
+        if (!this.queryable) {
+            const keys = Object.keys(query);
+            if (keys.length > 0)
+                throw new http.BadRequest(`Query parameter '${keys[0]}' is not allowed`);
+            query = null;
+        }
+        if (query?.search !== undefined && !this.searchable)
+            throw new http.BadRequest('Query search is not allowed');
+        return {
+            query,
+            parameters
+        };
+    }
     fitCriteria(query, parameters) {
-        const criteria = [];
-        if (this.query.criteria !== undefined)
-            criteria.push(this.query.criteria);
+        const groups = [];
         const idx = parameters.findIndex((parameter) => parameter.name === 'id');
         if (idx !== -1) {
             query.id = parameters[idx].value;
             parameters.splice(idx, 1);
         }
         if (parameters.length > 0) {
-            const chunks = parameters
+            const criteria = parameters
                 .map(({ name, value }) => `${name}==${value}`)
                 .join(';');
-            criteria.push(chunks);
+            groups.push({ criteria, operator: this.prepend });
         }
+        if (this.query.criteria !== undefined)
+            groups.push({ criteria: this.query.criteria, operator: ';' });
         if (query.criteria !== undefined)
             if (this.closed)
-                throw new http.BadRequest('Query criteria is closed.');
+                throw new http.BadRequest('Query criteria is closed');
             else
-                criteria.push(query.criteria);
-        switch (criteria.length) {
-            case 0:
-                break;
-            case 1:
-                query.criteria = criteria[0];
-                break;
-            default:
-                query.criteria = '(' + criteria.join(');(') + ')';
-                break;
-        }
+                groups.push({ criteria: query.criteria, operator: WHATEVER });
+        if (groups.length > 0)
+            query.criteria = groups.reduce((acc, { criteria, operator }, i) => {
+                return i === groups.length - 1
+                    ? `${acc}(${criteria})`
+                    : `${acc}(${criteria})${operator}`;
+            }, '');
     }
     fitRanges(qs) {
         const query = qs;
+        node_assert_1.default.ok(this.query.limit !== undefined, 'Query limit must be defined');
+        node_assert_1.default.ok(this.query.omit !== undefined, 'Query limit range must be defined');
         if (qs.limit !== undefined)
             query.limit = fit(qs.limit, this.query.limit.range, 'limit');
         else
@@ -101,7 +163,8 @@ function fit(string, range, name) {
     const number = parseInt(string);
     if (number < range[0] || number > range[1])
         throw new http.BadRequest(`Query ${name} must be between ` +
-            `${range[0]} and ${range[1]} inclusive.`);
+            `${range[0]} and ${range[1]} inclusive`);
     return number;
 }
+const WHATEVER = ';';
 //# sourceMappingURL=Query.js.map