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.

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

Jump to bottom

fix(core): support shortcut prefix #1807

Merged
merged 2 commits into from Oct 27, 2022
Merged

fix(core): support shortcut prefix #1807

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7af0e0
fix(core): support shortcut prefix
azaleta Oct 27, 2022
136e403
Update packages/core/src/generator/index.ts
azaleta Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 11 additions & 6 deletions packages/core/src/generator/index.ts
View file
Open in desktop
Expand Up @@ -394,7 +394,7 @@ export class UnoGenerator {
return cssBody
}

async parseUtil(input: string | VariantMatchedResult, context: RuleContext, internal = false): Promise<(ParsedUtil | RawUtil)[] | undefined> {
async parseUtil(input: string | VariantMatchedResult, context: RuleContext, internal = false, shortcutPrefix: string | undefined = undefined): Promise<(ParsedUtil | RawUtil)[] | undefined> {
const [raw, processed, variantHandlers] = isString(input)
? this.matchVariants(input)
: input
Expand Down Expand Up @@ -432,10 +432,15 @@ export class UnoGenerator {
// match prefix
let unprefixed = processed
if (meta?.prefix) {
if (!processed.startsWith(meta.prefix))
continue

unprefixed = processed.slice(meta.prefix.length)
if (shortcutPrefix) {
if (shortcutPrefix !== meta.prefix)
continue
}
else {
if (!processed.startsWith(meta.prefix))
continue
unprefixed = processed.slice(meta.prefix.length)
}
}

// match rule
Expand Down Expand Up @@ -555,7 +560,7 @@ export class UnoGenerator {
.map(async (i) => {
const result = isString(i)
// rule
? await this.parseUtil(i, context, true) as ParsedUtil[]
? await this.parseUtil(i, context, true, meta.prefix ? meta.prefix : undefined) as ParsedUtil[]
azaleta marked this conversation as resolved.
Show resolved Hide resolved
// inline CSS value in shortcut
: [[Infinity, '{inline}', normalizeCSSEntries(i), undefined, []] as ParsedUtil]

Expand Down
34 changes: 33 additions & 1 deletion test/__snapshots__/prefix.test.ts.snap
View file
Open in desktop
Expand Up @@ -2,8 +2,40 @@

exports[`prefix > preset prefix 2`] = `
"/* layer: default */
.foo-container{max-width:100%;}
.hover\\\\:foo-p4:hover{padding:1rem;}
.foo-text-red{--un-text-opacity:1;color:rgba(248,113,113,var(--un-text-opacity));}
.bar-bar,
.bar-shortcut{color:bar;}"
.bar-shortcut{color:bar;}
@media (min-width: 640px){
.foo-container{max-width:640px;}
}
@media (min-width: 768px){
.foo-container{max-width:768px;}
}
@media (min-width: 1024px){
.foo-container{max-width:1024px;}
}
@media (min-width: 1280px){
.foo-container{max-width:1280px;}
}
@media (min-width: 1024px){@media (min-width: 1536px){
.\\\\32 xl\\\\:foo-container{max-width:1024px;}
}}
@media (min-width: 1280px){@media (min-width: 1536px){
.\\\\32 xl\\\\:foo-container{max-width:1280px;}
}}
@media (min-width: 1536px){
.\\\\32 xl\\\\:foo-container{max-width:100%;}
.foo-container{max-width:1536px;}
}
@media (min-width: 1536px){@media (min-width: 1536px){
.\\\\32 xl\\\\:foo-container{max-width:1536px;}
}}
@media (min-width: 640px){@media (min-width: 1536px){
.\\\\32 xl\\\\:foo-container{max-width:640px;}
}}
@media (min-width: 768px){@media (min-width: 1536px){
.\\\\32 xl\\\\:foo-container{max-width:768px;}
}}"
`;
8 changes: 6 additions & 2 deletions test/prefix.test.ts
View file
Open in desktop
@@ -1,12 +1,12 @@
import { createGenerator } from '@unocss/core'
import { describe, expect, test } from 'vitest'
import presetMini from '@unocss/preset-mini'
import presetUno from '@unocss/preset-uno'

describe('prefix', () => {
test('preset prefix', async () => {
const uno = createGenerator({
presets: [
presetMini({ prefix: 'foo-' }),
presetUno({ prefix: 'foo-' }),
],
rules: [
['bar', { color: 'bar' }, { prefix: 'bar-' }],
Expand All @@ -26,6 +26,8 @@ describe('prefix', () => {
'hover:foo-p4',
'bar-bar',
'bar-shortcut',
'foo-container',
'2xl:foo-container',
]), { preflights: false })

expect(matched).toMatchInlineSnapshot(`
Expand All @@ -34,6 +36,8 @@ describe('prefix', () => {
"foo-text-red",
"hover:foo-p4",
"bar-shortcut",
"foo-container",
"2xl:foo-container",
}
`)

Expand Down