@yak/solid 0.1.0 → 0.2.1

package/runtime/atoms.ts

@@ -33,12 +33,14 @@ export const atoms = <T>(
     staticClasses.length > 0
       ? [
           (_, classes) => {
-            staticClasses.forEach((cls) => classes.add(cls));
+            // author strings, not compiler names: the server writer must escape them
+            staticClasses.forEach((cls) => classes.add(cls, false));
           },
           ...dynamicFunctions,
         ]
       : dynamicFunctions;
 
-  // @ts-expect-error the internal implementation of css is not typed
-  return css(...runtimeFunctions);
+  // css() is typed for its compiled arguments; the public type describes the
+  // interpolation the author writes before compilation
+  return css(...runtimeFunctions) as unknown as ComponentStyles<T>;
 };

package/runtime/cssLiteral.ts

@@ -1,22 +1,33 @@
 import type { YakTheme } from "./index.ts";
 import type { Accessor } from "solid-js";
-import { ClassCollector, RuntimeStyleProcessor, StyleObject } from "./publicStyledApi.js";
+import { ClassCollector, CompiledStyleProcessor, StyleObject } from "./publicStyledApi.js";
 
-export const yakComponentSymbol = Symbol("yak");
+// Symbol.for, not Symbol(): the package ships two bundles (the public entry
+// and the internal one the compiler imports) and both contain this module. a
+// styled component created through one must be recognized by the other
+export const yakComponentSymbol = Symbol.for("@yak/solid:component");
 
 /**
- * Collects class names as a single space-separated string.
- *
- * `add` is the render hot path and stays a plain string append;
- * `has`/`delete` keep a Set-like contract for the rare runtime
- * functions that remove classes again (e.g. atoms).
+ * the class names of one render, kept as one space-separated string in the
+ * order the style block adds them. add() is the hot path: an append, and a
+ * duplicate check only once a second name arrives. has() and delete() exist
+ * for runtime processors that take a name back out, such as an atom that
+ * reverts a class. a Set would need a split and a join per render for the
+ * same string
  */
 export class Classes implements ClassCollector {
   value: string;
+  /**
+   * false once a name came from the author, such as an atom. compiler names
+   * are safe to print as they are; serializeElement in styled.ts escapes the
+   * class once this is false
+   */
+  generated = true;
   constructor(initial?: string) {
     this.value = initial || "";
   }
-  add(name: string) {
+  add(name: string, generated = true) {
+    if (!generated) this.generated = false;
     if (!this.value) {
       this.value = name;
     } else if (!this.has(name)) {
@@ -61,9 +72,9 @@ type CSSStyles<TProps = {}> = {
   style: { [key: string]: string | ((props: TProps) => string) };
 };
 
-type CSSFunction = <TProps = {}>(
+export type CSSFunction = <TProps>(
   styles: TemplateStringsArray,
-  ...values: CSSInterpolation<TProps & { theme: Accessor<YakTheme> }>[]
+  ...values: CSSInterpolation<NoInfer<TProps> & { theme: Accessor<YakTheme> }>[]
 ) => ComponentStyles<TProps>;
 
 export type NestedRuntimeStyleProcessor = (
@@ -76,59 +87,52 @@ export type NestedRuntimeStyleProcessor = (
       style?: StyleObject;
     }
   | void
+  | false
+  | null
+  | string
+  | number
   | NestedRuntimeStyleProcessor;
 
 /**
- * css() runtime factory of css``
+ * the runtime behind css``. the compiler rewrites every css`` and styled``
+ * call, so what arrives here is never the template the author wrote but its
+ * compiled form: class names, callbacks and css-variable maps (examples in
+ * the loop below). the public typings describe the call before compilation,
+ * which is why this function is internal: mocks/cssLiteral.ts exports the
+ * css the author sees, cast to the public type.
  *
- * /!\ @yak/solid transpiles css`` and styled``
- *
- * This changes the typings of the css`` and styled`` functions.
- * During development the user of @yak/solid wants to work with the
- * typings BEFORE compilation.
- *
- * Therefore this is only an internal function only and it must be cast to any
- * before exported to the user.
- *
- * The internal functioning of css`` is to return a single callback function that runs all functions
- * (or creates new ones if needed) that are passed as arguments. These functions receive the props, classes, and style object as arguments
- * and operate directly on the classes and style objects.
+ * it returns one processor, (props, classes, style) => void, that runs every
+ * compiled piece: class names go into the collector, css values into the
+ * style object
  */
-export function css<TProps>(
-  styles: TemplateStringsArray,
-  ...values: CSSInterpolation<NoInfer<TProps> & { theme: Accessor<YakTheme> }>[]
-): ComponentStyles<TProps>;
-export function css<TProps>(...args: Array<any>): RuntimeStyleProcessor<TProps> {
-  // Normally this  could be an array of strings passed, but as we transpile the usage of css`` ourselves, we control the arguments
-  // and ensure that only the first argument is a string (class name of the non-dynamic styles)
+export function css<TProps>(...args: Array<any>): CompiledStyleProcessor<TProps> {
   let staticClass: string | undefined;
   const dynamicCssFunctions: NestedRuntimeStyleProcessor[] = [];
-  for (const arg of args as Array<string | CSSFunction | CSSStyles<any>>) {
-    // A CSS-module class name which got auto generated during build from static css
-    // e.g. css`color: red;`
-    // compiled -> css("yak31e4")
+  for (const arg of args as Array<string | NestedRuntimeStyleProcessor | CSSStyles<any>>) {
+    // static css became a css-module class name at build time:
+    //   css`color: red;`  ->  css("yak31e4")
     if (typeof arg === "string") {
       staticClass = arg;
     }
-    // Dynamic CSS e.g.
-    // css`${props => props.active && css`color: red;`}`
-    // compiled -> css((props: { active: boolean }) => props.active && css("yak31e4"))
+    // conditional css stays a callback that returns another compiled css():
+    //   css`${props => props.active && css`color: red;`}`
+    //   ->  css(props => props.active && css("yak31e4"))
     else if (typeof arg === "function") {
-      dynamicCssFunctions.push(arg as unknown as NestedRuntimeStyleProcessor);
+      dynamicCssFunctions.push(arg);
     }
-    // Dynamic CSS with css variables e.g.
-    // css`transform: translate(${props => props.x}, ${props => props.y});`
-    // compiled -> css("yak31e4", { style: { "--yakVarX": props => props.x }, "--yakVarY": props => props.y }})
+    // a css value became a variable the callback fills at render time:
+    //   css`transform: translate(${props => props.x});`
+    //   ->  css("yak31e4", { style: { "--yakVarX": props => props.x } })
     else if (typeof arg === "object" && "style" in arg) {
       dynamicCssFunctions.push((props, _, style) => {
         for (const key in arg.style) {
           const value = arg.style[key];
           if (typeof value === "function") {
             style[key as keyof StyleObject] = String(
-              // The value for a css value can be a theme dependent function e.g.:
-              // const borderColor = (props: { theme: { mode: "dark" | "light" } }) => props.theme === "dark" ? "black" : "white";
-              // css`border-color: ${borderColor};`
-              // Therefore the value has to be extracted recursively
+              // a callback may return another callback before it yields the
+              // value, such as a theme-dependent one:
+              //   const color = (props) => props.theme().mode === "dark" ? "black" : "white";
+              //   css`border-color: ${color};`
               recursivePropExecution(props, value),
             ) as never;
           } else {
@@ -139,10 +143,8 @@ export function css<TProps>(...args: Array<any>): RuntimeStyleProcessor<TProps>
     }
   }
 
-  // Non Dynamic CSS
-  // This is just an optimization for the common case where there are no dynamic css functions
-  // `$dynamic: false` lets the styled runtime skip theme lookup and
-  // style-object allocation entirely for static components
+  // no dynamic parts, the common case: $dynamic false lets styled() skip the
+  // theme lookup and the style object for the component
   if (dynamicCssFunctions.length === 0) {
     return Object.assign(
       (_: unknown, classes: ClassCollector) => {
@@ -150,8 +152,8 @@ export function css<TProps>(...args: Array<any>): RuntimeStyleProcessor<TProps>
           classes.add(staticClass);
         }
       },
-      { $dynamic: false },
-    );
+      { $dynamic: false as const },
+    ) satisfies CompiledStyleProcessor<TProps>;
   }
 
   return Object.assign(
@@ -160,15 +162,15 @@ export function css<TProps>(...args: Array<any>): RuntimeStyleProcessor<TProps>
         classes.add(staticClass);
       }
       for (let i = 0; i < dynamicCssFunctions.length; i++) {
-        unwrapProps(props, dynamicCssFunctions[i], classes, allStyles);
+        runProcessor(props, dynamicCssFunctions[i], classes, allStyles);
       }
     },
-    { $dynamic: true },
-  );
+    { $dynamic: true as const },
+  ) satisfies CompiledStyleProcessor<TProps>;
 }
 
-// Dynamic CSS with runtime logic
-const unwrapProps = (
+/** run one processor and fold what it returns into the collector and the style object */
+const runProcessor = (
   props: unknown,
   fn: NestedRuntimeStyleProcessor,
   classes: ClassCollector,
@@ -186,7 +188,7 @@ const unwrapProps = (
       }
       if ("style" in result && result.style) {
         for (const key in result.style) {
-          // This is hard for typescript to infer
+          // both objects use StyleObject; typescript loses the key/value relation in this loop
           style[key as keyof StyleObject] = result.style[key as keyof StyleObject] as any;
         }
       }

package/runtime/cssProp.ts

@@ -22,5 +22,3 @@ declare module "@solidjs/web" {
     }
   }
 }
-
-export {};

package/runtime/internals/mergeClasses.ts

@@ -27,6 +27,7 @@ export const normalizeClass = (value: unknown): string => {
  * ```tsx
  * <div class={__yak_mergeClassNames("yX", active() && "active")} />
  * ```
+ * combineProps in styled.ts uses it for two attrs layers' classes as well.
  */
 export const mergeClasses = (yakClass: string, userClass: unknown): string | undefined => {
   const user = normalizeClass(userClass);

package/runtime/internals/mergeCssProp.ts

@@ -1,54 +1,82 @@
+import { isServer } from "@solidjs/web";
 import { Classes } from "../cssLiteral.js";
-import { RuntimeStyleProcessor } from "../publicStyledApi.js";
+import { RuntimeStyleProcessor, StyleObject } from "../publicStyledApi.js";
+import { normalizeClass } from "./mergeClasses.js";
+
+type Source = Record<PropertyKey, unknown>;
+
+/** the last source that carries the key */
+const lastWith = (sources: Source[], key: string): Source | undefined => {
+  for (let index = sources.length - 1; index >= 0; index--) {
+    if (key in sources[index]) return sources[index];
+  }
+  return undefined;
+};
 
 /**
- * This is an internal helper function to merge relevant props of a native element with a css prop.
- * It's automatically added when using the `css` prop in a JSX element.
- * e.g.:
+ * Merges the relevant props of a native element with a css prop. The
+ * compiler adds it for the `css` prop:
+ * ```tsx
+ * <button class="a" {...props} style={s} css={css`color: green;`} />
+ * ```
+ * compiles to
  * ```tsx
- * <p
- *  class="foo"
- *  css={css`
- *   color: green;
- * `}
- * {...{ style: { padding: "30px" }}}
- * />
+ * <button {...__yak_mergeCssProp(css("yak1"), { class: "a" }, props, { style: s })} />
+ * ```
  */
 export const mergeCssProp = (
-  relevantProps: {
-    class?: string;
-    style?: Record<string, string>;
-  } & Record<string, unknown>,
   cssProp: RuntimeStyleProcessor<unknown> | false | null | undefined,
+  ...sources: (Source | null | undefined)[]
 ) => {
-  const classes = new Classes(relevantProps.class);
-
-  const existingStyle = relevantProps.style;
-  const style = existingStyle ? { ...existingStyle } : {};
-
-  // a falsy css prop applies no styles, e.g. `css={on && css`...`}` with `on` false
-  if (cssProp) {
-    cssProp({}, classes, style);
+  const present = sources.filter((source): source is Source => source != null);
+  const out: Source = {};
+  for (const source of present) {
+    for (const key of Reflect.ownKeys(source)) {
+      // contributed below, from the last source that carries them
+      if (key === "class" || key === "style") continue;
+      const descriptor = Reflect.getOwnPropertyDescriptor(source, key)!;
+      if (descriptor.get || descriptor.set || !descriptor.enumerable) {
+        Object.defineProperty(out, key, descriptor);
+      } else {
+        out[key] = descriptor.value;
+      }
+    }
   }
+  // `in` finds the owner without invoking its getter
+  const classOwner = lastWith(present, "class");
+  const styleOwner = lastWith(present, "style");
 
-  // Forward all other props (onClick, aria-*, id, …) untouched and only
-  // override class/style with the merged result — the transform already
-  // built `relevantProps` in JSX attribute order, so this preserves overrides.
-  const result: Record<string, unknown> & {
-    class?: string;
-    style?: Record<string, string>;
-  } = { ...relevantProps };
+  const mergedClass = (): string | undefined => {
+    const classes = new Classes(normalizeClass(classOwner?.class));
+    // a falsy css prop applies no styles, e.g. `css={on && css`...`}` with `on` false
+    if (cssProp) cssProp({}, classes, {} as StyleObject);
+    return classes.value || undefined;
+  };
+  const mergedStyle = (): StyleObject | undefined => {
+    const base = styleOwner?.style as StyleObject | undefined;
+    const style: StyleObject = base ? { ...base } : {};
+    if (cssProp) cssProp({}, new Classes(), style);
+    for (const _ in style) return style;
+    return undefined;
+  };
 
-  if (Object.keys(style).length > 0) {
-    result.style = style;
-  } else {
-    delete result.style;
+  if (isServer) {
+    // The server reads once, so the values are resolved here; a class or
+    // style read takes no hydration id. A key left undefined would make
+    // `ssrElement` write `class=""`, so only carried values are set.
+    const className = mergedClass();
+    if (className !== undefined) out.class = className;
+    const style = mergedStyle();
+    if (style !== undefined) out.style = style;
+    return out;
   }
-  if (classes.value) {
-    result.class = classes.value;
-  } else {
-    delete result.class;
+  // on the client the spread reads these inside its effect, so a signal read
+  // by a source or by the css prop updates the attribute in place
+  if (cssProp || classOwner) {
+    Object.defineProperty(out, "class", { get: mergedClass, enumerable: true, configurable: true });
   }
-
-  return result;
+  if (cssProp || styleOwner) {
+    Object.defineProperty(out, "style", { get: mergedStyle, enumerable: true, configurable: true });
+  }
+  return out;
 };

package/runtime/mocks/cssLiteral.ts

@@ -1,6 +1,4 @@
-import type { css as cssInternal, NestedRuntimeStyleProcessor } from "../cssLiteral.js";
-
-export type { ComponentStyles, CSSInterpolation } from "../cssLiteral.js";
+import type { CSSFunction, NestedRuntimeStyleProcessor } from "../cssLiteral.js";
 
 /**
  * Allows to use CSS styles in a styled or css block
@@ -14,7 +12,7 @@ export type { ComponentStyles, CSSInterpolation } from "../cssLiteral.js";
  * `;
  * ```
  */
-export const css: typeof cssInternal = (styles: TemplateStringsArray, ...args: unknown[]) => {
+export const css: CSSFunction = (styles: TemplateStringsArray, ...args: unknown[]) => {
   // When called in yak files as a template tag (without SWC transformation),
   // return { __yak: rawCss } so the cross-file resolver can
   // extract the mixin value from evaluated .yak files.

package/runtime/mocks/styled.ts

@@ -2,7 +2,11 @@ import type { JSX } from "@solidjs/web";
 import { styled as StyledFactory } from "../styled.js";
 
 export const styled = /* @__PURE__ */ new Proxy(StyledFactory, {
-  get(target, TagName: keyof JSX.IntrinsicElements) {
-    return target(TagName);
+  get(target, key) {
+    // only a tag name becomes a factory. symbols, the function's own
+    // properties and `then` pass through, so a promise that resolves the
+    // factory does not take it for a thenable
+    if (typeof key !== "string" || key === "then" || key in target) return Reflect.get(target, key);
+    return target(key as keyof JSX.IntrinsicElements);
   },
 }) as typeof StyledFactory;

package/runtime/publicStyledApi.ts

@@ -43,7 +43,7 @@ export interface StyledFn {
  */
 export interface YakComponent<T> extends AnyComponent<T> {
   // This is intentionally typed to hide the internal implementation details.
-  [yakComponentSymbol]: [unknown, unknown, unknown, unknown];
+  [yakComponentSymbol]: readonly [unknown, unknown, unknown];
 }
 
 /**
@@ -143,14 +143,14 @@ export type FastOmit<T extends object, U extends string | number | symbol> = {
 };
 
 /**
- * Set-like collector for class names.
- *
- * Implemented as a string builder in the runtime (a Set<string>
- * split → Set → Array.from → join round-trip dominates render cost);
- * a real Set<string> also satisfies this interface.
+ * Collects the class names of one render. The runtime keeps them in one
+ * space-separated string (Classes in cssLiteral.ts, the only implementation):
+ * add() appends, has() and delete() let a runtime processor take a name back
+ * out. A Set would need a split and a join on every render for the same string.
  */
 export type ClassCollector = {
-  add(name: string): void;
+  /** generated is false for an author string such as an atom; the server writer escapes those */
+  add(name: string, generated?: boolean): void;
   has(name: string): boolean;
   delete(name: string): void;
 };
@@ -168,6 +168,18 @@ export type RuntimeStyleProcessor<T> = ((
   style: StyleObject,
 ) => void) & { $dynamic?: boolean };
 
+/** A class-only processor ignores props and needs no style object. */
+export type StaticStyleProcessor = ((
+  props: unknown,
+  classes: ClassCollector,
+  style?: StyleObject,
+) => void) & { $dynamic: false };
+
+/** css() marks its output so styled() can select the static render path. */
+export type CompiledStyleProcessor<T> =
+  | StaticStyleProcessor
+  | (RuntimeStyleProcessor<T> & { $dynamic: true });
+
 /**
  * Utility type to keep the generic API of a component while still being able to use it in a selector
  */