@cedarjs/internal 6.0.0-canary.2654 → 6.0.0-canary.2658

package/dist/build/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AAgCtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AAwPD,eAAO,MAAM,gBAAgB,iHA6D5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AA2CtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AAiQD,eAAO,MAAM,gBAAgB,iHAiE5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}

package/dist/build/api.js

@@ -2,6 +2,12 @@ import fs from "node:fs";
 import path from "node:path";
 import { build, context } from "esbuild";
 import { build as viteBuild, normalizePath } from "vite";
+import tsPathsMod from "vite-tsconfig-paths";
+const tsconfigPaths = (
+  // @ts-expect-error – .default only exists at runtime in CJS double-wrap
+  // interop
+  tsPathsMod.default?.default || tsPathsMod.default || tsPathsMod
+);
 import {
   getApiSideBabelPlugins,
   transformWithBabel
@@ -24,6 +30,7 @@ import { applyOtelWrapping } from "./esbuild-plugin-cedar-otel-wrapping.js";
 import { applyHandlerAlsWrapping } from "./esbuild-plugin-handler-als-wrapping.js";
 import { applyImportDir } from "./import-dir.js";
 import { applySrcAlias } from "./src-alias.js";
+import { applyTsconfigPaths } from "./tsconfig-paths.js";
 let BUILD_CTX = null;
 const buildApi = async () => {
   BUILD_CTX?.dispose();
@@ -55,6 +62,11 @@ const runCedarBabelTransformsPlugin = {
           path.relative(build2.initialOptions.absWorkingDir + "/src", args.path)
         )
       );
+      fileContents = applyTsconfigPaths(
+        fileContents,
+        args.path,
+        getPaths().api.base
+      );
       fileContents = applyDirectoryNamedImport(fileContents, args.path);
       fileContents = applyAutoImports(fileContents);
       fileContents = applyImportDir(fileContents, args.path)?.code ?? fileContents;
@@ -239,7 +251,11 @@ const buildApiWithVite = async () => {
     // are expanded before Babel sees the code.  The Babel import-dir plugin is
     // disabled for forVite:true builds; this inline Vite plugin is its
     // replacement for this code path (both CJS and ESM output via Rollup).
+    // tsconfigPaths resolves user-defined tsconfig.json `paths` aliases; it
+    // replaces the Babel module-resolver's tsconfig-paths handling for this
+    // code path.
     plugins: [
+      tsconfigPaths(),
       createImportDirVitePlugin(),
       createDirectoryNamedImportVitePlugin(),
       createCedarViteApiPlugin()

package/dist/build/esbuild-plugin-api-graphql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"esbuild-plugin-api-graphql.d.ts","sourceRoot":"","sources":["../../src/build/esbuild-plugin-api-graphql.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAmB1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CAgFzB,CAAA"}
+{"version":3,"file":"esbuild-plugin-api-graphql.d.ts","sourceRoot":"","sources":["../../src/build/esbuild-plugin-api-graphql.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAoB1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CA0FzB,CAAA"}

package/dist/build/esbuild-plugin-api-graphql.js

@@ -15,6 +15,7 @@ import { applyOtelWrapping } from "./esbuild-plugin-cedar-otel-wrapping.js";
 import { applyHandlerAlsWrapping } from "./esbuild-plugin-handler-als-wrapping.js";
 import { applyImportDir } from "./import-dir.js";
 import { applySrcAlias } from "./src-alias.js";
+import { applyTsconfigPaths } from "./tsconfig-paths.js";
 const cedarApiGraphqlPlugin = {
   name: "cedar-api-graphql",
   setup(build) {
@@ -27,6 +28,11 @@ const cedarApiGraphqlPlugin = {
           path.relative(build.initialOptions.absWorkingDir + "/src", args.path)
         )
       );
+      fileContents = applyTsconfigPaths(
+        fileContents,
+        args.path,
+        getPaths().api.base
+      );
       fileContents = applyDirectoryNamedImport(fileContents, args.path);
       fileContents = applyGraphqlOptionsExtract(fileContents) ?? fileContents;
       fileContents = applyGqlormInject(fileContents, args.path, ".js") ?? fileContents;

package/dist/build/tsconfig-paths.d.ts

@@ -0,0 +1,2 @@
+export declare function applyTsconfigPaths(code: string, filePath: string, cwd: string): string;
+//# sourceMappingURL=tsconfig-paths.d.ts.map

package/dist/build/tsconfig-paths.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tsconfig-paths.d.ts","sourceRoot":"","sources":["../../src/build/tsconfig-paths.ts"],"names":[],"mappings":"AA8FA,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,GACV,MAAM,CAyCR"}

package/dist/build/tsconfig-paths.js

@@ -0,0 +1,72 @@
+import path from "node:path";
+import { createMatchPath, loadConfig } from "tsconfig-paths";
+import { importStatementPath, resolveFile } from "@cedarjs/project-config";
+const EXCLUDED_PATH_KEY_RE = /src\/|\$api\/\*|types\/\*|@cedarjs\/.*/;
+const RESOLVE_EXTENSIONS = [
+  ".js",
+  ".tsx",
+  ".ts",
+  ".jsx",
+  ".mjs",
+  ".mts",
+  ".cjs"
+];
+const BARE_IMPORT_RE = /\bfrom\s+(['"])([^'"./][^'"]*)\1/g;
+function getMatchPath(cwd) {
+  const config = loadConfig(cwd);
+  if (config.resultType === "failed") {
+    return null;
+  }
+  const paths = Object.fromEntries(
+    Object.entries(config.paths).filter(
+      ([key]) => !EXCLUDED_PATH_KEY_RE.test(key)
+    )
+  );
+  if (Object.keys(paths).length === 0) {
+    return null;
+  }
+  return createMatchPath(config.absoluteBaseUrl, paths);
+}
+function resolveToFile(candidate) {
+  if (resolveFile(candidate)) {
+    return candidate;
+  }
+  if (resolveFile(path.join(candidate, "index"))) {
+    return path.join(candidate, "index");
+  }
+  const basename = path.basename(candidate);
+  if (resolveFile(path.join(candidate, basename))) {
+    return path.join(candidate, basename);
+  }
+  return null;
+}
+function applyTsconfigPaths(code, filePath, cwd) {
+  const matchPath = getMatchPath(cwd);
+  if (!matchPath) {
+    return code;
+  }
+  return code.replace(
+    BARE_IMPORT_RE,
+    (full, quote, importPath) => {
+      const basename = importPath.split("/").pop();
+      const rawMatch = matchPath(importPath, void 0, void 0, RESOLVE_EXTENSIONS) ?? (basename && matchPath(
+        `${importPath}/${basename}`,
+        void 0,
+        void 0,
+        RESOLVE_EXTENSIONS
+      ));
+      const resolved = rawMatch && resolveToFile(rawMatch);
+      if (!resolved) {
+        return full;
+      }
+      const relativePath = path.relative(path.dirname(filePath), resolved);
+      const formatted = importStatementPath(
+        relativePath.startsWith(".") ? relativePath : "./" + relativePath
+      );
+      return `from ${quote}${formatted}${quote}`;
+    }
+  );
+}
+export {
+  applyTsconfigPaths
+};

package/dist/cjs/build/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AAgCtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AAwPD,eAAO,MAAM,gBAAgB,iHA6D5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AA2CtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AAiQD,eAAO,MAAM,gBAAgB,iHAiE5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}

package/dist/cjs/build/api.js

@@ -39,6 +39,7 @@ var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
 var import_esbuild = require("esbuild");
 var import_vite = require("vite");
+var import_vite_tsconfig_paths = __toESM(require("vite-tsconfig-paths"), 1);
 var import_babel_config = require("@cedarjs/babel-config");
 var import_project_config = require("@cedarjs/project-config");
 var import_files = require("../files.js");
@@ -50,6 +51,12 @@ var import_esbuild_plugin_cedar_otel_wrapping = require("./esbuild-plugin-cedar-
 var import_esbuild_plugin_handler_als_wrapping = require("./esbuild-plugin-handler-als-wrapping.js");
 var import_import_dir = require("./import-dir.js");
 var import_src_alias = require("./src-alias.js");
+var import_tsconfig_paths = require("./tsconfig-paths.js");
+const tsconfigPaths = (
+  // @ts-expect-error – .default only exists at runtime in CJS double-wrap
+  // interop
+  import_vite_tsconfig_paths.default.default?.default || import_vite_tsconfig_paths.default.default || import_vite_tsconfig_paths.default
+);
 let BUILD_CTX = null;
 const buildApi = async () => {
   BUILD_CTX?.dispose();
@@ -81,6 +88,11 @@ const runCedarBabelTransformsPlugin = {
           import_node_path.default.relative(build2.initialOptions.absWorkingDir + "/src", args.path)
         )
       );
+      fileContents = (0, import_tsconfig_paths.applyTsconfigPaths)(
+        fileContents,
+        args.path,
+        (0, import_project_config.getPaths)().api.base
+      );
       fileContents = (0, import_directory_named_import.applyDirectoryNamedImport)(fileContents, args.path);
       fileContents = (0, import_auto_import.applyAutoImports)(fileContents);
       fileContents = (0, import_import_dir.applyImportDir)(fileContents, args.path)?.code ?? fileContents;
@@ -265,7 +277,11 @@ const buildApiWithVite = async () => {
     // are expanded before Babel sees the code.  The Babel import-dir plugin is
     // disabled for forVite:true builds; this inline Vite plugin is its
     // replacement for this code path (both CJS and ESM output via Rollup).
+    // tsconfigPaths resolves user-defined tsconfig.json `paths` aliases; it
+    // replaces the Babel module-resolver's tsconfig-paths handling for this
+    // code path.
     plugins: [
+      tsconfigPaths(),
       createImportDirVitePlugin(),
       createDirectoryNamedImportVitePlugin(),
       createCedarViteApiPlugin()

package/dist/cjs/build/esbuild-plugin-api-graphql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"esbuild-plugin-api-graphql.d.ts","sourceRoot":"","sources":["../../../src/build/esbuild-plugin-api-graphql.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAmB1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CAgFzB,CAAA"}
+{"version":3,"file":"esbuild-plugin-api-graphql.d.ts","sourceRoot":"","sources":["../../../src/build/esbuild-plugin-api-graphql.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAoB1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CA0FzB,CAAA"}

package/dist/cjs/build/esbuild-plugin-api-graphql.js

@@ -42,6 +42,7 @@ var import_esbuild_plugin_cedar_otel_wrapping = require("./esbuild-plugin-cedar-
 var import_esbuild_plugin_handler_als_wrapping = require("./esbuild-plugin-handler-als-wrapping.js");
 var import_import_dir = require("./import-dir.js");
 var import_src_alias = require("./src-alias.js");
+var import_tsconfig_paths = require("./tsconfig-paths.js");
 const cedarApiGraphqlPlugin = {
   name: "cedar-api-graphql",
   setup(build) {
@@ -54,6 +55,11 @@ const cedarApiGraphqlPlugin = {
           import_node_path.default.relative(build.initialOptions.absWorkingDir + "/src", args.path)
         )
       );
+      fileContents = (0, import_tsconfig_paths.applyTsconfigPaths)(
+        fileContents,
+        args.path,
+        (0, import_project_config.getPaths)().api.base
+      );
       fileContents = (0, import_directory_named_import.applyDirectoryNamedImport)(fileContents, args.path);
       fileContents = (0, import_api_graphql_transforms.applyGraphqlOptionsExtract)(fileContents) ?? fileContents;
       fileContents = (0, import_api_graphql_transforms.applyGqlormInject)(fileContents, args.path, ".js") ?? fileContents;

package/dist/cjs/build/tsconfig-paths.d.ts

@@ -0,0 +1,2 @@
+export declare function applyTsconfigPaths(code: string, filePath: string, cwd: string): string;
+//# sourceMappingURL=tsconfig-paths.d.ts.map

package/dist/cjs/build/tsconfig-paths.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tsconfig-paths.d.ts","sourceRoot":"","sources":["../../../src/build/tsconfig-paths.ts"],"names":[],"mappings":"AA8FA,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,GACV,MAAM,CAyCR"}

package/dist/cjs/build/tsconfig-paths.js

@@ -0,0 +1,106 @@
+"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 tsconfig_paths_exports = {};
+__export(tsconfig_paths_exports, {
+  applyTsconfigPaths: () => applyTsconfigPaths
+});
+module.exports = __toCommonJS(tsconfig_paths_exports);
+var import_node_path = __toESM(require("node:path"), 1);
+var import_tsconfig_paths = require("tsconfig-paths");
+var import_project_config = require("@cedarjs/project-config");
+const EXCLUDED_PATH_KEY_RE = /src\/|\$api\/\*|types\/\*|@cedarjs\/.*/;
+const RESOLVE_EXTENSIONS = [
+  ".js",
+  ".tsx",
+  ".ts",
+  ".jsx",
+  ".mjs",
+  ".mts",
+  ".cjs"
+];
+const BARE_IMPORT_RE = /\bfrom\s+(['"])([^'"./][^'"]*)\1/g;
+function getMatchPath(cwd) {
+  const config = (0, import_tsconfig_paths.loadConfig)(cwd);
+  if (config.resultType === "failed") {
+    return null;
+  }
+  const paths = Object.fromEntries(
+    Object.entries(config.paths).filter(
+      ([key]) => !EXCLUDED_PATH_KEY_RE.test(key)
+    )
+  );
+  if (Object.keys(paths).length === 0) {
+    return null;
+  }
+  return (0, import_tsconfig_paths.createMatchPath)(config.absoluteBaseUrl, paths);
+}
+function resolveToFile(candidate) {
+  if ((0, import_project_config.resolveFile)(candidate)) {
+    return candidate;
+  }
+  if ((0, import_project_config.resolveFile)(import_node_path.default.join(candidate, "index"))) {
+    return import_node_path.default.join(candidate, "index");
+  }
+  const basename = import_node_path.default.basename(candidate);
+  if ((0, import_project_config.resolveFile)(import_node_path.default.join(candidate, basename))) {
+    return import_node_path.default.join(candidate, basename);
+  }
+  return null;
+}
+function applyTsconfigPaths(code, filePath, cwd) {
+  const matchPath = getMatchPath(cwd);
+  if (!matchPath) {
+    return code;
+  }
+  return code.replace(
+    BARE_IMPORT_RE,
+    (full, quote, importPath) => {
+      const basename = importPath.split("/").pop();
+      const rawMatch = matchPath(importPath, void 0, void 0, RESOLVE_EXTENSIONS) ?? (basename && matchPath(
+        `${importPath}/${basename}`,
+        void 0,
+        void 0,
+        RESOLVE_EXTENSIONS
+      ));
+      const resolved = rawMatch && resolveToFile(rawMatch);
+      if (!resolved) {
+        return full;
+      }
+      const relativePath = import_node_path.default.relative(import_node_path.default.dirname(filePath), resolved);
+      const formatted = (0, import_project_config.importStatementPath)(
+        relativePath.startsWith(".") ? relativePath : "./" + relativePath
+      );
+      return `from ${quote}${formatted}${quote}`;
+    }
+  );
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  applyTsconfigPaths
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "6.0.0-canary.2654",
+  "version": "6.0.0-canary.2658",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -169,13 +169,13 @@
     "@babel/plugin-transform-react-jsx": "7.29.7",
     "@babel/plugin-transform-typescript": "^7.26.8",
     "@babel/traverse": "7.29.7",
-    "@cedarjs/babel-config": "6.0.0-canary.2654",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2654",
-    "@cedarjs/graphql-server": "6.0.0-canary.2654",
-    "@cedarjs/project-config": "6.0.0-canary.2654",
-    "@cedarjs/router": "6.0.0-canary.2654",
-    "@cedarjs/structure": "6.0.0-canary.2654",
-    "@cedarjs/utils": "6.0.0-canary.2654",
+    "@cedarjs/babel-config": "6.0.0-canary.2658",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2658",
+    "@cedarjs/graphql-server": "6.0.0-canary.2658",
+    "@cedarjs/project-config": "6.0.0-canary.2658",
+    "@cedarjs/router": "6.0.0-canary.2658",
+    "@cedarjs/structure": "6.0.0-canary.2658",
+    "@cedarjs/utils": "6.0.0-canary.2658",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -213,12 +213,14 @@
     "systeminformation": "5.31.7",
     "termi-link": "1.1.0",
     "ts-node": "10.9.2",
+    "tsconfig-paths": "4.2.0",
     "typescript": "5.9.3",
-    "vite": "7.3.5"
+    "vite": "7.3.5",
+    "vite-tsconfig-paths": "^6.1.1"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",
-    "@cedarjs/framework-tools": "6.0.0-canary.2654",
+    "@cedarjs/framework-tools": "6.0.0-canary.2658",
     "concurrently": "9.2.1",
     "graphql-tag": "2.12.6",
     "publint": "0.3.21",