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

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;AA0BtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AAkMD,eAAO,MAAM,gBAAgB,iHAyD5B,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;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"}

package/dist/build/api.js

@@ -6,13 +6,19 @@ import {
   getApiSideBabelPlugins,
   transformWithBabel
 } from "@cedarjs/babel-config";
-import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
+import {
+  getConfig,
+  getPaths,
+  projectSideIsEsm,
+  resolveFile
+} from "@cedarjs/project-config";
 import { findApiFiles } from "../files.js";
 import {
   applyGqlormInject,
   applyGraphqlOptionsExtract
 } from "./api-graphql-transforms.js";
 import { applyAutoImports } from "./auto-import.js";
+import { applyDirectoryNamedImport } from "./directory-named-import.js";
 import { cedarApiGraphqlPlugin } from "./esbuild-plugin-api-graphql.js";
 import { applyOtelWrapping } from "./esbuild-plugin-cedar-otel-wrapping.js";
 import { applyHandlerAlsWrapping } from "./esbuild-plugin-handler-als-wrapping.js";
@@ -49,6 +55,7 @@ const runCedarBabelTransformsPlugin = {
           path.relative(build2.initialOptions.absWorkingDir + "/src", args.path)
         )
       );
+      fileContents = applyDirectoryNamedImport(fileContents, args.path);
       fileContents = applyAutoImports(fileContents);
       fileContents = applyImportDir(fileContents, args.path)?.code ?? fileContents;
       const transformedCode = await transformWithBabel(
@@ -101,6 +108,36 @@ function createImportDirVitePlugin() {
     }
   };
 }
+function createDirectoryNamedImportVitePlugin() {
+  return {
+    name: "cedar-internal-directory-named-import",
+    enforce: "pre",
+    resolveId(id, importer) {
+      if (!id.startsWith(".") || !importer) {
+        return null;
+      }
+      if (importer.includes("node_modules")) {
+        return null;
+      }
+      const absolutePath = path.resolve(path.dirname(importer), id);
+      if (resolveFile(absolutePath)) {
+        return null;
+      }
+      const indexPath = path.join(absolutePath, "index");
+      const resolvedIndex = resolveFile(indexPath);
+      if (resolvedIndex) {
+        return normalizePath(resolvedIndex);
+      }
+      const basename = path.basename(absolutePath);
+      const dirNamedPath = path.join(absolutePath, basename);
+      const resolvedDirNamed = resolveFile(dirNamedPath);
+      if (resolvedDirNamed) {
+        return normalizePath(resolvedDirNamed);
+      }
+      return null;
+    }
+  };
+}
 function createCedarViteApiPlugin() {
   const cedarConfig = getConfig();
   const isEsm = projectSideIsEsm("api");
@@ -202,7 +239,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).
-    plugins: [createImportDirVitePlugin(), createCedarViteApiPlugin()]
+    plugins: [
+      createImportDirVitePlugin(),
+      createDirectoryNamedImportVitePlugin(),
+      createCedarViteApiPlugin()
+    ]
   });
 };
 const transpileApi = async (files) => {

package/dist/build/directory-named-import.d.ts

@@ -0,0 +1,2 @@
+export declare function applyDirectoryNamedImport(code: string, filePath: string): string;
+//# sourceMappingURL=directory-named-import.d.ts.map

package/dist/build/directory-named-import.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"directory-named-import.d.ts","sourceRoot":"","sources":["../../src/build/directory-named-import.ts"],"names":[],"mappings":"AAiCA,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,MAAM,CAyBR"}

package/dist/build/directory-named-import.js

@@ -0,0 +1,26 @@
+import path from "node:path";
+import { importStatementPath, resolveFile } from "@cedarjs/project-config";
+const RELATIVE_IMPORT_RE = /^(\s*(?:import|export)\s[^'"]*?)(['"])(\.\.?\/[^'"]+)\2/gm;
+function applyDirectoryNamedImport(code, filePath) {
+  const fileDir = path.dirname(filePath);
+  return code.replace(
+    RELATIVE_IMPORT_RE,
+    (match, prefix, quote, importPath) => {
+      const absolutePath = path.join(fileDir, importPath);
+      if (resolveFile(absolutePath)) {
+        return match;
+      }
+      if (resolveFile(path.join(absolutePath, "index"))) {
+        return `${prefix}${quote}${importStatementPath(importPath + "/index")}${quote}`;
+      }
+      const basename = path.basename(absolutePath);
+      if (resolveFile(path.join(absolutePath, basename))) {
+        return `${prefix}${quote}${importStatementPath(importPath + "/" + basename)}${quote}`;
+      }
+      return match;
+    }
+  );
+}
+export {
+  applyDirectoryNamedImport
+};

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;AAkB1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CA4EzB,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;AAmB1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CAgFzB,CAAA"}

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

@@ -10,6 +10,7 @@ import {
   applyGraphqlOptionsExtract
 } from "./api-graphql-transforms.js";
 import { applyAutoImports } from "./auto-import.js";
+import { applyDirectoryNamedImport } from "./directory-named-import.js";
 import { applyOtelWrapping } from "./esbuild-plugin-cedar-otel-wrapping.js";
 import { applyHandlerAlsWrapping } from "./esbuild-plugin-handler-als-wrapping.js";
 import { applyImportDir } from "./import-dir.js";
@@ -26,6 +27,7 @@ const cedarApiGraphqlPlugin = {
           path.relative(build.initialOptions.absWorkingDir + "/src", args.path)
         )
       );
+      fileContents = applyDirectoryNamedImport(fileContents, args.path);
       fileContents = applyGraphqlOptionsExtract(fileContents) ?? fileContents;
       fileContents = applyGqlormInject(fileContents, args.path, ".js") ?? fileContents;
       fileContents = applyAutoImports(fileContents);

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;AA0BtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AAkMD,eAAO,MAAM,gBAAgB,iHAyD5B,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;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"}

package/dist/cjs/build/api.js

@@ -44,6 +44,7 @@ var import_project_config = require("@cedarjs/project-config");
 var import_files = require("../files.js");
 var import_api_graphql_transforms = require("./api-graphql-transforms.js");
 var import_auto_import = require("./auto-import.js");
+var import_directory_named_import = require("./directory-named-import.js");
 var import_esbuild_plugin_api_graphql = require("./esbuild-plugin-api-graphql.js");
 var import_esbuild_plugin_cedar_otel_wrapping = require("./esbuild-plugin-cedar-otel-wrapping.js");
 var import_esbuild_plugin_handler_als_wrapping = require("./esbuild-plugin-handler-als-wrapping.js");
@@ -80,6 +81,7 @@ const runCedarBabelTransformsPlugin = {
           import_node_path.default.relative(build2.initialOptions.absWorkingDir + "/src", args.path)
         )
       );
+      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;
       const transformedCode = await (0, import_babel_config.transformWithBabel)(
@@ -132,6 +134,36 @@ function createImportDirVitePlugin() {
     }
   };
 }
+function createDirectoryNamedImportVitePlugin() {
+  return {
+    name: "cedar-internal-directory-named-import",
+    enforce: "pre",
+    resolveId(id, importer) {
+      if (!id.startsWith(".") || !importer) {
+        return null;
+      }
+      if (importer.includes("node_modules")) {
+        return null;
+      }
+      const absolutePath = import_node_path.default.resolve(import_node_path.default.dirname(importer), id);
+      if ((0, import_project_config.resolveFile)(absolutePath)) {
+        return null;
+      }
+      const indexPath = import_node_path.default.join(absolutePath, "index");
+      const resolvedIndex = (0, import_project_config.resolveFile)(indexPath);
+      if (resolvedIndex) {
+        return (0, import_vite.normalizePath)(resolvedIndex);
+      }
+      const basename = import_node_path.default.basename(absolutePath);
+      const dirNamedPath = import_node_path.default.join(absolutePath, basename);
+      const resolvedDirNamed = (0, import_project_config.resolveFile)(dirNamedPath);
+      if (resolvedDirNamed) {
+        return (0, import_vite.normalizePath)(resolvedDirNamed);
+      }
+      return null;
+    }
+  };
+}
 function createCedarViteApiPlugin() {
   const cedarConfig = (0, import_project_config.getConfig)();
   const isEsm = (0, import_project_config.projectSideIsEsm)("api");
@@ -233,7 +265,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).
-    plugins: [createImportDirVitePlugin(), createCedarViteApiPlugin()]
+    plugins: [
+      createImportDirVitePlugin(),
+      createDirectoryNamedImportVitePlugin(),
+      createCedarViteApiPlugin()
+    ]
   });
 };
 const transpileApi = async (files) => {

package/dist/cjs/build/directory-named-import.d.ts

@@ -0,0 +1,2 @@
+export declare function applyDirectoryNamedImport(code: string, filePath: string): string;
+//# sourceMappingURL=directory-named-import.d.ts.map

package/dist/cjs/build/directory-named-import.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"directory-named-import.d.ts","sourceRoot":"","sources":["../../../src/build/directory-named-import.ts"],"names":[],"mappings":"AAiCA,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,MAAM,CAyBR"}

package/dist/cjs/build/directory-named-import.js

@@ -0,0 +1,60 @@
+"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 directory_named_import_exports = {};
+__export(directory_named_import_exports, {
+  applyDirectoryNamedImport: () => applyDirectoryNamedImport
+});
+module.exports = __toCommonJS(directory_named_import_exports);
+var import_node_path = __toESM(require("node:path"), 1);
+var import_project_config = require("@cedarjs/project-config");
+const RELATIVE_IMPORT_RE = /^(\s*(?:import|export)\s[^'"]*?)(['"])(\.\.?\/[^'"]+)\2/gm;
+function applyDirectoryNamedImport(code, filePath) {
+  const fileDir = import_node_path.default.dirname(filePath);
+  return code.replace(
+    RELATIVE_IMPORT_RE,
+    (match, prefix, quote, importPath) => {
+      const absolutePath = import_node_path.default.join(fileDir, importPath);
+      if ((0, import_project_config.resolveFile)(absolutePath)) {
+        return match;
+      }
+      if ((0, import_project_config.resolveFile)(import_node_path.default.join(absolutePath, "index"))) {
+        return `${prefix}${quote}${(0, import_project_config.importStatementPath)(importPath + "/index")}${quote}`;
+      }
+      const basename = import_node_path.default.basename(absolutePath);
+      if ((0, import_project_config.resolveFile)(import_node_path.default.join(absolutePath, basename))) {
+        return `${prefix}${quote}${(0, import_project_config.importStatementPath)(importPath + "/" + basename)}${quote}`;
+      }
+      return match;
+    }
+  );
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  applyDirectoryNamedImport
+});

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;AAkB1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CA4EzB,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;AAmB1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CAgFzB,CAAA"}

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

@@ -37,6 +37,7 @@ var import_babel_config = require("@cedarjs/babel-config");
 var import_project_config = require("@cedarjs/project-config");
 var import_api_graphql_transforms = require("./api-graphql-transforms.js");
 var import_auto_import = require("./auto-import.js");
+var import_directory_named_import = require("./directory-named-import.js");
 var import_esbuild_plugin_cedar_otel_wrapping = require("./esbuild-plugin-cedar-otel-wrapping.js");
 var import_esbuild_plugin_handler_als_wrapping = require("./esbuild-plugin-handler-als-wrapping.js");
 var import_import_dir = require("./import-dir.js");
@@ -53,6 +54,7 @@ const cedarApiGraphqlPlugin = {
           import_node_path.default.relative(build.initialOptions.absWorkingDir + "/src", args.path)
         )
       );
+      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;
       fileContents = (0, import_auto_import.applyAutoImports)(fileContents);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "6.0.0-canary.2647",
+  "version": "6.0.0-canary.2654",
   "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.2647",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2647",
-    "@cedarjs/graphql-server": "6.0.0-canary.2647",
-    "@cedarjs/project-config": "6.0.0-canary.2647",
-    "@cedarjs/router": "6.0.0-canary.2647",
-    "@cedarjs/structure": "6.0.0-canary.2647",
-    "@cedarjs/utils": "6.0.0-canary.2647",
+    "@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",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -218,7 +218,7 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",
-    "@cedarjs/framework-tools": "6.0.0-canary.2647",
+    "@cedarjs/framework-tools": "6.0.0-canary.2654",
     "concurrently": "9.2.1",
     "graphql-tag": "2.12.6",
     "publint": "0.3.21",