@ruiapp/rapid-core 0.1.55 → 0.1.56

package/dist/dataAccess/entityManager.d.ts

@@ -6,11 +6,11 @@ export default class EntityManager<TEntity = any> {
     getModel(): RpdDataModel;
     findEntities(options: FindEntityOptions): Promise<TEntity[]>;
     findEntity(options: FindEntityOptions): Promise<TEntity | null>;
-    findById(options: FindEntityByIdOptions): Promise<TEntity | null>;
+    findById(options: FindEntityByIdOptions | string | number): Promise<TEntity | null>;
     createEntity(options: CreateEntityOptions, plugin?: RapidPlugin): Promise<TEntity>;
     updateEntityById(options: UpdateEntityByIdOptions, plugin?: RapidPlugin): Promise<TEntity>;
     count(options: CountEntityOptions): Promise<CountEntityResult>;
-    deleteById(options: DeleteEntityByIdOptions, plugin?: RapidPlugin): Promise<void>;
+    deleteById(options: DeleteEntityByIdOptions | string | number, plugin?: RapidPlugin): Promise<void>;
     addRelations(options: AddEntityRelationsOptions, plugin?: RapidPlugin): Promise<void>;
     removeRelations(options: RemoveEntityRelationsOptions, plugin?: RapidPlugin): Promise<void>;
 }

package/dist/index.js

@@ -1999,10 +1999,10 @@ async function findEntities(server, dataAccessor, options) {
     }
     let propertiesToSlect;
     if (!options.properties || !options.properties.length) {
-        propertiesToSlect = getEntityPropertiesIncludingBase(server, model).filter(property => !isRelationProperty(property));
+        propertiesToSlect = getEntityPropertiesIncludingBase(server, model).filter((property) => !isRelationProperty(property));
     }
     else {
-        propertiesToSlect = getEntityPropertiesIncludingBase(server, model).filter(property => options.properties.includes(property.code));
+        propertiesToSlect = getEntityPropertiesIncludingBase(server, model).filter((property) => options.properties.includes(property.code));
     }
     const columnsToSelect = [];
     const relationPropertiesToSelect = [];
@@ -2044,7 +2044,7 @@ async function findEntities(server, dataAccessor, options) {
     });
     // if `keepNonPropertyFields` is true and `properties` are not specified, then select relation columns automatically.
     if (options.keepNonPropertyFields && (!options.properties || !options.properties.length)) {
-        const oneRelationPropertiesWithNoLinkTable = getEntityPropertiesIncludingBase(server, model).filter(property => property.relation === "one" && !property.linkTableName);
+        const oneRelationPropertiesWithNoLinkTable = getEntityPropertiesIncludingBase(server, model).filter((property) => property.relation === "one" && !property.linkTableName);
         oneRelationPropertiesWithNoLinkTable.forEach((property) => {
             if (property.targetIdColumnName) {
                 columnsToSelect.push({
@@ -2338,7 +2338,7 @@ async function convertEntityFiltersToRowFilters(server, model, baseModel, filter
                 operator: filter.operator,
                 field: {
                     name: columnName,
-                    tableName: (property && property.isBaseProperty) ? baseModel.tableName : model.tableName,
+                    tableName: property && property.isBaseProperty ? baseModel.tableName : model.tableName,
                 },
                 value: filter.value,
                 itemType: filter.itemType,

package/package.json

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

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>;

package/src/dataAccess/entityManager.ts

@@ -68,9 +68,9 @@ async function findEntities(server: IRpdServer, dataAccessor: IRpdDataAccessor,
 
   let propertiesToSlect: RpdDataModelProperty[];
   if (!options.properties || !options.properties.length) {
-    propertiesToSlect = getEntityPropertiesIncludingBase(server, model).filter(property => !isRelationProperty(property));
+    propertiesToSlect = getEntityPropertiesIncludingBase(server, model).filter((property) => !isRelationProperty(property));
   } else {
-    propertiesToSlect = getEntityPropertiesIncludingBase(server, model).filter(property => options.properties.includes(property.code));
+    propertiesToSlect = getEntityPropertiesIncludingBase(server, model).filter((property) => options.properties.includes(property.code));
   }
 
   const columnsToSelect: ColumnQueryOptions[] = [];
@@ -114,7 +114,7 @@ async function findEntities(server: IRpdServer, dataAccessor: IRpdDataAccessor,
 
   // if `keepNonPropertyFields` is true and `properties` are not specified, then select relation columns automatically.
   if (options.keepNonPropertyFields && (!options.properties || !options.properties.length)) {
-    const oneRelationPropertiesWithNoLinkTable = getEntityPropertiesIncludingBase(server, model).filter(property => property.relation === "one" && !property.linkTableName);
+    const oneRelationPropertiesWithNoLinkTable = getEntityPropertiesIncludingBase(server, model).filter((property) => property.relation === "one" && !property.linkTableName);
     oneRelationPropertiesWithNoLinkTable.forEach((property) => {
       if (property.targetIdColumnName) {
         columnsToSelect.push({
@@ -429,7 +429,7 @@ async function convertEntityFiltersToRowFilters(server: IRpdServer, model: RpdDa
         operator: filter.operator,
         field: {
           name: columnName,
-          tableName: (property && property.isBaseProperty) ? baseModel.tableName : model.tableName,
+          tableName: property && property.isBaseProperty ? baseModel.tableName : model.tableName,
         },
         value: (filter as any).value,
         itemType: (filter as any).itemType,
@@ -789,7 +789,7 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
       updatedEntityOneRelationProps[property.code] = targetEntity;
       targetRow[property.targetIdColumnName!] = targetEntityId;
     }
-  };
+  }
 
   let updatedRow = row;
   if (Object.keys(row).length) {
@@ -803,7 +803,7 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
     updatedBaseRow = await baseDataAccessor.updateById(id, updatedBaseRow);
   }
 
-  let updatedEntity = mapDbRowToEntity(server, model, {...updatedRow, ...updatedBaseRow, ...updatedEntityOneRelationProps}, true);
+  let updatedEntity = mapDbRowToEntity(server, model, { ...updatedRow, ...updatedBaseRow, ...updatedEntityOneRelationProps }, true);
   updatedEntity = Object.assign({}, entity, updatedEntity);
 
   // save many-relation properties
@@ -923,7 +923,7 @@ export default class EntityManager<TEntity = any> {
     return await findEntity(this.#server, this.#dataAccessor, options);
   }
 
-  async findById(options: FindEntityByIdOptions): Promise<TEntity | null> {
+  async findById(options: FindEntityByIdOptions | string | number): Promise<TEntity | null> {
     // options is id
     if (!isObject(options)) {
       options = {
@@ -951,11 +951,11 @@ export default class EntityManager<TEntity = any> {
     }
     const countRowOptions: CountRowOptions = {
       filters: await convertEntityFiltersToRowFilters(this.#server, model, baseModel, options.filters),
-    }
+    };
     return await this.#dataAccessor.count(countRowOptions);
   }
 
-  async deleteById(options: DeleteEntityByIdOptions, plugin?: RapidPlugin): Promise<void> {
+  async deleteById(options: DeleteEntityByIdOptions | string | number, plugin?: RapidPlugin): Promise<void> {
     // options is id
     if (!isObject(options)) {
       options = {

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/helpers/inputHelper.ts

@@ -1,11 +1,11 @@
-import { isArray, mergeWith } from "lodash";
-
-export function mergeInput(defaultInput: any, input: any, fixedInput: any) {
-  return mergeWith({}, defaultInput, input, fixedInput, doNotMergeArray);
-}
-
-function doNotMergeArray(objValue: any, srcValue: any) {
-  if (isArray(srcValue)) {
-    return srcValue;
-  }
-}
+import { isArray, mergeWith } from "lodash";
+
+export function mergeInput(defaultInput: any, input: any, fixedInput: any) {
+  return mergeWith({}, defaultInput, input, fixedInput, doNotMergeArray);
+}
+
+function doNotMergeArray(objValue: any, srcValue: any) {
+  if (isArray(srcValue)) {
+    return srcValue;
+  }
+}

package/src/plugins/serverOperation/actionHandlers/runServerOperation.ts

@@ -1,15 +1,15 @@
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
-
-export const code = "runServerOperation";
-
-export async function handler(
-  plugin: RapidPlugin,
-  ctx: ActionHandlerContext,
-  options: {
-    operation: (ctx: ActionHandlerContext) => Promise<void>;
-  },
-) {
-  const { operation } = options;
-  await operation(ctx);
-}
+import { ActionHandlerContext } from "~/core/actionHandler";
+import { RapidPlugin } from "~/core/server";
+
+export const code = "runServerOperation";
+
+export async function handler(
+  plugin: RapidPlugin,
+  ctx: ActionHandlerContext,
+  options: {
+    operation: (ctx: ActionHandlerContext) => Promise<void>;
+  },
+) {
+  const { operation } = options;
+  await operation(ctx);
+}

package/src/plugins/stateMachine/stateMachineHelper.ts

@@ -1,36 +1,36 @@
-import { DefaultStateMachineSnapshot, GetStateMachineNextSnapshotOptions, TryGetStateMachineNextSnapshotResult } from "./StateMachinePluginTypes";
-import { createMachine, getInitialSnapshot, getNextSnapshot } from "xstate";
-
-export async function getStateMachineNextSnapshot(options: GetStateMachineNextSnapshotOptions) {
-  const { machineConfig, currentState, event } = options;
-  machineConfig.initial = currentState;
-
-  const machine = createMachine(machineConfig);
-  const snapshot = getInitialSnapshot(machine);
-
-  if (!snapshot.can(event)) {
-    throw new Error(`'${event.type}' action is not allowed at '${currentState}' state.`);
-  }
-
-  const nextSnapshot = getNextSnapshot(machine, snapshot, event);
-  return nextSnapshot;
-}
-
-export async function tryGetStateMachineNextSnapshot(options: GetStateMachineNextSnapshotOptions): Promise<TryGetStateMachineNextSnapshotResult> {
-  const { machineConfig, currentState, event } = options;
-  machineConfig.initial = currentState;
-
-  const machine = createMachine(machineConfig);
-  const snapshot = getInitialSnapshot(machine);
-
-  const canTransfer = snapshot.can(event);
-  let nextSnapshot: DefaultStateMachineSnapshot;
-  if (canTransfer) {
-    nextSnapshot = getNextSnapshot(machine, snapshot, event);
-  }
-
-  return {
-    canTransfer,
-    nextSnapshot,
-  };
-}
+import { DefaultStateMachineSnapshot, GetStateMachineNextSnapshotOptions, TryGetStateMachineNextSnapshotResult } from "./StateMachinePluginTypes";
+import { createMachine, getInitialSnapshot, getNextSnapshot } from "xstate";
+
+export async function getStateMachineNextSnapshot(options: GetStateMachineNextSnapshotOptions) {
+  const { machineConfig, currentState, event } = options;
+  machineConfig.initial = currentState;
+
+  const machine = createMachine(machineConfig);
+  const snapshot = getInitialSnapshot(machine);
+
+  if (!snapshot.can(event)) {
+    throw new Error(`'${event.type}' action is not allowed at '${currentState}' state.`);
+  }
+
+  const nextSnapshot = getNextSnapshot(machine, snapshot, event);
+  return nextSnapshot;
+}
+
+export async function tryGetStateMachineNextSnapshot(options: GetStateMachineNextSnapshotOptions): Promise<TryGetStateMachineNextSnapshotResult> {
+  const { machineConfig, currentState, event } = options;
+  machineConfig.initial = currentState;
+
+  const machine = createMachine(machineConfig);
+  const snapshot = getInitialSnapshot(machine);
+
+  const canTransfer = snapshot.can(event);
+  let nextSnapshot: DefaultStateMachineSnapshot;
+  if (canTransfer) {
+    nextSnapshot = getNextSnapshot(machine, snapshot, event);
+  }
+
+  return {
+    canTransfer,
+    nextSnapshot,
+  };
+}

package/src/plugins/webhooks/pluginConfig.ts

@@ -1,74 +1,74 @@
-import { RpdApplicationConfig } from "~/types";
-
-export default {
-  models: [
-    {
-      name: "webhook",
-      namespace: "sys",
-      singularCode: "webhook",
-      pluralCode: "webhooks",
-      schema: "public",
-      tableName: "sys_webhooks",
-      properties: [
-        {
-          name: "id",
-          code: "id",
-          columnName: "id",
-          type: "integer",
-          required: true,
-          autoIncrement: true,
-        },
-        {
-          name: "name",
-          code: "name",
-          columnName: "name",
-          type: "text",
-          required: true,
-        },
-        {
-          name: "url",
-          code: "url",
-          columnName: "url",
-          type: "text",
-          required: true,
-        },
-        {
-          name: "secret",
-          code: "secret",
-          columnName: "secret",
-          type: "text",
-          required: false,
-        },
-        {
-          name: "namespace",
-          code: "namespace",
-          columnName: "namespace",
-          type: "text",
-          required: true,
-        },
-        {
-          name: "model singular code",
-          code: "modelSingularCode",
-          columnName: "model_singular_code",
-          type: "text",
-          required: true,
-        },
-        {
-          name: "events",
-          code: "events",
-          columnName: "events",
-          type: "json",
-          required: false,
-        },
-        {
-          name: "enabled",
-          code: "enabled",
-          columnName: "enabled",
-          type: "boolean",
-          required: true,
-        },
-      ],
-    },
-  ],
-  routes: [],
-} satisfies RpdApplicationConfig;
+import { RpdApplicationConfig } from "~/types";
+
+export default {
+  models: [
+    {
+      name: "webhook",
+      namespace: "sys",
+      singularCode: "webhook",
+      pluralCode: "webhooks",
+      schema: "public",
+      tableName: "sys_webhooks",
+      properties: [
+        {
+          name: "id",
+          code: "id",
+          columnName: "id",
+          type: "integer",
+          required: true,
+          autoIncrement: true,
+        },
+        {
+          name: "name",
+          code: "name",
+          columnName: "name",
+          type: "text",
+          required: true,
+        },
+        {
+          name: "url",
+          code: "url",
+          columnName: "url",
+          type: "text",
+          required: true,
+        },
+        {
+          name: "secret",
+          code: "secret",
+          columnName: "secret",
+          type: "text",
+          required: false,
+        },
+        {
+          name: "namespace",
+          code: "namespace",
+          columnName: "namespace",
+          type: "text",
+          required: true,
+        },
+        {
+          name: "model singular code",
+          code: "modelSingularCode",
+          columnName: "model_singular_code",
+          type: "text",
+          required: true,
+        },
+        {
+          name: "events",
+          code: "events",
+          columnName: "events",
+          type: "json",
+          required: false,
+        },
+        {
+          name: "enabled",
+          code: "enabled",
+          columnName: "enabled",
+          type: "boolean",
+          required: true,
+        },
+      ],
+    },
+  ],
+  routes: [],
+} satisfies RpdApplicationConfig;

package/src/proxy/types.ts

@@ -1,21 +1,21 @@
-import { RapidRequest } from "~/core/request";
-import { RunProxyHandlerOptions } from "../types";
-import { RapidResponse } from "~/core/response";
-
-export interface ProxyContext {
-  sourceContext: ProxySourceContext;
-  targetContext: ProxyTargetContext;
-  options: ProxyOptions;
-}
-
-export interface ProxySourceContext {
-  request: RapidRequest;
-  response: RapidResponse;
-}
-
-export interface ProxyTargetContext {
-  request?: RapidRequest;
-  response?: RapidResponse;
-}
-
-export type ProxyOptions = RunProxyHandlerOptions;
+import { RapidRequest } from "~/core/request";
+import { RunProxyHandlerOptions } from "../types";
+import { RapidResponse } from "~/core/response";
+
+export interface ProxyContext {
+  sourceContext: ProxySourceContext;
+  targetContext: ProxyTargetContext;
+  options: ProxyOptions;
+}
+
+export interface ProxySourceContext {
+  request: RapidRequest;
+  response: RapidResponse;
+}
+
+export interface ProxyTargetContext {
+  request?: RapidRequest;
+  response?: RapidResponse;
+}
+
+export type ProxyOptions = RunProxyHandlerOptions;

package/src/queryBuilder/index.ts

@@ -1 +1 @@
-export * from "./queryBuilder";
+export * from "./queryBuilder";

package/src/utilities/rapidUtility.ts

@@ -1,5 +1,5 @@
-import { RpdDataModelProperty } from "../types";
-
-export function isRelationProperty(property: RpdDataModelProperty) {
-  return property.type === "relation" || property.type === "relation[]";
-}
+import { RpdDataModelProperty } from "../types";
+
+export function isRelationProperty(property: RpdDataModelProperty) {
+  return property.type === "relation" || property.type === "relation[]";
+}

package/src/utilities/typeUtility.ts

@@ -1,11 +1,11 @@
-export function isUndefined(val: any) {
-  return typeof val === "undefined";
-}
-
-export function isNull(val: any) {
-  return val === null;
-}
-
-export function isNullOrUndefined(val: any) {
-  return isNull(val) || isUndefined(val);
-}
+export function isUndefined(val: any) {
+  return typeof val === "undefined";
+}
+
+export function isNull(val: any) {
+  return val === null;
+}
+
+export function isNullOrUndefined(val: any) {
+  return isNull(val) || isUndefined(val);
+}