dnrops
/
pkl-swift
mirror of https://github.com/apple/pkl-swift
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

type id's should not generate as mutable var (#3) 

Co-authored-by: Philip K.F. Hölzenspies <holzensp@gmail.com>
This commit is contained in:
Krzysztof Zabłocki 2024-02-06 17:45:48 +01:00 committed by GitHub
parent a754b2a010
commit cec993dc2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
31 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/PklSwift/Project.swift
View File

@ -18,7 +18,7 @@ import Foundation
/// The Swift representation of `pkl.Project`
public struct Project: PklRegisteredType, Hashable, DependencyDeclaredInProjectFile {
public static var registeredIdentifier: String = "pkl.Project"
public static let registeredIdentifier: String = "pkl.Project"
let package: Package?
@ -70,7 +70,7 @@ extension Project: Decodable {
extension Project {
/// The Swift representation of `pkl.Project#RemoteDependency`
public struct RemoteDependency: PklRegisteredType, DependencyDeclaredInProjectFile, Decodable, Hashable {
public static var registeredIdentifier: String = "pkl.Project#RemoteDependency"
public static let registeredIdentifier: String = "pkl.Project#RemoteDependency"
let uri: String
let checksums: Checksums?
@ -78,7 +78,7 @@ extension Project {
/// The Swift representation of `pkl.Project#Package`
public struct Package: PklRegisteredType, Hashable {
public static var registeredIdentifier: String = "pkl.Project#Package"
public static let registeredIdentifier: String = "pkl.Project#Package"
let name: String
let baseUri: String

2
Sources/pkl-gen-swift/Generated/GeneratorSettings.pkl.swift
View File

@ -6,7 +6,7 @@ public enum GeneratorSettings {}
extension GeneratorSettings {
/// Settings used to configure code generation.
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "pkl.swift.GeneratorSettings"
public static let registeredIdentifier: String = "pkl.swift.GeneratorSettings"
/// The set of modules to turn into Swift code.
///

4
Tests/PklSwiftTests/Fixtures/Generated/AnyType.pkl.swift
View File

@ -5,7 +5,7 @@ public enum AnyType {}
extension AnyType {
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "AnyType"
public static let registeredIdentifier: String = "AnyType"
public var bird: AnyHashable?
@ -63,7 +63,7 @@ extension AnyType {
}
public struct Bird: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "AnyType#Bird"
public static let registeredIdentifier: String = "AnyType#Bird"
public var species: String

2
Tests/PklSwiftTests/Fixtures/Generated/ApiTypes.pkl.swift
View File

@ -5,7 +5,7 @@ public enum ApiTypes {}
extension ApiTypes {
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "ApiTypes"
public static let registeredIdentifier: String = "ApiTypes"
public var res1: Pair<Int, String>

4
Tests/PklSwiftTests/Fixtures/Generated/Classes.pkl.swift
View File

@ -5,7 +5,7 @@ public enum Classes {}
extension Classes {
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "Classes"
public static let registeredIdentifier: String = "Classes"
public var animals: [Animal]
@ -15,7 +15,7 @@ extension Classes {
}
public struct Animal: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "Classes#Animal"
public static let registeredIdentifier: String = "Classes#Animal"
public var name: String

2
Tests/PklSwiftTests/Fixtures/Generated/Collections.pkl.swift
View File

@ -5,7 +5,7 @@ public enum Collections {}
extension Collections {
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "Collections"
public static let registeredIdentifier: String = "Collections"
public var res1: [Int]

2
Tests/PklSwiftTests/Fixtures/Generated/ExtendedModule.pkl.swift
View File

@ -5,7 +5,7 @@ public enum ExtendedModule {}
extension ExtendedModule {
public struct Module: OpenModule.Module {
public static var registeredIdentifier: String = "ExtendedModule"
public static let registeredIdentifier: String = "ExtendedModule"
public var foo: String

2
Tests/PklSwiftTests/Fixtures/Generated/OpenModule.pkl.swift
View File

@ -13,7 +13,7 @@ extension OpenModule {
public typealias Module = OpenModule_Module
public struct ModuleImpl: Module {
public static var registeredIdentifier: String = "OpenModule"
public static let registeredIdentifier: String = "OpenModule"
public var foo: String

12
Tests/PklSwiftTests/Fixtures/Generated/UnionTypes.pkl.swift
View File

@ -108,7 +108,7 @@ extension UnionTypes {
}
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "UnionTypes"
public static let registeredIdentifier: String = "UnionTypes"
public var fruit1: Fruit
@ -160,7 +160,7 @@ extension UnionTypes {
}
public struct Banana: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "UnionTypes#Banana"
public static let registeredIdentifier: String = "UnionTypes#Banana"
public var isRipe: Bool
@ -170,7 +170,7 @@ extension UnionTypes {
}
public struct Grape: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "UnionTypes#Grape"
public static let registeredIdentifier: String = "UnionTypes#Grape"
public var isUsedForWine: Bool
@ -180,7 +180,7 @@ extension UnionTypes {
}
public struct Apple: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "UnionTypes#Apple"
public static let registeredIdentifier: String = "UnionTypes#Apple"
public var isRed: Bool
@ -192,7 +192,7 @@ extension UnionTypes {
public typealias Animal = UnionTypes_Animal
public struct Zebra: Animal {
public static var registeredIdentifier: String = "UnionTypes#Zebra"
public static let registeredIdentifier: String = "UnionTypes#Zebra"
public var name: String
@ -202,7 +202,7 @@ extension UnionTypes {
}
public struct Donkey: Animal {
public static var registeredIdentifier: String = "UnionTypes#Donkey"
public static let registeredIdentifier: String = "UnionTypes#Donkey"
public var name: String

8
Tests/PklSwiftTests/Fixtures/Generated/pkl_swift_example_Poly.pkl.swift
View File

@ -9,7 +9,7 @@ public protocol pkl_swift_example_Poly_Animal: pkl_swift_lib1_Being {
extension pkl_swift_example_Poly {
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "pkl.swift.example.Poly"
public static let registeredIdentifier: String = "pkl.swift.example.Poly"
public var beings: [any pkl_swift_lib1.Being]
@ -56,7 +56,7 @@ extension pkl_swift_example_Poly {
}
public struct Dog: Animal {
public static var registeredIdentifier: String = "pkl.swift.example.Poly#Dog"
public static let registeredIdentifier: String = "pkl.swift.example.Poly#Dog"
public var barks: Bool
@ -103,7 +103,7 @@ extension pkl_swift_example_Poly {
public typealias Animal = pkl_swift_example_Poly_Animal
public struct AnimalImpl: Animal {
public static var registeredIdentifier: String = "pkl.swift.example.Poly#Animal"
public static let registeredIdentifier: String = "pkl.swift.example.Poly#Animal"
public var name: String
@ -116,7 +116,7 @@ extension pkl_swift_example_Poly {
}
public struct Bird: pkl_swift_lib1.Being {
public static var registeredIdentifier: String = "pkl.swift.example.Poly#Bird"
public static let registeredIdentifier: String = "pkl.swift.example.Poly#Bird"
public var name: String

2
Tests/PklSwiftTests/Fixtures/Generated/pkl_swift_lib1.pkl.swift
View File

@ -9,7 +9,7 @@ public protocol pkl_swift_lib1_Being: PklRegisteredType, DynamicallyEquatable, H
extension pkl_swift_lib1 {
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "pkl.swift.lib1"
public static let registeredIdentifier: String = "pkl.swift.lib1"
public init() {}
}

4
codegen/snippet-tests/output/Classes.pkl.swift
View File

@ -9,7 +9,7 @@ public protocol Classes_Animal: PklRegisteredType, DynamicallyEquatable, Hashabl
extension Classes {
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "Classes"
public static let registeredIdentifier: String = "Classes"
public var animals: [any Animal]
@ -38,7 +38,7 @@ extension Classes {
public typealias Animal = Classes_Animal
public struct AnimalImpl: Animal {
public static var registeredIdentifier: String = "Classes#Animal"
public static let registeredIdentifier: String = "Classes#Animal"
public var name: String

2
codegen/snippet-tests/output/EmptyOpenModule.pkl.swift
View File

@ -10,7 +10,7 @@ extension EmptyOpenModule {
public typealias Module = EmptyOpenModule_Module
public struct ModuleImpl: Module {
public static var registeredIdentifier: String = "EmptyOpenModule"
public static let registeredIdentifier: String = "EmptyOpenModule"
public init() {}
}

8
codegen/snippet-tests/output/Enums.pkl.swift
View File

@ -113,7 +113,7 @@ extension Enums {
}
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "Enums"
public static let registeredIdentifier: String = "Enums"
/// City of tomorrow!
public var city: City
@ -145,7 +145,7 @@ extension Enums {
}
public struct Horse: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "Enums#Horse"
public static let registeredIdentifier: String = "Enums#Horse"
public var neigh: Bool
@ -155,7 +155,7 @@ extension Enums {
}
public struct Zebra: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "Enums#Zebra"
public static let registeredIdentifier: String = "Enums#Zebra"
public var stripes: String
@ -165,7 +165,7 @@ extension Enums {
}
public struct Monkey: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "Enums#Monkey"
public static let registeredIdentifier: String = "Enums#Monkey"
public var tail: String

4
codegen/snippet-tests/output/ExplicitlyCoolName.pkl.swift
View File

@ -10,7 +10,7 @@ extension ExplicitlyCoolName {
}
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "ExplicitName"
public static let registeredIdentifier: String = "ExplicitName"
public var MyCoolProp: SomethingVeryFunny
@ -24,7 +24,7 @@ extension ExplicitlyCoolName {
}
public struct SomethingVeryFunny: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "ExplicitName#SomethingFunny"
public static let registeredIdentifier: String = "ExplicitName#SomethingFunny"
public init() {}
}

2
codegen/snippet-tests/output/ExtendModule.pkl.swift
View File

@ -5,7 +5,7 @@ public enum ExtendModule {}
extension ExtendModule {
public struct Module: MyModule.Module {
public static var registeredIdentifier: String = "ExtendModule"
public static let registeredIdentifier: String = "ExtendModule"
public var bar: String

8
codegen/snippet-tests/output/ExtendingOpenClass.pkl.swift
View File

@ -9,7 +9,7 @@ public protocol ExtendingOpenClass_MyOpenClass: PklRegisteredType, DynamicallyEq
extension ExtendingOpenClass {
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "ExtendingOpenClass"
public static let registeredIdentifier: String = "ExtendingOpenClass"
public var res1: MyClass
@ -22,7 +22,7 @@ extension ExtendingOpenClass {
}
public struct MyClass: MyOpenClass {
public static var registeredIdentifier: String = "ExtendingOpenClass#MyClass"
public static let registeredIdentifier: String = "ExtendingOpenClass#MyClass"
public var myBoolean: Bool
@ -37,7 +37,7 @@ extension ExtendingOpenClass {
public typealias MyOpenClass = ExtendingOpenClass_MyOpenClass
public struct MyOpenClassImpl: MyOpenClass {
public static var registeredIdentifier: String = "ExtendingOpenClass#MyOpenClass"
public static let registeredIdentifier: String = "ExtendingOpenClass#MyOpenClass"
public var myStr: String
@ -47,7 +47,7 @@ extension ExtendingOpenClass {
}
public struct MyClass2: lib3.GoGoGo {
public static var registeredIdentifier: String = "ExtendingOpenClass#MyClass2"
public static let registeredIdentifier: String = "ExtendingOpenClass#MyClass2"
public var myBoolean: Bool

4
codegen/snippet-tests/output/ExtendsAbstractClass.pkl.swift
View File

@ -9,7 +9,7 @@ public protocol ExtendsAbstractClass_A: PklRegisteredType, DynamicallyEquatable,
extension ExtendsAbstractClass {
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "ExtendsAbstractClass"
public static let registeredIdentifier: String = "ExtendsAbstractClass"
public var a: any A
@ -36,7 +36,7 @@ extension ExtendsAbstractClass {
public typealias A = ExtendsAbstractClass_A
public struct B: A {
public static var registeredIdentifier: String = "ExtendsAbstractClass#B"
public static let registeredIdentifier: String = "ExtendsAbstractClass#B"
public var c: String

8
codegen/snippet-tests/output/Foo.pkl.swift
View File

@ -13,7 +13,7 @@ public protocol Foo_Being: PklRegisteredType, DynamicallyEquatable, Hashable {
extension Foo {
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "Foo"
public static let registeredIdentifier: String = "Foo"
public var animals: [any Animal]
@ -42,7 +42,7 @@ extension Foo {
public typealias Animal = Foo_Animal
public struct AnimalImpl: Animal {
public static var registeredIdentifier: String = "Foo#Animal"
public static let registeredIdentifier: String = "Foo#Animal"
public var name: String
@ -57,7 +57,7 @@ extension Foo {
public typealias Being = Foo_Being
public struct Bird: Animal {
public static var registeredIdentifier: String = "Foo#Bird"
public static let registeredIdentifier: String = "Foo#Bird"
public var flies: Bool
@ -73,7 +73,7 @@ extension Foo {
}
public struct Dog: Animal {
public static var registeredIdentifier: String = "Foo#Dog"
public static let registeredIdentifier: String = "Foo#Dog"
public var barks: Bool

2
codegen/snippet-tests/output/HiddenProperties.pkl.swift
View File

@ -5,7 +5,7 @@ public enum HiddenProperties {}
extension HiddenProperties {
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "HiddenProperties"
public static let registeredIdentifier: String = "HiddenProperties"
public var propC: String

2
codegen/snippet-tests/output/Imports.pkl.swift
View File

@ -5,7 +5,7 @@ public enum Imports {}
extension Imports {
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "Imports"
public static let registeredIdentifier: String = "Imports"
public var foo: Foo.Module

2
codegen/snippet-tests/output/MyModule.pkl.swift
View File

@ -11,7 +11,7 @@ extension MyModule {
public typealias Module = MyModule_Module
public struct ModuleImpl: Module {
public static var registeredIdentifier: String = "MyModule"
public static let registeredIdentifier: String = "MyModule"
public var foo: String

4
codegen/snippet-tests/output/Override2.pkl.swift
View File

@ -11,7 +11,7 @@ extension Override2 {
public typealias Module = Override2_Module
public struct ModuleImpl: Module {
public static var registeredIdentifier: String = "Override2"
public static let registeredIdentifier: String = "Override2"
/// Doc comments
public var foo: String
@ -22,7 +22,7 @@ extension Override2 {
}
public struct MySubclass: Module {
public static var registeredIdentifier: String = "Override2#MySubclass"
public static let registeredIdentifier: String = "Override2#MySubclass"
/// Doc comments
public var foo: String

2
codegen/snippet-tests/output/TypeAliased.pkl.swift
View File

@ -5,7 +5,7 @@ public enum TypeAliased {}
extension TypeAliased {
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "TypeAliased"
public static let registeredIdentifier: String = "TypeAliased"
public var myMap: StringyMap

2
codegen/snippet-tests/output/UnionNameKeyword.pkl.swift
View File

@ -11,7 +11,7 @@ extension UnionNameKeyword {
}
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "UnionNameKeyword"
public static let registeredIdentifier: String = "UnionNameKeyword"
public var type: `Type`

4
codegen/snippet-tests/output/com_example_ExtendedSimple.pkl.swift
View File

@ -5,13 +5,13 @@ public enum com_example_ExtendedSimple {}
extension com_example_ExtendedSimple {
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "com.example.ExtendedSimple"
public static let registeredIdentifier: String = "com.example.ExtendedSimple"
public init() {}
}
public struct ExtendedSimple: com_example_Simple.Person {
public static var registeredIdentifier: String = "com.example.ExtendedSimple#ExtendedSimple"
public static let registeredIdentifier: String = "com.example.ExtendedSimple#ExtendedSimple"
public var eyeColor: String

10
codegen/snippet-tests/output/com_example_Simple.pkl.swift
View File

@ -15,7 +15,7 @@ public protocol com_example_Simple_OpenClassExtendingOpenClass: PklRegisteredTyp
extension com_example_Simple {
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "com.example.Simple"
public static let registeredIdentifier: String = "com.example.Simple"
/// This is truly a person.
public var person: any Person
@ -43,7 +43,7 @@ extension com_example_Simple {
public typealias Person = com_example_Simple_Person
public struct PersonImpl: Person {
public static var registeredIdentifier: String = "com.example.Simple#Person"
public static let registeredIdentifier: String = "com.example.Simple#Person"
/// The name of the person
public var theName: String
@ -63,7 +63,7 @@ extension com_example_Simple {
}
public struct ThePerson: Person {
public static var registeredIdentifier: String = "com.example.Simple#ThePerson"
public static let registeredIdentifier: String = "com.example.Simple#ThePerson"
public var the: String
@ -89,7 +89,7 @@ extension com_example_Simple {
public typealias OpenClassExtendingOpenClass = com_example_Simple_OpenClassExtendingOpenClass
public struct OpenClassExtendingOpenClassImpl: OpenClassExtendingOpenClass {
public static var registeredIdentifier: String = "com.example.Simple#OpenClassExtendingOpenClass"
public static let registeredIdentifier: String = "com.example.Simple#OpenClassExtendingOpenClass"
public var someOtherProp: Bool?
@ -99,7 +99,7 @@ extension com_example_Simple {
}
public struct ClassWithReallyLongConstructor: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "com.example.Simple#ClassWithReallyLongConstructor"
public static let registeredIdentifier: String = "com.example.Simple#ClassWithReallyLongConstructor"
public var theProperty1: String

4
codegen/snippet-tests/output/lib3.pkl.swift
View File

@ -11,7 +11,7 @@ extension lib3 {
public typealias GoGoGo = lib3_GoGoGo
public struct GoGoGoImpl: GoGoGo {
public static var registeredIdentifier: String = "lib3#GoGoGo"
public static let registeredIdentifier: String = "lib3#GoGoGo"
public var duck: String
@ -21,7 +21,7 @@ extension lib3 {
}
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "lib3"
public static let registeredIdentifier: String = "lib3"
public init() {}
}

4
codegen/snippet-tests/output/override.pkl.swift
View File

@ -9,7 +9,7 @@ public protocol override_Foo: PklRegisteredType, DynamicallyEquatable, Hashable
extension override {
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "override"
public static let registeredIdentifier: String = "override"
public var foo: any Foo
@ -36,7 +36,7 @@ extension override {
public typealias Foo = override_Foo
public struct Bar: Foo {
public static var registeredIdentifier: String = "override#Bar"
public static let registeredIdentifier: String = "override#Bar"
public var myProp: String

2
codegen/snippet-tests/output/union.pkl.swift
View File

@ -34,7 +34,7 @@ extension union {
}
public struct Module: PklRegisteredType, Decodable, Hashable {
public static var registeredIdentifier: String = "union"
public static let registeredIdentifier: String = "union"
/// A city
public var city: City

2
codegen/src/internal/ClassGen.pkl
View File

@ -148,7 +148,7 @@ local struct: String = new Listing {
"public struct \(classInfo.struct.name): "
structSuperclasses
" {\n"
"\(module.indent)public static var registeredIdentifier: String = \(utils.toSwiftString(classInfo.source.reflectee.toString()))\n\n"
"\(module.indent)public static let registeredIdentifier: String = \(utils.toSwiftString(classInfo.source.reflectee.toString()))\n\n"
when (!properties.isEmpty) {
for (pklPropertyName, field in properties) {
when (pklPropertyName != properties.keys.first) {