@social-mail/shared 1.0.29 → 1.1.4

package/src/mime-parser/stream/{LineStream.js → LineStream.ts}

@@ -1,13 +1,12 @@
 import { tokenize } from "../tokenizer.js";
 
 export default class LineStream {
-
-    /** @type {AsyncGenerator<string, any, any>} */ g;
+    protected g?: AsyncGenerator<string, any, any>;
 
     /**
      * @returns {AsyncGenerator<string, any, any>}
      */
-    async *read() {
+    async *read(): AsyncGenerator<string, any, any> {
         const g = this.g ??= this.lines();
         for(;;) {
             const { value , done } = await g.next();
@@ -21,8 +20,8 @@ export default class LineStream {
     /**
      * @returns {AsyncGenerator<string, any, any>}
      */
-    async *readRFCHeaders() {
-        let last;
+    async *readRFCHeaders(): AsyncGenerator<string, any, any> {
+        let last: string | undefined;
         const g = this.g ??= this.lines();
         for(;;) {
             const { value , done } = await g.next();
@@ -30,7 +29,7 @@ export default class LineStream {
                 break;
             }
             if (/^\s+/i.test(value)) {
-                last += value.trimStart();
+                last = last + value.trimStart();
                 continue;
             }
             if (last) {
@@ -44,26 +43,22 @@ export default class LineStream {
     }
 
     /** @returns {AsyncGenerator<string, any,any>} */
-    lines() {
+    protected lines(): AsyncGenerator<string, any, any> {
         throw new Error("Not Implemented");
     }
 }
 
 export class StringLineStream extends LineStream {
 
-    /** @type {string} */ text;
-
     constructor(
-        /** @type {string} */ text,
-        /** @type {boolean} */ trimR
+        protected text: string,
+        protected trimR?: boolean
     ) {
         super();
-        this.text = text;
-        this.trimR = trimR;
     }
 
     /** @returns {AsyncGenerator<string, any, any>} */
-    async *lines() {
+    async *lines(): AsyncGenerator<string, any, any> {
         if (this.trimR) {
             for (const iterator of tokenize(this.text, "\n")) {
                 yield iterator.replace(/\r*$/, "");
@@ -77,17 +72,15 @@ export class StringLineStream extends LineStream {
 }
 
 export class ReadableLineStream extends LineStream {
+    protected readable: ReadableStream;
 
-    /** @type {ReadableStream} */
-    readable;
-
-    constructor( /** @type {ReadableStream} */ readable) {
+    constructor(readable: ReadableStream) {
         super();
         this.readable = readable;
     }
 
     /** @returns {AsyncGenerator<string, any, any>} */
-    async *lines() {
+    async *lines(): AsyncGenerator<string, any, any> {
         const utf8Decoder = new TextDecoder("utf-8");
         const reader = this.readable.getReader();
         let { value: chunk, done: readerDone } = await reader.read();

package/src/mime-parser/stream/TextWriter.ts

@@ -0,0 +1,36 @@
+export default class TextWriter {
+    writeLine(line: string): void {
+        throw new Error("Not Implemented");
+    }
+
+    writeLineMax80Chars(line: string, padPrefix = "") {
+        let prefix = "";
+        for(;;) {
+            if (line.length <= 80) {
+                this.writeLine(prefix + line);
+                break;
+            }
+            const firstSegment = line.substring(0, 80);
+            this.writeLine(prefix + firstSegment);
+            line = line.substring(80);
+            prefix = padPrefix;
+        }
+    }
+}
+
+export class BlobWriter extends TextWriter {
+    lines: string[] = [];
+
+    writeLine(line: string): void {
+        this.lines.push(line);
+    }
+
+    toBlob(): Blob {
+        const all = this.lines.join("\n");
+        return new Blob([all], {});
+    }
+
+    toString(): string {
+        return this.lines.join("\n");
+    }
+}

package/src/mime-parser/{tokenizer.js → tokenizer.ts}

@@ -1,8 +1,9 @@
-export function *tokenize (
-    /** @type {string} */ text,
-    /** @type {string} */ sep = ",") {
+export function* tokenize(
+    text: string,
+    sep: string = ","
+): Generator<string> {
     let start = 0;
-    for(;;) {
+    for (;;) {
         const index = text.indexOf(sep, start);
         if (index === -1) {
             break;
@@ -11,43 +12,45 @@ export function *tokenize (
         start = index + 1;
     }
     yield text.substring(start);
-};
+}
 
-export function *tokenizeRFCHeaders (
-    /** @type {string} */ text
-) {
+export function* tokenizeRFCHeaders(
+    text: string
+): Generator<string> {
     let start = 0;
     const sep = "\n";
-    let last;
-    let stop = 0;
+    let last: string | null = null;
+    let stop = false;
     do {
         const index = text.indexOf(sep, start);
         stop = index === -1;
         const line = stop ? text.substring(start) : text.substring(start, index);
         if (/^\s+/i.test(line)) {
-            last += line.trimStart();
+            if (last !== null) {
+                last += line.trimStart();
+            }
             continue;
         }
-        if (last) {
+        if (last !== null) {
             yield last;
         }
         last = line;
         start = index + 1;
     } while (stop);
-    if (last) {
+    if (last !== null) {
         yield last;
     }
-};
-
+}
 
 export function tokenizeMax(
-    /** @type {string} */ text,
-    /** @type {string} */ sep,
-    /** @type {number} */ max = Number.MAX_SAFE_INTEGER) {
+    text: string,
+    sep: string,
+    max: number = Number.MAX_SAFE_INTEGER
+): string[] {
     let start = 0;
-    const items = [];
+    const items: string[] = [];
     max--;
-    for(;;) {
+    for (;;) {
         const index = text.indexOf(sep, start);
         if (index === -1) {
             break;
@@ -60,4 +63,4 @@ export function tokenizeMax(
     }
     items.push(text.substring(start));
     return items;
-};
+}

package/tsconfig.json

@@ -1,21 +1,42 @@
 {
     "compilerOptions": {
-        "allowJs": true,
-        "skipLibCheck": true,
-        "skipDefaultLibCheck": true,
-        "outDir": "dist",
-        "target": "ES6",
-        "module": "ES2022",
-        "sourceMap": true,
+        "target": "es2022",
+        "module":"es2022",
+        "rootDir": "./src/",
         "incremental": true,
-        "moduleResolution": "Bundler",
+        "sourceMap": true,
         "declaration": true,
         "declarationMap": true,
+        "moduleResolution": "bundler",
+        "outDir": "dist",
+        "strict": false,
+        "tsBuildInfoFile": "./dist/.tsbuildinfo",
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true,
+        "allowSyntheticDefaultImports": true,
+        "useDefineForClassFields": false,
+        "forceConsistentCasingInFileNames": true,
+        "removeComments": true,
+        "importHelpers": true,
+        "skipLibCheck": true,
+        "noUnusedLocals": true,
+        "jsx": "react",
+        "jsxFactory": "XNode.create",
+        "types": ["node"],
         "lib": [
-            "ES2015"
+            "es6",
+            "dom",
+            "ES2020",
+            "ES2017.String",
+            "ESNext.Disposable",
+            "ES2021.WeakRef"
         ]
     },
     "include": [
         "src/**/*"
+    ],
+    "exclude": [
+		"node_modules",
+		"tests"
     ]
 }

package/dist/tsconfig.tsbuildinfo

@@ -1 +0,0 @@
-{"program":{"fileNames":["../../../../../../../../usr/lib/node_modules/typescript/lib/lib.es5.d.ts","../../../../../../../../usr/lib/node_modules/typescript/lib/lib.es2015.d.ts","../../../../../../../../usr/lib/node_modules/typescript/lib/lib.es2015.core.d.ts","../../../../../../../../usr/lib/node_modules/typescript/lib/lib.es2015.collection.d.ts","../../../../../../../../usr/lib/node_modules/typescript/lib/lib.es2015.generator.d.ts","../../../../../../../../usr/lib/node_modules/typescript/lib/lib.es2015.iterable.d.ts","../../../../../../../../usr/lib/node_modules/typescript/lib/lib.es2015.promise.d.ts","../../../../../../../../usr/lib/node_modules/typescript/lib/lib.es2015.proxy.d.ts","../../../../../../../../usr/lib/node_modules/typescript/lib/lib.es2015.reflect.d.ts","../../../../../../../../usr/lib/node_modules/typescript/lib/lib.es2015.symbol.d.ts","../../../../../../../../usr/lib/node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../../../../../../../../usr/lib/node_modules/typescript/lib/lib.decorators.d.ts","../../../../../../../../usr/lib/node_modules/typescript/lib/lib.decorators.legacy.d.ts","../src/QueryIterator.js","../src/mime-parser/tokenizer.js","../src/mime-parser/stream/LineStream.js","../src/ical-parser/ics.ts","../src/ical-parser/parseDate.ts","../src/ical-parser/Calender.ts","../src/mime-parser/parsePairs.js","../src/mime-parser/HeaderContentType.js","../src/mime-parser/encoder/RawBuffer.js","../src/mime-parser/encoder/word-encoding.js","../src/mime-parser/HeaderContentDisposition.js","../src/mime-parser/encoder/base64-to-blob.js","../src/mime-parser/encoder/quoted-printable.js","../src/mime-parser/stream/TextWriter.js","../src/mime-parser/MimeNode.js","../src/mime-parser/AttachmentFile.js","../src/mime-parser/MimeMessage.js","../src/tests/ical-parser/cal.test.js","../src/tests/mime/lines-test.js","../src/tests/mime/message1.js","../src/tests/mime/message2.js","../src/tests/mime/message3.js","../src/tests/mime/pairs.js","../src/tests/mime/parse-headers.js","../src/tests/mime/parse-headers2.js","../src/tests/mime/word-encoding-test.js"],"fileInfos":[{"version":"44e584d4f6444f58791784f1d530875970993129442a847597db702a073ca68c","affectsGlobalScope":true},"45b7ab580deca34ae9729e97c13cfd999df04416a79116c3bfb483804f85ded4",{"version":"6920e1448680767498a0b77c6a00a8e77d14d62c3da8967b171f1ddffa3c18e4","affectsGlobalScope":true},{"version":"dc2df20b1bcdc8c2d34af4926e2c3ab15ffe1160a63e58b7e09833f616efff44","affectsGlobalScope":true},{"version":"4443e68b35f3332f753eacc66a04ac1d2053b8b035a0e0ac1d455392b5e243b3","affectsGlobalScope":true},{"version":"bc47685641087c015972a3f072480889f0d6c65515f12bd85222f49a98952ed7","affectsGlobalScope":true},{"version":"0dc1e7ceda9b8b9b455c3a2d67b0412feab00bd2f66656cd8850e8831b08b537","affectsGlobalScope":true},{"version":"ce691fb9e5c64efb9547083e4a34091bcbe5bdb41027e310ebba8f7d96a98671","affectsGlobalScope":true},{"version":"8d697a2a929a5fcb38b7a65594020fcef05ec1630804a33748829c5ff53640d0","affectsGlobalScope":true},{"version":"4ff2a353abf8a80ee399af572debb8faab2d33ad38c4b4474cff7f26e7653b8d","affectsGlobalScope":true},{"version":"93495ff27b8746f55d19fcbcdbaccc99fd95f19d057aed1bd2c0cafe1335fbf0","affectsGlobalScope":true},{"version":"33358442698bb565130f52ba79bfd3d4d484ac85fe33f3cb1759c54d18201393","affectsGlobalScope":true},{"version":"782dec38049b92d4e85c1585fbea5474a219c6984a35b004963b00beb1aab538","affectsGlobalScope":true},{"version":"d78c310bfde534f8aef330e72d30fd96a07fa76364a5aa6f363a8760396475d0","signature":"574ed5b8a381ec55fe8052462bfc53437d2234c743f1b00b29c8fc8e46c77142"},{"version":"4f29f7c3d451d06d7ad03c87a4669feb88d40cd76e12196939bb4b64b3467dd4","signature":"aaedc1d2ee9a532850eb3c6473f0b14e4ac7316d90e4e3e3791e6bb1b82144db"},{"version":"a6f9da310a124da5f41b7875ec0c718d01281a2cb9f7d7683758b0167f243eac","signature":"462cf03736edfaf03de39c354b82f35b520a12b33f9fe9961093a2478d13601f"},{"version":"79125c55179c3fed1cff5f1a8ad63677cec615ecaa231746001dd3ad86099316","signature":"a063960f4bceb7a575b9064394cd44e907b62b144bf30fa877d7f593a4d9dfae"},{"version":"e52e80bf274dc8192d7bf320b8e6478f1d1b0578db8bb5524a49a474106bfdc5","signature":"14eb4be0762dfc364626ae7b02afee2e5deae62cd65d474d6c7b4d4da6bd9bf5"},{"version":"9c46b104d57705a5b9d11bee7dafc73646db74da4b2eb33b827685f09f09c594","signature":"1e2534356310a96bb124f505fe3eca547458a678f0f5eb4411fa4ebe13cde6ff"},{"version":"5a723fbf595f0207e35536889aeb6b644b0a71d0a16e434d3744880e312a99c0","signature":"afa45927c01d1168c72b47d88f35784a711ca30ec5b5666778d86165909b35b1"},{"version":"e95e3dff8b1cd0c17f9a71d71ab1a98e607ea2c95cee06a39682aae69e396504","signature":"72fe18ca34ce75033901b3cfb0ebe0baf88ee17911617e6dc75d652457ff48e7"},{"version":"b1ac01473d7b59a511d03771465b45888ccef606c559aea2ed295ddf30e8cde8","signature":"a45a481378470805da3fa7ce8cf33691ba25f16e3c032deda875b88a91ecaaa9"},{"version":"fcbd8cef267c42627c36f166fd39018060cea39d66cdb91c9663eae7b64ac508","signature":"1b9195f02cf202a581081fbfdc420ea20450bb8eb63f2795d764a6dec46ca06e"},{"version":"890078d31cdc373d6380968af312d2b7ef7431545683533f06fed5b459ca63d1","signature":"95046d1643075e9c571c8c0eadf0cd66de3a685b003110c3557f375eacc5bcb8"},{"version":"e8b930f9788e5d77e44989c0f752ceba5416bca71475887f838f81f80b1ef25e","signature":"695020a5b5f7120ded875ba31480f5ebb76e749f48fac1c3d36fc20da5910591"},{"version":"99439990bd6f9b0bca332c03be7b04de34605d4b3dcfe2ee7f5fc3a1d7531297","signature":"af8c62c1249888ecfd4698be40ff50964dff5e850840b4c618d3b3b456c695f7"},{"version":"fba98c766168655d4efce14edbd3582274fa29cbf674ceb21879c46593ffa318","signature":"17131504d505e8e22e3aa7646417b58d55e962108c214d72b71d3c7d181e3ef4"},{"version":"25fdcb657464f4f1c2a6c4d0b1f629207758773aee17eb874a6003da9e0cb390","signature":"c2af2b752155bd30dcc44dffeaaabe37793c45874800096694a34bce5aa3b09f"},{"version":"6eb51e78c64c343a9fa1f788df2d55d6a86caa07d924853ee283b8b27ae7894c","signature":"0299b47c4b21c7b6c71c8f6392e33d4f4690da763b56ee3b894541b5e89897c7"},{"version":"9a8fffce071de96d02ee972d30b233418f444f4191cf76facabb2b63fadae0c6","signature":"a880271a10585cbcbed58fac991d716f5a2555366d1a0bd10b9a1606528eeb9d"},{"version":"9c65a98fd9ef3f1d770b5c20ea61862fbe7518ba1a77106891ae55b732e442c0","signature":"f7869333ff40017ca7c4a34473e68f902f6c6014891b58bfd452691696d0c72c"},{"version":"a48e6bd95e59152b69542e9251a3e8fed0c750cf3583307080c444c5f3fdbc25","signature":"1bdfaf1b6406e1b827be5487a79a1e10b86f2ff62a3cf05e7d03ee246f667ba6"},{"version":"dbc342f59aab0b7ccfeb1d9812128ea15542c2a5f64aa96e47cd2b4a41df5ff6","signature":"f7869333ff40017ca7c4a34473e68f902f6c6014891b58bfd452691696d0c72c"},{"version":"76fda9cdc01cb86c6c76cd91289b6abbcbddbaebb38abcbf61439460ebb14db0","signature":"f7869333ff40017ca7c4a34473e68f902f6c6014891b58bfd452691696d0c72c"},{"version":"c58f8a2de9aead7cfcec56588f647fa6f2cd40d7c02d07ea6d89e3212fc0d293","signature":"f7869333ff40017ca7c4a34473e68f902f6c6014891b58bfd452691696d0c72c"},{"version":"5c4df6ee2462a3f0508423c5c05f829c087174748345947f0ae9ace7ec965b1d","signature":"1bdfaf1b6406e1b827be5487a79a1e10b86f2ff62a3cf05e7d03ee246f667ba6"},{"version":"544eb3f9b9d8f8b3e6e34023fb648016d03683d736954adb4614372cc2b13253","signature":"f7869333ff40017ca7c4a34473e68f902f6c6014891b58bfd452691696d0c72c"},{"version":"f796a1ae605b610c7ac3bdf77b3d446bb7ff36409d76cc70e04b6caa2fadb1ca","signature":"f7869333ff40017ca7c4a34473e68f902f6c6014891b58bfd452691696d0c72c"},{"version":"994c0994ce06d4f5bd25386338d30085f9a8da84af83cdd09cc67b0b14065cad","signature":"1bdfaf1b6406e1b827be5487a79a1e10b86f2ff62a3cf05e7d03ee246f667ba6"}],"root":[[14,39]],"options":{"allowJs":true,"declaration":true,"declarationMap":true,"module":7,"outDir":"./","skipDefaultLibCheck":true,"skipLibCheck":true,"sourceMap":true,"target":2},"fileIdsList":[[15,16,17,18],[28],[20,23],[20],[16,27,28,29],[16,21,22,23,24,25,26,27,29],[22],[15],[16,19],[16,28],[16,27,28],[23]],"referencedMap":[[19,1],[29,2],[24,3],[21,4],[30,5],[28,6],[23,7],[20,8],[16,8],[31,9],[32,8],[33,10],[34,11],[35,11],[36,4],[37,10],[38,10],[39,12]]},"version":"5.5.3"}

package/src/mime-parser/AttachmentFile.js

@@ -1,29 +0,0 @@
-import { MimeNode } from "./MimeNode.js";
-
-
-
-export class AttachmentFile extends File {
-
-    /** @type {"inline" | "attachment"} */
-    disposition;
-
-    /** @type {string} */
-    contentId;
-
-    /**
-     * Associated mime node if any
-     * @type {MimeNode}
-     */
-    node;
-
-    constructor(
-        /** @type {BlobPart[]} */ fileBits,
-        /** @type {string} */ fileName,
-        /** @type {FilePropertyBag & { disposition?: "inline" | "attachment"; contentId?: string; }} */
-        options) {
-        super(fileBits, fileName, options);
-        this.contentId = options.contentId;
-        this.disposition = options.disposition;
-    }
-
-}

package/src/mime-parser/HeaderContentDisposition.js

@@ -1,32 +0,0 @@
-import { wordEncoding } from "./encoder/word-encoding.js";
-import { parsePairs } from "./parsePairs.js";
-
-
-export class HeaderContentDisposition {
-
-    /** @type {string} */ type;
-    /** @type {string} */ filename;
-    /** @type {string} */ name;
-
-    constructor(
-        /** @type {string} */ type,
-        /** @type {string} */ filename,
-        /** @type {string} */ name
-    ) {
-        this.type = type;
-        this.filename = filename;
-        this.name = name;
-    }
-
-    parse(/** @type {string} */ text) {
-        const items = parsePairs(text, "type");
-        this.type = items.type;
-        this.filename = items.filename;
-        this.name = items.name;
-    }
-
-    toString() {
-        return `${this.type};\r\n\t\tfilename="${wordEncoding.encode( this.filename)}";`;
-    }
-
-}

package/src/mime-parser/HeaderContentType.js

@@ -1,34 +0,0 @@
-import { parsePairs } from "./parsePairs.js";
-
-
-export class HeaderContentType {
-
-    /** @type {string} */ type;
-    /** @type {string} */ charset;
-    /** @type {string} */ boundary;
-
-    constructor(
-        /** @type {string} */ type,
-        /** @type {string} */ charset = "UTF-8",
-        /** @type {string} */ boundary
-    ) {
-        this.type = type;
-        this.charset = charset;
-        this.boundary = boundary;
-    }
-
-    parse( /** @type {string} */ text) {
-        const items = parsePairs(text, "type");
-        this.type = items.type;
-        this.charset = items.charset;
-        this.boundary = items.boundary;
-    }
-
-    toString() {
-        if (this.boundary) {
-            return `${this.type}; charset="${this.charset}"; boundary="${this.boundary}";`;
-        }
-        return `${this.type}; charset="${this.charset}";`;
-    }
-}
-

package/src/mime-parser/MimeMessage.js

@@ -1,105 +0,0 @@
-import { MimeNode } from "./MimeNode.js";
-import { AttachmentFile } from "./AttachmentFile.js";
-import LineStream, { ReadableLineStream, StringLineStream } from "./stream/LineStream.js";
-import { BlobWriter } from "./stream/TextWriter.js";
-
-export default class MimeMessage {
-
-    static async load(
-        /** @type {ReadableStream | LineStream | string} */ reader,
-        /** @type {string} */ name,
-        /** @type {boolean} */ inline
-    ) {
-        const node = new MimeNode();
-        if (name) {
-            node.setHeader("X-Name", name);
-        }
-
-        const stream = typeof reader === "string"
-            ? new StringLineStream(reader)
-            : (reader instanceof LineStream
-                ? reader
-                : new ReadableLineStream(reader));
-
-        await node.parse(stream);
-        const attachments = await node.attachments();
-
-        // we should inline the images and remove them from attachments array for simplicity
-        // this should be done when templates are imported from somewhere else
-
-        const msg = new MimeMessage(node, attachments);
-        if (inline) {
-            await msg.inlineImages();
-        }
-        return msg;
-    }
-
-    get name() {
-        return this.node.header("x-name");
-    }
-
-    get html() {
-        const alternative = this.node.getFirstChild("multipart/alternative");
-        return alternative?.getFirstChild("text/html")?.text ?? "";
-    }
-
-    set html(/** @type {string} */ v) {
-        const alternative = this.node.getFirstChild("multipart/alternative", true);
-        const htmlMime = alternative.getFirstChild("text/html", true);
-        htmlMime.contentTransferEncoding = "quoted-printable";
-        htmlMime.text = v;
-        htmlMime.contentType.charset = "UTF-8";
-    }
-
-    get text() {
-        const alternative = this.node.getFirstChild("multipart/alternative");
-        return alternative?.getFirstChild("text/plain")?.text ?? "";
-    }
-
-    set text(/** @type {string} */ v) {
-        const alternative = this.node.getFirstChild("multipart/alternative", true);
-        const htmlMime = alternative.getFirstChild("text/plain", true);
-        htmlMime.contentTransferEncoding = "quoted-printable";
-        htmlMime.text = v;
-        htmlMime.contentType.charset = "UTF-8";
-    }
-
-    get subject() {
-        return this.node.header("subject") ?? "";
-    }
-
-    set subject(/** @type {string} */ v) {
-        this.node.setHeader("subject", v);
-    }
-
-    /** @type {MimeNode} */ node;
-    /** @type {AttachmentFile[]} */ attachments;
-
-    constructor(
-        /** @type {MimeNode} */ node = new MimeNode("multipart/mixed"),
-        /** @type {AttachmentFile[]} */ attachments = []) {
-        this.node = node;
-        this.attachments = attachments;
-    }
-
-    async save() {
-        const blobWriter = new BlobWriter();
-        await this.node.save(blobWriter);
-        return blobWriter.toBlob();
-    }
-
-    async inlineImages() {
-        let text = this.html;
-        if (!text) {
-            return;
-        }
-
-        for (const iterator of this.attachments) {
-            if (iterator.contentId) {
-                const encoded = iterator.node.encoded;
-                text = text.split(`cid:${iterator.contentId}`).join(`data://${iterator.type},${encoded}`);
-            }
-        }
-    }
-
-}

package/src/mime-parser/stream/TextWriter.js

@@ -1,27 +0,0 @@
-export default class TextWriter {
-
-    writeLine(/** @type {string} */ line) {
-        throw new Error("Not Implemented");
-    }
-
-}
-
-export class BlobWriter extends TextWriter {
-
-    /** @type {string[]} */
-    lines = [];
-
-    writeLine(/** @type {string} */line) {
-        this.lines.push(line);
-    }
-
-    toBlob() {
-        const all = this.lines.join("\n");
-        return new Blob([all], {});
-    }
-
-    toString() {
-        return this.lines.join("\n");
-    }
-
-}