From cf2cbe452b2fc48c2366ec3c7c5a1b94f3270cb7 Mon Sep 17 00:00:00 2001
From: Benjamin Toby <devops@tben.me>
Date: Fri, 13 Feb 2026 18:53:31 +0100
Subject: [PATCH] Updates

---
 .../dsql/generate-type-definitions.js         |  8 +++--
 .../functions/backend/handleNodemailer.ts     |  2 +-
 .../dsql/generate-type-definitions.ts         | 30 ++++++++++++-------
 package.json                                  |  2 +-
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/dist/package-shared/functions/dsql/generate-type-definitions.js b/dist/package-shared/functions/dsql/generate-type-definitions.js
index 356c46c..1f704d8 100644
--- a/dist/package-shared/functions/dsql/generate-type-definitions.js
+++ b/dist/package-shared/functions/dsql/generate-type-definitions.js
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = generateTypeDefinition;
+const slugify_1 = __importDefault(require("../../utils/slugify"));
 const default_fields_regexp_1 = __importDefault(require("./default-fields-regexp"));
 function generateTypeDefinition({ paradigm, table, query, typeDefName, allValuesOptional, addExport, dbName, }) {
     let typeDefinition = ``;
@@ -12,8 +13,8 @@ function generateTypeDefinition({ paradigm, table, query, typeDefName, allValues
         tdName = typeDefName
             ? typeDefName
             : dbName
-                ? `DSQL_${dbName}_${table.tableName}`.toUpperCase()
-                : `DSQL_${query.single}_${query.single_table}`.toUpperCase();
+                ? (0, slugify_1.default)(`DSQL_${dbName}_${table.tableName}`, "_").toUpperCase()
+                : (0, slugify_1.default)(`DSQL_${query.single}_${query.single_table}`, "_").toUpperCase();
         const fields = table.fields;
         function typeMap(schemaType) {
             var _a, _b, _c;
@@ -45,6 +46,9 @@ function generateTypeDefinition({ paradigm, table, query, typeDefName, allValues
         typesArrayJavascript.push(`/**\n * @typedef {object} ${tdName}`);
         fields.forEach((field) => {
             var _a;
+            if (field.fieldDescription) {
+                typesArrayTypeScript.push(`    /** \n     * ${field.fieldDescription}\n     */`);
+            }
             const nullValue = allValuesOptional
                 ? "?"
                 : ((_a = field.fieldName) === null || _a === void 0 ? void 0 : _a.match(default_fields_regexp_1.default))
diff --git a/package-shared/functions/backend/handleNodemailer.ts b/package-shared/functions/backend/handleNodemailer.ts
index 3bb067b..303a794 100644
--- a/package-shared/functions/backend/handleNodemailer.ts
+++ b/package-shared/functions/backend/handleNodemailer.ts
@@ -15,7 +15,7 @@ export type HandleNodemailerParam = Mail.Options & {
  * # Handle mails With Nodemailer
  */
 export default async function handleNodemailer(
-    params: HandleNodemailerParam
+    params: HandleNodemailerParam,
 ): Promise<SMTPTransport.SentMessageInfo | boolean | undefined> {
     if (
         !process.env.DSQL_MAIL_HOST ||
diff --git a/package-shared/functions/dsql/generate-type-definitions.ts b/package-shared/functions/dsql/generate-type-definitions.ts
index 25c06f6..037ec83 100644
--- a/package-shared/functions/dsql/generate-type-definitions.ts
+++ b/package-shared/functions/dsql/generate-type-definitions.ts
@@ -1,4 +1,5 @@
 import { DSQL_FieldSchemaType, DSQL_TableSchemaType } from "../../types";
+import slugify from "../../utils/slugify";
 import defaultFieldsRegexp from "./default-fields-regexp";
 
 type Param = {
@@ -27,8 +28,11 @@ export default function generateTypeDefinition({
         tdName = typeDefName
             ? typeDefName
             : dbName
-            ? `DSQL_${dbName}_${table.tableName}`.toUpperCase()
-            : `DSQL_${query.single}_${query.single_table}`.toUpperCase();
+              ? slugify(`DSQL_${dbName}_${table.tableName}`, "_").toUpperCase()
+              : slugify(
+                    `DSQL_${query.single}_${query.single_table}`,
+                    "_",
+                ).toUpperCase();
 
         const fields = table.fields;
 
@@ -39,7 +43,7 @@ export default function generateTypeDefinition({
                         schemaType.dataType?.match(/int/i) ||
                         typeof opt == "number"
                             ? `${opt}`
-                            : `"${opt}"`
+                            : `"${opt}"`,
                     )
                     .join(" | ");
             }
@@ -63,27 +67,33 @@ export default function generateTypeDefinition({
         const typesArrayJavascript = [];
 
         typesArrayTypeScript.push(
-            `${addExport ? "export " : ""}type ${tdName} = {`
+            `${addExport ? "export " : ""}type ${tdName} = {`,
         );
         typesArrayJavascript.push(`/**\n * @typedef {object} ${tdName}`);
 
         fields.forEach((field) => {
+            if (field.fieldDescription) {
+                typesArrayTypeScript.push(
+                    `    /** \n     * ${field.fieldDescription}\n     */`,
+                );
+            }
+
             const nullValue = allValuesOptional
                 ? "?"
                 : field.fieldName?.match(defaultFieldsRegexp)
-                ? "?"
-                : field.notNullValue
-                ? ""
-                : "?";
+                  ? "?"
+                  : field.notNullValue
+                    ? ""
+                    : "?";
 
             typesArrayTypeScript.push(
-                `    ${field.fieldName}${nullValue}: ${typeMap(field)};`
+                `    ${field.fieldName}${nullValue}: ${typeMap(field)};`,
             );
 
             typesArrayJavascript.push(
                 ` * @property {${typeMap(field)}${nullValue}} ${
                     field.fieldName
-                }`
+                }`,
             );
         });
 
diff --git a/package.json b/package.json
index 5b90043..aeca0c0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "5.7.47",
+    "version": "5.7.48",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {