@plumeria/core 3.0.1 → 4.0.0

package/dist/css.d.ts

@@ -61,10 +61,11 @@ type ViewTransition = {
   old?: CSSProperties;
 };
 
+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(...rules: (false | CSSProperties | null | undefined)[]): string;
+  props: typeof props;
   createTheme<const T extends CreateTheme>(_rule: T): ReturnVariableType<T>;
   createStatic<const T extends CreateStatic>(_rule: T): T;
   keyframes(_rule: Keyframes): string;

package/dist/css.js

@@ -2,13 +2,44 @@
 function errorFn(fn) {
 	throw new Error(`css.${fn} requires bundler-plugin setup`);
 }
+function props(...rules) {
+	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
+		});
+	}
+	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 props(...rules) {
-		return rules.filter(Boolean).join(" ");
-	}
+	static props = props;
 	static createTheme(_rule) {
 		throw errorFn("createTheme");
 	}

package/dist/css.mjs

@@ -2,13 +2,44 @@
 function errorFn(fn) {
 	throw new Error(`css.${fn} requires bundler-plugin setup`);
 }
+function props(...rules) {
+	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
+		});
+	}
+	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 props(...rules) {
-		return rules.filter(Boolean).join(" ");
-	}
+	static props = props;
 	static createTheme(_rule) {
 		throw errorFn("createTheme");
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/core",
-  "version": "3.0.1",
+  "version": "4.0.0",
   "description": "An atomic CSS runtime designed to disappear.",
   "author": "Refirst 11",
   "license": "MIT",
@@ -23,15 +23,6 @@
     "react-native-web"
   ],
   "sideEffects": false,
-  "exports": {
-    "./package.json": "./package.json",
-    "./stylesheet.css": "./stylesheet.css",
-    ".": {
-      "types": "./dist/css.d.ts",
-      "import": "./dist/css.mjs",
-      "default": "./dist/css.js"
-    }
-  },
   "main": "dist/css.js",
   "module": "dist/css.mjs",
   "types": "dist/css.d.ts",

package/stylesheet.css

@@ -1,3 +0,0 @@
-/**
- * Placeholder file for static css
- */