@antdv-next/cssinjs 1.0.0-alpha.2 → 1.0.0-beta.1

package/dist/StyleContext.d.ts

@@ -1,12 +1,12 @@
 import { Linter } from "./linters/interface.js";
 import "./linters/index.js";
 import { Entity, KeyType } from "./Cache.js";
-import * as vue7 from "vue";
+import * as vue0 from "vue";
 import { App, Ref } from "vue";
 
 //#region src/StyleContext.d.ts
 
-declare function createCache(): vue7.Raw<Entity>;
+declare function createCache(): vue0.Raw<Entity>;
 declare function useStyleContextProvide(props: Ref<StyleContextProps>): void;
 declare function provideStyleContext(app: App, props: Ref<StyleContextProps>): void;
 declare function useStyleContext(): Ref<{
@@ -114,6 +114,6 @@ interface StyleContextProps {
   autoPrefix?: boolean;
 }
 type StyleProviderProps = StyleContextProps;
-declare const StyleProvider: vue7.DefineSetupFnComponent<Partial<StyleContextProps>, {}, {}, Partial<StyleContextProps> & {}, vue7.PublicProps>;
+declare const StyleProvider: vue0.DefineSetupFnComponent<Partial<StyleContextProps>, {}, {}, Partial<StyleContextProps> & {}, vue0.PublicProps>;
 //#endregion
 export { StyleProvider, StyleProviderProps, createCache, provideStyleContext, useStyleContext, useStyleContextProvide };

package/dist/StyleContext.js

@@ -1,6 +1,6 @@
 import Cache_default from "./Cache.js";
+import { AUTO_PREFIX } from "./transformers/autoPrefix.js";
 import { computed, defineComponent, inject, markRaw, provide, ref } from "vue";
-import defu from "defu";
 
 //#region src/StyleContext.ts
 const ATTR_TOKEN = "data-token-hash";
@@ -45,7 +45,17 @@ function useStyleContext() {
 const StyleProvider = defineComponent((props, { slots }) => {
 	const parentContext = useStyleContext();
 	useStyleContextProvide(computed(() => {
-		return defu(props, parentContext.value || defaultStyleContext);
+		const restProps = props;
+		const mergedContext = { ...parentContext.value };
+		Object.keys(restProps).forEach((key) => {
+			const value = restProps[key];
+			if (restProps[key] !== void 0) mergedContext[key] = value;
+		});
+		const { cache, transformers = [] } = restProps;
+		mergedContext.cache = mergedContext.cache || createCache();
+		mergedContext.defaultCache = !cache && parentContext.value?.defaultCache;
+		if (transformers.includes(AUTO_PREFIX)) mergedContext.autoPrefix = true;
+		return mergedContext;
 	}));
 	return () => {
 		return slots?.default?.();

package/dist/cssinjs-utils/util/genStyleUtils.d.ts

@@ -6,7 +6,7 @@ import "../../index.js";
 import { UseCSP } from "../hooks/useCSP.js";
 import { UsePrefix } from "../hooks/usePrefix.js";
 import { UseToken } from "../hooks/useToken.js";
-import * as vue0 from "vue";
+import * as vue2 from "vue";
 import { Ref, UnwrapRef } from "vue";
 
 //#region src/cssinjs-utils/util/genStyleUtils.d.ts
@@ -85,7 +85,7 @@ declare function genStyleUtils<CompTokenMap extends TokenMap, AliasToken extends
      * @default true
      */
     injectStyle?: boolean;
-  }) => (prefixCls: Ref<string>, rootCls?: Ref<string | undefined>) => readonly [Ref<string, string>, vue0.ComputedRef<string | undefined>];
+  }) => (prefixCls: Ref<string>, rootCls?: Ref<string | undefined>) => readonly [Ref<string, string>, vue2.ComputedRef<string | undefined>];
   genSubStyleComponent: <C extends TokenMapKey<CompTokenMap>>(componentName: C | [C, string], styleFn: GenStyleFn<CompTokenMap, AliasToken, C>, getDefaultToken?: GetDefaultToken<CompTokenMap, AliasToken, C>, options?: {
     resetStyle?: boolean;
     resetFont?: boolean;
@@ -100,13 +100,13 @@ declare function genStyleUtils<CompTokenMap extends TokenMap, AliasToken extends
     order?: number;
     injectStyle?: boolean;
     unitless?: Partial<Record<ComponentTokenKey<CompTokenMap, AliasToken, C>, boolean>>;
-  }) => vue0.DefineComponent<vue0.ExtractPropTypes<{
+  }) => vue2.DefineComponent<vue2.ExtractPropTypes<{
     prefixCls: StringConstructor;
     rootCls: StringConstructor;
-  }>, () => null, {}, {}, {}, vue0.ComponentOptionsMixin, vue0.ComponentOptionsMixin, {}, string, vue0.PublicProps, Readonly<vue0.ExtractPropTypes<{
+  }>, () => null, {}, {}, {}, vue2.ComponentOptionsMixin, vue2.ComponentOptionsMixin, {}, string, vue2.PublicProps, Readonly<vue2.ExtractPropTypes<{
     prefixCls: StringConstructor;
     rootCls: StringConstructor;
-  }>> & Readonly<{}>, {}, {}, {}, {}, string, vue0.ComponentProvideOptions, true, {}, any>;
+  }>> & Readonly<{}>, {}, {}, {}, {}, string, vue2.ComponentProvideOptions, true, {}, any>;
   genComponentStyleHook: <C extends TokenMapKey<CompTokenMap>>(componentName: C | [C, string], styleFn: GenStyleFn<CompTokenMap, AliasToken, C>, getDefaultToken?: GetDefaultToken<CompTokenMap, AliasToken, C>, options?: {
     resetStyle?: boolean;
     resetFont?: boolean;

package/dist/hooks/useCacheToken.js

@@ -86,7 +86,7 @@ function useCacheToken(theme, tokens, option) {
 		const actualToken = { ...mergedDerivativeToken };
 		const mergedSalt = `${salt.value}_${cssVar.value.prefix || ""}`;
 		const hashId = hash(mergedSalt);
-		const hashCls = `${hashPrefix}-${hash(mergedSalt)}`;
+		const hashCls = `${hashPrefix}-${hashId}`;
 		actualToken._tokenKey = token2key(actualToken, mergedSalt);
 		const [tokenWithCssVar, cssVarsStr] = transformToken(mergedDerivativeToken, cssVar.value.key, {
 			prefix: cssVar.value.prefix,

package/dist/hooks/useGlobalCache.js

@@ -3,7 +3,6 @@ import { useStyleContext } from "../StyleContext.js";
 import { computed, watch } from "vue";
 
 //#region src/hooks/useGlobalCache.ts
-const isDev = process.env.NODE_ENV !== "production";
 const effectMap = /* @__PURE__ */ new Map();
 /**
 * Global cache for CSS-in-JS styles
@@ -32,7 +31,7 @@ function useGlobalCache(prefix, keyPath, cacheFn, onCacheRemove, onCacheEffect)
 	buildCache();
 	const cacheContent = computed(() => {
 		let entity = styleContext.value.cache.opGet(fullPathStr.value);
-		if (isDev && !entity) {
+		if (!entity) {
 			buildCache();
 			entity = getCacheEntity();
 		}

package/dist/hooks/useStyleRegister.js

@@ -1,5 +1,5 @@
 import { ATTR_CACHE_PATH, ATTR_MARK, CSS_IN_JS_INSTANCE, useStyleContext } from "../StyleContext.js";
-import { isClientSide, toStyleStr } from "../util/index.js";
+import { isClientSide, isNonNullable, toStyleStr, where } from "../util/index.js";
 import { useGlobalCache } from "./useGlobalCache.js";
 import contentQuotesLinter_default from "../linters/contentQuotesLinter.js";
 import hashedAnimationLinter_default from "../linters/hashedAnimationLinter.js";
@@ -21,10 +21,12 @@ function normalizeStyle(styleStr, autoPrefix) {
 function isCompoundCSSProperty(value) {
 	return typeof value === "object" && value && (SKIP_CHECK in value || MULTI_VALUE in value);
 }
-function injectSelectorHash(key, hashId, hashPriority) {
+function injectSelectorHash(key, hashId, hashPriority = "high") {
 	if (!hashId) return key;
-	const hashClassName = `.${hashId}`;
-	const hashSelector = hashPriority === "low" ? `:where(${hashClassName})` : hashClassName;
+	const hashSelector = where({
+		hashCls: hashId,
+		hashPriority
+	});
 	return key.split(",").map((k) => {
 		const fullPath = k.trim().split(/\s+/);
 		let firstPath = fullPath[0] || "";
@@ -110,7 +112,7 @@ function parseStyle(interpolation, config = {}, { root, injectHash, parentSelect
 					if (typeof value === "object" && value?.[MULTI_VALUE] && Array.isArray(actualValue)) actualValue.forEach((item) => {
 						appendStyle(key, item);
 					});
-					else appendStyle(key, actualValue);
+					else if (isNonNullable(actualValue)) appendStyle(key, actualValue);
 				}
 			});
 		}

package/dist/index.js

@@ -1,4 +1,5 @@
 import { collectStyleText, setStyleCollector } from "./ssr/styleCollector.js";
+import autoPrefix_default from "./transformers/autoPrefix.js";
 import { StyleProvider, createCache, provideStyleContext, useStyleContext, useStyleContextProvide } from "./StyleContext.js";
 import calc_default from "./theme/calc/index.js";
 import Theme from "./theme/Theme.js";
@@ -16,7 +17,6 @@ import useStyleRegister from "./hooks/useStyleRegister.js";
 import useCSSVarRegister from "./hooks/useCSSVarRegister.js";
 import extractStyle from "./extractStyle.js";
 import Keyframes_default from "./Keyframes.js";
-import autoPrefix_default from "./transformers/autoPrefix.js";
 import legacyLogicalProperties_default from "./transformers/legacyLogicalProperties.js";
 import px2rem_default from "./transformers/px2rem.js";
 import statistic_default, { merge, statistic } from "./cssinjs-utils/util/statistic.js";

package/dist/transformers/autoPrefix.js

@@ -4,4 +4,4 @@ const transform = AUTO_PREFIX;
 var autoPrefix_default = transform;
 
 //#endregion
-export { autoPrefix_default as default };
+export { AUTO_PREFIX, autoPrefix_default as default };

package/dist/util/index.js

@@ -103,6 +103,9 @@ function where(options) {
 	const hashSelector = `.${hashCls}`;
 	return hashPriority === "low" ? `:where(${hashSelector})` : hashSelector;
 }
+function isNonNullable(val) {
+	return val !== void 0 && val !== null;
+}
 
 //#endregion
-export { flattenToken, isClientSide, memoResult, supportLogicProps, supportWhere, toStyleStr, token2key, unit, where };
+export { flattenToken, isClientSide, isNonNullable, memoResult, supportLogicProps, supportWhere, toStyleStr, token2key, unit, where };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@antdv-next/cssinjs",
   "type": "module",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-beta.1",
   "description": "cssinjs solution for ant-design-vue",
   "exports": {
     ".": {
@@ -30,7 +30,7 @@
   "dependencies": {
     "@emotion/hash": "^0.8.0",
     "@emotion/unitless": "^0.7.5",
-    "@v-c/util": "^1.0.7",
+    "@v-c/util": "^1.0.8",
     "csstype": "^3.2.3",
     "defu": "^6.1.4",
     "stylis": "^4.3.6"