serverless · medikoo · Jun 3, 2020 · Jun 3, 2020
diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
@@ -79,7 +79,7 @@ class PluginManager {
     let pluginProvider = null;
     // check if plugin is provider agnostic
     if (pluginInstance.provider) {
-      if (_.isString(pluginInstance.provider)) {
+      if (typeof pluginInstance.provider === 'string') {
         pluginProvider = pluginInstance.provider;
       } else if (_.isObject(pluginInstance.provider)) {
         pluginProvider = pluginInstance.provider.constructor.getProviderName();
@@ -168,7 +168,7 @@ class PluginManager {
       modules = servicePlugs;
     } else if (servicePlugs) {
       localPath =
-        servicePlugs.localPath && _.isString(servicePlugs.localPath)
+        servicePlugs.localPath && typeof servicePlugs.localPath === 'string'
           ? servicePlugs.localPath
           : localPath;
       if (Array.isArray(servicePlugs.modules)) {
@@ -503,7 +503,7 @@ class PluginManager {
    */
   spawn(commandsArray, options) {
     let commands = commandsArray;
-    if (_.isString(commandsArray)) {
+    if (typeof commandsArray === 'string') {
       commands = _.split(commandsArray, ':');
     }
     return this.invoke(commands, true).then(() => {
@@ -568,7 +568,7 @@ class PluginManager {
       if (
         _.isPlainObject(value.customValidation) &&
         value.customValidation.regularExpression instanceof RegExp &&
-        _.isString(value.customValidation.errorMessage) &&
+        typeof value.customValidation.errorMessage === 'string' &&
         !value.customValidation.regularExpression.test(this.cliOptions[key])
       ) {
         throw new this.serverless.classes.Error(value.customValidation.errorMessage);

diff --git a/lib/classes/Utils.js b/lib/classes/Utils.js
@@ -219,7 +219,7 @@ class Utils {
               // For HTTP events, see what authorizer types are enabled
               if (_.has(event, 'http.authorizer')) {
                 if (
-                  (_.isString(event.http.authorizer) &&
+                  (typeof event.http.authorizer === 'string' &&
                     event.http.authorizer.toUpperCase() === 'AWS_IAM') ||
                   (event.http.authorizer.type &&
                     event.http.authorizer.type.toUpperCase() === 'AWS_IAM')
@@ -234,7 +234,7 @@ class Utils {
                 // 3) By listing a function's ARN in the arn property of the authorizer object.
 
                 if (
-                  (_.isString(event.http.authorizer) &&
+                  (typeof event.http.authorizer === 'string' &&
                     event.http.authorizer.toUpperCase() !== 'AWS_IAM' &&
                     !awsArnRegExs.cognitoIdpArnExpr.test(event.http.authorizer)) ||
                   event.http.authorizer.name ||
@@ -244,7 +244,7 @@ class Utils {
                   hasCustomAuthorizer = true;
                 }
                 if (
-                  (_.isString(event.http.authorizer) &&
+                  (typeof event.http.authorizer === 'string' &&
                     awsArnRegExs.cognitoIdpArnExpr.test(event.http.authorizer)) ||
                   (event.http.authorizer.arn &&
                     awsArnRegExs.cognitoIdpArnExpr.test(event.http.authorizer.arn))

diff --git a/lib/classes/Variables.js b/lib/classes/Variables.js
@@ -289,7 +289,7 @@ class Variables {
    */
   populateVariables(properties) {
     const variables = properties.filter(
-      property => _.isString(property.value) && property.value.match(this.variableSyntax)
+      property => typeof property.value === 'string' && property.value.match(this.variableSyntax)
     );
     return _.map(variables, variable =>
       this.populateValue(variable.value, false).then(populated =>
@@ -458,7 +458,7 @@ class Variables {
     if (property === matchedString) {
       // total replacement
       property = valueToPopulate;
-    } else if (_.isString(valueToPopulate)) {
+    } else if (typeof valueToPopulate === 'string') {
       // partial replacement, string
       property = replaceall(matchedString, valueToPopulate, property);
     } else if (_.isNumber(valueToPopulate)) {
@@ -548,7 +548,7 @@ class Variables {
         let deepPropertyString = variableMatch;
         let deepProperties = 0;
         values.forEach((value, index) => {
-          if (_.isString(value) && value.match(this.variableSyntax)) {
+          if (typeof value === 'string' && value.match(this.variableSyntax)) {
             deepProperties += 1;
             const deepVariable = this.makeDeepVariable(value);
             deepPropertyString = deepPropertyString.replace(
@@ -866,7 +866,7 @@ class Variables {
 
   getValueStrToBool(variableString) {
     return BbPromise.try(() => {
-      if (_.isString(variableString)) {
+      if (typeof variableString === 'string') {
         const groups = variableString.match(this.strToBoolRefSyntax);
         const param = groups[1].trim();
         if (/^(true|false|0|1)$/.test(param)) {
@@ -901,7 +901,7 @@ class Variables {
     if (deepRef.length) {
       // if there is a deep reference remaining
       ret = ret.then(result => {
-        if (_.isString(result) && result.match(this.variableSyntax)) {
+        if (typeof result === 'string' && result.match(this.variableSyntax)) {
           const deepVariable = this.makeDeepVariable(result);
           return BbPromise.resolve(this.appendDeepVariable(deepVariable, deepRef));
         }
@@ -944,7 +944,7 @@ class Variables {
       deepProperties,
       (reducedValueParam, subProperty) => {
         let reducedValue = reducedValueParam;
-        if (_.isString(reducedValue) && reducedValue.match(this.deepRefSyntax)) {
+        if (typeof reducedValue === 'string' && reducedValue.match(this.deepRefSyntax)) {
           // build mode
           reducedValue = this.appendDeepVariable(reducedValue, subProperty);
         } else {

diff --git a/lib/plugins/aws/deployFunction/index.js b/lib/plugins/aws/deployFunction/index.js
@@ -173,7 +173,7 @@ class AwsDeployFunction {
             throw new this.serverless.classes.Error(errorMessage);
           }
 
-          if (!_.isString(params.Environment.Variables[key])) {
+          if (typeof params.Environment.Variables[key] !== 'string') {
             params.Environment.Variables[key] = _.toString(params.Environment.Variables[key]);
           }
         });

diff --git a/lib/plugins/aws/info/getApiKeyValues.js b/lib/plugins/aws/info/getApiKeyValues.js
@@ -21,7 +21,7 @@ module.exports = {
           } else if (definition.name) {
             apiKeyNames.push(definition.name);
           }
-        } else if (_.isString(definition)) {
+        } else if (typeof definition === 'string') {
           // plain strings are simple, non-nested API keys
           apiKeyNames.push(definition);
         }

diff --git a/lib/plugins/aws/lib/naming.js b/lib/plugins/aws/lib/naming.js
@@ -48,7 +48,7 @@ module.exports = {
   getStackName() {
     if (
       this.provider.serverless.service.provider.stackName &&
-      _.isString(this.provider.serverless.service.provider.stackName)
+      typeof this.provider.serverless.service.provider.stackName === 'string'
     ) {
       return `${this.provider.serverless.service.provider.stackName}`;
     }
@@ -192,7 +192,7 @@ module.exports = {
   getWebsocketsApiName() {
     if (
       this.provider.serverless.service.provider.websocketsApiName &&
-      _.isString(this.provider.serverless.service.provider.websocketsApiName)
+      typeof this.provider.serverless.service.provider.websocketsApiName === 'string'
     ) {
       return `${this.provider.serverless.service.provider.websocketsApiName}`;
     }
@@ -245,7 +245,7 @@ module.exports = {
   getApiGatewayName() {
     if (
       this.provider.serverless.service.provider.apiName &&
-      _.isString(this.provider.serverless.service.provider.apiName)
+      typeof this.provider.serverless.service.provider.apiName === 'string'
     ) {
       return `${this.provider.serverless.service.provider.apiName}`;
     }
@@ -575,9 +575,10 @@ module.exports = {
     const originPath = originObj.OriginPath;
 
     let originId = isS3Origin ? 's3' : 'custom';
-    const domainName = _.isString(domain)
-      ? domain
-      : this.normalizeNameToAlphaNumericOnly(JSON.stringify(domain));
+    const domainName =
+      typeof domain === 'string'
+        ? domain
+        : this.normalizeNameToAlphaNumericOnly(JSON.stringify(domain));
 
     originId = `${originId}/${domainName}`;
     if (originPath) {

diff --git a/lib/plugins/aws/package/compile/events/alexaSkill/index.js b/lib/plugins/aws/package/compile/events/alexaSkill/index.js
@@ -29,10 +29,10 @@ class AwsCompileAlexaSkillEvents {
                 ' Please refer to the documentation for additional information.',
               ].join('');
               this.serverless.cli.log(warningMessage);
-            } else if (_.isString(event.alexaSkill)) {
+            } else if (typeof event.alexaSkill === 'string') {
               appId = event.alexaSkill;
             } else if (_.isPlainObject(event.alexaSkill)) {
-              if (!_.isString(event.alexaSkill.appId)) {
+              if (typeof event.alexaSkill.appId !== 'string') {
                 const errorMessage = [
                   `Missing "appId" property for alexaSkill event in function ${functionName}`,
                   ' The correct syntax is: appId: amzn1.ask.skill.xx-xx-xx-xx-xx',

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.js
@@ -4,7 +4,7 @@ const _ = require('lodash');
 const BbPromise = require('bluebird');
 
 function createApiKeyResource(that, apiKey) {
-  const name = _.isString(apiKey) ? apiKey : apiKey.name;
+  const name = typeof apiKey === 'string' ? apiKey : apiKey.name;
   const value = _.isObject(apiKey) && apiKey.value ? apiKey.value : undefined;
   const description = _.isObject(apiKey) ? apiKey.description : undefined;
   const customerId = _.isObject(apiKey) ? apiKey.customerId : undefined;
@@ -33,7 +33,7 @@ module.exports = {
   validateApiKeyInput(apiKey) {
     if (_.isObject(apiKey) && (!_.isNil(apiKey.name) || !_.isNil(apiKey.value))) {
       return true;
-    } else if (!_.isString(apiKey)) {
+    } else if (typeof apiKey !== 'string') {
       return false;
     }
     return true;

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js
@@ -330,7 +330,7 @@ function handleTags() {
   );
   const currentTags = this.apiGatewayStageState.tags || {};
   const tagKeysToBeRemoved = Object.keys(currentTags).filter(
-    currentKey => !_.isString(tagsMerged[currentKey])
+    currentKey => typeof tagsMerged[currentKey] !== 'string'
   );
 
   const restApiId = this.apiGatewayRestApiId;

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
@@ -251,7 +251,7 @@ module.exports = {
         type = 'AWS_IAM';
       } else if (authorizer.arn) {
         arn = authorizer.arn;
-        if (_.isString(authorizer.name)) {
+        if (typeof authorizer.name === 'string') {
           name = authorizer.name;
         } else if (
           authorizer.type &&

diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/validate.js b/lib/plugins/aws/package/compile/events/websockets/lib/validate.js
@@ -38,7 +38,7 @@ module.exports = {
             }
 
             // authorizers
-            if (_.isString(event.websocket.authorizer)) {
+            if (typeof event.websocket.authorizer === 'string') {
               if (event.websocket.authorizer.includes(':')) {
                 // arn
                 websocketObj.authorizer = {
@@ -140,7 +140,7 @@ module.exports = {
             }
             events.push(websocketObj);
             // dealing with the simplified string representation
-          } else if (_.isString(event.websocket)) {
+          } else if (typeof event.websocket === 'string') {
             events.push({
               functionName,
               route: event.websocket,

diff --git a/lib/plugins/print/print.js b/lib/plugins/print/print.js
@@ -47,7 +47,7 @@ class Print {
     }
     // provider treatment and defaults
     this.cache.serviceProvider = service.provider;
-    if (_.isString(this.cache.serviceProvider)) {
+    if (typeof this.cache.serviceProvider === 'string') {
       service.provider = { name: this.cache.serviceProvider };
     }
     service.provider = _.merge(
@@ -65,7 +65,7 @@ class Print {
       service.service = this.cache.serviceService;
       delete service.serviceObject;
     }
-    if (_.isString(this.cache.serviceProvider)) {
+    if (typeof this.cache.serviceProvider === 'string') {
       service.provider = this.cache.serviceProvider;
     } else {
       // is object