@magic-xpa/cli 4.1000.0 → 4.1100.0-dev000.0

package/src/schematics/utils/devkit-utils/component.js

@@ -1,98 +1,97 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildComponent = void 0;
-const core_1 = require("@angular-devkit/core");
-const schematics_1 = require("@angular-devkit/schematics");
-const ts = require("typescript");
-const ast_utils_1 = require("./ast-utils");
-const change_1 = require("./change");
-const find_module_1 = require("./find-module");
-const config_1 = require("./config");
-const parse_name_1 = require("./parse-name");
-const validation_1 = require("./validation");
-function addDeclarationToNgModule(options) {
-    return (host) => {
-        if (options.skipImport || !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 source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
-        const componentPath = `/${options.path}/`
-            + (options.flat ? '' : core_1.strings.dasherize(options.name) + '/')
-            + core_1.strings.dasherize(options.name)
-            + '.component';
-        const relativePath = (0, find_module_1.buildRelativePath)(modulePath, componentPath);
-        const classifiedName = core_1.strings.classify(`${options.name}Component`);
-        const declarationChanges = (0, ast_utils_1.addDeclarationToModule)(source, modulePath, classifiedName, relativePath);
-        const declarationRecorder = host.beginUpdate(modulePath);
-        for (const change of declarationChanges) {
-            if (change instanceof change_1.InsertChange) {
-                declarationRecorder.insertLeft(change.pos, change.toAdd);
-            }
-        }
-        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 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}Component`), relativePath);
-            for (const change of exportChanges) {
-                if (change instanceof change_1.InsertChange) {
-                    exportRecorder.insertLeft(change.pos, change.toAdd);
-                }
-            }
-            host.commitUpdate(exportRecorder);
-        }
-        return host;
-    };
-}
-function buildSelector(options) {
-    let selector = core_1.strings.dasherize(options.name);
-    if (options.prefix) {
-        selector = `${options.prefix}-${selector}`;
-    }
-    return selector;
-}
-function buildComponent(options) {
-    return (host, context) => {
-        const workspace = (0, config_1.getWorkspace)(host);
-        if (!options.project) {
-            options.project = Object.keys(workspace.projects)[0];
-        }
-        const project = workspace.projects[options.project];
-        if (options.path === undefined) {
-            options.path = `/${project.root}/src/app`;
-        }
-        options.selector = options.selector || buildSelector(options);
-        options.module = (0, find_module_1.findModuleFromOptions)(host, options);
-        const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
-        options.name = parsedPath.name;
-        options.path = parsedPath.path;
-        (0, validation_1.validateName)(options.name);
-        const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
-            options.spec ? (0, schematics_1.noop)() : (0, schematics_1.filter)(path => !path.endsWith('.spec.ts')),
-            options.inlineStyle ? (0, schematics_1.filter)(path => !path.endsWith('.__styleext__')) : (0, schematics_1.noop)(),
-            options.inlineTemplate ? (0, schematics_1.filter)(path => !path.endsWith('.html')) : (0, schematics_1.noop)(),
-            (0, schematics_1.template)(Object.assign(Object.assign(Object.assign({}, core_1.strings), { 'if-flat': (s) => options.flat ? '' : s }), options)),
-            (0, schematics_1.move)(null, parsedPath.path),
-        ]);
-        return (0, schematics_1.chain)([
-            (0, schematics_1.branchAndMerge)((0, schematics_1.chain)([
-                addDeclarationToNgModule(options),
-                (0, schematics_1.mergeWith)(templateSource),
-            ])),
-        ])(host, context);
-    };
-}
-exports.buildComponent = buildComponent;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildComponent = buildComponent;
+const core_1 = require("@angular-devkit/core");
+const schematics_1 = require("@angular-devkit/schematics");
+const ts = require("typescript");
+const ast_utils_1 = require("./ast-utils");
+const change_1 = require("./change");
+const find_module_1 = require("./find-module");
+const config_1 = require("./config");
+const parse_name_1 = require("./parse-name");
+const validation_1 = require("./validation");
+function addDeclarationToNgModule(options) {
+    return (host) => {
+        if (options.skipImport || !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 source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
+        const componentPath = `/${options.path}/`
+            + (options.flat ? '' : core_1.strings.dasherize(options.name) + '/')
+            + core_1.strings.dasherize(options.name)
+            + '.component';
+        const relativePath = (0, find_module_1.buildRelativePath)(modulePath, componentPath);
+        const classifiedName = core_1.strings.classify(`${options.name}Component`);
+        const declarationChanges = (0, ast_utils_1.addDeclarationToModule)(source, modulePath, classifiedName, relativePath);
+        const declarationRecorder = host.beginUpdate(modulePath);
+        for (const change of declarationChanges) {
+            if (change instanceof change_1.InsertChange) {
+                declarationRecorder.insertLeft(change.pos, change.toAdd);
+            }
+        }
+        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 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}Component`), relativePath);
+            for (const change of exportChanges) {
+                if (change instanceof change_1.InsertChange) {
+                    exportRecorder.insertLeft(change.pos, change.toAdd);
+                }
+            }
+            host.commitUpdate(exportRecorder);
+        }
+        return host;
+    };
+}
+function buildSelector(options) {
+    let selector = core_1.strings.dasherize(options.name);
+    if (options.prefix) {
+        selector = `${options.prefix}-${selector}`;
+    }
+    return selector;
+}
+function buildComponent(options) {
+    return (host, context) => {
+        const workspace = (0, config_1.getWorkspace)(host);
+        if (!options.project) {
+            options.project = Object.keys(workspace.projects)[0];
+        }
+        const project = workspace.projects[options.project];
+        if (options.path === undefined) {
+            options.path = `/${project.root}/src/app`;
+        }
+        options.selector = options.selector || buildSelector(options);
+        options.module = (0, find_module_1.findModuleFromOptions)(host, options);
+        const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
+        options.name = parsedPath.name;
+        options.path = parsedPath.path;
+        (0, validation_1.validateName)(options.name);
+        const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
+            options.spec ? (0, schematics_1.noop)() : (0, schematics_1.filter)(path => !path.endsWith('.spec.ts')),
+            options.inlineStyle ? (0, schematics_1.filter)(path => !path.endsWith('.__styleext__')) : (0, schematics_1.noop)(),
+            options.inlineTemplate ? (0, schematics_1.filter)(path => !path.endsWith('.html')) : (0, schematics_1.noop)(),
+            (0, schematics_1.template)(Object.assign(Object.assign(Object.assign({}, core_1.strings), { 'if-flat': (s) => options.flat ? '' : s }), options)),
+            (0, schematics_1.move)(null, parsedPath.path),
+        ]);
+        return (0, schematics_1.chain)([
+            (0, schematics_1.branchAndMerge)((0, schematics_1.chain)([
+                addDeclarationToNgModule(options),
+                (0, schematics_1.mergeWith)(templateSource),
+            ])),
+        ])(host, context);
+    };
+}
 //# sourceMappingURL=component.js.map

package/src/schematics/utils/devkit-utils/component.js.map

@@ -1 +1 @@
-{"version":3,"file":"component.js","sourceRoot":"","sources":["component.ts"],"names":[],"mappings":"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","sourcesContent":["import {normalize, strings} from '@angular-devkit/core';\nimport {\n  apply,\n  branchAndMerge,\n  chain,\n  filter,\n  mergeWith,\n  move,\n  noop,\n  Rule,\n  SchematicContext,\n  SchematicsException,\n  template,\n  Tree,\n  url,\n} from '@angular-devkit/schematics';\nimport * as ts from 'typescript';\nimport {addDeclarationToModule, addExportToModule} from './ast-utils';\nimport {InsertChange} from './change';\nimport {buildRelativePath, findModuleFromOptions} from './find-module';\nimport {getWorkspace} from './config';\nimport {parseName} from './parse-name';\nimport {validateName} from './validation';\n\nfunction addDeclarationToNgModule(options: any): Rule {\n  return (host: Tree) => {\n    if (options.skipImport || !options.module) {\n      return host;\n    }\n\n    const modulePath = options.module;\n    const text = host.read(modulePath);\n    if (text === null) {\n      throw new SchematicsException(`File ${modulePath} does not exist.`);\n    }\n    const sourceText = text.toString('utf-8');\n    const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);\n\n    const componentPath = `/${options.path}/`\n                          + (options.flat ? '' : strings.dasherize(options.name) + '/')\n                          + strings.dasherize(options.name)\n                          + '.component';\n    const relativePath = buildRelativePath(modulePath, componentPath);\n    const classifiedName = strings.classify(`${options.name}Component`);\n    const declarationChanges = addDeclarationToModule(source,\n                                                      modulePath,\n                                                      classifiedName,\n                                                      relativePath);\n\n    const declarationRecorder = host.beginUpdate(modulePath);\n    for (const change of declarationChanges) {\n      if (change instanceof InsertChange) {\n        declarationRecorder.insertLeft(change.pos, change.toAdd);\n      }\n    }\n    host.commitUpdate(declarationRecorder);\n\n    if (options.export) {\n      // Need to refresh the AST because we overwrote the file in the host.\n      const text = host.read(modulePath);\n      if (text === null) {\n        throw new SchematicsException(`File ${modulePath} does not exist.`);\n      }\n      const sourceText = text.toString('utf-8');\n      const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);\n\n      const exportRecorder = host.beginUpdate(modulePath);\n      const exportChanges = addExportToModule(source, modulePath,\n                                              strings.classify(`${options.name}Component`),\n                                              relativePath);\n\n      for (const change of exportChanges) {\n        if (change instanceof InsertChange) {\n          exportRecorder.insertLeft(change.pos, change.toAdd);\n        }\n      }\n      host.commitUpdate(exportRecorder);\n    }\n\n\n    return host;\n  };\n}\n\n\nfunction buildSelector(options: any) {\n  let selector = strings.dasherize(options.name);\n  if (options.prefix) {\n    selector = `${options.prefix}-${selector}`;\n  }\n\n  return selector;\n}\n\n\nexport function buildComponent(options: any): Rule {\n  return (host: Tree, context: SchematicContext) => {\n    const workspace = getWorkspace(host);\n    if (!options.project) {\n      options.project = Object.keys(workspace.projects)[0];\n    }\n    const project = workspace.projects[options.project];\n\n    if (options.path === undefined) {\n      options.path = `/${project.root}/src/app`;\n    }\n\n    options.selector = options.selector || buildSelector(options);\n    options.module = findModuleFromOptions(host, options);\n\n    const parsedPath = parseName(options.path, options.name);\n    options.name = parsedPath.name;\n    options.path = parsedPath.path;\n\n    validateName(options.name);\n\n    const templateSource = apply(url('./files'), [\n      options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),\n      options.inlineStyle ? filter(path => !path.endsWith('.__styleext__')) : noop(),\n      options.inlineTemplate ? filter(path => !path.endsWith('.html')) : noop(),\n      template({\n        ...strings,\n        'if-flat': (s: string) => options.flat ? '' : s,\n        ...options,\n      }),\n      move(null, parsedPath.path),\n    ]);\n\n    return chain([\n      branchAndMerge(chain([\n        addDeclarationToNgModule(options),\n        mergeWith(templateSource),\n      ])),\n    ])(host, context);\n  };\n}\n"]}
+{"version":3,"file":"component.js","sourceRoot":"","sources":["component.ts"],"names":[],"mappings":"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","sourcesContent":["import {normalize, strings} from '@angular-devkit/core';\r\nimport {\r\n  apply,\r\n  branchAndMerge,\r\n  chain,\r\n  filter,\r\n  mergeWith,\r\n  move,\r\n  noop,\r\n  Rule,\r\n  SchematicContext,\r\n  SchematicsException,\r\n  template,\r\n  Tree,\r\n  url,\r\n} from '@angular-devkit/schematics';\r\nimport * as ts from 'typescript';\r\nimport {addDeclarationToModule, addExportToModule} from './ast-utils';\r\nimport {InsertChange} from './change';\r\nimport {buildRelativePath, findModuleFromOptions} from './find-module';\r\nimport {getWorkspace} from './config';\r\nimport {parseName} from './parse-name';\r\nimport {validateName} from './validation';\r\n\r\nfunction addDeclarationToNgModule(options: any): Rule {\r\n  return (host: Tree) => {\r\n    if (options.skipImport || !options.module) {\r\n      return host;\r\n    }\r\n\r\n    const modulePath = options.module;\r\n    const text = host.read(modulePath);\r\n    if (text === null) {\r\n      throw new SchematicsException(`File ${modulePath} does not exist.`);\r\n    }\r\n    const sourceText = text.toString('utf-8');\r\n    const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);\r\n\r\n    const componentPath = `/${options.path}/`\r\n                          + (options.flat ? '' : strings.dasherize(options.name) + '/')\r\n                          + strings.dasherize(options.name)\r\n                          + '.component';\r\n    const relativePath = buildRelativePath(modulePath, componentPath);\r\n    const classifiedName = strings.classify(`${options.name}Component`);\r\n    const declarationChanges = addDeclarationToModule(source,\r\n                                                      modulePath,\r\n                                                      classifiedName,\r\n                                                      relativePath);\r\n\r\n    const declarationRecorder = host.beginUpdate(modulePath);\r\n    for (const change of declarationChanges) {\r\n      if (change instanceof InsertChange) {\r\n        declarationRecorder.insertLeft(change.pos, change.toAdd);\r\n      }\r\n    }\r\n    host.commitUpdate(declarationRecorder);\r\n\r\n    if (options.export) {\r\n      // Need to refresh the AST because we overwrote the file in the host.\r\n      const text = host.read(modulePath);\r\n      if (text === null) {\r\n        throw new SchematicsException(`File ${modulePath} does not exist.`);\r\n      }\r\n      const sourceText = text.toString('utf-8');\r\n      const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);\r\n\r\n      const exportRecorder = host.beginUpdate(modulePath);\r\n      const exportChanges = addExportToModule(source, modulePath,\r\n                                              strings.classify(`${options.name}Component`),\r\n                                              relativePath);\r\n\r\n      for (const change of exportChanges) {\r\n        if (change instanceof InsertChange) {\r\n          exportRecorder.insertLeft(change.pos, change.toAdd);\r\n        }\r\n      }\r\n      host.commitUpdate(exportRecorder);\r\n    }\r\n\r\n\r\n    return host;\r\n  };\r\n}\r\n\r\n\r\nfunction buildSelector(options: any) {\r\n  let selector = strings.dasherize(options.name);\r\n  if (options.prefix) {\r\n    selector = `${options.prefix}-${selector}`;\r\n  }\r\n\r\n  return selector;\r\n}\r\n\r\n\r\nexport function buildComponent(options: any): Rule {\r\n  return (host: Tree, context: SchematicContext) => {\r\n    const workspace = getWorkspace(host);\r\n    if (!options.project) {\r\n      options.project = Object.keys(workspace.projects)[0];\r\n    }\r\n    const project = workspace.projects[options.project];\r\n\r\n    if (options.path === undefined) {\r\n      options.path = `/${project.root}/src/app`;\r\n    }\r\n\r\n    options.selector = options.selector || buildSelector(options);\r\n    options.module = findModuleFromOptions(host, options);\r\n\r\n    const parsedPath = parseName(options.path, options.name);\r\n    options.name = parsedPath.name;\r\n    options.path = parsedPath.path;\r\n\r\n    validateName(options.name);\r\n\r\n    const templateSource = apply(url('./files'), [\r\n      options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),\r\n      options.inlineStyle ? filter(path => !path.endsWith('.__styleext__')) : noop(),\r\n      options.inlineTemplate ? filter(path => !path.endsWith('.html')) : noop(),\r\n      template({\r\n        ...strings,\r\n        'if-flat': (s: string) => options.flat ? '' : s,\r\n        ...options,\r\n      }),\r\n      move(null, parsedPath.path),\r\n    ]);\r\n\r\n    return chain([\r\n      branchAndMerge(chain([\r\n        addDeclarationToNgModule(options),\r\n        mergeWith(templateSource),\r\n      ])),\r\n    ])(host, context);\r\n  };\r\n}\r\n"]}

package/src/schematics/utils/devkit-utils/component.ts

@@ -1,136 +1,136 @@
-import {normalize, strings} from '@angular-devkit/core';
-import {
-  apply,
-  branchAndMerge,
-  chain,
-  filter,
-  mergeWith,
-  move,
-  noop,
-  Rule,
-  SchematicContext,
-  SchematicsException,
-  template,
-  Tree,
-  url,
-} from '@angular-devkit/schematics';
-import * as ts from 'typescript';
-import {addDeclarationToModule, addExportToModule} from './ast-utils';
-import {InsertChange} from './change';
-import {buildRelativePath, findModuleFromOptions} from './find-module';
-import {getWorkspace} from './config';
-import {parseName} from './parse-name';
-import {validateName} from './validation';
-
-function addDeclarationToNgModule(options: any): Rule {
-  return (host: Tree) => {
-    if (options.skipImport || !options.module) {
-      return host;
-    }
-
-    const modulePath = options.module;
-    const text = host.read(modulePath);
-    if (text === null) {
-      throw new SchematicsException(`File ${modulePath} does not exist.`);
-    }
-    const sourceText = text.toString('utf-8');
-    const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
-
-    const componentPath = `/${options.path}/`
-                          + (options.flat ? '' : strings.dasherize(options.name) + '/')
-                          + strings.dasherize(options.name)
-                          + '.component';
-    const relativePath = buildRelativePath(modulePath, componentPath);
-    const classifiedName = strings.classify(`${options.name}Component`);
-    const declarationChanges = addDeclarationToModule(source,
-                                                      modulePath,
-                                                      classifiedName,
-                                                      relativePath);
-
-    const declarationRecorder = host.beginUpdate(modulePath);
-    for (const change of declarationChanges) {
-      if (change instanceof InsertChange) {
-        declarationRecorder.insertLeft(change.pos, change.toAdd);
-      }
-    }
-    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 SchematicsException(`File ${modulePath} does not exist.`);
-      }
-      const sourceText = text.toString('utf-8');
-      const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
-
-      const exportRecorder = host.beginUpdate(modulePath);
-      const exportChanges = addExportToModule(source, modulePath,
-                                              strings.classify(`${options.name}Component`),
-                                              relativePath);
-
-      for (const change of exportChanges) {
-        if (change instanceof InsertChange) {
-          exportRecorder.insertLeft(change.pos, change.toAdd);
-        }
-      }
-      host.commitUpdate(exportRecorder);
-    }
-
-
-    return host;
-  };
-}
-
-
-function buildSelector(options: any) {
-  let selector = strings.dasherize(options.name);
-  if (options.prefix) {
-    selector = `${options.prefix}-${selector}`;
-  }
-
-  return selector;
-}
-
-
-export function buildComponent(options: any): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    const workspace = getWorkspace(host);
-    if (!options.project) {
-      options.project = Object.keys(workspace.projects)[0];
-    }
-    const project = workspace.projects[options.project];
-
-    if (options.path === undefined) {
-      options.path = `/${project.root}/src/app`;
-    }
-
-    options.selector = options.selector || buildSelector(options);
-    options.module = findModuleFromOptions(host, options);
-
-    const parsedPath = parseName(options.path, options.name);
-    options.name = parsedPath.name;
-    options.path = parsedPath.path;
-
-    validateName(options.name);
-
-    const templateSource = apply(url('./files'), [
-      options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),
-      options.inlineStyle ? filter(path => !path.endsWith('.__styleext__')) : noop(),
-      options.inlineTemplate ? filter(path => !path.endsWith('.html')) : noop(),
-      template({
-        ...strings,
-        'if-flat': (s: string) => options.flat ? '' : s,
-        ...options,
-      }),
-      move(null, parsedPath.path),
-    ]);
-
-    return chain([
-      branchAndMerge(chain([
-        addDeclarationToNgModule(options),
-        mergeWith(templateSource),
-      ])),
-    ])(host, context);
-  };
-}
+import {normalize, strings} from '@angular-devkit/core';
+import {
+  apply,
+  branchAndMerge,
+  chain,
+  filter,
+  mergeWith,
+  move,
+  noop,
+  Rule,
+  SchematicContext,
+  SchematicsException,
+  template,
+  Tree,
+  url,
+} from '@angular-devkit/schematics';
+import * as ts from 'typescript';
+import {addDeclarationToModule, addExportToModule} from './ast-utils';
+import {InsertChange} from './change';
+import {buildRelativePath, findModuleFromOptions} from './find-module';
+import {getWorkspace} from './config';
+import {parseName} from './parse-name';
+import {validateName} from './validation';
+
+function addDeclarationToNgModule(options: any): Rule {
+  return (host: Tree) => {
+    if (options.skipImport || !options.module) {
+      return host;
+    }
+
+    const modulePath = options.module;
+    const text = host.read(modulePath);
+    if (text === null) {
+      throw new SchematicsException(`File ${modulePath} does not exist.`);
+    }
+    const sourceText = text.toString('utf-8');
+    const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
+
+    const componentPath = `/${options.path}/`
+                          + (options.flat ? '' : strings.dasherize(options.name) + '/')
+                          + strings.dasherize(options.name)
+                          + '.component';
+    const relativePath = buildRelativePath(modulePath, componentPath);
+    const classifiedName = strings.classify(`${options.name}Component`);
+    const declarationChanges = addDeclarationToModule(source,
+                                                      modulePath,
+                                                      classifiedName,
+                                                      relativePath);
+
+    const declarationRecorder = host.beginUpdate(modulePath);
+    for (const change of declarationChanges) {
+      if (change instanceof InsertChange) {
+        declarationRecorder.insertLeft(change.pos, change.toAdd);
+      }
+    }
+    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 SchematicsException(`File ${modulePath} does not exist.`);
+      }
+      const sourceText = text.toString('utf-8');
+      const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
+
+      const exportRecorder = host.beginUpdate(modulePath);
+      const exportChanges = addExportToModule(source, modulePath,
+                                              strings.classify(`${options.name}Component`),
+                                              relativePath);
+
+      for (const change of exportChanges) {
+        if (change instanceof InsertChange) {
+          exportRecorder.insertLeft(change.pos, change.toAdd);
+        }
+      }
+      host.commitUpdate(exportRecorder);
+    }
+
+
+    return host;
+  };
+}
+
+
+function buildSelector(options: any) {
+  let selector = strings.dasherize(options.name);
+  if (options.prefix) {
+    selector = `${options.prefix}-${selector}`;
+  }
+
+  return selector;
+}
+
+
+export function buildComponent(options: any): Rule {
+  return (host: Tree, context: SchematicContext) => {
+    const workspace = getWorkspace(host);
+    if (!options.project) {
+      options.project = Object.keys(workspace.projects)[0];
+    }
+    const project = workspace.projects[options.project];
+
+    if (options.path === undefined) {
+      options.path = `/${project.root}/src/app`;
+    }
+
+    options.selector = options.selector || buildSelector(options);
+    options.module = findModuleFromOptions(host, options);
+
+    const parsedPath = parseName(options.path, options.name);
+    options.name = parsedPath.name;
+    options.path = parsedPath.path;
+
+    validateName(options.name);
+
+    const templateSource = apply(url('./files'), [
+      options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),
+      options.inlineStyle ? filter(path => !path.endsWith('.__styleext__')) : noop(),
+      options.inlineTemplate ? filter(path => !path.endsWith('.html')) : noop(),
+      template({
+        ...strings,
+        'if-flat': (s: string) => options.flat ? '' : s,
+        ...options,
+      }),
+      move(null, parsedPath.path),
+    ]);
+
+    return chain([
+      branchAndMerge(chain([
+        addDeclarationToNgModule(options),
+        mergeWith(templateSource),
+      ])),
+    ])(host, context);
+  };
+}