Skip to content

Commit 3033fa2

Browse files
committed
🚑️ Rename core package to jsond and update imports across the project
1 parent 80cf340 commit 3033fa2

File tree

20 files changed

+74
-30
lines changed

20 files changed

+74
-30
lines changed

apps/jsond/lib/internal/helpers.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'dart:async';
22

3-
import 'package:json_core/core.dart';
3+
import 'package:jsond/jsond.dart';
44

55
Future<T> watchdog<T>(FutureOr<T> Function() action) async {
66
final s = Stopwatch()..start();

apps/jsond/lib/main.dart

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import 'package:flutter_highlight/themes/tomorrow.dart';
1313
import 'package:highlight/languages/handlebars.dart';
1414
import 'package:highlight/languages/json.dart';
1515
import 'package:hive_flutter/hive_flutter.dart';
16-
import 'package:json_core/core.dart';
16+
import 'package:jsond/jsond.dart';
1717
import 'package:recase/recase.dart';
1818
import 'package:sliver_tools/sliver_tools.dart';
1919
import 'package:universal_platform/universal_platform.dart';
@@ -191,56 +191,63 @@ class _MyHomePageState extends State<MyHomePage> with WindowListener {
191191
template: jsonSerializableWithHiveCE,
192192
builtIn: true,
193193
dartFormat: true,
194-
id: -9,
194+
id: -4,
195195
),
196196
Template(
197197
name: 'Freezed',
198198
template: freezed,
199199
builtIn: true,
200200
dartFormat: true,
201-
id: -4,
201+
id: -5,
202202
),
203203
Template(
204204
name: 'Freezed With Default',
205205
template: freezedWithDefault,
206206
builtIn: true,
207207
dartFormat: true,
208-
id: -8,
208+
id: -6,
209209
),
210210
Template(
211211
name: 'Freezed With HiveCE',
212212
template: freezedWithHiveCE,
213213
builtIn: true,
214214
dartFormat: true,
215-
id: -10,
215+
id: -7,
216216
),
217217
Template(
218218
name: 'Freezed With Default And HiveCE',
219219
template: freezedWithDefaultAndHiveCE,
220220
builtIn: true,
221221
dartFormat: true,
222-
id: -11,
222+
id: -8,
223+
),
224+
Template(
225+
name: 'Unfreezed With Default And HiveCE',
226+
template: unfreezedWithDefaultAndHiveCE,
227+
builtIn: true,
228+
dartFormat: true,
229+
id: -9,
223230
),
224231
Template(
225232
name: 'Isar',
226233
template: isar,
227234
builtIn: true,
228235
dartFormat: true,
229-
id: -5,
236+
id: -10,
230237
),
231238
Template(
232239
name: 'Isar + JsonSerializable',
233240
template: isarWithJsonSerializable,
234241
builtIn: true,
235242
dartFormat: true,
236-
id: -6,
243+
id: -11,
237244
),
238245
Template(
239246
name: 'Isar + Freezed',
240247
template: isarWithFreezed,
241248
builtIn: true,
242249
dartFormat: true,
243-
id: -7,
250+
id: -12,
244251
),
245252
];
246253

apps/jsond/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: jsond
1+
name: jsond_app
22
description: A template-supported tool for converting JSON to Dart code.
33
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
44

@@ -10,7 +10,7 @@ environment:
1010
dependencies:
1111
flutter:
1212
sdk: flutter
13-
json_core:
13+
jsond:
1414
path: ../../packages/core
1515
highlight: ^0.7.0
1616
flutter_highlight: ^0.7.0

apps/jsond/test/widget_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import 'package:flutter/material.dart';
99
import 'package:flutter_test/flutter_test.dart';
1010

11-
import 'package:jsond/main.dart';
11+
import 'package:jsond_app/main.dart';
1212

1313
void main() {
1414
testWidgets('Counter increments smoke test', (WidgetTester tester) async {

packages/core/example/core_example.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:json_core/core.dart';
1+
import 'package:jsond/jsond.dart';
22

33
void main() {
44
final code = render(

packages/core/lib/core.dart renamed to packages/core/lib/jsond.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
library jsond;
2+
13
export 'src/consts.dart';
24
export 'src/extension.dart';
35
export 'src/json.dart';

packages/core/lib/src/json.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'dart:convert';
33
import 'package:antlr4/antlr4.dart';
44
import 'package:collection/collection.dart';
55

6-
import '../core.dart';
6+
import '../jsond.dart';
77
import 'antlr/JSON5Lexer.dart';
88
import 'antlr/JSON5Parser.dart';
99
import 'type.dart';

packages/core/lib/src/render.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:dart_style/dart_style.dart';
22
import 'package:mustache_template/mustache_template.dart';
33
import 'package:recase/recase.dart';
44

5-
import '../core.dart';
5+
import '../jsond.dart';
66
import 'type.dart';
77

88
String renderObjs(

packages/core/lib/src/templates.dart

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,38 @@ sealed class {{# @pascal_case }}{{ obj_naming }}{{/ @pascal_case }} with _${{# @
378378
=> _${{# @pascal_case }}{{ obj_naming }}{{/ @pascal_case }}FromJson(json);
379379
}
380380
381+
{{/ objs }}
382+
''';
383+
const unfreezedWithDefaultAndHiveCE =
384+
// language=handlebars
385+
r'''
386+
import 'package:freezed_annotation/freezed_annotation.dart';
387+
import 'package:hive_ce/hive.dart';
388+
389+
part 'models.freezed.dart';
390+
@GenerateAdapters([
391+
{{# objs }}
392+
AdapterSpec<{{# @pascal_case }}{{ obj_naming }}{{/ @pascal_case }}>(),
393+
{{/ objs }}
394+
])
395+
part 'models.g.dart';
396+
397+
{{# objs }}
398+
@unfreezed
399+
sealed class {{# @pascal_case }}{{ obj_naming }}{{/ @pascal_case }} extends HiveObject with _${{# @pascal_case }}{{ obj_naming }}{{/ @pascal_case }} {
400+
401+
factory {{# @pascal_case }}{{ obj_naming }}{{/ @pascal_case }}({{# obj_has_fields }}{ {{/ obj_has_fields }}
402+
{{# obj_fields }}
403+
{{^ field_is_dynamic }}@Default({{& field_default_value }}){{/ field_is_dynamic }} @JsonKey(name: '{{ field_key }}') {{# field_is_dynamic }}dynamic {{# @keywords }}{{# @camel_case }}{{ field_without_symbol_key }}{{/ @camel_case }}{{/ @keywords }},{{/ field_is_dynamic }}{{^ field_is_dynamic }}{{& field_type_naming }} {{# @keywords }}{{# @camel_case }}{{ field_without_symbol_key }}{{/ @camel_case }}{{/ @keywords }},{{/ field_is_dynamic }}
404+
{{/ obj_fields }}
405+
{{# obj_has_fields }} }{{/ obj_has_fields }}) = _{{# @pascal_case }}{{ obj_naming }}{{/ @pascal_case }};
406+
407+
{{# @pascal_case }}{{ obj_naming }}{{/ @pascal_case }}._();
408+
409+
factory {{# @pascal_case }}{{ obj_naming }}{{/ @pascal_case }}.fromJson(Map<String, Object?> json)
410+
=> _${{# @pascal_case }}{{ obj_naming }}{{/ @pascal_case }}FromJson(json);
411+
}
412+
381413
{{/ objs }}
382414
''';
383415

packages/core/lib/src/type.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:antlr4/antlr4.dart';
22
import 'package:collection/collection.dart';
33
import 'package:meta/meta.dart';
44

5-
import '../core.dart';
5+
import '../jsond.dart';
66
import 'antlr/JSON5Parser.dart';
77

88
abstract class JType<T extends RuleContext, R> {

0 commit comments

Comments
 (0)