hackolade · Vitalii4as · Jan 23, 2025 · Jan 21, 2025 · Jan 21, 2025 · Jan 21, 2025
diff --git a/api/fe.js b/api/fe.js
@@ -0,0 +1,6 @@
+const { generateScript, generateContainerScript } = require('../forward_engineering/api');
+
+module.exports = {
+	generateScript,
+	generateContainerScript,
+};
diff --git a/esbuild.package.js b/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, 'api', 're.js'),
 			path.resolve(__dirname, 'forward_engineering', 'api.js'),
 			path.resolve(__dirname, 'reverse_engineering', 'api.js'),
@@ -22,10 +24,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,

diff --git a/forward_engineering/api.js b/forward_engineering/api.js
@@ -1,11 +1,7 @@
-'use strict';
-const { generateCollectionScript } = require('./services/protoScriptGenerationService');
-const { setDependencies, dependencies } = require('../reverse_engineering/appDependencies');
-const RECORD_NAME_STRATEGY = 'RecordNameStrategy';
-const TOPIC_RECORD_NAME_STRATEGY = 'TopicRecordNameStrategy';
-const protobufjs = require('protobufjs');
-const descriptor = require('protobufjs/ext/descriptor');
+const _ = require('lodash');
 const { formatComment } = require('./helpers/utils');
+const { prepareScript } = require('./helpers/prepareScript');
+const { generateCollectionScript } = require('./services/protoScriptGenerationService');
 
 const defaultContainerData = [
 	{
@@ -17,11 +13,8 @@ const defaultContainerData = [
 
 module.exports = {
 	generateContainerScript(data, logger, callback, app) {
-		setDependencies(app);
-		const _ = dependencies.lodash;
 		const containerData = !_.isEmpty(data.containerData) ? data.containerData : defaultContainerData;
 		try {
-			const _ = dependencies.lodash;
 			let preparedData = {
 				...data,
 				containerData,
@@ -69,7 +62,7 @@ module.exports = {
 			]
 				.filter(row => row !== '')
 				.join('\n');
-			callback(null, this.prepareScript(script, preparedData));
+			callback(null, prepareScript(script, preparedData));
 		} catch (error) {
 			const errorObject = {
 				message: error.message,
@@ -80,12 +73,10 @@ module.exports = {
 			callback(errorObject);
 		}
 	},
+
 	generateScript(data, logger, callback, app) {
-		setDependencies(app);
-		const _ = dependencies.lodash;
 		const containerData = !_.isEmpty(data.containerData) ? data.containerData : defaultContainerData;
 		try {
-			const _ = dependencies.lodash;
 			let preparedData = {
 				...data,
 				containerData,
@@ -105,7 +96,7 @@ module.exports = {
 			]
 				.filter(row => row !== '')
 				.join('\n');
-			callback(null, this.prepareScript(script, preparedData));
+			callback(null, prepareScript(script, preparedData));
 		} catch (error) {
 			const errorObject = {
 				message: error.message,
@@ -115,75 +106,4 @@ module.exports = {
 			callback(errorObject);
 		}
 	},
-
-	prepareScript(script, data) {
-		const _ = dependencies.lodash;
-		const targetSchemaRegistry = _.get(data, 'options.targetScriptOptions.keyword');
-		if (targetSchemaRegistry === 'confluentSchemaRegistry') {
-			return this.getConfluentPostQuery({ data, schema: script });
-		}
-		if (targetSchemaRegistry === 'pulsarSchemaRegistry') {
-			return this.getPulsarPostQuery({ data, schema: script });
-		}
-
-		return script;
-	},
-
-	getPulsarPostQuery({ data, schema }) {
-		const _ = dependencies.lodash;
-		const root = protobufjs.parse(schema).root;
-		const descriptorMsg = root.toDescriptor('proto3');
-		const buffer = descriptor.FileDescriptorSet.encode(descriptorMsg).finish();
-		const fileDescriptorSet = buffer.toString('base64');
-		const descriptorJson = descriptorMsg.toJSON();
-		const rootMessageTypeName = `${_.get(descriptorJson, 'file[0].package')}.${_.get(descriptorJson, 'file[0].messageType[0].name')}`;
-		const rootFileDescriptorName = _.get(descriptorJson, 'file[0].name');
-		const body = {
-			fileDescriptorSet,
-			rootMessageTypeName,
-			rootFileDescriptorName,
-		};
-		const bodyObject = {
-			type: 'PROTOBUF_NATIVE',
-			data: body,
-			properties: {},
-		};
-		const namespace = _.get(data, 'containerData[0].name', '');
-		const topic = _.get(data, 'containerData[0].pulsarTopicName', '');
-		const persistence = _.get(data, 'containerData[0].isNonPersistentTopic', false)
-			? 'non-persistent'
-			: 'persistent';
-		return `POST /${persistence}/${namespace}/${topic}/schema\n\n${JSON.stringify(bodyObject, null, 4)}`;
-	},
-
-	getConfluentPostQuery({ data, schema }) {
-		const getName = () => {
-			const _ = dependencies.lodash;
-			const name = this.getRecordName(data);
-
-			const schemaType = _.get(data, 'containerData[0].schemaType');
-			const containerName = _.get(data, 'containerData[0].name');
-			const topic = _.get(data, 'modelData[0].schemaTopic');
-
-			const typePostfix = schemaType ? `-${schemaType}` : '';
-			const containerPrefix = containerName ? `${containerName}.` : '';
-			const topicPrefix = topic ? `${topic}-` : '';
-
-			const schemaNameStrategy = _.get(data, 'modelData[0].schemaNameStrategy', '');
-			switch (schemaNameStrategy) {
-				case RECORD_NAME_STRATEGY:
-					return `${containerPrefix}${name}${typePostfix}`;
-				case TOPIC_RECORD_NAME_STRATEGY:
-					return `${topicPrefix}${containerPrefix}${name}${typePostfix}`;
-				default:
-					return `${name}${typePostfix}`;
-			}
-		};
-
-		return `POST /subjects/${getName()}/versions\n\n${schema}`;
-	},
-
-	getRecordName(data) {
-		return data.containerData[0].code || data.containerData[0].name || data.containerData[0].collectionName;
-	},
 };
diff --git a/forward_engineering/helpers/DefinitionsHelper.js b/forward_engineering/helpers/DefinitionsHelper.js
@@ -1,9 +1,7 @@
-const { dependencies } = require('../../reverse_engineering/appDependencies');
-
+const _ = require('lodash');
 const MODEL_DEFINITION_REF_REGEX = /#model\/definitions\/(.*)/;
 
 const parseDefinitions = definitions => {
-	const _ = dependencies.lodash;
 	return Object.entries(_.get(JSON.parse(definitions), 'properties', {}))
 		.map(([key, value]) => ({ title: key, ...value }))
 		.filter(definition => {
@@ -14,7 +12,6 @@ const parseDefinitions = definitions => {
 };
 
 const getDefinitionInfo = (definitions, fieldOptions, referenceId) => {
-	const _ = dependencies.lodash;
 	const requiredDefinition = getReferencedDefinition(definitions, referenceId);
 
 	if (requiredDefinition) {
@@ -30,7 +27,6 @@ const getDefinitionInfo = (definitions, fieldOptions, referenceId) => {
 };
 
 const getReferencedDefinition = (definitions, referenceId) => {
-	const _ = dependencies.lodash;
 	return definitions.find(definition =>
 		_.get(definition, 'definitionRefs', []).some(ref => _.last(ref) === referenceId),
 	);
@@ -71,7 +67,6 @@ const extractDefinitionsFromProperties = (properties = []) => {
 };
 
 const convertEntityTypeToValidName = type => {
-	const _ = dependencies.lodash;
 	return _.lowerCase(type).split(' ').join('_');
 };
 

diff --git a/forward_engineering/helpers/FieldNumberGenerationHelper.js b/forward_engineering/helpers/FieldNumberGenerationHelper.js
@@ -1,7 +1,6 @@
-const { dependencies } = require('../../reverse_engineering/appDependencies');
+const _ = require('lodash');
 
 const fixFieldNumbers = ({ fields, oneOfFields, oneOfIndex, reservedNumbers }) => {
-	const _ = dependencies.lodash;
 	const fieldEntries = Object.entries(fields);
 	fieldEntries.splice(oneOfIndex, 0, ...Object.entries(oneOfFields));
 	const checks = getChecksFromReservedNumbers(reservedNumbers);
@@ -74,8 +73,6 @@ const getChecksFromReservedNumbers = reservedNumbers => {
 };
 
 const generateSequence = (fieldsNumber, checks) => {
-	const _ = dependencies.lodash;
-
 	const fieldsNumberPositionRange = _.range(1, fieldsNumber + 1);
 
 	return fieldsNumberPositionRange.reduce(
@@ -85,7 +82,6 @@ const generateSequence = (fieldsNumber, checks) => {
 };
 
 const getNextFieldNumber = (position, usedNumbers, checks) => {
-	const _ = dependencies.lodash;
 	const candidates = _.range(position, position + 1000);
 	const nextNumber = candidates.find(
 		candidate => !usedNumbers.includes(candidate) && notReservedField(candidate, checks),

diff --git a/forward_engineering/helpers/getConfluentPostQuery.js b/forward_engineering/helpers/getConfluentPostQuery.js
@@ -0,0 +1,38 @@
+const _ = require('lodash');
+
+const RECORD_NAME_STRATEGY = 'RecordNameStrategy';
+const TOPIC_RECORD_NAME_STRATEGY = 'TopicRecordNameStrategy';
+
+const getRecordName = data => {
+	return data.containerData[0].code || data.containerData[0].name || data.containerData[0].collectionName;
+};
+
+const getConfluentPostQuery = ({ data, schema }) => {
+	const getName = () => {
+		const name = getRecordName(data);
+
+		const schemaType = _.get(data, 'containerData[0].schemaType');
+		const containerName = _.get(data, 'containerData[0].name');
+		const topic = _.get(data, 'modelData[0].schemaTopic');
+
+		const typePostfix = schemaType ? `-${schemaType}` : '';
+		const containerPrefix = containerName ? `${containerName}.` : '';
+		const topicPrefix = topic ? `${topic}-` : '';
+
+		const schemaNameStrategy = _.get(data, 'modelData[0].schemaNameStrategy', '');
+		switch (schemaNameStrategy) {
+			case RECORD_NAME_STRATEGY:
+				return `${containerPrefix}${name}${typePostfix}`;
+			case TOPIC_RECORD_NAME_STRATEGY:
+				return `${topicPrefix}${containerPrefix}${name}${typePostfix}`;
+			default:
+				return `${name}${typePostfix}`;
+		}
+	};
+
+	return `POST /subjects/${getName()}/versions\n\n${schema}`;
+};
+
+module.exports = {
+	getConfluentPostQuery,
+};
diff --git a/forward_engineering/helpers/getPulsarPostQuery.js b/forward_engineering/helpers/getPulsarPostQuery.js
@@ -0,0 +1,31 @@
+const _ = require('lodash');
+const protobufjs = require('protobufjs');
+const descriptor = require('protobufjs/ext/descriptor');
+
+const getPulsarPostQuery = ({ data, schema }) => {
+	const root = protobufjs.parse(schema).root;
+	const descriptorMsg = root.toDescriptor('proto3');
+	const buffer = descriptor.FileDescriptorSet.encode(descriptorMsg).finish();
+	const fileDescriptorSet = buffer.toString('base64');
+	const descriptorJson = descriptorMsg.toJSON();
+	const rootMessageTypeName = `${_.get(descriptorJson, 'file[0].package')}.${_.get(descriptorJson, 'file[0].messageType[0].name')}`;
+	const rootFileDescriptorName = _.get(descriptorJson, 'file[0].name');
+	const body = {
+		fileDescriptorSet,
+		rootMessageTypeName,
+		rootFileDescriptorName,
+	};
+	const bodyObject = {
+		type: 'PROTOBUF_NATIVE',
+		data: body,
+		properties: {},
+	};
+	const namespace = _.get(data, 'containerData[0].name', '');
+	const topic = _.get(data, 'containerData[0].pulsarTopicName', '');
+	const persistence = _.get(data, 'containerData[0].isNonPersistentTopic', false) ? 'non-persistent' : 'persistent';
+	return `POST /${persistence}/${namespace}/${topic}/schema\n\n${JSON.stringify(bodyObject, null, 4)}`;
+};
+
+module.exports = {
+	getPulsarPostQuery,
+};
diff --git a/forward_engineering/helpers/prepareScript.js b/forward_engineering/helpers/prepareScript.js
@@ -0,0 +1,19 @@
+const _ = require('lodash');
+const { getConfluentPostQuery } = require('./getConfluentPostQuery');
+const { getPulsarPostQuery } = require('./getPulsarPostQuery');
+
+const prepareScript = (script, data) => {
+	const targetSchemaRegistry = _.get(data, 'options.targetScriptOptions.keyword');
+	if (targetSchemaRegistry === 'confluentSchemaRegistry') {
+		return getConfluentPostQuery({ data, schema: script });
+	}
+	if (targetSchemaRegistry === 'pulsarSchemaRegistry') {
+		return getPulsarPostQuery({ data, schema: script });
+	}
+
+	return script;
+};
+
+module.exports = {
+	prepareScript,
+};
diff --git a/forward_engineering/services/protoScriptGenerationService.js b/forward_engineering/services/protoScriptGenerationService.js
@@ -1,4 +1,4 @@
-const { dependencies } = require('../../reverse_engineering/appDependencies');
+const _ = require('lodash');
 const {
 	parseDefinitions,
 	getDefinitionInfo,
@@ -98,7 +98,6 @@ const getMessageStatement = ({
 	modelDefinitions,
 	externalDefinitions,
 }) => {
-	const _ = dependencies.lodash;
 	if (jsonSchema.$ref) {
 		const definitionName = jsonSchema.$ref.slice('#model/definitions/'.length);
 		jsonSchema = modelDefinitions.find(definition => definition.title === definitionName) || jsonSchema;
@@ -162,7 +161,6 @@ const concutFieldsStatements = (fieldsStatements, oneOfStatement, oneOfIndex) =>
 
 const getOneOfStatement = (oneOfMeta, fields, spacePrefix = '') => {
 	const oneOfName = oneOfMeta?.name || 'one_of';
-	const _ = dependencies.lodash;
 	if (_.isEmpty(fields)) {
 		return '';
 	}
@@ -206,7 +204,6 @@ const getOptionStatement = (option, spacePrefix) => {
 };
 
 const getReservedStatements = (data, spacePrefix) => {
-	const _ = dependencies.lodash;
 	const reservedFieldNames = !_.isEmpty(data.reservedFieldNames)
 		? `${spacePrefix}reserved ${data.reservedFieldNames};`
 		: ``;
@@ -228,7 +225,6 @@ const getFieldsStatement = ({
 	externalDefinitions,
 	oneOfIndex,
 }) => {
-	const _ = dependencies.lodash;
 	const oneOfFields = Object.entries(
 		(jsonSchema.oneOf || []).reduce((properties, property) => ({ ...properties, ...property.properties }), {}),
 	).reduce((oneOfProperties, [key, value]) => ({ ...oneOfProperties, [key]: { ...value, parent: 'oneOf' } }), {});
@@ -303,7 +299,6 @@ const getFieldInfo = ({
 	externalDefinitions,
 }) => {
 	const getUDT = udt => {
-		const _ = dependencies.lodash;
 		return !_.isEmpty(udt) ? udt : 'string';
 	};
 	if (isExternalRef) {
@@ -352,8 +347,6 @@ const getValidatedFieldRule = ({ fieldRule, protoVersion }) => {
 };
 
 const getFieldOptionsStatement = options => {
-	const _ = dependencies.lodash;
-
 	const stringifiedOptions = (options || [])
 		.filter(option => option?.optionKey && option?.optionValue)
 		.filter(option => option.optionKey !== 'allow_alias')