fix(compartment-mapper): bad types

endojs · Aug 14, 2024 · 04f003b · 04f003b
1 parent 616219c
commit 04f003b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/packages/compartment-mapper/src/import.js b/packages/compartment-mapper/src/import.js
@@ -69,7 +69,10 @@ export const loadLocation = async (
   moduleLocation,
   options = {},
 ) => {
-  const { dev, tags, conditions = tags, commonDependencies, policy } = options;
+  const { dev, tags, commonDependencies, policy } = options;
+  // conditions are not present in SyncArchiveOptions
+  const conditions =
+    'conditions' in options ? options.conditions || tags : tags;
   const compartmentMap = await mapNodeModules(readPowers, moduleLocation, {
     dev,
     conditions,

diff --git a/packages/compartment-mapper/src/powers.js b/packages/compartment-mapper/src/powers.js
@@ -68,13 +68,16 @@ const requiredSyncReadPowersProps = freeze(
 /**
  * Returns `true` if `value` is a {@link SyncReadPowers}
  *
- * @param {ReadPowers|ReadFn} value
+ * @param {ReadPowers|ReadFn|undefined} value
  * @returns {value is SyncReadPowers}
  */
 export const isSyncReadPowers = value =>
-  typeof value === 'object' &&
-  requiredSyncReadPowersProps.every(
-    prop => prop in value && typeof value[prop] === 'function',
+  Boolean(
+    value &&
+      typeof value === 'object' &&
+      requiredSyncReadPowersProps.every(
+        prop => prop in value && typeof value[prop] === 'function',
+      ),
   );
 
 /**
@@ -83,11 +86,11 @@ export const isSyncReadPowers = value =>
  *
  * Used for human-friendly error messages
  *
- * @param {ReadPowers | ReadFn} value The value to check for missing properties.
+ * @param {ReadPowers | ReadFn} [value] The value to check for missing properties.
  * @returns {SyncReadPowersProp[]}
  */
 export const findInvalidSyncReadPowersProps = value => {
-  if (typeof value === 'function') {
+  if (!value || typeof value === 'function') {
     return [...requiredSyncReadPowersProps];
   }
   return requiredSyncReadPowersProps.filter(

diff --git a/packages/compartment-mapper/src/search.js b/packages/compartment-mapper/src/search.js
@@ -96,10 +96,9 @@ const maybeReadDescriptorDefault = async (
  * }>}
  */
 export const search = async (readPowers, moduleLocation) => {
-  const { maybeRead } = unpackReadPowers(readPowers);
   const { data, directory, location, packageDescriptorLocation } =
     await searchDescriptor(moduleLocation, loc =>
-      maybeReadDescriptorDefault(maybeRead, loc),
+      maybeReadDescriptorDefault(readPowers, loc),
     );
 
   if (!data) {