@matvdt/js-toolkit 0.0.1-canary.13 → 0.0.1-canary.14

package/dist/payload-cms/server/create-collection.d.ts

@@ -1,9 +1,9 @@
 import type { CollectionSlug, Where } from 'payload';
-import { db, DeleteOptions, FindAllOptions, FindOptions, UpdateData, UpdateOptions } from './db';
+import { db, DeleteOptions, FindAllOptions, FindByIDOptions, FindOptions, UpdateData, UpdateOptions } from './db';
 export type BaseCollectionMethods<TSlug extends CollectionSlug> = {
     findOne: (options?: FindOptions) => ReturnType<typeof db.findOne<TSlug>>;
-    findBySlug: (slug: string) => ReturnType<typeof db.findBySlug<TSlug>>;
-    findByID: (id: string | number) => ReturnType<typeof db.findByID<TSlug>>;
+    findBySlug: (slug: string, options?: FindOptions) => ReturnType<typeof db.findBySlug<TSlug>>;
+    findByID: (id: string | number, options?: FindByIDOptions) => ReturnType<typeof db.findByID<TSlug>>;
     findAll: (options?: FindAllOptions) => ReturnType<typeof db.findAll<TSlug>>;
     update: (id: string | number, data: UpdateData, options?: UpdateOptions) => ReturnType<typeof db.update<TSlug>>;
     updateMany: (where: Where, data: UpdateData, options?: UpdateOptions) => ReturnType<typeof db.updateMany<TSlug>>;

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

@@ -1,15 +1,16 @@
 import type { CollectionSlug, DataFromCollectionSlug, DataFromGlobalSlug, GlobalSlug, Where } from 'payload';
 import { getPayload } from './get-payload';
 export type FindOptions = Omit<Parameters<Awaited<ReturnType<typeof getPayload>>['find']>[0], 'collection'>;
+export type FindByIDOptions = Omit<Parameters<Awaited<ReturnType<typeof getPayload>>['findByID']>[0], 'collection' | 'id'>;
 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, options?: FindOptions) => Promise<DataFromCollectionSlug<TSlug>>;
-    findBySlug: <TSlug extends CollectionSlug>(collection: TSlug, slug: string) => Promise<DataFromCollectionSlug<TSlug>>;
+    findBySlug: <TSlug extends CollectionSlug>(collection: TSlug, slug: string, options?: FindOptions) => 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>>;
+    findByID: <TSlug extends CollectionSlug>(collection: TSlug, id: string | number, options?: FindByIDOptions) => 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>>;

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

@@ -62,8 +62,17 @@ var db = {
     });
     return res.docs[0] ?? null;
   },
-  findBySlug: async (collection, slug) => {
-    return db.findOne(collection, { where: { slug: { equals: slug } } });
+  findBySlug: async (collection, slug, options) => {
+    return db.findOne(
+      collection,
+      {
+        ...options,
+        where: {
+          ...options?.where,
+          slug: { equals: slug }
+        }
+      }
+    );
   },
   findAll: async (collection, options) => {
     const payload = await getClient();
@@ -74,9 +83,13 @@ var db = {
     });
     return res.docs;
   },
-  findByID: async (collection, id) => {
+  findByID: async (collection, id, options) => {
     const payload = await getClient();
-    return payload.findByID({ collection, id });
+    return payload.findByID({
+      ...options,
+      collection,
+      id
+    });
   },
   create: async (collection, data, options) => {
     const payload = await getClient();
@@ -134,8 +147,8 @@ var db = {
 function createCollection(collection, extend) {
   const base = {
     findOne: (options) => db.findOne(collection, options),
-    findByID: (id) => db.findByID(collection, id),
-    findBySlug: (slug) => db.findBySlug(collection, slug),
+    findByID: (id, options) => db.findByID(collection, id, options),
+    findBySlug: (slug, options) => db.findBySlug(collection, slug, options),
     findAll: (options) => db.findAll(collection, options),
     update: (id, data, options) => db.update(collection, id, data, options),
     updateMany: (where, data, options) => db.updateMany(collection, where, data, options),

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

@@ -32,8 +32,17 @@ var db = {
     });
     return res.docs[0] ?? null;
   },
-  findBySlug: async (collection, slug) => {
-    return db.findOne(collection, { where: { slug: { equals: slug } } });
+  findBySlug: async (collection, slug, options) => {
+    return db.findOne(
+      collection,
+      {
+        ...options,
+        where: {
+          ...options?.where,
+          slug: { equals: slug }
+        }
+      }
+    );
   },
   findAll: async (collection, options) => {
     const payload = await getClient();
@@ -44,9 +53,13 @@ var db = {
     });
     return res.docs;
   },
-  findByID: async (collection, id) => {
+  findByID: async (collection, id, options) => {
     const payload = await getClient();
-    return payload.findByID({ collection, id });
+    return payload.findByID({
+      ...options,
+      collection,
+      id
+    });
   },
   create: async (collection, data, options) => {
     const payload = await getClient();
@@ -104,8 +117,8 @@ var db = {
 function createCollection(collection, extend) {
   const base = {
     findOne: (options) => db.findOne(collection, options),
-    findByID: (id) => db.findByID(collection, id),
-    findBySlug: (slug) => db.findBySlug(collection, slug),
+    findByID: (id, options) => db.findByID(collection, id, options),
+    findBySlug: (slug, options) => db.findBySlug(collection, slug, options),
     findAll: (options) => db.findAll(collection, options),
     update: (id, data, options) => db.update(collection, id, data, options),
     updateMany: (where, data, options) => db.updateMany(collection, where, data, options),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matvdt/js-toolkit",
-  "version": "0.0.1-canary.13",
+  "version": "0.0.1-canary.14",
   "description": "JS/TS toolkit",
   "type": "module",
   "main": "./dist/index.js",
@@ -27,11 +27,21 @@
   ],
   "scripts": {
     "build": "tsup && tsc",
+    "version:canary": "npm version prerelease --preid=canary",
+    "version:alpha" : "npm version prerelease --preid=alpha",
+    "version:beta"  : "npm version prerelease --preid=beta",
+    "version:rc"    : "npm version prerelease --preid=rc",
+    "version:latest": "npm version patch",
     "publish:canary": "npm publish --access public --tag canary",
     "publish:alpha" : "npm publish --access public --tag alpha",
     "publish:beta"  : "npm publish --access public --tag beta",
     "publish:rc"    : "npm publish --access public --tag rc",
     "publish:latest": "npm publish --access public",
+    "release:canary": "npm run version:canary && npm run publish:canary",
+    "release:alpha" : "npm run version:alpha && npm run publish:alpha",
+    "release:beta"  : "npm run version:beta && npm run publish:beta",
+    "release:rc"    : "npm run version:rc && npm run publish:rc",
+    "release:latest": "npm run version:latest && npm run publish:latest",
     "prepublishOnly": "npm run build"
   },
   "publishConfig": {