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

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

Author: PsychQuantClaw

Package.swift

@@ -9,7 +9,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.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"),
@@ -27,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"),
@@ -36,7 +36,7 @@ let package = Package(
         .executableTarget(
             name: "MacDocCLI",
             dependencies: [
-                .product(name: "CommonConverterSwift", package: "CommonConverterSwift"),
+                .product(name: "CommonConverterSwift", package: "doc-converter-swift"),
                 .product(name: "WordToMDSwift", package: "word-to-md-swift"),
                 .product(name: "HTMLToMDSwift", package: "HTMLToMDSwift"),
                 .product(name: "HTMLToWordSwift", package: "HTMLToWordSwift"),

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

@@ -8,15 +8,15 @@ let package = Package(
         .library(name: "HTMLToWordSwift", targets: ["HTMLToWordSwift"]),
     ],
     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"),
         .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.7.4"),
     ],
     targets: [
         .target(
             name: "HTMLToWordSwift",
             dependencies: [
-                .product(name: "DocConverterSwift", package: "doc-converter-swift"),
+                .product(name: "CommonConverterSwift", package: "doc-converter-swift"),
                 .product(name: "OOXMLSwift", package: "ooxml-swift"),
                 .product(name: "SwiftSoup", package: "SwiftSoup"),
             ]

packages/html-to-word-swift/Sources/HTMLToWordSwift/HTMLToWordConverter.swift

@@ -1,5 +1,5 @@
 import Foundation
-import DocConverterSwift
+import CommonConverterSwift
 import OOXMLSwift
 import SwiftSoup
 
@@ -8,7 +8,7 @@ public struct HTMLToWordConverter: DocumentConverter {
 
     public init() {}
 
-    public func convert<W: DocConverterSwift.StreamingOutput>(
+    public func convert<W: StreamingOutput>(
         input: URL,
         output: inout W,
         options: ConversionOptions