jqwidgets-ng 17.1.1 → 18.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ReleaseNotes.txt +125 -5
- package/jqwidgets/globalization/globalize.culture.cs-CZ.js +87 -87
- package/jqwidgets/globalization/globalize.culture.de-DE.js +83 -83
- package/jqwidgets/globalization/globalize.culture.en-CA.js +51 -51
- package/jqwidgets/globalization/globalize.culture.en-US.js +35 -35
- package/jqwidgets/globalization/globalize.culture.fr-FR.js +81 -81
- package/jqwidgets/globalization/globalize.culture.he-IL.js +99 -99
- package/jqwidgets/globalization/globalize.culture.hr-HR.js +83 -83
- package/jqwidgets/globalization/globalize.culture.hu-HU.js +82 -82
- package/jqwidgets/globalization/globalize.culture.it-IT.js +81 -81
- package/jqwidgets/globalization/globalize.culture.ja-JP.js +102 -102
- package/jqwidgets/globalization/globalize.culture.lt.js +85 -85
- package/jqwidgets/globalization/globalize.culture.ru-RU.js +84 -84
- package/jqwidgets/globalization/globalize.culture.sa-IN.js +73 -73
- package/jqwidgets/globalization/globalize.js +1591 -1591
- package/jqwidgets/jqxgantt.api.js +381 -381
- package/jqwidgets/jqxsplitlayout.js +6 -2445
- package/jqwidgets/styles/font/jqx-icons.svg +268 -268
- package/jqwidgets/styles/gantt/font/jqx-icons.svg +332 -332
- package/jqwidgets/styles/gantt/jqx.gantt.css +18667 -18667
- package/jqwidgets/styles/jqx.base.css +34 -34
- package/jqwidgets/styles/jqx.fluent.css +3563 -3563
- package/jqwidgets/styles/jqx.fluent_old.css +1262 -1262
- package/jqwidgets/styles/theme.css +293 -293
- package/package.json +3 -3
- package/schematics/cdk/schematics/collection.json +2 -1
- package/schematics/cdk/schematics/index.d.ts +2 -1
- package/schematics/cdk/schematics/index.js +4 -4
- package/schematics/cdk/schematics/index.mjs +4 -4
- package/schematics/cdk/schematics/migration.json +4 -39
- package/schematics/cdk/schematics/ng-add/index.js +1 -1
- package/schematics/cdk/schematics/ng-add/index.mjs +1 -1
- package/schematics/cdk/schematics/ng-generate/drag-drop/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template +6 -10
- package/schematics/cdk/schematics/ng-generate/drag-drop/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template +7 -5
- package/schematics/cdk/schematics/ng-generate/drag-drop/index.js +9 -15
- package/schematics/cdk/schematics/ng-generate/drag-drop/index.mjs +9 -15
- package/schematics/cdk/schematics/ng-generate/drag-drop/schema.json +7 -0
- package/schematics/cdk/schematics/ng-update/data/attribute-selectors.js +2 -13
- package/schematics/cdk/schematics/ng-update/data/attribute-selectors.mjs +2 -13
- package/schematics/cdk/schematics/ng-update/data/class-names.js +2 -32
- package/schematics/cdk/schematics/ng-update/data/class-names.mjs +2 -32
- package/schematics/cdk/schematics/ng-update/data/constructor-checks.d.ts +1 -1
- package/schematics/cdk/schematics/ng-update/data/constructor-checks.js +2 -59
- package/schematics/cdk/schematics/ng-update/data/constructor-checks.mjs +2 -59
- package/schematics/cdk/schematics/ng-update/data/css-selectors.js +2 -5
- package/schematics/cdk/schematics/ng-update/data/css-selectors.mjs +2 -5
- package/schematics/cdk/schematics/ng-update/data/element-selectors.js +2 -5
- package/schematics/cdk/schematics/ng-update/data/element-selectors.mjs +2 -5
- package/schematics/cdk/schematics/ng-update/data/input-names.js +2 -95
- package/schematics/cdk/schematics/ng-update/data/input-names.mjs +2 -95
- package/schematics/cdk/schematics/ng-update/data/method-call-checks.js +2 -47
- package/schematics/cdk/schematics/ng-update/data/method-call-checks.mjs +2 -47
- package/schematics/cdk/schematics/ng-update/data/output-names.js +2 -19
- package/schematics/cdk/schematics/ng-update/data/output-names.mjs +2 -19
- package/schematics/cdk/schematics/ng-update/data/property-names.js +2 -127
- package/schematics/cdk/schematics/ng-update/data/property-names.mjs +2 -127
- package/schematics/cdk/schematics/ng-update/devkit-file-system.js +10 -6
- package/schematics/cdk/schematics/ng-update/devkit-file-system.mjs +10 -6
- package/schematics/cdk/schematics/ng-update/devkit-migration-rule.d.ts +2 -2
- package/schematics/cdk/schematics/ng-update/devkit-migration-rule.js +6 -14
- package/schematics/cdk/schematics/ng-update/devkit-migration-rule.mjs +6 -14
- package/schematics/cdk/schematics/ng-update/devkit-migration.d.ts +5 -5
- package/schematics/cdk/schematics/ng-update/devkit-migration.js +1 -1
- package/schematics/cdk/schematics/ng-update/devkit-migration.mjs +1 -1
- package/schematics/cdk/schematics/ng-update/find-stylesheets.js +2 -2
- package/schematics/cdk/schematics/ng-update/find-stylesheets.mjs +2 -2
- package/schematics/cdk/schematics/ng-update/html-parsing/elements.d.ts +1 -2
- package/schematics/cdk/schematics/ng-update/html-parsing/elements.js +2 -3
- package/schematics/cdk/schematics/ng-update/html-parsing/elements.mjs +2 -3
- package/schematics/cdk/schematics/ng-update/index.d.ts +2 -16
- package/schematics/cdk/schematics/ng-update/index.js +7 -43
- package/schematics/cdk/schematics/ng-update/index.mjs +7 -43
- package/schematics/cdk/schematics/ng-update/migrations/attribute-selectors.js +5 -8
- package/schematics/cdk/schematics/ng-update/migrations/attribute-selectors.mjs +5 -8
- package/schematics/cdk/schematics/ng-update/migrations/class-inheritance.js +8 -11
- package/schematics/cdk/schematics/ng-update/migrations/class-inheritance.mjs +8 -11
- package/schematics/cdk/schematics/ng-update/migrations/class-names.js +12 -15
- package/schematics/cdk/schematics/ng-update/migrations/class-names.mjs +12 -15
- package/schematics/cdk/schematics/ng-update/migrations/constructor-signature.js +7 -10
- package/schematics/cdk/schematics/ng-update/migrations/constructor-signature.mjs +7 -10
- package/schematics/cdk/schematics/ng-update/migrations/css-selectors.js +5 -8
- package/schematics/cdk/schematics/ng-update/migrations/css-selectors.mjs +5 -8
- package/schematics/cdk/schematics/ng-update/migrations/element-selectors.js +5 -8
- package/schematics/cdk/schematics/ng-update/migrations/element-selectors.mjs +5 -8
- package/schematics/cdk/schematics/ng-update/migrations/input-names.js +5 -8
- package/schematics/cdk/schematics/ng-update/migrations/input-names.mjs +5 -8
- package/schematics/cdk/schematics/ng-update/migrations/method-call-arguments.js +5 -8
- package/schematics/cdk/schematics/ng-update/migrations/method-call-arguments.mjs +5 -8
- package/schematics/cdk/schematics/ng-update/migrations/misc-template.js +4 -20
- package/schematics/cdk/schematics/ng-update/migrations/misc-template.mjs +4 -20
- package/schematics/cdk/schematics/ng-update/migrations/output-names.js +5 -8
- package/schematics/cdk/schematics/ng-update/migrations/output-names.mjs +5 -8
- package/schematics/cdk/schematics/ng-update/migrations/property-names.js +5 -8
- package/schematics/cdk/schematics/ng-update/migrations/property-names.mjs +5 -8
- package/schematics/cdk/schematics/ng-update/migrations/symbol-removal.js +6 -10
- package/schematics/cdk/schematics/ng-update/migrations/symbol-removal.mjs +6 -10
- package/schematics/cdk/schematics/ng-update/public-api.d.ts +2 -0
- package/schematics/cdk/schematics/ng-update/public-api.js +3 -1
- package/schematics/cdk/schematics/ng-update/public-api.mjs +3 -1
- package/schematics/cdk/schematics/ng-update/upgrade-data.js +4 -1
- package/schematics/cdk/schematics/ng-update/upgrade-data.mjs +4 -1
- package/schematics/cdk/schematics/tsconfig.json +1 -0
- package/schematics/cdk/schematics/update-tool/component-resource-collector.d.ts +1 -0
- package/schematics/cdk/schematics/update-tool/component-resource-collector.js +34 -15
- package/schematics/cdk/schematics/update-tool/component-resource-collector.mjs +34 -15
- package/schematics/cdk/schematics/update-tool/file-system.d.ts +3 -3
- package/schematics/cdk/schematics/update-tool/file-system.js +1 -1
- package/schematics/cdk/schematics/update-tool/file-system.mjs +1 -1
- package/schematics/cdk/schematics/update-tool/index.d.ts +6 -2
- package/schematics/cdk/schematics/update-tool/index.js +27 -11
- package/schematics/cdk/schematics/update-tool/index.mjs +27 -11
- package/schematics/cdk/schematics/update-tool/migration.d.ts +13 -7
- package/schematics/cdk/schematics/update-tool/migration.js +14 -4
- package/schematics/cdk/schematics/update-tool/migration.mjs +14 -4
- package/schematics/cdk/schematics/update-tool/public-api.d.ts +1 -0
- package/schematics/cdk/schematics/update-tool/public-api.js +2 -1
- package/schematics/cdk/schematics/update-tool/public-api.mjs +2 -1
- package/schematics/cdk/schematics/update-tool/target-version.d.ts +1 -8
- package/schematics/cdk/schematics/update-tool/target-version.js +3 -10
- package/schematics/cdk/schematics/update-tool/target-version.mjs +3 -10
- package/schematics/cdk/schematics/update-tool/utils/decorators.d.ts +1 -1
- package/schematics/cdk/schematics/update-tool/utils/diagnostics.d.ts +11 -0
- package/schematics/cdk/schematics/update-tool/utils/diagnostics.js +19 -0
- package/schematics/cdk/schematics/update-tool/utils/diagnostics.mjs +19 -0
- package/schematics/cdk/schematics/update-tool/utils/parse-tsconfig.d.ts +8 -0
- package/schematics/cdk/schematics/update-tool/utils/parse-tsconfig.js +30 -4
- package/schematics/cdk/schematics/update-tool/utils/parse-tsconfig.mjs +30 -4
- package/schematics/cdk/schematics/update-tool/utils/property-name.d.ts +1 -1
- package/schematics/cdk/schematics/update-tool/utils/virtual-host.d.ts +2 -0
- package/schematics/cdk/schematics/update-tool/utils/virtual-host.js +13 -3
- package/schematics/cdk/schematics/update-tool/utils/virtual-host.mjs +13 -3
- package/schematics/cdk/schematics/update-tool/version-changes.d.ts +3 -3
- package/schematics/cdk/schematics/utils/ast.d.ts +2 -2
- package/schematics/cdk/schematics/utils/ast.js +15 -25
- package/schematics/cdk/schematics/utils/ast.mjs +15 -25
- package/schematics/cdk/schematics/utils/build-component.js +22 -27
- package/schematics/cdk/schematics/utils/build-component.mjs +22 -27
- package/schematics/cdk/schematics/utils/get-project.d.ts +2 -2
- package/schematics/cdk/schematics/utils/get-project.js +7 -2
- package/schematics/cdk/schematics/utils/get-project.mjs +7 -2
- package/schematics/cdk/schematics/utils/html-manipulation.d.ts +1 -1
- package/schematics/cdk/schematics/utils/html-manipulation.js +2 -2
- package/schematics/cdk/schematics/utils/html-manipulation.mjs +2 -2
- package/schematics/cdk/schematics/utils/index.d.ts +1 -0
- package/schematics/cdk/schematics/utils/index.js +2 -1
- package/schematics/cdk/schematics/utils/index.mjs +2 -1
- package/schematics/cdk/schematics/utils/parse5-element.d.ts +3 -1
- package/schematics/cdk/schematics/utils/parse5-element.js +1 -1
- package/schematics/cdk/schematics/utils/parse5-element.mjs +1 -1
- package/schematics/cdk/schematics/utils/project-index-file.d.ts +2 -3
- package/schematics/cdk/schematics/utils/project-index-file.js +4 -4
- package/schematics/cdk/schematics/utils/project-index-file.mjs +4 -4
- package/schematics/cdk/schematics/utils/project-main-file.d.ts +2 -3
- package/schematics/cdk/schematics/utils/project-main-file.js +6 -3
- package/schematics/cdk/schematics/utils/project-main-file.mjs +6 -3
- package/schematics/cdk/schematics/utils/project-style-file.d.ts +2 -2
- package/schematics/cdk/schematics/utils/project-style-file.js +4 -3
- package/schematics/cdk/schematics/utils/project-style-file.mjs +4 -3
- package/schematics/cdk/schematics/utils/project-targets.d.ts +6 -10
- package/schematics/cdk/schematics/utils/project-targets.js +18 -13
- package/schematics/cdk/schematics/utils/project-targets.mjs +18 -13
- package/schematics/cdk/schematics/utils/project-tsconfig-paths.d.ts +3 -3
- package/schematics/cdk/schematics/utils/project-tsconfig-paths.js +14 -29
- package/schematics/cdk/schematics/utils/project-tsconfig-paths.mjs +14 -29
- package/schematics/cdk/schematics/utils/schematic-options.d.ts +5 -2
- package/schematics/cdk/schematics/utils/schematic-options.js +25 -5
- package/schematics/cdk/schematics/utils/schematic-options.mjs +25 -5
- package/schematics/fonts/material-fonts.js +8 -19
- package/schematics/fonts/material-fonts.mjs +35 -0
- package/schematics/ng-add/schema.json +1 -0
- package/schematics/theming/create-custom-theme.d.ts +9 -2
- package/schematics/theming/create-custom-theme.js +51 -11
- package/schematics/theming/create-custom-theme.mjs +51 -0
- package/schematics/theming/theming.d.ts +13 -6
- package/schematics/theming/theming.js +167 -179
- package/schematics/theming/theming.mjs +152 -0
- package/schematics/theming/theming2.js +179 -0
- package/schematics/cdk/schematics/ng-update/migrations/tilde-import-v13/tilde-import-migration.d.ts +0 -14
- package/schematics/cdk/schematics/ng-update/migrations/tilde-import-v13/tilde-import-migration.js +0 -39
- package/schematics/cdk/schematics/ng-update/migrations/tilde-import-v13/tilde-import-migration.mjs +0 -39
- package/schematics/cdk/schematics/utils/vendored-ast-utils/index.d.ts +0 -70
- package/schematics/cdk/schematics/utils/vendored-ast-utils/index.js +0 -480
- package/schematics/cdk/schematics/utils/vendored-ast-utils/index.mjs +0 -480
|
@@ -7,16 +7,17 @@
|
|
|
7
7
|
* found in the LICENSE file at https://angular.io/license
|
|
8
8
|
*/
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
-
exports.createFileSystemCompilerHost = exports.FileSystemHost = void 0;
|
|
10
|
+
exports.createFormatDiagnosticHost = exports.createFileSystemCompilerHost = exports.FileSystemHost = void 0;
|
|
11
11
|
const ts = require("typescript");
|
|
12
12
|
/**
|
|
13
13
|
* Implementation of a TypeScript parse config host that relies fully on
|
|
14
14
|
* a given virtual file system.
|
|
15
15
|
*/
|
|
16
16
|
class FileSystemHost {
|
|
17
|
+
_fileSystem;
|
|
18
|
+
useCaseSensitiveFileNames = ts.sys.useCaseSensitiveFileNames;
|
|
17
19
|
constructor(_fileSystem) {
|
|
18
20
|
this._fileSystem = _fileSystem;
|
|
19
|
-
this.useCaseSensitiveFileNames = ts.sys.useCaseSensitiveFileNames;
|
|
20
21
|
}
|
|
21
22
|
fileExists(path) {
|
|
22
23
|
return this._fileSystem.fileExists(this._fileSystem.resolve(path));
|
|
@@ -59,4 +60,13 @@ function createFileSystemCompilerHost(options, fileSystem) {
|
|
|
59
60
|
return host;
|
|
60
61
|
}
|
|
61
62
|
exports.createFileSystemCompilerHost = createFileSystemCompilerHost;
|
|
62
|
-
|
|
63
|
+
/** Creates a format diagnostic host that works with the given file system. */
|
|
64
|
+
function createFormatDiagnosticHost(fileSystem) {
|
|
65
|
+
return {
|
|
66
|
+
getCanonicalFileName: p => fileSystem.resolve(p),
|
|
67
|
+
getCurrentDirectory: () => '/',
|
|
68
|
+
getNewLine: () => '\n',
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
exports.createFormatDiagnosticHost = createFormatDiagnosticHost;
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"virtual-host.js","sourceRoot":"","sources":["../../../../../../../../src/cdk/schematics/update-tool/utils/virtual-host.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport * as ts from 'typescript';\nimport {FileSystem} from '../file-system';\n\n// We use TypeScript's native `ts.matchFiles` utility for the virtual file system\n// hosts, as that function implements complex logic for matching files with respect\n// to root directory, extensions, excludes, includes etc. The function is currently\n// internal but we can use it as the API most likely will not change any time soon,\n// nor does it seem like this is being made public any time soon.\n// Related issue for tracking: https://github.com/microsoft/TypeScript/issues/13793.\n// https://github.com/microsoft/TypeScript/blob/b397d1fd4abd0edef85adf0afd91c030bb0b4955/src/compiler/utilities.ts#L6192\ndeclare module 'typescript' {\n  export interface FileSystemEntries {\n    readonly files: readonly string[];\n    readonly directories: readonly string[];\n  }\n\n  export const matchFiles:\n    | undefined\n    | ((\n        path: string,\n        extensions: readonly string[] | undefined,\n        excludes: readonly string[] | undefined,\n        includes: readonly string[] | undefined,\n        useCaseSensitiveFileNames: boolean,\n        currentDirectory: string,\n        depth: number | undefined,\n        getFileSystemEntries: (path: string) => FileSystemEntries,\n        realpath: (path: string) => string,\n        directoryExists: (path: string) => boolean,\n      ) => string[]);\n}\n\n/**\n * Implementation of a TypeScript parse config host that relies fully on\n * a given virtual file system.\n */\nexport class FileSystemHost implements ts.ParseConfigHost {\n  useCaseSensitiveFileNames = ts.sys.useCaseSensitiveFileNames;\n\n  constructor(private _fileSystem: FileSystem) {}\n\n  fileExists(path: string): boolean {\n    return this._fileSystem.fileExists(this._fileSystem.resolve(path));\n  }\n\n  readFile(path: string): string | undefined {\n    const content = this._fileSystem.read(this._fileSystem.resolve(path));\n    if (content === null) {\n      return undefined;\n    }\n    // Strip BOM as otherwise TSC methods (e.g. \"getWidth\") will return an offset which\n    // which breaks the CLI UpdateRecorder. https://github.com/angular/angular/pull/30719\n    return content.replace(/^\\uFEFF/, '');\n  }\n\n  readDirectory(\n    rootDir: string,\n    extensions: string[],\n    excludes: string[] | undefined,\n    includes: string[],\n    depth?: number,\n  ): string[] {\n    if (ts.matchFiles === undefined) {\n      throw Error(\n        'Unable to read directory in virtual file system host. This means that ' +\n          'TypeScript changed its file matching internals.\\n\\nPlease consider downgrading your ' +\n          'TypeScript version, and report an issue in the Angular Components repository.',\n      );\n    }\n    return ts.matchFiles(\n      rootDir,\n      extensions,\n      extensions,\n      includes,\n      this.useCaseSensitiveFileNames,\n      '/',\n      depth,\n      p => this._getFileSystemEntries(p),\n      p => this._fileSystem.resolve(p),\n      p => this._fileSystem.directoryExists(this._fileSystem.resolve(p)),\n    );\n  }\n\n  private _getFileSystemEntries(path: string): ts.FileSystemEntries {\n    return this._fileSystem.readDirectory(this._fileSystem.resolve(path));\n  }\n}\n\n/**\n * Creates a TypeScript compiler host that fully relies fully on the given\n * virtual file system. i.e. no interactions with the working directory.\n */\nexport function createFileSystemCompilerHost(\n  options: ts.CompilerOptions,\n  fileSystem: FileSystem,\n): ts.CompilerHost {\n  const host = ts.createCompilerHost(options, true);\n  const virtualHost = new FileSystemHost(fileSystem);\n\n  host.readFile = virtualHost.readFile.bind(virtualHost);\n  host.readDirectory = virtualHost.readDirectory.bind(virtualHost);\n  host.fileExists = virtualHost.fileExists.bind(virtualHost);\n  host.directoryExists = dirPath => fileSystem.directoryExists(fileSystem.resolve(dirPath));\n  host.getCurrentDirectory = () => '/';\n  host.getCanonicalFileName = p => fileSystem.resolve(p);\n\n  return host;\n}\n\n/** Creates a format diagnostic host that works with the given file system. */\nexport function createFormatDiagnosticHost(fileSystem: FileSystem): ts.FormatDiagnosticsHost {\n  return {\n    getCanonicalFileName: p => fileSystem.resolve(p),\n    getCurrentDirectory: () => '/',\n    getNewLine: () => '\\n',\n  };\n}\n"]}
|
|
@@ -6,15 +6,15 @@
|
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
8
|
import { TargetVersion } from './target-version';
|
|
9
|
-
export
|
|
9
|
+
export type VersionChanges<T> = {
|
|
10
10
|
[target in TargetVersion]?: ReadableChange<T>[];
|
|
11
11
|
};
|
|
12
|
-
export
|
|
12
|
+
export type ReadableChange<T> = {
|
|
13
13
|
pr: string;
|
|
14
14
|
changes: T[];
|
|
15
15
|
};
|
|
16
16
|
/** Conditional type that unwraps the value of a version changes type. */
|
|
17
|
-
export
|
|
17
|
+
export type ValueOfChanges<T> = T extends VersionChanges<infer X> ? X : null;
|
|
18
18
|
/**
|
|
19
19
|
* Gets the changes for a given target version from the specified version changes object.
|
|
20
20
|
*
|
|
@@ -7,12 +7,12 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import { Tree } from '@angular-devkit/schematics';
|
|
9
9
|
import { Schema as ComponentOptions } from '@schematics/angular/component/schema';
|
|
10
|
-
import {
|
|
10
|
+
import { workspaces } from '@angular-devkit/core';
|
|
11
11
|
import * as ts from 'typescript';
|
|
12
12
|
/** Reads file given path and returns TypeScript source file. */
|
|
13
13
|
export declare function parseSourceFile(host: Tree, path: string): ts.SourceFile;
|
|
14
14
|
/** Import and add module to root app module. */
|
|
15
|
-
export declare function addModuleImportToRootModule(host: Tree, moduleName: string, src: string, project: ProjectDefinition): void;
|
|
15
|
+
export declare function addModuleImportToRootModule(host: Tree, moduleName: string, src: string, project: workspaces.ProjectDefinition): void;
|
|
16
16
|
/**
|
|
17
17
|
* Import and add module to specific module path.
|
|
18
18
|
* @param host the tree we are updating
|
|
@@ -6,24 +6,16 @@
|
|
|
6
6
|
* Use of this source code is governed by an MIT-style license that can be
|
|
7
7
|
* found in the LICENSE file at https://angular.io/license
|
|
8
8
|
*/
|
|
9
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
10
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
11
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
12
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
13
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
14
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
15
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
16
|
-
});
|
|
17
|
-
};
|
|
18
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
10
|
exports.findModuleFromOptions = exports.addModuleImportToModule = exports.addModuleImportToRootModule = exports.parseSourceFile = void 0;
|
|
20
11
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
21
12
|
const change_1 = require("@schematics/angular/utility/change");
|
|
22
13
|
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
23
14
|
const find_module_1 = require("@schematics/angular/utility/find-module");
|
|
15
|
+
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
16
|
+
const ng_ast_utils_1 = require("@schematics/angular/utility/ng-ast-utils");
|
|
24
17
|
const ts = require("typescript");
|
|
25
18
|
const project_main_file_1 = require("./project-main-file");
|
|
26
|
-
const vendored_ast_utils_1 = require("./vendored-ast-utils");
|
|
27
19
|
/** Reads file given path and returns TypeScript source file. */
|
|
28
20
|
function parseSourceFile(host, path) {
|
|
29
21
|
const buffer = host.read(path);
|
|
@@ -35,7 +27,7 @@ function parseSourceFile(host, path) {
|
|
|
35
27
|
exports.parseSourceFile = parseSourceFile;
|
|
36
28
|
/** Import and add module to root app module. */
|
|
37
29
|
function addModuleImportToRootModule(host, moduleName, src, project) {
|
|
38
|
-
const modulePath = (0,
|
|
30
|
+
const modulePath = (0, ng_ast_utils_1.getAppModulePath)(host, (0, project_main_file_1.getProjectMainFile)(project));
|
|
39
31
|
addModuleImportToModule(host, modulePath, moduleName, src);
|
|
40
32
|
}
|
|
41
33
|
exports.addModuleImportToRootModule = addModuleImportToRootModule;
|
|
@@ -51,7 +43,7 @@ function addModuleImportToModule(host, modulePath, moduleName, src) {
|
|
|
51
43
|
if (!moduleSource) {
|
|
52
44
|
throw new schematics_1.SchematicsException(`Module not found: ${modulePath}`);
|
|
53
45
|
}
|
|
54
|
-
const changes = (0,
|
|
46
|
+
const changes = (0, ast_utils_1.addImportToModule)(moduleSource, modulePath, moduleName, src);
|
|
55
47
|
const recorder = host.beginUpdate(modulePath);
|
|
56
48
|
changes.forEach(change => {
|
|
57
49
|
if (change instanceof change_1.InsertChange) {
|
|
@@ -62,18 +54,16 @@ function addModuleImportToModule(host, modulePath, moduleName, src) {
|
|
|
62
54
|
}
|
|
63
55
|
exports.addModuleImportToModule = addModuleImportToModule;
|
|
64
56
|
/** Wraps the internal find module from options with undefined path handling */
|
|
65
|
-
function findModuleFromOptions(host, options) {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
return (0, find_module_1.findModuleFromOptions)(host, options);
|
|
76
|
-
});
|
|
57
|
+
async function findModuleFromOptions(host, options) {
|
|
58
|
+
const workspace = await (0, workspace_1.getWorkspace)(host);
|
|
59
|
+
if (!options.project) {
|
|
60
|
+
options.project = Array.from(workspace.projects.keys())[0];
|
|
61
|
+
}
|
|
62
|
+
const project = workspace.projects.get(options.project);
|
|
63
|
+
if (options.path === undefined) {
|
|
64
|
+
options.path = `/${project.root}/src/app`;
|
|
65
|
+
}
|
|
66
|
+
return (0, find_module_1.findModuleFromOptions)(host, options);
|
|
77
67
|
}
|
|
78
68
|
exports.findModuleFromOptions = findModuleFromOptions;
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3JjL2Nkay9zY2hlbWF0aWNzL3V0aWxzL2FzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyREFBcUU7QUFFckUsK0RBQWdFO0FBQ2hFLHFFQUFtRTtBQUNuRSx5RUFBb0c7QUFDcEcscUVBQXdFO0FBQ3hFLDJFQUEwRTtBQUUxRSxpQ0FBaUM7QUFDakMsMkRBQXVEO0FBRXZELGdFQUFnRTtBQUNoRSxTQUFnQixlQUFlLENBQUMsSUFBVSxFQUFFLElBQVk7SUFDdEQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMvQixJQUFJLENBQUMsTUFBTSxFQUFFO1FBQ1gsTUFBTSxJQUFJLGdDQUFtQixDQUFDLGlDQUFpQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO0tBQ3hFO0lBQ0QsT0FBTyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLENBQUMsWUFBWSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztBQUNwRixDQUFDO0FBTkQsMENBTUM7QUFFRCxnREFBZ0Q7QUFDaEQsU0FBZ0IsMkJBQTJCLENBQ3pDLElBQVUsRUFDVixVQUFrQixFQUNsQixHQUFXLEVBQ1gsT0FBcUM7SUFFckMsTUFBTSxVQUFVLEdBQUcsSUFBQSwrQkFBZ0IsRUFBQyxJQUFJLEVBQUUsSUFBQSxzQ0FBa0IsRUFBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO0lBQ3ZFLHVCQUF1QixDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0FBQzdELENBQUM7QUFSRCxrRUFRQztBQUVEOzs7Ozs7R0FNRztBQUNILFNBQWdCLHVCQUF1QixDQUNyQyxJQUFVLEVBQ1YsVUFBa0IsRUFDbEIsVUFBa0IsRUFDbEIsR0FBVztJQUVYLE1BQU0sWUFBWSxHQUFHLGVBQWUsQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFFdkQsSUFBSSxDQUFDLFlBQVksRUFBRTtRQUNqQixNQUFNLElBQUksZ0NBQW1CLENBQUMscUJBQXFCLFVBQVUsRUFBRSxDQUFDLENBQUM7S0FDbEU7SUFFRCxNQUFNLE9BQU8sR0FBRyxJQUFBLDZCQUFpQixFQUFDLFlBQVksRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQzdFLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLENBQUM7SUFFOUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFBRTtRQUN2QixJQUFJLE1BQU0sWUFBWSxxQkFBWSxFQUFFO1lBQ2xDLFFBQVEsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRSxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7U0FDL0M7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUVILElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLENBQUM7QUFDOUIsQ0FBQztBQXRCRCwwREFzQkM7QUFFRCxnRkFBZ0Y7QUFDekUsS0FBSyxVQUFVLHFCQUFxQixDQUN6QyxJQUFVLEVBQ1YsT0FBeUI7SUFFekIsTUFBTSxTQUFTLEdBQUcsTUFBTSxJQUFBLHdCQUFZLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFM0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUU7UUFDcEIsT0FBTyxDQUFDLE9BQU8sR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUM1RDtJQUVELE1BQU0sT0FBTyxHQUFHLFNBQVMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUUsQ0FBQztJQUV6RCxJQUFJLE9BQU8sQ0FBQyxJQUFJLEtBQUssU0FBUyxFQUFFO1FBQzlCLE9BQU8sQ0FBQyxJQUFJLEdBQUcsSUFBSSxPQUFPLENBQUMsSUFBSSxVQUFVLENBQUM7S0FDM0M7SUFFRCxPQUFPLElBQUEsbUNBQWtCLEVBQUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQzNDLENBQUM7QUFqQkQsc0RBaUJDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7U2NoZW1hdGljc0V4Y2VwdGlvbiwgVHJlZX0gZnJvbSAnQGFuZ3VsYXItZGV2a2l0L3NjaGVtYXRpY3MnO1xuaW1wb3J0IHtTY2hlbWEgYXMgQ29tcG9uZW50T3B0aW9uc30gZnJvbSAnQHNjaGVtYXRpY3MvYW5ndWxhci9jb21wb25lbnQvc2NoZW1hJztcbmltcG9ydCB7SW5zZXJ0Q2hhbmdlfSBmcm9tICdAc2NoZW1hdGljcy9hbmd1bGFyL3V0aWxpdHkvY2hhbmdlJztcbmltcG9ydCB7Z2V0V29ya3NwYWNlfSBmcm9tICdAc2NoZW1hdGljcy9hbmd1bGFyL3V0aWxpdHkvd29ya3NwYWNlJztcbmltcG9ydCB7ZmluZE1vZHVsZUZyb21PcHRpb25zIGFzIGludGVybmFsRmluZE1vZHVsZX0gZnJvbSAnQHNjaGVtYXRpY3MvYW5ndWxhci91dGlsaXR5L2ZpbmQtbW9kdWxlJztcbmltcG9ydCB7YWRkSW1wb3J0VG9Nb2R1bGV9IGZyb20gJ0BzY2hlbWF0aWNzL2FuZ3VsYXIvdXRpbGl0eS9hc3QtdXRpbHMnO1xuaW1wb3J0IHtnZXRBcHBNb2R1bGVQYXRofSBmcm9tICdAc2NoZW1hdGljcy9hbmd1bGFyL3V0aWxpdHkvbmctYXN0LXV0aWxzJztcbmltcG9ydCB7d29ya3NwYWNlc30gZnJvbSAnQGFuZ3VsYXItZGV2a2l0L2NvcmUnO1xuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5pbXBvcnQge2dldFByb2plY3RNYWluRmlsZX0gZnJvbSAnLi9wcm9qZWN0LW1haW4tZmlsZSc7XG5cbi8qKiBSZWFkcyBmaWxlIGdpdmVuIHBhdGggYW5kIHJldHVybnMgVHlwZVNjcmlwdCBzb3VyY2UgZmlsZS4gKi9cbmV4cG9ydCBmdW5jdGlvbiBwYXJzZVNvdXJjZUZpbGUoaG9zdDogVHJlZSwgcGF0aDogc3RyaW5nKTogdHMuU291cmNlRmlsZSB7XG4gIGNvbnN0IGJ1ZmZlciA9IGhvc3QucmVhZChwYXRoKTtcbiAgaWYgKCFidWZmZXIpIHtcbiAgICB0aHJvdyBuZXcgU2NoZW1hdGljc0V4Y2VwdGlvbihgQ291bGQgbm90IGZpbmQgZmlsZSBmb3IgcGF0aDogJHtwYXRofWApO1xuICB9XG4gIHJldHVybiB0cy5jcmVhdGVTb3VyY2VGaWxlKHBhdGgsIGJ1ZmZlci50b1N0cmluZygpLCB0cy5TY3JpcHRUYXJnZXQuTGF0ZXN0LCB0cnVlKTtcbn1cblxuLyoqIEltcG9ydCBhbmQgYWRkIG1vZHVsZSB0byByb290IGFwcCBtb2R1bGUuICovXG5leHBvcnQgZnVuY3Rpb24gYWRkTW9kdWxlSW1wb3J0VG9Sb290TW9kdWxlKFxuICBob3N0OiBUcmVlLFxuICBtb2R1bGVOYW1lOiBzdHJpbmcsXG4gIHNyYzogc3RyaW5nLFxuICBwcm9qZWN0OiB3b3Jrc3BhY2VzLlByb2plY3REZWZpbml0aW9uLFxuKSB7XG4gIGNvbnN0IG1vZHVsZVBhdGggPSBnZXRBcHBNb2R1bGVQYXRoKGhvc3QsIGdldFByb2plY3RNYWluRmlsZShwcm9qZWN0KSk7XG4gIGFkZE1vZHVsZUltcG9ydFRvTW9kdWxlKGhvc3QsIG1vZHVsZVBhdGgsIG1vZHVsZU5hbWUsIHNyYyk7XG59XG5cbi8qKlxuICogSW1wb3J0IGFuZCBhZGQgbW9kdWxlIHRvIHNwZWNpZmljIG1vZHVsZSBwYXRoLlxuICogQHBhcmFtIGhvc3QgdGhlIHRyZWUgd2UgYXJlIHVwZGF0aW5nXG4gKiBAcGFyYW0gbW9kdWxlUGF0aCBzcmMgbG9jYXRpb24gb2YgdGhlIG1vZHVsZSB0byBpbXBvcnRcbiAqIEBwYXJhbSBtb2R1bGVOYW1lIG5hbWUgb2YgbW9kdWxlIHRvIGltcG9ydFxuICogQHBhcmFtIHNyYyBzcmMgbG9jYXRpb24gdG8gaW1wb3J0XG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBhZGRNb2R1bGVJbXBvcnRUb01vZHVsZShcbiAgaG9zdDogVHJlZSxcbiAgbW9kdWxlUGF0aDogc3RyaW5nLFxuICBtb2R1bGVOYW1lOiBzdHJpbmcsXG4gIHNyYzogc3RyaW5nLFxuKSB7XG4gIGNvbnN0IG1vZHVsZVNvdXJjZSA9IHBhcnNlU291cmNlRmlsZShob3N0LCBtb2R1bGVQYXRoKTtcblxuICBpZiAoIW1vZHVsZVNvdXJjZSkge1xuICAgIHRocm93IG5ldyBTY2hlbWF0aWNzRXhjZXB0aW9uKGBNb2R1bGUgbm90IGZvdW5kOiAke21vZHVsZVBhdGh9YCk7XG4gIH1cblxuICBjb25zdCBjaGFuZ2VzID0gYWRkSW1wb3J0VG9Nb2R1bGUobW9kdWxlU291cmNlLCBtb2R1bGVQYXRoLCBtb2R1bGVOYW1lLCBzcmMpO1xuICBjb25zdCByZWNvcmRlciA9IGhvc3QuYmVnaW5VcGRhdGUobW9kdWxlUGF0aCk7XG5cbiAgY2hhbmdlcy5mb3JFYWNoKGNoYW5nZSA9PiB7XG4gICAgaWYgKGNoYW5nZSBpbnN0YW5jZW9mIEluc2VydENoYW5nZSkge1xuICAgICAgcmVjb3JkZXIuaW5zZXJ0TGVmdChjaGFuZ2UucG9zLCBjaGFuZ2UudG9BZGQpO1xuICAgIH1cbiAgfSk7XG5cbiAgaG9zdC5jb21taXRVcGRhdGUocmVjb3JkZXIpO1xufVxuXG4vKiogV3JhcHMgdGhlIGludGVybmFsIGZpbmQgbW9kdWxlIGZyb20gb3B0aW9ucyB3aXRoIHVuZGVmaW5lZCBwYXRoIGhhbmRsaW5nICAqL1xuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIGZpbmRNb2R1bGVGcm9tT3B0aW9ucyhcbiAgaG9zdDogVHJlZSxcbiAgb3B0aW9uczogQ29tcG9uZW50T3B0aW9ucyxcbik6IFByb21pc2U8c3RyaW5nIHwgdW5kZWZpbmVkPiB7XG4gIGNvbnN0IHdvcmtzcGFjZSA9IGF3YWl0IGdldFdvcmtzcGFjZShob3N0KTtcblxuICBpZiAoIW9wdGlvbnMucHJvamVjdCkge1xuICAgIG9wdGlvbnMucHJvamVjdCA9IEFycmF5LmZyb20od29ya3NwYWNlLnByb2plY3RzLmtleXMoKSlbMF07XG4gIH1cblxuICBjb25zdCBwcm9qZWN0ID0gd29ya3NwYWNlLnByb2plY3RzLmdldChvcHRpb25zLnByb2plY3QpITtcblxuICBpZiAob3B0aW9ucy5wYXRoID09PSB1bmRlZmluZWQpIHtcbiAgICBvcHRpb25zLnBhdGggPSBgLyR7cHJvamVjdC5yb290fS9zcmMvYXBwYDtcbiAgfVxuXG4gIHJldHVybiBpbnRlcm5hbEZpbmRNb2R1bGUoaG9zdCwgb3B0aW9ucyk7XG59XG4iXX0=
|
|
@@ -6,24 +6,16 @@
|
|
|
6
6
|
* Use of this source code is governed by an MIT-style license that can be
|
|
7
7
|
* found in the LICENSE file at https://angular.io/license
|
|
8
8
|
*/
|
|
9
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
10
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
11
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
12
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
13
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
14
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
15
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
16
|
-
});
|
|
17
|
-
};
|
|
18
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
10
|
exports.findModuleFromOptions = exports.addModuleImportToModule = exports.addModuleImportToRootModule = exports.parseSourceFile = void 0;
|
|
20
11
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
21
12
|
const change_1 = require("@schematics/angular/utility/change");
|
|
22
13
|
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
23
14
|
const find_module_1 = require("@schematics/angular/utility/find-module");
|
|
15
|
+
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
16
|
+
const ng_ast_utils_1 = require("@schematics/angular/utility/ng-ast-utils");
|
|
24
17
|
const ts = require("typescript");
|
|
25
18
|
const project_main_file_1 = require("./project-main-file");
|
|
26
|
-
const vendored_ast_utils_1 = require("./vendored-ast-utils");
|
|
27
19
|
/** Reads file given path and returns TypeScript source file. */
|
|
28
20
|
function parseSourceFile(host, path) {
|
|
29
21
|
const buffer = host.read(path);
|
|
@@ -35,7 +27,7 @@ function parseSourceFile(host, path) {
|
|
|
35
27
|
exports.parseSourceFile = parseSourceFile;
|
|
36
28
|
/** Import and add module to root app module. */
|
|
37
29
|
function addModuleImportToRootModule(host, moduleName, src, project) {
|
|
38
|
-
const modulePath = (0,
|
|
30
|
+
const modulePath = (0, ng_ast_utils_1.getAppModulePath)(host, (0, project_main_file_1.getProjectMainFile)(project));
|
|
39
31
|
addModuleImportToModule(host, modulePath, moduleName, src);
|
|
40
32
|
}
|
|
41
33
|
exports.addModuleImportToRootModule = addModuleImportToRootModule;
|
|
@@ -51,7 +43,7 @@ function addModuleImportToModule(host, modulePath, moduleName, src) {
|
|
|
51
43
|
if (!moduleSource) {
|
|
52
44
|
throw new schematics_1.SchematicsException(`Module not found: ${modulePath}`);
|
|
53
45
|
}
|
|
54
|
-
const changes = (0,
|
|
46
|
+
const changes = (0, ast_utils_1.addImportToModule)(moduleSource, modulePath, moduleName, src);
|
|
55
47
|
const recorder = host.beginUpdate(modulePath);
|
|
56
48
|
changes.forEach(change => {
|
|
57
49
|
if (change instanceof change_1.InsertChange) {
|
|
@@ -62,18 +54,16 @@ function addModuleImportToModule(host, modulePath, moduleName, src) {
|
|
|
62
54
|
}
|
|
63
55
|
exports.addModuleImportToModule = addModuleImportToModule;
|
|
64
56
|
/** Wraps the internal find module from options with undefined path handling */
|
|
65
|
-
function findModuleFromOptions(host, options) {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
return (0, find_module_1.findModuleFromOptions)(host, options);
|
|
76
|
-
});
|
|
57
|
+
async function findModuleFromOptions(host, options) {
|
|
58
|
+
const workspace = await (0, workspace_1.getWorkspace)(host);
|
|
59
|
+
if (!options.project) {
|
|
60
|
+
options.project = Array.from(workspace.projects.keys())[0];
|
|
61
|
+
}
|
|
62
|
+
const project = workspace.projects.get(options.project);
|
|
63
|
+
if (options.path === undefined) {
|
|
64
|
+
options.path = `/${project.root}/src/app`;
|
|
65
|
+
}
|
|
66
|
+
return (0, find_module_1.findModuleFromOptions)(host, options);
|
|
77
67
|
}
|
|
78
68
|
exports.findModuleFromOptions = findModuleFromOptions;
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3JjL2Nkay9zY2hlbWF0aWNzL3V0aWxzL2FzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCwyREFBcUU7QUFFckUsK0RBQWdFO0FBQ2hFLHFFQUFtRTtBQUNuRSx5RUFBb0c7QUFDcEcscUVBQXdFO0FBQ3hFLDJFQUEwRTtBQUUxRSxpQ0FBaUM7QUFDakMsMkRBQXVEO0FBRXZELGdFQUFnRTtBQUNoRSxTQUFnQixlQUFlLENBQUMsSUFBVSxFQUFFLElBQVk7SUFDdEQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMvQixJQUFJLENBQUMsTUFBTSxFQUFFO1FBQ1gsTUFBTSxJQUFJLGdDQUFtQixDQUFDLGlDQUFpQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO0tBQ3hFO0lBQ0QsT0FBTyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLENBQUMsWUFBWSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztBQUNwRixDQUFDO0FBTkQsMENBTUM7QUFFRCxnREFBZ0Q7QUFDaEQsU0FBZ0IsMkJBQTJCLENBQ3pDLElBQVUsRUFDVixVQUFrQixFQUNsQixHQUFXLEVBQ1gsT0FBcUM7SUFFckMsTUFBTSxVQUFVLEdBQUcsSUFBQSwrQkFBZ0IsRUFBQyxJQUFJLEVBQUUsSUFBQSxzQ0FBa0IsRUFBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO0lBQ3ZFLHVCQUF1QixDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0FBQzdELENBQUM7QUFSRCxrRUFRQztBQUVEOzs7Ozs7R0FNRztBQUNILFNBQWdCLHVCQUF1QixDQUNyQyxJQUFVLEVBQ1YsVUFBa0IsRUFDbEIsVUFBa0IsRUFDbEIsR0FBVztJQUVYLE1BQU0sWUFBWSxHQUFHLGVBQWUsQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFFdkQsSUFBSSxDQUFDLFlBQVksRUFBRTtRQUNqQixNQUFNLElBQUksZ0NBQW1CLENBQUMscUJBQXFCLFVBQVUsRUFBRSxDQUFDLENBQUM7S0FDbEU7SUFFRCxNQUFNLE9BQU8sR0FBRyxJQUFBLDZCQUFpQixFQUFDLFlBQVksRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQzdFLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLENBQUM7SUFFOUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFBRTtRQUN2QixJQUFJLE1BQU0sWUFBWSxxQkFBWSxFQUFFO1lBQ2xDLFFBQVEsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRSxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7U0FDL0M7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUVILElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLENBQUM7QUFDOUIsQ0FBQztBQXRCRCwwREFzQkM7QUFFRCxnRkFBZ0Y7QUFDekUsS0FBSyxVQUFVLHFCQUFxQixDQUN6QyxJQUFVLEVBQ1YsT0FBeUI7SUFFekIsTUFBTSxTQUFTLEdBQUcsTUFBTSxJQUFBLHdCQUFZLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFM0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUU7UUFDcEIsT0FBTyxDQUFDLE9BQU8sR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUM1RDtJQUVELE1BQU0sT0FBTyxHQUFHLFNBQVMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUUsQ0FBQztJQUV6RCxJQUFJLE9BQU8sQ0FBQyxJQUFJLEtBQUssU0FBUyxFQUFFO1FBQzlCLE9BQU8sQ0FBQyxJQUFJLEdBQUcsSUFBSSxPQUFPLENBQUMsSUFBSSxVQUFVLENBQUM7S0FDM0M7SUFFRCxPQUFPLElBQUEsbUNBQWtCLEVBQUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQzNDLENBQUM7QUFqQkQsc0RBaUJDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7U2NoZW1hdGljc0V4Y2VwdGlvbiwgVHJlZX0gZnJvbSAnQGFuZ3VsYXItZGV2a2l0L3NjaGVtYXRpY3MnO1xuaW1wb3J0IHtTY2hlbWEgYXMgQ29tcG9uZW50T3B0aW9uc30gZnJvbSAnQHNjaGVtYXRpY3MvYW5ndWxhci9jb21wb25lbnQvc2NoZW1hJztcbmltcG9ydCB7SW5zZXJ0Q2hhbmdlfSBmcm9tICdAc2NoZW1hdGljcy9hbmd1bGFyL3V0aWxpdHkvY2hhbmdlJztcbmltcG9ydCB7Z2V0V29ya3NwYWNlfSBmcm9tICdAc2NoZW1hdGljcy9hbmd1bGFyL3V0aWxpdHkvd29ya3NwYWNlJztcbmltcG9ydCB7ZmluZE1vZHVsZUZyb21PcHRpb25zIGFzIGludGVybmFsRmluZE1vZHVsZX0gZnJvbSAnQHNjaGVtYXRpY3MvYW5ndWxhci91dGlsaXR5L2ZpbmQtbW9kdWxlJztcbmltcG9ydCB7YWRkSW1wb3J0VG9Nb2R1bGV9IGZyb20gJ0BzY2hlbWF0aWNzL2FuZ3VsYXIvdXRpbGl0eS9hc3QtdXRpbHMnO1xuaW1wb3J0IHtnZXRBcHBNb2R1bGVQYXRofSBmcm9tICdAc2NoZW1hdGljcy9hbmd1bGFyL3V0aWxpdHkvbmctYXN0LXV0aWxzJztcbmltcG9ydCB7d29ya3NwYWNlc30gZnJvbSAnQGFuZ3VsYXItZGV2a2l0L2NvcmUnO1xuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5pbXBvcnQge2dldFByb2plY3RNYWluRmlsZX0gZnJvbSAnLi9wcm9qZWN0LW1haW4tZmlsZSc7XG5cbi8qKiBSZWFkcyBmaWxlIGdpdmVuIHBhdGggYW5kIHJldHVybnMgVHlwZVNjcmlwdCBzb3VyY2UgZmlsZS4gKi9cbmV4cG9ydCBmdW5jdGlvbiBwYXJzZVNvdXJjZUZpbGUoaG9zdDogVHJlZSwgcGF0aDogc3RyaW5nKTogdHMuU291cmNlRmlsZSB7XG4gIGNvbnN0IGJ1ZmZlciA9IGhvc3QucmVhZChwYXRoKTtcbiAgaWYgKCFidWZmZXIpIHtcbiAgICB0aHJvdyBuZXcgU2NoZW1hdGljc0V4Y2VwdGlvbihgQ291bGQgbm90IGZpbmQgZmlsZSBmb3IgcGF0aDogJHtwYXRofWApO1xuICB9XG4gIHJldHVybiB0cy5jcmVhdGVTb3VyY2VGaWxlKHBhdGgsIGJ1ZmZlci50b1N0cmluZygpLCB0cy5TY3JpcHRUYXJnZXQuTGF0ZXN0LCB0cnVlKTtcbn1cblxuLyoqIEltcG9ydCBhbmQgYWRkIG1vZHVsZSB0byByb290IGFwcCBtb2R1bGUuICovXG5leHBvcnQgZnVuY3Rpb24gYWRkTW9kdWxlSW1wb3J0VG9Sb290TW9kdWxlKFxuICBob3N0OiBUcmVlLFxuICBtb2R1bGVOYW1lOiBzdHJpbmcsXG4gIHNyYzogc3RyaW5nLFxuICBwcm9qZWN0OiB3b3Jrc3BhY2VzLlByb2plY3REZWZpbml0aW9uLFxuKSB7XG4gIGNvbnN0IG1vZHVsZVBhdGggPSBnZXRBcHBNb2R1bGVQYXRoKGhvc3QsIGdldFByb2plY3RNYWluRmlsZShwcm9qZWN0KSk7XG4gIGFkZE1vZHVsZUltcG9ydFRvTW9kdWxlKGhvc3QsIG1vZHVsZVBhdGgsIG1vZHVsZU5hbWUsIHNyYyk7XG59XG5cbi8qKlxuICogSW1wb3J0IGFuZCBhZGQgbW9kdWxlIHRvIHNwZWNpZmljIG1vZHVsZSBwYXRoLlxuICogQHBhcmFtIGhvc3QgdGhlIHRyZWUgd2UgYXJlIHVwZGF0aW5nXG4gKiBAcGFyYW0gbW9kdWxlUGF0aCBzcmMgbG9jYXRpb24gb2YgdGhlIG1vZHVsZSB0byBpbXBvcnRcbiAqIEBwYXJhbSBtb2R1bGVOYW1lIG5hbWUgb2YgbW9kdWxlIHRvIGltcG9ydFxuICogQHBhcmFtIHNyYyBzcmMgbG9jYXRpb24gdG8gaW1wb3J0XG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBhZGRNb2R1bGVJbXBvcnRUb01vZHVsZShcbiAgaG9zdDogVHJlZSxcbiAgbW9kdWxlUGF0aDogc3RyaW5nLFxuICBtb2R1bGVOYW1lOiBzdHJpbmcsXG4gIHNyYzogc3RyaW5nLFxuKSB7XG4gIGNvbnN0IG1vZHVsZVNvdXJjZSA9IHBhcnNlU291cmNlRmlsZShob3N0LCBtb2R1bGVQYXRoKTtcblxuICBpZiAoIW1vZHVsZVNvdXJjZSkge1xuICAgIHRocm93IG5ldyBTY2hlbWF0aWNzRXhjZXB0aW9uKGBNb2R1bGUgbm90IGZvdW5kOiAke21vZHVsZVBhdGh9YCk7XG4gIH1cblxuICBjb25zdCBjaGFuZ2VzID0gYWRkSW1wb3J0VG9Nb2R1bGUobW9kdWxlU291cmNlLCBtb2R1bGVQYXRoLCBtb2R1bGVOYW1lLCBzcmMpO1xuICBjb25zdCByZWNvcmRlciA9IGhvc3QuYmVnaW5VcGRhdGUobW9kdWxlUGF0aCk7XG5cbiAgY2hhbmdlcy5mb3JFYWNoKGNoYW5nZSA9PiB7XG4gICAgaWYgKGNoYW5nZSBpbnN0YW5jZW9mIEluc2VydENoYW5nZSkge1xuICAgICAgcmVjb3JkZXIuaW5zZXJ0TGVmdChjaGFuZ2UucG9zLCBjaGFuZ2UudG9BZGQpO1xuICAgIH1cbiAgfSk7XG5cbiAgaG9zdC5jb21taXRVcGRhdGUocmVjb3JkZXIpO1xufVxuXG4vKiogV3JhcHMgdGhlIGludGVybmFsIGZpbmQgbW9kdWxlIGZyb20gb3B0aW9ucyB3aXRoIHVuZGVmaW5lZCBwYXRoIGhhbmRsaW5nICAqL1xuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIGZpbmRNb2R1bGVGcm9tT3B0aW9ucyhcbiAgaG9zdDogVHJlZSxcbiAgb3B0aW9uczogQ29tcG9uZW50T3B0aW9ucyxcbik6IFByb21pc2U8c3RyaW5nIHwgdW5kZWZpbmVkPiB7XG4gIGNvbnN0IHdvcmtzcGFjZSA9IGF3YWl0IGdldFdvcmtzcGFjZShob3N0KTtcblxuICBpZiAoIW9wdGlvbnMucHJvamVjdCkge1xuICAgIG9wdGlvbnMucHJvamVjdCA9IEFycmF5LmZyb20od29ya3NwYWNlLnByb2plY3RzLmtleXMoKSlbMF07XG4gIH1cblxuICBjb25zdCBwcm9qZWN0ID0gd29ya3NwYWNlLnByb2plY3RzLmdldChvcHRpb25zLnByb2plY3QpITtcblxuICBpZiAob3B0aW9ucy5wYXRoID09PSB1bmRlZmluZWQpIHtcbiAgICBvcHRpb25zLnBhdGggPSBgLyR7cHJvamVjdC5yb290fS9zcmMvYXBwYDtcbiAgfVxuXG4gIHJldHVybiBpbnRlcm5hbEZpbmRNb2R1bGUoaG9zdCwgb3B0aW9ucyk7XG59XG4iXX0=
|
|
@@ -6,29 +6,21 @@
|
|
|
6
6
|
* Use of this source code is governed by an MIT-style license that can be
|
|
7
7
|
* found in the LICENSE file at https://angular.io/license
|
|
8
8
|
*/
|
|
9
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
10
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
11
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
12
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
13
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
14
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
15
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
16
|
-
});
|
|
17
|
-
};
|
|
18
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
10
|
exports.buildComponent = void 0;
|
|
20
11
|
const core_1 = require("@angular-devkit/core");
|
|
21
12
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
13
|
+
const schema_1 = require("@schematics/angular/component/schema");
|
|
22
14
|
const change_1 = require("@schematics/angular/utility/change");
|
|
23
15
|
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
24
16
|
const find_module_1 = require("@schematics/angular/utility/find-module");
|
|
25
17
|
const parse_name_1 = require("@schematics/angular/utility/parse-name");
|
|
26
18
|
const validation_1 = require("@schematics/angular/utility/validation");
|
|
27
19
|
const workspace_models_1 = require("@schematics/angular/utility/workspace-models");
|
|
20
|
+
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
28
21
|
const fs_1 = require("fs");
|
|
29
22
|
const path_1 = require("path");
|
|
30
23
|
const ts = require("typescript");
|
|
31
|
-
const vendored_ast_utils_1 = require("../utils/vendored-ast-utils");
|
|
32
24
|
const get_project_1 = require("./get-project");
|
|
33
25
|
const schematic_options_1 = require("./schematic-options");
|
|
34
26
|
/**
|
|
@@ -37,12 +29,12 @@ const schematic_options_1 = require("./schematic-options");
|
|
|
37
29
|
*/
|
|
38
30
|
function buildDefaultPath(project) {
|
|
39
31
|
const root = project.sourceRoot ? `/${project.sourceRoot}/` : `/${project.root}/src/`;
|
|
40
|
-
const projectDirName = project.extensions
|
|
32
|
+
const projectDirName = project.extensions['projectType'] === workspace_models_1.ProjectType.Application ? 'app' : 'lib';
|
|
41
33
|
return `${root}${projectDirName}`;
|
|
42
34
|
}
|
|
43
35
|
/**
|
|
44
36
|
* List of style extensions which are CSS compatible. All supported CLI style extensions can be
|
|
45
|
-
* found here: angular/angular-cli/
|
|
37
|
+
* found here: angular/angular-cli/main/packages/schematics/angular/ng-new/schema.json#L118-L122
|
|
46
38
|
*/
|
|
47
39
|
const supportedCssExtensions = ['css', 'scss', 'less'];
|
|
48
40
|
function readIntoSourceFile(host, modulePath) {
|
|
@@ -54,7 +46,7 @@ function readIntoSourceFile(host, modulePath) {
|
|
|
54
46
|
}
|
|
55
47
|
function addDeclarationToNgModule(options) {
|
|
56
48
|
return (host) => {
|
|
57
|
-
if (options.skipImport || !options.module) {
|
|
49
|
+
if (options.skipImport || options.standalone || !options.module) {
|
|
58
50
|
return host;
|
|
59
51
|
}
|
|
60
52
|
const modulePath = options.module;
|
|
@@ -65,7 +57,7 @@ function addDeclarationToNgModule(options) {
|
|
|
65
57
|
'.component';
|
|
66
58
|
const relativePath = (0, find_module_1.buildRelativePath)(modulePath, componentPath);
|
|
67
59
|
const classifiedName = core_1.strings.classify(`${options.name}Component`);
|
|
68
|
-
const declarationChanges = (0,
|
|
60
|
+
const declarationChanges = (0, ast_utils_1.addDeclarationToModule)(source, modulePath, classifiedName, relativePath);
|
|
69
61
|
const declarationRecorder = host.beginUpdate(modulePath);
|
|
70
62
|
for (const change of declarationChanges) {
|
|
71
63
|
if (change instanceof change_1.InsertChange) {
|
|
@@ -77,7 +69,7 @@ function addDeclarationToNgModule(options) {
|
|
|
77
69
|
// Need to refresh the AST because we overwrote the file in the host.
|
|
78
70
|
source = readIntoSourceFile(host, modulePath);
|
|
79
71
|
const exportRecorder = host.beginUpdate(modulePath);
|
|
80
|
-
const exportChanges = (0,
|
|
72
|
+
const exportChanges = (0, ast_utils_1.addExportToModule)(source, modulePath, core_1.strings.classify(`${options.name}Component`), relativePath);
|
|
81
73
|
for (const change of exportChanges) {
|
|
82
74
|
if (change instanceof change_1.InsertChange) {
|
|
83
75
|
exportRecorder.insertLeft(change.pos, change.toAdd);
|
|
@@ -117,9 +109,9 @@ function indentTextContent(text, numSpaces) {
|
|
|
117
109
|
* to manually duplicate the file content.
|
|
118
110
|
*/
|
|
119
111
|
function buildComponent(options, additionalFiles = {}) {
|
|
120
|
-
return (host, ctx) =>
|
|
112
|
+
return async (host, ctx) => {
|
|
121
113
|
const context = ctx;
|
|
122
|
-
const workspace =
|
|
114
|
+
const workspace = await (0, workspace_1.getWorkspace)(host);
|
|
123
115
|
const project = (0, get_project_1.getProjectFromWorkspace)(workspace, options.project);
|
|
124
116
|
const defaultComponentOptions = (0, schematic_options_1.getDefaultComponentOptions)(project);
|
|
125
117
|
// TODO(devversion): Remove if we drop support for older CLI versions.
|
|
@@ -138,11 +130,12 @@ function buildComponent(options, additionalFiles = {}) {
|
|
|
138
130
|
defaultComponentOptions[key])
|
|
139
131
|
.forEach(key => (options[key] = defaultComponentOptions[key]));
|
|
140
132
|
if (options.path === undefined) {
|
|
141
|
-
// TODO(jelbourn): figure out if the need for this `as any` is a bug due to two different
|
|
142
|
-
// incompatible `ProjectDefinition` classes in @angular-devkit
|
|
143
133
|
options.path = buildDefaultPath(project);
|
|
144
134
|
}
|
|
145
|
-
options.
|
|
135
|
+
options.standalone = await (0, schematic_options_1.isStandaloneSchematic)(host, options);
|
|
136
|
+
if (!options.standalone) {
|
|
137
|
+
options.module = (0, find_module_1.findModuleFromOptions)(host, options);
|
|
138
|
+
}
|
|
146
139
|
const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
|
|
147
140
|
options.name = parsedPath.name;
|
|
148
141
|
options.path = parsedPath.path;
|
|
@@ -153,12 +146,14 @@ function buildComponent(options, additionalFiles = {}) {
|
|
|
153
146
|
// accidentally generate invalid stylesheets (e.g. drag-drop-comp.styl) which will
|
|
154
147
|
// break the Angular CLI project. See: https://github.com/angular/components/issues/15164
|
|
155
148
|
if (!supportedCssExtensions.includes(options.style)) {
|
|
156
|
-
|
|
157
|
-
// within CLI v7.3.0-rc.0. This would break the schematic for older CLI versions.
|
|
158
|
-
options.style = 'css';
|
|
149
|
+
options.style = schema_1.Style.Css;
|
|
159
150
|
}
|
|
160
151
|
// Object that will be used as context for the EJS templates.
|
|
161
|
-
const baseTemplateContext =
|
|
152
|
+
const baseTemplateContext = {
|
|
153
|
+
...core_1.strings,
|
|
154
|
+
'if-flat': (s) => (options.flat ? '' : s),
|
|
155
|
+
...options,
|
|
156
|
+
};
|
|
162
157
|
// Key-value object that includes the specified additional files with their loaded content.
|
|
163
158
|
// The resolved contents can be used inside EJS templates.
|
|
164
159
|
const resolvedFiles = {};
|
|
@@ -175,7 +170,7 @@ function buildComponent(options, additionalFiles = {}) {
|
|
|
175
170
|
options.inlineTemplate ? (0, schematics_1.filter)(path => !path.endsWith('.html.template')) : (0, schematics_1.noop)(),
|
|
176
171
|
// Treat the template options as any, because the type definition for the template options
|
|
177
172
|
// is made unnecessarily explicit. Every type of object can be used in the EJS template.
|
|
178
|
-
(0, schematics_1.applyTemplates)(
|
|
173
|
+
(0, schematics_1.applyTemplates)({ indentTextContent, resolvedFiles, ...baseTemplateContext }),
|
|
179
174
|
// TODO(devversion): figure out why we cannot just remove the first parameter
|
|
180
175
|
// See for example: angular-cli#schematics/angular/component/index.ts#L160
|
|
181
176
|
(0, schematics_1.move)(null, parsedPath.path),
|
|
@@ -183,7 +178,7 @@ function buildComponent(options, additionalFiles = {}) {
|
|
|
183
178
|
return () => (0, schematics_1.chain)([
|
|
184
179
|
(0, schematics_1.branchAndMerge)((0, schematics_1.chain)([addDeclarationToNgModule(options), (0, schematics_1.mergeWith)(templateSource)])),
|
|
185
180
|
])(host, context);
|
|
186
|
-
}
|
|
181
|
+
};
|
|
187
182
|
}
|
|
188
183
|
exports.buildComponent = buildComponent;
|
|
189
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"build-component.js","sourceRoot":"","sources":["../../../../../../../src/cdk/schematics/utils/build-component.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {strings, template as interpolateTemplate} from '@angular-devkit/core';\nimport {\n  apply,\n  applyTemplates,\n  branchAndMerge,\n  chain,\n  filter,\n  mergeWith,\n  move,\n  noop,\n  Rule,\n  SchematicsException,\n  Tree,\n  url,\n} from '@angular-devkit/schematics';\nimport {FileSystemSchematicContext} from '@angular-devkit/schematics/tools';\nimport {Schema as ComponentOptions, Style} from '@schematics/angular/component/schema';\nimport {InsertChange} from '@schematics/angular/utility/change';\nimport {getWorkspace} from '@schematics/angular/utility/workspace';\nimport {buildRelativePath, findModuleFromOptions} from '@schematics/angular/utility/find-module';\nimport {parseName} from '@schematics/angular/utility/parse-name';\nimport {validateHtmlSelector} from '@schematics/angular/utility/validation';\nimport {ProjectType} from '@schematics/angular/utility/workspace-models';\nimport {readFileSync, statSync} from 'fs';\nimport {dirname, join, resolve} from 'path';\nimport * as ts from 'typescript';\nimport {addDeclarationToModule, addExportToModule} from '../utils/vendored-ast-utils';\nimport {getProjectFromWorkspace} from './get-project';\nimport {getDefaultComponentOptions} from './schematic-options';\nimport {ProjectDefinition} from '@angular-devkit/core/src/workspace';\n\n/**\n * Build a default project path for generating.\n * @param project The project to build the path for.\n */\nfunction buildDefaultPath(project: ProjectDefinition): string {\n  const root = project.sourceRoot ? `/${project.sourceRoot}/` : `/${project.root}/src/`;\n\n  const projectDirName = project.extensions.projectType === ProjectType.Application ? 'app' : 'lib';\n\n  return `${root}${projectDirName}`;\n}\n\n/**\n * List of style extensions which are CSS compatible. All supported CLI style extensions can be\n * found here: angular/angular-cli/master/packages/schematics/angular/ng-new/schema.json#L118-L122\n */\nconst supportedCssExtensions = ['css', 'scss', 'less'];\n\nfunction readIntoSourceFile(host: Tree, modulePath: string) {\n  const text = host.read(modulePath);\n  if (text === null) {\n    throw new SchematicsException(`File ${modulePath} does not exist.`);\n  }\n\n  return ts.createSourceFile(modulePath, text.toString('utf-8'), ts.ScriptTarget.Latest, true);\n}\n\nfunction addDeclarationToNgModule(options: ComponentOptions): Rule {\n  return (host: Tree) => {\n    if (options.skipImport || !options.module) {\n      return host;\n    }\n\n    const modulePath = options.module;\n    let source = readIntoSourceFile(host, modulePath);\n\n    const componentPath =\n      `/${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\n    const declarationChanges = addDeclarationToModule(\n      source,\n      modulePath,\n      classifiedName,\n      relativePath,\n    );\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      source = readIntoSourceFile(host, modulePath);\n\n      const exportRecorder = host.beginUpdate(modulePath);\n      const exportChanges = addExportToModule(\n        source,\n        modulePath,\n        strings.classify(`${options.name}Component`),\n        relativePath,\n      );\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    return host;\n  };\n}\n\nfunction buildSelector(options: ComponentOptions, projectPrefix?: string) {\n  let selector = strings.dasherize(options.name);\n  if (options.prefix) {\n    selector = `${options.prefix}-${selector}`;\n  } else if (options.prefix === undefined && projectPrefix) {\n    selector = `${projectPrefix}-${selector}`;\n  }\n\n  return selector;\n}\n\n/**\n * Indents the text content with the amount of specified spaces. The spaces will be added after\n * every line-break. This utility function can be used inside of EJS templates to properly\n * include the additional files.\n */\nfunction indentTextContent(text: string, numSpaces: number): string {\n  // In the Material project there should be only LF line-endings, but the schematic files\n  // are not being linted and therefore there can be also CRLF or just CR line-endings.\n  return text.replace(/(\\r\\n|\\r|\\n)/g, `$1${' '.repeat(numSpaces)}`);\n}\n\n/**\n * Rule that copies and interpolates the files that belong to this schematic context. Additionally\n * a list of file paths can be passed to this rule in order to expose them inside the EJS\n * template context.\n *\n * This allows inlining the external template or stylesheet files in EJS without having\n * to manually duplicate the file content.\n */\nexport function buildComponent(\n  options: ComponentOptions,\n  additionalFiles: {[key: string]: string} = {},\n): Rule {\n  return async (host, ctx) => {\n    const context = ctx as FileSystemSchematicContext;\n    const workspace = await getWorkspace(host);\n    const project = getProjectFromWorkspace(workspace, options.project);\n    const defaultComponentOptions = getDefaultComponentOptions(project);\n\n    // TODO(devversion): Remove if we drop support for older CLI versions.\n    // This handles an unreported breaking change from the @angular-devkit/schematics. Previously\n    // the description path resolved to the factory file, but starting from 6.2.0, it resolves\n    // to the factory directory.\n    const schematicPath = statSync(context.schematic.description.path).isDirectory()\n      ? context.schematic.description.path\n      : dirname(context.schematic.description.path);\n\n    const schematicFilesUrl = './files';\n    const schematicFilesPath = resolve(schematicPath, schematicFilesUrl);\n\n    // Add the default component option values to the options if an option is not explicitly\n    // specified but a default component option is available.\n    Object.keys(options)\n      .filter(\n        key =>\n          options[key as keyof ComponentOptions] == null &&\n          defaultComponentOptions[key as keyof ComponentOptions],\n      )\n      .forEach(\n        key =>\n          ((options as any)[key] = (defaultComponentOptions as ComponentOptions)[\n            key as keyof ComponentOptions\n          ]),\n      );\n\n    if (options.path === undefined) {\n      // TODO(jelbourn): figure out if the need for this `as any` is a bug due to two different\n      // incompatible `ProjectDefinition` classes in @angular-devkit\n      options.path = buildDefaultPath(project as any);\n    }\n\n    options.module = findModuleFromOptions(host, options);\n\n    const parsedPath = parseName(options.path!, options.name);\n\n    options.name = parsedPath.name;\n    options.path = parsedPath.path;\n    options.selector = options.selector || buildSelector(options, project.prefix);\n\n    validateHtmlSelector(options.selector!);\n\n    // In case the specified style extension is not part of the supported CSS supersets,\n    // we generate the stylesheets with the \"css\" extension. This ensures that we don't\n    // accidentally generate invalid stylesheets (e.g. drag-drop-comp.styl) which will\n    // break the Angular CLI project. See: https://github.com/angular/components/issues/15164\n    if (!supportedCssExtensions.includes(options.style!)) {\n      // TODO: Cast is necessary as we can't use the Style enum which has been introduced\n      // within CLI v7.3.0-rc.0. This would break the schematic for older CLI versions.\n      options.style = 'css' as Style;\n    }\n\n    // Object that will be used as context for the EJS templates.\n    const baseTemplateContext = {\n      ...strings,\n      'if-flat': (s: string) => (options.flat ? '' : s),\n      ...options,\n    };\n\n    // Key-value object that includes the specified additional files with their loaded content.\n    // The resolved contents can be used inside EJS templates.\n    const resolvedFiles: Record<string, string> = {};\n\n    for (let key in additionalFiles) {\n      if (additionalFiles[key]) {\n        const fileContent = readFileSync(join(schematicFilesPath, additionalFiles[key]), 'utf-8');\n\n        // Interpolate the additional files with the base EJS template context.\n        resolvedFiles[key] = interpolateTemplate(fileContent)(baseTemplateContext);\n      }\n    }\n\n    const templateSource = apply(url(schematicFilesUrl), [\n      options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),\n      options.inlineStyle ? filter(path => !path.endsWith('.__style__.template')) : noop(),\n      options.inlineTemplate ? filter(path => !path.endsWith('.html.template')) : noop(),\n      // Treat the template options as any, because the type definition for the template options\n      // is made unnecessarily explicit. Every type of object can be used in the EJS template.\n      applyTemplates({indentTextContent, resolvedFiles, ...baseTemplateContext} as any),\n      // TODO(devversion): figure out why we cannot just remove the first parameter\n      // See for example: angular-cli#schematics/angular/component/index.ts#L160\n      move(null as any, parsedPath.path),\n    ]);\n\n    return () =>\n      chain([\n        branchAndMerge(chain([addDeclarationToNgModule(options), mergeWith(templateSource)])),\n      ])(host, context);\n  };\n}\n"]}
|
|
184
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"build-component.js","sourceRoot":"","sources":["../../../../../../../src/cdk/schematics/utils/build-component.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {strings, template as interpolateTemplate, workspaces} from '@angular-devkit/core';\nimport {\n  apply,\n  applyTemplates,\n  branchAndMerge,\n  chain,\n  filter,\n  mergeWith,\n  move,\n  noop,\n  Rule,\n  SchematicsException,\n  Tree,\n  url,\n} from '@angular-devkit/schematics';\nimport {FileSystemSchematicContext} from '@angular-devkit/schematics/tools';\nimport {Schema as ComponentOptions, Style} from '@schematics/angular/component/schema';\nimport {InsertChange} from '@schematics/angular/utility/change';\nimport {getWorkspace} from '@schematics/angular/utility/workspace';\nimport {buildRelativePath, findModuleFromOptions} from '@schematics/angular/utility/find-module';\nimport {parseName} from '@schematics/angular/utility/parse-name';\nimport {validateHtmlSelector} from '@schematics/angular/utility/validation';\nimport {ProjectType} from '@schematics/angular/utility/workspace-models';\nimport {addDeclarationToModule, addExportToModule} from '@schematics/angular/utility/ast-utils';\nimport {readFileSync, statSync} from 'fs';\nimport {dirname, join, resolve} from 'path';\nimport * as ts from 'typescript';\nimport {getProjectFromWorkspace} from './get-project';\nimport {getDefaultComponentOptions, isStandaloneSchematic} from './schematic-options';\n\n/**\n * Build a default project path for generating.\n * @param project The project to build the path for.\n */\nfunction buildDefaultPath(project: workspaces.ProjectDefinition): string {\n  const root = project.sourceRoot ? `/${project.sourceRoot}/` : `/${project.root}/src/`;\n\n  const projectDirName =\n    project.extensions['projectType'] === ProjectType.Application ? 'app' : 'lib';\n\n  return `${root}${projectDirName}`;\n}\n\n/**\n * List of style extensions which are CSS compatible. All supported CLI style extensions can be\n * found here: angular/angular-cli/main/packages/schematics/angular/ng-new/schema.json#L118-L122\n */\nconst supportedCssExtensions = ['css', 'scss', 'less'];\n\nfunction readIntoSourceFile(host: Tree, modulePath: string) {\n  const text = host.read(modulePath);\n  if (text === null) {\n    throw new SchematicsException(`File ${modulePath} does not exist.`);\n  }\n\n  return ts.createSourceFile(modulePath, text.toString('utf-8'), ts.ScriptTarget.Latest, true);\n}\n\nfunction addDeclarationToNgModule(options: ComponentOptions): Rule {\n  return (host: Tree) => {\n    if (options.skipImport || options.standalone || !options.module) {\n      return host;\n    }\n\n    const modulePath = options.module;\n    let source = readIntoSourceFile(host, modulePath);\n\n    const componentPath =\n      `/${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\n    const declarationChanges = addDeclarationToModule(\n      source,\n      modulePath,\n      classifiedName,\n      relativePath,\n    );\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      source = readIntoSourceFile(host, modulePath);\n\n      const exportRecorder = host.beginUpdate(modulePath);\n      const exportChanges = addExportToModule(\n        source,\n        modulePath,\n        strings.classify(`${options.name}Component`),\n        relativePath,\n      );\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    return host;\n  };\n}\n\nfunction buildSelector(options: ComponentOptions, projectPrefix?: string) {\n  let selector = strings.dasherize(options.name);\n  if (options.prefix) {\n    selector = `${options.prefix}-${selector}`;\n  } else if (options.prefix === undefined && projectPrefix) {\n    selector = `${projectPrefix}-${selector}`;\n  }\n\n  return selector;\n}\n\n/**\n * Indents the text content with the amount of specified spaces. The spaces will be added after\n * every line-break. This utility function can be used inside of EJS templates to properly\n * include the additional files.\n */\nfunction indentTextContent(text: string, numSpaces: number): string {\n  // In the Material project there should be only LF line-endings, but the schematic files\n  // are not being linted and therefore there can be also CRLF or just CR line-endings.\n  return text.replace(/(\\r\\n|\\r|\\n)/g, `$1${' '.repeat(numSpaces)}`);\n}\n\n/**\n * Rule that copies and interpolates the files that belong to this schematic context. Additionally\n * a list of file paths can be passed to this rule in order to expose them inside the EJS\n * template context.\n *\n * This allows inlining the external template or stylesheet files in EJS without having\n * to manually duplicate the file content.\n */\nexport function buildComponent(\n  options: ComponentOptions,\n  additionalFiles: {[key: string]: string} = {},\n): Rule {\n  return async (host, ctx) => {\n    const context = ctx as FileSystemSchematicContext;\n    const workspace = await getWorkspace(host);\n    const project = getProjectFromWorkspace(workspace, options.project);\n    const defaultComponentOptions = getDefaultComponentOptions(project);\n\n    // TODO(devversion): Remove if we drop support for older CLI versions.\n    // This handles an unreported breaking change from the @angular-devkit/schematics. Previously\n    // the description path resolved to the factory file, but starting from 6.2.0, it resolves\n    // to the factory directory.\n    const schematicPath = statSync(context.schematic.description.path).isDirectory()\n      ? context.schematic.description.path\n      : dirname(context.schematic.description.path);\n\n    const schematicFilesUrl = './files';\n    const schematicFilesPath = resolve(schematicPath, schematicFilesUrl);\n\n    // Add the default component option values to the options if an option is not explicitly\n    // specified but a default component option is available.\n    Object.keys(options)\n      .filter(\n        key =>\n          options[key as keyof ComponentOptions] == null &&\n          defaultComponentOptions[key as keyof ComponentOptions],\n      )\n      .forEach(\n        key =>\n          ((options as any)[key] = (defaultComponentOptions as ComponentOptions)[\n            key as keyof ComponentOptions\n          ]),\n      );\n\n    if (options.path === undefined) {\n      options.path = buildDefaultPath(project);\n    }\n\n    options.standalone = await isStandaloneSchematic(host, options);\n\n    if (!options.standalone) {\n      options.module = findModuleFromOptions(host, options);\n    }\n\n    const parsedPath = parseName(options.path!, options.name);\n\n    options.name = parsedPath.name;\n    options.path = parsedPath.path;\n    options.selector = options.selector || buildSelector(options, project.prefix);\n\n    validateHtmlSelector(options.selector!);\n\n    // In case the specified style extension is not part of the supported CSS supersets,\n    // we generate the stylesheets with the \"css\" extension. This ensures that we don't\n    // accidentally generate invalid stylesheets (e.g. drag-drop-comp.styl) which will\n    // break the Angular CLI project. See: https://github.com/angular/components/issues/15164\n    if (!supportedCssExtensions.includes(options.style!)) {\n      options.style = Style.Css;\n    }\n\n    // Object that will be used as context for the EJS templates.\n    const baseTemplateContext = {\n      ...strings,\n      'if-flat': (s: string) => (options.flat ? '' : s),\n      ...options,\n    };\n\n    // Key-value object that includes the specified additional files with their loaded content.\n    // The resolved contents can be used inside EJS templates.\n    const resolvedFiles: Record<string, string> = {};\n\n    for (let key in additionalFiles) {\n      if (additionalFiles[key]) {\n        const fileContent = readFileSync(join(schematicFilesPath, additionalFiles[key]), 'utf-8');\n\n        // Interpolate the additional files with the base EJS template context.\n        resolvedFiles[key] = interpolateTemplate(fileContent)(baseTemplateContext);\n      }\n    }\n\n    const templateSource = apply(url(schematicFilesUrl), [\n      options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),\n      options.inlineStyle ? filter(path => !path.endsWith('.__style__.template')) : noop(),\n      options.inlineTemplate ? filter(path => !path.endsWith('.html.template')) : noop(),\n      // Treat the template options as any, because the type definition for the template options\n      // is made unnecessarily explicit. Every type of object can be used in the EJS template.\n      applyTemplates({indentTextContent, resolvedFiles, ...baseTemplateContext} as any),\n      // TODO(devversion): figure out why we cannot just remove the first parameter\n      // See for example: angular-cli#schematics/angular/component/index.ts#L160\n      move(null as any, parsedPath.path),\n    ]);\n\n    return () =>\n      chain([\n        branchAndMerge(chain([addDeclarationToNgModule(options), mergeWith(templateSource)])),\n      ])(host, context);\n  };\n}\n"]}
|