@bamboocss/generator 1.40.1 → 1.41.1

package/dist/index.cjs

@@ -2424,7 +2424,17 @@ function generatePropTypes(ctx) {
    * writes on purpose.
    */
   type Modifier = "/" | "!" | " !"
-  type WithModifier<T> = [T] extends [string] ? \`\${T}\${Modifier}\${string}\` & { __modifier?: true } : never
+  /**
+   * \`Extract\`, not a \`[T] extends [string]\` test, which was the same thing until a utility
+   * carried keywords beside its tokens: \`KnownKeywords\` keeps \`Number\` deliberately, and that
+   * one non-string member turned every modifier form off for the whole property. It rejected
+   * \`roundedBottom: 'lg!'\` while \`rounded: 'lg!'\` passed, purely because the two utilities are
+   * declared differently — both emit \`var(--radii-lg) !important\`.
+   *
+   * Filtering costs nothing the test did not: the same string members distribute either way,
+   * and \`Extract\` of no strings is \`never\`, exactly what the false branch returned.
+   */
+  type WithModifier<T> = \`\${Extract<T, string>}\${Modifier}\${string}\` & { __modifier?: true }
 
   /**
    * A list of candidate values, most-preferred first, emitted as repeated declarations so the
@@ -2515,6 +2525,19 @@ function generateStyleProps(ctx) {
 		*/
 		let heldOutTokens = "";
 		const separateTokens = ctx.config.strictTokens === "unknown-tokens";
+		/**
+		* The keywords go with them, so a mark does not depend on being a token.
+		*
+		* Only what `WithEscapeHatch` wraps carries `!` and `/`, and that used to be the
+		* tokens alone — so `shadow: 'none!'` was an error while `shadow: 'none'` and
+		* `color: 'red.300!'` were both fine, decided by whether the value happened to be a
+		* token rather than by anything the author can see.
+		*
+		* Held out only where there is a narrowed list to hold: an `authorIdentProperty`
+		* keeps csstype's open string, which must stay outside the wrapper or the property
+		* accepts nothing but marked values.
+		*/
+		const heldOutKeywords = separateTokens ? knownFallback : "";
 		if (propTypes.has(prop)) {
 			const tokenValue = `UtilityValues["${prop}"]`;
 			if (separateTokens) heldOutTokens = tokenValue;
@@ -2522,19 +2545,19 @@ function generateStyleProps(ctx) {
 			if (strictPropertyList.has(key)) union.push([
 				own,
 				"CssVars",
-				knownFallback
+				heldOutKeywords ? "" : knownFallback
 			].filter(Boolean).join(" | "));
 			else union.push([
 				own,
 				"CssVars",
-				gradedFallback
+				heldOutKeywords ? "" : gradedFallback
 			].filter(Boolean).join(" | "));
-		} else union.push([strictPropertyList.has(key) ? "CssVars" : "", knownFallback || cssFallback].filter(Boolean).join(" | "));
+		} else union.push([strictPropertyList.has(key) ? "CssVars" : "", heldOutKeywords ? "" : knownFallback || cssFallback].filter(Boolean).join(" | "));
 		const filtered = union.filter(Boolean);
 		if (!filtered.length) filtered.push("string | number");
 		let comment = comments?.[prop] || "";
 		if (ctx.utility.isDeprecated(prop)) comment = comment ? comment.replace("@see", "@deprecated\n@see") : "/** @deprecated */";
-		const line = `${key}?: ${restrict(prop, filtered.filter(Boolean).join(" | "), ctx.config, heldOutTokens)}`;
+		const line = `${key}?: ${restrict(prop, filtered.filter(Boolean).join(" | "), ctx.config, [heldOutTokens, heldOutKeywords].filter(Boolean).join(" | "))}`;
 		return " " + [comment, line].filter(Boolean).join("\n");
 	}).join("\n")}
     }

package/dist/index.mjs

@@ -2398,7 +2398,17 @@ function generatePropTypes(ctx) {
    * writes on purpose.
    */
   type Modifier = "/" | "!" | " !"
-  type WithModifier<T> = [T] extends [string] ? \`\${T}\${Modifier}\${string}\` & { __modifier?: true } : never
+  /**
+   * \`Extract\`, not a \`[T] extends [string]\` test, which was the same thing until a utility
+   * carried keywords beside its tokens: \`KnownKeywords\` keeps \`Number\` deliberately, and that
+   * one non-string member turned every modifier form off for the whole property. It rejected
+   * \`roundedBottom: 'lg!'\` while \`rounded: 'lg!'\` passed, purely because the two utilities are
+   * declared differently — both emit \`var(--radii-lg) !important\`.
+   *
+   * Filtering costs nothing the test did not: the same string members distribute either way,
+   * and \`Extract\` of no strings is \`never\`, exactly what the false branch returned.
+   */
+  type WithModifier<T> = \`\${Extract<T, string>}\${Modifier}\${string}\` & { __modifier?: true }
 
   /**
    * A list of candidate values, most-preferred first, emitted as repeated declarations so the
@@ -2489,6 +2499,19 @@ function generateStyleProps(ctx) {
 		*/
 		let heldOutTokens = "";
 		const separateTokens = ctx.config.strictTokens === "unknown-tokens";
+		/**
+		* The keywords go with them, so a mark does not depend on being a token.
+		*
+		* Only what `WithEscapeHatch` wraps carries `!` and `/`, and that used to be the
+		* tokens alone — so `shadow: 'none!'` was an error while `shadow: 'none'` and
+		* `color: 'red.300!'` were both fine, decided by whether the value happened to be a
+		* token rather than by anything the author can see.
+		*
+		* Held out only where there is a narrowed list to hold: an `authorIdentProperty`
+		* keeps csstype's open string, which must stay outside the wrapper or the property
+		* accepts nothing but marked values.
+		*/
+		const heldOutKeywords = separateTokens ? knownFallback : "";
 		if (propTypes.has(prop)) {
 			const tokenValue = `UtilityValues["${prop}"]`;
 			if (separateTokens) heldOutTokens = tokenValue;
@@ -2496,19 +2519,19 @@ function generateStyleProps(ctx) {
 			if (strictPropertyList.has(key)) union.push([
 				own,
 				"CssVars",
-				knownFallback
+				heldOutKeywords ? "" : knownFallback
 			].filter(Boolean).join(" | "));
 			else union.push([
 				own,
 				"CssVars",
-				gradedFallback
+				heldOutKeywords ? "" : gradedFallback
 			].filter(Boolean).join(" | "));
-		} else union.push([strictPropertyList.has(key) ? "CssVars" : "", knownFallback || cssFallback].filter(Boolean).join(" | "));
+		} else union.push([strictPropertyList.has(key) ? "CssVars" : "", heldOutKeywords ? "" : knownFallback || cssFallback].filter(Boolean).join(" | "));
 		const filtered = union.filter(Boolean);
 		if (!filtered.length) filtered.push("string | number");
 		let comment = comments?.[prop] || "";
 		if (ctx.utility.isDeprecated(prop)) comment = comment ? comment.replace("@see", "@deprecated\n@see") : "/** @deprecated */";
-		const line = `${key}?: ${restrict(prop, filtered.filter(Boolean).join(" | "), ctx.config, heldOutTokens)}`;
+		const line = `${key}?: ${restrict(prop, filtered.filter(Boolean).join(" | "), ctx.config, [heldOutTokens, heldOutKeywords].filter(Boolean).join(" | "))}`;
 		return " " + [comment, line].filter(Boolean).join("\n");
 	}).join("\n")}
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bamboocss/generator",
-  "version": "1.40.1",
+  "version": "1.41.1",
   "description": "The css generator for css bamboo",
   "homepage": "https://bamboocss.com",
   "license": "MIT",
@@ -38,12 +38,12 @@
     "pluralize": "8.0.0",
     "postcss": "8.5.26",
     "ts-pattern": "5.9.0",
-    "@bamboocss/core": "1.40.1",
-    "@bamboocss/is-valid-prop": "^1.40.1",
-    "@bamboocss/logger": "1.40.1",
-    "@bamboocss/shared": "1.40.1",
-    "@bamboocss/token-dictionary": "1.40.1",
-    "@bamboocss/types": "1.40.1"
+    "@bamboocss/core": "1.41.1",
+    "@bamboocss/is-valid-prop": "^1.41.1",
+    "@bamboocss/logger": "1.41.1",
+    "@bamboocss/shared": "1.41.1",
+    "@bamboocss/token-dictionary": "1.41.1",
+    "@bamboocss/types": "1.41.1"
   },
   "devDependencies": {
     "@types/pluralize": "0.0.33"