@compiled/parcel-transformer 0.14.6 → 0.15.0

package/dist/index.js

@@ -9,7 +9,9 @@ const generator_1 = __importDefault(require("@babel/generator"));
 const utils_1 = require("@compiled/utils");
 const plugin_1 = require("@parcel/plugin");
 const source_map_1 = __importDefault(require("@parcel/source-map"));
-const utils_2 = require("./utils");
+// @ts-expect-error missing type
+const utils_2 = require("@parcel/utils");
+const utils_3 = require("./utils");
 const configFiles = [
     '.compiledcssrc',
     '.compiledcssrc.json',
@@ -57,7 +59,7 @@ exports.default = new plugin_1.Transformer({
         return false;
     },
     async parse({ asset, config, options }) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         // Disable stylesheet extraction locally due to https://github.com/atlassian-labs/compiled/issues/1306
         const extract = config.extract && options.mode !== 'development';
         if (!asset.isSource && !extract) {
@@ -65,7 +67,8 @@ exports.default = new plugin_1.Transformer({
             return undefined;
         }
         const code = await asset.getCode();
-        if (code.indexOf('@compiled/react') === -1) {
+        if (code.indexOf('@compiled/react') === -1 &&
+            ((_b = (_a = config.importSources) === null || _a === void 0 ? void 0 : _a.every((importSource) => !code.includes(importSource))) !== null && _b !== void 0 ? _b : true)) {
             // We only want to parse files that are actually using Compiled.
             // For everything else we bail out.
             return undefined;
@@ -75,9 +78,9 @@ exports.default = new plugin_1.Transformer({
             caller: { name: 'compiled' },
             rootMode: 'upward-optional',
             parserOpts: {
-                plugins: (_a = config.parserBabelPlugins) !== null && _a !== void 0 ? _a : undefined,
+                plugins: (_c = config.parserBabelPlugins) !== null && _c !== void 0 ? _c : undefined,
             },
-            plugins: (_b = config.transformerBabelPlugins) !== null && _b !== void 0 ? _b : undefined,
+            plugins: (_d = config.transformerBabelPlugins) !== null && _d !== void 0 ? _d : undefined,
         });
         return {
             type: 'babel',
@@ -87,23 +90,6 @@ exports.default = new plugin_1.Transformer({
     },
     async transform({ asset, config, options }) {
         var _a, _b, _c, _d, _e;
-        const distStyleRules = [];
-        let someCode = await asset.getCode();
-        for (const match of someCode.matchAll(/(import ['"](?<importSpec>.+\.compiled\.css)['"];)|(require\(['"](?<requireSpec>.+\.compiled\.css)['"]\);)/g)) {
-            const specifierPath = ((_a = match.groups) === null || _a === void 0 ? void 0 : _a.importSpec) || ((_b = match.groups) === null || _b === void 0 ? void 0 : _b.requireSpec);
-            if (!specifierPath)
-                continue;
-            someCode = someCode.replace(match[0], '');
-            asset.setCode(someCode);
-            const cssFilePath = (0, path_1.isAbsolute)(specifierPath)
-                ? specifierPath
-                : (0, path_1.join)((0, path_1.dirname)(asset.filePath), specifierPath);
-            const cssContent = (await asset.fs.readFile(cssFilePath)).toString().split('\n');
-            if (!asset.meta.styleRules) {
-                asset.meta.styleRules = [];
-            }
-            asset.meta.styleRules.push(...cssContent);
-        }
         const ast = await asset.getAST();
         if (!ast) {
             // We will only receive ASTs for assets we're interested in.
@@ -115,20 +101,21 @@ exports.default = new plugin_1.Transformer({
         const includedFiles = [];
         const code = asset.isASTDirty() ? undefined : await asset.getCode();
         const result = await (0, core_1.transformFromAstAsync)(ast.program, code, {
-            code: true,
-            ast: false,
+            code: false,
+            ast: true,
             filename: asset.filePath,
             babelrc: false,
             configFile: false,
-            sourceMaps: true,
+            sourceMaps: !!asset.env.sourceMap,
+            compact: false,
             parserOpts: {
-                plugins: (_c = config.parserBabelPlugins) !== null && _c !== void 0 ? _c : undefined,
+                plugins: (_a = config.parserBabelPlugins) !== null && _a !== void 0 ? _a : undefined,
             },
             plugins: [
-                ...((_d = config.transformerBabelPlugins) !== null && _d !== void 0 ? _d : []),
+                ...((_b = config.transformerBabelPlugins) !== null && _b !== void 0 ? _b : []),
                 asset.isSource && [
                     '@compiled/babel-plugin',
-                    Object.assign(Object.assign({}, config), { classNameCompressionMap: config.extract && config.classNameCompressionMap, onIncludedFiles: (files) => includedFiles.push(...files), resolver: config.resolver ? config.resolver : (0, utils_2.createDefaultResolver)(config), cache: false }),
+                    Object.assign(Object.assign({}, config), { classNameCompressionMap: config.extract && config.classNameCompressionMap, onIncludedFiles: (files) => includedFiles.push(...files), resolver: config.resolver ? config.resolver : (0, utils_3.createDefaultResolver)(config), cache: false }),
                 ],
                 extract && [
                     '@compiled/babel-plugin-strip-runtime',
@@ -142,33 +129,57 @@ exports.default = new plugin_1.Transformer({
                 name: 'compiled',
             },
         });
-        const output = (result === null || result === void 0 ? void 0 : result.code) || '';
         includedFiles.forEach((file) => {
             // Included files are those which have been statically evaluated into this asset.
             // This tells parcel that if any of those files change this asset should be transformed
             // again.
             asset.invalidateOnFileChange(file);
         });
-        asset.setCode(output);
         if (extract) {
             // Store styleRules to asset.meta to be used by @compiled/parcel-optimizer
             const metadata = result === null || result === void 0 ? void 0 : result.metadata;
-            asset.meta.styleRules = [...((_e = metadata.styleRules) !== null && _e !== void 0 ? _e : []), ...distStyleRules];
+            asset.meta.styleRules = [
+                ...((_d = (_c = asset.meta) === null || _c === void 0 ? void 0 : _c.styleRules) !== null && _d !== void 0 ? _d : []),
+                ...((_e = metadata.styleRules) !== null && _e !== void 0 ? _e : []),
+            ];
+        }
+        if (result === null || result === void 0 ? void 0 : result.ast) {
+            asset.setAST({
+                type: 'babel',
+                version: '7.0.0',
+                program: result === null || result === void 0 ? void 0 : result.ast,
+            });
         }
         return [asset];
     },
-    async generate({ asset, ast }) {
-        // TODO: We're using babels standard generator. Internally parcel does some hacks in
-        // the official Babel transformer to make it faster - using ASTree directly.
-        // Perhaps we should do the same thing.
-        const { code, map: babelMap } = (0, generator_1.default)(ast.program, {
-            filename: asset.filePath,
-            sourceMaps: true,
-            sourceFileName: asset.filePath,
+    async generate({ asset, ast, options }) {
+        const originalSourceMap = await asset.getMap();
+        const sourceFileName = (0, utils_2.relativeUrl)(options.projectRoot, asset.filePath);
+        // @ts-expect-error RawMappings should exist here
+        const { code, rawMappings } = (0, generator_1.default)(ast.program, {
+            sourceFileName,
+            sourceMaps: !!asset.env.sourceMap,
+            comments: true,
         });
+        const map = new source_map_1.default(options.projectRoot);
+        if (rawMappings) {
+            map.addIndexedMappings(rawMappings);
+        }
+        if (originalSourceMap) {
+            // The babel AST already contains the correct mappings, but not the source contents.
+            // We need to copy over the source contents from the original map.
+            // @ts-expect-error getSourcesContentMap exists
+            const sourcesContent = originalSourceMap.getSourcesContentMap();
+            for (const filePath in sourcesContent) {
+                const content = sourcesContent[filePath];
+                if (content != null) {
+                    map.setSourceContent(filePath, content);
+                }
+            }
+        }
         return {
             content: code,
-            map: babelMap ? new source_map_1.default().addVLQMap(babelMap) : null,
+            map,
         };
     },
 });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@compiled/parcel-transformer",
-  "version": "0.14.6",
+  "version": "0.15.0",
   "description": "A familiar and performant compile time CSS-in-JS library for React.",
   "homepage": "https://compiledcssinjs.com/docs/pkg-parcel-transformer",
   "bugs": "https://github.com/atlassian-labs/compiled/issues/new?assignees=&labels=bug&template=bug_report.md",
@@ -22,11 +22,12 @@
   "dependencies": {
     "@babel/core": "^7.21.8",
     "@babel/generator": "^7.21.5",
-    "@compiled/babel-plugin": "^0.28.0",
+    "@compiled/babel-plugin": "^0.28.3",
     "@compiled/babel-plugin-strip-runtime": "^0.28.0",
     "@compiled/utils": "^0.9.2",
     "@parcel/plugin": "^2.8.3",
     "@parcel/source-map": "^2.1.1",
+    "@parcel/utils": "^2.8.3",
     "enhanced-resolve": "^5.15.0"
   },
   "devDependencies": {
@@ -34,7 +35,8 @@
     "@parcel/fs": "^2.8.3",
     "@parcel/types": "^2.8.3",
     "@types/babel__core": "^7.20.3",
-    "prettier": "^2.8.8"
+    "prettier": "^2.8.8",
+    "source-map": "^0.7.4"
   },
   "engines": {
     "parcel": "^2.0.0"

package/src/__tests__/transformer.parceltest.ts

@@ -1,8 +1,11 @@
 import { join } from 'path';
 
 import Parcel, { createWorkerFarm } from '@parcel/core';
-import { MemoryFS } from '@parcel/fs';
+import { MemoryFS, NodeFS } from '@parcel/fs';
+// eslint-disable-next-line import/namespace
+import type { Asset } from '@parcel/types';
 import { format } from 'prettier';
+import { SourceMapConsumer } from 'source-map';
 
 const rootPath = join(__dirname, '..', '..', '..', '..');
 const fixtureRoot = join(rootPath, 'fixtures/parcel-transformer-test-app');
@@ -15,8 +18,27 @@ afterAll(() => {
 });
 
 const outputFS = new MemoryFS(workerFarm);
+const nodeFS = new NodeFS();
 
-const getParcelInstance = (workingDir: string) => {
+function findTargetSourcePosition(source: string, regex: RegExp): { line: number; column: number } {
+  const lines = source.split('\n');
+
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const match = line.match(regex);
+
+    if (match && match.index !== undefined) {
+      return {
+        line: i + 1,
+        column: match.index,
+      };
+    }
+  }
+
+  throw new Error(`Could not find target source\n${source}`);
+}
+
+const getParcelInstance = (workingDir: string, sourceMap = false) => {
   return new Parcel({
     config: join(workingDir, '.parcelrc'),
     entries: [join(workingDir, 'src', 'index.html')],
@@ -24,6 +46,7 @@ const getParcelInstance = (workingDir: string) => {
     targets: {
       default: {
         distDir: join(workingDir, 'dist'),
+        sourceMap: sourceMap,
       },
     },
     workerFarm,
@@ -40,12 +63,13 @@ it('transforms assets with babel plugin', async () => {
   );
 
   const code = await asset?.getCode();
-  const appCode = code?.slice(
-    code.indexOf('/* index.jsx generated by @compiled/babel-plugin v0.0.0 */')
-  );
+  const appCode = code?.slice(code.indexOf('var _3'));
   expect(appCode).toMatchInlineSnapshot(`
-    "/* index.jsx generated by @compiled/babel-plugin v0.0.0 */ var _2 = "._syaz5scu{color:red}";
+    "var _3 = "._bfhkbf54{background-color:green}";
+    var _2 = "._syaz5scu{color:red}";
     var _ = "._1wyb12am{font-size:50px}";
+    console.log("File START");
+    var styles = null;
     var App = function() {
         return /*#__PURE__*/ (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
             children: /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_runtime.CC, {
@@ -53,12 +77,14 @@ it('transforms assets with babel plugin', async () => {
                     /*#__PURE__*/ (0, _jsxRuntime.jsx)(_runtime.CS, {
                         children: [
                             _,
-                            _2
+                            _2,
+                            _3
                         ]
                     }),
                     /*#__PURE__*/ (0, _jsxRuntime.jsx)("div", {
                         className: (0, _runtime.ax)([
-                            "_1wyb12am _syaz5scu"
+                            "_1wyb12am _syaz5scu",
+                            "_bfhkbf54"
                         ]),
                         children: "hello from parcel"
                     })
@@ -66,10 +92,48 @@ it('transforms assets with babel plugin', async () => {
             })
         });
     };
+    console.log("File END");
     "
   `);
 }, 50000);
 
+it('transforms assets with babel plugin and source map is correct', async () => {
+  const parcel = getParcelInstance(fixtureRoot, true);
+  const { changedAssets, bundleGraph } = await parcel.run();
+
+  const asset = Array.from(changedAssets.values()).find(
+    (asset) => asset.filePath === join(fixtureRoot, 'src/index.jsx')
+  );
+  expect(asset).toBeDefined();
+  const bundle = bundleGraph.getBundlesWithAsset(asset as Asset)[0];
+
+  const mapFile = await outputFS.readFile(`${bundle.filePath}.map`, 'utf8');
+
+  const rawSourceMap = JSON.parse(mapFile);
+  const consumer = await new SourceMapConsumer(rawSourceMap);
+
+  const expectedOriginalPosition = findTargetSourcePosition(
+    await nodeFS.readFile((asset as Asset).filePath, 'utf8'),
+    /File END/
+  );
+  const expectedGeneratedPosition = findTargetSourcePosition(
+    await outputFS.readFile(bundle.filePath, 'utf8'),
+    /File END/
+  );
+
+  const actualGeneratedPosition = consumer.generatedPositionFor({
+    ...expectedOriginalPosition,
+    source: 'fixtures/parcel-transformer-test-app/src/index.jsx',
+  });
+  const actualOriginalPosition = consumer.originalPositionFor(expectedGeneratedPosition);
+
+  expect('fixtures/parcel-transformer-test-app/src/index.jsx').toEqual(
+    actualOriginalPosition?.source
+  );
+  expect(actualGeneratedPosition.line).toBe(expectedGeneratedPosition.line);
+  expect(actualGeneratedPosition.column).toBe(expectedGeneratedPosition.column - 1);
+}, 50000);
+
 it('transforms assets with custom resolve and statically evaluates imports', async () => {
   const customResolveFixtureRoot = join(
     rootPath,

package/src/index.ts

@@ -1,4 +1,4 @@
-import { join, dirname, isAbsolute } from 'path';
+import { join } from 'path';
 
 import { parseAsync, transformFromAstAsync } from '@babel/core';
 import generate from '@babel/generator';
@@ -10,6 +10,8 @@ import type {
 import { toBoolean } from '@compiled/utils';
 import { Transformer } from '@parcel/plugin';
 import SourceMap from '@parcel/source-map';
+// @ts-expect-error missing type
+import { relativeUrl } from '@parcel/utils';
 
 import type { ParcelTransformerOpts } from './types';
 import { createDefaultResolver } from './utils';
@@ -87,7 +89,10 @@ export default new Transformer<ParcelTransformerOpts>({
     }
 
     const code = await asset.getCode();
-    if (code.indexOf('@compiled/react') === -1) {
+    if (
+      code.indexOf('@compiled/react') === -1 &&
+      (config.importSources?.every((importSource) => !code.includes(importSource)) ?? true)
+    ) {
       // We only want to parse files that are actually using Compiled.
       // For everything else we bail out.
       return undefined;
@@ -111,27 +116,6 @@ export default new Transformer<ParcelTransformerOpts>({
   },
 
   async transform({ asset, config, options }) {
-    const distStyleRules: string[] = [];
-    let someCode = await asset.getCode();
-    for (const match of someCode.matchAll(
-      /(import ['"](?<importSpec>.+\.compiled\.css)['"];)|(require\(['"](?<requireSpec>.+\.compiled\.css)['"]\);)/g
-    )) {
-      const specifierPath = match.groups?.importSpec || match.groups?.requireSpec;
-      if (!specifierPath) continue;
-      someCode = someCode.replace(match[0], '');
-      asset.setCode(someCode);
-
-      const cssFilePath = isAbsolute(specifierPath)
-        ? specifierPath
-        : join(dirname(asset.filePath), specifierPath);
-
-      const cssContent = (await asset.fs.readFile(cssFilePath)).toString().split('\n');
-      if (!asset.meta.styleRules) {
-        asset.meta.styleRules = [];
-      }
-      (asset.meta.styleRules as string[]).push(...cssContent);
-    }
-
     const ast = await asset.getAST();
 
     if (!ast) {
@@ -146,12 +130,13 @@ export default new Transformer<ParcelTransformerOpts>({
     const code = asset.isASTDirty() ? undefined : await asset.getCode();
 
     const result = await transformFromAstAsync(ast.program, code, {
-      code: true,
-      ast: false,
+      code: false,
+      ast: true,
       filename: asset.filePath,
       babelrc: false,
       configFile: false,
-      sourceMaps: true,
+      sourceMaps: !!asset.env.sourceMap,
+      compact: false,
       parserOpts: {
         plugins: config.parserBabelPlugins ?? undefined,
       },
@@ -180,8 +165,6 @@ export default new Transformer<ParcelTransformerOpts>({
       },
     });
 
-    const output = result?.code || '';
-
     includedFiles.forEach((file) => {
       // Included files are those which have been statically evaluated into this asset.
       // This tells parcel that if any of those files change this asset should be transformed
@@ -189,30 +172,58 @@ export default new Transformer<ParcelTransformerOpts>({
       asset.invalidateOnFileChange(file);
     });
 
-    asset.setCode(output);
-
     if (extract) {
       // Store styleRules to asset.meta to be used by @compiled/parcel-optimizer
       const metadata = result?.metadata as BabelFileMetadata;
-      asset.meta.styleRules = [...(metadata.styleRules ?? []), ...distStyleRules];
+      asset.meta.styleRules = [
+        ...((asset.meta?.styleRules as string[] | undefined) ?? []),
+        ...(metadata.styleRules ?? []),
+      ];
+    }
+
+    if (result?.ast) {
+      asset.setAST({
+        type: 'babel',
+        version: '7.0.0',
+        program: result?.ast,
+      });
     }
 
     return [asset];
   },
 
-  async generate({ asset, ast }) {
-    // TODO: We're using babels standard generator. Internally parcel does some hacks in
-    // the official Babel transformer to make it faster - using ASTree directly.
-    // Perhaps we should do the same thing.
-    const { code, map: babelMap } = generate(ast.program, {
-      filename: asset.filePath,
-      sourceMaps: true,
-      sourceFileName: asset.filePath,
+  async generate({ asset, ast, options }) {
+    const originalSourceMap = await asset.getMap();
+    const sourceFileName: string = relativeUrl(options.projectRoot, asset.filePath);
+
+    // @ts-expect-error RawMappings should exist here
+    const { code, rawMappings } = generate(ast.program, {
+      sourceFileName,
+      sourceMaps: !!asset.env.sourceMap,
+      comments: true,
     });
 
+    const map = new SourceMap(options.projectRoot);
+    if (rawMappings) {
+      map.addIndexedMappings(rawMappings);
+    }
+
+    if (originalSourceMap) {
+      // The babel AST already contains the correct mappings, but not the source contents.
+      // We need to copy over the source contents from the original map.
+      // @ts-expect-error getSourcesContentMap exists
+      const sourcesContent = originalSourceMap.getSourcesContentMap();
+      for (const filePath in sourcesContent) {
+        const content = sourcesContent[filePath];
+        if (content != null) {
+          map.setSourceContent(filePath, content);
+        }
+      }
+    }
+
     return {
       content: code,
-      map: babelMap ? new SourceMap().addVLQMap(babelMap) : null,
+      map,
     };
   },
 });