Change format of proxy ids to \0file/path?commonjs-proxy

rollup · May 15, 2019 · e32afca · e32afca
1 parent 1b47ac5
commit e32afca
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 36 deletions.
diff --git a/src/helpers.js b/src/helpers.js
@@ -1,5 +1,11 @@
-export const PROXY_PREFIX = '\0commonjs-proxy-';
-export const EXTERNAL_PREFIX = '\0commonjs-external-';
+export const PROXY_SUFFIX = '?commonjs-proxy';
+export const getProxyId = id => `\0${id}${PROXY_SUFFIX}`;
+export const getIdFromProxyId = proxyId => proxyId.slice(1, -PROXY_SUFFIX.length);
+
+export const EXTERNAL_SUFFIX = '?commonjs-external';
+export const getExternalProxyId = id => `\0${id}${EXTERNAL_SUFFIX}`;
+export const getIdFromExternalProxyId = proxyId => proxyId.slice(1, -EXTERNAL_SUFFIX.length);
+
 export const HELPERS_ID = '\0commonjsHelpers.js';
 
 // `x['default']` is used instead of `x.default` for backward compatibility with ES3 browsers.

diff --git a/src/index.js b/src/index.js
@@ -2,7 +2,7 @@ import { extname, resolve } from 'path';
 import { sync as nodeResolveSync } from 'resolve';
 import { createFilter } from 'rollup-pluginutils';
 import { peerDependencies } from '../package.json';
-import { EXTERNAL_PREFIX, HELPERS, HELPERS_ID, PROXY_PREFIX } from './helpers.js';
+import { EXTERNAL_SUFFIX, getIdFromExternalProxyId, getIdFromProxyId, HELPERS, HELPERS_ID, PROXY_SUFFIX } from './helpers';
 import { getIsCjsPromise, setIsCjsPromise } from './is-cjs';
 import { getResolveId } from './resolve-id';
 import { checkEsModule, hasCjsKeywords, transformCommonjs } from './transform.js';
@@ -100,15 +100,15 @@ export default function commonjs(options = {}) {
 			if (id === HELPERS_ID) return HELPERS;
 
 			// generate proxy modules
-			if (id.startsWith(EXTERNAL_PREFIX)) {
-				const actualId = id.slice(EXTERNAL_PREFIX.length);
+			if (id.endsWith(EXTERNAL_SUFFIX)) {
+				const actualId = getIdFromExternalProxyId(id);
 				const name = getName(actualId);
 
 				return `import ${name} from ${JSON.stringify(actualId)}; export default ${name};`;
 			}
 
-			if (id.startsWith(PROXY_PREFIX)) {
-				const actualId = id.slice(PROXY_PREFIX.length);
+			if (id.endsWith(PROXY_SUFFIX)) {
+				const actualId = getIdFromProxyId(id);
 				const name = getName(actualId);
 
 				return getIsCjsPromise(actualId).then(isCjs => {
@@ -130,7 +130,7 @@ export default function commonjs(options = {}) {
 
 		transform(code, id) {
 			if (!filter(id) || extensions.indexOf(extname(id)) === -1) {
-				setIsCjsPromise(id,null);
+				setIsCjsPromise(id, null);
 				return null;
 			}
 

diff --git a/src/resolve-id.js b/src/resolve-id.js
@@ -1,6 +1,6 @@
 import { statSync } from 'fs';
 import { dirname, resolve, sep } from 'path';
-import { EXTERNAL_PREFIX, PROXY_PREFIX } from './helpers';
+import { getExternalProxyId, getIdFromProxyId, getProxyId, HELPERS_ID, PROXY_SUFFIX } from './helpers';
 
 function getCandidatesForExtension(resolved, extension) {
 	return [resolved + extension, resolved + `${sep}index${extension}`];
@@ -23,23 +23,26 @@ export function getResolveId(extensions) {
 		for (let i = 0; i < candidates.length; i += 1) {
 			try {
 				const stats = statSync(candidates[i]);
-				if (stats.isFile()) return {id: candidates[i]};
+				if (stats.isFile()) return { id: candidates[i] };
 			} catch (err) {
 				/* noop */
 			}
 		}
 	}
 
 	function resolveId(importee, importer) {
-		const isProxyModule = importee.startsWith(PROXY_PREFIX);
+		const isProxyModule = importee.endsWith(PROXY_SUFFIX);
 		if (isProxyModule) {
-			importee = importee.slice(PROXY_PREFIX.length);
+			importee = getIdFromProxyId(importee);
 		} else if (importee.startsWith('\0')) {
-			return importee;
+			if (importee === HELPERS_ID) {
+				return importee;
+			}
+			return null;
 		}
 
-		if (importer && importer.startsWith(PROXY_PREFIX)) {
-			importer = importer.slice(PROXY_PREFIX.length);
+		if (importer && importer.endsWith(PROXY_SUFFIX)) {
+			importer = getIdFromProxyId(importer);
 		}
 
 		return this.resolve(importee, importer, { skipSelf: true }).then(resolved => {
@@ -48,9 +51,9 @@ export function getResolveId(extensions) {
 			}
 			if (isProxyModule) {
 				if (!resolved) {
-					return { id: EXTERNAL_PREFIX + importee, external: false };
+					return { id: getExternalProxyId(importee), external: false };
 				}
-				resolved.id = (resolved.external ? EXTERNAL_PREFIX : PROXY_PREFIX) + resolved.id;
+				resolved.id = (resolved.external ? getExternalProxyId : getProxyId)(resolved.id);
 				resolved.external = false;
 				return resolved;
 			}

diff --git a/src/transform.js b/src/transform.js
@@ -2,7 +2,7 @@ import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
 import { attachScopes, extractAssignedNames, makeLegalIdentifier } from 'rollup-pluginutils';
 import { flatten, isFalsy, isReference, isTruthy } from './ast-utils.js';
-import { HELPERS_ID, PROXY_PREFIX } from './helpers.js';
+import { getProxyId, HELPERS_ID } from './helpers';
 import { getName } from './utils.js';
 
 const reserved = 'process location abstract arguments boolean break byte case catch char class const continue debugger default delete do double else enum eval export extends false final finally float for from function goto if implements import in instanceof int interface let long native new null package private protected public return short static super switch synchronized this throw throws transient true try typeof var void volatile while with yield'.split(
@@ -372,7 +372,7 @@ export function transformCommonjs(
 				}),
 				sources.map(source => {
 					const { name, importsDefault } = required[source];
-					return `import ${importsDefault ? `${name} from ` : ``}'${PROXY_PREFIX}${source}';`;
+					return `import ${importsDefault ? `${name} from ` : ``}'${getProxyId(source)}';`;
 				})
 			)
 			.join('\n') + '\n\n';

diff --git a/test/form/constant-template-literal/output.js b/test/form/constant-template-literal/output.js
@@ -1,5 +1,5 @@
+import foo from '_tape?commonjs-proxy';
 import 'tape';
-import foo from 'commonjs-proxy-tape';
 
 console.log(foo);
 

diff --git a/test/form/dynamic-template-literal/output.js b/test/form/dynamic-template-literal/output.js
@@ -1,4 +1,4 @@
-import * as commonjsHelpers from 'commonjsHelpers.js';
+import * as commonjsHelpers from '_commonjsHelpers.js';
 
 var pe = 'pe';
 var foo = commonjsHelpers.commonjsRequire(`ta${pe}`);

diff --git a/test/form/ignore-ids-function/output.js b/test/form/ignore-ids-function/output.js
@@ -1,5 +1,4 @@
 import 'bar';
-import bar from 'commonjs-proxy-bar';
 
 var foo = require( 'foo' );
 
@@ -8,4 +7,4 @@ var input = {
 };
 
 export default input;
-export { input as __moduleExports };
+export { input as __moduleExports };
diff --git a/test/form/ignore-ids/output.js b/test/form/ignore-ids/output.js
@@ -1,5 +1,4 @@
 import 'bar';
-import bar from 'commonjs-proxy-bar';
 
 var foo = require( 'foo' );
 
@@ -8,4 +7,4 @@ var input = {
 };
 
 export default input;
-export { input as __moduleExports };
+export { input as __moduleExports };
diff --git a/test/form/multiple-var-declarations-b/output.js b/test/form/multiple-var-declarations-b/output.js
@@ -1,5 +1,5 @@
+import a from '_./a?commonjs-proxy';
 import './a';
-import a from 'commonjs-proxy-./a';
 
 var b = 42;
 
@@ -10,4 +10,4 @@ var input = {
 };
 
 export default input;
-export { input as __moduleExports };
+export { input as __moduleExports };
diff --git a/test/form/multiple-var-declarations-c/output.js b/test/form/multiple-var-declarations-c/output.js
@@ -1,5 +1,5 @@
+import b from '_./b?commonjs-proxy';
 import './b';
-import b from 'commonjs-proxy-./b';
 
 var a = 'a'
   , c = 'c';
@@ -11,4 +11,4 @@ var input = {
 };
 
 export default input;
-export { input as __moduleExports };
+export { input as __moduleExports };
diff --git a/test/form/multiple-var-declarations/output.js b/test/form/multiple-var-declarations/output.js
@@ -1,7 +1,7 @@
+import require$$0 from '_./a?commonjs-proxy';
+import b from '_./b?commonjs-proxy';
 import './a';
 import './b';
-import require$$0 from 'commonjs-proxy-./a';
-import b from 'commonjs-proxy-./b';
 
 var a = require$$0();
 
@@ -12,4 +12,4 @@ var input = {
 };
 
 export default input;
-export { input as __moduleExports };
+export { input as __moduleExports };
diff --git a/test/form/require-collision/output.js b/test/form/require-collision/output.js
@@ -1,5 +1,5 @@
+import require$$1 from '_foo?commonjs-proxy';
 import 'foo';
-import require$$1 from 'commonjs-proxy-foo';
 
 (function() {
   var foo = require$$1;

diff --git a/test/form/typeof-module-exports/output.js b/test/form/typeof-module-exports/output.js
@@ -1,4 +1,4 @@
-import * as commonjsHelpers from 'commonjsHelpers.js';
+import * as commonjsHelpers from '_commonjsHelpers.js';
 
 var input = commonjsHelpers.createCommonjsModule(function (module, exports) {
 var foo = 42;

diff --git a/test/test.js b/test/test.js
@@ -105,7 +105,7 @@ describe('rollup-plugin-commonjs', () => {
 
 				const expected = fs.readFileSync(outputFile, 'utf-8').trim();
 				const transformed = transform.call(transformContext, input, 'input.js');
-				const actual = (transformed ? transformed.code : input).trim().replace(/\0/g, '');
+				const actual = (transformed ? transformed.code : input).trim().replace(/\0/g, '_');
 				assert.equal(actual, expected);
 			});
 		});
@@ -615,8 +615,13 @@ describe('rollup-plugin-commonjs', () => {
 				plugins: [
 					commonjs(),
 					{
+						resolveId(id) {
+							if (id === '\0virtual' || id === '\0resolved-virtual') {
+								return '\0resolved-virtual';
+							}
+						},
 						load(id) {
-							if (id === '\0virtual') {
+							if (id === '\0resolved-virtual') {
 								return 'export default "Virtual export"';
 							}
 						}