@plumeria/core 3.0.0 → 3.1.0

package/dist/css.d.ts

@@ -61,18 +61,19 @@ type ViewTransition = {
   old?: CSSProperties;
 };
 
-declare class _css {
-  static create<const T extends Record<string, CSSProperties>>(rule: CreateStyleType<T>): ReturnType<T>;
-  static props(...rules: (false | Readonly<CSSProperties> | null | undefined)[]): string;
-  static createTheme<const T extends CreateTheme>(rule: T): ReturnVariableType<T>;
-  static createStatic<const T extends CreateStatic>(rule: T): T;
-  static keyframes(rule: Keyframes): string;
-  static viewTransition(rule: ViewTransition): string;
-}
+declare function props(...rules: (false | CSSProperties | null | undefined)[]): string;
+declare const css: {
+  new (): {};
+  create<const T extends Record<string, CSSProperties>>(_rule: CreateStyleType<T>): ReturnType<T>;
+  props: typeof props;
+  createTheme<const T extends CreateTheme>(_rule: T): ReturnVariableType<T>;
+  createStatic<const T extends CreateStatic>(_rule: T): T;
+  keyframes(_rule: Keyframes): string;
+  viewTransition(_rule: ViewTransition): string;
+};
 declare const x: (className: string, styles: Styles) => {
   className: string;
   styles: Styles;
 };
-declare const css: typeof _css;
 
 export { type CSSProperties, type CreateStyle, css, x };

package/dist/css.js

@@ -1,50 +1,62 @@
 
 function errorFn(fn) {
-	throw new Error("Using the \"css." + fn + "\" is runtime not supported. Make sure you have setup bundler-plugin correctly.");
-}
-function create(_rule) {
-	throw errorFn("create");
+	throw new Error(`css.${fn} requires bundler-plugin setup`);
 }
 function props(...rules) {
-	return rules.filter(Boolean).join(" ");
-}
-function createStatic(_rule) {
-	throw errorFn("createStatic");
-}
-function createTheme(_rule) {
-	throw errorFn("createTheme");
-}
-function keyframes(_rule) {
-	throw errorFn("keyframes");
-}
-function viewTransition(_rule) {
-	throw errorFn("viewTransition");
-}
-var _css = class {
-	static create(rule) {
-		return create(rule);
+	const chosen = new Map();
+	const classList = [];
+	const orderedKeys = [];
+	const rightmostKeys = [];
+	for (let i = rules.length - 1; i >= 0; i--) {
+		const arg = rules[i];
+		if (!arg || typeof arg === "string") continue;
+		for (const [key, hash] of Object.entries(arg)) if (!chosen.has(key)) chosen.set(key, {
+			hash,
+			propsIdx: i
+		});
 	}
-	static props(...rules) {
-		return props(...rules);
+	for (let i = 0; i < rules.length; i++) {
+		const arg = rules[i];
+		if (!arg) continue;
+		if (typeof arg === "string") {
+			classList.push(arg);
+			continue;
+		}
+		for (const [key] of Object.entries(arg)) {
+			const info = chosen.get(key);
+			if (info && info.propsIdx === i) {
+				if (i === rules.length - 1) rightmostKeys.push(info);
+				else orderedKeys.push(info);
+				chosen.delete(key);
+			}
+		}
+	}
+	for (const { hash } of orderedKeys) classList.push(hash);
+	for (const { hash } of rightmostKeys) classList.push(hash);
+	return classList.join(" ");
+}
+const css = class _css {
+	static create(_rule) {
+		throw errorFn("create");
 	}
-	static createTheme(rule) {
-		return createTheme(rule);
+	static props = props;
+	static createTheme(_rule) {
+		throw errorFn("createTheme");
 	}
-	static createStatic(rule) {
-		return createStatic(rule);
+	static createStatic(_rule) {
+		throw errorFn("createStatic");
 	}
-	static keyframes(rule) {
-		return keyframes(rule);
+	static keyframes(_rule) {
+		throw errorFn("keyframes");
 	}
-	static viewTransition(rule) {
-		return viewTransition(rule);
+	static viewTransition(_rule) {
+		throw errorFn("viewTransition");
 	}
 };
 const x = (className, styles) => ({
 	className,
 	styles
 });
-const css = _css;
 
 exports.css = css;
 exports.x = x;

package/dist/css.mjs

@@ -1,49 +1,61 @@
 
 function errorFn(fn) {
-	throw new Error("Using the \"css." + fn + "\" is runtime not supported. Make sure you have setup bundler-plugin correctly.");
-}
-function create(_rule) {
-	throw errorFn("create");
+	throw new Error(`css.${fn} requires bundler-plugin setup`);
 }
 function props(...rules) {
-	return rules.filter(Boolean).join(" ");
-}
-function createStatic(_rule) {
-	throw errorFn("createStatic");
-}
-function createTheme(_rule) {
-	throw errorFn("createTheme");
-}
-function keyframes(_rule) {
-	throw errorFn("keyframes");
-}
-function viewTransition(_rule) {
-	throw errorFn("viewTransition");
-}
-var _css = class {
-	static create(rule) {
-		return create(rule);
+	const chosen = new Map();
+	const classList = [];
+	const orderedKeys = [];
+	const rightmostKeys = [];
+	for (let i = rules.length - 1; i >= 0; i--) {
+		const arg = rules[i];
+		if (!arg || typeof arg === "string") continue;
+		for (const [key, hash] of Object.entries(arg)) if (!chosen.has(key)) chosen.set(key, {
+			hash,
+			propsIdx: i
+		});
 	}
-	static props(...rules) {
-		return props(...rules);
+	for (let i = 0; i < rules.length; i++) {
+		const arg = rules[i];
+		if (!arg) continue;
+		if (typeof arg === "string") {
+			classList.push(arg);
+			continue;
+		}
+		for (const [key] of Object.entries(arg)) {
+			const info = chosen.get(key);
+			if (info && info.propsIdx === i) {
+				if (i === rules.length - 1) rightmostKeys.push(info);
+				else orderedKeys.push(info);
+				chosen.delete(key);
+			}
+		}
+	}
+	for (const { hash } of orderedKeys) classList.push(hash);
+	for (const { hash } of rightmostKeys) classList.push(hash);
+	return classList.join(" ");
+}
+const css = class _css {
+	static create(_rule) {
+		throw errorFn("create");
 	}
-	static createTheme(rule) {
-		return createTheme(rule);
+	static props = props;
+	static createTheme(_rule) {
+		throw errorFn("createTheme");
 	}
-	static createStatic(rule) {
-		return createStatic(rule);
+	static createStatic(_rule) {
+		throw errorFn("createStatic");
 	}
-	static keyframes(rule) {
-		return keyframes(rule);
+	static keyframes(_rule) {
+		throw errorFn("keyframes");
 	}
-	static viewTransition(rule) {
-		return viewTransition(rule);
+	static viewTransition(_rule) {
+		throw errorFn("viewTransition");
 	}
 };
 const x = (className, styles) => ({
 	className,
 	styles
 });
-const css = _css;
 
 export { css, x };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/core",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "An atomic CSS runtime designed to disappear.",
   "author": "Refirst 11",
   "license": "MIT",