Skip to content

Commit 3434b8f

Browse files
tenhobitenhobi
committed
Fix specialized int list resolution
1 parent 744c8a0 commit 3434b8f

File tree

14 files changed

+51
-308
lines changed

14 files changed

+51
-308
lines changed

‎.vscode/settings.json

+24-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
11
{
2-
"yaml.schemaStore.enable": false
2+
"yaml.schemaStore.enable": false,
3+
"dart.flutterSdkPath": ".fvm/versions/3.27.1",
4+
"search.exclude": {
5+
"**/.fvm": true
6+
},
7+
"files.exclude": {
8+
"**/.git": true,
9+
"**/.DS_Store": true,
10+
".idea/**": true,
11+
".run/**": true
12+
},
13+
"files.watcherExclude": {
14+
"**/.fvm": true
15+
},
16+
"[dart]": {
17+
"editor.formatOnSave": true,
18+
"editor.formatOnType": true,
19+
"editor.rulers": [
20+
120
21+
],
22+
"editor.formatOnPaste": true,
23+
"editor.defaultFormatter": "Dart-Code.dart-code"
24+
},
25+
"dart.lineLength": 120
326
}

‎examples/drift/lib/db.drift.dart

-285
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// dart format width=80
21
// ignore_for_file: type=lint
32
part of 'db.dart';
43

@@ -158,15 +157,6 @@ class Todo extends DataClass implements Insertable<Todo> {
158157
content: content ?? this.content,
159158
category: category.present ? category.value : this.category,
160159
);
161-
Todo copyWithCompanion(TodosCompanion data) {
162-
return Todo(
163-
id: data.id.present ? data.id.value : this.id,
164-
title: data.title.present ? data.title.value : this.title,
165-
content: data.content.present ? data.content.value : this.content,
166-
category: data.category.present ? data.category.value : this.category,
167-
);
168-
}
169-
170160
@override
171161
String toString() {
172162
return (StringBuffer('Todo(')
@@ -371,14 +361,6 @@ class Category extends DataClass implements Insertable<Category> {
371361
id: id ?? this.id,
372362
description: description ?? this.description,
373363
);
374-
Category copyWithCompanion(CategoriesCompanion data) {
375-
return Category(
376-
id: data.id.present ? data.id.value : this.id,
377-
description:
378-
data.description.present ? data.description.value : this.description,
379-
);
380-
}
381-
382364
@override
383365
String toString() {
384366
return (StringBuffer('Category(')
@@ -450,7 +432,6 @@ class CategoriesCompanion extends UpdateCompanion<Category> {
450432

451433
abstract class _$MyDatabase extends GeneratedDatabase {
452434
_$MyDatabase(QueryExecutor e) : super(e);
453-
$MyDatabaseManager get managers => $MyDatabaseManager(this);
454435
late final $TodosTable todos = $TodosTable(this);
455436
late final $CategoriesTable categories = $CategoriesTable(this);
456437
@override
@@ -459,269 +440,3 @@ abstract class _$MyDatabase extends GeneratedDatabase {
459440
@override
460441
List<DatabaseSchemaEntity> get allSchemaEntities => [todos, categories];
461442
}
462-
463-
typedef $$TodosTableCreateCompanionBuilder = TodosCompanion Function({
464-
Value<int> id,
465-
required String title,
466-
required String content,
467-
Value<int?> category,
468-
});
469-
typedef $$TodosTableUpdateCompanionBuilder = TodosCompanion Function({
470-
Value<int> id,
471-
Value<String> title,
472-
Value<String> content,
473-
Value<int?> category,
474-
});
475-
476-
class $$TodosTableFilterComposer extends Composer<_$MyDatabase, $TodosTable> {
477-
$$TodosTableFilterComposer({
478-
required super.$db,
479-
required super.$table,
480-
super.joinBuilder,
481-
super.$addJoinBuilderToRootComposer,
482-
super.$removeJoinBuilderFromRootComposer,
483-
});
484-
ColumnFilters<int> get id => $composableBuilder(
485-
column: $table.id, builder: (column) => ColumnFilters(column));
486-
487-
ColumnFilters<String> get title => $composableBuilder(
488-
column: $table.title, builder: (column) => ColumnFilters(column));
489-
490-
ColumnFilters<String> get content => $composableBuilder(
491-
column: $table.content, builder: (column) => ColumnFilters(column));
492-
493-
ColumnFilters<int> get category => $composableBuilder(
494-
column: $table.category, builder: (column) => ColumnFilters(column));
495-
}
496-
497-
class $$TodosTableOrderingComposer extends Composer<_$MyDatabase, $TodosTable> {
498-
$$TodosTableOrderingComposer({
499-
required super.$db,
500-
required super.$table,
501-
super.joinBuilder,
502-
super.$addJoinBuilderToRootComposer,
503-
super.$removeJoinBuilderFromRootComposer,
504-
});
505-
ColumnOrderings<int> get id => $composableBuilder(
506-
column: $table.id, builder: (column) => ColumnOrderings(column));
507-
508-
ColumnOrderings<String> get title => $composableBuilder(
509-
column: $table.title, builder: (column) => ColumnOrderings(column));
510-
511-
ColumnOrderings<String> get content => $composableBuilder(
512-
column: $table.content, builder: (column) => ColumnOrderings(column));
513-
514-
ColumnOrderings<int> get category => $composableBuilder(
515-
column: $table.category, builder: (column) => ColumnOrderings(column));
516-
}
517-
518-
class $$TodosTableAnnotationComposer
519-
extends Composer<_$MyDatabase, $TodosTable> {
520-
$$TodosTableAnnotationComposer({
521-
required super.$db,
522-
required super.$table,
523-
super.joinBuilder,
524-
super.$addJoinBuilderToRootComposer,
525-
super.$removeJoinBuilderFromRootComposer,
526-
});
527-
GeneratedColumn<int> get id =>
528-
$composableBuilder(column: $table.id, builder: (column) => column);
529-
530-
GeneratedColumn<String> get title =>
531-
$composableBuilder(column: $table.title, builder: (column) => column);
532-
533-
GeneratedColumn<String> get content =>
534-
$composableBuilder(column: $table.content, builder: (column) => column);
535-
536-
GeneratedColumn<int> get category =>
537-
$composableBuilder(column: $table.category, builder: (column) => column);
538-
}
539-
540-
class $$TodosTableTableManager extends RootTableManager<
541-
_$MyDatabase,
542-
$TodosTable,
543-
Todo,
544-
$$TodosTableFilterComposer,
545-
$$TodosTableOrderingComposer,
546-
$$TodosTableAnnotationComposer,
547-
$$TodosTableCreateCompanionBuilder,
548-
$$TodosTableUpdateCompanionBuilder,
549-
(Todo, BaseReferences<_$MyDatabase, $TodosTable, Todo>),
550-
Todo,
551-
PrefetchHooks Function()> {
552-
$$TodosTableTableManager(_$MyDatabase db, $TodosTable table)
553-
: super(TableManagerState(
554-
db: db,
555-
table: table,
556-
createFilteringComposer: () =>
557-
$$TodosTableFilterComposer($db: db, $table: table),
558-
createOrderingComposer: () =>
559-
$$TodosTableOrderingComposer($db: db, $table: table),
560-
createComputedFieldComposer: () =>
561-
$$TodosTableAnnotationComposer($db: db, $table: table),
562-
updateCompanionCallback: ({
563-
Value<int> id = const Value.absent(),
564-
Value<String> title = const Value.absent(),
565-
Value<String> content = const Value.absent(),
566-
Value<int?> category = const Value.absent(),
567-
}) =>
568-
TodosCompanion(
569-
id: id,
570-
title: title,
571-
content: content,
572-
category: category,
573-
),
574-
createCompanionCallback: ({
575-
Value<int> id = const Value.absent(),
576-
required String title,
577-
required String content,
578-
Value<int?> category = const Value.absent(),
579-
}) =>
580-
TodosCompanion.insert(
581-
id: id,
582-
title: title,
583-
content: content,
584-
category: category,
585-
),
586-
withReferenceMapper: (p0) => p0
587-
.map((e) => (e.readTable(table), BaseReferences(db, table, e)))
588-
.toList(),
589-
prefetchHooksCallback: null,
590-
));
591-
}
592-
593-
typedef $$TodosTableProcessedTableManager = ProcessedTableManager<
594-
_$MyDatabase,
595-
$TodosTable,
596-
Todo,
597-
$$TodosTableFilterComposer,
598-
$$TodosTableOrderingComposer,
599-
$$TodosTableAnnotationComposer,
600-
$$TodosTableCreateCompanionBuilder,
601-
$$TodosTableUpdateCompanionBuilder,
602-
(Todo, BaseReferences<_$MyDatabase, $TodosTable, Todo>),
603-
Todo,
604-
PrefetchHooks Function()>;
605-
typedef $$CategoriesTableCreateCompanionBuilder = CategoriesCompanion Function({
606-
Value<int> id,
607-
required String description,
608-
});
609-
typedef $$CategoriesTableUpdateCompanionBuilder = CategoriesCompanion Function({
610-
Value<int> id,
611-
Value<String> description,
612-
});
613-
614-
class $$CategoriesTableFilterComposer
615-
extends Composer<_$MyDatabase, $CategoriesTable> {
616-
$$CategoriesTableFilterComposer({
617-
required super.$db,
618-
required super.$table,
619-
super.joinBuilder,
620-
super.$addJoinBuilderToRootComposer,
621-
super.$removeJoinBuilderFromRootComposer,
622-
});
623-
ColumnFilters<int> get id => $composableBuilder(
624-
column: $table.id, builder: (column) => ColumnFilters(column));
625-
626-
ColumnFilters<String> get description => $composableBuilder(
627-
column: $table.description, builder: (column) => ColumnFilters(column));
628-
}
629-
630-
class $$CategoriesTableOrderingComposer
631-
extends Composer<_$MyDatabase, $CategoriesTable> {
632-
$$CategoriesTableOrderingComposer({
633-
required super.$db,
634-
required super.$table,
635-
super.joinBuilder,
636-
super.$addJoinBuilderToRootComposer,
637-
super.$removeJoinBuilderFromRootComposer,
638-
});
639-
ColumnOrderings<int> get id => $composableBuilder(
640-
column: $table.id, builder: (column) => ColumnOrderings(column));
641-
642-
ColumnOrderings<String> get description => $composableBuilder(
643-
column: $table.description, builder: (column) => ColumnOrderings(column));
644-
}
645-
646-
class $$CategoriesTableAnnotationComposer
647-
extends Composer<_$MyDatabase, $CategoriesTable> {
648-
$$CategoriesTableAnnotationComposer({
649-
required super.$db,
650-
required super.$table,
651-
super.joinBuilder,
652-
super.$addJoinBuilderToRootComposer,
653-
super.$removeJoinBuilderFromRootComposer,
654-
});
655-
GeneratedColumn<int> get id =>
656-
$composableBuilder(column: $table.id, builder: (column) => column);
657-
658-
GeneratedColumn<String> get description => $composableBuilder(
659-
column: $table.description, builder: (column) => column);
660-
}
661-
662-
class $$CategoriesTableTableManager extends RootTableManager<
663-
_$MyDatabase,
664-
$CategoriesTable,
665-
Category,
666-
$$CategoriesTableFilterComposer,
667-
$$CategoriesTableOrderingComposer,
668-
$$CategoriesTableAnnotationComposer,
669-
$$CategoriesTableCreateCompanionBuilder,
670-
$$CategoriesTableUpdateCompanionBuilder,
671-
(Category, BaseReferences<_$MyDatabase, $CategoriesTable, Category>),
672-
Category,
673-
PrefetchHooks Function()> {
674-
$$CategoriesTableTableManager(_$MyDatabase db, $CategoriesTable table)
675-
: super(TableManagerState(
676-
db: db,
677-
table: table,
678-
createFilteringComposer: () =>
679-
$$CategoriesTableFilterComposer($db: db, $table: table),
680-
createOrderingComposer: () =>
681-
$$CategoriesTableOrderingComposer($db: db, $table: table),
682-
createComputedFieldComposer: () =>
683-
$$CategoriesTableAnnotationComposer($db: db, $table: table),
684-
updateCompanionCallback: ({
685-
Value<int> id = const Value.absent(),
686-
Value<String> description = const Value.absent(),
687-
}) =>
688-
CategoriesCompanion(
689-
id: id,
690-
description: description,
691-
),
692-
createCompanionCallback: ({
693-
Value<int> id = const Value.absent(),
694-
required String description,
695-
}) =>
696-
CategoriesCompanion.insert(
697-
id: id,
698-
description: description,
699-
),
700-
withReferenceMapper: (p0) => p0
701-
.map((e) => (e.readTable(table), BaseReferences(db, table, e)))
702-
.toList(),
703-
prefetchHooksCallback: null,
704-
));
705-
}
706-
707-
typedef $$CategoriesTableProcessedTableManager = ProcessedTableManager<
708-
_$MyDatabase,
709-
$CategoriesTable,
710-
Category,
711-
$$CategoriesTableFilterComposer,
712-
$$CategoriesTableOrderingComposer,
713-
$$CategoriesTableAnnotationComposer,
714-
$$CategoriesTableCreateCompanionBuilder,
715-
$$CategoriesTableUpdateCompanionBuilder,
716-
(Category, BaseReferences<_$MyDatabase, $CategoriesTable, Category>),
717-
Category,
718-
PrefetchHooks Function()>;
719-
720-
class $MyDatabaseManager {
721-
final _$MyDatabase _db;
722-
$MyDatabaseManager(this._db);
723-
$$TodosTableTableManager get todos =>
724-
$$TodosTableTableManager(_db, _db.todos);
725-
$$CategoriesTableTableManager get categories =>
726-
$$CategoriesTableTableManager(_db, _db.categories);
727-
}

‎examples/drift/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ resolution: workspace
1010
dependencies:
1111
auto_mappr_annotation: ^2.3.0
1212
drift: ^2.7.0
13-
equatable: ^2.0.5
13+
equatable: ^2.0.7
1414

1515
dev_dependencies:
1616
auto_mappr: ^2.6.0

‎examples/example/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resolution: workspace
99

1010
dependencies:
1111
auto_mappr_annotation: ^2.3.0
12-
equatable: ^2.0.5
12+
equatable: ^2.0.7
1313

1414
dev_dependencies:
1515
auto_mappr: ^2.6.0

‎examples/freezed/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resolution: workspace
99

1010
dependencies:
1111
auto_mappr_annotation: ^2.3.0
12-
equatable: ^2.0.5
12+
equatable: ^2.0.7
1313
freezed_annotation: ^2.2.0
1414

1515
dev_dependencies:

‎examples/injectable/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ resolution: workspace
99

1010
dependencies:
1111
auto_mappr_annotation: ^2.3.0
12-
equatable: ^2.0.5
13-
get_it: ^7.3.0
12+
equatable: ^2.0.7
13+
get_it: ^8.0.0
1414
injectable: ^2.5.0
1515

1616
dev_dependencies:

‎packages/auto_mappr/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## 2.6.0
44
- Update dependencies
5+
- Update get_it dependency to ^8.0.0
56

67
## 2.5.0
78
- Add support for safe mapping (mapping exceptions handling). [#216](https://github.com/netglade/auto_mappr/pull/216)

‎packages/auto_mappr/example/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resolution: workspace
99

1010
dependencies:
1111
auto_mappr_annotation: ^2.3.0
12-
equatable: ^2.0.5
12+
equatable: ^2.0.7
1313

1414
dev_dependencies:
1515
auto_mappr: ^2.6.0

0 commit comments

Comments
 (0)