HCK-12978: Script generation options

api/fe.js

@@ -0,0 +1,11 @@
+const { generateScript } = require('../forward_engineering/api/generateScript');
+const { generateViewScript } = require('../forward_engineering/api/generateViewScript');
+const { generateContainerScript } = require('../forward_engineering/api/generateContainerScript');
+const { isDropInStatements } = require('../forward_engineering/api/isDropInStatements');
+
+module.exports = {
+	generateScript,
+	generateViewScript,
+	generateContainerScript,
+	isDropInStatements,
+};

esbuild.package.js

@@ -13,6 +13,7 @@ esbuild
 	.build({
 		entryPoints: [
 			path.resolve(__dirname, 'forward_engineering', 'api.js'),
+			path.resolve(__dirname, 'api', 'fe.js'),
 			path.resolve(__dirname, 'forward_engineering', 'ddlProvider.js'),
 			path.resolve(__dirname, 'forward_engineering', 'dbtProvider.js'),
 			path.resolve(__dirname, 'reverse_engineering', 'api.js'),

forward_engineering/alterScript/alterScriptFromDeltaHelper.js

@@ -133,9 +133,9 @@ const getAlterCollectionsScriptDtos = ({
 		...deleteCollectionScriptDtos,
 		...modifyCollectionScriptDtos,
 		...addColumnScriptDtos,
-		...modifyCollectionKeysScriptDtos,
 		...deleteColumnScriptDtos,
 		...modifyColumnScriptDtos,
+		...modifyCollectionKeysScriptDtos,
 	].filter(Boolean);
 };
 

forward_engineering/alterScript/alterScriptHelpers/alterEntityHelper.js

@@ -290,8 +290,8 @@ const getModifyColumnScriptDtos =
 			...renameColumnScriptDtos,
 			...updateTypeScriptDtos,
 			...modifyNotNullScriptDtos,
-			...modifyCommentScriptDtos,
 			...modifyDefaultColumnValueScriptDtos,
+			...modifyCommentScriptDtos,
 		].filter(Boolean);
 	};
 

forward_engineering/alterScript/alterScriptHelpers/columnHelpers/defaultValueHelper.js

@@ -1,6 +1,7 @@
 const { toPairs } = require('lodash');
 const { AlterScriptDto } = require('../../types/AlterScriptDto');
-const { getFullTableName, wrapInQuotes, wrapInSingleQuotes } = require('../../../utils/general');
+const { getFullTableName, wrapInQuotes } = require('../../../utils/general');
+const { decorateDefault } = require('../../../ddlProvider/ddlHelpers/columnDefinitionHelper');
 const assignTemplates = require('../../../utils/assignTemplates');
 const templates = require('../../../ddlProvider/templates');
 
@@ -35,10 +36,12 @@ const getUpdatedDefaultColumnValueScriptDtos = ({ collection }) =>
 		})
 		.map(([columnName, jsonSchema]) => {
 			const newDefaultValue = jsonSchema.default;
+			const type = jsonSchema.mode || jsonSchema.childType || jsonSchema.type;
+			const isArrayType = Array.isArray(jsonSchema.array_type) && jsonSchema.array_type.length > 0;
 			const scriptGenerationConfig = {
 				tableName: getFullTableName(collection),
 				columnName: wrapInQuotes(columnName),
-				defaultValue: wrapInSingleQuotes({ name: newDefaultValue }),
+				defaultValue: decorateDefault(type, newDefaultValue, isArrayType),
 			};
 			return updateColumnDefaultValue(scriptGenerationConfig);
 		})

forward_engineering/api.js

@@ -1,80 +1,17 @@
-const _ = require('lodash');
-const reApi = require('../reverse_engineering/api');
-const { createLogger } = require('../reverse_engineering/helpers/loggerHelper');
-const applyToInstanceHelper = require('./applyToInstanceHelper');
-const {
-	buildEntityLevelAlterScript,
-	buildContainerLevelAlterScript,
-	doesContainerLevelAlterScriptContainDropStatements,
-	doesEntityLevelAlterScriptContainDropStatements,
-} = require('./alterScript/alterScriptBuilder');
+const { generateScript } = require('./api/generateScript');
+const { generateViewScript } = require('./api/generateViewScript');
+const { generateContainerScript } = require('./api/generateContainerScript');
+const { getDatabases } = require('./api/getDatabases');
+const { applyToInstance } = require('./api/applyToInstance');
+const { testConnection } = require('./api/testConnection');
+const { isDropInStatements } = require('./api/isDropInStatements');
 
 module.exports = {
-	generateScript(data, logger, callback, app) {
-		try {
-			const script = buildEntityLevelAlterScript(data, app);
-			callback(null, script);
-		} catch (error) {
-			logger.log('error', { message: error.message, stack: error.stack }, 'PostgreSQL Forward-Engineering Error');
-
-			callback({ message: error.message, stack: error.stack });
-		}
-	},
-
-	generateViewScript(data, logger, callback, app) {
-		callback(new Error('Forward-Engineering of delta model on view level is not supported'));
-	},
-
-	generateContainerScript(data, logger, callback, app) {
-		try {
-			const script = buildContainerLevelAlterScript(data, app);
-			callback(null, script);
-		} catch (error) {
-			logger.log('error', { message: error.message, stack: error.stack }, 'PostgreSQL Forward-Engineering Error');
-
-			callback({ message: error.message, stack: error.stack });
-		}
-	},
-
-	getDatabases(connectionInfo, logger, callback, app) {
-		logger.progress({ message: 'Find all databases' });
-
-		reApi.getDatabases(connectionInfo, logger, callback, app);
-	},
-
-	applyToInstance(connectionInfo, logger, callback, app) {
-		logger.clear();
-		logger.log(
-			'info',
-			_.omit(connectionInfo, 'script', 'containerData'),
-			'connectionInfo',
-			connectionInfo.hiddenKeys,
-		);
-
-		const postgresLogger = createLogger({
-			title: 'Apply to instance',
-			hiddenKeys: connectionInfo.hiddenKeys,
-			logger,
-		});
-
-		applyToInstanceHelper.applyToInstance(connectionInfo, postgresLogger, app).then(callback, callback);
-	},
-
-	testConnection(connectionInfo, logger, callback, app) {
-		reApi.testConnection(connectionInfo, logger, callback, app).then(callback, callback);
-	},
-
-	isDropInStatements(data, logger, callback, app) {
-		try {
-			if (data.level === 'container') {
-				const containsDropStatements = doesContainerLevelAlterScriptContainDropStatements(data, app);
-				callback(null, containsDropStatements);
-			} else {
-				const containsDropStatements = doesEntityLevelAlterScriptContainDropStatements(data, app);
-				callback(null, containsDropStatements);
-			}
-		} catch (e) {
-			callback({ message: e.message, stack: e.stack });
-		}
-	},
+	generateScript,
+	generateViewScript,
+	generateContainerScript,
+	getDatabases,
+	applyToInstance,
+	testConnection,
+	isDropInStatements,
 };

forward_engineering/api/applyToInstance.js

@@ -0,0 +1,20 @@
+const _ = require('lodash');
+const { createLogger } = require('../../reverse_engineering/helpers/loggerHelper');
+const applyToInstanceHelper = require('../applyToInstanceHelper');
+
+function applyToInstance(connectionInfo, logger, callback, app) {
+	logger.clear();
+	logger.log('info', _.omit(connectionInfo, 'script', 'containerData'), 'connectionInfo', connectionInfo.hiddenKeys);
+
+	const postgresLogger = createLogger({
+		title: 'Apply to instance',
+		hiddenKeys: connectionInfo.hiddenKeys,
+		logger,
+	});
+
+	applyToInstanceHelper.applyToInstance(connectionInfo, postgresLogger, app).then(callback, callback);
+}
+
+module.exports = {
+	applyToInstance,
+};

forward_engineering/api/generateContainerScript.js

@@ -0,0 +1,16 @@
+const { buildContainerLevelAlterScript } = require('../alterScript/alterScriptBuilder');
+
+function generateContainerScript(data, logger, callback, app) {
+	try {
+		const script = buildContainerLevelAlterScript(data, app);
+		callback(null, script);
+	} catch (error) {
+		logger.log('error', { message: error.message, stack: error.stack }, 'PostgreSQL Forward-Engineering Error');
+
+		callback({ message: error.message, stack: error.stack });
+	}
+}
+
+module.exports = {
+	generateContainerScript,
+};

forward_engineering/api/generateScript.js

@@ -0,0 +1,16 @@
+const { buildEntityLevelAlterScript } = require('../alterScript/alterScriptBuilder');
+
+function generateScript(data, logger, callback, app) {
+	try {
+		const script = buildEntityLevelAlterScript(data, app);
+		callback(null, script);
+	} catch (error) {
+		logger.log('error', { message: error.message, stack: error.stack }, 'PostgreSQL Forward-Engineering Error');
+
+		callback({ message: error.message, stack: error.stack });
+	}
+}
+
+module.exports = {
+	generateScript,
+};

forward_engineering/api/generateViewScript.js

@@ -0,0 +1,7 @@
+function generateViewScript(data, logger, callback, app) {
+	callback(new Error('Forward-Engineering of delta model on view level is not supported'));
+}
+
+module.exports = {
+	generateViewScript,
+};

forward_engineering/api/getDatabases.js

@@ -0,0 +1,11 @@
+const reApi = require('../../reverse_engineering/api');
+
+function getDatabases(connectionInfo, logger, callback, app) {
+	logger.progress({ message: 'Find all databases' });
+
+	reApi.getDatabases(connectionInfo, logger, callback, app);
+}
+
+module.exports = {
+	getDatabases,
+};

forward_engineering/api/isDropInStatements.js

@@ -0,0 +1,22 @@
+const {
+	doesContainerLevelAlterScriptContainDropStatements,
+	doesEntityLevelAlterScriptContainDropStatements,
+} = require('../alterScript/alterScriptBuilder');
+
+function isDropInStatements(data, logger, callback, app) {
+	try {
+		if (data.level === 'container') {
+			const containsDropStatements = doesContainerLevelAlterScriptContainDropStatements(data, app);
+			callback(null, containsDropStatements);
+		} else {
+			const containsDropStatements = doesEntityLevelAlterScriptContainDropStatements(data, app);
+			callback(null, containsDropStatements);
+		}
+	} catch (e) {
+		callback({ message: e.message, stack: e.stack });
+	}
+}
+
+module.exports = {
+	isDropInStatements,
+};

forward_engineering/api/testConnection.js

@@ -0,0 +1,9 @@
+const reApi = require('../../reverse_engineering/api');
+
+function testConnection(connectionInfo, logger, callback, app) {
+	reApi.testConnection(connectionInfo, logger, callback, app).then(callback, callback);
+}
+
+module.exports = {
+	testConnection,
+};