fixup! simplify handling of model settings

bajtos · bajtos · commit 19ddd92e832f · 2019-09-19T12:54:47.000+02:00
Signed-off-by: Miroslav Bajtoš &lt;mbajtoss@gmail.com&gt;
diff --git a/packages/cli/generators/import-model/migrate-model.js b/packages/cli/generators/import-model/migrate-model.js
@@ -107,9 +107,7 @@ function importModelDefinition(modelCtor, log) {
 
   // FIXME: parse LB3 "strict" setting
   templateData.allowAdditionalProperties = true;
-  templateData.modelSettings = stringifyModelSettings(
-    // FIXME: load model settings from top-level entries and `.options` prop
-    templateData.settings || {},
-  );
+
+  templateData.modelSettings = stringifyModelSettings(templateData.settings);
   return templateData;
 }
diff --git a/packages/cli/lib/utils.js b/packages/cli/lib/utils.js
@@ -564,6 +564,7 @@ exports.dataSourceToJSONFileName = function(dataSourceClass) {
 };
 
 exports.stringifyModelSettings = function(modelSettings) {
+  if (!modelSettings || !Object.keys(modelSettings).length) return '';
   return stringifyObject(
     {settings: modelSettings},
     {

Original file line number	Diff line number	Diff line change
`@@ -564,6 +564,7 @@ exports.dataSourceToJSONFileName = function(dataSourceClass) {`
`564`	`564`	`};`
`565`	`565`
`566`	`566`	`exports.stringifyModelSettings = function(modelSettings) {`
	`567`	`+ if (!modelSettings \|\| !Object.keys(modelSettings).length) return '';`
`567`	`568`	`return stringifyObject(`
`568`	`569`	`{settings: modelSettings},`
`569`	`570`	`{`