@cedarjs/vite 6.0.0-canary.2696 → 6.0.0-canary.2697

package/dist/apiDevMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiDevMiddleware.d.ts","sourceRoot":"","sources":["../src/apiDevMiddleware.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,MAAM,CAAA;AAgE7D,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CA8IlE;AA0BD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,CA0EhE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,KAIrB,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAoFnD;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC;IACrD,UAAU,EAAE,aAAa,CAAA;IACzB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;CACjD,CAAC,CAcD"}
+{"version":3,"file":"apiDevMiddleware.d.ts","sourceRoot":"","sources":["../src/apiDevMiddleware.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,MAAM,CAAA;AAkE7D,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAoMlE;AA0BD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,CA0EhE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,KAIrB,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAoFnD;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC;IACrD,UAAU,EAAE,aAAa,CAAA;IACzB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;CACjD,CAAC,CAcD"}

package/dist/apiDevMiddleware.js

@@ -13,13 +13,15 @@ const tsconfigPaths = (
 );
 import { buildCedarContext, wrapLegacyHandler } from "@cedarjs/api/runtime";
 import {
-  getApiSideBabelPlugins,
+  getApiSideBabelConfigPath,
+  getApiSideBabelPluginsForVite,
   transformWithBabel
 } from "@cedarjs/babel-config";
 import { getAsyncStoreInstance } from "@cedarjs/context/dist/store";
 import { createGraphQLYoga } from "@cedarjs/graphql-server";
 import { applyGqlormInject } from "@cedarjs/internal/dist/build/api-graphql-transforms.js";
-import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
+import { getConfig, getPaths } from "@cedarjs/project-config";
+import { generateDiffSourceMap } from "./lib/generateDiffSourceMap.js";
 import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
 import { cedarAutoImportsPlugin } from "./plugins/vite-plugin-cedar-auto-import.js";
 import { cedarDirectoryNamedImportPlugin } from "./plugins/vite-plugin-cedar-directory-named-import.js";
@@ -143,12 +145,8 @@ async function internalLoadApiFunctions(viteServer) {
 async function createApiViteServer() {
   const cedarPaths = getPaths();
   const cedarConfig = getConfig();
-  const isEsm = projectSideIsEsm("api");
   const normalizedBase = normalizePath(cedarPaths.base);
-  const babelPlugins = getApiSideBabelPlugins({
-    forVite: true,
-    projectIsEsm: isEsm
-  });
+  const babelPlugins = getApiSideBabelConfigPath() ? getApiSideBabelPluginsForVite() : null;
   const workspacePkgSourceMap = Object.fromEntries(
     Object.entries(getWorkspacePackageAliases(cedarPaths, cedarConfig)).map(
       ([name, sourceFile]) => [name, normalizePath(sourceFile)]
@@ -213,24 +211,50 @@ async function createApiViteServer() {
           }
           try {
             let sourceCode = code;
+            let sourceMap = null;
             if (normalizePath(id).endsWith("/graphql.ts") || normalizePath(id).endsWith("/graphql.js")) {
               const extracted = applyGraphqlOptionsExtract(sourceCode);
-              sourceCode = extracted?.code ?? sourceCode;
-              sourceCode = applyGqlormInject(sourceCode, id) ?? sourceCode;
+              if (extracted) {
+                sourceCode = extracted.code;
+                sourceMap = extracted.map;
+              }
+              const injected = applyGqlormInject(sourceCode, id);
+              if (injected) {
+                sourceCode = injected;
+                sourceMap = null;
+              }
             }
             if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {
               const relativePath = normalizePath(id).slice(
                 normalizedBase.length + "/api/src/".length
               );
               const apiFolder = relativePath.split("/")[0] ?? "?";
-              sourceCode = applyOtelWrapping(sourceCode, id, apiFolder) ?? sourceCode;
+              const wrapped = applyOtelWrapping(sourceCode, id, apiFolder);
+              if (wrapped) {
+                sourceCode = wrapped;
+                sourceMap = null;
+              }
+            }
+            if (!babelPlugins) {
+              if (sourceCode === code) {
+                return null;
+              }
+              return {
+                code: sourceCode,
+                map: sourceMap ?? generateDiffSourceMap(code, sourceCode)
+              };
+            }
+            const inputSourceMap = sourceCode === code ? null : sourceMap ?? generateDiffSourceMap(code, sourceCode);
+            if (inputSourceMap) {
+              inputSourceMap.sources = [id];
             }
             const result = await transformWithBabel(
               sourceCode,
               id,
               babelPlugins,
               true,
-              true
+              true,
+              inputSourceMap ?? void 0
             );
             if (!result?.code) {
               return null;

package/dist/buildApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AA2DA,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,EAAE,CAAC,EAAE,OAAO,CAAA;CACb;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAe,EACf,SAA0B,EAC1B,EAAU,GACX,GAAE,oBAAyB,iBA6X3B"}
+{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AA6DA,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,EAAE,CAAC,EAAE,OAAO,CAAA;CACb;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAe,EACf,SAA0B,EAC1B,EAAU,GACX,GAAE,oBAAyB,iBAya3B"}

package/dist/buildApp.js

@@ -11,7 +11,8 @@ const tsconfigPaths = (
   tsPathsMod.default?.default || tsPathsMod.default || tsPathsMod
 );
 import {
-  getApiSideBabelPlugins,
+  getApiSideBabelConfigPath,
+  getApiSideBabelPluginsForVite,
   transformWithBabel
 } from "@cedarjs/babel-config";
 import {
@@ -20,6 +21,7 @@ import {
 } from "@cedarjs/internal/dist/build/api.js";
 import { findApiFiles } from "@cedarjs/internal/dist/files.js";
 import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
+import { generateDiffSourceMap } from "./lib/generateDiffSourceMap.js";
 import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
 import { cedarAutoImportsPlugin } from "./plugins/vite-plugin-cedar-auto-import.js";
 import { cedarDirectoryNamedImportPlugin } from "./plugins/vite-plugin-cedar-directory-named-import.js";
@@ -118,10 +120,6 @@ async function buildCedarApp({
       };
     }
   }
-  const babelPlugins = workspace.includes("api") ? getApiSideBabelPlugins({
-    forVite: true,
-    projectIsEsm: projectSideIsEsm("api")
-  }) : null;
   const workspacePkgSourceMap = workspace.includes("api") ? Object.fromEntries(
     Object.entries(getWorkspacePackageAliases(cedarPaths, cedarConfig)).map(
       ([name, sourceFile]) => [name, normalizePath(sourceFile)]
@@ -263,7 +261,7 @@ async function buildCedarApp({
     );
   }
   plugins.push(cedarMockCellDataPlugin());
-  if (babelPlugins) {
+  if (workspace.includes("api")) {
     plugins.push({
       name: "cedar-vite-api-babel-transform",
       enforce: "pre",
@@ -277,31 +275,47 @@ async function buildCedarApp({
         if (!normalizePath(id).startsWith(normalizePath(cedarPaths.api.base))) {
           return null;
         }
-        const transformedCode = await transformWithBabel(
-          code,
-          id,
-          babelPlugins,
-          true,
-          true
+        const babelPlugins = getApiSideBabelConfigPath() ? getApiSideBabelPluginsForVite() : null;
+        const fromDirRelativeToApiSrc = path.relative(
+          cedarPaths.api.src,
+          path.dirname(id)
         );
-        if (transformedCode?.code) {
-          const fromDirRelativeToApiSrc = path.relative(
-            cedarPaths.api.src,
-            path.dirname(id)
-          );
-          let outputCode = applySrcAlias(
-            transformedCode.code,
-            fromDirRelativeToApiSrc
-          );
+        const applyImportRewrites = (source) => {
+          let rewritten = applySrcAlias(source, fromDirRelativeToApiSrc);
           if (projectSideIsEsm("api")) {
-            outputCode = applyEsmExtensions(outputCode, id);
+            rewritten = applyEsmExtensions(rewritten, id);
+          }
+          return rewritten;
+        };
+        const rewrittenCode = applyImportRewrites(code);
+        if (!babelPlugins) {
+          if (rewrittenCode === code) {
+            return null;
           }
           return {
-            code: outputCode,
-            map: transformedCode.map ?? null
+            code: rewrittenCode,
+            map: generateDiffSourceMap(code, rewrittenCode)
           };
         }
-        return null;
+        const inputSourceMap = rewrittenCode === code ? null : generateDiffSourceMap(code, rewrittenCode);
+        if (inputSourceMap) {
+          inputSourceMap.sources = [id];
+        }
+        const transformedCode = await transformWithBabel(
+          rewrittenCode,
+          id,
+          babelPlugins,
+          true,
+          true,
+          inputSourceMap ?? void 0
+        );
+        if (!transformedCode?.code) {
+          return null;
+        }
+        return {
+          code: applyImportRewrites(transformedCode.code),
+          map: transformedCode.map ?? null
+        };
       }
     });
   }

package/dist/cjs/apiDevMiddleware.js

@@ -49,6 +49,7 @@ var import_store = require("@cedarjs/context/dist/store");
 var import_graphql_server = require("@cedarjs/graphql-server");
 var import_api_graphql_transforms = require("@cedarjs/internal/dist/build/api-graphql-transforms.js");
 var import_project_config = require("@cedarjs/project-config");
+var import_generateDiffSourceMap = require("./lib/generateDiffSourceMap.js");
 var import_workspacePackageAliases = require("./lib/workspacePackageAliases.js");
 var import_vite_plugin_cedar_auto_import = require("./plugins/vite-plugin-cedar-auto-import.js");
 var import_vite_plugin_cedar_directory_named_import = require("./plugins/vite-plugin-cedar-directory-named-import.js");
@@ -177,12 +178,8 @@ async function internalLoadApiFunctions(viteServer) {
 async function createApiViteServer() {
   const cedarPaths = (0, import_project_config.getPaths)();
   const cedarConfig = (0, import_project_config.getConfig)();
-  const isEsm = (0, import_project_config.projectSideIsEsm)("api");
   const normalizedBase = (0, import_vite.normalizePath)(cedarPaths.base);
-  const babelPlugins = (0, import_babel_config.getApiSideBabelPlugins)({
-    forVite: true,
-    projectIsEsm: isEsm
-  });
+  const babelPlugins = (0, import_babel_config.getApiSideBabelConfigPath)() ? (0, import_babel_config.getApiSideBabelPluginsForVite)() : null;
   const workspacePkgSourceMap = Object.fromEntries(
     Object.entries((0, import_workspacePackageAliases.getWorkspacePackageAliases)(cedarPaths, cedarConfig)).map(
       ([name, sourceFile]) => [name, (0, import_vite.normalizePath)(sourceFile)]
@@ -247,24 +244,50 @@ async function createApiViteServer() {
           }
           try {
             let sourceCode = code;
+            let sourceMap = null;
             if ((0, import_vite.normalizePath)(id).endsWith("/graphql.ts") || (0, import_vite.normalizePath)(id).endsWith("/graphql.js")) {
               const extracted = (0, import_vite_plugin_cedar_graphql_options_extract.applyGraphqlOptionsExtract)(sourceCode);
-              sourceCode = extracted?.code ?? sourceCode;
-              sourceCode = (0, import_api_graphql_transforms.applyGqlormInject)(sourceCode, id) ?? sourceCode;
+              if (extracted) {
+                sourceCode = extracted.code;
+                sourceMap = extracted.map;
+              }
+              const injected = (0, import_api_graphql_transforms.applyGqlormInject)(sourceCode, id);
+              if (injected) {
+                sourceCode = injected;
+                sourceMap = null;
+              }
             }
             if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {
               const relativePath = (0, import_vite.normalizePath)(id).slice(
                 normalizedBase.length + "/api/src/".length
               );
               const apiFolder = relativePath.split("/")[0] ?? "?";
-              sourceCode = (0, import_vite_plugin_cedar_otel_wrapping.applyOtelWrapping)(sourceCode, id, apiFolder) ?? sourceCode;
+              const wrapped = (0, import_vite_plugin_cedar_otel_wrapping.applyOtelWrapping)(sourceCode, id, apiFolder);
+              if (wrapped) {
+                sourceCode = wrapped;
+                sourceMap = null;
+              }
+            }
+            if (!babelPlugins) {
+              if (sourceCode === code) {
+                return null;
+              }
+              return {
+                code: sourceCode,
+                map: sourceMap ?? (0, import_generateDiffSourceMap.generateDiffSourceMap)(code, sourceCode)
+              };
+            }
+            const inputSourceMap = sourceCode === code ? null : sourceMap ?? (0, import_generateDiffSourceMap.generateDiffSourceMap)(code, sourceCode);
+            if (inputSourceMap) {
+              inputSourceMap.sources = [id];
             }
             const result = await (0, import_babel_config.transformWithBabel)(
               sourceCode,
               id,
               babelPlugins,
               true,
-              true
+              true,
+              inputSourceMap ?? void 0
             );
             if (!result?.code) {
               return null;

package/dist/cjs/buildApp.js

@@ -42,6 +42,7 @@ var import_babel_config = require("@cedarjs/babel-config");
 var import_api = require("@cedarjs/internal/dist/build/api.js");
 var import_files = require("@cedarjs/internal/dist/files.js");
 var import_project_config = require("@cedarjs/project-config");
+var import_generateDiffSourceMap = require("./lib/generateDiffSourceMap.js");
 var import_workspacePackageAliases = require("./lib/workspacePackageAliases.js");
 var import_vite_plugin_cedar_auto_import = require("./plugins/vite-plugin-cedar-auto-import.js");
 var import_vite_plugin_cedar_directory_named_import = require("./plugins/vite-plugin-cedar-directory-named-import.js");
@@ -145,10 +146,6 @@ async function buildCedarApp({
       };
     }
   }
-  const babelPlugins = workspace.includes("api") ? (0, import_babel_config.getApiSideBabelPlugins)({
-    forVite: true,
-    projectIsEsm: (0, import_project_config.projectSideIsEsm)("api")
-  }) : null;
   const workspacePkgSourceMap = workspace.includes("api") ? Object.fromEntries(
     Object.entries((0, import_workspacePackageAliases.getWorkspacePackageAliases)(cedarPaths, cedarConfig)).map(
       ([name, sourceFile]) => [name, (0, import_vite2.normalizePath)(sourceFile)]
@@ -290,7 +287,7 @@ async function buildCedarApp({
     );
   }
   plugins.push((0, import_vite_plugin_cedar_mock_cell_data.cedarMockCellDataPlugin)());
-  if (babelPlugins) {
+  if (workspace.includes("api")) {
     plugins.push({
       name: "cedar-vite-api-babel-transform",
       enforce: "pre",
@@ -304,31 +301,47 @@ async function buildCedarApp({
         if (!(0, import_vite2.normalizePath)(id).startsWith((0, import_vite2.normalizePath)(cedarPaths.api.base))) {
           return null;
         }
-        const transformedCode = await (0, import_babel_config.transformWithBabel)(
-          code,
-          id,
-          babelPlugins,
-          true,
-          true
+        const babelPlugins = (0, import_babel_config.getApiSideBabelConfigPath)() ? (0, import_babel_config.getApiSideBabelPluginsForVite)() : null;
+        const fromDirRelativeToApiSrc = import_node_path.default.relative(
+          cedarPaths.api.src,
+          import_node_path.default.dirname(id)
         );
-        if (transformedCode?.code) {
-          const fromDirRelativeToApiSrc = import_node_path.default.relative(
-            cedarPaths.api.src,
-            import_node_path.default.dirname(id)
-          );
-          let outputCode = (0, import_api.applySrcAlias)(
-            transformedCode.code,
-            fromDirRelativeToApiSrc
-          );
+        const applyImportRewrites = (source) => {
+          let rewritten = (0, import_api.applySrcAlias)(source, fromDirRelativeToApiSrc);
           if ((0, import_project_config.projectSideIsEsm)("api")) {
-            outputCode = (0, import_api.applyEsmExtensions)(outputCode, id);
+            rewritten = (0, import_api.applyEsmExtensions)(rewritten, id);
+          }
+          return rewritten;
+        };
+        const rewrittenCode = applyImportRewrites(code);
+        if (!babelPlugins) {
+          if (rewrittenCode === code) {
+            return null;
           }
           return {
-            code: outputCode,
-            map: transformedCode.map ?? null
+            code: rewrittenCode,
+            map: (0, import_generateDiffSourceMap.generateDiffSourceMap)(code, rewrittenCode)
           };
         }
-        return null;
+        const inputSourceMap = rewrittenCode === code ? null : (0, import_generateDiffSourceMap.generateDiffSourceMap)(code, rewrittenCode);
+        if (inputSourceMap) {
+          inputSourceMap.sources = [id];
+        }
+        const transformedCode = await (0, import_babel_config.transformWithBabel)(
+          rewrittenCode,
+          id,
+          babelPlugins,
+          true,
+          true,
+          inputSourceMap ?? void 0
+        );
+        if (!transformedCode?.code) {
+          return null;
+        }
+        return {
+          code: applyImportRewrites(transformedCode.code),
+          map: transformedCode.map ?? null
+        };
       }
     });
   }

package/dist/cjs/lib/generateDiffSourceMap.js

@@ -0,0 +1,185 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var generateDiffSourceMap_exports = {};
+__export(generateDiffSourceMap_exports, {
+  generateDiffSourceMap: () => generateDiffSourceMap
+});
+module.exports = __toCommonJS(generateDiffSourceMap_exports);
+var import_magic_string = __toESM(require("magic-string"), 1);
+const MAX_ALIGNMENT_CELLS = 1e6;
+function generateDiffSourceMap(original, transformed) {
+  if (original === transformed) {
+    return null;
+  }
+  const ms = new import_magic_string.default(original);
+  const origLines = original.split("\n");
+  const newLines = transformed.split("\n");
+  const lineOffsets = new Array(origLines.length);
+  let offset = 0;
+  for (let i = 0; i < origLines.length; i++) {
+    lineOffsets[i] = offset;
+    offset += origLines[i].length + 1;
+  }
+  let prefix = 0;
+  const maxPrefix = Math.min(origLines.length, newLines.length);
+  while (prefix < maxPrefix && origLines[prefix] === newLines[prefix]) {
+    prefix++;
+  }
+  let suffix = 0;
+  const maxSuffix = Math.min(origLines.length, newLines.length) - prefix;
+  while (suffix < maxSuffix && origLines[origLines.length - 1 - suffix] === newLines[newLines.length - 1 - suffix]) {
+    suffix++;
+  }
+  const hunks = alignLines(
+    origLines,
+    prefix,
+    origLines.length - suffix,
+    newLines,
+    prefix,
+    newLines.length - suffix
+  );
+  for (const hunk of hunks) {
+    applyHunk(ms, hunk, origLines, newLines, lineOffsets, original.length);
+  }
+  if (ms.toString() !== transformed) {
+    return new import_magic_string.default(original).generateMap({ hires: true });
+  }
+  return ms.generateMap({ hires: true });
+}
+function alignLines(origLines, oLo, oHi, newLines, nLo, nHi) {
+  const m = oHi - oLo;
+  const n = nHi - nLo;
+  if (m === 0 && n === 0) {
+    return [];
+  }
+  if (m === 0 || n === 0 || m * n > MAX_ALIGNMENT_CELLS) {
+    return [{ oStart: oLo, oEnd: oHi, nStart: nLo, nEnd: nHi }];
+  }
+  const width = n + 1;
+  const dp = new Int32Array((m + 1) * width);
+  for (let i2 = m - 1; i2 >= 0; i2--) {
+    for (let j2 = n - 1; j2 >= 0; j2--) {
+      dp[i2 * width + j2] = origLines[oLo + i2] === newLines[nLo + j2] ? dp[(i2 + 1) * width + j2 + 1] + 1 : Math.max(dp[(i2 + 1) * width + j2], dp[i2 * width + j2 + 1]);
+    }
+  }
+  const hunks = [];
+  let i = 0;
+  let j = 0;
+  let hunkO = 0;
+  let hunkN = 0;
+  const flushHunk = () => {
+    if (i > hunkO || j > hunkN) {
+      hunks.push({
+        oStart: oLo + hunkO,
+        oEnd: oLo + i,
+        nStart: nLo + hunkN,
+        nEnd: nLo + j
+      });
+    }
+  };
+  while (i < m && j < n) {
+    if (origLines[oLo + i] === newLines[nLo + j]) {
+      flushHunk();
+      i++;
+      j++;
+      hunkO = i;
+      hunkN = j;
+    } else if (dp[(i + 1) * width + j] >= dp[i * width + j + 1]) {
+      i++;
+    } else {
+      j++;
+    }
+  }
+  i = m;
+  j = n;
+  flushHunk();
+  return hunks;
+}
+function applyHunk(ms, { oStart, oEnd, nStart, nEnd }, origLines, newLines, lineOffsets, originalLength) {
+  const oCount = oEnd - oStart;
+  const nCount = nEnd - nStart;
+  const newSlice = newLines.slice(nStart, nEnd);
+  if (oCount === nCount) {
+    for (let k = 0; k < oCount; k++) {
+      diffLinePair(
+        ms,
+        lineOffsets[oStart + k],
+        origLines[oStart + k],
+        newLines[nStart + k]
+      );
+    }
+  } else if (oCount === 0) {
+    const text = newSlice.join("\n");
+    if (oStart >= origLines.length) {
+      ms.appendLeft(originalLength, "\n" + text);
+    } else {
+      ms.appendLeft(lineOffsets[oStart], text + "\n");
+    }
+  } else if (nCount === 0) {
+    const start = lineOffsets[oStart];
+    if (oEnd >= origLines.length) {
+      ms.remove(oStart > 0 ? start - 1 : start, originalLength);
+    } else {
+      ms.remove(start, lineOffsets[oEnd]);
+    }
+  } else {
+    const start = lineOffsets[oStart];
+    const end = lineOffsets[oEnd - 1] + origLines[oEnd - 1].length;
+    ms.overwrite(start, end, newSlice.join("\n"));
+  }
+}
+function diffLinePair(ms, lineStart, origLine, newLine) {
+  if (origLine === newLine) {
+    return;
+  }
+  let charPrefix = 0;
+  const maxCharPrefix = Math.min(origLine.length, newLine.length);
+  while (charPrefix < maxCharPrefix && origLine[charPrefix] === newLine[charPrefix]) {
+    charPrefix++;
+  }
+  let charSuffix = 0;
+  const maxCharSuffix = Math.min(origLine.length, newLine.length) - charPrefix;
+  while (charSuffix < maxCharSuffix && origLine[origLine.length - 1 - charSuffix] === newLine[newLine.length - 1 - charSuffix]) {
+    charSuffix++;
+  }
+  const start = lineStart + charPrefix;
+  const end = lineStart + origLine.length - charSuffix;
+  const replacement = newLine.slice(charPrefix, newLine.length - charSuffix);
+  if (start === end) {
+    ms.appendLeft(start, replacement);
+  } else if (replacement === "") {
+    ms.remove(start, end);
+  } else {
+    ms.overwrite(start, end, replacement);
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  generateDiffSourceMap
+});

package/dist/lib/generateDiffSourceMap.d.ts

@@ -0,0 +1,18 @@
+import type { SourceMap } from 'magic-string';
+/**
+ * Generates a sourcemap for a string transform by diffing its input and
+ * output. Used for transforms that don't produce a map themselves.
+ *
+ * The diff first anchors on the common prefix and suffix lines, then aligns
+ * the remaining lines with an LCS so that unchanged lines *inside* the
+ * changed region (e.g. statements inside a newly inserted wrapper) also map
+ * exactly. Aligned line pairs that differ are refined with a character-level
+ * prefix/suffix diff, which gives exact column mappings for in-place
+ * rewrites (e.g. import specifier rewrites) — including the columns after
+ * the rewritten span. Only lines with no counterpart at all map coarsely, to
+ * the start of their surrounding edit.
+ *
+ * Returns null when the input and output are identical.
+ */
+export declare function generateDiffSourceMap(original: string, transformed: string): SourceMap | null;
+//# sourceMappingURL=generateDiffSourceMap.d.ts.map

package/dist/lib/generateDiffSourceMap.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateDiffSourceMap.d.ts","sourceRoot":"","sources":["../../src/lib/generateDiffSourceMap.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAc7C;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAClB,SAAS,GAAG,IAAI,CA0DlB"}

package/dist/lib/generateDiffSourceMap.js

@@ -0,0 +1,151 @@
+import MagicString from "magic-string";
+const MAX_ALIGNMENT_CELLS = 1e6;
+function generateDiffSourceMap(original, transformed) {
+  if (original === transformed) {
+    return null;
+  }
+  const ms = new MagicString(original);
+  const origLines = original.split("\n");
+  const newLines = transformed.split("\n");
+  const lineOffsets = new Array(origLines.length);
+  let offset = 0;
+  for (let i = 0; i < origLines.length; i++) {
+    lineOffsets[i] = offset;
+    offset += origLines[i].length + 1;
+  }
+  let prefix = 0;
+  const maxPrefix = Math.min(origLines.length, newLines.length);
+  while (prefix < maxPrefix && origLines[prefix] === newLines[prefix]) {
+    prefix++;
+  }
+  let suffix = 0;
+  const maxSuffix = Math.min(origLines.length, newLines.length) - prefix;
+  while (suffix < maxSuffix && origLines[origLines.length - 1 - suffix] === newLines[newLines.length - 1 - suffix]) {
+    suffix++;
+  }
+  const hunks = alignLines(
+    origLines,
+    prefix,
+    origLines.length - suffix,
+    newLines,
+    prefix,
+    newLines.length - suffix
+  );
+  for (const hunk of hunks) {
+    applyHunk(ms, hunk, origLines, newLines, lineOffsets, original.length);
+  }
+  if (ms.toString() !== transformed) {
+    return new MagicString(original).generateMap({ hires: true });
+  }
+  return ms.generateMap({ hires: true });
+}
+function alignLines(origLines, oLo, oHi, newLines, nLo, nHi) {
+  const m = oHi - oLo;
+  const n = nHi - nLo;
+  if (m === 0 && n === 0) {
+    return [];
+  }
+  if (m === 0 || n === 0 || m * n > MAX_ALIGNMENT_CELLS) {
+    return [{ oStart: oLo, oEnd: oHi, nStart: nLo, nEnd: nHi }];
+  }
+  const width = n + 1;
+  const dp = new Int32Array((m + 1) * width);
+  for (let i2 = m - 1; i2 >= 0; i2--) {
+    for (let j2 = n - 1; j2 >= 0; j2--) {
+      dp[i2 * width + j2] = origLines[oLo + i2] === newLines[nLo + j2] ? dp[(i2 + 1) * width + j2 + 1] + 1 : Math.max(dp[(i2 + 1) * width + j2], dp[i2 * width + j2 + 1]);
+    }
+  }
+  const hunks = [];
+  let i = 0;
+  let j = 0;
+  let hunkO = 0;
+  let hunkN = 0;
+  const flushHunk = () => {
+    if (i > hunkO || j > hunkN) {
+      hunks.push({
+        oStart: oLo + hunkO,
+        oEnd: oLo + i,
+        nStart: nLo + hunkN,
+        nEnd: nLo + j
+      });
+    }
+  };
+  while (i < m && j < n) {
+    if (origLines[oLo + i] === newLines[nLo + j]) {
+      flushHunk();
+      i++;
+      j++;
+      hunkO = i;
+      hunkN = j;
+    } else if (dp[(i + 1) * width + j] >= dp[i * width + j + 1]) {
+      i++;
+    } else {
+      j++;
+    }
+  }
+  i = m;
+  j = n;
+  flushHunk();
+  return hunks;
+}
+function applyHunk(ms, { oStart, oEnd, nStart, nEnd }, origLines, newLines, lineOffsets, originalLength) {
+  const oCount = oEnd - oStart;
+  const nCount = nEnd - nStart;
+  const newSlice = newLines.slice(nStart, nEnd);
+  if (oCount === nCount) {
+    for (let k = 0; k < oCount; k++) {
+      diffLinePair(
+        ms,
+        lineOffsets[oStart + k],
+        origLines[oStart + k],
+        newLines[nStart + k]
+      );
+    }
+  } else if (oCount === 0) {
+    const text = newSlice.join("\n");
+    if (oStart >= origLines.length) {
+      ms.appendLeft(originalLength, "\n" + text);
+    } else {
+      ms.appendLeft(lineOffsets[oStart], text + "\n");
+    }
+  } else if (nCount === 0) {
+    const start = lineOffsets[oStart];
+    if (oEnd >= origLines.length) {
+      ms.remove(oStart > 0 ? start - 1 : start, originalLength);
+    } else {
+      ms.remove(start, lineOffsets[oEnd]);
+    }
+  } else {
+    const start = lineOffsets[oStart];
+    const end = lineOffsets[oEnd - 1] + origLines[oEnd - 1].length;
+    ms.overwrite(start, end, newSlice.join("\n"));
+  }
+}
+function diffLinePair(ms, lineStart, origLine, newLine) {
+  if (origLine === newLine) {
+    return;
+  }
+  let charPrefix = 0;
+  const maxCharPrefix = Math.min(origLine.length, newLine.length);
+  while (charPrefix < maxCharPrefix && origLine[charPrefix] === newLine[charPrefix]) {
+    charPrefix++;
+  }
+  let charSuffix = 0;
+  const maxCharSuffix = Math.min(origLine.length, newLine.length) - charPrefix;
+  while (charSuffix < maxCharSuffix && origLine[origLine.length - 1 - charSuffix] === newLine[newLine.length - 1 - charSuffix]) {
+    charSuffix++;
+  }
+  const start = lineStart + charPrefix;
+  const end = lineStart + origLine.length - charSuffix;
+  const replacement = newLine.slice(charPrefix, newLine.length - charSuffix);
+  if (start === end) {
+    ms.appendLeft(start, replacement);
+  } else if (replacement === "") {
+    ms.remove(start, end);
+  } else {
+    ms.overwrite(start, end, replacement);
+  }
+}
+export {
+  generateDiffSourceMap
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "6.0.0-canary.2696",
+  "version": "6.0.0-canary.2697",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -63,16 +63,16 @@
     "@babel/parser": "7.29.7",
     "@babel/traverse": "7.29.7",
     "@babel/types": "7.29.7",
-    "@cedarjs/api": "6.0.0-canary.2696",
-    "@cedarjs/api-server": "6.0.0-canary.2696",
-    "@cedarjs/babel-config": "6.0.0-canary.2696",
-    "@cedarjs/context": "6.0.0-canary.2696",
-    "@cedarjs/cookie-jar": "6.0.0-canary.2696",
-    "@cedarjs/graphql-server": "6.0.0-canary.2696",
-    "@cedarjs/internal": "6.0.0-canary.2696",
-    "@cedarjs/project-config": "6.0.0-canary.2696",
-    "@cedarjs/server-store": "6.0.0-canary.2696",
-    "@cedarjs/testing": "6.0.0-canary.2696",
+    "@cedarjs/api": "6.0.0-canary.2697",
+    "@cedarjs/api-server": "6.0.0-canary.2697",
+    "@cedarjs/babel-config": "6.0.0-canary.2697",
+    "@cedarjs/context": "6.0.0-canary.2697",
+    "@cedarjs/cookie-jar": "6.0.0-canary.2697",
+    "@cedarjs/graphql-server": "6.0.0-canary.2697",
+    "@cedarjs/internal": "6.0.0-canary.2697",
+    "@cedarjs/project-config": "6.0.0-canary.2697",
+    "@cedarjs/server-store": "6.0.0-canary.2697",
+    "@cedarjs/testing": "6.0.0-canary.2697",
     "@fastify/url-data": "6.0.3",
     "@swc/core": "1.15.41",
     "@universal-deploy/store": "^0.2.1",
@@ -109,9 +109,9 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",
-    "@cedarjs/auth": "6.0.0-canary.2696",
-    "@cedarjs/router": "6.0.0-canary.2696",
-    "@cedarjs/web": "6.0.0-canary.2696",
+    "@cedarjs/auth": "6.0.0-canary.2697",
+    "@cedarjs/router": "6.0.0-canary.2697",
+    "@cedarjs/web": "6.0.0-canary.2697",
     "@hyrious/esbuild-plugin-commonjs": "0.2.6",
     "@jridgewell/trace-mapping": "0.3.31",
     "@types/aws-lambda": "8.10.162",
@@ -130,9 +130,9 @@
     "vitest": "4.1.10"
   },
   "peerDependencies": {
-    "@cedarjs/auth": "6.0.0-canary.2696",
-    "@cedarjs/router": "6.0.0-canary.2696",
-    "@cedarjs/web": "6.0.0-canary.2696"
+    "@cedarjs/auth": "6.0.0-canary.2697",
+    "@cedarjs/router": "6.0.0-canary.2697",
+    "@cedarjs/web": "6.0.0-canary.2697"
   },
   "engines": {
     "node": ">=24"