vite-plugin-qingkuai 1.0.29 → 1.0.30

package/.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

package/dist/index.cjs

@@ -11,6 +11,7 @@ var postcss = require('postcss');
 var selectorParser = require('postcss-selector-parser');
 var compiler = require('qingkuai/compiler');
 var sourceMapJs = require('source-map-js');
+var config = require('qingkuai-language-service/config');
 
 function _interopNamespaceDefault(e) {
     var n = Object.create(null);
@@ -31,6 +32,13 @@ function _interopNamespaceDefault(e) {
 
 var vite__namespace = /*#__PURE__*/_interopNamespaceDefault(vite);
 
+function isNumber(v) {
+  return typeof v === "number";
+}
+function isUndefined(v) {
+  return void 0 === v;
+}
+
 async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
   let error;
   const processedRules = /* @__PURE__ */ new WeakSet();
@@ -104,29 +112,6 @@ 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 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) => {
@@ -152,8 +137,29 @@ function qingkuai(options = {}) {
   let sourcemap;
   let cssSourcemap;
   let viteConfig;
+  const reportedConfigMessages = /* @__PURE__ */ new Set();
   const compileResultCache = /* @__PURE__ */ new Map();
-  const qingkuaiConfigurations = /* @__PURE__ */ new Map();
+  const configResolver = config.createConfigResolver(
+    {
+      read: (filePath) => {
+        return nodeFs.readFileSync(filePath, "utf-8");
+      },
+      exist: (filePath) => {
+        return nodeFs.existsSync(filePath);
+      }
+    },
+    {
+      dir: (filePath) => {
+        return nodePath.resolve(nodePath.dirname(filePath));
+      },
+      resolve: (...segments) => {
+        return nodePath.resolve(...segments);
+      },
+      ext: nodePath.extname,
+      base: nodePath.basename,
+      relative: nodePath.relative
+    }
+  );
   if (isUndefined(options.maxScheduleDepth)) {
     options.maxScheduleDepth = 300;
   }
@@ -180,7 +186,6 @@ function qingkuai(options = {}) {
         cssSourcemap = true;
         sourcemap = config.build.sourcemap !== false;
       }
-      loadAllQingkuaiConfigurations(config.root);
     },
     transformIndexHtml(html) {
       return {
@@ -199,7 +204,7 @@ function qingkuai(options = {}) {
         return id;
       }
       if (importer?.endsWith(".qk") && !nodePath.extname(id)) {
-        const qingkuaiConfig = getQingkuaiConfiguration(id);
+        const qingkuaiConfig = getQingkuaiConfig(importer);
         return nodePath.join(
           nodePath.dirname(importer),
           id + (qingkuaiConfig.resolveImportExtension ? ".qk" : "")
@@ -463,59 +468,44 @@ Caused by: "${fileId}".`;
       }
     }
   };
-  function getQingkuaiConfiguration(id) {
-    let config = {
-      interpretiveComments: true,
-      resolveImportExtension: true,
-      preserveHtmlComments: "development"
-    };
-    while (true) {
-      const dir = nodePath.dirname(id);
-      if (dir === id) {
-        break;
-      }
-      const got = qingkuaiConfigurations.get(id = dir);
-      if (got) {
-        config = got;
-        break;
+  function getQingkuaiConfig(filePath) {
+    return configResolver.resolve(filePath, (configPath, message) => {
+      reportConfigMessage(viteConfig.logger, configPath, message);
+    });
+  }
+  function reportConfigMessage(logger, filePath, message) {
+    const key = `${filePath}\0${message.value}`;
+    if (reportedConfigMessages.has(key)) {
+      return;
+    }
+    reportedConfigMessages.add(key);
+    const reason = message.kind === config.ConfigParsingMessageKind.Error ? "Failed to parse configuration file" : "Configuration file";
+    logger.warn(`[qingkuai] ${reason} ${filePath}: ${message.value}`);
+  }
+  function forgetConfigMessages(configPath) {
+    const prefix = `${configPath}\0`;
+    for (const key of reportedConfigMessages) {
+      if (key.startsWith(prefix)) {
+        reportedConfigMessages.delete(key);
       }
     }
-    return config;
   }
   function createQingkuaiConfigurationWatcher(server) {
     const watcher = server.watcher;
-    const isQingkuaiConfig = (filePath) => {
-      return nodePath.basename(filePath) === ".qingkuairc" && !filePath.includes(`${nodePath.sep}node_modules${nodePath.sep}`);
-    };
-    watcher.on("unlink", (filePath) => {
-      if (isQingkuaiConfig(filePath)) {
-        qingkuaiConfigurations.delete(nodePath.dirname(filePath));
-      }
-    });
-    watcher.on("change", (filePath) => {
-      if (isQingkuaiConfig(filePath)) {
-        recordQingkuaiConfiguration(filePath);
-      }
-    });
-    watcher.on("add", (filePath) => {
-      if (isQingkuaiConfig(filePath)) {
-        recordQingkuaiConfiguration(filePath);
+    const handleFileChange = (filePath) => {
+      for (const configPath of configResolver.removeCacheByPath(filePath)) {
+        forgetConfigMessages(configPath);
+        configResolver.resolve(configPath, (path, message) => {
+          reportConfigMessage(server.config.logger, path, message);
+        });
       }
-    });
-  }
-  function loadAllQingkuaiConfigurations(workspaceDir) {
-    findFilesByName(workspaceDir, ".qingkuairc", /* @__PURE__ */ new Set(["node_modules"])).forEach((fileName) => {
-      recordQingkuaiConfiguration(fileName);
-    });
-  }
-  function recordQingkuaiConfiguration(fileName) {
-    try {
-      qingkuaiConfigurations.set(nodePath.dirname(fileName), JSON.parse(nodeFs.readFileSync(fileName, "utf-8")));
-    } catch {
-    }
+    };
+    watcher.on("change", handleFileChange);
+    watcher.on("add", handleFileChange);
+    watcher.on("unlink", handleFileChange);
   }
   function getCompileOptions(id) {
-    const qingkuaiConfig = getQingkuaiConfiguration(id);
+    const qingkuaiConfig = getQingkuaiConfig(id);
     const ret = {
       interpretiveComments: isUndefined(qingkuaiConfig.interpretiveComments) ? isDev : !!qingkuaiConfig.interpretiveComments,
       allowConstReactive: qingkuaiConfig.allowConstReactive !== false,

package/dist/index.js

@@ -9,6 +9,14 @@ import postcss from 'postcss';
 import selectorParser from 'postcss-selector-parser';
 import { util, compile, isCompileError, ReactivityMode, WhitespaceMode } from 'qingkuai/compiler';
 import { SourceMapConsumer } from 'source-map-js';
+import { createConfigResolver, ConfigParsingMessageKind } from 'qingkuai-language-service/config';
+
+function isNumber(v) {
+  return typeof v === "number";
+}
+function isUndefined(v) {
+  return void 0 === v;
+}
 
 async function attachScopeForStyleSelectors(code, hash, sourceFile, map) {
   let error;
@@ -83,29 +91,6 @@ 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 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) => {
@@ -131,8 +116,29 @@ function qingkuai(options = {}) {
   let sourcemap;
   let cssSourcemap;
   let viteConfig;
+  const reportedConfigMessages = /* @__PURE__ */ new Set();
   const compileResultCache = /* @__PURE__ */ new Map();
-  const qingkuaiConfigurations = /* @__PURE__ */ new Map();
+  const configResolver = createConfigResolver(
+    {
+      read: (filePath) => {
+        return nodeFs.readFileSync(filePath, "utf-8");
+      },
+      exist: (filePath) => {
+        return nodeFs.existsSync(filePath);
+      }
+    },
+    {
+      dir: (filePath) => {
+        return nodePath.resolve(nodePath.dirname(filePath));
+      },
+      resolve: (...segments) => {
+        return nodePath.resolve(...segments);
+      },
+      ext: nodePath.extname,
+      base: nodePath.basename,
+      relative: nodePath.relative
+    }
+  );
   if (isUndefined(options.maxScheduleDepth)) {
     options.maxScheduleDepth = 300;
   }
@@ -159,7 +165,6 @@ function qingkuai(options = {}) {
         cssSourcemap = true;
         sourcemap = config.build.sourcemap !== false;
       }
-      loadAllQingkuaiConfigurations(config.root);
     },
     transformIndexHtml(html) {
       return {
@@ -178,7 +183,7 @@ function qingkuai(options = {}) {
         return id;
       }
       if (importer?.endsWith(".qk") && !nodePath.extname(id)) {
-        const qingkuaiConfig = getQingkuaiConfiguration(id);
+        const qingkuaiConfig = getQingkuaiConfig(importer);
         return nodePath.join(
           nodePath.dirname(importer),
           id + (qingkuaiConfig.resolveImportExtension ? ".qk" : "")
@@ -442,59 +447,44 @@ Caused by: "${fileId}".`;
       }
     }
   };
-  function getQingkuaiConfiguration(id) {
-    let config = {
-      interpretiveComments: true,
-      resolveImportExtension: true,
-      preserveHtmlComments: "development"
-    };
-    while (true) {
-      const dir = nodePath.dirname(id);
-      if (dir === id) {
-        break;
-      }
-      const got = qingkuaiConfigurations.get(id = dir);
-      if (got) {
-        config = got;
-        break;
+  function getQingkuaiConfig(filePath) {
+    return configResolver.resolve(filePath, (configPath, message) => {
+      reportConfigMessage(viteConfig.logger, configPath, message);
+    });
+  }
+  function reportConfigMessage(logger, filePath, message) {
+    const key = `${filePath}\0${message.value}`;
+    if (reportedConfigMessages.has(key)) {
+      return;
+    }
+    reportedConfigMessages.add(key);
+    const reason = message.kind === ConfigParsingMessageKind.Error ? "Failed to parse configuration file" : "Configuration file";
+    logger.warn(`[qingkuai] ${reason} ${filePath}: ${message.value}`);
+  }
+  function forgetConfigMessages(configPath) {
+    const prefix = `${configPath}\0`;
+    for (const key of reportedConfigMessages) {
+      if (key.startsWith(prefix)) {
+        reportedConfigMessages.delete(key);
       }
     }
-    return config;
   }
   function createQingkuaiConfigurationWatcher(server) {
     const watcher = server.watcher;
-    const isQingkuaiConfig = (filePath) => {
-      return nodePath.basename(filePath) === ".qingkuairc" && !filePath.includes(`${nodePath.sep}node_modules${nodePath.sep}`);
-    };
-    watcher.on("unlink", (filePath) => {
-      if (isQingkuaiConfig(filePath)) {
-        qingkuaiConfigurations.delete(nodePath.dirname(filePath));
-      }
-    });
-    watcher.on("change", (filePath) => {
-      if (isQingkuaiConfig(filePath)) {
-        recordQingkuaiConfiguration(filePath);
-      }
-    });
-    watcher.on("add", (filePath) => {
-      if (isQingkuaiConfig(filePath)) {
-        recordQingkuaiConfiguration(filePath);
+    const handleFileChange = (filePath) => {
+      for (const configPath of configResolver.removeCacheByPath(filePath)) {
+        forgetConfigMessages(configPath);
+        configResolver.resolve(configPath, (path, message) => {
+          reportConfigMessage(server.config.logger, path, message);
+        });
       }
-    });
-  }
-  function loadAllQingkuaiConfigurations(workspaceDir) {
-    findFilesByName(workspaceDir, ".qingkuairc", /* @__PURE__ */ new Set(["node_modules"])).forEach((fileName) => {
-      recordQingkuaiConfiguration(fileName);
-    });
-  }
-  function recordQingkuaiConfiguration(fileName) {
-    try {
-      qingkuaiConfigurations.set(nodePath.dirname(fileName), JSON.parse(nodeFs.readFileSync(fileName, "utf-8")));
-    } catch {
-    }
+    };
+    watcher.on("change", handleFileChange);
+    watcher.on("add", handleFileChange);
+    watcher.on("unlink", handleFileChange);
   }
   function getCompileOptions(id) {
-    const qingkuaiConfig = getQingkuaiConfiguration(id);
+    const qingkuaiConfig = getQingkuaiConfig(id);
     const ret = {
       interpretiveComments: isUndefined(qingkuaiConfig.interpretiveComments) ? isDev : !!qingkuaiConfig.interpretiveComments,
       allowConstReactive: qingkuaiConfig.allowConstReactive !== false,

package/package.json

@@ -3,7 +3,7 @@
   "author": "mlgq",
   "license": "MIT",
   "type": "module",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "packageManager": "pnpm@9.9.0",
   "exports": {
     ".": {
@@ -22,8 +22,10 @@
   },
   "scripts": {
     "dev": "rollup -c -w",
+    "test": "vitest --run",
     "release": "node scripts/release.js",
-    "build": "rimraf dist && tsc && rollup -c && rimraf dist/temp-types",
+    "typecheck": "tsc -p tsconfig.json",
+    "build": "rimraf dist && tsc -p tsconfig.build.json && rollup -c && rimraf dist/temp-types",
     "postpublish": "curl -X PUT 'https://registry-direct.npmmirror.com/-/package/vite-plugin-qingkuai/syncs'"
   },
   "devDependencies": {
@@ -37,7 +39,9 @@
     "rollup": "^4.38.0",
     "rollup-plugin-dts": "^6.2.1",
     "rollup-plugin-esbuild": "^6.2.1",
-    "vite": "8.0.0"
+    "typescript": "^6.0.3",
+    "vite": "8.3.5",
+    "vitest": "4.1.10"
   },
   "peerDependencies": {
     "qingkuai": ">=1.0.104",
@@ -48,6 +52,7 @@
     "lines-and-columns": "^2.0.4",
     "postcss": "^8.5.3",
     "postcss-selector-parser": "^7.1.0",
+    "qingkuai-language-service": "^1.0.23",
     "source-map-js": "^1.2.1"
   },
   "keywords": [