@salty-css/core 0.0.1-alpha.326 → 0.0.1-alpha.328

package/cache/resolve-dynamic-config-cache.cjs

@@ -2,13 +2,21 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const promises = require("fs/promises");
 const path = require("path");
-const compiler_helpers = require("../compiler/helpers.cjs");
 const resolveDynamicConfigCache = async () => {
-  const corePackageRoot = compiler_helpers.getCorePackageRoot();
-  if (!corePackageRoot) throw new Error("Could not resolve core package root");
-  const coreConfigDest = path.join(corePackageRoot, "cache/config-cache.json");
-  const contents = await promises.readFile(coreConfigDest, "utf8");
-  if (!contents) throw new Error(`Could not find config cache file at ${coreConfigDest}`);
+  const currentDir = process.cwd();
+  const filename = "config-cache.json";
+  const patterns = ["", "saltygen", "src", "src/saltygen", "cache", "src/cache", "src/saltygen/cache"];
+  let contents = "";
+  for (const pattern of patterns) {
+    const potentialPath = path.join(currentDir, pattern, filename);
+    console.log(`Trying to read config cache from: ${potentialPath}`);
+    try {
+      contents = await promises.readFile(potentialPath, "utf8");
+      break;
+    } catch {
+    }
+  }
+  if (!contents) throw new Error(`Could not find config cache file (${filename}) in any of the expected locations.`);
   return JSON.parse(contents);
 };
 exports.resolveDynamicConfigCache = resolveDynamicConfigCache;

package/cache/resolve-dynamic-config-cache.js

@@ -1,12 +1,20 @@
 import { readFile } from "fs/promises";
 import { join } from "path";
-import { getCorePackageRoot } from "../compiler/helpers.js";
 const resolveDynamicConfigCache = async () => {
-  const corePackageRoot = getCorePackageRoot();
-  if (!corePackageRoot) throw new Error("Could not resolve core package root");
-  const coreConfigDest = join(corePackageRoot, "cache/config-cache.json");
-  const contents = await readFile(coreConfigDest, "utf8");
-  if (!contents) throw new Error(`Could not find config cache file at ${coreConfigDest}`);
+  const currentDir = process.cwd();
+  const filename = "config-cache.json";
+  const patterns = ["", "saltygen", "src", "src/saltygen", "cache", "src/cache", "src/saltygen/cache"];
+  let contents = "";
+  for (const pattern of patterns) {
+    const potentialPath = join(currentDir, pattern, filename);
+    console.log(`Trying to read config cache from: ${potentialPath}`);
+    try {
+      contents = await readFile(potentialPath, "utf8");
+      break;
+    } catch {
+    }
+  }
+  if (!contents) throw new Error(`Could not find config cache file (${filename}) in any of the expected locations.`);
   return JSON.parse(contents);
 };
 export {

package/compiler/helpers.cjs

@@ -3,18 +3,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const path = require("path");
 var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 const getCorePackageRoot = () => {
-  try {
-    console.log("getCorePackageRoot import.meta.url:", typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("compiler/helpers.cjs", document.baseURI).href);
-    let { pathname } = new URL(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("compiler/helpers.cjs", document.baseURI).href);
-    console.log("getCorePackageRoot pathname start:", pathname);
-    while (/core\/?(src\/)?$/.test(pathname) === false) {
-      pathname = path.join(pathname, "../");
-    }
-    return pathname;
-  } catch (error) {
-    console.error("Error in getCorePackageRoot:", error);
-    return void 0;
+  let { pathname } = new URL(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("compiler/helpers.cjs", document.baseURI).href);
+  while (/core\/?(src\/)?$/.test(pathname) === false) {
+    pathname = path.join(pathname, "../");
   }
+  return pathname;
 };
 const resolveExportValue = async (value, maxLevel = 10, _level = 0) => {
   if (_level >= maxLevel) return value;

package/compiler/helpers.d.ts

@@ -1,4 +1,4 @@
-export declare const getCorePackageRoot: () => string | undefined;
+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;

package/compiler/helpers.js

@@ -1,17 +1,10 @@
 import { join } from "path";
 const getCorePackageRoot = () => {
-  try {
-    console.log("getCorePackageRoot import.meta.url:", import.meta.url);
-    let { pathname } = new URL(import.meta.url);
-    console.log("getCorePackageRoot pathname start:", pathname);
-    while (/core\/?(src\/)?$/.test(pathname) === false) {
-      pathname = join(pathname, "../");
-    }
-    return pathname;
-  } catch (error) {
-    console.error("Error in getCorePackageRoot:", error);
-    return void 0;
+  let { pathname } = new URL(import.meta.url);
+  while (/core\/?(src\/)?$/.test(pathname) === false) {
+    pathname = join(pathname, "../");
   }
+  return pathname;
 };
 const resolveExportValue = async (value, maxLevel = 10, _level = 0) => {
   if (_level >= maxLevel) return value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salty-css/core",
-  "version": "0.0.1-alpha.326",
+  "version": "0.0.1-alpha.328",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "typings": "./dist/index.d.ts",