@coolon/angular-ui-powerups 0.0.20 → 0.0.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -21,11 +21,8 @@ function generateRoutes(options) {
|
|
|
21
21
|
}
|
|
22
22
|
const projectName = options.project;
|
|
23
23
|
const project = workspace.projects[projectName];
|
|
24
|
-
const
|
|
25
|
-
const
|
|
26
|
-
const sourceRoot = `${project.sourceRoot}/${projectType}`;
|
|
27
|
-
const config = loadConfig(projectRoot, tree, context);
|
|
28
|
-
const placeDefs = extractPlaces(projectRoot, sourceRoot, options, tree, context);
|
|
24
|
+
const config = loadConfig(project, tree, context);
|
|
25
|
+
const placeDefs = extractPlaces(project, options, tree, context);
|
|
29
26
|
const files = schematics_1.apply(schematics_1.url('./templates'), [
|
|
30
27
|
schematics_1.applyTemplates(Object.assign({}, options, { placeDefs,
|
|
31
28
|
config }, core_1.strings)),
|
|
@@ -59,30 +56,36 @@ exports.generateRoutes = generateRoutes;
|
|
|
59
56
|
// return rule(tree, _context);
|
|
60
57
|
// };
|
|
61
58
|
// }
|
|
62
|
-
function createProject(
|
|
59
|
+
function createProject(project, context) {
|
|
60
|
+
const tsConfigPath = project.architect.build.options.tsConfig;
|
|
61
|
+
context.logger.info(`loading tsConfig from -> ${tsConfigPath}`);
|
|
63
62
|
try {
|
|
64
63
|
return new ts_morph_1.Project({
|
|
65
|
-
tsConfigFilePath:
|
|
64
|
+
tsConfigFilePath: `./${tsConfigPath}`
|
|
66
65
|
});
|
|
67
66
|
}
|
|
68
67
|
catch (error) {
|
|
69
|
-
context.logger.fatal(`Failed to load typescript project form: ${
|
|
68
|
+
context.logger.fatal(`Failed to load typescript project form: ${project.root} You probably need to specify the --project option?`);
|
|
70
69
|
}
|
|
71
70
|
}
|
|
72
|
-
function loadConfig(
|
|
73
|
-
|
|
71
|
+
function loadConfig(project, tree, context) {
|
|
72
|
+
context.logger.info(`loading places config from -> ${project.root}/places.json (or places.json5)`);
|
|
73
|
+
const fileEntry = tree.get(`${project.root}/places.json5`) || tree.get(`${project.root}/places.json5`);
|
|
74
74
|
if (!fileEntry) {
|
|
75
|
-
throw new Error(`Unable to find config file at '${
|
|
75
|
+
throw new Error(`Unable to find config file at '${project.root}/places.json' or '${project.root}/places.json5'`);
|
|
76
76
|
}
|
|
77
77
|
const config = JSON5.parse(fileEntry.content.toString('utf-8'));
|
|
78
78
|
return config;
|
|
79
79
|
}
|
|
80
|
-
function extractPlaces(
|
|
81
|
-
const
|
|
82
|
-
|
|
83
|
-
const
|
|
80
|
+
function extractPlaces(project, schema, tree, context) {
|
|
81
|
+
const projectType = project.projectType === 'application' ? 'app' : 'lib';
|
|
82
|
+
const projectRoot = `${project.root}`;
|
|
83
|
+
const sourceRoot = `${project.sourceRoot}/${projectType}`;
|
|
84
|
+
const importPrefix = `./${sourceRoot}`;
|
|
85
|
+
const tsProject = createProject(project, context);
|
|
84
86
|
const placeDefs = [];
|
|
85
|
-
|
|
87
|
+
context.logger.info(`Scanning sources in -> ${sourceRoot}`);
|
|
88
|
+
tree.getDir(sourceRoot).visit(filePath => {
|
|
86
89
|
if (!filePath.endsWith('.ts')) {
|
|
87
90
|
return;
|
|
88
91
|
}
|
|
@@ -92,7 +95,7 @@ function extractPlaces(projectPath, srcRoot, schema, tree, context) {
|
|
|
92
95
|
}
|
|
93
96
|
const sourceText = content.toString('utf-8');
|
|
94
97
|
if (sourceText.match(PLACE_ANNOTATION)) {
|
|
95
|
-
const sourceFile =
|
|
98
|
+
const sourceFile = tsProject.getSourceFileOrThrow(`./${filePath}`);
|
|
96
99
|
sourceFile.getClasses().forEach((classDecl) => {
|
|
97
100
|
place_def_1.PlaceDef.scan(classDecl, context).onMatch(result => {
|
|
98
101
|
// context.logger.info(`filePath=${filePath}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/index.ts"],"names":[],"mappings":";;AAAA,+CAA6D;AAC7D,2DAUoC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/index.ts"],"names":[],"mappings":";;AAAA,+CAA6D;AAC7D,2DAUoC;AAGpC,+BAA+B;AAC/B,uCAAqD;AACrD,2CAAuC;AAGvC,MAAM,gBAAgB,GAAG,uBAAuB,CAAC;AAEjD,SAAgB,cAAc,CAAC,OAAe;IAE5C,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAE/C,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACnD,IAAI,CAAC,eAAe,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;SACnE;QAED,8BAA8B;QAC9B,MAAM,gBAAgB,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;QAEpD,0CAA0C;QAC1C,MAAM,SAAS,GAA2C,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAEvF,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC;SAC5C;QAED,MAAM,WAAW,GAAG,OAAO,CAAC,OAAiB,CAAC;QAC9C,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAClD,MAAM,SAAS,GAAG,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAEjE,MAAM,KAAK,GAAG,kBAAK,CACjB,gBAAG,CAAC,aAAa,CAAC,EAClB;YACE,2BAAc,mBACT,OAAO,IACV,SAAS;gBACT,MAAM,IACH,cAAO,EACV;YACF,kFAAkF;YAClF,oBAAO,CAAC,CAAC,SAAoB,EAAE,EAAE;gBAC/B,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;iBACnD;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC,CAAC;SACH,CAAC,CAAC;QAEL,OAAO,sBAAS,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,CAAC;AAEJ,CAAC;AA7CD,wCA6CC;AAID,qEAAqE;AACrE,yDAAyD;AACzD,8BAA8B;AAC9B,wBAAwB;AACxB,oBAAoB;AACpB,mCAAmC;AACnC,+CAA+C;AAC/C,iEAAiE;AACjE,2BAA2B;AAC3B,cAAc;AACd,8BAA8B;AAC9B,aAAa;AACb,WAAW;AACX,SAAS;AACT,EAAE;AACF,mCAAmC;AACnC,OAAO;AACP,IAAI;AAEJ,SAAS,aAAa,CAAC,OAAY,EAAE,OAAyB;IAC5D,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC9D,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,YAAY,EAAE,CAAC,CAAC;IAChE,IAAI;QACF,OAAO,IAAI,kBAAO,CAAC;YACjB,gBAAgB,EAAE,KAAK,YAAY,EAAE;SACtC,CAAC,CAAC;KACJ;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,OAAO,CAAC,IAAI,qDAAqD,CAAC,CAAC;KACpI;AACH,CAAC;AAED,SAAS,UAAU,CAAC,OAAY,EAAE,IAAU,EAAE,OAAyB;IACrE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,OAAO,CAAC,IAAI,gCAAgC,CAAC,CAAC;IACnG,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,eAAe,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,eAAe,CAAC,CAAC;IACvG,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,kCAAkC,OAAO,CAAC,IAAI,qBAAqB,OAAO,CAAC,IAAI,gBAAgB,CAAC,CAAC;KAClH;IACD,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAChE,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CAAC,OAAY,EAAE,MAAc,EAAE,IAAU,EAAE,OAAyB;IACxF,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IAC1E,MAAM,WAAW,GAAG,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IACtC,MAAM,UAAU,GAAG,GAAG,OAAO,CAAC,UAAU,IAAI,WAAW,EAAE,CAAC;IAC1D,MAAM,YAAY,GAAG,KAAK,UAAU,EAAE,CAAC;IACvC,MAAM,SAAS,GAAG,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,SAAS,GAAe,EAAE,CAAC;IACjC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,UAAU,EAAE,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;QACvC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC7B,OAAO;SACR;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QACD,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE7C,IAAI,UAAU,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE;YAEtC,MAAM,UAAU,GAAG,SAAS,CAAC,oBAAoB,CAAC,KAAK,QAAQ,EAAE,CAAC,CAAC;YAEnE,UAAU,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC,SAA2B,EAAE,EAAE;gBAE9D,oBAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;oBACjD,+CAA+C;oBAC/C,MAAM,gBAAgB,GAAG,KAAK,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC3H,MAAM,UAAU,GAAG,MAAM,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;oBAC7D,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,gBAAgB,OAAO,SAAS,CAAC,OAAO,EAAE,YAAY,UAAU,CAAC,QAAQ,GAAG,CAAC,CAAC;oBACrG,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC7B,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC"}
|