Merge pull request #318 from AndriiNeverov/schematics-angular11-support

Upgraded Schematics to 11.1.2

Author: AnthonyNahas

package-lock.json

@@ -65,7 +65,7 @@
     "@angular/language-service": "^11.1.2",
     "@nguniversal/builders": "^11.1.1",
     "@release-it/conventional-changelog": "^1.1.4",
-    "@schematics/angular": "^9.1.13",
+    "@schematics/angular": "^11.1.2",
     "@types/express": "^4.17.11",
     "@types/jasmine": "^3.6.3",
     "@types/jasminewd2": "~2.0.3",

package.json

@@ -9,9 +9,7 @@ import {
   addSymbolToNgModuleMetadata as originalAddSymbolToNgModuleMetadata,
   findNode as originalFindNode,
   findNodes as originalFindNodes,
-  getContentOfKeyLiteral as originalGetContentOfKeyLiteral,
   getDecoratorMetadata as originalGetDecoratorMetadata,
-  getFirstNgModuleName as originalGetFirstNgModuleName,
   getMetadataField as originalGetMetadataField,
   getRouterModuleDeclaration as originalGetRouterModuleDeclaration,
   getSourceNodes as originalGetSourceNodes,
@@ -91,24 +89,10 @@ export function insertAfterLastOccurrence(
   return originalInsertAfterLastOccurrence(nodes, toInsert, file, fallbackPos, syntaxKind);
 }
 
-export function getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string | null {
-  return originalGetContentOfKeyLiteral(_source, node);
-}
-
 export function getDecoratorMetadata(source: ts.SourceFile, identifier: string, module: string): ts.Node[] {
   return originalGetDecoratorMetadata(source, identifier, module);
 }
 
-/**
- * Given a source file with @NgModule class(es), find the name of the first @NgModule class.
- *
- * @param source source file containing one or more @NgModule
- * @returns the name of the first @NgModule, or `undefined` if none is found
- */
-export function getFirstNgModuleName(source: ts.SourceFile): string | undefined {
-  return originalGetFirstNgModuleName(source);
-}
-
 export function getMetadataField(node: ts.ObjectLiteralExpression, metadataField: string): ts.ObjectLiteralElement[] {
   return originalGetMetadataField(node, metadataField);
 }

projects/angular-material-extensions/password-strength/schematics/helpers/angular/ast-utils.ts

@@ -3,7 +3,6 @@ export * from './change';
 export * from './component-schema';
 export * from './dependencies';
 export * from './find-module';
-export * from './json-utils';
 export * from './latest-versions';
 export * from './ng-ast-utils';
 export * from './parse-name';

projects/angular-material-extensions/password-strength/schematics/helpers/angular/index.ts

@@ -1,8 +1,8 @@
-import {chain, noop, Rule, SchematicContext, Tree} from '@angular-devkit/schematics';
+import { virtualFs, workspaces } from '@angular-devkit/core';
+import {chain, noop, Rule, SchematicContext, SchematicsException, Tree} from '@angular-devkit/schematics';
 import {NodePackageInstallTask} from '@angular-devkit/schematics/tasks';
 import {addPackageJsonDependency, NodeDependency, NodeDependencyType} from '../helpers';
-import {getWorkspace} from '@schematics/angular/utility/config';
-import {addModuleImportToRootModule, getProjectFromWorkspace} from '@angular/cdk/schematics';
+import {addModuleImportToRootModule} from '@angular/cdk/schematics';
 
 /** Loads the full version from the given Angular package gracefully. */
 function loadPackageVersionGracefully(context: SchematicContext): string | null {
@@ -50,15 +50,12 @@ export function installPackageJsonDependencies(): Rule {
   };
 }
 
-export function addModuleToImports(options: any): Rule {
+export function addModuleToImports(options: any, project: any): Rule {
   return (host: Tree, context: SchematicContext) => {
-    const workspace = getWorkspace(host);
-    // @ts-ignore
-    const project = getProjectFromWorkspace(workspace, options.project);
     const moduleName = 'MatPasswordStrengthModule';
 
     addModuleImportToRootModule(host, moduleName, '@angular-material-extensions/password-strength', project);
-    context.logger.log('info', `✅️ "${moduleName}" is imported`);
+    context.logger.log('info', `✅️ "${moduleName}" is imported into project ${options.project}`);
 
     return host;
   };
@@ -79,10 +76,45 @@ export function getPackageVersionFromPackageJson(tree: Tree, name: string): stri
   return null;
 }
 
+function createHost(tree: Tree): workspaces.WorkspaceHost {
+  return {
+    async readFile(path: string): Promise<string> {
+      const data = tree.read(path);
+      if (!data) {
+        throw new SchematicsException('File not found.');
+      }
+      return virtualFs.fileBufferToString(data);
+    },
+    async writeFile(path: string, data: string): Promise<void> {
+      return tree.overwrite(path, data);
+    },
+    async isDirectory(path: string): Promise<boolean> {
+      return !tree.exists(path) && tree.getDir(path).subfiles.length > 0;
+    },
+    async isFile(path: string): Promise<boolean> {
+      return tree.exists(path);
+    },
+  };
+}
+
 export default function (options: any): Rule {
-  return chain([
-    options && options.skipPackageJson ? noop() : addPackageJsonDependencies(),
-    options && options.skipPackageJson ? noop() : installPackageJsonDependencies(),
-    options && options.skipModuleImport ? noop() : addModuleToImports(options),
-  ]);
+  return async (tree: Tree) => {
+    const host = createHost(tree);
+    const { workspace } = await workspaces.readWorkspace('/', host);
+
+    if (!options.project) {
+      options.project = workspace.extensions.defaultProject;
+    }
+
+    const project = workspace.projects.get(options.project);
+    if (!project) {
+      throw new SchematicsException(`Invalid project name: ${options.project}`);
+    }
+
+    return chain([
+      options && options.skipPackageJson ? noop() : addPackageJsonDependencies(),
+      options && options.skipPackageJson ? noop() : installPackageJsonDependencies(),
+      options && options.skipModuleImport ? noop() : addModuleToImports(options, project),
+    ]);
+  };
 }