rollup seems to be working

Author: XuechunHou

package.json

@@ -137,11 +137,13 @@
     "typescript": "3.8.3",
     "watch": "1.0.2",
     "webpack": "4.43.0",
-    "yargs": "15.3.1"
+    "yargs": "15.3.1",
+    "@rollup/plugin-commonjs": "13.0.0",
+    "@rollup/plugin-node-resolve": "8.1.0"
   },
   "husky": {
     "hooks": {
       "pre-commit": "node tools/gitHooks/precommit.js"
     }
   }
-}
+}

packages-exp/dummy-exp/package.json

@@ -38,6 +38,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
+    "@rollup/plugin-alias": "3.1.1",
     "rollup": "1.32.1",
     "rollup-plugin-json": "4.0.0",
     "rollup-plugin-replace": "2.2.0",

packages-exp/dummy-exp/src/bar.ts

@@ -15,15 +15,16 @@
  * limitations under the License.
  */
 import { version } from '../../../packages/firebase/package.json';
+import { LogLevel } from '@firebase/logger';
 export const SDK_VERSION = version;
-export function bar(): string {
+export function bar(): LogLevel {
   return bar1();
 }
 
-export function bar1(): string {
-  return 'bar1';
+export function bar1(): LogLevel {
+  return LogLevel.DEBUG;
 }
 
 export function bar2(): string {
-  return bar1() + bar();
+  return bar1().toLocaleString() + bar();
 }

packages-exp/dummy-exp/src/far.ts

@@ -24,3 +24,7 @@ export function far1(version: string): string {
   console.log(version);
   return version;
 }
+export function far3(version: string): string {
+  console.log(version);
+  return version;
+}

packages-exp/dummy-exp/src/foo.ts

@@ -14,16 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export const fooo: string = 'foooo';
+export const f2: string = 'foo2';
+export const f1: string = 'foo1';
 
 export function foo(): string {
   return foo1();
 }
 
 export function foo1(): string {
-  return 'foo';
+  return f1;
 }
 export function foo2(): string {
-  return 'foo2';
+  return f1 + f2;
 }
 export class Apple {}
 
@@ -35,5 +38,3 @@ export enum BUG {
   ERROR = 4,
   SILENT = 5
 }
-export const fooo: string = 'foooo';
-export const f1: string = 'f1';

packages-exp/dummy-exp/src/index.ts

@@ -16,10 +16,11 @@
  */
 
 export * from './bar';
-export { foo1, fooo, Apple, BUG } from './foo';
-export { foo2 as foo3 } from './foo';
-import { SDK_VERSION } from './bar';
-import { far } from './far';
+
+export * from './foo';
+// import { SDK_VERSION } from './bar';
+// import { far } from './far';
+export { far1, far, far3 } from './far';
 export const VAR = 'variable';
 export let var2: string;
 export let var3 = 'var3';
@@ -31,7 +32,7 @@ export function boo(): LogLevel {
   return LogLevel.DEBUG;
 }
 
-export declare enum LogLevel1 {
+export enum LogLevel1 {
   DEBUG = 0,
   VERBOSE = 1,
   INFO = 2,
@@ -55,6 +56,6 @@ export type LogLevel2 =
   | 'info'
   | 'verbose';
 
-far(SDK_VERSION);
+// far(SDK_VERSION);
 
 export { LogLevel } from '@firebase/logger';

scripts/exp/modular-export-binary-size-analysis/analysis-helper.ts

@@ -24,6 +24,9 @@ import * as ts from 'typescript';
 import { TYPINGS } from './analysis';
 import { request } from 'express';
 
+import resolve from 'rollup-plugin-node-resolve';
+import commonjs from 'rollup-plugin-commonjs';
+
 /** Contains a list of members by type. */
 export type MemberList = {
   classes: string[];
@@ -46,12 +49,12 @@ export type ExportData = { dependencies: MemberList; sizeInBytes: number };
 export async function extractDependencies(
   exportName: string,
   jsBundle: string,
-  allModuleLocations: string[]
+  map: Map<string, string>
 ): Promise<MemberList> {
   const { dependencies } = await extractDependenciesAndSize(
     exportName,
     jsBundle,
-    allModuleLocations
+    map
   );
   return dependencies;
 }
@@ -63,27 +66,34 @@ export async function extractDependencies(
 export async function extractDependenciesAndSize(
   exportName: string,
   jsBundle: string,
-  allModuleLocations: string[]
+  map: Map<string, string>
 ): Promise<ExportData> {
   const input = tmp.fileSync().name + '.js';
   const output = tmp.fileSync().name + '.js';
 
   const beforeContent = `export { ${exportName} } from '${path.resolve(
     jsBundle
   )}';`;
+  //console.log(beforeContent);
   fs.writeFileSync(input, beforeContent);
 
   // Run Rollup on the JavaScript above to produce a tree-shaken build
   const bundle = await rollup.rollup({
     input,
-    external: id => id.startsWith('@firebase-exp/')
+    plugins: [
+      resolve({
+        mainFields: ['esm2017', 'module', 'main']
+      }),
+      commonjs()
+    ]
   });
   await bundle.write({ file: output, format: 'es' });
 
-  const dependencies = extractDeclarations(allModuleLocations, output);
+  const dependencies = extractDeclarations(output, map);
 
   // Extract size of minified build
   const afterContent = fs.readFileSync(output, 'utf-8');
+  //console.log(afterContent);
   const { code } = terser.minify(afterContent, {
     output: {
       comments: false
@@ -102,8 +112,8 @@ export async function extractDependenciesAndSize(
  * compiler API.
  */
 export function extractDeclarations(
-  allModulesLocation: string[],
-  jsFile: string
+  jsFile: string,
+  map?: Map<string, string>
 ): MemberList {
   const program = ts.createProgram([jsFile], { allowJs: true });
   const checker = program.getTypeChecker();
@@ -113,7 +123,7 @@ export function extractDeclarations(
     throw new Error('Failed to parse file: ' + jsFile);
   }
 
-  const declarations: MemberList = {
+  let declarations: MemberList = {
     functions: [],
     classes: [],
     variables: [],
@@ -150,10 +160,7 @@ export function extractDeclarations(
         const symbol = checker.getSymbolAtLocation(node.moduleSpecifier);
         const reExportFullPath = symbol.valueDeclaration.getSourceFile()
           .fileName;
-        const reExportsMember = extractDeclarations(
-          allModulesLocation,
-          reExportFullPath
-        );
+        const reExportsMember = extractDeclarations(reExportFullPath);
 
         // named exports
         if (node.exportClause && ts.isNamedExports(node.exportClause)) {
@@ -184,6 +191,12 @@ export function extractDeclarations(
       }
     }
   });
+
+  if (map) {
+    declarations = mapSymbolToType(map, declarations);
+    declarations = dedup(declarations);
+  }
+
   // Sort to ensure stable output
   declarations.functions.sort();
   declarations.classes.sort();
@@ -193,6 +206,61 @@ export function extractDeclarations(
   return declarations;
 }
 
+function dedup(memberList: MemberList): MemberList {
+  const classesSet: Set<string> = new Set(memberList.classes);
+  memberList.classes = Array.from(classesSet);
+
+  const functionsSet: Set<string> = new Set(memberList.functions);
+  memberList.functions = Array.from(functionsSet);
+
+  const enumsSet: Set<string> = new Set(memberList.enums);
+  memberList.enums = Array.from(enumsSet);
+
+  const variablesSet: Set<string> = new Set(memberList.variables);
+  memberList.variables = Array.from(variablesSet);
+
+  return memberList;
+}
+function mapSymbolToType(
+  map: Map<string, string>,
+  memberList: MemberList
+): MemberList {
+  const newMemberList: MemberList = {
+    functions: [],
+    classes: [],
+    variables: [],
+    enums: []
+  };
+  memberList.classes.forEach(element => {
+    if (map.has(element)) {
+      newMemberList[map.get(element)].push(element);
+    } else {
+      newMemberList.classes.push(element);
+    }
+  });
+  memberList.variables.forEach(element => {
+    if (map.has(element)) {
+      newMemberList[map.get(element)].push(element);
+    } else {
+      newMemberList.variables.push(element);
+    }
+  });
+  memberList.enums.forEach(element => {
+    if (map.has(element)) {
+      newMemberList[map.get(element)].push(element);
+    } else {
+      newMemberList.enums.push(element);
+    }
+  });
+  memberList.functions.forEach(element => {
+    if (map.has(element)) {
+      newMemberList[map.get(element)].push(element);
+    } else {
+      newMemberList.functions.push(element);
+    }
+  });
+  return newMemberList;
+}
 function isReExported(symbol: string, reExportedSymbols: string[]): boolean {
   return reExportedSymbols.includes(symbol);
 }