remove usage of conditional accessor

herodevs · Jun 4, 2024 · 78e194b · 78e194b
1 parent 8fbaf9a
commit 78e194b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 20 deletions.
diff --git a/libs/nes/init/src/lib/get-package-choices.ts b/libs/nes/init/src/lib/get-package-choices.ts
@@ -3,9 +3,15 @@ import { Choice, Entry, ReleaseTrain } from './models';
 
 export function getPackageChoices(releaseTrain: ReleaseTrain): Choice<Entry>[] {
   return releaseTrain.entries
-    .map((e) => ({
-      name: e.packageVersion.origination?.name || e.packageVersion.name,
-      value: e,
-    }))
+    .map((e) => {
+      let name = e.packageVersion.name;
+      if (e.packageVersion.origination) {
+        name = e.packageVersion.origination.name;
+      }
+      return {
+        name: name,
+        value: e,
+      };
+    })
     .sort(sortByName);
 }
diff --git a/libs/nes/init/src/lib/get-release-trains.ts b/libs/nes/init/src/lib/get-release-trains.ts
@@ -52,7 +52,7 @@ export async function getReleaseTrains(
   //     variables: { input: { tenantId: 1000, byToken: accessToken } },
   //   });
 
-  //   const results = queryResult.data?.licensing?.releaseTrains?.results;
+  //   const results = queryResult.data.licensing.releaseTrains.results;
   //   if (!results) {
   //     throw new Error(`Error getting release trains`);
   //   }

diff --git a/libs/nes/init/src/lib/npm/configure-npm-project.ts b/libs/nes/init/src/lib/npm/configure-npm-project.ts
@@ -13,16 +13,22 @@ function updatePackageJson(packages: Entry[]) {
   const packageJson = JSON.parse(packageJsonContents);
 
   const pkgUpdates = packages
-    .map((p) => ({
-      key: p.packageVersion.origination?.name || p.packageVersion.name,
-      value: p.packageVersion.fqns,
-    }))
+    .map((p) => {
+      let key = p.packageVersion.name;
+      if (p.packageVersion.origination) {
+        key = p.packageVersion.origination.name;
+      }
+      return {
+        key: key,
+        value: p.packageVersion.fqns,
+      };
+    })
     .reduce(
       (acc, cur) => {
         // Update the appropriate section of the package.json (dependencies if not dev or peer)
-        if (packageJson.devDependencies?.[cur.key]) {
+        if (packageJson.devDependencies && packageJson.devDependencies[cur.key]) {
           acc.devDeps[cur.key] = `npm:${cur.value}`;
-        } else if (packageJson.peerDependencies?.[cur.key]) {
+        } else if (packageJson.peerDependencies && packageJson.peerDependencies[cur.key]) {
           acc.peerDeps[cur.key] = `npm:${cur.value}`;
         } else {
           acc.deps[cur.key] = `npm:${cur.value}`;

diff --git a/libs/tracker/run/src/lib/process-category.ts b/libs/tracker/run/src/lib/process-category.ts
@@ -123,18 +123,16 @@ function findIncludedFiles(
   return allFiles
     .filter((file) => {
       const ext = getFileExt(file);
-      let shouldBeIncluded = !!category.fileTypes.find(
-        (fileType) => fileType === ext
-      );
-      if (shouldBeIncluded) {
-        ignorePatterns?.forEach((ignorePattern) => {
+      let shouldBeIncluded = !!category.fileTypes.find((fileType) => fileType === ext);
+      if (shouldBeIncluded && ignorePatterns) {
+        ignorePatterns.forEach((ignorePattern) => {
           if (file.indexOf(ignorePattern) !== -1) {
             shouldBeIncluded = false;
           }
         });
       }
-      if (shouldBeIncluded) {
-        category.excludes?.forEach((exclude) => {
+      if (shouldBeIncluded && category.excludes) {
+        category.excludes.forEach((exclude) => {
           if (file.indexOf(exclude) !== -1) {
             shouldBeIncluded = false;
           }
@@ -161,8 +159,7 @@ function findIncludedFiles(
       const parts = file.split('.');
       parts[parts.length - 1] = counterpartExt;
 
-      const counterpartExists =
-        files.filter((f) => f === parts.join('.')).length !== 0;
+      const counterpartExists = files.filter((f) => f === parts.join('.')).length !== 0;
 
       if (counterpartExists) {
         return false;