@ngx-formly/schematics 6.1.4 → 6.1.5
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/package.json +1 -1
- package/src/ng-add/index.js +4 -3
- package/src/ng-add/index.js.map +1 -1
- package/src/ng-add/schema.d.ts +2 -1
- package/utils/ast.d.ts +11 -10
- package/utils/ast.js +25 -27
- package/utils/ast.js.map +1 -1
package/package.json
CHANGED
package/src/ng-add/index.js
CHANGED
|
@@ -13,6 +13,7 @@ exports.ngAdd = void 0;
|
|
|
13
13
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
14
14
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
15
15
|
const ast_1 = require("../../utils/ast");
|
|
16
|
+
const schematics_2 = require("@angular/cdk/schematics");
|
|
16
17
|
const lib_versions_1 = require("../../utils/lib-versions");
|
|
17
18
|
const package_1 = require("../../utils/package");
|
|
18
19
|
/**
|
|
@@ -42,8 +43,8 @@ function addFormlyToPackageJson() {
|
|
|
42
43
|
function addFormlyModuleConfig(options) {
|
|
43
44
|
return (host) => __awaiter(this, void 0, void 0, function* () {
|
|
44
45
|
const modulePath = (yield (0, ast_1.findModuleFromOptions)(host, options));
|
|
45
|
-
(0,
|
|
46
|
-
(0,
|
|
46
|
+
(0, schematics_2.addModuleImportToModule)(host, modulePath, 'FormlyModule.forRoot()', '@ngx-formly/core');
|
|
47
|
+
(0, schematics_2.addModuleImportToModule)(host, modulePath, 'ReactiveFormsModule', '@angular/forms');
|
|
47
48
|
});
|
|
48
49
|
}
|
|
49
50
|
/** Add UI module to app.module */
|
|
@@ -53,7 +54,7 @@ function addUITheme(options) {
|
|
|
53
54
|
const uiTheme = options.uiTheme;
|
|
54
55
|
if (uiTheme) {
|
|
55
56
|
(0, package_1.addPackageToPackageJson)(host, 'dependencies', `@ngx-formly/${uiTheme}`, lib_versions_1.ngxFormlyVersion);
|
|
56
|
-
(0,
|
|
57
|
+
(0, schematics_2.addModuleImportToModule)(host, modulePath, `Formly${mapUIName(uiTheme)}Module`, `@ngx-formly/${uiTheme}`);
|
|
57
58
|
}
|
|
58
59
|
});
|
|
59
60
|
}
|
package/src/ng-add/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAAuF;AACvF,4DAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAAuF;AACvF,4DAA0E;AAC1E,yCAAwD;AACxD,wDAAkE;AAClE,2DAA4E;AAC5E,iDAA8D;AAG9D;;;;;GAKG;AACH,SAAgB,KAAK,CAAC,OAAe;IACnC,OAAO,IAAA,kBAAK,EAAC;QACX,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE,CAAC,CAAC,CAAC,sBAAsB,EAAE;QACtE,qBAAqB,CAAC,OAAO,CAAC;QAC9B,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;KAC1D,CAAC,CAAC;AACL,CAAC;AAND,sBAMC;AAED,mFAAmF;AACnF,SAAS,sBAAsB;IAC7B,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,IAAA,iCAAuB,EAAC,IAAI,EAAE,cAAc,EAAE,gBAAgB,EAAE,6BAAc,CAAC,CAAC;QAChF,IAAA,iCAAuB,EAAC,IAAI,EAAE,cAAc,EAAE,kBAAkB,EAAE,+BAAgB,CAAC,CAAC;QAEpF,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;QAE9C,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,+CAA+C;AAC/C,SAAS,qBAAqB,CAAC,OAAe;IAC5C,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,MAAM,UAAU,GAAG,CAAC,MAAM,IAAA,2BAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAE,CAAC;QACjE,IAAA,oCAAuB,EAAC,IAAI,EAAE,UAAU,EAAE,wBAAwB,EAAE,kBAAkB,CAAC,CAAC;QACxF,IAAA,oCAAuB,EAAC,IAAI,EAAE,UAAU,EAAE,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;IACrF,CAAC,CAAA,CAAC;AACJ,CAAC;AAED,kCAAkC;AAClC,SAAS,UAAU,CAAC,OAAe;IACjC,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,MAAM,UAAU,GAAG,MAAM,IAAA,2BAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAEhC,IAAI,OAAO,EAAE;YACX,IAAA,iCAAuB,EAAC,IAAI,EAAE,cAAc,EAAE,eAAe,OAAO,EAAE,EAAE,+BAAgB,CAAC,CAAC;YAE1F,IAAA,oCAAuB,EAAC,IAAI,EAAE,UAAU,EAAE,SAAS,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,eAAe,OAAO,EAAE,CAAC,CAAC;SAC1G;IACH,CAAC,CAAA,CAAC;AACJ,CAAC;AAMD,uEAAuE;AACvE,SAAS,SAAS,CAAC,OAAe;IAChC,MAAM,KAAK,GAAiB;QAC1B,SAAS,EAAE,WAAW;QACtB,QAAQ,EAAE,UAAU;QACpB,YAAY,EAAE,cAAc;QAC5B,KAAK,EAAE,OAAO;QACd,OAAO,EAAE,SAAS;QAClB,KAAK,EAAE,OAAO;QACd,eAAe,EAAE,aAAa;KAC/B,CAAC;IAEF,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC;AACxB,CAAC"}
|
package/src/ng-add/schema.d.ts
CHANGED
package/utils/ast.d.ts
CHANGED
|
@@ -1,21 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* https://github.com/angular/components/tree/main/src/cdk/schematics
|
|
3
|
+
*/
|
|
1
4
|
import { Tree } from '@angular-devkit/schematics';
|
|
2
5
|
import * as ts from 'typescript';
|
|
3
6
|
import { WorkspaceProject } from '@schematics/angular/utility/workspace-models';
|
|
7
|
+
import { Schema as ComponentOptions } from '@schematics/angular/component/schema';
|
|
8
|
+
import { Path } from '@angular-devkit/core';
|
|
9
|
+
import { JsonValue } from '@angular-devkit/core';
|
|
10
|
+
import { ProjectDefinition } from '@angular-devkit/core/src/workspace';
|
|
4
11
|
/** Reads file given path and returns TypeScript source file. */
|
|
5
12
|
export declare function parseSourceFile(host: Tree, path: string): ts.SourceFile;
|
|
6
13
|
/** Import and add module to root app module. */
|
|
7
|
-
export declare function addModuleImportToRootModule(host: Tree, moduleName: string, src: string, project:
|
|
8
|
-
/**
|
|
9
|
-
* Import and add module to specific module path.
|
|
10
|
-
* @param host the tree we are updating
|
|
11
|
-
* @param modulePath src location of the module to import
|
|
12
|
-
* @param moduleName name of module to import
|
|
13
|
-
* @param src src location to import
|
|
14
|
-
*/
|
|
15
|
-
export declare function addModuleImportToModule(host: Tree, modulePath: string, moduleName: string, src: string): void;
|
|
14
|
+
export declare function addModuleImportToRootModule(host: Tree, moduleName: string, src: string, project: ProjectDefinition): void;
|
|
16
15
|
/** Gets the app index.html file */
|
|
17
16
|
export declare function getIndexHtmlPath(host: Tree, project: WorkspaceProject): string;
|
|
18
17
|
/** Get the root stylesheet file. */
|
|
19
18
|
export declare function getStylesPath(host: Tree, project: WorkspaceProject): string;
|
|
20
19
|
/** Wraps the internal find module from options with undefined path handling */
|
|
21
|
-
export declare function findModuleFromOptions(host: Tree, options:
|
|
20
|
+
export declare function findModuleFromOptions(host: Tree, options: ComponentOptions): Promise<string | undefined>;
|
|
21
|
+
export declare function getProjectMainFile(project: ProjectDefinition): Path;
|
|
22
|
+
export declare function getProjectTargetOptions(project: ProjectDefinition, buildTarget: string): Record<string, JsonValue | undefined>;
|
package/utils/ast.js
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* https://github.com/angular/components/tree/main/src/cdk/schematics
|
|
4
|
+
*/
|
|
2
5
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
6
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
7
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -9,15 +12,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
12
|
});
|
|
10
13
|
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.
|
|
15
|
+
exports.getProjectTargetOptions = exports.getProjectMainFile = exports.findModuleFromOptions = exports.getStylesPath = exports.getIndexHtmlPath = exports.addModuleImportToRootModule = exports.parseSourceFile = void 0;
|
|
13
16
|
const core_1 = require("@angular-devkit/core");
|
|
14
17
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
15
18
|
const ts = require("typescript");
|
|
16
|
-
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
17
|
-
const change_1 = require("@schematics/angular/utility/change");
|
|
18
19
|
const ng_ast_utils_1 = require("@schematics/angular/utility/ng-ast-utils");
|
|
19
20
|
const find_module_1 = require("@schematics/angular/utility/find-module");
|
|
20
21
|
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
22
|
+
const schematics_2 = require("@angular/cdk/schematics");
|
|
21
23
|
/** Reads file given path and returns TypeScript source file. */
|
|
22
24
|
function parseSourceFile(host, path) {
|
|
23
25
|
const buffer = host.read(path);
|
|
@@ -29,32 +31,10 @@ function parseSourceFile(host, path) {
|
|
|
29
31
|
exports.parseSourceFile = parseSourceFile;
|
|
30
32
|
/** Import and add module to root app module. */
|
|
31
33
|
function addModuleImportToRootModule(host, moduleName, src, project) {
|
|
32
|
-
const modulePath = (0, ng_ast_utils_1.getAppModulePath)(host, project
|
|
33
|
-
addModuleImportToModule(host, modulePath, moduleName, src);
|
|
34
|
+
const modulePath = (0, ng_ast_utils_1.getAppModulePath)(host, getProjectMainFile(project));
|
|
35
|
+
(0, schematics_2.addModuleImportToModule)(host, modulePath, moduleName, src);
|
|
34
36
|
}
|
|
35
37
|
exports.addModuleImportToRootModule = addModuleImportToRootModule;
|
|
36
|
-
/**
|
|
37
|
-
* Import and add module to specific module path.
|
|
38
|
-
* @param host the tree we are updating
|
|
39
|
-
* @param modulePath src location of the module to import
|
|
40
|
-
* @param moduleName name of module to import
|
|
41
|
-
* @param src src location to import
|
|
42
|
-
*/
|
|
43
|
-
function addModuleImportToModule(host, modulePath, moduleName, src) {
|
|
44
|
-
const moduleSource = parseSourceFile(host, modulePath);
|
|
45
|
-
if (!moduleSource) {
|
|
46
|
-
throw new schematics_1.SchematicsException(`Module not found: ${modulePath}`);
|
|
47
|
-
}
|
|
48
|
-
const changes = (0, ast_utils_1.addImportToModule)(moduleSource, modulePath, moduleName, src);
|
|
49
|
-
const recorder = host.beginUpdate(modulePath);
|
|
50
|
-
changes.forEach((change) => {
|
|
51
|
-
if (change instanceof change_1.InsertChange) {
|
|
52
|
-
recorder.insertLeft(change.pos, change.toAdd);
|
|
53
|
-
}
|
|
54
|
-
});
|
|
55
|
-
host.commitUpdate(recorder);
|
|
56
|
-
}
|
|
57
|
-
exports.addModuleImportToModule = addModuleImportToModule;
|
|
58
38
|
/** Gets the app index.html file */
|
|
59
39
|
function getIndexHtmlPath(host, project) {
|
|
60
40
|
const buildTarget = project.architect.build.options;
|
|
@@ -99,4 +79,22 @@ function findModuleFromOptions(host, options) {
|
|
|
99
79
|
});
|
|
100
80
|
}
|
|
101
81
|
exports.findModuleFromOptions = findModuleFromOptions;
|
|
82
|
+
function getProjectMainFile(project) {
|
|
83
|
+
const buildOptions = getProjectTargetOptions(project, 'build');
|
|
84
|
+
if (!buildOptions.main) {
|
|
85
|
+
throw new schematics_1.SchematicsException(`Could not find the project main file inside of the ` +
|
|
86
|
+
`workspace config (${project.sourceRoot})`);
|
|
87
|
+
}
|
|
88
|
+
return buildOptions.main;
|
|
89
|
+
}
|
|
90
|
+
exports.getProjectMainFile = getProjectMainFile;
|
|
91
|
+
function getProjectTargetOptions(project, buildTarget) {
|
|
92
|
+
var _a, _b;
|
|
93
|
+
const options = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.get(buildTarget)) === null || _b === void 0 ? void 0 : _b.options;
|
|
94
|
+
if (!options) {
|
|
95
|
+
throw new schematics_1.SchematicsException(`Cannot determine project target configuration for: ${buildTarget}.`);
|
|
96
|
+
}
|
|
97
|
+
return options;
|
|
98
|
+
}
|
|
99
|
+
exports.getProjectTargetOptions = getProjectTargetOptions;
|
|
102
100
|
//# sourceMappingURL=ast.js.map
|
package/utils/ast.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast.js","sourceRoot":"","sources":["ast.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"ast.js","sourceRoot":"","sources":["ast.ts"],"names":[],"mappings":"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"}
|