Move pure comment annotation to Graph.contextParse

src/Graph.ts

@@ -17,6 +17,7 @@ import { BuildPhase } from './utils/buildPhase';
 import { errImplicitDependantIsNotIncluded, error } from './utils/error';
 import { analyseModuleExecution } from './utils/executionOrder';
 import { PluginDriver } from './utils/PluginDriver';
+import { markPureCallExpressions } from './utils/pureComments';
 import relativeId from './utils/relativeId';
 import { timeEnd, timeStart } from './utils/timers';
 import { markModuleAndImpureDependenciesAsExecuted } from './utils/traverseStaticDependencies';
@@ -45,7 +46,6 @@ function normalizeEntryModules(
 export default class Graph {
 	acornParser: typeof acorn.Parser;
 	cachedModules: Map<string, ModuleJSON>;
-	contextParse: (code: string, acornOptions?: acorn.Options) => acorn.Node;
 	deoptimizationTracker: PathTracker;
 	entryModules: Module[] = [];
 	moduleLoader: ModuleLoader;
@@ -77,11 +77,6 @@ export default class Graph {
 				for (const key of Object.keys(cache)) cache[key][0]++;
 			}
 		}
-		this.contextParse = (code: string, options: Partial<acorn.Options> = {}) =>
-			this.acornParser.parse(code, {
-				...(this.options.acorn as acorn.Options),
-				...options
-			});
 
 		if (watcher) {
 			this.watchMode = true;
@@ -117,6 +112,37 @@ export default class Graph {
 		this.phase = BuildPhase.GENERATE;
 	}
 
+	contextParse(code: string, options: Partial<acorn.Options> = {}) {
+		const onCommentOrig = options.onComment;
+		const comments: acorn.Comment[] = [];
+
+		if (onCommentOrig && typeof onCommentOrig == 'function') {
+			options.onComment = (block, text, start, end, ...args) => {
+				comments.push({type: block ? "Block" : "Line", value: text, start, end});
+				return onCommentOrig.call(options, block, text, start, end, ...args);
+			}
+		} else {
+			options.onComment = comments;
+		}
+
+		const ast = this.acornParser.parse(code, {
+			...(this.options.acorn as acorn.Options),
+			...options
+		});
+
+		if (typeof onCommentOrig == 'object') {
+			onCommentOrig.push(...comments);
+		}
+
+		options.onComment = onCommentOrig;
+
+		markPureCallExpressions(comments.map((cmt) => {
+			return {...cmt, block: cmt.type == "Block", text: cmt.value};
+		}), ast);
+
+		return ast;
+	}
+
 	getCache(): RollupCache {
 		// handle plugin cache eviction
 		for (const name in this.pluginCache) {

src/Module.ts

@@ -58,7 +58,6 @@ import { getOrCreate } from './utils/getOrCreate';
 import { getOriginalLocation } from './utils/getOriginalLocation';
 import { makeLegal } from './utils/identifierHelpers';
 import { basename, extname } from './utils/path';
-import { markPureCallExpressions } from './utils/pureComments';
 import relativeId from './utils/relativeId';
 import { RenderOptions } from './utils/renderHelpers';
 import { SOURCEMAPPING_URL_RE } from './utils/sourceMappingURL';
@@ -122,35 +121,6 @@ export interface AstContext {
 	warn: (warning: RollupWarning, pos: number) => void;
 }
 
-function tryParse(
-	module: Module,
-	Parser: typeof acorn.Parser,
-	acornOptions: acorn.Options
-): acorn.Node {
-	try {
-		return Parser.parse(module.info.code!, {
-			...acornOptions,
-			onComment: (block: boolean, text: string, start: number, end: number) =>
-				module.comments.push({ block, text, start, end })
-		});
-	} catch (err) {
-		let message = err.message.replace(/ \(\d+:\d+\)$/, '');
-		if (module.id.endsWith('.json')) {
-			message += ' (Note that you need @rollup/plugin-json to import JSON files)';
-		} else if (!module.id.endsWith('.js')) {
-			message += ' (Note that you need plugins to import files that are not JavaScript)';
-		}
-		return module.error(
-			{
-				code: 'PARSE_ERROR',
-				message,
-				parserError: err
-			},
-			err.pos
-		);
-	}
-}
-
 const MISSING_EXPORT_SHIM_DESCRIPTION: ExportDescription = {
 	identifier: null,
 	localName: MISSING_EXPORT_SHIM_VARIABLE
@@ -719,13 +689,12 @@ export default class Module {
 
 		this.alwaysRemovedCode = alwaysRemovedCode || [];
 		if (!ast) {
-			ast = tryParse(this, this.graph.acornParser, this.options.acorn as acorn.Options);
+			ast = this.tryParse();
 			for (const comment of this.comments) {
 				if (!comment.block && SOURCEMAPPING_URL_RE.test(comment.text)) {
 					this.alwaysRemovedCode.push([comment.start, comment.end]);
 				}
 			}
-			markPureCallExpressions(this.comments, ast);
 		}
 
 		timeEnd('generate ast', 3);
@@ -834,6 +803,32 @@ export default class Module {
 		return null;
 	}
 
+	tryParse(): acorn.Node {
+		try {
+			return this.graph.contextParse(this.info.code!, {
+				onComment: (block: boolean, text: string, start: number, end: number) =>
+					this.comments.push({ block, text, start, end })
+			});
+		} catch (err) {
+			let message = err.message.replace(/ \(\d+:\d+\)$/, '');
+			if (this.id.endsWith('.json')) {
+				message += ' (Note that you need @rollup/plugin-json to import JSON files)';
+			} else if (!this.id.endsWith('.js')) {
+				message += ' (Note that you need plugins to import files that are not JavaScript)';
+			}
+			console.log(err);
+			return this.error(
+				{
+					code: 'PARSE_ERROR',
+					message,
+					parserError: err
+				},
+				err.pos
+			);
+		}
+	}
+
+
 	updateOptions({
 		meta,
 		moduleSideEffects,

src/utils/PluginContext.ts

@@ -156,7 +156,7 @@ export function getPluginContexts(
 				const moduleIds = graph.modulesById.keys();
 				return wrappedModuleIds();
 			},
-			parse: graph.contextParse,
+			parse: graph.contextParse.bind(graph),
 			resolve(source, importer, { custom, skipSelf } = BLANK) {
 				return graph.moduleLoader.resolveId(source, importer, custom, skipSelf ? pidx : null);
 			},

test/function/samples/call-marked-pure-with-plugin-parse-ast/_config.js

@@ -0,0 +1,30 @@
+const assert = require('assert');
+
+module.exports = {
+	description: 'external function calls marked with pure comment do not have effects and should be removed even if parsed by PluginContext.parse method',
+	options: {
+		external: ['socks'],
+		plugins:[{
+			transform(code, _id) {
+				const comments = [];
+				const ast = this.parse(code, {onComment: comments});
+				if (comments.length != 5 || comments.some(({value}) => !value.includes('PURE'))) {
+					throw new Error('failed to get comments');
+				}
+				return {ast, code, map: null};
+			},
+		}],
+	},
+	context: {
+		require(id) {
+			if (id === 'socks') {
+				return () => {
+					throw new Error('Not all socks were removed.');
+				};
+			}
+		}
+	},
+	code(code) {
+		assert.ok(code.search(/socks\(\)/) === -1);
+	}
+};

test/function/samples/call-marked-pure-with-plugin-parse-ast/main.js

@@ -0,0 +1,8 @@
+import socks from 'socks';
+
+/*#__PURE__*/ socks();
+/* #__PURE__*/ socks();
+/*#__PURE__ */ socks();
+/* #__PURE__ */ socks();
+// #__PURE__
+socks();