Rename Resource.defaultValue to sourceLocalization

liamnichols · May 16, 2024 · 80979c4 · 80979c4
1 parent eb2f494
commit 80979c4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/Sources/StringExtractor/Resource+Extract.swift b/Sources/StringExtractor/Resource+Extract.swift
@@ -5,17 +5,17 @@ extension Resource {
         from segments: [StringParser.ParsedSegment],
         labels: [Int: String] = [:],
         key: String
-    ) throws -> (arguments: [Argument], defaultValue: String) {
-        var defaultValue: String = "", arguments: [Int: Argument] = [:]
+    ) throws -> (arguments: [Argument], sourceLocalization: String) {
+        var sourceLocalization: String = "", arguments: [Int: Argument] = [:]
         var nextUnspecifiedPosition = 1
 
         // Convert the parsed string into a default value and extract the arguments
         for segment in segments {
             switch segment {
             case .string(let contents):
-                defaultValue.append(contents)
+                sourceLocalization.append(contents)
             case .placeholder(let placeholder) where placeholder.rawValue == "%" || placeholder.rawValue == "%%":
-                defaultValue.append(placeholder.rawValue)
+                sourceLocalization.append(placeholder.rawValue)
             case .placeholder(let placeholder):
                 // If the placeholder is an unsupported type, raise an error about the invalid string
                 guard let _type = placeholder.type, let type = String.LocalizationValue.Placeholder(_type) else {
@@ -61,7 +61,7 @@ extension Resource {
                     )
                 }
 
-                defaultValue.append(placeholder.rawValue)
+                sourceLocalization.append(placeholder.rawValue)
                 arguments[position] = argument
             }
         }
@@ -81,7 +81,7 @@ extension Resource {
             }
         }
 
-        return (arguments.sorted(by: { $0.key < $1.key }).map(\.value), defaultValue)
+        return (arguments.sorted(by: { $0.key < $1.key }).map(\.value), sourceLocalization)
     }
 }
 

diff --git a/Sources/StringExtractor/Resource+StringUnit.swift b/Sources/StringExtractor/Resource+StringUnit.swift
@@ -13,14 +13,14 @@ extension Resource {
             comment: comment,
             identifier: identifier,
             arguments: extracted.arguments,
-            defaultValue: extracted.defaultValue
+            sourceLocalization: extracted.sourceLocalization
         )
     }
 
     static func extract(
         from localization: StringLocalization,
         key: String
-    ) throws -> (arguments: [Argument], defaultValue: String) {
+    ) throws -> (arguments: [Argument], sourceLocalization: String) {
         guard let stringUnit = preferredStringUnit(from: localization.stringUnit, variations: localization.variations) else {
             throw ExtractionError.localizationCorrupt(
                 ExtractionError.Context(

diff --git a/Sources/StringGenerator/StringGenerator.swift b/Sources/StringGenerator/StringGenerator.swift
@@ -1031,7 +1031,7 @@ public struct StringGenerator {
     var typeDocumentation: Trivia {
         let exampleResource = resources.first(where: { $0.arguments.isEmpty })
         let exampleId = exampleResource?.identifier ?? "foo"
-        let exampleValue = exampleResource?.defaultValue ?? "bar"
+        let exampleValue = exampleResource?.sourceLocalization ?? "bar"
         let exampleAccessor = ".\(variableToken.text).\(exampleId)"
 
         return Trivia(docComment: """
@@ -1053,7 +1053,7 @@ public struct StringGenerator {
     var customTypeDocumentation: Trivia {
         let exampleResource = resources.first(where: { $0.arguments.isEmpty })
         let exampleId = exampleResource?.identifier ?? "foo"
-        let exampleValue = exampleResource?.defaultValue ?? "bar"
+        let exampleValue = exampleResource?.sourceLocalization ?? "bar"
 
         return Trivia(docComment: """
         Constant values for the \(tableName) Strings Catalog

diff --git a/Sources/StringResource/Resource.swift b/Sources/StringResource/Resource.swift
@@ -13,21 +13,21 @@ public struct Resource: Equatable {
     /// An array of arguments to be interpolated into the resource
     public let arguments: [Argument]
 
-    /// The default localised value
-    public let defaultValue: String
+    /// The source localization value
+    public let sourceLocalization: String
 
     public init(
         key: String,
         comment: String?,
         identifier: String,
         arguments: [Argument],
-        defaultValue: String
+        sourceLocalization: String
     ) {
         self.key = key
         self.comment = comment
         self.identifier = identifier
         self.arguments = arguments
-        self.defaultValue = defaultValue
+        self.sourceLocalization = sourceLocalization
     }
 }