# HG changeset patch
# User cin
# Date 2022-09-13 21:06:43
# Node ID d644dced936efba5917df7ce6e2c15e9a7a8eda9
# Parent  e59104632d1457348a8090a8dc78f69591c214ee

linting

diff --git a/djx/.eslintrc.json b/djx/.eslintrc.json
--- a/djx/.eslintrc.json
+++ b/djx/.eslintrc.json
@@ -20,6 +20,8 @@
         "@typescript-eslint"
     ],
     "rules": {
+        "react/react-in-jsx-scope": "off",
+        "react/no-unknown-property": "off",
         "@typescript-eslint/no-empty-function": "off",
         "max-classes-per-file": [
             "error",
diff --git a/djx/package-lock.json b/djx/package-lock.json
--- a/djx/package-lock.json
+++ b/djx/package-lock.json
@@ -18,7 +18,7 @@
                 "@typescript-eslint/eslint-plugin": "^5.23.0",
                 "@typescript-eslint/parser": "^5.23.0",
                 "dojo": "1.16.0",
-                "eslint": "^8.15.0",
+                "eslint": "^8.23.0",
                 "eslint-config-standard": "^17.0.0",
                 "eslint-plugin-import": "^2.26.0",
                 "eslint-plugin-n": "^15.2.0",
@@ -26,7 +26,6 @@
                 "eslint-plugin-react": "^7.29.4",
                 "requirejs": "2.3.6",
                 "tap": "16.3.0",
-                "tslint": "^6.1.3",
                 "typescript": "4.8.3",
                 "yaml": "~1.7.2"
             },
@@ -1171,15 +1170,6 @@
             "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
             "dev": true
         },
-        "node_modules/builtin-modules": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-            "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/builtins": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
@@ -1351,12 +1341,6 @@
                 "color-support": "bin.js"
             }
         },
-        "node_modules/commander": {
-            "version": "2.20.3",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-            "dev": true
-        },
         "node_modules/commondir": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -3407,18 +3391,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/mkdirp": {
-            "version": "0.5.5",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-            "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-            "dev": true,
-            "dependencies": {
-                "minimist": "^1.2.5"
-            },
-            "bin": {
-                "mkdirp": "bin/cmd.js"
-            }
-        },
         "node_modules/ms": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -3965,15 +3937,6 @@
                 "node": ">=0.4.0"
             }
         },
-        "node_modules/resolve": {
-            "version": "1.17.0",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-            "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-            "dev": true,
-            "dependencies": {
-                "path-parse": "^1.0.6"
-            }
-        },
         "node_modules/resolve-from": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -6386,57 +6349,6 @@
             "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
             "dev": true
         },
-        "node_modules/tslint": {
-            "version": "6.1.3",
-            "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz",
-            "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==",
-            "dev": true,
-            "dependencies": {
-                "@babel/code-frame": "^7.0.0",
-                "builtin-modules": "^1.1.1",
-                "chalk": "^2.3.0",
-                "commander": "^2.12.1",
-                "diff": "^4.0.1",
-                "glob": "^7.1.1",
-                "js-yaml": "^3.13.1",
-                "minimatch": "^3.0.4",
-                "mkdirp": "^0.5.3",
-                "resolve": "^1.3.2",
-                "semver": "^5.3.0",
-                "tslib": "^1.13.0",
-                "tsutils": "^2.29.0"
-            },
-            "bin": {
-                "tslint": "bin/tslint"
-            },
-            "engines": {
-                "node": ">=4.8.0"
-            }
-        },
-        "node_modules/tslint/node_modules/semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver"
-            }
-        },
-        "node_modules/tslint/node_modules/tslib": {
-            "version": "1.13.0",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-            "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
-            "dev": true
-        },
-        "node_modules/tsutils": {
-            "version": "2.29.0",
-            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-            "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
-            "dev": true,
-            "dependencies": {
-                "tslib": "^1.8.1"
-            }
-        },
         "node_modules/type-check": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -7612,12 +7524,6 @@
             "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
             "dev": true
         },
-        "builtin-modules": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-            "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-            "dev": true
-        },
         "builtins": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
@@ -7743,12 +7649,6 @@
             "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
             "dev": true
         },
-        "commander": {
-            "version": "2.20.3",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-            "dev": true
-        },
         "commondir": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -9241,15 +9141,6 @@
                 "yallist": "^4.0.0"
             }
         },
-        "mkdirp": {
-            "version": "0.5.5",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-            "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-            "dev": true,
-            "requires": {
-                "minimist": "^1.2.5"
-            }
-        },
         "ms": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -9651,15 +9542,6 @@
             "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==",
             "dev": true
         },
-        "resolve": {
-            "version": "1.17.0",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-            "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-            "dev": true,
-            "requires": {
-                "path-parse": "^1.0.6"
-            }
-        },
         "resolve-from": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -11273,50 +11155,6 @@
             "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
             "dev": true
         },
-        "tslint": {
-            "version": "6.1.3",
-            "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz",
-            "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.0.0",
-                "builtin-modules": "^1.1.1",
-                "chalk": "^2.3.0",
-                "commander": "^2.12.1",
-                "diff": "^4.0.1",
-                "glob": "^7.1.1",
-                "js-yaml": "^3.13.1",
-                "minimatch": "^3.0.4",
-                "mkdirp": "^0.5.3",
-                "resolve": "^1.3.2",
-                "semver": "^5.3.0",
-                "tslib": "^1.13.0",
-                "tsutils": "^2.29.0"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-                    "dev": true
-                },
-                "tslib": {
-                    "version": "1.13.0",
-                    "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-                    "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
-                    "dev": true
-                }
-            }
-        },
-        "tsutils": {
-            "version": "2.29.0",
-            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-            "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
-            "dev": true,
-            "requires": {
-                "tslib": "^1.8.1"
-            }
-        },
         "type-check": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
diff --git a/djx/src/main/ts/declare.ts b/djx/src/main/ts/declare.ts
--- a/djx/src/main/ts/declare.ts
+++ b/djx/src/main/ts/declare.ts
@@ -138,7 +138,7 @@ export function djclass<T extends Abstra
         // proxy - фабрика для создания прокси-методов, которые внутри
         // себя вызовут this.inherited с правильными параметрами.
         const proxy = (m: (...args: unknown[]) => unknown) => function (this: dojo._base.DeclareCreatedObject, ...args: unknown[]) {
-            const f = this.getInherited({ callee: m, ...args, length: args.length});
+            const f = this.getInherited({ callee: m, ...args, length: args.length });
             return f ? f.apply(this, args) as unknown : undefined;
 
             // так сделать можно только dojo 1.15+
@@ -220,39 +220,35 @@ function isNodeBindSpec(v: object): v is
  */
 export function bind(params: NodeBindSpec | MemberBindSpec) {
     if (isNodeBindSpec(params)) {
-        return (target: Record<string, unknown>, name: string) => {
-            target[makeSetterName(name)] = params;
+        return <K extends string>(target: Record<K, unknown>, name: K) => {
+            target[makeSetterName(name) as K /** hack to not go insane) */] = params;
         };
     } else {
-        return (target: Record<string, unknown> & { _set(name: string, v: unknown): void }, name: string) => {
-            target[name] = null;
-            target[makeSetterName(name)] = function (v: unknown) {
+        return <K extends string,
+            T extends { [p in K]: p extends "_set" ? (name: p, v: unknown) => void : unknown; }> (target: T, name: K) => {
+            target[name] = undefined as T[K];
+            target[makeSetterName(name) as K] = function (this: T, v: unknown) {
                 this._set(name, v);
                 const inner = this[params.member] as Record<string, unknown>;
-                if (typeof inner.set === "function") 
+                if (typeof inner.set === "function")
                     inner.set(params.property, v);
-            };
+            } as T[K];
             if (params.getter)
                 target[makeGetterName(name)] = function () {
                     const inner = this[params.member] as Record<string, unknown>;
-                    if (typeof inner.get === "function") 
+                    if (typeof inner.get === "function")
                         return inner.get(params.property) as unknown;
                 };
         };
     }
 }
 
-/** Создает в прототипе указанное свойство со значение `undefined`, данный
- * декоратор следует использовать для свойств, у которых нет значения по-умолчанию
- * и они не могут быть `null | undefined`
- */
-export function prototype(): (p: object, name: string) => void;
 /** Создает в прототипе свойство с указанным значением.
  * @param value Значение, которое будет указано в прототипе
  */
 export function prototype<T>(value: T): <P extends { [m in K]: T }, K extends keyof P>(p: P, name: K) => void;
 export function prototype<T>(value?: T) {
-    return <P extends { [m in K]: T }, K extends keyof P>(p: P, name: K) => {
-        p[name] = value as any;
+    return (p: { [m in string]: T | undefined }, name: string) => {
+        p[name] = value;
     };
 }
diff --git a/djx/src/main/ts/tsx/traits.ts b/djx/src/main/ts/tsx/traits.ts
--- a/djx/src/main/ts/tsx/traits.ts
+++ b/djx/src/main/ts/tsx/traits.ts
@@ -4,7 +4,7 @@ import _WidgetBase = require("dijit/_Wid
 import registry = require("dijit/registry");
 
 interface _WidgetBaseConstructor {
-    new <E extends { [k in keyof E]: Event } = {}>(params?: Partial<_WidgetBase<E>> & ThisType<_WidgetBase<E>>, srcNodeRef?: string | Node): _WidgetBase<E> & dojo._base.DeclareCreatedObject;
+    new <E extends { [k in keyof E]: Event } = object>(params?: Partial<_WidgetBase<E>> & ThisType<_WidgetBase<E>>, srcNodeRef?: string | Node): _WidgetBase<E> & dojo._base.DeclareCreatedObject;
     prototype: _WidgetBase;
 }
 
diff --git a/djx/src/test/ts/observable-tests.ts b/djx/src/test/ts/observable-tests.ts
--- a/djx/src/test/ts/observable-tests.ts
+++ b/djx/src/test/ts/observable-tests.ts
@@ -12,7 +12,7 @@ const consumer1 = {
     next(v: number) {
         this.sum += v;
     }
-}
+};
 
 subj1.subscribe(consumer1);
 t.equal(consumer1.sum, 1, "Should get only one value");
@@ -31,19 +31,19 @@ let maps = 0;
 
 subj1
     .map(v => {
-        t.comment("map1: " + v * 2);
+        t.comment(`map1: ${v * 2}`);
         maps++;
         return v * 2;
     })
     .map (v => {
-        t.comment("map2: " + v * 2);
+        t.comment(`map2: ${v * 2}`);
         maps++;
         return v * 2;
     })
     .map(v => {
-        t.comment("map3: " + v * 2);
+        t.comment(`map3: ${v * 2}`);
         maps++;
-        return v * 2
+        return v * 2;
     })
     .subscribe(consumer2);
 
diff --git a/djx/src/test/ts/view/MyWidget.tsx b/djx/src/test/ts/view/MyWidget.tsx
--- a/djx/src/test/ts/view/MyWidget.tsx
+++ b/djx/src/test/ts/view/MyWidget.tsx
@@ -26,11 +26,11 @@ export class MyWidget extends djbase(Djx
     @bind({ node: "titleNode", type: "innerHTML" })
     title = "";
 
-    @prototype()
+    @prototype(0)
     counter = 0;
 
     render() {
-        const Frame = ({children, ref}: {ref: JSX.Ref<HTMLDivElement>, children: any[]}) => <div ref={ref} >{children}</div>;
+        const Frame = ({children, ref}: {ref: JSX.Ref<HTMLDivElement>, children: unknown[]}) => <div ref={ref} >{children}</div>;
         return <div className="myWidget" onsubmit={e => this._onSubmit(e)} tabIndex={3} style={{ alignContent: "center", border: "1px solid" }} >
             <h1 data-dojo-attach-point="titleNode"></h1>
             <Frame ref={ v => {}}>