@angular-devkit/schematics 9.0.0-rc.6 → 9.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/schematics",
-  "version": "9.0.0-rc.6",
+  "version": "9.0.0",
   "description": "Angular Schematics - Library",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
@@ -18,7 +18,7 @@
     "schematics"
   ],
   "dependencies": {
-    "@angular-devkit/core": "9.0.0-rc.6",
+    "@angular-devkit/core": "9.0.0",
     "ora": "4.0.2",
     "rxjs": "6.5.3"
   },
@@ -29,7 +29,6 @@
   "engines": {
     "node": ">= 10.13.0",
     "npm": ">= 6.11.0",
-    "pnpm": ">= 3.2.0",
     "yarn": ">= 1.13.0"
   },
   "author": "Angular Authors",

package/src/engine/engine.d.ts

@@ -41,8 +41,8 @@ export declare class CollectionImpl<CollectionT extends object, SchematicT exten
     private _engine;
     readonly baseDescriptions?: CollectionDescription<CollectionT>[] | undefined;
     constructor(_description: CollectionDescription<CollectionT>, _engine: SchematicEngine<CollectionT, SchematicT>, baseDescriptions?: CollectionDescription<CollectionT>[] | undefined);
-    readonly description: CollectionDescription<CollectionT>;
-    readonly name: string;
+    get description(): CollectionDescription<CollectionT>;
+    get name(): string;
     createSchematic(name: string, allowPrivate?: boolean): Schematic<CollectionT, SchematicT>;
     listSchematicNames(): string[];
 }
@@ -64,8 +64,8 @@ export declare class SchematicEngine<CollectionT extends object, SchematicT exte
     private _schematicCache;
     private _taskSchedulers;
     constructor(_host: EngineHost<CollectionT, SchematicT>, _workflow?: Workflow | undefined);
-    readonly workflow: Workflow | null;
-    readonly defaultMergeStrategy: MergeStrategy;
+    get workflow(): Workflow | null;
+    get defaultMergeStrategy(): MergeStrategy;
     createCollection(name: string): Collection<CollectionT, SchematicT>;
     private _createCollectionDescription;
     createContext(schematic: Schematic<CollectionT, SchematicT>, parent?: Partial<TypedSchematicContext<CollectionT, SchematicT>>, executionOptions?: Partial<ExecutionOptions>): TypedSchematicContext<CollectionT, SchematicT>;

package/src/engine/schematic.d.ts

@@ -18,7 +18,7 @@ export declare class SchematicImpl<CollectionT extends object, SchematicT extend
     private _collection;
     private _engine;
     constructor(_description: SchematicDescription<CollectionT, SchematicT>, _factory: RuleFactory<{}>, _collection: Collection<CollectionT, SchematicT>, _engine: Engine<CollectionT, SchematicT>);
-    readonly description: SchematicDescription<CollectionT, SchematicT>;
-    readonly collection: Collection<CollectionT, SchematicT>;
+    get description(): SchematicDescription<CollectionT, SchematicT>;
+    get collection(): Collection<CollectionT, SchematicT>;
     call<OptionT extends object>(options: OptionT, host: Observable<Tree>, parentContext?: Partial<TypedSchematicContext<CollectionT, SchematicT>>, executionOptions?: Partial<ExecutionOptions>): Observable<Tree>;
 }

package/src/rules/template.js

@@ -8,9 +8,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * found in the LICENSE file at https://angular.io/license
  */
 const core_1 = require("@angular-devkit/core");
+const util_1 = require("util");
 const base_1 = require("./base");
 const rename_1 = require("./rename");
-const is_binary_1 = require("./utils/is-binary");
 exports.TEMPLATE_FILENAME_RE = /\.template$/;
 class OptionIsNotDefinedException extends core_1.BaseException {
     constructor(name) { super(`Option "${name}" is not defined.`); }
@@ -24,16 +24,23 @@ class InvalidPipeException extends core_1.BaseException {
     constructor(name) { super(`Pipe "${name}" is invalid.`); }
 }
 exports.InvalidPipeException = InvalidPipeException;
+const decoder = new util_1.TextDecoder('utf-8', { fatal: true });
 function applyContentTemplate(options) {
     return (entry) => {
         const { path, content } = entry;
-        if (is_binary_1.isBinary(content)) {
-            return entry;
+        try {
+            const decodedContent = decoder.decode(content);
+            return {
+                path,
+                content: Buffer.from(core_1.template(decodedContent, {})(options)),
+            };
+        }
+        catch (e) {
+            if (e.code === 'ERR_ENCODING_INVALID_ENCODED_DATA') {
+                return entry;
+            }
+            throw e;
         }
-        return {
-            path: path,
-            content: Buffer.from(core_1.template(content.toString('utf-8'), {})(options)),
-        };
     };
 }
 exports.applyContentTemplate = applyContentTemplate;

package/src/tree/action.d.ts

@@ -29,7 +29,7 @@ export declare class ActionList implements Iterable<Action> {
     has(action: Action): boolean;
     find(predicate: (value: Action) => boolean): Action | null;
     forEach(fn: (value: Action, index: number, array: Action[]) => void, thisArg?: {}): void;
-    readonly length: number;
+    get length(): number;
     [Symbol.iterator](): IterableIterator<Action>;
 }
 export declare function isContentAction(action: Action): action is CreateFileAction | OverwriteFileAction;

package/src/tree/delegate.d.ts

@@ -13,7 +13,7 @@ export declare class DelegateTree implements Tree {
     constructor(_other: Tree);
     branch(): Tree;
     merge(other: Tree, strategy?: MergeStrategy): void;
-    readonly root: DirEntry;
+    get root(): DirEntry;
     read(path: string): Buffer | null;
     exists(path: string): boolean;
     get(path: string): FileEntry | null;
@@ -26,5 +26,5 @@ export declare class DelegateTree implements Tree {
     delete(path: string): void;
     rename(from: string, to: string): void;
     apply(action: Action, strategy?: MergeStrategy): void;
-    readonly actions: Action[];
+    get actions(): Action[];
 }

package/src/tree/entry.d.ts

@@ -12,14 +12,14 @@ export declare class SimpleFileEntry implements FileEntry {
     private _path;
     private _content;
     constructor(_path: Path, _content: Buffer);
-    readonly path: Path;
-    readonly content: Buffer;
+    get path(): Path;
+    get content(): Buffer;
 }
 export declare class LazyFileEntry implements FileEntry {
     private _path;
     private _load;
     private _content;
     constructor(_path: Path, _load: (path?: Path) => Buffer);
-    readonly path: Path;
-    readonly content: Buffer;
+    get path(): Path;
+    get content(): Buffer;
 }

package/src/tree/host-tree.d.ts

@@ -15,8 +15,8 @@ export declare class HostDirEntry implements DirEntry {
     protected _host: virtualFs.SyncDelegateHost;
     protected _tree: Tree;
     constructor(parent: DirEntry | null, path: Path, _host: virtualFs.SyncDelegateHost, _tree: Tree);
-    readonly subdirs: PathFragment[];
-    readonly subfiles: PathFragment[];
+    get subdirs(): PathFragment[];
+    get subfiles(): PathFragment[];
     dir(name: PathFragment): DirEntry;
     file(name: PathFragment): FileEntry | null;
     visit(visitor: FileVisitor): void;
@@ -38,7 +38,7 @@ export declare class HostTree implements Tree {
     protected _willRename(path: Path): boolean;
     branch(): Tree;
     merge(other: Tree, strategy?: MergeStrategy): void;
-    readonly root: DirEntry;
+    get root(): DirEntry;
     read(path: string): Buffer | null;
     exists(path: string): boolean;
     get(path: string): FileEntry | null;
@@ -51,7 +51,7 @@ export declare class HostTree implements Tree {
     delete(path: string): void;
     rename(from: string, to: string): void;
     apply(action: Action, strategy?: MergeStrategy): void;
-    readonly actions: Action[];
+    get actions(): Action[];
 }
 export declare class HostCreateTree extends HostTree {
     constructor(host: virtualFs.ReadonlyHost);

package/src/tree/null.d.ts

@@ -14,7 +14,7 @@ export declare class CannotCreateFileException extends BaseException {
 }
 export declare class NullTreeDirEntry implements DirEntry {
     readonly path: Path;
-    readonly parent: DirEntry | null;
+    get parent(): DirEntry | null;
     constructor(path: Path);
     readonly subdirs: PathFragment[];
     readonly subfiles: PathFragment[];
@@ -39,5 +39,5 @@ export declare class NullTree implements Tree {
     rename(path: string, _to: string): never;
     overwrite(path: string, _content: Buffer | string): never;
     apply(_action: Action, _strategy?: MergeStrategy): void;
-    readonly actions: Action[];
+    get actions(): Action[];
 }

package/src/tree/recorder.d.ts

@@ -7,7 +7,7 @@ export declare class UpdateRecorderBase implements UpdateRecorder {
     protected _content: UpdateBuffer;
     constructor(entry: FileEntry);
     static createFromFileEntry(entry: FileEntry): UpdateRecorderBase;
-    readonly path: string;
+    get path(): string;
     insertLeft(index: number, content: Buffer | string): UpdateRecorder;
     insertRight(index: number, content: Buffer | string): UpdateRecorder;
     remove(index: number, length: number): UpdateRecorder;

package/src/tree/scoped.d.ts

@@ -13,10 +13,10 @@ declare class ScopedDirEntry implements DirEntry {
     private _base;
     readonly scope: Path;
     constructor(_base: DirEntry, scope: Path);
-    readonly parent: DirEntry | null;
-    readonly path: Path;
-    readonly subdirs: PathFragment[];
-    readonly subfiles: PathFragment[];
+    get parent(): DirEntry | null;
+    get path(): Path;
+    get subdirs(): PathFragment[];
+    get subfiles(): PathFragment[];
     dir(name: PathFragment): DirEntry;
     file(name: PathFragment): FileEntry | null;
     visit(visitor: FileVisitor): void;
@@ -25,7 +25,7 @@ export declare class ScopedTree implements Tree {
     private _base;
     readonly _root: ScopedDirEntry;
     constructor(_base: Tree, scope: string);
-    readonly root: DirEntry;
+    get root(): DirEntry;
     branch(): Tree;
     merge(other: Tree, strategy?: MergeStrategy): void;
     read(path: string): Buffer | null;
@@ -40,7 +40,7 @@ export declare class ScopedTree implements Tree {
     delete(path: string): void;
     rename(from: string, to: string): void;
     apply(action: Action, strategy?: MergeStrategy): void;
-    readonly actions: Action[];
+    get actions(): Action[];
     private _fullPath;
     private _fullPathAction;
 }

package/src/utility/linked-list.d.ts

@@ -11,8 +11,8 @@ export declare class LinkedList<T extends {
     private _head;
     constructor(_head: T);
     get(l: number): T | null;
-    readonly head: T;
-    readonly length: number;
+    get head(): T;
+    get length(): number;
     reduce<R>(accumulator: (acc: R, value: T, index?: number) => R, seed: R): R;
     find(predicate: (value: T, index?: number) => boolean): T | null;
     forEach(visitor: (value: T, index?: number) => void): void;

package/src/utility/update-buffer.d.ts

@@ -32,7 +32,7 @@ export declare class Chunk {
     private _assertRight;
     next: Chunk | null;
     constructor(start: number, end: number, originalContent: Buffer);
-    readonly length: number;
+    get length(): number;
     toString(encoding?: string): string;
     slice(start: number): Chunk;
     append(buffer: Buffer, essential: boolean): void;
@@ -63,8 +63,8 @@ export declare class UpdateBuffer {
      * string functions.
      */
     protected _getTextPosition(index: number): number;
-    readonly length: number;
-    readonly original: Buffer;
+    get length(): number;
+    get original(): Buffer;
     toString(encoding?: string): string;
     generate(): Buffer;
     insertLeft(index: number, content: Buffer, assert?: boolean): void;

package/src/workflow/base.d.ts

@@ -40,12 +40,12 @@ export declare abstract class BaseWorkflow implements Workflow {
     protected _force: boolean;
     protected _dryRun: boolean;
     constructor(options: BaseWorkflowOptions);
-    readonly context: Readonly<WorkflowExecutionContext>;
-    readonly engine: Engine<{}, {}>;
-    readonly engineHost: EngineHost<{}, {}>;
-    readonly registry: schema.SchemaRegistry;
-    readonly reporter: Observable<DryRunEvent>;
-    readonly lifeCycle: Observable<LifeCycleEvent>;
+    get context(): Readonly<WorkflowExecutionContext>;
+    get engine(): Engine<{}, {}>;
+    get engineHost(): EngineHost<{}, {}>;
+    get registry(): schema.SchemaRegistry;
+    get reporter(): Observable<DryRunEvent>;
+    get lifeCycle(): Observable<LifeCycleEvent>;
     protected _createSinks(): Sink[];
     execute(options: Partial<WorkflowExecutionContext> & RequiredWorkflowExecutionContext): Observable<void>;
 }

package/testing/schematic-test-runner.d.ts

@@ -9,7 +9,7 @@ import { logging } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
 import { DelegateTree, Rule, SchematicContext, SchematicEngine, TaskConfiguration, Tree } from '../src';
 export declare class UnitTestTree extends DelegateTree {
-    readonly files: string[];
+    get files(): string[];
     readContent(path: string): string;
 }
 export declare class SchematicTestRunner {
@@ -19,9 +19,9 @@ export declare class SchematicTestRunner {
     private _collection;
     private _logger;
     constructor(_collectionName: string, collectionPath: string);
-    readonly engine: SchematicEngine<{}, {}>;
-    readonly logger: logging.Logger;
-    readonly tasks: TaskConfiguration[];
+    get engine(): SchematicEngine<{}, {}>;
+    get logger(): logging.Logger;
+    get tasks(): TaskConfiguration[];
     registerCollection(collectionName: string, collectionPath: string): void;
     runSchematicAsync<SchematicSchemaT>(schematicName: string, opts?: SchematicSchemaT, tree?: Tree): Observable<UnitTestTree>;
     /**

package/tools/export-ref.d.ts

@@ -3,7 +3,7 @@ export declare class ExportStringRef<T> {
     private _module;
     private _path;
     constructor(ref: string, parentPath?: string, inner?: boolean);
-    readonly ref: T | undefined;
-    readonly module: string;
-    readonly path: string;
+    get ref(): T | undefined;
+    get module(): string;
+    get path(): string;
 }

package/tools/node-modules-test-engine-host.d.ts

@@ -15,7 +15,7 @@ import { NodeModulesEngineHost } from './node-module-engine-host';
 export declare class NodeModulesTestEngineHost extends NodeModulesEngineHost {
     private _collections;
     private _tasks;
-    readonly tasks: TaskConfiguration<{}>[];
+    get tasks(): TaskConfiguration<{}>[];
     clearTasks(): void;
     registerCollection(name: string, path: string): void;
     transformContext(context: FileSystemSchematicContext): FileSystemSchematicContext;

package/tools/schema-option-transform.d.ts

@@ -7,8 +7,8 @@
  */
 import { schema } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
-import { FileSystemSchematicDescription } from './description';
+import { FileSystemSchematicContext, FileSystemSchematicDescription } from './description';
 export declare class InvalidInputOptions<T = {}> extends schema.SchemaValidationException {
     constructor(options: T, errors: schema.SchemaValidatorError[]);
 }
-export declare function validateOptionsWithSchema(registry: schema.SchemaRegistry): <T extends {}>(schematic: FileSystemSchematicDescription, options: T, context?: import("../src").TypedSchematicContext<import("./description").FileSystemCollectionDescription, FileSystemSchematicDescription> | undefined) => Observable<T>;
+export declare function validateOptionsWithSchema(registry: schema.SchemaRegistry): <T extends {}>(schematic: FileSystemSchematicDescription, options: T, context?: FileSystemSchematicContext | undefined) => Observable<T>;

package/tools/workflow/node-workflow.d.ts

@@ -21,6 +21,6 @@ export declare class NodeWorkflow extends workflow.BaseWorkflow {
         registry?: schema.CoreSchemaRegistry;
         resolvePaths?: string[];
     });
-    readonly engine: FileSystemEngine;
-    readonly engineHost: NodeModulesEngineHost;
+    get engine(): FileSystemEngine;
+    get engineHost(): NodeModulesEngineHost;
 }

package/src/rules/utils/is-binary.d.ts

@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * 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
- */
-/// <reference types="node" />
-export declare function isBinary(buffer: Buffer): boolean;

package/src/rules/utils/is-binary.js

@@ -1,27 +0,0 @@
-"use strict";
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * 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
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-function isBinary(buffer) {
-    const chunkLength = 24;
-    const chunkBegin = 0;
-    const chunkEnd = Math.min(buffer.length, chunkBegin + chunkLength);
-    const contentChunkUTF8 = buffer.toString('utf-8', chunkBegin, chunkEnd);
-    // Detect encoding
-    for (let i = 0; i < contentChunkUTF8.length; ++i) {
-        const charCode = contentChunkUTF8.charCodeAt(i);
-        if (charCode === 65533 || charCode <= 8) {
-            // 8 and below are control characters (e.g. backspace, null, eof, etc.).
-            // 65533 is the unknown character.
-            return true;
-        }
-    }
-    // Return
-    return false;
-}
-exports.isBinary = isBinary;