fix(schematics): exclude environment imports for libraries

Closes #1205, #1197
ngrx · Jul 29, 2018 · 58cb872 · 58cb872
1 parent 4a0b580
commit 58cb872
Show file tree

Hide file tree

Showing 25 changed files with 218 additions and 45 deletions.
diff --git a/modules/effects/schematics-core/index.ts b/modules/effects/schematics-core/index.ts
@@ -48,7 +48,7 @@ export {
   omit,
 } from './utility/ngrx-utils';
 
-export { getProjectPath } from './utility/project';
+export { getProjectPath, getProject, isLib } from './utility/project';
 export { insertImport } from './utility/route-utils';
 
 export const stringUtils = {

diff --git a/modules/effects/schematics-core/utility/ast-utils.ts b/modules/effects/schematics-core/utility/ast-utils.ts
@@ -352,6 +352,8 @@ function _addSymbolToNgModuleMetadata(
       return [];
     }
 
+    node = node[node.length - 1];
+
     const effectsModule = nodeArray.find(
       node =>
         (node.getText().includes('EffectsModule.forRoot') &&
@@ -398,8 +400,6 @@ function _addSymbolToNgModuleMetadata(
     }
   }
 
-  node = node[node.length - 1];
-
   let toInsert: string;
   let position = node.getEnd();
   if (node.kind == ts.SyntaxKind.ObjectLiteralExpression) {

diff --git a/modules/effects/schematics-core/utility/project.ts b/modules/effects/schematics-core/utility/project.ts
@@ -1,17 +1,29 @@
 import { getWorkspace } from './config';
 import { Tree } from '@angular-devkit/schematics';
 
-export function getProjectPath(
+export interface WorkspaceProject {
+  root: string;
+  projectType: string;
+}
+
+export function getProject(
   host: Tree,
   options: { project?: string | undefined; path?: string | undefined }
-) {
+): WorkspaceProject {
   const workspace = getWorkspace(host);
 
   if (!options.project) {
     options.project = Object.keys(workspace.projects)[0];
   }
 
-  const project = workspace.projects[options.project];
+  return workspace.projects[options.project];
+}
+
+export function getProjectPath(
+  host: Tree,
+  options: { project?: string | undefined; path?: string | undefined }
+) {
+  const project = getProject(host, options);
 
   if (project.root.substr(-1) === '/') {
     project.root = project.root.substr(0, project.root.length - 1);
@@ -26,3 +38,12 @@ export function getProjectPath(
 
   return options.path;
 }
+
+export function isLib(
+  host: Tree,
+  options: { project?: string | undefined; path?: string | undefined }
+) {
+  const project = getProject(host, options);
+
+  return project.projectType === 'library';
+}
diff --git a/modules/entity/schematics-core/index.ts b/modules/entity/schematics-core/index.ts
@@ -48,7 +48,7 @@ export {
   omit,
 } from './utility/ngrx-utils';
 
-export { getProjectPath } from './utility/project';
+export { getProjectPath, getProject, isLib } from './utility/project';
 export { insertImport } from './utility/route-utils';
 
 export const stringUtils = {

diff --git a/modules/entity/schematics-core/utility/ast-utils.ts b/modules/entity/schematics-core/utility/ast-utils.ts
@@ -352,6 +352,8 @@ function _addSymbolToNgModuleMetadata(
       return [];
     }
 
+    node = node[node.length - 1];
+
     const effectsModule = nodeArray.find(
       node =>
         (node.getText().includes('EffectsModule.forRoot') &&
@@ -398,8 +400,6 @@ function _addSymbolToNgModuleMetadata(
     }
   }
 
-  node = node[node.length - 1];
-
   let toInsert: string;
   let position = node.getEnd();
   if (node.kind == ts.SyntaxKind.ObjectLiteralExpression) {

diff --git a/modules/entity/schematics-core/utility/project.ts b/modules/entity/schematics-core/utility/project.ts
@@ -1,17 +1,29 @@
 import { getWorkspace } from './config';
 import { Tree } from '@angular-devkit/schematics';
 
-export function getProjectPath(
+export interface WorkspaceProject {
+  root: string;
+  projectType: string;
+}
+
+export function getProject(
   host: Tree,
   options: { project?: string | undefined; path?: string | undefined }
-) {
+): WorkspaceProject {
   const workspace = getWorkspace(host);
 
   if (!options.project) {
     options.project = Object.keys(workspace.projects)[0];
   }
 
-  const project = workspace.projects[options.project];
+  return workspace.projects[options.project];
+}
+
+export function getProjectPath(
+  host: Tree,
+  options: { project?: string | undefined; path?: string | undefined }
+) {
+  const project = getProject(host, options);
 
   if (project.root.substr(-1) === '/') {
     project.root = project.root.substr(0, project.root.length - 1);
@@ -26,3 +38,12 @@ export function getProjectPath(
 
   return options.path;
 }
+
+export function isLib(
+  host: Tree,
+  options: { project?: string | undefined; path?: string | undefined }
+) {
+  const project = getProject(host, options);
+
+  return project.projectType === 'library';
+}
diff --git a/modules/router-store/schematics-core/index.ts b/modules/router-store/schematics-core/index.ts
@@ -48,7 +48,7 @@ export {
   omit,
 } from './utility/ngrx-utils';
 
-export { getProjectPath } from './utility/project';
+export { getProjectPath, getProject, isLib } from './utility/project';
 export { insertImport } from './utility/route-utils';
 
 export const stringUtils = {

diff --git a/modules/router-store/schematics-core/utility/ast-utils.ts b/modules/router-store/schematics-core/utility/ast-utils.ts
@@ -352,6 +352,8 @@ function _addSymbolToNgModuleMetadata(
       return [];
     }
 
+    node = node[node.length - 1];
+
     const effectsModule = nodeArray.find(
       node =>
         (node.getText().includes('EffectsModule.forRoot') &&
@@ -398,8 +400,6 @@ function _addSymbolToNgModuleMetadata(
     }
   }
 
-  node = node[node.length - 1];
-
   let toInsert: string;
   let position = node.getEnd();
   if (node.kind == ts.SyntaxKind.ObjectLiteralExpression) {

diff --git a/modules/router-store/schematics-core/utility/project.ts b/modules/router-store/schematics-core/utility/project.ts
@@ -1,17 +1,29 @@
 import { getWorkspace } from './config';
 import { Tree } from '@angular-devkit/schematics';
 
-export function getProjectPath(
+export interface WorkspaceProject {
+  root: string;
+  projectType: string;
+}
+
+export function getProject(
   host: Tree,
   options: { project?: string | undefined; path?: string | undefined }
-) {
+): WorkspaceProject {
   const workspace = getWorkspace(host);
 
   if (!options.project) {
     options.project = Object.keys(workspace.projects)[0];
   }
 
-  const project = workspace.projects[options.project];
+  return workspace.projects[options.project];
+}
+
+export function getProjectPath(
+  host: Tree,
+  options: { project?: string | undefined; path?: string | undefined }
+) {
+  const project = getProject(host, options);
 
   if (project.root.substr(-1) === '/') {
     project.root = project.root.substr(0, project.root.length - 1);
@@ -26,3 +38,12 @@ export function getProjectPath(
 
   return options.path;
 }
+
+export function isLib(
+  host: Tree,
+  options: { project?: string | undefined; path?: string | undefined }
+) {
+  const project = getProject(host, options);
+
+  return project.projectType === 'library';
+}
diff --git a/modules/schematics-core/index.ts b/modules/schematics-core/index.ts
@@ -48,7 +48,7 @@ export {
   omit,
 } from './utility/ngrx-utils';
 
-export { getProjectPath } from './utility/project';
+export { getProjectPath, getProject, isLib } from './utility/project';
 export { insertImport } from './utility/route-utils';
 
 export const stringUtils = {

diff --git a/modules/schematics-core/testing/create-workspace.ts b/modules/schematics-core/testing/create-workspace.ts
@@ -26,6 +26,10 @@ const defaultModuleOptions = {
   flat: false,
 };
 
+const defaultLibOptions = {
+  name: 'baz',
+};
+
 export function getTestProjectPath(
   workspaceOptions: any = defaultWorkspaceOptions,
   appOptions: any = defaultAppOptions
@@ -37,7 +41,8 @@ export function createWorkspace(
   schematicRunner: SchematicTestRunner,
   appTree: UnitTestTree,
   workspaceOptions = defaultWorkspaceOptions,
-  appOptions = defaultAppOptions
+  appOptions = defaultAppOptions,
+  libOptions = defaultLibOptions
 ) {
   appTree = schematicRunner.runExternalSchematic(
     '@schematics/angular',
@@ -50,6 +55,12 @@ export function createWorkspace(
     appOptions,
     appTree
   );
+  appTree = schematicRunner.runExternalSchematic(
+    '@schematics/angular',
+    'library',
+    libOptions,
+    appTree
+  );
 
   return appTree;
 }
diff --git a/modules/schematics-core/utility/ast-utils.ts b/modules/schematics-core/utility/ast-utils.ts
@@ -352,6 +352,8 @@ function _addSymbolToNgModuleMetadata(
       return [];
     }
 
+    node = node[node.length - 1];
+
     const effectsModule = nodeArray.find(
       node =>
         (node.getText().includes('EffectsModule.forRoot') &&
@@ -398,8 +400,6 @@ function _addSymbolToNgModuleMetadata(
     }
   }
 
-  node = node[node.length - 1];
-
   let toInsert: string;
   let position = node.getEnd();
   if (node.kind == ts.SyntaxKind.ObjectLiteralExpression) {

diff --git a/modules/schematics-core/utility/project.ts b/modules/schematics-core/utility/project.ts
@@ -1,17 +1,29 @@
 import { getWorkspace } from './config';
 import { Tree } from '@angular-devkit/schematics';
 
-export function getProjectPath(
+export interface WorkspaceProject {
+  root: string;
+  projectType: string;
+}
+
+export function getProject(
   host: Tree,
   options: { project?: string | undefined; path?: string | undefined }
-) {
+): WorkspaceProject {
   const workspace = getWorkspace(host);
 
   if (!options.project) {
     options.project = Object.keys(workspace.projects)[0];
   }
 
-  const project = workspace.projects[options.project];
+  return workspace.projects[options.project];
+}
+
+export function getProjectPath(
+  host: Tree,
+  options: { project?: string | undefined; path?: string | undefined }
+) {
+  const project = getProject(host, options);
 
   if (project.root.substr(-1) === '/') {
     project.root = project.root.substr(0, project.root.length - 1);
@@ -26,3 +38,12 @@ export function getProjectPath(
 
   return options.path;
 }
+
+export function isLib(
+  host: Tree,
+  options: { project?: string | undefined; path?: string | undefined }
+) {
+  const project = getProject(host, options);
+
+  return project.projectType === 'library';
+}
diff --git a/modules/schematics/schematics-core/index.ts b/modules/schematics/schematics-core/index.ts
@@ -48,7 +48,7 @@ export {
   omit,
 } from './utility/ngrx-utils';
 
-export { getProjectPath } from './utility/project';
+export { getProjectPath, getProject, isLib } from './utility/project';
 export { insertImport } from './utility/route-utils';
 
 export const stringUtils = {

diff --git a/modules/schematics/schematics-core/utility/ast-utils.ts b/modules/schematics/schematics-core/utility/ast-utils.ts
@@ -352,6 +352,8 @@ function _addSymbolToNgModuleMetadata(
       return [];
     }
 
+    node = node[node.length - 1];
+
     const effectsModule = nodeArray.find(
       node =>
         (node.getText().includes('EffectsModule.forRoot') &&
@@ -398,8 +400,6 @@ function _addSymbolToNgModuleMetadata(
     }
   }
 
-  node = node[node.length - 1];
-
   let toInsert: string;
   let position = node.getEnd();
   if (node.kind == ts.SyntaxKind.ObjectLiteralExpression) {

diff --git a/modules/schematics/schematics-core/utility/project.ts b/modules/schematics/schematics-core/utility/project.ts
@@ -1,17 +1,29 @@
 import { getWorkspace } from './config';
 import { Tree } from '@angular-devkit/schematics';
 
-export function getProjectPath(
+export interface WorkspaceProject {
+  root: string;
+  projectType: string;
+}
+
+export function getProject(
   host: Tree,
   options: { project?: string | undefined; path?: string | undefined }
-) {
+): WorkspaceProject {
   const workspace = getWorkspace(host);
 
   if (!options.project) {
     options.project = Object.keys(workspace.projects)[0];
   }
 
-  const project = workspace.projects[options.project];
+  return workspace.projects[options.project];
+}
+
+export function getProjectPath(
+  host: Tree,
+  options: { project?: string | undefined; path?: string | undefined }
+) {
+  const project = getProject(host, options);
 
   if (project.root.substr(-1) === '/') {
     project.root = project.root.substr(0, project.root.length - 1);
@@ -26,3 +38,12 @@ export function getProjectPath(
 
   return options.path;
 }
+
+export function isLib(
+  host: Tree,
+  options: { project?: string | undefined; path?: string | undefined }
+) {
+  const project = getProject(host, options);
+
+  return project.projectType === 'library';
+}