replace local identifiers after collecting all

simonseyock · simonseyock · commit 206cd7305941 · 2019-09-28T14:21:20.000+02:00
diff --git a/index.js b/index.js
@@ -180,7 +180,7 @@ exports.astNodeVisitor = {
               const moduleId = path.relative(path.join(process.cwd(), moduleRoot), rel).replace(/\.js$/, '');
               if (getModuleInfo(moduleId, parser)) {
                 const exportName = importMatch[2] === 'default' ? getDefaultExportName(moduleId, parser) : importMatch[2];
-                const delimiter = importMatch[2] === 'default' ? '~': getDelimiter(moduleId, exportName, parser);
+                const delimiter = importMatch[2] === 'default' ? '~' : getDelimiter(moduleId, exportName, parser);
                 replacement = `module:${moduleId.replace(slashRegEx, '/')}${exportName ? delimiter + exportName : ''}`;
               }
             }
@@ -196,7 +196,9 @@ exports.astNodeVisitor = {
               value: path.basename(currentSourceName)
             };
           }
+        });
 
+        node.comments.forEach(comment => {
           // Replace local types with the full `module:` path
           Object.keys(identifiers).forEach(key => {
             const regex = new RegExp(`@(event |fires |.*[\{<\|,] ?!?)${key}`, 'g');

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ exports.astNodeVisitor = {`
`180`	`180`	`const moduleId = path.relative(path.join(process.cwd(), moduleRoot), rel).replace(/\.js$/, '');`
`181`	`181`	`if (getModuleInfo(moduleId, parser)) {`
`182`	`182`	`const exportName = importMatch[2] === 'default' ? getDefaultExportName(moduleId, parser) : importMatch[2];`
`183`		`- const delimiter = importMatch[2] === 'default' ? '~': getDelimiter(moduleId, exportName, parser);`
	`183`	`+ const delimiter = importMatch[2] === 'default' ? '~' : getDelimiter(moduleId, exportName, parser);`
`184`	`184`	replacement = `module:${moduleId.replace(slashRegEx, '/')}${exportName ? delimiter + exportName : ''}`;
`185`	`185`	`}`
`186`	`186`	`}`
`@@ -196,7 +196,9 @@ exports.astNodeVisitor = {`
`196`	`196`	`value: path.basename(currentSourceName)`
`197`	`197`	`};`
`198`	`198`	`}`
	`199`	`+ });`
`199`	`200`
	`201`	`+ node.comments.forEach(comment => {`
`200`	`202`	// Replace local types with the full `module:` path
`201`	`203`	`Object.keys(identifiers).forEach(key => {`
`202`	`204`	const regex = new RegExp(`@(event \|fires \|.*[\{<\\|,] ?!?)${key}`, 'g');