Enable @typescript-eslint/member-delimiter-style and @typescript-esli…

…nt/semi (microsoft#10172)
sonalivdeshpande · May 19, 2022 · a4dde08 · a4dde08
1 parent b3314fd
commit a4dde08
Show file tree

Hide file tree

Showing 195 changed files with 677 additions and 635 deletions.
diff --git a/azure/packages/azure-client/src/AzureUrlResolver.ts b/azure/packages/azure-client/src/AzureUrlResolver.ts
@@ -74,7 +74,7 @@ function decodeAzureUrl(urlString: string): {
     ordererUrl: string;
     storageUrl: string;
     tenantId: string;
-    containerId?: string,
+    containerId?: string;
 } {
     const url = new URL(urlString);
     const ordererUrl = url.origin;

diff --git a/azure/packages/azure-client/src/interfaces.ts b/azure/packages/azure-client/src/interfaces.ts
@@ -23,11 +23,11 @@ export interface AzureClientProps {
     /**
      * Configuration for establishing a connection with the Azure Fluid Relay.
      */
-    readonly connection: AzureConnectionConfig,
+    readonly connection: AzureConnectionConfig;
     /**
      * Optional. A logger instance to receive diagnostic messages.
      */
-    readonly logger?: ITelemetryBaseLogger,
+    readonly logger?: ITelemetryBaseLogger;
 }
 
 /**

diff --git a/common/build/eslint-config-fluid/minimal.js b/common/build/eslint-config-fluid/minimal.js
@@ -142,10 +142,28 @@ module.exports = {
         "@typescript-eslint/comma-spacing": "error",
         "@typescript-eslint/func-call-spacing": "error",
         "@typescript-eslint/keyword-spacing": "error",
+        "@typescript-eslint/member-delimiter-style": [
+            "error",
+            {
+                "multiline": {
+                    "delimiter": "semi",
+                    "requireLast": true
+                },
+                "singleline": {
+                    "delimiter": "semi",
+                    "requireLast": true
+                },
+                "multilineDetection": "brackets"
+            },
+        ],
         "@typescript-eslint/object-curly-spacing": [
             "error",
             "always",
         ],
+        "@typescript-eslint/semi": [
+            "error",
+            "always"
+        ],
         "@typescript-eslint/space-before-function-paren": [
             "error",
             {

diff --git a/common/build/eslint-config-fluid/printed-configs/default.json b/common/build/eslint-config-fluid/printed-configs/default.json
@@ -100,7 +100,18 @@
             "error"
         ],
         "@typescript-eslint/member-delimiter-style": [
-            "off"
+            "error",
+            {
+                "multiline": {
+                    "delimiter": "semi",
+                    "requireLast": true
+                },
+                "multilineDetection": "brackets",
+                "singleline": {
+                    "delimiter": "semi",
+                    "requireLast": true
+                }
+            }
         ],
         "@typescript-eslint/member-ordering": [
             "off"

diff --git a/common/build/eslint-config-fluid/printed-configs/test.json b/common/build/eslint-config-fluid/printed-configs/test.json
@@ -100,7 +100,18 @@
             "error"
         ],
         "@typescript-eslint/member-delimiter-style": [
-            "off"
+            "error",
+            {
+                "multiline": {
+                    "delimiter": "semi",
+                    "requireLast": true
+                },
+                "multilineDetection": "brackets",
+                "singleline": {
+                    "delimiter": "semi",
+                    "requireLast": true
+                }
+            }
         ],
         "@typescript-eslint/member-ordering": [
             "off"

diff --git a/common/lib/container-definitions/src/browserPackage.ts b/common/lib/container-definitions/src/browserPackage.ts
@@ -45,7 +45,7 @@ export interface IFluidBrowserPackage extends IFluidPackage {
          * {@inheritDoc @fluidframework/core-interfaces#IFluidPackage.fluid.environment}
          */
         [environment: string]: IFluidPackageEnvironment;
-    }
+    };
 }
 
 /**

diff --git a/common/lib/container-definitions/src/deltas.ts b/common/lib/container-definitions/src/deltas.ts
@@ -54,7 +54,7 @@ export interface IDeltaHandlerStrategy {
 declare module "@fluidframework/core-interfaces" {
     interface IFluidObject {
         /** @deprecated - use `FluidObject<IDeltaSender>` instead */
-        readonly IDeltaSender?: IDeltaSender
+        readonly IDeltaSender?: IDeltaSender;
      }
 }
 

diff --git a/common/lib/container-definitions/src/fluidPackage.ts b/common/lib/container-definitions/src/fluidPackage.ts
@@ -26,7 +26,7 @@ export interface IFluidPackageEnvironment {
          * of Library, the entrypoint for umd packages
          */
         [key: string]: unknown;
-    }
+    };
 }
 
 /**

diff --git a/common/lib/container-definitions/src/legacy/index.ts b/common/lib/container-definitions/src/legacy/index.ts
@@ -21,7 +21,7 @@ export interface IProvideFluidTokenProvider {
  * @deprecated - This will be removed in a later release.
  */
 export interface IFluidTokenProvider extends IProvideFluidTokenProvider {
-    intelligence: { [service: string]: any };
+    intelligence: { [service: string]: any; };
 }
 
 declare module "@fluidframework/core-interfaces" {

diff --git a/common/lib/container-definitions/src/loader.ts b/common/lib/container-definitions/src/loader.ts
@@ -219,7 +219,7 @@ export interface IContainer extends IEventProvider<IContainerEvents>, IFluidRout
      * be true when the proposal is accepted, and false if
      * the proposal is rejected.
      */
-    proposeCodeDetails(codeDetails: IFluidCodeDetails): Promise<boolean>
+    proposeCodeDetails(codeDetails: IFluidCodeDetails): Promise<boolean>;
 
     /**
      * Attaches the Container to the Container specified by the given Request.
@@ -393,7 +393,7 @@ export type ILoaderOptions = {
     /**
      * Max time(in ms) container will wait for a leave message of a disconnected client.
     */
-    maxClientLeaveWaitTime?: number,
+    maxClientLeaveWaitTime?: number;
 };
 
 /**
@@ -443,7 +443,7 @@ export interface IContainerLoadMode {
          * Also there might be a lot of trailing ops and applying them might take time, so hosts are
          * recommended to have some progress UX / cancellation built into loading flow when using this option.
          */
-        | "all"
+        | "all";
     deltaConnection?:
         /*
          * Connection to delta stream is made only when Container.resume() call is made. Op processing
@@ -462,7 +462,7 @@ export interface IContainerLoadMode {
          * Ops processing is enabled and ops are flowing through the system.
          * Default value.
          */
-        | undefined
+        | undefined;
 }
 
 /**

diff --git a/common/lib/container-definitions/src/tokenProvider.ts b/common/lib/container-definitions/src/tokenProvider.ts
@@ -10,5 +10,5 @@ export interface IProvideFluidTokenProvider {
 }
 
 export interface IFluidTokenProvider extends IProvideFluidTokenProvider {
-    intelligence: { [service: string]: any };
+    intelligence: { [service: string]: any; };
 }
diff --git a/common/lib/core-interfaces/src/fluidObject.ts b/common/lib/core-interfaces/src/fluidObject.ts
@@ -22,7 +22,7 @@ export interface IFluidObject {
     /**
      * @deprecated - use `FluidObject<IFluidRunnable>` instead
      */
-    readonly IFluidRunnable?: IFluidRunnable
+    readonly IFluidRunnable?: IFluidRunnable;
     /**
      * @deprecated - use `FluidObject<IFluidRouter>` instead
      */

diff --git a/common/lib/core-interfaces/src/fluidPackage.ts b/common/lib/core-interfaces/src/fluidPackage.ts
@@ -27,7 +27,7 @@ export interface IFluidPackageEnvironment {
          * of Library, the entrypoint for umd packages
          */
         [key: string]: unknown;
-    }
+    };
 }
 
 /**

diff --git a/common/lib/core-interfaces/src/fluidRouter.ts b/common/lib/core-interfaces/src/fluidRouter.ts
@@ -16,7 +16,7 @@ export interface IResponse {
     mimeType: string;
     status: number;
     value: any;
-    headers?: { [key: string]: any };
+    headers?: { [key: string]: any; };
     stack?: string;
 }
 

diff --git a/common/lib/core-interfaces/src/test/types/fluidObjectTypes.ts b/common/lib/core-interfaces/src/test/types/fluidObjectTypes.ts
@@ -106,7 +106,7 @@ declare function getIFluidObject(): IFluidObject;
 // validate nested property is FluidObject too
 {
     interface IFoo {
-        z: { z: { z: boolean } };
+        z: { z: { z: boolean; }; };
       }
 
     const foo: FluidObject<IFoo> = getFluidObject();
@@ -117,15 +117,15 @@ declare function getIFluidObject(): IFluidObject;
 // validate provider inheritance
 {
     interface IProvideFooParent{
-        IFooParent: IFooParent
+        IFooParent: IFooParent;
     }
 
     interface IFooParent extends Partial<IProvideFooParent>{
         parent();
     }
 
     interface IFooProvideChild {
-        IFooChild: IFooChild
+        IFooChild: IFooChild;
     }
 
     interface IFooChild extends IFooParent, Partial<IFooProvideChild>{

diff --git a/common/lib/driver-definitions/src/storage.ts b/common/lib/driver-definitions/src/storage.ts
@@ -220,7 +220,7 @@ export interface IDocumentDeltaConnection extends IDisposable, IEventProvider<ID
      * to better understand server environment etc. and use it in case error occurs.
      * Format: "prop1:val1;prop2:val2;prop3:val3"
      */
-    relayServiceAgent?: string,
+    relayServiceAgent?: string;
 
     /**
      * Submit a new message to the server

diff --git a/common/lib/driver-definitions/src/urlResolver.ts b/common/lib/driver-definitions/src/urlResolver.ts
@@ -20,10 +20,10 @@ export interface IFluidResolvedUrl extends IResolvedUrlBase {
     /**
      * The id of the container this resolved url is for.
      */
-    id: string,
+    id: string;
     url: string;
-    tokens: { [name: string]: string };
-    endpoints: { [name: string]: string };
+    tokens: { [name: string]: string; };
+    endpoints: { [name: string]: string; };
 }
 
 /**

diff --git a/common/lib/protocol-definitions/src/consensus.ts b/common/lib/protocol-definitions/src/consensus.ts
@@ -24,17 +24,17 @@ export interface IProposal {
 /**
  * Similar to IProposal except includes the sequence number when it was made in addition to the fields on IProposal
  */
-export type ISequencedProposal = { sequenceNumber: number } & IProposal;
+export type ISequencedProposal = { sequenceNumber: number; } & IProposal;
 
 /**
  * Adds the sequence number at which the message was approved to an ISequencedProposal
  */
-export type IApprovedProposal = { approvalSequenceNumber: number } & ISequencedProposal;
+export type IApprovedProposal = { approvalSequenceNumber: number; } & ISequencedProposal;
 
 /**
  * Adds the sequence number at which the message was committed to an IApprovedProposal
  */
-export type ICommittedProposal = { commitSequenceNumber: number } & IApprovedProposal;
+export type ICommittedProposal = { commitSequenceNumber: number; } & IApprovedProposal;
 
 /**
  * Events fired by a Quorum in response to client tracking.

diff --git a/common/lib/protocol-definitions/src/sockets.ts b/common/lib/protocol-definitions/src/sockets.ts
@@ -65,7 +65,7 @@ export interface IConnect {
      * separated by ";" which server can log to better understand client environment etc.
      * Format: "prop1:val1;prop2:val2;prop3:val3"
     */
-    relayUserAgent?: string,
+    relayUserAgent?: string;
 }
 
 /**
@@ -164,5 +164,5 @@ export interface IConnected {
      * to better understand server environment etc. and use it in case error occurs.
      * Format: "prop1:val1;prop2:val2;prop3:val3"
      */
-    relayServiceAgent?: string,
+    relayServiceAgent?: string;
 }
diff --git a/common/lib/protocol-definitions/src/storage.ts b/common/lib/protocol-definitions/src/storage.ts
@@ -87,15 +87,15 @@ export interface ITree {
 
 export interface ISnapshotTree {
     id?: string;
-    blobs: { [path: string]: string };
-    trees: { [path: string]: ISnapshotTree };
+    blobs: { [path: string]: string; };
+    trees: { [path: string]: ISnapshotTree; };
     // Indicates that this tree is unreferenced. If this is not present, the tree is considered referenced.
     unreferenced?: true;
 }
 
 export interface ISnapshotTreeEx extends ISnapshotTree {
     id: string;
-    trees: { [path: string]: ISnapshotTreeEx };
+    trees: { [path: string]: ISnapshotTreeEx; };
 }
 
 /**

diff --git a/common/lib/protocol-definitions/src/summary.ts b/common/lib/protocol-definitions/src/summary.ts
@@ -60,7 +60,7 @@ export interface ISummaryTree {
     type: SummaryType.Tree;
 
     // TODO type I can infer from SummaryObject. File mode I may want to directly specify so have symlink+exec access
-    tree: { [path: string]: SummaryObject };
+    tree: { [path: string]: SummaryObject; };
 
     // Indicates that this tree entry is unreferenced. If this is not present, the tree entry is considered referenced.
     unreferenced?: true;

diff --git a/examples/apps/spaces/src/fluid-object/storage/spacesStorage.ts b/examples/apps/spaces/src/fluid-object/storage/spacesStorage.ts
@@ -26,7 +26,7 @@ export interface ISpacesStorage<T> extends EventEmitter {
      * @param serializableItemData - The data of the item to add.
      * @returns A unique key corresponding to the added item.
      */
-    addItem(serializableItemData: Serializable<T>, layout?: Layout): string
+    addItem(serializableItemData: Serializable<T>, layout?: Layout): string;
     /**
      * Removes the item specified by the given key.
      * @param key - The key referring to the item to remove.

diff --git a/examples/apps/spaces/src/fluid-object/storage/spacesStorageView.tsx b/examples/apps/spaces/src/fluid-object/storage/spacesStorageView.tsx
@@ -14,7 +14,7 @@ import "./spacesStorageStyle.css";
 
 interface ISpacesEditButtonProps {
     clickCallback(): void;
-    title: string,
+    title: string;
 }
 
 const SpacesEditButton: React.FC<ISpacesEditButtonProps> =
@@ -90,7 +90,7 @@ const SpacesItemView: React.FC<ISpacesItemViewProps> =
 
 // Stronger typing here maybe?
 interface ISpacesStorageViewProps<T = any> {
-    getViewForItem: (item: Serializable<T>) => Promise<JSX.Element | undefined>,
+    getViewForItem: (item: Serializable<T>) => Promise<JSX.Element | undefined>;
     getUrlForItem: (itemId: string) => string;
     storage: ISpacesStorage<T>;
     editable: boolean;

diff --git a/examples/data-objects/prosemirror/src/fluidBridge.ts b/examples/data-objects/prosemirror/src/fluidBridge.ts
@@ -233,7 +233,7 @@ export class ProseMirrorTransactionBuilder {
 
         let currentGroup: IThingGroup | undefined;
         const groups = new Array<IThingGroup>();
-        const annotations: { from: number, to: number, segment: ISegment, propertyDeltas?: any }[] = [];
+        const annotations: { from: number; to: number; segment: ISegment; propertyDeltas?: any; }[] = [];
         let position = 0;
 
         for (const thing of this.things) {

diff --git a/examples/data-objects/table-document/src/cellrange.ts b/examples/data-objects/table-document/src/cellrange.ts
@@ -43,7 +43,7 @@ export function parseRange(range: string) {
 export class CellRange {
     constructor(
         private readonly interval: SequenceInterval,
-        private readonly resolve: (localRef: LocalReference) => { row: number; col: number },
+        private readonly resolve: (localRef: LocalReference) => { row: number; col: number; },
     ) {
         // Ensure CellInterval was not created with a null/undefined interval.
         assert(!!interval, "CellInterval created with bad interval!");

diff --git a/examples/data-objects/table-document/src/document.ts b/examples/data-objects/table-document/src/document.ts
@@ -34,7 +34,7 @@ export interface ITableDocumentEvents extends IEvent {
  * @deprecated - TableDocument is an abandoned prototype.  Please use SharedMatrix with
  *               the IMatrixProducer/Consumer interfaces instead.
  */
-export class TableDocument extends DataObject<{ Events: ITableDocumentEvents }> implements ITable {
+export class TableDocument extends DataObject<{ Events: ITableDocumentEvents; }> implements ITable {
     public static getFactory() { return TableDocument.factory; }
 
     private static readonly factory = new DataObjectFactory(

diff --git a/examples/data-objects/table-document/src/slice.ts b/examples/data-objects/table-document/src/slice.ts
@@ -22,7 +22,7 @@ export interface ITableSliceConfig {
     maxCol: number;
 }
 
-export class TableSlice extends DataObject<{ InitialState: ITableSliceConfig }> implements ITable {
+export class TableSlice extends DataObject<{ InitialState: ITableSliceConfig; }> implements ITable {
     public static getFactory() { return TableSlice.factory; }
 
     private static readonly factory = new DataObjectFactory(

diff --git a/examples/data-objects/table-document/src/test/tableWithInterception.spec.ts b/examples/data-objects/table-document/src/test/tableWithInterception.spec.ts
@@ -21,9 +21,9 @@ describeLoaderCompat("Table Document with Interception", (getTestObjectProvider)
 
         // Sample interface used for storing the details of a cell.
         interface ICellType {
-            row: number,
-            col: number,
-            value: string,
+            row: number;
+            col: number;
+            value: string;
         }
 
         function orderSequentially(callback: () => void): void {

diff --git a/examples/data-objects/todo/src/TextBox/TextBox.tsx b/examples/data-objects/todo/src/TextBox/TextBox.tsx
@@ -18,7 +18,7 @@ export const TextBoxName = `${pkg.name as string}-textbox`;
  * TextBox is a really simple component that uses the CollaborativeTextArea to provide a
  * collaborative textarea.
  */
-export class TextBox extends DataObject<{ InitialState: string }> implements IFluidHTMLView {
+export class TextBox extends DataObject<{ InitialState: string; }> implements IFluidHTMLView {
     public get IFluidHTMLView() { return this; }
 
     private text: SharedString | undefined;