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 2026-02-13 18:53:31 +01:00
parent 16cc7bede5
commit cf2cbe452b
4 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/package-shared/functions/dsql/generate-type-definitions.js vendored
View File

@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.default = generateTypeDefinition; exports.default = generateTypeDefinition;
const slugify_1 = __importDefault(require("../../utils/slugify"));
const default_fields_regexp_1 = __importDefault(require("./default-fields-regexp")); const default_fields_regexp_1 = __importDefault(require("./default-fields-regexp"));
function generateTypeDefinition({ paradigm, table, query, typeDefName, allValuesOptional, addExport, dbName, }) { function generateTypeDefinition({ paradigm, table, query, typeDefName, allValuesOptional, addExport, dbName, }) {
let typeDefinition = ``; let typeDefinition = ``;
@ -12,8 +13,8 @@ function generateTypeDefinition({ paradigm, table, query, typeDefName, allValues
tdName = typeDefName tdName = typeDefName
? typeDefName ? typeDefName
: dbName : dbName
? `DSQL_${dbName}_${table.tableName}`.toUpperCase() ? (0, slugify_1.default)(`DSQL_${dbName}_${table.tableName}`, "_").toUpperCase()
: `DSQL_${query.single}_${query.single_table}`.toUpperCase(); : (0, slugify_1.default)(`DSQL_${query.single}_${query.single_table}`, "_").toUpperCase();
const fields = table.fields; const fields = table.fields;
function typeMap(schemaType) { function typeMap(schemaType) {
var _a, _b, _c; var _a, _b, _c;
@ -45,6 +46,9 @@ function generateTypeDefinition({ paradigm, table, query, typeDefName, allValues
typesArrayJavascript.push(`/**\n * @typedef {object} ${tdName}`); typesArrayJavascript.push(`/**\n * @typedef {object} ${tdName}`);
fields.forEach((field) => { fields.forEach((field) => {
var _a; var _a;
if (field.fieldDescription) {
typesArrayTypeScript.push(` /** \n * ${field.fieldDescription}\n */`);
}
const nullValue = allValuesOptional const nullValue = allValuesOptional
? "?" ? "?"
: ((_a = field.fieldName) === null || _a === void 0 ? void 0 : _a.match(default_fields_regexp_1.default)) : ((_a = field.fieldName) === null || _a === void 0 ? void 0 : _a.match(default_fields_regexp_1.default))

2
package-shared/functions/backend/handleNodemailer.ts
View File

@ -15,7 +15,7 @@ export type HandleNodemailerParam = Mail.Options & {
* # Handle mails With Nodemailer * # Handle mails With Nodemailer
*/ */
export default async function handleNodemailer( export default async function handleNodemailer(
params: HandleNodemailerParam params: HandleNodemailerParam,
): Promise<SMTPTransport.SentMessageInfo | boolean | undefined> { ): Promise<SMTPTransport.SentMessageInfo | boolean | undefined> {
if ( if (
!process.env.DSQL_MAIL_HOST || !process.env.DSQL_MAIL_HOST ||

22
package-shared/functions/dsql/generate-type-definitions.ts
View File

@ -1,4 +1,5 @@
import { DSQL_FieldSchemaType, DSQL_TableSchemaType } from "../../types"; import { DSQL_FieldSchemaType, DSQL_TableSchemaType } from "../../types";
import slugify from "../../utils/slugify";
import defaultFieldsRegexp from "./default-fields-regexp"; import defaultFieldsRegexp from "./default-fields-regexp";
type Param = { type Param = {
@ -27,8 +28,11 @@ export default function generateTypeDefinition({
tdName = typeDefName tdName = typeDefName
? typeDefName ? typeDefName
: dbName : dbName
? `DSQL_${dbName}_${table.tableName}`.toUpperCase() ? slugify(`DSQL_${dbName}_${table.tableName}`, "_").toUpperCase()
: `DSQL_${query.single}_${query.single_table}`.toUpperCase(); : slugify(
`DSQL_${query.single}_${query.single_table}`,
"_",
).toUpperCase();
const fields = table.fields; const fields = table.fields;
@ -39,7 +43,7 @@ export default function generateTypeDefinition({
schemaType.dataType?.match(/int/i) || schemaType.dataType?.match(/int/i) ||
typeof opt == "number" typeof opt == "number"
? `${opt}` ? `${opt}`
: `"${opt}"` : `"${opt}"`,
) )
.join(" | "); .join(" | ");
} }
@ -63,11 +67,17 @@ export default function generateTypeDefinition({
const typesArrayJavascript = []; const typesArrayJavascript = [];
typesArrayTypeScript.push( typesArrayTypeScript.push(
`${addExport ? "export " : ""}type ${tdName} = {` `${addExport ? "export " : ""}type ${tdName} = {`,
); );
typesArrayJavascript.push(`/**\n * @typedef {object} ${tdName}`); typesArrayJavascript.push(`/**\n * @typedef {object} ${tdName}`);
fields.forEach((field) => { fields.forEach((field) => {
if (field.fieldDescription) {
typesArrayTypeScript.push(
` /** \n * ${field.fieldDescription}\n */`,
);
}
const nullValue = allValuesOptional const nullValue = allValuesOptional
? "?" ? "?"
: field.fieldName?.match(defaultFieldsRegexp) : field.fieldName?.match(defaultFieldsRegexp)
@ -77,13 +87,13 @@ export default function generateTypeDefinition({
: "?"; : "?";
typesArrayTypeScript.push( typesArrayTypeScript.push(
` ${field.fieldName}${nullValue}: ${typeMap(field)};` ` ${field.fieldName}${nullValue}: ${typeMap(field)};`,
); );
typesArrayJavascript.push( typesArrayJavascript.push(
` * @property {${typeMap(field)}${nullValue}} ${ ` * @property {${typeMap(field)}${nullValue}} ${
field.fieldName field.fieldName
}` }`,
); );
}); });

2
package.json
View File

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