Skip to content

パスの先頭部分を置き換える機能の追加 #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
omochi merged 3 commits into from
Jun 16, 2025
Merged

パスの先頭部分を置き換える機能の追加 #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce370cf
path alias
omochi May 30, 2025
10df949
update deps
omochi Jun 14, 2025
6acf9ae
update
omochi Jun 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 15 additions & 5 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@

import PackageDescription

let isLocalDevelopment = false
Copy link
Owner Author

@omochi omochi Jun 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

開発中にたびたび書き換えが生じて大変なので、仕組みを入れておく


let dependencies: [Package.Dependency] = if isLocalDevelopment {
[
.package(path: "../SwiftTypeReader"),
.package(path: "../TypeScriptAST"),
]
} else {
[
.package(url: "https://github.com/omochi/SwiftTypeReader.git", from: "3.2.0"),
.package(url: "https://github.com/omochi/TypeScriptAST.git", from: "2.1.0"),
]
}

let package = Package(
name: "CodableToTypeScript",
platforms: [.macOS(.v13)],
Expand All @@ -11,11 +25,7 @@ let package = Package(
targets: ["CodableToTypeScript"]
)
],
dependencies: [
.package(url: "https://github.com/omochi/SwiftTypeReader.git", from: "3.0.0"),
// .package(path: "../SwiftTypeReader"),
.package(url: "https://github.com/omochi/TypeScriptAST.git", from: "2.0.1"),
],
dependencies: dependencies,
targets: [
.target(
name: "TestUtils"
Expand Down
8 changes: 6 additions & 2 deletions Sources/CodableToTypeScript/Generator/PackageGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ public final class PackageGenerator {
symbols: SymbolTable,
importFileExtension: ImportFileExtension,
outputDirectory: URL,
typeScriptExtension: String = "ts"
typeScriptExtension: String = "ts",
pathPrefixReplacements: PathPrefixReplacements = []
Copy link
Owner Author

@omochi omochi Jun 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

これが追加された

) {
self.context = context
self.fileManager = fileManager
Expand All @@ -26,6 +27,7 @@ public final class PackageGenerator {
isDirectory: true, relativeTo: outputDirectory.baseURL
)
self.typeScriptExtension = typeScriptExtension
self.pathPrefixReplacements = pathPrefixReplacements
}

public let context: SwiftTypeReader.Context
Expand All @@ -35,6 +37,7 @@ public final class PackageGenerator {
public let importFileExtension: ImportFileExtension
public let outputDirectory: URL
public let typeScriptExtension: String
public let pathPrefixReplacements: PathPrefixReplacements
@available(*, deprecated, renamed: "didConvertSource")
public var didGenerateEntry: ((SourceFile, PackageEntry) throws -> Void)? {
get { didConvertSource }
Expand Down Expand Up @@ -111,7 +114,8 @@ public final class PackageGenerator {
let imports = try tsSource.buildAutoImportDecls(
from: entry.file,
symbolTable: allSymbols,
fileExtension: importFileExtension
fileExtension: importFileExtension,
pathPrefixReplacements: pathPrefixReplacements
)
tsSource.replaceImportDecls(imports)
for importedSymbolName in imports.flatMap(\.names) {
Expand Down