vite-plugin-qingkuai 1.0.21 → 1.0.23

package/dist/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
 var vite = require('vite');
+var nodeFs = require('node:fs');
 var nodePath = require('node:path');
 var nodeCrypto = require('node:crypto');
 var compiler = require('qingkuai/compiler');
-var nodeFs = require('node:fs');
 var linesAndColumns = require('lines-and-columns');
 var sourcemapCodec = require('@jridgewell/sourcemap-codec');
 var postcss = require('postcss');
@@ -30,16 +30,9 @@ function _interopNamespaceDefault(e) {
 
 var vite__namespace = /*#__PURE__*/_interopNamespaceDefault(vite);
 
-const globalStyle = "\n" + compiler.util.formatSourceCode(
-  `
-            /* Injected by vite-plugin-qingkuai */
-
-            *[hidden] {
-                display: none !important;
-            }
-        `
-).replace(/^/gm, "    ") + "\n";
-
+function isNumber(v) {
+  return typeof v === "number";
+}
 function isUndefined(v) {
   return void 0 === v;
 }
@@ -122,6 +115,17 @@ async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
   };
 }
 
+const globalStyle = "\n" + compiler.util.formatSourceCode(
+  `
+            /* Injected by vite-plugin-qingkuai */
+
+            *[hidden] {
+                display: none !important;
+            }
+        `
+).replace(/^/gm, "    ") + "\n";
+const VIRTUAL_STYLE_ID_RE = /^virtual:\[\d+\].*?\.qk\.(css|s[ac]ss|less|stylus|postcss)\?\d{13}$/;
+
 function offsetSourceMap(mappings, sourceIndex, preLine, preColumn) {
   return sourcemapCodec.decode(mappings).map((line) => {
     return line.map((segment) => {
@@ -148,7 +152,6 @@ function qingkuai(options = {}) {
   let viteConfig;
   const compileResultCache = /* @__PURE__ */ new Map();
   const qingkuaiConfigurations = /* @__PURE__ */ new Map();
-  const styleIdRE = /^virtual:\[\d+\].*?\.qk.(?:css|s[ac]ss|less|stylus|postcss)\?\d{13}$/;
   if (isUndefined(options.maxScheduleDepth)) {
     options.maxScheduleDepth = 300;
   }
@@ -189,7 +192,7 @@ function qingkuai(options = {}) {
       };
     },
     resolveId(id, importer) {
-      if (styleIdRE.test(id)) {
+      if (VIRTUAL_STYLE_ID_RE.test(id)) {
         return id;
       }
       if (importer?.endsWith(".qk") && !nodePath.extname(id)) {
@@ -202,22 +205,26 @@ function qingkuai(options = {}) {
       return id;
     },
     async load(id) {
-      if (styleIdRE.test(id)) {
-        const { fileId, index } = parseStyleId(id);
-        if (index === -1) {
-          return "";
-        }
-        let virtualFileName;
-        const compileRes = compileResultCache.get(fileId);
-        const style = compileRes.styleDescriptors[index];
-        while (true) {
-          const hash = nodeCrypto.randomBytes(6).toString("hex");
-          virtualFileName = `${fileId}.${hash}.${style.lang}`;
-          if (!nodeFs.existsSync(virtualFileName)) {
-            break;
-          }
+      if (!VIRTUAL_STYLE_ID_RE.test(id)) {
+        return;
+      }
+      const { fileId, index } = parseStyleId(id);
+      if (index === -1) {
+        return "";
+      }
+      let virtualFileName;
+      const compileRes = compileResultCache.get(fileId);
+      const styleDescriptor = compileRes.styleDescriptors[index];
+      while (true) {
+        const hash = nodeCrypto.randomBytes(6).toString("hex");
+        virtualFileName = `${fileId}.${hash}.${styleDescriptor.lang}`;
+        if (!nodeFs.existsSync(virtualFileName)) {
+          break;
         }
-        const preprocessRes = await vite__namespace.preprocessCSS(style.code, virtualFileName, {
+      }
+      let preprocessRes;
+      try {
+        preprocessRes = await vite__namespace.preprocessCSS(styleDescriptor.code, virtualFileName, {
           ...viteConfig,
           css: {
             ...viteConfig.css,
@@ -226,87 +233,126 @@ function qingkuai(options = {}) {
             }
           }
         });
-        if (!cssSourcemap) {
-          return preprocessRes.code;
-        }
-        const assertedPreprocessMap = preprocessRes.map;
-        const attachScopeResult = await attachScopeForStyleSelectors(
-          preprocessRes.code,
-          compileRes.hashId,
-          virtualFileName,
-          assertedPreprocessMap
-        );
-        const attachScopeMap = attachScopeResult.map ?? assertedPreprocessMap;
-        const samePath = (left, right) => {
-          return nodePath.normalize(left) === nodePath.normalize(right);
-        };
-        const sourceIndex = attachScopeMap?.sources.findIndex((source) => samePath(source, virtualFileName)) ?? -1;
-        const currentSourceIndex = sourceIndex === -1 ? preprocessRes.deps?.size || 0 : sourceIndex;
-        const offsetMappings = sourcemapCodec.encode(
-          offsetSourceMap(
-            attachScopeResult.mappings,
-            currentSourceIndex,
-            style.loc.start.line - 1,
-            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
-            );
-            if (preprocessedPosition.source && !samePath(preprocessedPosition.source, virtualFileName)) {
-              this.error({
-                message: attachScopeResult.error.message,
-                loc: {
-                  file: preprocessedPosition.source,
-                  line: preprocessedPosition.line,
-                  column: preprocessedPosition.column
-                }
+      } catch (err) {
+        let errorPos = null;
+        const lac = new linesAndColumns.LinesAndColumns(styleDescriptor.code);
+        switch (styleDescriptor.lang) {
+          case "css":
+          case "less":
+          case "stylus": {
+            delete err.loc;
+            err.message += `
+
+Caused by: "${fileId}".`;
+            break;
+          }
+          case "sass":
+          case "scss": {
+            if (err.sassMessage) {
+              err.message = err.sassMessage;
+            }
+            if (isNumber(err.line) && isNumber(err.column)) {
+              errorPos = lac.indexForLocation({
+                line: err.line - 1,
+                column: err.column - 1
               });
             }
-            const preprocessedIndex = new linesAndColumns.LinesAndColumns(style.code).indexForLocation({
-              line: preprocessedPosition.line - 1,
-              column: preprocessedPosition.column
-            }) || 0;
-            const position = compileRes.positions[style.loc.start.index + preprocessedIndex];
+            break;
+          }
+        }
+        if (isNumber(errorPos) && !isNaN(errorPos)) {
+          const loc = lac.locationForIndex(errorPos + styleDescriptor.loc.start.index);
+          if (loc) {
+            err.loc = {
+              file: fileId,
+              line: loc.line + 1,
+              column: loc.column
+            };
+            delete err.frame;
+          }
+        }
+        return this.error(err);
+      }
+      if (!cssSourcemap || styleDescriptor.global) {
+        return preprocessRes;
+      }
+      const assertedPreprocessMap = preprocessRes.map;
+      const attachScopeResult = await attachScopeForStyleSelectors(
+        preprocessRes.code,
+        compileRes.hashId,
+        virtualFileName,
+        assertedPreprocessMap
+      );
+      const attachScopeMap = attachScopeResult.map ?? assertedPreprocessMap;
+      const samePath = (left, right) => {
+        return nodePath.normalize(left) === nodePath.normalize(right);
+      };
+      const sourceIndex = attachScopeMap?.sources.findIndex((source) => samePath(source, virtualFileName)) ?? -1;
+      const currentSourceIndex = sourceIndex === -1 ? preprocessRes.deps?.size || 0 : sourceIndex;
+      const offsetMappings = sourcemapCodec.encode(
+        offsetSourceMap(
+          attachScopeResult.mappings,
+          currentSourceIndex,
+          styleDescriptor.loc.start.line - 1,
+          styleDescriptor.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
+          );
+          if (preprocessedPosition.source && !samePath(preprocessedPosition.source, virtualFileName)) {
             this.error({
               message: attachScopeResult.error.message,
               loc: {
-                file: fileId,
-                line: position.line,
-                column: position.column
+                file: preprocessedPosition.source,
+                line: preprocessedPosition.line,
+                column: preprocessedPosition.column
               }
             });
           }
+          const preprocessedIndex = new linesAndColumns.LinesAndColumns(styleDescriptor.code).indexForLocation({
+            line: preprocessedPosition.line - 1,
+            column: preprocessedPosition.column
+          }) || 0;
+          const position = compileRes.positions[styleDescriptor.loc.start.index + preprocessedIndex];
+          this.error({
+            message: attachScopeResult.error.message,
+            loc: {
+              file: fileId,
+              line: position.line,
+              column: position.column
+            }
+          });
         }
-        return {
-          code: attachScopeResult.code,
-          map: {
-            version: 3,
-            mappings: offsetMappings,
-            names: attachScopeMap?.names || assertedPreprocessMap?.names || [],
-            sources: attachScopeMap?.sources ? (() => {
-              const sources = [...attachScopeMap.sources];
-              if (currentSourceIndex !== -1) {
-                sources[currentSourceIndex] = fileId;
-              }
-              return sources;
-            })() : [...assertedPreprocessMap ? assertedPreprocessMap.sources.slice(0, -1) : [], fileId],
-            sourcesContent: attachScopeMap?.sourcesContent ? (() => {
-              const sourcesContent = [...attachScopeMap.sourcesContent];
-              if (currentSourceIndex !== -1) {
-                sourcesContent[currentSourceIndex] = nodeFs.readFileSync(fileId, "utf-8");
-              }
-              return sourcesContent;
-            })() : void 0
-          }
-        };
       }
+      return {
+        code: attachScopeResult.code,
+        map: {
+          version: 3,
+          mappings: offsetMappings,
+          names: attachScopeMap?.names || assertedPreprocessMap?.names || [],
+          sources: attachScopeMap?.sources ? (() => {
+            const sources = [...attachScopeMap.sources];
+            if (currentSourceIndex !== -1) {
+              sources[currentSourceIndex] = fileId;
+            }
+            return sources;
+          })() : [...assertedPreprocessMap ? assertedPreprocessMap.sources.slice(0, -1) : [], fileId],
+          sourcesContent: attachScopeMap?.sourcesContent ? (() => {
+            const sourcesContent = [...attachScopeMap.sourcesContent];
+            if (currentSourceIndex !== -1) {
+              sourcesContent[currentSourceIndex] = nodeFs.readFileSync(fileId, "utf-8");
+            }
+            return sourcesContent;
+          })() : void 0
+        }
+      };
     },
     async transform(src, id) {
       if (!id.endsWith(".qk")) {
@@ -382,8 +428,10 @@ function qingkuai(options = {}) {
           })
         };
       } catch (err) {
-        if (err.loc && "start" in err.loc && "index" in err.loc.start) {
-          err.pos = err.loc.start.index, this.error(err);
+        if (compiler.isCompileError(err)) {
+          this.error(err.message, err.loc.start.index);
+        } else if (err.cause && isNumber(err.cause.pos)) {
+          this.error(err, err.cause.pos);
         } else {
           this.error(
             "Qingkuai compile result is invalid. Please report this at https://github.com/qingkuai-js/qingkuai/issues and include your .qk source for reproduction."

package/dist/index.js

@@ -1,24 +1,17 @@
 import * as vite from 'vite';
+import nodeFs from 'node:fs';
 import nodePath from 'node:path';
 import nodeCrypto from 'node:crypto';
-import { util, compile } from 'qingkuai/compiler';
-import nodeFs, { existsSync, readFileSync } from 'node:fs';
+import { util, compile, isCompileError } 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 { SourceMapConsumer } from 'source-map-js';
 
-const globalStyle = "\n" + util.formatSourceCode(
-  `
-            /* Injected by vite-plugin-qingkuai */
-
-            *[hidden] {
-                display: none !important;
-            }
-        `
-).replace(/^/gm, "    ") + "\n";
-
+function isNumber(v) {
+  return typeof v === "number";
+}
 function isUndefined(v) {
   return void 0 === v;
 }
@@ -101,6 +94,17 @@ async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
   };
 }
 
+const globalStyle = "\n" + util.formatSourceCode(
+  `
+            /* Injected by vite-plugin-qingkuai */
+
+            *[hidden] {
+                display: none !important;
+            }
+        `
+).replace(/^/gm, "    ") + "\n";
+const VIRTUAL_STYLE_ID_RE = /^virtual:\[\d+\].*?\.qk\.(css|s[ac]ss|less|stylus|postcss)\?\d{13}$/;
+
 function offsetSourceMap(mappings, sourceIndex, preLine, preColumn) {
   return decode(mappings).map((line) => {
     return line.map((segment) => {
@@ -127,7 +131,6 @@ function qingkuai(options = {}) {
   let viteConfig;
   const compileResultCache = /* @__PURE__ */ new Map();
   const qingkuaiConfigurations = /* @__PURE__ */ new Map();
-  const styleIdRE = /^virtual:\[\d+\].*?\.qk.(?:css|s[ac]ss|less|stylus|postcss)\?\d{13}$/;
   if (isUndefined(options.maxScheduleDepth)) {
     options.maxScheduleDepth = 300;
   }
@@ -168,7 +171,7 @@ function qingkuai(options = {}) {
       };
     },
     resolveId(id, importer) {
-      if (styleIdRE.test(id)) {
+      if (VIRTUAL_STYLE_ID_RE.test(id)) {
         return id;
       }
       if (importer?.endsWith(".qk") && !nodePath.extname(id)) {
@@ -181,22 +184,26 @@ function qingkuai(options = {}) {
       return id;
     },
     async load(id) {
-      if (styleIdRE.test(id)) {
-        const { fileId, index } = parseStyleId(id);
-        if (index === -1) {
-          return "";
-        }
-        let virtualFileName;
-        const compileRes = compileResultCache.get(fileId);
-        const style = compileRes.styleDescriptors[index];
-        while (true) {
-          const hash = nodeCrypto.randomBytes(6).toString("hex");
-          virtualFileName = `${fileId}.${hash}.${style.lang}`;
-          if (!existsSync(virtualFileName)) {
-            break;
-          }
+      if (!VIRTUAL_STYLE_ID_RE.test(id)) {
+        return;
+      }
+      const { fileId, index } = parseStyleId(id);
+      if (index === -1) {
+        return "";
+      }
+      let virtualFileName;
+      const compileRes = compileResultCache.get(fileId);
+      const styleDescriptor = compileRes.styleDescriptors[index];
+      while (true) {
+        const hash = nodeCrypto.randomBytes(6).toString("hex");
+        virtualFileName = `${fileId}.${hash}.${styleDescriptor.lang}`;
+        if (!nodeFs.existsSync(virtualFileName)) {
+          break;
         }
-        const preprocessRes = await vite.preprocessCSS(style.code, virtualFileName, {
+      }
+      let preprocessRes;
+      try {
+        preprocessRes = await vite.preprocessCSS(styleDescriptor.code, virtualFileName, {
           ...viteConfig,
           css: {
             ...viteConfig.css,
@@ -205,87 +212,126 @@ function qingkuai(options = {}) {
             }
           }
         });
-        if (!cssSourcemap) {
-          return preprocessRes.code;
-        }
-        const assertedPreprocessMap = preprocessRes.map;
-        const attachScopeResult = await attachScopeForStyleSelectors(
-          preprocessRes.code,
-          compileRes.hashId,
-          virtualFileName,
-          assertedPreprocessMap
-        );
-        const attachScopeMap = attachScopeResult.map ?? assertedPreprocessMap;
-        const samePath = (left, right) => {
-          return nodePath.normalize(left) === nodePath.normalize(right);
-        };
-        const sourceIndex = attachScopeMap?.sources.findIndex((source) => samePath(source, virtualFileName)) ?? -1;
-        const currentSourceIndex = sourceIndex === -1 ? preprocessRes.deps?.size || 0 : sourceIndex;
-        const offsetMappings = encode(
-          offsetSourceMap(
-            attachScopeResult.mappings,
-            currentSourceIndex,
-            style.loc.start.line - 1,
-            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
-            );
-            if (preprocessedPosition.source && !samePath(preprocessedPosition.source, virtualFileName)) {
-              this.error({
-                message: attachScopeResult.error.message,
-                loc: {
-                  file: preprocessedPosition.source,
-                  line: preprocessedPosition.line,
-                  column: preprocessedPosition.column
-                }
+      } catch (err) {
+        let errorPos = null;
+        const lac = new LinesAndColumns(styleDescriptor.code);
+        switch (styleDescriptor.lang) {
+          case "css":
+          case "less":
+          case "stylus": {
+            delete err.loc;
+            err.message += `
+
+Caused by: "${fileId}".`;
+            break;
+          }
+          case "sass":
+          case "scss": {
+            if (err.sassMessage) {
+              err.message = err.sassMessage;
+            }
+            if (isNumber(err.line) && isNumber(err.column)) {
+              errorPos = lac.indexForLocation({
+                line: err.line - 1,
+                column: err.column - 1
               });
             }
-            const preprocessedIndex = new LinesAndColumns(style.code).indexForLocation({
-              line: preprocessedPosition.line - 1,
-              column: preprocessedPosition.column
-            }) || 0;
-            const position = compileRes.positions[style.loc.start.index + preprocessedIndex];
+            break;
+          }
+        }
+        if (isNumber(errorPos) && !isNaN(errorPos)) {
+          const loc = lac.locationForIndex(errorPos + styleDescriptor.loc.start.index);
+          if (loc) {
+            err.loc = {
+              file: fileId,
+              line: loc.line + 1,
+              column: loc.column
+            };
+            delete err.frame;
+          }
+        }
+        return this.error(err);
+      }
+      if (!cssSourcemap || styleDescriptor.global) {
+        return preprocessRes;
+      }
+      const assertedPreprocessMap = preprocessRes.map;
+      const attachScopeResult = await attachScopeForStyleSelectors(
+        preprocessRes.code,
+        compileRes.hashId,
+        virtualFileName,
+        assertedPreprocessMap
+      );
+      const attachScopeMap = attachScopeResult.map ?? assertedPreprocessMap;
+      const samePath = (left, right) => {
+        return nodePath.normalize(left) === nodePath.normalize(right);
+      };
+      const sourceIndex = attachScopeMap?.sources.findIndex((source) => samePath(source, virtualFileName)) ?? -1;
+      const currentSourceIndex = sourceIndex === -1 ? preprocessRes.deps?.size || 0 : sourceIndex;
+      const offsetMappings = encode(
+        offsetSourceMap(
+          attachScopeResult.mappings,
+          currentSourceIndex,
+          styleDescriptor.loc.start.line - 1,
+          styleDescriptor.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
+          );
+          if (preprocessedPosition.source && !samePath(preprocessedPosition.source, virtualFileName)) {
             this.error({
               message: attachScopeResult.error.message,
               loc: {
-                file: fileId,
-                line: position.line,
-                column: position.column
+                file: preprocessedPosition.source,
+                line: preprocessedPosition.line,
+                column: preprocessedPosition.column
               }
             });
           }
+          const preprocessedIndex = new LinesAndColumns(styleDescriptor.code).indexForLocation({
+            line: preprocessedPosition.line - 1,
+            column: preprocessedPosition.column
+          }) || 0;
+          const position = compileRes.positions[styleDescriptor.loc.start.index + preprocessedIndex];
+          this.error({
+            message: attachScopeResult.error.message,
+            loc: {
+              file: fileId,
+              line: position.line,
+              column: position.column
+            }
+          });
         }
-        return {
-          code: attachScopeResult.code,
-          map: {
-            version: 3,
-            mappings: offsetMappings,
-            names: attachScopeMap?.names || assertedPreprocessMap?.names || [],
-            sources: attachScopeMap?.sources ? (() => {
-              const sources = [...attachScopeMap.sources];
-              if (currentSourceIndex !== -1) {
-                sources[currentSourceIndex] = fileId;
-              }
-              return sources;
-            })() : [...assertedPreprocessMap ? assertedPreprocessMap.sources.slice(0, -1) : [], fileId],
-            sourcesContent: attachScopeMap?.sourcesContent ? (() => {
-              const sourcesContent = [...attachScopeMap.sourcesContent];
-              if (currentSourceIndex !== -1) {
-                sourcesContent[currentSourceIndex] = readFileSync(fileId, "utf-8");
-              }
-              return sourcesContent;
-            })() : void 0
-          }
-        };
       }
+      return {
+        code: attachScopeResult.code,
+        map: {
+          version: 3,
+          mappings: offsetMappings,
+          names: attachScopeMap?.names || assertedPreprocessMap?.names || [],
+          sources: attachScopeMap?.sources ? (() => {
+            const sources = [...attachScopeMap.sources];
+            if (currentSourceIndex !== -1) {
+              sources[currentSourceIndex] = fileId;
+            }
+            return sources;
+          })() : [...assertedPreprocessMap ? assertedPreprocessMap.sources.slice(0, -1) : [], fileId],
+          sourcesContent: attachScopeMap?.sourcesContent ? (() => {
+            const sourcesContent = [...attachScopeMap.sourcesContent];
+            if (currentSourceIndex !== -1) {
+              sourcesContent[currentSourceIndex] = nodeFs.readFileSync(fileId, "utf-8");
+            }
+            return sourcesContent;
+          })() : void 0
+        }
+      };
     },
     async transform(src, id) {
       if (!id.endsWith(".qk")) {
@@ -361,8 +407,10 @@ function qingkuai(options = {}) {
           })
         };
       } catch (err) {
-        if (err.loc && "start" in err.loc && "index" in err.loc.start) {
-          err.pos = err.loc.start.index, this.error(err);
+        if (isCompileError(err)) {
+          this.error(err.message, err.loc.start.index);
+        } else if (err.cause && isNumber(err.cause.pos)) {
+          this.error(err, err.cause.pos);
         } else {
           this.error(
             "Qingkuai compile result is invalid. Please report this at https://github.com/qingkuai-js/qingkuai/issues and include your .qk source for reproduction."
@@ -418,7 +466,7 @@ function qingkuai(options = {}) {
   }
   function recordQingkuaiConfiguration(fileName) {
     try {
-      qingkuaiConfigurations.set(nodePath.dirname(fileName), JSON.parse(readFileSync(fileName, "utf-8")));
+      qingkuaiConfigurations.set(nodePath.dirname(fileName), JSON.parse(nodeFs.readFileSync(fileName, "utf-8")));
     } catch {
     }
   }

package/package.json

@@ -2,7 +2,7 @@
     "name": "vite-plugin-qingkuai",
     "author": "mlgq",
     "license": "MIT",
-    "version": "1.0.21",
+    "version": "1.0.23",
     "type": "module",
     "keywords": [
         "vite",