@ruiapp/rapid-core 0.9.7 → 0.9.9

package/CHANGELOG.md

@@ -1,11 +1,11 @@
-# @ruiapp/rapid-core
-
-## 0.7.0
-
-- feature: added server.registerCronJob to allow plugins register cron jobs.
-
-## 0.2.4
-
-### Patch Changes
-
-- 146a99d: add between filterMode, range is deprecated
+# @ruiapp/rapid-core
+
+## 0.7.0
+
+- feature: added server.registerCronJob to allow plugins register cron jobs.
+
+## 0.2.4
+
+### Patch Changes
+
+- 146a99d: add between filterMode, range is deprecated

package/dist/helpers/entityHelper.d.ts

@@ -1,3 +1,3 @@
 import { IRpdServer } from "../core/server";
-import { RpdDataModel } from "../types";
-export declare function detectChangedFieldsOfEntity(server: IRpdServer, model: RpdDataModel, before: any, after: any): Record<string, any> | null;
+import { RpdDataModel, UpdateEntityByIdOptions } from "../types";
+export declare function detectChangedFieldsOfEntity(server: IRpdServer, model: RpdDataModel, before: any, after: any, relationPropertiesToUpdate: UpdateEntityByIdOptions["relationPropertiesToUpdate"]): Record<string, any> | null;

package/dist/index.d.ts

@@ -13,6 +13,7 @@ export { default as EntityManager } from "./dataAccess/entityManager";
 export * from "./dataAccess/entityManager";
 export * from "./utilities/accessControlUtility";
 export * from "./utilities/entityUtility";
+export * from "./utilities/fsUtility";
 export * from "./utilities/jwtUtility";
 export * from "./utilities/timeUtility";
 export * from "./utilities/passwordUtility";

package/dist/index.js

@@ -7,11 +7,11 @@ var events = require('events');
 var Router = require('koa-tree-router');
 var qs = require('qs');
 var dayjs = require('dayjs');
+var fs = require('fs');
+var path = require('path');
 var jsonwebtoken = require('jsonwebtoken');
 var crypto = require('crypto');
 var bcrypt = require('bcryptjs');
-var path = require('path');
-var fs = require('fs');
 var uuid = require('uuid');
 var nodemailer = require('nodemailer');
 var cron = require('cron');
@@ -22,10 +22,10 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var Router__default = /*#__PURE__*/_interopDefaultLegacy(Router);
 var qs__default = /*#__PURE__*/_interopDefaultLegacy(qs);
 var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
+var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
+var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 var crypto__default = /*#__PURE__*/_interopDefaultLegacy(crypto);
 var bcrypt__default = /*#__PURE__*/_interopDefaultLegacy(bcrypt);
-var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var nodemailer__default = /*#__PURE__*/_interopDefaultLegacy(nodemailer);
 
 function fixBigIntJSONSerialize() {
@@ -2246,7 +2246,7 @@ function mapPropertyNameToColumnName(server, model, propertyName) {
     return property.columnName || property.code;
 }
 
-function detectChangedFieldsOfEntity(server, model, before, after) {
+function detectChangedFieldsOfEntity(server, model, before, after, relationPropertiesToUpdate) {
     if (!before) {
         throw new Error("Argument 'before' can not be null.");
     }
@@ -2261,6 +2261,11 @@ function detectChangedFieldsOfEntity(server, model, before, after) {
             const afterValue = after[key];
             const beforeValue = before[key] || before[property.targetIdColumnName];
             if (afterValue) {
+                if (relationPropertiesToUpdate && relationPropertiesToUpdate[property.code]) {
+                    changed = true;
+                    changes[key] = afterValue;
+                    continue;
+                }
                 if (lodash.isNumber(afterValue)) {
                     if (beforeValue) {
                         if (lodash.isNumber(beforeValue)) {
@@ -2863,8 +2868,8 @@ async function findManyRelationLinksViaLinkTable(options) {
     const command = `SELECT * FROM ${server.queryBuilder.quoteTable({
         schema: relationProperty.linkSchema,
         tableName: relationProperty.linkTableName,
-    })} WHERE ${server.queryBuilder.quoteObject(relationProperty.selfIdColumnName)} = ANY($1::int[])
-    ORDER BY id
+    })} WHERE ${server.queryBuilder.quoteObject(relationProperty.selfIdColumnName)} = ANY($1::int[])
+    ORDER BY id
   `;
     const params = [mainEntityIds];
     const relationLinks = await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
@@ -3251,7 +3256,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
     if (!entity) {
         throw new Error(`${model.namespace}.${model.singularCode}  with id "${id}" was not found.`);
     }
-    let changes = detectChangedFieldsOfEntity(server, model, entity, entityToSave);
+    let changes = detectChangedFieldsOfEntity(server, model, entity, entityToSave, options.relationPropertiesToUpdate);
     if (!changes && !options.operation) {
         return entity;
     }
@@ -3281,7 +3286,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
         sender: plugin,
         routeContext: options.routeContext,
     });
-    changes = detectChangedFieldsOfEntity(server, model, entity, entityToSave);
+    changes = detectChangedFieldsOfEntity(server, model, entity, entityToSave, options.relationPropertiesToUpdate);
     // check readonly properties
     Object.keys(changes).forEach((propertyName) => {
         let isReadonlyProperty = false;
@@ -3495,7 +3500,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
             await server.queryDatabaseObject(`DELETE FROM ${server.queryBuilder.quoteTable({
                 schema: property.linkSchema,
                 tableName: property.linkTableName,
-            })} WHERE ${server.queryBuilder.quoteObject(property.selfIdColumnName)} = $1
+            })} WHERE ${server.queryBuilder.quoteObject(property.selfIdColumnName)} = $1
               AND ${server.queryBuilder.quoteObject(property.targetIdColumnName)} <> ALL($2::int[])`, [id, targetIdsToKeep], routeContext?.getDbTransactionClient());
         }
         else {
@@ -3524,8 +3529,8 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
                     await server.queryDatabaseObject(`UPDATE ${server.queryBuilder.quoteTable({
                         schema: relationModel.schema,
                         tableName: relationModel.tableName,
-                    })}
-            SET ${server.queryBuilder.quoteObject(property.selfIdColumnName)} = null
+                    })}
+            SET ${server.queryBuilder.quoteObject(property.selfIdColumnName)} = null
             WHERE id = ANY($1::int[])`, [targetIdsToRemove], routeContext?.getDbTransactionClient());
                 }
                 else {
@@ -3810,7 +3815,7 @@ async function deleteEntityById(server, dataAccessor, options, plugin) {
                         await server.queryDatabaseObject(`DELETE FROM ${server.queryBuilder.quoteTable({
                             schema: relationProperty.linkSchema,
                             tableName: relationProperty.linkTableName,
-                        })}
+                        })}
               WHERE ${server.queryBuilder.quoteObject(relationProperty.selfIdColumnName)} = $1`, [id], routeContext?.getDbTransactionClient());
                     }
                     else {
@@ -3820,8 +3825,8 @@ async function deleteEntityById(server, dataAccessor, options, plugin) {
                         await server.queryDatabaseObject(`UPDATE ${server.queryBuilder.quoteTable({
                             schema: relationModel.schema,
                             tableName: relationModel.tableName,
-                        })}
-              SET ${server.queryBuilder.quoteObject(relationProperty.selfIdColumnName)} = null
+                        })}
+              SET ${server.queryBuilder.quoteObject(relationProperty.selfIdColumnName)} = null
               WHERE ${server.queryBuilder.quoteObject(relationProperty.selfIdColumnName)} = $1`, [id], routeContext?.getDbTransactionClient());
                     }
                 }
@@ -3918,11 +3923,11 @@ class EntityManager {
                 const command = `INSERT INTO ${queryBuilder.quoteTable({
                     schema: relationProperty.linkSchema,
                     tableName: relationProperty.linkTableName,
-                })} (${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}, ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)})
-    SELECT $1, $2 WHERE NOT EXISTS (
-      SELECT ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}, ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}
-        FROM ${queryBuilder.quoteTable({ schema: relationProperty.linkSchema, tableName: relationProperty.linkTableName })}
-        WHERE ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}=$1 AND ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}=$2
+                })} (${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}, ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)})
+    SELECT $1, $2 WHERE NOT EXISTS (
+      SELECT ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}, ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}
+        FROM ${queryBuilder.quoteTable({ schema: relationProperty.linkSchema, tableName: relationProperty.linkTableName })}
+        WHERE ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}=$1 AND ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}=$2
       )`;
                 const params = [id, relation.id];
                 await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
@@ -3962,7 +3967,7 @@ class EntityManager {
         const { queryBuilder } = server;
         if (relationProperty.linkTableName) {
             for (const relation of relations) {
-                const command = `DELETE FROM ${queryBuilder.quoteTable({ schema: relationProperty.linkSchema, tableName: relationProperty.linkTableName })}
+                const command = `DELETE FROM ${queryBuilder.quoteTable({ schema: relationProperty.linkSchema, tableName: relationProperty.linkTableName })}
     WHERE ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}=$1 AND ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}=$2;`;
                 const params = [id, relation.id];
                 await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
@@ -4941,6 +4946,128 @@ function getEntityRelationTargetId(entity, propName, targetColumnName) {
     }
 }
 
+async function readFile(path) {
+    return new Promise((resolve, reject) => {
+        fs__default["default"].readFile(path, null, (err, data) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve(data);
+            }
+        });
+    });
+}
+async function copyFile(fromPath, toPath) {
+    return new Promise((resolve, reject) => {
+        fs__default["default"].copyFile(fromPath, toPath, (err) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve();
+            }
+        });
+    });
+}
+async function removeFile(path) {
+    return new Promise((resolve, reject) => {
+        fs__default["default"].rm(path, (err) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve();
+            }
+        });
+    });
+}
+async function moveFile(fromPath, toPath) {
+    return new Promise((resolve, reject) => {
+        fs__default["default"].rename(fromPath, toPath, (err) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve();
+            }
+        });
+    });
+}
+async function appendFile(path, data) {
+    return new Promise((resolve, reject) => {
+        fs__default["default"].appendFile(path, Buffer.from(data), (err) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve();
+            }
+        });
+    });
+}
+async function writeFile(path, data) {
+    return new Promise((resolve, reject) => {
+        fs__default["default"].writeFile(path, Buffer.from(data), (err) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve();
+            }
+        });
+    });
+}
+function ensureDirectoryExists(dirPath) {
+    if (!fs__default["default"].existsSync(dirPath)) {
+        const parentDirPath = path__default["default"].dirname(dirPath);
+        if (parentDirPath == dirPath) {
+            return;
+        }
+        ensureDirectoryExists(parentDirPath);
+        fs__default["default"].mkdirSync(dirPath);
+    }
+}
+function enumFileBaseNamesInDirectory(options) {
+    const { dirPath, prefix, fileNameFilter } = options;
+    let fileNames = [];
+    let resolvedDirPath = dirPath;
+    const isRelative = dirPath.startsWith(".") || dirPath.startsWith("..");
+    if (isRelative) {
+        resolvedDirPath = path__default["default"].join(process.cwd(), dirPath);
+    }
+    if (!fs__default["default"].existsSync(resolvedDirPath)) {
+        console.warn(`Directory '${resolvedDirPath}' not found.`);
+        return [];
+    }
+    const files = fs__default["default"].readdirSync(resolvedDirPath);
+    for (const fileName of files) {
+        const filePathName = path__default["default"].join(resolvedDirPath, fileName);
+        const fileStat = fs__default["default"].statSync(filePathName);
+        if (fileStat.isDirectory()) {
+            fileNames = fileNames.concat(enumFileBaseNamesInDirectory({
+                dirPath: filePathName,
+                prefix: prefix ? `${prefix}/${fileName}` : fileName,
+                fileNameFilter,
+            }));
+        }
+        else if (fileStat.isFile()) {
+            if (fileNameFilter && !fileNameFilter(fileName)) {
+                continue;
+            }
+            const baseName = path__default["default"].parse(fileName).name;
+            if (prefix) {
+                fileNames.push(`${prefix}/${baseName}`);
+            }
+            else {
+                fileNames.push(baseName);
+            }
+        }
+    }
+    fileNames.sort();
+    return fileNames;
+}
+
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // This module is browser compatible.
 /**
@@ -5471,9 +5598,9 @@ class MetaService {
                 await server.tryQueryDatabaseObject(`COMMENT ON TABLE ${queryBuilder.quoteTable(model)} IS ${queryBuilder.formatValueToSqlLiteral(model.name)};`, []);
             }
         }
-        const sqlQueryColumnInformations = `SELECT c.table_schema, c.table_name, c.column_name, c.ordinal_position, d.description, c.data_type,  c.udt_name, c.is_nullable, c.column_default, c.character_maximum_length, c.numeric_precision, c.numeric_scale
-      FROM information_schema.columns c
-      INNER JOIN pg_catalog.pg_statio_all_tables st ON (st.schemaname = c.table_schema and st.relname = c.table_name)
+        const sqlQueryColumnInformations = `SELECT c.table_schema, c.table_name, c.column_name, c.ordinal_position, d.description, c.data_type,  c.udt_name, c.is_nullable, c.column_default, c.character_maximum_length, c.numeric_precision, c.numeric_scale
+      FROM information_schema.columns c
+      INNER JOIN pg_catalog.pg_statio_all_tables st ON (st.schemaname = c.table_schema and st.relname = c.table_name)
       LEFT JOIN pg_catalog.pg_description d ON (d.objoid = st.relid and d.objsubid = c.ordinal_position);`;
         const columnsInDb = await server.queryDatabaseObject(sqlQueryColumnInformations, []);
         for (const model of applicationConfig.models) {
@@ -7373,31 +7500,6 @@ class AuthPlugin {
     }
 }
 
-async function readFile(path) {
-    return new Promise((resolve, reject) => {
-        fs__default["default"].readFile(path, null, (err, data) => {
-            if (err) {
-                reject(err);
-            }
-            else {
-                resolve(data);
-            }
-        });
-    });
-}
-async function appendFile(path, data) {
-    return new Promise((resolve, reject) => {
-        fs__default["default"].appendFile(path, Buffer.from(data), (err) => {
-            if (err) {
-                reject(err);
-            }
-            else {
-                resolve();
-            }
-        });
-    });
-}
-
 function getFileBaseName(pathname) {
     const extName = path__default["default"].extname(pathname);
     return path__default["default"].basename(pathname, extName);
@@ -7511,7 +7613,7 @@ async function handler$8(plugin, ctx, options) {
     const fileKey = `${uuid.v1()}${extName}`;
     const filePathName = path__default["default"].join(server.config.localFileStoragePath, fileKey);
     const fileBuffer = await file.arrayBuffer();
-    await appendFile(filePathName, fileBuffer);
+    await writeFile(filePathName, fileBuffer);
     ctx.output = { ok: true, fileKey };
 }
 
@@ -9661,9 +9763,9 @@ class EntityAccessControlPlugin {
         if (!userId) {
             return;
         }
-        const actions = await server.queryDatabaseObject(`select distinct a.* from sys_actions a
-      inner join oc_role_sys_action_links ra on a.id = ra.action_id
-      inner join oc_role_user_links ru on ru.role_id = ra.role_id
+        const actions = await server.queryDatabaseObject(`select distinct a.* from sys_actions a
+      inner join oc_role_sys_action_links ra on a.id = ra.action_id
+      inner join oc_role_user_links ru on ru.role_id = ra.role_id
       where ru.user_id = $1;`, [userId]);
         routeContext.state.allowedActions = actions.map((item) => item.code);
     }
@@ -9706,12 +9808,16 @@ exports.ServerOperationPlugin = ServerOperationPlugin;
 exports.SettingPlugin = SettingPlugin;
 exports.StateMachinePlugin = StateMachinePlugin;
 exports.WebhooksPlugin = WebhooksPlugin;
+exports.appendFile = appendFile;
 exports.bootstrapApplicationConfig = bootstrapApplicationConfig$1;
+exports.copyFile = copyFile;
 exports.createJwt = createJwt;
 exports.decodeJwt = decodeJwt;
 exports.deleteCookie = deleteCookie;
 exports.detectChangedFieldsOfEntity = detectChangedFieldsOfEntity;
+exports.ensureDirectoryExists = ensureDirectoryExists;
 exports.entityHelper = entityHelper;
+exports.enumFileBaseNamesInDirectory = enumFileBaseNamesInDirectory;
 exports.formatDateTimeWithTimezone = formatDateTimeWithTimezone;
 exports.generateJwtSecretKey = generateJwtSecretKey;
 exports.generatePasswordHash = generatePasswordHash;
@@ -9725,8 +9831,12 @@ exports.isAccessAllowed = isAccessAllowed;
 exports.licenseHelper = licenseHelper;
 exports.mapDbRowToEntity = mapDbRowToEntity;
 exports.metaHelper = metaHelper;
+exports.moveFile = moveFile;
+exports.readFile = readFile;
+exports.removeFile = removeFile;
 exports.setCookie = setCookie;
 exports.tryValidateLicense = tryValidateLicense;
 exports.validateLicense = validateLicense;
 exports.validatePassword = validatePassword;
 exports.verifyJwt = verifyJwt;
+exports.writeFile = writeFile;

package/dist/utilities/fsUtility.d.ts

@@ -4,3 +4,11 @@ export declare function copyFile(fromPath: string, toPath: string): Promise<void
 export declare function removeFile(path: string): Promise<void>;
 export declare function moveFile(fromPath: string, toPath: string): Promise<void>;
 export declare function appendFile(path: string, data: ArrayBuffer): Promise<void>;
+export declare function writeFile(path: string, data: ArrayBuffer): Promise<void>;
+export declare function ensureDirectoryExists(dirPath: string): void;
+export type EnumFileBaseNamesOptions = {
+    dirPath: string;
+    prefix?: string;
+    fileNameFilter?: (fileName: string) => boolean;
+};
+export declare function enumFileBaseNamesInDirectory(options: EnumFileBaseNamesOptions): string[];

package/package.json

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

package/rollup.config.js

@@ -1,16 +1,16 @@
-import typescript from "rollup-plugin-typescript2";
-import tscAlias from "rollup-plugin-tsc-alias";
-
-export default {
-  input: ["src/index.ts"],
-  output: [
-    {
-      dir: "dist",
-      entryFileNames: "[name].js",
-      format: "cjs",
-      exports: "named",
-    },
-  ],
-  plugins: [typescript(), tscAlias()],
-  external: [],
-};
+import typescript from "rollup-plugin-typescript2";
+import tscAlias from "rollup-plugin-tsc-alias";
+
+export default {
+  input: ["src/index.ts"],
+  output: [
+    {
+      dir: "dist",
+      entryFileNames: "[name].js",
+      format: "cjs",
+      exports: "named",
+    },
+  ],
+  plugins: [typescript(), tscAlias()],
+  external: [],
+};