@plumeria/core 0.21.5 → 0.22.1

package/dist/index.js

@@ -8,8 +8,29 @@ function create(object) {
 		const flat = {};
 		const nonFlat = {};
 		(0, zss_engine.splitAtomicAndNested)(styleObj, flat, nonFlat);
+		const props$1 = Object.keys(flat);
+		const finalFlat = {};
+		for (let i = 0; i < props$1.length; i++) {
+			const prop = props$1[i];
+			const kebab = (0, zss_engine.camelToKebabCase)(prop);
+			const isShorthand = !!zss_engine.SHORTHAND_PROPERTIES[kebab];
+			if (isShorthand) finalFlat[prop] = flat[prop];
+			else {
+				let isOverridden = false;
+				const shorthands = zss_engine.LONG_TO_SHORT[kebab] || [];
+				for (let j = i + 1; j < props$1.length; j++) {
+					const futureProp = props$1[j];
+					const futureKebab = (0, zss_engine.camelToKebabCase)(futureProp);
+					if (shorthands.includes(futureKebab)) {
+						isOverridden = true;
+						break;
+					}
+				}
+				if (!isOverridden) finalFlat[prop] = flat[prop];
+			}
+		}
 		const records = [];
-		Object.entries(flat).forEach(([prop, value]) => {
+		Object.entries(finalFlat).forEach(([prop, value]) => {
 			const hashes = new Set();
 			const sheets = new Set();
 			(0, zss_engine.processAtomicProps)({ [prop]: value }, hashes, sheets);
@@ -144,21 +165,21 @@ function global(object) {
 
 const keyframes = (object) => {
 	const hash = (0, zss_engine.genBase36Hash)(object, 1, 8);
-	const animationName = `kf-${hash}`;
-	global({ [`@keyframes ${animationName}`]: object });
-	return animationName;
+	const ident = `kf-${hash}`;
+	global({ [`@keyframes ${ident}`]: object });
+	return ident;
 };
 
 const viewTransition = (object) => {
 	const hash = (0, zss_engine.genBase36Hash)(object, 1, 8);
-	const transitionId = `vt-${hash}`;
+	const ident = `vt-${hash}`;
 	global({
-		[`::view-transition-group(${transitionId})`]: object.group,
-		[`::view-transition-image-pair(${transitionId})`]: object.imagePair,
-		[`::view-transition-old(${transitionId})`]: object.old,
-		[`::view-transition-new(${transitionId})`]: object.new
+		[`::view-transition-group(${ident})`]: object.group,
+		[`::view-transition-image-pair(${ident})`]: object.imagePair,
+		[`::view-transition-old(${ident})`]: object.old,
+		[`::view-transition-new(${ident})`]: object.new
 	});
-	return transitionId;
+	return ident;
 };
 
 const defineTokens = (object) => {

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { globalPromise_1, globalPromise_2, initPromise_1, initPromise_2, resolvePromise_1, resolvePromise_2 } from "./css.mjs";
-import { camelToKebabCase, genBase36Hash, injectClientCSS, injectClientGlobalCSS, injectClientQuery, isHashInStyleSheets, isServer, isTestingDevelopment, processAtomicProps, splitAtomicAndNested, transpile } from "zss-engine";
+import { LONG_TO_SHORT, SHORTHAND_PROPERTIES, camelToKebabCase, genBase36Hash, injectClientCSS, injectClientGlobalCSS, injectClientQuery, isHashInStyleSheets, isServer, isTestingDevelopment, processAtomicProps, splitAtomicAndNested, transpile } from "zss-engine";
 
 const styleAtomMap = new WeakMap();
 function create(object) {
@@ -8,8 +8,29 @@ function create(object) {
 		const flat = {};
 		const nonFlat = {};
 		splitAtomicAndNested(styleObj, flat, nonFlat);
+		const props$1 = Object.keys(flat);
+		const finalFlat = {};
+		for (let i = 0; i < props$1.length; i++) {
+			const prop = props$1[i];
+			const kebab = camelToKebabCase(prop);
+			const isShorthand = !!SHORTHAND_PROPERTIES[kebab];
+			if (isShorthand) finalFlat[prop] = flat[prop];
+			else {
+				let isOverridden = false;
+				const shorthands = LONG_TO_SHORT[kebab] || [];
+				for (let j = i + 1; j < props$1.length; j++) {
+					const futureProp = props$1[j];
+					const futureKebab = camelToKebabCase(futureProp);
+					if (shorthands.includes(futureKebab)) {
+						isOverridden = true;
+						break;
+					}
+				}
+				if (!isOverridden) finalFlat[prop] = flat[prop];
+			}
+		}
 		const records = [];
-		Object.entries(flat).forEach(([prop, value]) => {
+		Object.entries(finalFlat).forEach(([prop, value]) => {
 			const hashes = new Set();
 			const sheets = new Set();
 			processAtomicProps({ [prop]: value }, hashes, sheets);
@@ -144,21 +165,21 @@ function global(object) {
 
 const keyframes = (object) => {
 	const hash = genBase36Hash(object, 1, 8);
-	const animationName = `kf-${hash}`;
-	global({ [`@keyframes ${animationName}`]: object });
-	return animationName;
+	const ident = `kf-${hash}`;
+	global({ [`@keyframes ${ident}`]: object });
+	return ident;
 };
 
 const viewTransition = (object) => {
 	const hash = genBase36Hash(object, 1, 8);
-	const transitionId = `vt-${hash}`;
+	const ident = `vt-${hash}`;
 	global({
-		[`::view-transition-group(${transitionId})`]: object.group,
-		[`::view-transition-image-pair(${transitionId})`]: object.imagePair,
-		[`::view-transition-old(${transitionId})`]: object.old,
-		[`::view-transition-new(${transitionId})`]: object.new
+		[`::view-transition-group(${ident})`]: object.group,
+		[`::view-transition-image-pair(${ident})`]: object.imagePair,
+		[`::view-transition-old(${ident})`]: object.old,
+		[`::view-transition-new(${ident})`]: object.new
 	});
-	return transitionId;
+	return ident;
 };
 
 const defineTokens = (object) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/core",
-  "version": "0.21.5",
+  "version": "0.22.1",
   "description": "The atomic on-demand CSS-in-JS.",
   "author": "Refirst 11",
   "license": "MIT",
@@ -45,7 +45,7 @@
     "stylesheet.css"
   ],
   "dependencies": {
-    "zss-engine": "0.2.90"
+    "zss-engine": "0.2.94"
   },
   "publishConfig": {
     "access": "public"