@plumeria/core 19.0.0 → 19.1.0

package/lib/css.d.ts

@@ -15,6 +15,8 @@
 declare module '@plumeria/core' {
   import type {
     AtomicClassNameFor,
+    AtomicStyle,
+    AtomicDynamicStyle,
     Style,
     StyleProps,
     StaticStyles,
@@ -34,6 +36,8 @@ declare module '@plumeria/core' {
 
   export type {
     AtomicClassNameFor,
+    AtomicStyle,
+    AtomicDynamicStyle,
     Style,
     StyleProps,
     StaticStyles,

package/lib/types.d.ts

@@ -24,12 +24,8 @@ 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;
@@ -59,26 +55,30 @@ type AtomicClassNameFor<P extends string, V> = string & {
   readonly _value: V;
 };
 
-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 NestedKey
-      ? MapNamespace<T[key]>
+      ? 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 DynamicNamespace<T> = MapNamespace<T> & {
+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) => DynamicNamespace<R>
-    : MapNamespace<T[K]>;
+    ? (...args: A) => AtomicDynamicStyle<R>
+    : AtomicStyle<T[K]>;
 }>;
 type FlatNamespace<K extends StyleKey> = {
   readonly [P in StyleKey]?: P extends K
@@ -91,7 +91,9 @@ interface NestedNamespace<K extends StyleKey> {
 }
 
 type AllowedNamespace<K extends StyleKey> = FlatNamespace<K> &
-  NestedNamespace<K>;
+  NestedNamespace<K> & {
+    readonly [StyleTag]: true;
+  };
 
 type StyleList<T> = T | false | null | undefined | StyleList<T>[];
 
@@ -141,10 +143,12 @@ type Extended<
   P extends string,
 > = `@container style(--${I}-${StripColon<P>}: 1)`;
 
-type Marker = Record<Extended<string, string>, CSSProperties>;
+type Marker = Readonly<Record<ColonString, CSSVariableProperty>>;
 
 export type {
   AtomicClassNameFor,
+  AtomicStyle,
+  AtomicDynamicStyle,
   Style,
   StyleProps,
   StaticStyles,

package/package.json

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