Skip to content

git type import #52 #62

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

Merged
merged 1 commit into from
Feb 23, 2025
Merged

git type import #52 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 21 additions & 24 deletions src/lib/validation/at-rules/media.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {
import type {
AstAtRule,
AstNode,
FunctionToken,
MediaFeatureToken,
ParensToken,
Token,
ValidationOptions
} from "../../../@types";
} from "../../../@types/index.d.ts";
import type {ValidationSyntaxResult} from "../../../@types/validation.d.ts";
import {EnumToken, ValidationLevel} from "../../ast";
import {consumeWhitespace, splitTokenList} from "../utils";
Expand Down Expand Up @@ -112,30 +112,29 @@ export function validateAtRuleMediaQueryList(tokenList: Token[], atRule: AstAtRu
previousToken = tokens[0];

// media-condition | media-type | custom-media
if (!(validateMediaCondition(tokens[0], atRule) || validateMediaFeature(tokens[0]) || validateCustomMediaCondition(tokens[0], atRule))) {
if (!(validateMediaCondition(tokens[0], atRule) || validateMediaFeature(tokens[0]) || validateCustomMediaCondition(tokens[0], atRule))) {

if (tokens[0].typ == EnumToken.ParensTokenType) {
if (tokens[0].typ == EnumToken.ParensTokenType) {

result = validateAtRuleMediaQueryList(tokens[0].chi, atRule);
}
else {
result = validateAtRuleMediaQueryList(tokens[0].chi, atRule);
} else {

result = {
valid: ValidationLevel.Drop,
matches: [],
node: tokens[0] ?? atRule,
syntax: '@media',
error: 'expecting media feature or media condition',
tokens: []
}
}
result = {
valid: ValidationLevel.Drop,
matches: [],
node: tokens[0] ?? atRule,
syntax: '@media',
error: 'expecting media feature or media condition',
tokens: []
}
}

if (result.valid == ValidationLevel.Drop) {
if (result.valid == ValidationLevel.Drop) {

break;
}
break;
}

result = null;
result = null;
}

match.push(tokens.shift() as Token);
Expand All @@ -161,9 +160,7 @@ export function validateAtRuleMediaQueryList(tokenList: Token[], atRule: AstAtRu

break;
}
}

else if (![EnumToken.MediaFeatureOrTokenType, EnumToken.MediaFeatureAndTokenType].includes(tokens[0].typ)) {
} else if (![EnumToken.MediaFeatureOrTokenType, EnumToken.MediaFeatureAndTokenType].includes(tokens[0].typ)) {

// @ts-ignore
result = {
Expand Down Expand Up @@ -308,7 +305,7 @@ export function validateMediaCondition(token: Token, atRule: AstAtRule): boolean
return validateMediaCondition(token.val, atRule);
}

if (token.typ != EnumToken.ParensTokenType && !(['when', 'else'].includes(atRule.nam) && token.typ == EnumToken.FunctionTokenType && ['media', 'supports'].includes(token.val)) ) {
if (token.typ != EnumToken.ParensTokenType && !(['when', 'else'].includes(atRule.nam) && token.typ == EnumToken.FunctionTokenType && ['media', 'supports'].includes(token.val))) {

return false;
}
Expand Down
4 changes: 2 additions & 2 deletions src/lib/validation/at-rules/when.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {AstAtRule, type AstNode, FunctionToken, Token, type ValidationOptions} from "../../../@types";
import type {AstAtRule, AstNode, FunctionToken, Token, ValidationOptions} from "../../../@types";
import type {ValidationSyntaxResult} from "../../../@types/validation";
import {EnumToken, ValidationLevel} from "../../ast";
import {consumeWhitespace, splitTokenList} from "../utils";
Expand Down Expand Up @@ -111,7 +111,7 @@ export function validateAtRuleWhenQueryList(tokenList: Token[], atRule: AstAtRul
break;
}

} else if (['supports', 'font-tech', 'font-format'].includes(split[0].val) ) {
} else if (['supports', 'font-tech', 'font-format'].includes(split[0].val)) {

// result = valida
if (!validateSupportCondition(atRule, split[0])) {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/validation/syntaxes/image.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {ValidationSyntaxResult} from "../../../@types/validation";
import {type FunctionImageToken, Token} from "../../../@types";
import type {FunctionImageToken, Token} from "../../../@types/index.d.ts";
import {EnumToken, ValidationLevel} from "../../ast";
import {validateSyntax} from "../syntax";
import {getParsedSyntax} from "../config";
Expand Down