@unocss/svelte-scoped 0.53.0 → 0.53.3

package/dist/preprocess.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const index = require('./shared/svelte-scoped.2f74d0fb.cjs');
+const index = require('./shared/svelte-scoped.ff02f958.cjs');
 require('@unocss/core');
 require('@unocss/preset-uno');
 require('@unocss/config');

package/dist/preprocess.mjs

@@ -1,4 +1,4 @@
-export { U as default } from './shared/svelte-scoped.d229bfc8.mjs';
+export { U as default } from './shared/svelte-scoped.089933b6.mjs';
 import '@unocss/core';
 import '@unocss/preset-uno';
 import '@unocss/config';

package/dist/shared/{svelte-scoped.d229bfc8.mjs → svelte-scoped.089933b6.mjs}

@@ -129,7 +129,7 @@ async function sortClassesIntoCategories(body, options, uno, filename) {
 }
 
 const expressionsRE = /\S*{[^{}]+?}\S*/g;
-const classesRE = /(["'\`])([\S\s]+?)\1/g;
+const classesRE = /(["'\`])([\S\s]*?)\1/g;
 async function processExpressions(body, options, uno, filename) {
   const rulesToGenerate = {};
   const updatedExpressions = [];

package/dist/shared/{svelte-scoped.2f74d0fb.cjs → svelte-scoped.ff02f958.cjs}

@@ -136,7 +136,7 @@ async function sortClassesIntoCategories(body, options, uno, filename) {
 }
 
 const expressionsRE = /\S*{[^{}]+?}\S*/g;
-const classesRE = /(["'\`])([\S\s]+?)\1/g;
+const classesRE = /(["'\`])([\S\s]*?)\1/g;
 async function processExpressions(body, options, uno, filename) {
   const rulesToGenerate = {};
   const updatedExpressions = [];

package/dist/vite.cjs

@@ -2,14 +2,21 @@
 
 const core = require('@unocss/core');
 const config = require('@unocss/config');
-const index = require('./shared/svelte-scoped.2f74d0fb.cjs');
+const index = require('./shared/svelte-scoped.ff02f958.cjs');
 const node_fs = require('node:fs');
 const node_path = require('node:path');
 const node_url = require('node:url');
+const MagicString = require('magic-string');
+const remapping = require('@ampproject/remapping');
+require('node:crypto');
 require('@unocss/preset-uno');
-require('magic-string');
 require('css-tree');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
+
+const MagicString__default = /*#__PURE__*/_interopDefaultLegacy(MagicString);
+const remapping__default = /*#__PURE__*/_interopDefaultLegacy(remapping);
+
 function PassPreprocessToSveltePlugin(options = {}, ctx) {
   let commandIsBuild = true;
   const isBuild = () => commandIsBuild;
@@ -144,13 +151,100 @@ function GlobalStylesPlugin({ ready, uno }, injectReset) {
   };
 }
 
+const IGNORE_COMMENT = "@unocss-ignore";
+const SKIP_START_COMMENT = "@unocss-skip-start";
+const SKIP_END_COMMENT = "@unocss-skip-end";
+const SKIP_COMMENT_RE = new RegExp(`(//\\s*?${SKIP_START_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_START_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_START_COMMENT}\\s*?-->)[\\s\\S]*?(//\\s*?${SKIP_END_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_END_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_END_COMMENT}\\s*?-->)`, "g");
+
+function hash(str) {
+  let i;
+  let l;
+  let hval = 2166136261;
+  for (i = 0, l = str.length; i < l; i++) {
+    hval ^= str.charCodeAt(i);
+    hval += (hval << 1) + (hval << 4) + (hval << 7) + (hval << 8) + (hval << 24);
+  }
+  return `00000${(hval >>> 0).toString(36)}`.slice(-6);
+}
+
+async function applyTransformers(ctx, original, id, enforce = "default") {
+  if (original.includes(IGNORE_COMMENT))
+    return;
+  const transformers = (ctx.uno.config.transformers || []).filter((i) => (i.enforce || "default") === enforce);
+  if (!transformers.length)
+    return;
+  const skipMap = /* @__PURE__ */ new Map();
+  let code = original;
+  let s = new MagicString__default(transformSkipCode(code, skipMap));
+  const maps = [];
+  for (const t of transformers) {
+    if (t.idFilter) {
+      if (!t.idFilter(id))
+        continue;
+    } else if (!ctx.filter(code, id)) {
+      continue;
+    }
+    await t.transform(s, id, ctx);
+    if (s.hasChanged()) {
+      code = restoreSkipCode(s.toString(), skipMap);
+      maps.push(s.generateMap({ hires: true, source: id }));
+      s = new MagicString__default(code);
+    }
+  }
+  if (code !== original) {
+    ctx.affectedModules.add(id);
+    return {
+      code,
+      map: remapping__default(maps, () => null)
+    };
+  }
+}
+function transformSkipCode(code, map) {
+  for (const item of Array.from(code.matchAll(SKIP_COMMENT_RE))) {
+    if (item != null) {
+      const matched = item[0];
+      const withHashKey = `@unocss-skip-placeholder-${hash(matched)}`;
+      map.set(withHashKey, matched);
+      code = code.replace(matched, withHashKey);
+    }
+  }
+  return code;
+}
+function restoreSkipCode(code, map) {
+  for (const [withHashKey, matched] of map.entries())
+    code = code.replace(withHashKey, matched);
+  return code;
+}
+
+const svelteIdRE = /[&?]svelte/;
+function createCssTransformerPlugins(ctx, cssTransformers) {
+  const enforces = ["default", "pre", "post"];
+  return enforces.map((enforce) => ({
+    name: `unocss:svelte-scoped-transformers:${enforce}`,
+    enforce: enforce === "default" ? void 0 : enforce,
+    async transform(code, id) {
+      if (!id.match(core.cssIdRE) || id.match(svelteIdRE))
+        return;
+      ctx.uno.config.transformers = cssTransformers ?? [];
+      return applyTransformers({
+        ...ctx,
+        affectedModules: /* @__PURE__ */ new Set()
+      }, code, id, enforce);
+    }
+  }));
+}
+
 function UnocssSvelteScopedVite(options = {}) {
   const context = createSvelteScopedContext(options.configOrPath);
+  if (context.uno.config.transformers)
+    throw new Error('Due to the differences in normal UnoCSS global usage and Svelte Scoped usage, "config.transformers" will be ignored. You can still use transformers in CSS files with the "cssFileTransformers" option.');
   const plugins = [
     GlobalStylesPlugin(context, options.injectReset)
   ];
   if (!options.onlyGlobal)
     plugins.push(PassPreprocessToSveltePlugin(options, context));
+  if (options.cssFileTransformers)
+    plugins.push(...createCssTransformerPlugins(context, options.cssFileTransformers));
   return plugins;
 }
 function createSvelteScopedContext(configOrPath) {

package/dist/vite.d.ts

@@ -1,6 +1,6 @@
 import { Plugin } from 'vite';
 import { U as UnocssSveltePreprocessOptions } from './types.d-20d48151.js';
-import '@unocss/core';
+import { PluginOptions } from '@unocss/core';
 
 interface UnocssSvelteScopedViteOptions extends UnocssSveltePreprocessOptions {
   /**
@@ -29,6 +29,11 @@ interface UnocssSvelteScopedViteOptions extends UnocssSveltePreprocessOptions {
    * @default false
   */
   onlyGlobal?: boolean
+  /**
+   * Process CSS files using UnoCSS transformers.
+   * @default undefined
+   */
+  cssFileTransformers?: PluginOptions['transformers']
 }
 
 declare function UnocssSvelteScopedVite(options?: UnocssSvelteScopedViteOptions): Plugin[];

package/dist/vite.mjs

@@ -1,11 +1,13 @@
-import { createGenerator } from '@unocss/core';
+import { cssIdRE, createGenerator } from '@unocss/core';
 import { loadConfig } from '@unocss/config';
-import { U as UnocssSveltePreprocess } from './shared/svelte-scoped.d229bfc8.mjs';
+import { U as UnocssSveltePreprocess } from './shared/svelte-scoped.089933b6.mjs';
 import { readFileSync, existsSync, statSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import MagicString from 'magic-string';
+import remapping from '@ampproject/remapping';
+import 'node:crypto';
 import '@unocss/preset-uno';
-import 'magic-string';
 import 'css-tree';
 
 function PassPreprocessToSveltePlugin(options = {}, ctx) {
@@ -142,13 +144,100 @@ function GlobalStylesPlugin({ ready, uno }, injectReset) {
   };
 }
 
+const IGNORE_COMMENT = "@unocss-ignore";
+const SKIP_START_COMMENT = "@unocss-skip-start";
+const SKIP_END_COMMENT = "@unocss-skip-end";
+const SKIP_COMMENT_RE = new RegExp(`(//\\s*?${SKIP_START_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_START_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_START_COMMENT}\\s*?-->)[\\s\\S]*?(//\\s*?${SKIP_END_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_END_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_END_COMMENT}\\s*?-->)`, "g");
+
+function hash(str) {
+  let i;
+  let l;
+  let hval = 2166136261;
+  for (i = 0, l = str.length; i < l; i++) {
+    hval ^= str.charCodeAt(i);
+    hval += (hval << 1) + (hval << 4) + (hval << 7) + (hval << 8) + (hval << 24);
+  }
+  return `00000${(hval >>> 0).toString(36)}`.slice(-6);
+}
+
+async function applyTransformers(ctx, original, id, enforce = "default") {
+  if (original.includes(IGNORE_COMMENT))
+    return;
+  const transformers = (ctx.uno.config.transformers || []).filter((i) => (i.enforce || "default") === enforce);
+  if (!transformers.length)
+    return;
+  const skipMap = /* @__PURE__ */ new Map();
+  let code = original;
+  let s = new MagicString(transformSkipCode(code, skipMap));
+  const maps = [];
+  for (const t of transformers) {
+    if (t.idFilter) {
+      if (!t.idFilter(id))
+        continue;
+    } else if (!ctx.filter(code, id)) {
+      continue;
+    }
+    await t.transform(s, id, ctx);
+    if (s.hasChanged()) {
+      code = restoreSkipCode(s.toString(), skipMap);
+      maps.push(s.generateMap({ hires: true, source: id }));
+      s = new MagicString(code);
+    }
+  }
+  if (code !== original) {
+    ctx.affectedModules.add(id);
+    return {
+      code,
+      map: remapping(maps, () => null)
+    };
+  }
+}
+function transformSkipCode(code, map) {
+  for (const item of Array.from(code.matchAll(SKIP_COMMENT_RE))) {
+    if (item != null) {
+      const matched = item[0];
+      const withHashKey = `@unocss-skip-placeholder-${hash(matched)}`;
+      map.set(withHashKey, matched);
+      code = code.replace(matched, withHashKey);
+    }
+  }
+  return code;
+}
+function restoreSkipCode(code, map) {
+  for (const [withHashKey, matched] of map.entries())
+    code = code.replace(withHashKey, matched);
+  return code;
+}
+
+const svelteIdRE = /[&?]svelte/;
+function createCssTransformerPlugins(ctx, cssTransformers) {
+  const enforces = ["default", "pre", "post"];
+  return enforces.map((enforce) => ({
+    name: `unocss:svelte-scoped-transformers:${enforce}`,
+    enforce: enforce === "default" ? void 0 : enforce,
+    async transform(code, id) {
+      if (!id.match(cssIdRE) || id.match(svelteIdRE))
+        return;
+      ctx.uno.config.transformers = cssTransformers ?? [];
+      return applyTransformers({
+        ...ctx,
+        affectedModules: /* @__PURE__ */ new Set()
+      }, code, id, enforce);
+    }
+  }));
+}
+
 function UnocssSvelteScopedVite(options = {}) {
   const context = createSvelteScopedContext(options.configOrPath);
+  if (context.uno.config.transformers)
+    throw new Error('Due to the differences in normal UnoCSS global usage and Svelte Scoped usage, "config.transformers" will be ignored. You can still use transformers in CSS files with the "cssFileTransformers" option.');
   const plugins = [
     GlobalStylesPlugin(context, options.injectReset)
   ];
   if (!options.onlyGlobal)
     plugins.push(PassPreprocessToSveltePlugin(options, context));
+  if (options.cssFileTransformers)
+    plugins.push(...createCssTransformerPlugins(context, options.cssFileTransformers));
   return plugins;
 }
 function createSvelteScopedContext(configOrPath) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/svelte-scoped",
   "type": "module",
-  "version": "0.53.0",
+  "version": "0.53.3",
   "description": "Use UnoCSS in a modular fashion with styles being stored only in the Svelte component they are used in: Vite plugin for apps, preprocessor for component libraries",
   "author": "Jacob Bowdoin",
   "license": "MIT",
@@ -54,8 +54,8 @@
   "dependencies": {
     "css-tree": "^2.3.1",
     "magic-string": "^0.30.0",
-    "@unocss/config": "0.53.0",
-    "@unocss/reset": "0.53.0"
+    "@unocss/config": "0.53.3",
+    "@unocss/reset": "0.53.3"
   },
   "devDependencies": {
     "prettier-plugin-svelte": "^2.10.1",
@@ -64,6 +64,7 @@
   "scripts": {
     "build": "unbuild",
     "stub": "unbuild --stub",
-    "bench": "vitest bench"
+    "bench": "vitest bench",
+    "test:integration": "pnpm -r --filter=\"./test/fixtures/*\" test"
   }
 }