@master/css-schema 2.0.0-rc.85 → 2.0.0-rc.86

package/dist/css-directives.d.ts

@@ -1,5 +1,4 @@
 import { MasterCSSManifestDefaultMode, MasterCSSManifestModeTrigger, MasterCSSManifestUtilityKind, MasterCSSManifestUtilityLayerName, MasterCSSManifestVariant } from "./manifest.js";
-
 //#region src/css-directives.d.ts
 type CSSDirectiveVariableValue = number | string | false | (number | string)[];
 type CSSDirectiveDeclarations = Record<string, string>;
@@ -47,14 +46,23 @@ type CSSDirectiveAnimationDefinitions = Record<string, Record<string, CSSDirecti
 type CSSDirectiveAnimationOptions = Record<string, {
   static?: boolean;
 }>;
+type CSSDirectiveConditionPathEntry = {
+  type: 'condition';
+  value: string;
+} | {
+  type: 'variant';
+  token: string;
+};
 interface CSSDirectiveUtilityRuleDefinition {
   declarations: CSSDirectiveDeclarations;
-  atRules?: string[];
+  conditions?: string[];
+  conditionPath?: CSSDirectiveConditionPathEntry[];
   selector?: string;
 }
 interface CSSDirectiveUtilityPatternDefinition {
   prefix: string;
   values: string[];
+  valueMap?: Record<string, string>;
 }
 interface CSSDirectiveUtilityDynamicDefinition {
   key: string;
@@ -70,7 +78,8 @@ interface CSSDirectiveUtilityDefinition {
   pattern?: CSSDirectiveUtilityPatternDefinition;
   dynamic?: CSSDirectiveUtilityDynamicDefinition;
   declarations?: CSSDirectiveDeclarations;
-  atRules?: string[];
+  conditions?: string[];
+  conditionPath?: CSSDirectiveConditionPathEntry[];
   rules?: CSSDirectiveUtilityRuleDefinition[];
 }
 interface CSSDirectiveManifestInput {
@@ -106,7 +115,8 @@ interface CSSDirectiveStyleComposeDefinition {
   source?: CSSDirectiveSourceReference;
   directiveSource?: CSSDirectiveSourceReference;
   selectorSource?: CSSDirectiveSourceReference;
-  atRules?: string[];
+  conditions?: string[];
+  conditionPath?: CSSDirectiveConditionPathEntry[];
   layer?: CSSDirectiveLayerName;
   name?: string;
 }
@@ -117,7 +127,8 @@ interface CSSDirectiveStyleNativeDefinition {
   declarations: CSSDirectiveDeclarations;
   source?: CSSDirectiveSourceReference;
   selectorSource?: CSSDirectiveSourceReference;
-  atRules?: string[];
+  conditions?: string[];
+  conditionPath?: CSSDirectiveConditionPathEntry[];
   layer?: CSSDirectiveLayerName;
   name?: string;
 }
@@ -135,8 +146,5 @@ interface CSSDirectiveResult {
   references?: CSSDirectiveReference[];
   styleDefinitions?: CSSDirectiveStyleDefinition[];
 }
-declare const CSS_DIRECTIVE_VARIANT_REFERENCE_PREFIX = "__master_variant__:";
-declare function createCSSDirectiveVariantReference(token: string): string;
-declare function readCSSDirectiveVariantReference(atRule: string): string | undefined;
 //#endregion
-export { CSSDirectiveAnimationDefinitions, CSSDirectiveAnimationOptions, CSSDirectiveDeclarations, CSSDirectiveDefaultMode, CSSDirectiveError, CSSDirectiveExtractionPolicy, CSSDirectiveLayerName, CSSDirectiveManifestInput, CSSDirectiveModeTrigger, CSSDirectiveReference, CSSDirectiveRelatedInformation, CSSDirectiveResult, CSSDirectiveSourceLocation, CSSDirectiveSourceRange, CSSDirectiveSourceReference, CSSDirectiveStyleComposeDefinition, CSSDirectiveStyleDefinition, CSSDirectiveStyleNativeDefinition, CSSDirectiveUtilityDefinition, CSSDirectiveUtilityDynamicDefinition, CSSDirectiveUtilityPatternDefinition, CSSDirectiveUtilityRuleDefinition, CSSDirectiveVariableDefinition, CSSDirectiveVariableValue, CSSDirectiveVariantDefinitions, CSS_DIRECTIVE_VARIANT_REFERENCE_PREFIX, createCSSDirectiveSourceReference, createCSSDirectiveVariantReference, readCSSDirectiveVariantReference };
+export { CSSDirectiveAnimationDefinitions, CSSDirectiveAnimationOptions, CSSDirectiveConditionPathEntry, CSSDirectiveDeclarations, CSSDirectiveDefaultMode, CSSDirectiveError, CSSDirectiveExtractionPolicy, CSSDirectiveLayerName, CSSDirectiveManifestInput, CSSDirectiveModeTrigger, CSSDirectiveReference, CSSDirectiveRelatedInformation, CSSDirectiveResult, CSSDirectiveSourceLocation, CSSDirectiveSourceRange, CSSDirectiveSourceReference, CSSDirectiveStyleComposeDefinition, CSSDirectiveStyleDefinition, CSSDirectiveStyleNativeDefinition, CSSDirectiveUtilityDefinition, CSSDirectiveUtilityDynamicDefinition, CSSDirectiveUtilityPatternDefinition, CSSDirectiveUtilityRuleDefinition, CSSDirectiveVariableDefinition, CSSDirectiveVariableValue, CSSDirectiveVariantDefinitions, createCSSDirectiveSourceReference };

package/dist/css-directives.js

@@ -33,12 +33,5 @@ function createCSSDirectiveSourceReference(file, range, source) {
 		} } : {}
 	};
 }
-const CSS_DIRECTIVE_VARIANT_REFERENCE_PREFIX = "__master_variant__:";
-function createCSSDirectiveVariantReference(token) {
-	return CSS_DIRECTIVE_VARIANT_REFERENCE_PREFIX + token;
-}
-function readCSSDirectiveVariantReference(atRule) {
-	return atRule.startsWith("__master_variant__:") ? atRule.slice(19) : void 0;
-}
 //#endregion
-export { CSSDirectiveError, CSS_DIRECTIVE_VARIANT_REFERENCE_PREFIX, createCSSDirectiveSourceReference, createCSSDirectiveVariantReference, readCSSDirectiveVariantReference };
+export { CSSDirectiveError, createCSSDirectiveSourceReference };

package/dist/css-syntax.d.ts

@@ -1,5 +1,4 @@
 import { MasterCSSManifestUtility, MasterCSSManifestUtilityLayerName, MasterCSSManifestVariableNumericValue } from "./manifest.js";
-
 //#region src/css-syntax.d.ts
 type ValueComponent = StringValueComponent | NumberValueComponent | FunctionValueComponent | VariableValueComponent | SeparatorValueComponent;
 interface StringValueComponent {

package/dist/hydration-manifest.d.ts

@@ -1,6 +1,5 @@
 import { MasterCSSManifestUtilityLayerName } from "./manifest.js";
 import { UtilityType } from "./utility-type.js";
-
 //#region src/hydration-manifest.d.ts
 declare const MASTER_CSS_HYDRATION_MANIFEST_SCRIPT_ID = "master-css-hydration-manifest";
 declare const MASTER_CSS_HYDRATION_MANIFEST_ATTR = "data-master-css-hydration-manifest";

package/dist/index.js

@@ -1,8 +1,8 @@
-import { CSSDirectiveError, CSS_DIRECTIVE_VARIANT_REFERENCE_PREFIX, createCSSDirectiveSourceReference, createCSSDirectiveVariantReference, readCSSDirectiveVariantReference } from "./css-directives.js";
+import { CSSDirectiveError, createCSSDirectiveSourceReference } from "./css-directives.js";
 import { MASTER_CSS_HYDRATION_MANIFEST_ASSET_BASE, MASTER_CSS_HYDRATION_MANIFEST_ATTR, MASTER_CSS_HYDRATION_MANIFEST_FILE_BASENAME, MASTER_CSS_HYDRATION_MANIFEST_SCRIPT_ID, createMasterCSSHydrationManifestScript, serializeMasterCSSHydrationManifest } from "./hydration-manifest.js";
 import { flattenMasterCSSManifestVariables, getMasterCSSManifestVariableName, groupMasterCSSManifestVariables } from "./manifest.js";
 import { normalizeMasterCSSManifestForJSON, stringifyMasterCSSManifestJSON } from "./manifest-json.js";
 import { UtilityType } from "./utility-type.js";
 import { MASTER_CSS_RUNTIME_STYLE_ID } from "./runtime-style.js";
 import { isNativeCSSShorthandProperty } from "./native-css-shorthand.js";
-export { CSSDirectiveError, CSS_DIRECTIVE_VARIANT_REFERENCE_PREFIX, MASTER_CSS_HYDRATION_MANIFEST_ASSET_BASE, MASTER_CSS_HYDRATION_MANIFEST_ATTR, MASTER_CSS_HYDRATION_MANIFEST_FILE_BASENAME, MASTER_CSS_HYDRATION_MANIFEST_SCRIPT_ID, MASTER_CSS_RUNTIME_STYLE_ID, UtilityType, createCSSDirectiveSourceReference, createCSSDirectiveVariantReference, createMasterCSSHydrationManifestScript, flattenMasterCSSManifestVariables, getMasterCSSManifestVariableName, groupMasterCSSManifestVariables, isNativeCSSShorthandProperty, normalizeMasterCSSManifestForJSON, readCSSDirectiveVariantReference, serializeMasterCSSHydrationManifest, stringifyMasterCSSManifestJSON };
+export { CSSDirectiveError, MASTER_CSS_HYDRATION_MANIFEST_ASSET_BASE, MASTER_CSS_HYDRATION_MANIFEST_ATTR, MASTER_CSS_HYDRATION_MANIFEST_FILE_BASENAME, MASTER_CSS_HYDRATION_MANIFEST_SCRIPT_ID, MASTER_CSS_RUNTIME_STYLE_ID, UtilityType, createCSSDirectiveSourceReference, createMasterCSSHydrationManifestScript, flattenMasterCSSManifestVariables, getMasterCSSManifestVariableName, groupMasterCSSManifestVariables, isNativeCSSShorthandProperty, normalizeMasterCSSManifestForJSON, serializeMasterCSSHydrationManifest, stringifyMasterCSSManifestJSON };

package/dist/manifest-json.d.ts

@@ -1,5 +1,4 @@
 import { MasterCSSManifest } from "./manifest.js";
-
 //#region src/manifest-json.d.ts
 declare function normalizeMasterCSSManifestForJSON(manifest: MasterCSSManifest): MasterCSSManifest;
 declare function stringifyMasterCSSManifestJSON(manifest: MasterCSSManifest): string;

package/dist/manifest.d.ts

@@ -1,8 +1,7 @@
 import { UtilityType } from "./utility-type.js";
 import { PropertiesHyphen } from "csstype";
-
 //#region src/manifest.d.ts
-type MasterCSSManifestAtIdentifier = 'container' | 'starting-style' | 'supports' | 'media' | 'layer';
+type MasterCSSManifestConditionIdentifier = 'container' | 'starting-style' | 'supports' | 'media' | 'layer';
 type MasterCSSManifestUtilityLayerName = 'base' | 'defaults' | 'components' | 'utilities';
 type MasterCSSManifestDefaultMode = 'light' | 'dark' | 'none' | string;
 type MasterCSSManifestModeTrigger = 'class' | 'media' | 'host';
@@ -18,12 +17,12 @@ interface MasterCSSManifestVariableNumericValue {
   value: number;
   unit?: string;
 }
-interface MasterCSSManifestAtRuleBooleanNode {
+interface MasterCSSManifestConditionBooleanNode {
   raw?: string;
   name: string;
   type: 'boolean';
 }
-interface MasterCSSManifestAtRuleNumberNode {
+interface MasterCSSManifestConditionNumberNode {
   raw?: string;
   name?: string;
   type: 'number';
@@ -31,35 +30,35 @@ interface MasterCSSManifestAtRuleNumberNode {
   unit?: string;
   operator?: string;
 }
-interface MasterCSSManifestAtRuleStringNode {
+interface MasterCSSManifestConditionStringNode {
   raw?: string;
   name?: string;
   type: 'string';
   value: string;
 }
-type MasterCSSManifestAtRuleValueNode = MasterCSSManifestAtRuleNumberNode | MasterCSSManifestAtRuleStringNode;
-interface MasterCSSManifestAtRuleComparisonOperatorNode {
+type MasterCSSManifestConditionValueNode = MasterCSSManifestConditionNumberNode | MasterCSSManifestConditionStringNode;
+interface MasterCSSManifestConditionComparisonOperatorNode {
   type: 'comparison';
   raw?: string;
   value: string;
 }
-interface MasterCSSManifestAtRuleLogicalOperatorNode {
+interface MasterCSSManifestConditionLogicalOperatorNode {
   type: 'logical';
   raw?: string;
   value: string;
 }
-type MasterCSSManifestAtRuleOperatorNode = MasterCSSManifestAtRuleComparisonOperatorNode | MasterCSSManifestAtRuleLogicalOperatorNode;
-interface MasterCSSManifestAtRuleGroupNode {
+type MasterCSSManifestConditionOperatorNode = MasterCSSManifestConditionComparisonOperatorNode | MasterCSSManifestConditionLogicalOperatorNode;
+interface MasterCSSManifestConditionGroupNode {
   type?: 'group';
   raw?: string;
-  children: MasterCSSManifestAtRuleNode[];
+  children: MasterCSSManifestConditionNode[];
 }
-type MasterCSSManifestAtRuleNode = MasterCSSManifestAtRuleBooleanNode | MasterCSSManifestAtRuleValueNode | MasterCSSManifestAtRuleComparisonOperatorNode | MasterCSSManifestAtRuleLogicalOperatorNode | MasterCSSManifestAtRuleGroupNode;
-interface MasterCSSManifestAtRule {
-  id: MasterCSSManifestAtIdentifier;
-  nodes: MasterCSSManifestAtRuleNode[];
+type MasterCSSManifestConditionNode = MasterCSSManifestConditionBooleanNode | MasterCSSManifestConditionValueNode | MasterCSSManifestConditionComparisonOperatorNode | MasterCSSManifestConditionLogicalOperatorNode | MasterCSSManifestConditionGroupNode;
+interface MasterCSSManifestCondition {
+  id: MasterCSSManifestConditionIdentifier;
+  nodes: MasterCSSManifestConditionNode[];
 }
-type MasterCSSManifestAtRules = Record<string, MasterCSSManifestAtRule>;
+type MasterCSSManifestConditions = Record<string, MasterCSSManifestCondition>;
 interface MasterCSSManifestSelectorLiteralNode {
   type?: 'attribute' | 'pseudo-class' | 'pseudo-element' | 'class' | 'universal' | 'id';
   raw?: string;
@@ -118,8 +117,8 @@ type MasterCSSManifestAnimationOptions = Record<string, {
 interface MasterCSSManifestVariantBranch {
   selector?: string;
   selectorNodes?: MasterCSSManifestSelectorNode[];
-  atRules?: string[];
-  atRuleNodes?: MasterCSSManifestAtRule[];
+  conditions?: string[];
+  conditionNodes?: MasterCSSManifestCondition[];
   layer?: MasterCSSManifestUtilityLayerName;
 }
 interface MasterCSSManifestVariant {
@@ -134,6 +133,7 @@ type MasterCSSManifestUtilityMatcher = {
   type: 'pattern';
   prefix: string;
   values: string[];
+  valueMap?: Record<string, string>;
 } | {
   type: 'key';
   keys: string[];
@@ -163,7 +163,7 @@ type MasterCSSManifestUtilityEmit = {
 };
 interface MasterCSSManifestUtilityRule<TDeclarations = MasterCSSManifestCSSDeclarations> {
   declarations: TDeclarations;
-  atRules?: string[];
+  conditions?: string[];
   selector?: string;
 }
 interface MasterCSSManifestUtility {
@@ -180,7 +180,7 @@ interface MasterCSSManifestUtility {
   namespaces?: string[];
   implicitNamespace?: boolean;
   separators?: string[];
-  atRules?: string[];
+  conditions?: string[];
   variableAliases?: MasterCSSManifestVariableAliasSet;
   variableAliasRefs?: string[];
   emit: MasterCSSManifestUtilityEmit;
@@ -200,9 +200,9 @@ interface MasterCSSManifest {
   animations?: MasterCSSManifestAnimations;
   animationOptions?: MasterCSSManifestAnimationOptions;
   variants?: MasterCSSManifestVariants;
-  atRules?: MasterCSSManifestAtRules;
-  breakpointAtRules?: MasterCSSManifestAtRules;
-  containerAtRules?: MasterCSSManifestAtRules;
+  conditions?: MasterCSSManifestConditions;
+  breakpointConditions?: MasterCSSManifestConditions;
+  containerConditions?: MasterCSSManifestConditions;
   selectors?: MasterCSSManifestSelectors;
   utilities?: MasterCSSManifestUtilities;
   debug?: Record<string, unknown>;
@@ -211,4 +211,4 @@ declare function getMasterCSSManifestVariableName(namespace: string, variable: P
 declare function flattenMasterCSSManifestVariables(variables: MasterCSSManifestVariables | undefined): MasterCSSManifestVariableEntry[];
 declare function groupMasterCSSManifestVariables(variables: readonly MasterCSSManifestVariable[] | undefined): MasterCSSManifestVariables | undefined;
 //#endregion
-export { MasterCSSManifest, MasterCSSManifestAnimationOptions, MasterCSSManifestAnimations, MasterCSSManifestAtIdentifier, MasterCSSManifestAtRule, MasterCSSManifestAtRuleBooleanNode, MasterCSSManifestAtRuleComparisonOperatorNode, MasterCSSManifestAtRuleGroupNode, MasterCSSManifestAtRuleLogicalOperatorNode, MasterCSSManifestAtRuleNode, MasterCSSManifestAtRuleNumberNode, MasterCSSManifestAtRuleOperatorNode, MasterCSSManifestAtRuleStringNode, MasterCSSManifestAtRuleValueNode, MasterCSSManifestAtRules, MasterCSSManifestCSSDeclarationPrimitive, MasterCSSManifestCSSDeclarations, MasterCSSManifestDefaultMode, MasterCSSManifestKeyframes, MasterCSSManifestModeTrigger, MasterCSSManifestSelectorCombinatorNode, MasterCSSManifestSelectorLiteralNode, MasterCSSManifestSelectorNode, MasterCSSManifestSelectorSeparatorNode, MasterCSSManifestSelectors, MasterCSSManifestSettings, MasterCSSManifestUtilities, MasterCSSManifestUtility, MasterCSSManifestUtilityEmit, MasterCSSManifestUtilityKind, MasterCSSManifestUtilityLayerName, MasterCSSManifestUtilityMatcher, MasterCSSManifestUtilityMatcherValueSegments, MasterCSSManifestUtilityRule, MasterCSSManifestVariable, MasterCSSManifestVariableAlias, MasterCSSManifestVariableAliasSet, MasterCSSManifestVariableEntry, MasterCSSManifestVariableNumericValue, MasterCSSManifestVariableType, MasterCSSManifestVariableValue, MasterCSSManifestVariables, MasterCSSManifestVariant, MasterCSSManifestVariantBranch, MasterCSSManifestVariantToken, MasterCSSManifestVariants, flattenMasterCSSManifestVariables, getMasterCSSManifestVariableName, groupMasterCSSManifestVariables };
+export { MasterCSSManifest, MasterCSSManifestAnimationOptions, MasterCSSManifestAnimations, MasterCSSManifestCSSDeclarationPrimitive, MasterCSSManifestCSSDeclarations, MasterCSSManifestCondition, MasterCSSManifestConditionBooleanNode, MasterCSSManifestConditionComparisonOperatorNode, MasterCSSManifestConditionGroupNode, MasterCSSManifestConditionIdentifier, MasterCSSManifestConditionLogicalOperatorNode, MasterCSSManifestConditionNode, MasterCSSManifestConditionNumberNode, MasterCSSManifestConditionOperatorNode, MasterCSSManifestConditionStringNode, MasterCSSManifestConditionValueNode, MasterCSSManifestConditions, MasterCSSManifestDefaultMode, MasterCSSManifestKeyframes, MasterCSSManifestModeTrigger, MasterCSSManifestSelectorCombinatorNode, MasterCSSManifestSelectorLiteralNode, MasterCSSManifestSelectorNode, MasterCSSManifestSelectorSeparatorNode, MasterCSSManifestSelectors, MasterCSSManifestSettings, MasterCSSManifestUtilities, MasterCSSManifestUtility, MasterCSSManifestUtilityEmit, MasterCSSManifestUtilityKind, MasterCSSManifestUtilityLayerName, MasterCSSManifestUtilityMatcher, MasterCSSManifestUtilityMatcherValueSegments, MasterCSSManifestUtilityRule, MasterCSSManifestVariable, MasterCSSManifestVariableAlias, MasterCSSManifestVariableAliasSet, MasterCSSManifestVariableEntry, MasterCSSManifestVariableNumericValue, MasterCSSManifestVariableType, MasterCSSManifestVariableValue, MasterCSSManifestVariables, MasterCSSManifestVariant, MasterCSSManifestVariantBranch, MasterCSSManifestVariantToken, MasterCSSManifestVariants, flattenMasterCSSManifestVariables, getMasterCSSManifestVariableName, groupMasterCSSManifestVariables };

package/package.json

@@ -88,7 +88,7 @@
   "dependencies": {
     "csstype": "^3.2.3"
   },
-  "version": "2.0.0-rc.85",
+  "version": "2.0.0-rc.86",
   "scripts": {
     "build": "tsdown --config ../../shared/tsdown-package.config.ts",
     "dev": "tsdown --config ../../shared/tsdown-package.config.ts --watch",