@ngflow/ng-architect 1.2.5 → 1.2.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/package.json
CHANGED
|
@@ -7,6 +7,21 @@ const routes_utils_1 = require("../utils/routes-utils");
|
|
|
7
7
|
const structure_resolver_1 = require("../utils/structure-resolver");
|
|
8
8
|
const options_validator_1 = require("../utils/options-validator");
|
|
9
9
|
function default_1(options) {
|
|
10
|
+
return (tree, context) => {
|
|
11
|
+
// 🔹 Resolver a structure antes de qualquer lógica
|
|
12
|
+
const resolvedStructure = (0, structure_resolver_1.resolveStructure)(tree, options);
|
|
13
|
+
options.structure = resolvedStructure;
|
|
14
|
+
context.logger.info(`📐 Structure resolved to: ${resolvedStructure}`);
|
|
15
|
+
// 🔹 Validar flags e opções obrigatórias
|
|
16
|
+
(0, options_validator_1.validateOptions)(options, resolvedStructure);
|
|
17
|
+
// 🔹 Continuar com a geração real da feature
|
|
18
|
+
return featureRule(options)(tree, context);
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
;
|
|
22
|
+
// ------------------------------------------------------
|
|
23
|
+
// Função interna que gera a feature de forma limpa
|
|
24
|
+
function featureRule(options) {
|
|
10
25
|
const featureKebab = (0, string_utils_1.toKebabCase)(options.name);
|
|
11
26
|
const featurePascal = (0, string_utils_1.toPascalCase)(options.name);
|
|
12
27
|
let basePath;
|
|
@@ -33,44 +48,45 @@ function default_1(options) {
|
|
|
33
48
|
: `libs/${options.lib}/src/lib/${featureKebab}`;
|
|
34
49
|
subFolders = ['pages', 'data', 'models'];
|
|
35
50
|
break;
|
|
36
|
-
default:
|
|
37
|
-
throw new Error(`Invalid structure: ${options.structure}`);
|
|
38
51
|
}
|
|
39
52
|
return (0, schematics_1.chain)([
|
|
40
|
-
(
|
|
53
|
+
(_tree, context) => {
|
|
41
54
|
context.logger.info(`🟢 Creating feature: ${featurePascal} (${featureKebab})`);
|
|
42
55
|
context.logger.info(`Structure: ${options.structure}`);
|
|
43
|
-
const resolved = (0, structure_resolver_1.resolveStructure)(tree, options);
|
|
44
|
-
options.structure = resolved;
|
|
45
|
-
context.logger.info(`📐 Structure resolved to: ${resolved}`);
|
|
46
|
-
(0, options_validator_1.validateOptions)(options, resolved);
|
|
47
56
|
},
|
|
48
|
-
|
|
57
|
+
// 🔹 Gerar ficheiros a partir do template
|
|
58
|
+
(0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files'), [
|
|
59
|
+
(0, schematics_1.template)({ featureKebab, featurePascal }),
|
|
60
|
+
(0, schematics_1.move)(basePath),
|
|
61
|
+
])),
|
|
62
|
+
// 🔹 Atualizar routes.ts (standalone + lazy loading quando necessário)
|
|
49
63
|
(_tree, context) => {
|
|
50
64
|
context.logger.info(`🟢 Updating app.routes.ts with ${featurePascal}Page...`);
|
|
51
65
|
(0, routes_utils_1.updateAppRoutes)(_tree, featureKebab, featurePascal, options.structure, options);
|
|
52
66
|
},
|
|
67
|
+
// 🔹 Criar subpastas e barrels (index.ts)
|
|
53
68
|
(_tree) => {
|
|
54
|
-
// Cria subpastas e barrels
|
|
55
69
|
subFolders.forEach((folder) => {
|
|
56
70
|
const folderPath = `${basePath}/${folder}`;
|
|
57
71
|
if (!_tree.exists(folderPath))
|
|
58
72
|
_tree.create(folderPath + '/.gitkeep', '');
|
|
59
|
-
//
|
|
60
|
-
const files = _tree.getDir(folderPath).subfiles.filter(f => f.endsWith('.ts'));
|
|
61
|
-
const barrelContent = files
|
|
73
|
+
// Criar barrel index.ts automaticamente
|
|
74
|
+
const files = _tree.getDir(folderPath).subfiles.filter((f) => f.endsWith('.ts'));
|
|
75
|
+
const barrelContent = files
|
|
76
|
+
.map((f) => {
|
|
62
77
|
const name = f.replace('.ts', '');
|
|
63
78
|
return `export * from './${name}';`;
|
|
64
|
-
})
|
|
79
|
+
})
|
|
80
|
+
.join('\n');
|
|
65
81
|
if (!_tree.exists(`${folderPath}/index.ts`)) {
|
|
66
82
|
_tree.create(`${folderPath}/index.ts`, barrelContent);
|
|
67
83
|
}
|
|
68
84
|
else {
|
|
69
|
-
//
|
|
85
|
+
// Adiciona novos exports sem duplicar
|
|
70
86
|
const existing = _tree.read(`${folderPath}/index.ts`).toString('utf-8');
|
|
71
87
|
const newExports = files
|
|
72
|
-
.map(f => `export * from './${f.replace('.ts', '')}';`)
|
|
73
|
-
.filter(line => !existing.includes(line))
|
|
88
|
+
.map((f) => `export * from './${f.replace('.ts', '')}';`)
|
|
89
|
+
.filter((line) => !existing.includes(line))
|
|
74
90
|
.join('\n');
|
|
75
91
|
if (newExports)
|
|
76
92
|
_tree.overwrite(`${folderPath}/index.ts`, existing + '\n' + newExports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAgBA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAgBA,4BAcC;AA9BD,2DAUoC;AACpC,wDAAkE;AAClE,wDAAwD;AACxD,oEAA+D;AAC/D,kEAA6D;AAE7D,mBAAyB,OAAY;IACnC,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,mDAAmD;QACnD,MAAM,iBAAiB,GAAG,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1D,OAAO,CAAC,SAAS,GAAG,iBAAiB,CAAC;QAEtC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,iBAAiB,EAAE,CAAC,CAAC;QAEtE,yCAAyC;QACzC,IAAA,mCAAe,EAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QAE5C,6CAA6C;QAC7C,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC,CAAC;AACJ,CAAC;AAAA,CAAC;AAEF,yDAAyD;AACzD,mDAAmD;AACnD,SAAS,WAAW,CAAC,OAAY;IAC/B,MAAM,YAAY,GAAG,IAAA,0BAAW,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,IAAA,2BAAY,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD,IAAI,QAAiB,CAAC;IACtB,IAAI,UAAU,GAAa,EAAE,CAAC;IAE9B,QAAQ,OAAO,CAAC,SAAS,EAAE,CAAC;QAC1B,KAAK,MAAM;YACT,QAAQ,GAAG,WAAW,YAAY,EAAE,CAAC;YACrC,MAAM;QAER,KAAK,eAAe;YAClB,QAAQ,GAAG,oBAAoB,YAAY,EAAE,CAAC;YAC9C,UAAU,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YACzC,MAAM;QAER,KAAK,eAAe;YAClB,IAAI,CAAC,OAAO,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;YACrF,QAAQ,GAAG,WAAW,OAAO,CAAC,MAAM,IAAI,YAAY,EAAE,CAAC;YACvD,UAAU,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YACzC,MAAM;QAER,KAAK,UAAU;YACb,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG;gBAC9B,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;YAC1E,QAAQ,GAAG,OAAO,CAAC,GAAG;gBACpB,CAAC,CAAC,QAAQ,OAAO,CAAC,GAAG,YAAY,YAAY,EAAE;gBAC/C,CAAC,CAAC,QAAQ,OAAO,CAAC,GAAG,YAAY,YAAY,EAAE,CAAC;YAClD,UAAU,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YACzC,MAAM;IACV,CAAC;IAED,OAAO,IAAA,kBAAK,EAAC;QACX,CAAC,KAAW,EAAE,OAAyB,EAAE,EAAE;YACzC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,aAAa,KAAK,YAAY,GAAG,CAAC,CAAC;YAC/E,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;QACzD,CAAC;QAED,0CAA0C;QAC1C,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,SAAS,CAAC,EAAE;YACpB,IAAA,qBAAQ,EAAC,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC;YACzC,IAAA,iBAAI,EAAC,QAAQ,CAAC;SACf,CAAC,CACH;QAED,uEAAuE;QACvE,CAAC,KAAW,EAAE,OAAyB,EAAE,EAAE;YACzC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,aAAa,SAAS,CAAC,CAAC;YAC9E,IAAA,8BAAe,EAAC,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAClF,CAAC;QAED,0CAA0C;QAC1C,CAAC,KAAW,EAAE,EAAE;YACd,UAAU,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBAC5B,MAAM,UAAU,GAAG,GAAG,QAAQ,IAAI,MAAM,EAAE,CAAC;gBAC3C,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;oBAAE,KAAK,CAAC,MAAM,CAAC,UAAU,GAAG,WAAW,EAAE,EAAE,CAAC,CAAC;gBAE1E,wCAAwC;gBACxC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;gBACjF,MAAM,aAAa,GAAG,KAAK;qBACxB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACT,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;oBAClC,OAAO,oBAAoB,IAAI,IAAI,CAAC;gBACtC,CAAC,CAAC;qBACD,IAAI,CAAC,IAAI,CAAC,CAAC;gBAEd,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,UAAU,WAAW,CAAC,EAAE,CAAC;oBAC5C,KAAK,CAAC,MAAM,CAAC,GAAG,UAAU,WAAW,EAAE,aAAa,CAAC,CAAC;gBACxD,CAAC;qBAAM,CAAC;oBACN,sCAAsC;oBACtC,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,UAAU,WAAW,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;oBACzE,MAAM,UAAU,GAAG,KAAK;yBACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC;yBACxD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;yBAC1C,IAAI,CAAC,IAAI,CAAC,CAAC;oBACd,IAAI,UAAU;wBAAE,KAAK,CAAC,SAAS,CAAC,GAAG,UAAU,WAAW,EAAE,QAAQ,GAAG,IAAI,GAAG,UAAU,CAAC,CAAC;gBAC1F,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,KAAK,CAAC;QACf,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -15,15 +15,32 @@ import { resolveStructure } from '../utils/structure-resolver';
|
|
|
15
15
|
import { validateOptions } from '../utils/options-validator';
|
|
16
16
|
|
|
17
17
|
export default function (options: any): Rule {
|
|
18
|
+
return (tree: Tree, context: SchematicContext) => {
|
|
19
|
+
// 🔹 Resolver a structure antes de qualquer lógica
|
|
20
|
+
const resolvedStructure = resolveStructure(tree, options);
|
|
21
|
+
options.structure = resolvedStructure;
|
|
22
|
+
|
|
23
|
+
context.logger.info(`📐 Structure resolved to: ${resolvedStructure}`);
|
|
24
|
+
|
|
25
|
+
// 🔹 Validar flags e opções obrigatórias
|
|
26
|
+
validateOptions(options, resolvedStructure);
|
|
27
|
+
|
|
28
|
+
// 🔹 Continuar com a geração real da feature
|
|
29
|
+
return featureRule(options)(tree, context);
|
|
30
|
+
};
|
|
31
|
+
};
|
|
32
|
+
|
|
33
|
+
// ------------------------------------------------------
|
|
34
|
+
// Função interna que gera a feature de forma limpa
|
|
35
|
+
function featureRule(options: any): Rule {
|
|
18
36
|
const featureKebab = toKebabCase(options.name);
|
|
19
37
|
const featurePascal = toPascalCase(options.name);
|
|
20
38
|
|
|
21
|
-
let basePath
|
|
39
|
+
let basePath!: string;
|
|
22
40
|
let subFolders: string[] = [];
|
|
23
41
|
|
|
24
42
|
switch (options.structure) {
|
|
25
43
|
case 'flat':
|
|
26
|
-
|
|
27
44
|
basePath = `src/app/${featureKebab}`;
|
|
28
45
|
break;
|
|
29
46
|
|
|
@@ -46,52 +63,51 @@ export default function (options: any): Rule {
|
|
|
46
63
|
: `libs/${options.lib}/src/lib/${featureKebab}`;
|
|
47
64
|
subFolders = ['pages', 'data', 'models'];
|
|
48
65
|
break;
|
|
49
|
-
|
|
50
|
-
default:
|
|
51
|
-
throw new Error(`Invalid structure: ${options.structure}`);
|
|
52
66
|
}
|
|
53
67
|
|
|
54
68
|
return chain([
|
|
55
|
-
(
|
|
69
|
+
(_tree: Tree, context: SchematicContext) => {
|
|
56
70
|
context.logger.info(`🟢 Creating feature: ${featurePascal} (${featureKebab})`);
|
|
57
71
|
context.logger.info(`Structure: ${options.structure}`);
|
|
58
|
-
const resolved = resolveStructure(tree, options);
|
|
59
|
-
options.structure = resolved;
|
|
60
|
-
|
|
61
|
-
context.logger.info(`📐 Structure resolved to: ${resolved}`);
|
|
62
|
-
|
|
63
|
-
validateOptions(options, resolved);
|
|
64
72
|
},
|
|
65
73
|
|
|
66
|
-
|
|
74
|
+
// 🔹 Gerar ficheiros a partir do template
|
|
75
|
+
mergeWith(
|
|
76
|
+
apply(url('./files'), [
|
|
77
|
+
template({ featureKebab, featurePascal }),
|
|
78
|
+
move(basePath),
|
|
79
|
+
])
|
|
80
|
+
),
|
|
67
81
|
|
|
82
|
+
// 🔹 Atualizar routes.ts (standalone + lazy loading quando necessário)
|
|
68
83
|
(_tree: Tree, context: SchematicContext) => {
|
|
69
84
|
context.logger.info(`🟢 Updating app.routes.ts with ${featurePascal}Page...`);
|
|
70
|
-
|
|
71
85
|
updateAppRoutes(_tree, featureKebab, featurePascal, options.structure, options);
|
|
72
86
|
},
|
|
73
87
|
|
|
88
|
+
// 🔹 Criar subpastas e barrels (index.ts)
|
|
74
89
|
(_tree: Tree) => {
|
|
75
|
-
// Cria subpastas e barrels
|
|
76
90
|
subFolders.forEach((folder) => {
|
|
77
91
|
const folderPath = `${basePath}/${folder}`;
|
|
78
92
|
if (!_tree.exists(folderPath)) _tree.create(folderPath + '/.gitkeep', '');
|
|
79
93
|
|
|
80
|
-
//
|
|
81
|
-
const files = _tree.getDir(folderPath).subfiles.filter(f => f.endsWith('.ts'));
|
|
82
|
-
const barrelContent = files
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
94
|
+
// Criar barrel index.ts automaticamente
|
|
95
|
+
const files = _tree.getDir(folderPath).subfiles.filter((f) => f.endsWith('.ts'));
|
|
96
|
+
const barrelContent = files
|
|
97
|
+
.map((f) => {
|
|
98
|
+
const name = f.replace('.ts', '');
|
|
99
|
+
return `export * from './${name}';`;
|
|
100
|
+
})
|
|
101
|
+
.join('\n');
|
|
86
102
|
|
|
87
103
|
if (!_tree.exists(`${folderPath}/index.ts`)) {
|
|
88
104
|
_tree.create(`${folderPath}/index.ts`, barrelContent);
|
|
89
105
|
} else {
|
|
90
|
-
//
|
|
106
|
+
// Adiciona novos exports sem duplicar
|
|
91
107
|
const existing = _tree.read(`${folderPath}/index.ts`)!.toString('utf-8');
|
|
92
108
|
const newExports = files
|
|
93
|
-
.map(f => `export * from './${f.replace('.ts','')}';`)
|
|
94
|
-
.filter(line => !existing.includes(line))
|
|
109
|
+
.map((f) => `export * from './${f.replace('.ts', '')}';`)
|
|
110
|
+
.filter((line) => !existing.includes(line))
|
|
95
111
|
.join('\n');
|
|
96
112
|
if (newExports) _tree.overwrite(`${folderPath}/index.ts`, existing + '\n' + newExports);
|
|
97
113
|
}
|