@matvdt/js-toolkit 0.0.1-canary.8 → 0.0.1-canary.9

package/dist/payload-cms/server/index.cjs

@@ -1,7 +1,9 @@
 "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)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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);
 
 // src/payload-cms/server/index.ts
@@ -31,23 +41,31 @@ module.exports = __toCommonJS(server_exports);
 var import_react = require("react");
 
 // src/payload-cms/server/get-payload.ts
+var import_node_path = __toESM(require("path"), 1);
+var import_node_url = require("url");
 var import_payload = require("payload");
-var import_node = require("payload/node");
-var getPayload = async (config) => {
-  if (config) {
-    return (0, import_payload.getPayload)({ config });
-  }
-  const configPath = await (0, import_node.findConfig)();
-  if (!configPath) {
-    throw new Error(
-      "[@matvdt/js-toolkit] No payload.config.ts/js file was found in the project root folder."
-    );
+async function loadPayloadConfig() {
+  const candidates = [
+    "payload.config.ts",
+    "payload.config.js",
+    "src/payload.config.ts",
+    "src/payload.config.js"
+  ];
+  for (const candidate of candidates) {
+    const absolutePath = import_node_path.default.resolve(process.cwd(), candidate);
+    try {
+      const configModule = await import((0, import_node_url.pathToFileURL)(absolutePath).href);
+      return configModule.default;
+    } catch {
+      continue;
+    }
   }
-  const configModule = await import(
-    /* webpackIgnore: true */
-    configPath
+  throw new Error(
+    "[@matvdt/js-toolkit] Could not find payload.config.ts. Pass it explicitly to getPayload(config), or ensure it exists at a standard location relative to the project root."
   );
-  const resolvedConfig = await (configModule.default || configModule);
+}
+var getPayload = async (config) => {
+  const resolvedConfig = config ?? await loadPayloadConfig();
   return (0, import_payload.getPayload)({ config: resolvedConfig });
 };
 

package/dist/payload-cms/server/index.js

@@ -2,23 +2,31 @@
 import { cache } from "react";
 
 // src/payload-cms/server/get-payload.ts
+import path from "path";
+import { pathToFileURL } from "url";
 import { getPayload as getPayloadSDK } from "payload";
-import { findConfig } from "payload/node";
-var getPayload = async (config) => {
-  if (config) {
-    return getPayloadSDK({ config });
-  }
-  const configPath = await findConfig();
-  if (!configPath) {
-    throw new Error(
-      "[@matvdt/js-toolkit] No payload.config.ts/js file was found in the project root folder."
-    );
+async function loadPayloadConfig() {
+  const candidates = [
+    "payload.config.ts",
+    "payload.config.js",
+    "src/payload.config.ts",
+    "src/payload.config.js"
+  ];
+  for (const candidate of candidates) {
+    const absolutePath = path.resolve(process.cwd(), candidate);
+    try {
+      const configModule = await import(pathToFileURL(absolutePath).href);
+      return configModule.default;
+    } catch {
+      continue;
+    }
   }
-  const configModule = await import(
-    /* webpackIgnore: true */
-    configPath
+  throw new Error(
+    "[@matvdt/js-toolkit] Could not find payload.config.ts. Pass it explicitly to getPayload(config), or ensure it exists at a standard location relative to the project root."
   );
-  const resolvedConfig = await (configModule.default || configModule);
+}
+var getPayload = async (config) => {
+  const resolvedConfig = config ?? await loadPayloadConfig();
   return getPayloadSDK({ config: resolvedConfig });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matvdt/js-toolkit",
-  "version": "0.0.1-canary.8",
+  "version": "0.0.1-canary.9",
   "description": "JS/TS toolkit",
   "type": "module",
   "main": "./dist/index.js",