From 618d49e201da773390fa5ce42ad9903dc9dc2ceb Mon Sep 17 00:00:00 2001
From: Alexis Sellier <self@cloudhead.io>
Date: Mon, 14 Jun 2021 10:38:17 +0200
Subject: [PATCH] [eslint] Enforce semis

---
 .eslintrc.js                         | 16 +++++++++++++++-
 src/Form.svelte                      | 10 +++++-----
 src/Options.svelte                   |  2 +-
 src/base/orgs/Org.ts                 |  4 ++--
 src/base/projects/Widget.svelte      |  2 +-
 src/base/registrations/Submit.svelte |  2 +-
 src/base/registrations/Update.svelte |  2 +-
 src/base/registrations/View.svelte   |  6 +++---
 src/config.ts                        |  2 +-
 src/project.ts                       |  2 +-
 10 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index c901a0f1d..afb10ffbc 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -23,8 +23,22 @@ module.exports = {
     }
   ],
   rules: {
+    indent: ["error", 2, { "SwitchCase": 1 }],
+    semi: "off", // We use the typescript-specific rule as it's more accurate.
     "@typescript-eslint/no-explicit-any": "off",
-    indent: ["error", 2, { "SwitchCase": 1 }]
+    "@typescript-eslint/semi": ["error"],
+    "@typescript-eslint/member-delimiter-style": [
+      "warn", {
+        "multiline": {
+          "delimiter": "semi",
+          "requireLast": true,
+        },
+        "singleline": {
+          "delimiter": "semi",
+          "requireLast": false,
+        }
+      }
+    ]
   },
   settings: {
     "svelte3/typescript": true,
diff --git a/src/Form.svelte b/src/Form.svelte
index 4e060d07b..fffedcfbc 100644
--- a/src/Form.svelte
+++ b/src/Form.svelte
@@ -1,10 +1,10 @@
 <script context="module" lang="typescript">
   export interface Field {
-    name: string
-    value: string | null
-    label?: string
-    placeholder?: string
-    editable: boolean
+    name: string;
+    value: string | null;
+    label?: string;
+    placeholder?: string;
+    editable: boolean;
   }
 </script>
 
diff --git a/src/Options.svelte b/src/Options.svelte
index 714468e3b..9d12cbf43 100644
--- a/src/Options.svelte
+++ b/src/Options.svelte
@@ -1,7 +1,7 @@
 <script lang="typescript">
   import { createEventDispatcher } from 'svelte';
 
-  export let options: { label: string, value: string }[];
+  export let options: { label: string; value: string }[];
   export let name: string;
   export let selected = "";
   export let disabled = false;
diff --git a/src/base/orgs/Org.ts b/src/base/orgs/Org.ts
index bc294fa97..f9e0931ab 100644
--- a/src/base/orgs/Org.ts
+++ b/src/base/orgs/Org.ts
@@ -29,8 +29,8 @@ const GetOrgs = `
 `;
 
 export class Org {
-  address: string
-  owner: string
+  address: string;
+  owner: string;
 
   constructor(address: string, owner: string) {
     assert(ethers.utils.isAddress(address), "address must be valid");
diff --git a/src/base/projects/Widget.svelte b/src/base/projects/Widget.svelte
index 23af055f0..d6eeff87a 100644
--- a/src/base/projects/Widget.svelte
+++ b/src/base/projects/Widget.svelte
@@ -11,7 +11,7 @@
   type State =
       { status: Status.Loading }
     | { status: Status.Loaded }
-    | { status: Status.Error, error: string };
+    | { status: Status.Error; error: string };
 
   export let project: proj.Project;
   export let config: Config;
diff --git a/src/base/registrations/Submit.svelte b/src/base/registrations/Submit.svelte
index 03fc20eba..704eab4d7 100644
--- a/src/base/registrations/Submit.svelte
+++ b/src/base/registrations/Submit.svelte
@@ -19,7 +19,7 @@
   let error: Error | null = null;
   let registrationOwner = owner || session.address;
 
-  const view = () => navigate(`/registrations/${subdomain}`)
+  const view = () => navigate(`/registrations/${subdomain}`);
 
   onMount(async () => {
     try {
diff --git a/src/base/registrations/Update.svelte b/src/base/registrations/Update.svelte
index b5cceb0c8..8df2d8e94 100644
--- a/src/base/registrations/Update.svelte
+++ b/src/base/registrations/Update.svelte
@@ -18,7 +18,7 @@
       { status: Status.Signing }
     | { status: Status.Pending }
     | { status: Status.Success }
-    | { status: Status.Failed, error: string };
+    | { status: Status.Failed; error: string };
 
   export let subdomain: string;
   export let config: Config;
diff --git a/src/base/registrations/View.svelte b/src/base/registrations/View.svelte
index bd666c930..9d038f2ac 100644
--- a/src/base/registrations/View.svelte
+++ b/src/base/registrations/View.svelte
@@ -27,8 +27,8 @@
   type State =
       { status: Status.Loading }
     | { status: Status.NotFound }
-    | { status: Status.Found, registration: Registration }
-    | { status: Status.Failed, error: string };
+    | { status: Status.Found; registration: Registration }
+    | { status: Status.Failed; error: string };
 
   export let subdomain: string;
   export let config: Config;
@@ -74,7 +74,7 @@
       .filter(r => r.editable && r.value !== null)
       .map(f => {
         assert(f.value !== null);
-        return { name: f.name, value: f.value }
+        return { name: f.name, value: f.value };
       });
   };
 
diff --git a/src/config.ts b/src/config.ts
index a398d5e3b..4825b90b1 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -26,7 +26,7 @@ export class Config {
   provider: ethers.providers.JsonRpcProvider;
   signer: ethers.Signer & TypedDataSigner | null;
   safe: { api: string | null; viewer: string | null };
-  abi: { [contract: string]: string[] }
+  abi: { [contract: string]: string[] };
   seed: { api: string | null };
   tokens: string[];
 
diff --git a/src/project.ts b/src/project.ts
index 6dc0e2d27..270c89b28 100644
--- a/src/project.ts
+++ b/src/project.ts
@@ -101,7 +101,7 @@ export async function getReadme(
 }
 
 export function path(
-  opts: { urn: string, org?: string, commit?: string, path?: string }
+  opts: { urn: string; org?: string; commit?: string; path?: string }
 ): string {
   const { urn, org, commit, path } = opts;
   const result = [];