@master/css 2.0.0-beta.191 → 2.0.0-beta.192

package/dist/bin/index.bundle.js

@@ -1,8 +1,7 @@
 #!/usr/bin/env node
-var h=Object.create;var d=Object.defineProperty;var C=Object.getOwnPropertyDescriptor;var _=Object.getOwnPropertyNames;var x=Object.getPrototypeOf,E=Object.prototype.hasOwnProperty;var O=(e,o,t,i)=>{if(o&&typeof o=="object"||typeof o=="function")for(let s of _(o))!E.call(e,s)&&s!==t&&d(e,s,{get:()=>o[s],enumerable:!(i=C(o,s))||i.enumerable});return e};var p=(e,o,t)=>(t=e!=null?h(x(e)):{},O(o||!e||!e.__esModule?d(t,"default",{value:e,enumerable:!0}):t,e));var T=require("commander"),m=p(require("path")),a=p(require("fs"));var S=`/** @type {import('@master/css').Config} */
+var h=Object.create;var d=Object.defineProperty;var C=Object.getOwnPropertyDescriptor;var _=Object.getOwnPropertyNames;var x=Object.getPrototypeOf,E=Object.prototype.hasOwnProperty;var O=(e,o,t,r)=>{if(o&&typeof o=="object"||typeof o=="function")for(let s of _(o))!E.call(e,s)&&s!==t&&d(e,s,{get:()=>o[s],enumerable:!(r=C(o,s))||r.enumerable});return e};var p=(e,o,t)=>(t=e!=null?h(x(e)):{},O(o||!e||!e.__esModule?d(t,"default",{value:e,enumerable:!0}):t,e));var T=require("commander"),m=p(require("path")),a=p(require("fs"));var S=`/** @type {import('@master/css').Config} */
 export default {
     styles: {},
-    colors: {},
     rules: {},
     variables: {},
     semantics: {},
@@ -14,7 +13,6 @@ export default {
 `;var g=`/** @type {import('@master/css').Config} */
 module.exports = {
     styles: {},
-    colors: {},
     rules: {},
     variables: {},
     semantics: {},
@@ -27,7 +25,6 @@ module.exports = {
 
 export default {
     styles: {},
-    colors: {},
     rules: {},
     variables: {},
     semantics: {},
@@ -36,4 +33,4 @@ export default {
     selectors: {},
     functions: {}
 } as Config
-`;var n=p(require("@techor/log")),l=require("@techor/fs"),{version:v,name:j,description:F}=(0,l.readJSONFileSync)(m.default.resolve(__dirname,"../../package.json")),c=new T.Command;c.name(j).description(F).version(v||"0.0.0");c.command("init").description("Initialize definition files for Master CSS").option("-o, --override","Override existing definition file").option("--esm","ES Module .mjs").option("--ts","TypeScript .ts").option("--cjs","CommonJS .js").action(async function(e){let{esm:o,ts:t,cjs:i}=e;if(!o&&!t&&!i)if(a.default.existsSync("tsconfig.json"))t=!0;else{let{type:r}=(0,l.readJSONFileSync)("./package.json")||{};r==="module"?o=!0:i=!0}let s=(r,f)=>{let u=a.default.existsSync(m.default.join(process.cwd(),r));u?u&&e.override?(a.default.writeFileSync(r,f),n.default.ok`**${r}** file is overridden`):n.default.x`**${r}** file already exists`:(a.default.writeFileSync(r,f),n.default.ok`**${r}** file is created`)};o&&s("master.css.mjs",S),t&&s("master.css.ts",y),i&&s("master.css.js",g)});c.command("render").description("Scans HTML and injects generated CSS rules").argument("<source paths>","The path in glob patterns of the source of the HTML file").option("-c --config <path>","The source path of the Master CSS configuration","master.css.*").option("-a --analyze","Analyze injected CSS and HTML size ( brotli ) without writing to file").action(async function(e,o){try{await require("@master/css-renderer/actions/main")(e,o)}catch(t){t.code==="ERR_MODULE_NOT_FOUND"?n.default.i`Please run **npm** **install** **@master/css-renderer** first`:console.error(t)}});c.command("extract").argument("[source paths]","The glob pattern path to extract sources").option("-w, --watch","Watch file changed and generate CSS rules.").option("-o, --output <path>","Specify your CSS file output path").option("-v, --verbose","Verbose logging 0~N","1").option("--options <path>","Specify your extractor options sources","master.css-extractor.*").action(async function(e,o){try{await require("@master/css-extractor/actions/main")(e,o)}catch(t){t.code==="ERR_MODULE_NOT_FOUND"?n.default.i`Please run **npm** **install** **@master/css-extractor** first`:console.error(t)}});c.parse();
+`;var n=p(require("@techor/log")),l=require("@techor/fs"),{version:v,name:j,description:F}=(0,l.readJSONFileSync)(m.default.resolve(__dirname,"../../package.json")),c=new T.Command;c.name(j).description(F).version(v||"0.0.0");c.command("init").description("Initialize definition files for Master CSS").option("-o, --override","Override existing definition file").option("--esm","ES Module .mjs").option("--ts","TypeScript .ts").option("--cjs","CommonJS .js").action(async function(e){let{esm:o,ts:t,cjs:r}=e;if(!o&&!t&&!r)if(a.default.existsSync("tsconfig.json"))t=!0;else{let{type:i}=(0,l.readJSONFileSync)("./package.json")||{};i==="module"?o=!0:r=!0}let s=(i,f)=>{let u=a.default.existsSync(m.default.join(process.cwd(),i));u?u&&e.override?(a.default.writeFileSync(i,f),n.default.ok`**${i}** file is overridden`):n.default.x`**${i}** file already exists`:(a.default.writeFileSync(i,f),n.default.ok`**${i}** file is created`)};o&&s("master.css.mjs",S),t&&s("master.css.ts",y),r&&s("master.css.js",g)});c.command("render").description("Scans HTML and injects generated CSS rules").argument("<source paths>","The path in glob patterns of the source of the HTML file").option("-c --config <path>","The source path of the Master CSS configuration","master.css.*").option("-a --analyze","Analyze injected CSS and HTML size ( brotli ) without writing to file").action(async function(e,o){try{await require("@master/css-renderer/actions/main")(e,o)}catch(t){t.code==="ERR_MODULE_NOT_FOUND"?n.default.i`Please run **npm** **install** **@master/css-renderer** first`:console.error(t)}});c.command("extract").argument("[source paths]","The glob pattern path to extract sources").option("-w, --watch","Watch file changed and generate CSS rules.").option("-o, --output <path>","Specify your CSS file output path").option("-v, --verbose","Verbose logging 0~N","1").option("--options <path>","Specify your extractor options sources","master.css-extractor.*").action(async function(e,o){try{await require("@master/css-extractor/actions/main")(e,o)}catch(t){t.code==="ERR_MODULE_NOT_FOUND"?n.default.i`Please run **npm** **install** **@master/css-extractor** first`:console.error(t)}});c.parse();

package/dist/config/functions.d.ts

@@ -3,7 +3,30 @@ declare const functions: {
         transform(opening: any, value: any, closing: any): any;
     };
     calc: {
-        transform(opening: any, value: any, closing: any): string;
+        transform(opening: any, value: any, closing: any): (string | number | {
+            type: "function";
+            name: string;
+            symbol: string;
+            childrens: (string | number | any | {
+                type: "variable";
+                name: string;
+                alpha?: string;
+            } | {
+                type: "separator";
+                value: string;
+                prefixWhite?: boolean;
+                suffixWhite?: boolean;
+            })[];
+        } | {
+            type: "variable";
+            name: string;
+            alpha?: string;
+        } | {
+            type: "separator";
+            value: string;
+            prefixWhite?: boolean;
+            suffixWhite?: boolean;
+        })[];
     };
     translate: {
         unit: string;

package/dist/config/index.d.ts

@@ -1,5 +1,4 @@
 import mediaQueries from './media-queries';
-import colors from './colors';
 import selectors from './selectors';
 import semantics from './semantics';
 import animations from './animations';
@@ -9,10 +8,12 @@ import functions from './functions';
 import { CSSDeclarations } from '../types/css-declarations';
 import type { Rule } from '../rule';
 declare const config: Config;
-export { config, mediaQueries, colors, selectors, semantics, rules, functions, animations, variables };
-type Variable = number | string | (number | string)[];
-type VariableGroup = {
-    [key: string]: Variable;
+export { config, mediaQueries, selectors, semantics, rules, functions, animations, variables };
+export type ConfigVariable = number | string | Array<number | string>;
+export type ConfigVariableGroup = {
+    [key in '' | `@${string}`]?: ConfigVariable;
+} & {
+    [key: string]: ConfigVariable | ConfigVariableGroup;
 };
 export interface Config {
     extends?: (Config | {
@@ -21,9 +22,6 @@ export interface Config {
     styles?: {
         [key: string]: string | Config['styles'];
     };
-    colors?: {
-        [key: string]: string | Config['colors'];
-    };
     mediaQueries?: {
         [key: string]: number | string | Config['mediaQueries'];
     };
@@ -36,9 +34,9 @@ export interface Config {
         [key: string]: CSSDeclarations;
     };
     variables?: {
-        [key in keyof typeof rules]: VariableGroup;
-    } | {
-        [key in string]: VariableGroup | Variable;
+        [key in keyof typeof rules]?: ConfigVariableGroup;
+    } & {
+        [key: string]: ConfigVariableGroup | ConfigVariable;
     };
     rules?: {
         [key in keyof typeof rules | string]?: Rule['options'];
@@ -50,7 +48,7 @@ export interface Config {
     functions?: Record<string, {
         unit?: string;
         colored?: boolean;
-        transform?(this: Rule, opening: string, value: string, closing: string): string;
+        transform?(this: Rule, opening: string, value: string, closing: string): string | Rule['valueNodes'];
     }>;
     animations?: Record<string, {
         [key in 'from' | 'to']?: CSSDeclarations;