types: enable use of strict in tsconfig (clientIO#2051)

Author: jamesgeorgewilliams

.gitignore

@@ -3,6 +3,7 @@ node_modules/
 coverage/
 *.log
 demo/**/dist/**
-/test/ts/*.js*
+/test/ts/*.js
+/test/ts/*.js.map
 .tscache/
 .DS_Store

grunt/config/ts.js

@@ -1,14 +1,8 @@
 module.exports = {
     test: {
-        src: ['test/ts/*.ts'],
-        options: {
-            noImplicitAny: true,
-            forceConsistentCasingInFileNames: true,
-            noImplicitReturns: true,
-            noImplicitThis: true,
-            strictNullChecks: false,
-            suppressImplicitAnyIndexErrors: true,
-            noUnusedLocals: false
+        tsconfig: {
+            tsconfig: 'test/ts/tsconfig.json',
+            passThrough: true
         }
     }
 };

test/ts/index.test.ts

@@ -84,7 +84,7 @@ graph.addCell({
 });
 
 // `cells` attribute is a collection of cells
-const cell = graph.get('cells').at(0);
+const cell = graph.get('cells')?.at(0);
 (<joint.dia.Element>cell).getBBox({ rotate: true }).inflate(5);
 
 // ModelSetOptions
@@ -94,15 +94,15 @@ rectangle.set('test', true, { silent: true, customOption: true });
 // a child inherits attributes from `dia.Element`
 const cylinder = new joint.shapes.standard.Cylinder({ z: 0 });
 cylinder.set({ position: { x: 4, y: 5 }});
-cylinder.set('z', cylinder.attributes.z + 1);
+cylinder.set('z', (cylinder.attributes.z || 0) + 1);
 
 const paper = new joint.dia.Paper({
     model: graph,
     frozen: true,
     findParentBy: (_elementView, _evt, x, y) => graph.findModelsFromPoint({ x, y })
 });
 
-const cellView = cell.findView(paper);
+const cellView = graph.getCells[0].findView(paper);
 cellView.vel.addClass('test-class');
 
 let isHTMLView: AssertExtends<typeof paper.vel, null> = true;

test/ts/tsconfig.json

@@ -0,0 +1,32 @@
+{
+    "include": [
+        "**/*.ts",
+    ],
+    "compilerOptions": {
+        "target": "es6",
+        "moduleResolution": "node",
+        "pretty": true,
+        "sourceMap": true,
+        // The following options are enabled when using 'strict: true'
+        "alwaysStrict": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        /* 
+            Rule is disabled due to design limitation with overloads in TypeScript
+            https://github.com/microsoft/TypeScript/issues/38353
+            https://github.com/microsoft/TypeScript/issues/42196
+        */
+        "strictBindCallApply": false,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "strictPropertyInitialization": true,
+        "useUnknownInCatchVariables": true,
+        // 'strict' options **End**
+        "forceConsistentCasingInFileNames": true,
+        "noImplicitReturns": true,
+        "suppressImplicitAnyIndexErrors": true,
+        "noUnusedLocals": false,
+        "skipLibCheck": false,
+        "types": [],
+    }
+}

types/joint.d.ts

@@ -12,6 +12,8 @@ export namespace dia {
 
     type Event = JQuery.TriggeredEvent;
 
+    type ObjectHash = { [key: string]: any };
+
     type Point = g.PlainPoint;
 
     type BBox = g.PlainRect;
@@ -157,7 +159,7 @@ export namespace dia {
         }
     }
 
-    class Graph<A = Graph.Attributes, S = dia.ModelSetOptions> extends Backbone.Model<A, S> {
+    class Graph<A extends ObjectHash = Graph.Attributes, S = dia.ModelSetOptions> extends Backbone.Model<A, S> {
 
         constructor(attributes?: Graph.Attributes, opt?: { cellNamespace?: any, cellModel?: typeof Cell });
 
@@ -314,7 +316,7 @@ export namespace dia {
         }
     }
 
-    class Cell<A = Cell.Attributes, S = dia.ModelSetOptions> extends Backbone.Model<A, S> {
+    class Cell<A extends ObjectHash = Cell.Attributes, S extends Backbone.ModelSetOptions = dia.ModelSetOptions> extends Backbone.Model<A, S> {
 
         constructor(attributes?: A, opt?: Graph.Options);
 
@@ -485,7 +487,7 @@ export namespace dia {
         }
     }
 
-    class Element<A = Element.Attributes, S = dia.ModelSetOptions> extends Cell<A, S> {
+    class Element<A extends ObjectHash = Element.Attributes, S extends Backbone.ModelSetOptions = dia.ModelSetOptions> extends Cell<A, S> {
 
         isElement(): boolean;
 
@@ -608,7 +610,7 @@ export namespace dia {
         }
     }
 
-    class Link<A = Link.Attributes, S = dia.ModelSetOptions> extends Cell<A, S> {
+    class Link<A extends ObjectHash = Link.Attributes, S extends Backbone.ModelSetOptions = dia.ModelSetOptions> extends Cell<A, S> {
 
         toolMarkup: string;
         doubleToolMarkup?: string;
@@ -1816,7 +1818,7 @@ export namespace dia {
         }
     }
 
-    class HighlighterView<Options = HighlighterView.Options> extends mvc.View<undefined, SVGElement> {
+    class HighlighterView<Options extends mvc.ViewOptions<undefined, SVGElement> = HighlighterView.Options> extends mvc.View<undefined, SVGElement> {
 
         constructor(options?: Options);
 
@@ -2015,7 +2017,7 @@ export namespace highlighters {
         }
     }
 
-    class list<Item = any, Options = list.Options> extends dia.HighlighterView<Options> {
+    class list<Item = any, Options extends mvc.ViewOptions<undefined, SVGElement> = list.Options> extends dia.HighlighterView<Options> {
 
         options: Options;
 
@@ -2189,7 +2191,7 @@ export namespace shapes {
 
         type CylinderAttributes = dia.Element.GenericAttributes<CylinderSelectors>;
 
-        class Cylinder<S = dia.ModelSetOptions> extends dia.Element<CylinderAttributes, S> {
+        class Cylinder<S extends Backbone.ModelSetOptions = dia.ModelSetOptions> extends dia.Element<CylinderAttributes, S> {
             topRy(): string | number;
             topRy(t: string | number, opt?: S): this;
         }
@@ -3300,6 +3302,7 @@ export namespace mvc {
 
     interface ViewOptions<T extends (Backbone.Model | undefined), E extends Element = HTMLElement> extends Backbone.ViewOptions<T, E> {
         theme?: string;
+        [key: string]: any;
     }
 
     interface viewEventData {
@@ -4136,7 +4139,7 @@ export namespace elementTools {
         }
     }
 
-    abstract class Control<T = Control.Options> extends dia.ToolView {
+    abstract class Control<T extends mvc.ViewOptions<undefined, SVGElement> = Control.Options> extends dia.ToolView {
         options: T;
         constructor(opt?: T);