fix: modelSettings is stringified properly #2915

packages/cli/generators/discover/index.js

@@ -219,9 +219,12 @@ module.exports = class DiscoveryGenerator extends ArtifactGenerator {
       modelDefinition.isModelBaseBuiltin = true;
       modelDefinition.modelBaseClass = 'Entity';
       modelDefinition.className = utils.pascalCase(modelDefinition.name);
-      // These last two are so that the templat doesn't error out of they aren't there
+      // These last two are so that the template doesn't error out of they aren't there
       modelDefinition.allowAdditionalProperties = true;
-      modelDefinition.modelSettings = modelDefinition.settings || {};
+      // modelDefinition.modelSettings = modelDefinition.settings || {};
+      modelDefinition.modelSettings = utils.stringifyModelSettings(
+        modelDefinition.settings || {},
+      );
       debug(`Generating: ${modelDefinition.name}`);
 
       const fullPath = path.resolve(

packages/cli/generators/model/index.js

@@ -14,7 +14,6 @@ const inspect = require('util').inspect;
 const utils = require('../../lib/utils');
 const chalk = require('chalk');
 const path = require('path');
-const stringifyObject = require('stringify-object');
 
 const PROMPT_BASE_MODEL_CLASS = 'Please select the model base class';
 const ERROR_NO_MODELS_FOUND = 'Model was not found in';
@@ -515,13 +514,8 @@ module.exports = class ModelGenerator extends ArtifactGenerator {
     });
 
     if (this.artifactInfo.modelSettings) {
-      this.artifactInfo.modelSettings = stringifyObject(
-        {settings: this.artifactInfo.modelSettings},
-        {
-          indent: '  ', // two spaces
-          singleQuotes: true,
-          inlineCharacterLimit: 80,
-        },
+      this.artifactInfo.modelSettings = utils.stringifyModelSettings(
+        this.artifactInfo.modelSettings,
       );
     }
 

packages/cli/lib/utils.js

@@ -23,6 +23,7 @@ const urlSlug = require('url-slug');
 const validate = require('validate-npm-package-name');
 const Conflicter = require('yeoman-generator/lib/util/conflicter');
 const connectors = require('../generators/datasource/connectors.json');
+const stringifyObject = require('stringify-object');
 
 const readdirAsync = promisify(fs.readdir);
 
@@ -518,6 +519,17 @@ exports.dataSourceToJSONFileName = function(dataSourceClass) {
   );
 };
 
+exports.stringifyModelSettings = function(modelSettings) {
+  return stringifyObject(
+    {settings: modelSettings},
+    {
+      indent: '  ', // two spaces
+      singleQuotes: true,
+      inlineCharacterLimit: 80,
+    },
+  );
+};
+
 // literal strings with artifacts directory locations
 exports.repositoriesDir = 'repositories';
 exports.datasourcesDir = 'datasources';