vite-plugin-qingkuai 1.0.26 → 1.0.27

package/dist/index.cjs

@@ -78,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 {
@@ -408,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,
@@ -443,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."
@@ -509,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) {
@@ -526,7 +535,7 @@ Caused by: "${fileId}".`;
       }
     }
     switch (qingkuaiConfig.preserveHtmlComments) {
-      case "all": {
+      case "always": {
         ret.preserveHtmlComments = true;
         break;
       }

package/dist/index.js

@@ -57,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 {
@@ -387,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,
@@ -422,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."
@@ -488,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) {
@@ -505,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.26",
+  "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",