@salty-css/core 0.1.0-alpha.31 → 0.1.0-alpha.33

package/compiler/salty-compiler.cjs

@@ -17,8 +17,9 @@ const module$1 = require("module");
 const parseStyles = require("../parse-styles-lOMGe_c5.cjs");
 const css_merge = require("../css/merge.cjs");
 const parsers_index = require("../parsers/index.cjs");
-const moduleType = require("../util/module-type");
+const compiler_getFiles = require("./get-files.cjs");
 const console = require("console");
+var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -92,6 +93,20 @@ const resolveImport = (spec, sourceFile, destDir, options = {}) => {
   copyAsset(absolute, destPath);
   return { rule: buildRule(`../imports/${fileName}`, opts) };
 };
+const readPackageJsonModule = async (dirname) => {
+  const packageJsonContent = await compiler_getFiles.getPackageJson(dirname);
+  if (!packageJsonContent) return void 0;
+  return packageJsonContent.type;
+};
+let cachedModuleType;
+const detectCurrentModuleType = async (dirname) => {
+  if (cachedModuleType) return cachedModuleType;
+  const packageJsonModule = await readPackageJsonModule(dirname);
+  if (packageJsonModule === "module") cachedModuleType = "esm";
+  else if (packageJsonModule === "commonjs") cachedModuleType = "cjs";
+  else if ((typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("compiler/salty-compiler.cjs", document.baseURI).href).endsWith(".cjs")) cachedModuleType = "cjs";
+  return cachedModuleType || "esm";
+};
 function dotCase(str) {
   if (!str) return "";
   if (typeof str !== "string") return dotCase(String(str));
@@ -207,7 +222,7 @@ class SaltyCompiler {
       const destDir = await this.getDestDir();
       const coreConfigPath = path.join(this.projectRootDir, (rcProject == null ? void 0 : rcProject.configDir) || "", "salty.config.ts");
       const coreConfigDest = path.join(destDir, "salty.config.js");
-      const moduleType$1 = await moduleType.detectCurrentModuleType(this.projectRootDir);
+      const moduleType = await detectCurrentModuleType(this.projectRootDir);
       const externalModules = this.getExternalModules(coreConfigPath);
       await esbuild__namespace.build({
         entryPoints: [coreConfigPath],
@@ -215,7 +230,7 @@ class SaltyCompiler {
         treeShaking: true,
         bundle: true,
         outfile: coreConfigDest,
-        format: moduleType$1,
+        format: moduleType,
         external: externalModules
       });
       const { config } = await this.importFile(coreConfigDest);
@@ -649,7 +664,7 @@ ${css}
       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);
-      const moduleType$1 = await moduleType.detectCurrentModuleType(this.projectRootDir);
+      const moduleType = await detectCurrentModuleType(this.projectRootDir);
       await esbuild__namespace.build({
         stdin: {
           contents: currentFile,
@@ -661,7 +676,7 @@ ${css}
         treeShaking: true,
         bundle: true,
         outfile: outputFilePath,
-        format: moduleType$1,
+        format: moduleType,
         target: ["node20"],
         keepNames: true,
         external: externalModules,

package/compiler/salty-compiler.js

@@ -15,7 +15,7 @@ import { createRequire } from "module";
 import { p as parseAndJoinStyles, c as parseVariableTokens } from "../parse-styles-BBJ3PWyV.js";
 import { mergeObjects, mergeFactories } from "../css/merge.js";
 import { parseTemplates, getTemplateTypes, getTemplateVariantMaps } from "../parsers/index.js";
-import { detectCurrentModuleType } from "../util/module-type";
+import { getPackageJson } from "./get-files.js";
 import console from "console";
 const logger = createLogger({
   level: "debug",
@@ -73,6 +73,20 @@ const resolveImport = (spec, sourceFile, destDir, options = {}) => {
   copyAsset(absolute, destPath);
   return { rule: buildRule(`../imports/${fileName}`, opts) };
 };
+const readPackageJsonModule = async (dirname2) => {
+  const packageJsonContent = await getPackageJson(dirname2);
+  if (!packageJsonContent) return void 0;
+  return packageJsonContent.type;
+};
+let cachedModuleType;
+const detectCurrentModuleType = async (dirname2) => {
+  if (cachedModuleType) return cachedModuleType;
+  const packageJsonModule = await readPackageJsonModule(dirname2);
+  if (packageJsonModule === "module") cachedModuleType = "esm";
+  else if (packageJsonModule === "commonjs") cachedModuleType = "cjs";
+  else if (import.meta.url.endsWith(".cjs")) cachedModuleType = "cjs";
+  return cachedModuleType || "esm";
+};
 function dotCase(str) {
   if (!str) return "";
   if (typeof str !== "string") return dotCase(String(str));

package/package.json

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