Skip to content

feat(style): allow multiple strings in gale #8

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
Pistonight merged 1 commit into from
Apr 29, 2026
Merged

feat(style): allow multiple strings in gale #8

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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pistonite/celera",
"version": "0.2.1",
"version": "0.2.2",
"type": "module",
"private": true,
"description": "In-house UI framework",
Expand Down
28 changes: 10 additions & 18 deletions src/style/gale.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export const gale = <T extends string>(
componentStylesToGaleStringCache.set(STUB_COMPONENT_STYLES_KEY, c);
galeStringCache = c;
}
const mFunction = (classes: string): string => {
const mFunction = (...classes: string[]): string => {
return computeClassesWithCache(
projectStyles,
STUB_COMPONENT_STYLES_KEY,
Expand Down Expand Up @@ -128,7 +128,7 @@ export const gale = <T extends string>(
componentStylesToGaleStringCache.set(componentStyles, c);
galeStringCache = c;
}
const mFunction = (classes: string): string => {
const mFunction = (...classes: string[]): string => {
return computeClassesWithCache(
projectStyles,
componentStyles,
Expand All @@ -144,14 +144,15 @@ export const gale = <T extends string>(
projectStyles: Record<string, string>,
componentStyles: Record<string, string>,
cache: Map<string, string>,
classes: string,
classes: (string | undefined | null | false)[],
): string => {
const cached = cache.get(classes);
const classesConcatenated = classes.filter(Boolean).join(" ");
const cached = cache.get(classesConcatenated);
if (cached !== undefined) {
return cached;
}
const parsed: string[] = [];
for (const p of classes.split(" ")) {
for (const p of classesConcatenated.split(" ")) {
const slotName = p.trim();
if (!slotName) {
continue;
Expand All @@ -166,7 +167,7 @@ export const gale = <T extends string>(
}

const result = mergeClasses(...parsed);
cache.set(classes, result);
cache.set(classesConcatenated, result);
return result;
};

Expand All @@ -188,7 +189,9 @@ export type GaleKeys<T extends string> = T | GaleBuiltinKey;
/** Hook to be called inside a component to get the `m` function. See {@link gale} */
export type GaleHook<T extends string> = () => GaleFn<T>;
/** The `m` function that turns a style string into class names */
export type GaleFn<T extends string> = <K extends string>(classes: GaleString<K, T, []>) => string;
export type GaleFn<T extends string> = <K extends string>(
...classes: (GaleString<K, T, []> | undefined | null | false)[]
) => string;

/** Type-safe, space-separated style idents */
export type GaleString<K extends string, T extends string, S extends string[]> = K extends S[number]
Expand Down Expand Up @@ -362,14 +365,3 @@ export const GALE_BUILTIN_STYLES = {
} as const satisfies Record<string, GriffelStyle>;

type GaleBuiltinKey = keyof typeof GALE_BUILTIN_STYLES;
// // type A = Validate<"margin-0", Keys>;
// // type B = Validate<"foo", Keys>;
// // type C = Validate<"foo bar", Keys>;
// // type D = Validate<"margin-0 padding-0", Keys>;
// // type E = Validate<"margin-0 0", Keys>;
// // type F = Validate<"0 padding-0", Keys>;
//
// const testFunc = <T extends string>(exp: Validate<T, Keys>): void => {
// }
//
// testFunc("margin-0");
Loading