-
-
Notifications
You must be signed in to change notification settings - Fork 7.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tocss: Simplify the hugo:vars type handling
Instead of maintaing a list of all CSS units and functions this commit: * Uses 3 regexps to detect typed CSS values (e.g. `24px`) + properly handle numeric Go types. * These regexps may have some false positives -- e.g. strings that needs to be quoted. * For that rare case, you can mark the string with e.g. `"32xxx" | css.Quoted` * For the opposite case: `"32" | css.Unquoted` Updates #10632
- Loading branch information
Showing
9 changed files
with
206 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| // Copyright 2023 The Hugo Authors. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package css | ||
|
|
||
| // QuotedString is a string that needs to be quoted in CSS. | ||
| type QuotedString string | ||
|
|
||
| // UnquotedString is a string that does not need to be quoted in CSS. | ||
| type UnquotedString string |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
resources/resource_transformers/tocss/internal/sass/helpers_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // Copyright 2023 The Hugo Authors. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package sass | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| qt "github.com/frankban/quicktest" | ||
| ) | ||
|
|
||
| func TestIsUnquotedCSSValue(t *testing.T) { | ||
| c := qt.New(t) | ||
|
|
||
| for _, test := range []struct { | ||
| in any | ||
| out bool | ||
| }{ | ||
| {"24px", true}, | ||
| {"1.5rem", true}, | ||
| {"10%", true}, | ||
| {"hsl(0, 0%, 100%)", true}, | ||
| {"calc(24px + 36px)", true}, | ||
| {"24xxx", true}, // a false positive. | ||
| {123, true}, | ||
| {123.12, true}, | ||
| {"#fff", true}, | ||
| {"#ffffff", true}, | ||
| {"#ffffffff", false}, | ||
| } { | ||
| c.Assert(isTypedCSSValue(test.in), qt.Equals, test.out) | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package css | ||
|
|
||
| import ( | ||
| "github.com/gohugoio/hugo/common/types/css" | ||
| "github.com/gohugoio/hugo/deps" | ||
| "github.com/gohugoio/hugo/tpl/internal" | ||
| "github.com/spf13/cast" | ||
| ) | ||
|
|
||
| const name = "css" | ||
|
|
||
| // Namespace provides template functions for the "css" namespace. | ||
| type Namespace struct { | ||
| } | ||
|
|
||
| // Quoted returns a string that needs to be quoted in CSS. | ||
| func (ns *Namespace) Quoted(v any) css.QuotedString { | ||
| s := cast.ToString(v) | ||
| return css.QuotedString(s) | ||
| } | ||
|
|
||
| // Unquoted returns a string that does not need to be quoted in CSS. | ||
| func (ns *Namespace) Unquoted(v any) css.UnquotedString { | ||
| s := cast.ToString(v) | ||
| return css.UnquotedString(s) | ||
| } | ||
|
|
||
| func init() { | ||
| f := func(d *deps.Deps) *internal.TemplateFuncsNamespace { | ||
| ctx := &Namespace{} | ||
|
|
||
| ns := &internal.TemplateFuncsNamespace{ | ||
| Name: name, | ||
| Context: func(args ...any) (any, error) { return ctx, nil }, | ||
| } | ||
|
|
||
| return ns | ||
| } | ||
|
|
||
| internal.AddTemplateFuncsNamespace(f) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters