better missing object handling

cityssm · May 14, 2024 · e98cdaa · e98cdaa
1 parent b70d450
commit e98cdaa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/public/javascripts/main.js b/public/javascripts/main.js
@@ -58,17 +58,18 @@ const pts = {
         });
     };
     pts.getLicencePlateCountryProperties = (originalLicencePlateCountry) => {
-        var _a;
+        var _a, _b, _c;
         if (!defaultConfigPropertiesIsLoaded) {
             return {};
         }
-        const licencePlateCountryAlias = (_a = defaultConfigProperties.licencePlateCountryAliases[originalLicencePlateCountry.toUpperCase()]) !== null && _a !== void 0 ? _a : originalLicencePlateCountry;
+        const licencePlateCountryAlias = (_b = (_a = defaultConfigProperties.licencePlateCountryAliases) === null || _a === void 0 ? void 0 : _a[originalLicencePlateCountry.toUpperCase()]) !== null && _b !== void 0 ? _b : originalLicencePlateCountry;
         if (Object.prototype.hasOwnProperty.call(defaultConfigProperties.licencePlateProvinces, licencePlateCountryAlias)) {
-            return defaultConfigProperties.licencePlateProvinces[licencePlateCountryAlias];
+            return (_c = defaultConfigProperties.licencePlateProvinces) === null || _c === void 0 ? void 0 : _c[licencePlateCountryAlias];
         }
         return {};
     };
     pts.getLicencePlateLocationProperties = (originalLicencePlateCountry, originalLicencePlateProvince) => {
+        var _a, _b, _c, _d, _e;
         const licencePlateProvinceDefault = {
             provinceShortName: originalLicencePlateProvince,
             color: '#000',
@@ -81,19 +82,18 @@ const pts = {
                 licencePlateProvince: licencePlateProvinceDefault
             };
         }
-        const licencePlateCountryAlias = defaultConfigProperties.licencePlateCountryAliases[originalLicencePlateCountry.toUpperCase()] || originalLicencePlateCountry;
+        const licencePlateCountryAlias = (_b = (_a = defaultConfigProperties.licencePlateCountryAliases) === null || _a === void 0 ? void 0 : _a[originalLicencePlateCountry.toUpperCase()]) !== null && _b !== void 0 ? _b : originalLicencePlateCountry;
         let licencePlateProvinceAlias = originalLicencePlateProvince;
         if (Object.prototype.hasOwnProperty.call(defaultConfigProperties.licencePlateProvinceAliases, licencePlateCountryAlias)) {
-            const provinceAliases = defaultConfigProperties.licencePlateProvinceAliases[licencePlateCountryAlias];
+            const provinceAliases = (_d = (_c = defaultConfigProperties.licencePlateProvinceAliases) === null || _c === void 0 ? void 0 : _c[licencePlateCountryAlias]) !== null && _d !== void 0 ? _d : {};
             licencePlateProvinceAlias =
                 provinceAliases[originalLicencePlateProvince.toUpperCase()] ||
                     originalLicencePlateProvince;
         }
         let licencePlateProvince = licencePlateProvinceDefault;
         if (Object.prototype.hasOwnProperty.call(defaultConfigProperties.licencePlateProvinces, licencePlateCountryAlias)) {
             licencePlateProvince =
-                defaultConfigProperties.licencePlateProvinces[licencePlateCountryAlias]
-                    .provinces[licencePlateProvinceAlias] || licencePlateProvinceDefault;
+                ((_e = defaultConfigProperties.licencePlateProvinces) === null || _e === void 0 ? void 0 : _e[licencePlateCountryAlias].provinces[licencePlateProvinceAlias]) || licencePlateProvinceDefault;
         }
         return {
             licencePlateCountryAlias,

diff --git a/public/javascripts/main.ts b/public/javascripts/main.ts
@@ -115,7 +115,7 @@ interface DefaultConfigProperties {
     }
 
     const licencePlateCountryAlias =
-      defaultConfigProperties.licencePlateCountryAliases[
+      defaultConfigProperties.licencePlateCountryAliases?.[
         originalLicencePlateCountry.toUpperCase()
       ] ?? originalLicencePlateCountry
 
@@ -125,7 +125,7 @@ interface DefaultConfigProperties {
         licencePlateCountryAlias
       )
     ) {
-      return defaultConfigProperties.licencePlateProvinces[
+      return defaultConfigProperties.licencePlateProvinces?.[
         licencePlateCountryAlias
       ]
     }
@@ -154,9 +154,9 @@ interface DefaultConfigProperties {
     // Get the country alias
 
     const licencePlateCountryAlias =
-      defaultConfigProperties.licencePlateCountryAliases[
+      defaultConfigProperties.licencePlateCountryAliases?.[
         originalLicencePlateCountry.toUpperCase()
-      ] || originalLicencePlateCountry
+      ] ?? originalLicencePlateCountry
 
     // Get the province alias
 
@@ -169,9 +169,7 @@ interface DefaultConfigProperties {
       )
     ) {
       const provinceAliases =
-        defaultConfigProperties.licencePlateProvinceAliases[
-          licencePlateCountryAlias
-        ]
+        defaultConfigProperties.licencePlateProvinceAliases?.[licencePlateCountryAlias] ?? {}
 
       licencePlateProvinceAlias =
         provinceAliases[originalLicencePlateProvince.toUpperCase()] ||
@@ -189,7 +187,7 @@ interface DefaultConfigProperties {
       )
     ) {
       licencePlateProvince =
-        defaultConfigProperties.licencePlateProvinces[licencePlateCountryAlias]
+        defaultConfigProperties.licencePlateProvinces?.[licencePlateCountryAlias]
           .provinces[licencePlateProvinceAlias] || licencePlateProvinceDefault
     }