Skip to content

Allow usage of adaptJsonSchema in browser version of application #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 16, 2023
Merged

Allow usage of adaptJsonSchema in browser version of application #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions api/re.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
const { adaptJsonSchema } = require('../reverse_engineering/helpers/adaptJsonSchema/adaptJsonSchema');

module.exports = { adaptJsonSchema };
19 changes: 2 additions & 17 deletions reverse_engineering/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const commonHelper = require('./helpers/commonHelper');
const dataHelper = require('./helpers/dataHelper');
const errorHelper = require('./helpers/errorHelper');
const adaptJsonSchema = require('./helpers/adaptJsonSchema/adaptJsonSchema');
const { adaptJsonSchema } = require('./helpers/adaptJsonSchema/adaptJsonSchema');
const resolveExternalDefinitionPathHelper = require('./helpers/resolveExternalDefinitionPathHelper');
const validationHelper = require('../forward_engineering/helpers/validationHelper');

Expand Down Expand Up @@ -62,22 +62,7 @@ module.exports = {
callback(handledError);
},

adaptJsonSchema(data, logger, callback) {
logger.log('info', 'Adaptation of JSON Schema started...', 'Adapt JSON Schema');
try {
const jsonSchema = JSON.parse(data.jsonSchema);

const adaptedJsonSchema = adaptJsonSchema(jsonSchema, data.options?.targetDBVersion);

logger.log('info', 'Adaptation of JSON Schema finished.', 'Adapt JSON Schema');

callback(null, {
jsonSchema: JSON.stringify(adaptedJsonSchema)
});
} catch(e) {
callback(commonHelper.handleErrorObject(e, 'Adapt JSON Schema'), data);
}
},
adaptJsonSchema,

resolveExternalDefinitionPath(data, logger, callback) {
resolveExternalDefinitionPathHelper.resolvePath(data, callback);
Expand Down
22 changes: 20 additions & 2 deletions reverse_engineering/helpers/adaptJsonSchema/adaptJsonSchema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const mapJsonSchema = require('./mapJsonSchema');
const commonHelper = require('../commonHelper')

const convertToString = (jsonSchema) => {
return Object.assign({}, jsonSchema, {
Expand Down Expand Up @@ -44,7 +45,7 @@ const handleNumericType = (jsonSchema) => {
return jsonSchema;
};

const adaptJsonSchema = (jsonSchema, targetDBVersion) => {
const adaptSchema = (jsonSchema, targetDBVersion) => {
const isJSONSchemaCompatibleTargetVersion = targetDBVersion?.split('.')?.[1] >= '1'; // 3.1.0 or higher
return mapJsonSchema(jsonSchema, (jsonSchemaItem) => {
if (Array.isArray(jsonSchemaItem.type) && !isJSONSchemaCompatibleTargetVersion) {
Expand All @@ -59,4 +60,21 @@ const adaptJsonSchema = (jsonSchema, targetDBVersion) => {
});
};

module.exports = adaptJsonSchema;
const adaptJsonSchema = (data, logger, callback) => {
logger.log('info', 'Adaptation of JSON Schema started...', 'Adapt JSON Schema');
try {
const jsonSchema = JSON.parse(data.jsonSchema);

const adaptedJsonSchema = adaptSchema(jsonSchema, data.options?.targetDBVersion);

logger.log('info', 'Adaptation of JSON Schema finished.', 'Adapt JSON Schema');

callback(null, {
jsonSchema: JSON.stringify(adaptedJsonSchema)
});
} catch(e) {
callback(commonHelper.handleErrorObject(e, 'Adapt JSON Schema'), data);
}
};

module.exports = { adaptJsonSchema };