@loomcore/api 0.2.46 → 0.2.47

package/dist/__tests__/setup/vitest-setup.js

@@ -1,5 +1,6 @@
-import { setIdSchema } from '@loomcore/common/validation';
+import { initializeTypeBox, setIdSchema, TypeboxObjectId } from '@loomcore/common/validation';
 import { Type } from '@sinclair/typebox';
+initializeTypeBox();
 if (!process.env.TEST_DATABASE) {
     process.env.TEST_DATABASE = 'postgres';
 }
@@ -8,7 +9,7 @@ if (testDatabase === 'postgres') {
     setIdSchema(Type.Number({ title: 'ID', integer: true, minimum: 1 }));
 }
 else if (testDatabase === 'mongodb') {
-    setIdSchema(Type.String({ title: 'ID', pattern: '^[0-9a-fA-F]{24}$' }));
+    setIdSchema(TypeboxObjectId({ title: 'ID' }));
 }
 else {
     throw new Error(`Invalid TEST_DATABASE value: ${testDatabase}. Must be 'postgres' or 'mongodb'`);

package/dist/databases/models/constants.js

@@ -1 +1,6 @@
-export const PROPERTIES_THAT_ARE_NOT_OBJECT_IDS = ['_orgId'];
+export const PROPERTIES_THAT_ARE_NOT_OBJECT_IDS = [
+    '_orgId',
+    '_createdBy',
+    '_updatedBy',
+    '_deletedBy',
+];

package/dist/databases/mongo-db/utils/build-no-sql-match.util.js

@@ -2,17 +2,42 @@ import { entityUtils } from '@loomcore/common/utils';
 import { ObjectId } from 'mongodb';
 import { PROPERTIES_THAT_ARE_NOT_OBJECT_IDS } from '../../models/constants.js';
 import { getPropertySchema } from '../../utils/get-property-schema.util.js';
+function isExcludedFromObjectIdConversion(key) {
+    return PROPERTIES_THAT_ARE_NOT_OBJECT_IDS.includes(key);
+}
+function shouldConvertEqToObjectId(key, propSchema, hasSchema) {
+    if (isExcludedFromObjectIdConversion(key)) {
+        return false;
+    }
+    if (key === '_id' || propSchema?.format === 'objectid') {
+        return true;
+    }
+    return !hasSchema && key.endsWith('Id');
+}
+function shouldConvertInToObjectIds(key, propSchema, hasSchema) {
+    if (isExcludedFromObjectIdConversion(key)) {
+        return false;
+    }
+    if (key === '_id' || propSchema?.format === 'objectid') {
+        return true;
+    }
+    const isObjectIdArray = propSchema?.type === 'array' && propSchema.items?.format === 'objectid';
+    if (isObjectIdArray) {
+        return true;
+    }
+    return !hasSchema && (key.endsWith('Id') || key.endsWith('Ids'));
+}
 export function buildNoSqlMatch(queryOptions, modelSpec) {
     const filters = queryOptions.filters || {};
     const schema = modelSpec?.fullSchema;
+    const hasSchema = !!schema;
     let match = {};
     for (const [key, value] of Object.entries(filters)) {
         if (value) {
             const propSchema = schema ? getPropertySchema(key, schema) : undefined;
             if (value.eq !== undefined) {
-                const isObjectIdField = propSchema?.format === 'objectid';
                 const valueToCompare = value.eq;
-                if ((key === '_id' || isObjectIdField || (!schema && key.endsWith('Id') && !PROPERTIES_THAT_ARE_NOT_OBJECT_IDS.includes(key)))
+                if (shouldConvertEqToObjectId(key, propSchema, hasSchema)
                     && typeof valueToCompare === 'string' && entityUtils.isValidObjectId(valueToCompare)) {
                     match[key] = new ObjectId(valueToCompare);
                 }
@@ -24,8 +49,7 @@ export function buildNoSqlMatch(queryOptions, modelSpec) {
                 }
             }
             if (value.in !== undefined && Array.isArray(value.in)) {
-                const isObjectIdArray = propSchema?.type === 'array' && propSchema.items?.format === 'objectid';
-                if (key === '_id' || isObjectIdArray || (!schema && (key.endsWith('Id') || key.endsWith('Ids')) && !PROPERTIES_THAT_ARE_NOT_OBJECT_IDS.includes(key))) {
+                if (shouldConvertInToObjectIds(key, propSchema, hasSchema)) {
                     const objectIds = value.in
                         .filter(val => typeof val === 'string' && entityUtils.isValidObjectId(val))
                         .map(val => new ObjectId(val));

package/dist/databases/mongo-db/utils/convert-strings-to-object-ids.util.js

@@ -26,10 +26,11 @@ export function convertStringsToObjectIds(entity, schema) {
             const items = subSchema.items;
             if (!items)
                 return obj;
+            const propertyName = path[path.length - 1];
+            if (propertyName && PROPERTIES_THAT_ARE_NOT_OBJECT_IDS.includes(propertyName)) {
+                return obj;
+            }
             if (items.format === 'objectid') {
-                if (path.length === 1 && PROPERTIES_THAT_ARE_NOT_OBJECT_IDS.includes(path[0])) {
-                    return obj;
-                }
                 return obj.map(item => {
                     if (typeof item === 'string' && entityUtils.isValidObjectId(item)) {
                         return new ObjectId(item);
@@ -51,10 +52,10 @@ export function convertStringsToObjectIds(entity, schema) {
                 const typedPropSchema = propSchema;
                 const fullPath = [...path, key];
                 const value = result[key];
-                const isObjectIdField = typedPropSchema.format === 'objectid';
-                if (isObjectIdField && path.length === 0 && PROPERTIES_THAT_ARE_NOT_OBJECT_IDS.includes(key)) {
+                if (PROPERTIES_THAT_ARE_NOT_OBJECT_IDS.includes(key)) {
                     continue;
                 }
+                const isObjectIdField = typedPropSchema.format === 'objectid';
                 if (isObjectIdField && typeof value === 'string' && entityUtils.isValidObjectId(value)) {
                     result[key] = new ObjectId(value);
                 }

package/dist/utils/create-public-spec.utils.js

@@ -4,10 +4,7 @@ export function createPublicSpec(spec) {
     if (config.debug?.showAuditFields) {
         return spec;
     }
-    const publicSpec = entityUtils.getModelSpec(spec.schema, {
-        isAuditable: spec.isAuditable,
+    return entityUtils.getModelSpec(spec.schema, {
         isEntity: spec.isEntity,
-        addAuditableSchema: false,
     });
-    return publicSpec;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.2.46",
+  "version": "0.2.47",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
   "scripts": {
@@ -60,7 +60,7 @@
     "reflect-metadata": "^0.2.2"
   },
   "peerDependencies": {
-    "@loomcore/common": "^0.0.84",
+    "@loomcore/common": "^0.0.86",
     "@sinclair/typebox": "0.34.33",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",