@schematics/angular 14.0.0-next.11 → 14.0.0-next.12

package/app-shell/index.js

@@ -40,11 +40,7 @@ const project_targets_1 = require("../utility/project-targets");
 const workspace_1 = require("../utility/workspace");
 const workspace_models_1 = require("../utility/workspace-models");
 function getSourceFile(host, path) {
-    const buffer = host.read(path);
-    if (!buffer) {
-        throw new schematics_1.SchematicsException(`Could not find ${path}.`);
-    }
-    const content = buffer.toString();
+    const content = host.readText(path);
     const source = ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);
     return source;
 }
@@ -76,10 +72,10 @@ function getComponentTemplate(host, compPath, tmplInfo) {
         const templateUrl = tmplInfo.templateUrlProp.initializer.text;
         const dir = (0, core_1.dirname)((0, core_1.normalize)(compPath));
         const templatePath = (0, core_1.join)(dir, templateUrl);
-        const buffer = host.read(templatePath);
-        if (buffer) {
-            template = buffer.toString();
+        try {
+            template = host.readText(templatePath);
         }
+        catch { }
     }
     return template;
 }

package/application/index.js

@@ -233,7 +233,7 @@ function default_1(options) {
         // If scoped project (i.e. "@foo/bar"), convert dir to "foo/bar".
         let folderName = options.name.startsWith('@') ? options.name.slice(1) : options.name;
         if (/[A-Z]/.test(folderName)) {
-            folderName = core_1.strings.dasherize(folderName);
+            folderName = schematics_1.strings.dasherize(folderName);
         }
         const appDir = isRootApp
             ? (0, core_1.normalize)(options.projectRoot || '')
@@ -244,7 +244,7 @@ function default_1(options) {
             (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files'), [
                 options.minimal ? (0, schematics_1.filter)(minimalPathFilter) : (0, schematics_1.noop)(),
                 (0, schematics_1.applyTemplates)({
-                    utils: core_1.strings,
+                    utils: schematics_1.strings,
                     ...options,
                     relativePathToWorkspaceRoot: (0, paths_1.relativePathToWorkspaceRoot)(appDir),
                     appName: options.name,
@@ -280,7 +280,7 @@ function default_1(options) {
                     ? (0, schematics_1.filter)((path) => !path.endsWith('.spec.ts.template'))
                     : (0, schematics_1.noop)(),
                 (0, schematics_1.applyTemplates)({
-                    utils: core_1.strings,
+                    utils: schematics_1.strings,
                     ...options,
                     selector: appRootSelector,
                     ...componentOptions,

package/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.spec.ts.template

@@ -8,7 +8,7 @@ describe('<%= classify(name) %><%= classify(type) %>', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ <%= classify(name) %><%= classify(type) %> ]
+      <%= standalone ? 'imports' : 'declarations' %>: [ <%= classify(name) %><%= classify(type) %> ]
     })
     .compileComponents();
 

package/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template

@@ -1,7 +1,8 @@
 import { Component, OnInit<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%><% if(changeDetection !== 'Default') { %>, ChangeDetectionStrategy<% }%> } from '@angular/core';
 
 @Component({<% if(!skipSelector) {%>
-  selector: '<%= selector %>',<%}%><% if(inlineTemplate) { %>
+  selector: '<%= selector %>',<%}%><% if(standalone) {%>
+  standalone: true,<%}%><% if(inlineTemplate) { %>
   template: `
     <p>
       <%= dasherize(name) %> works!

package/component/index.js

@@ -30,7 +30,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const ast_utils_1 = require("../utility/ast-utils");
@@ -41,28 +40,24 @@ const validation_1 = require("../utility/validation");
 const workspace_1 = require("../utility/workspace");
 const schema_1 = require("./schema");
 function readIntoSourceFile(host, modulePath) {
-    const text = host.read(modulePath);
-    if (text === null) {
-        throw new schematics_1.SchematicsException(`File ${modulePath} does not exist.`);
-    }
-    const sourceText = text.toString('utf-8');
+    const sourceText = host.readText(modulePath);
     return ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
 }
 function addDeclarationToNgModule(options) {
     return (host) => {
-        if (options.skipImport || !options.module) {
+        if (options.skipImport || options.standalone || !options.module) {
             return host;
         }
         options.type = options.type != null ? options.type : 'Component';
         const modulePath = options.module;
         const source = readIntoSourceFile(host, modulePath);
         const componentPath = `/${options.path}/` +
-            (options.flat ? '' : core_1.strings.dasherize(options.name) + '/') +
-            core_1.strings.dasherize(options.name) +
+            (options.flat ? '' : schematics_1.strings.dasherize(options.name) + '/') +
+            schematics_1.strings.dasherize(options.name) +
             (options.type ? '.' : '') +
-            core_1.strings.dasherize(options.type);
+            schematics_1.strings.dasherize(options.type);
         const relativePath = (0, find_module_1.buildRelativePath)(modulePath, componentPath);
-        const classifiedName = core_1.strings.classify(options.name) + core_1.strings.classify(options.type);
+        const classifiedName = schematics_1.strings.classify(options.name) + schematics_1.strings.classify(options.type);
         const declarationChanges = (0, ast_utils_1.addDeclarationToModule)(source, modulePath, classifiedName, relativePath);
         const declarationRecorder = host.beginUpdate(modulePath);
         for (const change of declarationChanges) {
@@ -75,7 +70,7 @@ function addDeclarationToNgModule(options) {
             // Need to refresh the AST because we overwrote the file in the host.
             const source = readIntoSourceFile(host, modulePath);
             const exportRecorder = host.beginUpdate(modulePath);
-            const exportChanges = (0, ast_utils_1.addExportToModule)(source, modulePath, core_1.strings.classify(options.name) + core_1.strings.classify(options.type), relativePath);
+            const exportChanges = (0, ast_utils_1.addExportToModule)(source, modulePath, schematics_1.strings.classify(options.name) + schematics_1.strings.classify(options.type), relativePath);
             for (const change of exportChanges) {
                 if (change instanceof change_1.InsertChange) {
                     exportRecorder.insertLeft(change.pos, change.toAdd);
@@ -87,7 +82,7 @@ function addDeclarationToNgModule(options) {
     };
 }
 function buildSelector(options, projectPrefix) {
-    let selector = core_1.strings.dasherize(options.name);
+    let selector = schematics_1.strings.dasherize(options.name);
     if (options.prefix) {
         selector = `${options.prefix}-${selector}`;
     }
@@ -119,7 +114,7 @@ function default_1(options) {
             skipStyleFile ? (0, schematics_1.filter)((path) => !path.endsWith('.__style__.template')) : (0, schematics_1.noop)(),
             options.inlineTemplate ? (0, schematics_1.filter)((path) => !path.endsWith('.html.template')) : (0, schematics_1.noop)(),
             (0, schematics_1.applyTemplates)({
-                ...core_1.strings,
+                ...schematics_1.strings,
                 'if-flat': (s) => (options.flat ? '' : s),
                 ...options,
             }),

package/component/schema.d.ts

@@ -65,6 +65,10 @@ export interface Schema {
      * Do not create "spec.ts" test files for the new component.
      */
     skipTests?: boolean;
+    /**
+     * Whether the generated component is standalone.
+     */
+    standalone?: boolean;
     /**
      * The file extension or preprocessor to use for style files, or 'none' to skip generating
      * the style file.

package/component/schema.json

@@ -48,6 +48,12 @@
       "alias": "t",
       "x-user-analytics": 10
     },
+    "standalone": {
+      "description": "Whether the generated component is standalone.",
+      "type": "boolean",
+      "default": false,
+      "x-user-analytics": 15
+    },
     "viewEncapsulation": {
       "description": "The view encapsulation strategy to use in the new component.",
       "enum": ["Emulated", "None", "ShadowDom"],

package/directive/files/__name@dasherize@if-flat__/__name@dasherize__.directive.ts.template

@@ -1,7 +1,8 @@
 import { Directive } from '@angular/core';
 
 @Directive({
-  selector: '[<%= selector %>]'
+  selector: '[<%= selector %>]'<% if(standalone) {%>,
+  standalone: true<%}%>
 })
 export class <%= classify(name) %>Directive {
 

package/directive/index.js

@@ -30,7 +30,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const ast_utils_1 = require("../utility/ast-utils");
@@ -41,22 +40,18 @@ const validation_1 = require("../utility/validation");
 const workspace_1 = require("../utility/workspace");
 function addDeclarationToNgModule(options) {
     return (host) => {
-        if (options.skipImport || !options.module) {
+        if (options.skipImport || options.standalone || !options.module) {
             return host;
         }
         const modulePath = options.module;
-        const text = host.read(modulePath);
-        if (text === null) {
-            throw new schematics_1.SchematicsException(`File ${modulePath} does not exist.`);
-        }
-        const sourceText = text.toString('utf-8');
+        const sourceText = host.readText(modulePath);
         const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
         const directivePath = `/${options.path}/` +
-            (options.flat ? '' : core_1.strings.dasherize(options.name) + '/') +
-            core_1.strings.dasherize(options.name) +
+            (options.flat ? '' : schematics_1.strings.dasherize(options.name) + '/') +
+            schematics_1.strings.dasherize(options.name) +
             '.directive';
         const relativePath = (0, find_module_1.buildRelativePath)(modulePath, directivePath);
-        const classifiedName = core_1.strings.classify(`${options.name}Directive`);
+        const classifiedName = schematics_1.strings.classify(`${options.name}Directive`);
         const declarationChanges = (0, ast_utils_1.addDeclarationToModule)(source, modulePath, classifiedName, relativePath);
         const declarationRecorder = host.beginUpdate(modulePath);
         for (const change of declarationChanges) {
@@ -67,14 +62,10 @@ function addDeclarationToNgModule(options) {
         host.commitUpdate(declarationRecorder);
         if (options.export) {
             // Need to refresh the AST because we overwrote the file in the host.
-            const text = host.read(modulePath);
-            if (text === null) {
-                throw new schematics_1.SchematicsException(`File ${modulePath} does not exist.`);
-            }
-            const sourceText = text.toString('utf-8');
+            const sourceText = host.readText(modulePath);
             const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
             const exportRecorder = host.beginUpdate(modulePath);
-            const exportChanges = (0, ast_utils_1.addExportToModule)(source, modulePath, core_1.strings.classify(`${options.name}Directive`), relativePath);
+            const exportChanges = (0, ast_utils_1.addExportToModule)(source, modulePath, schematics_1.strings.classify(`${options.name}Directive`), relativePath);
             for (const change of exportChanges) {
                 if (change instanceof change_1.InsertChange) {
                     exportRecorder.insertLeft(change.pos, change.toAdd);
@@ -93,7 +84,7 @@ function buildSelector(options, projectPrefix) {
     else if (options.prefix === undefined && projectPrefix) {
         selector = `${projectPrefix}-${selector}`;
     }
-    return core_1.strings.camelize(selector);
+    return schematics_1.strings.camelize(selector);
 }
 function default_1(options) {
     return async (host) => {
@@ -114,7 +105,7 @@ function default_1(options) {
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
             options.skipTests ? (0, schematics_1.filter)((path) => !path.endsWith('.spec.ts.template')) : (0, schematics_1.noop)(),
             (0, schematics_1.applyTemplates)({
-                ...core_1.strings,
+                ...schematics_1.strings,
                 'if-flat': (s) => (options.flat ? '' : s),
                 ...options,
             }),

package/directive/schema.d.ts

@@ -43,4 +43,8 @@ export interface Schema {
      * Do not create "spec.ts" test files for the new class.
      */
     skipTests?: boolean;
+    /**
+     * Whether the generated directive is standalone.
+     */
+    standalone?: boolean;
 }

package/directive/schema.json

@@ -59,6 +59,12 @@
       "format": "html-selector",
       "description": "The HTML selector to use for this directive."
     },
+    "standalone": {
+      "description": "Whether the generated directive is standalone.",
+      "type": "boolean",
+      "default": false,
+      "x-user-analytics": 15
+    },
     "flat": {
       "type": "boolean",
       "description": "When true (the default), creates the new files at the top level of the current project.",

package/e2e/index.js

@@ -53,7 +53,7 @@ function default_1(options) {
             (0, workspace_1.updateWorkspace)(workspace),
             (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files'), [
                 (0, schematics_1.applyTemplates)({
-                    utils: core_1.strings,
+                    utils: schematics_1.strings,
                     ...options,
                     relativePathToWorkspaceRoot: (0, paths_1.relativePathToWorkspaceRoot)(root),
                 }),

package/library/index.js

@@ -108,7 +108,7 @@ function default_1(options) {
         const newProjectRoot = workspace.extensions.newProjectRoot || '';
         let folderName = packageName.startsWith('@') ? packageName.slice(1) : packageName;
         if (/[A-Z]/.test(folderName)) {
-            folderName = core_1.strings.dasherize(folderName);
+            folderName = schematics_1.strings.dasherize(folderName);
         }
         const projectRoot = (0, core_1.join)((0, core_1.normalize)(newProjectRoot), folderName);
         const distRoot = `dist/${folderName}`;
@@ -116,7 +116,7 @@ function default_1(options) {
         const sourceDir = `${projectRoot}/src/lib`;
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
             (0, schematics_1.applyTemplates)({
-                ...core_1.strings,
+                ...schematics_1.strings,
                 ...options,
                 packageName,
                 projectRoot,

package/module/index.js

@@ -41,8 +41,8 @@ const workspace_1 = require("../utility/workspace");
 const schema_1 = require("./schema");
 function buildRelativeModulePath(options, modulePath) {
     const importModulePath = (0, core_1.normalize)(`/${options.path}/` +
-        (options.flat ? '' : core_1.strings.dasherize(options.name) + '/') +
-        core_1.strings.dasherize(options.name) +
+        (options.flat ? '' : schematics_1.strings.dasherize(options.name) + '/') +
+        schematics_1.strings.dasherize(options.name) +
         '.module');
     return (0, find_module_1.buildRelativePath)(modulePath, importModulePath);
 }
@@ -52,14 +52,10 @@ function addDeclarationToNgModule(options) {
             return host;
         }
         const modulePath = options.module;
-        const text = host.read(modulePath);
-        if (text === null) {
-            throw new schematics_1.SchematicsException(`File ${modulePath} does not exist.`);
-        }
-        const sourceText = text.toString();
+        const sourceText = host.readText(modulePath);
         const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
         const relativePath = buildRelativeModulePath(options, modulePath);
-        const changes = (0, ast_utils_1.addImportToModule)(source, modulePath, core_1.strings.classify(`${options.name}Module`), relativePath);
+        const changes = (0, ast_utils_1.addImportToModule)(source, modulePath, schematics_1.strings.classify(`${options.name}Module`), relativePath);
         const recorder = host.beginUpdate(modulePath);
         for (const change of changes) {
             if (change instanceof change_1.InsertChange) {
@@ -85,11 +81,7 @@ function addRouteDeclarationToNgModule(options, routingModulePath) {
         else {
             path = options.module;
         }
-        const text = host.read(path);
-        if (!text) {
-            throw new Error(`Couldn't find the module nor its routing module.`);
-        }
-        const sourceText = text.toString();
+        const sourceText = host.readText(path);
         const addDeclaration = (0, ast_utils_1.addRouteDeclarationToModule)(ts.createSourceFile(path, sourceText, ts.ScriptTarget.Latest, true), path, buildRoute(options, options.module));
         const recorder = host.beginUpdate(path);
         recorder.insertLeft(addDeclaration.pos, addDeclaration.toAdd);
@@ -105,7 +97,7 @@ function getRoutingModulePath(host, modulePath) {
 }
 function buildRoute(options, modulePath) {
     const relativeModulePath = buildRelativeModulePath(options, modulePath);
-    const moduleName = `${core_1.strings.classify(options.name)}Module`;
+    const moduleName = `${schematics_1.strings.classify(options.name)}Module`;
     const loadChildren = `() => import('${relativeModulePath}').then(m => m.${moduleName})`;
     return `{ path: '${options.route}', loadChildren: ${loadChildren} }`;
 }
@@ -131,7 +123,7 @@ function default_1(options) {
                 ? (0, schematics_1.noop)()
                 : (0, schematics_1.filter)((path) => !path.endsWith('-routing.module.ts.template')),
             (0, schematics_1.applyTemplates)({
-                ...core_1.strings,
+                ...schematics_1.strings,
                 'if-flat': (s) => (options.flat ? '' : s),
                 lazyRoute: isLazyLoadedModuleGen,
                 lazyRouteWithoutRouteModule: isLazyLoadedModuleGen && !routingModulePath,
@@ -140,7 +132,7 @@ function default_1(options) {
             }),
             (0, schematics_1.move)(parsedPath.path),
         ]);
-        const moduleDasherized = core_1.strings.dasherize(options.name);
+        const moduleDasherized = schematics_1.strings.dasherize(options.name);
         const modulePath = `${!options.flat ? moduleDasherized + '/' : ''}${moduleDasherized}.module.ts`;
         const componentOptions = {
             module: modulePath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "14.0.0-next.11",
+  "version": "14.0.0-next.12",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -15,8 +15,8 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "14.0.0-next.11",
-    "@angular-devkit/schematics": "14.0.0-next.11",
+    "@angular-devkit/core": "14.0.0-next.12",
+    "@angular-devkit/schematics": "14.0.0-next.12",
     "jsonc-parser": "3.0.0"
   },
   "repository": {

package/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.ts.template

@@ -1,7 +1,8 @@
 import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({
-  name: '<%= camelize(name) %>'
+  name: '<%= camelize(name) %>'<% if(standalone) {%>,
+  standalone: true<%}%>
 })
 export class <%= classify(name) %>Pipe implements PipeTransform {
 

package/pipe/index.js

@@ -30,7 +30,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const ast_utils_1 = require("../utility/ast-utils");
@@ -40,22 +39,18 @@ const parse_name_1 = require("../utility/parse-name");
 const workspace_1 = require("../utility/workspace");
 function addDeclarationToNgModule(options) {
     return (host) => {
-        if (options.skipImport || !options.module) {
+        if (options.skipImport || options.standalone || !options.module) {
             return host;
         }
         const modulePath = options.module;
-        const text = host.read(modulePath);
-        if (text === null) {
-            throw new schematics_1.SchematicsException(`File ${modulePath} does not exist.`);
-        }
-        const sourceText = text.toString('utf-8');
+        const sourceText = host.readText(modulePath);
         const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
         const pipePath = `/${options.path}/` +
-            (options.flat ? '' : core_1.strings.dasherize(options.name) + '/') +
-            core_1.strings.dasherize(options.name) +
+            (options.flat ? '' : schematics_1.strings.dasherize(options.name) + '/') +
+            schematics_1.strings.dasherize(options.name) +
             '.pipe';
         const relativePath = (0, find_module_1.buildRelativePath)(modulePath, pipePath);
-        const changes = (0, ast_utils_1.addDeclarationToModule)(source, modulePath, core_1.strings.classify(`${options.name}Pipe`), relativePath);
+        const changes = (0, ast_utils_1.addDeclarationToModule)(source, modulePath, schematics_1.strings.classify(`${options.name}Pipe`), relativePath);
         const recorder = host.beginUpdate(modulePath);
         for (const change of changes) {
             if (change instanceof change_1.InsertChange) {
@@ -64,14 +59,10 @@ function addDeclarationToNgModule(options) {
         }
         host.commitUpdate(recorder);
         if (options.export) {
-            const text = host.read(modulePath);
-            if (text === null) {
-                throw new schematics_1.SchematicsException(`File ${modulePath} does not exist.`);
-            }
-            const sourceText = text.toString('utf-8');
+            const sourceText = host.readText(modulePath);
             const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
             const exportRecorder = host.beginUpdate(modulePath);
-            const exportChanges = (0, ast_utils_1.addExportToModule)(source, modulePath, core_1.strings.classify(`${options.name}Pipe`), relativePath);
+            const exportChanges = (0, ast_utils_1.addExportToModule)(source, modulePath, schematics_1.strings.classify(`${options.name}Pipe`), relativePath);
             for (const change of exportChanges) {
                 if (change instanceof change_1.InsertChange) {
                     exportRecorder.insertLeft(change.pos, change.toAdd);
@@ -94,7 +85,7 @@ function default_1(options) {
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
             options.skipTests ? (0, schematics_1.filter)((path) => !path.endsWith('.spec.ts.template')) : (0, schematics_1.noop)(),
             (0, schematics_1.applyTemplates)({
-                ...core_1.strings,
+                ...schematics_1.strings,
                 'if-flat': (s) => (options.flat ? '' : s),
                 ...options,
             }),

package/pipe/schema.d.ts

@@ -34,4 +34,8 @@ export interface Schema {
      * Do not create "spec.ts" test files for the new pipe.
      */
     skipTests?: boolean;
+    /**
+     * Whether the generated pipe is standalone.
+     */
+    standalone?: boolean;
 }

package/pipe/schema.json

@@ -45,6 +45,12 @@
       "description": "Do not import this pipe into the owning NgModule.",
       "x-user-analytics": 18
     },
+    "standalone": {
+      "description": "Whether the generated pipe is standalone.",
+      "type": "boolean",
+      "default": false,
+      "x-user-analytics": 15
+    },
     "module": {
       "type": "string",
       "description": "The declaring NgModule.",

package/service-worker/index.js

@@ -113,11 +113,7 @@ function updateAppModule(mainPath) {
     };
 }
 function getTsSourceFile(host, path) {
-    const buffer = host.read(path);
-    if (!buffer) {
-        throw new schematics_1.SchematicsException(`Could not read file (${path}).`);
-    }
-    const content = buffer.toString();
+    const content = host.readText(path);
     const source = ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);
     return source;
 }

package/universal/index.js

@@ -96,11 +96,7 @@ function updateConfigFile(options, tsConfigDirectory) {
     });
 }
 function findBrowserModuleImport(host, modulePath) {
-    const moduleBuffer = host.read(modulePath);
-    if (!moduleBuffer) {
-        throw new schematics_1.SchematicsException(`Module file (${modulePath}) not found`);
-    }
-    const moduleFileText = moduleBuffer.toString('utf-8');
+    const moduleFileText = host.readText(modulePath);
     const source = ts.createSourceFile(modulePath, moduleFileText, ts.ScriptTarget.Latest, true);
     const decoratorMetadata = (0, ast_utils_1.getDecoratorMetadata)(source, 'NgModule', '@angular/core')[0];
     const browserModuleNode = (0, ast_utils_1.findNode)(decoratorMetadata, ts.SyntaxKind.Identifier, 'BrowserModule');
@@ -230,7 +226,7 @@ function default_1(options) {
         }
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files/src'), [
             (0, schematics_1.applyTemplates)({
-                ...core_1.strings,
+                ...schematics_1.strings,
                 ...options,
                 stripTsExtension: (s) => s.replace(/\.ts$/, ''),
                 hasLocalizePackage: !!(0, dependencies_1.getPackageJsonDependency)(host, '@angular/localize'),
@@ -239,7 +235,7 @@ function default_1(options) {
         ]);
         const rootSource = (0, schematics_1.apply)((0, schematics_1.url)('./files/root'), [
             (0, schematics_1.applyTemplates)({
-                ...core_1.strings,
+                ...schematics_1.strings,
                 ...options,
                 stripTsExtension: (s) => s.replace(/\.ts$/, ''),
                 tsConfigExtends,

package/utility/find-module.d.ts

@@ -15,6 +15,7 @@ export interface ModuleOptions {
     skipImport?: boolean;
     moduleExt?: string;
     routingModuleExt?: string;
+    standalone?: boolean;
 }
 export declare const MODULE_EXT = ".module.ts";
 export declare const ROUTING_MODULE_EXT = "-routing.module.ts";

package/utility/find-module.js

@@ -15,8 +15,7 @@ exports.ROUTING_MODULE_EXT = '-routing.module.ts';
  * Find the module referred by a set of options passed to the schematics.
  */
 function findModuleFromOptions(host, options) {
-    // eslint-disable-next-line no-prototype-builtins
-    if (options.hasOwnProperty('skipImport') && options.skipImport) {
+    if (options.standalone || options.skipImport) {
         return undefined;
     }
     const moduleExt = options.moduleExt || exports.MODULE_EXT;

package/utility/generate-from-files.js

@@ -8,7 +8,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateFromFiles = void 0;
-const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const parse_name_1 = require("./parse-name");
 const workspace_1 = require("./workspace");
@@ -24,11 +23,11 @@ function generateFromFiles(options, extraTemplateValues = {}) {
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
             options.skipTests ? (0, schematics_1.filter)((path) => !path.endsWith('.spec.ts.template')) : (0, schematics_1.noop)(),
             (0, schematics_1.applyTemplates)({
-                ...core_1.strings,
+                ...schematics_1.strings,
                 ...options,
                 ...extraTemplateValues,
             }),
-            (0, schematics_1.move)(parsedPath.path + (options.flat ? '' : '/' + core_1.strings.dasherize(options.name))),
+            (0, schematics_1.move)(parsedPath.path + (options.flat ? '' : '/' + schematics_1.strings.dasherize(options.name))),
         ]);
         return (0, schematics_1.chain)([(0, schematics_1.mergeWith)(templateSource)]);
     };

package/utility/json-file.js

@@ -14,13 +14,7 @@ class JSONFile {
     constructor(host, path) {
         this.host = host;
         this.path = path;
-        const buffer = this.host.read(this.path);
-        if (buffer) {
-            this.content = buffer.toString();
-        }
-        else {
-            throw new Error(`Could not read '${path}'.`);
-        }
+        this.content = this.host.readText(this.path);
     }
     get JsonAst() {
         if (this._jsonAst) {

package/utility/ng-ast-utils.js

@@ -37,11 +37,7 @@ const path_1 = require("path");
 const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const ast_utils_1 = require("../utility/ast-utils");
 function findBootstrapModuleCall(host, mainPath) {
-    const mainBuffer = host.read(mainPath);
-    if (!mainBuffer) {
-        throw new schematics_1.SchematicsException(`Main file (${mainPath}) not found`);
-    }
-    const mainText = mainBuffer.toString('utf-8');
+    const mainText = host.readText(mainPath);
     const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);
     const allNodes = (0, ast_utils_1.getSourceNodes)(source);
     let bootstrapCall = null;
@@ -70,11 +66,7 @@ function findBootstrapModulePath(host, mainPath) {
         throw new schematics_1.SchematicsException('Bootstrap call not found');
     }
     const bootstrapModule = bootstrapCall.arguments[0];
-    const mainBuffer = host.read(mainPath);
-    if (!mainBuffer) {
-        throw new schematics_1.SchematicsException(`Client application main file (${mainPath}) not found`);
-    }
-    const mainText = mainBuffer.toString('utf-8');
+    const mainText = host.readText(mainPath);
     const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);
     const allNodes = (0, ast_utils_1.getSourceNodes)(source);
     const bootstrapModuleRelativePath = allNodes

package/utility/parse-name.js

@@ -8,7 +8,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseName = void 0;
-// import { relative, Path } from "../../../angular_devkit/core/src/virtual-fs";
 const core_1 = require("@angular-devkit/core");
 function parseName(path, name) {
     const nameWithoutPath = (0, core_1.basename)((0, core_1.normalize)(name));

package/utility/validation.js

@@ -8,15 +8,13 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateHtmlSelector = exports.htmlSelectorRe = void 0;
-const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 // Must start with a letter, and must contain only alphanumeric characters or dashes.
 // When adding a dash the segment after the dash must also start with a letter.
 exports.htmlSelectorRe = /^[a-zA-Z][.0-9a-zA-Z]*(:?-[a-zA-Z][.0-9a-zA-Z]*)*$/;
 function validateHtmlSelector(selector) {
     if (selector && !exports.htmlSelectorRe.test(selector)) {
-        throw new schematics_1.SchematicsException(core_1.tags.oneLine `Selector (${selector})
-        is invalid.`);
+        throw new schematics_1.SchematicsException(`Selector (${selector}) is invalid.`);
     }
 }
 exports.validateHtmlSelector = validateHtmlSelector;

package/utility/workspace.js

@@ -14,11 +14,7 @@ const workspace_models_1 = require("./workspace-models");
 function createHost(tree) {
     return {
         async readFile(path) {
-            const data = tree.read(path);
-            if (!data) {
-                throw new Error('File not found.');
-            }
-            return core_1.virtualFs.fileBufferToString(data);
+            return tree.readText(path);
         },
         async writeFile(path, data) {
             return tree.overwrite(path, data);

package/web-worker/index.js

@@ -46,7 +46,7 @@ function addSnippet(options) {
       }
     `;
         // Append the worker creation snippet.
-        const originalContent = host.read(siblingModulePath);
+        const originalContent = host.readText(siblingModulePath);
         host.overwrite(siblingModulePath, originalContent + '\n' + workerCreationSnippet);
         return host;
     };
@@ -72,7 +72,7 @@ function default_1(options) {
         options.name = parsedPath.name;
         options.path = parsedPath.path;
         const templateSourceWorkerCode = (0, schematics_1.apply)((0, schematics_1.url)('./files/worker'), [
-            (0, schematics_1.applyTemplates)({ ...options, ...core_1.strings }),
+            (0, schematics_1.applyTemplates)({ ...options, ...schematics_1.strings }),
             (0, schematics_1.move)(parsedPath.path),
         ]);
         const root = project.root || '';

package/workspace/index.js

@@ -7,14 +7,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const latest_versions_1 = require("../utility/latest-versions");
 function default_1(options) {
     return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files'), [
         options.minimal ? (0, schematics_1.filter)((path) => !path.endsWith('editorconfig.template')) : (0, schematics_1.noop)(),
         (0, schematics_1.applyTemplates)({
-            utils: core_1.strings,
+            utils: schematics_1.strings,
             ...options,
             'dot': '.',
             latestVersions: latest_versions_1.latestVersions,