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

Rename staticVar with isStatic
All checks were successful
gitea-openium/resgen.swift/pipeline/pr-master This commit looks good
Details

Browse Source
This commit is contained in:
Thibaut Schmitt
2025-07-25 14:54:23 +02:00
parent bd15afc3d6
commit ee9175c185
14 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -22,7 +22,7 @@ enum AnalyticsGenerator {
sections: [AnalyticsCategory],
target: String,
tags: [String],
staticVar: Bool,
isStatic: Bool,
outputFile: String,
visibility: ExtensionVisibility
) {
@@ -43,7 +43,7 @@ enum AnalyticsGenerator {
targets: targets,
sections: sections,
tags: tags,
staticVar: staticVar,
isStatic: isStatic,
visibility: visibility
)
@@ -64,19 +64,19 @@ enum AnalyticsGenerator {
targets: [TrackerType],
sections: [AnalyticsCategory],
tags: [String],
staticVar: Bool,
isStatic: Bool,
visibility: ExtensionVisibility
) -> String {
[
getHeader(
targets: targets,
staticVar: staticVar,
isStatic: isStatic,
visibility: visibility
),
getProperties(
sections: sections,
tags: tags,
staticVar: staticVar,
isStatic: isStatic,
visibility: visibility
),
getFooter()
@@ -88,7 +88,7 @@ enum AnalyticsGenerator {
private static func getHeader(
targets: [TrackerType],
staticVar: Bool,
isStatic: Bool,
visibility: ExtensionVisibility
) -> String {
"""
@@ -306,7 +306,7 @@ enum AnalyticsGenerator {
private static func getProperties(
sections: [AnalyticsCategory],
tags: [String],
staticVar: Bool,
isStatic: Bool,
visibility: ExtensionVisibility
) -> String {
sections
@@ -322,7 +322,7 @@ enum AnalyticsGenerator {
return // Go to next definition
}
if staticVar {
if isStatic {
res += "\n\n\(definition.getStaticProperty(visibility: visibility))"
} else {
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 {
ColorExtensionGenerator.writeExtensionFile(
colors: parsedColors,
staticVar: options.staticMembers,
isStatic: options.staticMembers,
extensionName: extensionName,
extensionFilePath: extensionFilePath,
isSwiftUI: true,
@@ -73,7 +73,7 @@ struct Colors: ParsableCommand {
let extensionFilePathUIKit = options.extensionFilePathUIKit {
ColorExtensionGenerator.writeExtensionFile(
colors: parsedColors,
staticVar: options.staticMembers,
isStatic: options.staticMembers,
extensionName: extensionNameUIKit,
extensionFilePath: extensionFilePathUIKit,
isSwiftUI: false,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -11,7 +11,7 @@ import ToolCore
extension StringsFileGeneratorTests {
static func getExtensionContentExpectation(
staticVar: Bool,
isStatic: Bool,
s1DefOneFr: String = "Section Un - Definition Un",
s1DefOneComment: String = "",
s1DefTwoFr: String = "Section Un - Definition Deux",
@@ -55,7 +55,7 @@ extension StringsFileGeneratorTests {
///
/// Comment :
/// \(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)")
}
@@ -64,7 +64,7 @@ extension StringsFileGeneratorTests {
///
/// Comment :
/// \(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)")
}
@@ -75,7 +75,7 @@ extension StringsFileGeneratorTests {
///
/// Comment :
/// \(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)")
}
@@ -84,7 +84,7 @@ extension StringsFileGeneratorTests {
///
/// Comment :
/// \(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)")
}
}

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

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