Permalink
Browse files

Stronger typing for transform options / remove duplication

Reviewed By: jeanlauliac

Differential Revision: D4929276

fbshipit-source-id: 0b23435a1502c72377425cae775e258106a5bf14
  • Loading branch information...
davidaurelio authored and facebook-github-bot committed Apr 21, 2017
1 parent 6b19419 commit 13f89f4e38eb892bd1e830aa6acf2b671e4be541
Showing with 28 additions and 21 deletions.
  1. +2 −2 packager/src/Bundler/Bundle.js
  2. +25 −18 packager/src/Bundler/index.js
  3. +1 −1 packager/src/JSTransformer/worker/worker.js
@@ -41,7 +41,7 @@ class Bundle extends BundleBase {
_minify: boolean | void;
_numRequireCalls: number;
_ramBundle: Unbundle | null;
_ramGroups: Array<string> | void;
_ramGroups: ?Array<string>;
_sourceMap: string | null;
_sourceMapFormat: SourceMapFormat;
_sourceMapUrl: ?string;
@@ -309,7 +309,7 @@ class Bundle extends BundleBase {
].join('\n');
}
setRamGroups(ramGroups: Array<string>) {
setRamGroups(ramGroups: ?Array<string>) {
this._ramGroups = ramGroups;
}
}
@@ -47,16 +47,22 @@ import type {
import type {Reporter} from '../lib/reporting';
import type {GlobalTransformCache} from '../lib/GlobalTransformCache';
export type ExtraTransformOptions = {
export type ExtraTransformOptions = {|
+inlineRequires?: {+blacklist: {[string]: true}} | boolean,
+preloadedModules?: Array<string> | false,
+preloadedModules?: {[path: string]: true} | false,
+ramGroups?: Array<string>,
};
|};
export type GetTransformOptionsOpts = {|
dev: boolean,
hot: boolean,
platform: string,
|};
export type GetTransformOptions = (
mainModuleName: string,
options: {},
getDependencies: string => Promise<Array<string>>,
options: GetTransformOptionsOpts,
getDependenciesOf: string => Promise<Array<string>>,
) => Promise<ExtraTransformOptions>;
type Asset = {|
@@ -749,7 +755,7 @@ class Bundler {
});
}
getTransformOptions(
async getTransformOptions(
mainModuleName: string,
options: {|
dev: boolean,
@@ -758,24 +764,25 @@ class Bundler {
platform: string,
projectRoots: Array<string>,
|},
): Promise<TransformOptions> {
): Promise<TransformOptions> {
const getDependencies = (entryFile: string) =>
this.getDependencies({...options, entryFile})
.then(r => r.dependencies.map(d => d.path));
const extraOptions: Promise<ExtraTransformOptions> = this._getTransformOptions
? this._getTransformOptions(mainModuleName, options, getDependencies)
: Promise.resolve({});
return extraOptions.then(extraOpts => ({
dev: options.dev,
const {dev, hot, platform} = options;
const extraOptions = this._getTransformOptions
? await this._getTransformOptions(mainModuleName, {dev, hot, platform}, getDependencies)
: {};
return {
dev,
generateSourceMaps: options.generateSourceMaps,
hot: options.hot,
inlineRequires: extraOpts.inlineRequires || false,
platform: options.platform,
preloadedModules: extraOpts.preloadedModules,
hot,
inlineRequires: extraOptions.inlineRequires || false,
platform,
preloadedModules: extraOptions.preloadedModules,
projectRoots: options.projectRoots,
ramGroups: extraOpts.ramGroups,
}));
ramGroups: extraOptions.ramGroups,
};
}
getResolver(): Promise<Resolver> {
@@ -41,7 +41,7 @@ export type TransformOptions = {|
+hot: boolean,
+inlineRequires: {+blacklist: {[string]: true}} | boolean,
+platform: string,
+preloadedModules: ?Array<string> | false,
+preloadedModules: ?{[string]: true} | false,
+projectRoots: Array<string>,
+ramGroups: ?Array<string>,
|};

0 comments on commit 13f89f4

Please sign in to comment.