doc: Adds val Encodable/Zinc docs

NeedleInAJayStack · NeedleInAJayStack · commit 2846b0a76823 · 2022-11-15T23:24:27.000-07:00
diff --git a/Sources/Haystack/Bool.swift b/Sources/Haystack/Bool.swift
@@ -6,6 +6,8 @@ import Foundation
 extension Bool: Val {
     public static var valType: ValType { .Bool }
     
+    /// Converts to Zinc formatted string.
+    /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)
     public func toZinc() -> String {
         return self ? "T" : "F"
     }
diff --git a/Sources/Haystack/Coord.swift b/Sources/Haystack/Coord.swift
@@ -19,12 +19,13 @@ public struct Coord: Val {
         self.longitude = longitude
     }
     
+    /// Converts to Zinc formatted string.
+    /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)
     public func toZinc() -> String {
         return "C(\(latitude),\(longitude))"
     }
 }
 
-/// See https://project-haystack.org/doc/docHaystack/Json#coord
 extension Coord: Codable {
     static let kindValue = "coord"
     
@@ -34,6 +35,8 @@ extension Coord: Codable {
         case lng
     }
     
+    /// Read from decodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#coord)
     public init(from decoder: Decoder) throws {
         if let container = try? decoder.container(keyedBy: Self.CodingKeys) {
             guard try container.decode(String.self, forKey: ._kind) == Self.kindValue else {
@@ -61,6 +64,8 @@ extension Coord: Codable {
         }
     }
     
+    /// Write to encodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#coord)
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: Self.CodingKeys)
         try container.encode(Self.kindValue, forKey: ._kind)
diff --git a/Sources/Haystack/Date.swift b/Sources/Haystack/Date.swift
@@ -47,6 +47,8 @@ public struct Date: Val {
         )
     }
     
+    /// Converts to Zinc formatted string.
+    /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)
     public func toZinc() -> String {
         return isoString
     }
@@ -66,7 +68,6 @@ var dateFormatter: ISO8601DateFormatter {
     return formatter
 }
 
-/// See https://project-haystack.org/doc/docHaystack/Json#date
 extension Date {
     static let kindValue = "date"
     
@@ -75,6 +76,8 @@ extension Date {
         case val
     }
     
+    /// Read from decodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#date)
     public init(from decoder: Decoder) throws {
         if let container = try? decoder.container(keyedBy: Self.CodingKeys) {
             guard try container.decode(String.self, forKey: ._kind) == Self.kindValue else {
@@ -110,6 +113,8 @@ extension Date {
         }
     }
     
+    /// Write to encodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#date)
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: Self.CodingKeys)
         try container.encode(Self.kindValue, forKey: ._kind)
diff --git a/Sources/Haystack/DateTime.swift b/Sources/Haystack/DateTime.swift
@@ -89,6 +89,8 @@ public struct DateTime: Val {
         }
     }
     
+    /// Converts to Zinc formatted string.
+    /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)
     public func toZinc() -> String {
         var zinc: String
         if hasMilliseconds {
@@ -166,14 +168,6 @@ public struct DateTime: Val {
         }
         
         return (date, gmtOffset)
-        
-//        if let date = dateTimeFormatter.date(from: isoString) {
-//            return date
-//        } else if let date = dateTimeWithMillisFormatter.date(from: isoString) {
-//            return date
-//        } else {
-//            throw ValError.invalidDateTimeFormat(isoString)
-//        }
     }
     
     private var hasMilliseconds: Bool {
@@ -199,7 +193,6 @@ public struct DateTime: Val {
 
 var calendar = Calendar(identifier: .gregorian)
 
-/// See https://project-haystack.org/doc/docHaystack/Json#dateTime
 extension DateTime {
     static let kindValue = "dateTime"
     
@@ -209,6 +202,8 @@ extension DateTime {
         case tz
     }
     
+    /// Read from decodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#dateTime)
     public init(from decoder: Decoder) throws {
         guard let container = try? decoder.container(keyedBy: Self.CodingKeys) else {
             throw DecodingError.typeMismatch(
@@ -249,6 +244,8 @@ extension DateTime {
         self.timezone = timezone
     }
     
+    /// Write to encodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#dateTime)
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: Self.CodingKeys)
         try container.encode(Self.kindValue, forKey: ._kind)
diff --git a/Sources/Haystack/Dict.swift b/Sources/Haystack/Dict.swift
@@ -20,6 +20,8 @@ public struct Dict: Val {
         self.elements = elements
     }
     
+    /// Converts to Zinc formatted string.
+    /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)
     public func toZinc() -> String {
         return toZinc(withBraces: true)
     }
@@ -38,10 +40,11 @@ public struct Dict: Val {
     }
 }
 
-/// See https://project-haystack.org/doc/docHaystack/Json#dict
 extension Dict {
     static let kindValue = "dateTime"
     
+    /// Read from decodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#dict)
     public init(from decoder: Decoder) throws {
         guard let container = try? decoder.container(keyedBy: DictCodingKey.self) else {
             throw DecodingError.typeMismatch(
@@ -79,7 +82,9 @@ extension Dict {
         }
         self.elements = elements
     }
-
+    
+    /// Write to encodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#dict)
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: DictCodingKey.self)
         for (key, value) in elements {
diff --git a/Sources/Haystack/Grid.swift b/Sources/Haystack/Grid.swift
@@ -19,6 +19,8 @@ public struct Grid: Val {
         self.rows = rows
     }
     
+    /// Converts to Zinc formatted string.
+    /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)
     public func toZinc() -> String {
         var zinc = #"ver:"3.0""#
         if meta.elements.count > 0 {
@@ -49,7 +51,6 @@ public struct Grid: Val {
     }
 }
 
-/// See https://project-haystack.org/doc/docHaystack/Json#grid
 extension Grid {
     static let kindValue = "grid"
     
@@ -60,6 +61,8 @@ extension Grid {
         case rows
     }
     
+    /// Read from decodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#grid)
     public init(from decoder: Decoder) throws {
         if let container = try? decoder.container(keyedBy: Self.CodingKeys) {
             guard try container.decode(String.self, forKey: ._kind) == Self.kindValue else {
@@ -86,6 +89,8 @@ extension Grid {
         }
     }
     
+    /// Write to encodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#grid)
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: Self.CodingKeys)
         try container.encode(Self.kindValue, forKey: ._kind)
diff --git a/Sources/Haystack/List.swift b/Sources/Haystack/List.swift
@@ -13,14 +13,18 @@ public struct List: Val {
         self.elements = elements
     }
     
+    /// Converts to Zinc formatted string.
+    /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)
     public func toZinc() -> String {
         let zincElements = elements.map { $0.toZinc() }
         return "[\(zincElements.joined(separator:", "))]"
     }
 }
 
-/// See https://project-haystack.org/doc/docHaystack/Json#list
-extension List: Encodable {
+extension List {
+    
+    /// Read from decodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#list)
     public init(from decoder: Decoder) throws {
         guard var container = try? decoder.unkeyedContainer() else {
             throw DecodingError.typeMismatch(
@@ -43,7 +47,9 @@ extension List: Encodable {
         }
         self.elements = elements
     }
-
+    
+    /// Write to encodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#list)
     public func encode(to encoder: Encoder) throws {
         var container = encoder.unkeyedContainer()
         for element in elements {
diff --git a/Sources/Haystack/Marker.swift b/Sources/Haystack/Marker.swift
@@ -10,23 +10,27 @@ public let marker = Marker()
 public struct Marker: Val {
     public static var valType: ValType { .Marker }
     
+    /// Singleton `Marker` instance
     public static var val: Self {
         return marker
     }
     
+    /// Converts to Zinc formatted string.
+    /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)
     public func toZinc() -> String {
         return "M"
     }
 }
 
-/// See https://project-haystack.org/doc/docHaystack/Json#marker
 extension Marker {
     static let kindValue = "marker"
     
     enum CodingKeys: CodingKey {
         case _kind
     }
     
+    /// Read from decodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#marker)
     public init(from decoder: Decoder) throws {
         if let container = try? decoder.container(keyedBy: Self.CodingKeys) {
             guard try container.decode(String.self, forKey: ._kind) == Self.kindValue else {
@@ -50,6 +54,8 @@ extension Marker {
         }
     }
     
+    /// Write to encodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#marker)
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: Self.CodingKeys)
         try container.encode(Self.kindValue, forKey: ._kind)
diff --git a/Sources/Haystack/NA.swift b/Sources/Haystack/NA.swift
@@ -15,19 +15,22 @@ public struct NA: Val {
         return na
     }
     
+    /// Converts to Zinc formatted string.
+    /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)
     public func toZinc() -> String {
         return "NA"
     }
 }
 
-/// See https://project-haystack.org/doc/docHaystack/Json#na
 extension NA {
     static let kindValue = "na"
     
     enum CodingKeys: CodingKey {
         case _kind
     }
     
+    /// Read from decodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#na)
     public init(from decoder: Decoder) throws {
         if let container = try? decoder.container(keyedBy: Self.CodingKeys) {
             guard try container.decode(String.self, forKey: ._kind) == Self.kindValue else {
@@ -51,6 +54,8 @@ extension NA {
         }
     }
     
+    /// Write to encodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#na)
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: Self.CodingKeys)
         try container.encode(Self.kindValue, forKey: ._kind)
diff --git a/Sources/Haystack/Null.swift b/Sources/Haystack/Null.swift
@@ -13,13 +13,17 @@ public struct Null: Val {
         return null
     }
     
+    /// Converts to Zinc formatted string.
+    /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)
     public func toZinc() -> String {
         return "N"
     }
 }
 
-/// See https://project-haystack.org/doc/docHaystack/Json#v4
 extension Null {
+    
+    /// Read from decodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#v4)
     public init(from decoder: Decoder) throws {
         if let container = try? decoder.singleValueContainer() {
             guard container.decodeNil() else {
@@ -43,6 +47,8 @@ extension Null {
         }
     }
     
+    /// Write to encodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#v4)
     public func encode(to encoder: Encoder) throws {
         var container = encoder.singleValueContainer()
         try container.encodeNil()
diff --git a/Sources/Haystack/Number.swift b/Sources/Haystack/Number.swift
@@ -25,6 +25,8 @@ public struct Number: Val {
         self.unit = unit
     }
     
+    /// Converts to Zinc formatted string.
+    /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)
     public func toZinc() -> String {
         guard !val.isNaN else {
             return "NaN"
@@ -51,7 +53,6 @@ public struct Number: Val {
     }
 }
 
-/// See https://project-haystack.org/doc/docHaystack/Json#number
 extension Number {
     static let kindValue = "number"
     
@@ -61,6 +62,8 @@ extension Number {
         case unit
     }
     
+    /// Read from decodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#number)
     public init(from decoder: Decoder) throws {
         if let container = try? decoder.container(keyedBy: Self.CodingKeys) {
             guard try container.decode(String.self, forKey: ._kind) == Self.kindValue else {
@@ -117,6 +120,8 @@ extension Number {
         }
     }
     
+    /// Write to encodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#number)
     public func encode(to encoder: Encoder) throws {
         if unit != nil || val.isNaN || val.isInfinite {
             var container = encoder.container(keyedBy: Self.CodingKeys)
diff --git a/Sources/Haystack/Ref.swift b/Sources/Haystack/Ref.swift
@@ -21,6 +21,8 @@ public struct Ref: Val {
         self.dis = dis
     }
     
+    /// Converts to Zinc formatted string.
+    /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)
     public func toZinc() -> String {
         var zinc = "@\(val)"
         if let dis = dis {
@@ -30,7 +32,6 @@ public struct Ref: Val {
     }
 }
 
-/// See https://project-haystack.org/doc/docHaystack/Json#ref
 extension Ref {
     static let kindValue = "ref"
     
@@ -40,6 +41,8 @@ extension Ref {
         case dis
     }
     
+    /// Read from decodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#ref)
     public init(from decoder: Decoder) throws {
         if let container = try? decoder.container(keyedBy: Self.CodingKeys) {
             guard try container.decode(String.self, forKey: ._kind) == Self.kindValue else {
@@ -67,6 +70,8 @@ extension Ref {
         }
     }
     
+    /// Write to encodable data
+    /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#ref)
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: Self.CodingKeys)
         try container.encode(Self.kindValue, forKey: ._kind)
diff --git a/Sources/Haystack/Remove.swift b/Sources/Haystack/Remove.swift
diff --git a/Sources/Haystack/String.swift b/Sources/Haystack/String.swift
diff --git a/Sources/Haystack/Symbol.swift b/Sources/Haystack/Symbol.swift
diff --git a/Sources/Haystack/Time.swift b/Sources/Haystack/Time.swift
diff --git a/Sources/Haystack/Uri.swift b/Sources/Haystack/Uri.swift
diff --git a/Sources/Haystack/XStr.swift b/Sources/Haystack/XStr.swift

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ import Foundation`
`6`	`6`	`extension Bool: Val {`
`7`	`7`	`public static var valType: ValType { .Bool }`
`8`	`8`
	`9`	`+ /// Converts to Zinc formatted string.`
	`10`	`+ /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)`
`9`	`11`	`public func toZinc() -> String {`
`10`	`12`	`return self ? "T" : "F"`
`11`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,13 @@ public struct Coord: Val {`
`19`	`19`	`self.longitude = longitude`
`20`	`20`	`}`
`21`	`21`
	`22`	`+ /// Converts to Zinc formatted string.`
	`23`	`+ /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)`
`22`	`24`	`public func toZinc() -> String {`
`23`	`25`	`return "C(\(latitude),\(longitude))"`
`24`	`26`	`}`
`25`	`27`	`}`
`26`	`28`
`27`		`-/// See https://project-haystack.org/doc/docHaystack/Json#coord`
`28`	`29`	`extension Coord: Codable {`
`29`	`30`	`static let kindValue = "coord"`
`30`	`31`
`@@ -34,6 +35,8 @@ extension Coord: Codable {`
`34`	`35`	`case lng`
`35`	`36`	`}`
`36`	`37`
	`38`	`+ /// Read from decodable data`
	`39`	`+ /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#coord)`
`37`	`40`	`public init(from decoder: Decoder) throws {`
`38`	`41`	`if let container = try? decoder.container(keyedBy: Self.CodingKeys) {`
`39`	`42`	`guard try container.decode(String.self, forKey: ._kind) == Self.kindValue else {`
`@@ -61,6 +64,8 @@ extension Coord: Codable {`
`61`	`64`	`}`
`62`	`65`	`}`
`63`	`66`
	`67`	`+ /// Write to encodable data`
	`68`	`+ /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#coord)`
`64`	`69`	`public func encode(to encoder: Encoder) throws {`
`65`	`70`	`var container = encoder.container(keyedBy: Self.CodingKeys)`
`66`	`71`	`try container.encode(Self.kindValue, forKey: ._kind)`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ public struct Date: Val {`
`47`	`47`	`)`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ /// Converts to Zinc formatted string.`
	`51`	`+ /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)`
`50`	`52`	`public func toZinc() -> String {`
`51`	`53`	`return isoString`
`52`	`54`	`}`
`@@ -66,7 +68,6 @@ var dateFormatter: ISO8601DateFormatter {`
`66`	`68`	`return formatter`
`67`	`69`	`}`
`68`	`70`
`69`		`-/// See https://project-haystack.org/doc/docHaystack/Json#date`
`70`	`71`	`extension Date {`
`71`	`72`	`static let kindValue = "date"`
`72`	`73`
`@@ -75,6 +76,8 @@ extension Date {`
`75`	`76`	`case val`
`76`	`77`	`}`
`77`	`78`
	`79`	`+ /// Read from decodable data`
	`80`	`+ /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#date)`
`78`	`81`	`public init(from decoder: Decoder) throws {`
`79`	`82`	`if let container = try? decoder.container(keyedBy: Self.CodingKeys) {`
`80`	`83`	`guard try container.decode(String.self, forKey: ._kind) == Self.kindValue else {`
`@@ -110,6 +113,8 @@ extension Date {`
`110`	`113`	`}`
`111`	`114`	`}`
`112`	`115`
	`116`	`+ /// Write to encodable data`
	`117`	`+ /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#date)`
`113`	`118`	`public func encode(to encoder: Encoder) throws {`
`114`	`119`	`var container = encoder.container(keyedBy: Self.CodingKeys)`
`115`	`120`	`try container.encode(Self.kindValue, forKey: ._kind)`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ public struct Dict: Val {`
`20`	`20`	`self.elements = elements`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ /// Converts to Zinc formatted string.`
	`24`	`+ /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)`
`23`	`25`	`public func toZinc() -> String {`
`24`	`26`	`return toZinc(withBraces: true)`
`25`	`27`	`}`
`@@ -38,10 +40,11 @@ public struct Dict: Val {`
`38`	`40`	`}`
`39`	`41`	`}`
`40`	`42`
`41`		`-/// See https://project-haystack.org/doc/docHaystack/Json#dict`
`42`	`43`	`extension Dict {`
`43`	`44`	`static let kindValue = "dateTime"`
`44`	`45`
	`46`	`+ /// Read from decodable data`
	`47`	`+ /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#dict)`
`45`	`48`	`public init(from decoder: Decoder) throws {`
`46`	`49`	`guard let container = try? decoder.container(keyedBy: DictCodingKey.self) else {`
`47`	`50`	`throw DecodingError.typeMismatch(`
`@@ -79,7 +82,9 @@ extension Dict {`
`79`	`82`	`}`
`80`	`83`	`self.elements = elements`
`81`	`84`	`}`
`82`		`-`
	`85`	`+`
	`86`	`+ /// Write to encodable data`
	`87`	`+ /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#dict)`
`83`	`88`	`public func encode(to encoder: Encoder) throws {`
`84`	`89`	`var container = encoder.container(keyedBy: DictCodingKey.self)`
`85`	`90`	`for (key, value) in elements {`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ public struct Grid: Val {`
`19`	`19`	`self.rows = rows`
`20`	`20`	`}`
`21`	`21`
	`22`	`+ /// Converts to Zinc formatted string.`
	`23`	`+ /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)`
`22`	`24`	`public func toZinc() -> String {`
`23`	`25`	`var zinc = #"ver:"3.0""#`
`24`	`26`	`if meta.elements.count > 0 {`
`@@ -49,7 +51,6 @@ public struct Grid: Val {`
`49`	`51`	`}`
`50`	`52`	`}`
`51`	`53`
`52`		`-/// See https://project-haystack.org/doc/docHaystack/Json#grid`
`53`	`54`	`extension Grid {`
`54`	`55`	`static let kindValue = "grid"`
`55`	`56`
`@@ -60,6 +61,8 @@ extension Grid {`
`60`	`61`	`case rows`
`61`	`62`	`}`
`62`	`63`
	`64`	`+ /// Read from decodable data`
	`65`	`+ /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#grid)`
`63`	`66`	`public init(from decoder: Decoder) throws {`
`64`	`67`	`if let container = try? decoder.container(keyedBy: Self.CodingKeys) {`
`65`	`68`	`guard try container.decode(String.self, forKey: ._kind) == Self.kindValue else {`
`@@ -86,6 +89,8 @@ extension Grid {`
`86`	`89`	`}`
`87`	`90`	`}`
`88`	`91`
	`92`	`+ /// Write to encodable data`
	`93`	`+ /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#grid)`
`89`	`94`	`public func encode(to encoder: Encoder) throws {`
`90`	`95`	`var container = encoder.container(keyedBy: Self.CodingKeys)`
`91`	`96`	`try container.encode(Self.kindValue, forKey: ._kind)`
Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,18 @@ public struct List: Val {`
`13`	`13`	`self.elements = elements`
`14`	`14`	`}`
`15`	`15`
	`16`	`+ /// Converts to Zinc formatted string.`
	`17`	`+ /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)`
`16`	`18`	`public func toZinc() -> String {`
`17`	`19`	`let zincElements = elements.map { $0.toZinc() }`
`18`	`20`	`return "[\(zincElements.joined(separator:", "))]"`
`19`	`21`	`}`
`20`	`22`	`}`
`21`	`23`
`22`		`-/// See https://project-haystack.org/doc/docHaystack/Json#list`
`23`		`-extension List: Encodable {`
	`24`	`+extension List {`
	`25`	`+`
	`26`	`+ /// Read from decodable data`
	`27`	`+ /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#list)`
`24`	`28`	`public init(from decoder: Decoder) throws {`
`25`	`29`	`guard var container = try? decoder.unkeyedContainer() else {`
`26`	`30`	`throw DecodingError.typeMismatch(`
`@@ -43,7 +47,9 @@ extension List: Encodable {`
`43`	`47`	`}`
`44`	`48`	`self.elements = elements`
`45`	`49`	`}`
`46`		`-`
	`50`	`+`
	`51`	`+ /// Write to encodable data`
	`52`	`+ /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#list)`
`47`	`53`	`public func encode(to encoder: Encoder) throws {`
`48`	`54`	`var container = encoder.unkeyedContainer()`
`49`	`55`	`for element in elements {`
Original file line number	Diff line number	Diff line change
`@@ -10,23 +10,27 @@ public let marker = Marker()`
`10`	`10`	`public struct Marker: Val {`
`11`	`11`	`public static var valType: ValType { .Marker }`
`12`	`12`
	`13`	+ /// Singleton `Marker` instance
`13`	`14`	`public static var val: Self {`
`14`	`15`	`return marker`
`15`	`16`	`}`
`16`	`17`
	`18`	`+ /// Converts to Zinc formatted string.`
	`19`	`+ /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)`
`17`	`20`	`public func toZinc() -> String {`
`18`	`21`	`return "M"`
`19`	`22`	`}`
`20`	`23`	`}`
`21`	`24`
`22`		`-/// See https://project-haystack.org/doc/docHaystack/Json#marker`
`23`	`25`	`extension Marker {`
`24`	`26`	`static let kindValue = "marker"`
`25`	`27`
`26`	`28`	`enum CodingKeys: CodingKey {`
`27`	`29`	`case _kind`
`28`	`30`	`}`
`29`	`31`
	`32`	`+ /// Read from decodable data`
	`33`	`+ /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#marker)`
`30`	`34`	`public init(from decoder: Decoder) throws {`
`31`	`35`	`if let container = try? decoder.container(keyedBy: Self.CodingKeys) {`
`32`	`36`	`guard try container.decode(String.self, forKey: ._kind) == Self.kindValue else {`
`@@ -50,6 +54,8 @@ extension Marker {`
`50`	`54`	`}`
`51`	`55`	`}`
`52`	`56`
	`57`	`+ /// Write to encodable data`
	`58`	`+ /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#marker)`
`53`	`59`	`public func encode(to encoder: Encoder) throws {`
`54`	`60`	`var container = encoder.container(keyedBy: Self.CodingKeys)`
`55`	`61`	`try container.encode(Self.kindValue, forKey: ._kind)`
Original file line number	Diff line number	Diff line change
`@@ -15,19 +15,22 @@ public struct NA: Val {`
`15`	`15`	`return na`
`16`	`16`	`}`
`17`	`17`
	`18`	`+ /// Converts to Zinc formatted string.`
	`19`	`+ /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)`
`18`	`20`	`public func toZinc() -> String {`
`19`	`21`	`return "NA"`
`20`	`22`	`}`
`21`	`23`	`}`
`22`	`24`
`23`		`-/// See https://project-haystack.org/doc/docHaystack/Json#na`
`24`	`25`	`extension NA {`
`25`	`26`	`static let kindValue = "na"`
`26`	`27`
`27`	`28`	`enum CodingKeys: CodingKey {`
`28`	`29`	`case _kind`
`29`	`30`	`}`
`30`	`31`
	`32`	`+ /// Read from decodable data`
	`33`	`+ /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#na)`
`31`	`34`	`public init(from decoder: Decoder) throws {`
`32`	`35`	`if let container = try? decoder.container(keyedBy: Self.CodingKeys) {`
`33`	`36`	`guard try container.decode(String.self, forKey: ._kind) == Self.kindValue else {`
`@@ -51,6 +54,8 @@ extension NA {`
`51`	`54`	`}`
`52`	`55`	`}`
`53`	`56`
	`57`	`+ /// Write to encodable data`
	`58`	`+ /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#na)`
`54`	`59`	`public func encode(to encoder: Encoder) throws {`
`55`	`60`	`var container = encoder.container(keyedBy: Self.CodingKeys)`
`56`	`61`	`try container.encode(Self.kindValue, forKey: ._kind)`
Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,17 @@ public struct Null: Val {`
`13`	`13`	`return null`
`14`	`14`	`}`
`15`	`15`
	`16`	`+ /// Converts to Zinc formatted string.`
	`17`	`+ /// See [Zinc Literals](https://project-haystack.org/doc/docHaystack/Zinc#literals)`
`16`	`18`	`public func toZinc() -> String {`
`17`	`19`	`return "N"`
`18`	`20`	`}`
`19`	`21`	`}`
`20`	`22`
`21`		`-/// See https://project-haystack.org/doc/docHaystack/Json#v4`
`22`	`23`	`extension Null {`
	`24`	`+`
	`25`	`+ /// Read from decodable data`
	`26`	`+ /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#v4)`
`23`	`27`	`public init(from decoder: Decoder) throws {`
`24`	`28`	`if let container = try? decoder.singleValueContainer() {`
`25`	`29`	`guard container.decodeNil() else {`
`@@ -43,6 +47,8 @@ extension Null {`
`43`	`47`	`}`
`44`	`48`	`}`
`45`	`49`
	`50`	`+ /// Write to encodable data`
	`51`	`+ /// See [JSON format](https://project-haystack.org/doc/docHaystack/Json#v4)`
`46`	`52`	`public func encode(to encoder: Encoder) throws {`
`47`	`53`	`var container = encoder.singleValueContainer()`
`48`	`54`	`try container.encodeNil()`