zyzz 0.0.3 → 0.0.6

package/dist/compiler/internal/Configurations.js

@@ -3,18 +3,26 @@
  * @module
  */
 import * as Identity from '../../internal/Identity.js';
-import * as Config from '../../Config.js';
+import * as Config from '../../internal/Configuration.js';
+import * as PublicConfig from '../../Config.js';
 import * as Shorthands from '../../internal/Shorthands.js';
 import * as Token from '../../internal/Token.js';
-import * as Theme from '../../Theme.js';
+import * as Theme from '../../internal/Theme.js';
+import * as VariableSets from '../../internal/VariableSets.js';
+import * as Vars from '../../Vars.js';
 /** Reads a direct configuration factory without executing authored expressions. */
 export function collect(options) {
     function data(node) {
         const linked = options.resolve(node);
-        if (linked?.kind === 'theme')
-            return linked.definition;
+        if (linked?.kind === 'theme' ||
+            (linked?.call.variableConfig && linked.call.selection))
+            return linked.definition[Token.definition].contract.variableSet
+                ? VariableSets.from(linked.definition[Token.definition])
+                : linked.definition;
         if (node.type === 'TSAsExpression' || node.type === 'TSSatisfiesExpression')
             return data(node.expression);
+        if (node.type === 'Literal' && node.value === false)
+            return false;
         if (node.type === 'ArrayExpression')
             return node.elements.map((node) => {
                 if (!node || node.type === 'SpreadElement')
@@ -50,9 +58,30 @@ export function collect(options) {
     }
     if (options.expression.arguments.length > 1)
         throw new Config.InvalidError('Config.create accepts one literal options object.');
-    const input = (options.expression.arguments.length
+    let input = (options.expression.arguments.length
         ? data(options.expression.arguments[0])
         : {});
+    PublicConfig.create(input);
+    const authored = input;
+    const variableMode = authored.vars !== undefined;
+    if (variableMode) {
+        Config.create(authored);
+        const wrap = (value) => VariableSets.theme(Token.definition in value
+            ? value
+            : Vars.define(value), authored.mappings);
+        const { vars, defaultVars, mappings: _mappings, ...rest } = authored;
+        input =
+            defaultVars === undefined
+                ? { ...rest, theme: wrap(vars) }
+                : {
+                    ...rest,
+                    defaultTheme: defaultVars,
+                    themes: Object.fromEntries(Object.entries(vars).map(([key, value]) => [
+                        key,
+                        wrap(value),
+                    ])),
+                };
+    }
     const config = Config.create(input);
     const catalog = (() => {
         if ('themes' in config) {
@@ -67,8 +96,17 @@ export function collect(options) {
         ? options.name
         : Identity.requireId(input.id, 'Config.create');
     const contract = Object.freeze({
+        ...(variableMode
+            ? {
+                variableSet: true,
+                mappings: VariableSets.mappings(authored.mappings),
+            }
+            : {}),
         [Token.identity]: identity,
         cssOutput: input.cssOutput ?? 'atomic',
+        ...(input.defaultLayer !== undefined
+            ? { defaultLayer: input.defaultLayer }
+            : {}),
         ...(input.shorthands
             ? { shorthands: Shorthands.read(input.shorthands) }
             : {}),
@@ -104,29 +142,44 @@ export function collect(options) {
     const selected = members[JSON.stringify('themes' in config ? ['themes', input.defaultTheme] : ['theme'])];
     if ('themes' in config && selected)
         members[JSON.stringify(['theme'])] = selected;
+    if (variableMode && selected)
+        members[JSON.stringify(['vars'])] = {
+            ...selected,
+            call: {
+                ...selected.call,
+                directVariables: true,
+                type: `import('zyzz').Vars.References<${selected.call.tokenType}>`,
+            },
+        };
     const definition = selected?.definition ?? Token.bind(Theme.define({}), contract);
     const normalized = {
         ...(() => {
             if ('themes' in config) {
                 return {
                     defaultTheme: input.defaultTheme,
-                    themes: Object.fromEntries(Object.entries(catalog).map(([name, theme]) => [
-                        name,
-                        { ...values(theme.tokens), ...theme[Token.definition].queries },
-                    ])),
+                    themes: Object.fromEntries(Object.keys(catalog).map((name) => {
+                        const theme = members[JSON.stringify(['themes', name])].definition;
+                        return [
+                            name,
+                            { ...values(theme.tokens), ...theme[Token.definition].queries },
+                        ];
+                    })),
                 };
             }
             if ('theme' in config) {
                 return {
                     theme: {
-                        ...values(config.theme.tokens),
-                        ...config.theme[Token.definition].queries,
+                        ...values(definition.tokens),
+                        ...definition[Token.definition].queries,
                     },
                 };
             }
             return {};
         })(),
         ...(input.cssOutput ? { cssOutput: input.cssOutput } : {}),
+        ...(input.defaultLayer !== undefined
+            ? { defaultLayer: input.defaultLayer }
+            : {}),
         ...(input.shorthands ? { shorthands: input.shorthands } : {}),
         ...(input.output ? { output: input.output } : {}),
         ...(input.layers ? { layers: input.layers } : {}),
@@ -135,6 +188,9 @@ export function collect(options) {
     return {
         binding: options.name,
         call: {
+            ...(variableMode
+                ? { variableConfig: true, variableMappings: authored.mappings }
+                : {}),
             appearance: true,
             script: true,
             end: options.expression.end,
@@ -143,7 +199,9 @@ export function collect(options) {
             options: normalized,
             start: options.expression.start,
             tokenType: selected?.call.tokenType ?? '{}',
-            type: `import('zyzz').Config.create.ReturnType<${type(normalized)}>`,
+            type: variableMode
+                ? `import('zyzz').Config.VariableConfig<${type({ ...normalized, theme: undefined, themes: undefined, defaultTheme: undefined, vars: 'themes' in normalized ? normalized.themes : normalized.theme, ...('themes' in normalized ? { defaultVars: normalized.defaultTheme } : {}), ...(authored.mappings !== undefined ? { mappings: VariableSets.mappings(authored.mappings) } : {}) })}>`
+                : `import('zyzz').Config.create.ReturnType<${type(normalized)}>`,
         },
         definition,
         kind: 'config',
@@ -152,11 +210,14 @@ export function collect(options) {
 }
 /** Encodes validated literal options as a declaration type, never executable text. */
 export function type(value) {
+    if (Token.is(value))
+        return `import('zyzz').Vars.Reference<'${value.group}'>`;
     if (Array.isArray(value))
         return `readonly [${value.map(type).join(',')}]`;
     if (!value || typeof value !== 'object')
         return JSON.stringify(value);
     return `{${Object.entries(value)
+        .filter(([, value]) => value !== undefined)
         .map(([key, value]) => `readonly ${JSON.stringify(key)}:${type(value)}`)
         .join(';')}}`;
 }

package/dist/compiler/internal/Configurations.js.map

@@ -1 +1 @@
-{"version":3,"file":"Configurations.js","sourceRoot":"","sources":["../../../src/compiler/internal/Configurations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Configurations.js","sourceRoot":"","sources":["../../../src/compiler/internal/Configurations.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAA;AAEtD,OAAO,KAAK,MAAM,MAAM,iCAAiC,CAAA;AACzD,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAA;AAC1D,OAAO,KAAK,KAAK,MAAM,yBAAyB,CAAA;AAChD,OAAO,KAAK,KAAK,MAAM,yBAAyB,CAAA;AAChD,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAA;AAC9D,OAAO,KAAK,IAAI,MAAM,eAAe,CAAA;AAGrC,mFAAmF;AACnF,MAAM,UAAU,OAAO,CAAC,OAAwB;IAC9C,SAAS,IAAI,CAAC,IAAc;QAC1B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACpC,IACE,MAAM,EAAE,IAAI,KAAK,OAAO;YACxB,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YAEtD,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,WAAW;gBAC7D,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBACxD,CAAC,CAAC,MAAM,CAAC,UAAU,CAAA;QAEvB,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,IAAI,IAAI,CAAC,IAAI,KAAK,uBAAuB;YACzE,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAE9B,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK;YAAE,OAAO,KAAK,CAAA;QAEjE,IAAI,IAAI,CAAC,IAAI,KAAK,iBAAiB;YACjC,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAChC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe;oBACxC,MAAM,IAAI,MAAM,CAAC,YAAY,CAC3B,+CAA+C,CAChD,CAAA;gBAEH,OAAO,IAAI,CAAC,IAAI,CAAC,CAAA;YACnB,CAAC,CAAC,CAAA;QAEJ,IAAI,IAAI,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;YACrC,MAAM,OAAO,GAA4B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAE5D,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACvC,IACE,QAAQ,CAAC,IAAI,KAAK,UAAU;oBAC5B,QAAQ,CAAC,QAAQ;oBACjB,QAAQ,CAAC,MAAM;oBACf,QAAQ,CAAC,IAAI,KAAK,MAAM;oBAExB,MAAM,IAAI,MAAM,CAAC,YAAY,CAC3B,sEAAsE,CACvE,CAAA;gBAEH,MAAM,GAAG,GAAG,CAAC,GAAG,EAAE;oBAChB,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;wBACvC,OAAO,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAA;oBAC1B,CAAC;oBAED,IACE,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS;wBAC/B,CAAC,OAAO,QAAQ,CAAC,GAAG,CAAC,KAAK,KAAK,QAAQ;4BACrC,OAAO,QAAQ,CAAC,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,EACzC,CAAC;wBACD,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;oBACnC,CAAC;oBAED,OAAO,SAAS,CAAA;gBAClB,CAAC,CAAC,EAAE,CAAA;gBACJ,IAAI,GAAG,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC;oBAClD,MAAM,IAAI,MAAM,CAAC,YAAY,CAC3B,6CAA6C,CAC9C,CAAA;gBAEH,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACrC,CAAC;YAED,OAAO,OAAO,CAAA;QAChB,CAAC;QAED,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC3B,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;QACzC,MAAM,IAAI,MAAM,CAAC,YAAY,CAC3B,mDAAmD,CACpD,CAAA;IAEH,IAAI,KAAK,GAAG,CACV,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM;QACjC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAE,CAAC;QACxC,CAAC,CAAC,EAAE,CACkB,CAAA;IAE1B,YAAY,CAAC,MAAM,CAAC,KAA+C,CAAC,CAAA;IAEpE,MAAM,QAAQ,GAAG,KAA0C,CAAA;IAC3D,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAA;IAChD,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACvB,MAAM,IAAI,GAAG,CAAC,KAAoC,EAAE,EAAE,CACpD,YAAY,CAAC,KAAK,CAChB,KAAK,CAAC,UAAU,IAAI,KAAK;YACvB,CAAC,CAAE,KAAyB;YAC5B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAoB,CAAC,EACrC,QAAQ,CAAC,QAAQ,CAClB,CAAA;QACH,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,GAAG,QAAQ,CAAA;QACpE,KAAK;YACH,WAAW,KAAK,SAAS;gBACvB,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,IAAuB,CAAC,EAAE;gBACnD,CAAC,CAAC;oBACE,GAAG,IAAI;oBACP,YAAY,EAAE,WAAW;oBACzB,MAAM,EAAE,MAAM,CAAC,WAAW,CACxB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;wBACzC,GAAG;wBACH,IAAI,CAAC,KAAwB,CAAC;qBAC/B,CAAC,CACH;iBACF,CAAA;IACT,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAEnC,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE;QACpB,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;YACvB,OAAO,MAAM,CAAC,MAAM,CAAA;QACtB,CAAC;QAED,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;YACtB,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAA;QAChC,CAAC;QAED,OAAO,EAAE,CAAA;IACX,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,QAAQ,GACZ,KAAK,CAAC,EAAE,KAAK,SAAS;QACpB,CAAC,CAAC,OAAO,CAAC,IAAI;QACd,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,eAAe,CAAC,CAAA;IACnD,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,GAAG,CAAC,YAAY;YACd,CAAC,CAAC;gBACE,WAAW,EAAE,IAAI;gBACjB,QAAQ,EAAE,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC;aACnD;YACH,CAAC,CAAC,EAAE,CAAC;QACP,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,QAAQ;QAC1B,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,QAAQ;QACtC,GAAG,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS;YAClC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE;YACtC,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,KAAK,CAAC,UAAU;YAClB,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE;YACnD,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,CAAA;IAEF,MAAM,OAAO,GAAgC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAEhE,KAAK,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,GAAG,GAAG,QAAQ,IAAI,GAAG,EAAE,CAAA;QACjC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QACjD,MAAM,SAAS,GAAG,IAAI,CAAC;YACrB,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC1B,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO;SACtC,CAAC,CAAA;QAEF,MAAM,IAAI,GAAG;YACX,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/D,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG;YAC3B,IAAI;YACJ,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK;YAC/B,SAAS;YACT,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,IAAI,KAAK,CAAC,UAAU;gBAC7C,CAAC,CAAC;oBACE,IAAI,EAAE,kDAAkD,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,cAAc,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,aAAa;iBAC5K;gBACH,CAAC,CAAC,EAAE,CAAC;SACR,CAAA;QAED,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACvE;gBACE,OAAO,EAAE,IAAI;gBACb,IAAI;gBACJ,UAAU;gBACV,IAAI,EAAE,OAAO;aACd,CAAA;IACL,CAAC;IAED,MAAM,QAAQ,GACZ,OAAO,CACL,IAAI,CAAC,SAAS,CACZ,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAChE,CACF,CAAA;IAEH,IAAI,QAAQ,IAAI,MAAM,IAAI,QAAQ;QAChC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAA;IAE/C,IAAI,YAAY,IAAI,QAAQ;QAC1B,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG;YAClC,GAAG,QAAQ;YACX,IAAI,EAAE;gBACJ,GAAG,QAAQ,CAAC,IAAI;gBAChB,eAAe,EAAE,IAAI;gBACrB,IAAI,EAAE,kCAAkC,QAAQ,CAAC,IAAI,CAAC,SAAS,GAAG;aACnE;SACF,CAAA;IAEH,MAAM,UAAU,GACd,QAAQ,EAAE,UAAU,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAA;IAEhE,MAAM,UAAU,GAAG;QACjB,GAAG,CAAC,GAAG,EAAE;YACP,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;gBACvB,OAAO;oBACL,YAAY,EAAE,KAAK,CAAC,YAAY;oBAChC,MAAM,EAAE,MAAM,CAAC,WAAW,CACxB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;wBAChC,MAAM,KAAK,GACT,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAE,CAAC,UAAW,CAAA;wBACxD,OAAO;4BACL,IAAI;4BACJ,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE;yBAChE,CAAA;oBACH,CAAC,CAAC,CACH;iBACF,CAAA;YACH,CAAC;YAED,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;gBACtB,OAAO;oBACL,KAAK,EAAE;wBACL,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;wBAC5B,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO;qBACxC;iBACF,CAAA;YACH,CAAC;YAED,OAAO,EAAE,CAAA;QACX,CAAC,CAAC,EAAE;QACJ,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,GAAG,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS;YAClC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE;YACtC,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjD,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjD,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9D,CAAA;IAED,OAAO;QACL,OAAO,EAAE,OAAO,CAAC,IAAI;QACrB,IAAI,EAAE;YACJ,GAAG,CAAC,YAAY;gBACd,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,CAAC,QAAQ,EAAE;gBAC/D,CAAC,CAAC,EAAE,CAAC;YACP,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI;YACZ,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG;YAC3B,OAAO,EAAE,MAAM,CAAC,WAAW,CACzB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CACpE;YACD,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI;YACzC,OAAO,EAAE,UAAU;YACnB,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK;YAC/B,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI;YAC3C,IAAI,EAAE,YAAY;gBAChB,CAAC,CAAC,wCAAwC,IAAI,CAAC,EAAE,GAAG,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,IAAI,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG;gBACxX,CAAC,CAAC,2CAA2C,IAAI,CAAC,UAAU,CAAC,GAAG;SACnE;QACD,UAAU;QACV,IAAI,EAAE,QAAQ;QACd,OAAO;KACR,CAAA;AACH,CAAC;AAiBD,sFAAsF;AACtF,MAAM,UAAU,IAAI,CAAC,KAAc;IACjC,IAAI,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC;QAAE,OAAO,kCAAkC,KAAK,CAAC,KAAK,IAAI,CAAA;IAC7E,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,aAAa,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;IAC1E,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IAErE,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;SAC7B,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;SAC1C,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;SACvE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;AACjB,CAAC;AAED,SAAS,MAAM,CAAC,IAAoC;IAClD,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QACzC,GAAG;QACH,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC;YACb,CAAC,CAAC,KAAK,CAAC,KAAK;YACb,CAAC,CAAC,MAAM,CAAC,KAAuC,CAAC;KACpD,CAAC,CACH,CAAA;AACH,CAAC"}

package/dist/compiler/internal/Contract.d.ts

@@ -1,5 +1,5 @@
 import * as Stylesheets from './Stylesheets.js';
-import * as Theme from '../../Theme.js';
+import * as Theme from '../../internal/Theme.js';
 import type * as Themes from './Themes.js';
 import * as Token from '../../internal/Token.js';
 /** Reads versioned JSON as validated data; never evaluates package code. */

package/dist/compiler/internal/Contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Contract.d.ts","sourceRoot":"","sources":["../../../src/compiler/internal/Contract.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,KAAK,MAAM,yBAAyB,CAAA;AAEhD,4EAA4E;AAC5E,wBAAgB,IAAI,CAClB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,EACvC,QAAQ,SAAK;;;;;;EAyZd;AAwCD,4EAA4E;AAC5E,wBAAgB,KAAK,CACnB,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,EAC5C,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,EAClD,WAAW,GAAE,SAAS,WAAW,CAAC,OAAO,EAAO,EAChD,QAAQ,SAAK,EACb,cAAc,GAAE,SAAS,KAAK,CAAC,aAAa,EAAO,GAClD,MAAM,CA8SR;AAED,iCAAiC;AACjC,MAAM,CAAC,OAAO,WAAW,KAAK,CAAC;IAC7B,wFAAwF;IACxF,KAAK,aAAa,GAAG;QACnB,kEAAkE;QAClE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;QACzB,2EAA2E;QAC3E,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QACxC,uDAAuD;QACvD,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;KACnC,CAAA;CACF"}
+{"version":3,"file":"Contract.d.ts","sourceRoot":"","sources":["../../../src/compiler/internal/Contract.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,KAAK,MAAM,yBAAyB,CAAA;AAGhD,OAAO,KAAK,KAAK,MAAM,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,KAAK,MAAM,yBAAyB,CAAA;AAEhD,4EAA4E;AAC5E,wBAAgB,IAAI,CAClB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,EACvC,QAAQ,SAAK;;;;;;EAkhBd;AAyCD,4EAA4E;AAC5E,wBAAgB,KAAK,CACnB,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,EAC5C,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,EAClD,WAAW,GAAE,SAAS,WAAW,CAAC,OAAO,EAAO,EAChD,QAAQ,SAAK,EACb,cAAc,GAAE,SAAS,KAAK,CAAC,aAAa,EAAO,GAClD,MAAM,CAkVR;AAED,iCAAiC;AACjC,MAAM,CAAC,OAAO,WAAW,KAAK,CAAC;IAC7B,wFAAwF;IACxF,KAAK,aAAa,GAAG;QACnB,kEAAkE;QAClE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;QACzB,2EAA2E;QAC3E,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QACxC,uDAAuD;QACvD,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;KACnC,CAAA;CACF"}

package/dist/compiler/internal/Contract.js

@@ -1,18 +1,20 @@
-import * as Config from '../../Config.js';
+import * as Config from '../../internal/Configuration.js';
 import * as Configurations from './Configurations.js';
 import * as FunctionSyntax from '../../internal/FunctionSyntax.js';
 import * as Identifiers from './Identifiers.js';
 import * as PackedStyles from './PackedStyles.js';
 import * as Shorthands from '../../internal/Shorthands.js';
 import * as Stylesheets from './Stylesheets.js';
-import * as Theme from '../../Theme.js';
+import * as Theme from '../../internal/Theme.js';
+import * as VariableSets from '../../internal/VariableSets.js';
+import * as Vars from '../../Vars.js';
 import * as Token from '../../internal/Token.js';
 /** Reads versioned JSON as validated data; never evaluates package code. */
 export function read(source, identities, moduleId = '') {
     const data = record(JSON.parse(source));
     if (![
         1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
-        22, 23, 24,
+        22, 23, 24, 25, 26, 27,
     ].includes(data.version))
         throw new Error('Unsupported Zyzz contract version.');
     // Root controls arrived with version 18; older readers must treat them as absent.
@@ -40,20 +42,69 @@ export function read(source, identities, moduleId = '') {
         for (const entry of Object.values(record(data.exports)))
             collect(entry);
     }
+    function decode(value) {
+        if (!value || typeof value !== 'object')
+            return value;
+        if (Array.isArray(value))
+            return value.map(decode);
+        const fields = record(value);
+        if (Object.hasOwn(fields, '$object'))
+            return Object.fromEntries(Object.entries(record(fields.$object)).map(([key, value]) => [
+                key,
+                decode(value),
+            ]));
+        if (Object.hasOwn(fields, '$variable')) {
+            const reference = record(fields.$variable);
+            const identity = string(reference.identity);
+            let contract = identities.get(identity);
+            if (contract && !contract.variableSet)
+                throw new Error('Conflicting packed variable-set modes for one identity.');
+            if (!contract) {
+                contract = Object.freeze({
+                    variableSet: true,
+                    [Token.identity]: identity,
+                });
+                identities.set(identity, contract);
+            }
+            const resolved = decode(reference.value);
+            return Token.create({
+                contract,
+                group: VariableSets.domain(resolved),
+                path: string(reference.path),
+                value: resolved,
+            });
+        }
+        return Object.fromEntries(Object.entries(fields).map(([key, value]) => [key, decode(value)]));
+    }
     const themes = Object.create(null);
     const types = Object.create(null);
     for (const [name, value] of Object.entries(record(data.themes))) {
         const entry = record(value);
         const identity = string(entry.identity);
+        if (entry.variableSet === true && data.version < 26)
+            throw new Error('Vars contracts require contract version 26 or later.');
+        const mappings = VariableSets.mappings(entry.mappings);
         if (entry.cssOutput !== undefined &&
             entry.cssOutput !== 'atomic' &&
             entry.cssOutput !== 'grouped')
             throw new Error('Invalid packed CSS output mode.');
         const cssOutput = (entry.cssOutput ?? legacyModes.get(identity));
+        if (entry.defaultLayer !== undefined) {
+            if (data.version < 27)
+                throw new Error('Default layers require contract version 27 or later.');
+            Config.create({ defaultLayer: entry.defaultLayer });
+        }
+        const defaultLayer = entry.defaultLayer;
         const shorthands = entry.shorthands !== undefined
             ? Shorthands.read(entry.shorthands)
             : undefined;
         let contract = identities.get(identity);
+        if (contract &&
+            Boolean(contract.variableSet) !== (entry.variableSet === true))
+            throw new Error('Conflicting packed variable-set modes for one identity.');
+        if (contract &&
+            JSON.stringify(contract.mappings ?? {}) !== JSON.stringify(mappings ?? {}))
+            throw new Error('Conflicting packed variable mappings for one identity.');
         if (contract &&
             Shorthands.signature(contract.shorthands) !==
                 Shorthands.signature(shorthands))
@@ -61,21 +112,36 @@ export function read(source, identities, moduleId = '') {
         if (contract &&
             (contract.cssOutput ?? 'atomic') !== (cssOutput ?? 'atomic'))
             throw new Error('Conflicting packed CSS output modes for one theme identity.');
+        if (contract && contract.defaultLayer !== defaultLayer)
+            throw new Error('Conflicting packed default layers for one theme identity.');
         if (!contract) {
             contract = Object.freeze({
+                ...(entry.variableSet === true
+                    ? {
+                        variableSet: true,
+                        mappings,
+                    }
+                    : {}),
                 ...(entry.shorthands !== undefined
                     ? { shorthands: Shorthands.read(entry.shorthands) }
                     : {}),
                 ...(cssOutput ? { cssOutput } : {}),
+                ...(defaultLayer !== undefined ? { defaultLayer } : {}),
                 [Token.complete]: true,
                 [Token.identity]: identity,
             });
             identities.set(identity, contract);
         }
-        const definition = Theme.define(record(entry.tokens));
+        const definition = entry.variableSet === true
+            ? VariableSets.theme(Vars.define(decode(entry.tokens)), mappings)
+            : Theme.define(record(entry.tokens));
         if (data.version < 24 &&
             Object.hasOwn(definition.tokens, 'typography'))
             throw new Error('Packed typography sets require contract version 24 or later.');
+        if (data.version < 25 &&
+            (definition[Token.definition].paths ||
+                Object.hasOwn(definition.tokens, 'borderWidth')))
+            throw new Error('Packed responsive typography and border widths require contract version 25 or later.');
         themes[name] = Token.bind(definition, contract);
         types[name] = type(input(definition));
     }
@@ -146,7 +212,8 @@ export function read(source, identities, moduleId = '') {
             const name = string(entry.name);
             const reference = string(entry.reference);
             if (![
-                9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+                9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+                27,
             ].includes(data.version) ||
                 ![
                     'cssFunction',
@@ -188,8 +255,7 @@ export function read(source, identities, moduleId = '') {
             };
         }
         if (entry.kind === 'style-reference') {
-            if (entry.style !== undefined &&
-                ![16, 17, 18, 19, 20, 21, 22, 23, 24].includes(data.version))
+            if (entry.style !== undefined && data.version < 16)
                 throw new Error('Packed callable styles require contract version 16 or later.');
             const binding = string(entry.binding);
             if (!/^z-style-[a-z0-9_-]+$/.test(binding))
@@ -239,13 +305,19 @@ export function read(source, identities, moduleId = '') {
                 link(value),
             ]))
             : undefined;
-        const options = entry.options === undefined ? undefined : record(entry.options);
+        const options = entry.options === undefined ? undefined : record(decode(entry.options));
         if (options) {
-            Config.create(options);
+            if (entry.variableConfig === true)
+                Config.create(variableOptions(options, entry.variableMappings));
+            else
+                Config.create(options);
             if (data.version >= 17 &&
                 (options.cssOutput ?? 'atomic') !==
                     (definition[Token.definition].contract.cssOutput ?? 'atomic'))
                 throw new Error('Configuration CSS output disagrees with linked theme metadata.');
+            if (options.defaultLayer !==
+                definition[Token.definition].contract.defaultLayer)
+                throw new Error('Configuration default layer disagrees with linked theme metadata.');
             if (Shorthands.signature(options.shorthands) !==
                 Shorthands.signature(definition[Token.definition].contract.shorthands))
                 throw new Error('Configuration mappings disagree with linked theme metadata.');
@@ -253,7 +325,9 @@ export function read(source, identities, moduleId = '') {
         const catalogOnly = !!options?.themes &&
             (data.version < 4 || entry.catalogOnly === true);
         const fullConfigType = options
-            ? `import('zyzz').Config.create.ReturnType<${Configurations.type(options)}>`
+            ? entry.variableConfig === true
+                ? `import('zyzz').Config.VariableConfig<${Configurations.type(variableOptions(options, entry.variableMappings))}>`
+                : `import('zyzz').Config.create.ReturnType<${Configurations.type(options)}>`
             : '';
         // Helpers a legacy library did not compile are hidden from its consumers' types.
         const hidden = [
@@ -271,6 +345,24 @@ export function read(source, identities, moduleId = '') {
         return {
             binding: string(entry.binding),
             call: {
+                ...(entry.variableSet === true
+                    ? {
+                        variableSet: true,
+                        type: `import('zyzz').Vars.Definition<${types[theme]}>`,
+                    }
+                    : {}),
+                ...(entry.directVariables === true
+                    ? {
+                        directVariables: true,
+                        type: `import('zyzz').Vars.${entry.variableSet === true ? 'Definition' : 'References'}<${types[theme]}>`,
+                    }
+                    : {}),
+                ...(entry.variableConfig === true
+                    ? {
+                        variableConfig: true,
+                        variableMappings: entry.variableMappings,
+                    }
+                    : {}),
                 ...(entry.recipe === true ? { recipe: true } : {}),
                 ...(entry.output === 'html' ? { output: 'html' } : {}),
                 ...(catalogOnly ? { catalogOnly: true } : {}),
@@ -294,7 +386,7 @@ export function read(source, identities, moduleId = '') {
                 ...(options
                     ? {
                         options,
-                        type: `${outputType}${entry.initialization === true ? "['script']" : entry.root === true ? "['appearance']" : entry.selection === true ? "['themes']" : ''}`,
+                        type: `${outputType}${entry.initialization === true ? "['script']" : entry.root === true ? "['appearance']" : entry.selection === true ? (entry.variableConfig === true ? "['vars']" : "['themes']") : ''}`,
                     }
                     : {}),
                 ...(members
@@ -339,6 +431,8 @@ function tokens(tree) {
     ]));
 }
 function type(value) {
+    if (Token.is(value))
+        return Configurations.type(value);
     if (Array.isArray(value))
         return `readonly [${value.map(type).join(',')}]`;
     if (!value || typeof value !== 'object')
@@ -392,6 +486,11 @@ export function write(links, themes, stylesheets = [], moduleId = '', configurat
                     : {}),
             };
         return {
+            ...(link.call.variableSet ? { variableSet: true } : {}),
+            ...(link.call.directVariables ? { directVariables: true } : {}),
+            ...(link.call.variableConfig
+                ? { variableConfig: true, variableMappings: link.call.variableMappings }
+                : {}),
             ...(link.call.recipe ? { recipe: true } : {}),
             ...(link.call.output ? { output: link.call.output } : {}),
             ...(link.call.script &&
@@ -408,7 +507,7 @@ export function write(links, themes, stylesheets = [], moduleId = '', configurat
             ...(link.call.selection ? { selection: true } : {}),
             ...(link.call.initialization ? { initialization: true } : {}),
             ...(link.call.root ? { root: true } : {}),
-            ...(link.call.options ? { options: link.call.options } : {}),
+            ...(link.call.options ? { options: encode(link.call.options) } : {}),
             ...(link.members
                 ? {
                     members: Object.fromEntries(Object.entries(link.members).map(([key, link]) => [
@@ -433,14 +532,30 @@ export function write(links, themes, stylesheets = [], moduleId = '', configurat
                 ...(theme[Token.definition].contract.shorthands
                     ? { shorthands: theme[Token.definition].contract.shorthands }
                     : {}),
+                ...(theme[Token.definition].contract.defaultLayer !== undefined
+                    ? { defaultLayer: theme[Token.definition].contract.defaultLayer }
+                    : {}),
                 ...(theme[Token.definition].contract.cssOutput
                     ? { cssOutput: theme[Token.definition].contract.cssOutput }
                     : {}),
+                ...(theme[Token.definition].contract.variableSet
+                    ? {
+                        variableSet: true,
+                        mappings: theme[Token.definition].contract.mappings,
+                    }
+                    : {}),
                 identity: theme[Token.definition].contract[Token.identity],
-                tokens: input(theme),
+                tokens: encode(input(theme)),
             },
         ])),
         version: (() => {
+            if (Object.values(themes).some((theme) => theme[Token.definition].contract.defaultLayer !== undefined))
+                return 27;
+            if (Object.values(themes).some((theme) => theme[Token.definition].contract.variableSet))
+                return 26;
+            if (Object.values(themes).some((theme) => theme[Token.definition].paths ||
+                Object.hasOwn(theme.tokens, 'borderWidth')))
+                return 25;
             if (Object.values(themes).some((theme) => Object.hasOwn(theme.tokens, 'typography')))
                 return 24;
             function callable(link) {
@@ -604,4 +719,31 @@ function extended(signature) {
     return (/[\\\u0080-\uffff]/.test(signature.returns) ||
         signature.parameters.some((parameter) => /[\\\u0080-\uffff]/.test(parameter.name + (parameter.syntax ?? '*'))));
 }
+function encode(value) {
+    if (Token.is(value))
+        return {
+            $variable: {
+                identity: value.contract[Token.identity],
+                path: value.path,
+                value: encode(value.value),
+            },
+        };
+    if (Array.isArray(value))
+        return value.map(encode);
+    if (!value || typeof value !== 'object')
+        return value;
+    const fields = Object.fromEntries(Object.entries(value).map(([key, value]) => [key, encode(value)]));
+    return Object.hasOwn(fields, '$variable') || Object.hasOwn(fields, '$object')
+        ? { $object: fields }
+        : fields;
+}
+function variableOptions(options, mappings) {
+    const { theme, themes, defaultTheme, ...rest } = options;
+    return {
+        ...rest,
+        vars: (themes ?? theme),
+        ...(themes ? { defaultVars: String(defaultTheme) } : {}),
+        ...(mappings !== undefined ? { mappings } : {}),
+    };
+}
 //# sourceMappingURL=Contract.js.map