@ruiapp/rapid-core 0.1.41 → 0.1.43

package/src/dataAccess/entityMapper.ts

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

package/src/dataAccess/filterHelper.ts

@@ -34,9 +34,7 @@ export function removeFiltersWithNullValue(filters?: EntityFilterOptions[]) {
   return result;
 }
 
-function transformFilterWithSubFilters(
-  filter: FindEntityExistenceFilterOptions | FindEntityLogicalFilterOptions,
-): FindEntityExistenceFilterOptions | FindEntityLogicalFilterOptions | null {
+function transformFilterWithSubFilters(filter: FindEntityExistenceFilterOptions | FindEntityLogicalFilterOptions): FindEntityExistenceFilterOptions | FindEntityLogicalFilterOptions | null {
   const subFilters = removeFiltersWithNullValue(filter.filters);
   if (!subFilters.length) {
     return null;

package/src/dataAccess/metaHelper.ts

@@ -0,0 +1,45 @@
+import { IRpdServer } from "~/core/server";
+import { RpdDataModel, RpdDataModelProperty } from "~/types";
+
+export function getEntityProperties(server: IRpdServer, model: RpdDataModel) {
+  return model.properties;
+}
+
+export function getEntityPropertiesIncludingBase(server: IRpdServer, model: RpdDataModel) {
+  if (!model.base) {
+    return model.properties;
+  }
+
+  const baseModel = server.getModel({
+    singularCode: model.base,
+  });
+  baseModel.properties.forEach(prop => prop.isBaseProperty = true);
+
+  return [
+    ...baseModel.properties,
+    ...model.properties,
+  ]
+}
+
+export function getEntityPropertyByCode(server: IRpdServer, model: RpdDataModel, propertyCode: string) {
+  return getEntityProperty(server, model, (e) => e.code === propertyCode);
+}
+
+export function getEntityProperty(server: IRpdServer, model: RpdDataModel, predicate: (item: RpdDataModelProperty) => boolean) {
+  let property = model.properties.find(predicate);
+  if (!property) {
+    const baseModelSingularCode = model.base;
+    if (baseModelSingularCode) {
+      const baseModel = server.getModel({
+        singularCode: baseModelSingularCode,
+      });
+
+      property = baseModel.properties.find(predicate);
+      if (property) {
+        property.isBaseProperty = true;
+      }
+    }
+  }
+
+  return property;
+}

package/src/dataAccess/propertyMapper.ts

@@ -6,7 +6,7 @@ export function mapPropertyNameToColumnName(model: RpdDataModel, propertyName: s
     return propertyName;
   }
 
-  const property = model.properties.find(item => item.code === propertyName);
+  const property = model.properties.find((item) => item.code === propertyName);
   if (!property) {
     return propertyName;
   }
@@ -23,5 +23,5 @@ export function mapPropertyNamesToColumnNames(model: RpdDataModel, propertyNames
     return [];
   }
 
-  return propertyNames.map(fieldName => mapPropertyNameToColumnName(model, fieldName));
-}
+  return propertyNames.map((fieldName) => mapPropertyNameToColumnName(model, fieldName));
+}

package/src/deno-std/datetime/to_imf.ts

@@ -27,21 +27,6 @@ export function toIMF(date: Date): string {
   const s = dtPad(date.getUTCSeconds().toString());
   const y = date.getUTCFullYear();
   const days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
-  const months = [
-    "Jan",
-    "Feb",
-    "Mar",
-    "Apr",
-    "May",
-    "Jun",
-    "Jul",
-    "Aug",
-    "Sep",
-    "Oct",
-    "Nov",
-    "Dec",
-  ];
-  return `${days[date.getUTCDay()]}, ${d} ${
-    months[date.getUTCMonth()]
-  } ${y} ${h}:${min}:${s} GMT`;
+  const months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+  return `${days[date.getUTCDay()]}, ${d} ${months[date.getUTCMonth()]} ${y} ${h}:${min}:${s} GMT`;
 }

package/src/deno-std/encoding/base64.ts

@@ -100,11 +100,7 @@ const base64abc = [
  * @param data
  */
 export function encode(data: ArrayBuffer | string): string {
-  const uint8 = typeof data === "string"
-    ? new TextEncoder().encode(data)
-    : data instanceof Uint8Array
-    ? data
-    : new Uint8Array(data);
+  const uint8 = typeof data === "string" ? new TextEncoder().encode(data) : data instanceof Uint8Array ? data : new Uint8Array(data);
   let result = "",
     i;
   const l = uint8.length;

package/src/deno-std/http/cookie.ts

@@ -85,10 +85,7 @@ function toString(cookie: Cookie): string {
     out.push("HttpOnly");
   }
   if (typeof cookie.maxAge === "number" && Number.isInteger(cookie.maxAge)) {
-    assert(
-      cookie.maxAge >= 0,
-      "Max-Age must be an integer superior or equal to 0",
-    );
+    assert(cookie.maxAge >= 0, "Max-Age must be an integer superior or equal to 0");
     out.push(`Max-Age=${cookie.maxAge}`);
   }
   if (cookie.domain) {
@@ -104,9 +101,7 @@ function toString(cookie: Cookie): string {
   }
   if (cookie.expires) {
     const { expires } = cookie;
-    const dateString = toIMF(
-      typeof expires === "number" ? new Date(expires) : expires,
-    );
+    const dateString = toIMF(typeof expires === "number" ? new Date(expires) : expires);
     out.push(`Expires=${dateString}`);
   }
   if (cookie.unparsed) {
@@ -136,12 +131,8 @@ function validatePath(path: string | null) {
   }
   for (let i = 0; i < path.length; i++) {
     const c = path.charAt(i);
-    if (
-      c < String.fromCharCode(0x20) || c > String.fromCharCode(0x7E) || c == ";"
-    ) {
-      throw new Error(
-        path + ": Invalid cookie path char '" + c + "'",
-      );
+    if (c < String.fromCharCode(0x20) || c > String.fromCharCode(0x7e) || c == ";") {
+      throw new Error(path + ": Invalid cookie path char '" + c + "'");
     }
   }
 }
@@ -155,20 +146,11 @@ function validateValue(name: string, value: string | null) {
   if (value == null || name == null) return;
   for (let i = 0; i < value.length; i++) {
     const c = value.charAt(i);
-    if (
-      c < String.fromCharCode(0x21) || c == String.fromCharCode(0x22) ||
-      c == String.fromCharCode(0x2c) || c == String.fromCharCode(0x3b) ||
-      c == String.fromCharCode(0x5c) || c == String.fromCharCode(0x7f)
-    ) {
-      throw new Error(
-        "RFC2616 cookie '" + name + "' cannot contain character '" + c + "'",
-      );
+    if (c < String.fromCharCode(0x21) || c == String.fromCharCode(0x22) || c == String.fromCharCode(0x2c) || c == String.fromCharCode(0x3b) || c == String.fromCharCode(0x5c) || c == String.fromCharCode(0x7f)) {
+      throw new Error("RFC2616 cookie '" + name + "' cannot contain character '" + c + "'");
     }
     if (c > String.fromCharCode(0x80)) {
-      throw new Error(
-        "RFC2616 cookie '" + name + "' can only have US-ASCII chars as value" +
-          c.charCodeAt(0).toString(16),
-      );
+      throw new Error("RFC2616 cookie '" + name + "' can only have US-ASCII chars as value" + c.charCodeAt(0).toString(16));
     }
   }
 }
@@ -185,9 +167,7 @@ function validateDomain(domain: string) {
   const char1 = domain.charAt(0);
   const charN = domain.charAt(domain.length - 1);
   if (char1 == "-" || charN == "." || charN == "-") {
-    throw new Error(
-      "Invalid first/last char in cookie domain: " + domain,
-    );
+    throw new Error("Invalid first/last char in cookie domain: " + domain);
   }
 }
 
@@ -275,11 +255,7 @@ export function setCookie(headers: Headers, cookie: Cookie) {
  * @param name Name of cookie
  * @param attributes Additional cookie attributes
  */
-export function deleteCookie(
-  headers: Headers,
-  name: string,
-  attributes?: { path?: string; domain?: string },
-) {
+export function deleteCookie(headers: Headers, name: string, attributes?: { path?: string; domain?: string }) {
   setCookie(headers, {
     name: name,
     value: "",
@@ -289,12 +265,10 @@ export function deleteCookie(
 }
 
 function parseSetCookie(value: string): Cookie | null {
-  const attrs = value
-    .split(";")
-    .map((attr) => {
-      const [key, ...values] = attr.trim().split("=");
-      return [key, values.join("=")];
-    });
+  const attrs = value.split(";").map((attr) => {
+    const [key, ...values] = attr.trim().split("=");
+    return [key, values.join("=")];
+  });
   const cookie: Cookie = {
     name: attrs[0][0],
     value: attrs[0][1],
@@ -308,9 +282,7 @@ function parseSetCookie(value: string): Cookie | null {
       case "max-age":
         cookie.maxAge = Number(value);
         if (cookie.maxAge < 0) {
-          console.warn(
-            "Max-Age must be an integer superior or equal to 0. Cookie ignored.",
-          );
+          console.warn("Max-Age must be an integer superior or equal to 0. Cookie ignored.");
           return null;
         }
         break;
@@ -339,29 +311,21 @@ function parseSetCookie(value: string): Cookie | null {
   if (cookie.name.startsWith("__Secure-")) {
     /** This requirement is mentioned in https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie but not the RFC. */
     if (!cookie.secure) {
-      console.warn(
-        "Cookies with names starting with `__Secure-` must be set with the secure flag. Cookie ignored.",
-      );
+      console.warn("Cookies with names starting with `__Secure-` must be set with the secure flag. Cookie ignored.");
       return null;
     }
   }
   if (cookie.name.startsWith("__Host-")) {
     if (!cookie.secure) {
-      console.warn(
-        "Cookies with names starting with `__Host-` must be set with the secure flag. Cookie ignored.",
-      );
+      console.warn("Cookies with names starting with `__Host-` must be set with the secure flag. Cookie ignored.");
       return null;
     }
     if (cookie.domain !== undefined) {
-      console.warn(
-        "Cookies with names starting with `__Host-` must not have a domain specified. Cookie ignored.",
-      );
+      console.warn("Cookies with names starting with `__Host-` must not have a domain specified. Cookie ignored.");
       return null;
     }
     if (cookie.path !== "/") {
-      console.warn(
-        "Cookies with names starting with `__Host-` must have path be `/`. Cookie has been ignored.",
-      );
+      console.warn("Cookies with names starting with `__Host-` must have path be `/`. Cookie has been ignored.");
       return null;
     }
   }
@@ -390,9 +354,12 @@ function parseSetCookie(value: string): Cookie | null {
 export function getSetCookies(headers: Headers): Cookie[] {
   // TODO(lino-levan): remove this ts-ignore when Typescript 5.2 lands in Deno
   // @ts-ignore Typescript's TS Dom types will be out of date until 5.2
-  return headers.getSetCookie()
-    /** Parse each `set-cookie` header separately */
-    .map(parseSetCookie)
-    /** Skip empty cookies */
-    .filter(Boolean) as Cookie[];
+  return (
+    (headers as any)
+      .getSetCookie()
+      /** Parse each `set-cookie` header separately */
+      .map(parseSetCookie)
+      /** Skip empty cookies */
+      .filter(Boolean) as Cookie[]
+  );
 }

package/src/facilities/log/LogFacility.ts

@@ -33,4 +33,3 @@ export interface Logger {
 
   child(options: Object): Logger;
 }
-

package/src/helpers/entityHelpers.ts

@@ -1,7 +1,4 @@
-export function getEntityPartChanges(
-  before: any,
-  after: any,
-): Record<string, any> | null {
+export function getEntityPartChanges(before: any, after: any): Record<string, any> | null {
   if (!before) {
     throw new Error("Argument 'before' can not be null.");
   }

package/src/helpers/runCollectionEntityActionHandler.ts

@@ -3,17 +3,9 @@ import { mergeInput } from "./inputHelper";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import EntityManager from "~/dataAccess/entityManager";
 
-type EntityActionHandler = (
-  entityManager: EntityManager,
-  input: any,
-) => Promise<any>;
+type EntityActionHandler = (entityManager: EntityManager, input: any) => Promise<any>;
 
-export default async function runCollectionEntityActionHandler(
-  ctx: ActionHandlerContext,
-  options: RunEntityActionHandlerOptions,
-  code: string,
-  handleEntityAction: EntityActionHandler,
-) {
+export default async function runCollectionEntityActionHandler(ctx: ActionHandlerContext, options: RunEntityActionHandlerOptions, code: string, handleEntityAction: EntityActionHandler) {
   const { logger, server, input } = ctx;
 
   const { defaultInput, fixedInput } = options;

package/src/plugins/auth/AuthPlugin.ts

@@ -2,9 +2,7 @@
  * Auth manager plugin
  */
 
-import {
-  RpdApplicationConfig,
-} from "~/types";
+import { RpdApplicationConfig } from "~/types";
 import { IRpdServer, RapidPlugin, RpdConfigurationItemOptions, RpdServerPluginConfigurableTargetOptions, RpdServerPluginExtendingAbilities } from "~/core/server";
 
 import pluginActionHandlers from "./actionHandlers";
@@ -13,7 +11,6 @@ import pluginRoutes from "./routes";
 import { RouteContext } from "~/core/routeContext";
 import { verifyJwt } from "~/utilities/jwtUtility";
 
-
 class AuthPlugin implements RapidPlugin {
   get code(): string {
     return "authManager";
@@ -59,7 +56,7 @@ class AuthPlugin implements RapidPlugin {
       // Authorization header has no Bearer or no token
       const authHeader = headers.get("Authorization")!;
       if (!authHeader.startsWith("Bearer ") || authHeader.length <= 7) {
-        throw new Error('AUTHORIZATION_HEADER_INVALID');
+        throw new Error("AUTHORIZATION_HEADER_INVALID");
       }
 
       token = authHeader.slice(7);

package/src/plugins/auth/actionHandlers/changePassword.ts

@@ -4,11 +4,7 @@ import { RapidPlugin } from "~/core/server";
 
 export const code = "changePassword";
 
-export async function handler(
-  plugin: RapidPlugin,
-  ctx: ActionHandlerContext,
-  options: any,
-) {
+export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
   const { server, input, routerContext } = ctx;
   const { response } = routerContext;
   const { id, oldPassword, newPassword } = input;
@@ -18,9 +14,9 @@ export async function handler(
     ctx.status = 401;
     ctx.output = {
       error: {
-        message: "You are not signed in."
-      }
-    }
+        message: "You are not signed in.",
+      },
+    };
     return;
   }
 
@@ -34,8 +30,8 @@ export async function handler(
         operator: "eq",
         field: "id",
         value: userId,
-      }
-    ]
+      },
+    ],
   });
 
   if (!user) {

package/src/plugins/auth/actionHandlers/createSession.ts

@@ -5,17 +5,13 @@ import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
 
 export interface UserAccessToken {
-  sub: "userAccessToken",
+  sub: "userAccessToken";
   aud: string;
 }
 
 export const code = "createSession";
 
-export async function handler(
-  plugin: RapidPlugin,
-  ctx: ActionHandlerContext,
-  options: any,
-) {
+export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
   const { server, input, routerContext } = ctx;
   const { response } = routerContext;
   const { account, password } = input;
@@ -30,8 +26,8 @@ export async function handler(
         operator: "eq",
         field: "login",
         value: account,
-      }
-    ]
+      },
+    ],
   });
 
   if (!user) {
@@ -44,13 +40,16 @@ export async function handler(
   }
 
   const secretKey = Buffer.from(server.config.jwtKey, "base64");
-  const token = createJwt({
-    iss: "authManager",
-    sub: "userAccessToken",
-    aud: "" + user.id,
-    iat: Math.floor(Date.now() / 1000),
-    act: user.login,
-  } as UserAccessToken, secretKey);
+  const token = createJwt(
+    {
+      iss: "authManager",
+      sub: "userAccessToken",
+      aud: "" + user.id,
+      iat: Math.floor(Date.now() / 1000),
+      act: user.login,
+    } as UserAccessToken,
+    secretKey,
+  );
 
   setCookie(response.headers, {
     name: ctx.server.config.sessionCookieName,

package/src/plugins/auth/actionHandlers/deleteSession.ts

@@ -4,11 +4,7 @@ import { setCookie } from "~/deno-std/http/cookie";
 
 export const code = "deleteSession";
 
-export async function handler(
-  plugin: RapidPlugin,
-  ctx: ActionHandlerContext,
-  options: any,
-) {
+export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
   const { server, input, routerContext } = ctx;
   const { response } = routerContext;
 

package/src/plugins/auth/actionHandlers/getMyProfile.ts

@@ -3,11 +3,7 @@ import { RapidPlugin } from "~/core/server";
 
 export const code = "getMyProfile";
 
-export async function handler(
-  plugin: RapidPlugin,
-  ctx: ActionHandlerContext,
-  options: any,
-) {
+export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
   const { server, input, routerContext } = ctx;
 
   const userId = routerContext.state.userId;
@@ -15,9 +11,9 @@ export async function handler(
     ctx.status = 401;
     ctx.output = {
       error: {
-        message: "You are not signed in."
-      }
-    }
+        message: "You are not signed in.",
+      },
+    };
     return;
   }
 
@@ -28,7 +24,7 @@ export async function handler(
         operator: "eq",
         field: "id",
         value: userId,
-      }
+      },
     ],
     properties: ["id", "name", "login", "email", "department", "roles", "state", "createdAt"],
   });

package/src/plugins/auth/actionHandlers/index.ts

@@ -5,10 +5,4 @@ import * as deleteSession from "./deleteSession";
 import * as getMyProfile from "./getMyProfile";
 import * as resetPassword from "./resetPassword";
 
-export default [
-  changePassword,
-  createSession,
-  deleteSession,
-  getMyProfile,
-  resetPassword,
-] satisfies IPluginActionHandler[];
+export default [changePassword, createSession, deleteSession, getMyProfile, resetPassword] satisfies IPluginActionHandler[];

package/src/plugins/auth/actionHandlers/resetPassword.ts

@@ -4,11 +4,7 @@ import { RapidPlugin } from "~/core/server";
 
 export const code = "resetPassword";
 
-export async function handler(
-  plugin: RapidPlugin,
-  ctx: ActionHandlerContext,
-  options: any,
-) {
+export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
   const { server, input, routerContext } = ctx;
   const { response } = routerContext;
   const { userId, password } = input;
@@ -23,8 +19,8 @@ export async function handler(
         operator: "eq",
         field: "id",
         value: userId,
-      }
-    ]
+      },
+    ],
   });
 
   if (!user) {

package/src/plugins/auth/models/AccessToken.ts

@@ -1,6 +1,6 @@
 import { RpdDataModel } from "~/types";
 
-export default     {
+export default {
   maintainedBy: "authManager",
   namespace: "auth",
   name: "access_token",
@@ -53,4 +53,4 @@ export default     {
       required: true,
     },
   ],
-} as RpdDataModel;
+} as RpdDataModel;

package/src/plugins/auth/models/index.ts

@@ -1,5 +1,3 @@
 import AccessToken from "./AccessToken";
 
-export default [
-  AccessToken,
-]
+export default [AccessToken];

package/src/plugins/auth/routes/changePassword.ts

@@ -12,4 +12,4 @@ export default {
       code: "changePassword",
     },
   ],
-} satisfies RpdRoute;
+} satisfies RpdRoute;

package/src/plugins/auth/routes/getMyProfile.ts

@@ -12,4 +12,4 @@ export default {
       code: "getMyProfile",
     },
   ],
-} satisfies RpdRoute;
+} satisfies RpdRoute;

package/src/plugins/auth/routes/index.ts

@@ -4,10 +4,4 @@ import resetPassword from "./resetPassword";
 import signin from "./signin";
 import signout from "./signout";
 
-export default [
-  changePassword,
-  getMyProfile,
-  resetPassword,
-  signin,
-  signout,
-]
+export default [changePassword, getMyProfile, resetPassword, signin, signout];

package/src/plugins/auth/routes/resetPassword.ts

@@ -12,4 +12,4 @@ export default {
       code: "resetPassword",
     },
   ],
-} satisfies RpdRoute;
+} satisfies RpdRoute;