perf(CLI): Integrate CLI triage into this package

bin/serverless.js

@@ -31,23 +31,20 @@ if (require('../lib/utils/isStandaloneExecutable')) {
   }
 }
 
-// CLI Triage
-(() => {
-  try {
-    const componentsV1 = require('@serverless/cli');
-    const componentsV2 = require('@serverless/components');
-
-    // Serverless Components v1 CLI (deprecated)
-    if (componentsV1.runningComponents()) return () => componentsV1.runComponents();
-
-    // Serverless Components CLI
-    if (componentsV2.runningComponents()) return () => componentsV2.runComponents();
-  } catch (error) {
-    if (process.env.SLS_DEBUG) {
-      require('../lib/classes/Error').logWarning(`CLI triage crashed with: ${error.stack}`);
-    }
+(async () => {
+  const cliName = await require('../lib/cli/triage')();
+
+  switch (cliName) {
+    case 'serverless':
+      require('../scripts/serverless');
+      return;
+    case '@serverless/components':
+      require('@serverless/components').runComponents();
+      return;
+    case '@serverless/cli':
+      require('@serverless/cli').runComponents();
+      return;
+    default:
+      throw new Error(`Unrecognized CLI name "${cliName}"`);
   }
-
-  // Serverless Framework CLI
-  return () => require('../scripts/serverless');
-})()();
+})();

lib/cli/triage.js

@@ -0,0 +1,190 @@
+'use strict';
+
+module.exports = async () => {
+  const cliArgs = new Set(process.argv.slice(2));
+
+  // Unconditionally favor "serverless" for version check
+  if (cliArgs.has('--version')) return 'serverless';
+  if (cliArgs.has('-v')) return 'serverless';
+
+  // Unconditionally favor "@serverless/components" when component specific command or flag
+  const componentsCommands = new Set(['registry', 'init', 'publish']);
+  if (componentsCommands.has(process.argv[2])) return '@serverless/components';
+  if (cliArgs.has('--help-components')) return '@serverless/components';
+  if (cliArgs.has('--target')) return '@serverless/components';
+
+  // Detect eventual component configuration
+  const fsp = require('fs').promises;
+  if (
+    (
+      await Promise.all(
+        ['yml', 'yaml', 'json'].map(async (extension) => {
+          try {
+            await fsp.access(`serverless.component.${extension}`);
+            return true;
+          } catch {
+            return false;
+          }
+        })
+      )
+    ).some(Boolean)
+  ) {
+    return '@serverless/components';
+  }
+
+  // Detect eventual service configuration
+  const configurationExtension =
+    (
+      await Promise.all(
+        ['yml', 'yaml', 'json', 'js', 'ts'].map(async (extension) => {
+          try {
+            await fsp.access(`serverless.${extension}`);
+            return extension;
+          } catch {
+            return null;
+          }
+        })
+      )
+    ).find(Boolean) || null;
+
+  if (configurationExtension) {
+    // Found top level service configuration, recognize CLI by content
+
+    const resolveByObjectConfiguration = (configuration) => {
+      if (configuration.provider) return 'serverless';
+      if (configuration.component) return '@serverless/components';
+      for (const value of Object.values(configuration)) {
+        if (value.component) return '@serverless/cli';
+      }
+      return 'serverless';
+    };
+    switch (configurationExtension) {
+      case 'yml':
+      case 'yaml': {
+        const content = await fsp.readFile(`serverless.${configurationExtension}`, 'utf8');
+        if (content.search(/(?:^|\n)provider\s*:/) !== -1) return 'serverless';
+        if (content.search(/(?:^|\n)component\s*:/) !== -1) return '@serverless/components';
+        if (content.search(/\n\s+component\s*:/) !== -1) return '@serverless/cli';
+        return 'serverless';
+      }
+      case 'json': {
+        const configuration = (() => {
+          try {
+            return require(`${process.cwd()}/serverless.json`);
+          } catch {
+            return null;
+          }
+        })();
+        if (!configuration) return 'serverless';
+        return resolveByObjectConfiguration(configuration);
+      }
+      case 'js': {
+        const configuration = (() => {
+          try {
+            return require(`${process.cwd()}/serverless.js`);
+          } catch {
+            return null;
+          }
+        })();
+        if (!configuration) return 'serverless';
+        if (typeof configuration === 'function') return '@serverless/cli';
+        return resolveByObjectConfiguration(configuration);
+      }
+      case 'ts':
+        return 'serverless';
+      default:
+        throw new Error(`Unrecognized extension "${configurationExtension}"`);
+    }
+  }
+
+  // No top level service configuration
+  const isChinaUser = (() => {
+    if (process.env.SLS_GEO_LOCATION) return process.env.SLS_GEO_LOCATION === 'cn';
+    return new Intl.DateTimeFormat('en', { timeZoneName: 'long' })
+      .format()
+      .includes('China Standard Time');
+  })();
+
+  // If "sls" or "sls deploy" command and in China, force "@serverless/components"
+  if (
+    (process.argv.length === 2 || process.argv[2] === 'deploy') &&
+    (isChinaUser || process.env.SERVERLESS_PLATFORM_VENDOR === 'tencent')
+  ) {
+    return '@serverless/components';
+  }
+
+  // Detect eventual component template
+  const nestedTemplateKeywords = new Set([
+    'deploy',
+    'remove',
+    'info',
+    'help',
+    '--help',
+    'dev',
+    'logs',
+    'invoke',
+    'credentials',
+  ]);
+  if (!nestedTemplateKeywords.has(process.argv[2])) return 'serverless';
+
+  const path = require('path');
+  const detectSubServiceType = async (subDirname) => {
+    const subConfigurationExtension =
+      (
+        await Promise.all(
+          ['yml', 'yaml', 'json', 'js'].map(async (extension) => {
+            try {
+              await fsp.access(path.resolve(subDirname, `serverless.${extension}`));
+              return extension;
+            } catch {
+              return null;
+            }
+          })
+        )
+      ).find(Boolean) || null;
+    if (!subConfigurationExtension) return null;
+    switch (subConfigurationExtension) {
+      case 'yml':
+      case 'yaml': {
+        const content = await fsp.readFile(
+          path.resolve(subDirname, `serverless.${subConfigurationExtension}`),
+          'utf8'
+        );
+        if (content.search(/(?:^|\n)component\s*:/) !== -1) return '@serverless/components';
+        return 'other';
+      }
+      case 'json': {
+        const configuration = (() => {
+          try {
+            return require(`${path.resolve(subDirname)}/serverless.json`);
+          } catch {
+            return null;
+          }
+        })();
+        return configuration && configuration.component ? '@serverless/components' : 'other';
+      }
+      case 'js': {
+        const configuration = (() => {
+          try {
+            return require(`${path.resolve(subDirname)}/serverless.js`);
+          } catch {
+            return null;
+          }
+        })();
+        return configuration && configuration.component ? '@serverless/components' : 'other';
+      }
+      default:
+        throw new Error(`Unrecognized extension "${subConfigurationExtension}"`);
+    }
+  };
+  let hasComponent = false;
+  for (const subDirname of await fsp.readdir('.')) {
+    const stats = await fsp.lstat(subDirname);
+    if (!stats.isDirectory()) continue;
+    const subServiceType = await detectSubServiceType(subDirname);
+    if (!subServiceType) continue;
+    if (subServiceType === '@serverless/components') hasComponent = true;
+    else return 'serverless';
+  }
+  return hasComponent ? '@serverless/components' : 'serverless';
+};

test/unit/lib/cli/triage/fixtures/@serverless/cli/js/component/serverless.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { foo: { component: 'foo' } };

test/unit/lib/cli/triage/fixtures/@serverless/cli/js/function/serverless.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = () => {};

test/unit/lib/cli/triage/fixtures/@serverless/cli/json/component/serverless.json

@@ -0,0 +1,3 @@
+{
+  "foo": { "component": "foo" }
+}

test/unit/lib/cli/triage/fixtures/@serverless/cli/yml/component/serverless.yml

@@ -0,0 +1,2 @@
+foo:
+  component: foo

test/unit/lib/cli/triage/fixtures/@serverless/components/js/template/foo/instance/serverless.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { component: 'foo' };

test/unit/lib/cli/triage/fixtures/@serverless/components/js/template/foo/serverless.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { component: 'foo' };

test/unit/lib/cli/triage/fixtures/@serverless/components/json/component/serverless.component.json

@@ -0,0 +1 @@
+{}

test/unit/lib/cli/triage/fixtures/@serverless/components/json/instance/serverless.json

@@ -0,0 +1,3 @@
+{
+  "component": "foo"
+}

test/unit/lib/cli/triage/fixtures/@serverless/components/json/template/foo/serverless.json

@@ -0,0 +1 @@
+{ "component": "foo" }

test/unit/lib/cli/triage/fixtures/@serverless/components/yml/component/serverless.component.yaml

@@ -0,0 +1 @@
+{}

test/unit/lib/cli/triage/fixtures/@serverless/components/yml/instance/serverless.yml

@@ -0,0 +1 @@
+component: foo

test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template/foo/serverless.yml

@@ -0,0 +1 @@
+component: foo

test/unit/lib/cli/triage/fixtures/serverless/js/component-in-custom/serverless.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { service: 'foo', provider: { name: 'foo' }, custom: { component: 'foo' } };

test/unit/lib/cli/triage/fixtures/serverless/js/projects/bar/serverless.yml

@@ -0,0 +1,3 @@
+service: foo
+provider:
+  name: any

test/unit/lib/cli/triage/fixtures/serverless/js/projects/foo/serverless.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { component: 'foo' };

test/unit/lib/cli/triage/fixtures/serverless/json/component-in-custom/serverless.json

@@ -0,0 +1 @@
+{ "service": "foo", "provider": { "name": "foo" }, "custom": { "component": "foo" } }

test/unit/lib/cli/triage/fixtures/serverless/json/projects/bar/serverless.yml

@@ -0,0 +1,3 @@
+service: foo
+provider:
+  name: any

test/unit/lib/cli/triage/fixtures/serverless/json/projects/foo/serverless.json

@@ -0,0 +1 @@
+{ "component": "foo" }

test/unit/lib/cli/triage/fixtures/serverless/ts/any/serverless.ts

@@ -0,0 +1,3 @@
+module.exports = {
+  foo: { component: 'foo' },
+};

test/unit/lib/cli/triage/fixtures/serverless/yml/component-in-custom/serverless.yml

@@ -0,0 +1,7 @@
+service: foo
+
+provider:
+  name: aws
+
+custom:
+  component: foo

test/unit/lib/cli/triage/fixtures/serverless/yml/projects/bar/serverless.yml

@@ -0,0 +1,3 @@
+service: foo
+provider:
+  name: any

test/unit/lib/cli/triage/fixtures/serverless/yml/projects/foo/serverless.yml

@@ -0,0 +1 @@
+component: foo