Updates

package-shared/functions/dsql/db-schema-to-type.ts

@@ -3,6 +3,7 @@ import _ from "lodash";
 import generateTypeDefinition from "./generate-type-definitions";
 import { AppNames } from "../../dict/app-names";
 import defaultFields from "../../data/defaultFields.json";
+import slugify from "../../utils/slugify";
 
 type Params = {
     dbSchema?: DSQL_DatabaseSchemaType;
@@ -36,12 +37,14 @@ export default function dbSchemaToType(params?: Params): string[] | undefined {
         datasquirelSchema.dbName ||
         datasquirelSchema.dbFullName?.replace(
             new RegExp(`${AppNames["DsqlDbPrefix"]}\\d+_`),
-            ""
+            "",
         )
     )
         ?.toUpperCase()
         .replace(/ /g, "_");
 
+    const finalDefDbName = slugify(defDbName);
+
     const defNames: string[] = [];
 
     const schemas = dbTablesSchemas
@@ -49,7 +52,7 @@ export default function dbSchemaToType(params?: Params): string[] | undefined {
             const defObj = generateTypeDefinition({
                 paradigm: "TypeScript",
                 table,
-                typeDefName: `DSQL_${defDbName}_${table.tableName.toUpperCase()}`,
+                typeDefName: `DSQL_${finalDefDbName}_${table.tableName.toUpperCase()}`,
                 allValuesOptional: true,
                 addExport: true,
             });
@@ -63,7 +66,7 @@ export default function dbSchemaToType(params?: Params): string[] | undefined {
         .filter((schm) => typeof schm == "string");
 
     const allTd = defNames?.[0]
-        ? `export type DSQL_${defDbName}_ALL_TYPEDEFS = ${defNames.join(` & `)}`
+        ? `export type DSQL_${finalDefDbName}_ALL_TYPEDEFS = ${defNames.join(` & `)}`
         : ``;
 
     return [tableNames, ...schemas, allTd];

package-shared/functions/dsql/generate-type-definitions.ts

@@ -26,7 +26,7 @@ export default function generateTypeDefinition({
 
     try {
         tdName = typeDefName
-            ? slugify(typeDefName, "_").toUpperCase()
+            ? typeDefName
             : dbName
               ? slugify(`DSQL_${dbName}_${table.tableName}`, "_").toUpperCase()
               : slugify(