vite-plugin-qingkuai 1.0.9 → 1.0.10

package/dist/index.cjs

@@ -3,11 +3,13 @@
 var node_path = require('node:path');
 var node_fs = require('node:fs');
 var node_crypto = require('node:crypto');
-var sourcemapCodec = require('@jridgewell/sourcemap-codec');
 var compiler = require('qingkuai/compiler');
+var linesAndColumns = require('lines-and-columns');
+var sourcemapCodec = require('@jridgewell/sourcemap-codec');
 var postcss = require('postcss');
 var selectorParser = require('postcss-selector-parser');
 var vite = require('vite');
+var sourceMapJs = require('source-map-js');
 
 function findFilesByName(dir, targetFileName, ignoreList) {
   const result = [];
@@ -26,23 +28,8 @@ function findFilesByName(dir, targetFileName, ignoreList) {
   return result;
 }
 
-function offsetSourceMap(mappings, sourceIndex, preLine, preColumn) {
-  return sourcemapCodec.decode(mappings).map((line) => {
-    return line.map((segment) => {
-      if (segment.length === 1 || segment[1] !== sourceIndex) {
-        return segment;
-      }
-      if (segment[2] === preLine) {
-        segment[3] += preColumn;
-      } else {
-        segment[2] += preLine;
-      }
-      return segment;
-    });
-  });
-}
-
 async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
+  let error;
   const processor = postcss([
     {
       postcssPlugin: "postcss-attach-scope-qingkuai",
@@ -52,8 +39,34 @@ async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
         }
         rule.selector = selectorParser((selectors) => {
           selectors.each((selector) => {
+            const scopePseudoSelectors = selector.nodes.filter(
+              (node) => node.type === "pseudo" && node.value === ":scope"
+            );
+            if (scopePseudoSelectors.length) {
+              if (scopePseudoSelectors.length > 1) {
+                error = {
+                  loc: scopePseudoSelectors[1].source?.start,
+                  message: "Duplicate scope pseudo class selectors."
+                };
+              } else {
+                const fistScopePseudo = scopePseudoSelectors[0];
+                if (!fistScopePseudo.nodes[0]?.toString()) {
+                  error = {
+                    loc: fistScopePseudo?.source?.start,
+                    message: "Must pass paramter for the :scope pseudo class selector."
+                  };
+                }
+                if (fistScopePseudo.nodes.length > 1) {
+                  error = {
+                    loc: fistScopePseudo?.source?.start,
+                    message: "The :scope pseudo class selector can accept at most one parameter."
+                  };
+                }
+                fistScopePseudo.nodes[0] && (selector = fistScopePseudo.nodes[0]);
+              }
+            }
             const index = selector.nodes.findLastIndex(({ type }) => {
-              return type === "class" || type === "tag" || type === "id" || type === "universal";
+              return type === "id" || type === "tag" || type === "class" || type === "universal" || type === "attribute";
             });
             if (index !== -1) {
               const lastNode = selector.nodes[index];
@@ -65,6 +78,7 @@ async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
                   raws: {}
                 })
               );
+              scopePseudoSelectors[0]?.replaceWith(...scopePseudoSelectors[0].nodes);
             }
           });
         }).processSync(rule.selector);
@@ -78,7 +92,26 @@ async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
       annotation: false
     }
   });
-  return { code: ret.css, mappings: ret.map.toJSON().mappings };
+  return { error, code: ret.css, mappings: ret.map.toJSON().mappings };
+}
+
+function offsetSourceMap(mappings, sourceIndex, preLine, preColumn) {
+  return sourcemapCodec.decode(mappings).map((line) => {
+    return line.map((segment) => {
+      if (segment.length === 1 || segment[1] !== sourceIndex) {
+        return segment;
+      }
+      if (segment[2] === preLine) {
+        segment[3] += preColumn;
+      } else {
+        segment[2] += preLine;
+      }
+      return segment;
+    });
+  });
+}
+async function getOriginalPosition(map, line, column) {
+  return new sourceMapJs.SourceMapConsumer(map).originalPositionFor({ line, column });
 }
 
 function qingkuaiPlugin() {
@@ -119,6 +152,7 @@ function qingkuaiPlugin() {
         const qingkuaiConfig = getQingkuaiConfiguration(id);
         return node_path.join(node_path.dirname(importer), id + (qingkuaiConfig.resolveImportExtension ? ".qk" : ""));
       }
+      return id;
     },
     async load(id) {
       if (styleIdRE.test(id)) {
@@ -163,6 +197,30 @@ function qingkuaiPlugin() {
             style.loc.start.column - 1
           )
         );
+        if (attachScopeResult.error) {
+          if (!attachScopeResult.error.loc) {
+            this.error(attachScopeResult.error.message);
+          } else {
+            const preprocessedPosition = await getOriginalPosition(
+              assertedPreprocessMap,
+              attachScopeResult.error.loc.line,
+              attachScopeResult.error.loc.column
+            );
+            const preprocessedIndex = new linesAndColumns.LinesAndColumns(style.code).indexForLocation({
+              line: preprocessedPosition.line - 1,
+              column: preprocessedPosition.column
+            }) || 0;
+            const position = compileRes.inputDescriptor.positions[style.loc.start.index + preprocessedIndex];
+            this.error({
+              message: attachScopeResult.error.message,
+              loc: {
+                file: fileId,
+                line: position.line,
+                column: position.column
+              }
+            });
+          }
+        }
         return {
           code: attachScopeResult.code,
           map: {
@@ -192,64 +250,68 @@ function qingkuaiPlugin() {
         }
         return;
       }
-      const compileRes = compiler.compile(src, {
-        sourcemap,
-        debug: isDev,
-        hashId: compileResultCache.get(id)?.hashId || void 0,
-        reserveTemplateComment: getReserveHtmlComments(qingkuaiConfig),
-        componentName: compiler.util.kebab2Camel(node_path.basename(id, node_path.extname(id)), true)
-      });
-      compileRes.messages.forEach(({ type, value: warning }) => {
-        if (type === "warning") {
-          this.warn(warning.message);
+      try {
+        const compileRes = compiler.compile(src, {
+          sourcemap,
+          debug: isDev,
+          hashId: compileResultCache.get(id)?.hashId || void 0,
+          reserveTemplateComment: getReserveHtmlComments(qingkuaiConfig),
+          componentName: compiler.util.kebab2Camel(node_path.basename(id, node_path.extname(id)), true)
+        });
+        compileRes.messages.forEach(({ type, value: warning }) => {
+          if (type === "warning") {
+            this.warn(warning.message);
+          }
+        });
+        compileResultCache.set(id, compileRes);
+        const compiledCodeArr = [compileRes.code];
+        compileRes.inputDescriptor.styles.forEach((_, index) => {
+          compiledCodeArr.push(`import "virtual:[${index}]${id}.css?${Date.now()}"`);
+        });
+        const baseMap = {
+          version: 3,
+          sources: [id],
+          sourcesContent: [src]
+        };
+        const compiledCode = compiledCodeArr.join("\n");
+        if (!compileRes.inputDescriptor.script.isTS) {
+          if (!sourcemap) {
+            return compiledCode;
+          }
+          return {
+            code: compiledCode,
+            map: Object.assign(baseMap, {
+              mappings: compileRes.mappings
+            })
+          };
         }
-      });
-      compileResultCache.set(id, compileRes);
-      const compiledCodeArr = [compileRes.code];
-      compileRes.inputDescriptor.styles.forEach((_, index) => {
-        compiledCodeArr.push(`import "virtual:[${index}]${id}.css?${Date.now()}"`);
-      });
-      const baseMap = {
-        version: 3,
-        sources: [id],
-        sourcesContent: [src]
-      };
-      const compiledCode = compiledCodeArr.join("\n");
-      if (!compileRes.inputDescriptor.script.isTS) {
+        const esBuildCompileRes = await vite.transformWithEsbuild(
+          compiledCode,
+          id,
+          {
+            sourcemap,
+            loader: "ts",
+            target: "esnext"
+          },
+          sourcemap ? {
+            version: 3,
+            sources: [id],
+            sourcesContent: [src],
+            mappings: compileRes.mappings
+          } : void 0
+        );
         if (!sourcemap) {
-          return compiledCode;
+          return esBuildCompileRes.code;
         }
         return {
-          code: compiledCode,
+          code: esBuildCompileRes.code,
           map: Object.assign(baseMap, {
-            mappings: compileRes.mappings
+            mappings: esBuildCompileRes.map.mappings
           })
         };
+      } catch (err) {
+        err.pos = err.loc.start.index, this.error(err);
       }
-      const esBuildCompileRes = await vite.transformWithEsbuild(
-        compiledCode,
-        id,
-        {
-          sourcemap,
-          loader: "ts",
-          target: "esnext"
-        },
-        sourcemap ? {
-          version: 3,
-          sources: [id],
-          sourcesContent: [src],
-          mappings: compileRes.mappings
-        } : void 0
-      );
-      if (!sourcemap) {
-        return esBuildCompileRes.code;
-      }
-      return {
-        code: esBuildCompileRes.code,
-        map: Object.assign(baseMap, {
-          mappings: esBuildCompileRes.map.mappings
-        })
-      };
     }
   };
   function getQingkuaiConfiguration(id) {

package/dist/index.js

@@ -1,11 +1,13 @@
 import { join, basename, extname, dirname } from 'node:path';
 import { readdirSync, existsSync, readFileSync } from 'node:fs';
 import { randomBytes } from 'node:crypto';
-import { decode, encode } from '@jridgewell/sourcemap-codec';
 import { compile, util } from 'qingkuai/compiler';
+import { LinesAndColumns } from 'lines-and-columns';
+import { decode, encode } from '@jridgewell/sourcemap-codec';
 import postcss from 'postcss';
 import selectorParser from 'postcss-selector-parser';
 import { transformWithEsbuild, preprocessCSS } from 'vite';
+import { SourceMapConsumer } from 'source-map-js';
 
 function findFilesByName(dir, targetFileName, ignoreList) {
   const result = [];
@@ -24,23 +26,8 @@ function findFilesByName(dir, targetFileName, ignoreList) {
   return result;
 }
 
-function offsetSourceMap(mappings, sourceIndex, preLine, preColumn) {
-  return decode(mappings).map((line) => {
-    return line.map((segment) => {
-      if (segment.length === 1 || segment[1] !== sourceIndex) {
-        return segment;
-      }
-      if (segment[2] === preLine) {
-        segment[3] += preColumn;
-      } else {
-        segment[2] += preLine;
-      }
-      return segment;
-    });
-  });
-}
-
 async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
+  let error;
   const processor = postcss([
     {
       postcssPlugin: "postcss-attach-scope-qingkuai",
@@ -50,8 +37,34 @@ async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
         }
         rule.selector = selectorParser((selectors) => {
           selectors.each((selector) => {
+            const scopePseudoSelectors = selector.nodes.filter(
+              (node) => node.type === "pseudo" && node.value === ":scope"
+            );
+            if (scopePseudoSelectors.length) {
+              if (scopePseudoSelectors.length > 1) {
+                error = {
+                  loc: scopePseudoSelectors[1].source?.start,
+                  message: "Duplicate scope pseudo class selectors."
+                };
+              } else {
+                const fistScopePseudo = scopePseudoSelectors[0];
+                if (!fistScopePseudo.nodes[0]?.toString()) {
+                  error = {
+                    loc: fistScopePseudo?.source?.start,
+                    message: "Must pass paramter for the :scope pseudo class selector."
+                  };
+                }
+                if (fistScopePseudo.nodes.length > 1) {
+                  error = {
+                    loc: fistScopePseudo?.source?.start,
+                    message: "The :scope pseudo class selector can accept at most one parameter."
+                  };
+                }
+                fistScopePseudo.nodes[0] && (selector = fistScopePseudo.nodes[0]);
+              }
+            }
             const index = selector.nodes.findLastIndex(({ type }) => {
-              return type === "class" || type === "tag" || type === "id" || type === "universal";
+              return type === "id" || type === "tag" || type === "class" || type === "universal" || type === "attribute";
             });
             if (index !== -1) {
               const lastNode = selector.nodes[index];
@@ -63,6 +76,7 @@ async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
                   raws: {}
                 })
               );
+              scopePseudoSelectors[0]?.replaceWith(...scopePseudoSelectors[0].nodes);
             }
           });
         }).processSync(rule.selector);
@@ -76,7 +90,26 @@ async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
       annotation: false
     }
   });
-  return { code: ret.css, mappings: ret.map.toJSON().mappings };
+  return { error, code: ret.css, mappings: ret.map.toJSON().mappings };
+}
+
+function offsetSourceMap(mappings, sourceIndex, preLine, preColumn) {
+  return decode(mappings).map((line) => {
+    return line.map((segment) => {
+      if (segment.length === 1 || segment[1] !== sourceIndex) {
+        return segment;
+      }
+      if (segment[2] === preLine) {
+        segment[3] += preColumn;
+      } else {
+        segment[2] += preLine;
+      }
+      return segment;
+    });
+  });
+}
+async function getOriginalPosition(map, line, column) {
+  return new SourceMapConsumer(map).originalPositionFor({ line, column });
 }
 
 function qingkuaiPlugin() {
@@ -117,6 +150,7 @@ function qingkuaiPlugin() {
         const qingkuaiConfig = getQingkuaiConfiguration(id);
         return join(dirname(importer), id + (qingkuaiConfig.resolveImportExtension ? ".qk" : ""));
       }
+      return id;
     },
     async load(id) {
       if (styleIdRE.test(id)) {
@@ -161,6 +195,30 @@ function qingkuaiPlugin() {
             style.loc.start.column - 1
           )
         );
+        if (attachScopeResult.error) {
+          if (!attachScopeResult.error.loc) {
+            this.error(attachScopeResult.error.message);
+          } else {
+            const preprocessedPosition = await getOriginalPosition(
+              assertedPreprocessMap,
+              attachScopeResult.error.loc.line,
+              attachScopeResult.error.loc.column
+            );
+            const preprocessedIndex = new LinesAndColumns(style.code).indexForLocation({
+              line: preprocessedPosition.line - 1,
+              column: preprocessedPosition.column
+            }) || 0;
+            const position = compileRes.inputDescriptor.positions[style.loc.start.index + preprocessedIndex];
+            this.error({
+              message: attachScopeResult.error.message,
+              loc: {
+                file: fileId,
+                line: position.line,
+                column: position.column
+              }
+            });
+          }
+        }
         return {
           code: attachScopeResult.code,
           map: {
@@ -190,64 +248,68 @@ function qingkuaiPlugin() {
         }
         return;
       }
-      const compileRes = compile(src, {
-        sourcemap,
-        debug: isDev,
-        hashId: compileResultCache.get(id)?.hashId || void 0,
-        reserveTemplateComment: getReserveHtmlComments(qingkuaiConfig),
-        componentName: util.kebab2Camel(basename(id, extname(id)), true)
-      });
-      compileRes.messages.forEach(({ type, value: warning }) => {
-        if (type === "warning") {
-          this.warn(warning.message);
+      try {
+        const compileRes = compile(src, {
+          sourcemap,
+          debug: isDev,
+          hashId: compileResultCache.get(id)?.hashId || void 0,
+          reserveTemplateComment: getReserveHtmlComments(qingkuaiConfig),
+          componentName: util.kebab2Camel(basename(id, extname(id)), true)
+        });
+        compileRes.messages.forEach(({ type, value: warning }) => {
+          if (type === "warning") {
+            this.warn(warning.message);
+          }
+        });
+        compileResultCache.set(id, compileRes);
+        const compiledCodeArr = [compileRes.code];
+        compileRes.inputDescriptor.styles.forEach((_, index) => {
+          compiledCodeArr.push(`import "virtual:[${index}]${id}.css?${Date.now()}"`);
+        });
+        const baseMap = {
+          version: 3,
+          sources: [id],
+          sourcesContent: [src]
+        };
+        const compiledCode = compiledCodeArr.join("\n");
+        if (!compileRes.inputDescriptor.script.isTS) {
+          if (!sourcemap) {
+            return compiledCode;
+          }
+          return {
+            code: compiledCode,
+            map: Object.assign(baseMap, {
+              mappings: compileRes.mappings
+            })
+          };
         }
-      });
-      compileResultCache.set(id, compileRes);
-      const compiledCodeArr = [compileRes.code];
-      compileRes.inputDescriptor.styles.forEach((_, index) => {
-        compiledCodeArr.push(`import "virtual:[${index}]${id}.css?${Date.now()}"`);
-      });
-      const baseMap = {
-        version: 3,
-        sources: [id],
-        sourcesContent: [src]
-      };
-      const compiledCode = compiledCodeArr.join("\n");
-      if (!compileRes.inputDescriptor.script.isTS) {
+        const esBuildCompileRes = await transformWithEsbuild(
+          compiledCode,
+          id,
+          {
+            sourcemap,
+            loader: "ts",
+            target: "esnext"
+          },
+          sourcemap ? {
+            version: 3,
+            sources: [id],
+            sourcesContent: [src],
+            mappings: compileRes.mappings
+          } : void 0
+        );
         if (!sourcemap) {
-          return compiledCode;
+          return esBuildCompileRes.code;
         }
         return {
-          code: compiledCode,
+          code: esBuildCompileRes.code,
           map: Object.assign(baseMap, {
-            mappings: compileRes.mappings
+            mappings: esBuildCompileRes.map.mappings
           })
         };
+      } catch (err) {
+        err.pos = err.loc.start.index, this.error(err);
       }
-      const esBuildCompileRes = await transformWithEsbuild(
-        compiledCode,
-        id,
-        {
-          sourcemap,
-          loader: "ts",
-          target: "esnext"
-        },
-        sourcemap ? {
-          version: 3,
-          sources: [id],
-          sourcesContent: [src],
-          mappings: compileRes.mappings
-        } : void 0
-      );
-      if (!sourcemap) {
-        return esBuildCompileRes.code;
-      }
-      return {
-        code: esBuildCompileRes.code,
-        map: Object.assign(baseMap, {
-          mappings: esBuildCompileRes.map.mappings
-        })
-      };
     }
   };
   function getQingkuaiConfiguration(id) {

package/dist/temp-type/scope.d.ts

@@ -1,5 +1,6 @@
-import type { SourceMap } from "./types";
+import type { PostcssPluginError, SourceMap } from "./types";
 export declare function attachScopeForStyleSelectors(code: string, hash: string, sourceFile: string, map: SourceMap | undefined): Promise<{
+    error: PostcssPluginError | undefined;
     code: string;
     mappings: string;
 }>;

package/dist/temp-type/sourcemap.d.ts

@@ -1,2 +1,3 @@
 import type { SourceMapMappings } from "@jridgewell/sourcemap-codec";
 export declare function offsetSourceMap(mappings: string, sourceIndex: number, preLine: number, preColumn: number): SourceMapMappings;
+export declare function getOriginalPosition(map: any, line: number, column: number): Promise<import("source-map-js").MappedPosition>;

package/dist/temp-type/types.d.ts

@@ -16,3 +16,10 @@ export type QingkuaiConfiguration = Partial<{
     convenientDerivedDeclaration: boolean;
     reserveHtmlComments: "all" | "never" | "development" | "production";
 }>;
+export interface PostcssPluginError {
+    message: string;
+    loc?: {
+        line: number;
+        column: number;
+    };
+}

package/package.json

@@ -2,7 +2,7 @@
     "name": "vite-plugin-qingkuai",
     "author": "mlgq",
     "license": "MIT",
-    "version": "1.0.9",
+    "version": "1.0.10",
     "type": "module",
     "keywords": [
         "vite",
@@ -25,7 +25,7 @@
         "@types/fs-extra": "^11.0.4",
         "@types/node": "^22.13.14",
         "fs-extra": "^11.3.0",
-        "qingkuai": "^1.0.41",
+        "qingkuai": "^1.0.42",
         "rimraf": "^6.0.1",
         "rollup": "^4.38.0",
         "rollup-plugin-dts": "^6.2.1",
@@ -33,12 +33,14 @@
         "vite": "^6.2.4"
     },
     "peerDependencies": {
-        "qingkuai": "^1.0.41",
+        "qingkuai": "^1.0.42",
         "vite": "^6.2.4"
     },
     "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.0",
+        "lines-and-columns": "^2.0.4",
         "postcss": "^8.5.3",
-        "postcss-selector-parser": "^7.1.0"
+        "postcss-selector-parser": "^7.1.0",
+        "source-map-js": "^1.2.1"
     }
 }