Adding Periphery and Fixing Linting Issues

.periphery.yml

@@ -0,0 +1 @@
+retain_public: true

Package.swift

@@ -4,46 +4,43 @@
 import PackageDescription
 
 let package = Package(
- name: "SyntaxKit",
- platforms: [
- .macOS(.v13),
- .iOS(.v13),
- .watchOS(.v6),
- .tvOS(.v13),
- .visionOS(.v1)
- ],
- products: [
- // Products define the executables and libraries a package produces, making them visible to other packages.
- .library(
- name: "SyntaxKit",
- targets: ["SyntaxKit"]
- ),
- .executable(
- name: "skit",
- targets: ["skit"]
- ),
- ],
- dependencies: [
- .package(url: "https://github.com/apple/swift-syntax.git", from: "601.0.1")
- ],
- targets: [
- // Targets are the basic building blocks of a package, defining a module or a test suite.
- // Targets can depend on other targets in this package and products from dependencies.
- .target(
- name: "SyntaxKit",
- dependencies: [
- .product(name: "SwiftSyntax", package: "swift-syntax"),
- .product(name: "SwiftOperators", package: "swift-syntax"),
- .product(name: "SwiftParser", package: "swift-syntax")
- ]
- ),
- .executableTarget(
- name: "skit",
- dependencies: ["SyntaxKit"]
- ),
- .testTarget(
- name: "SyntaxKitTests",
- dependencies: ["SyntaxKit"]
- ),
- ]
+ name: "SyntaxKit",
+ platforms: [
+ .macOS(.v13),
+ .iOS(.v13),
+ .watchOS(.v6),
+ .tvOS(.v13),
+ .visionOS(.v1)
+ ],
+ products: [
+ .library(
+ name: "SyntaxKit",
+ targets: ["SyntaxKit"]
+ ),
+ .executable(
+ name: "skit",
+ targets: ["skit"]
+ ),
+ ],
+ dependencies: [
+ .package(url: "https://github.com/apple/swift-syntax.git", from: "601.0.1")
+ ],
+ targets: [
+ .target(
+ name: "SyntaxKit",
+ dependencies: [
+ .product(name: "SwiftSyntax", package: "swift-syntax"),
+ .product(name: "SwiftOperators", package: "swift-syntax"),
+ .product(name: "SwiftParser", package: "swift-syntax")
+ ]
+ ),
+ .executableTarget(
+ name: "skit",
+ dependencies: ["SyntaxKit"]
+ ),
+ .testTarget(
+ name: "SyntaxKitTests",
+ dependencies: ["SyntaxKit"]
+ ),
+ ]
 )

Scripts/lint.sh

@@ -75,6 +75,8 @@ $PACKAGE_DIR/Scripts/header.sh -d $PACKAGE_DIR/Sources -c "Leo Dion" -o "Bright
 run_command $MINT_RUN swiftlint lint $SWIFTLINT_OPTIONS
 run_command $MINT_RUN swift-format lint --recursive --parallel $SWIFTFORMAT_OPTIONS Sources Tests
 
-#$MINT_RUN periphery scan $PERIPHERY_OPTIONS --disable-update-check
+if [ -z "$CI" ]; then
+ run_command $MINT_RUN periphery scan $PERIPHERY_OPTIONS --disable-update-check
+fi
 
 popd

Sources/SyntaxKit/CodeBlock.swift

@@ -46,7 +46,7 @@ public protocol CodeBlockBuilder {
 
 /// A result builder for creating arrays of ``CodeBlock``s.
 @resultBuilder
-public struct CodeBlockBuilderResult {
+public enum CodeBlockBuilderResult {
  /// Builds a block of ``CodeBlock``s.
  public static func buildBlock(_ components: CodeBlock...) -> [CodeBlock] {
  components

Sources/SyntaxKit/ParameterBuilderResult.swift

@@ -31,7 +31,7 @@ import Foundation
 
 /// A result builder for creating arrays of ``Parameter``s.
 @resultBuilder
-public struct ParameterBuilderResult {
+public enum ParameterBuilderResult {
  /// Builds a block of ``Parameter``s.
  public static func buildBlock(_ components: Parameter...) -> [Parameter] {
  components

Sources/SyntaxKit/ParameterExpBuilderResult.swift

@@ -31,7 +31,7 @@ import Foundation
 
 /// A result builder for creating arrays of ``ParameterExp``s.
 @resultBuilder
-public struct ParameterExpBuilderResult {
+public enum ParameterExpBuilderResult {
  /// Builds a block of ``ParameterExp``s.
  public static func buildBlock(_ components: ParameterExp...) -> [ParameterExp] {
  components

Sources/SyntaxKit/parser/SyntaxParser.swift

@@ -32,7 +32,7 @@ import SwiftOperators
 import SwiftParser
 import SwiftSyntax
 
-package struct SyntaxParser {
+package enum SyntaxParser {
  package static func parse(code: String, options: [String] = []) throws -> SyntaxResponse {
  let sourceFile = Parser.parse(source: code)
 
@@ -53,6 +53,6 @@ package struct SyntaxParser {
  let encoder = JSONEncoder()
  let json = String(decoding: try encoder.encode(tree), as: UTF8.self)
 
- return SyntaxResponse(syntaxJSON: json, swiftVersion: version)
+ return SyntaxResponse(syntaxJSON: json)
  }
 }

Sources/SyntaxKit/parser/SyntaxResponse.swift

@@ -30,7 +30,5 @@
 import Foundation
 
 package struct SyntaxResponse: Codable {
- // package let syntaxHTML: String
  package let syntaxJSON: String
- package let swiftVersion: String
 }

Sources/SyntaxKit/parser/TokenVisitor.swift

@@ -97,10 +97,8 @@ final class TokenVisitor: SyntaxRewriter {
  range: Range(
  startRow: start.line,
  startColumn: start.column,
- graphemeStartColumn: graphemeStartColumn,
  endRow: end.line,
- endColumn: end.column,
- graphemeEndColumn: graphemeEndColumn
+ endColumn: end.column
  ),
  type: syntaxType
  )
@@ -185,9 +183,7 @@ final class TokenVisitor: SyntaxRewriter {
  .escapeHTML()
  .replaceInvisiblesWithHTML()
  .replaceHTMLWhitespacesWithSymbols()
- if token.presence == .missing {
- current.class = "\(token.presence)"
- }
+
  current.token = Token(kind: "\(token.tokenKind)", leadingTrivia: "", trailingTrivia: "")
 
  token.leadingTrivia.forEach { piece in

Sources/SyntaxKit/parser/TreeNode.swift

@@ -35,12 +35,10 @@ final class TreeNode: Codable {
 
  var text: String
  var range = Range(
- startRow: 0, startColumn: 0, graphemeStartColumn: 0, endRow: 0, endColumn: 0,
- graphemeEndColumn: 0)
+ startRow: 0, startColumn: 0, endRow: 0, endColumn: 0)
  var structure = [StructureProperty]()
  var type: SyntaxType
  var token: Token?
- var `class`: String?
 
  init(id: Int, text: String, range: Range, type: SyntaxType) {
  self.id = id
@@ -76,10 +74,8 @@ extension TreeNode: CustomStringConvertible {
 struct Range: Codable, Equatable {
  let startRow: Int
  let startColumn: Int
- let graphemeStartColumn: Int
  let endRow: Int
  let endColumn: Int
- let graphemeEndColumn: Int
 }
 
 extension Range: CustomStringConvertible {