vite-plugin-qingkuai 1.0.19 → 1.0.21

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

@@ -62,15 +62,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 +87,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 +99,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,7 +113,13 @@ 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 || ""
+  };
 }
 
 function offsetSourceMap(mappings, sourceIndex, preLine, preColumn) {
@@ -127,7 +141,7 @@ 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;
@@ -135,10 +149,18 @@ function qingkuai() {
   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);
@@ -214,10 +236,16 @@ function qingkuai() {
           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,
-            preprocessRes.deps?.size || 0,
+            currentSourceIndex,
             style.loc.start.line - 1,
             style.loc.start.column - 1
           )
@@ -231,6 +259,16 @@ function qingkuai() {
               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
+                }
+              });
+            }
             const preprocessedIndex = new linesAndColumns.LinesAndColumns(style.code).indexForLocation({
               line: preprocessedPosition.line - 1,
               column: preprocessedPosition.column
@@ -251,8 +289,21 @@ function qingkuai() {
           map: {
             version: 3,
             mappings: offsetMappings,
-            names: assertedPreprocessMap?.names || [],
-            sources: [...assertedPreprocessMap ? assertedPreprocessMap.sources.slice(0, -1) : [], fileId]
+            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
           }
         };
       }
@@ -302,11 +353,13 @@ function qingkuai() {
           id,
           {
             sourcemap,
+            lang: "ts",
             loader: "ts",
             target: "esnext"
           },
           sourcemap ? {
             version: 3,
+            names: [],
             sources: [id],
             sourcesContent: [src],
             mappings: compileRes.mappings
@@ -329,7 +382,7 @@ function qingkuai() {
           })
         };
       } catch (err) {
-        if (err.loc.start && "index" in err.loc.start) {
+        if (err.loc && "start" in err.loc && "index" in err.loc.start) {
           err.pos = err.loc.start.index, this.error(err);
         } else {
           this.error(

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

@@ -41,15 +41,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 +66,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 +78,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,7 +92,13 @@ 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 || ""
+  };
 }
 
 function offsetSourceMap(mappings, sourceIndex, preLine, preColumn) {
@@ -106,7 +120,7 @@ async function getOriginalPosition(map, line, column) {
   return new SourceMapConsumer(map).originalPositionFor({ line, column });
 }
 
-function qingkuai() {
+function qingkuai(options = {}) {
   let isDev;
   let sourcemap;
   let cssSourcemap;
@@ -114,10 +128,18 @@ function qingkuai() {
   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);
@@ -193,10 +215,16 @@ function qingkuai() {
           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,
-            preprocessRes.deps?.size || 0,
+            currentSourceIndex,
             style.loc.start.line - 1,
             style.loc.start.column - 1
           )
@@ -210,6 +238,16 @@ function qingkuai() {
               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
+                }
+              });
+            }
             const preprocessedIndex = new LinesAndColumns(style.code).indexForLocation({
               line: preprocessedPosition.line - 1,
               column: preprocessedPosition.column
@@ -230,8 +268,21 @@ function qingkuai() {
           map: {
             version: 3,
             mappings: offsetMappings,
-            names: assertedPreprocessMap?.names || [],
-            sources: [...assertedPreprocessMap ? assertedPreprocessMap.sources.slice(0, -1) : [], fileId]
+            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
           }
         };
       }
@@ -281,11 +332,13 @@ function qingkuai() {
           id,
           {
             sourcemap,
+            lang: "ts",
             loader: "ts",
             target: "esnext"
           },
           sourcemap ? {
             version: 3,
+            names: [],
             sources: [id],
             sourcesContent: [src],
             mappings: compileRes.mappings
@@ -308,7 +361,7 @@ function qingkuai() {
           })
         };
       } catch (err) {
-        if (err.loc.start && "index" in err.loc.start) {
+        if (err.loc && "start" in err.loc && "index" in err.loc.start) {
           err.pos = err.loc.start.index, this.error(err);
         } else {
           this.error(

package/package.json

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