dispersa 0.2.0 → 0.3.0

package/dist/builders.d.cts

@@ -1,8 +1,8 @@
-import { M as ModifierInputs, L as LifecycleHooks, C as CssRendererOptions, O as OutputConfig, T as TailwindRendererOptions, I as IosRendererOptions, A as AndroidRendererOptions } from './index-CePv_bgv.cjs';
-import { F as Filter } from './types-BDY1xBmD.cjs';
-import { T as Transform } from './types-DM5faYUn.cjs';
-import { a as JsonRendererOptions, J as JsModuleRendererOptions } from './types-DbufGPrb.cjs';
-import './types-C1GpiJ6q.cjs';
+import { M as ModifierInputs, L as LifecycleHooks, C as CssRendererOptions, O as OutputConfig, T as TailwindRendererOptions, I as IosRendererOptions, A as AndroidRendererOptions } from './index-BkvV7Z54.cjs';
+import { F as Filter } from './types-DWKq-eJj.cjs';
+import { T as Transform } from './types-BAv39mum.cjs';
+import { a as JsonRendererOptions, J as JsModuleRendererOptions } from './types-CussyWwe.cjs';
+import './types-Bc0kA7De.cjs';
 import 'json-schema-to-ts';
 
 /**

package/dist/builders.d.ts

@@ -1,8 +1,8 @@
-import { M as ModifierInputs, L as LifecycleHooks, C as CssRendererOptions, O as OutputConfig, T as TailwindRendererOptions, I as IosRendererOptions, A as AndroidRendererOptions } from './index-BP52gB00.js';
-import { F as Filter } from './types-Cl-1UYGD.js';
-import { T as Transform } from './types-DdPWYkgh.js';
-import { a as JsonRendererOptions, J as JsModuleRendererOptions } from './types-DJH6_4U9.js';
-import './types-C1GpiJ6q.js';
+import { M as ModifierInputs, L as LifecycleHooks, C as CssRendererOptions, O as OutputConfig, T as TailwindRendererOptions, I as IosRendererOptions, A as AndroidRendererOptions } from './index-DJ_UHSQG.js';
+import { F as Filter } from './types-BzNcG-rI.js';
+import { T as Transform } from './types-CzHa7YkW.js';
+import { a as JsonRendererOptions, J as JsModuleRendererOptions } from './types-CZb19kiq.js';
+import './types-Bc0kA7De.js';
 import 'json-schema-to-ts';
 
 /**

package/dist/builders.js

@@ -204,32 +204,55 @@ function filterTokensBySource(tokens, expectedSource) {
   }
   return filtered;
 }
-function interpolatePattern(pattern, modifierInputs, modifierName, context) {
-  let result = pattern;
-  if (modifierName !== void 0) {
-    result = result.replace(/\{modifierName\}/g, modifierName);
+function filterTokensFromSets(tokens) {
+  const filtered = {};
+  for (const [name, token] of Object.entries(tokens)) {
+    const hasModifierSource = typeof token._sourceModifier === "string" && token._sourceModifier !== "";
+    if (!hasModifierSource) {
+      filtered[name] = token;
+    }
   }
-  if (context !== void 0) {
-    result = result.replace(/\{context\}/g, context);
+  return filtered;
+}
+function resolveBaseFileName(fileName, defaults) {
+  if (typeof fileName === "function") {
+    return fileName({ ...defaults, _base: "true" });
+  }
+  if (/\{.+?\}/.test(fileName)) {
+    const baseInputs = Object.fromEntries(Object.keys(defaults).map((k) => [k, "base"]));
+    return collapseBaseSegments(interpolatePattern(fileName, baseInputs));
+  }
+  const extMatch = fileName.match(/(\.[^.]+)$/);
+  const extension = extMatch ? extMatch[1] : "";
+  const baseName = extension ? fileName.slice(0, -extension.length) : fileName;
+  return `${baseName}-base${extension}`;
+}
+function collapseBaseSegments(value) {
+  let result = value;
+  let previous = "";
+  while (result !== previous) {
+    previous = result;
+    result = result.replace(/\bbase([/-])base\b/, "base");
   }
+  return result;
+}
+function interpolatePattern(pattern, modifierInputs) {
+  let result = pattern;
   for (const [key, value] of Object.entries(modifierInputs)) {
     result = result.replaceAll(`{${key}}`, value);
   }
   return result;
 }
-function resolveFileName(fileName, modifierInputs, modifierName, context) {
+function resolveFileName(fileName, modifierInputs) {
   if (typeof fileName === "function") {
     return fileName(modifierInputs);
   }
   if (/\{.+?\}/.test(fileName)) {
-    return interpolatePattern(fileName, modifierInputs, modifierName, context);
+    return interpolatePattern(fileName, modifierInputs);
   }
   const extMatch = fileName.match(/(\.[^.]+)$/);
   const extension = extMatch ? extMatch[1] : "";
   const baseName = extension ? fileName.slice(0, -extension.length) : fileName;
-  if (modifierName !== void 0 && context !== void 0) {
-    return `${baseName}-${modifierName}-${context}${extension}`;
-  }
   const modifierSuffix = Object.entries(modifierInputs).sort(([keyA], [keyB]) => keyA.localeCompare(keyB)).map(([key, value]) => `${key}-${value}`).join("-");
   if (modifierSuffix) {
     return `${baseName}-${modifierSuffix}${extension}`;
@@ -1344,6 +1367,33 @@ function collectRemainder(tokens, included) {
   }
   return result;
 }
+function buildSetLayerBlocks(tokens, resolver) {
+  const blocks = [];
+  const included = /* @__PURE__ */ new Set();
+  const addBlock = (key, blockTokens, description) => {
+    if (Object.keys(blockTokens).length === 0) {
+      return;
+    }
+    for (const k of Object.keys(blockTokens)) {
+      included.add(k);
+    }
+    blocks.push({ key, description, tokens: blockTokens });
+  };
+  for (const item of resolver.resolutionOrder) {
+    const ref = item.$ref;
+    if (typeof ref !== "string" || !ref.startsWith("#/sets/")) {
+      continue;
+    }
+    const setName = ref.slice("#/sets/".length);
+    addBlock(
+      `Set: ${setName}`,
+      collectSetTokens(tokens, setName, included),
+      resolver.sets?.[setName]?.description
+    );
+  }
+  addBlock("Unattributed", collectRemainder(tokens, included));
+  return blocks;
+}
 function buildDefaultLayerBlocks(tokens, baseModifierInputs, resolver) {
   const blocks = [];
   const included = /* @__PURE__ */ new Set();
@@ -2064,6 +2114,10 @@ var CssRenderer = class _CssRenderer {
       throw new ConfigurationError("Modifier preset requires modifiers to be defined in resolver");
     }
     const files = {};
+    const baseResult = await this.buildModifierBaseFile(context, options);
+    if (baseResult) {
+      files[baseResult.fileName] = baseResult.content;
+    }
     for (const [modifierName, modifierDef] of Object.entries(context.resolver.modifiers)) {
       for (const contextValue of Object.keys(modifierDef.contexts)) {
         const result = await this.buildModifierContextFile(
@@ -2079,6 +2133,59 @@ var CssRenderer = class _CssRenderer {
     }
     return { kind: "outputTree", files };
   }
+  async buildModifierBaseFile(context, options) {
+    const basePermutation = context.permutations.find(
+      ({ modifierInputs }) => this.isBasePermutation(modifierInputs, context.meta.defaults)
+    );
+    if (!basePermutation) {
+      return void 0;
+    }
+    const setTokens = filterTokensFromSets(basePermutation.tokens);
+    if (Object.keys(setTokens).length === 0) {
+      return void 0;
+    }
+    const setBlocks = buildSetLayerBlocks(setTokens, context.resolver);
+    if (setBlocks.length === 0) {
+      return void 0;
+    }
+    const modifiers = context.resolver.modifiers;
+    const firstModifierName = Object.keys(modifiers)[0] ?? "";
+    const firstModifierContext = context.meta.defaults[firstModifierName] ?? "";
+    const baseModifierInputs = { ...context.meta.defaults };
+    const selector = resolveSelector(
+      options.selector,
+      firstModifierName,
+      firstModifierContext,
+      true,
+      baseModifierInputs
+    );
+    const mediaQuery = resolveMediaQuery(
+      options.mediaQuery,
+      firstModifierName,
+      firstModifierContext,
+      true,
+      baseModifierInputs
+    );
+    const referenceTokens = basePermutation.tokens;
+    const cssBlocks = [];
+    for (const block of setBlocks) {
+      const cleanTokens = stripInternalMetadata(block.tokens);
+      const css2 = await this.formatTokens(cleanTokens, {
+        selector,
+        mediaQuery,
+        minify: options.minify ?? false,
+        preserveReferences: options.preserveReferences ?? false,
+        referenceTokens
+      });
+      const header = block.description ? `/* ${block.key} */
+/* ${block.description} */` : `/* ${block.key} */`;
+      cssBlocks.push(`${header}
+${css2}`);
+    }
+    const content = cssBlocks.join("\n");
+    const fileName = context.output.file ? resolveBaseFileName(context.output.file, context.meta.defaults) : `${context.output.name}-base.css`;
+    return { fileName, content };
+  }
   collectTokensForModifierContext(modifierName, contextValue, permutations) {
     const expectedSource = `${modifierName}-${contextValue}`;
     let tokensFromSource = {};
@@ -2125,7 +2232,7 @@ var CssRenderer = class _CssRenderer {
       preserveReferences: options.preserveReferences ?? false,
       referenceTokens
     });
-    const fileName = context.output.file ? resolveFileName(context.output.file, modifierInputs, modifierName, contextValue) : buildInMemoryOutputKey({
+    const fileName = context.output.file ? resolveFileName(context.output.file, modifierInputs) : buildInMemoryOutputKey({
       outputName: context.output.name,
       extension: "css",
       modifierInputs,