fix(transform): add legacy h

fixes #1761
ionic-team · Jul 25, 2019 · 93cb82e · 93cb82e
1 parent 41c4f75
commit 93cb82e
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 38 deletions.
diff --git a/src/compiler/transformers/add-imports.ts b/src/compiler/transformers/add-imports.ts
@@ -21,7 +21,7 @@ const addEsmImports = (tsSourceFile: ts.SourceFile, importFnNames: string[], imp
   // ESM Imports
   // import { importNames } from 'importPath';
 
-  let importSpecifiers = importFnNames.map(importKey => {
+  const importSpecifiers = importFnNames.map(importKey => {
     const splt = importKey.split(' as ');
     let importAs = importKey;
     let importFnName = importKey;
@@ -38,44 +38,16 @@ const addEsmImports = (tsSourceFile: ts.SourceFile, importFnNames: string[], imp
   });
 
   const statements = tsSourceFile.statements.slice();
-
-  const existingImportIndex = statements.findIndex(s => {
-    return ts.isImportDeclaration(s) &&
-           s.moduleSpecifier &&
-           (s.moduleSpecifier as ts.StringLiteral).text === importPath;
-  });
-
-  if (existingImportIndex > -1) {
-    const existingImport = statements[existingImportIndex] as ts.ImportDeclaration;
-
-    importSpecifiers = [
-      ...(existingImport.importClause.namedBindings as ts.NamedImports).elements.map(elm => elm),
-      ...importSpecifiers
-    ];
-
-    statements[existingImportIndex] = ts.updateImportDeclaration(
-      existingImport,
-      undefined,
-      undefined,
-      ts.createImportClause(
-        undefined,
-        ts.createNamedImports(importSpecifiers)
-      ),
-      ts.createLiteral(importPath)
-    );
-
-  } else {
-    const newImport = ts.createImportDeclaration(
-      undefined,
+  const newImport = ts.createImportDeclaration(
+    undefined,
+    undefined,
+    ts.createImportClause(
       undefined,
-      ts.createImportClause(
-        undefined,
-        ts.createNamedImports(importSpecifiers)
-      ),
-      ts.createLiteral(importPath)
-    );
-    statements.unshift(newImport);
-  }
+      ts.createNamedImports(importSpecifiers)
+    ),
+    ts.createLiteral(importPath)
+  );
+  statements.unshift(newImport);
 
   return ts.updateSourceFileNode(tsSourceFile, statements);
 };

diff --git a/src/compiler/transformers/component-hydrate/tranform-to-hydrate-component.ts b/src/compiler/transformers/component-hydrate/tranform-to-hydrate-component.ts
@@ -4,6 +4,7 @@ import { catchError, loadTypeScriptDiagnostics } from '@utils';
 import { getComponentMeta, getModuleFromSourceFile, getScriptTarget } from '../transform-utils';
 import { updateHydrateComponentClass } from './hydrate-component';
 import ts from 'typescript';
+import { addLegacyImports } from '../core-runtime-apis';
 
 
 export const transformToHydrateComponentText = (compilerCtx: d.CompilerCtx, buildCtx: d.BuildCtx, cmp: d.ComponentCompilerMeta, inputJsText: string) => {
@@ -69,6 +70,9 @@ const hydrateComponentTransform = (compilerCtx: d.CompilerCtx, transformOpts: d.
 
       tsSourceFile = ts.visitEachChild(tsSourceFile, visitNode, transformCtx);
 
+      if (moduleFile.isLegacy) {
+        addLegacyImports(moduleFile);
+      }
       tsSourceFile = addImports(transformOpts, tsSourceFile, moduleFile.coreRuntimeApis, transformOpts.coreImportPath);
 
       return tsSourceFile;

diff --git a/src/compiler/transformers/component-lazy/transform-lazy-component.ts b/src/compiler/transformers/component-lazy/transform-lazy-component.ts
@@ -4,6 +4,7 @@ import { catchError, loadTypeScriptDiagnostics } from '@utils';
 import { getComponentMeta, getModuleFromSourceFile, getScriptTarget } from '../transform-utils';
 import { updateLazyComponentClass } from './lazy-component';
 import ts from 'typescript';
+import { addLegacyImports } from '../core-runtime-apis';
 
 
 export const transformToLazyComponentText = (compilerCtx: d.CompilerCtx, buildCtx: d.BuildCtx, transformOpts: d.TransformOptions, cmp: d.ComponentCompilerMeta, inputText: string) => {
@@ -62,6 +63,9 @@ export const lazyComponentTransform = (compilerCtx: d.CompilerCtx, transformOpts
 
       tsSourceFile = ts.visitEachChild(tsSourceFile, visitNode, transformCtx);
 
+      if (moduleFile.isLegacy) {
+        addLegacyImports(moduleFile);
+      }
       tsSourceFile = addImports(transformOpts, tsSourceFile, moduleFile.coreRuntimeApis, transformOpts.coreImportPath);
 
       return tsSourceFile;

diff --git a/src/compiler/transformers/component-native/tranform-to-native-component.ts b/src/compiler/transformers/component-native/tranform-to-native-component.ts
@@ -7,6 +7,7 @@ import { catchError, loadTypeScriptDiagnostics } from '@utils';
 import { defineCustomElement } from '../define-custom-element';
 import { updateNativeComponentClass } from './native-component';
 import ts from 'typescript';
+import { addLegacyImports } from '../core-runtime-apis';
 
 
 export const transformToNativeComponentText = (compilerCtx: d.CompilerCtx, buildCtx: d.BuildCtx, cmp: d.ComponentCompilerMeta, inputJsText: string) => {
@@ -86,6 +87,9 @@ export const nativeComponentTransform = (compilerCtx: d.CompilerCtx, transformOp
         }
       }
 
+      if (moduleFile.isLegacy) {
+        addLegacyImports(moduleFile);
+      }
       tsSourceFile = addImports(transformOpts, tsSourceFile, moduleFile.coreRuntimeApis, transformOpts.coreImportPath);
 
       return tsSourceFile;

diff --git a/src/compiler/transformers/core-runtime-apis.ts b/src/compiler/transformers/core-runtime-apis.ts
@@ -23,6 +23,7 @@ export const RUNTIME_APIS = {
   getContext: `getContext as ${GET_CONTEXT}`,
   getElement: `getElement as ${GET_ELEMENT}`,
   h: `h as ${H}`,
+  legacyH: `h`,
   Host: `Host as ${HOST}`,
   HTMLElement: HTML_ELEMENT,
   proxyCustomElement: `proxyCustomElement as ${PROXY_CUSTOM_ELEMENT}`,
@@ -36,3 +37,7 @@ export const addCoreRuntimeApi = (moduleFile: d.Module, coreRuntimeApi: string)
     moduleFile.coreRuntimeApis.push(coreRuntimeApi);
   }
 };
+
+export const addLegacyImports = (moduleFile: d.Module) => {
+  addCoreRuntimeApi(moduleFile, RUNTIME_APIS.legacyH);
+};