fix(service): fix models for create command (#33)

Author: devCrossNet

.github/PULL_REQUEST_TEMPLATE.md

@@ -24,8 +24,8 @@ or a link to a ticket system...
 
 ### New Feature / Bug Fix
 
-- [ ] Run unit tests to ensure all existing tests are still passing
-- [ ] Add new passing unit tests to cover the code introduced by your PR
+- [ ] Run unit tests **AND E2E TESTS** to ensure all existing tests are still passing
+- [ ] Add new passing unit **AND E2E TESTS** tests to cover the code introduced by your PR
 
 <!--
 Thanks for contributing!

package-lock.json

@@ -4,6 +4,7 @@
   "scripts": {
     "postinstall": "lerna bootstrap",
     "build": "lerna run build",
+    "clean": "lerna run clean",
     "test": "jest --coverage",
     "e2e": "lerna run e2e",
     "lint": "tslint -c tslint.json './packages/**/src/**/*.ts'",

package.json

@@ -3,7 +3,21 @@ import { format } from 'prettier';
 import { runtimeRoot } from '../utils/path';
 import { logError, logInfo } from '../utils/ui';
 
-const prettierConfig = JSON.parse(fs.readFileSync(runtimeRoot('.prettierrc')).toString());
+let prettierConfig;
+
+try {
+  prettierConfig = JSON.parse(fs.readFileSync(runtimeRoot('.prettierrc')).toString());
+} catch (e) {
+  prettierConfig = {
+    singleQuote: true,
+    bracketSpacing: true,
+    arrowParens: 'always',
+    trailingComma: 'all',
+    tabWidth: 2,
+    printWidth: 120,
+    endOfLine: 'lf',
+  };
+}
 
 export class JSONModel<T> {
   protected path: string = null;
@@ -15,30 +29,30 @@ export class JSONModel<T> {
   }
 
   public load() {
-    try {
-      this.model = JSON.parse(fs.readFileSync(this.path).toString());
-    } catch (e) {
-      logError(e);
-      logInfo(fs.readFileSync(this.path).toString());
+    if (fs.existsSync(this.path)) {
+      try {
+        this.model = JSON.parse(fs.readFileSync(this.path).toString());
+      } catch (e) {
+        logError(e);
+      }
     }
   }
 
   public save(prettier: boolean = true) {
     let jsonString = '';
     try {
-      jsonString = JSON.stringify(this.model, null, (prettierConfig && prettierConfig.tabWidth) || 2) + '\n';
+      jsonString = JSON.stringify(this.model, null, prettierConfig.tabWidth) + '\n';
+
+      const data = prettier
+        ? format(jsonString, {
+            ...prettierConfig,
+            parser: 'json',
+          })
+        : jsonString;
+
+      fs.writeFileSync(this.path, data);
     } catch (e) {
       logError(e);
-      logInfo(this.model);
     }
-
-    const data = prettier
-      ? format(jsonString, {
-          ...prettierConfig,
-          parser: 'json',
-        })
-      : jsonString;
-
-    fs.writeFileSync(this.path, data);
   }
 }

packages/addon-contentful/package-lock.json

@@ -43,14 +43,16 @@ class Model extends JSONModel<IVuesionConfig> implements IVuesionConfig {
   constructor() {
     super(runtimeRoot('.vuesion/config.json'));
 
-    this.clean = this.model.clean;
-    this.currentVersion = this.model.currentVersion;
-    this.devServer = this.model.devServer;
-    this.generators = this.model.generators;
-    this.i18n = this.model.i18n;
-    this.prettier = this.model.prettier;
-    this.spa = this.model.spa;
-    this.webpack = this.model.webpack;
+    if (this.model !== null) {
+      this.clean = this.model.clean;
+      this.currentVersion = this.model.currentVersion;
+      this.devServer = this.model.devServer;
+      this.generators = this.model.generators;
+      this.i18n = this.model.i18n;
+      this.prettier = this.model.prettier;
+      this.spa = this.model.spa;
+      this.webpack = this.model.webpack;
+    }
   }
 
   public getWebpackAliases() {