HCK-9614: adapt FE to work in the browser (#16)

* HCK-9614: adapt FE to work in the browser

* HCK-9614: small fixes

* HCK-9614: fix legacy dep

Author: Nightlngale

api/fe.js

@@ -0,0 +1,5 @@
+const { generateContainerScript } = require('../forward_engineering/generateContainerScript');
+
+module.exports = {
+	generateContainerScript,
+};

esbuild.package.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const esbuild = require('esbuild');
 const { clean } = require('esbuild-plugin-clean');
+const { copy } = require('esbuild-plugin-copy');
 const { copyFolderFiles, addReleaseFlag } = require('@hackolade/hck-esbuild-plugins-pack');
 const { EXCLUDED_EXTENSIONS, EXCLUDED_FILES, DEFAULT_RELEASE_FOLDER_PATH } = require('./buildConstants');
 
@@ -11,6 +12,7 @@ const RELEASE_FOLDER_PATH = path.join(DEFAULT_RELEASE_FOLDER_PATH, `${packageDat
 esbuild
 	.build({
 		entryPoints: [
+			path.resolve(__dirname, 'api', 'fe.js'),
 			path.resolve(__dirname, 'forward_engineering', 'api.js'),
 			path.resolve(__dirname, 'reverse_engineering', 'api.js'),
 		],
@@ -21,10 +23,17 @@ esbuild
 		outdir: RELEASE_FOLDER_PATH,
 		minify: true,
 		logLevel: 'info',
+		external: ['lodash'],
 		plugins: [
 			clean({
 				patterns: [DEFAULT_RELEASE_FOLDER_PATH],
 			}),
+			copy({
+				assets: {
+					from: [path.join('node_modules', 'lodash', '**', '*')],
+					to: [path.join('node_modules', 'lodash')],
+				},
+			}),
 			copyFolderFiles({
 				fromPath: __dirname,
 				targetFolderPath: RELEASE_FOLDER_PATH,

forward_engineering/api.js

@@ -1,36 +1,10 @@
 const { generateGremlinDataSamples } = require('./helpers/sampleDataHelper');
 const { generateJanusGraphSchema } = require('./helpers/schemaHelper');
 const gremlinHelper = require('../reverse_engineering/gremlinHelper');
+const { generateContainerScript } = require('./generateContainerScript');
 
 module.exports = {
-	generateContainerScript(data, logger, cb, app) {
-		try {
-			logger.clear();
-
-			const insertSamplesOption =
-				(data.options?.additionalOptions || []).find(option => option.id === 'INCLUDE_SAMPLES') || {};
-			const withSamples = data.options.origin !== 'ui';
-
-			const schemaScript = generateJanusGraphSchema({ ...data, app });
-			const sampleScript = generateGremlinDataSamples({ ...data, app });
-
-			if (withSamples || !insertSamplesOption.value) {
-				return cb(null, `${schemaScript}\n\n${sampleScript}`);
-			}
-
-			cb(null, [
-				{ title: 'JanusGraph schema', script: schemaScript },
-				{
-					title: 'Sample data',
-					script: sampleScript,
-				},
-			]);
-		} catch (e) {
-			logger.log('error', { message: e.message, stack: e.stack }, 'Forward-Engineering Error');
-
-			setTimeout(() => cb({ message: e.message, stack: e.stack }), 150);
-		}
-	},
+	generateContainerScript,
 
 	applyToInstance(connectionInfo, logger, callback, app) {
 		const sshService = app.require('@hackolade/ssh-service');

forward_engineering/generateContainerScript.js

@@ -0,0 +1,35 @@
+const { generateGremlinDataSamples } = require('./helpers/sampleDataHelper');
+const { generateJanusGraphSchema } = require('./helpers/schemaHelper');
+
+function generateContainerScript(data, logger, cb, app) {
+	try {
+		logger.clear();
+
+		const insertSamplesOption =
+			(data.options?.additionalOptions || []).find(option => option.id === 'INCLUDE_SAMPLES') || {};
+		const withSamples = data.options.origin !== 'ui';
+
+		const schemaScript = generateJanusGraphSchema({ ...data, app });
+		const sampleScript = generateGremlinDataSamples({ ...data, app });
+
+		if (withSamples || !insertSamplesOption.value) {
+			return cb(null, `${schemaScript}\n\n${sampleScript}`);
+		}
+
+		cb(null, [
+			{ title: 'JanusGraph schema', script: schemaScript },
+			{
+				title: 'Sample data',
+				script: sampleScript,
+			},
+		]);
+	} catch (e) {
+		logger.log('error', { message: e.message, stack: e.stack }, 'Forward-Engineering Error');
+
+		setTimeout(() => cb({ message: e.message, stack: e.stack }), 150);
+	}
+}
+
+module.exports = {
+	generateContainerScript,
+};

forward_engineering/helpers/geoshapeHelper.js

@@ -1,10 +1,7 @@
+const _ = require('lodash');
 const { DEFAULT_INDENT, NEW_LINE_DOUBLE_INDENT } = require('./common');
 
-let _ = null;
-const setDependencies = dependencies => (_ = dependencies.lodash);
-
 const getGeoshapeSample = (field, dependencies) => {
-	setDependencies(dependencies);
 	switch (field.subType) {
 		case 'point':
 			return getPoint(field);

forward_engineering/helpers/sampleDataHelper.js

@@ -139,12 +139,13 @@ const getChoices = item => {
 			return choices;
 		}
 
-		return Object.assign({}, choices, {
+		return {
+			...choices,
 			[choiceType]: {
 				choice: _.get(item, choiceType, []),
 				meta: _.get(item, `${choiceType}_meta`, {}),
 			},
-		});
+		};
 	}, {});
 
 	if (_.isEmpty(choices)) {
@@ -210,19 +211,22 @@ const resolveChoices = (choices, properties) => {
 		}
 
 		if (_.isUndefined(choicePropertiesIndex) || Object.keys(sortedProperties).length <= choicePropertiesIndex) {
-			return Object.assign({}, sortedProperties, choiceProperties);
+			return { ...sortedProperties, ...choiceProperties };
 		}
 
 		return Object.keys(sortedProperties).reduce((result, propertyKey, index) => {
 			if (index !== choicePropertiesIndex) {
-				return Object.assign({}, result, {
+				return {
+					...result,
 					[propertyKey]: sortedProperties[propertyKey],
-				});
+				};
 			}
 
-			return Object.assign({}, result, choiceProperties, {
+			return {
+				...result,
+				...choiceProperties,
 				[propertyKey]: sortedProperties[propertyKey],
-			});
+			};
 		}, {});
 	}, properties || {});
 };