fix: iterate over all file name holding objects

arlac77 · May 21, 2019 · ff63664 · ff63664
1 parent 44a0b7c
commit ff63664
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 14 deletions.
diff --git a/src/cleanup.mjs b/src/cleanup.mjs
@@ -12,6 +12,23 @@ async function rm(file) {
   }
 }
 
+async function iterate(o,cb)
+{
+  switch(typeof o) {
+    case 'string':
+      return cb(o);
+  }
+
+  if(Array.isArray(o)) {
+      for(const x of o) {
+        await iterate(x,cb);
+      }
+  }
+  for(const k in o) {
+    await iterate(o[k],cb);
+  }
+}
+
 export async function cleanup(context, stagingDir) {
   for (const name of await globby(["**/package.json"], {
     cwd: stagingDir
@@ -27,19 +44,8 @@ export async function cleanup(context, stagingDir) {
     await Promise.all(
       ["unpkg", "jspm", "shim", "browser", "testling", "source"].map(
         async key => {
-          if (pkg[key] !== undefined) {
-            if (typeof pkg[key] !== "string") {
-              const o = pkg[key];
-              for (const k of o) {
-                await rm(join(stagingDir, o[k]));
-              }
-              delete pkg[key];
-            } else {
-              const file = join(stagingDir, pkg[key]);
-              delete pkg[key];
-              return rm(file);
-            }
-          }
+          await iterate(pkg[key], async o => { rm(join(stagingDir, o)) });
+          delete pkg[key];
         }
       )
     );

diff --git a/tests/fixtures/package.json b/tests/fixtures/package.json
@@ -43,5 +43,12 @@
     "units": {
       "${name}": "systemd/${name}*"
     }
-  }
+  },
+  "browser": {
+    "a": "src/a",
+    "b": "src/b"
+  },
+  "testling": [
+    "c"
+  ]
 }