From 2ca920b2619f64e44ea548110c1cc018e2e07a53 Mon Sep 17 00:00:00 2001 From: Darya Viter Date: Tue, 21 Oct 2025 16:50:15 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=20=D0=BE=D1=80=D1=84=D0=BE=D0=B3=D1=80=D0=B0=D1=84?= =?UTF-8?q?=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sources/FigmaGen/Generators/Tokens/DefaultTokensGenerator.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/FigmaGen/Generators/Tokens/DefaultTokensGenerator.swift b/Sources/FigmaGen/Generators/Tokens/DefaultTokensGenerator.swift index ebf186d..d6f6587 100644 --- a/Sources/FigmaGen/Generators/Tokens/DefaultTokensGenerator.swift +++ b/Sources/FigmaGen/Generators/Tokens/DefaultTokensGenerator.swift @@ -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, From e0e1c710455a596f51f0d59577e47e9ded6a01b8 Mon Sep 17 00:00:00 2001 From: Darya Viter Date: Tue, 21 Oct 2025 16:51:21 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=D0=B0=20?= =?UTF-8?q?=D0=BE=D0=B1=D1=8F=D0=B7=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20GitHub=20=D1=82=D0=BE=D0=BA=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Generators/GenerationParametersError.swift | 4 ++++ .../DefaultTokensGenerationParametersResolver.swift | 10 +++++----- .../Models/Parameters/RemoteFileParameters.swift | 4 ++-- .../Providers/GitHubApi/GitHubAPIProvider.swift | 1 - 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Sources/FigmaGen/Generators/GenerationParametersError.swift b/Sources/FigmaGen/Generators/GenerationParametersError.swift index 5c4eb44..23518e7 100644 --- a/Sources/FigmaGen/Generators/GenerationParametersError.swift +++ b/Sources/FigmaGen/Generators/GenerationParametersError.swift @@ -7,6 +7,7 @@ enum GenerationParametersError: Error, CustomStringConvertible { case invalidFileConfiguration case invalidAccessToken case invalidGitHubAccessToken + case emptyGitHubAccessToken // MARK: - Instance Properties @@ -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." } } } diff --git a/Sources/FigmaGen/Generators/Tokens/GenerationParametersResolver/DefaultTokensGenerationParametersResolver.swift b/Sources/FigmaGen/Generators/Tokens/GenerationParametersResolver/DefaultTokensGenerationParametersResolver.swift index 540fa74..9f06b1b 100644 --- a/Sources/FigmaGen/Generators/Tokens/GenerationParametersResolver/DefaultTokensGenerationParametersResolver.swift +++ b/Sources/FigmaGen/Generators/Tokens/GenerationParametersResolver/DefaultTokensGenerationParametersResolver.swift @@ -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( diff --git a/Sources/FigmaGen/Models/Parameters/RemoteFileParameters.swift b/Sources/FigmaGen/Models/Parameters/RemoteFileParameters.swift index f9872ab..ae3c957 100644 --- a/Sources/FigmaGen/Models/Parameters/RemoteFileParameters.swift +++ b/Sources/FigmaGen/Models/Parameters/RemoteFileParameters.swift @@ -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 diff --git a/Sources/FigmaGen/Providers/GitHubApi/GitHubAPIProvider.swift b/Sources/FigmaGen/Providers/GitHubApi/GitHubAPIProvider.swift index a36408c..de30436 100644 --- a/Sources/FigmaGen/Providers/GitHubApi/GitHubAPIProvider.swift +++ b/Sources/FigmaGen/Providers/GitHubApi/GitHubAPIProvider.swift @@ -92,7 +92,6 @@ extension GitHubAPIProvider { func request(route: Route) -> Promise where Route.Response == GitHubAPIEmptyResponse { Promise { seal in - let task = httpService.request(route: makeHTTPRoute(for: route)) task.responseJSON { response in From 5159833d8fb524923475d74a0881f07190f4297d Mon Sep 17 00:00:00 2001 From: Timur Shafigullin Date: Wed, 22 Oct 2025 20:40:37 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D1=88=D0=B0=D0=B3=20=D1=83=D1=81=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=B8=20Swift?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ca95b8..8e92a39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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