@seriousme/opifex 1.9.4 → 1.10.1

package/dist/mqttPacket/decoder.js

@@ -1,5 +1,10 @@
 import { invalidTopic, invalidTopicFilter } from "./validators.js";
+import { isValidReasonCode } from "./ReasonCode.js";
+import { propertyByNumber, PropertyByPropertySetType, propertyKind, propertyToId, propertyToKind, } from "./Properties.js";
 const utf8Decoder = new TextDecoder("utf-8");
+const userPropID = propertyToId.userProperty;
+const subIdentID = propertyToId.subscriptionIdentifier;
+const subIdentsID = propertyToId.subscriptionIdentifiers;
 /**
  * Checks if a specific bit flag is set in a byte using a bitmask
  * @param byte - The byte to check
@@ -42,6 +47,7 @@ export class DecoderError extends Error {
  * Decoder class for parsing MQTT packets
  */
 export class Decoder {
+    packetType;
     buf;
     pos;
     len;
@@ -50,7 +56,8 @@ export class Decoder {
      * @param buf - The buffer to decode
      * @param pos - Starting position in the buffer (default: 0)
      */
-    constructor(buf, pos = 0) {
+    constructor(packetType, buf, pos = 0) {
+        this.packetType = packetType;
         this.buf = buf;
         this.pos = pos;
         this.len = buf.length;
@@ -82,6 +89,35 @@ export class Decoder {
         const lsb = this.getByte();
         return (msb << 8) | lsb;
     }
+    /**
+     * Gets a 4 byte integer from the buffer (for v5)
+     * @returns The 32 bit integer value
+     */
+    getInt32() {
+        const msb = this.getInt16();
+        const lsb = this.getInt16();
+        return (msb << 16) | lsb;
+    }
+    /**
+     * Gets a variable byte integer from the buffer (for v5)
+     * its like the length decoder in length.ts but this one works directly on the buffer
+     * @returns The decoded variable byte integer
+     * @throws {DecoderError} If malformed variable byte integer
+     */
+    getVariableByteInteger() {
+        let num = 0;
+        let multiplier = 1;
+        let byte;
+        do {
+            byte = this.getByte();
+            num += (byte & 127) * multiplier;
+            if (multiplier > 128 * 128 * 128) {
+                throw new DecoderError("Malformed Variable Byte Integer");
+            }
+            multiplier *= 128;
+        } while ((byte & 128) !== 0);
+        return num;
+    }
     /**
      * Gets a byte array from the buffer
      * @returns A subarray of the buffer
@@ -98,17 +134,26 @@ export class Decoder {
      * Gets a UTF-8 string from the buffer
      * @returns The decoded UTF-8 string
      */
-    getUtf8String() {
+    getUTF8String() {
         const str = utf8Decoder.decode(this.getByteArray());
         return str;
     }
+    /**
+     * Gets a UTF-8 string pair from the buffer (for v5)
+     * @returns The decoded UTF-8 pair as [name,value]
+     */
+    getUTF8StringPair() {
+        const name = utf8Decoder.decode(this.getByteArray());
+        const value = utf8Decoder.decode(this.getByteArray());
+        return [name, value];
+    }
     /**
      * Gets a topic from the buffer
      * @returns The decoded topic
      * @throws {DecoderError} If topic is invalid
      */
     getTopic() {
-        const topic = this.getUtf8String();
+        const topic = this.getUTF8String();
         if (invalidTopic(topic)) {
             throw new DecoderError("Topic must contain valid UTF-8 and contain more than 1 byte and no wildcards");
         }
@@ -120,7 +165,7 @@ export class Decoder {
      * @throws {DecoderError} If topic filter is invalid
      */
     getTopicFilter() {
-        const topicFilter = this.getUtf8String();
+        const topicFilter = this.getUTF8String();
         if (invalidTopicFilter(topicFilter)) {
             throw new DecoderError("Topicfilter must contain valid UTF-8 and contain more than 1 byte and valid wildcards");
         }
@@ -136,6 +181,92 @@ export class Decoder {
         this.pos = end;
         return this.buf.subarray(start, end);
     }
+    /**
+     * Gets a single property
+     * @param id
+     * @returns
+     */
+    getProperty(id) {
+        switch (propertyToKind[id]) {
+            case propertyKind.boolean:
+                return !!this.getByte();
+            case propertyKind.byte:
+                return this.getByte();
+            case propertyKind.int16:
+                return this.getInt16();
+            case propertyKind.int32:
+                return this.getInt32();
+            case propertyKind.varInt:
+                return this.getVariableByteInteger();
+            case propertyKind.byteArray:
+                return this.getByteArray();
+            case propertyKind.utf8string:
+                return this.getUTF8String();
+        }
+        // deno-coverage-ignore
+        throw new DecoderError("Invalid property kind");
+    }
+    /**
+     * Gets all properties from the buffer
+     * and validates if they are allowed for this type of packet
+     * @param propertySetType
+     * @returns
+     * @throws {DecoderError} If properties are invalid
+     */
+    getProperties(propertySetType) {
+        const allowedProps = PropertyByPropertySetType[propertySetType];
+        const properties = {};
+        const propLength = this.getVariableByteInteger();
+        const endPos = this.pos + propLength;
+        const userProps = [];
+        const subIdents = [];
+        while (this.pos < endPos) {
+            const id = this.getVariableByteInteger();
+            const label = propertyByNumber[id];
+            if (id === subIdentID && allowedProps.includes(subIdentsID)) {
+                subIdents.push(this.getVariableByteInteger());
+                continue;
+            }
+            if (!allowedProps.includes(id)) {
+                throw new DecoderError(`Property type ${label ? label : id} not allowed at byte ${this.pos}`);
+            }
+            if (id === userPropID) {
+                const stringPair = this.getUTF8StringPair();
+                userProps.push(stringPair);
+                continue;
+            }
+            const value = this.getProperty(id);
+            // deno-lint-ignore no-explicit-any
+            if (properties[label] !== undefined) {
+                throw new DecoderError(`Property ${label} only allowed once`);
+            }
+            else {
+                // deno-lint-ignore no-explicit-any
+                properties[label] = value;
+            }
+        }
+        if (userProps.length > 0) {
+            // deno-lint-ignore no-explicit-any
+            properties.userProperty = userProps;
+        }
+        if (subIdents.length > 0) {
+            // deno-lint-ignore no-explicit-any
+            properties.subscriptionIdentifiers = subIdents;
+        }
+        return properties;
+    }
+    /**
+     * Gets a reason code from the buffer
+     * @returns The decoded reason code
+     * @throws {DecoderError} If reason code is invalid
+     */
+    getReasonCode() {
+        const reasonCode = this.getByte();
+        if (!isValidReasonCode(this.packetType, reasonCode)) {
+            throw new DecoderError("Invalid reason code");
+        }
+        return reasonCode;
+    }
     /**
      * Checks if decoder has reached the end of the buffer
      * @returns True if at end, false otherwise

package/dist/mqttPacket/decoder.js.map

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

package/dist/mqttPacket/disconnect.d.ts

@@ -1,16 +1,22 @@
-import type { TPacketType } from "./types.ts";
+import type { CodecOpts, ProtocolLevelNoV5, TPacketType, TReasonCode } from "./types.ts";
+import type { DisconnectProperties } from "./Properties.ts";
 /**
  * DisconnectPacket is the final control packet sent from the client to the server.
  * It indicates that the client is disconnecting cleanly.
  */
-export type DisconnectPacket = {
+export type DisconnectPacketv4 = {
     type: TPacketType;
+    protocolLevel: ProtocolLevelNoV5;
 };
+export type DisconnectPacketv5 = {
+    type: TPacketType;
+    protocolLevel: 5;
+    reasonCode: TReasonCode;
+    properties?: DisconnectProperties;
+};
+export type DisconnectPacket = DisconnectPacketv4 | DisconnectPacketv5;
 export declare const disconnect: {
-    encode(_packet: DisconnectPacket): {
-        flags: number;
-        bytes: number[];
-    };
-    decode(buffer: Uint8Array, _flags: number): DisconnectPacket;
+    encode(_packet: DisconnectPacket, _codecOpts: CodecOpts): Uint8Array;
+    decode(buffer: Uint8Array, _flags: number, codecOpts: CodecOpts, packetType: TPacketType): DisconnectPacket;
 };
 //# sourceMappingURL=disconnect.d.ts.map

package/dist/mqttPacket/disconnect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"disconnect.d.ts","sourceRoot":"","sources":["../../mqttPacket/disconnect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE;IACvB,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IACtE,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAAC;CAa9D,CAAC"}
+{"version":3,"file":"disconnect.d.ts","sourceRoot":"","sources":["../../mqttPacket/disconnect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,SAAS,EACT,iBAAiB,EACjB,WAAW,EACX,WAAW,EACZ,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAI5D;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,WAAW,CAAC;IAClB,aAAa,EAAE,iBAAiB,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,WAAW,CAAC;IAClB,aAAa,EAAE,CAAC,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,UAAU,CAAC,EAAE,oBAAoB,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG,kBAAkB,CAAC;AAIvE,eAAO,MAAM,UAAU,EAAE;IACvB,MAAM,CAAC,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,SAAS,GAAG,UAAU,CAAC;IACrE,MAAM,CACJ,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,WAAW,GACtB,gBAAgB,CAAC;CA4DrB,CAAC"}

package/dist/mqttPacket/disconnect.js

@@ -1,14 +1,53 @@
 import { PacketType } from "./PacketType.js";
-import { isEmptyBuf } from "./decoder.js";
+import { Decoder, hasEmptyFlags, isEmptyBuf } from "./decoder.js";
+import { Encoder } from "./encoder.js";
+import { ReasonCode } from "./ReasonCode.js";
+const DISCONNECT_PACKET = new Uint8Array([PacketType.disconnect << 4, 0]);
 export const disconnect = {
-    encode(_packet) {
-        const flags = 0;
-        return { flags, bytes: [] };
+    encode(packet, codecOpts) {
+        if (packet.protocolLevel !== 5) {
+            return DISCONNECT_PACKET;
+        }
+        const reasonCode = packet.reasonCode || ReasonCode.normalDisconnection;
+        const encoder = new Encoder(packet.type);
+        // see MQTT v5 3.14.2.1
+        // if remaining length is less than 1 the value of 0x00 (normal disconnect) is used.
+        if (reasonCode === ReasonCode.normalDisconnection &&
+            Object.keys(packet.properties || {}).length === 0) {
+            return encoder.done(0);
+        }
+        encoder
+            .setReasonCode(reasonCode);
+        if (packet.properties) {
+            encoder.setProperties(packet.properties, packet.type, codecOpts.maxOutgoingPacketSize);
+        }
+        return encoder.done(0);
     },
-    decode(buffer, _flags) {
-        isEmptyBuf(buffer);
+    decode(buffer, flags, codecOpts, packetType) {
+        hasEmptyFlags(flags);
+        if (codecOpts.protocolLevel !== 5) {
+            isEmptyBuf(buffer);
+            return {
+                type: PacketType.disconnect,
+                protocolLevel: codecOpts.protocolLevel,
+            };
+        }
+        const decoder = new Decoder(packetType, buffer);
+        if (decoder.atEnd()) {
+            return {
+                type: PacketType.disconnect,
+                protocolLevel: 5,
+                reasonCode: 0,
+            };
+        }
+        const reasonCode = decoder.getReasonCode();
+        const properties = decoder.getProperties(PacketType.disconnect);
+        decoder.done();
         return {
             type: PacketType.disconnect,
+            protocolLevel: 5,
+            reasonCode,
+            properties,
         };
     },
 };

package/dist/mqttPacket/disconnect.js.map

@@ -1 +1 @@
-{"version":3,"file":"disconnect.js","sourceRoot":"","sources":["../../mqttPacket/disconnect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAW1C,MAAM,CAAC,MAAM,UAAU,GAGnB;IACF,MAAM,CAAC,OAAyB;QAC9B,MAAM,KAAK,GAAG,CAAC,CAAC;QAChB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,MAAkB,EAAE,MAAc;QACvC,UAAU,CAAC,MAAM,CAAC,CAAC;QACnB,OAAO;YACL,IAAI,EAAE,UAAU,CAAC,UAAU;SAC5B,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"disconnect.js","sourceRoot":"","sources":["../../mqttPacket/disconnect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAQlE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAoB7C,MAAM,iBAAiB,GAAG,IAAI,UAAU,CAAC,CAAC,UAAU,CAAC,UAAU,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAE1E,MAAM,CAAC,MAAM,UAAU,GAQnB;IACF,MAAM,CAAC,MAAwB,EAAE,SAAoB;QACnD,IAAI,MAAM,CAAC,aAAa,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,UAAU,CAAC,mBAAmB,CAAC;QACvE,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzC,uBAAuB;QACvB,oFAAoF;QACpF,IACE,UAAU,KAAK,UAAU,CAAC,mBAAmB;YAC7C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EACjD,CAAC;YACD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC;QACD,OAAO;aACJ,aAAa,CAAC,UAAU,CAAC,CAAC;QAC7B,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,OAAO,CAAC,aAAa,CACnB,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,IAAI,EACX,SAAS,CAAC,qBAAqB,CAChC,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAED,MAAM,CACJ,MAAkB,EAClB,KAAa,EACb,SAAS,EACT,UAAuB;QAEvB,aAAa,CAAC,KAAK,CAAC,CAAC;QACrB,IAAI,SAAS,CAAC,aAAa,KAAK,CAAC,EAAE,CAAC;YAClC,UAAU,CAAC,MAAM,CAAC,CAAC;YACnB,OAAO;gBACL,IAAI,EAAE,UAAU,CAAC,UAAU;gBAC3B,aAAa,EAAE,SAAS,CAAC,aAAa;aACvC,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAChD,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YACpB,OAAO;gBACL,IAAI,EAAE,UAAU,CAAC,UAAU;gBAC3B,aAAa,EAAE,CAAC;gBAChB,UAAU,EAAE,CAAC;aACd,CAAC;QACJ,CAAC;QACD,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3C,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAChE,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,OAAO;YACL,IAAI,EAAE,UAAU,CAAC,UAAU;YAC3B,aAAa,EAAE,CAAC;YAChB,UAAU;YACV,UAAU;SACX,CAAC;IACJ,CAAC;CACF,CAAC"}

package/dist/mqttPacket/encoder.d.ts

@@ -1,20 +1,31 @@
-import type { Topic, TopicFilter } from "./types.ts";
+import type { Topic, TopicFilter, TPacketType, TReasonCode, UTF8StringPair } from "./types.ts";
+import type { PropsByPacketSetType, TPropertySetType } from "./Properties.ts";
 /**
  * Custom error class for encoding operations
  */
 export declare class EncoderError extends Error {
     constructor(message: string);
 }
-/**
- * Encoder class for MQTT packet encoding
- */
 export declare class Encoder {
-    /** Internal buffer to store encoded bytes */
-    private buffer;
+    /** Internal bufferlist to store items */
+    private buffers;
+    /** Number of bytes in the buffer */
+    private numBytes;
+    /** Packet type */
+    private packetType;
+    /** marker to rewind to */
+    private marker;
     /**
      * Creates a new Encoder instance
      */
-    constructor();
+    constructor(packetType: TPacketType);
+    encodedSize(): number;
+    setMarker(): void;
+    rewindToMarker(): void;
+    /**
+     * @param value
+     */
+    addArray(value: number[] | Uint8Array): this;
     /**
      * Adds a single byte to the buffer
      * @param value - Byte value to add (0-255)
@@ -27,6 +38,18 @@ export declare class Encoder {
      * @returns The encoder instance for chaining
      */
     setInt16(value: number): this;
+    /**
+     * adds a 4 byte integer from the buffer (for v5)
+     * @param value - 32-bit integer to encode and add
+     * @returns The encoder instance for chaining
+     */
+    setInt32(value: number): this;
+    /**
+     * adds a variable byte integer to the buffer (for v5)
+     * @param value - integer to encode and add
+     * @returns The encoder instance for chaining
+     */
+    setVariableByteInteger(value: number): this;
     /**
      * Adds a byte array to the buffer with length prefix
      * @param value - Byte array to add
@@ -40,6 +63,12 @@ export declare class Encoder {
      * @returns The encoder instance for chaining
      */
     setUtf8String(value: string): this;
+    /**
+     * Adds a UTF-8 string pair from the buffer (for v5)
+     * @param stringPair - UTF8StringPair
+     * @returns The encoder instance for chaining
+     */
+    setUtf8StringPair([name, value]: UTF8StringPair): this;
     /**
      * Adds an MQTT topic string to the buffer
      * @param value - Topic string to add
@@ -60,10 +89,30 @@ export declare class Encoder {
      * @returns The encoder instance for chaining
      */
     setRemainder(value: Uint8Array | number[]): this;
+    /**
+     * add lenght and buffers from this
+     * @param encoder - the encoder to add it to
+     */
+    addToEncoder(encoder: Encoder): void;
+    /**
+     * Encode a single property
+     * @param id - the id of the property
+     * @param value  the value of the property
+     * @returns
+     */
+    private setProperty;
+    /**
+     * Encode a set of properties respecting potential size limits
+     * @param props - the properties to encode
+     * @param propertySetType - the type of packet to encode for
+     * @param maximumPacketSize - the maximum packet size to be consumed by properties
+     */
+    setProperties<T extends TPropertySetType>(props: PropsByPacketSetType[T], propertySetType: TPropertySetType, maximumPacketSize: number): void;
+    setReasonCode(reasonCode: TReasonCode): this;
     /**
      * Returns the final encoded buffer
      * @returns Array containing all encoded bytes
      */
-    done(): number[];
+    done(flags: number): Uint8Array;
 }
 //# sourceMappingURL=encoder.d.ts.map

package/dist/mqttPacket/encoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encoder.d.ts","sourceRoot":"","sources":["../../mqttPacket/encoder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGrD;;GAEG;AACH,qBAAa,YAAa,SAAQ,KAAK;gBACzB,OAAO,EAAE,MAAM;CAI5B;AAED;;GAEG;AACH,qBAAa,OAAO;IAClB,6CAA6C;IAC7C,OAAO,CAAC,MAAM,CAAW;IAEzB;;OAEG;;IAKH;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK5B;;;;OAIG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAM7B;;;;;OAKG;IACH,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IASrC;;;;OAIG;IACH,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKlC;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAU5B;;;;;OAKG;IACH,cAAc,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAUxC;;;;OAIG;IACH,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE,GAAG,IAAI;IAKhD;;;OAGG;IACH,IAAI,IAAI,MAAM,EAAE;CAGjB"}
+{"version":3,"file":"encoder.d.ts","sourceRoot":"","sources":["../../mqttPacket/encoder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,KAAK,EACL,WAAW,EACX,WAAW,EACX,WAAW,EACX,cAAc,EACf,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAEV,oBAAoB,EAEpB,gBAAgB,EAGjB,MAAM,iBAAiB,CAAC;AAezB;;GAEG;AACH,qBAAa,YAAa,SAAQ,KAAK;gBACzB,OAAO,EAAE,MAAM;CAI5B;AAMD,qBAAa,OAAO;IAClB,yCAAyC;IACzC,OAAO,CAAC,OAAO,CAAa;IAE5B,oCAAoC;IACpC,OAAO,CAAC,QAAQ,CAAS;IAEzB,kBAAkB;IAClB,OAAO,CAAC,UAAU,CAAc;IAEhC,0BAA0B;IAC1B,OAAO,CAAC,MAAM,CAAS;IAEvB;;OAEG;gBACS,UAAU,EAAE,WAAW;IAOnC,WAAW;IAIX,SAAS;IAIT,cAAc;IAMd;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU,GAAG,IAAI;IAM5C;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAM5B;;;;OAIG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAM7B;;;;OAIG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAM7B;;;;OAIG;IACH,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK3C;;;;;OAKG;IACH,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IASrC;;;;OAIG;IACH,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKlC;;;;OAIG;IACH,iBAAiB,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,cAAc,GAAG,IAAI;IAMtD;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAU5B;;;;;OAKG;IACH,cAAc,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAUxC;;;;OAIG;IACH,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE,GAAG,IAAI;IAKhD;;;OAGG;IACH,YAAY,CAAC,OAAO,EAAE,OAAO;IAO7B;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAwDnB;;;;;OAKG;IACH,aAAa,CAAC,CAAC,SAAS,gBAAgB,EACtC,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAC9B,eAAe,EAAE,gBAAgB,EACjC,iBAAiB,EAAE,MAAM;IA0B3B,aAAa,CAAC,UAAU,EAAE,WAAW;IAUrC;;;OAGG;IACH,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU;CAehC"}