@ngx-formly/schematics 8.0.0 → 9.0.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/README.md +26 -19
- package/package.json +4 -4
- package/src/ng-add/index.js +9 -19
- package/src/ng-add/index.js.map +1 -1
- package/tsconfig.lib.json +8 -19
- package/utils/ast.d.ts +4 -4
- package/utils/ast.js +45 -24
- package/utils/ast.js.map +1 -1
- package/utils/lib-versions.d.ts +2 -2
- package/utils/lib-versions.js +2 -2
- package/utils/testing.js +5 -16
- package/utils/testing.js.map +1 -1
- package/src/ng-add/index.spec.d.ts +0 -1
- package/src/ng-add/index.spec.js +0 -103
- package/src/ng-add/index.spec.js.map +0 -1
package/README.md
CHANGED
|
@@ -55,25 +55,32 @@ Formly is a dynamic (JSON powered) form library for Angular that brings unmatche
|
|
|
55
55
|
|
|
56
56
|
#### **Which Version to use?**
|
|
57
57
|
|
|
58
|
-
| Angular version | Formly version
|
|
59
|
-
| --------------- |
|
|
60
|
-
| Angular >=
|
|
61
|
-
| Angular >=
|
|
62
|
-
| Angular >=
|
|
63
|
-
| Angular >=
|
|
64
|
-
| Angular >=
|
|
65
|
-
| Angular >=
|
|
66
|
-
| Angular >=
|
|
67
|
-
| Angular >=
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
58
|
+
| Angular version | Formly version | Migration |
|
|
59
|
+
| --------------- | -------------------- | ---------------------------------- |
|
|
60
|
+
| Angular >= 20 | `@ngx-formly/core@9.x` | [Upgrade to v9](UPGRADE-9.0.md) |
|
|
61
|
+
| Angular >= 19 | `@ngx-formly/core@8.x` | [Upgrade to v8](UPGRADE-8.0.md) |
|
|
62
|
+
| Angular >= 18 | `@ngx-formly/core@7.x` | [Upgrade to v7](UPGRADE-7.0.md) |
|
|
63
|
+
| Angular >= 13 | `@ngx-formly/core@6.x` | [Upgrade to v6](UPGRADE-6.0.md) |
|
|
64
|
+
| Angular >= 7 | `@ngx-formly/core@5.x` | [Upgrade to v5](UPGRADE-5.0.md) |
|
|
65
|
+
| Angular >= 6 | `@ngx-formly/core@4.x` | |
|
|
66
|
+
| Angular >= 5 | `@ngx-formly/core@3.x` | |
|
|
67
|
+
| Angular >= 4 | `@ngx-formly/core@2.x` | [Upgrade to v2](UPGRADE-2.0.md) |
|
|
68
|
+
| Angular >= 2 | `ng-formly@1.x` | |
|
|
69
|
+
|
|
70
|
+
#### Upgrading to v9
|
|
71
|
+
|
|
72
|
+
Formly v9 requires Angular 20 or newer. Upgrade Angular first, then update all
|
|
73
|
+
`@ngx-formly/*` packages used by your application together to v9.
|
|
74
|
+
The Material, PrimeNG, and NG-ZORRO integrations require version 20 or newer of
|
|
75
|
+
their respective UI libraries. Kendo requires version 19.1 or newer, and NativeScript
|
|
76
|
+
requires `@nativescript/angular` 20 or newer. Applications staying on Angular 19 should
|
|
77
|
+
use Formly v8; applications staying on Angular 18 should use Formly v7.
|
|
78
|
+
|
|
79
|
+
PrimeNG datepicker fields no longer accept `monthNavigator`, `yearNavigator`, or
|
|
80
|
+
`yearRange`, which PrimeNG 20 removed. Replace `@primeng/themes` imports with
|
|
81
|
+
`@primeuix/themes` when configuring a PrimeNG theme.
|
|
82
|
+
|
|
83
|
+
See the [v9 upgrade guide](UPGRADE-9.0.md) for migration steps and the [changelog](CHANGELOG.md) for the full list of changes.
|
|
77
84
|
|
|
78
85
|
## Core Team
|
|
79
86
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ngx-formly/schematics",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "9.0.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "tsc -p tsconfig.lib.json"
|
|
@@ -10,9 +10,9 @@
|
|
|
10
10
|
"save": "devDependencies"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@angular-devkit/core": "^
|
|
14
|
-
"@angular-devkit/schematics": "^
|
|
15
|
-
"@schematics/angular": "^
|
|
13
|
+
"@angular-devkit/core": "^20.3.36",
|
|
14
|
+
"@angular-devkit/schematics": "^20.3.36",
|
|
15
|
+
"@schematics/angular": "^20.3.36"
|
|
16
16
|
},
|
|
17
17
|
"homepage": "https://github.com/ngx-formly/ngx-formly#readme",
|
|
18
18
|
"description": "Formly is a dynamic (JSON powered) form library for Angular that bring unmatched maintainability to your application's forms.",
|
package/src/ng-add/index.js
CHANGED
|
@@ -1,19 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.ngAdd = ngAdd;
|
|
13
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
14
5
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
15
6
|
const ast_1 = require("../../utils/ast");
|
|
16
|
-
const schematics_2 = require("@angular/cdk/schematics");
|
|
17
7
|
const lib_versions_1 = require("../../utils/lib-versions");
|
|
18
8
|
const package_1 = require("../../utils/package");
|
|
19
9
|
/**
|
|
@@ -40,22 +30,22 @@ function addFormlyToPackageJson() {
|
|
|
40
30
|
}
|
|
41
31
|
/** Add formly module to the relative module */
|
|
42
32
|
function addFormlyModuleConfig(options) {
|
|
43
|
-
return (host) =>
|
|
44
|
-
const modulePath = (
|
|
45
|
-
(0,
|
|
46
|
-
(0,
|
|
47
|
-
}
|
|
33
|
+
return async (host) => {
|
|
34
|
+
const modulePath = (await (0, ast_1.findModuleFromOptions)(host, options));
|
|
35
|
+
(0, ast_1.addModuleImportToModule)(host, modulePath, 'FormlyModule.forRoot()', '@ngx-formly/core');
|
|
36
|
+
(0, ast_1.addModuleImportToModule)(host, modulePath, 'ReactiveFormsModule', '@angular/forms');
|
|
37
|
+
};
|
|
48
38
|
}
|
|
49
39
|
/** Add UI module to app.module */
|
|
50
40
|
function addUITheme(options) {
|
|
51
|
-
return (host) =>
|
|
52
|
-
const modulePath =
|
|
41
|
+
return async (host) => {
|
|
42
|
+
const modulePath = await (0, ast_1.findModuleFromOptions)(host, options);
|
|
53
43
|
const uiTheme = options.uiTheme;
|
|
54
44
|
if (uiTheme) {
|
|
55
45
|
(0, package_1.addPackageToPackageJson)(host, 'dependencies', `@ngx-formly/${uiTheme}`, lib_versions_1.ngxFormlyVersion);
|
|
56
|
-
(0,
|
|
46
|
+
(0, ast_1.addModuleImportToModule)(host, modulePath, `Formly${mapUIName(uiTheme)}Module`, `@ngx-formly/${uiTheme}`);
|
|
57
47
|
}
|
|
58
|
-
}
|
|
48
|
+
};
|
|
59
49
|
}
|
|
60
50
|
// @TODO: available themes should probably be moved to some config file
|
|
61
51
|
function mapUIName(uiTheme) {
|
package/src/ng-add/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAaA,sBAMC;AAnBD,2DAAuF;AACvF,4DAA0E;AAC1E,yCAAiF;AACjF,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;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,KAAK,EAAE,IAAU,EAAE,EAAE;QAC1B,MAAM,UAAU,GAAG,CAAC,MAAM,IAAA,2BAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QAChE,IAAA,6BAAuB,EAAC,IAAI,EAAE,UAAU,EAAE,wBAAwB,EAAE,kBAAkB,CAAC,CAAC;QACxF,IAAA,6BAAuB,EAAC,IAAI,EAAE,UAAU,EAAE,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;IACrF,CAAC,CAAC;AACJ,CAAC;AAED,kCAAkC;AAClC,SAAS,UAAU,CAAC,OAAe;IACjC,OAAO,KAAK,EAAE,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,CAAC;YACZ,IAAA,iCAAuB,EAAC,IAAI,EAAE,cAAc,EAAE,eAAe,OAAO,EAAE,EAAE,+BAAgB,CAAC,CAAC;YAE1F,IAAA,6BAAuB,EAAC,IAAI,EAAE,UAAU,EAAE,SAAS,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,eAAe,OAAO,EAAE,CAAC,CAAC;QAC3G,CAAC;IACH,CAAC,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/tsconfig.lib.json
CHANGED
|
@@ -1,26 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"compilerOptions": {
|
|
3
|
-
"lib": [
|
|
4
|
-
"es2018",
|
|
5
|
-
"dom"
|
|
6
|
-
],
|
|
3
|
+
"lib": ["ES2022"],
|
|
7
4
|
"declaration": true,
|
|
8
|
-
"module": "
|
|
9
|
-
"moduleResolution": "
|
|
10
|
-
"noEmitOnError":
|
|
11
|
-
"skipDefaultLibCheck": true,
|
|
5
|
+
"module": "Node16",
|
|
6
|
+
"moduleResolution": "Node16",
|
|
7
|
+
"noEmitOnError": true,
|
|
12
8
|
"skipLibCheck": true,
|
|
13
9
|
"sourceMap": true,
|
|
14
|
-
"target": "
|
|
15
|
-
"types": [
|
|
16
|
-
"node", "jest"
|
|
17
|
-
]
|
|
10
|
+
"target": "ES2022",
|
|
11
|
+
"types": ["node"]
|
|
18
12
|
},
|
|
19
|
-
"include": [
|
|
20
|
-
|
|
21
|
-
"utils/**/*"
|
|
22
|
-
],
|
|
23
|
-
"exclude": [
|
|
24
|
-
"src/*/files/**/*"
|
|
25
|
-
]
|
|
13
|
+
"include": ["src/**/*", "utils/**/*"],
|
|
14
|
+
"exclude": ["src/*/files/**/*", "**/*.spec.ts"]
|
|
26
15
|
}
|
package/utils/ast.d.ts
CHANGED
|
@@ -7,17 +7,17 @@ import { WorkspaceProject } from '@schematics/angular/utility/workspace-models';
|
|
|
7
7
|
import { Schema as ComponentOptions } from '@schematics/angular/component/schema';
|
|
8
8
|
import { Path } from '@angular-devkit/core';
|
|
9
9
|
import { JsonValue } from '@angular-devkit/core';
|
|
10
|
-
import {
|
|
10
|
+
import { workspaces } from '@angular-devkit/core';
|
|
11
11
|
export declare function addModuleImportToModule(host: Tree, modulePath: string, moduleName: string, src: string): void;
|
|
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
|
/** Gets the app index.html file */
|
|
17
17
|
export declare function getIndexHtmlPath(host: Tree, project: WorkspaceProject): string;
|
|
18
18
|
/** Get the root stylesheet file. */
|
|
19
19
|
export declare function getStylesPath(host: Tree, project: WorkspaceProject): string;
|
|
20
20
|
/** Wraps the internal find module from options with undefined path handling */
|
|
21
21
|
export declare function findModuleFromOptions(host: Tree, options: ComponentOptions): Promise<string | undefined>;
|
|
22
|
-
export declare function getProjectMainFile(project: ProjectDefinition): Path;
|
|
23
|
-
export declare function getProjectTargetOptions(project: ProjectDefinition, buildTarget: string): Record<string, JsonValue | undefined>;
|
|
22
|
+
export declare function getProjectMainFile(project: workspaces.ProjectDefinition): Path;
|
|
23
|
+
export declare function getProjectTargetOptions(project: workspaces.ProjectDefinition, buildTarget: string): Record<string, JsonValue | undefined>;
|
package/utils/ast.js
CHANGED
|
@@ -2,15 +2,39 @@
|
|
|
2
2
|
/**
|
|
3
3
|
* https://github.com/angular/components/tree/main/src/cdk/schematics
|
|
4
4
|
*/
|
|
5
|
-
var
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
5
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
8
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
9
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
10
|
+
}
|
|
11
|
+
Object.defineProperty(o, k2, desc);
|
|
12
|
+
}) : (function(o, m, k, k2) {
|
|
13
|
+
if (k2 === undefined) k2 = k;
|
|
14
|
+
o[k2] = m[k];
|
|
15
|
+
}));
|
|
16
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
17
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
18
|
+
}) : function(o, v) {
|
|
19
|
+
o["default"] = v;
|
|
20
|
+
});
|
|
21
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
22
|
+
var ownKeys = function(o) {
|
|
23
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
24
|
+
var ar = [];
|
|
25
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
26
|
+
return ar;
|
|
27
|
+
};
|
|
28
|
+
return ownKeys(o);
|
|
29
|
+
};
|
|
30
|
+
return function (mod) {
|
|
31
|
+
if (mod && mod.__esModule) return mod;
|
|
32
|
+
var result = {};
|
|
33
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
34
|
+
__setModuleDefault(result, mod);
|
|
35
|
+
return result;
|
|
36
|
+
};
|
|
37
|
+
})();
|
|
14
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
39
|
exports.addModuleImportToModule = addModuleImportToModule;
|
|
16
40
|
exports.parseSourceFile = parseSourceFile;
|
|
@@ -22,7 +46,7 @@ exports.getProjectMainFile = getProjectMainFile;
|
|
|
22
46
|
exports.getProjectTargetOptions = getProjectTargetOptions;
|
|
23
47
|
const core_1 = require("@angular-devkit/core");
|
|
24
48
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
25
|
-
const ts = require("typescript");
|
|
49
|
+
const ts = __importStar(require("typescript"));
|
|
26
50
|
const ng_ast_utils_1 = require("@schematics/angular/utility/ng-ast-utils");
|
|
27
51
|
const find_module_1 = require("@schematics/angular/utility/find-module");
|
|
28
52
|
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
@@ -84,18 +108,16 @@ function getStylesPath(host, project) {
|
|
|
84
108
|
throw new schematics_1.SchematicsException('No style files could be found into which a theme could be added');
|
|
85
109
|
}
|
|
86
110
|
/** Wraps the internal find module from options with undefined path handling */
|
|
87
|
-
function findModuleFromOptions(host, options) {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
return (0, find_module_1.findModuleFromOptions)(host, options);
|
|
98
|
-
});
|
|
111
|
+
async function findModuleFromOptions(host, options) {
|
|
112
|
+
const workspace = await (0, workspace_1.getWorkspace)(host);
|
|
113
|
+
if (!options.project) {
|
|
114
|
+
options.project = Array.from(workspace.projects.keys())[0];
|
|
115
|
+
}
|
|
116
|
+
const project = workspace.projects.get(options.project);
|
|
117
|
+
if (options.path === undefined) {
|
|
118
|
+
options.path = `/${project.root}/src/app`;
|
|
119
|
+
}
|
|
120
|
+
return (0, find_module_1.findModuleFromOptions)(host, options);
|
|
99
121
|
}
|
|
100
122
|
function getProjectMainFile(project) {
|
|
101
123
|
const buildOptions = getProjectTargetOptions(project, 'build');
|
|
@@ -106,8 +128,7 @@ function getProjectMainFile(project) {
|
|
|
106
128
|
return buildOptions.main;
|
|
107
129
|
}
|
|
108
130
|
function getProjectTargetOptions(project, buildTarget) {
|
|
109
|
-
|
|
110
|
-
const options = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.get(buildTarget)) === null || _b === void 0 ? void 0 : _b.options;
|
|
131
|
+
const options = project.targets?.get(buildTarget)?.options;
|
|
111
132
|
if (!options) {
|
|
112
133
|
throw new schematics_1.SchematicsException(`Cannot determine project target configuration for: ${buildTarget}.`);
|
|
113
134
|
}
|
package/utils/ast.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast.js","sourceRoot":"","sources":["ast.ts"],"names":[],"mappings":";AAAA;;GAEG
|
|
1
|
+
{"version":3,"file":"ast.js","sourceRoot":"","sources":["ast.ts"],"names":[],"mappings":"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"}
|
package/utils/lib-versions.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const angularVersion = "^
|
|
2
|
-
export declare const ngxFormlyVersion = "^
|
|
1
|
+
export declare const angularVersion = "^20.0.0";
|
|
2
|
+
export declare const ngxFormlyVersion = "^9.0.0";
|
package/utils/lib-versions.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ngxFormlyVersion = exports.angularVersion = void 0;
|
|
4
|
-
exports.angularVersion = '^
|
|
5
|
-
exports.ngxFormlyVersion = '^
|
|
4
|
+
exports.angularVersion = '^20.0.0';
|
|
5
|
+
exports.ngxFormlyVersion = '^9.0.0';
|
|
6
6
|
//# sourceMappingURL=lib-versions.js.map
|
package/utils/testing.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.getTestProjectPath = getTestProjectPath;
|
|
13
4
|
exports.createWorkspace = createWorkspace;
|
|
@@ -35,12 +26,10 @@ const defaultAppOptions = {
|
|
|
35
26
|
function getTestProjectPath(workspaceOptions = defaultWorkspaceOptions, appOptions = defaultAppOptions) {
|
|
36
27
|
return `/${workspaceOptions.newProjectRoot}/${appOptions.name}`;
|
|
37
28
|
}
|
|
38
|
-
function createWorkspace(
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
.runExternalSchematic('@schematics/angular', 'application', appOptions, appTree);
|
|
44
|
-
});
|
|
29
|
+
async function createWorkspace(schematicRunner, appTree, workspaceOptions = defaultWorkspaceOptions, appOptions = defaultAppOptions) {
|
|
30
|
+
appTree = await schematicRunner
|
|
31
|
+
.runExternalSchematic('@schematics/angular', 'workspace', workspaceOptions);
|
|
32
|
+
return await schematicRunner
|
|
33
|
+
.runExternalSchematic('@schematics/angular', 'application', appOptions, appTree);
|
|
45
34
|
}
|
|
46
35
|
//# sourceMappingURL=testing.js.map
|
package/utils/testing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["testing.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"testing.js","sourceRoot":"","sources":["testing.ts"],"names":[],"mappings":";;AA6BA,gDAKC;AAED,0CAoBC;AAnDD,MAAM,uBAAuB,GAAG;IAC9B,IAAI,EAAE,WAAW;IACjB,OAAO,EAAE,OAAO;IAChB,cAAc,EAAE,UAAU;CAC3B,CAAC;AAEF,MAAM,iBAAiB,GAAG;IACxB,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,KAAK;IAClB,cAAc,EAAE,KAAK;IACrB,iBAAiB,EAAE,UAAU;IAC7B,OAAO,EAAE,KAAK;IACd,KAAK,EAAE,KAAK;IACZ,SAAS,EAAE,KAAK;IAChB,UAAU,EAAE,KAAK;CAClB,CAAC;AAEF,iCAAiC;AACjC,iBAAiB;AACjB,gBAAgB;AAChB,uBAAuB;AACvB,iBAAiB;AACjB,KAAK;AAEL,SAAgB,kBAAkB,CAChC,gBAAgB,GAAG,uBAAuB,EAC1C,UAAU,GAAG,iBAAiB;IAE9B,OAAO,IAAI,gBAAgB,CAAC,cAAc,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;AAClE,CAAC;AAEM,KAAK,UAAU,eAAe,CACnC,eAAoC,EACpC,OAAqB,EACrB,gBAAgB,GAAG,uBAAuB,EAC1C,UAAU,GAAG,iBAAiB;IAE9B,OAAO,GAAG,MAAM,eAAe;SAC5B,oBAAoB,CACnB,qBAAqB,EACrB,WAAW,EACX,gBAAgB,CACjB,CAAC;IAEJ,OAAO,MAAM,eAAe;SACzB,oBAAoB,CACnB,qBAAqB,EACrB,aAAa,EACb,UAAU,EACV,OAAO,CACR,CAAC;AACN,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
package/src/ng-add/index.spec.js
DELETED
|
@@ -1,103 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
const testing_1 = require("@angular-devkit/schematics/testing");
|
|
13
|
-
const path_1 = require("path");
|
|
14
|
-
const testing_2 = require("../../utils/testing");
|
|
15
|
-
describe('ng-add-schematic', () => {
|
|
16
|
-
const COLLECTION_PATH = (0, path_1.join)(__dirname, '../collection.json');
|
|
17
|
-
const projectPath = (0, testing_2.getTestProjectPath)();
|
|
18
|
-
let runner;
|
|
19
|
-
let appTree;
|
|
20
|
-
beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
|
-
runner = new testing_1.SchematicTestRunner('schematics', COLLECTION_PATH);
|
|
22
|
-
appTree = yield (0, testing_2.createWorkspace)(runner, appTree);
|
|
23
|
-
}));
|
|
24
|
-
it('should update package.json', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
|
-
const tree = yield runner.runSchematic('ng-add', {}, appTree);
|
|
26
|
-
const packageJson = JSON.parse(tree.get('/package.json').content.toString());
|
|
27
|
-
expect(packageJson.dependencies['@angular/forms']).toBeDefined();
|
|
28
|
-
expect(packageJson.dependencies['@ngx-formly/core']).toBeDefined();
|
|
29
|
-
}));
|
|
30
|
-
it('should not add a theme by default to package.json', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
31
|
-
const tree = yield runner.runSchematic('ng-add', {}, appTree);
|
|
32
|
-
const packageJson = JSON.parse(tree.get('/package.json').content.toString());
|
|
33
|
-
// @TODO: list of themes should probably be retrieved from some config file
|
|
34
|
-
['material', 'bootstrap', 'ionic', 'primeng', 'kendo', 'ng-zorro-antd'].forEach(theme => {
|
|
35
|
-
expect(packageJson.dependencies[`@ngx-formly/${theme}`]).toBeUndefined();
|
|
36
|
-
});
|
|
37
|
-
}));
|
|
38
|
-
it('should skip package.json update', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
39
|
-
const options = { skipPackageJson: true };
|
|
40
|
-
const tree = yield runner.runSchematic('ng-add', options, appTree);
|
|
41
|
-
const packageJson = JSON.parse(tree.get('/package.json').content.toString());
|
|
42
|
-
expect(packageJson.dependencies['@ngx-formly/core']).toBeUndefined();
|
|
43
|
-
}));
|
|
44
|
-
it('should add to root app module', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
45
|
-
const tree = yield runner.runSchematic('ng-add', {}, appTree);
|
|
46
|
-
const content = tree.readContent(`${projectPath}/src/app/app.module.ts`);
|
|
47
|
-
expect(content).toMatch(
|
|
48
|
-
// eslint-disable-next-line:trailing-comma
|
|
49
|
-
/import { FormlyModule } from '@ngx-formly\/core';/);
|
|
50
|
-
expect(content).toMatch(
|
|
51
|
-
// eslint-disable-next-line:trailing-comma
|
|
52
|
-
/FormlyModule.forRoot/);
|
|
53
|
-
expect(content).toMatch(
|
|
54
|
-
// eslint-disable-next-line:trailing-comma
|
|
55
|
-
/import { ReactiveFormsModule } from '@angular\/forms';/);
|
|
56
|
-
expect(content).toMatch(
|
|
57
|
-
// eslint-disable-next-line:trailing-comma
|
|
58
|
-
/ReactiveFormsModule/);
|
|
59
|
-
}));
|
|
60
|
-
it('should add UI theme to package.json', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
61
|
-
const tree = yield runner.runSchematic('ng-add', { uiTheme: 'bootstrap' }, appTree);
|
|
62
|
-
const packageJson = JSON.parse(tree.get('/package.json').content.toString());
|
|
63
|
-
expect(packageJson.dependencies['@ngx-formly/bootstrap']).toBeDefined();
|
|
64
|
-
}));
|
|
65
|
-
it('should add UI theme to root app module', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
66
|
-
const tree = yield runner.runSchematic('ng-add', { uiTheme: 'bootstrap' }, appTree);
|
|
67
|
-
const content = tree.readContent(`${projectPath}/src/app/app.module.ts`);
|
|
68
|
-
expect(content).toMatch(
|
|
69
|
-
// eslint-disable-next-line:trailing-comma
|
|
70
|
-
/import { FormlyBootstrapModule } from '@ngx-formly\/bootstrap';/);
|
|
71
|
-
expect(content).toMatch(
|
|
72
|
-
// eslint-disable-next-line:trailing-comma
|
|
73
|
-
/FormlyBootstrapModule/);
|
|
74
|
-
}));
|
|
75
|
-
it('should add to any module', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
76
|
-
const fooModule = `${projectPath}/src/app/foo.module.ts`;
|
|
77
|
-
appTree.create(fooModule, `
|
|
78
|
-
import { NgModule } from '@angular/core';
|
|
79
|
-
import { CommonModule } from '@angular/common';
|
|
80
|
-
|
|
81
|
-
@NgModule({
|
|
82
|
-
imports: [],
|
|
83
|
-
declarations: []
|
|
84
|
-
})
|
|
85
|
-
export class FooModule { }
|
|
86
|
-
`);
|
|
87
|
-
const tree = yield runner.runSchematic('ng-add', { module: 'foo.module.ts' }, appTree);
|
|
88
|
-
const content = tree.readContent(fooModule);
|
|
89
|
-
expect(content).toMatch(
|
|
90
|
-
// eslint-disable-next-line:trailing-comma
|
|
91
|
-
/import { FormlyModule } from '@ngx-formly\/core';/);
|
|
92
|
-
expect(content).toMatch(
|
|
93
|
-
// eslint-disable-next-line:trailing-comma
|
|
94
|
-
/FormlyModule.forRoot/);
|
|
95
|
-
expect(content).toMatch(
|
|
96
|
-
// eslint-disable-next-line:trailing-comma
|
|
97
|
-
/import { ReactiveFormsModule } from '@angular\/forms';/);
|
|
98
|
-
expect(content).toMatch(
|
|
99
|
-
// eslint-disable-next-line:trailing-comma
|
|
100
|
-
/ReactiveFormsModule/);
|
|
101
|
-
}));
|
|
102
|
-
});
|
|
103
|
-
//# sourceMappingURL=index.spec.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.spec.js","sourceRoot":"","sources":["index.spec.ts"],"names":[],"mappings":"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"}
|