Skip to content
This repository was archived by the owner on May 1, 2020. It is now read-only.

Commit 6fd622c

Browse files
committed
fix(generators): handle old cli
1 parent 34fc05b commit 6fd622c

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

src/generators.ts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@ import { hydrateRequest, hydrateTabRequest, getNgModules, GeneratorOption, Gener
44

55
export { getNgModules, GeneratorOption, GeneratorRequest };
66

7-
export function processPageRequest(context: BuildContext, name: string, commandOptions: any) {
8-
9-
const hydratedRequest = hydrateRequest(context, { type: 'page', name, includeNgModule: commandOptions.module });
10-
return generateTemplates(context, hydratedRequest, commandOptions.constants);
7+
export function processPageRequest(context: BuildContext, name: string, commandOptions?: { module?: boolean; constants?: boolean; }) {
8+
if (commandOptions) {
9+
const hydratedRequest = hydrateRequest(context, { type: 'page', name, includeNgModule: commandOptions.module });
10+
return generateTemplates(context, hydratedRequest, commandOptions.constants);
11+
}else {
12+
const hydratedRequest = hydrateRequest(context, { type: 'page', name, includeNgModule: false });
13+
return generateTemplates(context, hydratedRequest);
14+
}
1115
}
1216

1317
export function processPipeRequest(context: BuildContext, name: string, ngModulePath: string) {
@@ -26,9 +30,11 @@ export function processProviderRequest(context: BuildContext, name: string, ngMo
2630
return nonPageFileManipulation(context, name, ngModulePath, 'provider');
2731
}
2832

29-
export function processTabsRequest(context: BuildContext, name: string, tabs: any[], commandOptions: any) {
30-
const includePageConstants = commandOptions.constants;
31-
const includeNgModule = commandOptions.module;
33+
export function processTabsRequest(context: BuildContext, name: string, tabs: any[], commandOptions?: { module?: boolean; constants?: boolean; }) {
34+
35+
const includePageConstants = commandOptions ? commandOptions.constants : false;
36+
const includeNgModule = commandOptions ? commandOptions.module : false;
37+
3238
const tabHydratedRequests = tabs.map((tab) => hydrateRequest(context, { type: 'page', name: tab, includeNgModule}));
3339
const hydratedRequest = hydrateTabRequest(context, { type: 'tabs', name, includeNgModule, tabs: tabHydratedRequests });
3440

src/generators/util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ export function tabsModuleManipulation(tabs: string[][], hydratedRequest: Hydrat
244244

245245
}
246246

247-
export function generateTemplates(context: BuildContext, request: HydratedGeneratorRequest, includePageConstants: any): Promise<string[]> {
247+
export function generateTemplates(context: BuildContext, request: HydratedGeneratorRequest, includePageConstants?: boolean): Promise<string[]> {
248248
Logger.debug('[Generators] generateTemplates: Reading templates ...');
249249

250250
let pageConstantFile = join(context.pagesDir, 'pages.constants.ts');

0 commit comments

Comments
 (0)