dispersa 0.4.0 → 0.4.2

package/dist/index.cjs

@@ -44,49 +44,8 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/shared/utils/token-utils.ts
-function formatDeprecationMessage(token, description = "", format = "bracket") {
-  if (token.$deprecated == null || token.$deprecated === false) {
-    return description;
-  }
-  const deprecationMsg = typeof token.$deprecated === "string" ? token.$deprecated : "";
-  if (format === "comment") {
-    const msg = deprecationMsg ? ` ${deprecationMsg}` : "";
-    return `DEPRECATED${msg}`;
-  } else {
-    const msg = deprecationMsg ? `: ${deprecationMsg}` : "";
-    const prefix = `[DEPRECATED${msg}]`;
-    return description ? `${prefix} ${description}` : prefix;
-  }
-}
-function stripInternalTokenMetadata(tokens) {
-  const cleaned = {};
-  for (const [name, token] of Object.entries(tokens)) {
-    const { _isAlias: _alias, _sourceModifier: _source, _sourceSet, ...rest } = token;
-    cleaned[name] = rest;
-  }
-  return cleaned;
-}
-function getSortedTokenEntries(tokens) {
-  return Object.entries(tokens).sort(([nameA], [nameB]) => nameA.localeCompare(nameB));
-}
-function isTokenLike(value) {
-  return typeof value === "object" && value !== null && ("$value" in value || "$ref" in value);
-}
-function getPureAliasReferenceName(value) {
-  if (typeof value !== "string") {
-    return void 0;
-  }
-  const match = /^\{([^}]+)\}$/.exec(value);
-  return match?.[1]?.trim();
-}
-var init_token_utils = __esm({
-  "src/shared/utils/token-utils.ts"() {
-  }
-});
-
 // src/shared/errors/index.ts
-exports.DispersaError = void 0; exports.TokenReferenceError = void 0; exports.CircularReferenceError = void 0; exports.ValidationError = void 0; exports.ColorParseError = void 0; exports.DimensionFormatError = void 0; exports.FileOperationError = void 0; exports.ConfigurationError = void 0; exports.BasePermutationError = void 0; exports.ModifierError = void 0;
+exports.DispersaError = void 0; exports.TokenReferenceError = void 0; exports.CircularReferenceError = void 0; exports.ValidationError = void 0; exports.FileOperationError = void 0; exports.ConfigurationError = void 0; exports.BasePermutationError = void 0; exports.ModifierError = void 0;
 var init_errors = __esm({
   "src/shared/errors/index.ts"() {
     exports.DispersaError = class extends Error {
@@ -137,20 +96,6 @@ var init_errors = __esm({
         this.name = "ValidationError";
       }
     };
-    exports.ColorParseError = class extends exports.DispersaError {
-      constructor(colorValue) {
-        super(`Color parsing failed: '${colorValue}'. Provide a valid CSS color or DTCG color object.`);
-        this.colorValue = colorValue;
-        this.name = "ColorParseError";
-      }
-    };
-    exports.DimensionFormatError = class extends exports.DispersaError {
-      constructor(dimensionValue) {
-        super(`Dimension parsing failed: '${dimensionValue}'. Provide a valid DTCG dimension object.`);
-        this.dimensionValue = dimensionValue;
-        this.name = "DimensionFormatError";
-      }
-    };
     exports.FileOperationError = class extends exports.DispersaError {
       constructor(operation, filePath, originalError) {
         super(`Failed to ${operation} file: ${filePath}. ${originalError.message}`);
@@ -186,6 +131,70 @@ var init_errors = __esm({
   }
 });
 
+// src/shared/utils/token-utils.ts
+function formatDeprecationMessage(token, description = "", format = "bracket") {
+  if (token.$deprecated == null || token.$deprecated === false) {
+    return description;
+  }
+  const deprecationMsg = typeof token.$deprecated === "string" ? token.$deprecated : "";
+  if (format === "comment") {
+    const msg2 = deprecationMsg ? ` ${deprecationMsg}` : "";
+    return `DEPRECATED${msg2}`;
+  }
+  const msg = deprecationMsg ? `: ${deprecationMsg}` : "";
+  const prefix = `[DEPRECATED${msg}]`;
+  return description ? `${prefix} ${description}` : prefix;
+}
+function stripInternalTokenMetadata(tokens) {
+  const cleaned = {};
+  for (const [name, token] of Object.entries(tokens)) {
+    const { _isAlias: _alias, _sourceModifier: _source, _sourceSet, ...rest } = token;
+    cleaned[name] = rest;
+  }
+  return cleaned;
+}
+function getSortedTokenEntries(tokens) {
+  return Object.entries(tokens).sort(([nameA], [nameB]) => nameA.localeCompare(nameB));
+}
+function buildNestedTokenObject(tokens, extractValue) {
+  const result = {};
+  for (const [, token] of getSortedTokenEntries(tokens)) {
+    setNestedValue(result, token.path, extractValue(token));
+  }
+  return result;
+}
+function setNestedValue(root, path7, value) {
+  let current = root;
+  for (let i = 0; i < path7.length - 1; i++) {
+    const part = path7[i];
+    if (part == null) {
+      continue;
+    }
+    if (!(part in current)) {
+      current[part] = {};
+    }
+    current = current[part];
+  }
+  const lastPart = path7[path7.length - 1];
+  if (lastPart != null) {
+    current[lastPart] = value;
+  }
+}
+function isTokenLike(value) {
+  return typeof value === "object" && value !== null && ("$value" in value || "$ref" in value);
+}
+function getPureAliasReferenceName(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const match = /^\{([^}]+)\}$/.exec(value);
+  return match?.[1]?.trim();
+}
+var init_token_utils = __esm({
+  "src/shared/utils/token-utils.ts"() {
+  }
+});
+
 // src/shared/utils/validation-handler.ts
 var ValidationHandler;
 var init_validation_handler = __esm({
@@ -2925,30 +2934,29 @@ var init_validator = __esm({
       validateTokenOrGroup(obj) {
         const hasValue = isTokenLike(obj);
         if (hasValue) {
-          const tokenErrors = this.validateToken(obj);
-          if (tokenErrors.length === 0) {
+          const tokenErrors2 = this.validateToken(obj);
+          if (tokenErrors2.length === 0) {
             return { type: "token", errors: [] };
           }
           return {
             type: "invalid",
-            errors: tokenErrors,
+            errors: tokenErrors2,
             message: "Object has $value/$ref but failed token validation"
           };
-        } else {
-          const groupErrors = this.validateGroup(obj);
-          if (groupErrors.length === 0) {
-            return { type: "group", errors: [] };
-          }
-          const tokenErrors = this.validateToken(obj);
-          if (tokenErrors.length === 0) {
-            return { type: "token", errors: [] };
-          }
-          return {
-            type: "invalid",
-            errors: groupErrors.length < tokenErrors.length ? groupErrors : tokenErrors,
-            message: groupErrors.length < tokenErrors.length ? "Object appears to be a group but failed validation" : "Object appears to be a token but failed validation"
-          };
         }
+        const groupErrors = this.validateGroup(obj);
+        if (groupErrors.length === 0) {
+          return { type: "group", errors: [] };
+        }
+        const tokenErrors = this.validateToken(obj);
+        if (tokenErrors.length === 0) {
+          return { type: "token", errors: [] };
+        }
+        return {
+          type: "invalid",
+          errors: groupErrors.length < tokenErrors.length ? groupErrors : tokenErrors,
+          message: groupErrors.length < tokenErrors.length ? "Object appears to be a group but failed validation" : "Object appears to be a token but failed validation"
+        };
       }
       /**
        * Format AJV errors into readable ValidationError objects
@@ -3143,35 +3151,34 @@ var init_resolver_parser = __esm({
             this.validateSourceReferences(set.sources, `set "${setName}"`, contextMsg);
           }
         }
-        if (resolver.modifiers) {
-          for (const [modifierName, modifier] of Object.entries(resolver.modifiers)) {
-            for (const [contextName, sources] of Object.entries(modifier.contexts)) {
-              this.validateSourceReferences(
-                sources,
-                `modifier "${modifierName}" context "${contextName}"`,
-                contextMsg
-              );
-            }
+        if (!resolver.modifiers) {
+          return;
+        }
+        for (const [modifierName, modifier] of Object.entries(resolver.modifiers)) {
+          for (const [contextName, sources] of Object.entries(modifier.contexts)) {
+            this.validateSourceReferences(
+              sources,
+              `modifier "${modifierName}" context "${contextName}"`,
+              contextMsg
+            );
           }
         }
       }
-      /**
-       * Validate source references in an array
-       */
       validateSourceReferences(sources, location, contextMsg) {
         for (const source of sources) {
-          if (typeof source === "object" && source !== null && "$ref" in source) {
-            const ref = source.$ref;
-            if (ref.startsWith("#/modifiers/")) {
-              this.handleValidationIssue(
-                `Invalid reference in ${location}: "${ref}". Sets and modifier contexts MUST NOT reference modifiers${contextMsg}`
-              );
-            }
-            if (ref.startsWith("#/resolutionOrder/")) {
-              this.handleValidationIssue(
-                `Invalid reference in ${location}: "${ref}". References MUST NOT point to resolutionOrder array items${contextMsg}`
-              );
-            }
+          if (typeof source !== "object" || source === null || !("$ref" in source)) {
+            continue;
+          }
+          const ref = source.$ref;
+          if (ref.startsWith("#/modifiers/")) {
+            this.handleValidationIssue(
+              `Invalid reference in ${location}: "${ref}". Sets and modifier contexts MUST NOT reference modifiers${contextMsg}`
+            );
+          }
+          if (ref.startsWith("#/resolutionOrder/")) {
+            this.handleValidationIssue(
+              `Invalid reference in ${location}: "${ref}". References MUST NOT point to resolutionOrder array items${contextMsg}`
+            );
           }
         }
       }
@@ -3251,15 +3258,14 @@ var init_resolver_loader = __esm({
        * ```
        */
       async load(resolver) {
-        if (typeof resolver === "string") {
-          const absolutePath = path__namespace.resolve(this.options.baseDir, resolver);
-          const resolverDoc = await this.parser.parseFile(absolutePath);
-          const baseDir = path__namespace.dirname(absolutePath);
-          return { resolverDoc, baseDir };
-        } else {
-          const resolverDoc = this.parser.parseInline(resolver);
-          return { resolverDoc, baseDir: this.options.baseDir };
+        if (typeof resolver !== "string") {
+          const resolverDoc2 = this.parser.parseInline(resolver);
+          return { resolverDoc: resolverDoc2, baseDir: this.options.baseDir };
         }
+        const absolutePath = path__namespace.resolve(this.options.baseDir, resolver);
+        const resolverDoc = await this.parser.parseFile(absolutePath);
+        const baseDir = path__namespace.dirname(absolutePath);
+        return { resolverDoc, baseDir };
       }
       /**
        * Load only the resolver document (without base directory)
@@ -3292,6 +3298,35 @@ function sanitizeDataAttributeName(value) {
 function escapeCssString(value) {
   return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\r?\n/g, " ");
 }
+function groupTokensByType(tokens, typeGroupMap) {
+  const groupMap = /* @__PURE__ */ new Map();
+  for (const [, token] of getSortedTokenEntries(tokens)) {
+    const groupName = typeGroupMap[token.$type ?? ""] ?? "Other";
+    const existing = groupMap.get(groupName) ?? [];
+    existing.push(token);
+    groupMap.set(groupName, existing);
+  }
+  return Array.from(groupMap.entries()).map(([name, groupTokens]) => ({
+    name,
+    tokens: groupTokens
+  }));
+}
+function indentStr(width, level) {
+  return " ".repeat(width * level);
+}
+function buildGeneratedFileHeader() {
+  return [
+    "// Generated by Dispersa - do not edit manually",
+    "// https://github.com/timges/dispersa"
+  ].join("\n");
+}
+function toSafeIdentifier(name, keywords, capitalize) {
+  const camel = name.replace(/[-._]+(.)/g, (_, c) => c.toUpperCase()).replace(/[-._]+$/g, "").replace(/^[-._]+/g, "");
+  const cased = capitalize ? camel.charAt(0).toUpperCase() + camel.slice(1) : camel.charAt(0).toLowerCase() + camel.slice(1);
+  const safe = /^\d/.test(cased) ? `_${cased}` : cased;
+  const keyCheck = capitalize ? safe.charAt(0).toLowerCase() + safe.slice(1) : safe;
+  return keywords.has(keyCheck) ? `\`${safe}\`` : safe;
+}
 function normalizeModifierInputs(inputs) {
   const normalized = {};
   for (const [key, value] of Object.entries(inputs)) {
@@ -3299,6 +3334,14 @@ function normalizeModifierInputs(inputs) {
   }
   return normalized;
 }
+function assertFileRequired(buildPath, outputFile, outputName, presetLabel) {
+  const requiresFile = buildPath !== void 0 && buildPath !== "";
+  if (!outputFile && requiresFile) {
+    throw new exports.ConfigurationError(
+      `Output "${outputName}": file is required for ${presetLabel} output`
+    );
+  }
+}
 function buildStablePermutationKey(modifierInputs, dimensions) {
   return dimensions.map((dimension) => `${dimension}=${modifierInputs[dimension] ?? ""}`).join("|");
 }
@@ -3348,14 +3391,18 @@ function generatePermutationKey(modifierInputs, resolver, isBase) {
   }
   return buildStablePermutationKey(normalizedInputs, metadata.dimensions);
 }
-function buildInMemoryOutputKey(params) {
-  const { outputName, extension, modifierInputs, resolver, defaults } = params;
+function isBasePermutation(modifierInputs, defaults) {
   const normalizedInputs = normalizeModifierInputs(modifierInputs);
   const normalizedDefaults = normalizeModifierInputs(defaults);
-  const isBase = Object.entries(normalizedDefaults).every(
-    ([key, value]) => normalizedInputs[key] === value
+  return Object.entries(normalizedDefaults).every(([key, value]) => normalizedInputs[key] === value);
+}
+function buildInMemoryOutputKey(params) {
+  const { outputName, extension, modifierInputs, resolver, defaults } = params;
+  const permutationKey = generatePermutationKey(
+    modifierInputs,
+    resolver,
+    isBasePermutation(modifierInputs, defaults)
   );
-  const permutationKey = generatePermutationKey(modifierInputs, resolver, isBase);
   return `${outputName}-${permutationKey}.${extension}`;
 }
 function buildMetadata(resolver) {
@@ -3477,6 +3524,7 @@ function resolveFileName(fileName, modifierInputs) {
 }
 var init_utils = __esm({
   "src/renderers/bundlers/utils.ts"() {
+    init_errors();
     init_token_utils();
   }
 });
@@ -3486,36 +3534,38 @@ var js_exports = {};
 __export(js_exports, {
   bundleAsJsModule: () => bundleAsJsModule
 });
+function updateStringTracking(state, char) {
+  if (!state.escaped && (char === '"' || char === "'" || char === "`")) {
+    if (!state.inString) {
+      state.inString = true;
+      state.stringChar = char;
+    } else if (char === state.stringChar) {
+      state.inString = false;
+      state.stringChar = "";
+    }
+  }
+  state.escaped = !state.escaped && char === "\\";
+}
 function extractObjectFromJsModule(formattedJs) {
   const assignmentMatch = /const\s+\w+\s*=\s*\{/.exec(formattedJs);
   if (!assignmentMatch) {
     return "{}";
   }
   const startIndex = assignmentMatch.index + assignmentMatch[0].length - 1;
+  const state = { inString: false, stringChar: "", escaped: false };
   let braceCount = 0;
-  let inString = false;
-  let stringChar = "";
-  let escaped = false;
   for (let i = startIndex; i < formattedJs.length; i++) {
     const char = formattedJs[i];
-    if (!escaped && (char === '"' || char === "'" || char === "`")) {
-      if (!inString) {
-        inString = true;
-        stringChar = char;
-      } else if (char === stringChar) {
-        inString = false;
-        stringChar = "";
-      }
-    }
-    escaped = !escaped && char === "\\";
-    if (!inString) {
-      if (char === "{") {
-        braceCount++;
-      } else if (char === "}") {
-        braceCount--;
-        if (braceCount === 0) {
-          return formattedJs.substring(startIndex, i + 1);
-        }
+    updateStringTracking(state, char);
+    if (state.inString) {
+      continue;
+    }
+    if (char === "{") {
+      braceCount++;
+    } else if (char === "}") {
+      braceCount--;
+      if (braceCount === 0) {
+        return formattedJs.substring(startIndex, i + 1);
       }
     }
   }
@@ -3612,22 +3662,19 @@ __export(json_exports, {
   bundleAsJson: () => bundleAsJson
 });
 async function bundleAsJson(bundleData, resolver, formatTokens) {
+  if (!formatTokens) {
+    throw new exports.ConfigurationError("JSON formatter was not provided");
+  }
   const metadata = buildMetadata(resolver);
   const tokens = {};
   for (const { tokens: tokenSet, modifierInputs } of bundleData) {
     const cleanTokens = stripInternalMetadata(tokenSet);
-    if (!formatTokens) {
-      throw new exports.ConfigurationError("JSON formatter was not provided");
-    }
     const normalizedInputs = normalizeModifierInputs(modifierInputs);
     const key = buildStablePermutationKey(normalizedInputs, metadata.dimensions);
     const themeJson = await formatTokens(cleanTokens);
     tokens[key] = JSON.parse(themeJson);
   }
-  const bundle = {
-    _meta: metadata,
-    tokens
-  };
+  const bundle = { _meta: metadata, tokens };
   return JSON.stringify(bundle, null, 2);
 }
 var init_json = __esm({
@@ -3693,15 +3740,15 @@ var TypeGenerator = class {
     const lines = [];
     if (names.length === 0) {
       lines.push(`export type ${typeName} = never`);
-    } else {
-      lines.push(`export type ${typeName} =`);
-      for (let i = 0; i < names.length; i++) {
-        const name = names[i];
-        if (name == null) {
-          continue;
-        }
-        lines.push(`  | "${name}"`);
+      return lines;
+    }
+    lines.push(`export type ${typeName} =`);
+    for (let i = 0; i < names.length; i++) {
+      const name = names[i];
+      if (name == null) {
+        continue;
       }
+      lines.push(`  | "${name}"`);
     }
     return lines;
   }
@@ -3727,15 +3774,10 @@ var TypeGenerator = class {
   generateStructureType(tokens, options) {
     const lines = [];
     const structure = this.buildNestedStructure(tokens);
-    if (options.exportType === "type") {
-      lines.push(`export type ${options.moduleName} = {`);
-      this.addStructureProperties(lines, structure, 1);
-      lines.push("}");
-    } else {
-      lines.push(`export interface ${options.moduleName} {`);
-      this.addStructureProperties(lines, structure, 1);
-      lines.push("}");
-    }
+    const opener = options.exportType === "type" ? `export type ${options.moduleName} = {` : `export interface ${options.moduleName} {`;
+    lines.push(opener);
+    this.addStructureProperties(lines, structure, 1);
+    lines.push("}");
     return lines;
   }
   /**
@@ -3769,20 +3811,20 @@ var TypeGenerator = class {
   /**
    * Add structure properties to lines
    */
-  addStructureProperties(lines, structure, indent2) {
-    const indentStr = "  ".repeat(indent2);
+  addStructureProperties(lines, structure, indent) {
+    const indentStr2 = "  ".repeat(indent);
     for (const [key, value] of Object.entries(structure)) {
       if (this.isToken(value)) {
         const token = value;
         if (token.$description) {
-          lines.push(`${indentStr}/** ${token.$description} */`);
+          lines.push(`${indentStr2}/** ${token.$description} */`);
         }
         const valueType = this.inferValueType(token);
-        lines.push(`${indentStr}${this.quoteKey(key)}: ${valueType}`);
+        lines.push(`${indentStr2}${this.quoteKey(key)}: ${valueType}`);
       } else {
-        lines.push(`${indentStr}${this.quoteKey(key)}: {`);
-        this.addStructureProperties(lines, value, indent2 + 1);
-        lines.push(`${indentStr}}`);
+        lines.push(`${indentStr2}${this.quoteKey(key)}: {`);
+        this.addStructureProperties(lines, value, indent + 1);
+        lines.push(`${indentStr2}}`);
       }
     }
   }
@@ -3907,12 +3949,6 @@ function toBuildError(error, outputName) {
   if (error instanceof exports.ValidationError) {
     return { message, code: "VALIDATION", severity: "error" };
   }
-  if (error instanceof exports.ColorParseError) {
-    return { message, code: "COLOR_PARSE", severity: "error" };
-  }
-  if (error instanceof exports.DimensionFormatError) {
-    return { message, code: "DIMENSION_FORMAT", severity: "error" };
-  }
   if (error instanceof exports.FileOperationError) {
     return { message, code: "FILE_OPERATION", path: error.filePath, severity: "error" };
   }
@@ -3980,28 +4016,27 @@ var BuildOrchestrator = class {
     if (config.hooks?.onBuildStart) {
       await config.hooks.onBuildStart({ config, resolver });
     }
-    let permutations;
-    if (config.permutations && config.permutations.length > 0) {
-      permutations = await Promise.all(
-        config.permutations.map(async (modifierInputs) => {
-          const { tokens, modifierInputs: resolvedInputs } = await this.pipeline.resolve(
-            resolver,
-            modifierInputs,
-            config.transforms,
-            config.preprocessors,
-            config.filters
-          );
-          return { tokens, modifierInputs: resolvedInputs };
-        })
-      );
-    } else {
-      permutations = await this.pipeline.resolveAllPermutations(
+    if (!config.permutations || config.permutations.length === 0) {
+      const permutations2 = await this.pipeline.resolveAllPermutations(
         resolver,
         config.transforms,
         config.preprocessors,
         config.filters
       );
+      return this.executeBuild(buildPath, config, permutations2, resolver);
     }
+    const permutations = await Promise.all(
+      config.permutations.map(async (modifierInputs) => {
+        const { tokens, modifierInputs: resolvedInputs } = await this.pipeline.resolve(
+          resolver,
+          modifierInputs,
+          config.transforms,
+          config.preprocessors,
+          config.filters
+        );
+        return { tokens, modifierInputs: resolvedInputs };
+      })
+    );
     return this.executeBuild(buildPath, config, permutations, resolver);
   }
   /**
@@ -4023,44 +4058,15 @@ var BuildOrchestrator = class {
    * @returns Build result with success status, outputs, and any errors
    */
   async executeBuild(buildPath, config, permutations, resolver) {
-    const outputs = [];
-    const errors = [];
     try {
       const resolverDoc = await resolveResolverDocument(resolver);
       const metadata = buildMetadata(resolverDoc);
-      const basePermutation = metadata.defaults;
       const settled = await Promise.allSettled(
-        config.outputs.map(async (output) => {
-          if (output.hooks?.onBuildStart) {
-            await output.hooks.onBuildStart({ config, resolver });
-          }
-          try {
-            const results = await this.processOutput(output, permutations, resolverDoc, metadata, basePermutation, buildPath);
-            if (output.hooks?.onBuildEnd) {
-              await output.hooks.onBuildEnd({ success: true, outputs: results });
-            }
-            return results;
-          } catch (error) {
-            if (output.hooks?.onBuildEnd) {
-              await output.hooks.onBuildEnd({ success: false, outputs: [], errors: [toBuildError(error, output.name)] });
-            }
-            throw error;
-          }
-        })
+        config.outputs.map(
+          (output) => this.buildSingleOutput(output, permutations, resolverDoc, metadata, buildPath, config, resolver)
+        )
       );
-      for (let i = 0; i < settled.length; i++) {
-        const outcome = settled[i];
-        if (outcome.status === "fulfilled") {
-          outputs.push(...outcome.value);
-        } else {
-          errors.push(toBuildError(outcome.reason, config.outputs[i].name));
-        }
-      }
-      const result = {
-        success: errors.length === 0,
-        outputs,
-        errors: errors.length > 0 ? errors : void 0
-      };
+      const result = this.collectSettledResults(settled, config);
       if (config.hooks?.onBuildEnd) {
         await config.hooks.onBuildEnd(result);
       }
@@ -4077,6 +4083,40 @@ var BuildOrchestrator = class {
       return result;
     }
   }
+  async buildSingleOutput(output, permutations, resolverDoc, metadata, buildPath, config, resolver) {
+    if (output.hooks?.onBuildStart) {
+      await output.hooks.onBuildStart({ config, resolver });
+    }
+    try {
+      const results = await this.processOutput(output, permutations, resolverDoc, metadata, metadata.defaults, buildPath);
+      if (output.hooks?.onBuildEnd) {
+        await output.hooks.onBuildEnd({ success: true, outputs: results });
+      }
+      return results;
+    } catch (error) {
+      if (output.hooks?.onBuildEnd) {
+        await output.hooks.onBuildEnd({ success: false, outputs: [], errors: [toBuildError(error, output.name)] });
+      }
+      throw error;
+    }
+  }
+  collectSettledResults(settled, config) {
+    const outputs = [];
+    const errors = [];
+    for (let i = 0; i < settled.length; i++) {
+      const outcome = settled[i];
+      if (outcome.status === "fulfilled") {
+        outputs.push(...outcome.value);
+      } else {
+        errors.push(toBuildError(outcome.reason, config.outputs[i].name));
+      }
+    }
+    return {
+      success: errors.length === 0,
+      outputs,
+      errors: errors.length > 0 ? errors : void 0
+    };
+  }
   async processOutput(output, permutations, resolverDoc, metadata, basePermutation, buildPath) {
     if (!output.renderer.format) {
       throw new exports.ConfigurationError("Renderer does not implement format()");
@@ -4126,7 +4166,7 @@ async function writeOutputFile(fileName, content, encoding = "utf-8") {
   }
 }
 
-// src/processing/token-modifier.ts
+// src/processing/apply.ts
 function applyTransforms(tokens, transformList) {
   const result = {};
   for (const [name, token] of Object.entries(tokens)) {
@@ -5404,14 +5444,15 @@ var ResolutionEngine = class {
   mergeTokens(target, source) {
     const result = { ...target };
     for (const [key, value] of Object.entries(source)) {
-      if (typeof value === "object" && value !== null && !Array.isArray(value) && !("$value" in value)) {
-        result[key] = this.mergeTokens(
-          result[key] ?? {},
-          value
-        );
-      } else {
+      const isGroup = typeof value === "object" && value !== null && !Array.isArray(value) && !("$value" in value);
+      if (!isGroup) {
         result[key] = value;
+        continue;
       }
+      result[key] = this.mergeTokens(
+        result[key] ?? {},
+        value
+      );
     }
     return result;
   }
@@ -6557,7 +6598,7 @@ function colorObjectToHex(color) {
   return culori.formatHex(culoriColor);
 }
 
-// src/processing/processors/transforms/built-in/dimension-converter.ts
+// src/processing/transforms/built-in/dimension-converter.ts
 function isDimensionObject(value) {
   return typeof value === "object" && value !== null && "value" in value && "unit" in value;
 }
@@ -6565,6 +6606,14 @@ function dimensionObjectToString(dimension) {
   return `${dimension.value}${dimension.unit}`;
 }
 
+// src/processing/transforms/built-in/duration-converter.ts
+function isDurationObject(value) {
+  return typeof value === "object" && value !== null && "value" in value && "unit" in value && value.unit !== void 0;
+}
+function durationObjectToString(duration) {
+  return `${duration.value}${duration.unit}`;
+}
+
 // src/renderers/android.ts
 init_errors();
 init_token_utils();
@@ -6616,9 +6665,6 @@ function resolveColorFormat(format) {
   }
   return "argb_hex";
 }
-function indent(width, level) {
-  return " ".repeat(width * level);
-}
 function escapeKotlinString(str) {
   return str.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\$/g, "\\$");
 }
@@ -6634,22 +6680,6 @@ function roundComponent(value) {
 function toResourceName(family) {
   return family.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_|_$/g, "");
 }
-function toPascalCase(name) {
-  const pascal = name.replace(/[-._]+(.)/g, (_, c) => c.toUpperCase()).replace(/[-._]+$/g, "").replace(/^[-._]+/g, "");
-  const result = pascal.charAt(0).toUpperCase() + pascal.slice(1);
-  if (/^\d/.test(result)) {
-    return `_${result}`;
-  }
-  return KOTLIN_KEYWORDS.has(result.charAt(0).toLowerCase() + result.slice(1)) ? `\`${result}\`` : result;
-}
-function toKotlinIdentifier(name) {
-  const camel = name.replace(/[-._]+(.)/g, (_, c) => c.toUpperCase()).replace(/[-._]+$/g, "").replace(/^[-._]+/g, "");
-  const identifier = camel.charAt(0).toLowerCase() + camel.slice(1);
-  if (/^\d/.test(identifier)) {
-    return `_${identifier}`;
-  }
-  return KOTLIN_KEYWORDS.has(identifier) ? `\`${identifier}\`` : identifier;
-}
 var AndroidRenderer = class {
   async format(context, options) {
     if (!options?.packageName) {
@@ -6657,6 +6687,7 @@ var AndroidRenderer = class {
         `Output "${context.output.name}": packageName is required for Android output`
       );
     }
+    const visibility = options?.visibility;
     const opts = {
       preset: options?.preset ?? "standalone",
       packageName: options.packageName,
@@ -6664,7 +6695,8 @@ var AndroidRenderer = class {
       colorFormat: resolveColorFormat(options?.colorFormat),
       colorSpace: options?.colorSpace ?? "sRGB",
       structure: options?.structure ?? "nested",
-      visibility: options?.visibility,
+      visibility,
+      visPrefix: visibility ? `${visibility} ` : "",
       indent: options?.indent ?? 4
     };
     if (opts.preset === "bundle") {
@@ -6697,19 +6729,6 @@ var AndroidRenderer = class {
   // -----------------------------------------------------------------------
   // Flat structure grouping
   // -----------------------------------------------------------------------
-  groupTokensByType(tokens) {
-    const groupMap = /* @__PURE__ */ new Map();
-    for (const [, token] of getSortedTokenEntries(tokens)) {
-      const groupName = KOTLIN_TYPE_GROUP_MAP[token.$type ?? ""] ?? "Other";
-      const existing = groupMap.get(groupName) ?? [];
-      existing.push(token);
-      groupMap.set(groupName, existing);
-    }
-    return Array.from(groupMap.entries()).map(([name, groupTokens]) => ({
-      name,
-      tokens: groupTokens
-    }));
-  }
   /**
    * Builds a flattened camelCase name from a token's path, stripping the
    * type prefix segment (which is already represented by the group object).
@@ -6718,7 +6737,7 @@ var AndroidRenderer = class {
     const path7 = token.path;
     const withoutTypePrefix = path7.length > 1 ? path7.slice(1) : path7;
     const joined = withoutTypePrefix.join("_");
-    return toKotlinIdentifier(joined);
+    return toSafeIdentifier(joined, KOTLIN_KEYWORDS, false);
   }
   // -----------------------------------------------------------------------
   // Rendering
@@ -6730,22 +6749,21 @@ var AndroidRenderer = class {
     return this.formatAsNested(tokens, options);
   }
   formatAsNested(tokens, options) {
+    const tokenTypes = this.collectTokenTypesFromEntries(tokens);
     const tree = this.buildTokenTree(tokens);
-    const tokenTypes = /* @__PURE__ */ new Set();
-    this.collectTokenTypes(tree, tokenTypes);
-    return this.buildFile(tokenTypes, options, (lines, vis) => {
+    return this.buildFile(tokenTypes, options, (lines) => {
       lines.push(`@Suppress("unused")`);
-      lines.push(`${vis}object ${options.objectName} {`);
+      lines.push(`${options.visPrefix}object ${options.objectName} {`);
       this.renderTreeChildren(lines, tree, 1, options);
       lines.push("}");
     });
   }
   formatAsFlat(tokens, options) {
-    const groups = this.groupTokensByType(tokens);
+    const groups = groupTokensByType(tokens, KOTLIN_TYPE_GROUP_MAP);
     const tokenTypes = this.collectTokenTypesFromEntries(tokens);
-    return this.buildFile(tokenTypes, options, (lines, vis) => {
+    return this.buildFile(tokenTypes, options, (lines) => {
       lines.push(`@Suppress("unused")`);
-      lines.push(`${vis}object ${options.objectName} {`);
+      lines.push(`${options.visPrefix}object ${options.objectName} {`);
       this.renderFlatGroups(lines, groups, 1, options);
       lines.push("}");
     });
@@ -6756,9 +6774,8 @@ var AndroidRenderer = class {
    */
   buildFile(tokenTypes, options, renderBody) {
     const imports = this.collectImports(tokenTypes, options);
-    const vis = options.visibility ? `${options.visibility} ` : "";
     const lines = [];
-    lines.push(this.buildFileHeader());
+    lines.push(buildGeneratedFileHeader());
     lines.push("");
     lines.push(`package ${options.packageName}`);
     lines.push("");
@@ -6769,19 +6786,18 @@ var AndroidRenderer = class {
       lines.push("");
     }
     if (tokenTypes.has("shadow")) {
-      lines.push(...this.buildShadowTokenClass(vis, options));
+      lines.push(...this.buildShadowTokenClass(options));
       lines.push("");
     }
-    renderBody(lines, vis);
+    renderBody(lines);
     lines.push("");
     return lines.join("\n");
   }
   renderFlatGroups(lines, groups, baseDepth, options) {
-    const vis = options.visibility ? `${options.visibility} ` : "";
-    const groupIndent = indent(options.indent, baseDepth);
-    const valIndent = indent(options.indent, baseDepth + 1);
+    const groupIndent = indentStr(options.indent, baseDepth);
+    const valIndent = indentStr(options.indent, baseDepth + 1);
     for (const group of groups) {
-      lines.push(`${groupIndent}${vis}object ${group.name} {`);
+      lines.push(`${groupIndent}${options.visPrefix}object ${group.name} {`);
       for (const token of group.tokens) {
         const kotlinName = this.buildFlatKotlinName(token);
         const kotlinValue = this.formatKotlinValue(token, options, baseDepth + 1);
@@ -6789,23 +6805,24 @@ var AndroidRenderer = class {
         if (token.$description) {
           lines.push(`${valIndent}/** ${escapeKDoc(token.$description)} */`);
         }
-        lines.push(`${valIndent}${vis}val ${kotlinName}${annotation} = ${kotlinValue}`);
+        lines.push(
+          `${valIndent}${options.visPrefix}val ${kotlinName}${annotation} = ${kotlinValue}`
+        );
       }
       lines.push(`${groupIndent}}`);
       lines.push("");
     }
   }
   renderTreeChildren(lines, node, depth, options) {
-    const vis = options.visibility ? `${options.visibility} ` : "";
-    const pad = indent(options.indent, depth);
+    const pad = indentStr(options.indent, depth);
     const entries = Array.from(node.children.entries());
     for (let idx = 0; idx < entries.length; idx++) {
       const [key, child] = entries[idx];
       if (child.token && child.children.size === 0) {
         this.renderLeaf(lines, key, child.token, depth, options);
       } else if (child.children.size > 0 && !child.token) {
-        const objectName = toPascalCase(key);
-        lines.push(`${pad}${vis}object ${objectName} {`);
+        const objectName = toSafeIdentifier(key, KOTLIN_KEYWORDS, true);
+        lines.push(`${pad}${options.visPrefix}object ${objectName} {`);
         this.renderTreeChildren(lines, child, depth + 1, options);
         lines.push(`${pad}}`);
         if (idx < entries.length - 1) {
@@ -6818,30 +6835,23 @@ var AndroidRenderer = class {
     }
   }
   renderLeaf(lines, key, token, depth, options) {
-    const vis = options.visibility ? `${options.visibility} ` : "";
-    const pad = indent(options.indent, depth);
-    const kotlinName = toKotlinIdentifier(key);
+    const pad = indentStr(options.indent, depth);
+    const kotlinName = toSafeIdentifier(key, KOTLIN_KEYWORDS, false);
     const kotlinValue = this.formatKotlinValue(token, options, depth);
     const annotation = this.typeAnnotationSuffix(token);
     if (token.$description) {
       lines.push(`${pad}/** ${escapeKDoc(token.$description)} */`);
     }
-    lines.push(`${pad}${vis}val ${kotlinName}${annotation} = ${kotlinValue}`);
-  }
-  buildFileHeader() {
-    return [
-      "// Generated by Dispersa - do not edit manually",
-      "// https://github.com/timges/dispersa"
-    ].join("\n");
+    lines.push(`${pad}${options.visPrefix}val ${kotlinName}${annotation} = ${kotlinValue}`);
   }
   // -----------------------------------------------------------------------
   // Shadow data class
   // -----------------------------------------------------------------------
-  buildShadowTokenClass(vis, options) {
-    const i1 = indent(options.indent, 1);
+  buildShadowTokenClass(options) {
+    const i1 = indentStr(options.indent, 1);
     return [
       "@Immutable",
-      `${vis}data class ShadowToken(`,
+      `${options.visPrefix}data class ShadowToken(`,
       `${i1}val color: Color,`,
       `${i1}val elevation: Dp,`,
       `${i1}val offsetX: Dp,`,
@@ -6892,14 +6902,6 @@ var AndroidRenderer = class {
     }
     return Array.from(imports).sort();
   }
-  collectTokenTypes(node, types) {
-    if (node.token?.$type) {
-      types.add(node.token.$type);
-    }
-    for (const child of node.children.values()) {
-      this.collectTokenTypes(child, types);
-    }
-  }
   collectTokenTypesFromEntries(tokens) {
     const types = /* @__PURE__ */ new Set();
     for (const [, token] of Object.entries(tokens)) {
@@ -7126,9 +7128,8 @@ var AndroidRenderer = class {
     return map[name.toLowerCase()];
   }
   formatDurationValue(value) {
-    if (typeof value === "object" && value !== null && "value" in value && "unit" in value) {
-      const dur = value;
-      return dur.unit === "ms" ? `${dur.value}.milliseconds` : `${dur.value}.seconds`;
+    if (isDurationObject(value)) {
+      return value.unit === "ms" ? `${value.value}.milliseconds` : `${value.value}.seconds`;
     }
     return typeof value === "number" ? `${value}.milliseconds` : "0.milliseconds";
   }
@@ -7146,8 +7147,8 @@ var AndroidRenderer = class {
     const elevation = isDimensionObject(shadow.blur) ? this.formatDimensionValue(shadow.blur) : "0.dp";
     const offsetX = isDimensionObject(shadow.offsetX) ? this.formatDimensionValue(shadow.offsetX) : "0.dp";
     const offsetY = isDimensionObject(shadow.offsetY) ? this.formatDimensionValue(shadow.offsetY) : "0.dp";
-    const propIndent = indent(options.indent, depth + 1);
-    const closeIndent = indent(options.indent, depth);
+    const propIndent = indentStr(options.indent, depth + 1);
+    const closeIndent = indentStr(options.indent, depth);
     return [
       "ShadowToken(",
       `${propIndent}color = ${color},`,
@@ -7196,8 +7197,8 @@ var AndroidRenderer = class {
     if (parts.length === 0) {
       return "TextStyle()";
     }
-    const propIndent = indent(options.indent, depth + 1);
-    const closeIndent = indent(options.indent, depth);
+    const propIndent = indentStr(options.indent, depth + 1);
+    const closeIndent = indentStr(options.indent, depth);
     return `TextStyle(
 ${parts.map((p) => `${propIndent}${p}`).join(",\n")},
 ${closeIndent})`;
@@ -7206,12 +7207,12 @@ ${closeIndent})`;
   // Output: standalone
   // -----------------------------------------------------------------------
   async formatStandalone(context, options) {
-    const requiresFile = context.buildPath !== void 0 && context.buildPath !== "";
-    if (!context.output.file && requiresFile) {
-      throw new exports.ConfigurationError(
-        `Output "${context.output.name}": file is required for standalone Android output`
-      );
-    }
+    assertFileRequired(
+      context.buildPath,
+      context.output.file,
+      context.output.name,
+      "standalone Android"
+    );
     const files = {};
     for (const { tokens, modifierInputs } of context.permutations) {
       const processedTokens = stripInternalMetadata(tokens);
@@ -7231,12 +7232,12 @@ ${closeIndent})`;
   // Output: bundle
   // -----------------------------------------------------------------------
   async formatBundle(context, options) {
-    const requiresFile = context.buildPath !== void 0 && context.buildPath !== "";
-    if (!context.output.file && requiresFile) {
-      throw new exports.ConfigurationError(
-        `Output "${context.output.name}": file is required for bundle Android output`
-      );
-    }
+    assertFileRequired(
+      context.buildPath,
+      context.output.file,
+      context.output.name,
+      "bundle Android"
+    );
     const content = this.formatBundleContent(context, options);
     const fileName = context.output.file ? resolveFileName(context.output.file, context.meta.basePermutation) : buildInMemoryOutputKey({
       outputName: context.output.name,
@@ -7249,15 +7250,15 @@ ${closeIndent})`;
   }
   formatBundleContent(context, options) {
     const allTokenTypes = this.collectAllPermutationTypes(context);
-    return this.buildFile(allTokenTypes, options, (lines, vis) => {
-      const i1 = indent(options.indent, 1);
+    return this.buildFile(allTokenTypes, options, (lines) => {
+      const i1 = indentStr(options.indent, 1);
       lines.push(`@Suppress("unused")`);
-      lines.push(`${vis}object ${options.objectName} {`);
+      lines.push(`${options.visPrefix}object ${options.objectName} {`);
       for (let idx = 0; idx < context.permutations.length; idx++) {
         const { tokens, modifierInputs } = context.permutations[idx];
         const processedTokens = stripInternalMetadata(tokens);
         const permName = this.buildPermutationName(modifierInputs);
-        lines.push(`${i1}${vis}object ${permName} {`);
+        lines.push(`${i1}${options.visPrefix}object ${permName} {`);
         this.renderBundleTokens(lines, processedTokens, options, 2);
         lines.push(`${i1}}`);
         if (idx < context.permutations.length - 1) {
@@ -7268,20 +7269,17 @@ ${closeIndent})`;
     });
   }
   collectAllPermutationTypes(context) {
-    const allTokenTypes = /* @__PURE__ */ new Set();
+    const types = /* @__PURE__ */ new Set();
     for (const { tokens } of context.permutations) {
-      const processed = stripInternalMetadata(tokens);
-      for (const [, token] of Object.entries(processed)) {
-        if (token.$type) {
-          allTokenTypes.add(token.$type);
-        }
+      for (const t of this.collectTokenTypesFromEntries(stripInternalMetadata(tokens))) {
+        types.add(t);
       }
     }
-    return allTokenTypes;
+    return types;
   }
   renderBundleTokens(lines, tokens, options, baseDepth) {
     if (options.structure === "flat") {
-      const groups = this.groupTokensByType(tokens);
+      const groups = groupTokensByType(tokens, KOTLIN_TYPE_GROUP_MAP);
       this.renderFlatGroups(lines, groups, baseDepth, options);
       return;
     }
@@ -7293,7 +7291,7 @@ ${closeIndent})`;
     if (values.length === 0) {
       return "Default";
     }
-    return values.map((v) => toPascalCase(v)).join("");
+    return values.map((v) => toSafeIdentifier(v, KOTLIN_KEYWORDS, true)).join("");
   }
 };
 function androidRenderer() {
@@ -7313,19 +7311,19 @@ init_token_utils();
 // src/renderers/bundlers/css.ts
 init_errors();
 init_utils();
+var REF_PREFIX_SETS = "#/sets/";
+var REF_PREFIX_MODIFIERS = "#/modifiers/";
 var getSourceSet = (token) => {
   if (typeof token !== "object" || token === null) {
     return void 0;
   }
-  const maybe = token;
-  return typeof maybe._sourceSet === "string" ? maybe._sourceSet : void 0;
+  return "_sourceSet" in token && typeof token._sourceSet === "string" ? token._sourceSet : void 0;
 };
 var getSourceModifier = (token) => {
   if (typeof token !== "object" || token === null) {
     return void 0;
   }
-  const maybe = token;
-  return typeof maybe._sourceModifier === "string" ? maybe._sourceModifier : void 0;
+  return "_sourceModifier" in token && typeof token._sourceModifier === "string" ? token._sourceModifier : void 0;
 };
 async function bundleAsCss(bundleData, resolver, options, formatTokens) {
   const baseItem = bundleData.find((item) => item.isBase);
@@ -7410,6 +7408,15 @@ async function formatModifierPermutation({ tokens, modifierInputs }, baseItem, o
   return `/* Modifier: ${modifier}=${context} */
 ${css2}`;
 }
+function addLayerBlock(blocks, included, 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 });
+}
 function collectSetTokens(tokens, setName, included) {
   const result = {};
   for (const [name, token] of Object.entries(tokens)) {
@@ -7440,75 +7447,67 @@ function collectRemainder(tokens, included) {
 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/")) {
+    if (typeof ref !== "string" || !ref.startsWith(REF_PREFIX_SETS)) {
       continue;
     }
-    const setName = ref.slice("#/sets/".length);
-    addBlock(
+    const setName = ref.slice(REF_PREFIX_SETS.length);
+    addLayerBlock(
+      blocks,
+      included,
       `Set: ${setName}`,
       collectSetTokens(tokens, setName, included),
       resolver.sets?.[setName]?.description
     );
   }
-  addBlock("Unattributed", collectRemainder(tokens, included));
+  addLayerBlock(blocks, included, "Unattributed", collectRemainder(tokens, included));
   return blocks;
 }
 function buildDefaultLayerBlocks(tokens, baseModifierInputs, resolver) {
   const blocks = [];
   const included = /* @__PURE__ */ new Set();
   const baseInputs = normalizeModifierInputs(baseModifierInputs);
-  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") {
       continue;
     }
-    if (ref.startsWith("#/sets/")) {
-      const setName = ref.slice("#/sets/".length);
-      addBlock(
-        `Set: ${setName}`,
-        collectSetTokens(tokens, setName, included),
-        resolver.sets?.[setName]?.description
-      );
-      continue;
-    }
-    if (ref.startsWith("#/modifiers/")) {
-      const modifierName = ref.slice("#/modifiers/".length);
-      const modifier = resolver.modifiers?.[modifierName];
-      const selectedContext = baseInputs[modifierName.toLowerCase()];
-      if (!modifier || !selectedContext) {
-        continue;
-      }
-      const expectedSource = `${modifierName}-${selectedContext}`.toLowerCase();
-      addBlock(
-        `Modifier: ${modifierName}=${selectedContext} (default)`,
-        collectModifierTokens(tokens, expectedSource, included),
-        modifier.description
-      );
-    }
+    processResolutionOrderRef(ref, tokens, blocks, included, baseInputs, resolver);
   }
-  addBlock("Unattributed", collectRemainder(tokens, included));
+  addLayerBlock(blocks, included, "Unattributed", collectRemainder(tokens, included));
   return blocks;
 }
+function processResolutionOrderRef(ref, tokens, blocks, included, baseInputs, resolver) {
+  if (ref.startsWith(REF_PREFIX_SETS)) {
+    const setName = ref.slice(REF_PREFIX_SETS.length);
+    addLayerBlock(
+      blocks,
+      included,
+      `Set: ${setName}`,
+      collectSetTokens(tokens, setName, included),
+      resolver.sets?.[setName]?.description
+    );
+    return;
+  }
+  if (!ref.startsWith(REF_PREFIX_MODIFIERS)) {
+    return;
+  }
+  const modifierName = ref.slice(REF_PREFIX_MODIFIERS.length);
+  const modifier = resolver.modifiers?.[modifierName];
+  const selectedContext = baseInputs[modifierName.toLowerCase()];
+  if (!modifier || !selectedContext) {
+    return;
+  }
+  const expectedSource = `${modifierName}-${selectedContext}`.toLowerCase();
+  addLayerBlock(
+    blocks,
+    included,
+    `Modifier: ${modifierName}=${selectedContext} (default)`,
+    collectModifierTokens(tokens, expectedSource, included),
+    modifier.description
+  );
+}
 function findSingleDiffPermutation(bundleData, modifierName, context, baseInputs) {
   const normalizedModifier = modifierName.toLowerCase();
   const normalizedContext = context.toLowerCase();
@@ -7523,35 +7522,19 @@ function findSingleDiffPermutation(bundleData, modifierName, context, baseInputs
     return Object.entries(baseInputs).every(([k, v]) => k === normalizedModifier || inputs[k] === v);
   });
 }
-function orderBundleData(bundleData, resolver, baseItem) {
-  const modifiers = resolver.modifiers;
-  if (!modifiers) {
-    return bundleData;
+function pushUniqueBundleItem(ordered, includedKeys, item) {
+  if (!item) {
+    return;
   }
-  const baseInputs = normalizeModifierInputs(baseItem.modifierInputs);
-  const orderedModifierNames = getOrderedModifierNames(resolver);
-  if (orderedModifierNames.length === 0) {
-    return bundleData;
+  const key = stableInputsKey(item.modifierInputs);
+  if (includedKeys.has(key)) {
+    return;
   }
-  const firstModifierDef = modifiers[orderedModifierNames[0] ?? ""];
-  if (!firstModifierDef) {
-    return bundleData;
-  }
-  const includedKeys = /* @__PURE__ */ new Set();
-  const ordered = [];
-  const pushUnique = (item) => {
-    if (!item) {
-      return;
-    }
-    const key = stableInputsKey(item.modifierInputs);
-    if (includedKeys.has(key)) {
-      return;
-    }
-    includedKeys.add(key);
-    ordered.push(item);
-  };
-  pushUnique(baseItem);
-  for (const modifierName of orderedModifierNames) {
+  includedKeys.add(key);
+  ordered.push(item);
+}
+function appendModifierPermutations(bundleData, modifiers, orderedNames, baseInputs, ordered, includedKeys) {
+  for (const modifierName of orderedNames) {
     const modifierDef = modifiers[modifierName];
     if (!modifierDef) {
       continue;
@@ -7561,9 +7544,39 @@ function orderBundleData(bundleData, resolver, baseItem) {
       if (defaultValue === ctx.toLowerCase()) {
         continue;
       }
-      pushUnique(findSingleDiffPermutation(bundleData, modifierName, ctx, baseInputs));
+      pushUniqueBundleItem(
+        ordered,
+        includedKeys,
+        findSingleDiffPermutation(bundleData, modifierName, ctx, baseInputs)
+      );
     }
   }
+}
+function orderBundleData(bundleData, resolver, baseItem) {
+  const modifiers = resolver.modifiers;
+  if (!modifiers) {
+    return bundleData;
+  }
+  const baseInputs = normalizeModifierInputs(baseItem.modifierInputs);
+  const orderedModifierNames = getOrderedModifierNames(resolver);
+  if (orderedModifierNames.length === 0) {
+    return bundleData;
+  }
+  const firstModifierDef = modifiers[orderedModifierNames[0] ?? ""];
+  if (!firstModifierDef) {
+    return bundleData;
+  }
+  const includedKeys = /* @__PURE__ */ new Set();
+  const ordered = [];
+  pushUniqueBundleItem(ordered, includedKeys, baseItem);
+  appendModifierPermutations(
+    bundleData,
+    modifiers,
+    orderedModifierNames,
+    baseInputs,
+    ordered,
+    includedKeys
+  );
   return ordered.length > 0 ? ordered : bundleData;
 }
 function getOrderedModifierNames(resolver) {
@@ -7575,10 +7588,10 @@ function getOrderedModifierNames(resolver) {
     if (typeof ref !== "string") {
       continue;
     }
-    if (!ref.startsWith("#/modifiers/")) {
+    if (!ref.startsWith(REF_PREFIX_MODIFIERS)) {
       continue;
     }
-    const name = ref.slice("#/modifiers/".length);
+    const name = ref.slice(REF_PREFIX_MODIFIERS.length);
     if (seen.has(name)) {
       continue;
     }
@@ -7649,24 +7662,22 @@ var CssRenderer = class _CssRenderer {
       ...options,
       referenceTokens: options?.referenceTokens ?? tokens
     };
-    const groups = this.groupTokens(tokens, opts);
+    const sortedTokens = getSortedTokenEntries(tokens).map(([, token]) => token);
     const referenceTokens = opts.referenceTokens;
     const lines = [];
-    for (const [selector, groupTokens] of Object.entries(groups)) {
-      this.buildCssBlock(lines, groupTokens, selector, tokens, referenceTokens, opts);
-    }
+    this.buildCssBlock(lines, sortedTokens, opts.selector, tokens, referenceTokens, opts);
     const cssString = lines.join("");
     return opts.minify ? cssString : await this.formatWithPrettier(cssString);
   }
   buildCssBlock(lines, groupTokens, selector, tokens, referenceTokens, opts) {
-    const indent2 = opts.minify ? "" : "  ";
+    const indent = opts.minify ? "" : "  ";
     const newline = opts.minify ? "" : "\n";
     const space = opts.minify ? "" : " ";
     const hasMediaQuery = opts.mediaQuery != null && opts.mediaQuery !== "";
-    const tokenIndent = hasMediaQuery ? indent2 + indent2 : indent2;
+    const tokenIndent = hasMediaQuery ? indent + indent : indent;
     if (hasMediaQuery) {
       lines.push(`@media ${opts.mediaQuery}${space}{${newline}`);
-      lines.push(`${indent2}${selector}${space}{${newline}`);
+      lines.push(`${indent}${selector}${space}{${newline}`);
     } else {
       lines.push(`${selector}${space}{${newline}`);
     }
@@ -7683,21 +7694,21 @@ var CssRenderer = class _CssRenderer {
       );
     }
     if (hasMediaQuery) {
-      lines.push(`${indent2}}${newline}`);
+      lines.push(`${indent}}${newline}`);
     }
     lines.push(`}${newline}${newline}`);
   }
-  pushTokenLines(lines, token, tokens, referenceTokens, preserveReferences, indent2, newline, space) {
+  pushTokenLines(lines, token, tokens, referenceTokens, preserveReferences, indent, newline, space) {
     const entries = this.buildCssEntries(token, tokens, referenceTokens, preserveReferences);
     if (token.$deprecated != null && token.$deprecated !== false) {
       const deprecationMsg = formatDeprecationMessage(token, "", "comment");
-      lines.push(`${indent2}/* ${this.sanitizeCssCommentText(deprecationMsg)} */${newline}`);
+      lines.push(`${indent}/* ${this.sanitizeCssCommentText(deprecationMsg)} */${newline}`);
     }
     if (token.$description && token.$description !== "") {
-      lines.push(`${indent2}/* ${this.sanitizeCssCommentText(token.$description)} */${newline}`);
+      lines.push(`${indent}/* ${this.sanitizeCssCommentText(token.$description)} */${newline}`);
     }
     for (const entry of entries) {
-      lines.push(`${indent2}--${entry.name}:${space}${entry.value};${newline}`);
+      lines.push(`${indent}--${entry.name}:${space}${entry.value};${newline}`);
     }
   }
   async formatWithPrettier(css2) {
@@ -7712,15 +7723,6 @@ var CssRenderer = class _CssRenderer {
       return css2;
     }
   }
-  /**
-   * Group tokens by selector (for theme support)
-   */
-  groupTokens(tokens, options) {
-    const sortedTokens = getSortedTokenEntries(tokens).map(([, token]) => token);
-    return {
-      [options.selector]: sortedTokens
-    };
-  }
   buildCssEntries(token, tokens, referenceTokens, preserveReferences) {
     if (preserveReferences) {
       const refName = getPureAliasReferenceName(token.originalValue);
@@ -7862,7 +7864,7 @@ var CssRenderer = class _CssRenderer {
       leaves.push({ path: path7, value });
       return;
     }
-    if (isColorObject(value) || isDimensionObject(value) || this.isDurationObject(value)) {
+    if (isColorObject(value) || isDimensionObject(value) || isDurationObject(value)) {
       leaves.push({ path: path7, value });
       return;
     }
@@ -7905,8 +7907,8 @@ var CssRenderer = class _CssRenderer {
     if (isDimensionObject(value)) {
       return dimensionObjectToString(value);
     }
-    if (this.isDurationObject(value)) {
-      return this.formatDurationValue(value);
+    if (isDurationObject(value)) {
+      return durationObjectToString(value);
     }
     if (typeof value === "string") {
       return value;
@@ -7969,15 +7971,6 @@ var CssRenderer = class _CssRenderer {
   isPrimitiveValue(value) {
     return typeof value === "string" || typeof value === "number" || typeof value === "boolean";
   }
-  isDurationObject(value) {
-    return typeof value === "object" && value !== null && "value" in value && "unit" in value && value.unit !== void 0;
-  }
-  formatDurationValue(value) {
-    if (typeof value === "string") {
-      return value;
-    }
-    return `${value.value}${value.unit}`;
-  }
   /**
    * Format token value for CSS
    * Handles DTCG 2025.10 object formats for colors and dimensions
@@ -7998,8 +7991,8 @@ var CssRenderer = class _CssRenderer {
       return typeof value === "string" ? value : dimensionObjectToString(value);
     }
     if (type === "duration") {
-      if (this.isDurationObject(value)) {
-        return this.formatDurationValue(value);
+      if (isDurationObject(value)) {
+        return durationObjectToString(value);
       }
       if (typeof value === "string") {
         return value;
@@ -8089,16 +8082,16 @@ var CssRenderer = class _CssRenderer {
    */
   formatTransition(value) {
     const parts = [];
-    if (this.isDurationObject(value.duration)) {
-      parts.push(this.formatDurationValue(value.duration));
+    if (isDurationObject(value.duration)) {
+      parts.push(durationObjectToString(value.duration));
     } else if (value.duration != null) {
       parts.push(String(value.duration));
     }
     if (Array.isArray(value.timingFunction) && value.timingFunction.length === 4) {
       parts.push(`cubic-bezier(${value.timingFunction.join(", ")})`);
     }
-    if (this.isDurationObject(value.delay)) {
-      parts.push(this.formatDurationValue(value.delay));
+    if (isDurationObject(value.delay)) {
+      parts.push(durationObjectToString(value.delay));
     } else if (value.delay != null) {
       parts.push(String(value.delay));
     }
@@ -8108,7 +8101,7 @@ var CssRenderer = class _CssRenderer {
     const bundleData = context.permutations.map(({ tokens, modifierInputs }) => ({
       tokens,
       modifierInputs,
-      isBase: this.isBasePermutation(modifierInputs, context.meta.defaults)
+      isBase: isBasePermutation(modifierInputs, context.meta.defaults)
     }));
     return await bundleAsCss(bundleData, context.resolver, options, async (tokens, resolved) => {
       return await this.formatTokens(tokens, {
@@ -8118,12 +8111,12 @@ var CssRenderer = class _CssRenderer {
     });
   }
   async formatStandalone(context, options) {
-    const requiresFile = context.buildPath !== void 0 && context.buildPath !== "";
-    if (!context.output.file && requiresFile) {
-      throw new exports.ConfigurationError(
-        `Output "${context.output.name}": file is required for standalone CSS output`
-      );
-    }
+    assertFileRequired(
+      context.buildPath,
+      context.output.file,
+      context.output.name,
+      "standalone CSS"
+    );
     const files = {};
     for (const { tokens, modifierInputs } of context.permutations) {
       const { fileName, content } = await this.buildStandaloneFile(
@@ -8137,7 +8130,7 @@ var CssRenderer = class _CssRenderer {
     return { kind: "outputTree", files };
   }
   async buildStandaloneFile(tokens, modifierInputs, context, options) {
-    const isBase = this.isBasePermutation(modifierInputs, context.meta.defaults);
+    const isBase = isBasePermutation(modifierInputs, context.meta.defaults);
     const { modifierName, modifierContext } = this.resolveModifierContext(
       modifierInputs,
       context,
@@ -8174,12 +8167,7 @@ var CssRenderer = class _CssRenderer {
     return { fileName, content };
   }
   async formatModifier(context, options) {
-    const requiresFile = context.buildPath !== void 0 && context.buildPath !== "";
-    if (!context.output.file && requiresFile) {
-      throw new exports.ConfigurationError(
-        `Output "${context.output.name}": file is required for modifier CSS output`
-      );
-    }
+    assertFileRequired(context.buildPath, context.output.file, context.output.name, "modifier CSS");
     if (!context.resolver.modifiers) {
       throw new exports.ConfigurationError("Modifier preset requires modifiers to be defined in resolver");
     }
@@ -8205,7 +8193,7 @@ var CssRenderer = class _CssRenderer {
   }
   async buildModifierBaseFile(context, options) {
     const basePermutation = context.permutations.find(
-      ({ modifierInputs }) => this.isBasePermutation(modifierInputs, context.meta.defaults)
+      ({ modifierInputs }) => isBasePermutation(modifierInputs, context.meta.defaults)
     );
     if (!basePermutation) {
       return void 0;
@@ -8218,25 +8206,40 @@ var CssRenderer = class _CssRenderer {
     if (setBlocks.length === 0) {
       return void 0;
     }
+    const { selector, mediaQuery } = this.resolveBaseModifierContext(context, options);
+    const content = await this.formatSetBlocksCss(
+      setBlocks,
+      basePermutation.tokens,
+      selector,
+      mediaQuery,
+      options
+    );
+    const fileName = context.output.file ? resolveBaseFileName(context.output.file, context.meta.defaults) : `${context.output.name}-base.css`;
+    return { fileName, content };
+  }
+  resolveBaseModifierContext(context, options) {
     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;
+    return {
+      selector: resolveSelector(
+        options.selector,
+        firstModifierName,
+        firstModifierContext,
+        true,
+        baseModifierInputs
+      ),
+      mediaQuery: resolveMediaQuery(
+        options.mediaQuery,
+        firstModifierName,
+        firstModifierContext,
+        true,
+        baseModifierInputs
+      )
+    };
+  }
+  async formatSetBlocksCss(setBlocks, referenceTokens, selector, mediaQuery, options) {
     const cssBlocks = [];
     for (const block of setBlocks) {
       const cleanTokens = stripInternalMetadata(block.tokens);
@@ -8252,9 +8255,7 @@ var CssRenderer = class _CssRenderer {
       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 };
+    return cssBlocks.join("\n");
   }
   collectTokensForModifierContext(modifierName, contextValue, permutations) {
     const expectedSource = `${modifierName}-${contextValue}`;
@@ -8331,13 +8332,6 @@ ${css2}`);
     }
     return { modifierName: "", modifierContext: "" };
   }
-  isBasePermutation(modifierInputs, defaults) {
-    const normalizedInputs = normalizeModifierInputs(modifierInputs);
-    const normalizedDefaults = normalizeModifierInputs(defaults);
-    return Object.entries(normalizedDefaults).every(
-      ([key, value]) => normalizedInputs[key] === value
-    );
-  }
 };
 function cssRenderer() {
   const rendererInstance = new CssRenderer();
@@ -8350,8 +8344,6 @@ function cssRenderer() {
 }
 
 // src/renderers/ios.ts
-init_errors();
-init_token_utils();
 init_utils();
 var toSRGB2 = culori.converter("rgb");
 var toP32 = culori.converter("p3");
@@ -8440,94 +8432,68 @@ var IosRenderer = class {
     return await this.formatStandalone(context, opts);
   }
   formatTokens(tokens, options) {
-    if (options.structure === "grouped") {
-      return this.formatAsGrouped(tokens, options);
-    }
-    return this.formatAsEnum(tokens, options);
-  }
-  formatAsEnum(tokens, options) {
     const access3 = options.accessLevel;
-    const groups = this.groupTokensByType(tokens);
+    const groups = groupTokensByType(tokens, SWIFT_TYPE_GROUP_MAP);
     const imports = this.collectImports(tokens);
-    const i1 = this.indentStr(options.indent, 1);
-    const i2 = this.indentStr(options.indent, 2);
     const staticPrefix = this.staticLetPrefix(options);
     const frozen = this.frozenPrefix(options);
     const lines = [];
-    lines.push(this.buildFileHeader());
+    lines.push(buildGeneratedFileHeader());
     lines.push("");
     for (const imp of imports) {
       lines.push(`import ${imp}`);
     }
     lines.push(...this.buildStructDefinitions(tokens, access3, options));
+    this.pushTokenLayout(lines, groups, options, access3, staticPrefix, frozen);
+    lines.push(...this.buildViewExtensions(tokens, access3, options));
+    if (options.structure !== "grouped") {
+      lines.push("");
+    }
+    return lines.join("\n");
+  }
+  pushTokenLayout(lines, groups, options, access3, staticPrefix, frozen) {
+    const i1 = indentStr(options.indent, 1);
+    const i2 = indentStr(options.indent, 2);
+    if (options.structure === "grouped") {
+      this.pushGroupedLayout(lines, groups, options, access3, i1, i2, staticPrefix, frozen);
+      return;
+    }
     lines.push("");
     lines.push(`${frozen}${access3} enum ${options.enumName} {`);
     for (const group of groups) {
       lines.push(`${i1}${frozen}${access3} enum ${group.name} {`);
-      for (const token of group.tokens) {
-        const swiftName = this.buildQualifiedSwiftName(token);
-        const swiftValue = this.formatSwiftValue(token, options);
-        const typeAnnotation = this.getTypeAnnotation(token);
-        const annotation = typeAnnotation ? `: ${typeAnnotation}` : "";
-        const docComment = this.buildDocComment(token, i2);
-        if (docComment) {
-          lines.push(docComment);
-        }
-        lines.push(`${i2}${access3} ${staticPrefix}${swiftName}${annotation} = ${swiftValue}`);
-      }
+      this.pushTokenDeclarations(lines, group.tokens, options, access3, i2, staticPrefix);
       lines.push(`${i1}}`);
       lines.push("");
     }
     lines.push("}");
-    lines.push(...this.buildViewExtensions(tokens, access3, options));
-    lines.push("");
-    return lines.join("\n");
   }
-  formatAsGrouped(tokens, options) {
-    const access3 = options.accessLevel;
+  pushGroupedLayout(lines, groups, options, access3, i1, i2, staticPrefix, frozen) {
     const namespace = options.extensionNamespace;
-    const groups = this.groupTokensByType(tokens);
-    const imports = this.collectImports(tokens);
-    const i1 = this.indentStr(options.indent, 1);
-    const i2 = this.indentStr(options.indent, 2);
-    const staticPrefix = this.staticLetPrefix(options);
-    const frozen = this.frozenPrefix(options);
-    const lines = [];
-    lines.push(this.buildFileHeader());
-    lines.push("");
-    for (const imp of imports) {
-      lines.push(`import ${imp}`);
-    }
-    lines.push(...this.buildStructDefinitions(tokens, access3, options));
     lines.push("");
     lines.push(`${frozen}${access3} enum ${namespace} {}`);
     lines.push("");
     for (const group of groups) {
       lines.push(`${access3} extension ${namespace} {`);
       lines.push(`${i1}${frozen}enum ${group.name} {`);
-      for (const token of group.tokens) {
-        const swiftName = this.buildQualifiedSwiftName(token);
-        const swiftValue = this.formatSwiftValue(token, options);
-        const typeAnnotation = this.getTypeAnnotation(token);
-        const annotation = typeAnnotation ? `: ${typeAnnotation}` : "";
-        const docComment = this.buildDocComment(token, i2);
-        if (docComment) {
-          lines.push(docComment);
-        }
-        lines.push(`${i2}${access3} ${staticPrefix}${swiftName}${annotation} = ${swiftValue}`);
-      }
+      this.pushTokenDeclarations(lines, group.tokens, options, access3, i2, staticPrefix);
       lines.push(`${i1}}`);
       lines.push("}");
       lines.push("");
     }
-    lines.push(...this.buildViewExtensions(tokens, access3, options));
-    return lines.join("\n");
   }
-  buildFileHeader() {
-    return [
-      "// Generated by Dispersa - do not edit manually",
-      "// https://github.com/timges/dispersa"
-    ].join("\n");
+  pushTokenDeclarations(lines, tokens, options, access3, indent, staticPrefix) {
+    for (const token of tokens) {
+      const swiftName = this.buildQualifiedSwiftName(token);
+      const swiftValue = this.formatSwiftValue(token, options);
+      const typeAnnotation = this.getTypeAnnotation(token);
+      const annotation = typeAnnotation ? `: ${typeAnnotation}` : "";
+      const docComment = this.buildDocComment(token, indent);
+      if (docComment) {
+        lines.push(docComment);
+      }
+      lines.push(`${indent}${access3} ${staticPrefix}${swiftName}${annotation} = ${swiftValue}`);
+    }
   }
   collectImports(tokens) {
     const imports = /* @__PURE__ */ new Set();
@@ -8542,24 +8508,11 @@ var IosRenderer = class {
   /**
    * Builds a `///` doc comment from a token's `$description`, if present.
    */
-  buildDocComment(token, indent2) {
+  buildDocComment(token, indent) {
     if (!token.$description) {
       return void 0;
     }
-    return `${indent2}/// ${token.$description}`;
-  }
-  groupTokensByType(tokens) {
-    const groupMap = /* @__PURE__ */ new Map();
-    for (const [, token] of getSortedTokenEntries(tokens)) {
-      const groupName = SWIFT_TYPE_GROUP_MAP[token.$type ?? ""] ?? "Other";
-      const existing = groupMap.get(groupName) ?? [];
-      existing.push(token);
-      groupMap.set(groupName, existing);
-    }
-    return Array.from(groupMap.entries()).map(([name, groupTokens]) => ({
-      name,
-      tokens: groupTokens
-    }));
+    return `${indent}/// ${token.$description}`;
   }
   /**
    * Builds a qualified Swift name from a token's path, preserving parent
@@ -8572,43 +8525,40 @@ var IosRenderer = class {
     const path7 = token.path;
     const withoutTypePrefix = path7.length > 1 ? path7.slice(1) : path7;
     const joined = withoutTypePrefix.join("_");
-    return this.toSwiftIdentifier(joined);
+    return toSafeIdentifier(joined, SWIFT_KEYWORDS, false);
   }
   formatSwiftValue(token, options) {
-    const value = token.$value;
-    if (token.$type === "color") {
-      return this.formatColorValue(value, options);
-    }
-    if (token.$type === "dimension") {
-      return this.formatDimensionValue(value);
-    }
-    if (token.$type === "fontFamily") {
-      return this.formatFontFamilyValue(value);
-    }
-    if (token.$type === "fontWeight") {
-      return this.formatFontWeightValue(value);
-    }
-    if (token.$type === "duration") {
-      return this.formatDurationValue(value);
-    }
-    if (token.$type === "shadow") {
-      return this.formatShadowValue(value, options);
-    }
-    if (token.$type === "typography") {
-      return this.formatTypographyValue(value);
-    }
-    if (token.$type === "border") {
-      return this.formatBorderValue(value, options);
-    }
-    if (token.$type === "gradient") {
-      return this.formatGradientValue(value, options);
-    }
-    if (token.$type === "number") {
-      return String(value);
-    }
-    if (token.$type === "cubicBezier" && Array.isArray(value) && value.length === 4) {
-      return `UnitCurve.bezier(startControlPoint: UnitPoint(x: ${value[0]}, y: ${value[1]}), endControlPoint: UnitPoint(x: ${value[2]}, y: ${value[3]}))`;
+    const { $type, $value: value } = token;
+    switch ($type) {
+      case "color":
+        return this.formatColorValue(value, options);
+      case "dimension":
+        return this.formatDimensionValue(value);
+      case "fontFamily":
+        return this.formatFontFamilyValue(value);
+      case "fontWeight":
+        return this.formatFontWeightValue(value);
+      case "duration":
+        return this.formatDurationValue(value);
+      case "shadow":
+        return this.formatShadowValue(value, options);
+      case "typography":
+        return this.formatTypographyValue(value);
+      case "border":
+        return this.formatBorderValue(value, options);
+      case "gradient":
+        return this.formatGradientValue(value, options);
+      case "number":
+        return String(value);
+      case "cubicBezier":
+        if (Array.isArray(value) && value.length === 4) {
+          return `UnitCurve.bezier(startControlPoint: UnitPoint(x: ${value[0]}, y: ${value[1]}), endControlPoint: UnitPoint(x: ${value[2]}, y: ${value[3]}))`;
+        }
+        break;
     }
+    return this.formatSwiftPrimitive(value);
+  }
+  formatSwiftPrimitive(value) {
     if (typeof value === "string") {
       return `"${this.escapeSwiftString(value)}"`;
     }
@@ -8641,9 +8591,7 @@ var IosRenderer = class {
   }
   formatDimensionValue(value) {
     if (isDimensionObject(value)) {
-      const dim = value;
-      const ptValue = dim.unit === "rem" ? dim.value * 16 : dim.value;
-      return String(ptValue);
+      return this.dimensionToPoints(value);
     }
     return String(value);
   }
@@ -8710,7 +8658,7 @@ var IosRenderer = class {
     return map[name.toLowerCase()];
   }
   formatDurationValue(value) {
-    if (typeof value === "object" && value !== null && "value" in value && "unit" in value) {
+    if (isDurationObject(value)) {
       const dur = value;
       const seconds = dur.unit === "ms" ? dur.value / 1e3 : dur.value;
       return String(seconds);
@@ -8759,9 +8707,7 @@ var IosRenderer = class {
     if (!isDimensionObject(typo.letterSpacing)) {
       return "0";
     }
-    const dim = typo.letterSpacing;
-    const ptValue = dim.unit === "rem" ? dim.value * 16 : dim.value;
-    return String(ptValue);
+    return this.dimensionToPoints(typo.letterSpacing);
   }
   extractLineSpacing(typo) {
     if (typo.lineHeight == null || typeof typo.lineHeight !== "number") {
@@ -8770,18 +8716,19 @@ var IosRenderer = class {
     if (!isDimensionObject(typo.fontSize)) {
       return "0";
     }
-    const dim = typo.fontSize;
-    const basePt = dim.unit === "rem" ? dim.value * 16 : dim.value;
+    const basePt = this.dimensionToNumericPoints(typo.fontSize);
     const lineHeightPt = Math.round(basePt * typo.lineHeight * 100) / 100;
     return String(lineHeightPt - basePt);
   }
+  dimensionToNumericPoints(dim) {
+    return dim.unit === "rem" ? dim.value * 16 : dim.value;
+  }
   dimensionToPoints(dim) {
-    const ptValue = dim.unit === "rem" ? dim.value * 16 : dim.value;
-    return String(ptValue);
+    return String(this.dimensionToNumericPoints(dim));
   }
   /** Formats a dimension as a CGFloat literal (appends `.0` for integers). */
   dimensionToCGFloat(dim) {
-    const ptValue = dim.unit === "rem" ? dim.value * 16 : dim.value;
+    const ptValue = this.dimensionToNumericPoints(dim);
     return Number.isInteger(ptValue) ? `${ptValue}.0` : String(ptValue);
   }
   getTypeAnnotation(token) {
@@ -8800,21 +8747,12 @@ var IosRenderer = class {
         return void 0;
     }
   }
-  toSwiftIdentifier(name) {
-    const camel = name.replace(/[-._]+(.)/g, (_, c) => c.toUpperCase()).replace(/[-._]+$/g, "").replace(/^[-._]+/g, "");
-    const identifier = camel.charAt(0).toLowerCase() + camel.slice(1);
-    const safe = /^\d/.test(identifier) ? `_${identifier}` : identifier;
-    return SWIFT_KEYWORDS.has(safe) ? `\`${safe}\`` : safe;
-  }
   escapeSwiftString(str) {
     return str.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n");
   }
   roundComponent(value) {
     return Math.round(value * 1e4) / 1e4;
   }
-  indentStr(width, level) {
-    return " ".repeat(width * level);
-  }
   /**
    * Returns the prefix for `static let` declarations.
    * Swift 6 requires `nonisolated(unsafe)` on global stored properties.
@@ -8830,34 +8768,25 @@ var IosRenderer = class {
   structConformances(options) {
     return options.swiftVersion === "6.0" ? ": Sendable" : "";
   }
-  hasShadowTokens(tokens) {
-    return Object.values(tokens).some((t) => t.$type === "shadow");
-  }
-  hasTypographyTokens(tokens) {
-    return Object.values(tokens).some((t) => t.$type === "typography");
-  }
-  hasBorderTokens(tokens) {
-    return Object.values(tokens).some((t) => t.$type === "border");
-  }
   /** Emits all struct definitions needed by the token set. */
   buildStructDefinitions(tokens, access3, options) {
     const lines = [];
-    if (this.hasShadowTokens(tokens)) {
+    if (Object.values(tokens).some(isShadowToken)) {
       lines.push("");
       lines.push(...this.buildShadowStyleStruct(access3, options));
     }
-    if (this.hasTypographyTokens(tokens)) {
+    if (Object.values(tokens).some(isTypographyToken)) {
       lines.push("");
       lines.push(...this.buildTypographyStyleStruct(access3, options));
     }
-    if (this.hasBorderTokens(tokens)) {
+    if (Object.values(tokens).some(isBorderToken)) {
       lines.push("");
       lines.push(...this.buildBorderStyleStruct(access3, options));
     }
     return lines;
   }
   buildShadowStyleStruct(access3, options) {
-    const i1 = this.indentStr(options.indent, 1);
+    const i1 = indentStr(options.indent, 1);
     const conformances = this.structConformances(options);
     const frozen = this.frozenPrefix(options);
     return [
@@ -8871,7 +8800,7 @@ var IosRenderer = class {
     ];
   }
   buildTypographyStyleStruct(access3, options) {
-    const i1 = this.indentStr(options.indent, 1);
+    const i1 = indentStr(options.indent, 1);
     const conformances = this.structConformances(options);
     const frozen = this.frozenPrefix(options);
     return [
@@ -8883,7 +8812,7 @@ var IosRenderer = class {
     ];
   }
   buildBorderStyleStruct(access3, options) {
-    const i1 = this.indentStr(options.indent, 1);
+    const i1 = indentStr(options.indent, 1);
     const conformances = this.structConformances(options);
     const frozen = this.frozenPrefix(options);
     return [
@@ -8896,9 +8825,9 @@ var IosRenderer = class {
   /** Emits convenience View extensions for shadow and typography application. */
   buildViewExtensions(tokens, access3, options) {
     const lines = [];
-    const i1 = this.indentStr(options.indent, 1);
-    const i2 = this.indentStr(options.indent, 2);
-    if (this.hasShadowTokens(tokens)) {
+    const i1 = indentStr(options.indent, 1);
+    const i2 = indentStr(options.indent, 2);
+    if (Object.values(tokens).some(isShadowToken)) {
       lines.push("");
       lines.push(`${access3} extension View {`);
       lines.push(`${i1}func shadowStyle(_ style: ShadowStyle) -> some View {`);
@@ -8908,7 +8837,7 @@ var IosRenderer = class {
       lines.push(`${i1}}`);
       lines.push("}");
     }
-    if (this.hasTypographyTokens(tokens)) {
+    if (Object.values(tokens).some(isTypographyToken)) {
       lines.push("");
       lines.push(`${access3} extension View {`);
       lines.push(`${i1}func typographyStyle(_ style: TypographyStyle) -> some View {`);
@@ -8940,12 +8869,12 @@ var IosRenderer = class {
     return `Gradient(stops: [${stops.join(", ")}])`;
   }
   async formatStandalone(context, options) {
-    const requiresFile = context.buildPath !== void 0 && context.buildPath !== "";
-    if (!context.output.file && requiresFile) {
-      throw new exports.ConfigurationError(
-        `Output "${context.output.name}": file is required for standalone iOS output`
-      );
-    }
+    assertFileRequired(
+      context.buildPath,
+      context.output.file,
+      context.output.name,
+      "standalone iOS"
+    );
     const files = {};
     for (const { tokens, modifierInputs } of context.permutations) {
       const processedTokens = stripInternalMetadata(tokens);
@@ -8974,7 +8903,6 @@ function iosRenderer() {
 
 // src/renderers/js-module.ts
 init_utils();
-init_errors();
 init_token_utils();
 var JsModuleRenderer = class {
   async format(context, options) {
@@ -8990,18 +8918,13 @@ var JsModuleRenderer = class {
       const bundleData = context.permutations.map(({ tokens, modifierInputs }) => ({
         tokens: stripInternalMetadata(tokens),
         modifierInputs,
-        isBase: this.isBasePermutation(modifierInputs, context.meta.defaults)
+        isBase: isBasePermutation(modifierInputs, context.meta.defaults)
       }));
       return await bundleAsJsModule2(bundleData, context.resolver, opts, async (tokens) => {
         return await this.formatTokens(tokens, opts);
       });
     }
-    const requiresFile = context.buildPath !== void 0 && context.buildPath !== "";
-    if (!context.output.file && requiresFile) {
-      throw new exports.ConfigurationError(
-        `Output "${context.output.name}": file is required for JS module output`
-      );
-    }
+    assertFileRequired(context.buildPath, context.output.file, context.output.name, "JS module");
     const files = {};
     for (const { tokens, modifierInputs } of context.permutations) {
       const cleanTokens = stripInternalMetadata(tokens);
@@ -9055,42 +8978,18 @@ var JsModuleRenderer = class {
     lines.push(`export default ${varName}`);
     return lines;
   }
-  /**
-   * Convert tokens to plain object with flat or nested structure
-   */
   tokensToPlainObject(tokens, structure) {
+    if (structure === "nested") {
+      return buildNestedTokenObject(tokens, (token) => token.$value);
+    }
     const result = {};
-    if (structure === "flat") {
-      for (const [name, token] of getSortedTokenEntries(tokens)) {
-        result[name] = token.$value;
-      }
-    } else {
-      for (const [, token] of getSortedTokenEntries(tokens)) {
-        const parts = token.path;
-        let current = result;
-        for (let i = 0; i < parts.length - 1; i++) {
-          const part = parts[i];
-          if (part == null) {
-            continue;
-          }
-          if (!(part in current)) {
-            current[part] = {};
-          }
-          current = current[part];
-        }
-        const lastPart = parts[parts.length - 1];
-        if (lastPart != null) {
-          current[lastPart] = token.$value;
-        }
-      }
+    for (const [name, token] of getSortedTokenEntries(tokens)) {
+      result[name] = token.$value;
     }
     return result;
   }
-  /**
-   * Add object properties to lines
-   */
-  addObjectProperties(lines, obj, indent2) {
-    const indentStr = "  ".repeat(indent2);
+  addObjectProperties(lines, obj, indent) {
+    const indentStr2 = "  ".repeat(indent);
     const entries = Object.entries(obj).sort(([keyA], [keyB]) => keyA.localeCompare(keyB));
     for (let i = 0; i < entries.length; i++) {
       const entry = entries[i];
@@ -9099,14 +8998,16 @@ var JsModuleRenderer = class {
       }
       const [key, value] = entry;
       const isLast = i === entries.length - 1;
-      if (typeof value === "object" && value !== null && !Array.isArray(value)) {
-        lines.push(`${indentStr}${this.quoteKey(key)}: {`);
-        this.addObjectProperties(lines, value, indent2 + 1);
-        lines.push(`${indentStr}}${isLast ? "" : ","}`);
-      } else {
-        const valueStr = JSON.stringify(value);
-        lines.push(`${indentStr}${this.quoteKey(key)}: ${valueStr}${isLast ? "" : ","}`);
+      const isNestedObject = typeof value === "object" && value !== null && !Array.isArray(value);
+      if (!isNestedObject) {
+        lines.push(
+          `${indentStr2}${this.quoteKey(key)}: ${JSON.stringify(value)}${isLast ? "" : ","}`
+        );
+        continue;
       }
+      lines.push(`${indentStr2}${this.quoteKey(key)}: {`);
+      this.addObjectProperties(lines, value, indent + 1);
+      lines.push(`${indentStr2}}${isLast ? "" : ","}`);
     }
   }
   /**
@@ -9118,9 +9019,6 @@ var JsModuleRenderer = class {
     }
     return `"${key}"`;
   }
-  isBasePermutation(modifierInputs, defaults) {
-    return Object.entries(modifierInputs).every(([key, value]) => value === defaults[key]);
-  }
 };
 function jsRenderer() {
   const rendererInstance = new JsModuleRenderer();
@@ -9134,7 +9032,6 @@ function jsRenderer() {
 
 // src/renderers/json.ts
 init_utils();
-init_errors();
 init_token_utils();
 var JsonRenderer = class {
   async format(context, options) {
@@ -9149,18 +9046,13 @@ var JsonRenderer = class {
       const bundleData = context.permutations.map(({ tokens, modifierInputs }) => ({
         tokens: stripInternalMetadata(tokens),
         modifierInputs,
-        isBase: this.isBasePermutation(modifierInputs, context.meta.defaults)
+        isBase: isBasePermutation(modifierInputs, context.meta.defaults)
       }));
       return await bundleAsJson2(bundleData, context.resolver, async (tokens) => {
         return await this.formatTokens(tokens, opts);
       });
     }
-    const requiresFile = context.buildPath !== void 0 && context.buildPath !== "";
-    if (!context.output.file && requiresFile) {
-      throw new exports.ConfigurationError(
-        `Output "${context.output.name}": file is required for JSON output`
-      );
-    }
+    assertFileRequired(context.buildPath, context.output.file, context.output.name, "JSON");
     const files = {};
     for (const { tokens, modifierInputs } of context.permutations) {
       const processedTokens = stripInternalMetadata(tokens);
@@ -9220,55 +9112,11 @@ var JsonRenderer = class {
     }
     return result;
   }
-  /**
-   * Nest tokens by path (values only)
-   */
   nestValues(tokens) {
-    const result = {};
-    for (const [, token] of getSortedTokenEntries(tokens)) {
-      const parts = token.path;
-      let current = result;
-      for (let i = 0; i < parts.length - 1; i++) {
-        const part = parts[i];
-        if (part === null || part === void 0) {
-          continue;
-        }
-        if (!(part in current)) {
-          current[part] = {};
-        }
-        current = current[part];
-      }
-      const lastPart = parts[parts.length - 1];
-      if (lastPart !== null && lastPart !== void 0) {
-        current[lastPart] = token.$value;
-      }
-    }
-    return result;
+    return buildNestedTokenObject(tokens, (token) => token.$value);
   }
-  /**
-   * Nest tokens by path (with metadata)
-   */
   nestTokens(tokens) {
-    const result = {};
-    for (const [, token] of getSortedTokenEntries(tokens)) {
-      const parts = token.path;
-      let current = result;
-      for (let i = 0; i < parts.length - 1; i++) {
-        const part = parts[i];
-        if (part === null || part === void 0) {
-          continue;
-        }
-        if (!(part in current)) {
-          current[part] = {};
-        }
-        current = current[part];
-      }
-      const lastPart = parts[parts.length - 1];
-      if (lastPart !== null && lastPart !== void 0) {
-        current[lastPart] = this.serializeToken(token);
-      }
-    }
-    return result;
+    return buildNestedTokenObject(tokens, (token) => this.serializeToken(token));
   }
   serializeToken(token) {
     return {
@@ -9279,9 +9127,6 @@ var JsonRenderer = class {
       ...token.$extensions != null && { $extensions: token.$extensions }
     };
   }
-  isBasePermutation(modifierInputs, defaults) {
-    return Object.entries(modifierInputs).every(([key, value]) => value === defaults[key]);
-  }
 };
 function jsonRenderer() {
   const rendererInstance = new JsonRenderer();
@@ -9294,7 +9139,6 @@ function jsonRenderer() {
 }
 
 // src/renderers/tailwind.ts
-init_errors();
 init_token_utils();
 
 // src/renderers/bundlers/tailwind.ts
@@ -9323,6 +9167,13 @@ async function bundleAsTailwind(bundleData, options, formatThemeTokens, formatOv
   }
   return cssBlocks.join("\n");
 }
+function resolveModifierSelectorAndMedia(options, modifier, context, modifierInputs) {
+  const normalized = normalizeModifierInputs(modifierInputs);
+  return {
+    selector: resolveSelector(options.selector, modifier, context, false, normalized),
+    mediaQuery: resolveMediaQuery(options.mediaQuery, modifier, context, false, normalized)
+  };
+}
 async function formatModifierOverride({ tokens, modifierInputs }, baseItem, options, formatOverrideBlock) {
   const differenceCount = countModifierDifferences(modifierInputs, baseItem.modifierInputs);
   if (differenceCount > 1) {
@@ -9335,19 +9186,11 @@ async function formatModifierOverride({ tokens, modifierInputs }, baseItem, opti
   const expectedSource = getExpectedSource(modifierInputs, baseItem.modifierInputs);
   const [modifier, context] = parseModifierSource(expectedSource);
   const cleanTokens = stripInternalMetadata(tokensToInclude);
-  const selector = resolveSelector(
-    options.selector,
+  const { selector, mediaQuery } = resolveModifierSelectorAndMedia(
+    options,
     modifier,
     context,
-    false,
-    normalizeModifierInputs(modifierInputs)
-  );
-  const mediaQuery = resolveMediaQuery(
-    options.mediaQuery,
-    modifier,
-    context,
-    false,
-    normalizeModifierInputs(modifierInputs)
+    modifierInputs
   );
   const css2 = await formatOverrideBlock(cleanTokens, selector, mediaQuery, options.minify);
   return `/* Modifier: ${modifier}=${context} */
@@ -9436,7 +9279,7 @@ var TailwindRenderer = class {
    */
   async formatTokens(tokens, options) {
     const lines = [];
-    const indent2 = options.minify ? "" : "  ";
+    const indent = options.minify ? "" : "  ";
     const newline = options.minify ? "" : "\n";
     const space = options.minify ? "" : " ";
     if (options.includeImport) {
@@ -9458,7 +9301,7 @@ var TailwindRenderer = class {
     for (const [, token] of getSortedTokenEntries(tokens)) {
       const varName = this.buildVariableName(token);
       const varValue = this.formatValue(token);
-      lines.push(`${indent2}--${varName}:${space}${varValue};${newline}`);
+      lines.push(`${indent}--${varName}:${space}${varValue};${newline}`);
     }
     lines.push(`}${newline}`);
     const cssString = lines.join("");
@@ -9469,15 +9312,15 @@ var TailwindRenderer = class {
    * Used for modifier overrides (e.g., dark mode) appended after the @theme block.
    */
   async formatOverrideBlock(tokens, selector, mediaQuery, minify) {
-    const indent2 = minify ? "" : "  ";
+    const indent = minify ? "" : "  ";
     const newline = minify ? "" : "\n";
     const space = minify ? "" : " ";
     const hasMediaQuery = mediaQuery !== "";
-    const tokenIndent = hasMediaQuery ? indent2 + indent2 : indent2;
+    const tokenIndent = hasMediaQuery ? indent + indent : indent;
     const lines = [];
     if (hasMediaQuery) {
       lines.push(`@media ${mediaQuery}${space}{${newline}`);
-      lines.push(`${indent2}${selector}${space}{${newline}`);
+      lines.push(`${indent}${selector}${space}{${newline}`);
     } else {
       lines.push(`${selector}${space}{${newline}`);
     }
@@ -9487,7 +9330,7 @@ var TailwindRenderer = class {
       lines.push(`${tokenIndent}--${varName}:${space}${varValue};${newline}`);
     }
     if (hasMediaQuery) {
-      lines.push(`${indent2}}${newline}`);
+      lines.push(`${indent}}${newline}`);
       lines.push(`}${newline}`);
     } else {
       lines.push(`}${newline}`);
@@ -9514,8 +9357,8 @@ var TailwindRenderer = class {
     if (token.$type === "dimension" && isDimensionObject(value)) {
       return dimensionObjectToString(value);
     }
-    if (token.$type === "duration" && this.isDurationObject(value)) {
-      return `${value.value}${value.unit}`;
+    if (token.$type === "duration" && isDurationObject(value)) {
+      return durationObjectToString(value);
     }
     if (token.$type === "fontFamily") {
       if (Array.isArray(value)) {
@@ -9570,9 +9413,6 @@ var TailwindRenderer = class {
     }
     return parts.join(" ");
   }
-  isDurationObject(value) {
-    return typeof value === "object" && value !== null && "value" in value && "unit" in value && value.unit !== void 0;
-  }
   async formatWithPrettier(css2) {
     try {
       return await prettier__default.default.format(css2, {
@@ -9589,7 +9429,7 @@ var TailwindRenderer = class {
     const bundleData = context.permutations.map(({ tokens, modifierInputs }) => ({
       tokens,
       modifierInputs,
-      isBase: this.isBasePermutation(modifierInputs, context.meta.defaults)
+      isBase: isBasePermutation(modifierInputs, context.meta.defaults)
     }));
     return await bundleAsTailwind(
       bundleData,
@@ -9599,12 +9439,12 @@ var TailwindRenderer = class {
     );
   }
   async formatStandalone(context, options) {
-    const requiresFile = context.buildPath !== void 0 && context.buildPath !== "";
-    if (!context.output.file && requiresFile) {
-      throw new exports.ConfigurationError(
-        `Output "${context.output.name}": file is required for standalone Tailwind output`
-      );
-    }
+    assertFileRequired(
+      context.buildPath,
+      context.output.file,
+      context.output.name,
+      "standalone Tailwind"
+    );
     const files = {};
     for (const { tokens, modifierInputs } of context.permutations) {
       const processedTokens = stripInternalMetadata(tokens);
@@ -9620,11 +9460,6 @@ var TailwindRenderer = class {
     }
     return outputTree(files);
   }
-  isBasePermutation(modifierInputs, defaults) {
-    return Object.entries(defaults).every(
-      ([key, value]) => modifierInputs[key]?.toLowerCase() === value.toLowerCase()
-    );
-  }
 };
 function tailwindRenderer() {
   const rendererInstance = new TailwindRenderer();
@@ -9757,11 +9592,6 @@ function defineRenderer(renderer) {
 
 // src/index.ts
 init_errors();
-/**
- * @license
- * Copyright (c) 2025 Dispersa Contributors
- * SPDX-License-Identifier: MIT
- */
 /**
  * @license MIT
  * Copyright (c) 2025-present Dispersa Contributors
@@ -9769,6 +9599,11 @@ init_errors();
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+/**
+ * @license
+ * Copyright (c) 2025 Dispersa Contributors
+ * SPDX-License-Identifier: MIT
+ */
 
 exports.Dispersa = Dispersa;
 exports.android = android;