@coolon/angular-ui-powerups 3.4.5 → 3.4.6
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/CHANGELOG.md +7 -0
- package/package.json +1 -1
- package/schematics/aup-i18n/index.js +4 -12
- package/schematics/aup-i18n/index.js.map +1 -1
- package/schematics/bootstrap-app/index.js +4 -12
- package/schematics/bootstrap-app/index.js.map +1 -1
- package/schematics/bootstrap-app/templates/app/app-routing.module.ts.template +7 -3
- package/schematics/bootstrap-app/templates/app/places/places.module.ts.template +0 -3
- package/schematics/place-add/index.js +4 -3
- package/schematics/place-add/index.js.map +1 -1
- package/schematics/utils/build-context.d.ts +4 -5
- package/schematics/utils/build-context.js +1 -43
- package/schematics/utils/build-context.js.map +1 -1
- package/schematics/utils/workspace.d.ts +15 -0
- package/schematics/utils/workspace.js +54 -0
- package/schematics/utils/workspace.js.map +1 -0
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,13 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
### [3.4.6](https://bitbucket.org/coolon/angular-ui-powerups/compare/v3.4.5...v3.4.6) (2020-11-17)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* schematics not using correct source and app roots ([55ee77b](https://bitbucket.org/coolon/angular-ui-powerups/commit/55ee77b7a4517071386705cefeb4c57a9b7cf056))
|
|
11
|
+
|
|
5
12
|
### [3.4.5](https://bitbucket.org/coolon/angular-ui-powerups/compare/v3.4.4...v3.4.5) (2020-11-17)
|
|
6
13
|
|
|
7
14
|
|
package/package.json
CHANGED
|
@@ -3,23 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.applyWithOverwrite = exports.run = void 0;
|
|
4
4
|
const core_1 = require("@angular-devkit/core");
|
|
5
5
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
|
+
const workspace_1 = require("../utils/workspace");
|
|
6
7
|
// @see https://javascript-conference.com/blog/how-to-create-your-own-angular-schematics/
|
|
7
8
|
function run(_options) {
|
|
8
9
|
return (tree, _context) => {
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
throw new Error('Could not find Angular workspace configuration');
|
|
12
|
-
}
|
|
13
|
-
// convert workspace to string
|
|
14
|
-
const workspaceContent = workspaceConfig.toString();
|
|
15
|
-
// parse workspace string into JSON object
|
|
16
|
-
const workspace = JSON.parse(workspaceContent);
|
|
17
|
-
if (!_options.project) {
|
|
18
|
-
_options.project = workspace.defaultProject;
|
|
19
|
-
}
|
|
10
|
+
const workspace = workspace_1.Workspace.load(tree, _context);
|
|
11
|
+
const buildContext = workspace.getApplicationOrDefault(_options.project);
|
|
20
12
|
const templateSource = applyWithOverwrite(schematics_1.url('./templates'), [
|
|
21
13
|
schematics_1.applyTemplates(Object.assign(Object.assign({}, _options), core_1.strings)),
|
|
22
|
-
schematics_1.move(
|
|
14
|
+
schematics_1.move(buildContext.sourceRoot)
|
|
23
15
|
]);
|
|
24
16
|
const rules = [templateSource];
|
|
25
17
|
// if (_options.initialPlaceName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/aup-i18n/index.ts"],"names":[],"mappings":";;;AAAA,+CAA6D;AAC7D,2DAaoC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/aup-i18n/index.ts"],"names":[],"mappings":";;;AAAA,+CAA6D;AAC7D,2DAaoC;AACpC,kDAA+C;AAG/C,yFAAyF;AAEzF,SAAgB,GAAG,CAAC,QAAgB;IAElC,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAEhD,MAAM,SAAS,GAAG,qBAAS,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,SAAS,CAAC,uBAAuB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAExE,MAAM,cAAc,GAAG,kBAAkB,CACvC,gBAAG,CAAC,aAAa,CAAC,EAAE;YAClB,2BAAc,iCAAM,QAAQ,GAAK,cAAO,EAAG;YAC3C,iBAAI,CAAC,YAAY,CAAC,UAAU,CAAC;SAC9B,CAAC,CAAC;QAEL,MAAM,KAAK,GAAG,CAAC,cAAc,CAAC,CAAC;QAC/B,mCAAmC;QACnC,+EAA+E;QAC/E,mCAAmC;QACnC,oDAAoD;QACpD,SAAS;QACT,OAAO;QACP,IAAI;QACJ,OAAO,kBAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAS,CAAC;IAC9C,CAAC,CAAC;AACJ,CAAC;AAvBD,kBAuBC;AAED,8DAA8D;AAC9D,wDAAwD;AACxD,gDAAgD;AAChD,0BAA0B;AAC1B,4BAA4B;AAC5B,sIAAsI;AACtI,sIAAsI;AACtI,0FAA0F;AAC1F,kFAAkF;AAClF,WAAW;AACX,wBAAwB;AACxB,0BAA0B;AAC1B,0CAA0C;AAC1C,+DAA+D;AAC/D,gCAAgC;AAChC,YAAY;AACZ,UAAU;AACV,UAAU;AACV,OAAO;AACP,IAAI;AAEJ,2CAA2C;AAC3C,SAAgB,kBAAkB,CAAC,MAAc,EAAE,KAAa;IAC9D,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,MAAM,IAAI,GAAG,sBAAS,CACpB,kBAAK,CAAC,MAAM,EAAE;YACZ,GAAG,KAAK;YACR,oBAAO,CAAC,CAAC,SAAS,EAAE,EAAE;gBACpB,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;oBAC/B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;oBAClD,OAAO,IAAI,CAAC;iBACb;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC,CAAC;SACH,CAAC,CACH,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9B,CAAC,CAAC;AACJ,CAAC;AAjBD,gDAiBC;AAGD,6CAA6C;AAC7C,+DAA+D;AAC/D,YAAY;AACZ,wBAAwB;AACxB,uBAAuB;AACvB,qBAAqB;AACrB,qBAAqB;AACrB,0BAA0B;AAC1B,4BAA4B;AAC5B,QAAQ;AACR,IAAI;AAGJ,kDAAkD;AAClD,gCAAgC;AAChC,EAAE;AACF,yDAAyD;AACzD,EAAE;AACF,qDAAqD;AACrD,8CAA8C;AAC9C,UAAU;AACV,4EAA4E;AAC5E,EAAE;AACF,2BAA2B;AAC3B,kBAAkB;AAClB,UAAU;AACV,EAAE;AACF,2CAA2C;AAC3C,OAAO;AACP,IAAI;AAGJ,oDAAoD;AACpD,yDAAyD;AACzD,2EAA2E;AAC3E,mBAAmB;AACnB,OAAO;AACP,IAAI;AACJ,EAAE;AACF,qDAAqD;AACrD,yDAAyD;AACzD,oEAAoE;AACpE,mBAAmB;AACnB,OAAO;AACP,IAAI"}
|
|
@@ -4,23 +4,15 @@ exports.applyWithOverwrite = exports.bootstrapApp = void 0;
|
|
|
4
4
|
const core_1 = require("@angular-devkit/core");
|
|
5
5
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
6
|
const package_util_1 = require("../package-util");
|
|
7
|
+
const workspace_1 = require("../utils/workspace");
|
|
7
8
|
// @see https://javascript-conference.com/blog/how-to-create-your-own-angular-schematics/
|
|
8
9
|
function bootstrapApp(_options) {
|
|
9
10
|
return (tree, _context) => {
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
throw new Error('Could not find Angular workspace configuration');
|
|
13
|
-
}
|
|
14
|
-
// convert workspace to string
|
|
15
|
-
const workspaceContent = workspaceConfig.toString();
|
|
16
|
-
// parse workspace string into JSON object
|
|
17
|
-
const workspace = JSON.parse(workspaceContent);
|
|
18
|
-
if (!_options.project) {
|
|
19
|
-
_options.project = workspace.defaultProject;
|
|
20
|
-
}
|
|
11
|
+
const workspace = workspace_1.Workspace.load(tree, _context);
|
|
12
|
+
const buildContext = workspace.getApplicationOrDefault(_options.project);
|
|
21
13
|
const templateSource = applyWithOverwrite(schematics_1.url('./templates'), [
|
|
22
14
|
schematics_1.applyTemplates(Object.assign(Object.assign({}, _options), core_1.strings)),
|
|
23
|
-
schematics_1.move(
|
|
15
|
+
schematics_1.move(buildContext.appRoot)
|
|
24
16
|
]);
|
|
25
17
|
const rules = [
|
|
26
18
|
templateSource,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/bootstrap-app/index.ts"],"names":[],"mappings":";;;AAAA,+CAA6D;AAC7D,2DAaoC;AACpC,kDAAoD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/bootstrap-app/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
|
|
|
2
2
|
import { RouterModule, Routes } from '@angular/router';
|
|
3
3
|
import { GarbageCollector } from '@coolon/pectin';
|
|
4
4
|
import { placeRoutes } from './places/place-routes';
|
|
5
|
+
import { PlacesModule } from './places/places.module';
|
|
5
6
|
|
|
6
7
|
const routes: Routes = [
|
|
7
8
|
...placeRoutes,
|
|
@@ -9,9 +10,12 @@ const routes: Routes = [
|
|
|
9
10
|
];
|
|
10
11
|
|
|
11
12
|
@NgModule({
|
|
12
|
-
imports: [
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
imports: [
|
|
14
|
+
RouterModule.forRoot(routes, {
|
|
15
|
+
enableTracing: false
|
|
16
|
+
}),
|
|
17
|
+
PlacesModule
|
|
18
|
+
],
|
|
15
19
|
exports: [RouterModule]
|
|
16
20
|
})
|
|
17
21
|
export class AppRoutingModule extends GarbageCollector {
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import {NgModule} from '@angular/core';
|
|
2
2
|
import {ComponentsModule, InteractionModule} from "@coolon/angular-ui-powerups";
|
|
3
|
-
import {HomeComponent} from './home/home.component';
|
|
4
3
|
|
|
5
4
|
@NgModule({
|
|
6
5
|
declarations: [
|
|
7
|
-
HomeComponent
|
|
8
6
|
],
|
|
9
7
|
imports: [
|
|
10
8
|
ComponentsModule,
|
|
@@ -14,6 +12,5 @@ import {HomeComponent} from './home/home.component';
|
|
|
14
12
|
})
|
|
15
13
|
export class PlacesModule {
|
|
16
14
|
constructor() {
|
|
17
|
-
|
|
18
15
|
}
|
|
19
16
|
}
|
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addPlace = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
|
-
const build_context_1 = require("../utils/build-context");
|
|
6
5
|
const template_utilities_1 = require("../utils/template-utilities");
|
|
6
|
+
const workspace_1 = require("../utils/workspace");
|
|
7
7
|
function addPlace(_options) {
|
|
8
8
|
return (tree, context) => {
|
|
9
|
-
const
|
|
9
|
+
const workspace = workspace_1.Workspace.load(tree, context);
|
|
10
|
+
const buildContext = workspace.getApplication(_options.project);
|
|
10
11
|
const nameParts = _options.name.split('/');
|
|
11
12
|
const componentName = nameParts[nameParts.length - 1];
|
|
12
13
|
const componentPathParts = nameParts.slice(0, nameParts.length - 1);
|
|
@@ -24,7 +25,7 @@ function addPlace(_options) {
|
|
|
24
25
|
}, `${(pathToSourceRoot.join('/'))}/${componentName}`);
|
|
25
26
|
const additionalFiles = template_utilities_1.applyTemplatesWithOverwrite(tree, 'templates/files', {
|
|
26
27
|
name: componentName
|
|
27
|
-
},
|
|
28
|
+
}, buildContext.appRoot);
|
|
28
29
|
return schematics_1.chain([componentFiles, additionalFiles])(tree, context);
|
|
29
30
|
};
|
|
30
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;AAEjF,oEAA0E;AAC1E,kDAA+C;AAI/C,SAAgB,QAAQ,CAAC,QAAgB;IAEvC,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAE/C,MAAM,SAAS,GAAG,qBAAS,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,YAAY,GAAG,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAEhE,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3C,MAAM,aAAa,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACtD,MAAM,kBAAkB,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACpE,MAAM,gBAAgB,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAC9E,MAAM,eAAe,GAAG,YAAY,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;QAClG,IAAI,CAAC,eAAe,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,mIAAmI,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;SAC3M;QACD,MAAM,WAAW,GAAG,YAAY,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QAChE,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE7D,MAAM,cAAc,GAAG,gDAA2B,CAChD,IAAI,EACJ,qBAAqB,EACrB;YACE,IAAI,EAAE,aAAa;YACnB,cAAc,EAAE,YAAY,CAAC,cAAc;YAC3C,UAAU,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;SACtD,EACD,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,aAAa,EAAE,CACnD,CAAC;QAGF,MAAM,eAAe,GAAG,gDAA2B,CACjD,IAAI,EACJ,iBAAiB,EACjB;YACE,IAAI,EAAE,aAAa;SACpB,EACD,YAAY,CAAC,OAAO,CAAC,CAAC;QAExB,OAAO,kBAAK,CAAC,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjE,CAAC,CAAC;AAEJ,CAAC;AA1CD,4BA0CC;AAED,SAAS,iBAAiB,CAAC,WAAgC;IACzD,uDAAuD;IACvD,MAAM,WAAW,GAAG,WAAW,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,WAAW,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;IAEjE,OAAO,WAAW,CAAC,WAAW,EAAE,CAAC;AACnC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { experimental } from '@angular-devkit/core';
|
|
1
2
|
import { SchematicContext, Tree } from '@angular-devkit/schematics';
|
|
2
3
|
import { ClassDeclaration, SourceFile } from 'ts-morph';
|
|
3
4
|
import { DecoratedSourceFile } from './decorators/decorated-source-file';
|
|
@@ -11,7 +12,7 @@ export declare abstract class BuildContext {
|
|
|
11
12
|
get logger(): import("@angular-devkit/core/src/logger").LoggerApi;
|
|
12
13
|
get tsConfigPath(): string;
|
|
13
14
|
get sourceRoot(): string;
|
|
14
|
-
get appRoot():
|
|
15
|
+
get appRoot(): string;
|
|
15
16
|
private loadTypeScriptProject;
|
|
16
17
|
scanClassesInTree(tree: Tree, scanRootDirectory: string, scanClass: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, path: string) => void): void;
|
|
17
18
|
findFileInAncestorPath(pathToSourceRoot: string[], fileName: string): string;
|
|
@@ -19,16 +20,14 @@ export declare abstract class BuildContext {
|
|
|
19
20
|
}
|
|
20
21
|
export declare namespace BuildContext {
|
|
21
22
|
interface Settings {
|
|
22
|
-
readonly workspaceProject:
|
|
23
|
+
readonly workspaceProject: experimental.workspace.WorkspaceProject;
|
|
23
24
|
readonly projectType: string;
|
|
24
25
|
readonly tsConfigPath: string;
|
|
25
26
|
readonly appRoot: string;
|
|
26
27
|
}
|
|
27
28
|
class App extends BuildContext {
|
|
28
|
-
get selectorPrefix():
|
|
29
|
+
get selectorPrefix(): string;
|
|
29
30
|
}
|
|
30
31
|
class Lib extends BuildContext {
|
|
31
32
|
}
|
|
32
|
-
function forLib(projectName: string, tree: Tree, context: SchematicContext): Lib;
|
|
33
|
-
function forApp(projectName: string, tree: Tree, context: SchematicContext): App;
|
|
34
33
|
}
|
|
@@ -22,7 +22,7 @@ class BuildContext {
|
|
|
22
22
|
return this.settings.appRoot;
|
|
23
23
|
}
|
|
24
24
|
get appRoot() {
|
|
25
|
-
return this.settings.workspaceProject
|
|
25
|
+
return this.settings.workspaceProject.sourceRoot;
|
|
26
26
|
}
|
|
27
27
|
loadTypeScriptProject() {
|
|
28
28
|
// TODO: this barfs if you're not running it from teh project root directory
|
|
@@ -87,47 +87,5 @@ exports.BuildContext = BuildContext;
|
|
|
87
87
|
class Lib extends BuildContext {
|
|
88
88
|
}
|
|
89
89
|
BuildContext.Lib = Lib;
|
|
90
|
-
function forLib(projectName, tree, context) {
|
|
91
|
-
const settings = loadSettings(projectName, tree);
|
|
92
|
-
if (settings.projectType !== 'lib') {
|
|
93
|
-
throw new Error(`Requested app context, but '${projectName}' is a library`);
|
|
94
|
-
}
|
|
95
|
-
return new BuildContext.Lib(tree, projectName, settings, context);
|
|
96
|
-
}
|
|
97
|
-
BuildContext.forLib = forLib;
|
|
98
|
-
function forApp(projectName, tree, context) {
|
|
99
|
-
const settings = loadSettings(projectName, tree);
|
|
100
|
-
if (settings.projectType !== 'app') {
|
|
101
|
-
throw new Error(`Requested app context, but '${projectName}' is a library`);
|
|
102
|
-
}
|
|
103
|
-
return new BuildContext.App(tree, projectName, settings, context);
|
|
104
|
-
}
|
|
105
|
-
BuildContext.forApp = forApp;
|
|
106
|
-
function loadSettings(project, tree) {
|
|
107
|
-
const workspaceConfig = tree.read('/angular.json');
|
|
108
|
-
if (workspaceConfig) {
|
|
109
|
-
// convert workspace to string
|
|
110
|
-
const workspaceContent = workspaceConfig.toString();
|
|
111
|
-
// parse workspace string into JSON object
|
|
112
|
-
const workspace = JSON.parse(workspaceContent);
|
|
113
|
-
const workspaceProject = workspace.projects[project || workspace.defaultProject];
|
|
114
|
-
const projectType = workspaceProject.projectType === 'application' ? 'app' : 'lib';
|
|
115
|
-
const appRoot = `${workspaceProject.sourceRoot}/${projectType}`;
|
|
116
|
-
const tsConfigPath = workspaceProject.architect.build.options.tsConfig;
|
|
117
|
-
// return new BuildContext.App(project, typescriptConfig, sourceRoot, context);
|
|
118
|
-
return {
|
|
119
|
-
workspaceProject,
|
|
120
|
-
projectType,
|
|
121
|
-
tsConfigPath,
|
|
122
|
-
appRoot
|
|
123
|
-
};
|
|
124
|
-
}
|
|
125
|
-
else {
|
|
126
|
-
throw new Error('Could not find Angular workspace configuration');
|
|
127
|
-
// console.log(tree.root.path);
|
|
128
|
-
// const tsConfig = `${tree.getDir(project).path}/tsconfig.json`;
|
|
129
|
-
// return new BuildContext(project, tsConfig, tree.getDir(project).path, context);
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
90
|
})(BuildContext = exports.BuildContext || (exports.BuildContext = {}));
|
|
133
91
|
//# sourceMappingURL=build-context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-context.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/utils/build-context.ts"],"names":[],"mappings":";;;AAEA,uCAAiE;AACjE,8EAAyE;AACzE,6EAAuE;AAEvE,MAAsB,YAAY;IAGhC,YAAqB,IAAU,EAAW,WAAmB,EAAqB,QAA+B,EAAW,OAAyB;QAAhI,SAAI,GAAJ,IAAI,CAAM;QAAW,gBAAW,GAAX,WAAW,CAAQ;QAAqB,aAAQ,GAAR,QAAQ,CAAuB;QAAW,YAAO,GAAP,OAAO,CAAkB;QACnJ,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;IACxD,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IAC/B,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"build-context.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/utils/build-context.ts"],"names":[],"mappings":";;;AAEA,uCAAiE;AACjE,8EAAyE;AACzE,6EAAuE;AAEvE,MAAsB,YAAY;IAGhC,YAAqB,IAAU,EAAW,WAAmB,EAAqB,QAA+B,EAAW,OAAyB;QAAhI,SAAI,GAAJ,IAAI,CAAM;QAAW,gBAAW,GAAX,WAAW,CAAQ;QAAqB,aAAQ,GAAR,QAAQ,CAAuB;QAAW,YAAO,GAAP,OAAO,CAAkB;QACnJ,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;IACxD,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IAC/B,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,UAAU,CAAC;IACnD,CAAC;IAEO,qBAAqB;QAC3B,4EAA4E;QAC5E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QAClE,IAAI;YACF,OAAO,IAAI,kBAAO,CAAC;gBACjB,gBAAgB,EAAE,IAAI,CAAC,YAAY;gBACnC,UAAU,EAAE,IAAI,oDAAuB,CAAC,IAAI,CAAC,IAAI,CAAC;aACnD,CAAC,CAAC;SACJ;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,IAAI,CAAC,YAAY,qDAAqD,CAAC,CAAC;YACrI,MAAM,KAAK,CAAC;SACb;IACH,CAAC;IAED,iBAAiB,CAAC,IAAU,EAAE,iBAAyB,EAAE,SAA6F;QACpJ,MAAM,YAAY,GAAG,KAAK,iBAAiB,EAAE,CAAC;QAC9C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,iBAAiB,EAAE,CAAC,CAAC;QAExE,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YAE9C,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;gBAC9D,OAAO;aACR;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACpC,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO;aACR;YACD,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,KAAK,QAAQ,EAAE,CAAC,CAAC;YAChF,MAAM,OAAO,GAAG,UAAU,CAAC,qBAAqB,EAAE,CAAC;YACnD,UAAU,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC,SAA2B,EAAE,EAAE;gBAC9D,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,sBAAsB,CAAC,gBAA0B,EAAE,QAAgB;QACjE,KAAK,IAAI,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAChD,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,QAAQ,EAAE,CAAC;YACnF,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE;gBACxC,OAAO,kBAAkB,CAAC;aAC3B;SACF;IACH,CAAC;IAGD,aAAa,CAAC,IAAY;QACxB,oFAAoF;QACpF,wDAAwD;QACxD,uBAAuB;QACvB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YACpG,SAAS,EAAE,IAAI;SAChB,CAAC,CAAA;QACF,OAAO,2CAAmB,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACtD,CAAC;CAEF;AAhFD,oCAgFC;AAED,WAAiB,YAAY;IAS3B,MAAa,GAAI,SAAQ,YAAY;QACnC,IAAI,cAAc;YAChB,OAAO,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAClD,CAAC;KACF;IAJY,gBAAG,MAIf,CAAA;IAED,MAAa,GAAI,SAAQ,YAAY;KAEpC;IAFY,gBAAG,MAEf,CAAA;AAEH,CAAC,EAnBgB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAmB5B"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { experimental } from '@angular-devkit/core';
|
|
2
|
+
import { SchematicContext, Tree } from '@angular-devkit/schematics';
|
|
3
|
+
import { BuildContext } from './build-context';
|
|
4
|
+
export declare class Workspace {
|
|
5
|
+
readonly schema: experimental.workspace.WorkspaceSchema;
|
|
6
|
+
readonly tree: Tree;
|
|
7
|
+
readonly context: SchematicContext;
|
|
8
|
+
get defaultProject(): string;
|
|
9
|
+
constructor(schema: experimental.workspace.WorkspaceSchema, tree: Tree, context: SchematicContext);
|
|
10
|
+
static load(tree: Tree, _context: SchematicContext): Workspace;
|
|
11
|
+
getApplication(projectName: string): BuildContext.App;
|
|
12
|
+
getApplicationOrDefault(projectName: string | undefined): BuildContext.App;
|
|
13
|
+
getLibrary(projectName: string): BuildContext.Lib;
|
|
14
|
+
protected loadProjectSettings(project: string, tree: Tree): BuildContext.Settings;
|
|
15
|
+
}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Workspace = void 0;
|
|
4
|
+
const build_context_1 = require("./build-context");
|
|
5
|
+
class Workspace {
|
|
6
|
+
constructor(schema, tree, context) {
|
|
7
|
+
this.schema = schema;
|
|
8
|
+
this.tree = tree;
|
|
9
|
+
this.context = context;
|
|
10
|
+
}
|
|
11
|
+
get defaultProject() {
|
|
12
|
+
return this.schema.defaultProject;
|
|
13
|
+
}
|
|
14
|
+
static load(tree, _context) {
|
|
15
|
+
const workspaceConfig = tree.read('/angular.json');
|
|
16
|
+
if (!workspaceConfig) {
|
|
17
|
+
throw new Error('Could not find Angular workspace configuration');
|
|
18
|
+
}
|
|
19
|
+
const workspaceContent = workspaceConfig.toString();
|
|
20
|
+
return new Workspace(JSON.parse(workspaceContent), tree, _context);
|
|
21
|
+
}
|
|
22
|
+
getApplication(projectName) {
|
|
23
|
+
const settings = this.loadProjectSettings(projectName, this.tree);
|
|
24
|
+
if (settings.projectType !== 'app') {
|
|
25
|
+
throw new Error(`Requested app context, but '${projectName}' is a library`);
|
|
26
|
+
}
|
|
27
|
+
return new build_context_1.BuildContext.App(this.tree, projectName, settings, this.context);
|
|
28
|
+
}
|
|
29
|
+
getApplicationOrDefault(projectName) {
|
|
30
|
+
return this.getApplication(projectName !== null && projectName !== void 0 ? projectName : this.defaultProject);
|
|
31
|
+
}
|
|
32
|
+
getLibrary(projectName) {
|
|
33
|
+
const settings = this.loadProjectSettings(projectName, this.tree);
|
|
34
|
+
if (settings.projectType !== 'lib') {
|
|
35
|
+
throw new Error(`Requested app context, but '${projectName}' is a library`);
|
|
36
|
+
}
|
|
37
|
+
return new build_context_1.BuildContext.Lib(this.tree, projectName, settings, this.context);
|
|
38
|
+
}
|
|
39
|
+
loadProjectSettings(project, tree) {
|
|
40
|
+
const workspaceProject = this.schema.projects[project || this.schema.defaultProject];
|
|
41
|
+
const projectType = workspaceProject.projectType === 'application' ? 'app' : 'lib';
|
|
42
|
+
const appRoot = `${workspaceProject.sourceRoot}/${projectType}`;
|
|
43
|
+
const tsConfigPath = workspaceProject.architect.build.options.tsConfig;
|
|
44
|
+
// return new BuildContext.App(project, typescriptConfig, sourceRoot, context);
|
|
45
|
+
return {
|
|
46
|
+
workspaceProject,
|
|
47
|
+
projectType,
|
|
48
|
+
tsConfigPath,
|
|
49
|
+
appRoot
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
exports.Workspace = Workspace;
|
|
54
|
+
//# sourceMappingURL=workspace.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/utils/workspace.ts"],"names":[],"mappings":";;;AAEA,mDAA+C;AAE/C,MAAa,SAAS;IAMpB,YAAqB,MAA8C,EAAW,IAAU,EAAW,OAAyB;QAAvG,WAAM,GAAN,MAAM,CAAwC;QAAW,SAAI,GAAJ,IAAI,CAAM;QAAW,YAAO,GAAP,OAAO,CAAkB;IAC5H,CAAC;IALD,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;IACpC,CAAC;IAKD,MAAM,CAAC,IAAI,CAAC,IAAU,EAAE,QAA0B;QAChD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACnD,IAAI,CAAC,eAAe,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;SACnE;QACD,MAAM,gBAAgB,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;QACpD,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IACrE,CAAC;IAED,cAAc,CAAC,WAAmB;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAClE,IAAI,QAAQ,CAAC,WAAW,KAAK,KAAK,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,+BAA+B,WAAW,gBAAgB,CAAC,CAAC;SAC7E;QACD,OAAO,IAAI,4BAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9E,CAAC;IAED,uBAAuB,CAAC,WAA6B;QACnD,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,IAAI,CAAC,cAAc,CAAC,CAAC;IACjE,CAAC;IAED,UAAU,CAAC,WAAmB;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAClE,IAAI,QAAQ,CAAC,WAAW,KAAK,KAAK,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,+BAA+B,WAAW,gBAAgB,CAAC,CAAC;SAC7E;QACD,OAAO,IAAI,4BAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9E,CAAC;IAGS,mBAAmB,CAAC,OAAe,EAAE,IAAU;QAEvD,MAAM,gBAAgB,GAA4C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAC9H,MAAM,WAAW,GAAG,gBAAgB,CAAC,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;QACnF,MAAM,OAAO,GAAG,GAAG,gBAAgB,CAAC,UAAU,IAAI,WAAW,EAAE,CAAC;QAChE,MAAM,YAAY,GAAG,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QACvE,+EAA+E;QAC/E,OAAO;YACL,gBAAgB;YAChB,WAAW;YACX,YAAY;YACZ,OAAO;SACR,CAAC;IACJ,CAAC;CAGF;AAvDD,8BAuDC"}
|