Skip to content
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.

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

Fix minor issues with token schema #697

Merged
merged 1 commit into from
Jul 19, 2023
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
2 changes: 0 additions & 2 deletions scripts/validateTokenJson.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ if (getFlag('--silent') === null) {
// eslint-disable-next-line no-console
console.log(fail.errorMessage)
// eslint-disable-next-line no-console
console.log(JSON.stringify(fail.errors, null, 2))
// eslint-disable-next-line no-console
console.log('\n\n')
}
}
Expand Down
8 changes: 0 additions & 8 deletions src/schemas/baseToken.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,5 @@ import {z} from 'zod'
export const baseToken = z
.object({
$description: z.string().optional(),
$extensions: z
.object({
'org.primer.figma': z.object({
collection: z.string(),
scopes: z.array(z.enum(['all'])),
}),
})
.optional(),
})
.strict()
15 changes: 9 additions & 6 deletions src/schemas/collections.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
import {z} from 'zod'
import {joinFriendly} from '../utilities/joinFriendly'

export const colorCollections = z.enum(['base/color/light', 'base/color/dark', 'mode', 'pattern/mode'])

export const dimensionCollections = z.enum(['base/size', 'functional/size'])

type Collections = 'base/color/light' | 'base/color/dark' | 'mode' | 'pattern/mode' | 'base/size' | 'functional/size'
type Collections =
| 'base/color/light'
| 'base/color/dark'
| 'base/color/dark-dimmed'
| 'mode'
| 'pattern/mode'
| 'base/size'
| 'functional/size'

export const collection = (collections: Collections[]) => {
return z.string().refine(
value => collections.includes(value as Collections),
value => ({
message: `Invalid mode: "${value}", valid modes are ${joinFriendly(collections)}`,
message: `Invalid collection: "${value}", valid collections are ${joinFriendly(collections)}`,
}),
)
}
Expand Down
12 changes: 9 additions & 3 deletions src/schemas/colorToken.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,15 @@ export const colorToken = baseToken
$extensions: z
.object({
'org.primer.figma': z.object({
collection: collection(['base/color/light', 'base/color/dark', 'mode', 'pattern/mode']),
mode: mode(['light', 'dark']),
scopes: scopes(['all', 'bgColor', 'fgColor', 'borderColor']),
collection: collection([
'base/color/light',
'base/color/dark',
'base/color/dark-dimmed',
'mode',
'pattern/mode',
]).optional(),
mode: mode(['light', 'dark']).optional(),
scopes: scopes(['all', 'bgColor', 'fgColor', 'borderColor']).optional(),
}),
})
.optional(),
Expand Down
Loading