feat(commonjs): Infer type for unidentified modules

rollup · Nov 12, 2021 · f306907 · f306907
1 parent 81f0eb7
commit f306907
Show file tree

Hide file tree

Showing 48 changed files with 74 additions and 45 deletions.
diff --git a/packages/commonjs/src/index.js b/packages/commonjs/src/index.js
@@ -56,10 +56,11 @@ export default function commonjs(options = {}) {
   const defaultIsModuleExports =
     typeof options.defaultIsModuleExports === 'boolean' ? options.defaultIsModuleExports : 'auto';
 
-  const { resolveRequireSourcesAndGetMeta, getWrappedIds } = getResolveRequireSourcesAndGetMeta(
-    extensions,
-    detectCycles
-  );
+  const {
+    resolveRequireSourcesAndGetMeta,
+    getWrappedIds,
+    isRequiredId
+  } = getResolveRequireSourcesAndGetMeta(extensions, detectCycles);
   const dynamicRequireModuleSet = getDynamicRequireModuleSet(options.dynamicRequireTargets);
   const isDynamicRequireModulesEnabled = dynamicRequireModuleSet.size > 0;
   const commonDir = isDynamicRequireModulesEnabled
@@ -111,7 +112,8 @@ export default function commonjs(options = {}) {
 
     if (
       !dynamicRequireModuleSet.has(normalizePathSlashes(id)) &&
-      (!hasCjsKeywords(code, ignoreGlobal) || (isEsModule && !options.transformMixedEsModules))
+      (!(hasCjsKeywords(code, ignoreGlobal) || isRequiredId(id)) ||
+        (isEsModule && !options.transformMixedEsModules))
     ) {
       return { meta: { commonjs: { isCommonJS: false } } };
     }
@@ -136,7 +138,8 @@ export default function commonjs(options = {}) {
       ast,
       defaultIsModuleExports,
       needsRequireWrapper,
-      resolveRequireSourcesAndGetMeta(this)
+      resolveRequireSourcesAndGetMeta(this),
+      isRequiredId(id)
     );
   }
 

diff --git a/packages/commonjs/src/resolve-require-sources.js b/packages/commonjs/src/resolve-require-sources.js
@@ -3,6 +3,7 @@ import { resolveExtensions } from './resolve-id';
 
 export function getResolveRequireSourcesAndGetMeta(extensions, detectCycles) {
   const knownCjsModuleTypes = Object.create(null);
+  const requiredIds = Object.create(null);
   const dependentModules = Object.create(null);
   const getDependentModules = (id) =>
     dependentModules[id] || (dependentModules[id] = Object.create(null));
@@ -12,6 +13,7 @@ export function getResolveRequireSourcesAndGetMeta(extensions, detectCycles) {
       Object.keys(knownCjsModuleTypes).filter(
         (id) => knownCjsModuleTypes[id] === IS_WRAPPED_COMMONJS
       ),
+    isRequiredId: (id) => requiredIds[id],
     resolveRequireSourcesAndGetMeta: (rollupContext) => async (id, isParentCommonJS, sources) => {
       knownCjsModuleTypes[id] = isParentCommonJS;
       const requireTargets = await Promise.all(
@@ -34,6 +36,7 @@ export function getResolveRequireSourcesAndGetMeta(extensions, detectCycles) {
           if (resolved.external) {
             return { id: wrapId(childId, EXTERNAL_SUFFIX), allowProxy: false };
           }
+          requiredIds[childId] = true;
           const parentDependentModules = getDependentModules(id);
           const childDependentModules = getDependentModules(childId);
           childDependentModules[id] = true;

diff --git a/packages/commonjs/src/transform-commonjs.js b/packages/commonjs/src/transform-commonjs.js
@@ -51,7 +51,8 @@ export default async function transformCommonjs(
   astCache,
   defaultIsModuleExports,
   needsRequireWrapper,
-  resolveRequireSourcesAndGetMeta
+  resolveRequireSourcesAndGetMeta,
+  isRequired
 ) {
   const ast = astCache || tryParse(parse, code, id);
   const magicString = new MagicString(code);
@@ -418,6 +419,7 @@ export default async function transformCommonjs(
   if (
     !(
       shouldWrap ||
+      isRequired ||
       uses.module ||
       uses.exports ||
       uses.require ||

diff --git a/...n/strict-require-semantic-auto/_config.js → .../function/strict-requires-auto/_config.js b/...n/strict-require-semantic-auto/_config.js → .../function/strict-requires-auto/_config.js
diff --git a/...rict-require-semantic-auto/a-imports-b.js → ...ction/strict-requires-auto/a-imports-b.js b/...rict-require-semantic-auto/a-imports-b.js → ...ction/strict-requires-auto/a-imports-b.js
diff --git a/...rict-require-semantic-auto/b-imports-c.js → ...ction/strict-requires-auto/b-imports-c.js b/...rict-require-semantic-auto/b-imports-c.js → ...ction/strict-requires-auto/b-imports-c.js
diff --git a/...rict-require-semantic-auto/c-imports-a.js → ...ction/strict-requires-auto/c-imports-a.js b/...rict-require-semantic-auto/c-imports-a.js → ...ction/strict-requires-auto/c-imports-a.js
diff --git a/...tion/strict-require-semantic-auto/main.js → ...res/function/strict-requires-auto/main.js b/...tion/strict-require-semantic-auto/main.js → ...res/function/strict-requires-auto/main.js
diff --git a/...rict-require-semantic-circular/_config.js → ...ction/strict-requires-circular/_config.js b/...rict-require-semantic-circular/_config.js → ...ction/strict-requires-circular/_config.js
diff --git a/.../strict-require-semantic-circular/main.js → ...function/strict-requires-circular/main.js b/.../strict-require-semantic-circular/main.js → ...function/strict-requires-circular/main.js
diff --git a/...strict-require-semantic-circular/other.js → ...unction/strict-requires-circular/other.js b/...strict-require-semantic-circular/other.js → ...unction/strict-requires-circular/other.js
diff --git a/...quire-semantic-cycle-detection/_config.js → ...trict-requires-cycle-detection/_config.js b/...quire-semantic-cycle-detection/_config.js → ...trict-requires-cycle-detection/_config.js
diff --git a/...e-semantic-cycle-detection/a-imports-b.js → ...t-requires-cycle-detection/a-imports-b.js b/...e-semantic-cycle-detection/a-imports-b.js → ...t-requires-cycle-detection/a-imports-b.js
diff --git a/...e-semantic-cycle-detection/b-imports-c.js → ...t-requires-cycle-detection/b-imports-c.js b/...e-semantic-cycle-detection/b-imports-c.js → ...t-requires-cycle-detection/b-imports-c.js
diff --git a/...e-semantic-cycle-detection/c-imports-a.js → ...t-requires-cycle-detection/c-imports-a.js b/...e-semantic-cycle-detection/c-imports-a.js → ...t-requires-cycle-detection/c-imports-a.js
diff --git a/...-require-semantic-cycle-detection/main.js → ...n/strict-requires-cycle-detection/main.js b/...-require-semantic-cycle-detection/main.js → ...n/strict-requires-cycle-detection/main.js
diff --git a/...ct-require-semantic-debug-none/_config.js → ...ion/strict-requires-debug-none/_config.js b/...ct-require-semantic-debug-none/_config.js → ...ion/strict-requires-debug-none/_config.js
diff --git a/...trict-require-semantic-debug-none/main.js → ...nction/strict-requires-debug-none/main.js b/...trict-require-semantic-debug-none/main.js → ...nction/strict-requires-debug-none/main.js
diff --git a/.../strict-require-semantic-debug/_config.js → ...function/strict-requires-debug/_config.js b/.../strict-require-semantic-debug/_config.js → ...function/strict-requires-debug/_config.js
diff --git a/...ict-require-semantic-debug/a-imports-b.js → ...tion/strict-requires-debug/a-imports-b.js b/...ict-require-semantic-debug/a-imports-b.js → ...tion/strict-requires-debug/a-imports-b.js
diff --git a/...ict-require-semantic-debug/b-imports-c.js → ...tion/strict-requires-debug/b-imports-c.js b/...ict-require-semantic-debug/b-imports-c.js → ...tion/strict-requires-debug/b-imports-c.js
diff --git a/...ict-require-semantic-debug/c-imports-a.js → ...tion/strict-requires-debug/c-imports-a.js b/...ict-require-semantic-debug/c-imports-a.js → ...tion/strict-requires-debug/c-imports-a.js
diff --git a/...ion/strict-require-semantic-debug/main.js → ...es/function/strict-requires-debug/main.js b/...ion/strict-require-semantic-debug/main.js → ...es/function/strict-requires-debug/main.js
diff --git a/.../strict-require-semantic-entry/_config.js → ...function/strict-requires-entry/_config.js b/.../strict-require-semantic-entry/_config.js → ...function/strict-requires-entry/_config.js
@@ -4,15 +4,15 @@ module.exports = {
   description: 'strict require semantic modules can be entry points',
   options: {
     input: [
-      'fixtures/function/strict-require-semantic-entry/main.js',
-      'fixtures/function/strict-require-semantic-entry/other.js'
+      'fixtures/function/strict-requires-entry/main.js',
+      'fixtures/function/strict-requires-entry/other.js'
     ],
     output: {
       chunkFileNames: 'generated-[name].js'
     }
   },
   pluginOptions: {
-    strictRequires: ['fixtures/function/strict-require-semantic-entry/main.js']
+    strictRequires: ['fixtures/function/strict-requires-entry/main.js']
   },
   exports(exports) {
     assert.deepStrictEqual(exports, { foo: 'foo' });

diff --git a/...ion/strict-require-semantic-entry/main.js → ...es/function/strict-requires-entry/main.js b/...ion/strict-require-semantic-entry/main.js → ...es/function/strict-requires-entry/main.js
diff --git a/...on/strict-require-semantic-entry/other.js → ...s/function/strict-requires-entry/other.js b/...on/strict-require-semantic-entry/other.js → ...s/function/strict-requires-entry/other.js
diff --git a/...re-semantic-exportmode-exports/_config.js → ...ct-requires-exportmode-exports/_config.js b/...re-semantic-exportmode-exports/_config.js → ...ct-requires-exportmode-exports/_config.js
@@ -1,6 +1,6 @@
 module.exports = {
   description: 'supports using function wrappers for modules for export mode "exports"',
   pluginOptions: {
-    strictRequires: ['fixtures/function/strict-require-semantic-exportmode-exports/*E*.js']
+    strictRequires: ['fixtures/function/strict-requires-exportmode-exports/*E*.js']
   }
 };
diff --git a/...antic-exportmode-exports/assignExports.js → ...uires-exportmode-exports/assignExports.js b/...antic-exportmode-exports/assignExports.js → ...uires-exportmode-exports/assignExports.js
diff --git a/...emantic-exportmode-exports/compiledEsm.js → ...equires-exportmode-exports/compiledEsm.js b/...emantic-exportmode-exports/compiledEsm.js → ...equires-exportmode-exports/compiledEsm.js
diff --git a/...quire-semantic-exportmode-exports/main.js → ...trict-requires-exportmode-exports/main.js b/...quire-semantic-exportmode-exports/main.js → ...trict-requires-exportmode-exports/main.js
diff --git a/...ntic-exportmode-exports/wrappedExports.js → ...ires-exportmode-exports/wrappedExports.js b/...ntic-exportmode-exports/wrappedExports.js → ...ires-exportmode-exports/wrappedExports.js
diff --git a/...ire-semantic-exportmode-module/_config.js → ...ict-requires-exportmode-module/_config.js b/...ire-semantic-exportmode-module/_config.js → ...ict-requires-exportmode-module/_config.js
@@ -1,6 +1,6 @@
 module.exports = {
   description: 'supports using function wrappers for modules for export mode "module"',
   pluginOptions: {
-    strictRequires: ['fixtures/function/strict-require-semantic-exportmode-module/*E*.js']
+    strictRequires: ['fixtures/function/strict-requires-exportmode-module/*E*.js']
   }
 };
diff --git a/...portmode-module/assignModuleAndExports.js → ...portmode-module/assignModuleAndExports.js b/...portmode-module/assignModuleAndExports.js → ...portmode-module/assignModuleAndExports.js
diff --git a/...-exportmode-module/assignModuleExports.js → ...-exportmode-module/assignModuleExports.js b/...-exportmode-module/assignModuleExports.js → ...-exportmode-module/assignModuleExports.js
diff --git a/...equire-semantic-exportmode-module/main.js → ...strict-requires-exportmode-module/main.js b/...equire-semantic-exportmode-module/main.js → ...strict-requires-exportmode-module/main.js
diff --git a/...exportmode-module/wrappedModuleExports.js → ...exportmode-module/wrappedModuleExports.js b/...exportmode-module/wrappedModuleExports.js → ...exportmode-module/wrappedModuleExports.js
diff --git a/...re-semantic-exportmode-replace/_config.js → ...ct-requires-exportmode-replace/_config.js b/...re-semantic-exportmode-replace/_config.js → ...ct-requires-exportmode-replace/_config.js
@@ -1,6 +1,6 @@
 module.exports = {
   description: 'supports using function wrappers for modules for export mode "replace"',
   pluginOptions: {
-    strictRequires: ['fixtures/function/strict-require-semantic-exportmode-replace/*E*.js']
+    strictRequires: ['fixtures/function/strict-requires-exportmode-replace/*E*.js']
   }
 };
diff --git a/...quire-semantic-exportmode-replace/main.js → ...trict-requires-exportmode-replace/main.js b/...quire-semantic-exportmode-replace/main.js → ...trict-requires-exportmode-replace/main.js
diff --git a/...xportmode-replace/replaceModuleExports.js → ...xportmode-replace/replaceModuleExports.js b/...xportmode-replace/replaceModuleExports.js → ...xportmode-replace/replaceModuleExports.js
diff --git a/packages/commonjs/test/fixtures/function/strict-requires-file-without-module-type/_config.js b/packages/commonjs/test/fixtures/function/strict-requires-file-without-module-type/_config.js
@@ -0,0 +1,7 @@
+module.exports = {
+  description:
+    'identifies files without module features as commonjs if they are required by another file',
+  pluginOptions: {
+    strictRequires: true
+  }
+};
diff --git a/packages/commonjs/test/fixtures/function/strict-requires-file-without-module-type/error.js b/packages/commonjs/test/fixtures/function/strict-requires-file-without-module-type/error.js
@@ -0,0 +1 @@
+throw new Error('FAIL');
diff --git a/packages/commonjs/test/fixtures/function/strict-requires-file-without-module-type/main.js b/packages/commonjs/test/fixtures/function/strict-requires-file-without-module-type/main.js
@@ -0,0 +1,2 @@
+// eslint-disable-next-line global-require
+t.is(0 && require('./error.js'), 0);
diff --git a/...rict-require-semantic-from-esm/_config.js → ...ction/strict-requires-from-esm/_config.js b/...rict-require-semantic-from-esm/_config.js → ...ction/strict-requires-from-esm/_config.js
@@ -1,6 +1,6 @@
 module.exports = {
   description: 'handles importing wrapped modules from ESM',
   pluginOptions: {
-    strictRequires: ['fixtures/function/strict-require-semantic-from-esm/strict.js']
+    strictRequires: ['fixtures/function/strict-requires-from-esm/strict.js']
   }
 };
diff --git a/...n/strict-require-semantic-from-esm/dep.js → .../function/strict-requires-from-esm/dep.js b/...n/strict-require-semantic-from-esm/dep.js → .../function/strict-requires-from-esm/dep.js
diff --git a/.../strict-require-semantic-from-esm/main.js → ...function/strict-requires-from-esm/main.js b/.../strict-require-semantic-from-esm/main.js → ...function/strict-requires-from-esm/main.js
diff --git a/...trict-require-semantic-from-esm/strict.js → ...nction/strict-requires-from-esm/strict.js b/...trict-require-semantic-from-esm/strict.js → ...nction/strict-requires-from-esm/strict.js
diff --git a/packages/commonjs/test/snapshots/function.js.md b/packages/commonjs/test/snapshots/function.js.md
@@ -3588,9 +3588,7 @@ Generated by [AVA](https://avajs.dev).
       ␊
       var require$$5 = 'bar';␊
       ␊
-      var none = /*#__PURE__*/Object.freeze({␊
-      	__proto__: null␊
-      });␊
+      var none = {};␊
       ␊
       const externalNamed = require$$0;␊
       const externalMixed = require$$1;␊
@@ -3698,11 +3696,7 @@ Generated by [AVA](https://avajs.dev).
       ␊
       var require$$5 = /*@__PURE__*/getAugmentedNamespace(_default$1);␊
       ␊
-      var none = /*#__PURE__*/Object.freeze({␊
-      	__proto__: null␊
-      });␊
-      ␊
-      var require$$6 = /*@__PURE__*/getAugmentedNamespace(none);␊
+      var none = {};␊
       ␊
       const externalNamed = require$$0;␊
       const externalMixed = require$$1;␊
@@ -3711,7 +3705,7 @@ Generated by [AVA](https://avajs.dev).
       const namedExports = require$$3;␊
       const mixedExports = require$$4;␊
       const defaultExport = require$$5;␊
-      const noExports = require$$6;␊
+      const noExports = none;␊
       ␊
       t.deepEqual(namedExports, { foo: 'foo' }, 'named exports');␊
       t.deepEqual(mixedExports, { foo: 'foo', default: 'bar' }, 'mixed exports');␊
@@ -4004,9 +3998,7 @@ Generated by [AVA](https://avajs.dev).
       	'default': _default␊
       });␊
       ␊
-      var none = /*#__PURE__*/Object.freeze({␊
-      	__proto__: null␊
-      });␊
+      var none = {};␊
       ␊
       const externalNamed = externalEsmNamed__namespace;␊
       const externalMixed = externalEsmMixed__namespace;␊
@@ -4085,9 +4077,7 @@ Generated by [AVA](https://avajs.dev).
       ␊
       var require$$5 = 'bar';␊
       ␊
-      var none = /*#__PURE__*/Object.freeze({␊
-      	__proto__: null␊
-      });␊
+      var none = {};␊
       ␊
       const externalNamed = require$$0;␊
       const externalMixed = require$$1;␊
@@ -4235,11 +4225,7 @@ Generated by [AVA](https://avajs.dev).
       ␊
       var require$$5 = /*@__PURE__*/getAugmentedNamespace(_default$1);␊
       ␊
-      var none = /*#__PURE__*/Object.freeze({␊
-      	__proto__: null␊
-      });␊
-      ␊
-      var require$$6 = /*@__PURE__*/getAugmentedNamespace(none);␊
+      var none = {};␊
       ␊
       const externalNamed = require$$0;␊
       const externalMixed = require$$1;␊
@@ -4248,7 +4234,7 @@ Generated by [AVA](https://avajs.dev).
       const namedExports = require$$3;␊
       const mixedExports = require$$4;␊
       const defaultExport = require$$5;␊
-      const noExports = require$$6;␊
+      const noExports = none;␊
       ␊
       t.deepEqual(namedExports, { foo: 'foo' }, 'named exports');␊
       t.deepEqual(mixedExports, { foo: 'foo', default: 'bar' }, 'mixed exports');␊
@@ -5442,7 +5428,7 @@ Generated by [AVA](https://avajs.dev).
       `,
     }
 
-## strict-require-semantic-auto
+## strict-requires-auto
 
 > Snapshot 1
 
@@ -5491,7 +5477,7 @@ Generated by [AVA](https://avajs.dev).
       `,
     }
 
-## strict-require-semantic-circular
+## strict-requires-circular
 
 > Snapshot 1
 
@@ -5527,7 +5513,7 @@ Generated by [AVA](https://avajs.dev).
       `,
     }
 
-## strict-require-semantic-cycle-detection
+## strict-requires-cycle-detection
 
 > Snapshot 1
 
@@ -5576,7 +5562,7 @@ Generated by [AVA](https://avajs.dev).
       `,
     }
 
-## strict-require-semantic-debug
+## strict-requires-debug
 
 > Snapshot 1
 
@@ -5625,7 +5611,7 @@ Generated by [AVA](https://avajs.dev).
       `,
     }
 
-## strict-require-semantic-debug-none
+## strict-requires-debug-none
 
 > Snapshot 1
 
@@ -5638,7 +5624,7 @@ Generated by [AVA](https://avajs.dev).
       `,
     }
 
-## strict-require-semantic-entry
+## strict-requires-entry
 
 > Snapshot 1
 
@@ -5678,7 +5664,7 @@ Generated by [AVA](https://avajs.dev).
       `,
     }
 
-## strict-require-semantic-exportmode-exports
+## strict-requires-exportmode-exports
 
 > Snapshot 1
 
@@ -5754,7 +5740,7 @@ Generated by [AVA](https://avajs.dev).
       `,
     }
 
-## strict-require-semantic-exportmode-module
+## strict-requires-exportmode-module
 
 > Snapshot 1
 
@@ -5830,7 +5816,7 @@ Generated by [AVA](https://avajs.dev).
       `,
     }
 
-## strict-require-semantic-exportmode-replace
+## strict-requires-exportmode-replace
 
 > Snapshot 1
 
@@ -5862,7 +5848,32 @@ Generated by [AVA](https://avajs.dev).
       `,
     }
 
-## strict-require-semantic-from-esm
+## strict-requires-file-without-module-type
+
+> Snapshot 1
+
+    {
+      'main.js': `'use strict';␊
+      ␊
+      var main = {};␊
+      ␊
+      var hasRequiredMain;␊
+      ␊
+      function requireMain () {␊
+      	if (hasRequiredMain) return main;␊
+      	hasRequiredMain = 1;␊
+      	// eslint-disable-next-line global-require␊
+      	t.is(0 , 0);␊
+      	return main;␊
+      }␊
+      ␊
+      var mainExports = requireMain();␊
+      ␊
+      module.exports = mainExports;␊
+      `,
+    }
+
+## strict-requires-from-esm
 
 > Snapshot 1
 

diff --git a/packages/commonjs/test/snapshots/function.js.snap b/packages/commonjs/test/snapshots/function.js.snap