@ruiapp/rapid-core 0.11.6 → 0.11.7

package/src/core/ExpressionInterpreter.ts

@@ -1,45 +1,45 @@
-import { memoize, set } from "lodash";
-
-const genExpression = memoize(
-  (varNames: string[], expressionString: string) => {
-    // eslint-disable-next-line no-new-func
-    return new Function(...varNames, `return (${expressionString})`);
-  },
-  (varNames, expressionString) => {
-    return varNames.join(",") + ":" + expressionString;
-  },
-);
-
-export function interpreteExpression(expressionString: string, rootVars: Record<string, any>) {
-  const varNames = [];
-  const varValues = [];
-  for (const name in rootVars) {
-    varNames.push(name);
-    varValues.push(rootVars[name]);
-  }
-
-  let result;
-  try {
-    const expression = genExpression(varNames, expressionString);
-    result = expression(...varValues);
-  } catch (err: any) {
-    console.error(`Expression interprete error. expression: '${expressionString}', error:`, err.message);
-  }
-  return result;
-}
-
-export function interpreteConfigExpressions(config: Record<string, any>, vars: Record<string, any>) {
-  if (!config) {
-    return;
-  }
-
-  const propExpressions = config.$exps;
-  if (!propExpressions) {
-    return;
-  }
-
-  for (const propName in propExpressions) {
-    const propValue = interpreteExpression(propExpressions[propName], vars);
-    set(config, propName, propValue);
-  }
-}
+import { memoize, set } from "lodash";
+
+const genExpression = memoize(
+  (varNames: string[], expressionString: string) => {
+    // eslint-disable-next-line no-new-func
+    return new Function(...varNames, `return (${expressionString})`);
+  },
+  (varNames, expressionString) => {
+    return varNames.join(",") + ":" + expressionString;
+  },
+);
+
+export function interpreteExpression(expressionString: string, rootVars: Record<string, any>) {
+  const varNames = [];
+  const varValues = [];
+  for (const name in rootVars) {
+    varNames.push(name);
+    varValues.push(rootVars[name]);
+  }
+
+  let result;
+  try {
+    const expression = genExpression(varNames, expressionString);
+    result = expression(...varValues);
+  } catch (err: any) {
+    console.error(`Expression interprete error. expression: '${expressionString}', error:`, err.message);
+  }
+  return result;
+}
+
+export function interpreteConfigExpressions(config: Record<string, any>, vars: Record<string, any>) {
+  if (!config) {
+    return;
+  }
+
+  const propExpressions = config.$exps;
+  if (!propExpressions) {
+    return;
+  }
+
+  for (const propName in propExpressions) {
+    const propValue = interpreteExpression(propExpressions[propName], vars);
+    set(config, propName, propValue);
+  }
+}

package/src/core/actionHandler.ts

@@ -1,24 +1,24 @@
-import { RpdApplicationConfig } from "~/types";
-import { IRpdServer, RapidPlugin } from "./server";
-import { Next, RouteContext } from "./routeContext";
-import { Logger } from "~/facilities/log/LogFacility";
-import { CronJobConfiguration } from "~/types/cron-job-types";
-
-export interface ActionHandlerContext {
-  logger: Logger;
-  routerContext: RouteContext;
-  next?: Next;
-  server: IRpdServer;
-  vars?: Record<string, any>;
-  input?: any;
-  output?: any;
-  results: any[];
-  status?: Response["status"];
-}
-
-export type ActionHandler = (ctx: ActionHandlerContext, options: any) => void | Promise<void>;
-
-export interface IPluginActionHandler {
-  code: string;
-  handler: (plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) => void | Promise<void>;
-}
+import { RpdApplicationConfig } from "~/types";
+import { IRpdServer, RapidPlugin } from "./server";
+import { Next, RouteContext } from "./routeContext";
+import { Logger } from "~/facilities/log/LogFacility";
+import { CronJobConfiguration } from "~/types/cron-job-types";
+
+export interface ActionHandlerContext {
+  logger: Logger;
+  routerContext: RouteContext;
+  next?: Next;
+  server: IRpdServer;
+  vars?: Record<string, any>;
+  input?: any;
+  output?: any;
+  results: any[];
+  status?: Response["status"];
+}
+
+export type ActionHandler = (ctx: ActionHandlerContext, options: any) => void | Promise<void>;
+
+export interface IPluginActionHandler {
+  code: string;
+  handler: (plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) => void | Promise<void>;
+}

package/src/core/actionHandlers/ifActionHandler.ts

@@ -1,27 +1,27 @@
-import { ActionHandler, ActionHandlerContext, IPluginActionHandler } from "~/core/actionHandler";
-import { generatePasswordHash, validatePassword } from "~/utilities/passwordUtility";
-import { interpreteConfigExpressions, interpreteExpression } from "../ExpressionInterpreter";
-import { RpdRouteActionConfig } from "~/types";
-
-export const code = "if";
-
-export type IfActionHandlerConfig = {
-  condition: string;
-  then: RpdRouteActionConfig[];
-  otherwise: RpdRouteActionConfig[];
-};
-
-export async function handler(_plugin: any, ctx: ActionHandlerContext, options: IfActionHandlerConfig) {
-  const { server, input, routerContext: routeContext } = ctx;
-  const { response } = routeContext;
-  const { condition, then, otherwise } = options;
-
-  const conditionResult = interpreteExpression(condition, ctx.vars);
-  const actions: RpdRouteActionConfig[] = conditionResult ? then : otherwise;
-  if (!actions || !actions.length) {
-    return;
-  }
-  await server.runActionHandlers(ctx, actions);
-}
-
-export default { code, handler } as IPluginActionHandler;
+import { ActionHandler, ActionHandlerContext, IPluginActionHandler } from "~/core/actionHandler";
+import { generatePasswordHash, validatePassword } from "~/utilities/passwordUtility";
+import { interpreteConfigExpressions, interpreteExpression } from "../ExpressionInterpreter";
+import { RpdRouteActionConfig } from "~/types";
+
+export const code = "if";
+
+export type IfActionHandlerConfig = {
+  condition: string;
+  then: RpdRouteActionConfig[];
+  otherwise: RpdRouteActionConfig[];
+};
+
+export async function handler(_plugin: any, ctx: ActionHandlerContext, options: IfActionHandlerConfig) {
+  const { server, input, routerContext: routeContext } = ctx;
+  const { response } = routeContext;
+  const { condition, then, otherwise } = options;
+
+  const conditionResult = interpreteExpression(condition, ctx.vars);
+  const actions: RpdRouteActionConfig[] = conditionResult ? then : otherwise;
+  if (!actions || !actions.length) {
+    return;
+  }
+  await server.runActionHandlers(ctx, actions);
+}
+
+export default { code, handler } as IPluginActionHandler;

package/src/core/eventManager.ts

@@ -1,20 +1,20 @@
-import { EventEmitter } from "events";
-
-export default class EventManager<EventTypes extends Record<string, any[]>> {
-  #eventEmitter: EventEmitter;
-
-  constructor() {
-    this.#eventEmitter = new EventEmitter();
-  }
-
-  on<K extends keyof EventTypes>(eventName: K, listener: (...args: EventTypes[K]) => void) {
-    this.#eventEmitter.on(eventName as string, listener);
-  }
-
-  async emit<K extends keyof EventTypes>(eventName: K, ...args: EventTypes[K]) {
-    const listeners = this.#eventEmitter.listeners(eventName as string);
-    for (const listener of listeners) {
-      await listener(...args);
-    }
-  }
-}
+import { EventEmitter } from "events";
+
+export default class EventManager<EventTypes extends Record<string, any[]>> {
+  #eventEmitter: EventEmitter;
+
+  constructor() {
+    this.#eventEmitter = new EventEmitter();
+  }
+
+  on<K extends keyof EventTypes>(eventName: K, listener: (...args: EventTypes[K]) => void) {
+    this.#eventEmitter.on(eventName as string, listener);
+  }
+
+  async emit<K extends keyof EventTypes>(eventName: K, ...args: EventTypes[K]) {
+    const listeners = this.#eventEmitter.listeners(eventName as string);
+    for (const listener of listeners) {
+      await listener(...args);
+    }
+  }
+}

package/src/core/facility.ts

@@ -1,7 +1,7 @@
-import { IRpdServer } from "./server";
-
-export interface FacilityFactory<TFacility = any, TCreateFacilityOptions = any> {
-  name: string;
-
-  createFacility: (server: IRpdServer, options?: TCreateFacilityOptions) => Promise<TFacility>;
-}
+import { IRpdServer } from "./server";
+
+export interface FacilityFactory<TFacility = any, TCreateFacilityOptions = any> {
+  name: string;
+
+  createFacility: (server: IRpdServer, options?: TCreateFacilityOptions) => Promise<TFacility>;
+}

package/src/core/http/formDataParser.ts

@@ -1,87 +1,87 @@
-export type BodyData = Record<string, string | File | (string | File)[]>;
-export type ParseBodyOptions = {
-  /**
-   * Parse all fields with multiple values should be parsed as an array.
-   * @default false
-   * @example
-   * ```ts
-   * const data = new FormData()
-   * data.append('file', 'aaa')
-   * data.append('file', 'bbb')
-   * data.append('message', 'hello')
-   * ```
-   *
-   * If `all` is `false`:
-   * parseBody should return `{ file: 'bbb', message: 'hello' }`
-   *
-   * If `all` is `true`:
-   * parseBody should return `{ file: ['aaa', 'bbb'], message: 'hello' }`
-   */
-  all?: boolean;
-};
-
-export const parseFormDataBody = async <T extends BodyData = BodyData>(request: Request, options: ParseBodyOptions = { all: false }): Promise<T> => {
-  const contentType = request.headers.get("Content-Type");
-
-  if (isFormDataContent(contentType)) {
-    return parseFormData<T>(request, options);
-  }
-
-  return {} as T;
-};
-
-function isFormDataContent(contentType: string | null): boolean {
-  if (contentType === null) {
-    return false;
-  }
-
-  return contentType.startsWith("multipart/form-data") || contentType.startsWith("application/x-www-form-urlencoded");
-}
-
-async function parseFormData<T extends BodyData = BodyData>(request: Request, options: ParseBodyOptions): Promise<T> {
-  const formData = await (request as Request).formData();
-
-  if (formData) {
-    return convertFormDataToBodyData<T>(formData, options);
-  }
-
-  return {} as T;
-}
-
-function convertFormDataToBodyData<T extends BodyData = BodyData>(formData: FormData, options: ParseBodyOptions): T {
-  const form: BodyData = {};
-
-  formData.forEach((value, key) => {
-    const shouldParseAllValues = options.all || key.endsWith("[]");
-
-    if (!shouldParseAllValues) {
-      form[key] = value;
-    } else {
-      handleParsingAllValues(form, key, value);
-    }
-  });
-
-  return form as T;
-}
-
-const handleParsingAllValues = (form: BodyData, key: string, value: FormDataEntryValue): void => {
-  if (form[key] && isArrayField(form[key])) {
-    appendToExistingArray(form[key] as (string | File)[], value);
-  } else if (form[key]) {
-    convertToNewArray(form, key, value);
-  } else {
-    form[key] = value;
-  }
-};
-
-function isArrayField(field: unknown): field is (string | File)[] {
-  return Array.isArray(field);
-}
-
-const appendToExistingArray = (arr: (string | File)[], value: FormDataEntryValue): void => {
-  arr.push(value);
-};
-
-const convertToNewArray = (form: BodyData, key: string, value: FormDataEntryValue): void => {
-  form[key] = [form[key] as string | File, value];
-};
+export type BodyData = Record<string, string | File | (string | File)[]>;
+export type ParseBodyOptions = {
+  /**
+   * Parse all fields with multiple values should be parsed as an array.
+   * @default false
+   * @example
+   * ```ts
+   * const data = new FormData()
+   * data.append('file', 'aaa')
+   * data.append('file', 'bbb')
+   * data.append('message', 'hello')
+   * ```
+   *
+   * If `all` is `false`:
+   * parseBody should return `{ file: 'bbb', message: 'hello' }`
+   *
+   * If `all` is `true`:
+   * parseBody should return `{ file: ['aaa', 'bbb'], message: 'hello' }`
+   */
+  all?: boolean;
+};
+
+export const parseFormDataBody = async <T extends BodyData = BodyData>(request: Request, options: ParseBodyOptions = { all: false }): Promise<T> => {
+  const contentType = request.headers.get("Content-Type");
+
+  if (isFormDataContent(contentType)) {
+    return parseFormData<T>(request, options);
+  }
+
+  return {} as T;
+};
+
+function isFormDataContent(contentType: string | null): boolean {
+  if (contentType === null) {
+    return false;
+  }
+
+  return contentType.startsWith("multipart/form-data") || contentType.startsWith("application/x-www-form-urlencoded");
+}
+
+async function parseFormData<T extends BodyData = BodyData>(request: Request, options: ParseBodyOptions): Promise<T> {
+  const formData = await (request as Request).formData();
+
+  if (formData) {
+    return convertFormDataToBodyData<T>(formData, options);
+  }
+
+  return {} as T;
+}
+
+function convertFormDataToBodyData<T extends BodyData = BodyData>(formData: FormData, options: ParseBodyOptions): T {
+  const form: BodyData = {};
+
+  formData.forEach((value, key) => {
+    const shouldParseAllValues = options.all || key.endsWith("[]");
+
+    if (!shouldParseAllValues) {
+      form[key] = value;
+    } else {
+      handleParsingAllValues(form, key, value);
+    }
+  });
+
+  return form as T;
+}
+
+const handleParsingAllValues = (form: BodyData, key: string, value: FormDataEntryValue): void => {
+  if (form[key] && isArrayField(form[key])) {
+    appendToExistingArray(form[key] as (string | File)[], value);
+  } else if (form[key]) {
+    convertToNewArray(form, key, value);
+  } else {
+    form[key] = value;
+  }
+};
+
+function isArrayField(field: unknown): field is (string | File)[] {
+  return Array.isArray(field);
+}
+
+const appendToExistingArray = (arr: (string | File)[], value: FormDataEntryValue): void => {
+  arr.push(value);
+};
+
+const convertToNewArray = (form: BodyData, key: string, value: FormDataEntryValue): void => {
+  form[key] = [form[key] as string | File, value];
+};

package/src/core/http-types.ts

@@ -1,4 +1,4 @@
-export type HttpStatus = number;
-export type ResponseData = string | ArrayBuffer | ReadableStream;
-
-export type HeadersDefinition = [string, string][] | Record<string, string>;
+export type HttpStatus = number;
+export type ResponseData = string | ArrayBuffer | ReadableStream;
+
+export type HeadersDefinition = [string, string][] | Record<string, string>;