perf: undefinedChecks

src/internal/extractMatchingDoseAndRateFirstEntry.ts

@@ -1,3 +1,6 @@
+// Functions
+import { isNotUndefined } from "../internal/undefinedChecks";
+
 // Types
 import type { Dosage, DoseAndRate } from "../types";
 type KeyType = keyof DoseAndRate;
@@ -7,15 +10,15 @@ export function extractMatchingDoseAndRateFirstEntry<T extends KeyType>(
   key: T,
 ): DoseAndRate[T] | undefined {
   // If empty, return undefined
-  if (dos.doseAndRate === undefined) {
+  if (!isNotUndefined(dos.doseAndRate)) {
     return undefined;
   }
 
   // Find the first entry that match criteria
   let doseAndRate = dos.doseAndRate.find((s) => s[key] !== undefined);
 
   // If not found, skip
-  if (doseAndRate === undefined) {
+  if (!isNotUndefined(doseAndRate)) {
     return undefined;
   }
 

src/internal/extractTimingRepeat.ts

@@ -1,8 +1,9 @@
+import { isNotUndefined } from "./undefinedChecks";
 import type { Dosage } from "../types";
 
 export function extractTimingRepeat(dos: Dosage) {
   // If empty, return undefined
-  if (dos.timing?.repeat === undefined) {
+  if (!isNotUndefined(dos.timing?.repeat)) {
     return undefined;
   }
 

src/internal/isEmptyArray.ts

@@ -1,3 +1,4 @@
+import { isNotUndefined } from "./undefinedChecks";
 export function isArrayEmpty(array?: any[]): array is undefined | [] {
-  return array === undefined || array.length === 0;
+  return !isNotUndefined(array) || array.length === 0;
 }

src/internal/undefinedChecks.ts

@@ -0,0 +1,11 @@
+export function isNotUndefined<T>(val: T | undefined): val is T {
+  return val !== undefined;
+}
+
+export function noUndefinedInArray<T>(...args: (T | undefined)[]) {
+  return args.every(isNotUndefined);
+}
+
+export function allUndefinedInArray<T>(...args: (T | undefined)[]) {
+  return !args.some(isNotUndefined);
+}

src/translators/boundsDuration.ts

@@ -1,5 +1,6 @@
 // Functions
 import { extractTimingRepeat } from "../internal/extractTimingRepeat";
+import { isNotUndefined } from "../internal/undefinedChecks";
 
 // types
 import type { Config, Duration, DisplayOrderParams, I18N } from "../types";
@@ -16,14 +17,14 @@ function transformDurationToString(
   if (duration.system === "http://hl7.org/fhir/ValueSet/duration-units") {
     let code = duration.code! as "s" | "min" | "h" | "d" | "wk" | "mo" | "a";
     return i18next.t(`unitsOfTime:withCount.${code}`, { count: quantity });
-  } else {
-    // otherwise, it is UCUM, ... so let the user do the job
-    let unit = config.fromFHIRQuantityUnitToString({
-      language: config.language,
-      quantity: duration,
-    });
-    return `${quantity} ${unit}`;
   }
+
+  // otherwise, it is UCUM, ... so let the user do the job
+  let unit = config.fromFHIRQuantityUnitToString({
+    language: config.language,
+    quantity: duration,
+  });
+  return `${quantity} ${unit}`;
 }
 
 export function transformBoundsDurationToText({
@@ -34,15 +35,15 @@ export function transformBoundsDurationToText({
   let repeat = extractTimingRepeat(dos);
 
   // If empty, return undefined
-  if (repeat === undefined) {
+  if (!isNotUndefined(repeat)) {
     return undefined;
   }
 
   // Pickup the repeat interesting attributes
   let boundsDuration = repeat.boundsDuration;
 
   // Do nothing if no boundsDuration, I am not a wizard
-  if (boundsDuration === undefined) {
+  if (!isNotUndefined(boundsDuration)) {
     return undefined;
   }
 

src/translators/boundsPeriod.ts

@@ -1,6 +1,9 @@
 // Functions
 import { formatDatetime } from "../utils/formatDatetimes";
-import { isNotUndefined } from "../internal/isNotUndefined";
+import {
+  isNotUndefined,
+  noUndefinedInArray,
+} from "../internal/undefinedChecks";
 
 // types
 import type { DisplayOrderParams } from "../types";
@@ -11,7 +14,7 @@ export function transformBoundsPeriodToText({
   i18next,
 }: DisplayOrderParams): string | undefined {
   // If empty, return undefined
-  if (dos.timing?.repeat?.boundsPeriod === undefined) {
+  if (!isNotUndefined(dos.timing?.repeat?.boundsPeriod)) {
     return undefined;
   }
 
@@ -24,15 +27,15 @@ export function transformBoundsPeriodToText({
   // Three cases
 
   // 1. Both start and end are present
-  if (isNotUndefined([start, end])) {
+  if (noUndefinedInArray(start, end)) {
     return i18next.t("fields.boundsPeriod.startAndEnd", {
       start: start,
       end: end,
     });
   }
 
   // 2. Only start is present
-  if (isNotUndefined([start])) {
+  if (isNotUndefined(start)) {
     return i18next.t("fields.boundsPeriod.onlyStart", {
       start: start,
     });

src/translators/boundsRange.ts

@@ -4,6 +4,7 @@ import type { DisplayOrderParams } from "../types";
 // Utility function
 import { fromRangeToString } from "../utils/fromRangeToString";
 import { extractTimingRepeat } from "../internal/extractTimingRepeat";
+import { isNotUndefined } from "../internal/undefinedChecks";
 
 export function transformBoundsRangeToText({
   dos,
@@ -13,15 +14,15 @@ export function transformBoundsRangeToText({
   let repeat = extractTimingRepeat(dos);
 
   // If empty, return undefined
-  if (repeat === undefined) {
+  if (!isNotUndefined(repeat)) {
     return undefined;
   }
 
   // Pickup the repeat interesting attributes
   let boundsRange = repeat.boundsRange;
 
   // Do nothing if no boundsRange, I am not a wizard
-  if (boundsRange === undefined) {
+  if (!isNotUndefined(boundsRange)) {
     return undefined;
   }
 
@@ -33,7 +34,7 @@ export function transformBoundsRangeToText({
   });
 
   // Reject if empty
-  if (rangeText === undefined) {
+  if (!isNotUndefined(rangeText)) {
     return undefined;
   }
 

src/translators/countCountMax.ts

@@ -1,6 +1,9 @@
 // Functions
 import { extractTimingRepeat } from "../internal/extractTimingRepeat";
-import { isNotUndefined } from "../internal/isNotUndefined";
+import {
+  isNotUndefined,
+  noUndefinedInArray,
+} from "../internal/undefinedChecks";
 
 // Types
 import type { DisplayOrderParams } from "../types";
@@ -12,7 +15,7 @@ export function transformCountCountMaxToText({
   let repeat = extractTimingRepeat(dos);
 
   // If empty, return undefined
-  if (repeat === undefined) {
+  if (!isNotUndefined(repeat)) {
     return undefined;
   }
 
@@ -28,15 +31,15 @@ export function transformCountCountMaxToText({
   // Three cases
 
   // 1. Both count & countMax are present
-  if (isNotUndefined([count, countMax])) {
+  if (noUndefinedInArray(count, countMax)) {
     return i18next.t("fields.countMax.countMax", {
       count: countMax,
       low: count,
     });
   }
 
   // 2. Only countMax is present
-  if (isNotUndefined([countMax])) {
+  if (isNotUndefined(countMax)) {
     return i18next.t("fields.count.count", { count: countMax });
   }
 

src/translators/dayOfWeek.ts

@@ -2,6 +2,7 @@
 import { fromListToString } from "../utils/fromListToString";
 import { extractTimingRepeat } from "../internal/extractTimingRepeat";
 import { isArrayEmpty } from "../internal/isEmptyArray";
+import { isNotUndefined } from "../internal/undefinedChecks";
 
 // Types
 import type { DisplayOrderParams } from "../types";
@@ -14,7 +15,7 @@ export function transformDayOfWeekToText({
   let repeat = extractTimingRepeat(dos);
 
   // If empty, return undefined
-  if (repeat === undefined) {
+  if (!isNotUndefined(repeat)) {
     return undefined;
   }
 

src/translators/doseQuantity.ts

@@ -1,6 +1,7 @@
 // Functions
 import { extractMatchingDoseAndRateFirstEntry } from "../internal/extractMatchingDoseAndRateFirstEntry";
 import { fromQuantityToString } from "../utils/fromQuantityToString";
+import { isNotUndefined } from "../internal/undefinedChecks";
 
 // types
 import type { DisplayOrderParams } from "../types";
@@ -13,7 +14,7 @@ export function transformDoseQuantityToText({
   let doseQuantity = extractMatchingDoseAndRateFirstEntry(dos, "doseQuantity");
 
   // If not found, skip
-  if (doseQuantity === undefined) {
+  if (!isNotUndefined(doseQuantity)) {
     return undefined;
   }
 

src/translators/doseRange.ts

@@ -1,6 +1,7 @@
 // Utility function
 import { fromRangeToString } from "../utils/fromRangeToString";
 import { extractMatchingDoseAndRateFirstEntry } from "../internal/extractMatchingDoseAndRateFirstEntry";
+import { isNotUndefined } from "../internal/undefinedChecks";
 
 // types
 import type { DisplayOrderParams } from "../types";
@@ -13,7 +14,7 @@ export function transformDoseRangeToText({
   let doseRange = extractMatchingDoseAndRateFirstEntry(dos, "doseRange");
 
   // If not found, skip
-  if (doseRange === undefined) {
+  if (!isNotUndefined(doseRange)) {
     return undefined;
   }
 
@@ -25,7 +26,7 @@ export function transformDoseRangeToText({
   });
 
   // Reject if empty
-  if (text === undefined) {
+  if (!isNotUndefined(text)) {
     return undefined;
   }
 

src/translators/durationDurationMax.ts

@@ -1,6 +1,6 @@
 // Functions
 import { extractTimingRepeat } from "../internal/extractTimingRepeat";
-import { isNotUndefined } from "../internal/isNotUndefined";
+import { isNotUndefined } from "../internal/undefinedChecks";
 
 // Types
 import type { DisplayOrderParams } from "../types";
@@ -12,7 +12,7 @@ export function transformDurationDurationMaxToText({
   let repeat = extractTimingRepeat(dos);
 
   // If empty, return undefined
-  if (repeat === undefined) {
+  if (!isNotUndefined(repeat)) {
     return undefined;
   }
 
@@ -22,20 +22,20 @@ export function transformDurationDurationMaxToText({
   let unit = repeat.durationUnit;
 
   // Do nothing if no unit, I am not a wizard
-  if (unit === undefined) {
+  if (!isNotUndefined(unit)) {
     return undefined;
   }
 
   return [
     // duration
-    isNotUndefined([duration]) &&
+    isNotUndefined(duration) &&
       i18next.t("fields.duration", {
         durationText: i18next.t(`unitsOfTime:withCount.${unit}`, {
           count: duration,
         }),
       }),
     // durationMax
-    isNotUndefined([max]) &&
+    isNotUndefined(max) &&
       i18next.t("fields.durationMax", {
         durationMaxText: i18next.t(`unitsOfTime:withCount.${unit}`, {
           count: max,

src/translators/frequencyFrequencyMax.ts

@@ -1,6 +1,9 @@
 // Functions
 import { extractTimingRepeat } from "../internal/extractTimingRepeat";
-import { isNotUndefined } from "../internal/isNotUndefined";
+import {
+  isNotUndefined,
+  noUndefinedInArray,
+} from "../internal/undefinedChecks";
 
 // Types
 import type { DisplayOrderParams } from "../types";
@@ -12,7 +15,7 @@ export function transformFrequencyFrequencyMaxToText({
   let repeat = extractTimingRepeat(dos);
 
   // If empty, return undefined
-  if (repeat === undefined) {
+  if (!isNotUndefined(repeat)) {
     return undefined;
   }
 
@@ -28,15 +31,15 @@ export function transformFrequencyFrequencyMaxToText({
   // Three cases
 
   // 1. Frequency and frequencyMax are present
-  if (isNotUndefined([frequency, max])) {
+  if (noUndefinedInArray(frequency, max)) {
     return i18next.t("fields.frequency.withfrequencyMax", {
       count: max,
       frequency: frequency,
     });
   }
 
   // 2. Only frequencyMax is present
-  if (isNotUndefined([max])) {
+  if (isNotUndefined(max)) {
     return i18next.t("fields.frequencyMax.frequencyMax", { count: max });
   }
 

src/translators/maxDosePerAdministration.ts

@@ -1,5 +1,6 @@
 // Functions
 import { fromQuantityToString } from "../utils/fromQuantityToString";
+import { isNotUndefined } from "../internal/undefinedChecks";
 
 // types
 import type { DisplayOrderParams } from "../types";
@@ -10,7 +11,7 @@ export function transformMaxDosePerAdministrationToText({
   i18next,
 }: DisplayOrderParams): string | undefined {
   // If empty, return undefined
-  if (dos.maxDosePerAdministration === undefined) {
+  if (!isNotUndefined(dos.maxDosePerAdministration)) {
     return undefined;
   }
 

src/translators/maxDosePerLifetime.ts

@@ -1,5 +1,6 @@
 // Functions
 import { fromQuantityToString } from "../utils/fromQuantityToString";
+import { isNotUndefined } from "../internal/undefinedChecks";
 
 // types
 import type { DisplayOrderParams } from "../types";
@@ -10,7 +11,7 @@ export function transformMaxDosePerLifetimeToText({
   i18next,
 }: DisplayOrderParams): string | undefined {
   // If empty, return undefined
-  if (dos.maxDosePerLifetime === undefined) {
+  if (!isNotUndefined(dos.maxDosePerLifetime)) {
     return undefined;
   }