Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add updateAnnotatedFile property #139

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ class Openapi {
/// Include in depth logging output from run commands.
final bool debugLogging;

/// If set to true, the annotated file will be added or updated comment lines as of the last run date on the top of the file.
/// Defaults to true
final bool updateAnnotatedFile;

const Openapi({
this.additionalProperties,
this.skipSpecValidation = false,
Expand All @@ -129,6 +133,7 @@ class Openapi {
this.cachePath,
this.projectPubspecPath,
this.debugLogging = false,
this.updateAnnotatedFile = true,
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ void main() {
debugLogging: true);
expect(api.debugLogging, isTrue);
});
test('Sets updateAnnotatedFile', () {
final api = Openapi(
inputSpec: InputSpec.json(),
generatorName: Generator.dart,
updateAnnotatedFile: false);
expect(api.updateAnnotatedFile, isFalse);
});
group('InputSpec', () {
group('local spec', () {
test('provides default yaml path', () {
Expand Down
7 changes: 7 additions & 0 deletions openapi-generator/lib/src/models/generator_arguments.dart
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ class GeneratorArguments {
/// Default: false
final bool skipValidation;

/// Write the last run placeholder to the annotated file.
///
/// Default: true
final bool updateAnnotatedFile;

/// Provides an OAS spec file.
///
/// When the [useNextGen] flag is set this should be the spec file configuration
Expand Down Expand Up @@ -104,6 +109,8 @@ class GeneratorArguments {
annotations.readPropertyOrDefault('runSourceGenOnOutput', true),
shouldFetchDependencies =
annotations.readPropertyOrDefault('fetchDependencies', true),
updateAnnotatedFile =
annotations.readPropertyOrDefault('updateAnnotatedFile', true),
outputDirectory = annotations.readPropertyOrNull('outputDirectory'),
cachePath =
annotations.readPropertyOrDefault('cachePath', defaultCachedPath),
Expand Down
37 changes: 24 additions & 13 deletions openapi-generator/lib/src/openapi_generator_runner.dart
Original file line number Diff line number Diff line change
Expand Up @@ -220,24 +220,35 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
),
),
);
await updateAnnotatedFile(annotatedPath: annotatedPath).then(
(_) => logOutputMessage(
log: log,
communication: OutputMessage(
message: 'Successfully updated annotated file.',
level: Level.CONFIG,
if (args.updateAnnotatedFile) {
await updateAnnotatedFile(annotatedPath: annotatedPath).then(
(_) => logOutputMessage(
log: log,
communication: OutputMessage(
message: 'Successfully updated annotated file.',
level: Level.CONFIG,
),
),
),
onError: (e, st) => logOutputMessage(
onError: (e, st) => logOutputMessage(
log: log,
communication: OutputMessage(
message: 'Failed to update annotated class file.',
level: Level.WARNING,
additionalContext: e,
stackTrace: st,
),
),
);
} else {
logOutputMessage(
log: log,
communication: OutputMessage(
message: 'Failed to update annotated class file.',
message:
'Skipped updating annotated file step because flag was set.',
level: Level.WARNING,
additionalContext: e,
stackTrace: st,
),
),
);
);
}
}
return '';
}
Expand Down
25 changes: 23 additions & 2 deletions openapi-generator/test/builder_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ class TestClassConfig extends OpenapiGeneratorConfig {}
'https://raw.githubusercontent.com/Nexushunter/tagmine-api/main/openapi.yaml';
final basePath = '${testSpecPath}output-nextgen/';
final f = File('${basePath}cache.json');
tearDown(() {
final b = File(basePath);
tearDownAll(() {
final b = Directory(basePath);
if (b.existsSync()) b.deleteSync(recursive: true);
});

Expand Down Expand Up @@ -263,6 +263,27 @@ class TestClassConfig extends OpenapiGeneratorConfig {}
copy.deleteSync();
expect(hasOutput, isTrue);
});
test('skip updating annotated file', () async {
final annotatedFile = File(
'.${Platform.pathSeparator}test${Platform.pathSeparator}specs${Platform.pathSeparator}output-nextgen${Platform.pathSeparator}annotated_file.dart');
final annotetedFileContent = '\n';
await annotatedFile.writeAsString(annotetedFileContent, flush: true);

generatedOutput = await generate('''
@Openapi(
inputSpecFile: '$specPath',
inputSpec: RemoteSpec(path: '$specPath'),
useNextGen: true,
cachePath: '${f.path}',
updateAnnotatedFile: false,
)
''', path: annotatedFile.path);
expect(
generatedOutput,
contains(
'Skipped updating annotated file step because flag was set.'));
expect(annotatedFile.readAsStringSync(), equals(annotetedFileContent));
});
group('source gen', () {
group('uses Flutter', () {
group('with wrapper', () {
Expand Down
6 changes: 6 additions & 0 deletions openapi-generator/test/generator_arguments_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ void main() {
test('shouldFetchDependencies',
() => expect(args.shouldFetchDependencies, isTrue));
test('skipValidation', () => expect(args.skipValidation, isFalse));
test('updateAnnotatedFile',
() => expect(args.updateAnnotatedFile, isTrue));
test(
'pubspecPath',
() => expect(
Expand Down Expand Up @@ -168,6 +170,7 @@ void main() {
expect(args.isRemote, isFalse);
expect(args.generatorName, 'dart-dio');
expect(args.shouldGenerateSources, isTrue);
expect(args.updateAnnotatedFile, isTrue);
expect(args.additionalProperties?.useEnumExtension, isTrue);
expect(args.additionalProperties?.pubAuthor, 'test author');
expect(await args.jarArgs, [
Expand Down Expand Up @@ -218,6 +221,7 @@ void main() {
expect(args.isRemote, isFalse);
expect(args.generatorName, 'dart-dio');
expect(args.shouldGenerateSources, isTrue);
expect(args.updateAnnotatedFile, isTrue);
expect(args.additionalProperties?.useEnumExtension, isTrue);
expect((args.additionalProperties as DioProperties?)?.nullableFields,
isTrue);
Expand Down Expand Up @@ -269,6 +273,7 @@ void main() {
expect(args.isRemote, isFalse);
expect(args.generatorName, 'dart-dio');
expect(args.shouldGenerateSources, isTrue);
expect(args.updateAnnotatedFile, isTrue);
expect(args.additionalProperties?.useEnumExtension, isTrue);
expect(
(args.additionalProperties as DioAltProperties?)?.nullSafe, isTrue);
Expand Down Expand Up @@ -329,6 +334,7 @@ void main() {
'https://petstore3.swagger.io/api/v3/openapi.json');
expect(args.generatorName, 'dart-dio');
expect(args.shouldGenerateSources, isTrue);
expect(args.updateAnnotatedFile, isTrue);
expect(args.additionalProperties?.useEnumExtension, isTrue);
expect(
(args.additionalProperties as DioAltProperties?)?.nullSafe, isTrue);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ import 'package:openapi_generator_annotations/openapi_generator_annotations.dart
nullSafeArrayDefault: true),
inlineSchemaNameMappings: {'200resp': 'OkResp'},
projectPubspecPath: './test/specs/dart_pubspec.test.yaml',
updateAnnotatedFile: true,
)
class DioAltPropertiesTestConfig {}
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@ import 'package:openapi_generator_annotations/openapi_generator_annotations.dart
nullableFields: true),
inlineSchemaNameMappings: {'200resp': 'OkResp'},
projectPubspecPath: './test/specs/dart_pubspec.test.yaml',
updateAnnotatedFile: true,
)
class DioPropertiesTestConfig {}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ import 'package:openapi_generator_annotations/openapi_generator_annotations.dart
nullSafeArrayDefault: true),
inlineSchemaNameMappings: {'200resp': 'OkResp'},
projectPubspecPath: './test/specs/dart_pubspec.test.yaml',
updateAnnotatedFile: true,
)
class DioAltPropertiesTestConfig {}
1 change: 1 addition & 0 deletions openapi-generator/test/specs/test_config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ import 'package:openapi_generator_annotations/openapi_generator_annotations.dart
legacyDiscriminatorBehavior: true),
inlineSchemaNameMappings: {'200resp': 'OkResp'},
projectPubspecPath: './test/specs/dart_pubspec.test.yaml',
updateAnnotatedFile: true,
)
class TestClassConfig {}
6 changes: 6 additions & 0 deletions openapi-generator/test/test_annotations/test_configs.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ const inputSpec = '';
const runSourceGenOnOutput = true;

const skipSpecValidation = false;

const updateAnnotatedFile = true;
''')
@Openapi(inputSpec: InputSpec(path: ''), generatorName: Generator.dio)
class TestClassDefault {}
Expand All @@ -29,6 +31,8 @@ const inputSpec = '';
const runSourceGenOnOutput = true;

const skipSpecValidation = false;

const updateAnnotatedFile = true;
''')
@Openapi(
inputSpec: InputSpec(path: ''),
Expand All @@ -49,6 +53,8 @@ const inputSpec = '';
const runSourceGenOnOutput = true;

const skipSpecValidation = false;

const updateAnnotatedFile = true;
''')
@Openapi(
inputSpec: InputSpec(path: ''),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class TestGenerator extends src_gen.GeneratorForAnnotation<Openapi> {
SupportedFields(name: 'runSourceGenOnOutput', type: bool),
SupportedFields(name: 'cachePath', type: String),
SupportedFields(name: 'projectPubspecPath', type: String),
SupportedFields(name: 'updateAnnotatedFile', type: bool),
]..sort((a, b) => a.name.compareTo(b.name));
for (final field in fields) {
final v = annotation.read(field.name);
Expand Down
Loading