Add tests for options.cjs defaults behavior with all-false values.

standard-things · Feb 3, 2019 · f8d60c7 · f8d60c7
1 parent 9c202e2
commit f8d60c7
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 5 deletions.
diff --git a/src/package.js b/src/package.js
@@ -421,7 +421,7 @@ function createOptionsCJS(value) {
 
   const possibleNames = keys(value)
 
-  let allFalse = true
+  let useZeroConfig = true
 
   for (const name of possibleNames) {
     if (Reflect.has(defaultCJS, name)) {
@@ -430,8 +430,9 @@ function createOptionsCJS(value) {
       if (isFlag(optionsValue)) {
         const flagValue = !! optionsValue
 
-        if (flagValue) {
-          allFalse = false
+        if (flagValue &&
+            name !== "topLevelReturn") {
+          useZeroConfig = false
         }
 
         options[name] = flagValue
@@ -447,11 +448,11 @@ function createOptionsCJS(value) {
     }
   }
 
-  const source = allFalse
+  const defaultSource = useZeroConfig
     ? zeroConfigOptions.cjs
     : defaultCJS
 
-  return defaults(options, source)
+  return defaults(options, defaultSource)
 }
 
 function findRoot(dirPath) {

diff --git a/test/fixture/options-auto/inverse/.esmrc b/test/fixture/options-auto/inverse/.esmrc
@@ -0,0 +1,6 @@
+{
+  cjs: {
+    topLevelReturn: false
+  },
+  debug: true
+}
diff --git a/test/fixture/options-auto/inverse/index.js b/test/fixture/options-auto/inverse/index.js
@@ -0,0 +1 @@
+export default module
diff --git a/test/fixture/options-auto/top-level-return/.esmrc b/test/fixture/options-auto/top-level-return/.esmrc
@@ -0,0 +1,6 @@
+{
+  cjs: {
+    topLevelReturn: true
+  },
+  debug: true
+}
diff --git a/test/fixture/options-auto/top-level-return/index.js b/test/fixture/options-auto/top-level-return/index.js
@@ -0,0 +1,3 @@
+return exports
+// eslint-disable-next-line no-unreachable
+export {}
diff --git a/test/misc-tests.js b/test/misc-tests.js
@@ -329,6 +329,15 @@ describe("miscellaneous tests", () => {
         ]
         .map((request) => import(request)))
     )
+
+    it("should merge `options.cjs` of all `false` against zero-config defaults", () =>
+      Promise
+        .all([
+          "./fixture/options-auto/inverse",
+          "./fixture/options-auto/top-level-return"
+        ]
+        .map((request) => import(request)))
+    )
   })
 
   describe("errors", () => {