refactor: move version export to core entry-point

src/lib/core/public-api.ts

@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+export * from './version';
 export * from './animation/animation';
 export * from './common-behaviors/index';
 export * from './datetime/index';

src/lib/public-api.ts

@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './version';
 export * from '@angular/material/autocomplete';
 export * from '@angular/material/badge';
 export * from '@angular/material/bottom-sheet';

src/lib/schematics/ng-update/test-cases/misc/material-imports.spec.ts

@@ -5,10 +5,10 @@ import {join} from 'path';
 
 describe('v8 material imports', () => {
 
-  function writeSecondaryEntryPoint(materialPath: string, name: string) {
+  function writeSecondaryEntryPoint(materialPath: string, name: string, exportName = name) {
     const entryPointPath = join(materialPath, name);
     mkdirpSync(entryPointPath);
-    writeFileSync(join(entryPointPath, 'index.d.ts'), `export const ${name} = '';`);
+    writeFileSync(join(entryPointPath, 'index.d.ts'), `export const ${exportName} = '';`);
   }
 
   it('should report imports for deleted animation constants', async () => {
@@ -21,11 +21,13 @@ describe('v8 material imports', () => {
       export * from './a';
       export * from './b';
       export * from './c';
+      export * from './core';
     `);
 
     writeSecondaryEntryPoint(materialPath, 'a');
     writeSecondaryEntryPoint(materialPath, 'b');
     writeSecondaryEntryPoint(materialPath, 'c');
+    writeSecondaryEntryPoint(materialPath, 'core', 'VERSION');
 
     await runFixers();
 

src/lib/schematics/ng-update/test-cases/misc/material-imports_expected_output.ts

@@ -10,3 +10,6 @@ import { b } from "@angular/material/b";
 import { c } from "@angular/material/c";
 
 import { /* comment */ a as a3 } from "@angular/material/a";
+
+// primary entry-point export
+import { VERSION } from "@angular/material/core";

src/lib/schematics/ng-update/test-cases/misc/material-imports_input.ts

@@ -6,3 +6,6 @@ import {a as a2} from '@angular/material';
 import {c, b, a} from '@angular/material';
 
 import {/* comment */ a as a3} from '@angular/material';
+
+// primary entry-point export
+import {VERSION} from '@angular/material';

src/lib/schematics/ng-update/upgrade-rules/package-imports-v8/updateAngularMaterialImportsRule.ts

@@ -94,16 +94,13 @@ function walk(ctx: Lint.WalkContext<boolean>, checker: ts.TypeChecker): void {
 
     // Determine the subpackage each symbol in the namedBinding comes from.
     for (const element of declaration.importClause.namedBindings.elements) {
-      // Ensure the import specifier name is statically analyzable.
-      if (!ts.isIdentifier(element.name)) {
-        return ctx.addFailureAtNode(element, element.getText() + Rule.SYMBOL_NOT_FOUND_FAILURE_STR);
-      }
+      const elementName = element.propertyName ? element.propertyName : element.name;
 
       // Get the symbol for the named binding element. Note that we cannot determine the
       // value declaration based on the type of the element as types are not necessarily
       // specific to a given secondary entry-point (e.g. exports with the type of "string")
       // would resolve to the module types provided by TypeScript itself.
-      const symbol = getDeclarationSymbolOfNode(element.name, checker);
+      const symbol = getDeclarationSymbolOfNode(elementName, checker);
 
       // If the symbol can't be found, add failure saying the symbol
       // can't be found.

tools/public_api_guard/lib/core.d.ts

@@ -426,3 +426,5 @@ export declare class ShowOnDirtyErrorStateMatcher implements ErrorStateMatcher {
 }
 
 export declare type ThemePalette = 'primary' | 'accent' | 'warn' | undefined;
+
+export declare const VERSION: Version;

tools/public_api_guard/lib/lib.d.ts

@@ -1 +0,0 @@
-export declare const VERSION: Version;