Support deep type conversions in FirebaseFunctions data and add crashlytics log function by vincentborko · Pull Request #59 · skiptools/skip-firebase

vincentborko · 2026-01-11T23:30:05Z

Thank you for contributing to the Skip project! Please use this space to describe your change and add any labels (bug, enhancement, documentation, etc.) to help categorize your contribution.

Firestore test doesnt pass for Kotlin (12/11 passed) but I didnt touch Firestore

Skip Pull Request Checklist:

REQUIRED: I have signed the Contributor Agreement
REQUIRED: I have tested my change locally with swift test
OPTIONAL: I have tested my change on an iOS simulator or device
OPTIONAL: I have tested my change on an Android emulator or device

…(from Firestore)

marcprux · 2026-01-11T23:37:36Z

Sources/SkipFirebaseFunctions/SkipFirebaseFunctions.swift

+
+// MARK: - Kotlin to Swift type conversion helpers (from SkipFirebaseFirestore)
+
+fileprivate func deepSwift(value: Any) -> Any {


What do you think about harmonizing with SkipFirestore by moving its similar deepSwift implementation:

skip-firebase/Sources/SkipFirebaseFirestore/SkipFirebaseFirestore.swift

Lines 1107 to 1119 in 9b64623

fileprivate func deepSwift(value: Any) -> Any {

if let str = value as? String {

return str // needed to not be treated as a Collection

} else if let ts = value as? com.google.firebase.Timestamp {

return Timestamp(timestamp: ts)

} else if let map = value as? kotlin.collections.Map<Any, Any> {

return deepSwift(map: map)

} else if let collection = value as? kotlin.collections.Collection<Any> {

return deepSwift(collection: collection)

} else {

return value

}

}

... into SkipFirebaseCore.swift? That way we would share the same implementation for both Functions and Firestore…

I'll give it a try, hope I won't run into merge conflicts this time

I'll have to move Timestamp into Core then as well

I'll have to move Timestamp into Core then as well

I think that's fine, since it is a core type for Firebase.

should we somehow "reimport" this in skipfirestore? I noticed now to access Timestamps we need to import SkipFirebaseCore + skipfirebasefirestore for android, while only firestore for iOS

Oh, right … that is a problem. We don't currently handle @_exported import … imports, and so anything defined in SkipFirebaseCore won't come in automatically when importing the other two packages.

Maybe you could add a public typealias Timestamp = SkipFirebaseCore.Timestamp in each of SkipFirebaseFirestore.swift and SkipFirebaseFunction.swift to work around this for the time being?

…and if that does't work out, we can always just go back to duplicating the deepSwift logic in both packages.

marcprux · 2026-01-12T04:14:13Z

Sources/SkipFirebaseCore/SkipFirebaseCore.swift

+    }
+}
+
+public func deepSwift<T>(map: kotlin.collections.Map<T, Any>) -> Dictionary<T, Any> {


I think only the top deepSwift(value: Any) function needs to be public. These other ones can be private.

of course, fixed

Hmm, seeing a CI failure:

e: file:///Users/runner/work/skip-firebase/skip-firebase/.build/plugins/outputs/skip-firebase/SkipFirebaseFirestore/destination/skipstone/SkipFirebaseFirestore/src/main/kotlin/skip/firebase/firestore/SkipFirebaseFirestore.kt:1041:20 Cannot access 'fun <T> deepSwift(map: Map<T, Any>): Dictionary<T, Any>': it is private in file. e: file:///Users/runner/work/skip-firebase/skip-firebase/.build/plugins/outputs/skip-firebase/SkipFirebaseFirestore/destination/skipstone/SkipFirebaseFirestore/src/main/kotlin/skip/firebase/firestore/SkipFirebaseFirestore.kt:1080:20 Cannot access 'fun <T> deepSwift(map: Map<T, Any>): Dictionary<T, Any>': it is private in file. e: file:///Users/runner/work/skip-firebase/skip-firebase/.build/plugins/outputs/skip-firebase/SkipFirebaseFirestore/destination/skipstone/SkipFirebaseFirestore/src/main/kotlin/skip/firebase/firestore/SkipFirebaseFirestore.kt:1041:20 Cannot access 'fun <T> deepSwift(map: Map<T, Any>): Dictionary<T, Any>': it is private in file.

yea, for e.g. in querydocumentsnapshot in skipfirestore we need

override public func data() -> [String: Any] { if let data = doc.getData() { return deepSwift(map: data) } else { return [:] } }

I'll make them internal, agree?

oh it looks like Kotlin's internal might work file-level instead of module-scoped? I guess I have to revert to public, tests are failing with internal as well...

I think that'll be fine.

marcprux · 2026-01-15T23:40:01Z

Thanks! One last request, can you add typealiases for Timestamp in SkipFirebaseFirestore.swift‎ and SkipFirebaseFunctions.swift like:

public typealias Timestamp = SkipFirebaseCore.Timestamp

That way, if anyone was relying on getting Timestamp by importing SkipFirebaseFirestore, it should continue to work for them without having the explicitly import SkipFirebaseCore.

… in firestore, functions

marcprux · 2026-01-16T14:39:26Z

Thanks for this!

vincentborko added 7 commits October 17, 2025 03:28

Fix HTTPSCallableResult.data crash - add return statement fallback

1ffa5df

Simplify HTTPSCallableResult.data to use nil-coalescing

c86eb12

Use intermediate variable for getData() to help Skip transpilation

c10950d

Add getDataSafe() method as alternative to data property

b3d6320

Change getDataSafe() to return Any for better Kotlin bridging

9bba7b3

Add deepSwift() helpers to convert Kotlin collections to Swift types …

51b78ab

…(from Firestore)

Update SkipFirebaseCrashlytics.swift

f3f3b20

cla-bot bot added the cla-signed label Jan 11, 2026

vincentborko changed the title ~~Functions fix~~ Functions fix + add crashlytics log Jan 11, 2026

marcprux requested changes Jan 11, 2026

View reviewed changes

merge firebase and functions deepswift() into shared core

c3967f7

marcprux reviewed Jan 12, 2026

View reviewed changes

only one public func for deepswift, rest private

4ff8e9e

vincentborko added 2 commits January 16, 2026 01:29

make deepswift helpers internal, add typealias for Firebase Timestamp…

63b4303

… in firestore, functions

revert to public

965a3af

marcprux changed the title ~~Functions fix + add crashlytics log~~ Support deep type conversions in FirebaseFunctions data and add crashlytics log function Jan 16, 2026

marcprux merged commit 845c9fd into skiptools:main Jan 16, 2026
2 checks passed


		// MARK: - Kotlin to Swift type conversion helpers (from SkipFirebaseFirestore)

		fileprivate func deepSwift(value: Any) -> Any {

	fileprivate func deepSwift(value: Any) -> Any {
	if let str = value as? String {
	return str // needed to not be treated as a Collection
	} else if let ts = value as? com.google.firebase.Timestamp {
	return Timestamp(timestamp: ts)
	} else if let map = value as? kotlin.collections.Map<Any, Any> {
	return deepSwift(map: map)
	} else if let collection = value as? kotlin.collections.Collection<Any> {
	return deepSwift(collection: collection)
	} else {
	return value
	}
	}

Uh oh!

Conversation

vincentborko commented Jan 11, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vincentborko Jan 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

marcprux commented Jan 15, 2026

Uh oh!

marcprux commented Jan 16, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

vincentborko Jan 16, 2026 •

edited

Loading