Skip to content

Commit b98e22d

Browse files
hukusuke1007hukusuke1007
committed
[flamingo] Updated Plugins. [flamingo_generator] Modified Timestamp type.
1 parent f28a87a commit b98e22d

File tree

11 files changed

+116
-61
lines changed

11 files changed

+116
-61
lines changed

‎flamingo/CHANGELOG.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
# 1.6.0
1+
# 1.7.0
2+
Updated Plugins.
3+
4+
## 1.6.0
25
Modified Increment Bug.
36
BREAKING CHANGE: Change the implementation of Increment method.
47

‎flamingo/example/ios/Podfile.lock

+47-56
Original file line numberDiff line numberDiff line change
@@ -218,62 +218,57 @@ PODS:
218218
- BoringSSL-GRPC/Implementation (0.0.7):
219219
- BoringSSL-GRPC/Interface (= 0.0.7)
220220
- BoringSSL-GRPC/Interface (0.0.7)
221-
- cloud_firestore (0.14.1-2):
222-
- Firebase/CoreOnly (~> 6.26.0)
223-
- Firebase/Firestore (~> 6.26.0)
221+
- cloud_firestore (0.14.2):
222+
- Firebase/CoreOnly (~> 6.33.0)
223+
- Firebase/Firestore (~> 6.33.0)
224224
- firebase_core
225225
- Flutter
226-
- Firebase/CoreOnly (6.26.0):
227-
- FirebaseCore (= 6.7.2)
228-
- Firebase/Firestore (6.26.0):
226+
- Firebase/CoreOnly (6.33.0):
227+
- FirebaseCore (= 6.10.3)
228+
- Firebase/Firestore (6.33.0):
229229
- Firebase/CoreOnly
230-
- FirebaseFirestore (~> 1.15.0)
231-
- Firebase/Storage (6.26.0):
230+
- FirebaseFirestore (~> 1.18.0)
231+
- Firebase/Storage (6.33.0):
232232
- Firebase/CoreOnly
233-
- FirebaseStorage (~> 3.6.1)
234-
- firebase_core (0.5.0):
235-
- Firebase/CoreOnly (~> 6.26.0)
233+
- FirebaseStorage (~> 3.9.0)
234+
- firebase_core (0.5.1):
235+
- Firebase/CoreOnly (~> 6.33.0)
236236
- Flutter
237237
- firebase_storage (4.0.1):
238-
- Firebase/CoreOnly (~> 6.26.0)
239-
- Firebase/Storage (~> 6.26.0)
238+
- Firebase/CoreOnly (~> 6.33.0)
239+
- Firebase/Storage (~> 6.33.0)
240240
- firebase_core
241241
- Flutter
242-
- FirebaseAuthInterop (1.1.0)
243-
- FirebaseCore (6.7.2):
244-
- FirebaseCoreDiagnostics (~> 1.3)
245-
- FirebaseCoreDiagnosticsInterop (~> 1.2)
246-
- GoogleUtilities/Environment (~> 6.5)
247-
- GoogleUtilities/Logger (~> 6.5)
248-
- FirebaseCoreDiagnostics (1.5.0):
249-
- GoogleDataTransport (~> 7.0)
242+
- FirebaseCore (6.10.3):
243+
- FirebaseCoreDiagnostics (~> 1.6)
250244
- GoogleUtilities/Environment (~> 6.7)
251245
- GoogleUtilities/Logger (~> 6.7)
252-
- nanopb (~> 1.30905.0)
253-
- FirebaseCoreDiagnosticsInterop (1.2.0)
254-
- FirebaseFirestore (1.15.0):
246+
- FirebaseCoreDiagnostics (1.7.0):
247+
- GoogleDataTransport (~> 7.4)
248+
- GoogleUtilities/Environment (~> 6.7)
249+
- GoogleUtilities/Logger (~> 6.7)
250+
- nanopb (~> 1.30906.0)
251+
- FirebaseFirestore (1.18.0):
255252
- abseil/algorithm (= 0.20200225.0)
256253
- abseil/base (= 0.20200225.0)
257254
- abseil/memory (= 0.20200225.0)
258255
- abseil/meta (= 0.20200225.0)
259256
- abseil/strings/strings (= 0.20200225.0)
260257
- abseil/time (= 0.20200225.0)
261258
- abseil/types (= 0.20200225.0)
262-
- FirebaseAuthInterop (~> 1.0)
263-
- FirebaseCore (~> 6.2)
259+
- FirebaseCore (~> 6.10)
264260
- "gRPC-C++ (~> 1.28.0)"
265261
- leveldb-library (~> 1.22)
266-
- nanopb (~> 1.30905.0)
267-
- FirebaseStorage (3.6.1):
268-
- FirebaseAuthInterop (~> 1.1)
269-
- FirebaseCore (~> 6.6)
262+
- nanopb (~> 1.30906.0)
263+
- FirebaseStorage (3.9.1):
264+
- FirebaseCore (~> 6.10)
270265
- GTMSessionFetcher/Core (~> 1.1)
271266
- Flutter (1.0.0)
272-
- GoogleDataTransport (7.1.0):
273-
- nanopb (~> 1.30905.0)
274-
- GoogleUtilities/Environment (6.7.1):
267+
- GoogleDataTransport (7.5.1):
268+
- nanopb (~> 1.30906.0)
269+
- GoogleUtilities/Environment (6.7.2):
275270
- PromisesObjC (~> 1.2)
276-
- GoogleUtilities/Logger (6.7.1):
271+
- GoogleUtilities/Logger (6.7.2):
277272
- GoogleUtilities/Environment
278273
- "gRPC-C++ (1.28.2)":
279274
- "gRPC-C++/Implementation (= 1.28.2)"
@@ -301,14 +296,14 @@ PODS:
301296
- gRPC-Core/Interface (1.28.2)
302297
- GTMSessionFetcher/Core (1.4.0)
303298
- leveldb-library (1.22)
304-
- nanopb (1.30905.0):
305-
- nanopb/decode (= 1.30905.0)
306-
- nanopb/encode (= 1.30905.0)
307-
- nanopb/decode (1.30905.0)
308-
- nanopb/encode (1.30905.0)
299+
- nanopb (1.30906.0):
300+
- nanopb/decode (= 1.30906.0)
301+
- nanopb/encode (= 1.30906.0)
302+
- nanopb/decode (1.30906.0)
303+
- nanopb/encode (1.30906.0)
309304
- path_provider (0.0.1):
310305
- Flutter
311-
- PromisesObjC (1.2.9)
306+
- PromisesObjC (1.2.10)
312307

313308
DEPENDENCIES:
314309
- cloud_firestore (from `.symlinks/plugins/cloud_firestore/ios`)
@@ -322,10 +317,8 @@ SPEC REPOS:
322317
- abseil
323318
- BoringSSL-GRPC
324319
- Firebase
325-
- FirebaseAuthInterop
326320
- FirebaseCore
327321
- FirebaseCoreDiagnostics
328-
- FirebaseCoreDiagnosticsInterop
329322
- FirebaseFirestore
330323
- FirebaseStorage
331324
- GoogleDataTransport
@@ -352,26 +345,24 @@ EXTERNAL SOURCES:
352345
SPEC CHECKSUMS:
353346
abseil: 6c8eb7892aefa08d929b39f9bb108e5367e3228f
354347
BoringSSL-GRPC: 8edf627ee524575e2f8d19d56f068b448eea3879
355-
cloud_firestore: d800bcc818ca2307beaeb697a94aa76341bc661d
356-
Firebase: 7cf5f9c67f03cb3b606d1d6535286e1080e57eb6
357-
firebase_core: 3134fe79d257d430f163b558caf52a10a87efe8a
358-
firebase_storage: 419f66c641d8bbd8306abeb7d08bd6ece87d8b5a
359-
FirebaseAuthInterop: a0f37ae05833af156e72028f648d313f7e7592e9
360-
FirebaseCore: f42e5e5f382cdcf6b617ed737bf6c871a6947b17
361-
FirebaseCoreDiagnostics: 7535fe695737f8c5b350584292a70b7f8ff0357b
362-
FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
363-
FirebaseFirestore: 8c158bdde010fa397386333a74570eaef033e62d
364-
FirebaseStorage: f4f39ae834a7145963b913f54e2f24a9db1d8fac
348+
cloud_firestore: 814580227d2487e317fe797a495c0c5c76b8cb8b
349+
Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
350+
firebase_core: aa25a5dc6b492ecab37587c53d8420135f0cac90
351+
firebase_storage: 7ab602a75a80cab746f4f31c98a4927f9f376e92
352+
FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
353+
FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1
354+
FirebaseFirestore: adff4877869ca91a11250cc0989a6cd56bad163f
355+
FirebaseStorage: 15e0f15ef3c7fec3d1899d68623e47d4447066b4
365356
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
366-
GoogleDataTransport: af0c79193dc59acd37630b4833d0dc6912ae6bd5
367-
GoogleUtilities: e121a3867449ce16b0e35ddf1797ea7a389ffdf2
357+
GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
358+
GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
368359
"gRPC-C++": 13d8ccef97d5c3c441b7e3c529ef28ebee86fad2
369360
gRPC-Core: 4afa11bfbedf7cdecd04de535a9e046893404ed5
370361
GTMSessionFetcher: 6f5c8abbab8a9bce4bb3f057e317728ec6182b10
371362
leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7
372-
nanopb: c43f40fadfe79e8b8db116583945847910cbabc9
363+
nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
373364
path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
374-
PromisesObjC: b48e0338dbbac2207e611750777895f7a5811b75
365+
PromisesObjC: b14b1c6b68e306650688599de8a45e49fae81151
375366

376367
PODFILE CHECKSUM: fc81e398f362bae88bdf55239bd5cf842faad39f
377368

‎flamingo/example/lib/flamingo_test.dart

+10
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,12 @@ class FlamingoTest {
133133
print('--- timestamp test ---');
134134
final data = <String, dynamic>{
135135
'name': 'shohei',
136+
UserKey.editAt.value: {'_seconds': 1575163645, '_nanoseconds': 648000000},
137+
UserKey.clearAt.value: Timestamp.now(),
138+
_user.updatedFieldValueKey: {
139+
'_seconds': 1575163645,
140+
'_nanoseconds': 648000000
141+
},
136142
_user.createdFieldValueKey: {
137143
'_seconds': 1575163645,
138144
'_nanoseconds': 648000000
@@ -146,6 +152,10 @@ class FlamingoTest {
146152
final _user = User(values: data);
147153
assert(_user.createdAt != null);
148154
assert(_user.updatedAt != null);
155+
assert(_user.editAt != null);
156+
assert(_user.clearAt != null);
157+
print(_user.editAt.toDate());
158+
print(_user.clearAt.toDate());
149159
}
150160
}
151161

‎flamingo/example/lib/model/user.dart

+6
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ class User extends Document<User> {
2121
@Field()
2222
String name;
2323

24+
@Field()
25+
Timestamp editAt;
26+
27+
@Field()
28+
Timestamp clearAt;
29+
2430
@SubCollection()
2531
Collection<Setting> setting;
2632

‎flamingo/example/lib/model/user.flamingo.dart

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flamingo/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: flamingo
22
description: This is Firebase Firestore Model Framework Library. Can be manage document reference and collection reference. And provide Firestore and Cloud Storage interface.
3-
version: 1.6.0
3+
version: 1.7.0
44
repository: https://github.com/hukusuke1007/flamingo
55
homepage: https://github.com/hukusuke1007/flamingo
66

@@ -10,8 +10,8 @@ environment:
1010
dependencies:
1111
flutter:
1212
sdk: flutter
13-
firebase_core: ^0.5.0
14-
cloud_firestore: ^0.14.1+2
13+
firebase_core: ^0.5.1
14+
cloud_firestore: ^0.14.2
1515
firebase_storage: ^4.0.1
1616
rxdart: ^0.24.1
1717

‎flamingo_generator/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# 0.6.0
2+
Modified Timestamp type.
3+
4+
## 0.5.0
5+
Modified Increment field.
6+
17
# 0.4.1+1
28
Modified homepage url.
39

‎flamingo_generator/example/lib/model/cart.dart

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ class Cart extends Model {
1717
@Field()
1818
double itemC;
1919

20+
@Field()
21+
Timestamp itemAt;
22+
2023
@override
2124
Map<String, dynamic> toData() => _$toData(this);
2225

‎flamingo_generator/example/lib/model/cart.flamingo.dart

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flamingo_generator/lib/src/field_value_generator.dart

+8
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,14 @@ class FieldValueGenerator extends Generator {
154154
final mapValueType =
155155
f.elementType.toString().split(', ')[1].replaceAll('>', '');
156156
return """doc.${f.element.name} = Helper.valueMapFromKey<String, $mapValueType>(data, \'${f.element.name}\');""";
157+
} else if (f.elementType.toString() == 'Timestamp') {
158+
return """
159+
if (data[\'${f.element.name}\'] is Map) {
160+
doc.${f.element.name} = Helper.timestampFromMap(data, \'${f.element.name}\');
161+
} else {
162+
doc.${f.element.name} = Helper.valueFromKey<${f.elementType.toString()}>(data, \'${f.element.name}\');
163+
}
164+
""";
157165
}
158166
return """doc.${f.element.name} = Helper.valueFromKey<${f.elementType.toString()}>(data, \'${f.element.name}\');""";
159167
}

‎flamingo_generator/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: flamingo_generator
22
description: Automatically generate code for converting flamingo JSON by annotating Dart classes.
3-
version: 0.5.0
3+
version: 0.6.0
44
homepage: https://github.com/hukusuke1007/flamingo
55
repository: https://github.com/hukusuke1007/flamingo
66

0 commit comments

Comments
 (0)