Skip to content

Commit 9dcb580

Browse files
committed
Add new information for wizard into schema options
1 parent 088145b commit 9dcb580

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

src/ng-generate/table-prompter/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ function getTtlPaths(promptSubj: Subject<any>, allAnswers: Schema, subscriber: S
201201
case singleAnswer.name === configFileName.name: {
202202
if (singleAnswer.answer !== WIZARD_CONFIG_FILE) {
203203
WIZARD_CONFIG_FILE = `${singleAnswer.answer}-${WIZARD_CONFIG_FILE}`;
204+
allAnswers.configFile = WIZARD_CONFIG_FILE;
204205
}
205206
promptSubj.next(pathDecision);
206207
break;

src/ng-generate/table/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ export function generateTable(options: Schema): Rule {
6868
options.skipImport = false;
6969
}
7070

71+
if(options.configFile !== WIZARD_CONFIG_FILE) {
72+
options.configFile = WIZARD_CONFIG_FILE;
73+
}
74+
7175
loadAndApplyConfigFile(options.configFile, options);
7276

7377
if (options.aspectModelTFilesString) {

src/ng-generate/types/index.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,17 @@ import {formatGeneratedFiles, loadAndApplyConfigFile} from '../../utils/file';
1919
import {TemplateHelper} from '../../utils/template-helper';
2020
import {visitAspectModel} from './aspect-model-type-generator-visitor';
2121
import {Schema} from './schema';
22+
import {WIZARD_CONFIG_FILE} from "../table-prompter/index";
2223

2324
export default function (options: Schema): Rule {
2425
const spinner = ora().start();
2526
options.spinner = spinner;
2627
options.templateHelper = new TemplateHelper();
2728

29+
if(options.configFile !== WIZARD_CONFIG_FILE) {
30+
options.configFile = WIZARD_CONFIG_FILE;
31+
}
32+
2833
loadAndApplyConfigFile(options.configFile, options);
2934

3035
if (options.aspectModelTFilesString) {

0 commit comments

Comments
 (0)