Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Benjamin Toby 2025-06-01 11:39:56 +01:00
parent b28b05956b
commit 9b7c98cff6
18 changed files with 151 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dist/package-shared/functions/backend/queues/add-queue.d.ts vendored
View File

@ -6,5 +6,6 @@ type Param = {
};
export default function addQueue({ queue, userId, dummy }: Param): Promise<(import("../../../types").PostReturn & {
queryObject?: ReturnType<Awaited<typeof import("../../dsql/sql/sql-generator").default>>;
count?: number;
}) | null | undefined>;
export {};

3
dist/package-shared/functions/dsql/sql/sql-generator.d.ts vendored
View File

@ -7,6 +7,7 @@ type Param<T extends {
genObject?: ServerQueryParam<T>;
tableName: string;
dbFullName?: string;
count?: boolean;
};
type Return = {
string: string;
@ -20,5 +21,5 @@ export default function sqlGenerator<T extends {
[key: string]: any;
} = {
[key: string]: any;
}>({ tableName, genObject, dbFullName }: Param<T>): Return;
}>({ tableName, genObject, dbFullName, count }: Param<T>): Return;
export {};

15
dist/package-shared/functions/dsql/sql/sql-generator.js vendored
View File

@ -5,7 +5,7 @@ exports.default = sqlGenerator;
* # SQL Query Generator
* @description Generates an SQL Query for node module `mysql` or `serverless-mysql`
*/
function sqlGenerator({ tableName, genObject, dbFullName }) {
function sqlGenerator({ tableName, genObject, dbFullName, count }) {
const finalQuery = (genObject === null || genObject === void 0 ? void 0 : genObject.query) ? genObject.query : undefined;
const queryKeys = finalQuery ? Object.keys(finalQuery) : undefined;
const sqlSearhValues = [];
@ -109,7 +109,10 @@ function sqlGenerator({ tableName, genObject, dbFullName }) {
let queryString = (() => {
var _a, _b, _c;
let str = "SELECT";
if ((_a = genObject === null || genObject === void 0 ? void 0 : genObject.selectFields) === null || _a === void 0 ? void 0 : _a[0]) {
if (count) {
str += ` COUNT(*)`;
}
else if ((_a = genObject === null || genObject === void 0 ? void 0 : genObject.selectFields) === null || _a === void 0 ? void 0 : _a[0]) {
if (genObject.join) {
str += ` ${(_b = genObject.selectFields) === null || _b === void 0 ? void 0 : _b.map((fld) => `${finalDbName}${tableName}.${fld}`).join(",")}`;
}
@ -125,7 +128,7 @@ function sqlGenerator({ tableName, genObject, dbFullName }) {
str += " *";
}
}
if (genObject === null || genObject === void 0 ? void 0 : genObject.join) {
if ((genObject === null || genObject === void 0 ? void 0 : genObject.join) && !count) {
const existingJoinTableNames = [tableName];
str +=
"," +
@ -198,13 +201,13 @@ function sqlGenerator({ tableName, genObject, dbFullName }) {
const stringOperator = (genObject === null || genObject === void 0 ? void 0 : genObject.searchOperator) || "AND";
queryString += ` WHERE ${sqlSearhString.join(` ${stringOperator} `)}`;
}
if (genObject === null || genObject === void 0 ? void 0 : genObject.order)
if ((genObject === null || genObject === void 0 ? void 0 : genObject.order) && !count)
queryString += ` ORDER BY ${genObject.join
? `${finalDbName}${tableName}.${String(genObject.order.field)}`
: String(genObject.order.field)} ${genObject.order.strategy}`;
if (genObject === null || genObject === void 0 ? void 0 : genObject.limit)
if ((genObject === null || genObject === void 0 ? void 0 : genObject.limit) && !count)
queryString += ` LIMIT ${genObject.limit}`;
if (genObject === null || genObject === void 0 ? void 0 : genObject.offset)
if ((genObject === null || genObject === void 0 ? void 0 : genObject.offset) && !count)
queryString += ` OFFSET ${genObject.offset}`;
return {
string: queryString,

9
dist/package-shared/shell/createDbFromSchema/index.js vendored
View File

@ -58,22 +58,23 @@ function createDbFromSchema(_a) {
});
for (let tb = 0; tb < allTables.length; tb++) {
const { TABLE_NAME } = allTables[tb];
const targetTableSchema = tables.find((_table) => _table.tableName === TABLE_NAME);
/**
* @description Check if TABLE_NAME is part of the tables contained
* in the user schema JSON. If it's not, the table is either deleted
* or the table name has been recently changed
*/
if (!tables.filter((_table) => _table.tableName === TABLE_NAME)[0]) {
const oldTableFilteredArray = tables.filter((_table) => _table.tableNameOld &&
if (!targetTableSchema) {
const oldTable = tables.find((_table) => _table.tableNameOld &&
_table.tableNameOld === TABLE_NAME);
/**
* @description Check if this table has been recently renamed. Rename
* table id true. Drop table if false
*/
if (oldTableFilteredArray && oldTableFilteredArray[0]) {
if (oldTable) {
console.log("Renaming Table");
yield (0, varDatabaseDbHandler_1.default)({
queryString: `RENAME TABLE \`${dbFullName}\`.\`${oldTableFilteredArray[0].tableNameOld}\` TO \`${oldTableFilteredArray[0].tableName}\``,
queryString: `RENAME TABLE \`${dbFullName}\`.\`${oldTable.tableNameOld}\` TO \`${oldTable.tableName}\``,
});
}
else {

4
dist/package-shared/types/index.d.ts vendored
View File

@ -1,5 +1,5 @@
import type { RequestOptions } from "https";
import { DSQL_DATASQUIREL_PROCESS_QUEUE } from "./dsql";
import { DSQL_DATASQUIREL_PROCESS_QUEUE, DSQL_DATASQUIREL_USER_DATABASES } from "./dsql";
import { Editor } from "tinymce";
export type DSQL_DatabaseFullName = string;
export interface DSQL_DatabaseSchemaType {
@ -1364,6 +1364,7 @@ export type DsqlCrudParam<T extends {
query?: DsqlCrudQueryObject<T>;
sanitize?: (data?: T) => T;
debug?: boolean;
count?: boolean;
};
export type ErrorCallback = (title: string, error: Error, data?: any) => void;
export interface MariaDBUser {
@ -1419,6 +1420,7 @@ export type PagePropsType = {
user?: UserType | null;
pageUrl?: string | null;
query?: any;
databases?: DSQL_DATASQUIREL_USER_DATABASES[] | null;
};
export type APIResponseObject<T extends any = any> = {
success: boolean;

3
dist/package-shared/utils/backend/names/grab-dir-names.d.ts vendored
View File

@ -25,8 +25,11 @@ export default function grabDirNames(param?: Param): {
userPrivateDbImportZipFilePath: string | undefined;
dbNginxLoadBalancerConfigFile: string;
dockerComposeFile: string;
dockerComposeFileAlt: string;
testDockerComposeFile: string;
testDockerComposeFileAlt: string;
extraDockerComposeFile: string;
extraDockerComposeFileAlt: string;
siteSetupFile: string;
envFile: string;
testEnvFile: string;

8
dist/package-shared/utils/backend/names/grab-dir-names.js vendored
View File

@ -52,9 +52,12 @@ function grabDirNames(param) {
? path_1.default.join(userPrivateSQLExportsDir, userPrivateDbImportZipFileName)
: undefined;
const dbNginxLoadBalancerConfigFile = path_1.default.join(appDir, "docker/services/mariadb/load-balancer/config/template/nginx.conf");
const dockerComposeFile = path_1.default.join(appDir, "docker-compose.yml");
let dockerComposeFile = path_1.default.join(appDir, "docker-compose.yml");
let dockerComposeFileAlt = path_1.default.join(appDir, "docker-compose.yaml");
const testDockerComposeFile = path_1.default.join(appDir, "test.docker-compose.yml");
const testDockerComposeFileAlt = path_1.default.join(appDir, "test.docker-compose.yaml");
const extraDockerComposeFile = path_1.default.join(appDir, "extra.docker-compose.yml");
const extraDockerComposeFileAlt = path_1.default.join(appDir, "extra.docker-compose.yaml");
const siteSetupFile = path_1.default.join(appDir, "site-setup.json");
const envFile = path_1.default.join(appDir, ".env");
const testEnvFile = path_1.default.join(appDir, "test.env");
@ -79,8 +82,11 @@ function grabDirNames(param) {
userPrivateDbImportZipFilePath,
dbNginxLoadBalancerConfigFile,
dockerComposeFile,
dockerComposeFileAlt,
testDockerComposeFile,
testDockerComposeFileAlt,
extraDockerComposeFile,
extraDockerComposeFileAlt,
siteSetupFile,
envFile,
testEnvFile,

3
dist/package-shared/utils/data-fetching/crud.d.ts vendored
View File

@ -4,6 +4,7 @@ export default function dsqlCrud<T extends {
[key: string]: any;
} = {
[key: string]: any;
}>({ action, data, table, targetValue, query, sanitize, debug, targetField, targetId, }: DsqlCrudParam<T>): Promise<(PostReturn & {
}>({ action, data, table, targetValue, query, sanitize, debug, targetField, targetId, count, }: DsqlCrudParam<T>): Promise<(PostReturn & {
queryObject?: ReturnType<Awaited<typeof sqlGenerator>>;
count?: number;
}) | null>;

41
dist/package-shared/utils/data-fetching/crud.js vendored
View File

@ -13,11 +13,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = dsqlCrud;
const get_1 = __importDefault(require("../../actions/get"));
const post_1 = __importDefault(require("../../actions/post"));
const sql_generator_1 = __importDefault(require("../../functions/dsql/sql/sql-generator"));
const conn_db_handler_1 = __importDefault(require("../db/conn-db-handler"));
function dsqlCrud(_a) {
return __awaiter(this, arguments, void 0, function* ({ action, data, table, targetValue, query, sanitize, debug, targetField, targetId, }) {
return __awaiter(this, arguments, void 0, function* ({ action, data, table, targetValue, query, sanitize, debug, targetField, targetId, count, }) {
var _b, _c;
const finalData = sanitize ? sanitize(data) : data;
let queryObject;
switch (action) {
@ -26,13 +27,35 @@ function dsqlCrud(_a) {
tableName: table,
genObject: query,
});
const GET_RES = yield (0, get_1.default)({
query: (queryObject === null || queryObject === void 0 ? void 0 : queryObject.string) || "",
queryValues: (queryObject === null || queryObject === void 0 ? void 0 : queryObject.values) || [],
debug,
forceLocal: true,
});
return Object.assign(Object.assign({}, GET_RES), { queryObject });
const DB_CONN = global.DSQL_READ_ONLY_DB_CONN || global.DSQL_DB_CONN;
const connQueries = [
{
query: queryObject === null || queryObject === void 0 ? void 0 : queryObject.string,
values: (queryObject === null || queryObject === void 0 ? void 0 : queryObject.values) || [],
},
];
if (count) {
const countQueryObject = (0, sql_generator_1.default)({
tableName: table,
genObject: query,
count: true,
});
connQueries.push({
query: countQueryObject.string,
values: countQueryObject.values,
});
}
const res = yield (0, conn_db_handler_1.default)(DB_CONN, connQueries);
const isSuccess = Array.isArray(res) && Array.isArray(res[0]);
return {
success: isSuccess,
payload: isSuccess ? res[0] : null,
error: isSuccess ? undefined : res === null || res === void 0 ? void 0 : res.error,
queryObject,
count: isSuccess && ((_c = (_b = res[1]) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c["COUNT(*)"])
? res[1][0]["COUNT(*)"]
: undefined,
};
case "insert":
return yield (0, post_1.default)({
query: {

8
dist/package-shared/utils/db/conn-db-handler.d.ts vendored
View File

@ -1,5 +1,5 @@
import { ServerlessMysql } from "serverless-mysql";
type QueryObject = {
export type ConnDBHandlerQueryObject = {
query: string;
values?: (string | number | undefined)[];
};
@ -17,11 +17,11 @@ export default function connDbHandler<ReturnType = any>(
*/
conn?: ServerlessMysql,
/**
* String Or `QueryObject` Array
* String Or `ConnDBHandlerQueryObject` Array
*/
query?: QueryObject["query"] | QueryObject[],
query?: ConnDBHandlerQueryObject["query"] | ConnDBHandlerQueryObject[],
/**
* Array of Values to Sanitize and Inject
*/
values?: QueryObject["values"], debug?: boolean): Promise<Return<ReturnType>>;
values?: ConnDBHandlerQueryObject["values"], debug?: boolean): Promise<Return<ReturnType>>;
export {};

2
dist/package-shared/utils/db/conn-db-handler.js vendored
View File

@ -25,7 +25,7 @@ function connDbHandler(
*/
conn,
/**
* String Or `QueryObject` Array
* String Or `ConnDBHandlerQueryObject` Array
*/
query,
/**

17
package-shared/functions/dsql/sql/sql-generator.ts
View File

@ -8,6 +8,7 @@ type Param<T extends { [key: string]: any } = { [key: string]: any }> = {
genObject?: ServerQueryParam<T>;
tableName: string;
dbFullName?: string;
count?: boolean;
};
type Return = {
@ -21,7 +22,7 @@ type Return = {
*/
export default function sqlGenerator<
T extends { [key: string]: any } = { [key: string]: any }
>({ tableName, genObject, dbFullName }: Param<T>): Return {
>({ tableName, genObject, dbFullName, count }: Param<T>): Return {
const finalQuery = genObject?.query ? genObject.query : undefined;
const queryKeys = finalQuery ? Object.keys(finalQuery) : undefined;
@ -162,7 +163,10 @@ export default function sqlGenerator<
let queryString = (() => {
let str = "SELECT";
if (genObject?.selectFields?.[0]) {
if (count) {
str += ` COUNT(*)`;
} else if (genObject?.selectFields?.[0]) {
if (genObject.join) {
str += ` ${genObject.selectFields
?.map((fld) => `${finalDbName}${tableName}.${fld}`)
@ -178,7 +182,7 @@ export default function sqlGenerator<
}
}
if (genObject?.join) {
if (genObject?.join && !count) {
const existingJoinTableNames: string[] = [tableName];
str +=
@ -264,15 +268,16 @@ export default function sqlGenerator<
queryString += ` WHERE ${sqlSearhString.join(` ${stringOperator} `)}`;
}
if (genObject?.order)
if (genObject?.order && !count)
queryString += ` ORDER BY ${
genObject.join
? `${finalDbName}${tableName}.${String(genObject.order.field)}`
: String(genObject.order.field)
} ${genObject.order.strategy}`;
if (genObject?.limit) queryString += ` LIMIT ${genObject.limit}`;
if (genObject?.offset) queryString += ` OFFSET ${genObject.offset}`;
if (genObject?.limit && !count) queryString += ` LIMIT ${genObject.limit}`;
if (genObject?.offset && !count)
queryString += ` OFFSET ${genObject.offset}`;
return {
string: queryString,

14
package-shared/shell/createDbFromSchema/index.ts
View File

@ -75,15 +75,17 @@ export default async function createDbFromSchema({
for (let tb = 0; tb < allTables.length; tb++) {
const { TABLE_NAME } = allTables[tb];
const targetTableSchema = tables.find(
(_table) => _table.tableName === TABLE_NAME
);
/**
* @description Check if TABLE_NAME is part of the tables contained
* in the user schema JSON. If it's not, the table is either deleted
* or the table name has been recently changed
*/
if (
!tables.filter((_table) => _table.tableName === TABLE_NAME)[0]
) {
const oldTableFilteredArray = tables.filter(
if (!targetTableSchema) {
const oldTable = tables.find(
(_table) =>
_table.tableNameOld &&
_table.tableNameOld === TABLE_NAME
@ -93,10 +95,10 @@ export default async function createDbFromSchema({
* @description Check if this table has been recently renamed. Rename
* table id true. Drop table if false
*/
if (oldTableFilteredArray && oldTableFilteredArray[0]) {
if (oldTable) {
console.log("Renaming Table");
await varDatabaseDbHandler({
queryString: `RENAME TABLE \`${dbFullName}\`.\`${oldTableFilteredArray[0].tableNameOld}\` TO \`${oldTableFilteredArray[0].tableName}\``,
queryString: `RENAME TABLE \`${dbFullName}\`.\`${oldTable.tableNameOld}\` TO \`${oldTable.tableName}\``,
});
} else {
console.log(`Dropping Table from ${dbFullName}`);

7
package-shared/types/index.ts
View File

@ -1,5 +1,8 @@
import type { RequestOptions } from "https";
import { DSQL_DATASQUIREL_PROCESS_QUEUE } from "./dsql";
import {
DSQL_DATASQUIREL_PROCESS_QUEUE,
DSQL_DATASQUIREL_USER_DATABASES,
} from "./dsql";
import { Editor } from "tinymce";
export type DSQL_DatabaseFullName = string;
@ -1542,6 +1545,7 @@ export type DsqlCrudParam<
query?: DsqlCrudQueryObject<T>;
sanitize?: (data?: T) => T;
debug?: boolean;
count?: boolean;
};
export type ErrorCallback = (title: string, error: Error, data?: any) => void;
@ -1600,6 +1604,7 @@ export type PagePropsType = {
user?: UserType | null;
pageUrl?: string | null;
query?: any;
databases?: DSQL_DATASQUIREL_USER_DATABASES[] | null;
};
export type APIResponseObject<T extends any = any> = {

14
package-shared/utils/backend/names/grab-dir-names.ts
View File

@ -71,12 +71,21 @@ export default function grabDirNames(param?: Param) {
"docker/services/mariadb/load-balancer/config/template/nginx.conf"
);
const dockerComposeFile = path.join(appDir, "docker-compose.yml");
let dockerComposeFile = path.join(appDir, "docker-compose.yml");
let dockerComposeFileAlt = path.join(appDir, "docker-compose.yaml");
const testDockerComposeFile = path.join(appDir, "test.docker-compose.yml");
const testDockerComposeFileAlt = path.join(
appDir,
"test.docker-compose.yaml"
);
const extraDockerComposeFile = path.join(
appDir,
"extra.docker-compose.yml"
);
const extraDockerComposeFileAlt = path.join(
appDir,
"extra.docker-compose.yaml"
);
const siteSetupFile = path.join(appDir, "site-setup.json");
@ -104,8 +113,11 @@ export default function grabDirNames(param?: Param) {
userPrivateDbImportZipFilePath,
dbNginxLoadBalancerConfigFile,
dockerComposeFile,
dockerComposeFileAlt,
testDockerComposeFile,
testDockerComposeFileAlt,
extraDockerComposeFile,
extraDockerComposeFileAlt,
siteSetupFile,
envFile,
testEnvFile,

46
package-shared/utils/data-fetching/crud.ts
View File

@ -2,6 +2,7 @@ import get from "../../actions/get";
import post from "../../actions/post";
import sqlGenerator from "../../functions/dsql/sql/sql-generator";
import { DsqlCrudParam, PostReturn } from "../../types";
import connDbHandler, { ConnDBHandlerQueryObject } from "../db/conn-db-handler";
export default async function dsqlCrud<
T extends { [key: string]: any } = { [key: string]: any }
@ -15,9 +16,11 @@ export default async function dsqlCrud<
debug,
targetField,
targetId,
count,
}: DsqlCrudParam<T>): Promise<
| (PostReturn & {
queryObject?: ReturnType<Awaited<typeof sqlGenerator>>;
count?: number;
})
| null
> {
@ -31,14 +34,43 @@ export default async function dsqlCrud<
genObject: query,
});
const GET_RES = await get({
query: queryObject?.string || "",
queryValues: queryObject?.values || [],
debug,
forceLocal: true,
});
const DB_CONN =
global.DSQL_READ_ONLY_DB_CONN || global.DSQL_DB_CONN;
return { ...GET_RES, queryObject };
const connQueries: ConnDBHandlerQueryObject[] = [
{
query: queryObject?.string,
values: queryObject?.values || [],
},
];
if (count) {
const countQueryObject = sqlGenerator({
tableName: table,
genObject: query,
count: true,
});
connQueries.push({
query: countQueryObject.string,
values: countQueryObject.values,
});
}
const res = await connDbHandler(DB_CONN, connQueries);
const isSuccess = Array.isArray(res) && Array.isArray(res[0]);
return {
success: isSuccess,
payload: isSuccess ? res[0] : null,
error: isSuccess ? undefined : res?.error,
queryObject,
count:
isSuccess && res[1]?.[0]?.["COUNT(*)"]
? res[1][0]["COUNT(*)"]
: undefined,
};
case "insert":
return await post({

8
package-shared/utils/db/conn-db-handler.ts
View File

@ -1,7 +1,7 @@
import { ServerlessMysql } from "serverless-mysql";
import debugLog from "../logging/debug-log";
type QueryObject = {
export type ConnDBHandlerQueryObject = {
query: string;
values?: (string | number | undefined)[];
};
@ -19,13 +19,13 @@ export default async function connDbHandler<ReturnType = any>(
*/
conn?: ServerlessMysql,
/**
* String Or `QueryObject` Array
* String Or `ConnDBHandlerQueryObject` Array
*/
query?: QueryObject["query"] | QueryObject[],
query?: ConnDBHandlerQueryObject["query"] | ConnDBHandlerQueryObject[],
/**
* Array of Values to Sanitize and Inject
*/
values?: QueryObject["values"],
values?: ConnDBHandlerQueryObject["values"],
debug?: boolean
): Promise<Return<ReturnType>> {
try {

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "@moduletrace/datasquirel",
"version": "4.6.6",
"version": "4.6.7",
"description": "Cloud-based SQL data management tool",
"main": "dist/index.js",
"bin": {