Skip to content

Commit 65a71bf

Browse files
author
github-actions
committed
Prepare version 0.13.1
1 parent 95e04d6 commit 65a71bf

File tree

6 files changed

+114
-116
lines changed

6 files changed

+114
-116
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## [0.13.1]
4+
5+
- Released @ 6/2025 (UTC)
6+
- chore: Update dependencies
7+
38
## [0.13.0]
49

510
- Released @ 3/2025 (UTC)

‎example/example.dart‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ import 'models/model_user/model_user.dart';
1818
void main() {
1919
final a = const ModelTest(
2020
users: [
21-
ModelUser(ref: DataRefModel(collection: ['users'], id: '123')),
21+
ModelUser(
22+
ref: DataRefModel(collection: ['users'], id: '123'),
23+
),
2224
],
2325
checks: [1, 2, 3, 4],
2426
);

‎example/models/model_test/_model_test.g.dart‎

Lines changed: 45 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -142,40 +142,37 @@ class ModelTest extends _ModelTest {
142142
/// [json] is `null` or if the conversion fails.
143143
static ModelTest? fromJsonOrNull(Map<String, dynamic>? json) {
144144
try {
145-
final users =
146-
letListOrNull<dynamic>(json?['users'])
147-
?.map(
148-
(p0) => () {
149-
final a = letMapOrNull<String, dynamic>(p0);
150-
return a != null ? ModelUser.fromJson(a) : null;
151-
}(),
152-
)
153-
.nonNulls
154-
.nullIfEmpty
155-
?.toList()
156-
.unmodifiable;
157-
final checks =
158-
letListOrNull<dynamic>(json?['checks'])
159-
?.map((p0) => letAsOrNull<int>(p0))
160-
.nonNulls
161-
.nullIfEmpty
162-
?.toList()
163-
.unmodifiable;
164-
final random =
165-
letMapOrNull<dynamic, dynamic>(json?['random'])
166-
?.map(
167-
(p0, p1) => MapEntry(
168-
p0?.toString().trim().nullIfEmpty,
169-
letMapOrNull<dynamic, dynamic>(p1)
170-
?.map((p0, p1) => MapEntry(p0, letAsOrNull<int>(p1)))
171-
.nonNulls
172-
.nullIfEmpty
173-
?.unmodifiable,
174-
),
175-
)
176-
.nonNulls
177-
.nullIfEmpty
178-
?.unmodifiable;
145+
final users = letListOrNull<dynamic>(json?['users'])
146+
?.map(
147+
(p0) => () {
148+
final a = letMapOrNull<String, dynamic>(p0);
149+
return a != null ? ModelUser.fromJson(a) : null;
150+
}(),
151+
)
152+
.nonNulls
153+
.nullIfEmpty
154+
?.toList()
155+
.unmodifiable;
156+
final checks = letListOrNull<dynamic>(json?['checks'])
157+
?.map((p0) => letAsOrNull<int>(p0))
158+
.nonNulls
159+
.nullIfEmpty
160+
?.toList()
161+
.unmodifiable;
162+
final random = letMapOrNull<dynamic, dynamic>(json?['random'])
163+
?.map(
164+
(p0, p1) => MapEntry(
165+
p0?.toString().trim().nullIfEmpty,
166+
letMapOrNull<dynamic, dynamic>(p1)
167+
?.map((p0, p1) => MapEntry(p0, letAsOrNull<int>(p1)))
168+
.nonNulls
169+
.nullIfEmpty
170+
?.unmodifiable,
171+
),
172+
)
173+
.nonNulls
174+
.nullIfEmpty
175+
?.unmodifiable;
179176
return ModelTest(users: users, checks: checks, random: random);
180177
} catch (e) {
181178
return null;
@@ -212,19 +209,21 @@ class ModelTest extends _ModelTest {
212209
@override
213210
Map<String, dynamic> toJson({bool includeNulls = false}) {
214211
try {
215-
final users0 =
216-
users?.map((p0) => p0?.toJson()).nonNulls.nullIfEmpty?.toList();
212+
final users0 = users
213+
?.map((p0) => p0?.toJson())
214+
.nonNulls
215+
.nullIfEmpty
216+
?.toList();
217217
final checks0 = checks?.map((p0) => p0).nonNulls.nullIfEmpty?.toList();
218-
final random0 =
219-
random
220-
?.map(
221-
(p0, p1) => MapEntry(
222-
p0?.trim().nullIfEmpty,
223-
p1?.map((p0, p1) => MapEntry(p0, p1)).nonNulls.nullIfEmpty,
224-
),
225-
)
226-
.nonNulls
227-
.nullIfEmpty;
218+
final random0 = random
219+
?.map(
220+
(p0, p1) => MapEntry(
221+
p0?.trim().nullIfEmpty,
222+
p1?.map((p0, p1) => MapEntry(p0, p1)).nonNulls.nullIfEmpty,
223+
),
224+
)
225+
.nonNulls
226+
.nullIfEmpty;
228227
final withNulls = {'users': users0, 'random': random0, 'checks': checks0};
229228
return includeNulls ? withNulls : withNulls.nonNulls;
230229
} catch (e) {

‎lib/src/extract_insights_from_file.dart‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ Future<List<ClassInsight<GenerateDartModel>>> extractInsightsFromFile(
3737
await analyzer.analyze(
3838
inclClassAnnotations: {GenerateDartModel.CLASS_NAME},
3939
inclMemberAnnotations: {Field.CLASS_NAME},
40-
onClassAnnotationField:
41-
(p) async => temp = _updateFromClassAnnotationField(temp, p),
40+
onClassAnnotationField: (p) async =>
41+
temp = _updateFromClassAnnotationField(temp, p),
4242
onAnnotatedMember: (p) async => temp = _updateFromAnnotatedMember(temp, p),
4343
onPreAnalysis: (_, className) => temp = const GenerateDartModel(fields: {}),
4444
onPostAnalysis: (params) {
@@ -142,19 +142,18 @@ GenerateDartModel _updateFromAnnotatedMember(
142142
params.memberAnnotationFields[FieldModelFieldNames.fieldPath],
143143
);
144144
final a2 = [params.memberName];
145-
final b1 =
146-
params.memberAnnotationFields[FieldModelFieldNames.fieldType]
147-
?.toStringValue();
145+
final b1 = params.memberAnnotationFields[FieldModelFieldNames.fieldType]
146+
?.toStringValue();
148147
final b2 = params.memberType.getDisplayString();
149-
final nullable =
150-
params.memberAnnotationFields[FieldModelFieldNames.nullable]
151-
?.toBoolValue();
152-
final primaryKey =
153-
params.memberAnnotationFields[FieldModelFieldNames.primaryKey]
154-
?.toBoolValue();
155-
final foreignKey =
156-
params.memberAnnotationFields[FieldModelFieldNames.foreignKey]
157-
?.toBoolValue();
148+
final nullable = params
149+
.memberAnnotationFields[FieldModelFieldNames.nullable]
150+
?.toBoolValue();
151+
final primaryKey = params
152+
.memberAnnotationFields[FieldModelFieldNames.primaryKey]
153+
?.toBoolValue();
154+
final foreignKey = params
155+
.memberAnnotationFields[FieldModelFieldNames.foreignKey]
156+
?.toBoolValue();
158157
final children =
159158
(dartObjToObject(
160159
params.memberAnnotationFields[FieldModelFieldNames.children],
@@ -163,12 +162,12 @@ GenerateDartModel _updateFromAnnotatedMember(
163162
?.map((e) => (e as Map).map((k, v) => MapEntry(k.toString(), v)))
164163
.nonNulls
165164
.toList();
166-
final fallback =
167-
params.memberAnnotationFields[FieldModelFieldNames.fallback]
168-
?.toListValue();
169-
final description =
170-
params.memberAnnotationFields[FieldModelFieldNames.description]
171-
?.toStringValue();
165+
final fallback = params
166+
.memberAnnotationFields[FieldModelFieldNames.fallback]
167+
?.toListValue();
168+
final description = params
169+
.memberAnnotationFields[FieldModelFieldNames.description]
170+
?.toStringValue();
172171
final field = DartField(
173172
fieldPath: a1 ?? a2,
174173
fieldType: b1 ?? b2,

‎lib/src/gen_models_app.dart‎

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ Future<void> genModelsApp(
6464
late final String outputFileNamePattern;
6565
try {
6666
inputPath = argResults.option(DefaultOptions.INPUT_PATH.name)!;
67-
templatePathOrUrl =
68-
argResults.option(DefaultOptions.TEMPLATE_PATH_OR_URL.name)!;
67+
templatePathOrUrl = argResults.option(
68+
DefaultOptions.TEMPLATE_PATH_OR_URL.name,
69+
)!;
6970
dartSdk = argResults.option(DefaultOptions.DART_SDK.name);
7071
outputFileNamePattern = argResults.option(OUTPUT_FILE_NAME_PATTERN.name)!;
7172
} catch (_) {
@@ -77,14 +78,13 @@ Future<void> genModelsApp(
7778
}
7879
final analysisContextCollection = createDartAnalysisContextCollection({
7980
inputPath,
80-
}, dartSdk,);
81+
}, dartSdk);
8182
final spinner = Spinner();
8283
spinner.start();
8384
_print(Log.printWhite, 'Reading template at: $templatePathOrUrl...');
84-
final result =
85-
await MdTemplateUtility.i
86-
.readTemplateFromPathOrUrl(templatePathOrUrl)
87-
.value;
85+
final result = await MdTemplateUtility.i
86+
.readTemplateFromPathOrUrl(templatePathOrUrl)
87+
.value;
8888
if (result.isErr()) {
8989
_print(Log.printRed, ' Failed to read template!', spinner);
9090
exit(ExitCodes.FAILURE.code);
@@ -177,8 +177,8 @@ final _interpolator = TemplateInterpolator<ClassInsight<GenerateDartModel>>({
177177
'___SUPER_CONSTRUCTOR___': (insight) {
178178
return insight.annotation.shouldInherit == true
179179
? insight.annotation.inheritanceConstructor?.nullIfEmpty != null
180-
? ': super.${insight.annotation.inheritanceConstructor}()'
181-
: ''
180+
? ': super.${insight.annotation.inheritanceConstructor}()'
181+
: ''
182182
: '';
183183
},
184184
'___FIELD_DECLARATIONS___': (insight) {
@@ -256,14 +256,12 @@ final _interpolator = TemplateInterpolator<ClassInsight<GenerateDartModel>>({
256256
}
257257

258258
final j = fields.map((a) {
259-
final ff =
260-
fields
261-
.where(
262-
(b) => a.fieldPath!
263-
.join('.')
264-
.startsWith('${b.fieldPath!.join('.')}.'),
265-
)
266-
.toList();
259+
final ff = fields
260+
.where(
261+
(b) =>
262+
a.fieldPath!.join('.').startsWith('${b.fieldPath!.join('.')}.'),
263+
)
264+
.toList();
267265
ff.sort((a, b) => b.fieldName!.compareTo(a.fieldName!));
268266
return $v(ff.length > 1 ? '${ff[1].fieldName}' : 'json', a);
269267
});
@@ -293,16 +291,15 @@ final _interpolator = TemplateInterpolator<ClassInsight<GenerateDartModel>>({
293291
},
294292
'___TO_JSON_ARGS___': (insight) {
295293
final fields = insight.fields.toList();
296-
final parents =
297-
fields
298-
.where(
299-
(f1) =>
300-
f1.fieldType == 'Map<String, dynamic>' &&
301-
fields
302-
.map((e) => e.fieldPath!.join('.'))
303-
.any((e) => e.startsWith('${f1.fieldPath!.join('.')}.')),
304-
)
305-
.toList();
294+
final parents = fields
295+
.where(
296+
(f1) =>
297+
f1.fieldType == 'Map<String, dynamic>' &&
298+
fields
299+
.map((e) => e.fieldPath!.join('.'))
300+
.any((e) => e.startsWith('${f1.fieldPath!.join('.')}.')),
301+
)
302+
.toList();
306303
fields.removeWhere((e) => parents.contains(e));
307304
final stringCaseType = insight.stringCaseType;
308305
final entries =
@@ -332,7 +329,7 @@ final _interpolator = TemplateInterpolator<ClassInsight<GenerateDartModel>>({
332329
(e) => "'${insight.stringCaseType.convert(e)}'",
333330
),
334331
'#',
335-
], newValue: '...?${parent.fieldName}0,',);
332+
], newValue: '...?${parent.fieldName}0,');
336333
}
337334
final test = buffer.entries.map((e) => '${e.key}: ${e.value},').join();
338335
return test.replaceAll('#:', '');

‎lib/src/gen_models_gemeni_app.dart‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ Future<void> genModelsGemeniApp(List<String> args) async {
3232
);
3333
final GEMENI_API_KEY = const df_gen_core.Option(
3434
name: 'api-key',
35-
help: 'Get your Gemeni API key here https://ai.google.dev/gemini-api/docs/api-key.',
35+
help:
36+
'Get your Gemeni API key here https://ai.google.dev/gemini-api/docs/api-key.',
3637
);
3738
final GEMENI_MODEL = const df_gen_core.Option(
3839
name: 'model',
@@ -46,7 +47,8 @@ Future<void> genModelsGemeniApp(List<String> args) async {
4647
);
4748
final LANG = const df_gen_core.Option(
4849
name: 'lang',
49-
help: 'The programming language to generate the data model for, e.g. "dart" or "ts"',
50+
help:
51+
'The programming language to generate the data model for, e.g. "dart" or "ts"',
5052
defaultsTo: 'ts',
5153
);
5254
final parser = CliParser(
@@ -104,12 +106,9 @@ Future<void> genModelsGemeniApp(List<String> args) async {
104106
);
105107
exit(ExitCodes.FAILURE.code);
106108
}
107-
final analysisContextCollection = createDartAnalysisContextCollection(
108-
{
109-
inputPath,
110-
},
111-
dartSdk,
112-
);
109+
final analysisContextCollection = createDartAnalysisContextCollection({
110+
inputPath,
111+
}, dartSdk);
113112
final filePathStream0 = PathExplorer(inputPath).exploreFiles();
114113
final filePathStream1 = filePathStream0.where(
115114
(e) => _isAllowedFileName(e.path),
@@ -181,19 +180,16 @@ Future<void> _generateModelWithGemeni({
181180
if (fields == null) return;
182181
final className = insight.className;
183182
final prompt = StringBuffer();
184-
prompt.writeAll(
185-
[
186-
'Generate a data class called $className for the programming language "$lang" using the given data below, orignally for Dart models.',
187-
note,
188-
'Only respond with code.',
189-
'Assume any undefined/unknown variables/classes exist. Do not redefine them.',
190-
'Start the file with the comment "GENERATED WITH GEMENI. VERIFY AND MODIFY AS NEEDED BEFORE USING IN CODE."',
191-
'Do not provide additional comments.',
192-
'Do not provide examples.',
193-
'\n\n',
194-
],
195-
' ',
196-
);
183+
prompt.writeAll([
184+
'Generate a data class called $className for the programming language "$lang" using the given data below, orignally for Dart models.',
185+
note,
186+
'Only respond with code.',
187+
'Assume any undefined/unknown variables/classes exist. Do not redefine them.',
188+
'Start the file with the comment "GENERATED WITH GEMENI. VERIFY AND MODIFY AS NEEDED BEFORE USING IN CODE."',
189+
'Do not provide additional comments.',
190+
'Do not provide examples.',
191+
'\n\n',
192+
], ' ');
197193
prompt.writeAll(
198194
fields.map(
199195
(e) => {

0 commit comments

Comments
 (0)