@webiny/api 5.43.3 → 6.0.0-alpha.1

package/Benchmark.d.ts

@@ -1,4 +1,4 @@
-import { Benchmark as BenchmarkInterface, BenchmarkEnableOnCallable, BenchmarkMeasurement, BenchmarkMeasureOptions, BenchmarkOutputCallable, BenchmarkRuns } from "./types";
+import type { Benchmark as BenchmarkInterface, BenchmarkEnableOnCallable, BenchmarkMeasurement, BenchmarkMeasureOptions, BenchmarkOutputCallable, BenchmarkRuns } from "./types";
 export declare class Benchmark implements BenchmarkInterface {
     readonly measurements: BenchmarkMeasurement[];
     private outputDone;

package/Benchmark.js.map

@@ -1 +1 @@
-{"version":3,"names":["BenchmarkState","createDefaultOutputCallable","benchmark","console","log","elapsed","measurements","Benchmark","outputDone","isAlreadyRunning","totalElapsed","runs","enableOnCallables","onOutputCallables","state","UNDETERMINED","enableOn","cb","push","onOutput","enable","setState","ENABLED","disable","DISABLED","output","length","callables","reverse","result","stop","measure","options","enabled","getIsEnabled","measurement","startMeasurement","getIsAlreadyRunning","startRunning","measurementEnded","stopMeasurement","addRun","addElapsed","endRunning","name","category","start","Date","memoryStart","process","memoryUsage","heapUsed","end","memoryEnd","getTime","memory","exports"],"sources":["Benchmark.ts"],"sourcesContent":["import {\n    Benchmark as BenchmarkInterface,\n    BenchmarkEnableOnCallable,\n    BenchmarkMeasurement,\n    BenchmarkMeasureOptions,\n    BenchmarkOutputCallable,\n    BenchmarkRuns\n} from \"~/types\";\n\nenum BenchmarkState {\n    DISABLED = \"disabled\",\n    ENABLED = \"enabled\",\n    UNDETERMINED = \"undetermined\"\n}\n\ninterface BenchmarkMeasurementStart\n    extends Pick<BenchmarkMeasurement, \"name\" | \"category\" | \"start\"> {\n    memoryStart: number;\n}\n\nconst createDefaultOutputCallable = (): BenchmarkOutputCallable => {\n    return async ({ benchmark }) => {\n        console.log(`Benchmark total time elapsed: ${benchmark.elapsed}ms`);\n        console.log(\"Benchmark measurements:\");\n        console.log(benchmark.measurements);\n    };\n};\n\nexport class Benchmark implements BenchmarkInterface {\n    public readonly measurements: BenchmarkMeasurement[] = [];\n\n    private outputDone = false;\n    private isAlreadyRunning = false;\n    private totalElapsed = 0;\n    public readonly runs: BenchmarkRuns = {};\n    private readonly enableOnCallables: BenchmarkEnableOnCallable[] = [];\n    private readonly onOutputCallables: BenchmarkOutputCallable[] = [];\n    private state: BenchmarkState = BenchmarkState.UNDETERMINED;\n\n    public get elapsed(): number {\n        return this.totalElapsed;\n    }\n\n    public enableOn(cb: BenchmarkEnableOnCallable): void {\n        this.enableOnCallables.push(cb);\n    }\n\n    public onOutput(cb: BenchmarkOutputCallable): void {\n        this.onOutputCallables.push(cb);\n    }\n\n    public enable(): void {\n        this.setState(BenchmarkState.ENABLED);\n    }\n\n    public disable(): void {\n        this.setState(BenchmarkState.DISABLED);\n    }\n\n    /**\n     * When running the output, we need to reverse the callables array, so that the last one added is the first one executed.\n     *\n     * The last one is our built-in console.log output.\n     */\n    public async output(): Promise<void> {\n        /**\n         * No point in outputting more than once or if no measurements were made.\n         */\n        if (this.outputDone || this.measurements.length === 0) {\n            return;\n        }\n        const callables = [...this.onOutputCallables].reverse();\n        callables.push(createDefaultOutputCallable());\n        for (const cb of callables) {\n            const result = await cb({\n                benchmark: this,\n                stop: () => \"stop\"\n            });\n            if (result === \"stop\") {\n                return;\n            }\n        }\n        this.outputDone = true;\n    }\n\n    public async measure<T = any>(\n        options: BenchmarkMeasureOptions | string,\n        cb: () => Promise<T>\n    ): Promise<T> {\n        const enabled = await this.getIsEnabled();\n        if (!enabled) {\n            return cb();\n        }\n        const measurement = this.startMeasurement(options);\n        const isAlreadyRunning = this.getIsAlreadyRunning();\n        this.startRunning();\n        try {\n            return await cb();\n        } finally {\n            const measurementEnded = this.stopMeasurement(measurement);\n            this.measurements.push(measurementEnded);\n            this.addRun(measurementEnded);\n            /**\n             * Only add to total time if this run is not a child of another run.\n             * And then end running.\n             */\n            if (!isAlreadyRunning) {\n                this.addElapsed(measurementEnded);\n                this.endRunning();\n            }\n        }\n    }\n\n    private getIsAlreadyRunning(): boolean {\n        return this.isAlreadyRunning;\n    }\n    private startRunning(): void {\n        this.isAlreadyRunning = true;\n    }\n    private endRunning(): void {\n        this.isAlreadyRunning = false;\n    }\n\n    private async getIsEnabled(): Promise<boolean> {\n        if (this.state === BenchmarkState.ENABLED) {\n            return true;\n        } else if (this.state === BenchmarkState.DISABLED) {\n            return false;\n        }\n\n        for (const cb of this.enableOnCallables) {\n            const result = await cb();\n            if (result) {\n                this.enable();\n                return true;\n            }\n        }\n        this.disable();\n        return false;\n    }\n\n    private addElapsed(measurement: Pick<BenchmarkMeasurement, \"elapsed\">): void {\n        this.totalElapsed = this.totalElapsed + measurement.elapsed;\n    }\n\n    private addRun(measurement: Pick<BenchmarkMeasurement, \"name\" | \"category\">): void {\n        const name = `${measurement.category}#${measurement.name}`;\n        if (!this.runs[name]) {\n            this.runs[name] = 0;\n        }\n        this.runs[name]++;\n    }\n\n    private setState(state: BenchmarkState): void {\n        this.state = state;\n    }\n\n    private startMeasurement(options: BenchmarkMeasureOptions | string): BenchmarkMeasurementStart {\n        const name = typeof options === \"string\" ? options : options.name;\n        const category = typeof options === \"string\" ? \"webiny\" : options.category;\n        return {\n            name,\n            category,\n            start: new Date(),\n            memoryStart: process.memoryUsage().heapUsed\n        };\n    }\n\n    private stopMeasurement(measurement: BenchmarkMeasurementStart): BenchmarkMeasurement {\n        const end = new Date();\n        const memoryEnd = process.memoryUsage().heapUsed;\n        const elapsed = end.getTime() - measurement.start.getTime();\n        return {\n            name: measurement.name,\n            category: measurement.category,\n            start: measurement.start,\n            end,\n            elapsed,\n            memory: memoryEnd - measurement.memoryStart\n        };\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["BenchmarkState","createDefaultOutputCallable","benchmark","console","log","elapsed","measurements","Benchmark","outputDone","isAlreadyRunning","totalElapsed","runs","enableOnCallables","onOutputCallables","state","UNDETERMINED","enableOn","cb","push","onOutput","enable","setState","ENABLED","disable","DISABLED","output","length","callables","reverse","result","stop","measure","options","enabled","getIsEnabled","measurement","startMeasurement","getIsAlreadyRunning","startRunning","measurementEnded","stopMeasurement","addRun","addElapsed","endRunning","name","category","start","Date","memoryStart","process","memoryUsage","heapUsed","end","memoryEnd","getTime","memory","exports"],"sources":["Benchmark.ts"],"sourcesContent":["import type {\n    Benchmark as BenchmarkInterface,\n    BenchmarkEnableOnCallable,\n    BenchmarkMeasurement,\n    BenchmarkMeasureOptions,\n    BenchmarkOutputCallable,\n    BenchmarkRuns\n} from \"~/types\";\n\nenum BenchmarkState {\n    DISABLED = \"disabled\",\n    ENABLED = \"enabled\",\n    UNDETERMINED = \"undetermined\"\n}\n\ninterface BenchmarkMeasurementStart\n    extends Pick<BenchmarkMeasurement, \"name\" | \"category\" | \"start\"> {\n    memoryStart: number;\n}\n\nconst createDefaultOutputCallable = (): BenchmarkOutputCallable => {\n    return async ({ benchmark }) => {\n        console.log(`Benchmark total time elapsed: ${benchmark.elapsed}ms`);\n        console.log(\"Benchmark measurements:\");\n        console.log(benchmark.measurements);\n    };\n};\n\nexport class Benchmark implements BenchmarkInterface {\n    public readonly measurements: BenchmarkMeasurement[] = [];\n\n    private outputDone = false;\n    private isAlreadyRunning = false;\n    private totalElapsed = 0;\n    public readonly runs: BenchmarkRuns = {};\n    private readonly enableOnCallables: BenchmarkEnableOnCallable[] = [];\n    private readonly onOutputCallables: BenchmarkOutputCallable[] = [];\n    private state: BenchmarkState = BenchmarkState.UNDETERMINED;\n\n    public get elapsed(): number {\n        return this.totalElapsed;\n    }\n\n    public enableOn(cb: BenchmarkEnableOnCallable): void {\n        this.enableOnCallables.push(cb);\n    }\n\n    public onOutput(cb: BenchmarkOutputCallable): void {\n        this.onOutputCallables.push(cb);\n    }\n\n    public enable(): void {\n        this.setState(BenchmarkState.ENABLED);\n    }\n\n    public disable(): void {\n        this.setState(BenchmarkState.DISABLED);\n    }\n\n    /**\n     * When running the output, we need to reverse the callables array, so that the last one added is the first one executed.\n     *\n     * The last one is our built-in console.log output.\n     */\n    public async output(): Promise<void> {\n        /**\n         * No point in outputting more than once or if no measurements were made.\n         */\n        if (this.outputDone || this.measurements.length === 0) {\n            return;\n        }\n        const callables = [...this.onOutputCallables].reverse();\n        callables.push(createDefaultOutputCallable());\n        for (const cb of callables) {\n            const result = await cb({\n                benchmark: this,\n                stop: () => \"stop\"\n            });\n            if (result === \"stop\") {\n                return;\n            }\n        }\n        this.outputDone = true;\n    }\n\n    public async measure<T = any>(\n        options: BenchmarkMeasureOptions | string,\n        cb: () => Promise<T>\n    ): Promise<T> {\n        const enabled = await this.getIsEnabled();\n        if (!enabled) {\n            return cb();\n        }\n        const measurement = this.startMeasurement(options);\n        const isAlreadyRunning = this.getIsAlreadyRunning();\n        this.startRunning();\n        try {\n            return await cb();\n        } finally {\n            const measurementEnded = this.stopMeasurement(measurement);\n            this.measurements.push(measurementEnded);\n            this.addRun(measurementEnded);\n            /**\n             * Only add to total time if this run is not a child of another run.\n             * And then end running.\n             */\n            if (!isAlreadyRunning) {\n                this.addElapsed(measurementEnded);\n                this.endRunning();\n            }\n        }\n    }\n\n    private getIsAlreadyRunning(): boolean {\n        return this.isAlreadyRunning;\n    }\n    private startRunning(): void {\n        this.isAlreadyRunning = true;\n    }\n    private endRunning(): void {\n        this.isAlreadyRunning = false;\n    }\n\n    private async getIsEnabled(): Promise<boolean> {\n        if (this.state === BenchmarkState.ENABLED) {\n            return true;\n        } else if (this.state === BenchmarkState.DISABLED) {\n            return false;\n        }\n\n        for (const cb of this.enableOnCallables) {\n            const result = await cb();\n            if (result) {\n                this.enable();\n                return true;\n            }\n        }\n        this.disable();\n        return false;\n    }\n\n    private addElapsed(measurement: Pick<BenchmarkMeasurement, \"elapsed\">): void {\n        this.totalElapsed = this.totalElapsed + measurement.elapsed;\n    }\n\n    private addRun(measurement: Pick<BenchmarkMeasurement, \"name\" | \"category\">): void {\n        const name = `${measurement.category}#${measurement.name}`;\n        if (!this.runs[name]) {\n            this.runs[name] = 0;\n        }\n        this.runs[name]++;\n    }\n\n    private setState(state: BenchmarkState): void {\n        this.state = state;\n    }\n\n    private startMeasurement(options: BenchmarkMeasureOptions | string): BenchmarkMeasurementStart {\n        const name = typeof options === \"string\" ? options : options.name;\n        const category = typeof options === \"string\" ? \"webiny\" : options.category;\n        return {\n            name,\n            category,\n            start: new Date(),\n            memoryStart: process.memoryUsage().heapUsed\n        };\n    }\n\n    private stopMeasurement(measurement: BenchmarkMeasurementStart): BenchmarkMeasurement {\n        const end = new Date();\n        const memoryEnd = process.memoryUsage().heapUsed;\n        const elapsed = end.getTime() - measurement.start.getTime();\n        return {\n            name: measurement.name,\n            category: measurement.category,\n            start: measurement.start,\n            end,\n            elapsed,\n            memory: memoryEnd - measurement.memoryStart\n        };\n    }\n}\n"],"mappings":"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","ignoreList":[]}

package/ServiceDiscovery.d.ts

@@ -1,8 +1,12 @@
-import { DynamoDBDocument } from "@webiny/aws-sdk/client-dynamodb";
-import { GenericRecord } from "./types";
+import type { DynamoDBDocument } from "@webiny/aws-sdk/client-dynamodb";
+import type { GenericRecord } from "./types";
 type Manifest = GenericRecord<string>;
 export declare class ServiceDiscovery {
-    static setDocumentClient(client: DynamoDBDocument): void;
+    static setDocumentClient(client: Pick<DynamoDBDocument, "send">): void;
     static load(): Promise<Manifest | undefined>;
+    /**
+     * Should be used for testing purposes only!
+     */
+    static clear(): void;
 }
 export {};

package/ServiceDiscovery.js

@@ -31,6 +31,9 @@ class ServiceManifestLoader {
   setDocumentClient(client) {
     this.client = client;
   }
+  clear() {
+    this.manifest = undefined;
+  }
   async loadManifests() {
     const client = this.client || (0, _clientDynamodb.getDocumentClient)();
     const {
@@ -62,6 +65,12 @@ class ServiceDiscovery {
   static async load() {
     return serviceManifestLoader.load();
   }
+  /**
+   * Should be used for testing purposes only!
+   */
+  static clear() {
+    serviceManifestLoader.clear();
+  }
 }
 exports.ServiceDiscovery = ServiceDiscovery;
 

package/ServiceDiscovery.js.map

@@ -1 +1 @@
-{"version":3,"names":["_clientDynamodb","require","ServiceManifestLoader","manifest","undefined","load","manifests","loadManifests","reduce","acc","name","setDocumentClient","client","getDocumentClient","Items","send","QueryCommand","TableName","String","process","env","DB_TABLE","IndexName","KeyConditionExpression","ExpressionAttributeValues","S","Array","isArray","map","item","unmarshall","data","serviceManifestLoader","ServiceDiscovery","exports"],"sources":["ServiceDiscovery.ts"],"sourcesContent":["import {\n    getDocumentClient,\n    DynamoDBDocument,\n    QueryCommand,\n    unmarshall\n} from \"@webiny/aws-sdk/client-dynamodb\";\nimport { GenericRecord } from \"~/types\";\n\ninterface ServiceManifest {\n    name: string;\n    manifest: Manifest;\n}\n\ntype Manifest = GenericRecord<string>;\n\nclass ServiceManifestLoader {\n    private client: DynamoDBDocument | undefined;\n    private manifest: Manifest | undefined = undefined;\n\n    async load() {\n        if (this.manifest) {\n            return this.manifest;\n        }\n\n        const manifests = await this.loadManifests();\n\n        if (!manifests) {\n            return undefined;\n        }\n\n        /**\n         * Service manifests are already merged by unique names in the database, so we only need to construct\n         * a final object containing all manifests by name.\n         */\n        this.manifest = manifests.reduce((acc, manifest) => {\n            return { ...acc, [manifest.name]: manifest.manifest };\n        }, {});\n\n        return this.manifest;\n    }\n\n    setDocumentClient(client: DynamoDBDocument) {\n        this.client = client;\n    }\n\n    private async loadManifests(): Promise<ServiceManifest[] | undefined> {\n        const client = this.client || getDocumentClient();\n        const { Items } = await client.send(\n            new QueryCommand({\n                TableName: String(process.env.DB_TABLE),\n                IndexName: \"GSI1\",\n                KeyConditionExpression: \"GSI1_PK = :GSI1_PK AND GSI1_SK > :GSI1_SK\",\n                ExpressionAttributeValues: {\n                    \":GSI1_PK\": { S: `SERVICE_MANIFESTS` },\n                    \":GSI1_SK\": { S: \" \" }\n                }\n            })\n        );\n\n        if (!Array.isArray(Items)) {\n            return undefined;\n        }\n\n        return Items.map(item => unmarshall(item).data);\n    }\n}\n\nconst serviceManifestLoader = new ServiceManifestLoader();\n\nexport class ServiceDiscovery {\n    static setDocumentClient(client: DynamoDBDocument): void {\n        serviceManifestLoader.setDocumentClient(client);\n    }\n\n    static async load() {\n        return serviceManifestLoader.load();\n    }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AAeA,MAAMC,qBAAqB,CAAC;EAEhBC,QAAQ,GAAyBC,SAAS;EAElD,MAAMC,IAAIA,CAAA,EAAG;IACT,IAAI,IAAI,CAACF,QAAQ,EAAE;MACf,OAAO,IAAI,CAACA,QAAQ;IACxB;IAEA,MAAMG,SAAS,GAAG,MAAM,IAAI,CAACC,aAAa,CAAC,CAAC;IAE5C,IAAI,CAACD,SAAS,EAAE;MACZ,OAAOF,SAAS;IACpB;;IAEA;AACR;AACA;AACA;IACQ,IAAI,CAACD,QAAQ,GAAGG,SAAS,CAACE,MAAM,CAAC,CAACC,GAAG,EAAEN,QAAQ,KAAK;MAChD,OAAO;QAAE,GAAGM,GAAG;QAAE,CAACN,QAAQ,CAACO,IAAI,GAAGP,QAAQ,CAACA;MAAS,CAAC;IACzD,CAAC,EAAE,CAAC,CAAC,CAAC;IAEN,OAAO,IAAI,CAACA,QAAQ;EACxB;EAEAQ,iBAAiBA,CAACC,MAAwB,EAAE;IACxC,IAAI,CAACA,MAAM,GAAGA,MAAM;EACxB;EAEA,MAAcL,aAAaA,CAAA,EAA2C;IAClE,MAAMK,MAAM,GAAG,IAAI,CAACA,MAAM,IAAI,IAAAC,iCAAiB,EAAC,CAAC;IACjD,MAAM;MAAEC;IAAM,CAAC,GAAG,MAAMF,MAAM,CAACG,IAAI,CAC/B,IAAIC,4BAAY,CAAC;MACbC,SAAS,EAAEC,MAAM,CAACC,OAAO,CAACC,GAAG,CAACC,QAAQ,CAAC;MACvCC,SAAS,EAAE,MAAM;MACjBC,sBAAsB,EAAE,2CAA2C;MACnEC,yBAAyB,EAAE;QACvB,UAAU,EAAE;UAAEC,CAAC,EAAE;QAAoB,CAAC;QACtC,UAAU,EAAE;UAAEA,CAAC,EAAE;QAAI;MACzB;IACJ,CAAC,CACL,CAAC;IAED,IAAI,CAACC,KAAK,CAACC,OAAO,CAACb,KAAK,CAAC,EAAE;MACvB,OAAOV,SAAS;IACpB;IAEA,OAAOU,KAAK,CAACc,GAAG,CAACC,IAAI,IAAI,IAAAC,0BAAU,EAACD,IAAI,CAAC,CAACE,IAAI,CAAC;EACnD;AACJ;AAEA,MAAMC,qBAAqB,GAAG,IAAI9B,qBAAqB,CAAC,CAAC;AAElD,MAAM+B,gBAAgB,CAAC;EAC1B,OAAOtB,iBAAiBA,CAACC,MAAwB,EAAQ;IACrDoB,qBAAqB,CAACrB,iBAAiB,CAACC,MAAM,CAAC;EACnD;EAEA,aAAaP,IAAIA,CAAA,EAAG;IAChB,OAAO2B,qBAAqB,CAAC3B,IAAI,CAAC,CAAC;EACvC;AACJ;AAAC6B,OAAA,CAAAD,gBAAA,GAAAA,gBAAA","ignoreList":[]}
+{"version":3,"names":["_clientDynamodb","require","ServiceManifestLoader","manifest","undefined","load","manifests","loadManifests","reduce","acc","name","setDocumentClient","client","clear","getDocumentClient","Items","send","QueryCommand","TableName","String","process","env","DB_TABLE","IndexName","KeyConditionExpression","ExpressionAttributeValues","S","Array","isArray","map","item","unmarshall","data","serviceManifestLoader","ServiceDiscovery","exports"],"sources":["ServiceDiscovery.ts"],"sourcesContent":["import type { DynamoDBDocument } from \"@webiny/aws-sdk/client-dynamodb\";\nimport { getDocumentClient, QueryCommand, unmarshall } from \"@webiny/aws-sdk/client-dynamodb\";\nimport type { GenericRecord } from \"~/types\";\n\ninterface ServiceManifest {\n    name: string;\n    manifest: Manifest;\n}\n\ntype Manifest = GenericRecord<string>;\n\nclass ServiceManifestLoader {\n    private client: Pick<DynamoDBDocument, \"send\"> | undefined;\n    private manifest: Manifest | undefined = undefined;\n\n    public async load() {\n        if (this.manifest) {\n            return this.manifest;\n        }\n\n        const manifests = await this.loadManifests();\n\n        if (!manifests) {\n            return undefined;\n        }\n\n        /**\n         * Service manifests are already merged by unique names in the database, so we only need to construct\n         * a final object containing all manifests by name.\n         */\n        this.manifest = manifests.reduce((acc, manifest) => {\n            return { ...acc, [manifest.name]: manifest.manifest };\n        }, {});\n\n        return this.manifest;\n    }\n\n    public setDocumentClient(client: Pick<DynamoDBDocument, \"send\">) {\n        this.client = client;\n    }\n\n    public clear(): void {\n        this.manifest = undefined;\n    }\n\n    private async loadManifests(): Promise<ServiceManifest[] | undefined> {\n        const client = this.client || getDocumentClient();\n        const { Items } = await client.send(\n            new QueryCommand({\n                TableName: String(process.env.DB_TABLE),\n                IndexName: \"GSI1\",\n                KeyConditionExpression: \"GSI1_PK = :GSI1_PK AND GSI1_SK > :GSI1_SK\",\n                ExpressionAttributeValues: {\n                    \":GSI1_PK\": { S: `SERVICE_MANIFESTS` },\n                    \":GSI1_SK\": { S: \" \" }\n                }\n            })\n        );\n\n        if (!Array.isArray(Items)) {\n            return undefined;\n        }\n\n        return Items.map(item => unmarshall(item).data);\n    }\n}\n\nconst serviceManifestLoader = new ServiceManifestLoader();\n\nexport class ServiceDiscovery {\n    static setDocumentClient(client: Pick<DynamoDBDocument, \"send\">): void {\n        serviceManifestLoader.setDocumentClient(client);\n    }\n\n    static async load() {\n        return serviceManifestLoader.load();\n    }\n    /**\n     * Should be used for testing purposes only!\n     */\n    static clear(): void {\n        serviceManifestLoader.clear();\n    }\n}\n"],"mappings":";;;;;;AACA,IAAAA,eAAA,GAAAC,OAAA;AAUA,MAAMC,qBAAqB,CAAC;EAEhBC,QAAQ,GAAyBC,SAAS;EAElD,MAAaC,IAAIA,CAAA,EAAG;IAChB,IAAI,IAAI,CAACF,QAAQ,EAAE;MACf,OAAO,IAAI,CAACA,QAAQ;IACxB;IAEA,MAAMG,SAAS,GAAG,MAAM,IAAI,CAACC,aAAa,CAAC,CAAC;IAE5C,IAAI,CAACD,SAAS,EAAE;MACZ,OAAOF,SAAS;IACpB;;IAEA;AACR;AACA;AACA;IACQ,IAAI,CAACD,QAAQ,GAAGG,SAAS,CAACE,MAAM,CAAC,CAACC,GAAG,EAAEN,QAAQ,KAAK;MAChD,OAAO;QAAE,GAAGM,GAAG;QAAE,CAACN,QAAQ,CAACO,IAAI,GAAGP,QAAQ,CAACA;MAAS,CAAC;IACzD,CAAC,EAAE,CAAC,CAAC,CAAC;IAEN,OAAO,IAAI,CAACA,QAAQ;EACxB;EAEOQ,iBAAiBA,CAACC,MAAsC,EAAE;IAC7D,IAAI,CAACA,MAAM,GAAGA,MAAM;EACxB;EAEOC,KAAKA,CAAA,EAAS;IACjB,IAAI,CAACV,QAAQ,GAAGC,SAAS;EAC7B;EAEA,MAAcG,aAAaA,CAAA,EAA2C;IAClE,MAAMK,MAAM,GAAG,IAAI,CAACA,MAAM,IAAI,IAAAE,iCAAiB,EAAC,CAAC;IACjD,MAAM;MAAEC;IAAM,CAAC,GAAG,MAAMH,MAAM,CAACI,IAAI,CAC/B,IAAIC,4BAAY,CAAC;MACbC,SAAS,EAAEC,MAAM,CAACC,OAAO,CAACC,GAAG,CAACC,QAAQ,CAAC;MACvCC,SAAS,EAAE,MAAM;MACjBC,sBAAsB,EAAE,2CAA2C;MACnEC,yBAAyB,EAAE;QACvB,UAAU,EAAE;UAAEC,CAAC,EAAE;QAAoB,CAAC;QACtC,UAAU,EAAE;UAAEA,CAAC,EAAE;QAAI;MACzB;IACJ,CAAC,CACL,CAAC;IAED,IAAI,CAACC,KAAK,CAACC,OAAO,CAACb,KAAK,CAAC,EAAE;MACvB,OAAOX,SAAS;IACpB;IAEA,OAAOW,KAAK,CAACc,GAAG,CAACC,IAAI,IAAI,IAAAC,0BAAU,EAACD,IAAI,CAAC,CAACE,IAAI,CAAC;EACnD;AACJ;AAEA,MAAMC,qBAAqB,GAAG,IAAI/B,qBAAqB,CAAC,CAAC;AAElD,MAAMgC,gBAAgB,CAAC;EAC1B,OAAOvB,iBAAiBA,CAACC,MAAsC,EAAQ;IACnEqB,qBAAqB,CAACtB,iBAAiB,CAACC,MAAM,CAAC;EACnD;EAEA,aAAaP,IAAIA,CAAA,EAAG;IAChB,OAAO4B,qBAAqB,CAAC5B,IAAI,CAAC,CAAC;EACvC;EACA;AACJ;AACA;EACI,OAAOQ,KAAKA,CAAA,EAAS;IACjBoB,qBAAqB,CAACpB,KAAK,CAAC,CAAC;EACjC;AACJ;AAACsB,OAAA,CAAAD,gBAAA,GAAAA,gBAAA","ignoreList":[]}

package/createConditionalPluginFactory.d.ts

@@ -1,3 +1,3 @@
-import { PluginFactory } from "@webiny/plugins/types";
+import type { PluginFactory } from "@webiny/plugins/types";
 export type Condition = () => boolean;
 export declare const createConditionalPluginFactory: (condition: Condition, cb: PluginFactory) => PluginFactory;

package/createConditionalPluginFactory.js.map

@@ -1 +1 @@
-{"version":3,"names":["createConditionalPluginFactory","condition","cb","Promise","resolve","exports"],"sources":["createConditionalPluginFactory.ts"],"sourcesContent":["import { PluginFactory } from \"@webiny/plugins/types\";\n\nexport type Condition = () => boolean;\n\nexport const createConditionalPluginFactory = (\n    condition: Condition,\n    cb: PluginFactory\n): PluginFactory => {\n    return () => {\n        if (condition()) {\n            return cb();\n        }\n\n        return Promise.resolve([]);\n    };\n};\n"],"mappings":";;;;;;AAIO,MAAMA,8BAA8B,GAAGA,CAC1CC,SAAoB,EACpBC,EAAiB,KACD;EAChB,OAAO,MAAM;IACT,IAAID,SAAS,CAAC,CAAC,EAAE;MACb,OAAOC,EAAE,CAAC,CAAC;IACf;IAEA,OAAOC,OAAO,CAACC,OAAO,CAAC,EAAE,CAAC;EAC9B,CAAC;AACL,CAAC;AAACC,OAAA,CAAAL,8BAAA,GAAAA,8BAAA","ignoreList":[]}
+{"version":3,"names":["createConditionalPluginFactory","condition","cb","Promise","resolve","exports"],"sources":["createConditionalPluginFactory.ts"],"sourcesContent":["import type { PluginFactory } from \"@webiny/plugins/types\";\n\nexport type Condition = () => boolean;\n\nexport const createConditionalPluginFactory = (\n    condition: Condition,\n    cb: PluginFactory\n): PluginFactory => {\n    return () => {\n        if (condition()) {\n            return cb();\n        }\n\n        return Promise.resolve([]);\n    };\n};\n"],"mappings":";;;;;;AAIO,MAAMA,8BAA8B,GAAGA,CAC1CC,SAAoB,EACpBC,EAAiB,KACD;EAChB,OAAO,MAAM;IACT,IAAID,SAAS,CAAC,CAAC,EAAE;MACb,OAAOC,EAAE,CAAC,CAAC;IACf;IAEA,OAAOC,OAAO,CAACC,OAAO,CAAC,EAAE,CAAC;EAC9B,CAAC;AACL,CAAC;AAACC,OAAA,CAAAL,8BAAA,GAAAA,8BAAA","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api",
-	"version": "5.43.3",
+	"version": "6.0.0-alpha.1",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -12,12 +12,12 @@
 	],
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/aws-sdk": "5.43.3",
-		"@webiny/plugins": "5.43.3",
-		"@webiny/utils": "5.43.3"
+		"@webiny/aws-sdk": "6.0.0-alpha.1",
+		"@webiny/plugins": "6.0.0-alpha.1",
+		"@webiny/utils": "6.0.0-alpha.1"
 	},
 	"devDependencies": {
-		"@webiny/project-utils": "5.43.3",
+		"@webiny/project-utils": "6.0.0-alpha.1",
 		"rimraf": "6.0.1",
 		"typescript": "5.3.3"
 	},
@@ -29,5 +29,5 @@
 		"build": "node ../cli/bin.js run build",
 		"watch": "node ../cli/bin.js run watch"
 	},
-	"gitHead": "c6d623eb1b715f3731434a8d3107b8fd8a1d6792"
+	"gitHead": "9bd236cf5e689f209a11bec089207dcc2d41a53c"
 }

package/plugins/BenchmarkPlugin.d.ts

@@ -1,5 +1,5 @@
 import { Plugin } from "@webiny/plugins";
-import { Benchmark } from "../types";
+import type { Benchmark } from "../types";
 /**
  * This plugin should be initialized only once per context, hence the name of the plugin.
  */

package/plugins/BenchmarkPlugin.js.map

@@ -1 +1 @@
-{"version":3,"names":["_plugins","require","BenchmarkPlugin","Plugin","type","name","constructor","benchmark","enable","disable","measure","cb","exports"],"sources":["BenchmarkPlugin.ts"],"sourcesContent":["import { Plugin } from \"@webiny/plugins\";\nimport { Benchmark } from \"~/types\";\n\n/**\n * This plugin should be initialized only once per context, hence the name of the plugin.\n */\nexport class BenchmarkPlugin extends Plugin {\n    public static override readonly type: string = \"context.benchmark\";\n    public override name = \"context.benchmark\";\n    public readonly benchmark: Benchmark;\n\n    public constructor(benchmark: Benchmark) {\n        super();\n        this.benchmark = benchmark;\n    }\n\n    public enable(): void {\n        this.benchmark.enable();\n    }\n\n    public disable(): void {\n        this.benchmark.disable();\n    }\n\n    public async measure<T = any>(name: string, cb: () => Promise<T>): Promise<T> {\n        return this.benchmark.measure<T>(name, cb);\n    }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAGA;AACA;AACA;AACO,MAAMC,eAAe,SAASC,eAAM,CAAC;EACxC,OAAgCC,IAAI,GAAW,mBAAmB;EAClDC,IAAI,GAAG,mBAAmB;EAGnCC,WAAWA,CAACC,SAAoB,EAAE;IACrC,KAAK,CAAC,CAAC;IACP,IAAI,CAACA,SAAS,GAAGA,SAAS;EAC9B;EAEOC,MAAMA,CAAA,EAAS;IAClB,IAAI,CAACD,SAAS,CAACC,MAAM,CAAC,CAAC;EAC3B;EAEOC,OAAOA,CAAA,EAAS;IACnB,IAAI,CAACF,SAAS,CAACE,OAAO,CAAC,CAAC;EAC5B;EAEA,MAAaC,OAAOA,CAAUL,IAAY,EAAEM,EAAoB,EAAc;IAC1E,OAAO,IAAI,CAACJ,SAAS,CAACG,OAAO,CAAIL,IAAI,EAAEM,EAAE,CAAC;EAC9C;AACJ;AAACC,OAAA,CAAAV,eAAA,GAAAA,eAAA","ignoreList":[]}
+{"version":3,"names":["_plugins","require","BenchmarkPlugin","Plugin","type","name","constructor","benchmark","enable","disable","measure","cb","exports"],"sources":["BenchmarkPlugin.ts"],"sourcesContent":["import { Plugin } from \"@webiny/plugins\";\nimport type { Benchmark } from \"~/types\";\n\n/**\n * This plugin should be initialized only once per context, hence the name of the plugin.\n */\nexport class BenchmarkPlugin extends Plugin {\n    public static override readonly type: string = \"context.benchmark\";\n    public override name = \"context.benchmark\";\n    public readonly benchmark: Benchmark;\n\n    public constructor(benchmark: Benchmark) {\n        super();\n        this.benchmark = benchmark;\n    }\n\n    public enable(): void {\n        this.benchmark.enable();\n    }\n\n    public disable(): void {\n        this.benchmark.disable();\n    }\n\n    public async measure<T = any>(name: string, cb: () => Promise<T>): Promise<T> {\n        return this.benchmark.measure<T>(name, cb);\n    }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAGA;AACA;AACA;AACO,MAAMC,eAAe,SAASC,eAAM,CAAC;EACxC,OAAgCC,IAAI,GAAW,mBAAmB;EAClDC,IAAI,GAAG,mBAAmB;EAGnCC,WAAWA,CAACC,SAAoB,EAAE;IACrC,KAAK,CAAC,CAAC;IACP,IAAI,CAACA,SAAS,GAAGA,SAAS;EAC9B;EAEOC,MAAMA,CAAA,EAAS;IAClB,IAAI,CAACD,SAAS,CAACC,MAAM,CAAC,CAAC;EAC3B;EAEOC,OAAOA,CAAA,EAAS;IACnB,IAAI,CAACF,SAAS,CAACE,OAAO,CAAC,CAAC;EAC5B;EAEA,MAAaC,OAAOA,CAAUL,IAAY,EAAEM,EAAoB,EAAc;IAC1E,OAAO,IAAI,CAACJ,SAAS,CAACG,OAAO,CAAIL,IAAI,EAAEM,EAAE,CAAC;EAC9C;AACJ;AAACC,OAAA,CAAAV,eAAA,GAAAA,eAAA","ignoreList":[]}

package/plugins/CompressorPlugin.d.ts

@@ -1,5 +1,5 @@
 import { Plugin } from "@webiny/plugins/Plugin";
-import { ICompressor } from "@webiny/utils/compression/Compressor";
+import type { ICompressor } from "@webiny/utils/compression/Compressor";
 export interface ICompressorPluginParams {
     getCompressor(): ICompressor;
 }

package/plugins/CompressorPlugin.js.map

@@ -1 +1 @@
-{"version":3,"names":["_Plugin","require","CompressorPlugin","Plugin","name","type","constructor","params","getCompressor","exports"],"sources":["CompressorPlugin.ts"],"sourcesContent":["import { Plugin } from \"@webiny/plugins/Plugin\";\nimport { ICompressor } from \"@webiny/utils/compression/Compressor\";\n\nexport interface ICompressorPluginParams {\n    getCompressor(): ICompressor;\n}\n\n/**\n * Should never be initialized outside the api package.\n */\nexport class CompressorPlugin extends Plugin {\n    public override readonly name: string = \"context.compressor\";\n    public static override type: string = \"context.compressor\";\n\n    public readonly getCompressor: () => ICompressor;\n\n    public constructor(params: ICompressorPluginParams) {\n        super();\n        this.getCompressor = params.getCompressor;\n    }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AAOA;AACA;AACA;AACO,MAAMC,gBAAgB,SAASC,cAAM,CAAC;EAChBC,IAAI,GAAW,oBAAoB;EAC5D,OAAuBC,IAAI,GAAW,oBAAoB;EAInDC,WAAWA,CAACC,MAA+B,EAAE;IAChD,KAAK,CAAC,CAAC;IACP,IAAI,CAACC,aAAa,GAAGD,MAAM,CAACC,aAAa;EAC7C;AACJ;AAACC,OAAA,CAAAP,gBAAA,GAAAA,gBAAA","ignoreList":[]}
+{"version":3,"names":["_Plugin","require","CompressorPlugin","Plugin","name","type","constructor","params","getCompressor","exports"],"sources":["CompressorPlugin.ts"],"sourcesContent":["import { Plugin } from \"@webiny/plugins/Plugin\";\nimport type { ICompressor } from \"@webiny/utils/compression/Compressor\";\n\nexport interface ICompressorPluginParams {\n    getCompressor(): ICompressor;\n}\n\n/**\n * Should never be initialized outside the api package.\n */\nexport class CompressorPlugin extends Plugin {\n    public override readonly name: string = \"context.compressor\";\n    public static override type: string = \"context.compressor\";\n\n    public readonly getCompressor: () => ICompressor;\n\n    public constructor(params: ICompressorPluginParams) {\n        super();\n        this.getCompressor = params.getCompressor;\n    }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AAOA;AACA;AACA;AACO,MAAMC,gBAAgB,SAASC,cAAM,CAAC;EAChBC,IAAI,GAAW,oBAAoB;EAC5D,OAAuBC,IAAI,GAAW,oBAAoB;EAInDC,WAAWA,CAACC,MAA+B,EAAE;IAChD,KAAK,CAAC,CAAC;IACP,IAAI,CAACC,aAAa,GAAGD,MAAM,CAACC,aAAa;EAC7C;AACJ;AAACC,OAAA,CAAAP,gBAAA,GAAAA,gBAAA","ignoreList":[]}

package/plugins/ContextPlugin.d.ts

@@ -1,5 +1,5 @@
 import { Plugin } from "@webiny/plugins";
-import { Context } from "../types";
+import type { Context } from "../types";
 export interface ContextPluginCallable<T extends Context = Context> {
     (context: T): void | Promise<void>;
 }
@@ -9,4 +9,8 @@ export declare class ContextPlugin<T extends Context = Context> extends Plugin {
     constructor(callable: ContextPluginCallable<T>);
     apply(context: T): Promise<void>;
 }
-export declare const createContextPlugin: <T extends Context = Context>(callable: ContextPluginCallable<T>) => ContextPlugin<T>;
+interface ContextPluginOptions {
+    name?: string;
+}
+export declare const createContextPlugin: <T extends Context = Context>(callable: ContextPluginCallable<T>, options?: ContextPluginOptions) => ContextPlugin<T>;
+export {};

package/plugins/ContextPlugin.js

@@ -19,8 +19,12 @@ class ContextPlugin extends _plugins.Plugin {
   }
 }
 exports.ContextPlugin = ContextPlugin;
-const createContextPlugin = callable => {
-  return new ContextPlugin(callable);
+const createContextPlugin = (callable, options) => {
+  const plugin = new ContextPlugin(callable);
+  if (options && options.name) {
+    plugin.name = options.name;
+  }
+  return plugin;
 };
 exports.createContextPlugin = createContextPlugin;
 

package/plugins/ContextPlugin.js.map

@@ -1 +1 @@
-{"version":3,"names":["_plugins","require","ContextPlugin","Plugin","type","constructor","callable","_callable","apply","context","Error","exports","createContextPlugin"],"sources":["ContextPlugin.ts"],"sourcesContent":["import { Plugin } from \"@webiny/plugins\";\nimport { Context } from \"~/types\";\n\nexport interface ContextPluginCallable<T extends Context = Context> {\n    (context: T): void | Promise<void>;\n}\n\nexport class ContextPlugin<T extends Context = Context> extends Plugin {\n    public static override readonly type: string = \"context\";\n    private readonly _callable: ContextPluginCallable<T>;\n\n    constructor(callable: ContextPluginCallable<T>) {\n        super();\n        this._callable = callable;\n    }\n\n    public async apply(context: T): Promise<void> {\n        if (typeof this._callable !== \"function\") {\n            throw Error(\n                `Missing callable in ContextPlugin! Either pass a callable to plugin constructor or extend the plugin and override the \"apply\" method.`\n            );\n        }\n\n        return this._callable(context);\n    }\n}\n\nexport const createContextPlugin = <T extends Context = Context>(\n    callable: ContextPluginCallable<T>\n): ContextPlugin<T> => {\n    return new ContextPlugin<T>(callable);\n};\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAOO,MAAMC,aAAa,SAAsCC,eAAM,CAAC;EACnE,OAAgCC,IAAI,GAAW,SAAS;EAGxDC,WAAWA,CAACC,QAAkC,EAAE;IAC5C,KAAK,CAAC,CAAC;IACP,IAAI,CAACC,SAAS,GAAGD,QAAQ;EAC7B;EAEA,MAAaE,KAAKA,CAACC,OAAU,EAAiB;IAC1C,IAAI,OAAO,IAAI,CAACF,SAAS,KAAK,UAAU,EAAE;MACtC,MAAMG,KAAK,CACP,uIACJ,CAAC;IACL;IAEA,OAAO,IAAI,CAACH,SAAS,CAACE,OAAO,CAAC;EAClC;AACJ;AAACE,OAAA,CAAAT,aAAA,GAAAA,aAAA;AAEM,MAAMU,mBAAmB,GAC5BN,QAAkC,IACf;EACnB,OAAO,IAAIJ,aAAa,CAAII,QAAQ,CAAC;AACzC,CAAC;AAACK,OAAA,CAAAC,mBAAA,GAAAA,mBAAA","ignoreList":[]}
+{"version":3,"names":["_plugins","require","ContextPlugin","Plugin","type","constructor","callable","_callable","apply","context","Error","exports","createContextPlugin","options","plugin","name"],"sources":["ContextPlugin.ts"],"sourcesContent":["import { Plugin } from \"@webiny/plugins\";\nimport type { Context } from \"~/types\";\n\nexport interface ContextPluginCallable<T extends Context = Context> {\n    (context: T): void | Promise<void>;\n}\n\nexport class ContextPlugin<T extends Context = Context> extends Plugin {\n    public static override readonly type: string = \"context\";\n    private readonly _callable: ContextPluginCallable<T>;\n\n    constructor(callable: ContextPluginCallable<T>) {\n        super();\n        this._callable = callable;\n    }\n\n    public async apply(context: T): Promise<void> {\n        if (typeof this._callable !== \"function\") {\n            throw Error(\n                `Missing callable in ContextPlugin! Either pass a callable to plugin constructor or extend the plugin and override the \"apply\" method.`\n            );\n        }\n\n        return this._callable(context);\n    }\n}\n\ninterface ContextPluginOptions {\n    name?: string;\n}\n\nexport const createContextPlugin = <T extends Context = Context>(\n    callable: ContextPluginCallable<T>,\n    options?: ContextPluginOptions\n): ContextPlugin<T> => {\n    const plugin = new ContextPlugin<T>(callable);\n    if (options && options.name) {\n        plugin.name = options.name;\n    }\n    return plugin;\n};\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAOO,MAAMC,aAAa,SAAsCC,eAAM,CAAC;EACnE,OAAgCC,IAAI,GAAW,SAAS;EAGxDC,WAAWA,CAACC,QAAkC,EAAE;IAC5C,KAAK,CAAC,CAAC;IACP,IAAI,CAACC,SAAS,GAAGD,QAAQ;EAC7B;EAEA,MAAaE,KAAKA,CAACC,OAAU,EAAiB;IAC1C,IAAI,OAAO,IAAI,CAACF,SAAS,KAAK,UAAU,EAAE;MACtC,MAAMG,KAAK,CACP,uIACJ,CAAC;IACL;IAEA,OAAO,IAAI,CAACH,SAAS,CAACE,OAAO,CAAC;EAClC;AACJ;AAACE,OAAA,CAAAT,aAAA,GAAAA,aAAA;AAMM,MAAMU,mBAAmB,GAAGA,CAC/BN,QAAkC,EAClCO,OAA8B,KACX;EACnB,MAAMC,MAAM,GAAG,IAAIZ,aAAa,CAAII,QAAQ,CAAC;EAC7C,IAAIO,OAAO,IAAIA,OAAO,CAACE,IAAI,EAAE;IACzBD,MAAM,CAACC,IAAI,GAAGF,OAAO,CAACE,IAAI;EAC9B;EACA,OAAOD,MAAM;AACjB,CAAC;AAACH,OAAA,CAAAC,mBAAA,GAAAA,mBAAA","ignoreList":[]}

package/types.d.ts

@@ -1,7 +1,10 @@
-import { PluginsContainer } from "@webiny/plugins";
-import { ICompressor } from "@webiny/utils/compression/Compressor";
+import type { PluginsContainer } from "@webiny/plugins";
+import type { ICompressor } from "@webiny/utils/compression/Compressor";
 export type GenericRecord<K extends PropertyKey = PropertyKey, V = any> = Record<K, V>;
 export type NonEmptyArray<T> = [T, ...T[]];
+export type PossiblyUndefinedProperties<T> = {
+    [K in keyof T]: T[K] extends undefined ? T[K] : T[K] | undefined;
+};
 export type BenchmarkRuns = GenericRecord<string, number>;
 export interface BenchmarkMeasurement {
     name: string;

package/types.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import { PluginsContainer } from \"@webiny/plugins\";\nimport { ICompressor } from \"@webiny/utils/compression/Compressor\";\n\nexport type GenericRecord<K extends PropertyKey = PropertyKey, V = any> = Record<K, V>;\n\nexport type NonEmptyArray<T> = [T, ...T[]];\n\nexport type BenchmarkRuns = GenericRecord<string, number>;\n\nexport interface BenchmarkMeasurement {\n    name: string;\n    category: string;\n    start: Date;\n    end: Date;\n    elapsed: number;\n    memory: number;\n}\n\nexport interface BenchmarkEnableOnCallable {\n    (): Promise<boolean>;\n}\n\nexport interface BenchmarkOutputCallableParams {\n    benchmark: Benchmark;\n    stop: () => \"stop\";\n}\nexport interface BenchmarkOutputCallable {\n    (params: BenchmarkOutputCallableParams): Promise<\"stop\" | undefined | null | void>;\n}\nexport interface BenchmarkMeasureOptions {\n    name: string;\n    category: string;\n}\nexport interface Benchmark {\n    elapsed: number;\n    runs: BenchmarkRuns;\n    measurements: BenchmarkMeasurement[];\n    output: () => Promise<void>;\n    onOutput: (cb: BenchmarkOutputCallable) => void;\n    enableOn: (cb: BenchmarkEnableOnCallable) => void;\n    measure: <T = any>(\n        options: BenchmarkMeasureOptions | string,\n        cb: () => Promise<T>\n    ) => Promise<T>;\n    enable: () => void;\n    disable: () => void;\n}\n\n/**\n * The main context which is constructed on every request.\n * All other contexts should extend or augment this one.\n */\nexport interface Context {\n    plugins: PluginsContainer;\n    readonly WEBINY_VERSION: string;\n    /**\n     * Not to be used outside of Webiny internal code.\n     * @internal\n     */\n    hasResult: () => boolean;\n    /**\n     * Not to be used outside of Webiny internal code.\n     * @internal\n     *\n     * @private\n     */\n    _result?: unknown;\n    /**\n     * Not to be used outside of Webiny internal code.\n     * @internal\n     */\n    setResult: (value: unknown) => void;\n    /**\n     * Not to be used outside of Webiny internal code.\n     * @internal\n     */\n    getResult: () => void;\n    /**\n     * Wait for property to be defined on the object and then execute the callable.\n     * In case of multiple objects defined, wait for all of them.\n     */\n    waitFor: <T extends Context = Context>(\n        obj: string[] | string,\n        cb: (context: T) => void\n    ) => void;\n    /**\n     * Benchmark instance to help determine possible bugs and slow code.\n     */\n    benchmark: Benchmark;\n    /**\n     * Compressor instance to compress and decompress the data.\n     */\n    compressor: ICompressor;\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport type { ICompressor } from \"@webiny/utils/compression/Compressor\";\n\nexport type GenericRecord<K extends PropertyKey = PropertyKey, V = any> = Record<K, V>;\n\nexport type NonEmptyArray<T> = [T, ...T[]];\n\nexport type PossiblyUndefinedProperties<T> = {\n    [K in keyof T]: T[K] extends undefined ? T[K] : T[K] | undefined;\n};\n\nexport type BenchmarkRuns = GenericRecord<string, number>;\n\nexport interface BenchmarkMeasurement {\n    name: string;\n    category: string;\n    start: Date;\n    end: Date;\n    elapsed: number;\n    memory: number;\n}\n\nexport interface BenchmarkEnableOnCallable {\n    (): Promise<boolean>;\n}\n\nexport interface BenchmarkOutputCallableParams {\n    benchmark: Benchmark;\n    stop: () => \"stop\";\n}\nexport interface BenchmarkOutputCallable {\n    (params: BenchmarkOutputCallableParams): Promise<\"stop\" | undefined | null | void>;\n}\nexport interface BenchmarkMeasureOptions {\n    name: string;\n    category: string;\n}\nexport interface Benchmark {\n    elapsed: number;\n    runs: BenchmarkRuns;\n    measurements: BenchmarkMeasurement[];\n    output: () => Promise<void>;\n    onOutput: (cb: BenchmarkOutputCallable) => void;\n    enableOn: (cb: BenchmarkEnableOnCallable) => void;\n    measure: <T = any>(\n        options: BenchmarkMeasureOptions | string,\n        cb: () => Promise<T>\n    ) => Promise<T>;\n    enable: () => void;\n    disable: () => void;\n}\n\n/**\n * The main context which is constructed on every request.\n * All other contexts should extend or augment this one.\n */\nexport interface Context {\n    plugins: PluginsContainer;\n    readonly WEBINY_VERSION: string;\n    /**\n     * Not to be used outside of Webiny internal code.\n     * @internal\n     */\n    hasResult: () => boolean;\n    /**\n     * Not to be used outside of Webiny internal code.\n     * @internal\n     *\n     * @private\n     */\n    _result?: unknown;\n    /**\n     * Not to be used outside of Webiny internal code.\n     * @internal\n     */\n    setResult: (value: unknown) => void;\n    /**\n     * Not to be used outside of Webiny internal code.\n     * @internal\n     */\n    getResult: () => void;\n    /**\n     * Wait for property to be defined on the object and then execute the callable.\n     * In case of multiple objects defined, wait for all of them.\n     */\n    waitFor: <T extends Context = Context>(\n        obj: string[] | string,\n        cb: (context: T) => void\n    ) => void;\n    /**\n     * Benchmark instance to help determine possible bugs and slow code.\n     */\n    benchmark: Benchmark;\n    /**\n     * Compressor instance to compress and decompress the data.\n     */\n    compressor: ICompressor;\n}\n"],"mappings":"","ignoreList":[]}