@plumeria/core 18.5.4 → 19.1.0

package/lib/class-style.d.ts

@@ -1,6 +1,6 @@
 import type { Style } from '#types';
 
-global {
+declare global {
   namespace React {
     interface HTMLAttributes<T> {
       classStyle?: Style;

package/lib/css.d.ts

@@ -9,13 +9,18 @@
  * type viewTransition = <const T extends ViewTransition>(rule: T) => string;
  * type marker = (id: string, pseudo: string) => Marker;
  * type extended = <I extends string, P extends string>(id: I, pseudo: P) => Extended<I, P>;
- * type use = (...rules: Style) => string;
+ * type use = (...rules: Style[]) => string;
  * ```
  */
 declare module '@plumeria/core' {
   import type {
     AtomicClassNameFor,
+    AtomicStyle,
+    AtomicDynamicStyle,
     Style,
+    StyleProps,
+    StaticStyles,
+    WithoutProperties,
     CSSProperties,
     CreateStyleValue,
     CreateReturnType,
@@ -29,7 +34,16 @@ declare module '@plumeria/core' {
     Extended,
   } from '#types';
 
-  export type { AtomicClassNameFor, Style, CSSProperties };
+  export type {
+    AtomicClassNameFor,
+    AtomicStyle,
+    AtomicDynamicStyle,
+    Style,
+    StyleProps,
+    StaticStyles,
+    WithoutProperties,
+    CSSProperties,
+  };
 
   export const create: create;
   export type create = <const T extends Record<string, CreateStyleValue>>(
@@ -63,5 +77,5 @@ declare module '@plumeria/core' {
   ) => Extended<I, P>;
 
   export const use: use;
-  export type use = (...rules: Style) => string;
+  export type use = (...rules: Style[]) => string;
 }

package/lib/types.d.ts

@@ -24,12 +24,11 @@ type ColonSelector = {
   [key in ColonString]: CommonProperties | CSSVariableProperty;
 };
 
-type AtRule =
-  | `@media ${string}`
-  | `@container ${string}`
-  | `@supports ${string}`
-  | `@layer ${string}`
-  | `@scope ${string}`;
+type AtKeyword = '@media' | '@container' | '@supports' | '@layer' | '@scope';
+type AtRule = `${AtKeyword} ${string}` | `${AtKeyword}(${string}`;
+
+type StyleKey = keyof CSSTypes;
+type NestedKey = ColonString | ArrayString | AtRule;
 
 type AtRuleSelector = {
   [K in AtRule]:
@@ -56,24 +55,62 @@ type AtomicClassNameFor<P extends string, V> = string & {
   readonly _value: V;
 };
 
-type AtString = `@${string}`;
-type MapNamespace<T> = Readonly<{
+declare const StyleTag: unique symbol;
+
+type AtomicStyle<T> = Readonly<{
   [key in keyof T]: T[key] extends Record<string, unknown>
-    ? key extends ColonString | ArrayString | AtString
-      ? MapNamespace<T[key]>
+    ? key extends NestedKey
+      ? AtomicStyle<T[key]>
       : AtomicClassNameFor<key & string, T[key]>
     : key extends string
       ? AtomicClassNameFor<key, T[key]>
       : never;
-}>;
+}> & {
+  readonly [StyleTag]: true;
+};
+
+declare const DynamicTag: unique symbol;
+
+type AtomicDynamicStyle<T> = AtomicStyle<T> & {
+  readonly [DynamicTag]: true;
+};
 
 type CreateReturnType<T> = Readonly<{
   [K in keyof T]: T[K] extends (...args: infer A) => infer R
-    ? (...args: A) => MapNamespace<R>
-    : MapNamespace<T[K]>;
+    ? (...args: A) => AtomicDynamicStyle<R>
+    : AtomicStyle<T[K]>;
 }>;
-type Conditional = false | CSSProperties | null | undefined;
-type Style = Conditional | Style[];
+type FlatNamespace<K extends StyleKey> = {
+  readonly [P in StyleKey]?: P extends K
+    ? AtomicClassNameFor<P & string, unknown>
+    : never;
+};
+
+interface NestedNamespace<K extends StyleKey> {
+  readonly [P: NestedKey]: AllowedNamespace<K> | undefined;
+}
+
+type AllowedNamespace<K extends StyleKey> = FlatNamespace<K> &
+  NestedNamespace<K> & {
+    readonly [StyleTag]: true;
+  };
+
+type StyleList<T> = T | false | null | undefined | StyleList<T>[];
+
+type StyleNamespace = AllowedNamespace<StyleKey>;
+type Style = StyleList<StyleNamespace>;
+
+type StyleProps<K extends StyleKey> = StyleList<AllowedNamespace<K>>;
+
+type WithoutProperties<K extends StyleKey> = StyleProps<Exclude<StyleKey, K>>;
+
+type StaticNamespace<K extends StyleKey> = AllowedNamespace<K> & {
+  readonly [DynamicTag]?: never;
+};
+
+type StaticStyles<K extends StyleKey = StyleKey> = StyleList<
+  StaticNamespace<K>
+>;
 
 type CreateStatic = Record<string, string | number>;
 
@@ -99,8 +136,6 @@ type ViewTransition = {
   old?: CSSProperties;
 };
 
-type Marker = Record<string, CSSProperties>;
-
 type StripColon<T extends string> = T extends `:${infer R}` ? StripColon<R> : T;
 
 type Extended<
@@ -108,9 +143,16 @@ type Extended<
   P extends string,
 > = `@container style(--${I}-${StripColon<P>}: 1)`;
 
+type Marker = Readonly<Record<ColonString, CSSVariableProperty>>;
+
 export type {
   AtomicClassNameFor,
+  AtomicStyle,
+  AtomicDynamicStyle,
   Style,
+  StyleProps,
+  StaticStyles,
+  WithoutProperties,
   CSSProperties,
   CreateStyleValue,
   CreateReturnType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/core",
-  "version": "18.5.4",
+  "version": "19.1.0",
   "description": "Zero-cost abstraction layer for styling React components.",
   "author": "Refirst 11",
   "license": "MIT",