ecij 0.3.0 → 0.4.1

package/README.md

@@ -172,6 +172,5 @@ npm test -- -u
 
 - Log CSS extraction failures
 - Scope handling
-- Validate that the `css` used refers to the ecij export
 - Full import/export handling (default/namespace import/export)
 - Sourcemaps

package/dist/index.js

@@ -1,8 +1,8 @@
 import { createHash } from "node:crypto";
 import { relative } from "node:path";
 import { cwd } from "node:process";
-import { Visitor, parseSync } from "oxc-parser";
-import { makeIdFiltersToMatchWithQuery } from "@rolldown/pluginutils";
+import { makeIdFiltersToMatchWithQuery } from "rolldown/filter";
+import { Visitor, parseSync } from "rolldown/utils";
 
 //#region src/index.ts
 const JS_TS_FILE_REGEX = /\.[cm]?[jt]sx?$/;
@@ -14,6 +14,7 @@ function hashText(text) {
 }
 function ecij({ include = JS_TS_FILE_REGEX, exclude = [NODE_MODULES_REGEX, D_TS_FILE_REGEX], classPrefix = "css-" } = {}) {
 	const parsedFileInfoCache = /* @__PURE__ */ new Map();
+	const stylesheetImportPerFile = /* @__PURE__ */ new Map();
 	const extractedCssPerFile = /* @__PURE__ */ new Map();
 	/**
 	* Parses a file and extracts all relevant information in a single pass
@@ -95,27 +96,28 @@ function ecij({ include = JS_TS_FILE_REGEX, exclude = [NODE_MODULES_REGEX, D_TS_
 		const { declarations, localIdentifiers, importedIdentifiers } = await parseFile(context, filePath, code);
 		const cssExtractions = [];
 		const replacements = [];
-		const modulesWithSideEffects = /* @__PURE__ */ new Set();
+		const stylesheetDependencies = /* @__PURE__ */ new Set();
 		async function resolveValue(identifierName) {
 			if (localIdentifiers.has(identifierName)) return localIdentifiers.get(identifierName);
 			if (importedIdentifiers.has(identifierName)) {
 				const { source, imported } = importedIdentifiers.get(identifierName);
 				const resolvedId = await context.resolve(source, filePath);
 				if (resolvedId != null) {
+					await context.load(resolvedId);
 					const { id } = resolvedId;
-					const { declarations: declarations$1, exportNameToValueMap } = await parseFile(context, id);
+					const { exportNameToValueMap } = await parseFile(context, id);
 					if (exportNameToValueMap.has(imported)) {
-						if (declarations$1.length !== 0) modulesWithSideEffects.add(id);
+						if (stylesheetImportPerFile.has(id)) stylesheetDependencies.add(stylesheetImportPerFile.get(id));
 						return exportNameToValueMap.get(imported);
 					}
 				}
 			}
 		}
-		function addProcessedDeclaration(declaration, cssContent$1) {
+		function addProcessedDeclaration(declaration, cssContent) {
 			const { className, node } = declaration;
 			cssExtractions.push({
 				className,
-				cssContent: cssContent$1.trim(),
+				cssContent: cssContent.trim(),
 				sourcePosition: node.start
 			});
 			replacements.push({
@@ -126,16 +128,16 @@ function ecij({ include = JS_TS_FILE_REGEX, exclude = [NODE_MODULES_REGEX, D_TS_
 		}
 		for (const declaration of declarations) {
 			if (declaration.hasInterpolations) continue;
-			const cssContent$1 = declaration.node.quasi.quasis[0].value.raw;
-			addProcessedDeclaration(declaration, cssContent$1);
+			const cssContent = declaration.node.quasi.quasis[0].value.raw;
+			addProcessedDeclaration(declaration, cssContent);
 		}
 		for (const declaration of declarations) {
 			if (!declaration.hasInterpolations) continue;
 			const { quasis, expressions } = declaration.node.quasi;
-			let cssContent$1 = "";
+			let cssContent = "";
 			let allResolved = true;
 			for (let i = 0; i < quasis.length; i++) {
-				cssContent$1 += quasis[i].value.raw;
+				cssContent += quasis[i].value.raw;
 				if (i < expressions.length) {
 					const expression = expressions[i];
 					if (expression.type !== "Identifier") {
@@ -148,35 +150,36 @@ function ecij({ include = JS_TS_FILE_REGEX, exclude = [NODE_MODULES_REGEX, D_TS_
 						allResolved = false;
 						break;
 					}
-					cssContent$1 += resolvedValue;
+					cssContent += resolvedValue;
 				}
 			}
-			if (allResolved) addProcessedDeclaration(declaration, cssContent$1);
+			if (allResolved) addProcessedDeclaration(declaration, cssContent);
 		}
 		if (replacements.length === 0) return {
 			transformedCode: code,
 			hasExtractions: false,
 			cssContent: "",
-			modulesWithSideEffects
+			stylesheetDependencies
 		};
 		replacements.sort((a, b) => b.start - a.start);
 		let transformedCode = code;
 		for (const { start, end, className } of replacements) transformedCode = `${transformedCode.slice(0, start)}'${className}'${transformedCode.slice(end)}`;
 		cssExtractions.sort((a, b) => a.sourcePosition - b.sourcePosition);
 		const cssBlocks = [];
-		for (const { className, cssContent: cssContent$1 } of cssExtractions) if (cssContent$1 !== "") cssBlocks.push(`.${className} {\n  ${cssContent$1}\n}`);
+		for (const { className, cssContent } of cssExtractions) if (cssContent !== "") cssBlocks.push(`.${className} {\n  ${cssContent}\n}`);
 		const cssContent = cssBlocks.join("\n\n");
 		return {
 			transformedCode,
 			hasExtractions: true,
 			cssContent,
-			modulesWithSideEffects
+			stylesheetDependencies
 		};
 	}
 	return {
 		name: "ecij",
 		buildEnd() {
 			parsedFileInfoCache.clear();
+			stylesheetImportPerFile.clear();
 			extractedCssPerFile.clear();
 		},
 		resolveId(id) {
@@ -197,14 +200,15 @@ function ecij({ include = JS_TS_FILE_REGEX, exclude = [NODE_MODULES_REGEX, D_TS_
 				if (!code.includes("ecij")) return null;
 				const queryIndex = id.indexOf("?");
 				const cleanId = queryIndex === -1 ? id : id.slice(0, queryIndex);
-				const { transformedCode, hasExtractions, cssContent, modulesWithSideEffects } = await extractCssFromCode(this, code, cleanId);
+				const { transformedCode, hasExtractions, cssContent, stylesheetDependencies } = await extractCssFromCode(this, code, cleanId);
 				if (!hasExtractions) return null;
 				if (cssContent === "") return transformedCode;
 				const cssModuleId = `${cleanId}.${hashText(cssContent)}.css`;
 				extractedCssPerFile.set(cssModuleId, cssContent);
+				stylesheetImportPerFile.set(id, cssModuleId);
 				const importStatements = [];
-				for (const id$1 of modulesWithSideEffects) importStatements.push(`import ${JSON.stringify(id$1)};\n`);
-				importStatements.push(`import ${JSON.stringify(cssModuleId)}\n;`);
+				for (const id of stylesheetDependencies) importStatements.push(`import ${JSON.stringify(id)};\n`);
+				importStatements.push(`import ${JSON.stringify(cssModuleId)};\n`);
 				return `${importStatements.join("")}${transformedCode}`;
 			}
 		}

package/index.d.ts

@@ -14,7 +14,4 @@
  * const myClass = 'css-a1b2c3d4';
  * ```
  */
-export function css(
-  strings: TemplateStringsArray,
-  ...expressions: Array<string | number>
-): string;
+export function css(strings: TemplateStringsArray, ...expressions: Array<string | number>): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ecij",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "Rolldown and Vite plugin to Extract CSS-in-JS",
   "keywords": [
     "css-in-js"
@@ -9,14 +9,19 @@
   "bugs": {
     "url": "https://github.com/nstepien/ecij/issues"
   },
+  "license": "MIT",
+  "author": "Nicolas Stepien",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nstepien/ecij.git"
   },
-  "license": "MIT",
-  "author": "Nicolas Stepien",
+  "files": [
+    "dist",
+    "index.d.ts"
+  ],
   "type": "module",
   "sideEffects": false,
+  "main": "index.js",
   "exports": {
     ".": {
       "types": "./index.d.ts",
@@ -27,32 +32,23 @@
       "default": "./dist/index.js"
     }
   },
-  "main": "index.js",
-  "files": [
-    "dist",
-    "index.d.ts"
-  ],
   "scripts": {
     "build": "rolldown -c",
-    "format": "prettier --write .",
-    "format:check": "prettier --check .",
+    "format": "oxfmt",
+    "format:check": "oxfmt --check",
     "typecheck": "tsc --build",
     "test": "vitest run",
     "test:coverage": "vitest run --coverage"
   },
-  "dependencies": {
-    "@rolldown/pluginutils": "^1.0.0-beta.53",
-    "oxc-parser": "^0.102.0"
-  },
   "devDependencies": {
-    "@types/node": "^24.10.1",
-    "@vitest/coverage-v8": "^4.0.15",
-    "prettier": "^3.7.4",
-    "rolldown": "^1.0.0-beta.53",
-    "rolldown-plugin-dts": "^0.18.3",
+    "@types/node": "^25.3.2",
+    "@vitest/coverage-v8": "^4.0.18",
+    "oxfmt": "^0.35.0",
+    "rolldown": "^1.0.0-rc.6",
+    "rolldown-plugin-dts": "^0.22.2",
     "typescript": "^5.9.3",
-    "vite": "npm:rolldown-vite@^7.2.10",
-    "vitest": "^4.0.15"
+    "vite": "^8.0.0-beta.16",
+    "vitest": "^4.0.18"
   },
   "overrides": {
     "vite": "$vite"