HCK-7863: added vector type (#127)

* Added config for vector data type and vector index methods

* fix vector config

* chore: untangling dependencies

* chore: untangling dependencies (finished)

* fix: proper keyword for Subtype

* fix: missing function

* feat: added `vector` type to generated FE script

* fix: appropriate dimension in all cases

* fix: removed type explicit decorator

* feat: added `Default` property, simplified subtypes

* fix: normalized behavior in DTD, handled the polyglot derive

* Update forward_engineering/alterScript/alterScriptHelpers/alterContainerHelper.js

Co-authored-by: Serhii Filonenko <91055067+serhii-filonenko@users.noreply.github.com>

* Update forward_engineering/alterScript/alterScriptHelpers/alterContainerHelper.js

Co-authored-by: Serhii Filonenko <91055067+serhii-filonenko@users.noreply.github.com>

* fix: type from columnDefinition

---------

Co-authored-by: pdesmarets <pascal@desmarets.org>
Co-authored-by: Vitalii Bedletskyi <vitalii.bedletskyi@hackolade.com>
Co-authored-by: Serhii Filonenko <91055067+serhii-filonenko@users.noreply.github.com>

Author: 4 people

forward_engineering/alterScript/alterScriptBuilder.js

@@ -1,12 +1,13 @@
 const { getAlterScriptDtos } = require('./alterScriptFromDeltaHelper');
-
 const { AlterScriptDto } = require('./types/AlterScriptDto');
+const { commentIfDeactivated } = require('../utils/general');
 
 /**
- * @return {(dtos: AlterScriptDto[], shouldApplyDropStatements: boolean) => string}
+ * @param {AlterScriptDto[]} dtos
+ * @param {boolean} shouldApplyDropStatements
+ * @return {string}
  * */
-const joinAlterScriptDtosIntoScript = _ => (dtos, shouldApplyDropStatements) => {
-	const { commentIfDeactivated } = require('../utils/general');
+const joinAlterScriptDtosIntoScript = (dtos, shouldApplyDropStatements) => {
 	return dtos
 		.map(dto => {
 			if (dto.isActivated === false) {
@@ -40,13 +41,12 @@ const joinAlterScriptDtosIntoScript = _ => (dtos, shouldApplyDropStatements) =>
  * @return {string}
  * */
 const buildEntityLevelAlterScript = (data, app) => {
-	const _ = app.require('lodash');
 	const alterScriptDtos = getAlterScriptDtos(data, app);
 	const shouldApplyDropStatements = data.options?.additionalOptions?.some(
 		option => option.id === 'applyDropStatements' && option.value,
 	);
 
-	return joinAlterScriptDtosIntoScript(_)(alterScriptDtos, shouldApplyDropStatements);
+	return joinAlterScriptDtosIntoScript(alterScriptDtos, shouldApplyDropStatements);
 };
 
 /**
@@ -78,13 +78,12 @@ const mapCoreDataForContainerLevelScripts = data => {
  * */
 const buildContainerLevelAlterScript = (data, app) => {
 	const preparedData = mapCoreDataForContainerLevelScripts(data);
-	const _ = app.require('lodash');
 	const alterScriptDtos = getAlterScriptDtos(preparedData, app);
 	const shouldApplyDropStatements = preparedData.options?.additionalOptions?.some(
 		option => option.id === 'applyDropStatements' && option.value,
 	);
 
-	return joinAlterScriptDtosIntoScript(_)(alterScriptDtos, shouldApplyDropStatements);
+	return joinAlterScriptDtosIntoScript(alterScriptDtos, shouldApplyDropStatements);
 };
 
 /**

forward_engineering/alterScript/alterScriptFromDeltaHelper.js

@@ -1,3 +1,4 @@
+const _ = require('lodash');
 const {
 	getAddContainerScriptDto,
 	getDeleteContainerScriptDto,
@@ -39,29 +40,30 @@ const {
 
 /**
  * @param dto {{
- *     collection: Object,
- *     app: App,
+ *     collection: Object
  * }}
  * @return {AlterScriptDto[]}
  * */
-const getAlterContainersScriptDtos = ({ collection, app }) => {
+const getAlterContainersScriptDtos = ({ collection }) => {
 	const addedContainers = collection.properties?.containers?.properties?.added?.items;
 	const deletedContainers = collection.properties?.containers?.properties?.deleted?.items;
 	const modifiedContainers = collection.properties?.containers?.properties?.modified?.items;
 
 	const addContainersScriptDtos = []
 		.concat(addedContainers)
 		.filter(Boolean)
-		.map(container => getAddContainerScriptDto(app)(Object.keys(container.properties)[0]));
+		.map(container => getAddContainerScriptDto(Object.keys(container.properties)[0]));
+
 	const deleteContainersScriptDtos = []
 		.concat(deletedContainers)
 		.filter(Boolean)
-		.map(container => getDeleteContainerScriptDto(app)(Object.keys(container.properties)[0]));
+		.map(container => getDeleteContainerScriptDto(Object.keys(container.properties)[0]));
+
 	const modifyContainersScriptDtos = []
 		.concat(modifiedContainers)
 		.filter(Boolean)
 		.map(containerWrapper => Object.values(containerWrapper.properties)[0])
-		.flatMap(container => getModifyContainerScriptDtos(app)(container));
+		.flatMap(container => getModifyContainerScriptDtos(container));
 
 	return [...addContainersScriptDtos, ...deleteContainersScriptDtos, ...modifyContainersScriptDtos].filter(Boolean);
 };
@@ -103,18 +105,23 @@ const getAlterCollectionsScriptDtos = ({
 	const createCollectionsScriptDtos = createScriptsData
 		.filter(collection => collection.compMod?.created)
 		.map(getAddCollectionScriptDto({ app, dbVersion, modelDefinitions, internalDefinitions, externalDefinitions }));
+
 	const deleteCollectionScriptDtos = deleteScriptsData
 		.filter(collection => collection.compMod?.deleted)
 		.map(getDeleteCollectionScriptDto(app));
-	const modifyCollectionScriptDtos = modifyScriptsData.flatMap(getModifyCollectionScriptDtos({ app, dbVersion }));
+
+	const modifyCollectionScriptDtos = modifyScriptsData.flatMap(getModifyCollectionScriptDtos({ dbVersion }));
+
 	const addColumnScriptDtos = createScriptsData
 		.filter(item => !item?.compMod?.created)
 		.flatMap(
 			getAddColumnScriptDtos({ app, dbVersion, modelDefinitions, internalDefinitions, externalDefinitions }),
 		);
+
 	const deleteColumnScriptDtos = deleteScriptsData
 		.filter(item => !item?.compMod?.deleted)
 		.flatMap(getDeleteColumnScriptDtos(app));
+
 	const modifyColumnScriptDtos = modifyScriptsData.flatMap(
 		getModifyColumnScriptDtos({ app, dbVersion, modelDefinitions, internalDefinitions, externalDefinitions }),
 	);
@@ -155,7 +162,7 @@ const getAlterViewScriptDtos = (collection, app) => {
 		.filter(Boolean)
 		.map(viewWrapper => Object.values(viewWrapper.properties)[0])
 		.map(view => ({ ...view, ...(view.role || {}) }))
-		.flatMap(view => getModifyViewScriptDtos(app)(view));
+		.flatMap(view => getModifyViewScriptDtos(view));
 
 	return [...deleteViewsScriptDtos, ...createViewsScriptDtos, ...modifyViewsScriptDtos].filter(Boolean);
 };
@@ -183,22 +190,24 @@ const getAlterModelDefinitionsScriptDtos = ({
 		.concat(collection.properties?.modelDefinitions?.properties?.added?.items)
 		.filter(Boolean)
 		.map(item => Object.values(item.properties)[0])
-		.map(item => ({ ...item, ...(app.require('lodash').omit(item.role, 'properties') || {}) }))
+		.map(item => ({ ...item, ...(_.omit(item.role, 'properties') || {}) }))
 		.filter(item => item.compMod?.created)
 		.map(getCreateUdtScriptDto({ app, dbVersion, modelDefinitions, internalDefinitions, externalDefinitions }));
+
 	const deleteUdtScriptDtos = []
 		.concat(collection.properties?.modelDefinitions?.properties?.deleted?.items)
 		.filter(Boolean)
 		.map(item => Object.values(item.properties)[0])
-		.map(item => ({ ...item, ...(app.require('lodash').omit(item.role, 'properties') || {}) }))
+		.map(item => ({ ...item, ...(_.omit(item.role, 'properties') || {}) }))
 		.filter(collection => collection.compMod?.deleted)
 		.map(getDeleteUdtScriptDto(app));
+
 	const addColumnScriptDtos = []
 		.concat(collection.properties?.modelDefinitions?.properties?.added?.items)
 		.filter(Boolean)
 		.map(item => Object.values(item.properties)[0])
 		.filter(item => !item.compMod)
-		.map(item => ({ ...item, ...(app.require('lodash').omit(item.role, 'properties') || {}) }))
+		.map(item => ({ ...item, ...(_.omit(item.role, 'properties') || {}) }))
 		.filter(item => item.childType === 'composite')
 		.flatMap(
 			getAddColumnToTypeScriptDtos({
@@ -209,12 +218,13 @@ const getAlterModelDefinitionsScriptDtos = ({
 				externalDefinitions,
 			}),
 		);
+
 	const deleteColumnScriptDtos = []
 		.concat(collection.properties?.modelDefinitions?.properties?.deleted?.items)
 		.filter(Boolean)
 		.map(item => Object.values(item.properties)[0])
 		.filter(item => !item.compMod)
-		.map(item => ({ ...item, ...(app.require('lodash').omit(item.role, 'properties') || {}) }))
+		.map(item => ({ ...item, ...(_.omit(item.role, 'properties') || {}) }))
 		.filter(item => item.childType === 'composite')
 		.flatMap(getDeleteColumnFromTypeScriptDtos(app));
 
@@ -223,7 +233,7 @@ const getAlterModelDefinitionsScriptDtos = ({
 		.filter(Boolean)
 		.map(item => Object.values(item.properties)[0])
 		.filter(item => !item.compMod)
-		.map(item => ({ ...item, ...(app.require('lodash').omit(item.role, 'properties') || {}) }))
+		.map(item => ({ ...item, ...(_.omit(item.role, 'properties') || {}) }))
 		.filter(item => item.childType === 'composite')
 		.flatMap(getModifyColumnOfTypeScriptDtos(app));
 
@@ -240,28 +250,29 @@ const getAlterModelDefinitionsScriptDtos = ({
  * @return Array<AlterScriptDto>
  * */
 const getAlterRelationshipsScriptDtos = ({ collection, app }) => {
-	const _ = app.require('lodash');
 	const ddlProvider = require('../ddlProvider/ddlProvider')(null, null, app);
 
 	const addedRelationships = []
 		.concat(collection.properties?.relationships?.properties?.added?.items)
 		.filter(Boolean)
 		.map(item => Object.values(item.properties)[0])
 		.filter(relationship => relationship?.role?.compMod?.created);
+
 	const deletedRelationships = []
 		.concat(collection.properties?.relationships?.properties?.deleted?.items)
 		.filter(Boolean)
 		.map(item => Object.values(item.properties)[0])
 		.filter(relationship => relationship?.role?.compMod?.deleted);
+
 	const modifiedRelationships = []
 		.concat(collection.properties?.relationships?.properties?.modified?.items)
 		.filter(Boolean)
 		.map(item => Object.values(item.properties)[0])
 		.filter(relationship => relationship?.role?.compMod?.modified);
 
-	const deleteFkScriptDtos = getDeleteForeignKeyScriptDtos(ddlProvider, _)(deletedRelationships);
-	const addFkScriptDtos = getAddForeignKeyScriptDtos(ddlProvider, _)(addedRelationships);
-	const modifiedFkScriptDtos = getModifyForeignKeyScriptDtos(ddlProvider, _)(modifiedRelationships);
+	const deleteFkScriptDtos = getDeleteForeignKeyScriptDtos(ddlProvider)(deletedRelationships);
+	const addFkScriptDtos = getAddForeignKeyScriptDtos(ddlProvider)(addedRelationships);
+	const modifiedFkScriptDtos = getModifyForeignKeyScriptDtos(ddlProvider)(modifiedRelationships);
 
 	return [...deleteFkScriptDtos, ...addFkScriptDtos, ...modifiedFkScriptDtos].filter(Boolean);
 };
@@ -308,17 +319,19 @@ const getAlterContainersSequencesScriptDtos = ({ collection, app }) => {
 		.concat(addedContainers)
 		.filter(Boolean)
 		.map(container => Object.values(container.properties)[0])
-		.flatMap(container => getAddContainerSequencesScriptDtos({ app })({ container }));
+		.flatMap(container => getAddContainerSequencesScriptDtos({ container }));
+
 	const deleteContainersScriptDtos = []
 		.concat(deletedContainers)
 		.filter(Boolean)
 		.map(container => Object.values(container.properties)[0])
-		.flatMap(container => getDeleteContainerSequencesScriptDtos({ app })({ container }));
+		.flatMap(container => getDeleteContainerSequencesScriptDtos({ container }));
+
 	const modifyContainersScriptDtos = []
 		.concat(modifiedContainers)
 		.filter(Boolean)
 		.map(container => Object.values(container.properties)[0])
-		.flatMap(container => getModifyContainerSequencesScriptDtos({ app })({ container }));
+		.flatMap(container => getModifyContainerSequencesScriptDtos({ container }));
 
 	return [...addContainersSequencesScriptDtos, ...deleteContainersScriptDtos, ...modifyContainersScriptDtos].filter(
 		Boolean,
@@ -342,7 +355,7 @@ const getAlterScriptDtos = (data, app) => {
 	const internalDefinitions = JSON.parse(data.internalDefinitions);
 	const externalDefinitions = JSON.parse(data.externalDefinitions);
 	const dbVersion = data.modelData[0]?.dbVersion;
-	const containersScriptDtos = getAlterContainersScriptDtos({ collection, app });
+	const containersScriptDtos = getAlterContainersScriptDtos({ collection });
 	const collectionsScriptDtos = getAlterCollectionsScriptDtos({
 		collection,
 		app,

forward_engineering/alterScript/alterScriptHelpers/alterContainerHelper.js

@@ -1,37 +1,56 @@
+const _ = require('lodash');
 const { getModifySchemaCommentsScriptDtos } = require('./containerHelpers/commentsHelper');
 const { AlterScriptDto } = require('../types/AlterScriptDto');
+const assignTemplates = require('../../utils/assignTemplates');
+const templates = require('../../ddlProvider/templates');
+const { wrapInQuotes } = require('../../utils/general');
 
 /**
- * @return {(containerName: string) => AlterScriptDto | undefined}
+ * @param {string} schemaName
+ * @return {AlterScriptDto | undefined}
  * */
-const getAddContainerScriptDto = app => containerName => {
-	const _ = app.require('lodash');
-	const ddlProvider = require('../../ddlProvider/ddlProvider')(null, null, app);
-	const { wrapInQuotes } = require('../../utils/general');
-	const script = ddlProvider.createSchemaOnly(wrapInQuotes(containerName));
-	return AlterScriptDto.getInstance([script], true, false);
+const createSchemaOnly = schemaName => {
+	const templateConfig = {
+		schemaName,
+	};
+	return assignTemplates(templates.createSchemaOnly, templateConfig);
 };
 
 /**
- * @return {(containerName: string) => AlterScriptDto | undefined}
+ * @param {string} schemaName
+ * @return {AlterScriptDto | undefined}
  * */
-const getDeleteContainerScriptDto = app => containerName => {
-	const _ = app.require('lodash');
-	const ddlProvider = require('../../ddlProvider/ddlProvider')(null, null, app);
-	const { wrapInQuotes } = require('../../utils/general');
+const dropSchema = schemaName => {
+	const templateConfig = {
+		schemaName,
+	};
+	return assignTemplates(templates.dropSchema, templateConfig);
+};
 
-	const script = ddlProvider.dropSchema(wrapInQuotes(containerName));
-	return AlterScriptDto.getInstance([script], true, true);
+/**
+ * @param {string} containerName
+ * @return {AlterScriptDto | undefined}
+ * */
+const getAddContainerScriptDto = containerName => {
+	const script = createSchemaOnly(wrapInQuotes(containerName));
+	return AlterScriptDto.getInstance([script], true, false);
 };
 
 /**
- * @return {(container: Object) => Array<AlterScriptDto>}
+ * @param {string} containerName
+ * @return {AlterScriptDto | undefined}
  * */
-const getModifyContainerScriptDtos = app => container => {
-	const _ = app.require('lodash');
-	const ddlProvider = require('../../ddlProvider/ddlProvider')(null, null, app);
+const getDeleteContainerScriptDto = containerName => {
+	const script = dropSchema(wrapInQuotes(containerName));
+	return AlterScriptDto.getInstance([script], true, true);
+};
 
-	const modifyCommentScriptDtos = getModifySchemaCommentsScriptDtos(_, ddlProvider)(container);
+/**
+ * @param {Object} container
+ * @return {Array<AlterScriptDto>}
+ * */
+const getModifyContainerScriptDtos = container => {
+	const modifyCommentScriptDtos = getModifySchemaCommentsScriptDtos(container);
 
 	return [...modifyCommentScriptDtos];
 };