This commit is contained in:
Benjamin Toby 2025-04-17 12:07:46 +01:00
parent 7c04884a00
commit fb0bc4b753
3 changed files with 15 additions and 3 deletions

View File

@ -11,6 +11,7 @@ const ejson_1 = __importDefault(require("../../utils/ejson"));
const generate_type_definitions_1 = __importDefault(require("./generate-type-definitions"));
const path_1 = __importDefault(require("path"));
function dbSchemaToType(params) {
var _a;
let datasquirelSchema;
const defaultTableFieldsJSONFilePath = path_1.default.resolve(__dirname, "../../data/defaultFields.json");
if (params === null || params === void 0 ? void 0 : params.dbSchema) {
@ -38,11 +39,15 @@ function dbSchemaToType(params) {
...newDefaultFields,
] });
});
const defDbName = (datasquirelSchema.dbName ||
((_a = datasquirelSchema.dbFullName) === null || _a === void 0 ? void 0 : _a.replace(/datasquirel_user_\d+_/, "")))
.toUpperCase()
.replace(/ /g, "_");
const schemas = dbTablesSchemas
.map((table) => (0, generate_type_definitions_1.default)({
paradigm: "TypeScript",
table,
typeDefName: `DSQL_DATASQUIREL_${table.tableName.toUpperCase()}`,
typeDefName: `DSQL_${defDbName}_${table.tableName.toUpperCase()}`,
allValuesOptional: true,
addExport: true,
}))

View File

@ -60,12 +60,19 @@ export default function dbSchemaToType(params?: Params): string[] | undefined {
} as DSQL_TableSchemaType;
});
const defDbName = (
datasquirelSchema.dbName ||
datasquirelSchema.dbFullName?.replace(/datasquirel_user_\d+_/, "")
)
.toUpperCase()
.replace(/ /g, "_");
const schemas = dbTablesSchemas
.map((table) =>
generateTypeDefinition({
paradigm: "TypeScript",
table,
typeDefName: `DSQL_DATASQUIREL_${table.tableName.toUpperCase()}`,
typeDefName: `DSQL_${defDbName}_${table.tableName.toUpperCase()}`,
allValuesOptional: true,
addExport: true,
})

View File

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