@cedarjs/vite 5.0.2-rc.5 → 6.0.0-canary.2619

package/dist/apiDevMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiDevMiddleware.d.ts","sourceRoot":"","sources":["../src/apiDevMiddleware.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,MAAM,CAAA;AA2BrD,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAgFlE;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":"AAOA,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,MAAM,CAAA;AA8BrD,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAsGlE;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

@@ -10,8 +10,11 @@ import {
 } 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 { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
+import { applyGraphqlOptionsExtract } from "./plugins/vite-plugin-cedar-graphql-options-extract.js";
+import { applyOtelWrapping } from "./plugins/vite-plugin-cedar-otel-wrapping.js";
 const LAMBDA_FUNCTIONS = {};
 let graphqlYoga = null;
 let loadApiFunctionsInFlight = null;
@@ -118,7 +121,6 @@ async function createApiViteServer() {
   const isEsm = projectSideIsEsm("api");
   const normalizedBase = normalizePath(cedarPaths.base);
   const babelPlugins = getApiSideBabelPlugins({
-    openTelemetry: (cedarConfig.experimental?.opentelemetry?.enabled ?? false) && (cedarConfig.experimental?.opentelemetry?.wrapApi ?? false),
     projectIsEsm: isEsm
   });
   const workspacePkgSourceMap = Object.fromEntries(
@@ -154,8 +156,20 @@ async function createApiViteServer() {
             return null;
           }
           try {
+            let sourceCode = code;
+            if (normalizePath(id).endsWith("/graphql.ts") || normalizePath(id).endsWith("/graphql.js")) {
+              sourceCode = applyGraphqlOptionsExtract(sourceCode) ?? sourceCode;
+              sourceCode = applyGqlormInject(sourceCode, id) ?? sourceCode;
+            }
+            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 result = await transformWithBabel(
-              code,
+              sourceCode,
               id,
               babelPlugins,
               true

package/dist/buildApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AA+BA,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,iBA8U3B"}
+{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AAkCA,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,iBA8U3B"}

package/dist/buildApp.js

@@ -10,7 +10,10 @@ import {
 import { findApiFiles } from "@cedarjs/internal/dist/files.js";
 import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
 import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
-import { cedarContextWrappingPlugin } from "./plugins/vite-plugin-cedar-context-wrapping.js";
+import { cedarGqlormInjectPlugin } from "./plugins/vite-plugin-cedar-gqlorm-inject.js";
+import { cedarGraphqlOptionsExtractPlugin } from "./plugins/vite-plugin-cedar-graphql-options-extract.js";
+import { cedarOtelWrappingPlugin } from "./plugins/vite-plugin-cedar-otel-wrapping.js";
+import { handlerAlsWrappingPlugin } from "./plugins/vite-plugin-handler-als-wrapping.js";
 function resolveWithExtensions(id) {
   if (fs.existsSync(id)) {
     return id;
@@ -100,7 +103,6 @@ async function buildCedarApp({
     }
   }
   const babelPlugins = workspace.includes("api") ? getApiSideBabelPlugins({
-    openTelemetry: (cedarConfig.experimental?.opentelemetry?.enabled ?? false) && (cedarConfig.experimental?.opentelemetry?.wrapApi ?? false),
     projectIsEsm: projectSideIsEsm("api")
   }) : null;
   const workspacePkgSourceMap = workspace.includes("api") ? Object.fromEntries(
@@ -224,8 +226,11 @@ async function buildCedarApp({
     });
   }
   if (workspace.includes("api")) {
+    plugins.push(cedarGraphqlOptionsExtractPlugin());
+    plugins.push(cedarGqlormInjectPlugin());
+    plugins.push(cedarOtelWrappingPlugin());
     plugins.push(
-      cedarContextWrappingPlugin({ projectIsEsm: projectSideIsEsm("api") })
+      handlerAlsWrappingPlugin({ projectIsEsm: projectSideIsEsm("api") })
     );
   }
   if (babelPlugins) {