Use typecasts with as to avoid parser issues in tsx (#13)

SAP-samples · Jun 3, 2024 · 4547de9 · 4547de9
1 parent bc61d3d
commit 4547de9
Show file tree

Hide file tree

Showing 184 changed files with 3,177 additions and 2,998 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,9 +3,9 @@
   "author": "SAP SE",
   "private": true,
   "devDependencies": {
-    "archiver": "^6.0.1",
+    "archiver": "^7.0.1",
     "fast-glob": "^3.3.2",
-    "gh-pages": "^6.1.0"
+    "gh-pages": "^6.1.1"
   },
   "workspaces": [
     "steps/*"

diff --git a/steps/01/package.json b/steps/01/package.json
@@ -8,6 +8,6 @@
     "start": "ui5 serve -o index.html"
   },
   "devDependencies": {
-    "@ui5/cli": "^3.7.1"
+    "@ui5/cli": "^3.10.3"
   }
 }
diff --git a/steps/02/package.json b/steps/02/package.json
@@ -8,10 +8,10 @@
     "start": "ui5 serve -o index.html"
   },
   "devDependencies": {
-    "@ui5/cli": "^3.7.1",
-    "typescript": "^5.2.2",
-    "ui5-middleware-livereload": "^3.0.2",
-    "ui5-middleware-serveframework": "^3.0.0",
-    "ui5-tooling-transpile": "^3.2.7"
+    "@ui5/cli": "^3.10.3",
+    "typescript": "^5.4.5",
+    "ui5-middleware-livereload": "^3.0.3",
+    "ui5-middleware-serveframework": "^3.1.1",
+    "ui5-tooling-transpile": "^3.4.1"
   }
 }
diff --git a/steps/02/ui5.yaml b/steps/02/ui5.yaml
@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.1"
+  version: "1.120.15"
   libraries:
     - name: sap.ui.core
     - name: themelib_sap_horizon

diff --git a/steps/03/package.json b/steps/03/package.json
@@ -9,10 +9,10 @@
   },
   "devDependencies": {
     "@types/openui5": "^1.120.0",
-    "@ui5/cli": "^3.7.1",
-    "typescript": "^5.2.2",
-    "ui5-middleware-livereload": "^3.0.2",
-    "ui5-middleware-serveframework": "^3.0.0",
-    "ui5-tooling-transpile": "^3.2.7"
+    "@ui5/cli": "^3.10.3",
+    "typescript": "^5.4.5",
+    "ui5-middleware-livereload": "^3.0.3",
+    "ui5-middleware-serveframework": "^3.1.1",
+    "ui5-tooling-transpile": "^3.4.1"
   }
 }
diff --git a/steps/03/ui5.yaml b/steps/03/ui5.yaml
@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.1"
+  version: "1.120.15"
   libraries:
     - name: sap.m
     - name: sap.ui.core

diff --git a/steps/04/package.json b/steps/04/package.json
@@ -9,10 +9,10 @@
   },
   "devDependencies": {
     "@types/openui5": "^1.120.0",
-    "@ui5/cli": "^3.7.1",
-    "typescript": "^5.2.2",
-    "ui5-middleware-livereload": "^3.0.2",
-    "ui5-middleware-serveframework": "^3.0.0",
-    "ui5-tooling-transpile": "^3.2.7"
+    "@ui5/cli": "^3.10.3",
+    "typescript": "^5.4.5",
+    "ui5-middleware-livereload": "^3.0.3",
+    "ui5-middleware-serveframework": "^3.1.1",
+    "ui5-tooling-transpile": "^3.4.1"
   }
 }
diff --git a/steps/04/ui5.yaml b/steps/04/ui5.yaml
@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.1"
+  version: "1.120.15"
   libraries:
     - name: sap.m
     - name: sap.ui.core

diff --git a/steps/05/package.json b/steps/05/package.json
@@ -9,10 +9,10 @@
   },
   "devDependencies": {
     "@types/openui5": "^1.120.0",
-    "@ui5/cli": "^3.7.1",
-    "typescript": "^5.2.2",
-    "ui5-middleware-livereload": "^3.0.2",
-    "ui5-middleware-serveframework": "^3.0.0",
-    "ui5-tooling-transpile": "^3.2.7"
+    "@ui5/cli": "^3.10.3",
+    "typescript": "^5.4.5",
+    "ui5-middleware-livereload": "^3.0.3",
+    "ui5-middleware-serveframework": "^3.1.1",
+    "ui5-tooling-transpile": "^3.4.1"
   }
 }
diff --git a/steps/05/ui5.yaml b/steps/05/ui5.yaml
@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.1"
+  version: "1.120.15"
   libraries:
     - name: sap.m
     - name: sap.ui.core

diff --git a/steps/06/package.json b/steps/06/package.json
@@ -9,10 +9,10 @@
   },
   "devDependencies": {
     "@types/openui5": "^1.120.0",
-    "@ui5/cli": "^3.7.1",
-    "typescript": "^5.2.2",
-    "ui5-middleware-livereload": "^3.0.2",
-    "ui5-middleware-serveframework": "^3.0.0",
-    "ui5-tooling-transpile": "^3.2.7"
+    "@ui5/cli": "^3.10.3",
+    "typescript": "^5.4.5",
+    "ui5-middleware-livereload": "^3.0.3",
+    "ui5-middleware-serveframework": "^3.1.1",
+    "ui5-tooling-transpile": "^3.4.1"
   }
 }
diff --git a/steps/06/ui5.yaml b/steps/06/ui5.yaml
@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.1"
+  version: "1.120.15"
   libraries:
     - name: sap.m
     - name: sap.ui.core

diff --git a/steps/07/package.json b/steps/07/package.json
@@ -9,10 +9,10 @@
   },
   "devDependencies": {
     "@types/openui5": "^1.120.0",
-    "@ui5/cli": "^3.7.1",
-    "typescript": "^5.2.2",
-    "ui5-middleware-livereload": "^3.0.2",
-    "ui5-middleware-serveframework": "^3.0.0",
-    "ui5-tooling-transpile": "^3.2.7"
+    "@ui5/cli": "^3.10.3",
+    "typescript": "^5.4.5",
+    "ui5-middleware-livereload": "^3.0.3",
+    "ui5-middleware-serveframework": "^3.1.1",
+    "ui5-tooling-transpile": "^3.4.1"
   }
 }
diff --git a/steps/07/ui5.yaml b/steps/07/ui5.yaml
@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.1"
+  version: "1.120.15"
   libraries:
     - name: sap.m
     - name: sap.ui.core

diff --git a/steps/08/README.md b/steps/08/README.md
@@ -77,8 +77,8 @@ export default class AppController extends Controller {
 
    onShowHello(): void {
       // read msg from i18n model
-      const recipient = (<JSONModel>this.getView()?.getModel())?.getProperty("/recipient/name");
-      const resourceBundle = <ResourceBundle>(<ResourceModel>this.getView()?.getModel("i18n"))?.getResourceBundle();
+      const recipient = (this.getView()?.getModel() as JSONModel)?.getProperty("/recipient/name");
+      const resourceBundle = (this.getView()?.getModel("i18n") as ResourceModel)?.getResourceBundle() as ResourceBundle;
       const msg = resourceBundle.getText("helloMsg", [recipient]) || "no text defined";
       // show message
       MessageToast.show(msg);
@@ -158,4 +158,4 @@ A resource bundle is a flat structure, therefore the preceding slash \(/\) can b
 
 [API Reference: `sap/base/strings/formatMessage`](https://sdk.openui5.org/#/api/module:sap/base/strings/formatMessage)
 
-[Binding Path](https://sdk.openui5.org/topic/2888af49635949eca14fa326d04833b9 "Binding paths address the different properties and lists in a model and define how a node in the hierarchical data tree can be found.")
+[Binding Path](https://sdk.openui5.org/topic/2888af49635949eca14fa326d04833b9 "Binding paths address the different properties and lists in a model and define how a node in the hierarchical data tree can be found.")
diff --git a/steps/08/package.json b/steps/08/package.json
@@ -9,10 +9,10 @@
   },
   "devDependencies": {
     "@types/openui5": "^1.120.0",
-    "@ui5/cli": "^3.7.1",
-    "typescript": "^5.2.2",
-    "ui5-middleware-livereload": "^3.0.2",
-    "ui5-middleware-serveframework": "^3.0.0",
-    "ui5-tooling-transpile": "^3.2.7"
+    "@ui5/cli": "^3.10.3",
+    "typescript": "^5.4.5",
+    "ui5-middleware-livereload": "^3.0.3",
+    "ui5-middleware-serveframework": "^3.1.1",
+    "ui5-tooling-transpile": "^3.4.1"
   }
 }
diff --git a/steps/08/ui5.yaml b/steps/08/ui5.yaml
@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.1"
+  version: "1.120.15"
   libraries:
     - name: sap.m
     - name: sap.ui.core

diff --git a/steps/08/webapp/controller/App.controller.ts b/steps/08/webapp/controller/App.controller.ts
@@ -28,8 +28,8 @@ export default class AppController extends Controller {
 
    onShowHello(): void {
       // read msg from i18n model
-      const recipient = (<JSONModel>this.getView()?.getModel())?.getProperty("/recipient/name");
-      const resourceBundle = <ResourceBundle>(<ResourceModel>this.getView()?.getModel("i18n"))?.getResourceBundle();
+      const recipient = (this.getView()?.getModel() as JSONModel)?.getProperty("/recipient/name");
+      const resourceBundle = (this.getView()?.getModel("i18n") as ResourceModel)?.getResourceBundle() as ResourceBundle;
       const msg = resourceBundle.getText("helloMsg", [recipient]) || "no text defined";
       // show message
       MessageToast.show(msg);

diff --git a/steps/09/README.md b/steps/09/README.md
@@ -101,8 +101,8 @@ import ResourceBundle from "sap/base/i18n/ResourceBundle";
 export default class AppController extends Controller {
     onShowHello(): void {
         // read msg from i18n model
-        const recipient = (<JSONModel> this.getView()?.getModel())?.getProperty("/recipient/name");
-        const resourceBundle = <ResourceBundle> (<ResourceModel> this.getView()?.getModel("i18n"))?.getResourceBundle();
+        const recipient = (this.getView()?.getModel() as JSONModel)?.getProperty("/recipient/name");
+        const resourceBundle = (this.getView()?.getModel("i18n") as ResourceModel)?.getResourceBundle() as ResourceBundle;
         const msg = resourceBundle.getText("helloMsg", [recipient]) || "no text defined";
         // show message
         MessageToast.show(msg);
@@ -172,4 +172,4 @@ new ComponentContainer({
 
 [Advanced Concepts for OpenUI5 Components](https://sdk.openui5.org/topic/ecbc417ff264498b96bc364c53280242.html "Advanced concepts for components include routing and navigation and component data as well as the event bus.")
 
-[API Reference: `sap.ui.core.ComponentContainer`](https://sdk.openui5.org/api/sap.ui.core.ComponentContainer)
+[API Reference: `sap.ui.core.ComponentContainer`](https://sdk.openui5.org/api/sap.ui.core.ComponentContainer)
diff --git a/steps/09/package.json b/steps/09/package.json
@@ -9,10 +9,10 @@
   },
   "devDependencies": {
     "@types/openui5": "^1.120.0",
-    "@ui5/cli": "^3.7.1",
-    "typescript": "^5.2.2",
-    "ui5-middleware-livereload": "^3.0.2",
-    "ui5-middleware-serveframework": "^3.0.0",
-    "ui5-tooling-transpile": "^3.2.7"
+    "@ui5/cli": "^3.10.3",
+    "typescript": "^5.4.5",
+    "ui5-middleware-livereload": "^3.0.3",
+    "ui5-middleware-serveframework": "^3.1.1",
+    "ui5-tooling-transpile": "^3.4.1"
   }
 }
diff --git a/steps/09/ui5.yaml b/steps/09/ui5.yaml
@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.1"
+  version: "1.120.15"
   libraries:
     - name: sap.m
     - name: sap.ui.core

diff --git a/steps/09/webapp/controller/App.controller.ts b/steps/09/webapp/controller/App.controller.ts
@@ -10,9 +10,9 @@ import ResourceBundle from "sap/base/i18n/ResourceBundle";
 export default class AppController extends Controller {
     onShowHello() : void {
         // read msg from i18n model
-        // functions with generic return values require casting 
-        const resourceBundle = <ResourceBundle> (<ResourceModel> this.getView()?.getModel("i18n"))?.getResourceBundle();
-        const recipient = (<JSONModel> this.getView()?.getModel())?.getProperty("/recipient/name");
+        // functions with generic return values require casting
+        const resourceBundle = (this.getView()?.getModel("i18n") as ResourceModel)?.getResourceBundle() as ResourceBundle;
+        const recipient = (this.getView()?.getModel() as JSONModel)?.getProperty("/recipient/name");
         const msg = resourceBundle.getText("helloMsg", [recipient]) || "no text defined";
         // show message
         MessageToast.show(msg);

diff --git a/steps/10/package.json b/steps/10/package.json
@@ -9,10 +9,10 @@
   },
   "devDependencies": {
     "@types/openui5": "^1.120.0",
-    "@ui5/cli": "^3.7.1",
-    "typescript": "^5.2.2",
-    "ui5-middleware-livereload": "^3.0.2",
-    "ui5-middleware-serveframework": "^3.0.0",
-    "ui5-tooling-transpile": "^3.2.7"
+    "@ui5/cli": "^3.10.3",
+    "typescript": "^5.4.5",
+    "ui5-middleware-livereload": "^3.0.3",
+    "ui5-middleware-serveframework": "^3.1.1",
+    "ui5-tooling-transpile": "^3.4.1"
   }
 }
diff --git a/steps/10/ui5.yaml b/steps/10/ui5.yaml
@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.1"
+  version: "1.120.15"
   libraries:
     - name: sap.m
     - name: sap.ui.core

diff --git a/steps/10/webapp/controller/App.controller.ts b/steps/10/webapp/controller/App.controller.ts
@@ -10,8 +10,8 @@ import ResourceBundle from "sap/base/i18n/ResourceBundle";
 export default class AppController extends Controller {
     onShowHello() : void {
         // read msg from i18n model
-        const recipient = (<JSONModel> this.getView()?.getModel())?.getProperty("/recipient/name");
-        const resourceBundle = <ResourceBundle> (<ResourceModel> this.getView()?.getModel("i18n"))?.getResourceBundle();
+        const recipient = (this.getView()?.getModel() as JSONModel)?.getProperty("/recipient/name");
+        const resourceBundle = (this.getView()?.getModel("i18n") as ResourceModel)?.getResourceBundle() as ResourceBundle;
         const msg = resourceBundle.getText("helloMsg", [recipient]) || "no text defined";
         // show message
         MessageToast.show(msg);

diff --git a/steps/11/package.json b/steps/11/package.json
@@ -9,10 +9,10 @@
   },
   "devDependencies": {
     "@types/openui5": "^1.120.0",
-    "@ui5/cli": "^3.7.1",
-    "typescript": "^5.2.2",
-    "ui5-middleware-livereload": "^3.0.2",
-    "ui5-middleware-serveframework": "^3.0.0",
-    "ui5-tooling-transpile": "^3.2.7"
+    "@ui5/cli": "^3.10.3",
+    "typescript": "^5.4.5",
+    "ui5-middleware-livereload": "^3.0.3",
+    "ui5-middleware-serveframework": "^3.1.1",
+    "ui5-tooling-transpile": "^3.4.1"
   }
 }
diff --git a/steps/11/ui5.yaml b/steps/11/ui5.yaml
@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.1"
+  version: "1.120.15"
   libraries:
     - name: sap.m
     - name: sap.ui.core

diff --git a/steps/11/webapp/controller/App.controller.ts b/steps/11/webapp/controller/App.controller.ts
@@ -10,8 +10,8 @@ import ResourceBundle from "sap/base/i18n/ResourceBundle";
 export default class AppController extends Controller {
     onShowHello() : void {
         // read msg from i18n model
-        const recipient = (<JSONModel> this.getView()?.getModel())?.getProperty("/recipient/name");
-        const resourceBundle = <ResourceBundle> (<ResourceModel> this.getView()?.getModel("i18n"))?.getResourceBundle();
+        const recipient = (this.getView()?.getModel() as JSONModel)?.getProperty("/recipient/name");
+        const resourceBundle = (this.getView()?.getModel("i18n") as ResourceModel)?.getResourceBundle() as ResourceBundle;
         const msg = resourceBundle.getText("helloMsg", [recipient]) || "no text defined";
         // show message
         MessageToast.show(msg);

diff --git a/steps/12/package.json b/steps/12/package.json
@@ -9,10 +9,10 @@
   },
   "devDependencies": {
     "@types/openui5": "^1.120.0",
-    "@ui5/cli": "^3.7.1",
-    "typescript": "^5.2.2",
-    "ui5-middleware-livereload": "^3.0.2",
-    "ui5-middleware-serveframework": "^3.0.0",
-    "ui5-tooling-transpile": "^3.2.7"
+    "@ui5/cli": "^3.10.3",
+    "typescript": "^5.4.5",
+    "ui5-middleware-livereload": "^3.0.3",
+    "ui5-middleware-serveframework": "^3.1.1",
+    "ui5-tooling-transpile": "^3.4.1"
   }
 }
diff --git a/steps/12/ui5.yaml b/steps/12/ui5.yaml
@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.1"
+  version: "1.120.15"
   libraries:
     - name: sap.m
     - name: sap.ui.core

diff --git a/steps/12/webapp/controller/App.controller.ts b/steps/12/webapp/controller/App.controller.ts
@@ -10,8 +10,8 @@ import ResourceBundle from "sap/base/i18n/ResourceBundle";
 export default class AppController extends Controller {
     onShowHello() : void {
         // read msg from i18n model
-        const recipient = (<JSONModel> this.getView()?.getModel())?.getProperty("/recipient/name");
-        const resourceBundle = <ResourceBundle> (<ResourceModel> this.getView()?.getModel("i18n"))?.getResourceBundle();
+        const recipient = (this.getView()?.getModel() as JSONModel)?.getProperty("/recipient/name");
+        const resourceBundle = (this.getView()?.getModel("i18n") as ResourceModel)?.getResourceBundle() as ResourceBundle;
         const msg = resourceBundle.getText("helloMsg", [recipient]) || "no text defined";
         // show message
         MessageToast.show(msg);