allow custom extensions in markdown-tool

Author: QuietMisdreavus

Sources/markdown-tool/Commands/DumpTreeCommand.swift

@@ -28,13 +28,27 @@ extension MarkdownCommand {
         @Flag<Bool>(inversion: .prefixedNo, exclusivity: .chooseLast, help: "Parse block directives")
         var parseBlockDirectives: Bool = false
 
+        @Option(help: "Additional Commonmark extensions to enable")
+        var `extension`: [String] = []
+
+        @Flag<Bool>(help: "Don't enable the default Commonmark extensions (\(ConvertOptions.defaultCommonmarkExtensions.joined(separator: ", ")))")
+        var noDefaultExtensions: Bool = false
+
         func run() throws {
             let parseOptions: ParseOptions = parseBlockDirectives ? [.parseBlockDirectives] : []
+            var commonmarkExts = noDefaultExtensions ? [] : ConvertOptions.defaultCommonmarkExtensions
+            commonmarkExts.append(contentsOf: `extension`)
+            let convertOptions = ConvertOptions.init(
+                parseOptions: parseOptions,
+                commonmarkOptions: ConvertOptions.defaultCommonmarkOptions,
+                extensions: commonmarkExts
+            )
+
             let document: Document
             if let inputFilePath = inputFilePath {
-                (_, document) = try MarkdownCommand.parseFile(at: inputFilePath, options: parseOptions)
+                (_, document) = try MarkdownCommand.parseFile(at: inputFilePath, options: convertOptions)
             } else {
-                (_, document) = try MarkdownCommand.parseStandardInput(options: parseOptions)
+                (_, document) = try MarkdownCommand.parseStandardInput(options: convertOptions)
             }
             var dumpOptions = MarkupDumpOptions()
             if sourceLocations {

Sources/markdown-tool/Commands/FormatCommand.swift

@@ -123,6 +123,12 @@ extension MarkdownCommand {
         @Argument(help: "Input file (default: standard input)")
         var inputFilePath: String?
 
+        @Option(help: "Additional Commonmark extensions to enable")
+        var `extension`: [String] = []
+
+        @Flag<Bool>(help: "Don't enable the default Commonmark extensions (\(ConvertOptions.defaultCommonmarkExtensions.joined(separator: ", ")))")
+        var noDefaultExtensions: Bool = false
+
         /// Search for the an executable with a given base name.
         func findExecutable(named name: String) throws -> String? {
             let which = Process()
@@ -196,12 +202,19 @@ extension MarkdownCommand {
             if parseSymbolLinks {
                 parseOptions.insert(.parseSymbolLinks)
             }
+            var commonmarkExts = noDefaultExtensions ? [] : ConvertOptions.defaultCommonmarkExtensions
+            commonmarkExts.append(contentsOf: `extension`)
+            let convertOptions = ConvertOptions.init(
+                parseOptions: parseOptions,
+                commonmarkOptions: ConvertOptions.defaultCommonmarkOptions,
+                extensions: commonmarkExts
+            )
             let source: String
             let document: Document
             if let inputFilePath = inputFilePath {
-                (source, document) = try MarkdownCommand.parseFile(at: inputFilePath, options: parseOptions)
+                (source, document) = try MarkdownCommand.parseFile(at: inputFilePath, options: convertOptions)
             } else {
-                (source, document) = try MarkdownCommand.parseStandardInput(options: parseOptions)
+                (source, document) = try MarkdownCommand.parseStandardInput(options: convertOptions)
             }
 
             guard let emphasisMarker = MarkupFormatter.Options.EmphasisMarker(argument: emphasisMarker) else {

Sources/markdown-tool/main.swift

@@ -29,15 +29,15 @@ struct MarkdownCommand: ParsableCommand {
         Format.self,
     ])
 
-    static func parseFile(at path: String, options: ParseOptions) throws -> (source: String, parsed: Document) {
+    static func parseFile(at path: String, options: ConvertOptions) throws -> (source: String, parsed: Document) {
         let data = try Data(contentsOf: URL(fileURLWithPath: path))
         guard let inputString = String(data: data, encoding: .utf8) else {
             throw Error.couldntDecodeInputAsUTF8
         }
-        return (inputString, Document(parsing: inputString, options: options))
+        return (inputString, Document(parsing: inputString, convertOptions: options))
     }
 
-    static func parseStandardInput(options: ParseOptions) throws -> (source: String, parsed: Document) {
+    static func parseStandardInput(options: ConvertOptions) throws -> (source: String, parsed: Document) {
         let stdinData: Data
         if #available(macOS 10.15.4, *) {
             stdinData = try FileHandle.standardInput.readToEnd() ?? Data()
@@ -47,7 +47,7 @@ struct MarkdownCommand: ParsableCommand {
         guard let stdinString = String(data: stdinData, encoding: .utf8) else {
             throw Error.couldntDecodeInputAsUTF8
         }
-        return (stdinString, Document(parsing: stdinString, options: options))
+        return (stdinString, Document(parsing: stdinString, convertOptions: options))
     }
 }