Merge pull request #346 from POPWorldMedia/typescript5-#345

Typescript5 update #345
POPWorldMedia · Sep 9, 2023 · 5badf2b · 5badf2b
2 parents 0f4a56e + aef17c5
commit 5badf2b
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 37 deletions.
diff --git a/src/PopForums.Mvc/Client/Components/AnswerButton.ts b/src/PopForums.Mvc/Client/Components/AnswerButton.ts
@@ -1,6 +1,6 @@
 namespace PopForums {
 
-    export class AnswerButton extends ElementBase {
+    export class AnswerButton extends ElementBase<TopicState> {
         constructor() {
             super();
         }
@@ -46,7 +46,7 @@ namespace PopForums {
             super.connectedCallback();
         }
 
-        getDependentReference(): [StateBase, string] {
+        getDependentReference(): [TopicState, string] {
             return [PopForums.currentTopicState, "answerPostID"];
         }
 

diff --git a/src/PopForums.Mvc/Client/Components/CommentButton.ts b/src/PopForums.Mvc/Client/Components/CommentButton.ts
@@ -1,6 +1,6 @@
 namespace PopForums {
 
-    export class CommentButton extends ElementBase {
+    export class CommentButton extends ElementBase<TopicState> {
         constructor() {
             super();
         }
@@ -35,7 +35,7 @@ namespace PopForums {
             super.connectedCallback();
         }
 
-        getDependentReference(): [StateBase, string] {
+        getDependentReference(): [TopicState, string] {
             return [PopForums.currentTopicState, "commentReplyID"];
         }
 

diff --git a/src/PopForums.Mvc/Client/Components/FavoriteButton.ts b/src/PopForums.Mvc/Client/Components/FavoriteButton.ts
@@ -1,6 +1,6 @@
 namespace PopForums {
 
-    export class FavoriteButton extends ElementBase {
+    export class FavoriteButton extends ElementBase<TopicState> {
     constructor() {
         super();
     }
@@ -44,7 +44,7 @@ namespace PopForums {
         super.connectedCallback();
     }
 
-    getDependentReference(): [StateBase, string] {
+    getDependentReference(): [TopicState, string] {
         return [PopForums.currentTopicState, "isFavorite"];
     }
 

diff --git a/src/PopForums.Mvc/Client/Components/FullText.ts b/src/PopForums.Mvc/Client/Components/FullText.ts
@@ -1,6 +1,6 @@
 namespace PopForums {
 
-    export class FullText extends ElementBase {
+    export class FullText extends ElementBase<TopicState> {
     constructor() {
         super();
     }
@@ -135,7 +135,7 @@ namespace PopForums {
             super.connectedCallback();
     }
 
-    getDependentReference(): [StateBase, string] {
+    getDependentReference(): [TopicState, string] {
         return [PopForums.currentTopicState, "nextQuote"];
     }
 

diff --git a/src/PopForums.Mvc/Client/Components/MorePostsBeforeReplyButton.ts b/src/PopForums.Mvc/Client/Components/MorePostsBeforeReplyButton.ts
@@ -1,6 +1,6 @@
 namespace PopForums {
 
-    export class MorePostsBeforeReplyButton extends ElementBase {
+    export class MorePostsBeforeReplyButton extends ElementBase<TopicState> {
     constructor() {
         super();
     }
@@ -24,7 +24,7 @@ namespace PopForums {
         super.connectedCallback();
     }
 
-    getDependentReference(): [StateBase, string] {
+    getDependentReference(): [TopicState, string] {
         return [PopForums.currentTopicState, "isNewerPostsAvailable"];
     }
 

diff --git a/src/PopForums.Mvc/Client/Components/MorePostsButton.ts b/src/PopForums.Mvc/Client/Components/MorePostsButton.ts
@@ -1,6 +1,6 @@
 namespace PopForums {
 
-    export class MorePostsButton extends ElementBase {
+    export class MorePostsButton extends ElementBase<TopicState> {
     constructor() {
         super();
     }
@@ -24,7 +24,7 @@ namespace PopForums {
         super.connectedCallback();
     }
 
-    getDependentReference(): [StateBase, string] {
+    getDependentReference(): [TopicState, string] {
         return [PopForums.currentTopicState, "highPage"];
     }
 

diff --git a/src/PopForums.Mvc/Client/Components/NotificationList.ts b/src/PopForums.Mvc/Client/Components/NotificationList.ts
@@ -1,6 +1,6 @@
 namespace PopForums {
 
-    export class NotificationList extends ElementBase {
+    export class NotificationList extends ElementBase<UserState> {
     constructor() {
         super();
     }
@@ -9,7 +9,7 @@ namespace PopForums {
         super.connectedCallback();
     }
 
-    getDependentReference(): [StateBase, string] {
+    getDependentReference(): [UserState, string] {
         return [PopForums.userState, "notifications"];
     }
 

diff --git a/src/PopForums.Mvc/Client/Components/NotificationToggle.ts b/src/PopForums.Mvc/Client/Components/NotificationToggle.ts
@@ -1,6 +1,6 @@
 namespace PopForums {
 
-    export class NotificationToggle extends ElementBase {
+    export class NotificationToggle extends ElementBase<UserState> {
     constructor() {
         super();
         this.userState = PopForums.userState;
@@ -47,7 +47,7 @@ namespace PopForums {
         this.userState.list.addEventListener("scroll", this.userState.ScrollLoad);
     }
 
-    getDependentReference(): [StateBase, string] {
+    getDependentReference(): [UserState, string] {
         return [PopForums.userState, "notificationCount"];
     }
 

diff --git a/src/PopForums.Mvc/Client/Components/PMCount.ts b/src/PopForums.Mvc/Client/Components/PMCount.ts
@@ -1,14 +1,14 @@
 namespace PopForums {
 
-export class PMCount extends ElementBase {
+export class PMCount extends ElementBase<UserState> {
     constructor() {
         super();
         this.isInit = false;
     }
 
     private isInit: boolean;
 
-    getDependentReference(): [StateBase, string] {
+    getDependentReference(): [UserState, string] {
         return [PopForums.userState, "newPmCount"];
     }
 

diff --git a/src/PopForums.Mvc/Client/Components/PreviousPostsButton.ts b/src/PopForums.Mvc/Client/Components/PreviousPostsButton.ts
@@ -1,6 +1,6 @@
 namespace PopForums {
 
-    export class PreviousPostsButton extends ElementBase {
+    export class PreviousPostsButton extends ElementBase<TopicState> {
     constructor() {
         super();
     }
@@ -24,7 +24,7 @@ namespace PopForums {
         super.connectedCallback();
     }
 
-    getDependentReference(): [StateBase, string] {
+    getDependentReference(): [TopicState, string] {
         return [PopForums.currentTopicState, "lowPage"];
     }
 

diff --git a/src/PopForums.Mvc/Client/Components/QuoteButton.ts b/src/PopForums.Mvc/Client/Components/QuoteButton.ts
@@ -41,7 +41,7 @@
         this.onclick = (e: MouseEvent) => {
             // get this from topic state's callback/ready method, because iOS loses selection when you touch quote button
             let fragment = PopForums.currentTopicState.documentFragment;
-            let ancestor = PopForums.currentTopicState.selectionAncestor;
+            let ancestor = PopForums.currentTopicState.selectionAncestor as Element;
             if (!fragment) {
                 let selection = document.getSelection();
                 if (!selection || selection.rangeCount === 0 || selection.getRangeAt(0).toString().length === 0) {
@@ -51,16 +51,16 @@
                     return;
                 }
                 let range = selection.getRangeAt(0);
-                ancestor = range.commonAncestorContainer;
+                ancestor = range.commonAncestorContainer as Element;
                 fragment = range.cloneContents();
             }
             let div = document.createElement("div");
             div.appendChild(fragment);
             // is selection in the container?
-            while (ancestor['id'] !== this.containerid && ancestor.parentElement !== null) {
+            while (ancestor.id !== this.containerid && ancestor.parentElement !== null) {
                 ancestor = ancestor.parentElement;
             }
-            let isInText = ancestor['id'] === this.containerid;
+            let isInText = ancestor.id === this.containerid;
             // if not, is it partially in the container?
             if (!isInText) {
                 let container = div.querySelector("#" + this.containerid);

diff --git a/src/PopForums.Mvc/Client/Components/ReplyButton.ts b/src/PopForums.Mvc/Client/Components/ReplyButton.ts
@@ -1,6 +1,6 @@
 namespace PopForums {
 
-    export class ReplyButton extends ElementBase {
+    export class ReplyButton extends ElementBase<TopicState> {
     constructor() {
         super();
     }
@@ -39,7 +39,7 @@ namespace PopForums {
         super.connectedCallback();
     }
 
-    getDependentReference(): [StateBase, string] {
+    getDependentReference(): [TopicState, string] {
         return [PopForums.currentTopicState, "isReplyLoaded"];
     }
 

diff --git a/src/PopForums.Mvc/Client/Components/SubscribeButton.ts b/src/PopForums.Mvc/Client/Components/SubscribeButton.ts
@@ -1,6 +1,6 @@
 namespace PopForums {
 
-    export class SubscribeButton extends ElementBase {
+    export class SubscribeButton extends ElementBase<TopicState> {
     constructor() {
         super();
     }
@@ -44,7 +44,7 @@ namespace PopForums {
         super.connectedCallback();
     }
 
-    getDependentReference(): [StateBase, string] {
+    getDependentReference(): [TopicState, string] {
         return [PopForums.currentTopicState, "isSubscribed"];
     }
 

diff --git a/src/PopForums.Mvc/Client/Components/TopicButton.ts b/src/PopForums.Mvc/Client/Components/TopicButton.ts
@@ -1,6 +1,6 @@
 namespace PopForums {
 
-    export class TopicButton extends ElementBase {
+    export class TopicButton extends ElementBase<ForumState> {
     constructor() {
         super();
     }
@@ -29,7 +29,7 @@ namespace PopForums {
         super.connectedCallback();
     }
 
-    getDependentReference(): [StateBase, string] {
+    getDependentReference(): [ForumState, string] {
         return [PopForums.currentForumState, "isNewTopicLoaded"];
     }
 

diff --git a/src/PopForums.Mvc/Client/ElementBase.ts b/src/PopForums.Mvc/Client/ElementBase.ts
@@ -1,6 +1,6 @@
 namespace PopForums {
 
-export abstract class ElementBase extends HTMLElement {
+export abstract class ElementBase<B extends StateBase> extends HTMLElement {
 
     connectedCallback() {
         if (this.state && this.propertyToWatch)
@@ -12,16 +12,16 @@ export abstract class ElementBase extends HTMLElement {
         this.state.subscribe(this.propertyToWatch, delegate);
     }
 
-    private state: StateBase;
+    private state: B;
     private propertyToWatch: string;
 
     update() {
-        const externalValue = this.state[this.propertyToWatch];
+        const externalValue = this.state[this.propertyToWatch as keyof B];
         this.updateUI(externalValue);
     }
 
     // Implementation should return the StateBase and property (as a string) to monitor
-    abstract getDependentReference(): [StateBase, string];
+    abstract getDependentReference(): [B, string];
 
     // Use in the implementation to manipulate the shadow or light DOM or straight markup as needed in response to the new data.
     abstract updateUI(data: any): void;

diff --git a/src/PopForums.Mvc/Client/tsconfig.json b/src/PopForums.Mvc/Client/tsconfig.json
@@ -7,7 +7,6 @@
     "outFile": "../wwwroot/PopForums.js",
     "experimentalDecorators": true,
     "noImplicitAny": true,
-    "suppressImplicitAnyIndexErrors": true,
     "moduleResolution": "Node"
   }
 }
diff --git a/src/PopForums.Mvc/PopForums.Mvc.csproj b/src/PopForums.Mvc/PopForums.Mvc.csproj
@@ -20,7 +20,7 @@
 
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-		<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.9.5">
+		<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.2.2">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

diff --git a/src/PopForums.Mvc/package.json b/src/PopForums.Mvc/package.json
@@ -9,7 +9,7 @@
     "vue-router": "4.1.6"
   },
   "devDependencies": {
-    "typescript": "4.9.5",
+    "typescript": "5.2.2",
     "gulp-typescript": "5.0.1",
     "@babel/core": "7.19.3",
     "@babel/preset-env": "7.19.3",