@schematics/angular 14.2.0 → 15.0.0-next.0

package/app-shell/schema.d.ts

@@ -2,10 +2,6 @@
  * Generates an application shell for running a server-side version of an app.
  */
 export interface Schema {
-    /**
-     * The name of the application directory.
-     */
-    appDir?: string;
     /**
      * The application ID to use in withServerTransition().
      */

package/app-shell/schema.json

@@ -29,11 +29,6 @@
       "description": "The name of the main entry-point file.",
       "default": "main.server.ts"
     },
-    "appDir": {
-      "type": "string",
-      "description": "The name of the application directory.",
-      "default": "app"
-    },
     "rootModuleFileName": {
       "type": "string",
       "description": "The name of the root module file",

package/class/schema.d.ts

@@ -13,7 +13,7 @@ export interface Schema {
     /**
      * The name of the project.
      */
-    project?: string;
+    project: string;
     /**
      * Do not create "spec.ts" test files for the new class.
      */

package/class/schema.json

@@ -42,5 +42,5 @@
       "description": "Adds a developer-defined type to the filename, in the format \"name.type.ts\"."
     }
   },
-  "required": ["name"]
+  "required": ["name", "project"]
 }

package/component/index.js

@@ -6,81 +6,14 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
-const change_1 = require("../utility/change");
+const add_declaration_to_ng_module_1 = require("../utility/add-declaration-to-ng-module");
 const find_module_1 = require("../utility/find-module");
 const parse_name_1 = require("../utility/parse-name");
 const validation_1 = require("../utility/validation");
 const workspace_1 = require("../utility/workspace");
 const schema_1 = require("./schema");
-function readIntoSourceFile(host, modulePath) {
-    const sourceText = host.readText(modulePath);
-    return ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
-}
-function addDeclarationToNgModule(options) {
-    return (host) => {
-        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 ? '' : schematics_1.strings.dasherize(options.name) + '/') +
-            schematics_1.strings.dasherize(options.name) +
-            (options.type ? '.' : '') +
-            schematics_1.strings.dasherize(options.type);
-        const relativePath = (0, find_module_1.buildRelativePath)(modulePath, componentPath);
-        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) {
-            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 source = readIntoSourceFile(host, modulePath);
-            const exportRecorder = host.beginUpdate(modulePath);
-            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);
-                }
-            }
-            host.commitUpdate(exportRecorder);
-        }
-        return host;
-    };
-}
 function buildSelector(options, projectPrefix) {
     let selector = schematics_1.strings.dasherize(options.name);
     if (options.prefix) {
@@ -130,7 +63,13 @@ function default_1(options) {
                 : (0, schematics_1.noop)(),
             (0, schematics_1.move)(parsedPath.path),
         ]);
-        return (0, schematics_1.chain)([addDeclarationToNgModule(options), (0, schematics_1.mergeWith)(templateSource)]);
+        return (0, schematics_1.chain)([
+            (0, add_declaration_to_ng_module_1.addDeclarationToNgModule)({
+                type: 'component',
+                ...options,
+            }),
+            (0, schematics_1.mergeWith)(templateSource),
+        ]);
     };
 }
 exports.default = default_1;

package/component/schema.d.ts

@@ -48,7 +48,7 @@ export interface Schema {
     /**
      * The name of the project.
      */
-    project?: string;
+    project: string;
     /**
      * The HTML selector to use for this component.
      */

package/component/schema.json

@@ -136,5 +136,5 @@
       "x-user-analytics": 19
     }
   },
-  "required": ["name"]
+  "required": ["name", "project"]
 }

package/directive/index.js

@@ -6,76 +6,13 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
-const change_1 = require("../utility/change");
+const add_declaration_to_ng_module_1 = require("../utility/add-declaration-to-ng-module");
 const find_module_1 = require("../utility/find-module");
 const parse_name_1 = require("../utility/parse-name");
 const validation_1 = require("../utility/validation");
 const workspace_1 = require("../utility/workspace");
-function addDeclarationToNgModule(options) {
-    return (host) => {
-        if (options.skipImport || options.standalone || !options.module) {
-            return host;
-        }
-        const modulePath = options.module;
-        const sourceText = host.readText(modulePath);
-        const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
-        const directivePath = `/${options.path}/` +
-            (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 = 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) {
-            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 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, 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);
-                }
-            }
-            host.commitUpdate(exportRecorder);
-        }
-        return host;
-    };
-}
 function buildSelector(options, projectPrefix) {
     let selector = options.name;
     if (options.prefix) {
@@ -111,7 +48,13 @@ function default_1(options) {
             }),
             (0, schematics_1.move)(parsedPath.path),
         ]);
-        return (0, schematics_1.chain)([addDeclarationToNgModule(options), (0, schematics_1.mergeWith)(templateSource)]);
+        return (0, schematics_1.chain)([
+            (0, add_declaration_to_ng_module_1.addDeclarationToNgModule)({
+                type: 'directive',
+                ...options,
+            }),
+            (0, schematics_1.mergeWith)(templateSource),
+        ]);
     };
 }
 exports.default = default_1;

package/directive/schema.d.ts

@@ -30,7 +30,7 @@ export interface Schema {
     /**
      * The name of the project.
      */
-    project?: string;
+    project: string;
     /**
      * The HTML selector to use for this directive.
      */

package/directive/schema.json

@@ -85,5 +85,5 @@
       "x-user-analytics": 19
     }
   },
-  "required": ["name"]
+  "required": ["name", "project"]
 }

package/enum/schema.d.ts

@@ -14,7 +14,7 @@ export interface Schema {
      * The name of the project in which to create the enum. Default is the configured default
      * project for the workspace.
      */
-    project?: string;
+    project: string;
     /**
      * Adds a developer-defined type to the filename, in the format "name.type.ts".
      */

package/enum/schema.json

@@ -36,5 +36,5 @@
       "description": "Adds a developer-defined type to the filename, in the format \"name.type.ts\"."
     }
   },
-  "required": ["name"]
+  "required": ["name", "project"]
 }

package/guard/schema.d.ts

@@ -22,7 +22,7 @@ export interface Schema {
     /**
      * The name of the project.
      */
-    project?: string;
+    project: string;
     /**
      * Do not create "spec.ts" test files for the new guard.
      */

package/guard/schema.json

@@ -55,5 +55,5 @@
       "x-prompt": "Which interfaces would you like to implement?"
     }
   },
-  "required": ["name"]
+  "required": ["name", "project"]
 }

package/interceptor/schema.d.ts

@@ -17,7 +17,7 @@ export interface Schema {
     /**
      * The name of the project.
      */
-    project?: string;
+    project: string;
     /**
      * Do not create "spec.ts" test files for the new interceptor.
      */

package/interceptor/schema.json

@@ -43,5 +43,5 @@
       "x-user-analytics": 12
     }
   },
-  "required": ["name"]
+  "required": ["name", "project"]
 }

package/interface/schema.d.ts

@@ -17,7 +17,7 @@ export interface Schema {
     /**
      * The name of the project.
      */
-    project?: string;
+    project: string;
     /**
      * Adds a developer-defined type to the filename, in the format "name.type.ts".
      */

package/interface/schema.json

@@ -44,5 +44,5 @@
       }
     }
   },
-  "required": ["name"]
+  "required": ["name", "project"]
 }

package/module/index.js

@@ -47,7 +47,7 @@ function buildRelativeModulePath(options, modulePath) {
         '.module');
     return (0, find_module_1.buildRelativePath)(modulePath, importModulePath);
 }
-function addDeclarationToNgModule(options) {
+function addImportToNgModule(options) {
     return (host) => {
         if (!options.module) {
             return host;
@@ -144,7 +144,7 @@ function default_1(options) {
             project: options.project,
         };
         return (0, schematics_1.chain)([
-            !isLazyLoadedModuleGen ? addDeclarationToNgModule(options) : (0, schematics_1.noop)(),
+            !isLazyLoadedModuleGen ? addImportToNgModule(options) : (0, schematics_1.noop)(),
             addRouteDeclarationToNgModule(options, routingModulePath),
             (0, schematics_1.mergeWith)(templateSource),
             isLazyLoadedModuleGen ? (0, schematics_1.schematic)('component', componentOptions) : (0, schematics_1.noop)(),

package/module/schema.d.ts

@@ -25,7 +25,7 @@ export interface Schema {
     /**
      * The name of the project.
      */
-    project?: string;
+    project: string;
     /**
      * The route path for a lazy-loaded module. When supplied, creates a component in the new
      * module, and adds the route to that component in the `Routes` array declared in the module

package/module/schema.json

@@ -64,5 +64,5 @@
       "alias": "m"
     }
   },
-  "required": ["name"]
+  "required": ["name", "project"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "14.2.0",
+  "version": "15.0.0-next.0",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -23,9 +23,9 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "14.2.0",
-    "@angular-devkit/schematics": "14.2.0",
-    "jsonc-parser": "3.1.0"
+    "@angular-devkit/core": "15.0.0-next.0",
+    "@angular-devkit/schematics": "15.0.0-next.0",
+    "jsonc-parser": "3.2.0"
   },
   "repository": {
     "type": "git",

package/pipe/index.js

@@ -6,74 +6,13 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
-const change_1 = require("../utility/change");
+const add_declaration_to_ng_module_1 = require("../utility/add-declaration-to-ng-module");
 const find_module_1 = require("../utility/find-module");
 const parse_name_1 = require("../utility/parse-name");
 const validation_1 = require("../utility/validation");
 const workspace_1 = require("../utility/workspace");
-function addDeclarationToNgModule(options) {
-    return (host) => {
-        if (options.skipImport || options.standalone || !options.module) {
-            return host;
-        }
-        const modulePath = options.module;
-        const sourceText = host.readText(modulePath);
-        const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
-        const pipePath = `/${options.path}/` +
-            (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, schematics_1.strings.classify(`${options.name}Pipe`), relativePath);
-        const recorder = host.beginUpdate(modulePath);
-        for (const change of changes) {
-            if (change instanceof change_1.InsertChange) {
-                recorder.insertLeft(change.pos, change.toAdd);
-            }
-        }
-        host.commitUpdate(recorder);
-        if (options.export) {
-            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, 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);
-                }
-            }
-            host.commitUpdate(exportRecorder);
-        }
-        return host;
-    };
-}
 function default_1(options) {
     return async (host) => {
         var _a;
@@ -92,7 +31,13 @@ function default_1(options) {
             }),
             (0, schematics_1.move)(parsedPath.path),
         ]);
-        return (0, schematics_1.chain)([addDeclarationToNgModule(options), (0, schematics_1.mergeWith)(templateSource)]);
+        return (0, schematics_1.chain)([
+            (0, add_declaration_to_ng_module_1.addDeclarationToNgModule)({
+                type: 'pipe',
+                ...options,
+            }),
+            (0, schematics_1.mergeWith)(templateSource),
+        ]);
     };
 }
 exports.default = default_1;

package/pipe/schema.d.ts

@@ -25,7 +25,7 @@ export interface Schema {
     /**
      * The name of the project.
      */
-    project?: string;
+    project: string;
     /**
      * Do not import this pipe into the owning NgModule.
      */

package/pipe/schema.json

@@ -66,5 +66,5 @@
       "x-user-analytics": 19
     }
   },
-  "required": ["name"]
+  "required": ["name", "project"]
 }

package/resolver/schema.d.ts

@@ -18,7 +18,7 @@ export interface Schema {
     /**
      * The name of the project.
      */
-    project?: string;
+    project: string;
     /**
      * Do not create "spec.ts" test files for the new resolver.
      */

package/resolver/schema.json

@@ -43,5 +43,5 @@
       }
     }
   },
-  "required": ["name"]
+  "required": ["name", "project"]
 }

package/service/schema.d.ts

@@ -17,7 +17,7 @@ export interface Schema {
     /**
      * The name of the project.
      */
-    project?: string;
+    project: string;
     /**
      * Do not create "spec.ts" test files for the new service.
      */

package/service/schema.json

@@ -42,5 +42,5 @@
       "x-user-analytics": 12
     }
   },
-  "required": ["name"]
+  "required": ["name", "project"]
 }

package/third_party/github.com/Microsoft/TypeScript/BUILD.bazel

@@ -1,11 +1,11 @@
 load("//tools:defaults.bzl", "ts_library")
 
-# files fetched on 2022-08-18 from
-# https://github.com/microsoft/TypeScript/releases/tag/v4.8-rc
+# files fetched on 2022-09-01 from
+# https://github.com/microsoft/TypeScript/releases/tag/v4.8.2
 
 # Commands to download:
-# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.8-rc/lib/typescript.d.ts -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
-# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.8-rc/lib/typescript.js -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
+# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.8.2/lib/typescript.d.ts -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
+# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.8.2/lib/typescript.js -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
 
 licenses(["notice"])  # Apache 2.0