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

package/compiler/salty-compiler.cjs

@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const esbuild = require("esbuild");
 const path = require("path");
-const winston = require("winston");
+const logger = require("../logger-7xz0pyAz.cjs");
 const promises = require("fs/promises");
 const fs = require("fs");
 const child_process = require("child_process");
@@ -13,10 +13,11 @@ const compiler_helpers = require("./helpers.cjs");
 const defineTemplates = require("../define-templates-Deq1aCbN.cjs");
 const dashCase = require("../dash-case-DIwKaYgE.cjs");
 const toHash = require("../to-hash-C05Y906F.cjs");
-const parseStyles = require("../parse-styles-CA3TP5n1.cjs");
+const parseStyles = require("../parse-styles-C54MOrPg.cjs");
 const css_merge = require("../css/merge.cjs");
-const parsers_index = require("../parsers/index.cjs");
+require("../css/dynamic-styles.cjs");
 const compiler_getFiles = require("./get-files.cjs");
+const parsers_index = require("../parsers/index.cjs");
 const console = require("console");
 var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 function _interopNamespaceDefault(e) {
@@ -36,14 +37,6 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 const esbuild__namespace = /* @__PURE__ */ _interopNamespaceDefault(esbuild);
-const logger = winston.createLogger({
-  level: "debug",
-  format: winston.format.combine(winston.format.colorize(), winston.format.cli()),
-  transports: [new winston.transports.Console({})]
-});
-const logError = (message) => {
-  logger.error(message);
-};
 const readPackageJsonModule = async (dirname) => {
   const packageJsonContent = await compiler_getFiles.getPackageJson(dirname);
   if (!packageJsonContent) return void 0;
@@ -111,7 +104,7 @@ const saltyReset = {
   }
 };
 class SaltyCompiler {
-  constructor(projectRootDir) {
+  constructor(projectRootDir, options = {}) {
     __publicField(this, "importFile", (path2) => {
       const now = Date.now();
       return import(
@@ -168,6 +161,14 @@ class SaltyCompiler {
       this.cache.destDir = destDir;
       return destDir;
     });
+    /**
+     * Absolute path to the `config-cache.json` written during `generateCss()`.
+     * Plugins read this to copy the file into the production bundle output.
+     */
+    __publicField(this, "getConfigCachePath", async () => {
+      const destDir = await this.getDestDir();
+      return path.join(destDir, "cache/config-cache.json");
+    });
     __publicField(this, "generateConfig", async () => {
       const rcProject = await this.getRCProjectConfig(this.projectRootDir);
       const destDir = await this.getDestDir();
@@ -201,8 +202,7 @@ ${currentFile}`;
       }
     });
     __publicField(this, "getConfigCache", async () => {
-      const destDir = await this.getDestDir();
-      const coreConfigDest = path.join(destDir, "cache/config-cache.json");
+      const coreConfigDest = await this.getConfigCachePath();
       const contents = fs.readFileSync(coreConfigDest, "utf8");
       if (!contents) throw new Error("Could not find config cache file");
       return JSON.parse(contents);
@@ -220,8 +220,8 @@ ${currentFile}`;
     __publicField(this, "generateCss", async (clean = true) => {
       try {
         const start = Date.now();
-        if (this.isProduction) logger.info("Generating CSS in production mode! 🔥");
-        else logger.info("Generating CSS in development mode! 🚀");
+        if (this.isProduction) logger.logger.info("Generating CSS in production mode! 🔥");
+        else logger.logger.info("Generating CSS in development mode! 🚀");
         const globalCssFiles = [];
         const cssFiles = [];
         const destDir = await this.getDestDir();
@@ -393,7 +393,7 @@ ${css}
         const end = Date.now();
         const time = end - start;
         const emoji = time < 200 ? "🔥" : time < 500 ? "🚀" : time < 1e3 ? "🎉" : time < 2e3 ? "🚗" : time < 5e3 ? "🤔" : "🥴";
-        logger.info(`Generated CSS in ${time}ms! ${emoji}`);
+        logger.logger.info(`Generated CSS in ${time}ms! ${emoji}`);
       } catch (e) {
         console.error(e);
       }
@@ -532,7 +532,7 @@ ${css}
       type MediaQueryKeys = ${mediaQueryKeys || `''`};
       `;
       fs.writeFileSync(tsTokensPath, tsTokensTypes);
-      const configCachePath = path.join(destDir, "cache/config-cache.json");
+      const configCachePath = await this.getConfigCachePath();
       fs.writeFileSync(configCachePath, JSON.stringify(configCacheContent, null, 2));
       const corePackageRoot = compiler_helpers.getCorePackageRoot();
       const configCacheSecondaryPath = path.join(corePackageRoot, "cache/config-cache.json");
@@ -546,7 +546,8 @@ ${css}
       let currentFile = fs.readFileSync(sourceFilePath, "utf8");
       currentFile = this.replaceStyledTag(currentFile);
       currentFile = this.addConfigCache(currentFile);
-      const outputFilePath = path.join(outputDirectory, "js", hashedName + ".js");
+      const currentFileHash = toHash.toHash(currentFile);
+      const outputFilePath = path.join(outputDirectory, "js", `${hashedName}-${currentFileHash}.js`);
       const rcProject = await this.getRCProjectConfig(this.projectRootDir);
       const coreConfigPath = path.join(this.projectRootDir, (rcProject == null ? void 0 : rcProject.configDir) || "", "salty.config.ts");
       const externalModules = this.getExternalModules(coreConfigPath);
@@ -690,11 +691,13 @@ ${newContent}
       });
     });
     this.projectRootDir = projectRootDir;
+    this.options = options;
     if (typeof process === "undefined") {
       throw new Error("SaltyServer can only be used in a Node.js environment.");
     }
   }
   get isProduction() {
+    if (this.options.mode) return this.options.mode === "production";
     try {
       return process.env["NODE_ENV"] !== "development";
     } catch {
@@ -703,5 +706,3 @@ ${newContent}
   }
 }
 exports.SaltyCompiler = SaltyCompiler;
-exports.logError = logError;
-exports.logger = logger;

package/compiler/salty-compiler.d.ts

@@ -1,9 +1,14 @@
 import { CachedConfig, SaltyConfig } from '../config';
+export type SaltyCompilerMode = 'production' | 'development';
+export interface SaltyCompilerOptions {
+    mode?: SaltyCompilerMode;
+}
 export declare class SaltyCompiler {
     projectRootDir: string;
+    private options;
     importFile: (path: string) => Promise<any>;
     private cache;
-    constructor(projectRootDir: string);
+    constructor(projectRootDir: string, options?: SaltyCompilerOptions);
     get isProduction(): boolean;
     /**
      * Locate and read the .saltyrc.json file starting from the current directory and moving up the directory tree.
@@ -21,6 +26,11 @@ export declare class SaltyCompiler {
      * Caches the result to avoid redundant computations.
      */
     getDestDir: () => Promise<string>;
+    /**
+     * Absolute path to the `config-cache.json` written during `generateCss()`.
+     * Plugins read this to copy the file into the production bundle output.
+     */
+    getConfigCachePath: () => Promise<string>;
     private generateConfig;
     private addConfigCache;
     private getConfigCache;

package/compiler/salty-compiler.js

@@ -3,7 +3,7 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import * as esbuild from "esbuild";
 import { join, parse } from "path";
-import { createLogger, transports, format } from "winston";
+import { l as logger } from "../logger-hHmCwThj.js";
 import { readFile } from "fs/promises";
 import { readFileSync, existsSync, mkdirSync, statSync, readdirSync, writeFileSync } from "fs";
 import { execSync } from "child_process";
@@ -11,19 +11,12 @@ import { isSaltyFile, resolveExportValue, getCorePackageRoot, saltyFileExtension
 import { d as defineTemplates } from "../define-templates-CVhhgPnd.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 parseVariableTokens } from "../parse-styles-BTIoYnBr.js";
+import { p as parseAndJoinStyles, b as parseVariableTokens } from "../parse-styles-CLMTHo2H.js";
 import { mergeObjects, mergeFactories } from "../css/merge.js";
-import { parseTemplates, getTemplateTypes } from "../parsers/index.js";
+import "../css/dynamic-styles.js";
 import { getPackageJson } from "./get-files.js";
+import { parseTemplates, getTemplateTypes } from "../parsers/index.js";
 import console from "console";
-const logger = createLogger({
-  level: "debug",
-  format: format.combine(format.colorize(), format.cli()),
-  transports: [new transports.Console({})]
-});
-const logError = (message) => {
-  logger.error(message);
-};
 const readPackageJsonModule = async (dirname) => {
   const packageJsonContent = await getPackageJson(dirname);
   if (!packageJsonContent) return void 0;
@@ -91,7 +84,7 @@ const saltyReset = {
   }
 };
 class SaltyCompiler {
-  constructor(projectRootDir) {
+  constructor(projectRootDir, options = {}) {
     __publicField(this, "importFile", (path) => {
       const now = Date.now();
       return import(
@@ -148,6 +141,14 @@ class SaltyCompiler {
       this.cache.destDir = destDir;
       return destDir;
     });
+    /**
+     * Absolute path to the `config-cache.json` written during `generateCss()`.
+     * Plugins read this to copy the file into the production bundle output.
+     */
+    __publicField(this, "getConfigCachePath", async () => {
+      const destDir = await this.getDestDir();
+      return join(destDir, "cache/config-cache.json");
+    });
     __publicField(this, "generateConfig", async () => {
       const rcProject = await this.getRCProjectConfig(this.projectRootDir);
       const destDir = await this.getDestDir();
@@ -181,8 +182,7 @@ ${currentFile}`;
       }
     });
     __publicField(this, "getConfigCache", async () => {
-      const destDir = await this.getDestDir();
-      const coreConfigDest = join(destDir, "cache/config-cache.json");
+      const coreConfigDest = await this.getConfigCachePath();
       const contents = readFileSync(coreConfigDest, "utf8");
       if (!contents) throw new Error("Could not find config cache file");
       return JSON.parse(contents);
@@ -512,7 +512,7 @@ ${css}
       type MediaQueryKeys = ${mediaQueryKeys || `''`};
       `;
       writeFileSync(tsTokensPath, tsTokensTypes);
-      const configCachePath = join(destDir, "cache/config-cache.json");
+      const configCachePath = await this.getConfigCachePath();
       writeFileSync(configCachePath, JSON.stringify(configCacheContent, null, 2));
       const corePackageRoot = getCorePackageRoot();
       const configCacheSecondaryPath = join(corePackageRoot, "cache/config-cache.json");
@@ -526,7 +526,8 @@ ${css}
       let currentFile = readFileSync(sourceFilePath, "utf8");
       currentFile = this.replaceStyledTag(currentFile);
       currentFile = this.addConfigCache(currentFile);
-      const outputFilePath = join(outputDirectory, "js", hashedName + ".js");
+      const currentFileHash = toHash(currentFile);
+      const outputFilePath = join(outputDirectory, "js", `${hashedName}-${currentFileHash}.js`);
       const rcProject = await this.getRCProjectConfig(this.projectRootDir);
       const coreConfigPath = join(this.projectRootDir, (rcProject == null ? void 0 : rcProject.configDir) || "", "salty.config.ts");
       const externalModules = this.getExternalModules(coreConfigPath);
@@ -670,11 +671,13 @@ ${newContent}
       });
     });
     this.projectRootDir = projectRootDir;
+    this.options = options;
     if (typeof process === "undefined") {
       throw new Error("SaltyServer can only be used in a Node.js environment.");
     }
   }
   get isProduction() {
+    if (this.options.mode) return this.options.mode === "production";
     try {
       return process.env["NODE_ENV"] !== "development";
     } catch {
@@ -683,7 +686,5 @@ ${newContent}
   }
 }
 export {
-  SaltyCompiler,
-  logError as a,
-  logger as l
+  SaltyCompiler
 };

package/css/dynamic-styles.cjs

@@ -1,15 +1,28 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const parseStyles = require("../parse-styles-CA3TP5n1.cjs");
+const parseStyles = require("../parse-styles-C54MOrPg.cjs");
 const toHash = require("../to-hash-C05Y906F.cjs");
 const cache_resolveDynamicConfigCache = require("../cache/resolve-dynamic-config-cache.cjs");
-const getDynamicStylesClassName = (styles) => {
-  return toHash.toHash(styles);
-};
-const getDynamicStylesCss = async (styles, scope) => {
-  const config = await cache_resolveDynamicConfigCache.resolveDynamicConfigCache();
-  const parsed = await parseStyles.parseStyles(styles, scope, config);
-  return parsed.join("\n");
+const getDynamicStylesClassName = (styles) => toHash.toHash(styles);
+const initializeDynamicStyles = (options = {}) => {
+  const resolveConfig = async () => {
+    if (options.config) return options.config;
+    return cache_resolveDynamicConfigCache.resolveDynamicConfigCache({
+      primaryPath: options.configCachePath,
+      extraPaths: options.configCachePaths
+    });
+  };
+  return {
+    getDynamicStylesClassName,
+    getDynamicStylesCss: async (styles, scope) => {
+      const config = await resolveConfig();
+      const parsed = await parseStyles.parseStyles(styles, scope, config);
+      return parsed.join("\n");
+    }
+  };
 };
+const defaultHelpers = initializeDynamicStyles();
+const getDynamicStylesCss = defaultHelpers.getDynamicStylesCss;
 exports.getDynamicStylesClassName = getDynamicStylesClassName;
 exports.getDynamicStylesCss = getDynamicStylesCss;
+exports.initializeDynamicStyles = initializeDynamicStyles;

package/css/dynamic-styles.d.ts

@@ -1,10 +1,49 @@
 import { BaseStyles } from '../types';
+import { CachedConfig, SaltyConfig } from '../types/config-types';
+export interface InitializeDynamicStylesOptions {
+    /**
+     * Absolute path (or path relative to `process.cwd()`) to a `config-cache.json` file.
+     * Wins over `configCachePaths` and the built-in search patterns when readable.
+     */
+    configCachePath?: string;
+    /**
+     * Extra paths searched before the built-in patterns. Each entry can be a directory
+     * (the resolver will look for `config-cache.json`, `cache/config-cache.json`, and
+     * `saltygen/cache/config-cache.json` inside) or a direct path to a `.json` file.
+     */
+    configCachePaths?: string[];
+    /**
+     * Pre-loaded config object. When provided, the filesystem is not touched — required
+     * for edge runtimes (e.g. Cloudflare Workers) where `fs/promises` is unavailable.
+     */
+    config?: Partial<SaltyConfig & CachedConfig>;
+}
+export interface DynamicStylesHelpers {
+    getDynamicStylesClassName: (styles: BaseStyles) => string;
+    getDynamicStylesCss: (styles: BaseStyles, scope?: string) => Promise<string>;
+}
 /**
  * Create a hash of the dynamic styles that then can be used as scope.
  */
 export declare const getDynamicStylesClassName: (styles: BaseStyles) => string;
+/**
+ * Bind dynamic-styles helpers to a specific config / cache location.
+ *
+ * Useful when deploying to environments where the build-time `saltygen/` directory is
+ * not available at runtime — e.g. an Astro site shipped to Cloudflare. Configure once
+ * at app startup and reuse the returned helpers.
+ *
+ * @example
+ *   const { getDynamicStylesCss } = initializeDynamicStyles({
+ *     configCachePath: 'dist/saltygen/cache/config-cache.json',
+ *   });
+ */
+export declare const initializeDynamicStyles: (options?: InitializeDynamicStylesOptions) => DynamicStylesHelpers;
 /**
  * Add any dynamic styles to your app with a custom scope.
  * Note: this works only with server components.
+ *
+ * For production deployments that strip the source tree (e.g. Cloudflare),
+ * use {@link initializeDynamicStyles} to bind to a known cache location.
  */
 export declare const getDynamicStylesCss: (styles: BaseStyles, scope?: string) => Promise<string>;

package/css/dynamic-styles.js

@@ -1,15 +1,28 @@
-import { a as parseStyles } from "../parse-styles-BTIoYnBr.js";
+import { a as parseStyles } from "../parse-styles-CLMTHo2H.js";
 import { t as toHash } from "../to-hash-DAN2LcHK.js";
 import { resolveDynamicConfigCache } from "../cache/resolve-dynamic-config-cache.js";
-const getDynamicStylesClassName = (styles) => {
-  return toHash(styles);
-};
-const getDynamicStylesCss = async (styles, scope) => {
-  const config = await resolveDynamicConfigCache();
-  const parsed = await parseStyles(styles, scope, config);
-  return parsed.join("\n");
+const getDynamicStylesClassName = (styles) => toHash(styles);
+const initializeDynamicStyles = (options = {}) => {
+  const resolveConfig = async () => {
+    if (options.config) return options.config;
+    return resolveDynamicConfigCache({
+      primaryPath: options.configCachePath,
+      extraPaths: options.configCachePaths
+    });
+  };
+  return {
+    getDynamicStylesClassName,
+    getDynamicStylesCss: async (styles, scope) => {
+      const config = await resolveConfig();
+      const parsed = await parseStyles(styles, scope, config);
+      return parsed.join("\n");
+    }
+  };
 };
+const defaultHelpers = initializeDynamicStyles();
+const getDynamicStylesCss = defaultHelpers.getDynamicStylesCss;
 export {
   getDynamicStylesClassName,
-  getDynamicStylesCss
+  getDynamicStylesCss,
+  initializeDynamicStyles
 };

package/css/index.cjs

@@ -13,3 +13,4 @@ exports.mergeFactories = css_merge.mergeFactories;
 exports.mergeObjects = css_merge.mergeObjects;
 exports.getDynamicStylesClassName = css_dynamicStyles.getDynamicStylesClassName;
 exports.getDynamicStylesCss = css_dynamicStyles.getDynamicStylesCss;
+exports.initializeDynamicStyles = css_dynamicStyles.initializeDynamicStyles;

package/css/index.js

@@ -2,11 +2,12 @@ import { keyframes } from "./keyframes.js";
 import { MediaQueryFactory, media } from "./media.js";
 import { token } from "./token.js";
 import { mergeFactories, mergeObjects } from "./merge.js";
-import { getDynamicStylesClassName, getDynamicStylesCss } from "./dynamic-styles.js";
+import { getDynamicStylesClassName, getDynamicStylesCss, initializeDynamicStyles } from "./dynamic-styles.js";
 export {
   MediaQueryFactory,
   getDynamicStylesClassName,
   getDynamicStylesCss,
+  initializeDynamicStyles,
   keyframes,
   media,
   mergeFactories,

package/css/keyframes.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const parseStyles = require("../parse-styles-CA3TP5n1.cjs");
+const parseStyles = require("../parse-styles-C54MOrPg.cjs");
 const toHash = require("../to-hash-C05Y906F.cjs");
 const keyframes = ({ animationName: _name, params: _params, appendInitialStyles, ...keyframes2 }) => {
   const modifyKeyframes = async (params = {}) => {

package/css/keyframes.js

@@ -1,4 +1,4 @@
-import { p as parseAndJoinStyles } from "../parse-styles-BTIoYnBr.js";
+import { p as parseAndJoinStyles } from "../parse-styles-CLMTHo2H.js";
 import { t as toHash } from "../to-hash-DAN2LcHK.js";
 const keyframes = ({ animationName: _name, params: _params, appendInitialStyles, ...keyframes2 }) => {
   const modifyKeyframes = async (params = {}) => {

package/generators/index.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const classNameGenerator = require("../class-name-generator-B2Pb2obX.cjs");
+const classNameGenerator = require("../class-name-generator-DB5aQwC_.cjs");
 const dashCase = require("../dash-case-DIwKaYgE.cjs");
 class StyledGenerator extends classNameGenerator.StylesGenerator {
   constructor(tagName, _params) {

package/generators/index.js

@@ -1,5 +1,5 @@
-import { S as StylesGenerator } from "../class-name-generator-YeSQe_Ik.js";
-import { C } from "../class-name-generator-YeSQe_Ik.js";
+import { S as StylesGenerator } from "../class-name-generator-CMWY5KTJ.js";
+import { C } from "../class-name-generator-CMWY5KTJ.js";
 import { d as dashCase } from "../dash-case-DblXvymC.js";
 class StyledGenerator extends StylesGenerator {
   constructor(tagName, _params) {

package/instances/classname-instance.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const classNameGenerator = require("../class-name-generator-B2Pb2obX.cjs");
+const classNameGenerator = require("../class-name-generator-DB5aQwC_.cjs");
 const classNameInstance = (params) => {
   const generator = new classNameGenerator.ClassNameGenerator(params);
   const createClass = (classNameStr) => {

package/instances/classname-instance.js

@@ -1,4 +1,4 @@
-import { C as ClassNameGenerator } from "../class-name-generator-YeSQe_Ik.js";
+import { C as ClassNameGenerator } from "../class-name-generator-CMWY5KTJ.js";
 const classNameInstance = (params) => {
   const generator = new ClassNameGenerator(params);
   const createClass = (classNameStr) => {

package/logger-7xz0pyAz.cjs

@@ -0,0 +1,12 @@
+"use strict";
+const winston = require("winston");
+const logger = winston.createLogger({
+  level: "debug",
+  format: winston.format.combine(winston.format.colorize(), winston.format.cli()),
+  transports: [new winston.transports.Console({})]
+});
+const logError = (message) => {
+  logger.error(message);
+};
+exports.logError = logError;
+exports.logger = logger;

package/logger-hHmCwThj.js

@@ -0,0 +1,13 @@
+import { createLogger, transports, format } from "winston";
+const logger = createLogger({
+  level: "debug",
+  format: format.combine(format.colorize(), format.cli()),
+  transports: [new transports.Console({})]
+});
+const logError = (message) => {
+  logger.error(message);
+};
+export {
+  logError as a,
+  logger as l
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salty-css/core",
-  "version": "0.1.0-alpha.9",
+  "version": "0.1.0-refactor-add-additional-paths-to-config-cache.0",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "typings": "./dist/index.d.ts",
@@ -63,6 +63,10 @@
       "import": "./compiler/helpers.js",
       "require": "./compiler/helpers.cjs"
     },
+    "./compiler/copy-config-cache": {
+      "import": "./compiler/copy-config-cache.js",
+      "require": "./compiler/copy-config-cache.cjs"
+    },
     "./factories": {
       "import": "./factories/index.js",
       "require": "./factories/index.cjs"