fix: build artifact export without mlly dep

Author: skoshx

src/transform.ts

@@ -18,6 +18,7 @@ import { encrypt } from './core/encryption'
 import { randomUUID } from 'node:crypto'
 import { batchedArtifactsUploadByBuildId } from './transform/artifacts/batchedArtifactsUpload'
 import { flytrapTransformWithArtifacts } from './transform/index'
+import { findIgnoredImports } from './transform/package-ignores'
 
 const transformedFiles = new Set<string>([])
 
@@ -167,7 +168,8 @@ export const unpluginOptions: UnpluginOptions = {
 				const transformedScriptTagContents = flytrapTransformWithArtifacts(
 					ss.toString(),
 					normalizeFilepath(pkgDirPath, id),
-					config
+					config,
+					findIgnoredImports
 				).unwrap()
 				wholeSourceFile.overwrite(
 					scriptStartIndex,

src/transform/artifacts/artifacts.ts

@@ -12,11 +12,15 @@ import {
 	VariableDeclarator
 } from '@babel/types'
 import { ArtifactMarking, FlytrapConfig } from '../../core/types'
-import { getRequiredExportsForCapture } from '../imports'
+
 import { parseCode } from '../parser'
 import { Ok } from 'ts-results'
 import type { ParserOptions } from '@babel/parser'
 
+export function getRequiredExportsForCapture(): string[] {
+	return ['uff', 'ufc', 'setFlytrapConfig']
+}
+
 export function getParseConfig(config: ParserOptions = {}): ParserOptions {
 	return {
 		sourceType: 'module',

src/transform/packageIgnores.ts src/transform/call-ignores.tssrc/transform/packageIgnores.ts renamed to src/transform/call-ignores.ts

@@ -1,4 +1,3 @@
-import { findStaticImports, parseStaticImport } from 'mlly'
 import { NodePath } from '@babel/traverse'
 import { CallExpression, Expression, V8IntrinsicIdentifier } from '@babel/types'
 import generate from '@babel/generator'
@@ -58,25 +57,6 @@ const reservedWords = [
 	'require'
 ]
 
-export function findIgnoredImports(code: string, packageIgnores: string[]) {
-	const ignoredImports: string[] = []
-	const statements = findStaticImports(code).filter((staticImport) => {
-		return packageIgnores.some((packageName) => staticImport.specifier.includes(packageName))
-	})
-	for (let i = 0; i < statements.length; i++) {
-		const imports = parseStaticImport(statements[i])
-		if (imports.defaultImport) {
-			ignoredImports.push(imports.defaultImport)
-		}
-		if (imports.namedImports) {
-			for (const [, importedName] of Object.entries(imports.namedImports)) {
-				ignoredImports.push(importedName)
-			}
-		}
-	}
-	return ignoredImports
-}
-
 function getFunctionPath(node: Expression | V8IntrinsicIdentifier): string {
 	return _babelInterop(generate)(node).code
 }

src/transform/imports.ts

@@ -2,7 +2,6 @@ import MagicString from 'magic-string'
 import { findStaticImports, parseStaticImport } from 'mlly'
 import { FLYTRAP_PACKAGE_NAME } from '../core/config'
 import { FlytrapConfig } from '../core/types'
-import * as flytrapExports from '../index'
 import { parseCode } from './parser'
 import { extname } from '../core/util'
 import { log } from '../core/logging'
@@ -11,10 +10,6 @@ export function getRequiredExportsForCapture(): string[] {
 	return ['uff', 'ufc', 'setFlytrapConfig']
 }
 
-export function getCoreExports(): string[] {
-	return Object.keys(flytrapExports)
-}
-
 export function findStartingIndex(s: MagicString, fileNamePath?: string) {
 	const parseResult = parseCode(s.toString(), fileNamePath)
 

src/transform/index.ts

@@ -29,28 +29,32 @@ import {
 	ExportDefaultDeclaration,
 	ExportNamedDeclaration,
 	RestElement,
-	Pattern,
-	Expression,
-	V8IntrinsicIdentifier
+	Pattern
 } from '@babel/types'
 import generate from '@babel/generator'
-
-import { getCoreExports } from './imports'
 import {
 	_babelInterop,
 	extractCurrentScope,
 	extractFunctionCallId,
-	extractFunctionCallName,
 	extractFunctionId,
 	extractFunctionName
 } from './artifacts/artifacts'
-import { findIgnoredImports, shouldIgnoreCall } from './packageIgnores'
 import { ArtifactMarking, FlytrapConfig } from '../core/types'
 import { parseCode } from './parser'
 import { createHumanLog } from '../core/errors'
 import { log } from '../core/logging'
 import { Err, Ok } from 'ts-results'
 import { shouldIgnoreFunctionName } from './function-excludes'
+import { shouldIgnoreCall } from './call-ignores'
+import * as flytrapExports from '../index'
+
+function getRequiredExportsForCapture(): string[] {
+	return ['uff', 'ufc', 'setFlytrapConfig']
+}
+
+function getCoreExports(): string[] {
+	return Object.keys(flytrapExports)
+}
 
 export function getCalleeAndAccessorKey(node: MemberExpression | Identifier) {
 	if (!isMemberExpression(node)) {
@@ -128,6 +132,7 @@ export function flytrapTransformWithArtifacts(
 	code: string,
 	filePath: string,
 	config?: Partial<FlytrapConfig>,
+	findIgnoredImports?: (code: string, packageIgnores: string[]) => string[],
 	returnArtifacts = false
 ) {
 	const parseResult = parseCode(code, filePath, config?.babel?.parserOptions)
@@ -157,9 +162,10 @@ export function flytrapTransformWithArtifacts(
 		return Ok([startIndex, endIndex])
 	}
 
-	const ignoredImports = config?.packageIgnores
-		? findIgnoredImports(code, config.packageIgnores)
-		: undefined
+	const ignoredImports =
+		config?.packageIgnores && findIgnoredImports
+			? findIgnoredImports(code, config.packageIgnores)
+			: undefined
 
 	try {
 		_babelInterop(babelTraverse)(ast, {

src/transform/package-ignores.ts

@@ -0,0 +1,20 @@
+import { findStaticImports, parseStaticImport } from 'mlly'
+
+export function findIgnoredImports(code: string, packageIgnores: string[]) {
+	const ignoredImports: string[] = []
+	const statements = findStaticImports(code).filter((staticImport) => {
+		return packageIgnores.some((packageName) => staticImport.specifier.includes(packageName))
+	})
+	for (let i = 0; i < statements.length; i++) {
+		const imports = parseStaticImport(statements[i])
+		if (imports.defaultImport) {
+			ignoredImports.push(imports.defaultImport)
+		}
+		if (imports.namedImports) {
+			for (const [, importedName] of Object.entries(imports.namedImports)) {
+				ignoredImports.push(importedName)
+			}
+		}
+	}
+	return ignoredImports
+}

test/artifacts.test.ts

@@ -10,6 +10,7 @@ import babelTraverse from '@babel/traverse'
 import { parse } from '@babel/parser'
 import { flytrapTransformWithArtifacts } from '../src/transform/index'
 import { config } from 'dotenv'
+import { findIgnoredImports } from '../src/transform/package-ignores'
 config()
 
 const largeFixture = `
@@ -179,6 +180,7 @@ it('generates values same as transform', () => {
 		pageCodeFixture,
 		'/file.js',
 		undefined,
+		findIgnoredImports,
 		true
 	).unwrap()
 	const functionIds = artifactMarkings.map((a) => a.functionOrCallId)

test/excludes.test.ts

@@ -1,12 +1,13 @@
 import { describe, expect, it } from 'vitest'
 import { parse } from '@babel/parser'
 import babelTraverse from '@babel/traverse'
-import { findIgnoredImports, shouldIgnoreCall } from '../src/transform/packageIgnores'
+import { findIgnoredImports } from '../src/transform/package-ignores'
 import { excludeDirectoriesIncludeFilePath } from '../src/transform/directory-excludes'
 import { CapturePayload } from '../src/core/types'
 import { shouldIgnoreCapture } from '../src/core/captureIgnores'
 import { _babelInterop, getParseConfig } from '../src/transform/artifacts/artifacts'
 import { shouldIgnoreFunctionName } from '../src/transform/function-excludes'
+import { shouldIgnoreCall } from '../src/transform/call-ignores'
 
 describe('excludeDirectories', () => {
 	it('excludeDirectoriesIncludeFilePath', () => {

test/transform/generate.test.ts

@@ -1,7 +1,7 @@
 // Generate tests using Flytrap
 
 import MagicString from 'magic-string'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, expect, it } from 'vitest'
 import { mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'fs'
 import { join } from 'path'
 import { tryCatchSync } from '../../src/core/util'