refactor: Do not rely on serverless.yamlParser

Author: medikoo

lib/plugins/plugin/install.js

@@ -2,16 +2,27 @@
 
 const BbPromise = require('bluebird');
 const childProcess = BbPromise.promisifyAll(require('child_process'));
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const path = require('path');
 const _ = require('lodash');
+const isPlainObject = require('type/plain-object/is');
+const yaml = require('js-yaml');
+const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
+const log = require('@serverless/utils/log');
 const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
 const yamlAstParser = require('../../utils/yamlAstParser');
 const fileExists = require('../../utils/fs/fileExists');
 const pluginUtils = require('./lib/utils');
 const npmCommandDeferred = require('../../utils/npm-command-deferred');
 
+const requestManualUpdate = (serverlessFilePath) =>
+  log(`
+  Can't automatically add plugin into "${path.basename(serverlessFilePath)}" file.
+  Please make it manually.
+`);
+
 class PluginInstall {
   constructor(serverless, options) {
     this.serverless = serverless;
@@ -97,10 +108,7 @@ class PluginInstall {
     const serverlessFilePath = this.getServerlessFilePath();
     const fileExtension = path.extname(serverlessFilePath);
     if (fileExtension === '.js' || fileExtension === '.ts') {
-      this.serverless.cli.log(`
-          Can't automatically add plugin into "${path.basename(serverlessFilePath)}" file.
-          Please make it manually.
-        `);
+      requestManualUpdate(serverlessFilePath);
       return;
     }
 
@@ -136,7 +144,25 @@ class PluginInstall {
       return;
     }
 
-    const serverlessFileObj = await this.serverless.yamlParser.parse(serverlessFilePath);
+    const serverlessFileObj = yaml.load(await fsp.readFile(serverlessFilePath, 'utf8'), {
+      filename: serverlessFilePath,
+      schema: cloudformationSchema,
+    });
+    if (serverlessFileObj.plugins != null) {
+      // Plugins section can be behind veriables, opt-out in such case
+      if (isPlainObject(serverlessFileObj.plugins)) {
+        if (
+          serverlessFileObj.plugins.modules != null &&
+          !Array.isArray(serverlessFileObj.plugins.modules)
+        ) {
+          requestManualUpdate(serverlessFilePath);
+          return;
+        }
+      } else if (!Array.isArray(serverlessFileObj.plugins)) {
+        requestManualUpdate(serverlessFilePath);
+        return;
+      }
+    }
     await yamlAstParser.addNewArrayItem(
       serverlessFilePath,
       checkIsArrayPluginsObject(serverlessFileObj.plugins) ? 'plugins' : 'plugins.modules',

lib/plugins/plugin/uninstall.js

@@ -2,13 +2,24 @@
 
 const BbPromise = require('bluebird');
 const childProcess = BbPromise.promisifyAll(require('child_process'));
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const path = require('path');
 const _ = require('lodash');
+const isPlainObject = require('type/plain-object/is');
+const yaml = require('js-yaml');
+const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
+const log = require('@serverless/utils/log');
 const cliCommandsSchema = require('../../cli/commands-schema');
 const yamlAstParser = require('../../utils/yamlAstParser');
 const pluginUtils = require('./lib/utils');
 
+const requestManualUpdate = (serverlessFilePath) =>
+  log(`
+  Can't automatically add plugin into "${path.basename(serverlessFilePath)}" file.
+  Please make it manually.
+`);
+
 class PluginUninstall {
   constructor(serverless, options) {
     this.serverless = serverless;
@@ -67,10 +78,7 @@ class PluginUninstall {
     const serverlessFilePath = this.getServerlessFilePath();
     const fileExtension = path.extname(serverlessFilePath);
     if (fileExtension === '.js' || fileExtension === '.ts') {
-      this.serverless.cli.log(`
-          Can't automatically remove plugin from "serverless.js" file.
-          Please make it manually.
-        `);
+      requestManualUpdate(serverlessFilePath);
       return;
     }
 
@@ -95,7 +103,25 @@ class PluginUninstall {
       return;
     }
 
-    const serverlessFileObj = await this.serverless.yamlParser.parse(serverlessFilePath);
+    const serverlessFileObj = yaml.load(await fsp.readFile(serverlessFilePath, 'utf8'), {
+      filename: serverlessFilePath,
+      schema: cloudformationSchema,
+    });
+    if (serverlessFileObj.plugins != null) {
+      // Plugins section can be behind veriables, opt-out in such case
+      if (isPlainObject(serverlessFileObj.plugins)) {
+        if (
+          serverlessFileObj.plugins.modules != null &&
+          !Array.isArray(serverlessFileObj.plugins.modules)
+        ) {
+          requestManualUpdate(serverlessFilePath);
+          return;
+        }
+      } else if (!Array.isArray(serverlessFileObj.plugins)) {
+        requestManualUpdate(serverlessFilePath);
+        return;
+      }
+    }
     await yamlAstParser.removeExistingArrayItem(
       serverlessFilePath,
       Array.isArray(serverlessFileObj.plugins) ? 'plugins' : 'plugins.modules',