vite-plugin-qingkuai 1.0.25 → 1.0.27

package/dist/index.cjs

@@ -2,13 +2,14 @@
 
 var vite = require('vite');
 var nodeFs = require('node:fs');
+var nodeUrl = require('node:url');
 var nodePath = require('node:path');
 var nodeCrypto = require('node:crypto');
-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 compiler = require('qingkuai/compiler');
 var sourceMapJs = require('source-map-js');
 
 function _interopNamespaceDefault(e) {
@@ -30,29 +31,6 @@ function _interopNamespaceDefault(e) {
 
 var vite__namespace = /*#__PURE__*/_interopNamespaceDefault(vite);
 
-function isNumber(v) {
-  return typeof v === "number";
-}
-function isUndefined(v) {
-  return void 0 === v;
-}
-function findFilesByName(dir, targetFileName, ignoreList) {
-  const result = [];
-  const entries = nodeFs.readdirSync(dir, { withFileTypes: true });
-  for (const entry of entries) {
-    if (ignoreList.has(entry.name)) {
-      continue;
-    }
-    const fullPath = nodePath.join(dir, entry.name);
-    if (entry.name === targetFileName) {
-      result.push(fullPath);
-    } else if (entry.isDirectory()) {
-      result.push(...findFilesByName(fullPath, targetFileName, ignoreList));
-    }
-  }
-  return result;
-}
-
 async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
   let error;
   const processedRules = /* @__PURE__ */ new WeakSet();
@@ -100,11 +78,11 @@ async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
     }
   ]);
   const ret = await processor.process(code, {
-    from: sourceFile,
     map: {
-      prev: map,
-      annotation: false
-    }
+      annotation: false,
+      prev: map?.version ? map : void 0
+    },
+    from: sourceFile
   });
   const outputMap = ret.map?.toJSON();
   return {
@@ -126,10 +104,34 @@ const globalStyle = "\n" + compiler.util.formatSourceCode(
 ).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) {
+function isNumber(v) {
+  return typeof v === "number";
+}
+function isUndefined(v) {
+  return void 0 === v;
+}
+function findFilesByName(dir, targetFileName, ignoreList) {
+  const result = [];
+  const entries = nodeFs.readdirSync(dir, { withFileTypes: true });
+  for (const entry of entries) {
+    if (ignoreList.has(entry.name)) {
+      continue;
+    }
+    const fullPath = nodePath.join(dir, entry.name);
+    if (entry.name === targetFileName) {
+      result.push(fullPath);
+    } else if (entry.isDirectory()) {
+      result.push(...findFilesByName(fullPath, targetFileName, ignoreList));
+    }
+  }
+  return result;
+}
+
+function offsetSourceMap(sourceIndices, mappings, preLine, preColumn) {
+  const indices = new Set(sourceIndices);
   return sourcemapCodec.decode(mappings).map((line) => {
     return line.map((segment) => {
-      if (segment.length === 1 || segment[1] !== sourceIndex) {
+      if (segment.length === 1 || !indices.has(segment[1])) {
         return segment;
       }
       if (segment[2] === preLine) {
@@ -273,9 +275,11 @@ Caused by: "${fileId}".`;
         }
         return this.error(err);
       }
+      preprocessRes.deps?.forEach((dep) => this.addWatchFile(dep));
       if (!cssSourcemap || styleDescriptor.global) {
         return preprocessRes;
       }
+      const phantomIndices = [];
       const assertedPreprocessMap = preprocessRes.map;
       const attachScopeResult = await attachScopeForStyleSelectors(
         preprocessRes.code,
@@ -284,15 +288,28 @@ Caused by: "${fileId}".`;
         assertedPreprocessMap
       );
       const attachScopeMap = attachScopeResult.map ?? assertedPreprocessMap;
-      const samePath = (left, right) => {
-        return nodePath.normalize(left) === nodePath.normalize(right);
+      const sameVirtualSource = (source) => {
+        let resolved = source.startsWith("file://") ? nodeUrl.fileURLToPath(source) : source;
+        if (!nodePath.isAbsolute(resolved)) {
+          const candidates = [
+            nodePath.resolve(nodePath.dirname(virtualFileName), resolved),
+            nodePath.resolve(resolved)
+          ];
+          return candidates.some(
+            (candidate) => nodePath.normalize(candidate) === nodePath.normalize(virtualFileName)
+          );
+        }
+        return nodePath.normalize(resolved) === nodePath.normalize(virtualFileName);
       };
-      const sourceIndex = attachScopeMap?.sources.findIndex((source) => samePath(source, virtualFileName)) ?? -1;
-      const currentSourceIndex = sourceIndex === -1 ? preprocessRes.deps?.size || 0 : sourceIndex;
+      attachScopeMap?.sources.forEach((source, index2) => {
+        if (sameVirtualSource(source)) {
+          phantomIndices.push(index2);
+        }
+      });
       const offsetMappings = sourcemapCodec.encode(
         offsetSourceMap(
+          phantomIndices,
           attachScopeResult.mappings,
-          currentSourceIndex,
           styleDescriptor.loc.start.line - 1,
           styleDescriptor.loc.start.column - 1
         )
@@ -306,7 +323,7 @@ Caused by: "${fileId}".`;
             attachScopeResult.error.loc.line,
             attachScopeResult.error.loc.column
           );
-          if (preprocessedPosition.source && !samePath(preprocessedPosition.source, virtualFileName)) {
+          if (preprocessedPosition.source && !sameVirtualSource(preprocessedPosition.source)) {
             this.error({
               message: attachScopeResult.error.message,
               loc: {
@@ -337,20 +354,17 @@ Caused by: "${fileId}".`;
           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
+          sources: attachScopeMap?.sources.map((source, index2) => {
+            return phantomIndices.includes(index2) ? fileId : source;
+          }) ?? [
+            ...assertedPreprocessMap?.sources.filter((source) => {
+              return !sameVirtualSource(source);
+            }) ?? [],
+            fileId
+          ],
+          sourcesContent: attachScopeMap?.sourcesContent?.map((content, index2) => {
+            return phantomIndices.includes(index2) ? nodeFs.readFileSync(fileId, "utf-8") : content;
+          })
         }
       };
     },
@@ -394,14 +408,14 @@ Caused by: "${fileId}".`;
         }
         const transformWithOxc = vite__namespace.transformWithOxc;
         const transformWithEsbuild = vite__namespace.transformWithEsbuild;
-        const tsCompileRes = await (transformWithOxc ?? transformWithEsbuild)(
+        const tsTransform = transformWithOxc ?? transformWithEsbuild;
+        const tsCompileRes = await tsTransform(
           compiledCode,
           id,
           {
             sourcemap,
-            lang: "ts",
-            loader: "ts",
-            target: "esnext"
+            target: "esnext",
+            [transformWithOxc ? "lang" : "loader"]: "ts"
           },
           sourcemap ? {
             version: 3,
@@ -429,9 +443,17 @@ Caused by: "${fileId}".`;
         };
       } catch (err) {
         if (compiler.isCompileError(err)) {
-          this.error(err.message, err.loc.start.index);
+          const location = new linesAndColumns.LinesAndColumns(src).locationForIndex(err.loc.start.index) || void 0;
+          this.error({
+            loc: location && {
+              file: id,
+              line: location.line + 1,
+              column: location.column
+            },
+            message: err.message
+          });
         } else if (err.cause && isNumber(err.cause.pos)) {
-          this.error(err, err.cause.pos);
+          this.error({ message: err.message });
         } 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."
@@ -495,7 +517,8 @@ Caused by: "${fileId}".`;
     const qingkuaiConfig = getQingkuaiConfiguration(id);
     const ret = {
       interpretiveComments: isUndefined(qingkuaiConfig.interpretiveComments) ? isDev : !!qingkuaiConfig.interpretiveComments,
-      shorthandDerivedDeclaration: isUndefined(qingkuaiConfig.shorthandDerivedDeclaration) ? true : !!qingkuaiConfig.shorthandDerivedDeclaration,
+      allowConstReactive: qingkuaiConfig.allowConstReactive !== false,
+      requireReactivityMark: qingkuaiConfig.requireReactivityMark === true,
       reactivityMode: qingkuaiConfig.reactivityMode === "shallow" ? "shallow" : "reactive"
     };
     switch (qingkuaiConfig.whitespace) {
@@ -512,7 +535,7 @@ Caused by: "${fileId}".`;
       }
     }
     switch (qingkuaiConfig.preserveHtmlComments) {
-      case "all": {
+      case "always": {
         ret.preserveHtmlComments = true;
         break;
       }

package/dist/index.js

@@ -1,37 +1,15 @@
 import * as vite from 'vite';
 import nodeFs from 'node:fs';
+import nodeUrl from 'node:url';
 import nodePath from 'node:path';
 import nodeCrypto from 'node:crypto';
-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 { util, compile, isCompileError } from 'qingkuai/compiler';
 import { SourceMapConsumer } from 'source-map-js';
 
-function isNumber(v) {
-  return typeof v === "number";
-}
-function isUndefined(v) {
-  return void 0 === v;
-}
-function findFilesByName(dir, targetFileName, ignoreList) {
-  const result = [];
-  const entries = nodeFs.readdirSync(dir, { withFileTypes: true });
-  for (const entry of entries) {
-    if (ignoreList.has(entry.name)) {
-      continue;
-    }
-    const fullPath = nodePath.join(dir, entry.name);
-    if (entry.name === targetFileName) {
-      result.push(fullPath);
-    } else if (entry.isDirectory()) {
-      result.push(...findFilesByName(fullPath, targetFileName, ignoreList));
-    }
-  }
-  return result;
-}
-
 async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
   let error;
   const processedRules = /* @__PURE__ */ new WeakSet();
@@ -79,11 +57,11 @@ async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
     }
   ]);
   const ret = await processor.process(code, {
-    from: sourceFile,
     map: {
-      prev: map,
-      annotation: false
-    }
+      annotation: false,
+      prev: map?.version ? map : void 0
+    },
+    from: sourceFile
   });
   const outputMap = ret.map?.toJSON();
   return {
@@ -105,10 +83,34 @@ const globalStyle = "\n" + util.formatSourceCode(
 ).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) {
+function isNumber(v) {
+  return typeof v === "number";
+}
+function isUndefined(v) {
+  return void 0 === v;
+}
+function findFilesByName(dir, targetFileName, ignoreList) {
+  const result = [];
+  const entries = nodeFs.readdirSync(dir, { withFileTypes: true });
+  for (const entry of entries) {
+    if (ignoreList.has(entry.name)) {
+      continue;
+    }
+    const fullPath = nodePath.join(dir, entry.name);
+    if (entry.name === targetFileName) {
+      result.push(fullPath);
+    } else if (entry.isDirectory()) {
+      result.push(...findFilesByName(fullPath, targetFileName, ignoreList));
+    }
+  }
+  return result;
+}
+
+function offsetSourceMap(sourceIndices, mappings, preLine, preColumn) {
+  const indices = new Set(sourceIndices);
   return decode(mappings).map((line) => {
     return line.map((segment) => {
-      if (segment.length === 1 || segment[1] !== sourceIndex) {
+      if (segment.length === 1 || !indices.has(segment[1])) {
         return segment;
       }
       if (segment[2] === preLine) {
@@ -252,9 +254,11 @@ Caused by: "${fileId}".`;
         }
         return this.error(err);
       }
+      preprocessRes.deps?.forEach((dep) => this.addWatchFile(dep));
       if (!cssSourcemap || styleDescriptor.global) {
         return preprocessRes;
       }
+      const phantomIndices = [];
       const assertedPreprocessMap = preprocessRes.map;
       const attachScopeResult = await attachScopeForStyleSelectors(
         preprocessRes.code,
@@ -263,15 +267,28 @@ Caused by: "${fileId}".`;
         assertedPreprocessMap
       );
       const attachScopeMap = attachScopeResult.map ?? assertedPreprocessMap;
-      const samePath = (left, right) => {
-        return nodePath.normalize(left) === nodePath.normalize(right);
+      const sameVirtualSource = (source) => {
+        let resolved = source.startsWith("file://") ? nodeUrl.fileURLToPath(source) : source;
+        if (!nodePath.isAbsolute(resolved)) {
+          const candidates = [
+            nodePath.resolve(nodePath.dirname(virtualFileName), resolved),
+            nodePath.resolve(resolved)
+          ];
+          return candidates.some(
+            (candidate) => nodePath.normalize(candidate) === nodePath.normalize(virtualFileName)
+          );
+        }
+        return nodePath.normalize(resolved) === nodePath.normalize(virtualFileName);
       };
-      const sourceIndex = attachScopeMap?.sources.findIndex((source) => samePath(source, virtualFileName)) ?? -1;
-      const currentSourceIndex = sourceIndex === -1 ? preprocessRes.deps?.size || 0 : sourceIndex;
+      attachScopeMap?.sources.forEach((source, index2) => {
+        if (sameVirtualSource(source)) {
+          phantomIndices.push(index2);
+        }
+      });
       const offsetMappings = encode(
         offsetSourceMap(
+          phantomIndices,
           attachScopeResult.mappings,
-          currentSourceIndex,
           styleDescriptor.loc.start.line - 1,
           styleDescriptor.loc.start.column - 1
         )
@@ -285,7 +302,7 @@ Caused by: "${fileId}".`;
             attachScopeResult.error.loc.line,
             attachScopeResult.error.loc.column
           );
-          if (preprocessedPosition.source && !samePath(preprocessedPosition.source, virtualFileName)) {
+          if (preprocessedPosition.source && !sameVirtualSource(preprocessedPosition.source)) {
             this.error({
               message: attachScopeResult.error.message,
               loc: {
@@ -316,20 +333,17 @@ Caused by: "${fileId}".`;
           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
+          sources: attachScopeMap?.sources.map((source, index2) => {
+            return phantomIndices.includes(index2) ? fileId : source;
+          }) ?? [
+            ...assertedPreprocessMap?.sources.filter((source) => {
+              return !sameVirtualSource(source);
+            }) ?? [],
+            fileId
+          ],
+          sourcesContent: attachScopeMap?.sourcesContent?.map((content, index2) => {
+            return phantomIndices.includes(index2) ? nodeFs.readFileSync(fileId, "utf-8") : content;
+          })
         }
       };
     },
@@ -373,14 +387,14 @@ Caused by: "${fileId}".`;
         }
         const transformWithOxc = vite.transformWithOxc;
         const transformWithEsbuild = vite.transformWithEsbuild;
-        const tsCompileRes = await (transformWithOxc ?? transformWithEsbuild)(
+        const tsTransform = transformWithOxc ?? transformWithEsbuild;
+        const tsCompileRes = await tsTransform(
           compiledCode,
           id,
           {
             sourcemap,
-            lang: "ts",
-            loader: "ts",
-            target: "esnext"
+            target: "esnext",
+            [transformWithOxc ? "lang" : "loader"]: "ts"
           },
           sourcemap ? {
             version: 3,
@@ -408,9 +422,17 @@ Caused by: "${fileId}".`;
         };
       } catch (err) {
         if (isCompileError(err)) {
-          this.error(err.message, err.loc.start.index);
+          const location = new LinesAndColumns(src).locationForIndex(err.loc.start.index) || void 0;
+          this.error({
+            loc: location && {
+              file: id,
+              line: location.line + 1,
+              column: location.column
+            },
+            message: err.message
+          });
         } else if (err.cause && isNumber(err.cause.pos)) {
-          this.error(err, err.cause.pos);
+          this.error({ message: err.message });
         } 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."
@@ -474,7 +496,8 @@ Caused by: "${fileId}".`;
     const qingkuaiConfig = getQingkuaiConfiguration(id);
     const ret = {
       interpretiveComments: isUndefined(qingkuaiConfig.interpretiveComments) ? isDev : !!qingkuaiConfig.interpretiveComments,
-      shorthandDerivedDeclaration: isUndefined(qingkuaiConfig.shorthandDerivedDeclaration) ? true : !!qingkuaiConfig.shorthandDerivedDeclaration,
+      allowConstReactive: qingkuaiConfig.allowConstReactive !== false,
+      requireReactivityMark: qingkuaiConfig.requireReactivityMark === true,
       reactivityMode: qingkuaiConfig.reactivityMode === "shallow" ? "shallow" : "reactive"
     };
     switch (qingkuaiConfig.whitespace) {
@@ -491,7 +514,7 @@ Caused by: "${fileId}".`;
       }
     }
     switch (qingkuaiConfig.preserveHtmlComments) {
-      case "all": {
+      case "always": {
         ret.preserveHtmlComments = true;
         break;
       }

package/package.json

@@ -3,13 +3,15 @@
   "author": "mlgq",
   "license": "MIT",
   "type": "module",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "packageManager": "pnpm@9.9.0",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "repository": {
     "type": "git",
@@ -30,7 +32,7 @@
     "fs-extra": "^11.3.0",
     "husky": "^9.1.7",
     "lint-staged": "^17.3.0",
-    "qingkuai": "^1.0.83",
+    "qingkuai": "^1.0.101",
     "rimraf": "^6.0.1",
     "rollup": "^4.38.0",
     "rollup-plugin-dts": "^6.2.1",