Updates

dist/package-shared/functions/dsql/db-schema-to-type.js

@@ -29,14 +29,25 @@ function dbSchemaToType(params) {
     });
     const defDbName = (_b = (datasquirelSchema.dbName ||
         ((_a = datasquirelSchema.dbFullName) === null || _a === void 0 ? void 0 : _a.replace(new RegExp(`${app_names_1.AppNames["DsqlDbPrefix"]}\\d+_`), "")))) === null || _b === void 0 ? void 0 : _b.toUpperCase().replace(/ /g, "_");
+    const defNames = [];
     const schemas = dbTablesSchemas
-        .map((table) => (0, generate_type_definitions_1.default)({
-        paradigm: "TypeScript",
-        table,
-        typeDefName: `DSQL_${defDbName}_${table.tableName.toUpperCase()}`,
-        allValuesOptional: true,
-        addExport: true,
-    }))
+        .map((table) => {
+        var _a;
+        const defObj = (0, generate_type_definitions_1.default)({
+            paradigm: "TypeScript",
+            table,
+            typeDefName: `DSQL_${defDbName}_${table.tableName.toUpperCase()}`,
+            allValuesOptional: true,
+            addExport: true,
+        });
+        if ((_a = defObj.tdName) === null || _a === void 0 ? void 0 : _a.match(/./)) {
+            defNames.push(defObj.tdName);
+        }
+        return defObj.typeDefinition;
+    })
         .filter((schm) => typeof schm == "string");
-    return [tableNames, ...schemas];
+    const allTd = (defNames === null || defNames === void 0 ? void 0 : defNames[0])
+        ? `export type DSQL_${defDbName}_ALL_TYPEDEFS = ${defNames.join(` & `)}`
+        : ``;
+    return [tableNames, ...schemas, allTd];
 }

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

@@ -8,5 +8,8 @@ type Param = {
     addExport?: boolean;
     dbName?: string;
 };
-export default function generateTypeDefinition({ paradigm, table, query, typeDefName, allValuesOptional, addExport, dbName, }: Param): string | null;
+export default function generateTypeDefinition({ paradigm, table, query, typeDefName, allValuesOptional, addExport, dbName, }: Param): {
+    typeDefinition: string | null;
+    tdName: string;
+};
 export {};

dist/package-shared/functions/dsql/generate-type-definitions.js

@@ -7,8 +7,9 @@ exports.default = generateTypeDefinition;
 const default_fields_regexp_1 = __importDefault(require("./default-fields-regexp"));
 function generateTypeDefinition({ paradigm, table, query, typeDefName, allValuesOptional, addExport, dbName, }) {
     let typeDefinition = ``;
+    let tdName = ``;
     try {
-        const tdName = typeDefName
+        tdName = typeDefName
             ? typeDefName
             : dbName
                 ? `DSQL_${dbName}_${table.tableName}`.toUpperCase()
@@ -67,5 +68,5 @@ function generateTypeDefinition({ paradigm, table, query, typeDefName, allValues
         console.log(error.message);
         typeDefinition = null;
     }
-    return typeDefinition;
+    return { typeDefinition, tdName };
 }