@salty-css/core 0.1.0-refactor-add-additional-paths-to-config-cache.1 → 0.1.0

package/bin/main.cjs

@@ -9,7 +9,6 @@ const path = require("path");
 const promises = require("fs/promises");
 const child_process = require("child_process");
 const ora = require("ora");
-const logger = require("../logger-7xz0pyAz.cjs");
 const pascalCase = require("../pascal-case-By_l58S-.cjs");
 const ejs = require("ejs");
 const promises$1 = require("readline/promises");
@@ -66,9 +65,9 @@ async function formatWithPrettier(filePath) {
     const hasPrettier = hasPrettierInstalled();
     if (!hasPrettier) return;
     await execAsync(`./node_modules/.bin/prettier --write "${filePath}"`);
-    logger.logger.info(`Formatted ${filePath} with Prettier`);
+    compiler_saltyCompiler.logger.info(`Formatted ${filePath} with Prettier`);
   } catch (error) {
-    logger.logger.error(`Error formatting ${filePath} with Prettier:`, error);
+    compiler_saltyCompiler.logger.error(`Error formatting ${filePath} with Prettier:`, error);
   }
 }
 const SALTYRC_FILENAME = ".saltyrc.json";
@@ -111,8 +110,8 @@ const writeProjectToRc = async (cwd, relativeProjectPath, framework) => {
   const existing = await readRawRc(cwd);
   const { content, changed, created } = upsertProjectInRc(existing, relativeProjectPath, framework);
   if (!changed) return false;
-  if (created) logger.logger.info("Creating file: " + path2);
-  else logger.logger.info("Edit file: " + path2);
+  if (created) compiler_saltyCompiler.logger.info("Creating file: " + path2);
+  else compiler_saltyCompiler.logger.info("Edit file: " + path2);
   await promises.writeFile(path2, content);
   await formatWithPrettier(path2);
   return true;
@@ -149,18 +148,18 @@ const buildContext = async (opts) => {
 };
 const registerBuildCommand = (program, defaultProject) => {
   program.command("build [directory]").alias("b").description("Build the Salty-CSS project.").option("-d, --dir <dir>", "Project directory to build the project in.").option("--watch", "Watch for changes and rebuild the project.").option("--mode <mode>", 'Build mode: "production" or "development". Defaults to NODE_ENV-based detection.').action(async function(_dir = defaultProject) {
-    logger.logger.info("Building the Salty-CSS project...");
+    compiler_saltyCompiler.logger.info("Building the Salty-CSS project...");
     const { dir = _dir, watch, mode } = this.opts();
     if (mode !== void 0 && mode !== "production" && mode !== "development") {
-      return logger.logError(`Invalid --mode "${mode}". Expected "production" or "development".`);
+      return compiler_saltyCompiler.logError(`Invalid --mode "${mode}". Expected "production" or "development".`);
     }
     const resolved = dir ?? await getDefaultProject();
-    if (!resolved) return logger.logError("Project directory must be provided. Add it as the first argument after build command or use the --dir option.");
+    if (!resolved) return compiler_saltyCompiler.logError("Project directory must be provided. Add it as the first argument after build command or use the --dir option.");
     const projectDir = resolveProjectDir(resolved);
     const compiler = new compiler_saltyCompiler.SaltyCompiler(projectDir, { mode });
     await compiler.generateCss();
     if (watch) {
-      logger.logger.info("Watching for changes in the project directory...");
+      compiler_saltyCompiler.logger.info("Watching for changes in the project directory...");
       fs.watch(projectDir, { recursive: true }, async (_event, filePath) => {
         const shouldRestart$1 = await shouldRestart.checkShouldRestart(filePath);
         if (shouldRestart$1) {
@@ -246,13 +245,13 @@ const readTemplate = async (key, options) => {
 const registerGenerateCommand = (program, defaultProject) => {
   program.command("generate [file] [directory]").alias("g").description("Generate a new component file.").option("-f, --file <file>", "File to generate.").option("-d, --dir <dir>", "Project directory to generate the file in.").option("-t, --tag <tag>", "HTML tag of the component.", "div").option("-n, --name <name>", "Name of the component.").option("-c, --className <className>", "CSS class of the component.").option("-r, --reactComponent", "Generate a wrapper component file alongside the styled definition.").action(async function(_file, _dir = defaultProject) {
     const { file = _file, dir = _dir, tag, name, className, reactComponent = false } = this.opts();
-    if (!file) return logger.logError("File to generate must be provided. Add it as the first argument after generate command or use the --file option.");
-    if (!dir) return logger.logError("Project directory must be provided. Add it as the second argument after generate command or use the --dir option.");
+    if (!file) return compiler_saltyCompiler.logError("File to generate must be provided. Add it as the first argument after generate command or use the --file option.");
+    if (!dir) return compiler_saltyCompiler.logError("Project directory must be provided. Add it as the second argument after generate command or use the --dir option.");
     let ctx;
     try {
       ctx = await buildContext({ dir, requirePackageJson: false });
     } catch (err) {
-      return logger.logError(err instanceof Error ? err.message : String(err));
+      return compiler_saltyCompiler.logError(err instanceof Error ? err.message : String(err));
     }
     const rcFramework = getFramework(getProjectFramework(ctx.rcFile, ctx.relativeProjectPath));
     const framework = rcFramework ?? await detectFramework(ctx);
@@ -266,13 +265,13 @@ const registerGenerateCommand = (program, defaultProject) => {
     const formattedStyledFilePath = path.format(parsedFilePath);
     const alreadyExists = await promises.readFile(formattedStyledFilePath, "utf-8").catch(() => void 0);
     if (alreadyExists !== void 0) {
-      logger.logger.error("File already exists: " + formattedStyledFilePath);
+      compiler_saltyCompiler.logger.error("File already exists: " + formattedStyledFilePath);
       return;
     }
     let styledComponentName = pascalCase.pascalCase(name || parsedFilePath.base.replace(/\.css\.\w+$/, ""));
     if (reactComponent) {
       if (!framework.templates.component) {
-        return logger.logError(`--reactComponent is not supported for the ${framework.name} framework.`);
+        return compiler_saltyCompiler.logError(`--reactComponent is not supported for the ${framework.name} framework.`);
       }
       const componentName = styledComponentName + "Component";
       styledComponentName = styledComponentName + "Wrapper";
@@ -288,13 +287,13 @@ const registerGenerateCommand = (program, defaultProject) => {
       parsedFilePath.ext = framework.templates.component.wrapperExt;
       parsedFilePath.base = parsedFilePath.name + parsedFilePath.ext;
       const formattedWrapperPath = path.format(parsedFilePath);
-      logger.logger.info("Generating a new file: " + formattedWrapperPath);
+      compiler_saltyCompiler.logger.info("Generating a new file: " + formattedWrapperPath);
       await promises.writeFile(formattedWrapperPath, wrapperContent);
       await formatWithPrettier(formattedWrapperPath);
     }
     const styledKey = reactComponent && framework.templates.component ? framework.templates.component.styled : framework.templates.styled;
     const { content } = await readTemplate(styledKey, { tag, name: styledComponentName, className });
-    logger.logger.info("Generating a new file: " + formattedStyledFilePath);
+    compiler_saltyCompiler.logger.info("Generating a new file: " + formattedStyledFilePath);
     await promises.writeFile(formattedStyledFilePath, content);
     await formatWithPrettier(formattedStyledFilePath);
   });
@@ -395,13 +394,13 @@ const astroIntegration = {
     const existing = await promises.readFile(configPath, "utf-8").catch(() => void 0);
     if (existing === void 0) return null;
     const result = editAstroConfig(existing);
-    if (result.warning) logger.logger.warn(result.warning);
+    if (result.warning) compiler_saltyCompiler.logger.warn(result.warning);
     if (result.content === null) return null;
     const newContent = result.content;
     return {
       packages: [`-D ${astroPackage(ctx.cliVersion)}`],
       execute: async () => {
-        logger.logger.info("Adding Salty-CSS integration to Astro config: " + configPath);
+        compiler_saltyCompiler.logger.info("Adding Salty-CSS integration to Astro config: " + configPath);
         await promises.writeFile(configPath, newContent);
         await formatWithPrettier(configPath);
         return { changed: true };
@@ -468,17 +467,17 @@ const eslintIntegration = {
   plan: async (ctx, configPath) => {
     const existing = await promises.readFile(configPath, "utf-8").catch(() => void 0);
     if (existing === void 0) {
-      logger.logger.error("Could not read ESLint config file.");
+      compiler_saltyCompiler.logger.error("Could not read ESLint config file.");
       return null;
     }
     const result = editEslintConfig(existing, configPath.endsWith("js"));
-    if (result.warning) logger.logger.warn(result.warning);
+    if (result.warning) compiler_saltyCompiler.logger.warn(result.warning);
     if (result.content === null) return null;
     const newContent = result.content;
     return {
       packages: [corePackages.eslintConfigCore(ctx.cliVersion)],
       execute: async () => {
-        logger.logger.info("Edit file: " + configPath);
+        compiler_saltyCompiler.logger.info("Edit file: " + configPath);
         await promises.writeFile(configPath, newContent);
         await formatWithPrettier(configPath);
         return { changed: true };
@@ -521,7 +520,7 @@ const nextIntegration = {
     return {
       packages: [`-D ${nextPackage(ctx.cliVersion)}`],
       execute: async () => {
-        logger.logger.info("Adding Salty-CSS plugin to Next.js config...");
+        compiler_saltyCompiler.logger.info("Adding Salty-CSS plugin to Next.js config...");
         await promises.writeFile(configPath, content);
         await formatWithPrettier(configPath);
         return { changed: true };
@@ -552,8 +551,8 @@ const viteIntegration = {
     return {
       packages: [`-D ${vitePackage(ctx.cliVersion)}`],
       execute: async () => {
-        logger.logger.info("Edit file: " + configPath);
-        logger.logger.info("Adding Salty-CSS plugin to Vite config...");
+        compiler_saltyCompiler.logger.info("Edit file: " + configPath);
+        compiler_saltyCompiler.logger.info("Adding Salty-CSS plugin to Vite config...");
         await promises.writeFile(configPath, content);
         await formatWithPrettier(configPath);
         return { changed: true };
@@ -584,12 +583,12 @@ const applyIntegrationPlans = async (planned) => {
 const writeProjectFile = async (projectDir, fileName, content) => {
   const filePath = path.join(projectDir, fileName);
   if (fs.existsSync(filePath)) {
-    logger.logger.debug("File already exists: " + filePath);
+    compiler_saltyCompiler.logger.debug("File already exists: " + filePath);
     return;
   }
   const additionalFolders = fileName.split("/").slice(0, -1).join("/");
   if (additionalFolders) await promises.mkdir(path.join(projectDir, additionalFolders), { recursive: true });
-  logger.logger.info("Creating file: " + filePath);
+  compiler_saltyCompiler.logger.info("Creating file: " + filePath);
   await promises.writeFile(filePath, content);
   await formatWithPrettier(filePath);
 };
@@ -598,13 +597,13 @@ const ensureGitignoreSaltygen = async (rootDir) => {
   const existing = await promises.readFile(path$1, "utf-8").catch(() => void 0);
   if (existing === void 0) return;
   if (existing.includes("saltygen")) return;
-  logger.logger.info("Edit file: " + path$1);
+  compiler_saltyCompiler.logger.info("Edit file: " + path$1);
   await promises.writeFile(path$1, existing + "\n\n# Salty-CSS\nsaltygen\n");
 };
 const importSaltygenIntoCss = async (projectDir, explicitCssFile) => {
   const target = explicitCssFile ?? await findGlobalCssFile(projectDir);
   if (!target) {
-    logger.logger.warn("Could not find a CSS file to import the generated CSS. Please add it manually.");
+    compiler_saltyCompiler.logger.warn("Could not find a CSS file to import the generated CSS. Please add it manually.");
     return;
   }
   const cssFilePath = path.join(projectDir, target);
@@ -613,14 +612,14 @@ const importSaltygenIntoCss = async (projectDir, explicitCssFile) => {
   if (cssFileContent.includes("saltygen")) return;
   const cssFileFolder = path.join(cssFilePath, "..");
   const relPath = path.relative(cssFileFolder, path.join(projectDir, "saltygen/index.css"));
-  logger.logger.info("Adding global import statement to CSS file: " + cssFilePath);
+  compiler_saltyCompiler.logger.info("Adding global import statement to CSS file: " + cssFilePath);
   await promises.writeFile(cssFilePath, `@import '${relPath}';
 ` + cssFileContent);
   await formatWithPrettier(cssFilePath);
 };
 const wirePrepareScript = async () => {
   const pkg = await readPackageJson().catch(() => {
-    logger.logError("Could not read package.json file.");
+    compiler_saltyCompiler.logError("Could not read package.json file.");
     return void 0;
   });
   if (!pkg) return;
@@ -632,11 +631,11 @@ const registerInitCommand = (program) => {
     try {
       const opts = this.opts();
       const dir = opts.dir ?? _dir;
-      if (!dir) return logger.logError("Project directory must be provided. Add it as the first argument after init command or use the --dir option.");
+      if (!dir) return compiler_saltyCompiler.logError("Project directory must be provided. Add it as the first argument after init command or use the --dir option.");
       const ctx = await buildContext({ dir, skipInstall: opts.skipInstall, yes: opts.yes });
-      logger.logger.info("Initializing a new Salty-CSS project!");
+      compiler_saltyCompiler.logger.info("Initializing a new Salty-CSS project!");
       const framework = await detectFramework(ctx);
-      logger.logger.info(`Detected framework: ${framework.name}`);
+      compiler_saltyCompiler.logger.info(`Detected framework: ${framework.name}`);
       const plannedIntegrations = await planIntegrations(ctx);
       if (!ctx.skipInstall) {
         const packages = [
@@ -655,29 +654,29 @@ const registerInitCommand = (program) => {
       await importSaltygenIntoCss(ctx.projectDir, opts.cssFile);
       await applyIntegrationPlans(plannedIntegrations);
       await wirePrepareScript();
-      logger.logger.info("Running the build to generate initial CSS...");
+      compiler_saltyCompiler.logger.info("Running the build to generate initial CSS...");
       const compiler = new compiler_saltyCompiler.SaltyCompiler(ctx.projectDir);
       await compiler.generateCss();
-      logger.logger.info("🎉 Salty CSS project initialized successfully!");
-      logger.logger.info("Next steps:");
-      logger.logger.info("1. Configure variables and templates in `salty.config.ts`");
-      logger.logger.info("2. Create a new component with `npx salty-css generate [component-name]`");
-      logger.logger.info("3. Run `npx salty-css build` to generate the CSS");
-      logger.logger.info("4. Read about the features in the documentation: https://salty-css.dev");
-      logger.logger.info("5. Star the project on GitHub: https://github.com/margarita-form/salty-css ⭐");
+      compiler_saltyCompiler.logger.info("🎉 Salty CSS project initialized successfully!");
+      compiler_saltyCompiler.logger.info("Next steps:");
+      compiler_saltyCompiler.logger.info("1. Configure variables and templates in `salty.config.ts`");
+      compiler_saltyCompiler.logger.info("2. Create a new component with `npx salty-css generate [component-name]`");
+      compiler_saltyCompiler.logger.info("3. Run `npx salty-css build` to generate the CSS");
+      compiler_saltyCompiler.logger.info("4. Read about the features in the documentation: https://salty-css.dev");
+      compiler_saltyCompiler.logger.info("5. Star the project on GitHub: https://github.com/margarita-form/salty-css ⭐");
     } catch (err) {
-      return logger.logError(err instanceof Error ? err.message : String(err));
+      return compiler_saltyCompiler.logError(err instanceof Error ? err.message : String(err));
     }
   });
 };
 const getSaltyCssPackages = async () => {
   const packageJSONPath = path.join(process.cwd(), "package.json");
-  const packageJson = await readPackageJson(packageJSONPath).catch((err) => logger.logError(err));
-  if (!packageJson) return logger.logError("Could not read package.json file.");
+  const packageJson = await readPackageJson(packageJSONPath).catch((err) => compiler_saltyCompiler.logError(err));
+  if (!packageJson) return compiler_saltyCompiler.logError("Could not read package.json file.");
   const allDependencies = { ...packageJson.dependencies, ...packageJson.devDependencies };
   const saltyCssPackages = Object.entries(allDependencies).filter(([name]) => name === "salty-css" || name.startsWith("@salty-css/"));
   if (!saltyCssPackages.length) {
-    return logger.logError(
+    return compiler_saltyCompiler.logError(
       "No Salty-CSS packages found in package.json. Make sure you are running update command in the same directory! Used package.json path: " + packageJSONPath
     );
   }
@@ -687,7 +686,7 @@ const registerUpdateCommand = (program) => {
   program.command("update [version]").alias("up").description("Update Salty-CSS packages to the latest or specified version.").option("-v, --version <version>", "Version to update to.").option("--legacy-peer-deps <legacyPeerDeps>", "Use legacy peer dependencies (not recommended).", false).option("-y, --yes", "Skip confirmation prompts (install and rebuild).").option("-d, --dir <dir>", "Project directory to rebuild after updating.").action(async function(_version = "latest") {
     const { legacyPeerDeps, version = _version, yes = false, dir } = this.opts();
     const saltyCssPackages = await getSaltyCssPackages();
-    if (!saltyCssPackages) return logger.logError("Could not update Salty-CSS packages as any were found in package.json.");
+    if (!saltyCssPackages) return compiler_saltyCompiler.logError("Could not update Salty-CSS packages as any were found in package.json.");
     const cli = await readThisPackageJson();
     const packagesToUpdate = saltyCssPackages.map(([name]) => {
       if (version === "@") return `${name}@${cli.version}`;
@@ -696,16 +695,16 @@ const registerUpdateCommand = (program) => {
     try {
       await confirmInstall(packagesToUpdate, yes);
     } catch (err) {
-      return logger.logError(err instanceof Error ? err.message : String(err));
+      return compiler_saltyCompiler.logError(err instanceof Error ? err.message : String(err));
     }
     if (legacyPeerDeps) {
-      logger.logger.warn("Using legacy peer dependencies to update packages.");
+      compiler_saltyCompiler.logger.warn("Using legacy peer dependencies to update packages.");
       await npmInstall(...packagesToUpdate, "--legacy-peer-deps");
     } else {
       await npmInstall(...packagesToUpdate);
     }
     const updatedPackages = await getSaltyCssPackages();
-    if (!updatedPackages) return logger.logError("Something went wrong while reading the updated packages.");
+    if (!updatedPackages) return compiler_saltyCompiler.logError("Something went wrong while reading the updated packages.");
     const mappedByVersions = updatedPackages.reduce((acc, [name, version2]) => {
       if (!acc[version2]) acc[version2] = [];
       acc[version2].push(name);
@@ -714,41 +713,41 @@ const registerUpdateCommand = (program) => {
     const versionsCount = Object.keys(mappedByVersions).length;
     if (versionsCount === 1) {
       const v = Object.keys(mappedByVersions)[0];
-      logger.logger.info(`Updated to all Salty CSS packages successfully to ${v.replace(/^\^/, "")}`);
+      compiler_saltyCompiler.logger.info(`Updated to all Salty CSS packages successfully to ${v.replace(/^\^/, "")}`);
     } else {
       for (const [v, names] of Object.entries(mappedByVersions)) {
-        logger.logger.info(`Updated to ${v.replace(/^\^/, "")}: ${names.join(", ")}`);
+        compiler_saltyCompiler.logger.info(`Updated to ${v.replace(/^\^/, "")}: ${names.join(", ")}`);
       }
     }
     const project = dir ?? await getDefaultProject();
     if (!project) {
-      logger.logger.warn("Skipping rebuild: no project directory configured. Run `salty-css build [dir]` manually.");
+      compiler_saltyCompiler.logger.warn("Skipping rebuild: no project directory configured. Run `salty-css build [dir]` manually.");
       return;
     }
     const shouldRebuild = await confirmYesNo("Rebuild Salty CSS now?", { yes });
     if (!shouldRebuild) return;
     const projectDir = resolveProjectDir(project);
-    logger.logger.info("Rebuilding Salty-CSS project...");
+    compiler_saltyCompiler.logger.info("Rebuilding Salty-CSS project...");
     await new compiler_saltyCompiler.SaltyCompiler(projectDir).generateCss();
-    logger.logger.info("Rebuild complete.");
+    compiler_saltyCompiler.logger.info("Rebuild complete.");
   });
 };
 const registerVersionOption = (program) => {
   program.option("-v, --version", "Show the current version of Salty-CSS.").action(async function() {
     const cli = await readThisPackageJson();
-    logger.logger.info("CLI is running: " + cli.version);
+    compiler_saltyCompiler.logger.info("CLI is running: " + cli.version);
     const packageJSONPath = path.join(process.cwd(), "package.json");
-    const packageJson = await readPackageJson(packageJSONPath).catch((err) => logger.logError(err));
+    const packageJson = await readPackageJson(packageJSONPath).catch((err) => compiler_saltyCompiler.logError(err));
     if (!packageJson) return;
     const allDependencies = { ...packageJson.dependencies, ...packageJson.devDependencies };
     const saltyCssPackages = Object.keys(allDependencies).filter((dep) => dep === "salty-css" || dep.startsWith("@salty-css/"));
     if (!saltyCssPackages.length) {
-      return logger.logError(
+      return compiler_saltyCompiler.logError(
         "No Salty-CSS packages found in package.json. Make sure you are running update command in the same directory! Used package.json path: " + packageJSONPath
       );
     }
     for (const dep of saltyCssPackages) {
-      logger.logger.info(`${dep}: ${allDependencies[dep]}`);
+      compiler_saltyCompiler.logger.info(`${dep}: ${allDependencies[dep]}`);
     }
   });
 };

package/bin/main.js

@@ -1,13 +1,12 @@
 import { Command } from "commander";
 import { existsSync, watch } from "fs";
-import { SaltyCompiler } from "../compiler/salty-compiler.js";
+import { l as logger, a as logError, SaltyCompiler } from "../compiler/salty-compiler.js";
 import { isSaltyFile } from "../compiler/helpers.js";
 import { c as checkShouldRestart } from "../should-restart-CXIO0jxY.js";
 import { join, relative, parse, format } from "path";
 import { readFile, writeFile, mkdir } from "fs/promises";
 import { exec } from "child_process";
 import ora from "ora";
-import { l as logger, a as logError } from "../logger-hHmCwThj.js";
 import { p as pascalCase } from "../pascal-case-F3Usi5Wf.js";
 import ejs from "ejs";
 import { createInterface } from "readline/promises";

package/{class-name-generator-CMWY5KTJ.js → class-name-generator-CUEoPowv.js}

@@ -1,9 +1,8 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { p as parseAndJoinStyles } from "./parse-styles-CLMTHo2H.js";
-import { d as dashCase } from "./dash-case-DblXvymC.js";
-import { t as toHash } from "./to-hash-DAN2LcHK.js";
+import { p as parseAndJoinStyles, b as parseTemplateCallSite } from "./parse-styles-BgVqQAni.js";
+import { t as toHash, d as dashCase } from "./to-hash-DSoCPs8D.js";
 class StylesGenerator {
   constructor(params) {
     __publicField(this, "buildContext", {});
@@ -50,7 +49,22 @@ class StylesGenerator {
     if (!(config == null ? void 0 : config.templates) || !this.params.base || this.priority > 0) return [];
     const templateKeys = Object.keys(config.templates);
     return Object.entries(this.params.base).reduce((acc, [key, value]) => {
-      if (templateKeys.includes(key)) acc.push("t_" + toHash(dashCase(`${key}-${value}`), 4));
+      if (!templateKeys.includes(key)) return acc;
+      const callSite = parseTemplateCallSite(value);
+      if (!callSite || callSite.path.length === 0) return acc;
+      const { path, variants } = callSite;
+      const cumulative = [];
+      for (const part of path) {
+        cumulative.push(part);
+        const baseClassName = dashCase(`${key}-${cumulative.join(".")}`);
+        acc.push("t_" + toHash(baseClassName, 4));
+        for (const [axis, axisValue] of Object.entries(variants)) {
+          if (axisValue === false || axisValue === void 0) continue;
+          const valueSuffix = axisValue === true ? "" : `-${dashCase(String(axisValue))}`;
+          const variantClassName = `${baseClassName}-${dashCase(axis)}${valueSuffix}`;
+          acc.push("tv_" + toHash(variantClassName, 4));
+        }
+      }
       return acc;
     }, []);
   }

package/{class-name-generator-DB5aQwC_.cjs → class-name-generator-MtPkBfM_.cjs}

@@ -2,9 +2,8 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-const parseStyles = require("./parse-styles-C54MOrPg.cjs");
-const dashCase = require("./dash-case-DIwKaYgE.cjs");
-const toHash = require("./to-hash-C05Y906F.cjs");
+const parseStyles = require("./parse-styles-BbI-2wdn.cjs");
+const toHash = require("./to-hash-DT2ImSPA.cjs");
 class StylesGenerator {
   constructor(params) {
     __publicField(this, "buildContext", {});
@@ -35,7 +34,7 @@ class StylesGenerator {
   get cssFileName() {
     const { callerName } = this.buildContext;
     if (callerName) {
-      const dasherized = dashCase.dashCase(callerName);
+      const dasherized = toHash.dashCase(callerName);
       return `cl_${dasherized}-${this.hash}.css`;
     }
     return `${this.hash}.css`;
@@ -51,7 +50,22 @@ class StylesGenerator {
     if (!(config == null ? void 0 : config.templates) || !this.params.base || this.priority > 0) return [];
     const templateKeys = Object.keys(config.templates);
     return Object.entries(this.params.base).reduce((acc, [key, value]) => {
-      if (templateKeys.includes(key)) acc.push("t_" + toHash.toHash(dashCase.dashCase(`${key}-${value}`), 4));
+      if (!templateKeys.includes(key)) return acc;
+      const callSite = parseStyles.parseTemplateCallSite(value);
+      if (!callSite || callSite.path.length === 0) return acc;
+      const { path, variants } = callSite;
+      const cumulative = [];
+      for (const part of path) {
+        cumulative.push(part);
+        const baseClassName = toHash.dashCase(`${key}-${cumulative.join(".")}`);
+        acc.push("t_" + toHash.toHash(baseClassName, 4));
+        for (const [axis, axisValue] of Object.entries(variants)) {
+          if (axisValue === false || axisValue === void 0) continue;
+          const valueSuffix = axisValue === true ? "" : `-${toHash.dashCase(String(axisValue))}`;
+          const variantClassName = `${baseClassName}-${toHash.dashCase(axis)}${valueSuffix}`;
+          acc.push("tv_" + toHash.toHash(variantClassName, 4));
+        }
+      }
       return acc;
     }, []);
   }

package/compiler/helpers.cjs

@@ -16,11 +16,19 @@ const resolveExportValue = async (value, maxLevel = 10, _level = 0) => {
   return value;
 };
 const saltyFileExtensions = ["salty", "css", "styles", "styled"];
+const tsFileExtensions = ["ts", "tsx", "js", "jsx", "mjs", "cjs"];
 const escapeRegExp = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-const saltyFileRegExp = (additional = []) => new RegExp(`\\.(${[...saltyFileExtensions, ...additional].map(escapeRegExp).join("|")})\\.`);
-const isSaltyFile = (file, additional = []) => saltyFileRegExp(additional).test(file);
+const saltyFileRegExp = (additional = [], testExtension = true) => {
+  const extensions = [...saltyFileExtensions, ...additional].map(escapeRegExp).join("|");
+  if (testExtension) {
+    return new RegExp(`\\.(${extensions})\\.(${tsFileExtensions.map(escapeRegExp).join("|")})$`);
+  }
+  return new RegExp(`\\.(${extensions})\\.`);
+};
+const isSaltyFile = (file, additional = [], testExtension = true) => saltyFileRegExp(additional, testExtension).test(file);
 exports.getCorePackageRoot = getCorePackageRoot;
 exports.isSaltyFile = isSaltyFile;
 exports.resolveExportValue = resolveExportValue;
 exports.saltyFileExtensions = saltyFileExtensions;
 exports.saltyFileRegExp = saltyFileRegExp;
+exports.tsFileExtensions = tsFileExtensions;

package/compiler/helpers.d.ts

@@ -1,5 +1,6 @@
 export declare const getCorePackageRoot: () => string;
 export declare const resolveExportValue: <T>(value: unknown, maxLevel?: number, _level?: number) => Promise<T>;
 export declare const saltyFileExtensions: string[];
-export declare const saltyFileRegExp: (additional?: string[]) => RegExp;
-export declare const isSaltyFile: (file: string, additional?: string[]) => boolean;
+export declare const tsFileExtensions: string[];
+export declare const saltyFileRegExp: (additional?: string[], testExtension?: boolean) => RegExp;
+export declare const isSaltyFile: (file: string, additional?: string[], testExtension?: boolean) => boolean;

package/compiler/helpers.js

@@ -13,13 +13,21 @@ const resolveExportValue = async (value, maxLevel = 10, _level = 0) => {
   return value;
 };
 const saltyFileExtensions = ["salty", "css", "styles", "styled"];
+const tsFileExtensions = ["ts", "tsx", "js", "jsx", "mjs", "cjs"];
 const escapeRegExp = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-const saltyFileRegExp = (additional = []) => new RegExp(`\\.(${[...saltyFileExtensions, ...additional].map(escapeRegExp).join("|")})\\.`);
-const isSaltyFile = (file, additional = []) => saltyFileRegExp(additional).test(file);
+const saltyFileRegExp = (additional = [], testExtension = true) => {
+  const extensions = [...saltyFileExtensions, ...additional].map(escapeRegExp).join("|");
+  if (testExtension) {
+    return new RegExp(`\\.(${extensions})\\.(${tsFileExtensions.map(escapeRegExp).join("|")})$`);
+  }
+  return new RegExp(`\\.(${extensions})\\.`);
+};
+const isSaltyFile = (file, additional = [], testExtension = true) => saltyFileRegExp(additional, testExtension).test(file);
 export {
   getCorePackageRoot,
   isSaltyFile,
   resolveExportValue,
   saltyFileExtensions,
-  saltyFileRegExp
+  saltyFileRegExp,
+  tsFileExtensions
 };

package/compiler/resolve-import.d.ts

@@ -0,0 +1,17 @@
+import { ImportSpec } from '../factories/define-import';
+export interface ResolveImportOptions {
+    /**
+     * Override for node_modules resolution. Receives the bare specifier (with any leading `~` already
+     * stripped) and the source file path of the salty file that called `defineImport`. Must return the
+     * absolute filesystem path of the resolved CSS file. Defaults to `createRequire(sourceFile).resolve`.
+     */
+    resolveModule?: (specifier: string, sourceFile: string) => string;
+    /**
+     * Override for copying resolved node_modules CSS into `<destDir>/imports/`. Receives the absolute
+     * source and destination paths. Defaults to `copyFileSync`.
+     */
+    copyAsset?: (from: string, to: string) => void;
+}
+export declare const resolveImport: (spec: ImportSpec, sourceFile: string, destDir: string, options?: ResolveImportOptions) => {
+    rule: string;
+};