openium/resgen.swift
1
0
Fork 0
Code Pull Requests Releases 10 Activity

feat(RES-58): Add new parameter "bundle" #19

Merged
t.schmitt merged 5 commits from feat/RES-58-add-bundle-parameter into master 2025-07-25 16:14:36 +02:00
Conversation 0 Commits 5 Files Changed 37 +866 -403
37 changed files with 866 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ee9175c185 - Show all commits

2
Sources/ResgenSwift/Analytics/Analytics.swift
View File

@@ -49,7 +49,7 @@ struct Analytics: ParsableCommand {
sections: sections, sections: sections,
target: options.target, target: options.target,
tags: ["ios", "iosonly"], tags: ["ios", "iosonly"],
staticVar: options.staticMembers, isStatic: options.staticMembers,
outputFile: options.outputFile, outputFile: options.outputFile,
visibility: options.extensionVisibility visibility: options.extensionVisibility
) )

16
Sources/ResgenSwift/Analytics/Generator/AnalyticsGenerator.swift
View File

@@ -22,7 +22,7 @@ enum AnalyticsGenerator {
sections: [AnalyticsCategory], sections: [AnalyticsCategory],
target: String, target: String,
tags: [String], tags: [String],
staticVar: Bool, isStatic: Bool,
outputFile: String, outputFile: String,
visibility: ExtensionVisibility visibility: ExtensionVisibility
) { ) {
@@ -43,7 +43,7 @@ enum AnalyticsGenerator {
targets: targets, targets: targets,
sections: sections, sections: sections,
tags: tags, tags: tags,
staticVar: staticVar, isStatic: isStatic,
visibility: visibility visibility: visibility
) )
@@ -64,19 +64,19 @@ enum AnalyticsGenerator {
targets: [TrackerType], targets: [TrackerType],
sections: [AnalyticsCategory], sections: [AnalyticsCategory],
tags: [String], tags: [String],
staticVar: Bool, isStatic: Bool,
visibility: ExtensionVisibility visibility: ExtensionVisibility
) -> String { ) -> String {
[ [
getHeader( getHeader(
targets: targets, targets: targets,
staticVar: staticVar, isStatic: isStatic,
visibility: visibility visibility: visibility
), ),
getProperties( getProperties(
sections: sections, sections: sections,
tags: tags, tags: tags,
staticVar: staticVar, isStatic: isStatic,
visibility: visibility visibility: visibility
), ),
getFooter() getFooter()
@@ -88,7 +88,7 @@ enum AnalyticsGenerator {
private static func getHeader( private static func getHeader(
targets: [TrackerType], targets: [TrackerType],
staticVar: Bool, isStatic: Bool,
visibility: ExtensionVisibility visibility: ExtensionVisibility
) -> String { ) -> String {
""" """
@@ -306,7 +306,7 @@ enum AnalyticsGenerator {
private static func getProperties( private static func getProperties(
sections: [AnalyticsCategory], sections: [AnalyticsCategory],
tags: [String], tags: [String],
staticVar: Bool, isStatic: Bool,
visibility: ExtensionVisibility visibility: ExtensionVisibility
) -> String { ) -> String {
sections sections
@@ -322,7 +322,7 @@ enum AnalyticsGenerator {
return // Go to next definition return // Go to next definition
} }
if staticVar { if isStatic {
res += "\n\n\(definition.getStaticProperty(visibility: visibility))" res += "\n\n\(definition.getStaticProperty(visibility: visibility))"
} else { } else {
res += "\n\n\(definition.getProperty(visibility: visibility))" res += "\n\n\(definition.getProperty(visibility: visibility))"

4
Sources/ResgenSwift/Colors/Colors.swift
View File

@@ -59,7 +59,7 @@ struct Colors: ParsableCommand {
let extensionFilePath = options.extensionFilePath { let extensionFilePath = options.extensionFilePath {
ColorExtensionGenerator.writeExtensionFile( ColorExtensionGenerator.writeExtensionFile(
colors: parsedColors, colors: parsedColors,
staticVar: options.staticMembers, isStatic: options.staticMembers,
extensionName: extensionName, extensionName: extensionName,
extensionFilePath: extensionFilePath, extensionFilePath: extensionFilePath,
isSwiftUI: true, isSwiftUI: true,
@@ -73,7 +73,7 @@ struct Colors: ParsableCommand {
let extensionFilePathUIKit = options.extensionFilePathUIKit { let extensionFilePathUIKit = options.extensionFilePathUIKit {
ColorExtensionGenerator.writeExtensionFile( ColorExtensionGenerator.writeExtensionFile(
colors: parsedColors, colors: parsedColors,
staticVar: options.staticMembers, isStatic: options.staticMembers,
extensionName: extensionNameUIKit, extensionName: extensionNameUIKit,
extensionFilePath: extensionFilePathUIKit, extensionFilePath: extensionFilePathUIKit,
isSwiftUI: false, isSwiftUI: false,

12
Sources/ResgenSwift/Colors/Generator/ColorExtensionGenerator.swift
View File

@@ -17,7 +17,7 @@ struct ColorExtensionGenerator {
static func writeExtensionFile( static func writeExtensionFile(
colors: [ParsedColor], colors: [ParsedColor],
staticVar: Bool, isStatic: Bool,
extensionName: String, extensionName: String,
extensionFilePath: String, extensionFilePath: String,
isSwiftUI: Bool, isSwiftUI: Bool,
@@ -27,7 +27,7 @@ struct ColorExtensionGenerator {
// Create extension content // Create extension content
let extensionContent = Self.getExtensionContent( let extensionContent = Self.getExtensionContent(
colors: colors, colors: colors,
staticVar: staticVar, isStatic: isStatic,
extensionName: extensionName, extensionName: extensionName,
isSwiftUI: isSwiftUI, isSwiftUI: isSwiftUI,
visibility: visibility, visibility: visibility,
@@ -47,7 +47,7 @@ struct ColorExtensionGenerator {
static func getExtensionContent( static func getExtensionContent(
colors: [ParsedColor], colors: [ParsedColor],
staticVar: Bool, isStatic: Bool,
extensionName: String, extensionName: String,
isSwiftUI: Bool, isSwiftUI: Bool,
visibility: ExtensionVisibility, visibility: ExtensionVisibility,
@@ -60,7 +60,7 @@ struct ColorExtensionGenerator {
), ),
Self.getProperties( Self.getProperties(
for: colors, for: colors,
withStaticVar: staticVar, withIsStatic: isStatic,
isSwiftUI: isSwiftUI, isSwiftUI: isSwiftUI,
visibility: visibility, visibility: visibility,
assetBundle: assetBundle assetBundle: assetBundle
@@ -89,14 +89,14 @@ struct ColorExtensionGenerator {
private static func getProperties( private static func getProperties(
for colors: [ParsedColor], for colors: [ParsedColor],
withStaticVar staticVar: Bool, withIsStatic isStatic: Bool,
isSwiftUI: Bool, isSwiftUI: Bool,
visibility: ExtensionVisibility, visibility: ExtensionVisibility,
assetBundle: AssetBundle assetBundle: AssetBundle
) -> String { ) -> String {
colors.map { colors.map {
$0.getColorProperty( $0.getColorProperty(
isStatic: staticVar, isStatic: isStatic,
isSwiftUI: isSwiftUI, isSwiftUI: isSwiftUI,
visibility: visibility, visibility: visibility,
assetBundle: assetBundle assetBundle: assetBundle

4
Sources/ResgenSwift/Fonts/Fonts.swift
View File

@@ -54,7 +54,7 @@ struct Fonts: ParsableCommand {
// Generate extension // Generate extension
FontExtensionGenerator.writeExtensionFile( FontExtensionGenerator.writeExtensionFile(
fontsNames: fontsNames, fontsNames: fontsNames,
staticVar: options.staticMembers, isStatic: options.staticMembers,
extensionName: options.extensionName, extensionName: options.extensionName,
extensionFilePath: options.extensionFilePath, extensionFilePath: options.extensionFilePath,
isSwiftUI: true, isSwiftUI: true,
@@ -65,7 +65,7 @@ struct Fonts: ParsableCommand {
let extensionFilePathUIKit = options.extensionFilePathUIKit { let extensionFilePathUIKit = options.extensionFilePathUIKit {
FontExtensionGenerator.writeExtensionFile( FontExtensionGenerator.writeExtensionFile(
fontsNames: fontsNames, fontsNames: fontsNames,
staticVar: options.staticMembers, isStatic: options.staticMembers,
extensionName: extensionNameUIKit, extensionName: extensionNameUIKit,
extensionFilePath: extensionFilePathUIKit, extensionFilePath: extensionFilePathUIKit,
isSwiftUI: false, isSwiftUI: false,

12
Sources/ResgenSwift/Fonts/Generator/FontToolContentGenerator.swift
View File

@@ -26,7 +26,7 @@ enum FontExtensionGenerator {
static func writeExtensionFile( static func writeExtensionFile(
fontsNames: [FontName], fontsNames: [FontName],
staticVar: Bool, isStatic: Bool,
extensionName: String, extensionName: String,
extensionFilePath: String, extensionFilePath: String,
isSwiftUI: Bool, isSwiftUI: Bool,
@@ -35,7 +35,7 @@ enum FontExtensionGenerator {
// Create extension content // Create extension content
let extensionContent = Self.getExtensionContent( let extensionContent = Self.getExtensionContent(
fontsNames: fontsNames, fontsNames: fontsNames,
staticVar: staticVar, isStatic: isStatic,
extensionName: extensionName, extensionName: extensionName,
isSwiftUI: isSwiftUI, isSwiftUI: isSwiftUI,
visibility: visibility visibility: visibility
@@ -54,7 +54,7 @@ enum FontExtensionGenerator {
static func getExtensionContent( static func getExtensionContent(
fontsNames: [FontName], fontsNames: [FontName],
staticVar: Bool, isStatic: Bool,
extensionName: String, extensionName: String,
isSwiftUI: Bool, isSwiftUI: Bool,
visibility: ExtensionVisibility visibility: ExtensionVisibility
@@ -70,7 +70,7 @@ enum FontExtensionGenerator {
), ),
Self.getFontMethods( Self.getFontMethods(
fontsNames: fontsNames, fontsNames: fontsNames,
staticVar: staticVar, isStatic: isStatic,
isSwiftUI: isSwiftUI, isSwiftUI: isSwiftUI,
visibility: visibility visibility: visibility
), ),
@@ -94,7 +94,7 @@ enum FontExtensionGenerator {
private static func getFontMethods( private static func getFontMethods(
fontsNames: [FontName], fontsNames: [FontName],
staticVar: Bool, isStatic: Bool,
isSwiftUI: Bool, isSwiftUI: Bool,
visibility: ExtensionVisibility visibility: ExtensionVisibility
) -> String { ) -> String {
@@ -104,7 +104,7 @@ enum FontExtensionGenerator {
.unique() .unique()
.map { .map {
$0.getProperty( $0.getProperty(
isStatic: staticVar, isStatic: isStatic,
isSwiftUI: isSwiftUI, isSwiftUI: isSwiftUI,
visibility: visibility visibility: visibility
) )

12
Sources/ResgenSwift/Images/Generator/ImageExtensionGenerator.swift
View File

@@ -14,7 +14,7 @@ enum ImageExtensionGenerator {
static func generateExtensionFile( static func generateExtensionFile(
images: [ParsedImage], images: [ParsedImage],
staticVar: Bool, isStatic: Bool,
inputFilename: String, inputFilename: String,
extensionName: String, extensionName: String,
extensionFilePath: String, extensionFilePath: String,
@@ -25,7 +25,7 @@ enum ImageExtensionGenerator {
// Create extension conten1t // Create extension conten1t
let extensionContent = Self.getExtensionContent( let extensionContent = Self.getExtensionContent(
images: images, images: images,
staticVar: staticVar, isStatic: isStatic,
extensionName: extensionName, extensionName: extensionName,
inputFilename: inputFilename, inputFilename: inputFilename,
isSwiftUI: isSwiftUI, isSwiftUI: isSwiftUI,
@@ -46,7 +46,7 @@ enum ImageExtensionGenerator {
static func getExtensionContent( static func getExtensionContent(
images: [ParsedImage], images: [ParsedImage],
staticVar: Bool, isStatic: Bool,
extensionName: String, extensionName: String,
inputFilename: String, inputFilename: String,
isSwiftUI: Bool, isSwiftUI: Bool,
@@ -61,7 +61,7 @@ enum ImageExtensionGenerator {
), ),
Self.getProperties( Self.getProperties(
images: images, images: images,
staticVar: staticVar, isStatic: isStatic,
isSwiftUI: isSwiftUI, isSwiftUI: isSwiftUI,
visibility: visibility, visibility: visibility,
assetBundle: assetBundle assetBundle: assetBundle
@@ -88,7 +88,7 @@ enum ImageExtensionGenerator {
private static func getProperties( private static func getProperties(
images: [ParsedImage], images: [ParsedImage],
staticVar: Bool, isStatic: Bool,
isSwiftUI: Bool, isSwiftUI: Bool,
visibility: ExtensionVisibility, visibility: ExtensionVisibility,
assetBundle: AssetBundle assetBundle: AssetBundle
@@ -96,7 +96,7 @@ enum ImageExtensionGenerator {
images images
.map { parsedImage in .map { parsedImage in
let property = parsedImage.getImageProperty( let property = parsedImage.getImageProperty(
isStatic: staticVar, isStatic: isStatic,
isSwiftUI: isSwiftUI, isSwiftUI: isSwiftUI,
visibility: visibility, visibility: visibility,
assetBundle: assetBundle assetBundle: assetBundle

4
Sources/ResgenSwift/Images/Images.swift
View File

@@ -57,7 +57,7 @@ struct Images: ParsableCommand {
let extensionFilePath = options.extensionFilePath { let extensionFilePath = options.extensionFilePath {
ImageExtensionGenerator.generateExtensionFile( ImageExtensionGenerator.generateExtensionFile(
images: imagesToGenerate, images: imagesToGenerate,
staticVar: options.staticMembers, isStatic: options.staticMembers,
inputFilename: options.inputFilenameWithoutExt, inputFilename: options.inputFilenameWithoutExt,
extensionName: extensionName, extensionName: extensionName,
extensionFilePath: extensionFilePath, extensionFilePath: extensionFilePath,
@@ -71,7 +71,7 @@ struct Images: ParsableCommand {
let extensionFilePathUIKit = options.extensionFilePathUIKit { let extensionFilePathUIKit = options.extensionFilePathUIKit {
ImageExtensionGenerator.generateExtensionFile( ImageExtensionGenerator.generateExtensionFile(
images: imagesToGenerate, images: imagesToGenerate,
staticVar: options.staticMembers, isStatic: options.staticMembers,
inputFilename: options.inputFilenameWithoutExt, inputFilename: options.inputFilenameWithoutExt,
extensionName: extensionNameUIKit, extensionName: extensionNameUIKit,
extensionFilePath: extensionFilePathUIKit, extensionFilePath: extensionFilePathUIKit,

6
Tests/ResgenSwiftTests/Analytics/AnalyticsGeneratorTests.swift
View File

@@ -233,7 +233,7 @@ final class AnalyticsGeneratorTests: XCTestCase {
targets: [TrackerType.firebase], targets: [TrackerType.firebase],
sections: [sectionOne, sectionTwo, sectionThree], sections: [sectionOne, sectionTwo, sectionThree],
tags: ["ios", "iosonly"], tags: ["ios", "iosonly"],
staticVar: false, isStatic: false,
visibility: .public visibility: .public
) )
@@ -398,7 +398,7 @@ final class AnalyticsGeneratorTests: XCTestCase {
targets: [TrackerType.matomo], targets: [TrackerType.matomo],
sections: [sectionOne, sectionTwo, sectionThree], sections: [sectionOne, sectionTwo, sectionThree],
tags: ["ios", "iosonly"], tags: ["ios", "iosonly"],
staticVar: false, isStatic: false,
visibility: .package visibility: .package
) )
// Expect Analytics // Expect Analytics
@@ -565,7 +565,7 @@ final class AnalyticsGeneratorTests: XCTestCase {
targets: [TrackerType.matomo, TrackerType.firebase], targets: [TrackerType.matomo, TrackerType.firebase],
sections: [sectionOne, sectionTwo, sectionThree], sections: [sectionOne, sectionTwo, sectionThree],
tags: ["ios", "iosonly"], tags: ["ios", "iosonly"],
staticVar: false, isStatic: false,
visibility: .internal visibility: .internal
) )

12
Tests/ResgenSwiftTests/Colors/ColorExtensionGeneratorTests.swift
View File

@@ -23,7 +23,7 @@ final class ColorExtensionGeneratorTests: XCTestCase {
// When // When
let extensionContent = ColorExtensionGenerator.getExtensionContent( let extensionContent = ColorExtensionGenerator.getExtensionContent(
colors: colors, colors: colors,
staticVar: false, isStatic: false,
extensionName: "GenColors", extensionName: "GenColors",
isSwiftUI: false, isSwiftUI: false,
visibility: .public, visibility: .public,
@@ -53,7 +53,7 @@ final class ColorExtensionGeneratorTests: XCTestCase {
XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest()) XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
} }
func test_uiKit_GeneratedExtensionContentForStaticVar() { func test_uiKit_GeneratedExtensionContentForIsStatic() {
// Given // Given
let colors = [ let colors = [
ParsedColor(name: "colorOne", light: "#FF00FF", dark: "#00FF00"), ParsedColor(name: "colorOne", light: "#FF00FF", dark: "#00FF00"),
@@ -63,7 +63,7 @@ final class ColorExtensionGeneratorTests: XCTestCase {
// When // When
let extensionContent = ColorExtensionGenerator.getExtensionContent( let extensionContent = ColorExtensionGenerator.getExtensionContent(
colors: colors, colors: colors,
staticVar: true, isStatic: true,
extensionName: "GenColor", extensionName: "GenColor",
isSwiftUI: false, isSwiftUI: false,
visibility: .public, visibility: .public,
@@ -103,7 +103,7 @@ final class ColorExtensionGeneratorTests: XCTestCase {
// When // When
let extensionContent = ColorExtensionGenerator.getExtensionContent( let extensionContent = ColorExtensionGenerator.getExtensionContent(
colors: colors, colors: colors,
staticVar: false, isStatic: false,
extensionName: "GenColors", extensionName: "GenColors",
isSwiftUI: true, isSwiftUI: true,
visibility: .package, visibility: .package,
@@ -133,7 +133,7 @@ final class ColorExtensionGeneratorTests: XCTestCase {
XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest()) XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
} }
func test_swiftUI_GeneratedExtensionContentForStaticVar() { func test_swiftUI_GeneratedExtensionContentForIsStatic() {
// Given // Given
let colors = [ let colors = [
ParsedColor(name: "colorOne", light: "#FF00FF", dark: "#00FF00"), ParsedColor(name: "colorOne", light: "#FF00FF", dark: "#00FF00"),
@@ -143,7 +143,7 @@ final class ColorExtensionGeneratorTests: XCTestCase {
// When // When
let extensionContent = ColorExtensionGenerator.getExtensionContent( let extensionContent = ColorExtensionGenerator.getExtensionContent(
colors: colors, colors: colors,
staticVar: true, isStatic: true,
extensionName: "GenColor", extensionName: "GenColor",
isSwiftUI: true, isSwiftUI: true,
visibility: .internal, visibility: .internal,

4
Tests/ResgenSwiftTests/Fonts/FontExtensionGeneratorTests.swift
View File

@@ -23,7 +23,7 @@ final class FontExtensionGeneratorTests: XCTestCase {
// When // When
let extensionContent = FontExtensionGenerator.getExtensionContent( let extensionContent = FontExtensionGenerator.getExtensionContent(
fontsNames: fontNames, fontsNames: fontNames,
staticVar: false, isStatic: false,
extensionName: "GenFonts", extensionName: "GenFonts",
isSwiftUI: false, isSwiftUI: false,
visibility: .public visibility: .public
@@ -69,7 +69,7 @@ final class FontExtensionGeneratorTests: XCTestCase {
// When // When
let extensionContent = FontExtensionGenerator.getExtensionContent( let extensionContent = FontExtensionGenerator.getExtensionContent(
fontsNames: fontNames, fontsNames: fontNames,
staticVar: false, isStatic: false,
extensionName: "GenFonts", extensionName: "GenFonts",
isSwiftUI: true, isSwiftUI: true,
visibility: .package visibility: .package

12
Tests/ResgenSwiftTests/Images/ImageExtensionGeneratorTests.swift
View File

@@ -23,7 +23,7 @@ final class ImageExtensionGeneratorTests: XCTestCase {
// When // When
let extensionContent = ImageExtensionGenerator.getExtensionContent( let extensionContent = ImageExtensionGenerator.getExtensionContent(
images: images, images: images,
staticVar: false, isStatic: false,
extensionName: "GenImages", extensionName: "GenImages",
inputFilename: "myInputFilename", inputFilename: "myInputFilename",
isSwiftUI: false, isSwiftUI: false,
@@ -53,7 +53,7 @@ final class ImageExtensionGeneratorTests: XCTestCase {
XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest()) XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
} }
func test_uiKit_GeneratedExtensionContentForStaticVar() { func test_uiKit_GeneratedExtensionContentForIsStatic() {
// Given // Given
let images = [ let images = [
ParsedImage(name: "image_one", tags: "id", width: 10, height: 10), ParsedImage(name: "image_one", tags: "id", width: 10, height: 10),
@@ -63,7 +63,7 @@ final class ImageExtensionGeneratorTests: XCTestCase {
// When // When
let extensionContent = ImageExtensionGenerator.getExtensionContent( let extensionContent = ImageExtensionGenerator.getExtensionContent(
images: images, images: images,
staticVar: true, isStatic: true,
extensionName: "GenImages", extensionName: "GenImages",
inputFilename: "myInputFilename", inputFilename: "myInputFilename",
isSwiftUI: false, isSwiftUI: false,
@@ -103,7 +103,7 @@ final class ImageExtensionGeneratorTests: XCTestCase {
// When // When
let extensionContent = ImageExtensionGenerator.getExtensionContent( let extensionContent = ImageExtensionGenerator.getExtensionContent(
images: images, images: images,
staticVar: false, isStatic: false,
extensionName: "GenImages", extensionName: "GenImages",
inputFilename: "myInputFilename", inputFilename: "myInputFilename",
isSwiftUI: true, isSwiftUI: true,
@@ -133,7 +133,7 @@ final class ImageExtensionGeneratorTests: XCTestCase {
XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest()) XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
} }
func test_swiftUI_GeneratedExtensionContentForStaticVar() { func test_swiftUI_GeneratedExtensionContentForIsStatic() {
// Given // Given
let images = [ let images = [
ParsedImage(name: "image_one", tags: "id", width: 10, height: 10), ParsedImage(name: "image_one", tags: "id", width: 10, height: 10),
@@ -143,7 +143,7 @@ final class ImageExtensionGeneratorTests: XCTestCase {
// When // When
let extensionContent = ImageExtensionGenerator.getExtensionContent( let extensionContent = ImageExtensionGenerator.getExtensionContent(
images: images, images: images,
staticVar: true, isStatic: true,
extensionName: "GenImages", extensionName: "GenImages",
inputFilename: "myInputFilename", inputFilename: "myInputFilename",
isSwiftUI: true, isSwiftUI: true,

10
Tests/ResgenSwiftTests/Strings/StringFileGeneratorTests/Expectation/StringsFileGenerator+R2ExtensionsExpectation.swift
View File

@@ -11,7 +11,7 @@ import ToolCore
extension StringsFileGeneratorTests { extension StringsFileGeneratorTests {
static func getExtensionContentExpectation( static func getExtensionContentExpectation(
staticVar: Bool, isStatic: Bool,
s1DefOneFr: String = "Section Un - Definition Un", s1DefOneFr: String = "Section Un - Definition Un",
s1DefOneComment: String = "", s1DefOneComment: String = "",
s1DefTwoFr: String = "Section Un - Definition Deux", s1DefTwoFr: String = "Section Un - Definition Deux",
@@ -55,7 +55,7 @@ extension StringsFileGeneratorTests {
/// ///
/// Comment : /// Comment :
/// \(s1DefOneComment.isEmpty ? "No comment" : s1DefOneComment) /// \(s1DefOneComment.isEmpty ? "No comment" : s1DefOneComment)
\(visibility) \(staticVar ? "static " : "")var s1_def_one: String { \(visibility) \(isStatic ? "static " : "")var s1_def_one: String {
NSLocalizedString("s1_def_one", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "Section Un - Definition Un", comment: "\(s1DefOneComment)") NSLocalizedString("s1_def_one", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "Section Un - Definition Un", comment: "\(s1DefOneComment)")
} }
@@ -64,7 +64,7 @@ extension StringsFileGeneratorTests {
/// ///
/// Comment : /// Comment :
/// \(s1DefTwoComment.isEmpty ? "No comment" : s1DefTwoComment) /// \(s1DefTwoComment.isEmpty ? "No comment" : s1DefTwoComment)
\(visibility) \(staticVar ? "static " : "")var s1_def_two: String { \(visibility) \(isStatic ? "static " : "")var s1_def_two: String {
NSLocalizedString("s1_def_two", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "Section Un - Definition Deux", comment: "\(s1DefTwoComment)") NSLocalizedString("s1_def_two", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "Section Un - Definition Deux", comment: "\(s1DefTwoComment)")
} }
@@ -75,7 +75,7 @@ extension StringsFileGeneratorTests {
/// ///
/// Comment : /// Comment :
/// \(s2DefOneComment.isEmpty ? "No comment" : s2DefOneComment) /// \(s2DefOneComment.isEmpty ? "No comment" : s2DefOneComment)
\(visibility) \(staticVar ? "static " : "")var s2_def_one: String { \(visibility) \(isStatic ? "static " : "")var s2_def_one: String {
NSLocalizedString("s2_def_one", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "Section Deux - Definition Un", comment: "\(s2DefOneComment)") NSLocalizedString("s2_def_one", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "Section Deux - Definition Un", comment: "\(s2DefOneComment)")
} }
@@ -84,7 +84,7 @@ extension StringsFileGeneratorTests {
/// ///
/// Comment : /// Comment :
/// \(s2DefTwoComment.isEmpty ? "No comment" : s2DefTwoComment) /// \(s2DefTwoComment.isEmpty ? "No comment" : s2DefTwoComment)
\(visibility) \(staticVar ? "static " : "")var s2_def_two: String { \(visibility) \(isStatic ? "static " : "")var s2_def_two: String {
NSLocalizedString("s2_def_two", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "Section Deux - Definition Deux", comment: "\(s2DefTwoComment)") NSLocalizedString("s2_def_two", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "Section Deux - Definition Deux", comment: "\(s2DefTwoComment)")
} }
} }

12
Tests/ResgenSwiftTests/Strings/StringFileGeneratorTests/StringsFileGeneratorTests.swift
View File

@@ -387,7 +387,7 @@ final class StringsFileGeneratorTests: XCTestCase {
// Expect // Expect
let expect = Self.getExtensionContentExpectation( let expect = Self.getExtensionContentExpectation(
staticVar: false isStatic: false
) )
if extensionContent != expect { if extensionContent != expect {
@@ -422,7 +422,7 @@ final class StringsFileGeneratorTests: XCTestCase {
// Expect // Expect
let expect = Self.getExtensionContentExpectation( let expect = Self.getExtensionContentExpectation(
staticVar: false, isStatic: false,
s1DefOneComment: "This is a comment", s1DefOneComment: "This is a comment",
s1DefTwoComment: "This is a comment", s1DefTwoComment: "This is a comment",
s2DefOneComment: "This is a comment", s2DefOneComment: "This is a comment",
@@ -437,7 +437,7 @@ final class StringsFileGeneratorTests: XCTestCase {
} }
// MARK: - Extension Content Static // MARK: - Extension Content Static
func testGeneratedExtensionContentWithStaticVar() { func testGeneratedExtensionContentWithIsStatic() {
// Given // Given
let sectionOne = Section.Mock.getSectionOne() let sectionOne = Section.Mock.getSectionOne()
let sectionTwo = Section.Mock.getSectionTwo() let sectionTwo = Section.Mock.getSectionTwo()
@@ -457,7 +457,7 @@ final class StringsFileGeneratorTests: XCTestCase {
// Expect // Expect
let expect = Self.getExtensionContentExpectation( let expect = Self.getExtensionContentExpectation(
staticVar: true, isStatic: true,
visibility: .package, visibility: .package,
assetBundle: .module assetBundle: .module
) )
@@ -468,7 +468,7 @@ final class StringsFileGeneratorTests: XCTestCase {
XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest()) XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
} }
func testGeneratedExtensionContentWithStaticVarWithComment() { func testGeneratedExtensionContentWithIsStaticWithComment() {
// Given // Given
let sectionOne = Section.Mock.getSectionOne( let sectionOne = Section.Mock.getSectionOne(
defOneComment: "This is a comment", defOneComment: "This is a comment",
@@ -494,7 +494,7 @@ final class StringsFileGeneratorTests: XCTestCase {
// Expect // Expect
let expect = Self.getExtensionContentExpectation( let expect = Self.getExtensionContentExpectation(
staticVar: true, isStatic: true,
s1DefOneComment: "This is a comment", s1DefOneComment: "This is a comment",
s1DefTwoComment: "This is a comment", s1DefTwoComment: "This is a comment",
s2DefOneComment: "This is a comment", s2DefOneComment: "This is a comment",