@ruiapp/rapid-core 0.3.1 → 0.3.2

package/src/dataAccess/entityMapper.ts

@@ -1,100 +1,100 @@
-import type { IRpdServer } from "~/core/server";
-import { RpdDataModel } from "~/types";
-import { getEntityProperty, getEntityPropertyByCode, isRelationProperty } from "../helpers/metaHelper";
-
-// TODO Generate mapper and cache it.
-
-export function mapDbRowToEntity(server: IRpdServer, model: RpdDataModel, row: any, keepNonPropertyFields: boolean) {
-  if (!row) {
-    return null;
-  }
-
-  if (!model.properties || !model.properties.length) {
-    return row;
-  }
-
-  const result: Record<string, any> = {};
-  const columnNames = Object.keys(row);
-  // TODO: Improve performance.
-  columnNames.forEach((columnName) => {
-    let isRelationProp = false;
-    let propertyName = columnName;
-    let property = getEntityProperty(server, model, (item) => item.columnName === columnName);
-    if (property) {
-      propertyName = property.code;
-    } else {
-      property = getEntityProperty(server, model, (item) => item.relation === "one" && item.targetIdColumnName === columnName);
-      if (property) {
-        isRelationProp = true;
-        propertyName = property.code;
-      } else if (keepNonPropertyFields) {
-        propertyName = columnName;
-      }
-    }
-
-    if (property?.config?.dataManage?.hidden) {
-      return;
-    }
-
-    if (isRelationProp) {
-      if (row[propertyName]) {
-        if (!result[propertyName]) {
-          result[propertyName] = row[propertyName];
-        }
-      } else if (keepNonPropertyFields) {
-        result[columnName] = row[columnName];
-      }
-    } else {
-      if (!result[propertyName]) {
-        result[propertyName] = row[columnName];
-      }
-    }
-  });
-
-  return result;
-}
-
-export type DbRowWithBaseRow = {
-  row?: Record<string, any>;
-  baseRow?: Record<string, any>;
-};
-
-export function mapEntityToDbRow(server: IRpdServer, model: RpdDataModel, entity: any): DbRowWithBaseRow {
-  let result: DbRowWithBaseRow = {};
-  if (!entity) {
-    return result;
-  }
-
-  const row = (result.row = {});
-  const baseRow = (result.baseRow = {});
-  if (!model.properties || !model.properties.length) {
-    return result;
-  }
-
-  const propertyNames = Object.keys(entity);
-  propertyNames.forEach((propertyName) => {
-    let columnName = propertyName;
-    const property = getEntityPropertyByCode(server, model, propertyName);
-    if (property) {
-      if (!isRelationProperty(property)) {
-        columnName = property.columnName || property.code;
-        if (property.isBaseProperty) {
-          baseRow[columnName] = entity[propertyName];
-        } else {
-          row[columnName] = entity[propertyName];
-        }
-      }
-    } else {
-      const oneRelationProperty = getEntityProperty(server, model, (item) => item.relation === "one" && item.targetIdColumnName === propertyName);
-      if (oneRelationProperty) {
-        if (oneRelationProperty.isBaseProperty) {
-          baseRow[columnName] = entity[propertyName];
-        } else {
-          row[columnName] = entity[propertyName];
-        }
-      }
-    }
-  });
-
-  return result;
-}
+import type { IRpdServer } from "~/core/server";
+import { RpdDataModel } from "~/types";
+import { getEntityProperty, getEntityPropertyByCode, isRelationProperty } from "../helpers/metaHelper";
+
+// TODO Generate mapper and cache it.
+
+export function mapDbRowToEntity(server: IRpdServer, model: RpdDataModel, row: any, keepNonPropertyFields: boolean) {
+  if (!row) {
+    return null;
+  }
+
+  if (!model.properties || !model.properties.length) {
+    return row;
+  }
+
+  const result: Record<string, any> = {};
+  const columnNames = Object.keys(row);
+  // TODO: Improve performance.
+  columnNames.forEach((columnName) => {
+    let isRelationProp = false;
+    let propertyName = columnName;
+    let property = getEntityProperty(server, model, (item) => item.columnName === columnName);
+    if (property) {
+      propertyName = property.code;
+    } else {
+      property = getEntityProperty(server, model, (item) => item.relation === "one" && item.targetIdColumnName === columnName);
+      if (property) {
+        isRelationProp = true;
+        propertyName = property.code;
+      } else if (keepNonPropertyFields) {
+        propertyName = columnName;
+      }
+    }
+
+    if (property?.config?.dataManage?.hidden) {
+      return;
+    }
+
+    if (isRelationProp) {
+      if (row[propertyName]) {
+        if (!result[propertyName]) {
+          result[propertyName] = row[propertyName];
+        }
+      } else if (keepNonPropertyFields) {
+        result[columnName] = row[columnName];
+      }
+    } else {
+      if (!result[propertyName]) {
+        result[propertyName] = row[columnName];
+      }
+    }
+  });
+
+  return result;
+}
+
+export type DbRowWithBaseRow = {
+  row?: Record<string, any>;
+  baseRow?: Record<string, any>;
+};
+
+export function mapEntityToDbRow(server: IRpdServer, model: RpdDataModel, entity: any): DbRowWithBaseRow {
+  let result: DbRowWithBaseRow = {};
+  if (!entity) {
+    return result;
+  }
+
+  const row = (result.row = {});
+  const baseRow = (result.baseRow = {});
+  if (!model.properties || !model.properties.length) {
+    return result;
+  }
+
+  const propertyNames = Object.keys(entity);
+  propertyNames.forEach((propertyName) => {
+    let columnName = propertyName;
+    const property = getEntityPropertyByCode(server, model, propertyName);
+    if (property) {
+      if (!isRelationProperty(property)) {
+        columnName = property.columnName || property.code;
+        if (property.isBaseProperty) {
+          baseRow[columnName] = entity[propertyName];
+        } else {
+          row[columnName] = entity[propertyName];
+        }
+      }
+    } else {
+      const oneRelationProperty = getEntityProperty(server, model, (item) => item.relation === "one" && item.targetIdColumnName === propertyName);
+      if (oneRelationProperty) {
+        if (oneRelationProperty.isBaseProperty) {
+          baseRow[columnName] = entity[propertyName];
+        } else {
+          row[columnName] = entity[propertyName];
+        }
+      }
+    }
+  });
+
+  return result;
+}

package/src/dataAccess/propertyMapper.ts

@@ -1,28 +1,28 @@
-import { RpdDataModel } from "~/types";
-import { getEntityPropertyByCode, isOneRelationProperty } from "../helpers/metaHelper";
-import { IRpdServer } from "~/core/server";
-
-export function mapPropertyNameToColumnName(server: IRpdServer, model: RpdDataModel, propertyName: string) {
-  if (!model.properties) {
-    return propertyName;
-  }
-
-  const property = getEntityPropertyByCode(server, model, propertyName);
-  if (!property) {
-    return propertyName;
-  }
-
-  if (isOneRelationProperty(property)) {
-    return property.targetIdColumnName!;
-  }
-
-  return property.columnName || property.code;
-}
-
-export function mapPropertyNamesToColumnNames(server: IRpdServer, model: RpdDataModel, propertyNames: string[]) {
-  if (!propertyNames || !propertyNames.length) {
-    return [];
-  }
-
-  return propertyNames.map((fieldName) => mapPropertyNameToColumnName(server, model, fieldName));
-}
+import { RpdDataModel } from "~/types";
+import { getEntityPropertyByCode, isOneRelationProperty } from "../helpers/metaHelper";
+import { IRpdServer } from "~/core/server";
+
+export function mapPropertyNameToColumnName(server: IRpdServer, model: RpdDataModel, propertyName: string) {
+  if (!model.properties) {
+    return propertyName;
+  }
+
+  const property = getEntityPropertyByCode(server, model, propertyName);
+  if (!property) {
+    return propertyName;
+  }
+
+  if (isOneRelationProperty(property)) {
+    return property.targetIdColumnName!;
+  }
+
+  return property.columnName || property.code;
+}
+
+export function mapPropertyNamesToColumnNames(server: IRpdServer, model: RpdDataModel, propertyNames: string[]) {
+  if (!propertyNames || !propertyNames.length) {
+    return [];
+  }
+
+  return propertyNames.map((fieldName) => mapPropertyNameToColumnName(server, model, fieldName));
+}