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

Updates

Browse Source
This commit is contained in:
tben
2026-02-13 18:58:11 +01:00
parent 70908a2019
commit 194e4dcad0
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/package-shared/functions/dsql/db-schema-to-type.js
Vendored
+4 -2
View File
@@ -8,6 +8,7 @@ const lodash_1 = __importDefault(require("lodash"));
const generate_type_definitions_1 = __importDefault(require("./generate-type-definitions"));
const app_names_1 = require("../../dict/app-names");
const defaultFields_json_1 = __importDefault(require("../../data/defaultFields.json"));
const slugify_1 = __importDefault(require("../../utils/slugify"));
function dbSchemaToType(params) {
var _a, _b;
let datasquirelSchema = params === null || params === void 0 ? void 0 : params.dbSchema;
@@ -29,6 +30,7 @@ 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 finalDefDbName = (0, slugify_1.default)(defDbName);
const defNames = [];
const schemas = dbTablesSchemas
.map((table) => {
@@ -36,7 +38,7 @@ function dbSchemaToType(params) {
const defObj = (0, generate_type_definitions_1.default)({
paradigm: "TypeScript",
table,
typeDefName: `DSQL_${defDbName}_${table.tableName.toUpperCase()}`,
typeDefName: `DSQL_${finalDefDbName}_${table.tableName.toUpperCase()}`,
allValuesOptional: true,
addExport: true,
});
@@ -47,7 +49,7 @@ function dbSchemaToType(params) {
})
.filter((schm) => typeof schm == "string");
const allTd = (defNames === null || defNames === void 0 ? void 0 : defNames[0])
? `export type DSQL_${defDbName}_ALL_TYPEDEFS = ${defNames.join(` & `)}`
? `export type DSQL_${finalDefDbName}_ALL_TYPEDEFS = ${defNames.join(` & `)}`
: ``;
return [tableNames, ...schemas, allTd];
}
dist/package-shared/functions/dsql/generate-type-definitions.js
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ function generateTypeDefinition({ paradigm, table, query, typeDefName, allValues
let tdName = ``;
try {
tdName = typeDefName
? (0, slugify_1.default)(typeDefName, "_").toUpperCase()
? typeDefName
: dbName
? (0, slugify_1.default)(`DSQL_${dbName}_${table.tableName}`, "_").toUpperCase()
: (0, slugify_1.default)(`DSQL_${query.single}_${query.single_table}`, "_").toUpperCase();