build: resolve review comments on flat modules PR and fix more bugs (#14660)

tools/@angular/tsc-wrapped/src/main.ts

@@ -30,7 +30,7 @@ export type CodegenExtension =
 
 export function main(
     project: string | VinylFile, cliOptions: CliOptions, codegen?: CodegenExtension,
-    options?: ts.CompilerOptions, skipImportRename?: boolean): Promise<any> {
+    options?: ts.CompilerOptions): Promise<any> {
   try {
     let projectDir = project;
     // project is vinyl like file object
@@ -117,7 +117,7 @@ export function main(
       const tsickleCompilerHostOptions: tsickle.Options = {
         googmodule: false,
         untyped: true,
-        convertIndexImportShorthand: !skipImportRename &&
+        convertIndexImportShorthand:
             ngOptions.target === ts.ScriptTarget.ES2015,  // This covers ES6 too
       };
 
@@ -172,19 +172,13 @@ export function main(
 
 // CLI entry point
 if (require.main === module) {
-  let args = process.argv.slice(2);
-  let idx = args.indexOf('--skipImportRename');
-  let skipImportRename = false;
-  if (idx !== -1) {
-    args.splice(idx, 1);
-    skipImportRename = true;
-  }
+  const args = process.argv.slice(2);
   let {options, fileNames, errors} = (ts as any).parseCommandLine(args);
   check(errors);
   const project = options.project || '.';
   // TODO(alexeagle): command line should be TSC-compatible, remove "CliOptions" here
   const cliOptions = new CliOptions(require('minimist')(args));
-  main(project, cliOptions, null, options, skipImportRename)
+  main(project, cliOptions, null, options)
       .then((exitCode: any) => process.exit(exitCode))
       .catch((e: any) => {
         console.error(e.stack);

tools/gulp-tasks/public-api.js

@@ -1,8 +1,7 @@
 const entrypoints = [
-  'dist/packages-dist/core/typings/core.d.ts',
-  'dist/packages-dist/core/typings/testing/testing.d.ts',
+  'dist/packages-dist/core/typings/core.d.ts', 'dist/packages-dist/core/typings/testing/index.d.ts',
   'dist/packages-dist/common/typings/common.d.ts',
-  'dist/packages-dist/common/typings/testing/testing.d.ts',
+  'dist/packages-dist/common/typings/testing/index.d.ts',
   // The API surface of the compiler is currently unstable - all of the important APIs are exposed
   // via @angular/core, @angular/platform-browser or @angular/platform-browser-dynamic instead.
   //'dist/packages-dist/compiler/index.d.ts',
@@ -10,19 +9,18 @@ const entrypoints = [
   'dist/packages-dist/upgrade/typings/upgrade.d.ts',
   'dist/packages-dist/upgrade/typings/static/static.d.ts',
   'dist/packages-dist/platform-browser/typings/platform-browser.d.ts',
-  'dist/packages-dist/platform-browser/typings/testing/testing.d.ts',
+  'dist/packages-dist/platform-browser/typings/testing/index.d.ts',
   'dist/packages-dist/platform-browser-dynamic/typings/platform-browser-dynamic.d.ts',
-  'dist/packages-dist/platform-browser-dynamic/typings/testing/testing.d.ts',
+  'dist/packages-dist/platform-browser-dynamic/typings/testing/index.d.ts',
   'dist/packages-dist/platform-webworker/typings/platform-webworker.d.ts',
   'dist/packages-dist/platform-webworker-dynamic/typings/platform-webworker-dynamic.d.ts',
   'dist/packages-dist/platform-server/typings/platform-server.d.ts',
-  'dist/packages-dist/platform-server/typings/testing/testing.d.ts',
-  'dist/packages-dist/http/typings/http.d.ts',
-  'dist/packages-dist/http/typings/testing/testing.d.ts',
+  'dist/packages-dist/platform-server/typings/testing/index.d.ts',
+  'dist/packages-dist/http/typings/http.d.ts', 'dist/packages-dist/http/typings/testing/index.d.ts',
   'dist/packages-dist/forms/typings/forms.d.ts', 'dist/packages-dist/router/typings/router.d.ts',
   'dist/packages-dist/animations/typings/animations.d.ts',
   'dist/packages-dist/platform-browser/typings/animations/animations.d.ts',
-  'dist/packages-dist/platform-browser/typings/animations/testing/testing.d.ts'
+  'dist/packages-dist/platform-browser/typings/animations/testing/index.d.ts'
 ];
 
 const publicApiDir = 'tools/public_api_guard';

tools/public_api_guard/animation/typings/animation.d.ts

@@ -1,86 +0,0 @@
-/** @experimental */
-export declare function animate(timings: string | number, styles?: AnimationStyleMetadata | AnimationKeyframesSequenceMetadata): AnimationAnimateMetadata;
-
-/** @experimental */
-export declare class Animation {
-    constructor(input: AnimationMetadata | AnimationMetadata[]);
-    buildTimelines(startingStyles: StyleData | StyleData[], destinationStyles: StyleData | StyleData[]): AnimationTimelineInstruction[];
-}
-
-/** @experimental */
-export interface AnimationGroupMetadata extends AnimationMetadata {
-    steps: AnimationMetadata[];
-}
-
-/** @experimental */
-export interface AnimationKeyframesSequenceMetadata extends AnimationMetadata {
-    steps: AnimationStyleMetadata[];
-}
-
-/** @experimental */
-export declare class AnimationModule {
-}
-
-/** @experimental */
-export interface AnimationSequenceMetadata extends AnimationMetadata {
-    steps: AnimationMetadata[];
-}
-
-/** @experimental */
-export interface AnimationStateMetadata extends AnimationMetadata {
-    name: string;
-    styles: AnimationStyleMetadata;
-}
-
-/** @experimental */
-export interface AnimationStyleMetadata extends AnimationMetadata {
-    offset: number;
-    styles: StyleData[];
-}
-
-/** @experimental */
-export interface AnimationTransitionMetadata extends AnimationMetadata {
-    animation: AnimationMetadata;
-    expr: string | ((fromState: string, toState: string) => boolean);
-}
-
-/** @experimental */
-export declare class AnimationTrigger implements Trigger {
-    name: string;
-    states: {
-        [stateName: string]: StyleData;
-    };
-    transitionFactories: AnimationTransitionFactory[];
-    constructor(name: string, states: {
-        [stateName: string]: StyleData;
-    }, _transitionAsts: AnimationTransitionMetadata[]);
-    matchTransition(currentState: any, nextState: any): AnimationTransitionInstruction;
-}
-
-/** @experimental */
-export declare const AUTO_STYLE = "*";
-
-/** @experimental */
-export declare function group(steps: AnimationMetadata[]): AnimationGroupMetadata;
-
-/** @experimental */
-export declare function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSequenceMetadata;
-
-/** @experimental */
-export declare function sequence(steps: AnimationMetadata[]): AnimationSequenceMetadata;
-
-/** @experimental */
-export declare function state(name: string, styles: AnimationStyleMetadata): AnimationStateMetadata;
-
-/** @experimental */
-export declare function style(tokens: {
-    [key: string]: string | number;
-} | Array<{
-    [key: string]: string | number;
-}>): AnimationStyleMetadata;
-
-/** @experimental */
-export declare function transition(stateChangeExpr: string | ((fromState: string, toState: string) => boolean), steps: AnimationMetadata | AnimationMetadata[]): AnimationTransitionMetadata;
-
-/** @experimental */
-export declare function trigger(name: string, definitions: AnimationMetadata[]): AnimationTrigger;