From d3e2f38da0f484df08c36497ba8ea4a1a72d71cb Mon Sep 17 00:00:00 2001 From: link2xt Date: Tue, 14 Feb 2023 20:02:09 +0000 Subject: [PATCH] deltachat-jsonrpc: fix "prettier" arguments **.ts finds .ts files only in the current directory and no *.js files. --- .../typescript/example/example.ts | 5 +--- .../typescript/example/node-add-account.js | 25 +++++++++-------- .../typescript/example/node-demo.js | 2 +- deltachat-jsonrpc/typescript/package.json | 6 ++-- deltachat-jsonrpc/typescript/src/client.ts | 2 +- deltachat-jsonrpc/typescript/test/basic.ts | 28 +++++++++++-------- .../typescript/test/test_base.ts | 7 ++--- 7 files changed, 40 insertions(+), 35 deletions(-) diff --git a/deltachat-jsonrpc/typescript/example/example.ts b/deltachat-jsonrpc/typescript/example/example.ts index 15baf68b5..c180a9e31 100644 --- a/deltachat-jsonrpc/typescript/example/example.ts +++ b/deltachat-jsonrpc/typescript/example/example.ts @@ -68,10 +68,7 @@ async function run() { null ); for (const [chatId, _messageId] of chats) { - const chat = await client.rpc.getFullChatById( - selectedAccount, - chatId - ); + const chat = await client.rpc.getFullChatById(selectedAccount, chatId); write($main, `

${chat.name}

`); const messageIds = await client.rpc.getMessageIds( selectedAccount, diff --git a/deltachat-jsonrpc/typescript/example/node-add-account.js b/deltachat-jsonrpc/typescript/example/node-add-account.js index c553ad669..9d3e4a40a 100644 --- a/deltachat-jsonrpc/typescript/example/node-add-account.js +++ b/deltachat-jsonrpc/typescript/example/node-add-account.js @@ -3,24 +3,27 @@ import { DeltaChat } from "../dist/deltachat.js"; run().catch(console.error); async function run() { - const delta = new DeltaChat('ws://localhost:20808/ws'); + const delta = new DeltaChat("ws://localhost:20808/ws"); delta.on("event", (event) => { console.log("event", event.data); }); - const email = process.argv[2] - const password = process.argv[3] - if (!email || !password) throw new Error('USAGE: node node-add-account.js ') - console.log(`creating acccount for ${email}`) - const id = await delta.rpc.addAccount() - console.log(`created account id ${id}`) + const email = process.argv[2]; + const password = process.argv[3]; + if (!email || !password) + throw new Error( + "USAGE: node node-add-account.js " + ); + console.log(`creating acccount for ${email}`); + const id = await delta.rpc.addAccount(); + console.log(`created account id ${id}`); await delta.rpc.setConfig(id, "addr", email); await delta.rpc.setConfig(id, "mail_pw", password); - console.log('configuration updated') - await delta.rpc.configure(id) - console.log('account configured!') + console.log("configuration updated"); + await delta.rpc.configure(id); + console.log("account configured!"); const accounts = await delta.rpc.getAllAccounts(); console.log("accounts", accounts); - console.log("waiting for events...") + console.log("waiting for events..."); } diff --git a/deltachat-jsonrpc/typescript/example/node-demo.js b/deltachat-jsonrpc/typescript/example/node-demo.js index dcf96a4df..83ea89b3f 100644 --- a/deltachat-jsonrpc/typescript/example/node-demo.js +++ b/deltachat-jsonrpc/typescript/example/node-demo.js @@ -10,5 +10,5 @@ async function run() { const accounts = await delta.rpc.getAllAccounts(); console.log("accounts", accounts); - console.log("waiting for events...") + console.log("waiting for events..."); } diff --git a/deltachat-jsonrpc/typescript/package.json b/deltachat-jsonrpc/typescript/package.json index d016b956e..e93c1f6b3 100644 --- a/deltachat-jsonrpc/typescript/package.json +++ b/deltachat-jsonrpc/typescript/package.json @@ -38,8 +38,8 @@ "example:start": "http-server .", "extract-constants": "node ./scripts/generate-constants.js", "generate-bindings": "cargo test", - "prettier:check": "prettier --check **.ts", - "prettier:fix": "prettier --write **.ts", + "prettier:check": "prettier --check .", + "prettier:fix": "prettier --write .", "test": "run-s test:prepare test:run-coverage test:report-coverage", "test:prepare": "cargo build --package deltachat-rpc-server --bin deltachat-rpc-server", "test:report-coverage": "node report_api_coverage.mjs", @@ -49,4 +49,4 @@ "type": "module", "types": "dist/deltachat.d.ts", "version": "1.108.0" -} \ No newline at end of file +} diff --git a/deltachat-jsonrpc/typescript/src/client.ts b/deltachat-jsonrpc/typescript/src/client.ts index 2ed6435ff..9efbab964 100644 --- a/deltachat-jsonrpc/typescript/src/client.ts +++ b/deltachat-jsonrpc/typescript/src/client.ts @@ -43,7 +43,7 @@ export class BaseDeltaChat< const method = request.method; if (method === "event") { const event = request.params! as DCWireEvent; - //@ts-ignore + //@ts-ignore this.emit(event.event.type, event.contextId, event.event as any); this.emit("ALL", event.contextId, event.event as any); diff --git a/deltachat-jsonrpc/typescript/test/basic.ts b/deltachat-jsonrpc/typescript/test/basic.ts index 2df048d48..f09ed6258 100644 --- a/deltachat-jsonrpc/typescript/test/basic.ts +++ b/deltachat-jsonrpc/typescript/test/basic.ts @@ -4,10 +4,7 @@ import chaiAsPromised from "chai-as-promised"; chai.use(chaiAsPromised); import { StdioDeltaChat as DeltaChat } from "../deltachat.js"; -import { - RpcServerHandle, - startServer, -} from "./test_base.js"; +import { RpcServerHandle, startServer } from "./test_base.js"; describe("basic tests", () => { let serverHandle: RpcServerHandle; @@ -15,9 +12,9 @@ describe("basic tests", () => { before(async () => { serverHandle = await startServer(); - dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout) + dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout); // dc.on("ALL", (event) => { - //console.log("event", event); + //console.log("event", event); // }); }); @@ -111,8 +108,8 @@ describe("basic tests", () => { assert((await dc.rpc.getConfig(accountId, "addr")) == "valid@email"); }); it("set invalid key should throw", async function () { - await expect(dc.rpc.setConfig(accountId, "invalid_key", "some value")).to.be - .eventually.rejected; + await expect(dc.rpc.setConfig(accountId, "invalid_key", "some value")).to + .be.eventually.rejected; }); it("get invalid key should throw", async function () { await expect(dc.rpc.getConfig(accountId, "invalid_key")).to.be.eventually @@ -125,7 +122,10 @@ describe("basic tests", () => { it("set and retrive (batch)", async function () { const config = { addr: "valid@email", mail_pw: "1234" }; await dc.rpc.batchSetConfig(accountId, config); - const retrieved = await dc.rpc.batchGetConfig(accountId, Object.keys(config)); + const retrieved = await dc.rpc.batchGetConfig( + accountId, + Object.keys(config) + ); expect(retrieved).to.deep.equal(config); }); it("set and retrive ui.* (batch)", async function () { @@ -134,7 +134,10 @@ describe("basic tests", () => { "ui.enter_key_sends": "true", }; await dc.rpc.batchSetConfig(accountId, config); - const retrieved = await dc.rpc.batchGetConfig(accountId, Object.keys(config)); + const retrieved = await dc.rpc.batchGetConfig( + accountId, + Object.keys(config) + ); expect(retrieved).to.deep.equal(config); }); it("set and retrive mixed(ui and core) (batch)", async function () { @@ -145,7 +148,10 @@ describe("basic tests", () => { mail_pw: "123456", }; await dc.rpc.batchSetConfig(accountId, config); - const retrieved = await dc.rpc.batchGetConfig(accountId, Object.keys(config)); + const retrieved = await dc.rpc.batchGetConfig( + accountId, + Object.keys(config) + ); expect(retrieved).to.deep.equal(config); }); }); diff --git a/deltachat-jsonrpc/typescript/test/test_base.ts b/deltachat-jsonrpc/typescript/test/test_base.ts index 66bc0d72d..e8f604632 100644 --- a/deltachat-jsonrpc/typescript/test/test_base.ts +++ b/deltachat-jsonrpc/typescript/test/test_base.ts @@ -59,13 +59,13 @@ export async function startServer(): Promise { export async function createTempUser(url: string) { const response = await fetch(url, { - method: "POST", + method: "POST", headers: { "cache-control": "no-cache", }, }); - if (!response.ok) throw new Error('Received invalid response') - return response.json(); + if (!response.ok) throw new Error("Received invalid response"); + return response.json(); } function getTargetDir(): Promise { @@ -89,4 +89,3 @@ function getTargetDir(): Promise { ); }); } -