- Updated TypeScript to latest 5.9.3 version.

Author: cabal95

Rock.JavaScript.Obsidian.Blocks/package-lock.json

@@ -40,7 +40,7 @@
     "ts-jest": "^29.4.5",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
-    "typescript": "^5.2.2",
+    "typescript": "^5.9.3",
     "vue": "^3.3.10",
     "vue-eslint-parser": "^9.4.3",
     "vue-tsc": "^2.1.6"

Rock.JavaScript.Obsidian.Blocks/package.json

@@ -67,7 +67,6 @@ const NativeViewTransition: ComponentOptions = {
             }
 
             // If we don't support transitions then just return the child.
-            // @ts-expect-error startViewTransition is not standard yet.
             if (!document.startViewTransition) {
                 return children;
             }
@@ -90,7 +89,6 @@ const NativeViewTransition: ComponentOptions = {
                 // Note that we are starting to animate.
                 animationState = 1;
 
-                // @ts-expect-error startViewTransition is not standard yet.
                 document.startViewTransition(async () => {
                     // Note that we are ready to accept new content.
                     animationState = 2;

Rock.JavaScript.Obsidian.Blocks/src/CheckIn/CheckInKiosk/nativeViewTransition.partial.ts

@@ -387,10 +387,10 @@
         // The `editingTopic` variable happens to be null if a new topic is being added.
         // The "if block" contains the logic to add the new topic if needed.
 
-        let editingTopic = campusTopics.value.find(c => c.type?.value === campusTopicType.value?.value ?? false) || null;
+        let editingTopic = campusTopics.value.find(c => c.type?.value === campusTopicType.value?.value) || null;
 
         if (editingTopic === null && campusTopicGuid.value !== null) {
-            editingTopic = campusTopics.value.find(c => c.guid === campusTopicGuid.value ?? false) || null;
+            editingTopic = campusTopics.value.find(c => c.guid === campusTopicGuid.value) || null;
         }
 
         if (editingTopic === null) {

Rock.JavaScript.Obsidian.Blocks/src/Core/CampusDetail/editPanel.partial.obs

@@ -286,7 +286,7 @@
 
     if (config.options?.hasPersonId) {
         panelMode.value = DetailPanelMode.Add;
-        locationEditBag.value = { bag: locationViewBag.value } ?? { bag: {} as LocationBag };
+        locationEditBag.value = { bag: locationViewBag.value };
     }
 
     // Handle any initial error conditions or the need to go into edit mode.

Rock.JavaScript.Obsidian.Blocks/src/Core/locationDetail.obs

@@ -20,7 +20,7 @@
     import { NumberUpDownGroupOption } from "@Obsidian/Types/Controls/numberUpDownGroup";
     import { updateRefValue } from "@Obsidian/Utility/component";
     import { areEqual } from "@Obsidian/Utility/guid";
-    import { asFormattedString, toCurrencyOrNull} from "@Obsidian/Utility/numberUtils";
+    import { asFormattedString, toCurrencyOrNull } from "@Obsidian/Utility/numberUtils";
     import { ListItemBag } from "@Obsidian/ViewModels/Utility/listItemBag";
     import { RegistrationEntryFeeBag } from "@Obsidian/ViewModels/Blocks/Event/RegistrationEntry/registrationEntryFeeBag";
     import { RegistrationEntryFeeItemBag } from "@Obsidian/ViewModels/Blocks/Event/RegistrationEntry/registrationEntryFeeItemBag";
@@ -196,17 +196,17 @@
 
     const dropDownListOptions = computed((): ListItemBag[] => {
         return props.fee.items
-            ?.filter(i => !props.fee.hideWhenNoneRemaining || i.countRemaining === null || i.countRemaining === undefined || (i.countRemaining + internalValue.value[i.guid] ?? 0) > 0)
+            ?.filter(i => !props.fee.hideWhenNoneRemaining || i.countRemaining === null || i.countRemaining === undefined || (i.countRemaining + (internalValue.value[i.guid] ?? 0)) > 0)
             .map(i => ({
                 text: getItemLabel(i),
                 value: i.guid,
-                disabled: i.countRemaining !== null && i.countRemaining !== undefined && (i.countRemaining + internalValue.value[i.guid] ?? 0) === 0
+                disabled: i.countRemaining !== null && i.countRemaining !== undefined && (i.countRemaining + (internalValue.value[i.guid] ?? 0)) === 0
             })) ?? [];
     });
 
     const numberUpDownGroupOptions = computed((): NumberUpDownGroupOption[] => {
         return props.fee.items
-            ?.filter(i => !props.fee.hideWhenNoneRemaining || i.countRemaining === null || i.countRemaining === undefined || (i.countRemaining + internalValue.value[i.guid] ?? 0) > 0)
+            ?.filter(i => !props.fee.hideWhenNoneRemaining || i.countRemaining === null || i.countRemaining === undefined || (i.countRemaining + (internalValue.value[i.guid] ?? 0)) > 0)
             .map(i => ({
                 key: i.guid,
                 label: getItemLabel(i),

Rock.JavaScript.Obsidian.Blocks/src/Event/RegistrationEntry/feeField.partial.obs

@@ -105,7 +105,7 @@
     const apiKey = propertyRef(props.modelValue.bag?.apiKey ?? "", "ApiKey");
     const isActive = propertyRef(props.modelValue.bag?.isActive ?? false, "IsActive");
     const pageViewRetentionDuration = propertyRef(props.modelValue.bag?.pageViewRetentionDuration, "PageViewRetentionDuration");
-    const authenticationPage = propertyRef<PageRouteValueBag | null>({ page: props.modelValue.bag?.loginPage } ?? null, "AuthenticationPage");
+    const authenticationPage = propertyRef<PageRouteValueBag | null>({ page: props.modelValue.bag?.loginPage }, "AuthenticationPage");
     const rokuComponents = propertyRef(props.modelValue.bag?.rokuComponents ?? "", "RokuComponents");
     const showRokuComponents = ref(props.modelValue.bag?.showRokuComponents ?? false);
 
@@ -153,4 +153,4 @@
     // Watch for any changes to props that represent properties and then
     // automatically emit which property changed.
     watchPropertyChanges(propRefs, emit);
-</script>
+</script>

Rock.JavaScript.Obsidian.Blocks/src/Tv/RokuApplicationDetail/editPanel.partial.obs

@@ -138,7 +138,7 @@
     });
 
     const internalDateKey = computed((): string => {
-        if ((!props.modelValue?.year ?? 0) && !computedRequireYear.value) {
+        if (!(props.modelValue?.year ?? 0) && !computedRequireYear.value) {
             const dateKey = DateKey.toNoYearDateKey(props.modelValue?.month ?? 0, props.modelValue?.day ?? 0);
 
             return dateKey;

Rock.JavaScript.Obsidian/Framework/Controls/datePartsPicker.obs

@@ -83,7 +83,7 @@
                                                     <div>{{ result.email }}</div>
                                                 </div>
                                                 <ul class="phones list-unstyled m-0">
-                                                    <li v-for="phone in result.phoneNumbers" :key="phone.type ?? '' + phone.number ?? ''">{{ phone.isUnlisted ? 'Unlisted' : phone.number }} <small v-if="phone.type" class="text-muted">{{ phone.type.charAt(0) }}</small></li>
+                                                    <li v-for="phone in result.phoneNumbers" :key="phone.type ?? phone.number ?? ''">{{ phone.isUnlisted ? 'Unlisted' : phone.number }} <small v-if="phone.type" class="text-muted">{{ phone.type.charAt(0) }}</small></li>
                                                 </ul>
                                                 <div class="taglist justify-content-end">
                                                     <Tag v-for="tag in getTags(result)" :key="tag.name ?? undefined" :modelValue="tag" class="mb-0" disabled />