fix(compiler-cli): match string indexed partial declarations

Some partial libraries have been minified, which results in the declaration calls being being converted from property accesses to indexed accesses. This commit ensures that the linker can process these calls. Fixes angular#41655
petebacondarwin · Apr 22, 2021 · a7c015b · a7c015b
1 parent ea85ff5
commit a7c015b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/packages/compiler-cli/linker/babel/src/es2015_linker_plugin.ts b/packages/compiler-cli/linker/babel/src/es2015_linker_plugin.ts
@@ -139,6 +139,8 @@ function getCalleeName(call: NodePath<t.CallExpression>): string|null {
     return callee.name;
   } else if (t.isMemberExpression(callee) && t.isIdentifier(callee.property)) {
     return callee.property.name;
+  } else if (t.isMemberExpression(callee) && t.isStringLiteral(callee.property)) {
+    return callee.property.value;
   } else {
     return null;
   }

diff --git a/packages/compiler-cli/linker/babel/test/es2015_linker_plugin_spec.ts b/packages/compiler-cli/linker/babel/test/es2015_linker_plugin_spec.ts
@@ -70,9 +70,10 @@ describe('createEs2015LinkerPlugin()', () => {
            [
              'var core;',
              `ɵɵngDeclareDirective({minVersion: '0.0.0-PLACEHOLDER', version: '0.0.0-PLACEHOLDER', ngImport: core, x: 1});`,
-             `ɵɵngDeclareComponent({minVersion: '0.0.0-PLACEHOLDER', version: '0.0.0-PLACEHOLDER', ngImport: core, foo: () => ɵɵngDeclareDirective({minVersion: '0.0.0-PLACEHOLDER', version: '0.0.0-PLACEHOLDER', ngImport: core, x: 2})});`,
+             `i0.ɵɵngDeclareComponent({minVersion: '0.0.0-PLACEHOLDER', version: '0.0.0-PLACEHOLDER', ngImport: core, foo: () => ɵɵngDeclareDirective({minVersion: '0.0.0-PLACEHOLDER', version: '0.0.0-PLACEHOLDER', ngImport: core, x: 2})});`,
              `x.qux(() => ɵɵngDeclareDirective({minVersion: '0.0.0-PLACEHOLDER', version: '0.0.0-PLACEHOLDER', ngImport: core, x: 3}));`,
              'spread(...x);',
+             `i0['ɵɵngDeclareDirective']({minVersion: '0.0.0-PLACEHOLDER', version: '0.0.0-PLACEHOLDER', ngImport: core, x: 4});`,
            ].join('\n'),
            {
              plugins: [createEs2015LinkerPlugin({fileSystem, logger})],
@@ -93,7 +94,11 @@ describe('createEs2015LinkerPlugin()', () => {
          [
            'ɵɵngDeclareDirective',
            '{minVersion:\'0.0.0-PLACEHOLDER\',version:\'0.0.0-PLACEHOLDER\',ngImport:core,x:3}'
-         ]
+         ],
+         [
+           'ɵɵngDeclareDirective',
+           '{minVersion:\'0.0.0-PLACEHOLDER\',version:\'0.0.0-PLACEHOLDER\',ngImport:core,x:4}'
+         ],
        ]);
      });