@master/css 2.0.0-rc.68 → 2.0.0-rc.69

package/dist/transformers/index.cjs

@@ -0,0 +1,9 @@
+'use strict';
+
+var autoFillSolid = require('./auto-fill-solid.cjs');
+
+const transformers = {
+    'auto-fill-solid': autoFillSolid
+};
+
+module.exports = transformers;

package/dist/transformers/index.d.ts

@@ -0,0 +1,6 @@
+import autoFillSolid from './auto-fill-solid';
+declare const transformers: {
+    'auto-fill-solid': typeof autoFillSolid;
+};
+export default transformers;
+export type TransformerNames = keyof typeof transformers;

package/dist/transformers/index.mjs

@@ -0,0 +1,7 @@
+import autoFillSolid from './auto-fill-solid.mjs';
+
+const transformers = {
+    'auto-fill-solid': autoFillSolid
+};
+
+export { transformers as default };

package/dist/types/common.d.ts

@@ -1,3 +1 @@
-import SyntaxRuleType from '../syntax-rule-type';
 export type Vendors = 'webkit' | 'moz' | 'ms' | 'o';
-export type SyntaxRuleTypeValue = typeof SyntaxRuleType[keyof typeof SyntaxRuleType];

package/dist/types/config.d.ts

@@ -1,33 +1,30 @@
 import type { PropertiesHyphen } from 'csstype';
-import type { SyntaxRule } from '../syntax-rule';
-import type { ValueComponent } from './syntax';
 import type { rules, utilities } from '../config';
 import { AT_IDENTIFIERS } from '../common';
-import { SyntaxRuleTypeValue } from './common';
+import { DeclarerNames } from '../declarers';
+import { TransformerNames } from '../transformers';
+import { FunctionTransformerNames } from '../function-transformers';
+import SyntaxRuleType from '../syntax-rule-type';
 export interface SyntaxRuleDefinition {
-    type?: SyntaxRuleTypeValue;
-    matcher?: RegExp;
+    type?: SyntaxRuleType;
+    matcher?: RegExp | string;
     sign?: string;
     key?: string;
     subkey?: string;
-    ambiguousKeys?: string[];
-    ambiguousValues?: (RegExp | string)[];
-    variables?: string[];
+    aliasGroups?: string[];
+    values?: string[];
+    kind?: 'number' | 'color' | 'image';
+    namespaces?: string[];
     separators?: string[];
     unit?: any;
-    declarations?: PropertiesHyphen;
+    declarations?: PropertiesHyphen | Record<string, string | undefined | (string | undefined)[]> | (keyof PropertiesHyphen)[];
     includeAnimations?: boolean;
-    analyze?: (this: SyntaxRule, className: string) => [valueToken: string, prefixToken?: string];
-    transformValue?(this: SyntaxRule, value: string): string;
-    transformValueComponents?(this: SyntaxRule, valueComponents: ValueComponent[]): ValueComponent[];
-    declare?(this: SyntaxRule, value: string, valueComponents: ValueComponent[]): PropertiesHyphen;
-    delete?(this: SyntaxRule, className: string): void;
-    create?(this: SyntaxRule, className: string): void;
-    insert?(this: SyntaxRule): void;
+    declarer?: DeclarerNames | [DeclarerNames, any];
+    transformer?: TransformerNames | [TransformerNames, any];
 }
 export type VariableValue = number | string | false | (number | string)[];
 export type VariableDefinition = {
-    [key in '' | `@${string}` | string]?: VariableValue | VariableDefinition;
+    [key in '' | string]?: VariableValue | VariableDefinition;
 } | VariableValue;
 export type CSSKeyframes = Record<'from' | 'to' | string, PropertiesHyphen>;
 export type AnimationDefinitions = Record<string, CSSKeyframes>;
@@ -48,10 +45,10 @@ export type VariableDefinitions = {
 export type UtilityDefinitions = {
     [key in keyof typeof utilities]?: PropertiesHyphen;
 } & Record<string, PropertiesHyphen>;
-export type ModeDefinitions = Record<string, 'class' | 'media' | 'host' | false>;
+export type ModeDefinitions = Record<string, VariableDefinitions>;
 export interface FunctionDefinition {
     unit?: string;
-    transform?(this: SyntaxRule, value: string, bypassVariableNames: string[]): string | ValueComponent[];
+    transformer?: FunctionTransformerNames | [FunctionTransformerNames, any];
 }
 export type FunctionDefinitions = Record<string, FunctionDefinition>;
 export interface Config {
@@ -68,8 +65,15 @@ export interface Config {
     defaultMode?: 'light' | 'dark' | string | false;
     scope?: string;
     important?: boolean;
-    override?: boolean;
     functions?: FunctionDefinitions;
     animations?: AnimationDefinitions;
     modes?: ModeDefinitions;
+    modeTrigger?: 'class' | 'media' | 'host';
+}
+declare module 'csstype' {
+    interface PropertiesHyphen {
+        '-webkit-user-drag'?: 'auto' | 'element' | 'none' | 'inherit';
+        'user-drag'?: 'auto' | 'element' | 'none' | 'inherit';
+        '-webkit-text-decoration'?: string;
+    }
 }

package/dist/types/syntax.d.ts

@@ -27,7 +27,7 @@ export interface VariableValueComponent {
     token: string;
     type: 'variable';
     name: string;
-    alpha?: string;
+    alpha?: number;
     fallback?: string;
     variable?: Variable;
 }
@@ -47,7 +47,7 @@ export interface DefinedRule {
         value?: RegExp;
         arbitrary?: RegExp;
     };
-    variables: Record<string, Variable>;
+    variables?: Map<string, Variable>;
     order: number;
     definition: SyntaxRuleDefinition;
 }
@@ -64,24 +64,26 @@ export interface MediaQuery {
     type?: string;
 }
 type VariableCommon = {
+    namespace?: string;
     group?: string;
     name: string;
     key: string;
     modes?: Record<string, LiteralVariable>;
 };
-export interface StringVariable {
+export type StringVariable = {
     type: 'string';
     value: string;
-}
-export interface NumberVariable {
+};
+export type NumberVariable = {
     type: 'number';
     value: number;
-}
-export interface ColorVariable {
+};
+export type ColorVariable = {
     type: 'color';
     value: string;
     space: 'rgb' | 'hsl';
-}
+    alpha?: number;
+};
 export type LiteralVariable = StringVariable | NumberVariable | ColorVariable;
 export type Variable = LiteralVariable & VariableCommon;
 export {};

package/dist/utils/equal-selectors.cjs

@@ -36,8 +36,7 @@ function splitByCombinators(nodes) {
                 parts.push(buffer);
                 buffer = [];
             }
-            parts.push(node) // push combinator as-is
-            ;
+            parts.push(node); // push combinator as-is
         } else {
             buffer.push(node);
         }

package/dist/utils/equal-selectors.mjs

@@ -34,8 +34,7 @@ function splitByCombinators(nodes) {
                 parts.push(buffer);
                 buffer = [];
             }
-            parts.push(node) // push combinator as-is
-            ;
+            parts.push(node); // push combinator as-is
         } else {
             buffer.push(node);
         }

package/dist/utils/extend-config.cjs

@@ -1,58 +1,97 @@
 'use strict';
 
-var extend = require('@techor/extend');
+var extend = require('json-safe-extend');
+var flattenObject = require('./flatten-object.cjs');
+var flattenMetaObject = require('./flatten-meta-object.cjs');
 
-// todo: split resolveConfig into a function
 function extendConfig(...configs) {
-    const formatConfig = (config)=>{
-        const clonedConfig = extend({}, config);
-        const formatDeeply = (obj)=>{
-            Object.entries(obj).forEach(([key, value])=>{
-                if (typeof value === 'object' && !Array.isArray(value)) {
-                    formatDeeply(value);
-                } else if (key && !key.startsWith('@')) {
-                    obj[key] = {
-                        '': value
-                    };
-                }
-            });
-        };
-        [
-            'components',
-            'variables'
-        ].forEach((key)=>{
-            if (clonedConfig[key]) {
-                formatDeeply(clonedConfig[key]);
-            }
-        });
-        return clonedConfig;
-    };
     const collectConfigs = (config, result = [])=>{
         if (!config) return result;
         if (config.extends?.length) {
-            config.extends.forEach((ext)=>collectConfigs('config' in ext ? ext.config : ext, result));
+            for (const ext of config.extends){
+                collectConfigs('config' in ext ? ext.config : ext, result);
+            }
         }
-        result.push(formatConfig(config));
+        const cleanConfig = {
+            ...config
+        };
+        delete cleanConfig.extends;
+        result.push(cleanConfig);
         return result;
     };
-    const formattedConfigs = configs.reduce((acc, config)=>collectConfigs(config, acc), []);
-    return formattedConfigs.reduce((extendedConfig, currentConfig)=>{
-        Object.entries(currentConfig).forEach(([key, value])=>{
-            if (key === 'animations' && value) {
-                Object.assign(extendedConfig.animations, value);
-            } else if (value) {
-                extendedConfig = extend(extendedConfig, {
-                    [key]: value
-                });
+    const allConfigs = configs.reduce((acc, config)=>collectConfigs(config, acc), []);
+    let extendedConfig = {
+        __extended: true
+    };
+    for (const { variables, modes, components, animations, at, rules, utilities, selectors, functions, ...rest } of allConfigs){
+        const isExtended = '__extended' in rest;
+        if (isExtended) delete rest.__extended;
+        // variables
+        if (variables) {
+            extendedConfig.variables ??= {};
+            const flattened = isExtended ? {
+                ...variables
+            } : flattenMetaObject(variables, [], {});
+            Object.assign(extendedConfig.variables, flattened);
+        }
+        // modes
+        if (modes) {
+            extendedConfig.modes ??= {};
+            for (const [modeName, modeVars] of Object.entries(modes)){
+                const flattenedMode = isExtended ? {
+                    ...modeVars
+                } : flattenMetaObject(modeVars, [], {});
+                extendedConfig.modes[modeName] = {
+                    ...extendedConfig.modes[modeName],
+                    ...flattenedMode
+                };
             }
-        });
-        return extendedConfig;
-    }, {
-        animations: {},
-        components: {},
-        at: {},
-        variables: {}
-    });
+        }
+        // components
+        if (components) {
+            extendedConfig.components ??= {};
+            const flattened = isExtended ? {
+                ...components
+            } : flattenObject(components);
+            Object.assign(extendedConfig.components, flattened);
+        }
+        // at
+        if (at) {
+            extendedConfig.at ??= {};
+            const flattened = isExtended ? {
+                ...at
+            } : flattenObject(at);
+            Object.assign(extendedConfig.at, flattened);
+        }
+        // animations
+        if (animations) {
+            extendedConfig.animations ??= {};
+            Object.assign(extendedConfig.animations, animations);
+        }
+        // rules
+        if (rules) {
+            extendedConfig.rules ??= {};
+            Object.assign(extendedConfig.rules, rules);
+        }
+        // utilities
+        if (utilities) {
+            extendedConfig.utilities ??= {};
+            Object.assign(extendedConfig.utilities, utilities);
+        }
+        // selectors
+        if (selectors) {
+            extendedConfig.selectors ??= {};
+            Object.assign(extendedConfig.selectors, selectors);
+        }
+        // functions
+        if (functions) {
+            extendedConfig.functions ??= {};
+            Object.assign(extendedConfig.functions, functions);
+        }
+        // merge the rest (non-structured fields)
+        extendedConfig = extend({}, extendedConfig, rest);
+    }
+    return extendedConfig;
 }
 
 module.exports = extendConfig;

package/dist/utils/extend-config.d.ts

@@ -1,2 +1,11 @@
 import type { Config } from '../types/config';
-export default function extendConfig(...configs: (Config | undefined)[]): Config;
+import { Variable } from '../types/syntax';
+export declare type ExtendedConfig = {
+    __extended?: boolean;
+    variables?: Record<string, Variable>;
+    modes?: Record<string, Record<string, Variable>>;
+    at?: Record<string, string>;
+    selectors?: Record<string, string>;
+    components?: Record<string, string>;
+} & Omit<Config, 'variables' | 'modes'>;
+export default function extendConfig(...configs: (Config | undefined)[]): ExtendedConfig;

package/dist/utils/extend-config.mjs

@@ -1,56 +1,95 @@
-import extend from '@techor/extend';
+import extend from 'json-safe-extend';
+import flattenObject from './flatten-object.mjs';
+import flattenMetaObject from './flatten-meta-object.mjs';
 
-// todo: split resolveConfig into a function
 function extendConfig(...configs) {
-    const formatConfig = (config)=>{
-        const clonedConfig = extend({}, config);
-        const formatDeeply = (obj)=>{
-            Object.entries(obj).forEach(([key, value])=>{
-                if (typeof value === 'object' && !Array.isArray(value)) {
-                    formatDeeply(value);
-                } else if (key && !key.startsWith('@')) {
-                    obj[key] = {
-                        '': value
-                    };
-                }
-            });
-        };
-        [
-            'components',
-            'variables'
-        ].forEach((key)=>{
-            if (clonedConfig[key]) {
-                formatDeeply(clonedConfig[key]);
-            }
-        });
-        return clonedConfig;
-    };
     const collectConfigs = (config, result = [])=>{
         if (!config) return result;
         if (config.extends?.length) {
-            config.extends.forEach((ext)=>collectConfigs('config' in ext ? ext.config : ext, result));
+            for (const ext of config.extends){
+                collectConfigs('config' in ext ? ext.config : ext, result);
+            }
         }
-        result.push(formatConfig(config));
+        const cleanConfig = {
+            ...config
+        };
+        delete cleanConfig.extends;
+        result.push(cleanConfig);
         return result;
     };
-    const formattedConfigs = configs.reduce((acc, config)=>collectConfigs(config, acc), []);
-    return formattedConfigs.reduce((extendedConfig, currentConfig)=>{
-        Object.entries(currentConfig).forEach(([key, value])=>{
-            if (key === 'animations' && value) {
-                Object.assign(extendedConfig.animations, value);
-            } else if (value) {
-                extendedConfig = extend(extendedConfig, {
-                    [key]: value
-                });
+    const allConfigs = configs.reduce((acc, config)=>collectConfigs(config, acc), []);
+    let extendedConfig = {
+        __extended: true
+    };
+    for (const { variables, modes, components, animations, at, rules, utilities, selectors, functions, ...rest } of allConfigs){
+        const isExtended = '__extended' in rest;
+        if (isExtended) delete rest.__extended;
+        // variables
+        if (variables) {
+            extendedConfig.variables ??= {};
+            const flattened = isExtended ? {
+                ...variables
+            } : flattenMetaObject(variables, [], {});
+            Object.assign(extendedConfig.variables, flattened);
+        }
+        // modes
+        if (modes) {
+            extendedConfig.modes ??= {};
+            for (const [modeName, modeVars] of Object.entries(modes)){
+                const flattenedMode = isExtended ? {
+                    ...modeVars
+                } : flattenMetaObject(modeVars, [], {});
+                extendedConfig.modes[modeName] = {
+                    ...extendedConfig.modes[modeName],
+                    ...flattenedMode
+                };
             }
-        });
-        return extendedConfig;
-    }, {
-        animations: {},
-        components: {},
-        at: {},
-        variables: {}
-    });
+        }
+        // components
+        if (components) {
+            extendedConfig.components ??= {};
+            const flattened = isExtended ? {
+                ...components
+            } : flattenObject(components);
+            Object.assign(extendedConfig.components, flattened);
+        }
+        // at
+        if (at) {
+            extendedConfig.at ??= {};
+            const flattened = isExtended ? {
+                ...at
+            } : flattenObject(at);
+            Object.assign(extendedConfig.at, flattened);
+        }
+        // animations
+        if (animations) {
+            extendedConfig.animations ??= {};
+            Object.assign(extendedConfig.animations, animations);
+        }
+        // rules
+        if (rules) {
+            extendedConfig.rules ??= {};
+            Object.assign(extendedConfig.rules, rules);
+        }
+        // utilities
+        if (utilities) {
+            extendedConfig.utilities ??= {};
+            Object.assign(extendedConfig.utilities, utilities);
+        }
+        // selectors
+        if (selectors) {
+            extendedConfig.selectors ??= {};
+            Object.assign(extendedConfig.selectors, selectors);
+        }
+        // functions
+        if (functions) {
+            extendedConfig.functions ??= {};
+            Object.assign(extendedConfig.functions, functions);
+        }
+        // merge the rest (non-structured fields)
+        extendedConfig = extend({}, extendedConfig, rest);
+    }
+    return extendedConfig;
 }
 
 export { extendConfig as default };

package/dist/utils/flatten-meta-object.cjs

@@ -0,0 +1,38 @@
+'use strict';
+
+function flattenMetaObject(obj, name = [], result = {}) {
+    for (const [rawKey, rawValue] of Object.entries(obj)){
+        const key = rawKey || name[0] || '';
+        const path = [
+            ...name,
+            rawKey
+        ].filter(Boolean);
+        const flatKey = path.join('-');
+        const groupPath = path.slice(0, -1).join('.');
+        const namespace = path[0];
+        const isObject = rawValue && typeof rawValue === 'object' && !Array.isArray(rawValue);
+        const isSelfObject = isObject && Object.keys(rawValue).length === 1 && '' in rawValue;
+        if (isSelfObject) {
+            result[flatKey] = {
+                name: flatKey,
+                key,
+                value: rawValue[''],
+                group: path.length > 1 ? groupPath : undefined,
+                namespace: path.length > 1 ? namespace : undefined
+            };
+        } else if (!isObject) {
+            result[flatKey] = {
+                name: flatKey,
+                key,
+                value: Array.isArray(rawValue) ? rawValue.join(',') : rawValue,
+                group: path.length > 1 ? groupPath : undefined,
+                namespace: path.length > 1 ? namespace : undefined
+            };
+        } else {
+            flattenMetaObject(rawValue, path, result);
+        }
+    }
+    return result;
+}
+
+module.exports = flattenMetaObject;

package/dist/utils/flatten-meta-object.d.ts

@@ -0,0 +1,13 @@
+export default function flattenMetaObject(obj: Record<string, any>, name?: string[], result?: Record<string, {
+    name: string;
+    value: any;
+    key: string;
+    group?: string;
+    namespace?: string;
+}>): Record<string, {
+    name: string;
+    value: any;
+    key: string;
+    group?: string;
+    namespace?: string;
+}>;

package/dist/utils/flatten-meta-object.mjs

@@ -0,0 +1,36 @@
+function flattenMetaObject(obj, name = [], result = {}) {
+    for (const [rawKey, rawValue] of Object.entries(obj)){
+        const key = rawKey || name[0] || '';
+        const path = [
+            ...name,
+            rawKey
+        ].filter(Boolean);
+        const flatKey = path.join('-');
+        const groupPath = path.slice(0, -1).join('.');
+        const namespace = path[0];
+        const isObject = rawValue && typeof rawValue === 'object' && !Array.isArray(rawValue);
+        const isSelfObject = isObject && Object.keys(rawValue).length === 1 && '' in rawValue;
+        if (isSelfObject) {
+            result[flatKey] = {
+                name: flatKey,
+                key,
+                value: rawValue[''],
+                group: path.length > 1 ? groupPath : undefined,
+                namespace: path.length > 1 ? namespace : undefined
+            };
+        } else if (!isObject) {
+            result[flatKey] = {
+                name: flatKey,
+                key,
+                value: Array.isArray(rawValue) ? rawValue.join(',') : rawValue,
+                group: path.length > 1 ? groupPath : undefined,
+                namespace: path.length > 1 ? namespace : undefined
+            };
+        } else {
+            flattenMetaObject(rawValue, path, result);
+        }
+    }
+    return result;
+}
+
+export { flattenMetaObject as default };

package/dist/utils/flatten-object.cjs

@@ -1,15 +1,19 @@
 'use strict';
 
-function flattenObject(obj, parentKey = '') {
-    return Object.entries(obj).reduce((acc, [key, value])=>{
-        const currentKey = parentKey ? `${parentKey}${key ? '-' + key : ''}` : key;
-        if (typeof value === 'object' && !Array.isArray(value)) {
-            Object.assign(acc, flattenObject(value, currentKey));
+function flattenObject(obj, name = [], result = {}) {
+    for (const [key, value] of Object.entries(obj)){
+        const nextName = [
+            ...name,
+            key
+        ].filter(Boolean);
+        const flatKey = nextName.join('-');
+        if (value && typeof value === 'object' && !Array.isArray(value)) {
+            flattenObject(value, nextName, result);
         } else {
-            acc[currentKey] = value;
+            result[flatKey] = Array.isArray(value) ? value.join(',') : value;
         }
-        return acc;
-    }, {});
+    }
+    return result;
 }
 
-exports.flattenObject = flattenObject;
+module.exports = flattenObject;

package/dist/utils/flatten-object.d.ts

@@ -1 +1 @@
-export declare function flattenObject(obj: Map<string, any> | Record<string, any>, parentKey?: string): Record<string, any>;
+export default function flattenObject(obj: Record<string, any>, name?: string[], result?: Record<string, any>): Record<string, any>;

package/dist/utils/flatten-object.mjs

@@ -1,13 +1,17 @@
-function flattenObject(obj, parentKey = '') {
-    return Object.entries(obj).reduce((acc, [key, value])=>{
-        const currentKey = parentKey ? `${parentKey}${key ? '-' + key : ''}` : key;
-        if (typeof value === 'object' && !Array.isArray(value)) {
-            Object.assign(acc, flattenObject(value, currentKey));
+function flattenObject(obj, name = [], result = {}) {
+    for (const [key, value] of Object.entries(obj)){
+        const nextName = [
+            ...name,
+            key
+        ].filter(Boolean);
+        const flatKey = nextName.join('-');
+        if (value && typeof value === 'object' && !Array.isArray(value)) {
+            flattenObject(value, nextName, result);
         } else {
-            acc[currentKey] = value;
+            result[flatKey] = Array.isArray(value) ? value.join(',') : value;
         }
-        return acc;
-    }, {});
+    }
+    return result;
 }
 
-export { flattenObject };
+export { flattenObject as default };

package/dist/utils/generate-css.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
-var core = require('../core.cjs');
+var create = require('../create.cjs');
 
-function generateCSS(classes, css = new core()) {
+function generateCSS(classes, css = create()) {
     let text = '';
     css.add(...classes);
     text = css.text;

package/dist/utils/generate-css.d.ts

@@ -1,2 +1 @@
-import MasterCSS from '../core';
-export default function generateCSS(classes: string[], css?: MasterCSS): string;
+export default function generateCSS(classes: string[], css?: import("..").MasterCSS): string;

package/dist/utils/generate-css.mjs

@@ -1,6 +1,6 @@
-import MasterCSS from '../core.mjs';
+import createCSS from '../create.mjs';
 
-function generateCSS(classes, css = new MasterCSS()) {
+function generateCSS(classes, css = createCSS()) {
     let text = '';
     css.add(...classes);
     text = css.text;