build: align word-to-html with doc-converter-swift Refs #21 #12

Co-Authored-By: kiki830621 <kiki830621@gmail.com>

Author: PsychQuantClaw

Package.swift

@@ -9,8 +9,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.3.0"),
-        .package(url: "https://github.com/PsychQuant/doc-converter-swift.git", from: "0.3.0"),
-        .package(name: "CommonConverterSwift", path: "packages/common-converter-swift"),
+        .package(url: "https://github.com/PsychQuant/doc-converter-swift.git", from: "0.4.0"),
         .package(url: "https://github.com/PsychQuant/word-to-md-swift.git", from: "0.1.0"),
         .package(url: "https://github.com/PsychQuant/ooxml-swift.git", from: "0.5.0"),
         .package(url: "https://github.com/PsychQuant/markdown-swift.git", from: "0.1.0"),
@@ -28,7 +27,7 @@ let package = Package(
         .target(
             name: "MarkerWordConverter",
             dependencies: [
-                .product(name: "CommonConverterSwift", package: "CommonConverterSwift"),
+                .product(name: "CommonConverterSwift", package: "doc-converter-swift"),
                 .product(name: "OOXMLSwift", package: "ooxml-swift"),
                 .product(name: "MarkdownSwift", package: "markdown-swift"),
                 .product(name: "MarkerSwift", package: "marker-swift"),
@@ -37,8 +36,7 @@ let package = Package(
         .executableTarget(
             name: "MacDocCLI",
             dependencies: [
-                .product(name: "CommonConverterSwift", package: "CommonConverterSwift"),
-                .product(name: "DocConverterSwift", package: "doc-converter-swift"),
+                .product(name: "CommonConverterSwift", package: "doc-converter-swift"),
                 .product(name: "WordToMDSwift", package: "word-to-md-swift"),
                 .product(name: "HTMLToMDSwift", package: "HTMLToMDSwift"),
                 .product(name: "MDToHTMLSwift", package: "MDToHTMLSwift"),

Sources/MacDocCLI/MacDoc+WordHTML.swift

@@ -1,6 +1,6 @@
 import ArgumentParser
 import Foundation
-import DocConverterSwift
+import CommonConverterSwift
 import WordToHTMLSwift
 
 // MARK: - word-to-html

packages/word-to-html-swift/Package.swift

@@ -8,14 +8,14 @@ let package = Package(
         .library(name: "WordToHTMLSwift", targets: ["WordToHTMLSwift"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/PsychQuant/doc-converter-swift.git", from: "0.3.0"),
+        .package(url: "https://github.com/PsychQuant/doc-converter-swift.git", from: "0.4.0"),
         .package(url: "https://github.com/PsychQuant/ooxml-swift.git", from: "0.5.3"),
     ],
     targets: [
         .target(
             name: "WordToHTMLSwift",
             dependencies: [
-                .product(name: "DocConverterSwift", package: "doc-converter-swift"),
+                .product(name: "CommonConverterSwift", package: "doc-converter-swift"),
                 .product(name: "OOXMLSwift", package: "ooxml-swift"),
             ]
         ),

packages/word-to-html-swift/README.md

@@ -13,7 +13,7 @@ Direct Word (.docx) → HTML converter for macdoc.
 ## Usage
 
 ```swift
-import DocConverterSwift
+import CommonConverterSwift
 import WordToHTMLSwift
 
 let converter = WordHTMLConverter()

packages/word-to-html-swift/Sources/WordToHTMLSwift/WordHTMLConverter.swift

@@ -1,13 +1,13 @@
 import Foundation
-import DocConverterSwift
+import CommonConverterSwift
 import OOXMLSwift
 
 public struct WordHTMLConverter: DocumentConverter {
     public static let sourceFormat = "docx"
 
     public init() {}
 
-    public func convert<W: DocConverterSwift.StreamingOutput>(
+    public func convert<W: StreamingOutput>(
         input: URL,
         output: inout W,
         options: ConversionOptions
@@ -16,7 +16,7 @@ public struct WordHTMLConverter: DocumentConverter {
         try convert(document: document, source: input, output: &output, options: options)
     }
 
-    public func convert<W: DocConverterSwift.StreamingOutput>(
+    public func convert<W: StreamingOutput>(
         document: WordDocument,
         output: inout W,
         options: ConversionOptions = .default
@@ -28,12 +28,12 @@ public struct WordHTMLConverter: DocumentConverter {
         document: WordDocument,
         options: ConversionOptions = .default
     ) throws -> String {
-        var writer = DocConverterSwift.StringOutput()
+        var writer = StringOutput()
         try convert(document: document, output: &writer, options: options)
         return writer.content
     }
 
-    private func convert<W: DocConverterSwift.StreamingOutput>(
+    private func convert<W: StreamingOutput>(
         document: WordDocument,
         source: URL?,
         output: inout W,
@@ -73,7 +73,7 @@ public struct WordHTMLConverter: DocumentConverter {
 
     // MARK: - Document Shell
 
-    private func emitFrontmatter<W: DocConverterSwift.StreamingOutput>(
+    private func emitFrontmatter<W: StreamingOutput>(
         document: WordDocument,
         source: URL?,
         title: String,
@@ -91,7 +91,7 @@ public struct WordHTMLConverter: DocumentConverter {
         try output.writeLine("-->")
     }
 
-    private func emitDocumentStart<W: DocConverterSwift.StreamingOutput>(
+    private func emitDocumentStart<W: StreamingOutput>(
         title: String,
         output: inout W
     ) throws {
@@ -112,15 +112,15 @@ public struct WordHTMLConverter: DocumentConverter {
         try output.writeLine("  <main class=\"document\">")
     }
 
-    private func emitDocumentEnd<W: DocConverterSwift.StreamingOutput>(output: inout W) throws {
+    private func emitDocumentEnd<W: StreamingOutput>(output: inout W) throws {
         try output.writeLine("  </main>")
         try output.writeLine("</body>")
         try output.writeLine("</html>")
     }
 
     // MARK: - Blocks
 
-    private func emitParagraph<W: DocConverterSwift.StreamingOutput>(
+    private func emitParagraph<W: StreamingOutput>(
         _ paragraph: Paragraph,
         context: inout ConversionContext,
         output: inout W
@@ -159,7 +159,7 @@ public struct WordHTMLConverter: DocumentConverter {
         try output.writeLine("    <p>\(html)</p>")
     }
 
-    private func emitTable<W: DocConverterSwift.StreamingOutput>(
+    private func emitTable<W: StreamingOutput>(
         _ table: Table,
         context: inout ConversionContext,
         output: inout W
@@ -249,7 +249,7 @@ public struct WordHTMLConverter: DocumentConverter {
         }
     }
 
-    private func emitListBlock<W: DocConverterSwift.StreamingOutput>(
+    private func emitListBlock<W: StreamingOutput>(
         _ items: [FlatListItem],
         output: inout W
     ) throws {
@@ -260,7 +260,7 @@ public struct WordHTMLConverter: DocumentConverter {
         }
     }
 
-    private func renderList<W: DocConverterSwift.StreamingOutput>(
+    private func renderList<W: StreamingOutput>(
         items: [FlatListItem],
         index: inout Int,
         level: Int,
@@ -423,7 +423,7 @@ public struct WordHTMLConverter: DocumentConverter {
 
     // MARK: - Footnotes
 
-    private func emitFootnotes<W: DocConverterSwift.StreamingOutput>(
+    private func emitFootnotes<W: StreamingOutput>(
         context: ConversionContext,
         output: inout W
     ) throws {

packages/word-to-html-swift/Tests/WordToHTMLSwiftTests/WordHTMLConverterTests.swift

@@ -1,5 +1,5 @@
 import Foundation
-import DocConverterSwift
+import CommonConverterSwift
 import OOXMLSwift
 @testable import WordToHTMLSwift