@angular-devkit/schematics 14.0.0-next.6 → 14.0.0-next.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/schematics",
-  "version": "14.0.0-next.6",
+  "version": "14.0.0-next.9",
   "description": "Angular Schematics - Library",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
@@ -18,7 +18,7 @@
     "schematics"
   ],
   "dependencies": {
-    "@angular-devkit/core": "14.0.0-next.6",
+    "@angular-devkit/core": "14.0.0-next.9",
     "jsonc-parser": "3.0.0",
     "magic-string": "0.26.1",
     "ora": "5.4.1",

package/src/engine/engine.d.ts

@@ -44,7 +44,7 @@ export declare class CollectionImpl<CollectionT extends object, SchematicT exten
     get description(): CollectionDescription<CollectionT>;
     get name(): string;
     createSchematic(name: string, allowPrivate?: boolean): Schematic<CollectionT, SchematicT>;
-    listSchematicNames(): string[];
+    listSchematicNames(includeHidden?: boolean): string[];
 }
 export declare class TaskScheduler {
     private _context;
@@ -70,7 +70,7 @@ export declare class SchematicEngine<CollectionT extends object, SchematicT exte
     private _createCollectionDescription;
     createContext(schematic: Schematic<CollectionT, SchematicT>, parent?: Partial<TypedSchematicContext<CollectionT, SchematicT>>, executionOptions?: Partial<ExecutionOptions>): TypedSchematicContext<CollectionT, SchematicT>;
     createSchematic(name: string, collection: Collection<CollectionT, SchematicT>, allowPrivate?: boolean): Schematic<CollectionT, SchematicT>;
-    listSchematicNames(collection: Collection<CollectionT, SchematicT>): string[];
+    listSchematicNames(collection: Collection<CollectionT, SchematicT>, includeHidden?: boolean): string[];
     transformOptions<OptionT extends object, ResultT extends object>(schematic: Schematic<CollectionT, SchematicT>, options: OptionT, context?: TypedSchematicContext<CollectionT, SchematicT>): Observable<ResultT>;
     createSourceFromUrl(url: Url, context: TypedSchematicContext<CollectionT, SchematicT>): Source;
     executePostTasks(): Observable<void>;

package/src/engine/engine.js

@@ -79,8 +79,8 @@ class CollectionImpl {
     createSchematic(name, allowPrivate = false) {
         return this._engine.createSchematic(name, this, allowPrivate);
     }
-    listSchematicNames() {
-        return this._engine.listSchematicNames(this);
+    listSchematicNames(includeHidden) {
+        return this._engine.listSchematicNames(this, includeHidden);
     }
 }
 exports.CollectionImpl = CollectionImpl;
@@ -249,11 +249,11 @@ class SchematicEngine {
         schematicMap === null || schematicMap === void 0 ? void 0 : schematicMap.set(name, schematic);
         return schematic;
     }
-    listSchematicNames(collection) {
-        const names = this._host.listSchematicNames(collection.description);
+    listSchematicNames(collection, includeHidden) {
+        const names = this._host.listSchematicNames(collection.description, includeHidden);
         if (collection.baseDescriptions) {
             for (const base of collection.baseDescriptions) {
-                names.push(...this._host.listSchematicNames(base));
+                names.push(...this._host.listSchematicNames(base, includeHidden));
             }
         }
         // remove duplicates

package/src/engine/interface.d.ts

@@ -64,7 +64,7 @@ export declare type SchematicDescription<CollectionMetadataT extends object, Sch
  */
 export interface EngineHost<CollectionMetadataT extends object, SchematicMetadataT extends object> {
     createCollectionDescription(name: string, requester?: CollectionDescription<CollectionMetadataT>): CollectionDescription<CollectionMetadataT>;
-    listSchematicNames(collection: CollectionDescription<CollectionMetadataT>): string[];
+    listSchematicNames(collection: CollectionDescription<CollectionMetadataT>, includeHidden?: boolean): string[];
     createSchematicDescription(name: string, collection: CollectionDescription<CollectionMetadataT>): SchematicDescription<CollectionMetadataT, SchematicMetadataT> | null;
     getSchematicRuleFactory<OptionT extends object>(schematic: SchematicDescription<CollectionMetadataT, SchematicMetadataT>, collection: CollectionDescription<CollectionMetadataT>): RuleFactory<OptionT>;
     createSourceFromUrl(url: Url, context: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>): Source | null;
@@ -102,7 +102,7 @@ export interface Collection<CollectionMetadataT extends object, SchematicMetadat
     readonly description: CollectionDescription<CollectionMetadataT>;
     readonly baseDescriptions?: Array<CollectionDescription<CollectionMetadataT>>;
     createSchematic(name: string, allowPrivate?: boolean): Schematic<CollectionMetadataT, SchematicMetadataT>;
-    listSchematicNames(): string[];
+    listSchematicNames(includeHidden?: boolean): string[];
 }
 /**
  * A Schematic as created by the Engine. This should be used by the tool to execute the main

package/src/rules/move.js

@@ -28,7 +28,7 @@ function move(from, to) {
         else {
             // fromPath is a directory
             tree.getDir(fromPath).visit((path) => {
-                tree.rename(path, (0, core_1.join)(toPath, path.substr(fromPath.length)));
+                tree.rename(path, (0, core_1.join)(toPath, path.slice(fromPath.length)));
             });
         }
         return tree;

package/tools/description.d.ts

@@ -14,6 +14,7 @@ export interface FileSystemCollectionDescription {
     readonly schematics: {
         [name: string]: FileSystemSchematicDesc;
     };
+    readonly encapsulation?: boolean;
 }
 export interface FileSystemSchematicJsonDescription {
     readonly aliases?: string[];

package/tools/fallback-engine-host.d.ts

@@ -30,7 +30,7 @@ export declare class FallbackEngineHost implements EngineHost<{}, {}> {
     createSourceFromUrl(url: Url, context: FallbackContext): Source | null;
     transformOptions<OptionT extends object, ResultT extends object>(schematic: SchematicDescription<FallbackCollectionDescription, FallbackSchematicDescription>, options: OptionT, context?: FallbackContext): Observable<ResultT>;
     transformContext(context: FallbackContext): FallbackContext;
-    listSchematicNames(collection: CollectionDescription<FallbackCollectionDescription>): string[];
+    listSchematicNames(collection: CollectionDescription<FallbackCollectionDescription>, includeHidden?: boolean): string[];
     createTaskExecutor(name: string): Observable<TaskExecutor>;
     hasTaskExecutor(name: string): boolean;
 }

package/tools/fallback-engine-host.js

@@ -56,11 +56,13 @@ class FallbackEngineHost {
         });
         return result;
     }
-    listSchematicNames(collection) {
+    listSchematicNames(collection, includeHidden) {
         const allNames = new Set();
         this._hosts.forEach((host) => {
             try {
-                host.listSchematicNames(collection.description).forEach((name) => allNames.add(name));
+                host
+                    .listSchematicNames(collection.description, includeHidden)
+                    .forEach((name) => allNames.add(name));
             }
             catch (_) { }
         });

package/tools/file-system-engine-host-base.d.ts

@@ -46,7 +46,7 @@ export declare class SchematicNameCollisionException extends BaseException {
  */
 export declare abstract class FileSystemEngineHostBase implements FileSystemEngineHost {
     protected abstract _resolveCollectionPath(name: string, requester?: string): string;
-    protected abstract _resolveReferenceString(name: string, parentPath: string): {
+    protected abstract _resolveReferenceString(name: string, parentPath: string, collectionDescription: FileSystemCollectionDesc): {
         ref: RuleFactory<{}>;
         path: string;
     } | null;
@@ -55,7 +55,7 @@ export declare abstract class FileSystemEngineHostBase implements FileSystemEngi
     private _transforms;
     private _contextTransforms;
     private _taskFactories;
-    listSchematicNames(collection: FileSystemCollectionDesc): string[];
+    listSchematicNames(collection: FileSystemCollectionDesc, includeHidden?: boolean): string[];
     registerOptionsTransform<T extends object, R extends object>(t: OptionTransform<T, R>): void;
     registerContextTransform(t: ContextTransform): void;
     /**

package/tools/file-system-engine-host-base.js

@@ -85,11 +85,11 @@ class FileSystemEngineHostBase {
         this._contextTransforms = [];
         this._taskFactories = new Map();
     }
-    listSchematicNames(collection) {
+    listSchematicNames(collection, includeHidden) {
         const schematics = [];
         for (const key of Object.keys(collection.schematics)) {
             const schematic = collection.schematics[key];
-            if (schematic.hidden || schematic.private) {
+            if ((schematic.hidden && !includeHidden) || schematic.private) {
                 continue;
             }
             // If extends is present without a factory it is an alias, do not return it
@@ -163,8 +163,8 @@ class FileSystemEngineHostBase {
         }
         if (partialDesc.extends) {
             const index = partialDesc.extends.indexOf(':');
-            const collectionName = index !== -1 ? partialDesc.extends.substr(0, index) : null;
-            const schematicName = index === -1 ? partialDesc.extends : partialDesc.extends.substr(index + 1);
+            const collectionName = index !== -1 ? partialDesc.extends.slice(0, index) : null;
+            const schematicName = index === -1 ? partialDesc.extends : partialDesc.extends.slice(index + 1);
             if (collectionName !== null) {
                 const extendCollection = this.createCollectionDescription(collectionName);
                 return this.createSchematicDescription(schematicName, extendCollection);
@@ -178,7 +178,7 @@ class FileSystemEngineHostBase {
         if (!partialDesc.factory) {
             throw new SchematicMissingFactoryException(name);
         }
-        const resolvedRef = this._resolveReferenceString(partialDesc.factory, collectionPath);
+        const resolvedRef = this._resolveReferenceString(partialDesc.factory, collectionPath, collection);
         if (!resolvedRef) {
             throw new FactoryCannotBeResolvedException(name);
         }

package/tools/node-module-engine-host.d.ts

@@ -20,7 +20,7 @@ export declare class NodeModulesEngineHost extends FileSystemEngineHostBase {
     constructor(paths?: string[] | undefined);
     private resolve;
     protected _resolveCollectionPath(name: string, requester?: string): string;
-    protected _resolveReferenceString(refString: string, parentPath: string): {
+    protected _resolveReferenceString(refString: string, parentPath: string, collectionDescription?: FileSystemCollectionDesc): {
         ref: RuleFactory<{}>;
         path: string;
     } | null;

package/tools/node-module-engine-host.js

@@ -81,7 +81,7 @@ class NodeModulesEngineHost extends file_system_engine_host_base_1.FileSystemEng
         (0, file_system_utility_1.readJsonFile)(collectionPath);
         return collectionPath;
     }
-    _resolveReferenceString(refString, parentPath) {
+    _resolveReferenceString(refString, parentPath, collectionDescription) {
         const ref = new export_ref_1.ExportStringRef(refString, parentPath);
         if (!ref.ref) {
             return null;