@treatwell/moleculer-essentials 1.2.2 → 1.2.3

package/dist/{index-CjA1_Io7.cjs → index-BuNrZnJ4.cjs}

@@ -2,6 +2,7 @@
 
 var esToolkit = require('es-toolkit');
 var v4 = require('zod/v4');
+require('es-toolkit/compat');
 var bson = require('bson');
 var dateFns = require('date-fns');
 var zod = require('zod');

package/dist/{index-yStjjADK.mjs → index-DAz9xV2z.mjs}

@@ -1,5 +1,6 @@
 import { omit, pick } from 'es-toolkit';
 import { z as z$1 } from 'zod/v4';
+import 'es-toolkit/compat';
 import { ObjectId } from 'bson';
 import { parseISO } from 'date-fns';
 import { z } from 'zod';

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-CjA1_Io7.cjs');
+var index = require('./index-BuNrZnJ4.cjs');
 var v4 = require('zod/v4');
 var _2019_js = require('ajv/dist/2019.js');
 var moleculer = require('moleculer');
@@ -146,7 +146,7 @@ function generateOpenAPISpec({
   services,
   getSecuritySchemes
 }) {
-  services.forEach((svc) => esToolkit.merge(doc, svc.settings?.openapi));
+  services.forEach((svc) => compat.merge(doc, svc.settings?.openapi));
   const extractor = new OpenAPIExtractor(doc);
   if (doc.components?.schemas) {
     const { schemas } = doc.components;

package/dist/index.mjs

@@ -1,16 +1,16 @@
-import { S as SCHEMA_REF_NAME, z as zodToOpenAPISchema, o as omitFields, G as GetOpenApiParamsSchema, V as ValidationErrorSchema, F as FileTooBigSchema, a as FileNotExistSchema, U as UnauthorizedErrorSchema, b as ServerErrorSchema, C as COERCE_ARRAY_ATTRIBUTE } from './index-yStjjADK.mjs';
-export { D as DATE_TYPE, E as EMPTY_OBJECT_SCHEMA, O as OBJECTID_TYPE, c as addFieldsToSchema, f as composeSchemas, j as createOpenAPIResponses, e as optionalExceptFields, d as optionalFields, p as pickFields, t as toPartialSchema, i as zodCoerceArray, g as zodDate, h as zodObjectId } from './index-yStjjADK.mjs';
+import { S as SCHEMA_REF_NAME, z as zodToOpenAPISchema, o as omitFields, G as GetOpenApiParamsSchema, V as ValidationErrorSchema, F as FileTooBigSchema, a as FileNotExistSchema, U as UnauthorizedErrorSchema, b as ServerErrorSchema, C as COERCE_ARRAY_ATTRIBUTE } from './index-DAz9xV2z.mjs';
+export { D as DATE_TYPE, E as EMPTY_OBJECT_SCHEMA, O as OBJECTID_TYPE, c as addFieldsToSchema, f as composeSchemas, j as createOpenAPIResponses, e as optionalExceptFields, d as optionalFields, p as pickFields, t as toPartialSchema, i as zodCoerceArray, g as zodDate, h as zodObjectId } from './index-DAz9xV2z.mjs';
 import { ZodType, ZodObject, ZodOptional, z } from 'zod/v4';
 import { Ajv2019 } from 'ajv/dist/2019.js';
 import { Validators, Errors, Context, ServiceBroker, Service, TracerExporters, MetricReporters } from 'moleculer';
 import addFormats from 'ajv-formats';
 import addKeywords from 'ajv-keywords';
-import { omit, isEqual, merge, isPlainObject } from 'es-toolkit';
+import { omit, isEqual, isPlainObject } from 'es-toolkit';
 import { parseISO } from 'date-fns';
 import { ObjectId } from 'bson';
 import { w as wrapMixin } from './index-DNJWwcZu.mjs';
 export { a as wrapService } from './index-DNJWwcZu.mjs';
-import { defaultsDeep, isObject } from 'es-toolkit/compat';
+import { merge, defaultsDeep, isObject } from 'es-toolkit/compat';
 import http, { STATUS_CODES } from 'http';
 import { pino } from 'pino';
 import { hostname } from 'node:os';

package/dist/mixins/database.mixin.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var v4 = require('zod/v4');
-var index = require('../index-CjA1_Io7.cjs');
+var index = require('../index-BuNrZnJ4.cjs');
 var moleculer = require('moleculer');
 var esToolkit = require('es-toolkit');
 var mongodb = require('mongodb');
@@ -34,6 +34,21 @@ function optimizeQuery(query) {
     $or: $or.map((predicate) => ({ ...predicate, ...rest }))
   };
 }
+function getQueryFromList(type, list) {
+  if (!list?.length) {
+    return void 0;
+  }
+  const res = {};
+  list.forEach((el) => {
+    if (el.startsWith("-")) {
+      const p = el.slice(1);
+      res[p] = type === "sort" ? -1 : 0;
+    } else {
+      res[el] = 1;
+    }
+  });
+  return res;
+}
 
 var QueryOp = /* @__PURE__ */ ((QueryOp2) => {
   QueryOp2["GT"] = "$gt";
@@ -1074,79 +1089,6 @@ function DatabaseIndexesMixin(opts) {
   });
 }
 
-function getFieldMode(fields) {
-  const refField = fields?.[0] === "-_id" ? fields?.[1] : fields?.[0];
-  if (refField && !refField.startsWith("-")) {
-    return "allow";
-  }
-  return "deny";
-}
-function filterFields(fields, secureFields) {
-  if (!secureFields?.length) {
-    return fields;
-  }
-  const mode = getFieldMode(fields);
-  switch (mode) {
-    case "deny": {
-      if (fields?.some((f) => !f.startsWith("-"))) {
-        throw new Error('All fields must have a "-" prefix in deny mode');
-      }
-      return [
-        .../* @__PURE__ */ new Set([...fields || [], ...secureFields.map((f) => `-${f}`)])
-      ];
-    }
-    case "allow": {
-      if (fields?.some((f) => f.startsWith("-") && f !== "-_id")) {
-        throw new Error('No fields must have a "-" prefix in allow mode');
-      }
-      const filteredFields = fields?.filter(
-        (f) => !secureFields.find((sF) => f === sF || f.startsWith(`${sF}.`))
-      );
-      if (filteredFields?.length === 0) {
-        return ["_id"];
-      }
-      return filteredFields;
-    }
-    default:
-      throw new Error("Should not happen");
-  }
-}
-function filterObjectFields(obj, fields) {
-  if (!fields?.length) {
-    return obj;
-  }
-  let res = obj;
-  const [fieldsRemove, fieldsAdd] = esToolkit.partition(
-    fields || [],
-    (f) => f.startsWith("-")
-  );
-  if (fieldsRemove.length) {
-    res = esToolkit.omit(
-      res,
-      fieldsRemove.map((f) => f.substring(1))
-    );
-  }
-  if (fieldsAdd.length) {
-    res = esToolkit.pick(res, fieldsAdd);
-  }
-  return res;
-}
-function getQueryFromList(type, list) {
-  if (!list?.length) {
-    return void 0;
-  }
-  const res = {};
-  list.forEach((el) => {
-    if (el.startsWith("-")) {
-      const p = el.slice(1);
-      res[p] = type === "sort" ? -1 : 0;
-    } else {
-      res[el] = 1;
-    }
-  });
-  return res;
-}
-
 function DatabaseMethodsMixin(opts) {
   return index$1.wrapMixin({
     methods: {
@@ -1657,8 +1599,6 @@ exports.ZodActionSchemaFactory = ZodActionSchemaFactory;
 exports.addQueryOps = addQueryOps;
 exports.addZodQueryOps = addZodQueryOps;
 exports.createActions = createActions;
-exports.filterFields = filterFields;
-exports.filterObjectFields = filterObjectFields;
 exports.getDefaultIndexName = getDefaultIndexName;
 exports.getIndexesDifference = getIndexesDifference$1;
 exports.getQueryFromList = getQueryFromList;

package/dist/mixins/database.mixin.d.cts

@@ -834,6 +834,11 @@ declare function optionalMongoId<T>(schema: JSONSchemaType<WithId<T>>, refName?:
  * @param query the query to optimize
  */
 declare function optimizeQuery<T extends Record<string, unknown>>(query: Filter<T>): Filter<T>;
+/**
+ * Return an object with each list item as key and 1/0/-1 as value
+ * to be used in mongo projection or sort.
+ */
+declare function getQueryFromList<T extends 'sort' | 'projection', NotOp extends T extends 'sort' ? -1 : 0>(type: T, list?: string[]): Record<string, 1 | NotOp> | undefined;
 
 declare function DatabaseMethodsMixin<TSchema extends Document & {
     _id: ObjectId | string;
@@ -934,26 +939,5 @@ declare function DatabaseMethodsMixin<TSchema extends Document & {
     _deleteMany(query: Filter<TSchema>, params: TenantParams<TSchema, TenantField>, options?: DatabaseDeleteManyOptions): Promise<number>;
 }, unknown, unknown>>;
 
-/**
- * This function is here to prevent accessing private (secure) fields.
- *
- * It removes any unauthorized fields from the query if it is an
- * "allowed list" mode. In "deny list" mode or if no list,
- * it adds secure fields to the list.
- *
- * If a query is a mixed of both mode, it throws an error.
- */
-declare function filterFields(fields: string[] | undefined, secureFields: string[] | undefined): string[] | undefined;
-/**
- * Filter an objects following a fields array.
- * A simpler version of mongo projection logic.
- */
-declare function filterObjectFields<T extends Record<string, unknown>>(obj: Record<string, unknown>, fields?: string[]): T;
-/**
- * Return an object with each list item as key and 1/0/-1 as value
- * to be used in mongo projection or sort.
- */
-declare function getQueryFromList<T extends 'sort' | 'projection', NotOp extends T extends 'sort' ? -1 : 0>(type: T, list?: string[]): Record<string, 1 | NotOp> | undefined;
-
-export { AjvActionSchemaFactory, DATABASE_INDEXES_MIXIN_SYNC_EVENT, DatabaseConnectionMixin, DatabaseIndexesMixin, DatabaseMethodsMixin, EntityNotFoundError, IndexStatus, QueryOp, ZodActionSchemaFactory, addQueryOps, addZodQueryOps, createActions, filterFields, filterObjectFields, getDefaultIndexName, getIndexesDifference, getQueryFromList, isIndexEqual, isIndexNameEqual, isOnAtlas, optimizeQuery, optionalMongoId, parseAndValidateQuery, parseStringifiedQuery, removeMongoId, shouldAutoCreateIndexes, shouldAutoDropIndexes };
+export { AjvActionSchemaFactory, DATABASE_INDEXES_MIXIN_SYNC_EVENT, DatabaseConnectionMixin, DatabaseIndexesMixin, DatabaseMethodsMixin, EntityNotFoundError, IndexStatus, QueryOp, ZodActionSchemaFactory, addQueryOps, addZodQueryOps, createActions, getDefaultIndexName, getIndexesDifference, getQueryFromList, isIndexEqual, isIndexNameEqual, isOnAtlas, optimizeQuery, optionalMongoId, parseAndValidateQuery, parseStringifiedQuery, removeMongoId, shouldAutoCreateIndexes, shouldAutoDropIndexes };
 export type { ActionCountParamsOptions, ActionCreateParamsOptions, ActionGetParamsOptions, ActionListParamsOptions, ActionSchemaFactory, ActionSchemaFactoryOptions, DatabaseActionCountInternalParams, DatabaseActionCountParams, DatabaseActionCreateParams, DatabaseActionEntityResult, DatabaseActionFindParams, DatabaseActionFindResult, DatabaseActionGetInternalParams, DatabaseActionGetParams, DatabaseActionInternalNames, DatabaseActionListParams, DatabaseActionListResult, DatabaseActionNames, DatabaseActionOptions, DatabaseActionPublishedNames, DatabaseActionRemoveParams, DatabaseActionUpdateParams, DatabaseConnectionOptions, DatabaseCountOptions, DatabaseDeleteManyOptions, DatabaseDeleteOneOptions, DatabaseEventDelete, DatabaseEventInsert, DatabaseEventUpdate, DatabaseFindOptions, DatabaseIndexesOptions, DatabaseInsertManyOptions, DatabaseInsertOneOptions, DatabaseMethodsOptions, DatabaseReplaceOneOptions, DatabaseSoftDeleteScope, DatabaseUpdateManyOptions, DatabaseUpdateOneOptions, IndexState, IndexTuple, KeyString, ListSearchIndex, MongoIndex, SearchIndexCustomAnalyzers, SearchIndexDefinition, SearchIndexField, SearchIndexFieldString, SyncIndexesOptions, TenantParams, WithDbFields, WithOptionalId };

package/dist/mixins/database.mixin.d.mts

@@ -834,6 +834,11 @@ declare function optionalMongoId<T>(schema: JSONSchemaType<WithId<T>>, refName?:
  * @param query the query to optimize
  */
 declare function optimizeQuery<T extends Record<string, unknown>>(query: Filter<T>): Filter<T>;
+/**
+ * Return an object with each list item as key and 1/0/-1 as value
+ * to be used in mongo projection or sort.
+ */
+declare function getQueryFromList<T extends 'sort' | 'projection', NotOp extends T extends 'sort' ? -1 : 0>(type: T, list?: string[]): Record<string, 1 | NotOp> | undefined;
 
 declare function DatabaseMethodsMixin<TSchema extends Document & {
     _id: ObjectId | string;
@@ -934,26 +939,5 @@ declare function DatabaseMethodsMixin<TSchema extends Document & {
     _deleteMany(query: Filter<TSchema>, params: TenantParams<TSchema, TenantField>, options?: DatabaseDeleteManyOptions): Promise<number>;
 }, unknown, unknown>>;
 
-/**
- * This function is here to prevent accessing private (secure) fields.
- *
- * It removes any unauthorized fields from the query if it is an
- * "allowed list" mode. In "deny list" mode or if no list,
- * it adds secure fields to the list.
- *
- * If a query is a mixed of both mode, it throws an error.
- */
-declare function filterFields(fields: string[] | undefined, secureFields: string[] | undefined): string[] | undefined;
-/**
- * Filter an objects following a fields array.
- * A simpler version of mongo projection logic.
- */
-declare function filterObjectFields<T extends Record<string, unknown>>(obj: Record<string, unknown>, fields?: string[]): T;
-/**
- * Return an object with each list item as key and 1/0/-1 as value
- * to be used in mongo projection or sort.
- */
-declare function getQueryFromList<T extends 'sort' | 'projection', NotOp extends T extends 'sort' ? -1 : 0>(type: T, list?: string[]): Record<string, 1 | NotOp> | undefined;
-
-export { AjvActionSchemaFactory, DATABASE_INDEXES_MIXIN_SYNC_EVENT, DatabaseConnectionMixin, DatabaseIndexesMixin, DatabaseMethodsMixin, EntityNotFoundError, IndexStatus, QueryOp, ZodActionSchemaFactory, addQueryOps, addZodQueryOps, createActions, filterFields, filterObjectFields, getDefaultIndexName, getIndexesDifference, getQueryFromList, isIndexEqual, isIndexNameEqual, isOnAtlas, optimizeQuery, optionalMongoId, parseAndValidateQuery, parseStringifiedQuery, removeMongoId, shouldAutoCreateIndexes, shouldAutoDropIndexes };
+export { AjvActionSchemaFactory, DATABASE_INDEXES_MIXIN_SYNC_EVENT, DatabaseConnectionMixin, DatabaseIndexesMixin, DatabaseMethodsMixin, EntityNotFoundError, IndexStatus, QueryOp, ZodActionSchemaFactory, addQueryOps, addZodQueryOps, createActions, getDefaultIndexName, getIndexesDifference, getQueryFromList, isIndexEqual, isIndexNameEqual, isOnAtlas, optimizeQuery, optionalMongoId, parseAndValidateQuery, parseStringifiedQuery, removeMongoId, shouldAutoCreateIndexes, shouldAutoDropIndexes };
 export type { ActionCountParamsOptions, ActionCreateParamsOptions, ActionGetParamsOptions, ActionListParamsOptions, ActionSchemaFactory, ActionSchemaFactoryOptions, DatabaseActionCountInternalParams, DatabaseActionCountParams, DatabaseActionCreateParams, DatabaseActionEntityResult, DatabaseActionFindParams, DatabaseActionFindResult, DatabaseActionGetInternalParams, DatabaseActionGetParams, DatabaseActionInternalNames, DatabaseActionListParams, DatabaseActionListResult, DatabaseActionNames, DatabaseActionOptions, DatabaseActionPublishedNames, DatabaseActionRemoveParams, DatabaseActionUpdateParams, DatabaseConnectionOptions, DatabaseCountOptions, DatabaseDeleteManyOptions, DatabaseDeleteOneOptions, DatabaseEventDelete, DatabaseEventInsert, DatabaseEventUpdate, DatabaseFindOptions, DatabaseIndexesOptions, DatabaseInsertManyOptions, DatabaseInsertOneOptions, DatabaseMethodsOptions, DatabaseReplaceOneOptions, DatabaseSoftDeleteScope, DatabaseUpdateManyOptions, DatabaseUpdateOneOptions, IndexState, IndexTuple, KeyString, ListSearchIndex, MongoIndex, SearchIndexCustomAnalyzers, SearchIndexDefinition, SearchIndexField, SearchIndexFieldString, SyncIndexesOptions, TenantParams, WithDbFields, WithOptionalId };

package/dist/mixins/database.mixin.mjs

@@ -1,7 +1,7 @@
 import { ZodType, z, ZodObject } from 'zod/v4';
-import { o as omitFields, d as optionalFields, S as SCHEMA_REF_NAME, O as OBJECTID_TYPE, C as COERCE_ARRAY_ATTRIBUTE, h as zodObjectId, i as zodCoerceArray, j as createOpenAPIResponses } from '../index-yStjjADK.mjs';
+import { o as omitFields, d as optionalFields, S as SCHEMA_REF_NAME, O as OBJECTID_TYPE, C as COERCE_ARRAY_ATTRIBUTE, h as zodObjectId, i as zodCoerceArray, j as createOpenAPIResponses } from '../index-DAz9xV2z.mjs';
 import { Errors } from 'moleculer';
-import { isEqual as isEqual$1, partition, omit, pick } from 'es-toolkit';
+import { isEqual as isEqual$1 } from 'es-toolkit';
 import { MongoClient } from 'mongodb';
 import { w as wrapMixin } from '../index-DNJWwcZu.mjs';
 import { GlobalStoreMixin } from './global-store.mixin.mjs';
@@ -32,6 +32,21 @@ function optimizeQuery(query) {
     $or: $or.map((predicate) => ({ ...predicate, ...rest }))
   };
 }
+function getQueryFromList(type, list) {
+  if (!list?.length) {
+    return void 0;
+  }
+  const res = {};
+  list.forEach((el) => {
+    if (el.startsWith("-")) {
+      const p = el.slice(1);
+      res[p] = type === "sort" ? -1 : 0;
+    } else {
+      res[el] = 1;
+    }
+  });
+  return res;
+}
 
 var QueryOp = /* @__PURE__ */ ((QueryOp2) => {
   QueryOp2["GT"] = "$gt";
@@ -1072,79 +1087,6 @@ function DatabaseIndexesMixin(opts) {
   });
 }
 
-function getFieldMode(fields) {
-  const refField = fields?.[0] === "-_id" ? fields?.[1] : fields?.[0];
-  if (refField && !refField.startsWith("-")) {
-    return "allow";
-  }
-  return "deny";
-}
-function filterFields(fields, secureFields) {
-  if (!secureFields?.length) {
-    return fields;
-  }
-  const mode = getFieldMode(fields);
-  switch (mode) {
-    case "deny": {
-      if (fields?.some((f) => !f.startsWith("-"))) {
-        throw new Error('All fields must have a "-" prefix in deny mode');
-      }
-      return [
-        .../* @__PURE__ */ new Set([...fields || [], ...secureFields.map((f) => `-${f}`)])
-      ];
-    }
-    case "allow": {
-      if (fields?.some((f) => f.startsWith("-") && f !== "-_id")) {
-        throw new Error('No fields must have a "-" prefix in allow mode');
-      }
-      const filteredFields = fields?.filter(
-        (f) => !secureFields.find((sF) => f === sF || f.startsWith(`${sF}.`))
-      );
-      if (filteredFields?.length === 0) {
-        return ["_id"];
-      }
-      return filteredFields;
-    }
-    default:
-      throw new Error("Should not happen");
-  }
-}
-function filterObjectFields(obj, fields) {
-  if (!fields?.length) {
-    return obj;
-  }
-  let res = obj;
-  const [fieldsRemove, fieldsAdd] = partition(
-    fields || [],
-    (f) => f.startsWith("-")
-  );
-  if (fieldsRemove.length) {
-    res = omit(
-      res,
-      fieldsRemove.map((f) => f.substring(1))
-    );
-  }
-  if (fieldsAdd.length) {
-    res = pick(res, fieldsAdd);
-  }
-  return res;
-}
-function getQueryFromList(type, list) {
-  if (!list?.length) {
-    return void 0;
-  }
-  const res = {};
-  list.forEach((el) => {
-    if (el.startsWith("-")) {
-      const p = el.slice(1);
-      res[p] = type === "sort" ? -1 : 0;
-    } else {
-      res[el] = 1;
-    }
-  });
-  return res;
-}
-
 function DatabaseMethodsMixin(opts) {
   return wrapMixin({
     methods: {
@@ -1643,4 +1585,4 @@ function DatabaseMethodsMixin(opts) {
   });
 }
 
-export { AjvActionSchemaFactory, DATABASE_INDEXES_MIXIN_SYNC_EVENT, DatabaseConnectionMixin, DatabaseIndexesMixin, DatabaseMethodsMixin, EntityNotFoundError, IndexStatus, QueryOp, ZodActionSchemaFactory, addQueryOps, addZodQueryOps, createActions, filterFields, filterObjectFields, getDefaultIndexName, getIndexesDifference$1 as getIndexesDifference, getQueryFromList, isIndexEqual, isIndexNameEqual, isOnAtlas, optimizeQuery, optionalMongoId, parseAndValidateQuery, parseStringifiedQuery, removeMongoId, shouldAutoCreateIndexes, shouldAutoDropIndexes };
+export { AjvActionSchemaFactory, DATABASE_INDEXES_MIXIN_SYNC_EVENT, DatabaseConnectionMixin, DatabaseIndexesMixin, DatabaseMethodsMixin, EntityNotFoundError, IndexStatus, QueryOp, ZodActionSchemaFactory, addQueryOps, addZodQueryOps, createActions, getDefaultIndexName, getIndexesDifference$1 as getIndexesDifference, getQueryFromList, isIndexEqual, isIndexNameEqual, isOnAtlas, optimizeQuery, optionalMongoId, parseAndValidateQuery, parseStringifiedQuery, removeMongoId, shouldAutoCreateIndexes, shouldAutoDropIndexes };

package/package.json

@@ -6,7 +6,7 @@
     "type": "git",
     "url": "https://github.com/treatwell/moleculer-essentials"
   },
-  "version": "1.2.2",
+  "version": "1.2.3",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.cts",