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

package/dist/payload-cms/server/db.d.ts

@@ -1,19 +1,19 @@
-import type { CollectionSlug, GlobalSlug, Where } from 'payload';
+import type { CollectionSlug, DataFromCollectionSlug, DataFromGlobalSlug, GlobalSlug, Where } from 'payload';
 import { getPayload } from './get-payload';
 export type FindAllOptions = Omit<Parameters<Awaited<ReturnType<typeof getPayload>>['find']>[0], 'collection'>;
 export type UpdateOptions = Omit<Parameters<Awaited<ReturnType<typeof getPayload>>['update']>[0], 'collection' | 'id' | 'data' | 'where'>;
 export type DeleteOptions = Omit<Parameters<Awaited<ReturnType<typeof getPayload>>['delete']>[0], 'collection' | 'id' | 'where'>;
 export type UpdateData = Parameters<Awaited<ReturnType<typeof getPayload>>['update']>[0]['data'];
 export declare const db: {
-    findOne: <TSlug extends CollectionSlug>(collection: TSlug, where?: Where) => Promise<import("payload").JsonObject & import("payload").TypeWithID>;
-    findBySlug: <TSlug extends CollectionSlug>(collection: TSlug, slug: string) => Promise<import("payload").JsonObject & import("payload").TypeWithID>;
-    findAll: <TSlug extends CollectionSlug>(collection: TSlug, options?: FindAllOptions) => Promise<(import("payload").JsonObject & import("payload").TypeWithID)[]>;
-    findByID: <TSlug extends CollectionSlug>(collection: TSlug, id: string | number) => Promise<import("payload").JsonObject & import("payload").TypeWithID>;
+    findOne: <TSlug extends CollectionSlug>(collection: TSlug, where?: Where) => Promise<DataFromCollectionSlug<TSlug>>;
+    findBySlug: <TSlug extends CollectionSlug>(collection: TSlug, slug: string) => Promise<DataFromCollectionSlug<TSlug>>;
+    findAll: <TSlug extends CollectionSlug>(collection: TSlug, options?: FindAllOptions) => Promise<DataFromCollectionSlug<TSlug>[]>;
+    findByID: <TSlug extends CollectionSlug>(collection: TSlug, id: string | number) => Promise<DataFromCollectionSlug<TSlug>>;
     create: <TSlug extends CollectionSlug>(collection: TSlug, data: Parameters<Awaited<ReturnType<typeof getPayload>>['create']>[0]['data'], options?: Omit<Parameters<Awaited<ReturnType<typeof getPayload>>['create']>[0], 'collection' | 'data'>) => Promise<import("payload").JsonObject & import("payload").TypeWithID>;
     update: <TSlug extends CollectionSlug>(collection: TSlug, id: string | number, data: UpdateData, options?: UpdateOptions) => Promise<import("payload").JsonObject & import("payload").TypeWithID>;
     updateMany: <TSlug extends CollectionSlug>(collection: TSlug, where: Where, data: UpdateData, options?: UpdateOptions) => Promise<import("payload").BulkOperationResult<TSlug, import("payload").SelectExcludeType | import("payload").SelectIncludeType>>;
     delete: <TSlug extends CollectionSlug>(collection: TSlug, id: string | number, options?: DeleteOptions) => Promise<import("payload").JsonObject & import("payload").TypeWithID>;
     deleteMany: <TSlug extends CollectionSlug>(collection: TSlug, where: Where, options?: DeleteOptions) => Promise<import("payload").BulkOperationResult<TSlug, import("payload").SelectExcludeType | import("payload").SelectIncludeType>>;
-    global: <TSlug extends GlobalSlug>(slug: TSlug) => Promise<import("payload").JsonObject>;
+    global: <TSlug extends GlobalSlug>(slug: TSlug) => Promise<DataFromGlobalSlug<TSlug>>;
     raw: () => Promise<import("payload").BasePayload>;
 };

package/dist/payload-cms/server/get-payload.d.ts

@@ -1,2 +1,2 @@
-import { SanitizedConfig, type Payload } from 'payload';
+import { type SanitizedConfig, type Payload } from 'payload';
 export declare const getPayload: (config?: Promise<SanitizedConfig> | SanitizedConfig) => Promise<Payload>;

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

@@ -1,9 +1,7 @@
 "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)
@@ -17,14 +15,6 @@ 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
@@ -42,15 +32,22 @@ var import_react = require("react");
 
 // src/payload-cms/server/get-payload.ts
 var import_payload = require("payload");
+var import_node = require("payload/node");
 var getPayload = async (config) => {
   if (config) {
     return (0, import_payload.getPayload)({ config });
   }
-  const payloadConfig = await import(
+  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."
+    );
+  }
+  const configModule = await import(
     /* webpackIgnore: true */
-    "@payload-config"
+    configPath
   );
-  const resolvedConfig = payloadConfig.default || payloadConfig;
+  const resolvedConfig = await (configModule.default || configModule);
   return (0, import_payload.getPayload)({ config: resolvedConfig });
 };
 

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

@@ -3,15 +3,22 @@ import { cache } from "react";
 
 // src/payload-cms/server/get-payload.ts
 import { getPayload as getPayloadSDK } from "payload";
+import { findConfig } from "payload/node";
 var getPayload = async (config) => {
   if (config) {
     return getPayloadSDK({ config });
   }
-  const payloadConfig = await import(
+  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."
+    );
+  }
+  const configModule = await import(
     /* webpackIgnore: true */
-    "@payload-config"
+    configPath
   );
-  const resolvedConfig = payloadConfig.default || payloadConfig;
+  const resolvedConfig = await (configModule.default || configModule);
   return getPayloadSDK({ config: resolvedConfig });
 };
 

package/package.json

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