-
Notifications
You must be signed in to change notification settings - Fork 0
feat(swift,kotlin): mirror the recipe → Pattern rename in the ports — phase 2 #1062
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 6 additions & 6 deletions
12
android/lab/src/main/kotlin/com/fundamental/lab/RecipeExport.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,30 @@ | ||
| package com.fundamental.lab | ||
|
|
||
| import com.fundamental.core.recipes.FieldRecipe | ||
| import com.fundamental.core.recipes.FieldPattern | ||
| import kotlinx.serialization.encodeToString | ||
| import kotlinx.serialization.json.Json | ||
| import java.io.File | ||
|
|
||
| /** | ||
| * Recipe save/export — the FieldLab "export the current recipe" action. `FieldRecipe` is | ||
| * Recipe save/export — the FieldLab "export the current recipe" action. `FieldPattern` is | ||
| * `@Serializable`, so a recipe *value* round-trips: decoding the export reproduces an equal | ||
| * `FieldRecipe` (default-valued fields are omitted, so the bytes need not match the canon's | ||
| * `FieldPattern` (default-valued fields are omitted, so the bytes need not match the canon's | ||
| * `data/recipes.json` exactly). Mirror of the Swift FieldLab's recipe export. | ||
| */ | ||
| object RecipeExport { | ||
| private val json = Json { prettyPrint = true; encodeDefaults = false } | ||
|
|
||
| /** Serialize a recipe to canonical pretty JSON. */ | ||
| fun toJson(recipe: FieldRecipe): String = json.encodeToString(recipe) | ||
| fun toJson(recipe: FieldPattern): String = json.encodeToString(recipe) | ||
|
|
||
| /** Write a recipe to [file] as JSON (creating parent dirs); returns the file written. */ | ||
| fun write(recipe: FieldRecipe, file: File): File { | ||
| fun write(recipe: FieldPattern, file: File): File { | ||
| file.parentFile?.mkdirs() | ||
| file.writeText(toJson(recipe)) | ||
| return file | ||
| } | ||
|
|
||
| /** A safe default filename for a recipe (`recipe-<id>.json`). */ | ||
| fun defaultFileName(recipe: FieldRecipe): String = | ||
| fun defaultFileName(recipe: FieldPattern): String = | ||
| "recipe-${recipe.id.ifBlank { recipe.name }}.json".replace(Regex("[^A-Za-z0-9._-]"), "_") | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For Java callers or already-compiled Kotlin/JVM clients that still use the 0.x recipe API, these
typealiasdeclarations are erased and do not emit the oldcom.fundamental.core.recipes.FieldRecipe/FieldRecipesbytecode. That makes the advertised deprecation window source-only for Kotlin and a hard compile/load break for those clients instead of a warning; keep deprecated wrapper classes/objects (and the oldCompiledRecipeJVM type/signatures) if the old names are meant to remain usable until 1.0.Useful? React with 👍 / 👎.