vite-plugin-qingkuai 1.0.20 → 1.0.22

package/README.md

@@ -1,12 +1,11 @@
 # vite-plugin-qingkuai
 
-vite-plugin-qingkuai is a Vite plugin that transforms `.qk` component files into native JavaScript using the Qingkuai compiler. It enables fast and seamless development of web applications built with [QingKuai](https://qingkuai.dev)(a front-end framework).
-
-[QingKuai Documentation](https://qingkuai.dev) | [VSCode extension For QingKuai Language Features](https://marketplace.visualstudio.com/items?itemName=qingkuai-tools.qingkuai-language-features) | [Issues]("https://github.com/qingkuai-js/vite-plugin/issues)
+vite-plugin-qingkuai is a Vite plugin that transforms `.qk` component files into native JavaScript using the Qingkuai compiler. It enables fast and seamless development of web applications built with [Qingkuai](https://qingkuai.dev).
 
 ## Usage
 
 ```js
+// vite.config.js
 import { defineConfig } from "vite"
 import qingkuai from "vite-plugin-qingkuai"
 

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,6 @@ 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 isUndefined(v) {
   return void 0 === v;
 }
@@ -62,15 +52,22 @@ function findFilesByName(dir, targetFileName, ignoreList) {
 
 async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
   let error;
-  const hashAttribute = selectorParser.attribute({
-    attribute: `qk-${hash}`,
-    value: void 0,
-    raws: {}
-  });
+  const processedRules = /* @__PURE__ */ new WeakSet();
+  const createHashAttribute = () => {
+    return selectorParser.attribute({
+      attribute: `qk-${hash}`,
+      value: void 0,
+      raws: {}
+    });
+  };
   const processor = postcss([
     {
       postcssPlugin: "postcss-attach-scope-qingkuai",
       Rule(rule) {
+        if (processedRules.has(rule)) {
+          return;
+        }
+        processedRules.add(rule);
         if (rule.parent && "name" in rule?.parent && rule.parent.name === "keyframes") {
           return;
         }
@@ -80,7 +77,8 @@ async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
             for (let i = 0; i < selector.nodes.length; i++) {
               const item = selector.nodes[i];
               if (item.type === "attribute" && item.attribute === "qk-scope") {
-                [usedScopeAttribute, selector.nodes[i]] = [true, hashAttribute];
+                selector.nodes[i] = createHashAttribute();
+                usedScopeAttribute = true;
               }
             }
             if (usedScopeAttribute) {
@@ -91,7 +89,7 @@ async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
             });
             if (index !== -1) {
               const lastNode = selector.nodes[index];
-              lastNode.parent?.insertAfter(lastNode, hashAttribute);
+              lastNode.parent?.insertAfter(lastNode, createHashAttribute());
             }
           });
         }).processSync(rule.selector);
@@ -105,9 +103,26 @@ async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
       annotation: false
     }
   });
-  return { error, code: ret.css, mappings: ret.map.toJSON().mappings };
+  const outputMap = ret.map?.toJSON();
+  return {
+    error,
+    code: ret.css,
+    map: outputMap,
+    mappings: outputMap?.mappings || ""
+  };
 }
 
+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) => {
@@ -127,18 +142,25 @@ async function getOriginalPosition(map, line, column) {
   return new sourceMapJs.SourceMapConsumer(map).originalPositionFor({ line, column });
 }
 
-function qingkuai() {
+function qingkuai(options = {}) {
   let isDev;
   let sourcemap;
   let cssSourcemap;
   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;
+  }
   return {
     name: "qingkuai-compiler",
     config(_, env) {
       isDev = env.command === "serve";
+      return {
+        define: {
+          __qk_max_schedule_depth: options.maxScheduleDepth
+        }
+      };
     },
     configureServer(server) {
       createQingkuaiConfigurationWatcher(server);
@@ -167,7 +189,7 @@ function qingkuai() {
       };
     },
     resolveId(id, importer) {
-      if (styleIdRE.test(id)) {
+      if (VIRTUAL_STYLE_ID_RE.test(id)) {
         return id;
       }
       if (importer?.endsWith(".qk") && !nodePath.extname(id)) {
@@ -180,82 +202,112 @@ function qingkuai() {
       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 style = compileRes.styleDescriptors[index];
+      while (true) {
+        const hash = nodeCrypto.randomBytes(6).toString("hex");
+        virtualFileName = `${fileId}.${hash}.${style.lang}`;
+        if (!nodeFs.existsSync(virtualFileName)) {
+          break;
         }
-        const preprocessRes = await vite__namespace.preprocessCSS(style.code, virtualFileName, {
-          ...viteConfig,
-          css: {
-            ...viteConfig.css,
-            postcss: {
-              from: virtualFileName
-            }
+      }
+      const preprocessRes = await vite__namespace.preprocessCSS(style.code, virtualFileName, {
+        ...viteConfig,
+        css: {
+          ...viteConfig.css,
+          postcss: {
+            from: virtualFileName
           }
-        });
-        if (!cssSourcemap) {
-          return preprocessRes.code;
         }
-        const assertedPreprocessMap = preprocessRes.map;
-        const attachScopeResult = await attachScopeForStyleSelectors(
-          preprocessRes.code,
-          compileRes.hashId,
-          virtualFileName,
-          assertedPreprocessMap
-        );
-        const offsetMappings = sourcemapCodec.encode(
-          offsetSourceMap(
-            attachScopeResult.mappings,
-            preprocessRes.deps?.size || 0,
-            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
-            );
-            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];
+      });
+      if (!cssSourcemap || style.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,
+          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: fileId,
-                line: position.line,
-                column: position.column
+                file: preprocessedPosition.source,
+                line: preprocessedPosition.line,
+                column: preprocessedPosition.column
               }
             });
           }
+          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];
+          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: assertedPreprocessMap?.names || [],
-            sources: [...assertedPreprocessMap ? assertedPreprocessMap.sources.slice(0, -1) : [], fileId]
-          }
-        };
       }
+      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")) {

package/dist/index.d.ts

@@ -1,5 +1,9 @@
 import { Plugin } from 'vite';
 
-declare function qingkuai(): Plugin;
+type InitOptions = Partial<{
+    maxScheduleDepth: number;
+}>;
+
+declare function qingkuai(options?: InitOptions): Plugin;
 
 export { qingkuai as default };

package/dist/index.js

@@ -1,24 +1,14 @@
 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 { 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 isUndefined(v) {
   return void 0 === v;
 }
@@ -41,15 +31,22 @@ function findFilesByName(dir, targetFileName, ignoreList) {
 
 async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
   let error;
-  const hashAttribute = selectorParser.attribute({
-    attribute: `qk-${hash}`,
-    value: void 0,
-    raws: {}
-  });
+  const processedRules = /* @__PURE__ */ new WeakSet();
+  const createHashAttribute = () => {
+    return selectorParser.attribute({
+      attribute: `qk-${hash}`,
+      value: void 0,
+      raws: {}
+    });
+  };
   const processor = postcss([
     {
       postcssPlugin: "postcss-attach-scope-qingkuai",
       Rule(rule) {
+        if (processedRules.has(rule)) {
+          return;
+        }
+        processedRules.add(rule);
         if (rule.parent && "name" in rule?.parent && rule.parent.name === "keyframes") {
           return;
         }
@@ -59,7 +56,8 @@ async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
             for (let i = 0; i < selector.nodes.length; i++) {
               const item = selector.nodes[i];
               if (item.type === "attribute" && item.attribute === "qk-scope") {
-                [usedScopeAttribute, selector.nodes[i]] = [true, hashAttribute];
+                selector.nodes[i] = createHashAttribute();
+                usedScopeAttribute = true;
               }
             }
             if (usedScopeAttribute) {
@@ -70,7 +68,7 @@ async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
             });
             if (index !== -1) {
               const lastNode = selector.nodes[index];
-              lastNode.parent?.insertAfter(lastNode, hashAttribute);
+              lastNode.parent?.insertAfter(lastNode, createHashAttribute());
             }
           });
         }).processSync(rule.selector);
@@ -84,9 +82,26 @@ async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
       annotation: false
     }
   });
-  return { error, code: ret.css, mappings: ret.map.toJSON().mappings };
+  const outputMap = ret.map?.toJSON();
+  return {
+    error,
+    code: ret.css,
+    map: outputMap,
+    mappings: outputMap?.mappings || ""
+  };
 }
 
+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) => {
@@ -106,18 +121,25 @@ async function getOriginalPosition(map, line, column) {
   return new SourceMapConsumer(map).originalPositionFor({ line, column });
 }
 
-function qingkuai() {
+function qingkuai(options = {}) {
   let isDev;
   let sourcemap;
   let cssSourcemap;
   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;
+  }
   return {
     name: "qingkuai-compiler",
     config(_, env) {
       isDev = env.command === "serve";
+      return {
+        define: {
+          __qk_max_schedule_depth: options.maxScheduleDepth
+        }
+      };
     },
     configureServer(server) {
       createQingkuaiConfigurationWatcher(server);
@@ -146,7 +168,7 @@ function qingkuai() {
       };
     },
     resolveId(id, importer) {
-      if (styleIdRE.test(id)) {
+      if (VIRTUAL_STYLE_ID_RE.test(id)) {
         return id;
       }
       if (importer?.endsWith(".qk") && !nodePath.extname(id)) {
@@ -159,82 +181,112 @@ function qingkuai() {
       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 style = compileRes.styleDescriptors[index];
+      while (true) {
+        const hash = nodeCrypto.randomBytes(6).toString("hex");
+        virtualFileName = `${fileId}.${hash}.${style.lang}`;
+        if (!nodeFs.existsSync(virtualFileName)) {
+          break;
         }
-        const preprocessRes = await vite.preprocessCSS(style.code, virtualFileName, {
-          ...viteConfig,
-          css: {
-            ...viteConfig.css,
-            postcss: {
-              from: virtualFileName
-            }
+      }
+      const preprocessRes = await vite.preprocessCSS(style.code, virtualFileName, {
+        ...viteConfig,
+        css: {
+          ...viteConfig.css,
+          postcss: {
+            from: virtualFileName
           }
-        });
-        if (!cssSourcemap) {
-          return preprocessRes.code;
         }
-        const assertedPreprocessMap = preprocessRes.map;
-        const attachScopeResult = await attachScopeForStyleSelectors(
-          preprocessRes.code,
-          compileRes.hashId,
-          virtualFileName,
-          assertedPreprocessMap
-        );
-        const offsetMappings = encode(
-          offsetSourceMap(
-            attachScopeResult.mappings,
-            preprocessRes.deps?.size || 0,
-            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
-            );
-            const preprocessedIndex = new LinesAndColumns(style.code).indexForLocation({
-              line: preprocessedPosition.line - 1,
-              column: preprocessedPosition.column
-            }) || 0;
-            const position = compileRes.positions[style.loc.start.index + preprocessedIndex];
+      });
+      if (!cssSourcemap || style.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,
+          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: fileId,
-                line: position.line,
-                column: position.column
+                file: preprocessedPosition.source,
+                line: preprocessedPosition.line,
+                column: preprocessedPosition.column
               }
             });
           }
+          const preprocessedIndex = new LinesAndColumns(style.code).indexForLocation({
+            line: preprocessedPosition.line - 1,
+            column: preprocessedPosition.column
+          }) || 0;
+          const position = compileRes.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: {
-            version: 3,
-            mappings: offsetMappings,
-            names: assertedPreprocessMap?.names || [],
-            sources: [...assertedPreprocessMap ? assertedPreprocessMap.sources.slice(0, -1) : [], fileId]
-          }
-        };
       }
+      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")) {
@@ -367,7 +419,7 @@ function qingkuai() {
   }
   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.20",
+    "version": "1.0.22",
     "type": "module",
     "keywords": [
         "vite",