@pikacss/integration 0.0.37 → 0.0.39

package/README.md

@@ -1 +1,56 @@
 # @pikacss/integration
+
+Internal integration utilities for PikaCSS build tool plugins.
+
+## ⚠️ Internal Package
+
+**This is an internal package** used by official PikaCSS integration plugins. 
+
+**Most users should use these instead:**
+- **[`@pikacss/unplugin-pikacss`](../unplugin/)** - Universal plugin for multiple bundlers
+- **[`@pikacss/nuxt-pikacss`](../nuxt/)** - Nuxt module
+
+## Installation
+
+Only needed for plugin development:
+
+```bash
+pnpm add @pikacss/integration
+```
+
+## What This Package Provides
+
+Low-level utilities for building PikaCSS integrations:
+
+- 🔧 Core integration context management
+- 📁 File scanning and code transformation
+- 🎯 Config file loading and resolution
+- 📦 Code generation (TypeScript and CSS)
+- ⚡ Build-time optimizations
+
+## Exports
+
+This package exports utilities from `@pikacss/core` and provides integration-specific functionality:
+
+```typescript
+// Main exports
+export * from './ctx'           // Integration context system
+export * from './types'         // TypeScript type definitions
+export * from '@pikacss/core'   // Re-exports all core exports
+```
+
+## For Plugin Authors
+
+If you're building a new integration for a bundler or framework, this package provides the foundation. 
+
+See how it's used in existing integrations:
+- [`@pikacss/unplugin-pikacss`](../unplugin/) - Universal plugin implementation
+- [`@pikacss/nuxt-pikacss`](../nuxt/) - Nuxt module implementation
+
+## Documentation
+
+For complete documentation, visit: [PikaCSS Documentation](https://pikacss.github.io/pikacss/)
+
+## License
+
+MIT © DevilTea

package/dist/index.cjs

@@ -27,7 +27,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 //#endregion
 let node_fs = require("node:fs");
 let node_fs_promises = require("node:fs/promises");
-let __pikacss_core = require("@pikacss/core");
+let _pikacss_core = require("@pikacss/core");
 let alien_signals = require("alien-signals");
 let globby = require("globby");
 let klona = require("klona");
@@ -129,11 +129,11 @@ function generateVueDeclaration(ctx) {
 	];
 }
 async function generateOverloadContent(ctx) {
-	__pikacss_core.log.debug("Generating TypeScript overload content");
+	_pikacss_core.log.debug("Generating TypeScript overload content");
 	const paramsLines = [];
 	const fnsLines = [];
 	const usages = [...ctx.usages.values()].flat();
-	__pikacss_core.log.debug(`Processing ${usages.length} style usages for overload generation`);
+	_pikacss_core.log.debug(`Processing ${usages.length} style usages for overload generation`);
 	for (let i = 0; i < usages.length; i++) {
 		const usage = usages[i];
 		try {
@@ -167,15 +167,15 @@ async function generateOverloadContent(ctx) {
 	];
 }
 async function generateTsCodegenContent(ctx) {
-	__pikacss_core.log.debug("Generating TypeScript code generation content");
+	_pikacss_core.log.debug("Generating TypeScript code generation content");
 	const lines = [
 		`// Auto-generated by ${ctx.currentPackageName}`,
-		`import type { CSSProperty, CSSSelectors, DefineAutocomplete, Properties, StyleDefinition, StyleItem } from \'${ctx.currentPackageName}\'`,
+		`import type { CSSProperty, CSSSelector, DefineAutocomplete, Properties, StyleDefinition, StyleItem } from \'${ctx.currentPackageName}\'`,
 		"",
 		`declare module \'${ctx.currentPackageName}\' {`,
 		"  interface PikaAugment {",
 		"    Autocomplete: Autocomplete",
-		"    Selector: Autocomplete['Selector'] | CSSSelectors",
+		"    Selector: Autocomplete['Selector'] | CSSSelector",
 		"    CSSProperty: Autocomplete['ExtraCssProperty'] | CSSProperty",
 		"    Properties: Properties",
 		"    StyleDefinition: StyleDefinition",
@@ -189,7 +189,7 @@ async function generateTsCodegenContent(ctx) {
 	lines.push(...generateGlobalDeclaration(ctx));
 	lines.push(...generateVueDeclaration(ctx));
 	lines.push(...await generateOverloadContent(ctx));
-	__pikacss_core.log.debug("TypeScript code generation content completed");
+	_pikacss_core.log.debug("TypeScript code generation content completed");
 	return lines.join("\n");
 }
 
@@ -220,9 +220,9 @@ function useConfig({ cwd, tsCodegenFilepath, currentPackageName, autoCreateConfi
 	const inlineConfig = typeof configOrPath === "object" ? configOrPath : null;
 	async function _loadConfig() {
 		try {
-			__pikacss_core.log.debug("Loading engine config");
+			_pikacss_core.log.debug("Loading engine config");
 			if (inlineConfig != null) {
-				__pikacss_core.log.debug("Using inline config");
+				_pikacss_core.log.debug("Using inline config");
 				return {
 					config: (0, klona.klona)(inlineConfig),
 					file: null,
@@ -233,7 +233,7 @@ function useConfig({ cwd, tsCodegenFilepath, currentPackageName, autoCreateConfi
 			const _cwd = cwd();
 			if (resolvedConfigPath$1 == null) {
 				if (autoCreateConfig === false) {
-					__pikacss_core.log.warn("Config file not found and autoCreateConfig is false");
+					_pikacss_core.log.warn("Config file not found and autoCreateConfig is false");
 					return {
 						config: null,
 						file: null,
@@ -253,7 +253,7 @@ function useConfig({ cwd, tsCodegenFilepath, currentPackageName, autoCreateConfi
 					"})"
 				].join("\n"));
 			}
-			__pikacss_core.log.info(`Using config file: ${resolvedConfigPath$1}`);
+			_pikacss_core.log.info(`Using config file: ${resolvedConfigPath$1}`);
 			const { createJiti } = await import("jiti");
 			const jiti = createJiti(require("url").pathToFileURL(__filename).href, { interopDefault: true });
 			const content = await (0, node_fs_promises.readFile)(resolvedConfigPath$1, "utf-8");
@@ -267,7 +267,7 @@ function useConfig({ cwd, tsCodegenFilepath, currentPackageName, autoCreateConfi
 				content
 			};
 		} catch (error) {
-			__pikacss_core.log.error(`Failed to load config file: ${error.message}`, error);
+			_pikacss_core.log.error(`Failed to load config file: ${error.message}`, error);
 			return {
 				config: null,
 				file: null,
@@ -355,12 +355,49 @@ function useTransform({ cwd, cssCodegenFilepath, tsCodegenFilepath, scan, fnName
 			let end = start + fnName$1.length;
 			let depth = 1;
 			let inString = false;
-			while (depth > 0) {
+			let isEscaped = false;
+			while (depth > 0 && end < code.length) {
 				end++;
-				if (inString === false && code[end] === "(") depth++;
-				else if (inString === false && code[end] === ")") depth--;
-				else if (inString === false && (code[end] === "'" || code[end] === "\"")) inString = code[end];
-				else if (inString === code[end]) inString = false;
+				const char = code[end];
+				if (isEscaped) {
+					isEscaped = false;
+					continue;
+				}
+				if (char === "\\") {
+					isEscaped = true;
+					continue;
+				}
+				if (inString !== false) {
+					if (char === inString) inString = false;
+					else if (inString === "`" && char === "$" && code[end + 1] === "{") {
+						end++;
+						depth++;
+					}
+					continue;
+				}
+				if (char === "(") depth++;
+				else if (char === ")") depth--;
+				else if (char === "'" || char === "\"" || char === "`") inString = char;
+				else if (char === "/" && code[end + 1] === "/") {
+					const lineEnd = code.indexOf("\n", end);
+					if (lineEnd === -1) {
+						_pikacss_core.log.warn(`Unclosed function call at position ${start}`);
+						break;
+					}
+					end = lineEnd;
+				} else if (char === "/" && code[end + 1] === "*") {
+					const commentEnd = code.indexOf("*/", end + 2);
+					if (commentEnd === -1) {
+						_pikacss_core.log.warn(`Unclosed comment in function call at position ${start}`);
+						break;
+					}
+					end = commentEnd + 1;
+				}
+			}
+			if (depth !== 0) {
+				_pikacss_core.log.warn(`Malformed function call at position ${start}, skipping`);
+				matched = RE.exec(code);
+				continue;
 			}
 			const snippet = code.slice(start, end + 1);
 			result.push({
@@ -377,11 +414,11 @@ function useTransform({ cwd, cssCodegenFilepath, tsCodegenFilepath, scan, fnName
 		const _engine = engine();
 		if (_engine == null) return null;
 		try {
-			__pikacss_core.log.debug(`Transforming file: ${id}`);
+			_pikacss_core.log.debug(`Transforming file: ${id}`);
 			usages.delete(id);
 			const functionCalls = findFunctionCalls(code);
 			if (functionCalls.length === 0) return;
-			__pikacss_core.log.debug(`Found ${functionCalls.length} style function calls in ${id}`);
+			_pikacss_core.log.debug(`Found ${functionCalls.length} style function calls in ${id}`);
 			const usageList = [];
 			const transformed = new magic_string.default(code);
 			for (const fnCall of functionCalls) {
@@ -404,13 +441,13 @@ function useTransform({ cwd, cssCodegenFilepath, tsCodegenFilepath, scan, fnName
 			usages.set(id, usageList);
 			triggerStyleUpdated();
 			triggerTsCodegenUpdated();
-			__pikacss_core.log.debug(`Transformed ${usageList.length} style usages in ${id}`);
+			_pikacss_core.log.debug(`Transformed ${usageList.length} style usages in ${id}`);
 			return {
 				code: transformed.toString(),
 				map: transformed.generateMap({ hires: true })
 			};
 		} catch (error) {
-			__pikacss_core.log.error(`Failed to transform code (${(0, pathe.join)(cwd(), id)}): ${error.message}`, error);
+			_pikacss_core.log.error(`Failed to transform code (${(0, pathe.join)(cwd(), id)}): ${error.message}`, error);
 			return;
 		}
 	}
@@ -492,9 +529,9 @@ function createCtx(options) {
 		},
 		getCssCodegenContent: async () => {
 			await ctx.setupPromise;
-			__pikacss_core.log.debug("Generating CSS code");
+			_pikacss_core.log.debug("Generating CSS code");
 			const atomicStyleIds = [...new Set([...ctx.usages.values()].flatMap((i) => [...new Set(i.flatMap((i$1) => i$1.atomicStyleIds))]))];
-			__pikacss_core.log.debug(`Collecting ${atomicStyleIds.length} atomic style IDs`);
+			_pikacss_core.log.debug(`Collecting ${atomicStyleIds.length} atomic style IDs`);
 			return [
 				`/* Auto-generated by ${ctx.currentPackageName} */`,
 				await ctx.engine.renderPreflights(true),
@@ -511,7 +548,7 @@ function createCtx(options) {
 			const content = await ctx.getCssCodegenContent();
 			if (content == null) return;
 			await (0, node_fs_promises.mkdir)((0, pathe.dirname)(ctx.cssCodegenFilepath), { recursive: true }).catch(() => {});
-			__pikacss_core.log.debug(`Writing CSS code generation file: ${ctx.cssCodegenFilepath}`);
+			_pikacss_core.log.debug(`Writing CSS code generation file: ${ctx.cssCodegenFilepath}`);
 			await (0, node_fs_promises.writeFile)(ctx.cssCodegenFilepath, content);
 		},
 		writeTsCodegenFile: async () => {
@@ -520,12 +557,12 @@ function createCtx(options) {
 			const content = await ctx.getTsCodegenContent();
 			if (content == null) return;
 			await (0, node_fs_promises.mkdir)((0, pathe.dirname)(ctx.tsCodegenFilepath), { recursive: true }).catch(() => {});
-			__pikacss_core.log.debug(`Writing TypeScript code generation file: ${ctx.tsCodegenFilepath}`);
+			_pikacss_core.log.debug(`Writing TypeScript code generation file: ${ctx.tsCodegenFilepath}`);
 			await (0, node_fs_promises.writeFile)(ctx.tsCodegenFilepath, content);
 		},
 		fullyCssCodegen: async () => {
 			await ctx.setupPromise;
-			__pikacss_core.log.debug("Starting full CSS code generation scan");
+			_pikacss_core.log.debug("Starting full CSS code generation scan");
 			const stream = (0, globby.globbyStream)(options.scan.include, { ignore: options.scan.exclude });
 			let fileCount = 0;
 			const _cwd = cwd();
@@ -534,13 +571,13 @@ function createCtx(options) {
 				await ctx.transform(code, entry);
 				fileCount++;
 			}
-			__pikacss_core.log.debug(`Scanned ${fileCount} files for style collection`);
+			_pikacss_core.log.debug(`Scanned ${fileCount} files for style collection`);
 			await ctx.writeCssCodegenFile();
 		},
 		setupPromise: null,
 		setup: () => {
 			ctx.setupPromise = setup().catch((error) => {
-				__pikacss_core.log.error(`Failed to setup integration context: ${error.message}`, error);
+				_pikacss_core.log.error(`Failed to setup integration context: ${error.message}`, error);
 			}).then(() => {
 				ctx.setupPromise = null;
 			});
@@ -548,13 +585,13 @@ function createCtx(options) {
 		}
 	};
 	async function setup() {
-		__pikacss_core.log.debug("Setting up integration context");
+		_pikacss_core.log.debug("Setting up integration context");
 		usages.clear();
 		hooks.styleUpdated.listeners.clear();
 		hooks.tsCodegenUpdated.listeners.clear();
 		engine(null);
 		await loadConfig();
-		const devPlugin = (0, __pikacss_core.defineEnginePlugin)({
+		const devPlugin = (0, _pikacss_core.defineEnginePlugin)({
 			name: "@pikacss/integration:dev",
 			preflightUpdated: () => hooks.styleUpdated.trigger(),
 			atomicStyleAdded: () => hooks.styleUpdated.trigger(),
@@ -564,22 +601,22 @@ function createCtx(options) {
 			const config = resolvedConfig() ?? {};
 			config.plugins = config.plugins ?? [];
 			config.plugins.unshift(devPlugin);
-			__pikacss_core.log.debug("Creating engine with loaded/default config");
-			engine(await (0, __pikacss_core.createEngine)(config));
+			_pikacss_core.log.debug("Creating engine with loaded/default config");
+			engine(await (0, _pikacss_core.createEngine)(config));
 		} catch (error) {
-			__pikacss_core.log.error(`Failed to create engine: ${error.message}. Falling back to default config.`, error);
-			engine(await (0, __pikacss_core.createEngine)({ plugins: [devPlugin] }));
+			_pikacss_core.log.error(`Failed to create engine: ${error.message}. Falling back to default config.`, error);
+			engine(await (0, _pikacss_core.createEngine)({ plugins: [devPlugin] }));
 		}
-		__pikacss_core.log.debug("Integration context setup successfully");
+		_pikacss_core.log.debug("Integration context setup successfully");
 	}
 	return ctx;
 }
 
 //#endregion
 exports.createCtx = createCtx;
-Object.keys(__pikacss_core).forEach(function (k) {
+Object.keys(_pikacss_core).forEach(function (k) {
   if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,
-    get: function () { return __pikacss_core[k]; }
+    get: function () { return _pikacss_core[k]; }
   });
 });

package/dist/index.mjs

@@ -144,12 +144,12 @@ async function generateTsCodegenContent(ctx) {
 	log.debug("Generating TypeScript code generation content");
 	const lines = [
 		`// Auto-generated by ${ctx.currentPackageName}`,
-		`import type { CSSProperty, CSSSelectors, DefineAutocomplete, Properties, StyleDefinition, StyleItem } from \'${ctx.currentPackageName}\'`,
+		`import type { CSSProperty, CSSSelector, DefineAutocomplete, Properties, StyleDefinition, StyleItem } from \'${ctx.currentPackageName}\'`,
 		"",
 		`declare module \'${ctx.currentPackageName}\' {`,
 		"  interface PikaAugment {",
 		"    Autocomplete: Autocomplete",
-		"    Selector: Autocomplete['Selector'] | CSSSelectors",
+		"    Selector: Autocomplete['Selector'] | CSSSelector",
 		"    CSSProperty: Autocomplete['ExtraCssProperty'] | CSSProperty",
 		"    Properties: Properties",
 		"    StyleDefinition: StyleDefinition",
@@ -329,12 +329,49 @@ function useTransform({ cwd, cssCodegenFilepath, tsCodegenFilepath, scan, fnName
 			let end = start + fnName$1.length;
 			let depth = 1;
 			let inString = false;
-			while (depth > 0) {
+			let isEscaped = false;
+			while (depth > 0 && end < code.length) {
 				end++;
-				if (inString === false && code[end] === "(") depth++;
-				else if (inString === false && code[end] === ")") depth--;
-				else if (inString === false && (code[end] === "'" || code[end] === "\"")) inString = code[end];
-				else if (inString === code[end]) inString = false;
+				const char = code[end];
+				if (isEscaped) {
+					isEscaped = false;
+					continue;
+				}
+				if (char === "\\") {
+					isEscaped = true;
+					continue;
+				}
+				if (inString !== false) {
+					if (char === inString) inString = false;
+					else if (inString === "`" && char === "$" && code[end + 1] === "{") {
+						end++;
+						depth++;
+					}
+					continue;
+				}
+				if (char === "(") depth++;
+				else if (char === ")") depth--;
+				else if (char === "'" || char === "\"" || char === "`") inString = char;
+				else if (char === "/" && code[end + 1] === "/") {
+					const lineEnd = code.indexOf("\n", end);
+					if (lineEnd === -1) {
+						log.warn(`Unclosed function call at position ${start}`);
+						break;
+					}
+					end = lineEnd;
+				} else if (char === "/" && code[end + 1] === "*") {
+					const commentEnd = code.indexOf("*/", end + 2);
+					if (commentEnd === -1) {
+						log.warn(`Unclosed comment in function call at position ${start}`);
+						break;
+					}
+					end = commentEnd + 1;
+				}
+			}
+			if (depth !== 0) {
+				log.warn(`Malformed function call at position ${start}, skipping`);
+				matched = RE.exec(code);
+				continue;
 			}
 			const snippet = code.slice(start, end + 1);
 			result.push({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pikacss/integration",
   "type": "module",
-  "version": "0.0.37",
+  "version": "0.0.39",
   "author": "DevilTea <ch19980814@gmail.com>",
   "license": "MIT",
   "repository": {
@@ -49,7 +49,7 @@
     "micromatch": "^4.0.8",
     "pathe": "^2.0.3",
     "perfect-debounce": "^2.0.0",
-    "@pikacss/core": "0.0.37"
+    "@pikacss/core": "0.0.39"
   },
   "devDependencies": {
     "@types/micromatch": "^4.0.10"