Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ jobs:
gem install bundler
bundle install --without=documentation
- name: Swift
uses: fwal/setup-swift@v1
uses: swift-actions/setup-swift@v2
with:
swift-version: "5.9"
- name: Preparation
run: set -o pipefail
- name: Build
Expand All @@ -57,7 +59,9 @@ jobs:
gem install bundler
bundle install --without=documentation
- name: Swift
uses: fwal/setup-swift@v1
uses: swift-actions/setup-swift@v2
with:
swift-version: "5.9"
- name: Preparation
run: set -o pipefail
- name: Build
Expand Down
4 changes: 4 additions & 0 deletions Sources/FigmaGen/Generators/GenerationParametersError.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ enum GenerationParametersError: Error, CustomStringConvertible {
case invalidFileConfiguration
case invalidAccessToken
case invalidGitHubAccessToken
case emptyGitHubAccessToken

// MARK: - Instance Properties

Expand All @@ -20,6 +21,9 @@ enum GenerationParametersError: Error, CustomStringConvertible {

case .invalidGitHubAccessToken:
return "GitHiub access token cannot be empty or nil"

case .emptyGitHubAccessToken:
return "GitHiub access token is empty or nil, if your repository is private, add GitHiub access token."
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ final class DefaultTokensGenerator: TokensGenerator {
private func generateTypographyTokens(parameters: TokensGenerationParameters, tokenValues: TokenValues) throws {
try generateTokens(
typographyTokensGenerator,
tokensName: "typogrphy",
tokensName: "typography",
renderParameters: parameters.tokens.typographyRenderParameters,
tokenValues: tokenValues,
themes: parameters.themes,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ final class DefaultTokensGenerationParametersResolver: TokensGenerationParameter
)
}

let remoteFile = try configuration.remoteRepoConfig.map { remoteFileConfiguration in
guard
let accessToken = accessTokenResolver.resolveAccessToken(from: remoteFileConfiguration.accessToken)
else {
throw GenerationParametersError.invalidGitHubAccessToken
let remoteFile = configuration.remoteRepoConfig.map { remoteFileConfiguration in
let accessToken = accessTokenResolver.resolveAccessToken(from: remoteFileConfiguration.accessToken)

if accessToken.isEmptyOrNil {
print(GenerationParametersError.emptyGitHubAccessToken.description)
}

return RemoteFileParameters(
Expand Down
4 changes: 2 additions & 2 deletions Sources/FigmaGen/Models/Parameters/RemoteFileParameters.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ struct RemoteFileParameters {
let repo: String
let branch: String
let filePath: String
let accessToken: String
let accessToken: String?

init(
owner: String,
repo: String,
branch: String,
filePath: String,
accessToken: String
accessToken: String?
) {
self.owner = owner
self.repo = repo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ extension GitHubAPIProvider {

func request<Route: GitHubAPIRoute>(route: Route) -> Promise<Void> where Route.Response == GitHubAPIEmptyResponse {
Promise { seal in

let task = httpService.request(route: makeHTTPRoute(for: route))

task.responseJSON { response in
Expand Down
Loading