vite-plugin-qingkuai 1.0.12 → 1.0.13

package/.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+    "recommendations": []
+}

package/dist/index.cjs

@@ -1,9 +1,9 @@
 'use strict';
 
-var path = require('node:path');
-var node_fs = require('node:fs');
-var node_crypto = require('node:crypto');
+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');
@@ -11,14 +11,17 @@ var selectorParser = require('postcss-selector-parser');
 var vite = require('vite');
 var sourceMapJs = require('source-map-js');
 
+function isUndefined(v) {
+  return void 0 === v;
+}
 function findFilesByName(dir, targetFileName, ignoreList) {
   const result = [];
-  const entries = node_fs.readdirSync(dir, { withFileTypes: true });
+  const entries = nodeFs.readdirSync(dir, { withFileTypes: true });
   for (const entry of entries) {
     if (ignoreList.has(entry.name)) {
       continue;
     }
-    const fullPath = path.join(dir, entry.name);
+    const fullPath = nodePath.join(dir, entry.name);
     if (entry.name === targetFileName) {
       result.push(fullPath);
     } else if (entry.isDirectory()) {
@@ -105,16 +108,8 @@ function qingkuai() {
   const styleIdRE = /^virtual:\[\d+\].*?\.qk.(?:css|s[ac]ss|less|stylus|postcss)\?\d{13}$/;
   return {
     name: "qingkuai-compiler",
-    config(config, env) {
-      const rootPath = path.resolve(process.cwd(), config.root ?? "");
-      const qingkuaiConfig = getQingkuaiConfiguration(rootPath);
+    config(_, env) {
       isDev = env.command === "serve";
-      return {
-        define: {
-          __qk_expose_dependencies__: JSON.stringify(!!qingkuaiConfig.exposeDependencies),
-          __qk_expose_destructions__: JSON.stringify(!!qingkuaiConfig.exposeDestructions)
-        }
-      };
     },
     configureServer(server) {
       createQingkuaiConfigurationWatcher(server);
@@ -128,15 +123,30 @@ function qingkuai() {
         cssSourcemap = true;
         sourcemap = config.build.sourcemap !== false;
       }
+      const optimizeDeps = config.optimizeDeps;
+      if (!optimizeDeps) {
+        Object.assign(config, {
+          optimizeDeps: {
+            exclude: ["qingkuai"]
+          }
+        });
+      } else if (!optimizeDeps.exclude) {
+        optimizeDeps.exclude = ["qingkuai"];
+      } else {
+        optimizeDeps.exclude.push("qingkuai");
+      }
       loadAllQingkuaiConfigurations(config.root);
     },
     resolveId(id, importer) {
       if (styleIdRE.test(id)) {
         return id;
       }
-      if (importer?.endsWith(".qk") && !path.extname(id)) {
+      if (importer?.endsWith(".qk") && !nodePath.extname(id)) {
         const qingkuaiConfig = getQingkuaiConfiguration(id);
-        return path.join(path.dirname(importer), id + (qingkuaiConfig.resolveImportExtension ? ".qk" : ""));
+        return nodePath.join(
+          nodePath.dirname(importer),
+          id + (qingkuaiConfig.resolveImportExtension ? ".qk" : "")
+        );
       }
       return id;
     },
@@ -148,11 +158,11 @@ function qingkuai() {
         }
         let virtualFileName;
         const compileRes = compileResultCache.get(fileId);
-        const style = compileRes.inputDescriptor.styles[index];
+        const style = compileRes.styleDescriptors[index];
         while (true) {
-          const hash = node_crypto.randomBytes(6).toString("hex");
+          const hash = nodeCrypto.randomBytes(6).toString("hex");
           virtualFileName = `${fileId}.${hash}.${style.lang}`;
-          if (!node_fs.existsSync(virtualFileName)) {
+          if (!nodeFs.existsSync(virtualFileName)) {
             break;
           }
         }
@@ -196,7 +206,7 @@ function qingkuai() {
               line: preprocessedPosition.line - 1,
               column: preprocessedPosition.column
             }) || 0;
-            const position = compileRes.inputDescriptor.positions[style.loc.start.index + preprocessedIndex];
+            const position = compileRes.positions[style.loc.start.index + preprocessedIndex];
             this.error({
               message: attachScopeResult.error.message,
               loc: {
@@ -224,11 +234,11 @@ function qingkuai() {
       }
       try {
         const compileRes = compiler.compile(src, {
+          ...getCompileOptions(id),
           sourcemap,
           debug: isDev,
-          hashId: compileResultCache.get(id)?.hashId || void 0,
-          componentName: compiler.util.kebab2Camel(path.basename(id, path.extname(id)), true),
-          reserveTemplateComment: getReserveHtmlComments(getQingkuaiConfiguration(id))
+          hashId: compileResultCache.get(id)?.hashId,
+          componentName: compiler.util.kebab2Camel(nodePath.basename(id, nodePath.extname(id)), true)
         });
         compileRes.messages.forEach(({ type, value: warning }) => {
           if (type === "warning") {
@@ -237,7 +247,7 @@ function qingkuai() {
         });
         compileResultCache.set(id, compileRes);
         const compiledCodeArr = [compileRes.code];
-        compileRes.inputDescriptor.styles.forEach((_, index) => {
+        compileRes.styleDescriptors.forEach((_, index) => {
           compiledCodeArr.push(`import "virtual:[${index}]${id}.css?${Date.now()}"`);
         });
         const baseMap = {
@@ -246,7 +256,7 @@ function qingkuai() {
           sourcesContent: [src]
         };
         const compiledCode = compiledCodeArr.join("\n");
-        if (!compileRes.inputDescriptor.script.isTS) {
+        if (!compileRes.scriptDescriptor.isTS) {
           if (!sourcemap) {
             return compiledCode;
           }
@@ -288,14 +298,12 @@ function qingkuai() {
   };
   function getQingkuaiConfiguration(id) {
     let config = {
-      insertTipComments: true,
-      exposeDestructions: isDev,
-      exposeDependencies: isDev,
+      interpretiveComments: true,
       resolveImportExtension: true,
-      reserveHtmlComments: "development"
+      preserveHtmlComments: "development"
     };
     while (true) {
-      const dir = path.dirname(id);
+      const dir = nodePath.dirname(id);
       if (dir === id) {
         break;
       }
@@ -307,21 +315,9 @@ function qingkuai() {
     }
     return config;
   }
-  function getReserveHtmlComments(config) {
-    switch (config.reserveHtmlComments) {
-      case "all":
-        return true;
-      case "never":
-        return false;
-      case "production":
-        return !isDev;
-      default:
-        return isDev;
-    }
-  }
   function createQingkuaiConfigurationWatcher(server) {
     const watcher = server.watcher.add([".qingkuairc", "!**/node_modules/**"]);
-    watcher.on("unlink", (p) => qingkuaiConfigurations.delete(path.dirname(p)));
+    watcher.on("unlink", (p) => qingkuaiConfigurations.delete(nodePath.dirname(p)));
     watcher.on("change", recordQingkuaiConfiguration);
     watcher.on("add", recordQingkuaiConfiguration);
   }
@@ -332,10 +328,50 @@ function qingkuai() {
   }
   function recordQingkuaiConfiguration(fileName) {
     try {
-      qingkuaiConfigurations.set(path.dirname(fileName), JSON.parse(node_fs.readFileSync(fileName, "utf-8")));
+      qingkuaiConfigurations.set(nodePath.dirname(fileName), JSON.parse(nodeFs.readFileSync(fileName, "utf-8")));
     } catch {
     }
   }
+  function getCompileOptions(id) {
+    const qingkuaiConfig = getQingkuaiConfiguration(id);
+    const ret = {
+      interpretiveComments: isUndefined(qingkuaiConfig.interpretiveComments) ? isDev : !!qingkuaiConfig.interpretiveComments,
+      shorthandDerivedDeclaration: isUndefined(qingkuaiConfig.shorthandDerivedDeclaration) ? true : !!qingkuaiConfig.shorthandDerivedDeclaration,
+      reactivityMode: qingkuaiConfig.reactivityMode === "shallow" ? "shallow" : "reactive"
+    };
+    switch (qingkuaiConfig.whitespace) {
+      case "trim":
+      case "collapse":
+      case "preserve":
+      case "trim-collapse": {
+        ret.whitespace = qingkuaiConfig.whitespace;
+        break;
+      }
+      default: {
+        ret.whitespace = "trim-collapse";
+        break;
+      }
+    }
+    switch (qingkuaiConfig.preserveHtmlComments) {
+      case "all": {
+        ret.preserveHtmlComments = true;
+        break;
+      }
+      case "never": {
+        ret.preserveHtmlComments = false;
+        break;
+      }
+      case "production": {
+        ret.preserveHtmlComments = !isDev;
+        break;
+      }
+      default: {
+        ret.preserveHtmlComments = isDev;
+        break;
+      }
+    }
+    return ret;
+  }
 }
 function parseStyleId(id) {
   const m1 = /^virtual:\[(\d+)\]/.exec(id);

package/dist/index.js

@@ -1,7 +1,7 @@
-import path, { join } from 'node:path';
-import { readdirSync, existsSync, readFileSync } from 'node:fs';
-import { randomBytes } from 'node:crypto';
+import nodePath from 'node:path';
+import nodeCrypto from 'node:crypto';
 import { compile, util } 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';
@@ -9,14 +9,17 @@ import selectorParser from 'postcss-selector-parser';
 import { transformWithEsbuild, preprocessCSS } from 'vite';
 import { SourceMapConsumer } from 'source-map-js';
 
+function isUndefined(v) {
+  return void 0 === v;
+}
 function findFilesByName(dir, targetFileName, ignoreList) {
   const result = [];
-  const entries = readdirSync(dir, { withFileTypes: true });
+  const entries = nodeFs.readdirSync(dir, { withFileTypes: true });
   for (const entry of entries) {
     if (ignoreList.has(entry.name)) {
       continue;
     }
-    const fullPath = join(dir, entry.name);
+    const fullPath = nodePath.join(dir, entry.name);
     if (entry.name === targetFileName) {
       result.push(fullPath);
     } else if (entry.isDirectory()) {
@@ -103,16 +106,8 @@ function qingkuai() {
   const styleIdRE = /^virtual:\[\d+\].*?\.qk.(?:css|s[ac]ss|less|stylus|postcss)\?\d{13}$/;
   return {
     name: "qingkuai-compiler",
-    config(config, env) {
-      const rootPath = path.resolve(process.cwd(), config.root ?? "");
-      const qingkuaiConfig = getQingkuaiConfiguration(rootPath);
+    config(_, env) {
       isDev = env.command === "serve";
-      return {
-        define: {
-          __qk_expose_dependencies__: JSON.stringify(!!qingkuaiConfig.exposeDependencies),
-          __qk_expose_destructions__: JSON.stringify(!!qingkuaiConfig.exposeDestructions)
-        }
-      };
     },
     configureServer(server) {
       createQingkuaiConfigurationWatcher(server);
@@ -126,15 +121,30 @@ function qingkuai() {
         cssSourcemap = true;
         sourcemap = config.build.sourcemap !== false;
       }
+      const optimizeDeps = config.optimizeDeps;
+      if (!optimizeDeps) {
+        Object.assign(config, {
+          optimizeDeps: {
+            exclude: ["qingkuai"]
+          }
+        });
+      } else if (!optimizeDeps.exclude) {
+        optimizeDeps.exclude = ["qingkuai"];
+      } else {
+        optimizeDeps.exclude.push("qingkuai");
+      }
       loadAllQingkuaiConfigurations(config.root);
     },
     resolveId(id, importer) {
       if (styleIdRE.test(id)) {
         return id;
       }
-      if (importer?.endsWith(".qk") && !path.extname(id)) {
+      if (importer?.endsWith(".qk") && !nodePath.extname(id)) {
         const qingkuaiConfig = getQingkuaiConfiguration(id);
-        return path.join(path.dirname(importer), id + (qingkuaiConfig.resolveImportExtension ? ".qk" : ""));
+        return nodePath.join(
+          nodePath.dirname(importer),
+          id + (qingkuaiConfig.resolveImportExtension ? ".qk" : "")
+        );
       }
       return id;
     },
@@ -146,9 +156,9 @@ function qingkuai() {
         }
         let virtualFileName;
         const compileRes = compileResultCache.get(fileId);
-        const style = compileRes.inputDescriptor.styles[index];
+        const style = compileRes.styleDescriptors[index];
         while (true) {
-          const hash = randomBytes(6).toString("hex");
+          const hash = nodeCrypto.randomBytes(6).toString("hex");
           virtualFileName = `${fileId}.${hash}.${style.lang}`;
           if (!existsSync(virtualFileName)) {
             break;
@@ -194,7 +204,7 @@ function qingkuai() {
               line: preprocessedPosition.line - 1,
               column: preprocessedPosition.column
             }) || 0;
-            const position = compileRes.inputDescriptor.positions[style.loc.start.index + preprocessedIndex];
+            const position = compileRes.positions[style.loc.start.index + preprocessedIndex];
             this.error({
               message: attachScopeResult.error.message,
               loc: {
@@ -222,11 +232,11 @@ function qingkuai() {
       }
       try {
         const compileRes = compile(src, {
+          ...getCompileOptions(id),
           sourcemap,
           debug: isDev,
-          hashId: compileResultCache.get(id)?.hashId || void 0,
-          componentName: util.kebab2Camel(path.basename(id, path.extname(id)), true),
-          reserveTemplateComment: getReserveHtmlComments(getQingkuaiConfiguration(id))
+          hashId: compileResultCache.get(id)?.hashId,
+          componentName: util.kebab2Camel(nodePath.basename(id, nodePath.extname(id)), true)
         });
         compileRes.messages.forEach(({ type, value: warning }) => {
           if (type === "warning") {
@@ -235,7 +245,7 @@ function qingkuai() {
         });
         compileResultCache.set(id, compileRes);
         const compiledCodeArr = [compileRes.code];
-        compileRes.inputDescriptor.styles.forEach((_, index) => {
+        compileRes.styleDescriptors.forEach((_, index) => {
           compiledCodeArr.push(`import "virtual:[${index}]${id}.css?${Date.now()}"`);
         });
         const baseMap = {
@@ -244,7 +254,7 @@ function qingkuai() {
           sourcesContent: [src]
         };
         const compiledCode = compiledCodeArr.join("\n");
-        if (!compileRes.inputDescriptor.script.isTS) {
+        if (!compileRes.scriptDescriptor.isTS) {
           if (!sourcemap) {
             return compiledCode;
           }
@@ -286,14 +296,12 @@ function qingkuai() {
   };
   function getQingkuaiConfiguration(id) {
     let config = {
-      insertTipComments: true,
-      exposeDestructions: isDev,
-      exposeDependencies: isDev,
+      interpretiveComments: true,
       resolveImportExtension: true,
-      reserveHtmlComments: "development"
+      preserveHtmlComments: "development"
     };
     while (true) {
-      const dir = path.dirname(id);
+      const dir = nodePath.dirname(id);
       if (dir === id) {
         break;
       }
@@ -305,21 +313,9 @@ function qingkuai() {
     }
     return config;
   }
-  function getReserveHtmlComments(config) {
-    switch (config.reserveHtmlComments) {
-      case "all":
-        return true;
-      case "never":
-        return false;
-      case "production":
-        return !isDev;
-      default:
-        return isDev;
-    }
-  }
   function createQingkuaiConfigurationWatcher(server) {
     const watcher = server.watcher.add([".qingkuairc", "!**/node_modules/**"]);
-    watcher.on("unlink", (p) => qingkuaiConfigurations.delete(path.dirname(p)));
+    watcher.on("unlink", (p) => qingkuaiConfigurations.delete(nodePath.dirname(p)));
     watcher.on("change", recordQingkuaiConfiguration);
     watcher.on("add", recordQingkuaiConfiguration);
   }
@@ -330,10 +326,50 @@ function qingkuai() {
   }
   function recordQingkuaiConfiguration(fileName) {
     try {
-      qingkuaiConfigurations.set(path.dirname(fileName), JSON.parse(readFileSync(fileName, "utf-8")));
+      qingkuaiConfigurations.set(nodePath.dirname(fileName), JSON.parse(readFileSync(fileName, "utf-8")));
     } catch {
     }
   }
+  function getCompileOptions(id) {
+    const qingkuaiConfig = getQingkuaiConfiguration(id);
+    const ret = {
+      interpretiveComments: isUndefined(qingkuaiConfig.interpretiveComments) ? isDev : !!qingkuaiConfig.interpretiveComments,
+      shorthandDerivedDeclaration: isUndefined(qingkuaiConfig.shorthandDerivedDeclaration) ? true : !!qingkuaiConfig.shorthandDerivedDeclaration,
+      reactivityMode: qingkuaiConfig.reactivityMode === "shallow" ? "shallow" : "reactive"
+    };
+    switch (qingkuaiConfig.whitespace) {
+      case "trim":
+      case "collapse":
+      case "preserve":
+      case "trim-collapse": {
+        ret.whitespace = qingkuaiConfig.whitespace;
+        break;
+      }
+      default: {
+        ret.whitespace = "trim-collapse";
+        break;
+      }
+    }
+    switch (qingkuaiConfig.preserveHtmlComments) {
+      case "all": {
+        ret.preserveHtmlComments = true;
+        break;
+      }
+      case "never": {
+        ret.preserveHtmlComments = false;
+        break;
+      }
+      case "production": {
+        ret.preserveHtmlComments = !isDev;
+        break;
+      }
+      default: {
+        ret.preserveHtmlComments = isDev;
+        break;
+      }
+    }
+    return ret;
+  }
 }
 function parseStyleId(id) {
   const m1 = /^virtual:\[(\d+)\]/.exec(id);

package/package.json

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