@ngx-formly/schematics 5.10.24 → 6.0.0-dev.343964e2
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/.browserslistrc +16 -0
- package/README.md +4 -2
- package/package.json +14 -28
- package/src/collection.json +3 -9
- package/src/ng-add/index.d.ts +1 -1
- package/src/ng-add/index.js +27 -21
- package/src/ng-add/index.js.map +1 -1
- package/src/ng-add/index.spec.js +4 -4
- package/src/ng-add/index.spec.js.map +1 -1
- package/src/ng-add/schema.json +2 -2
- package/{tsconfig.json → tsconfig.lib.json} +2 -3
- package/utils/ast.d.ts +3 -5
- package/utils/ast.js +30 -37
- package/utils/ast.js.map +1 -1
- package/utils/lib-versions.d.ts +2 -2
- package/utils/lib-versions.js +3 -2
- package/utils/lib-versions.js.map +1 -1
- package/utils/package.js +1 -0
- package/utils/package.js.map +1 -1
- package/utils/testing.d.ts +1 -1
- package/utils/testing.js +20 -4
- 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 -100
- package/src/ng-add/index_spec.js.map +0 -1
- package/src/wrapper-component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ +0 -0
- package/src/wrapper-component/files/__name@dasherize@if-flat__/__name@dasherize__.component.html +0 -4
- package/src/wrapper-component/index.d.ts +0 -10
- package/src/wrapper-component/index.js +0 -23
- package/src/wrapper-component/index.js.map +0 -1
- package/src/wrapper-component/index_spec.d.ts +0 -1
- package/src/wrapper-component/index_spec.js +0 -55
- package/src/wrapper-component/index_spec.js.map +0 -1
- package/src/wrapper-component/schema.d.ts +0 -3
- package/src/wrapper-component/schema.js +0 -3
- package/src/wrapper-component/schema.js.map +0 -1
- package/src/wrapper-component/schema.json +0 -109
- package/utils/html.d.ts +0 -18
- package/utils/html.js +0 -60
- package/utils/html.js.map +0 -1
package/.browserslistrc
ADDED
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
|
|
2
|
+
# For additional information regarding the format and rule options, please see:
|
|
3
|
+
# https://github.com/browserslist/browserslist#queries
|
|
4
|
+
|
|
5
|
+
# For the full list of supported browsers by the Angular framework, please see:
|
|
6
|
+
# https://angular.io/guide/browser-support
|
|
7
|
+
|
|
8
|
+
# You can see what browsers were selected by your queries by running:
|
|
9
|
+
# npx browserslist
|
|
10
|
+
|
|
11
|
+
last 1 Chrome version
|
|
12
|
+
last 1 Firefox version
|
|
13
|
+
last 2 Edge major versions
|
|
14
|
+
last 2 Safari major versions
|
|
15
|
+
last 2 iOS major versions
|
|
16
|
+
Firefox ESR
|
package/README.md
CHANGED
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
[](https://gitter.im/formly-js/ng2-formly)
|
|
12
12
|
[](https://api.travis-ci.org/ngx-formly/ngx-formly.svg?branch=master)
|
|
13
13
|
[](https://twitter.com/formlydev)
|
|
14
|
+
[](https://gitpod.io/#https://github.com/ngx-formly/ngx-formly)
|
|
14
15
|
</div>
|
|
15
16
|
|
|
16
17
|
---
|
|
@@ -25,7 +26,7 @@ Formly is a dynamic (JSON powered) form library for Angular that bring unmatched
|
|
|
25
26
|
- Formly Schema (core)
|
|
26
27
|
- JSON Schema
|
|
27
28
|
- 😍 A bunch of themes, out of the box!
|
|
28
|
-
- 💪
|
|
29
|
+
- 💪 Built on top of [Angular Reactive Forms](https://angular.io/guide/reactive-forms)
|
|
29
30
|
- 📹 [@eggheadio course](https://egghead.io/playlists/configuration-based-reactive-angular-forms-with-ngx-formly-465f) - 20 lessons & 78 minutes
|
|
30
31
|
|
|
31
32
|
## Docs
|
|
@@ -48,13 +49,14 @@ Formly is a dynamic (JSON powered) form library for Angular that bring unmatched
|
|
|
48
49
|
| [Ionic](https://ionicframework.com) | [Demo](https://formly.dev/ui/ionic) | [StackBlitz](https://stackblitz.com/edit/ngx-formly-ui-ionic) |
|
|
49
50
|
| [PrimeNG](http://primefaces.org/primeng/#/) | [Demo](https://formly.dev/ui/primeng) | [StackBlitz](https://stackblitz.com/edit/ngx-formly-ui-primeng) |
|
|
50
51
|
| [Kendo](http://www.telerik.com/kendo-angular-ui) | [Demo](https://formly.dev/ui/kendo) | [StackBlitz](https://stackblitz.com/edit/ngx-formly-ui-kendo) |
|
|
51
|
-
| [NativeScript](https://www.nativescript.org) | ||
|
|
52
52
|
| [NG-ZORRO](http://ng.ant.design) | | [StackBlitz](https://stackblitz.com/edit/ngx-formly-ui-ng-zorro-antd) |
|
|
53
|
+
| [NativeScript](https://www.nativescript.org) | ||
|
|
53
54
|
|
|
54
55
|
**Which Version to use?**
|
|
55
56
|
|
|
56
57
|
| Angular version | Formly version |
|
|
57
58
|
| --------------- | ---------------------- |
|
|
59
|
+
| Angular >= 13 | `@ngx-formly/core@6.x` |
|
|
58
60
|
| Angular >= 7 | `@ngx-formly/core@5.x` |
|
|
59
61
|
| Angular >= 6 | `@ngx-formly/core@4.x` |
|
|
60
62
|
| Angular >= 5 | `@ngx-formly/core@3.x` |
|
package/package.json
CHANGED
|
@@ -1,40 +1,26 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ngx-formly/schematics",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "6.0.0-dev.343964e2",
|
|
4
4
|
"license": "MIT",
|
|
5
|
-
"homepage": "https://github.com/ngx-formly/ngx-formly#readme",
|
|
6
|
-
"description": "ngx-formly is an Angular 2 module which has a Components to help customize and render JavaScript/JSON configured forms. The formly-form Component and the FormlyConfig service are very powerful and bring unmatched maintainability to your application's forms.",
|
|
7
|
-
"keywords": [
|
|
8
|
-
"angular",
|
|
9
|
-
"forms",
|
|
10
|
-
"ngx-formly",
|
|
11
|
-
"ngx-formly",
|
|
12
|
-
"ngx-formly",
|
|
13
|
-
"formly",
|
|
14
|
-
"angular 2",
|
|
15
|
-
"angular 2 forms",
|
|
16
|
-
"json forms",
|
|
17
|
-
"form library",
|
|
18
|
-
"dynamic-forms"
|
|
19
|
-
],
|
|
20
|
-
"repository": {
|
|
21
|
-
"type": "git",
|
|
22
|
-
"url": "git+https://github.com/ngx-formly/ngx-formly.git"
|
|
23
|
-
},
|
|
24
|
-
"bugs": {
|
|
25
|
-
"url": "https://github.com/ngx-formly/ngx-formly/issues"
|
|
26
|
-
},
|
|
27
5
|
"scripts": {
|
|
28
|
-
"build": "tsc -p tsconfig.json"
|
|
29
|
-
"test": "npm run build && jasmine src/**/*_spec.js"
|
|
6
|
+
"build": "tsc -p tsconfig.lib.json"
|
|
30
7
|
},
|
|
31
8
|
"schematics": "./src/collection.json",
|
|
32
9
|
"ng-add": {
|
|
33
10
|
"save": "devDependencies"
|
|
34
11
|
},
|
|
35
12
|
"dependencies": {
|
|
36
|
-
"@angular-devkit/core": "
|
|
37
|
-
"@angular-devkit/schematics": "
|
|
38
|
-
"@schematics/angular": "
|
|
13
|
+
"@angular-devkit/core": "^13.0.3",
|
|
14
|
+
"@angular-devkit/schematics": "^13.0.3",
|
|
15
|
+
"@schematics/angular": "^13.0.3"
|
|
16
|
+
},
|
|
17
|
+
"homepage": "https://github.com/ngx-formly/ngx-formly#readme",
|
|
18
|
+
"description": "Formly is a dynamic (JSON powered) form library for Angular that bring unmatched maintainability to your application's forms.",
|
|
19
|
+
"repository": {
|
|
20
|
+
"type": "git",
|
|
21
|
+
"url": "git+https://github.com/ngx-formly/ngx-formly.git"
|
|
22
|
+
},
|
|
23
|
+
"bugs": {
|
|
24
|
+
"url": "https://github.com/ngx-formly/ngx-formly/issues"
|
|
39
25
|
}
|
|
40
26
|
}
|
package/src/collection.json
CHANGED
|
@@ -3,16 +3,10 @@
|
|
|
3
3
|
"extends": ["@schematics/angular"],
|
|
4
4
|
"schematics": {
|
|
5
5
|
"ng-add": {
|
|
6
|
-
"description": "
|
|
7
|
-
"factory": "./ng-add",
|
|
6
|
+
"description": "Installs Angular Formly",
|
|
7
|
+
"factory": "./ng-add/index#ngAdd",
|
|
8
8
|
"schema": "./ng-add/schema.json",
|
|
9
|
-
"aliases": ["
|
|
10
|
-
},
|
|
11
|
-
"wrapper": {
|
|
12
|
-
"aliases": [ "wc" ],
|
|
13
|
-
"factory": "./wrapper-component",
|
|
14
|
-
"description": "Create an @ngx-formly wrapper component.",
|
|
15
|
-
"schema": "./wrapper-component/schema.json"
|
|
9
|
+
"aliases": ["install"]
|
|
16
10
|
}
|
|
17
11
|
}
|
|
18
12
|
}
|
package/src/ng-add/index.d.ts
CHANGED
package/src/ng-add/index.js
CHANGED
|
@@ -1,5 +1,15 @@
|
|
|
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
|
+
};
|
|
2
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.ngAdd = void 0;
|
|
3
13
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
4
14
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
5
15
|
const ast_1 = require("../../utils/ast");
|
|
@@ -11,45 +21,41 @@ const package_1 = require("../../utils/package");
|
|
|
11
21
|
* - Adds pre-built themes to styles.ext
|
|
12
22
|
* - Adds Browser Animation to app.module
|
|
13
23
|
*/
|
|
14
|
-
function
|
|
15
|
-
return schematics_1.chain([
|
|
16
|
-
options && options.skipPackageJson ? schematics_1.noop() : addFormlyToPackageJson(),
|
|
24
|
+
function ngAdd(options) {
|
|
25
|
+
return (0, schematics_1.chain)([
|
|
26
|
+
options && options.skipPackageJson ? (0, schematics_1.noop)() : addFormlyToPackageJson(),
|
|
17
27
|
addFormlyModuleConfig(options),
|
|
18
|
-
options && options.uiTheme ? addUITheme(options) : schematics_1.noop(),
|
|
28
|
+
options && options.uiTheme ? addUITheme(options) : (0, schematics_1.noop)(),
|
|
19
29
|
]);
|
|
20
30
|
}
|
|
21
|
-
exports.
|
|
31
|
+
exports.ngAdd = ngAdd;
|
|
22
32
|
/** Add @angular/forms, @ngx-formly/core to package.json if not already present. */
|
|
23
33
|
function addFormlyToPackageJson() {
|
|
24
34
|
return (host, context) => {
|
|
25
|
-
package_1.addPackageToPackageJson(host, 'dependencies', '@angular/forms', lib_versions_1.angularVersion);
|
|
26
|
-
package_1.addPackageToPackageJson(host, 'dependencies', '@ngx-formly/core', lib_versions_1.ngxFormlyVersion);
|
|
35
|
+
(0, package_1.addPackageToPackageJson)(host, 'dependencies', '@angular/forms', lib_versions_1.angularVersion);
|
|
36
|
+
(0, package_1.addPackageToPackageJson)(host, 'dependencies', '@ngx-formly/core', lib_versions_1.ngxFormlyVersion);
|
|
27
37
|
context.addTask(new tasks_1.NodePackageInstallTask());
|
|
28
38
|
return host;
|
|
29
39
|
};
|
|
30
40
|
}
|
|
31
41
|
/** Add formly module to the relative module */
|
|
32
42
|
function addFormlyModuleConfig(options) {
|
|
33
|
-
return (host) => {
|
|
34
|
-
const modulePath = ast_1.findModuleFromOptions(host, options);
|
|
35
|
-
ast_1.addModuleImportToModule(host, modulePath, '
|
|
36
|
-
ast_1.addModuleImportToModule(host, modulePath, '
|
|
37
|
-
|
|
38
|
-
};
|
|
43
|
+
return (host) => __awaiter(this, void 0, void 0, function* () {
|
|
44
|
+
const modulePath = (yield (0, ast_1.findModuleFromOptions)(host, options));
|
|
45
|
+
(0, ast_1.addModuleImportToModule)(host, modulePath, 'FormlyModule.forRoot()', '@ngx-formly/core');
|
|
46
|
+
(0, ast_1.addModuleImportToModule)(host, modulePath, 'ReactiveFormsModule', '@angular/forms');
|
|
47
|
+
});
|
|
39
48
|
}
|
|
40
49
|
/** Add UI module to app.module */
|
|
41
50
|
function addUITheme(options) {
|
|
42
|
-
return (host,
|
|
43
|
-
const modulePath = ast_1.findModuleFromOptions(host, options);
|
|
51
|
+
return (host) => __awaiter(this, void 0, void 0, function* () {
|
|
52
|
+
const modulePath = yield (0, ast_1.findModuleFromOptions)(host, options);
|
|
44
53
|
const uiTheme = options.uiTheme;
|
|
45
54
|
if (uiTheme) {
|
|
46
|
-
package_1.addPackageToPackageJson(host, 'dependencies', `@ngx-formly/${uiTheme}`,
|
|
47
|
-
|
|
48
|
-
// context.addTask(new NodePackageInstallTask());
|
|
49
|
-
ast_1.addModuleImportToModule(host, modulePath, `Formly${mapUIName(uiTheme)}Module`, `@ngx-formly/${uiTheme}`);
|
|
55
|
+
(0, package_1.addPackageToPackageJson)(host, 'dependencies', `@ngx-formly/${uiTheme}`, lib_versions_1.ngxFormlyVersion);
|
|
56
|
+
(0, ast_1.addModuleImportToModule)(host, modulePath, `Formly${mapUIName(uiTheme)}Module`, `@ngx-formly/${uiTheme}`);
|
|
50
57
|
}
|
|
51
|
-
|
|
52
|
-
};
|
|
58
|
+
});
|
|
53
59
|
}
|
|
54
60
|
// @TODO: available themes should probably be moved to some config file
|
|
55
61
|
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,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;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,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,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,6BAAuB,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/index.spec.js
CHANGED
|
@@ -64,7 +64,7 @@ describe('ng-add-schematic', () => {
|
|
|
64
64
|
/import { ReactiveFormsModule } from '@angular\/forms';/);
|
|
65
65
|
expect(content).toMatch(
|
|
66
66
|
// eslint-disable-next-line:trailing-comma
|
|
67
|
-
/ReactiveFormsModule
|
|
67
|
+
/ReactiveFormsModule/);
|
|
68
68
|
}));
|
|
69
69
|
it('should add UI theme to package.json', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
70
70
|
const tree = yield runner
|
|
@@ -98,7 +98,7 @@ describe('ng-add-schematic', () => {
|
|
|
98
98
|
export class FooModule { }
|
|
99
99
|
`);
|
|
100
100
|
const tree = yield runner
|
|
101
|
-
.runSchematicAsync('ng-add', { module: '
|
|
101
|
+
.runSchematicAsync('ng-add', { module: 'foo.module.ts' }, appTree)
|
|
102
102
|
.toPromise();
|
|
103
103
|
const content = tree.readContent(fooModule);
|
|
104
104
|
expect(content).toMatch(
|
|
@@ -112,7 +112,7 @@ describe('ng-add-schematic', () => {
|
|
|
112
112
|
/import { ReactiveFormsModule } from '@angular\/forms';/);
|
|
113
113
|
expect(content).toMatch(
|
|
114
114
|
// eslint-disable-next-line:trailing-comma
|
|
115
|
-
/ReactiveFormsModule
|
|
115
|
+
/ReactiveFormsModule/);
|
|
116
116
|
}));
|
|
117
117
|
});
|
|
118
|
-
//# sourceMappingURL=index.spec.js.map
|
|
118
|
+
//# sourceMappingURL=index.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.spec.js","sourceRoot":"","sources":["index.spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,gEAAuF;AACvF,+BAA4B;AAC5B,2DAAkE;AAClE,iDAA0E;AAG1E,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;IAC9D,MAAM,WAAW,GAAG,IAAA,4BAAkB,GAAE,CAAC;IAEzC,IAAI,MAA2B,CAAC;IAChC,IAAI,OAAqB,CAAC;IAE1B,UAAU,CAAC,GAAS,EAAE;QACpB,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;QAChE,OAAO,GAAG,MAAM,IAAA,yBAAe,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,GAAS,EAAE;QAC1C,MAAM,IAAI,GAAG,MAAM,MAAM;aACtB,iBAAiB,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,CAAC;aACxC,SAAS,EAAE,CAAC;QACf,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,qBAAc,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAEtE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACjE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACrE,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAS,EAAE;QACjE,MAAM,IAAI,GAAG,MAAM,MAAM;aACtB,iBAAiB,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,CAAC;aACxC,SAAS,EAAE,CAAC;QACf,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,qBAAc,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAEtE,2EAA2E;QAC3E,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACtF,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,eAAe,KAAK,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QAC3E,CAAC,CAAC,CAAC;IACL,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAS,EAAE;QAC/C,MAAM,OAAO,GAAG,EAAE,eAAe,EAAE,IAAI,EAAY,CAAC;QACpD,MAAM,IAAI,GAAG,MAAM,MAAM;aACtB,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC;aAC7C,SAAS,EAAE,CAAC;QAEf,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,qBAAc,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAEtE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACvE,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,GAAS,EAAE;QAC7C,MAAM,IAAI,GAAG,MAAM,MAAM;aACtB,iBAAiB,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,CAAC;aACxC,SAAS,EAAE,CAAC;QAEf,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,WAAW,wBAAwB,CAAC,CAAC;QACzE,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,mDAAmD,CACpD,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,sBAAsB,CACvB,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,wDAAwD,CACzD,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,
|
|
1
|
+
{"version":3,"file":"index.spec.js","sourceRoot":"","sources":["index.spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,gEAAuF;AACvF,+BAA4B;AAC5B,2DAAkE;AAClE,iDAA0E;AAG1E,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;IAC9D,MAAM,WAAW,GAAG,IAAA,4BAAkB,GAAE,CAAC;IAEzC,IAAI,MAA2B,CAAC;IAChC,IAAI,OAAqB,CAAC;IAE1B,UAAU,CAAC,GAAS,EAAE;QACpB,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;QAChE,OAAO,GAAG,MAAM,IAAA,yBAAe,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,GAAS,EAAE;QAC1C,MAAM,IAAI,GAAG,MAAM,MAAM;aACtB,iBAAiB,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,CAAC;aACxC,SAAS,EAAE,CAAC;QACf,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,qBAAc,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAEtE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACjE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACrE,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAS,EAAE;QACjE,MAAM,IAAI,GAAG,MAAM,MAAM;aACtB,iBAAiB,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,CAAC;aACxC,SAAS,EAAE,CAAC;QACf,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,qBAAc,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAEtE,2EAA2E;QAC3E,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACtF,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,eAAe,KAAK,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QAC3E,CAAC,CAAC,CAAC;IACL,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAS,EAAE;QAC/C,MAAM,OAAO,GAAG,EAAE,eAAe,EAAE,IAAI,EAAY,CAAC;QACpD,MAAM,IAAI,GAAG,MAAM,MAAM;aACtB,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC;aAC7C,SAAS,EAAE,CAAC;QAEf,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,qBAAc,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAEtE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACvE,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,GAAS,EAAE;QAC7C,MAAM,IAAI,GAAG,MAAM,MAAM;aACtB,iBAAiB,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,CAAC;aACxC,SAAS,EAAE,CAAC;QAEf,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,WAAW,wBAAwB,CAAC,CAAC;QACzE,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,mDAAmD,CACpD,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,sBAAsB,CACvB,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,wDAAwD,CACzD,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,qBAAqB,CACtB,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAS,EAAE;QACnD,MAAM,IAAI,GAAG,MAAM,MAAM;aACtB,iBAAiB,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,OAAO,CAAC;aAC9D,SAAS,EAAE,CAAC;QAEf,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,qBAAc,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAEtE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,uBAAuB,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAC1E,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAS,EAAE;QACtD,MAAM,IAAI,GAAG,MAAM,MAAM;aACtB,iBAAiB,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,OAAO,CAAC;aAC9D,SAAS,EAAE,CAAC;QAEf,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,WAAW,wBAAwB,CAAC,CAAC;QACzE,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,iEAAiE,CAClE,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,uBAAuB,CACxB,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,0BAA0B,EAAE,GAAS,EAAE;QACxC,MAAM,SAAS,GAAG,GAAG,WAAW,wBAAwB,CAAC;QAEzD,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE;;;;;;;;;KASzB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,MAAM,MAAM;aACtB,iBAAiB,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,OAAO,CAAC;aACjE,SAAS,EAAE,CAAC;QAEf,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAE5C,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,mDAAmD,CACpD,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,sBAAsB,CACvB,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,wDAAwD,CACzD,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,qBAAqB,CACtB,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/src/ng-add/schema.json
CHANGED
package/utils/ast.d.ts
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import { Tree } from '@angular-devkit/schematics';
|
|
2
2
|
import * as ts from 'typescript';
|
|
3
|
-
import { WorkspaceProject
|
|
4
|
-
export declare function getWorkspacePath(host: Tree): string;
|
|
5
|
-
export declare function getWorkspace(host: Tree): WorkspaceSchema;
|
|
3
|
+
import { WorkspaceProject } from '@schematics/angular/utility/workspace-models';
|
|
6
4
|
/** Reads file given path and returns TypeScript source file. */
|
|
7
|
-
export declare function
|
|
5
|
+
export declare function parseSourceFile(host: Tree, path: string): ts.SourceFile;
|
|
8
6
|
/** Import and add module to root app module. */
|
|
9
7
|
export declare function addModuleImportToRootModule(host: Tree, moduleName: string, src: string, project: WorkspaceProject): void;
|
|
10
8
|
/**
|
|
@@ -20,4 +18,4 @@ export declare function getIndexHtmlPath(host: Tree, project: WorkspaceProject):
|
|
|
20
18
|
/** Get the root stylesheet file. */
|
|
21
19
|
export declare function getStylesPath(host: Tree, project: WorkspaceProject): string;
|
|
22
20
|
/** Wraps the internal find module from options with undefined path handling */
|
|
23
|
-
export declare function findModuleFromOptions(host: Tree, options: any):
|
|
21
|
+
export declare function findModuleFromOptions(host: Tree, options: any): Promise<string | undefined>;
|
package/utils/ast.js
CHANGED
|
@@ -1,5 +1,15 @@
|
|
|
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
|
+
};
|
|
2
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.findModuleFromOptions = exports.getStylesPath = exports.getIndexHtmlPath = exports.addModuleImportToModule = exports.addModuleImportToRootModule = exports.parseSourceFile = void 0;
|
|
3
13
|
const core_1 = require("@angular-devkit/core");
|
|
4
14
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
15
|
const ts = require("typescript");
|
|
@@ -7,35 +17,19 @@ const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
|
7
17
|
const change_1 = require("@schematics/angular/utility/change");
|
|
8
18
|
const ng_ast_utils_1 = require("@schematics/angular/utility/ng-ast-utils");
|
|
9
19
|
const find_module_1 = require("@schematics/angular/utility/find-module");
|
|
10
|
-
|
|
11
|
-
const possibleFiles = ['/angular.json', '/.angular.json'];
|
|
12
|
-
const path = possibleFiles.filter(path => host.exists(path))[0];
|
|
13
|
-
return path;
|
|
14
|
-
}
|
|
15
|
-
exports.getWorkspacePath = getWorkspacePath;
|
|
16
|
-
function getWorkspace(host) {
|
|
17
|
-
const path = getWorkspacePath(host);
|
|
18
|
-
const configBuffer = host.read(path);
|
|
19
|
-
if (configBuffer === null) {
|
|
20
|
-
throw new schematics_1.SchematicsException(`Could not find (${path})`);
|
|
21
|
-
}
|
|
22
|
-
const content = configBuffer.toString();
|
|
23
|
-
return core_1.parseJson(content, core_1.JsonParseMode.Loose);
|
|
24
|
-
}
|
|
25
|
-
exports.getWorkspace = getWorkspace;
|
|
20
|
+
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
26
21
|
/** Reads file given path and returns TypeScript source file. */
|
|
27
|
-
function
|
|
22
|
+
function parseSourceFile(host, path) {
|
|
28
23
|
const buffer = host.read(path);
|
|
29
24
|
if (!buffer) {
|
|
30
25
|
throw new schematics_1.SchematicsException(`Could not find file for path: ${path}`);
|
|
31
26
|
}
|
|
32
|
-
|
|
33
|
-
return ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);
|
|
27
|
+
return ts.createSourceFile(path, buffer.toString(), ts.ScriptTarget.Latest, true);
|
|
34
28
|
}
|
|
35
|
-
exports.
|
|
29
|
+
exports.parseSourceFile = parseSourceFile;
|
|
36
30
|
/** Import and add module to root app module. */
|
|
37
31
|
function addModuleImportToRootModule(host, moduleName, src, project) {
|
|
38
|
-
const modulePath = ng_ast_utils_1.getAppModulePath(host, project.architect.build.options.main);
|
|
32
|
+
const modulePath = (0, ng_ast_utils_1.getAppModulePath)(host, project.architect.build.options.main);
|
|
39
33
|
addModuleImportToModule(host, modulePath, moduleName, src);
|
|
40
34
|
}
|
|
41
35
|
exports.addModuleImportToRootModule = addModuleImportToRootModule;
|
|
@@ -47,11 +41,11 @@ exports.addModuleImportToRootModule = addModuleImportToRootModule;
|
|
|
47
41
|
* @param src src location to import
|
|
48
42
|
*/
|
|
49
43
|
function addModuleImportToModule(host, modulePath, moduleName, src) {
|
|
50
|
-
const moduleSource =
|
|
44
|
+
const moduleSource = parseSourceFile(host, modulePath);
|
|
51
45
|
if (!moduleSource) {
|
|
52
46
|
throw new schematics_1.SchematicsException(`Module not found: ${modulePath}`);
|
|
53
47
|
}
|
|
54
|
-
const changes = ast_utils_1.addImportToModule(moduleSource, modulePath, moduleName, src);
|
|
48
|
+
const changes = (0, ast_utils_1.addImportToModule)(moduleSource, modulePath, moduleName, src);
|
|
55
49
|
const recorder = host.beginUpdate(modulePath);
|
|
56
50
|
changes.forEach((change) => {
|
|
57
51
|
if (change instanceof change_1.InsertChange) {
|
|
@@ -79,12 +73,12 @@ function getStylesPath(host, project) {
|
|
|
79
73
|
// "main" style sheet.
|
|
80
74
|
const defaultMainStylePath = styles.find(a => /styles\.(c|le|sc)ss/.test(a));
|
|
81
75
|
if (defaultMainStylePath) {
|
|
82
|
-
return core_1.normalize(defaultMainStylePath);
|
|
76
|
+
return (0, core_1.normalize)(defaultMainStylePath);
|
|
83
77
|
}
|
|
84
78
|
// If there was no obvious default file, use the first style asset.
|
|
85
79
|
const fallbackStylePath = styles.find(a => /\.(c|le|sc)ss/.test(a));
|
|
86
80
|
if (fallbackStylePath) {
|
|
87
|
-
return core_1.normalize(fallbackStylePath);
|
|
81
|
+
return (0, core_1.normalize)(fallbackStylePath);
|
|
88
82
|
}
|
|
89
83
|
}
|
|
90
84
|
throw new schematics_1.SchematicsException('No style files could be found into which a theme could be added');
|
|
@@ -92,18 +86,17 @@ function getStylesPath(host, project) {
|
|
|
92
86
|
exports.getStylesPath = getStylesPath;
|
|
93
87
|
/** Wraps the internal find module from options with undefined path handling */
|
|
94
88
|
function findModuleFromOptions(host, options) {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
options.project
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
}
|
|
106
|
-
return find_module_1.findModuleFromOptions(host, options);
|
|
89
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
90
|
+
const workspace = yield (0, workspace_1.getWorkspace)(host);
|
|
91
|
+
if (!options.project) {
|
|
92
|
+
options.project = Array.from(workspace.projects.keys())[0];
|
|
93
|
+
}
|
|
94
|
+
const project = workspace.projects.get(options.project);
|
|
95
|
+
if (options.path === undefined) {
|
|
96
|
+
options.path = `/${project.root}/src/app`;
|
|
97
|
+
}
|
|
98
|
+
return (0, find_module_1.findModuleFromOptions)(host, options);
|
|
99
|
+
});
|
|
107
100
|
}
|
|
108
101
|
exports.findModuleFromOptions = findModuleFromOptions;
|
|
109
102
|
//# 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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"}
|
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 = "^13.0.0";
|
|
2
|
+
export declare const ngxFormlyVersion = "^6.0.0-next";
|
package/utils/lib-versions.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.angularVersion =
|
|
4
|
-
exports.
|
|
3
|
+
exports.ngxFormlyVersion = exports.angularVersion = void 0;
|
|
4
|
+
exports.angularVersion = '^13.0.0';
|
|
5
|
+
exports.ngxFormlyVersion = '^6.0.0-next';
|
|
5
6
|
//# sourceMappingURL=lib-versions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib-versions.js","sourceRoot":"","sources":["lib-versions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lib-versions.js","sourceRoot":"","sources":["lib-versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,gBAAgB,GAAG,aAAa,CAAC"}
|
package/utils/package.js
CHANGED
package/utils/package.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.js","sourceRoot":"","sources":["package.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["package.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,SAAgB,uBAAuB,CACnC,IAAU,EAAE,IAAY,EAAE,GAAW,EAAE,OAAe;IACxD,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAChE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACf,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;SACjB;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE;YACpB,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;SAC3B;QAED,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;KAC/D;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAjBD,0DAiBC"}
|
package/utils/testing.d.ts
CHANGED
package/utils/testing.js
CHANGED
|
@@ -1,12 +1,22 @@
|
|
|
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
|
+
};
|
|
2
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.createWorkspace = exports.getTestProjectPath = void 0;
|
|
3
13
|
const defaultWorkspaceOptions = {
|
|
4
14
|
name: 'workspace',
|
|
5
15
|
newProjectRoot: 'projects',
|
|
6
16
|
version: '6.0.0',
|
|
7
17
|
};
|
|
8
18
|
const defaultAppOptions = {
|
|
9
|
-
name: '
|
|
19
|
+
name: 'formly',
|
|
10
20
|
inlineStyle: false,
|
|
11
21
|
inlineTemplate: false,
|
|
12
22
|
viewEncapsulation: 'Emulated',
|
|
@@ -25,9 +35,15 @@ function getTestProjectPath(workspaceOptions = defaultWorkspaceOptions, appOptio
|
|
|
25
35
|
}
|
|
26
36
|
exports.getTestProjectPath = getTestProjectPath;
|
|
27
37
|
function createWorkspace(schematicRunner, appTree, workspaceOptions = defaultWorkspaceOptions, appOptions = defaultAppOptions) {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
38
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
39
|
+
appTree = yield schematicRunner
|
|
40
|
+
.runExternalSchematicAsync('@schematics/angular', 'workspace', workspaceOptions)
|
|
41
|
+
.toPromise();
|
|
42
|
+
appTree = yield schematicRunner
|
|
43
|
+
.runExternalSchematicAsync('@schematics/angular', 'application', appOptions, appTree)
|
|
44
|
+
.toPromise();
|
|
45
|
+
return appTree;
|
|
46
|
+
});
|
|
31
47
|
}
|
|
32
48
|
exports.createWorkspace = createWorkspace;
|
|
33
49
|
//# 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":";;;;;;;;;;;;AAKA,MAAM,uBAAuB,GAAG;IAC9B,IAAI,EAAE,WAAW;IACjB,cAAc,EAAE,UAAU;IAC1B,OAAO,EAAE,OAAO;CACjB,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;CACjB,CAAC;AAEF,iCAAiC;AACjC,iBAAiB;AACjB,gBAAgB;AAChB,uBAAuB;AACvB,iBAAiB;AACjB,KAAK;AAEL,SAAgB,kBAAkB,CAChC,mBAAwB,uBAAuB,EAC/C,aAAkB,iBAAiB;IAEnC,OAAO,IAAI,gBAAgB,CAAC,cAAc,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;AAClE,CAAC;AALD,gDAKC;AAED,SAAsB,eAAe,CACnC,eAAoC,EACpC,OAAqB,EACrB,gBAAgB,GAAG,uBAAuB,EAC1C,UAAU,GAAG,iBAAiB;;QAE9B,OAAO,GAAG,MAAM,eAAe;aAC5B,yBAAyB,CACxB,qBAAqB,EACrB,WAAW,EACX,gBAAgB,CACjB;aACA,SAAS,EAAE,CAAC;QACf,OAAO,GAAG,MAAM,eAAe;aAC5B,yBAAyB,CACxB,qBAAqB,EACrB,aAAa,EACb,UAAU,EACV,OAAO,CACR;aACA,SAAS,EAAE,CAAC;QAEf,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA;AAvBD,0CAuBC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
package/src/ng-add/index_spec.js
DELETED
|
@@ -1,100 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const testing_1 = require("@angular-devkit/schematics/testing");
|
|
4
|
-
const path_1 = require("path");
|
|
5
|
-
const test_1 = require("@schematics/angular/utility/test");
|
|
6
|
-
const testing_2 = require("../../utils/testing");
|
|
7
|
-
describe('ng-add-schematic', () => {
|
|
8
|
-
const collectionPath = path_1.join(__dirname, '../collection.json');
|
|
9
|
-
const schematicRunner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
10
|
-
const projectPath = testing_2.getTestProjectPath();
|
|
11
|
-
let appTree;
|
|
12
|
-
beforeEach(() => {
|
|
13
|
-
appTree = testing_2.createWorkspace(schematicRunner, appTree);
|
|
14
|
-
});
|
|
15
|
-
it('should update package.json', () => {
|
|
16
|
-
const tree = schematicRunner.runSchematic('ng-add', {}, appTree);
|
|
17
|
-
const packageJson = JSON.parse(test_1.getFileContent(tree, '/package.json'));
|
|
18
|
-
expect(packageJson.dependencies['@angular/forms']).toBeDefined();
|
|
19
|
-
expect(packageJson.dependencies['@ngx-formly/core']).toBeDefined();
|
|
20
|
-
});
|
|
21
|
-
it('should not add a theme by default to package.json', () => {
|
|
22
|
-
const tree = schematicRunner.runSchematic('ng-add', {}, appTree);
|
|
23
|
-
const packageJson = JSON.parse(test_1.getFileContent(tree, '/package.json'));
|
|
24
|
-
// @TODO: list of themes should probably be retrieved from some config file
|
|
25
|
-
['material', 'bootstrap', 'ionic', 'primeng', 'kendo', 'ng-zorro-antd'].forEach(theme => {
|
|
26
|
-
expect(packageJson.dependencies[`@ngx-formly/${theme}`]).toBeUndefined();
|
|
27
|
-
});
|
|
28
|
-
});
|
|
29
|
-
it('should skip package.json update', () => {
|
|
30
|
-
const options = { skipPackageJson: true };
|
|
31
|
-
const tree = schematicRunner.runSchematic('ng-add', options, appTree);
|
|
32
|
-
const packageJson = JSON.parse(test_1.getFileContent(tree, '/package.json'));
|
|
33
|
-
expect(packageJson.dependencies['@ngx-formly/core']).toBeUndefined();
|
|
34
|
-
});
|
|
35
|
-
it('should add to root app module', () => {
|
|
36
|
-
const tree = schematicRunner.runSchematic('ng-add', {}, appTree);
|
|
37
|
-
const content = tree.readContent(`${projectPath}/src/app/app.module.ts`);
|
|
38
|
-
expect(content).toMatch(
|
|
39
|
-
// tslint:disable-next-line:trailing-comma
|
|
40
|
-
/import { FormlyModule } from '@ngx-formly\/core';/);
|
|
41
|
-
expect(content).toMatch(
|
|
42
|
-
// tslint:disable-next-line:trailing-comma
|
|
43
|
-
/FormlyModule.forRoot/);
|
|
44
|
-
expect(content).toMatch(
|
|
45
|
-
// tslint:disable-next-line:trailing-comma
|
|
46
|
-
/import { ReactiveFormsModule } from '@angular\/forms';/);
|
|
47
|
-
expect(content).toMatch(
|
|
48
|
-
// tslint:disable-next-line:trailing-comma
|
|
49
|
-
/ReactiveFormsModule,/);
|
|
50
|
-
});
|
|
51
|
-
it('should add UI theme to package.json', () => {
|
|
52
|
-
const tree = schematicRunner.runSchematic('ng-add', {
|
|
53
|
-
uiTheme: 'bootstrap',
|
|
54
|
-
}, appTree);
|
|
55
|
-
const packageJson = JSON.parse(test_1.getFileContent(tree, '/package.json'));
|
|
56
|
-
expect(packageJson.dependencies['@ngx-formly/bootstrap']).toBeDefined();
|
|
57
|
-
});
|
|
58
|
-
it('should add UI theme to root app module', () => {
|
|
59
|
-
const tree = schematicRunner.runSchematic('ng-add', {
|
|
60
|
-
uiTheme: 'bootstrap',
|
|
61
|
-
}, appTree);
|
|
62
|
-
const content = tree.readContent(`${projectPath}/src/app/app.module.ts`);
|
|
63
|
-
expect(content).toMatch(
|
|
64
|
-
// tslint:disable-next-line:trailing-comma
|
|
65
|
-
/import { FormlyBootstrapModule } from '@ngx-formly\/bootstrap';/);
|
|
66
|
-
expect(content).toMatch(
|
|
67
|
-
// tslint:disable-next-line:trailing-comma
|
|
68
|
-
/FormlyBootstrapModule/);
|
|
69
|
-
});
|
|
70
|
-
it('should add to any module', () => {
|
|
71
|
-
const fooModule = `${projectPath}/src/app/foo.module.ts`;
|
|
72
|
-
appTree.create(fooModule, `
|
|
73
|
-
import { NgModule } from '@angular/core';
|
|
74
|
-
import { CommonModule } from '@angular/common';
|
|
75
|
-
|
|
76
|
-
@NgModule({
|
|
77
|
-
imports: [],
|
|
78
|
-
declarations: []
|
|
79
|
-
})
|
|
80
|
-
export class FooModule { }
|
|
81
|
-
`);
|
|
82
|
-
const tree = schematicRunner.runSchematic('ng-add', {
|
|
83
|
-
module: 'app/foo.module.ts',
|
|
84
|
-
}, appTree);
|
|
85
|
-
const content = tree.readContent(fooModule);
|
|
86
|
-
expect(content).toMatch(
|
|
87
|
-
// tslint:disable-next-line:trailing-comma
|
|
88
|
-
/import { FormlyModule } from '@ngx-formly\/core';/);
|
|
89
|
-
expect(content).toMatch(
|
|
90
|
-
// tslint:disable-next-line:trailing-comma
|
|
91
|
-
/FormlyModule.forRoot/);
|
|
92
|
-
expect(content).toMatch(
|
|
93
|
-
// tslint:disable-next-line:trailing-comma
|
|
94
|
-
/import { ReactiveFormsModule } from '@angular\/forms';/);
|
|
95
|
-
expect(content).toMatch(
|
|
96
|
-
// tslint:disable-next-line:trailing-comma
|
|
97
|
-
/ReactiveFormsModule,/);
|
|
98
|
-
});
|
|
99
|
-
});
|
|
100
|
-
//# sourceMappingURL=index_spec.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;AAAA,gEAAuF;AACvF,+BAA4B;AAC5B,2DAAkE;AAClE,iDAA0E;AAG1E,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,MAAM,cAAc,GAAG,WAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;IAC7D,MAAM,eAAe,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAC9E,MAAM,WAAW,GAAG,4BAAkB,EAAE,CAAC;IAEzC,IAAI,OAAqB,CAAC;IAE1B,UAAU,CAAC,GAAG,EAAE;QACd,OAAO,GAAG,yBAAe,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QACpC,MAAM,IAAI,GAAG,eAAe,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QACjE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAc,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAEtE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACjE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,IAAI,GAAG,eAAe,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QACjE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAc,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAEtE,2EAA2E;QAC3E,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACtF,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,eAAe,KAAK,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QAC3E,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,OAAO,GAAG,EAAE,eAAe,EAAE,IAAI,EAAY,CAAC;QACpD,MAAM,IAAI,GAAG,eAAe,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAc,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAEtE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACvC,MAAM,IAAI,GAAG,eAAe,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAEjE,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,WAAW,wBAAwB,CAAC,CAAC;QACzE,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,mDAAmD,CACpD,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,sBAAsB,CACvB,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,wDAAwD,CACzD,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,sBAAsB,CACvB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,IAAI,GAAG,eAAe,CAAC,YAAY,CAAC,QAAQ,EAAE;YAClD,OAAO,EAAE,WAAW;SACrB,EAAE,OAAO,CAAC,CAAC;QAEZ,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAc,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAEtE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,uBAAuB,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,MAAM,IAAI,GAAG,eAAe,CAAC,YAAY,CAAC,QAAQ,EAAE;YAClD,OAAO,EAAE,WAAW;SACrB,EAAE,OAAO,CAAC,CAAC;QAEZ,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,WAAW,wBAAwB,CAAC,CAAC;QACzE,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,iEAAiE,CAClE,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,uBAAuB,CACxB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0BAA0B,EAAE,GAAG,EAAE;QAClC,MAAM,SAAS,GAAG,GAAG,WAAW,wBAAwB,CAAC;QAEzD,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE;;;;;;;;;KASzB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,eAAe,CAAC,YAAY,CAAC,QAAQ,EAAE;YAClD,MAAM,EAAE,mBAAmB;SAC5B,EAAE,OAAO,CAAC,CAAC;QAEZ,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAE5C,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,mDAAmD,CACpD,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,sBAAsB,CACvB,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,wDAAwD,CACzD,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;QACrB,0CAA0C;QAC1C,sBAAsB,CACvB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
File without changes
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
import { Rule } from '@angular-devkit/schematics';
|
|
2
|
-
import { Schema } from './schema';
|
|
3
|
-
/**
|
|
4
|
-
* Scaffolds a new wrapper component.
|
|
5
|
-
* Internally it bootstraps the base component schematic
|
|
6
|
-
*/
|
|
7
|
-
export default function (options: Schema): Rule;
|
|
8
|
-
/**
|
|
9
|
-
* Add the wrapper component to FormlyModule
|
|
10
|
-
*/
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const schematics_1 = require("@angular-devkit/schematics");
|
|
4
|
-
const component_1 = require("@schematics/angular/component");
|
|
5
|
-
/**
|
|
6
|
-
* Scaffolds a new wrapper component.
|
|
7
|
-
* Internally it bootstraps the base component schematic
|
|
8
|
-
*/
|
|
9
|
-
function default_1(options) {
|
|
10
|
-
return schematics_1.chain([
|
|
11
|
-
component_1.default(Object.assign({}, options)),
|
|
12
|
-
]);
|
|
13
|
-
}
|
|
14
|
-
exports.default = default_1;
|
|
15
|
-
/**
|
|
16
|
-
* Add the wrapper component to FormlyModule
|
|
17
|
-
*/
|
|
18
|
-
// function addWrapperToModule(options: Schema) {
|
|
19
|
-
// return (host: Tree) => {
|
|
20
|
-
// return host;
|
|
21
|
-
// };
|
|
22
|
-
// }
|
|
23
|
-
//# sourceMappingURL=index.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAAA,2DAAyD;AACzD,6DAA2D;AAG3D;;;GAGG;AACH,mBAAwB,OAAe;IACrC,OAAO,kBAAK,CAAC;QACX,mBAAc,mBAAM,OAAO,EAAG;KAE/B,CAAC,CAAC;AACL,CAAC;AALD,4BAKC;AAED;;GAEG;AACH,iDAAiD;AACjD,6BAA6B;AAC7B,mBAAmB;AACnB,OAAO;AACP,IAAI"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
|
@@ -1,55 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
/**
|
|
4
|
-
* @license
|
|
5
|
-
* Copyright Google Inc. All Rights Reserved.
|
|
6
|
-
*
|
|
7
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
8
|
-
* found in the LICENSE file at https://angular.io/license
|
|
9
|
-
*/
|
|
10
|
-
const testing_1 = require("@angular-devkit/schematics/testing");
|
|
11
|
-
const path_1 = require("path");
|
|
12
|
-
const testing_2 = require("../../utils/testing");
|
|
13
|
-
const test_1 = require("@schematics/angular/utility/test");
|
|
14
|
-
const schema_1 = require("@schematics/angular/component/schema");
|
|
15
|
-
// tslint:disable:max-line-length
|
|
16
|
-
xdescribe('Component Schematic', () => {
|
|
17
|
-
const collectionPath = path_1.join(__dirname, '../collection.json');
|
|
18
|
-
const defaultOptions = {
|
|
19
|
-
name: 'foo',
|
|
20
|
-
path: 'src/app',
|
|
21
|
-
inlineStyle: false,
|
|
22
|
-
inlineTemplate: false,
|
|
23
|
-
changeDetection: schema_1.ChangeDetection.Default,
|
|
24
|
-
styleext: 'css',
|
|
25
|
-
spec: true,
|
|
26
|
-
module: undefined,
|
|
27
|
-
export: false,
|
|
28
|
-
project: 'bar',
|
|
29
|
-
};
|
|
30
|
-
const schematicRunner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
31
|
-
const projectPath = testing_2.getTestProjectPath();
|
|
32
|
-
let appTree;
|
|
33
|
-
beforeEach(() => {
|
|
34
|
-
appTree = testing_2.createWorkspace(schematicRunner, appTree);
|
|
35
|
-
});
|
|
36
|
-
it('should create a component', () => {
|
|
37
|
-
const tree = schematicRunner.runSchematic('wrapper', Object.assign({}, defaultOptions), appTree);
|
|
38
|
-
const files = tree.files;
|
|
39
|
-
expect(files.indexOf(`${projectPath}/src/app/foo/foo.component.css`)).toBeGreaterThanOrEqual(0);
|
|
40
|
-
expect(files.indexOf(`${projectPath}/src/app/foo/foo.component.html`)).toBeGreaterThanOrEqual(0);
|
|
41
|
-
expect(files.indexOf(`${projectPath}/src/app/foo/foo.component.spec.ts`)).toBeGreaterThanOrEqual(0);
|
|
42
|
-
expect(files.indexOf(`${projectPath}/src/app/foo/foo.component.ts`)).toBeGreaterThanOrEqual(0);
|
|
43
|
-
const moduleContent = test_1.getFileContent(tree, `${projectPath}/src/app/app.module.ts`);
|
|
44
|
-
expect(moduleContent).toMatch(/import.*Foo.*from '.\/foo\/foo.component'/);
|
|
45
|
-
expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooComponent\r?\n/m);
|
|
46
|
-
});
|
|
47
|
-
xit('should add wrapper to FormlyModule config', () => {
|
|
48
|
-
const tree = schematicRunner.runSchematic('wrapper', Object.assign({}, defaultOptions), appTree);
|
|
49
|
-
const moduleContent = test_1.getFileContent(tree, `${projectPath}/src/app/app.module.ts`);
|
|
50
|
-
expect(moduleContent).toContain(`wrappers: [
|
|
51
|
-
{ name: 'foo', component: FooWrapperComponent },
|
|
52
|
-
],`);
|
|
53
|
-
});
|
|
54
|
-
});
|
|
55
|
-
//# sourceMappingURL=index_spec.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;AAAA;;;;;;GAMG;AACH,gEAAuF;AACvF,+BAA4B;AAC5B,iDAA0E;AAE1E,2DAAkE;AAClE,iEAAuE;AAEvE,iCAAiC;AACjC,SAAS,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACpC,MAAM,cAAc,GAAG,WAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;IAC7D,MAAM,cAAc,GAAqB;QACvC,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,KAAK;QACrB,eAAe,EAAE,wBAAe,CAAC,OAAO;QACxC,QAAQ,EAAE,KAAK;QACf,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,KAAK;KACf,CAAC;IACF,MAAM,eAAe,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAC9E,MAAM,WAAW,GAAG,4BAAkB,EAAE,CAAC;IAEzC,IAAI,OAAqB,CAAC;IAE1B,UAAU,CAAC,GAAG,EAAE;QACd,OAAO,GAAG,yBAAe,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,IAAI,GAAG,eAAe,CAAC,YAAY,CAAC,SAAS,oBAAO,cAAc,GAAI,OAAO,CAAC,CAAC;QAErF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,WAAW,gCAAgC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;QAChG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,WAAW,iCAAiC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;QACjG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,WAAW,oCAAoC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;QACpG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,WAAW,+BAA+B,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;QAE/F,MAAM,aAAa,GAAG,qBAAc,CAAC,IAAI,EAAE,GAAG,WAAW,wBAAwB,CAAC,CAAC;QAEnF,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;QAC3E,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,sDAAsD,CAAC,CAAC;IACxF,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACpD,MAAM,IAAI,GAAG,eAAe,CAAC,YAAY,CAAC,SAAS,oBAAO,cAAc,GAAI,OAAO,CAAC,CAAC;QACrF,MAAM,aAAa,GAAG,qBAAc,CAAC,IAAI,EAAE,GAAG,WAAW,wBAAwB,CAAC,CAAC;QAEnF,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC;;OAE7B,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["schema.ts"],"names":[],"mappings":""}
|
|
@@ -1,109 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"$schema": "http://json-schema.org/schema",
|
|
3
|
-
"id": "SchematicsFormlyWrapperComponent",
|
|
4
|
-
"title": "Formly Wrapper Component Options Schema",
|
|
5
|
-
"type": "object",
|
|
6
|
-
"properties": {
|
|
7
|
-
"path": {
|
|
8
|
-
"type": "string",
|
|
9
|
-
"format": "path",
|
|
10
|
-
"description": "The path to create the component.",
|
|
11
|
-
"visible": false
|
|
12
|
-
},
|
|
13
|
-
"project": {
|
|
14
|
-
"type": "string",
|
|
15
|
-
"description": "The name of the project.",
|
|
16
|
-
"$default": {
|
|
17
|
-
"$source": "projectName"
|
|
18
|
-
}
|
|
19
|
-
},
|
|
20
|
-
"name": {
|
|
21
|
-
"type": "string",
|
|
22
|
-
"description": "The name of the component.",
|
|
23
|
-
"$default": {
|
|
24
|
-
"$source": "argv",
|
|
25
|
-
"index": 0
|
|
26
|
-
}
|
|
27
|
-
},
|
|
28
|
-
"inlineStyle": {
|
|
29
|
-
"description": "Specifies if the style will be in the ts file.",
|
|
30
|
-
"type": "boolean",
|
|
31
|
-
"default": false,
|
|
32
|
-
"alias": "s"
|
|
33
|
-
},
|
|
34
|
-
"inlineTemplate": {
|
|
35
|
-
"description": "Specifies if the template will be in the ts file.",
|
|
36
|
-
"type": "boolean",
|
|
37
|
-
"default": false,
|
|
38
|
-
"alias": "t"
|
|
39
|
-
},
|
|
40
|
-
"viewEncapsulation": {
|
|
41
|
-
"description": "Specifies the view encapsulation strategy.",
|
|
42
|
-
"enum": ["Emulated", "Native", "None"],
|
|
43
|
-
"type": "string",
|
|
44
|
-
"alias": "v"
|
|
45
|
-
},
|
|
46
|
-
"changeDetection": {
|
|
47
|
-
"description": "Specifies the change detection strategy.",
|
|
48
|
-
"enum": ["Default", "OnPush"],
|
|
49
|
-
"type": "string",
|
|
50
|
-
"default": "Default",
|
|
51
|
-
"alias": "c"
|
|
52
|
-
},
|
|
53
|
-
"prefix": {
|
|
54
|
-
"type": "string",
|
|
55
|
-
"description": "The prefix to apply to generated selectors.",
|
|
56
|
-
"alias": "p",
|
|
57
|
-
"oneOf": [
|
|
58
|
-
{
|
|
59
|
-
"maxLength": 0
|
|
60
|
-
},
|
|
61
|
-
{
|
|
62
|
-
"minLength": 1,
|
|
63
|
-
"format": "html-selector"
|
|
64
|
-
}
|
|
65
|
-
]
|
|
66
|
-
},
|
|
67
|
-
"styleext": {
|
|
68
|
-
"description": "The file extension to be used for style files.",
|
|
69
|
-
"type": "string",
|
|
70
|
-
"default": "css"
|
|
71
|
-
},
|
|
72
|
-
"spec": {
|
|
73
|
-
"type": "boolean",
|
|
74
|
-
"description": "Specifies if a spec file is generated.",
|
|
75
|
-
"default": true
|
|
76
|
-
},
|
|
77
|
-
"flat": {
|
|
78
|
-
"type": "boolean",
|
|
79
|
-
"description": "Flag to indicate if a dir is created.",
|
|
80
|
-
"default": false
|
|
81
|
-
},
|
|
82
|
-
"skipImport": {
|
|
83
|
-
"type": "boolean",
|
|
84
|
-
"description": "Flag to skip the module import.",
|
|
85
|
-
"default": false
|
|
86
|
-
},
|
|
87
|
-
"selector": {
|
|
88
|
-
"type": "string",
|
|
89
|
-
"format": "html-selector",
|
|
90
|
-
"description": "The selector to use for the component."
|
|
91
|
-
},
|
|
92
|
-
"module": {
|
|
93
|
-
"type": "string",
|
|
94
|
-
"description": "Allows specification of the declaring module.",
|
|
95
|
-
"alias": "m"
|
|
96
|
-
},
|
|
97
|
-
"export": {
|
|
98
|
-
"type": "boolean",
|
|
99
|
-
"default": false,
|
|
100
|
-
"description": "Specifies if declaring module exports the component."
|
|
101
|
-
},
|
|
102
|
-
"entryComponent": {
|
|
103
|
-
"type": "boolean",
|
|
104
|
-
"default": false,
|
|
105
|
-
"description": "Specifies if the component is an entry component of declaring module."
|
|
106
|
-
}
|
|
107
|
-
},
|
|
108
|
-
"required": []
|
|
109
|
-
}
|
package/utils/html.d.ts
DELETED
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
import { Tree } from '@angular-devkit/schematics';
|
|
2
|
-
import { WorkspaceProject } from '@angular-devkit/core/src/workspace';
|
|
3
|
-
/**
|
|
4
|
-
* Parses the index.html file to get the HEAD tag position.
|
|
5
|
-
* @param host the tree we are traversing
|
|
6
|
-
* @param src the src path of the html file to parse
|
|
7
|
-
*/
|
|
8
|
-
export declare function getHeadTag(host: Tree, src: string): {
|
|
9
|
-
position: any;
|
|
10
|
-
};
|
|
11
|
-
/**
|
|
12
|
-
* Adds a link to the index.html head tag Example:
|
|
13
|
-
* `<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">`
|
|
14
|
-
* @param host The tree we are updating
|
|
15
|
-
* @param project The project we're targeting.
|
|
16
|
-
* @param link html element string we are inserting.
|
|
17
|
-
*/
|
|
18
|
-
export declare function addHeadLink(host: Tree, project: WorkspaceProject, link: string): void;
|
package/utils/html.js
DELETED
|
@@ -1,60 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const schematics_1 = require("@angular-devkit/schematics");
|
|
4
|
-
const parse5 = require("parse5");
|
|
5
|
-
const ast_1 = require("./ast");
|
|
6
|
-
const change_1 = require("@schematics/angular/utility/change");
|
|
7
|
-
/**
|
|
8
|
-
* Parses the index.html file to get the HEAD tag position.
|
|
9
|
-
* @param host the tree we are traversing
|
|
10
|
-
* @param src the src path of the html file to parse
|
|
11
|
-
*/
|
|
12
|
-
function getHeadTag(host, src) {
|
|
13
|
-
const document = parse5.parse(src, { locationInfo: true });
|
|
14
|
-
let head;
|
|
15
|
-
const visit = (nodes) => {
|
|
16
|
-
nodes.forEach(node => {
|
|
17
|
-
const element = node;
|
|
18
|
-
if (element.tagName === 'head') {
|
|
19
|
-
head = element;
|
|
20
|
-
}
|
|
21
|
-
else {
|
|
22
|
-
if (element.childNodes) {
|
|
23
|
-
visit(element.childNodes);
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
});
|
|
27
|
-
};
|
|
28
|
-
visit(document.childNodes);
|
|
29
|
-
if (!head) {
|
|
30
|
-
throw new schematics_1.SchematicsException('Head element not found!');
|
|
31
|
-
}
|
|
32
|
-
return {
|
|
33
|
-
position: head.__location.startTag.endOffset,
|
|
34
|
-
};
|
|
35
|
-
}
|
|
36
|
-
exports.getHeadTag = getHeadTag;
|
|
37
|
-
/**
|
|
38
|
-
* Adds a link to the index.html head tag Example:
|
|
39
|
-
* `<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">`
|
|
40
|
-
* @param host The tree we are updating
|
|
41
|
-
* @param project The project we're targeting.
|
|
42
|
-
* @param link html element string we are inserting.
|
|
43
|
-
*/
|
|
44
|
-
function addHeadLink(host, project, link) {
|
|
45
|
-
const indexPath = ast_1.getIndexHtmlPath(host, project);
|
|
46
|
-
const buffer = host.read(indexPath);
|
|
47
|
-
if (!buffer) {
|
|
48
|
-
throw new schematics_1.SchematicsException(`Could not find file for path: ${indexPath}`);
|
|
49
|
-
}
|
|
50
|
-
const src = buffer.toString();
|
|
51
|
-
if (src.indexOf(link) === -1) {
|
|
52
|
-
const node = getHeadTag(host, src);
|
|
53
|
-
const insertion = new change_1.InsertChange(indexPath, node.position, link);
|
|
54
|
-
const recorder = host.beginUpdate(indexPath);
|
|
55
|
-
recorder.insertLeft(insertion.pos, insertion.toAdd);
|
|
56
|
-
host.commitUpdate(recorder);
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
exports.addHeadLink = addHeadLink;
|
|
60
|
-
//# sourceMappingURL=html.js.map
|
package/utils/html.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"html.js","sourceRoot":"","sources":["html.ts"],"names":[],"mappings":";;AAAA,2DAAuE;AACvE,iCAAiC;AACjC,+BAAyC;AACzC,+DAAkE;AAGlE;;;;GAIG;AACH,SAAgB,UAAU,CAAC,IAAU,EAAE,GAAW;IAChD,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,EAC/B,EAAC,YAAY,EAAE,IAAI,EAAC,CAAgC,CAAC;IAEvD,IAAI,IAAI,CAAC;IACT,MAAM,KAAK,GAAG,CAAC,KAAgC,EAAE,EAAE;QACjD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnB,MAAM,OAAO,GAA+B,IAAI,CAAC;YACjD,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE;gBAC9B,IAAI,GAAG,OAAO,CAAC;aAChB;iBAAM;gBACL,IAAI,OAAO,CAAC,UAAU,EAAE;oBACtB,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;iBAC3B;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAE3B,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,gCAAmB,CAAC,yBAAyB,CAAC,CAAC;KAC1D;IAED,OAAO;QACL,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS;KAC7C,CAAC;AACJ,CAAC;AA3BD,gCA2BC;AAED;;;;;;GAMG;AACH,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB,EAAE,IAAY;IAC7E,MAAM,SAAS,GAAG,sBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpC,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,gCAAmB,CAAC,iCAAiC,SAAS,EAAE,CAAC,CAAC;KAC7E;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAC9B,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;QAC5B,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACnC,MAAM,SAAS,GAAG,IAAI,qBAAY,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACnE,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC7C,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;KAC7B;AACH,CAAC;AAfD,kCAeC"}
|