Add support for generating TypeScript declarations, and named pipelines

packages/configs/default/index.json

@@ -1,6 +1,7 @@
 {
  "bundler": "@parcel/bundler-default",
  "transforms": {
+ "types:*.{ts,tsx}": ["@parcel/transformer-typescript-types"],
  "*.{js,mjs,jsm,jsx,es6,ts,tsx}": [
  "@parcel/transformer-babel",
  "@parcel/transformer-js"
@@ -34,6 +35,7 @@
  "*.html": "@parcel/packager-html",
  "*.css": "@parcel/packager-css",
  "*.js": "@parcel/packager-js",
+ "*.ts": "@parcel/packager-ts",
  "*": "@parcel/packager-raw"
  },
  "resolvers": ["@parcel/resolver-default"],

packages/configs/default/package.json

@@ -18,6 +18,7 @@
  "@parcel/packager-html": "^2.0.0-alpha.1.1",
  "@parcel/packager-js": "^2.0.0-alpha.1.1",
  "@parcel/packager-raw": "^2.0.0-alpha.1.1",
+ "@parcel/packager-ts": "^2.0.0-alpha.1.1",
  "@parcel/reporter-cli": "^2.0.0-alpha.1.1",
  "@parcel/reporter-dev-server": "^2.0.0-alpha.1.1",
  "@parcel/reporter-hmr-server": "^2.0.0-alpha.1.1",
@@ -39,6 +40,7 @@
  "@parcel/transformer-stylus": "^2.0.0-alpha.1.1",
  "@parcel/transformer-sugarss": "^2.0.0-alpha.1.1",
  "@parcel/transformer-toml": "^2.0.0-alpha.1.1",
+ "@parcel/transformer-typescript-types": "^2.0.0-alpha.1.1",
  "@parcel/transformer-yaml": "^2.0.0-alpha.1.1"
  }
 }

packages/core/core/src/AssetGraph.js

@@ -134,6 +134,7 @@ export default class AssetGraph extends Graph<AssetGraphNode> {
  nodeFromDep(
  createDependency({
  moduleSpecifier: entryFile,
+ pipeline: target.name,
  target: target,
  env: target.env,
  isEntry: true

packages/core/core/src/BundleGraph.js

@@ -500,8 +500,19 @@ export default class BundleGraph {
  );
  let depSymbol = symbolLookup.get(identifier);
  if (depSymbol != null) {
- let resolved = nullthrows(this.getDependencyResolution(dep));
- return this.resolveSymbol(resolved, depSymbol);
+ let resolvedAsset = nullthrows(this.getDependencyResolution(dep));
+ let {asset, symbol: resolvedSymbol, exportSymbol} = this.resolveSymbol(
+ resolvedAsset,
+ depSymbol
+ );
+
+ // If it didn't resolve to anything (likely CommonJS), pass through where we got to
+ if (resolvedSymbol == null) {
+ return {asset, symbol: resolvedSymbol, exportSymbol};
+ }
+
+ // Otherwise, keep the original symbol name along with the resolved symbol
+ return {asset, symbol: resolvedSymbol, exportSymbol: symbol};
  }
 
  // If this module exports wildcards, resolve the original module.
@@ -510,7 +521,11 @@ export default class BundleGraph {
  let resolved = nullthrows(this.getDependencyResolution(dep));
  let result = this.resolveSymbol(resolved, symbol);
  if (result.symbol != null) {
- return result;
+ return {
+ asset: result.asset,
+ symbol: result.symbol,
+ exportSymbol: symbol
+ };
  }
  }
  }

packages/core/core/src/ConfigLoader.js

@@ -36,7 +36,7 @@ export default class ConfigLoader {
  }
 
  async loadParcelConfig(configRequest: ConfigRequest) {
- let {filePath, isSource, env} = configRequest;
+ let {filePath, isSource, env, pipeline} = configRequest;
  let config = createConfig({
  isSource,
  searchPath: filePath,
@@ -55,7 +55,7 @@ export default class ConfigLoader {
  let devDeps = [];
  switch (configRequest.meta.actionType) {
  case 'transformation':
- devDeps = parcelConfig.getTransformerNames(filePath);
+ devDeps = parcelConfig.getTransformerNames(filePath, pipeline);
  break;
  case 'validation':
  devDeps = parcelConfig.getValidatorNames(filePath);

packages/core/core/src/Dependency.js

@@ -22,7 +22,8 @@ type DependencyOpts = {|
  env: Environment,
  meta?: Meta,
  target?: Target,
- symbols?: Map<Symbol, Symbol>
+ symbols?: Map<Symbol, Symbol>,
+ pipeline?: ?string
 |};
 
 export function createDependency(opts: DependencyOpts): Dependency {
@@ -31,7 +32,8 @@ export function createDependency(opts: DependencyOpts): Dependency {
  md5FromString(
  `${opts.sourceAssetId ?? ''}:${opts.moduleSpecifier}:${JSON.stringify(
  opts.env
- )}:${opts.target ? JSON.stringify(opts.target) : ''}`
+ )}:${opts.target ? JSON.stringify(opts.target) : ''}:${opts.pipeline ??
+ ''}`
  );
 
  return {

packages/core/core/src/InternalAsset.js

@@ -21,7 +21,6 @@ import SourceMap from '@parcel/source-map';
 import {
  bufferStream,
  loadConfig,
- md5FromFilePath,
  md5FromString,
  blobToStream,
  TapStream
@@ -241,11 +240,7 @@ export default class InternalAsset {
  return dep.id;
  }
 
- async addIncludedFile(file: File) {
- if (file.hash == null) {
- file.hash = await md5FromFilePath(this.options.inputFS, file.filePath);
- }
-
+ addIncludedFile(file: File) {
  this.value.includedFiles.set(file.filePath, file);
  }
 

packages/core/core/src/ParcelConfig.js

@@ -121,10 +121,11 @@ export default class ParcelConfig {
  return validators;
  }
 
- getTransformerNames(filePath: FilePath): Array<string> {
+ getTransformerNames(filePath: FilePath, pipeline?: ?string): Array<string> {
  let transformers: Pipeline | null = this.matchGlobMapPipelines(
  filePath,
- this.transforms
+ this.transforms,
+ pipeline
  );
  if (!transformers || transformers.length === 0) {
  throw new Error(`No transformers found for "${filePath}".`);
@@ -137,8 +138,11 @@ export default class ParcelConfig {
  return this.loadPlugins(this.getValidatorNames(filePath));
  }
 
- getTransformers(filePath: FilePath): Promise<Array<Transformer>> {
- return this.loadPlugins(this.getTransformerNames(filePath));
+ getTransformers(
+ filePath: FilePath,
+ pipeline?: ?string
+ ): Promise<Array<Transformer>> {
+ return this.loadPlugins(this.getTransformerNames(filePath, pipeline));
  }
 
  getBundler(): Promise<Bundler> {
@@ -206,8 +210,12 @@ export default class ParcelConfig {
  return this.loadPlugins(this.reporters);
  }
 
- isGlobMatch(filePath: FilePath, pattern: Glob) {
- return isMatch(filePath, pattern) || isMatch(basename(filePath), pattern);
+ isGlobMatch(filePath: FilePath, pattern: Glob, pipeline?: ?string) {
+ let prefix = pipeline ? `${pipeline}:` : '';
+ return (
+ isMatch(prefix + filePath, pattern) ||
+ isMatch(prefix + basename(filePath), pattern)
+ );
  }
 
  matchGlobMap(filePath: FilePath, globMap: {[Glob]: any, ...}) {
@@ -220,10 +228,14 @@ export default class ParcelConfig {
  return null;
  }
 
- matchGlobMapPipelines(filePath: FilePath, globMap: {[Glob]: Pipeline, ...}) {
+ matchGlobMapPipelines(
+ filePath: FilePath,
+ globMap: {[Glob]: Pipeline, ...},
+ pipeline?: ?string
+ ) {
  let matches = [];
  for (let pattern in globMap) {
- if (this.isGlobMatch(filePath, pattern)) {
+ if (this.isGlobMatch(filePath, pattern, pipeline)) {
  matches.push(globMap[pattern]);
  }
  }

packages/core/core/src/RequestGraph.js

@@ -65,7 +65,8 @@ const nodeFromConfigRequest = (configRequest: ConfigRequest) => ({
  id: md5FromObject({
  filePath: configRequest.filePath,
  plugin: configRequest.plugin,
- env: configRequest.env
+ env: configRequest.env,
+ pipeline: configRequest.pipeline
  }),
  type: 'config_request',
  value: configRequest

packages/core/core/src/ResolverRunner.js

@@ -48,7 +48,8 @@ export default class ResolverRunner {
  filePath: result.filePath,
  sideEffects: result.sideEffects,
  code: result.code,
- env: dependency.env
+ env: dependency.env,
+ pipeline: dependency.pipeline
  };
  }
  }

packages/core/core/src/TargetResolver.js

@@ -35,7 +35,7 @@ const DEFAULT_PRODUCTION_ENGINES = {
 };
 
 const DEFAULT_DIST_DIRNAME = 'dist';
-const COMMON_TARGETS = ['main', 'module', 'browser'];
+const COMMON_TARGETS = ['main', 'module', 'browser', 'types'];
 
 export default class TargetResolver {
  fs: FileSystem;

packages/core/core/src/Transformation.js

@@ -92,7 +92,8 @@ export default class Transformation {
  let asset = await this.loadAsset();
  let pipeline = await this.loadPipeline(
  this.request.filePath,
- asset.value.isSource
+ asset.value.isSource,
+ this.request.pipeline
  );
  let results = await this.runPipeline(pipeline, asset);
  let assets = results.map(a => a.value);
@@ -242,11 +243,16 @@ export default class Transformation {
  });
  }
 
- async loadPipeline(filePath: FilePath, isSource: boolean): Promise<Pipeline> {
+ async loadPipeline(
+ filePath: FilePath,
+ isSource: boolean,
+ pipelineName?: ?string
+ ): Promise<Pipeline> {
  let configRequest = {
  filePath,
  env: this.request.env,
  isSource,
+ pipeline: pipelineName,
  meta: {
  actionType: 'transformation'
  }
@@ -291,8 +297,8 @@ export default class Transformation {
  }
 
  let pipeline = new Pipeline({
- names: parcelConfig.getTransformerNames(filePath),
- plugins: await parcelConfig.getTransformers(filePath),
+ names: parcelConfig.getTransformerNames(filePath, pipelineName),
+ plugins: await parcelConfig.getTransformers(filePath, pipelineName),
  configs,
  options: this.options,
  workerApi: this.workerApi
@@ -314,7 +320,11 @@ export default class Transformation {
  |}): Promise<?Pipeline> {
  let nextFilePath =
  filePath.slice(0, -path.extname(filePath).length) + '.' + nextType;
- let nextPipeline = await this.loadPipeline(nextFilePath, isSource);
+ let nextPipeline = await this.loadPipeline(
+ nextFilePath,
+ isSource,
+ this.request.pipeline
+ );
 
  if (nextPipeline.id === currentPipeline.id) {
  return null;

packages/core/core/src/public/Asset.js

@@ -214,7 +214,7 @@ export class MutableAsset extends BaseAsset implements IMutableAsset {
  return this.#asset.addDependency(dep);
  }
 
- addIncludedFile(file: File): Promise<void> {
+ addIncludedFile(file: File) {
  return this.#asset.addIncludedFile(file);
  }
 

packages/core/core/src/public/Dependency.js

@@ -87,4 +87,8 @@ export default class Dependency implements IDependency {
  get symbols(): Map<Symbol, Symbol> {
  return this.#dep.symbols;
  }
+
+ get pipeline(): ?string {
+ return this.#dep.pipeline;
+ }
 }

packages/core/core/src/types.js

@@ -60,7 +60,8 @@ export type Dependency = {|
  target: ?Target,
  sourceAssetId: ?string,
  sourcePath: ?string,
- symbols: Map<Symbol, Symbol>
+ symbols: Map<Symbol, Symbol>,
+ pipeline?: ?string
 |};
 
 export type Asset = {|
@@ -146,7 +147,8 @@ export type AssetRequest = {|
  filePath: FilePath,
  env: Environment,
  sideEffects?: boolean,
- code?: string
+ code?: string,
+ pipeline?: ?string
 |};
 
 // Asset group nodes are essentially used as placeholders for the results of an asset request
@@ -225,6 +227,7 @@ export type ConfigRequest = {|
  filePath: FilePath,
  env: Environment,
  isSource: boolean,
+ pipeline?: ?string,
  plugin?: PackageName,
  //$FlowFixMe will lock this down more in a future commit
  meta: any,

packages/core/core/test/AssetGraph.test.js

@@ -70,6 +70,7 @@ describe('AssetGraph', () => {
  graph.nodes.has(
  createDependency({
  moduleSpecifier: '/path/to/index1/src/main.js',
+ pipeline: 'test',
  target: TARGETS[0],
  env: DEFAULT_ENV
  }).id
@@ -79,6 +80,7 @@ describe('AssetGraph', () => {
  graph.nodes.has(
  createDependency({
  moduleSpecifier: '/path/to/index2/src/main.js',
+ pipeline: 'test',
  target: TARGETS[0],
  env: DEFAULT_ENV
  }).id
@@ -109,6 +111,7 @@ describe('AssetGraph', () => {
  from: 'entry_file:/path/to/index1/src/main.js',
  to: createDependency({
  moduleSpecifier: '/path/to/index1/src/main.js',
+ pipeline: 'test',
  target: TARGETS[0],
  env: DEFAULT_ENV
  }).id,
@@ -118,6 +121,7 @@ describe('AssetGraph', () => {
  from: 'entry_file:/path/to/index2/src/main.js',
  to: createDependency({
  moduleSpecifier: '/path/to/index2/src/main.js',
+ pipeline: 'test',
  target: TARGETS[0],
  env: DEFAULT_ENV
  }).id,
@@ -138,6 +142,7 @@ describe('AssetGraph', () => {
 
  let dep = createDependency({
  moduleSpecifier: '/path/to/index/src/main.js',
+ pipeline: 'test',
  target: TARGETS[0],
  env: DEFAULT_ENV
  });
@@ -171,6 +176,7 @@ describe('AssetGraph', () => {
 
  let dep = createDependency({
  moduleSpecifier: '/path/to/index/src/main.js',
+ pipeline: 'test',
  target: TARGETS[0],
  env: DEFAULT_ENV,
  sourcePath: ''
@@ -304,6 +310,7 @@ describe('AssetGraph', () => {
 
  let dep = createDependency({
  moduleSpecifier: '/path/to/index/src/main.js',
+ pipeline: 'test',
  env: DEFAULT_ENV,
  target: TARGETS[0]
  });

packages/core/integration-tests/test/integration/formats/esm-conflict/a.js

@@ -0,0 +1,3 @@
+import {foo as bar} from 'foo';
+
+export const foo = bar + 3;

packages/core/integration-tests/test/integration/formats/esm-conflict/package.json

@@ -0,0 +1,5 @@
+{
+ "name": "esm-conflict",
+ "private": true,
+ "module": "dist/index.js"
+}