vite-plugin-qingkuai 1.0.24 → 1.0.26

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();
@@ -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;
+          })
         }
       };
     },

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();
@@ -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;
+          })
         }
       };
     },

package/package.json

@@ -3,7 +3,7 @@
   "author": "mlgq",
   "license": "MIT",
   "type": "module",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "packageManager": "pnpm@9.9.0",
   "exports": {
     ".": {

package/.github/workflows/release.yml

@@ -1,106 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags:
-      - "v*"
-  workflow_dispatch:
-    inputs:
-      tag:
-        type: string
-        required: false
-        description: "Optional tag to release (for example: v1.0.66). Leave empty to auto-create from package version."
-
-permissions:
-  contents: write
-  id-token: write
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout source
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-
-      - name: Resolve release tag
-        id: tag
-        env:
-          INPUT_TAG: ${{ inputs.tag }}
-          REF_NAME: ${{ github.ref_name }}
-          EVENT_NAME: ${{ github.event_name }}
-        run: |
-          if [[ "$EVENT_NAME" == "push" ]]; then
-            echo "value=$REF_NAME" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-
-          if [[ -n "$INPUT_TAG" ]]; then
-            echo "value=$INPUT_TAG" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-
-          package_version="$(node -p 'require("./package.json").version')"
-          echo "value=v$package_version" >> "$GITHUB_OUTPUT"
-
-      - name: Ensure tag exists on workflow dispatch
-        if: ${{ github.event_name == 'workflow_dispatch' }}
-        env:
-          TAG: ${{ steps.tag.outputs.value }}
-        run: |
-          git fetch origin --tags --prune
-
-          if git rev-parse --verify --quiet "refs/tags/$TAG" >/dev/null; then
-            echo "Tag already exists: $TAG"
-          else
-            git config user.name "github-actions[bot]"
-            git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-            git tag "$TAG"
-            git push origin "$TAG"
-            echo "Created and pushed tag: $TAG"
-          fi
-
-      - name: Checkout resolved tag
-        env:
-          TAG: ${{ steps.tag.outputs.value }}
-        run: |
-          git fetch origin --tags --prune
-          git checkout "refs/tags/$TAG"
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v6
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24
-          cache: pnpm
-          registry-url: https://registry.npmjs.org
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile --ignore-scripts
-
-      - name: Validate tag equals package version
-        env:
-          TAG: ${{ steps.tag.outputs.value }}
-        run: |
-          package_version="$(node -p 'require("./package.json").version')"
-          if [[ "v$package_version" != "$TAG" ]]; then
-            echo "Tag and package.json version mismatch: $TAG vs v$package_version"
-            exit 1
-          fi
-
-      - name: Build
-        run: pnpm build
-
-      - name: Publish package to npm (Trusted Publishing)
-        run: npm publish --access public --provenance
-
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: ${{ steps.tag.outputs.value }}
-          name: ${{ steps.tag.outputs.value }}
-          body: "Release ${{ steps.tag.outputs.value }}"

package/.husky/pre-commit

@@ -1 +0,0 @@
-pnpm lint-staged

package/scripts/release.js

@@ -1,94 +0,0 @@
-#!/usr/bin/env node
-import nodeFs from "node:fs"
-import nodePath from "node:path"
-
-import { spawnSync } from "node:child_process"
-
-const ROOT = nodePath.resolve(process.cwd())
-const PKG_PATH = nodePath.join(ROOT, "package.json")
-
-main()
-
-function readPackageJson() {
-    return JSON.parse(nodeFs.readFileSync(PKG_PATH, "utf-8"))
-}
-
-function writePackageJson(pkg) {
-    nodeFs.writeFileSync(PKG_PATH, JSON.stringify(pkg, null, 2) + "\n", "utf-8")
-}
-
-function bumpVersion(version) {
-    const parts = version.split(".").map(Number)
-    if (parts.length !== 3 || parts.some(n => Number.isNaN(n) || n < 0)) {
-        throw new Error(`Unsupported version format: ${version}`)
-    }
-    parts[2] += 1
-    return parts.join(".")
-}
-
-async function run(command, args, opts = {}) {
-    const result = spawnSync(command, args, { stdio: "inherit", ...opts })
-    if (result.error) {
-        throw result.error
-    }
-    if (result.status !== 0) {
-        throw new Error(`Command failed: ${command} ${args.join(" ")}`)
-    }
-    return result
-}
-
-function verifyCleanWorkingTree() {
-    const result = spawnSync("git", ["status", "--porcelain"], {
-        encoding: "utf-8",
-        stdio: ["ignore", "pipe", "inherit"]
-    })
-    if (result.error) {
-        throw result.error
-    }
-    if (result.status !== 0) {
-        throw new Error("Failed to check git working tree status")
-    }
-    if (result.stdout.trim()) {
-        throw new Error(
-            "Git working tree is not clean. Please commit or stash your changes before releasing."
-        )
-    }
-}
-
-async function release() {
-    verifyCleanWorkingTree()
-    const pkg = readPackageJson()
-    const currentVersion = pkg.version
-    if (!currentVersion) {
-        throw new Error("package.json is missing version")
-    }
-
-    const arg = process.argv[2]
-    const newVersion = arg ? arg.replace(/^v/, "") : bumpVersion(currentVersion)
-    const tag = `v${newVersion}`
-
-    if (newVersion === currentVersion) {
-        console.log(`Version unchanged: ${newVersion}`)
-        return
-    }
-
-    pkg.version = newVersion
-    writePackageJson(pkg)
-
-    await run("git", ["add", "package.json"])
-    await run("git", ["commit", "-m", `release: bump version to ${tag}`])
-    await run("git", ["tag", tag])
-    await run("git", ["push"])
-    await run("git", ["push", "origin", tag])
-
-    console.log(`Released ${tag}`)
-}
-
-async function main() {
-    try {
-        await release()
-    } catch (error) {
-        console.error(error instanceof Error ? error.message : error)
-        process.exit(1)
-    }
-}