@ruiapp/rapid-core 0.1.63 → 0.1.65

package/src/dataAccess/entityMapper.ts

@@ -1,7 +1,6 @@
 import type { IRpdServer } from "~/core/server";
 import { RpdDataModel } from "~/types";
-import { isRelationProperty } from "~/utilities/rapidUtility";
-import { getEntityProperty, getEntityPropertyByCode } from "./metaHelper";
+import { getEntityProperty, getEntityPropertyByCode, isRelationProperty } from "../helpers/metaHelper";
 
 // TODO Generate mapper and cache it.
 
@@ -58,7 +57,7 @@ export function mapDbRowToEntity(server: IRpdServer, model: RpdDataModel, row: a
 export type DbRowWithBaseRow = {
   row?: Record<string, any>;
   baseRow?: Record<string, any>;
-}
+};
 
 export function mapEntityToDbRow(server: IRpdServer, model: RpdDataModel, entity: any): DbRowWithBaseRow {
   let result: DbRowWithBaseRow = {};
@@ -66,8 +65,8 @@ export function mapEntityToDbRow(server: IRpdServer, model: RpdDataModel, entity
     return result;
   }
 
-  const row = result.row = {};
-  const baseRow = result.baseRow = {};
+  const row = (result.row = {});
+  const baseRow = (result.baseRow = {});
   if (!model.properties || !model.properties.length) {
     return result;
   }

package/src/dataAccess/propertyMapper.ts

@@ -1,27 +1,27 @@
-import { RpdDataModel } from "~/types";
-import { isRelationProperty } from "~/utilities/rapidUtility";
-
-export function mapPropertyNameToColumnName(model: RpdDataModel, propertyName: string) {
-  if (!model.properties) {
-    return propertyName;
-  }
-
-  const property = model.properties.find((item) => item.code === propertyName);
-  if (!property) {
-    return propertyName;
-  }
-
-  if (isRelationProperty(property) && property.relation === "one") {
-    return property.targetIdColumnName!;
-  }
-
-  return property.columnName || property.code;
-}
-
-export function mapPropertyNamesToColumnNames(model: RpdDataModel, propertyNames: string[]) {
-  if (!propertyNames || !propertyNames.length) {
-    return [];
-  }
-
-  return propertyNames.map((fieldName) => mapPropertyNameToColumnName(model, fieldName));
-}
+import { RpdDataModel } from "~/types";
+import { isRelationProperty } from "../helpers/metaHelper";
+
+export function mapPropertyNameToColumnName(model: RpdDataModel, propertyName: string) {
+  if (!model.properties) {
+    return propertyName;
+  }
+
+  const property = model.properties.find((item) => item.code === propertyName);
+  if (!property) {
+    return propertyName;
+  }
+
+  if (isRelationProperty(property) && property.relation === "one") {
+    return property.targetIdColumnName!;
+  }
+
+  return property.columnName || property.code;
+}
+
+export function mapPropertyNamesToColumnNames(model: RpdDataModel, propertyNames: string[]) {
+  if (!propertyNames || !propertyNames.length) {
+    return [];
+  }
+
+  return propertyNames.map((fieldName) => mapPropertyNameToColumnName(model, fieldName));
+}

package/src/deno-std/assert/assert.ts

@@ -1,9 +1,9 @@
-// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-import { AssertionError } from "./assertion_error";
-
-/** Make an assertion, error will be thrown if `expr` does not have truthy value. */
-export function assert(expr: unknown, msg = ""): asserts expr {
-  if (!expr) {
-    throw new AssertionError(msg);
-  }
-}
+// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
+import { AssertionError } from "./assertion_error";
+
+/** Make an assertion, error will be thrown if `expr` does not have truthy value. */
+export function assert(expr: unknown, msg = ""): asserts expr {
+  if (!expr) {
+    throw new AssertionError(msg);
+  }
+}

package/src/deno-std/assert/assertion_error.ts

@@ -1,7 +1,7 @@
-// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-export class AssertionError extends Error {
-  override name = "AssertionError";
-  constructor(message: string) {
-    super(message);
-  }
-}
+// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
+export class AssertionError extends Error {
+  override name = "AssertionError";
+  constructor(message: string) {
+    super(message);
+  }
+}

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

@@ -1,32 +1,32 @@
-// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-// This module is browser compatible.
-
-/**
- * Formats the given date to IMF date time format. (Reference:
- * https://tools.ietf.org/html/rfc7231#section-7.1.1.1).
- * IMF is the time format to use when generating times in HTTP
- * headers. The time being formatted must be in UTC for Format to
- * generate the correct format.
- *
- * @example
- * ```ts
- * import { toIMF } from "https://deno.land/std@$STD_VERSION/datetime/to_imf.ts";
- *
- * toIMF(new Date(0)); // => returns "Thu, 01 Jan 1970 00:00:00 GMT"
- * ```
- * @param date Date to parse
- * @return IMF date formatted string
- */
-export function toIMF(date: Date): string {
-  function dtPad(v: string, lPad = 2): string {
-    return v.padStart(lPad, "0");
-  }
-  const d = dtPad(date.getUTCDate().toString());
-  const h = dtPad(date.getUTCHours().toString());
-  const min = dtPad(date.getUTCMinutes().toString());
-  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`;
-}
+// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
+// This module is browser compatible.
+
+/**
+ * Formats the given date to IMF date time format. (Reference:
+ * https://tools.ietf.org/html/rfc7231#section-7.1.1.1).
+ * IMF is the time format to use when generating times in HTTP
+ * headers. The time being formatted must be in UTC for Format to
+ * generate the correct format.
+ *
+ * @example
+ * ```ts
+ * import { toIMF } from "https://deno.land/std@$STD_VERSION/datetime/to_imf.ts";
+ *
+ * toIMF(new Date(0)); // => returns "Thu, 01 Jan 1970 00:00:00 GMT"
+ * ```
+ * @param date Date to parse
+ * @return IMF date formatted string
+ */
+export function toIMF(date: Date): string {
+  function dtPad(v: string, lPad = 2): string {
+    return v.padStart(lPad, "0");
+  }
+  const d = dtPad(date.getUTCDate().toString());
+  const h = dtPad(date.getUTCHours().toString());
+  const min = dtPad(date.getUTCMinutes().toString());
+  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`;
+}

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

@@ -1,141 +1,141 @@
-// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-// This module is browser compatible.
-
-/**
- * {@linkcode encode} and {@linkcode decode} for
- * [base64](https://en.wikipedia.org/wiki/Base64) encoding.
- *
- * This module is browser compatible.
- *
- * @example
- * ```ts
- * import {
- *   decode,
- *   encode,
- * } from "https://deno.land/std@$STD_VERSION/encoding/base64.ts";
- *
- * const b64Repr = "Zm9vYg==";
- *
- * const binaryData = decode(b64Repr);
- * console.log(binaryData);
- * // => Uint8Array [ 102, 111, 111, 98 ]
- *
- * console.log(encode(binaryData));
- * // => Zm9vYg==
- * ```
- *
- * @module
- */
-
-const base64abc = [
-  "A",
-  "B",
-  "C",
-  "D",
-  "E",
-  "F",
-  "G",
-  "H",
-  "I",
-  "J",
-  "K",
-  "L",
-  "M",
-  "N",
-  "O",
-  "P",
-  "Q",
-  "R",
-  "S",
-  "T",
-  "U",
-  "V",
-  "W",
-  "X",
-  "Y",
-  "Z",
-  "a",
-  "b",
-  "c",
-  "d",
-  "e",
-  "f",
-  "g",
-  "h",
-  "i",
-  "j",
-  "k",
-  "l",
-  "m",
-  "n",
-  "o",
-  "p",
-  "q",
-  "r",
-  "s",
-  "t",
-  "u",
-  "v",
-  "w",
-  "x",
-  "y",
-  "z",
-  "0",
-  "1",
-  "2",
-  "3",
-  "4",
-  "5",
-  "6",
-  "7",
-  "8",
-  "9",
-  "+",
-  "/",
-];
-
-/**
- * CREDIT: https://gist.github.com/enepomnyaschih/72c423f727d395eeaa09697058238727
- * Encodes a given Uint8Array, ArrayBuffer or string into RFC4648 base64 representation
- * @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);
-  let result = "",
-    i;
-  const l = uint8.length;
-  for (i = 2; i < l; i += 3) {
-    result += base64abc[uint8[i - 2] >> 2];
-    result += base64abc[((uint8[i - 2] & 0x03) << 4) | (uint8[i - 1] >> 4)];
-    result += base64abc[((uint8[i - 1] & 0x0f) << 2) | (uint8[i] >> 6)];
-    result += base64abc[uint8[i] & 0x3f];
-  }
-  if (i === l + 1) {
-    // 1 octet yet to write
-    result += base64abc[uint8[i - 2] >> 2];
-    result += base64abc[(uint8[i - 2] & 0x03) << 4];
-    result += "==";
-  }
-  if (i === l) {
-    // 2 octets yet to write
-    result += base64abc[uint8[i - 2] >> 2];
-    result += base64abc[((uint8[i - 2] & 0x03) << 4) | (uint8[i - 1] >> 4)];
-    result += base64abc[(uint8[i - 1] & 0x0f) << 2];
-    result += "=";
-  }
-  return result;
-}
-
-/**
- * Decodes a given RFC4648 base64 encoded string
- * @param b64
- */
-export function decode(b64: string): Uint8Array {
-  const binString = atob(b64);
-  const size = binString.length;
-  const bytes = new Uint8Array(size);
-  for (let i = 0; i < size; i++) {
-    bytes[i] = binString.charCodeAt(i);
-  }
-  return bytes;
-}
+// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
+// This module is browser compatible.
+
+/**
+ * {@linkcode encode} and {@linkcode decode} for
+ * [base64](https://en.wikipedia.org/wiki/Base64) encoding.
+ *
+ * This module is browser compatible.
+ *
+ * @example
+ * ```ts
+ * import {
+ *   decode,
+ *   encode,
+ * } from "https://deno.land/std@$STD_VERSION/encoding/base64.ts";
+ *
+ * const b64Repr = "Zm9vYg==";
+ *
+ * const binaryData = decode(b64Repr);
+ * console.log(binaryData);
+ * // => Uint8Array [ 102, 111, 111, 98 ]
+ *
+ * console.log(encode(binaryData));
+ * // => Zm9vYg==
+ * ```
+ *
+ * @module
+ */
+
+const base64abc = [
+  "A",
+  "B",
+  "C",
+  "D",
+  "E",
+  "F",
+  "G",
+  "H",
+  "I",
+  "J",
+  "K",
+  "L",
+  "M",
+  "N",
+  "O",
+  "P",
+  "Q",
+  "R",
+  "S",
+  "T",
+  "U",
+  "V",
+  "W",
+  "X",
+  "Y",
+  "Z",
+  "a",
+  "b",
+  "c",
+  "d",
+  "e",
+  "f",
+  "g",
+  "h",
+  "i",
+  "j",
+  "k",
+  "l",
+  "m",
+  "n",
+  "o",
+  "p",
+  "q",
+  "r",
+  "s",
+  "t",
+  "u",
+  "v",
+  "w",
+  "x",
+  "y",
+  "z",
+  "0",
+  "1",
+  "2",
+  "3",
+  "4",
+  "5",
+  "6",
+  "7",
+  "8",
+  "9",
+  "+",
+  "/",
+];
+
+/**
+ * CREDIT: https://gist.github.com/enepomnyaschih/72c423f727d395eeaa09697058238727
+ * Encodes a given Uint8Array, ArrayBuffer or string into RFC4648 base64 representation
+ * @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);
+  let result = "",
+    i;
+  const l = uint8.length;
+  for (i = 2; i < l; i += 3) {
+    result += base64abc[uint8[i - 2] >> 2];
+    result += base64abc[((uint8[i - 2] & 0x03) << 4) | (uint8[i - 1] >> 4)];
+    result += base64abc[((uint8[i - 1] & 0x0f) << 2) | (uint8[i] >> 6)];
+    result += base64abc[uint8[i] & 0x3f];
+  }
+  if (i === l + 1) {
+    // 1 octet yet to write
+    result += base64abc[uint8[i - 2] >> 2];
+    result += base64abc[(uint8[i - 2] & 0x03) << 4];
+    result += "==";
+  }
+  if (i === l) {
+    // 2 octets yet to write
+    result += base64abc[uint8[i - 2] >> 2];
+    result += base64abc[((uint8[i - 2] & 0x03) << 4) | (uint8[i - 1] >> 4)];
+    result += base64abc[(uint8[i - 1] & 0x0f) << 2];
+    result += "=";
+  }
+  return result;
+}
+
+/**
+ * Decodes a given RFC4648 base64 encoded string
+ * @param b64
+ */
+export function decode(b64: string): Uint8Array {
+  const binString = atob(b64);
+  const size = binString.length;
+  const bytes = new Uint8Array(size);
+  for (let i = 0; i < size; i++) {
+    bytes[i] = binString.charCodeAt(i);
+  }
+  return bytes;
+}

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

@@ -146,7 +146,14 @@ 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)) {
+    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)) {

package/src/facilities/log/LogFacility.ts

@@ -1,35 +1,35 @@
-import winston from "winston";
-
-export interface Logger {
-  log: winston.LogMethod;
-  /**
-   * The service/app is going to stop or become unusable now. An operator should definitely look into this immediately.
-   */
-  emerg: winston.LeveledLogMethod;
-  /**
-   * Fatal for a particular service, but the app continues servicing other requests. An operator should look at this immediately.
-   */
-  crit: winston.LeveledLogMethod;
-  /**
-   * Fatal for a particular request, but the service/app continues servicing other requests. An operator should look at this soon(ish).
-   */
-  error: winston.LeveledLogMethod;
-  /**
-   * A note on something that should probably be looked at by an operator eventually.
-   */
-  warn: winston.LeveledLogMethod;
-  /**
-   * Detail on regular operation.
-   */
-  info: winston.LeveledLogMethod;
-  /**
-   * Anything else, i.e. too verbose to be included in "info" level.
-   */
-  debug: winston.LeveledLogMethod;
-  /**
-   * Logging from external libraries used by your app or very detailed application logging.
-   */
-  verbose: winston.LeveledLogMethod;
-
-  child(options: Object): Logger;
-}
+import winston from "winston";
+
+export interface Logger {
+  log: winston.LogMethod;
+  /**
+   * The service/app is going to stop or become unusable now. An operator should definitely look into this immediately.
+   */
+  emerg: winston.LeveledLogMethod;
+  /**
+   * Fatal for a particular service, but the app continues servicing other requests. An operator should look at this immediately.
+   */
+  crit: winston.LeveledLogMethod;
+  /**
+   * Fatal for a particular request, but the service/app continues servicing other requests. An operator should look at this soon(ish).
+   */
+  error: winston.LeveledLogMethod;
+  /**
+   * A note on something that should probably be looked at by an operator eventually.
+   */
+  warn: winston.LeveledLogMethod;
+  /**
+   * Detail on regular operation.
+   */
+  info: winston.LeveledLogMethod;
+  /**
+   * Anything else, i.e. too verbose to be included in "info" level.
+   */
+  debug: winston.LeveledLogMethod;
+  /**
+   * Logging from external libraries used by your app or very detailed application logging.
+   */
+  verbose: winston.LeveledLogMethod;
+
+  child(options: Object): Logger;
+}

package/src/helpers/entityHelpers.ts

@@ -1,21 +1,76 @@
-export function getEntityPartChanges(before: any, after: any): Record<string, any> | null {
-  if (!before) {
-    throw new Error("Argument 'before' can not be null.");
-  }
-
-  if (!after) {
-    throw new Error("Argument 'after' can not be null.");
-  }
-
-  let changed = null;
-  for (const key in after) {
-    if (after[key] != before[key]) {
-      if (changed) {
-        changed[key] = after[key];
-      } else {
-        changed = { [key]: after[key] };
-      }
-    }
-  }
-  return changed;
-}
+import { isNumber, isObject } from "lodash";
+import { IRpdServer } from "~/core/server";
+import { getEntityPropertyByCode, isOneRelationProperty } from "~/helpers/metaHelper";
+import { RpdDataModel } from "~/types";
+
+export function getEntityPartChanges(server: IRpdServer, model: RpdDataModel, before: any, after: any): Record<string, any> | null {
+  if (!before) {
+    throw new Error("Argument 'before' can not be null.");
+  }
+
+  if (!after) {
+    throw new Error("Argument 'after' can not be null.");
+  }
+
+  let changed = false;
+  let changes = {};
+  for (const key in after) {
+    const property = getEntityPropertyByCode(server, model, key);
+    if (isOneRelationProperty(property)) {
+      const afterValue: number | { id: number } | null = after[key];
+      const beforeValue: number | { id: number } | null = before[key] || before[property.targetIdColumnName];
+      if (afterValue) {
+        if (isNumber(afterValue)) {
+          if (beforeValue) {
+            if (isNumber(beforeValue)) {
+              if (afterValue != beforeValue) {
+                changed = true;
+                changes[key] = afterValue;
+              }
+            } else {
+              if (afterValue != beforeValue.id) {
+                changed = true;
+                changes[key] = afterValue;
+              }
+            }
+          } else {
+            changed = true;
+            changes[key] = afterValue;
+          }
+        } else {
+          if (beforeValue) {
+            if (isNumber(beforeValue)) {
+              if (afterValue.id != beforeValue) {
+                changed = true;
+                changes[key] = afterValue;
+              }
+            } else {
+              if (afterValue.id != beforeValue.id) {
+                changed = true;
+                changes[key] = afterValue;
+              }
+            }
+          } else {
+            changed = true;
+            changes[key] = afterValue;
+          }
+        }
+      } else {
+        if (beforeValue) {
+          changed = true;
+          changes[key] = null;
+        }
+      }
+    } else {
+      if (after[key] != before[key]) {
+        changed = true;
+        changes[key] = after[key];
+      }
+    }
+  }
+
+  if (changed) {
+    return changes;
+  }
+  return null;
+}

package/src/{dataAccess → helpers}/filterHelper.ts

@@ -34,7 +34,9 @@ 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;