@coolon/angular-ui-powerups 0.0.13 → 0.0.15

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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@coolon/angular-ui-powerups",
3
- "version": "0.0.13",
3
+ "version": "0.0.15",
4
4
  "schematics": "./schematics/collection.json",
5
5
  "dependencies": {
6
6
  "ts-morph": "^3.1.3",
@@ -1,3 +1,3 @@
1
1
  import { Rule } from '@angular-devkit/schematics';
2
2
  import { Schema } from './schema';
3
- export declare function generateRoutes(schema: Schema): Rule;
3
+ export declare function generateRoutes(options: Schema): Rule;
@@ -6,12 +6,28 @@ const JSON5 = require("json5");
6
6
  const ts_morph_1 = require("ts-morph");
7
7
  const place_def_1 = require("./place-def");
8
8
  const PLACE_ANNOTATION = /@Place\({([^})]*)}\)/m;
9
- function generateRoutes(schema) {
9
+ function generateRoutes(options) {
10
10
  return (tree, context) => {
11
- const config = loadConfig(schema.project, tree, context);
12
- const placeDefs = extractPlaces(schema.project, schema, tree, context);
11
+ const workspaceConfig = tree.read('/angular.json');
12
+ if (!workspaceConfig) {
13
+ throw new Error('Could not find Angular workspace configuration');
14
+ }
15
+ // convert workspace to string
16
+ const workspaceContent = workspaceConfig.toString();
17
+ // parse workspace string into JSON object
18
+ const workspace = JSON.parse(workspaceContent);
19
+ if (!options.project) {
20
+ options.project = workspace.defaultProject;
21
+ }
22
+ const projectName = options.project;
23
+ const project = workspace.projects[projectName];
24
+ const projectType = project.projectType === 'application' ? 'app' : 'lib';
25
+ const projectPath = `${project.sourceRoot}`;
26
+ const sourcePath = `${project.sourceRoot}/${projectType}`;
27
+ const config = loadConfig(projectPath, tree, context);
28
+ const placeDefs = extractPlaces(sourcePath, sourcePath, options, tree, context);
13
29
  const files = schematics_1.apply(schematics_1.url('./templates'), [
14
- schematics_1.applyTemplates(Object.assign({}, schema, { placeDefs,
30
+ schematics_1.applyTemplates(Object.assign({}, options, { placeDefs,
15
31
  config }, core_1.strings)),
16
32
  // @see https://github.com/angular/angular-cli/issues/11337#issuecomment-448259549
17
33
  schematics_1.forEach((fileEntry) => {
@@ -56,16 +72,16 @@ function createProject(projectPath, context) {
56
72
  function loadConfig(projectPath, tree, context) {
57
73
  const fileEntry = tree.get(`${projectPath}/places.json5`) || tree.get(`${projectPath}/places.json5`);
58
74
  if (!fileEntry) {
59
- throw new Error(`Unable to find config file at '${projectPath}places.json' or '${projectPath}places.json5'`);
75
+ throw new Error(`Unable to find config file at '${projectPath}/places.json' or '${projectPath}/places.json5'`);
60
76
  }
61
77
  const config = JSON5.parse(fileEntry.content.toString('utf-8'));
62
78
  return config;
63
79
  }
64
- function extractPlaces(projectPath, schema, tree, context) {
65
- const importPrefix = `${projectPath}/src/app/`;
80
+ function extractPlaces(projectPath, srcRoot, schema, tree, context) {
81
+ const importPrefix = srcRoot;
66
82
  const project = createProject(projectPath, context);
67
83
  const placeDefs = [];
68
- tree.getDir(projectPath).visit(filePath => {
84
+ tree.getDir(srcRoot).visit(filePath => {
69
85
  if (!filePath.endsWith('.ts')) {
70
86
  return;
71
87
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/index.ts"],"names":[],"mappings":"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"}