@ruiapp/rapid-core 0.10.7 → 0.10.9

package/dist/index.js

@@ -2742,12 +2742,16 @@ async function findEntities(server, dataAccessor, options) {
     return entities;
 }
 async function findEntity(server, dataAccessor, options) {
-    const entities = await findEntities(server, dataAccessor, {
-        ...options,
-        ...{
+    if (options.pagination) {
+        options.pagination.limit = 1;
+    }
+    else {
+        options.pagination = {
+            offset: 0,
             limit: 1,
-        },
-    });
+        };
+    }
+    const entities = await findEntities(server, dataAccessor, options);
     return lodash.first(entities);
 }
 async function findById(server, dataAccessor, options) {
@@ -2973,7 +2977,7 @@ async function convertEntityFiltersToRowFilters(routeContext, server, model, bas
             }
             let itemType;
             if (filter.operator === "in" || filter.operator === "notIn") {
-                itemType = filter.itemType || pgPropertyTypeColumnMap[property.type];
+                itemType = filter.itemType || (property && pgPropertyTypeColumnMap[property.type]);
             }
             replacedFilters.push({
                 operator: filter.operator,
@@ -3004,6 +3008,7 @@ async function findManyRelationLinksViaLinkTable(options) {
         singularCode: relationModel.singularCode,
     });
     const findEntityOptions = {
+        routeContext,
         filters: [
             {
                 field: "id",
@@ -3042,11 +3047,12 @@ async function findManyRelationLinksViaLinkTable(options) {
     return { relationLinks, targetEntities };
 }
 async function findManyRelatedEntitiesViaIdPropertyCode(options) {
-    const { server, relationProperty, mainEntityIds, selectRelationOptions } = options;
+    const { server, routeContext, relationProperty, mainEntityIds, selectRelationOptions } = options;
     const dataAccessor = server.getDataAccessor({
         singularCode: relationProperty.targetSingularCode,
     });
     const findEntityOptions = {
+        routeContext,
         filters: [
             {
                 field: relationProperty.selfIdColumnName,
@@ -3087,11 +3093,12 @@ async function findManyRelatedEntitiesViaIdPropertyCode(options) {
     return await findEntities(server, dataAccessor, findEntityOptions);
 }
 async function findOneRelatedEntitiesViaIdPropertyCode(options) {
-    const { server, relationProperty, relationEntityIds, selectRelationOptions } = options;
+    const { server, routeContext, relationProperty, relationEntityIds, selectRelationOptions } = options;
     const dataAccessor = server.getDataAccessor({
         singularCode: relationProperty.targetSingularCode,
     });
     const findEntityOptions = {
+        routeContext,
         filters: [
             {
                 field: "id",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.10.7",
+  "version": "0.10.9",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/dataAccess/entityManager.ts

@@ -362,12 +362,15 @@ async function findEntities(server: IRpdServer, dataAccessor: IRpdDataAccessor,
 }
 
 async function findEntity(server: IRpdServer, dataAccessor: IRpdDataAccessor, options: FindEntityOptions) {
-  const entities = await findEntities(server, dataAccessor, {
-    ...options,
-    ...{
+  if (options.pagination) {
+    options.pagination.limit = 1;
+  } else {
+    options.pagination = {
+      offset: 0,
       limit: 1,
-    },
-  });
+    };
+  }
+  const entities = await findEntities(server, dataAccessor, options);
   return first(entities);
 }
 
@@ -614,7 +617,7 @@ async function convertEntityFiltersToRowFilters(
 
       let itemType: string | undefined;
       if (filter.operator === "in" || filter.operator === "notIn") {
-        itemType = filter.itemType || pgPropertyTypeColumnMap[property.type];
+        itemType = filter.itemType || (property && pgPropertyTypeColumnMap[property.type]);
       }
 
       replacedFilters.push({
@@ -649,6 +652,7 @@ async function findManyRelationLinksViaLinkTable(options: FindManyRelationEntiti
   });
 
   const findEntityOptions: FindEntityOptions = {
+    routeContext,
     filters: [
       {
         field: "id",
@@ -692,12 +696,13 @@ async function findManyRelationLinksViaLinkTable(options: FindManyRelationEntiti
 }
 
 async function findManyRelatedEntitiesViaIdPropertyCode(options: FindManyRelationEntitiesOptions) {
-  const { server, relationProperty, mainEntityIds, selectRelationOptions } = options;
+  const { server, routeContext, relationProperty, mainEntityIds, selectRelationOptions } = options;
   const dataAccessor = server.getDataAccessor({
     singularCode: relationProperty.targetSingularCode as string,
   });
 
   const findEntityOptions: FindEntityOptions = {
+    routeContext,
     filters: [
       {
         field: relationProperty.selfIdColumnName,
@@ -741,13 +746,14 @@ async function findManyRelatedEntitiesViaIdPropertyCode(options: FindManyRelatio
 }
 
 async function findOneRelatedEntitiesViaIdPropertyCode(options: FindOneRelationEntitiesOptions) {
-  const { server, relationProperty, relationEntityIds, selectRelationOptions } = options;
+  const { server, routeContext, relationProperty, relationEntityIds, selectRelationOptions } = options;
 
   const dataAccessor = server.getDataAccessor({
     singularCode: relationProperty.targetSingularCode as string,
   });
 
   const findEntityOptions: FindEntityOptions = {
+    routeContext,
     filters: [
       {
         field: "id",