@adobe/aio-cli-plugin-app 8.5.1 → 8.6.1-pre.2022-08-17.163d3a3a

package/src/commands/app/deploy.js

@@ -12,13 +12,11 @@ governing permissions and limitations under the License.
 
 const ora = require('ora')
 const chalk = require('chalk')
-// const path = require('path')
-const { cli } = require('cli-ux')
 
 const BaseCommand = require('../../BaseCommand')
 const BuildCommand = require('./build')
 const webLib = require('@adobe/aio-lib-web')
-const { flags } = require('@oclif/command')
+const { Flags, CliUx: { ux: cli } } = require('@oclif/core')
 const { createWebExportFilter, runScript, buildExtensionPointPayloadWoMetadata, buildExcShellViewExtensionMetadata } = require('../../lib/app-helper')
 const rtLib = require('@adobe/aio-lib-runtime')
 const LogForwarding = require('../../lib/log-forwarding')
@@ -26,7 +24,7 @@ const LogForwarding = require('../../lib/log-forwarding')
 class Deploy extends BuildCommand {
   async run () {
     // cli input
-    const { flags } = this.parse(Deploy)
+    const { flags } = await this.parse(Deploy)
 
     // flags
     flags['web-assets'] = flags['web-assets'] && !flags['skip-web-assets'] && !flags['skip-static'] && !flags.action
@@ -260,80 +258,80 @@ This will always force a rebuild unless --no-force-build is set.
 
 Deploy.flags = {
   ...BaseCommand.flags,
-  'skip-build': flags.boolean({
+  'skip-build': Flags.boolean({
     description: '[deprecated] Please use --no-build'
   }),
-  'skip-deploy': flags.boolean({
+  'skip-deploy': Flags.boolean({
     description: '[deprecated] Please use \'aio app build\''
   }),
-  'skip-static': flags.boolean({
+  'skip-static': Flags.boolean({
     description: '[deprecated] Please use --no-web-assets'
   }),
-  'skip-web-assets': flags.boolean({
+  'skip-web-assets': Flags.boolean({
     description: '[deprecated] Please use --no-web-assets'
   }),
-  'skip-actions': flags.boolean({
+  'skip-actions': Flags.boolean({
     description: '[deprecated] Please use --no-actions'
   }),
-  actions: flags.boolean({
+  actions: Flags.boolean({
     description: '[default: true] Deploy actions if any',
     default: true,
     allowNo: true,
     exclusive: ['action'] // should be action exclusive --no-action but see https://github.com/oclif/oclif/issues/600
   }),
-  action: flags.string({
+  action: Flags.string({
     description: 'Deploy only a specific action, the flags can be specified multiple times, this will set --no-publish',
     char: 'a',
     exclusive: ['extension'],
     multiple: true
   }),
-  'web-assets': flags.boolean({
+  'web-assets': Flags.boolean({
     description: '[default: true] Deploy web-assets if any',
     default: true,
     allowNo: true
   }),
-  build: flags.boolean({
+  build: Flags.boolean({
     description: '[default: true] Run the build phase before deployment',
     default: true,
     allowNo: true
   }),
-  'force-build': flags.boolean({
+  'force-build': Flags.boolean({
     description: '[default: true] Force a build even if one already exists',
     exclusive: ['no-build'], // no-build
     default: true,
     allowNo: true
   }),
-  'content-hash': flags.boolean({
+  'content-hash': Flags.boolean({
     description: '[default: true] Enable content hashing in browser code',
     default: true,
     allowNo: true
   }),
-  open: flags.boolean({
+  open: Flags.boolean({
     description: 'Open the default web browser after a successful deploy, only valid if your app has a front-end',
     default: false
   }),
-  extension: flags.string({
+  extension: Flags.string({
     description: 'Deploy only a specific extension, the flags can be specified multiple times',
     exclusive: ['action'],
     char: 'e',
     multiple: true
   }),
-  publish: flags.boolean({
+  publish: Flags.boolean({
     description: '[default: true] Publish extension(s) to Exchange',
     allowNo: true,
     default: true,
     exclusive: ['action']
   }),
-  'force-publish': flags.boolean({
+  'force-publish': Flags.boolean({
     description: 'Force publish extension(s) to Exchange, delete previously published extension points',
     default: false,
     exclusive: ['action', 'publish'] // no-publish is excluded
   }),
-  'web-optimize': flags.boolean({
+  'web-optimize': Flags.boolean({
     description: '[default: false] Enable optimization (minification) of web js/css/html',
     default: false
   }),
-  'log-forwarding-update': flags.boolean({
+  'log-forwarding-update': Flags.boolean({
     description: '[default: true] Update log forwarding configuration on server',
     default: true,
     allowNo: true

package/src/commands/app/get-url.js

@@ -12,17 +12,18 @@ governing permissions and limitations under the License.
 
 const chalk = require('chalk')
 
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 
 const BaseCommand = require('../../BaseCommand')
 const { wrapError } = require('../../lib/app-helper')
 const { getActionUrls } = require('@adobe/aio-lib-runtime').utils
 const yaml = require('js-yaml')
+const { loadLocalDevConfig } = require('../../lib/run-local-runtime')
 
 class GetUrlCommand extends BaseCommand {
   async run () {
     // cli input
-    const { args, flags } = this.parse(GetUrlCommand)
+    const { args, flags } = await this.parse(GetUrlCommand)
 
     try {
       const options = {}
@@ -45,9 +46,16 @@ class GetUrlCommand extends BaseCommand {
       }
 
       const actionUrls = {}
-      Object.values(fullConfig.all).forEach(config => {
-        Object.assign(actionUrls, getActionUrls(config, true))
-      })
+      if (flags.local) {
+        Object.values(fullConfig.all).forEach(config => {
+          const localDevConfig = loadLocalDevConfig(config)
+          Object.assign(actionUrls, getActionUrls(localDevConfig, false, true))
+        })
+      } else {
+        Object.values(fullConfig.all).forEach(config => {
+          Object.assign(actionUrls, getActionUrls(config, true))
+        })
+      }
       urls.runtime = actionUrls
       const cdnUrls = {}
       if (options.cdn) {
@@ -88,20 +96,23 @@ GetUrlCommand.description = 'Get action URLs'
 
 GetUrlCommand.flags = {
   ...BaseCommand.flags,
-  cdn: flags.boolean({
+  cdn: Flags.boolean({
     description: 'Display CDN based action URLs'
   }),
-  json: flags.boolean({
+  json: Flags.boolean({
     description: 'Output json',
     char: 'j'
   }),
-  hson: flags.boolean({
+  hson: Flags.boolean({
     description: 'Output human readable json',
     char: 'h'
   }),
-  yml: flags.boolean({
+  yml: Flags.boolean({
     description: 'Output yml',
     char: 'y'
+  }),
+  local: Flags.boolean({
+    description: 'Display locally based action URLs'
   })
 }
 

package/src/commands/app/index.js

@@ -10,13 +10,13 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const HHelp = require('@oclif/plugin-help').default
+const { Help } = require('@oclif/core')
 const BaseCommand = require('../../BaseCommand')
 
 class IndexCommand extends BaseCommand {
   async run () {
-    const help = new HHelp(this.config)
-    help.showHelp(['app', '--help'])
+    const help = new Help(this.config)
+    await help.showHelp(['app', '--help'])
   }
 }
 

package/src/commands/app/info.js

@@ -11,14 +11,14 @@ governing permissions and limitations under the License.
 */
 
 const BaseCommand = require('../../BaseCommand')
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 const yaml = require('js-yaml')
 const deepCopy = require('lodash.clonedeep')
 
 class Info extends BaseCommand {
   async run () {
     // cli input
-    const { flags } = this.parse(Info)
+    const { flags } = await this.parse(Info)
     const appConfig = deepCopy(this.getFullConfig({ allowNoImpl: true }))
 
     // includes .env secret delete all aio config for now
@@ -39,7 +39,7 @@ class Info extends BaseCommand {
       this.log(JSON.stringify(appConfig))
     } else if (flags.yml) {
       // remove undefined fields
-      this.log(yaml.safeDump(JSON.parse(JSON.stringify(appConfig))))
+      this.log(yaml.safeDump(JSON.parse(JSON.stringify(appConfig)), {}))
     } else { // flags.hson
       this.log(JSON.stringify(appConfig, null, 2))
     }
@@ -56,23 +56,23 @@ Info.description = `Display settings/configuration in use by an Adobe I/O App
 
 Info.flags = {
   ...BaseCommand.flags,
-  json: flags.boolean({
+  json: Flags.boolean({
     description: 'Output json',
     char: 'j',
     exclusive: ['hson', 'yml']
   }),
-  hson: flags.boolean({
+  hson: Flags.boolean({
     default: true,
     description: 'Output human readable json',
     char: 'h',
     exclusive: ['json', 'yml']
   }),
-  yml: flags.boolean({
+  yml: Flags.boolean({
     description: 'Output yml',
     char: 'y',
     exclusive: ['hson', 'json']
   }),
-  mask: flags.boolean({
+  mask: Flags.boolean({
     description: 'Hide known private info',
     default: true,
     allowNo: true

package/src/commands/app/init.js

@@ -16,7 +16,7 @@ const fs = require('fs-extra')
 const ora = require('ora')
 const chalk = require('chalk')
 // const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:init', { provider: 'debug' })
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 const generators = require('@adobe/generator-aio-app')
 
 const { loadAndValidateConfigFile, importConfigJson } = require('../../lib/import')
@@ -29,7 +29,7 @@ const DEFAULT_WORKSPACE = 'Stage'
 
 class InitCommand extends AddCommand {
   async run () {
-    const { args, flags } = this.parse(InitCommand)
+    const { args, flags } = await this.parse(InitCommand)
 
     if (!flags.login && flags.workspace !== DEFAULT_WORKSPACE) {
       this.error('--no-login and --workspace flags cannot be used together.')
@@ -128,6 +128,24 @@ class InitCommand extends AddCommand {
     this.log(chalk.blue(chalk.bold(`Project initialized for Workspace ${workspace.name}, you can run 'aio app use -w <workspace>' to switch workspace.`)))
   }
 
+  async ensureDevTermAccepted (consoleCLI, orgId) {
+    const isTermAccepted = await consoleCLI.checkDevTermsForOrg(orgId)
+    if (!isTermAccepted) {
+      const terms = await consoleCLI.getDevTermsForOrg()
+      const confirmDevTerms = await consoleCLI.prompt.promptConfirm(`${terms.text}
+      \nDo you agree with the new Developer Terms?`)
+      if (!confirmDevTerms) {
+        this.error('The Developer Terms of Service were declined')
+      } else {
+        const accepted = await consoleCLI.acceptDevTermsForOrg(orgId)
+        if (!accepted) {
+          this.error('The Developer Terms of Service could not be accepted')
+        }
+        this.log(`The Developer Terms of Service were successfully accepted for org ${orgId}`)
+      }
+    }
+  }
+
   async selectExtensionPoints (flags, orgSupportedServices = null) {
     if (!flags.extensions) {
       return [implPromptChoices.find(i => i.value.name === 'application').value]
@@ -167,6 +185,7 @@ class InitCommand extends AddCommand {
   async selectConsoleOrg (consoleCLI) {
     const organizations = await consoleCLI.getOrganizations()
     const selectedOrg = await consoleCLI.promptForSelectOrganization(organizations)
+    await this.ensureDevTermAccepted(consoleCLI, selectedOrg.id)
     return selectedOrg
   }
 
@@ -252,15 +271,15 @@ class InitCommand extends AddCommand {
 
   async runCodeGenerators (flags, extensionPoints, projectName) {
     let env = yeoman.createEnv()
+    // by default yeoman runs the install, we control installation from the app plugin
+    env.options = { skipInstall: true }
     const initialGenerators = ['base-app', 'add-ci']
     // first run app generator that will generate the root skeleton + ci
     for (const generatorKey of initialGenerators) {
       const appGen = env.instantiate(generators[generatorKey], {
         options: {
           'skip-prompt': flags.yes,
-          'project-name': projectName,
-          // by default yeoman runs the install, we control installation from the app plugin
-          'skip-install': true
+          'project-name': projectName
         }
       })
       await env.runGenerator(appGen)
@@ -270,6 +289,8 @@ class InitCommand extends AddCommand {
     // https://github.com/yeoman/environment/issues/324
 
     env = yeoman.createEnv()
+    // by default yeoman runs the install, we control installation from the app plugin
+    env.options = { skipInstall: true }
     // try to use appGen.composeWith
     for (let i = 0; i < extensionPoints.length; ++i) {
       const extGen = env.instantiate(
@@ -278,9 +299,7 @@ class InitCommand extends AddCommand {
           options: {
             'skip-prompt': flags.yes,
             // do not prompt for overwrites
-            force: true,
-            // by default yeoman runs the install, we control installation from the app plugin
-            'skip-install': true
+            force: true
           }
         })
       await env.runGenerator(extGen)
@@ -310,38 +329,38 @@ InitCommand.description = `Create a new Adobe I/O App
 
 InitCommand.flags = {
   ...AddCommand.flags,
-  yes: flags.boolean({
+  yes: Flags.boolean({
     description: 'Skip questions, and use all default values',
     default: false,
     char: 'y'
   }),
-  import: flags.string({
+  import: Flags.string({
     description: 'Import an Adobe I/O Developer Console configuration file',
     char: 'i'
   }),
-  login: flags.boolean({
+  login: Flags.boolean({
     description: 'Login using your Adobe ID for interacting with Adobe I/O Developer Console',
     default: true,
     allowNo: true
   }),
-  extensions: flags.boolean({
+  extensions: Flags.boolean({
     description: 'Use --no-extensions to create a blank application that does not integrate with Exchange',
     default: true,
     allowNo: true
   }),
-  extension: flags.string({
+  extension: Flags.string({
     description: 'Extension point(s) to implement',
     char: 'e',
     multiple: true,
     exclusive: ['extensions']
   }),
-  workspace: flags.string({
+  workspace: Flags.string({
     description: 'Specify the Adobe Developer Console Workspace to init from, defaults to Stage',
     default: DEFAULT_WORKSPACE,
     char: 'w',
     exclusive: ['import'] // also no-login
   }),
-  'confirm-new-workspace': flags.boolean({
+  'confirm-new-workspace': Flags.boolean({
     description: 'Skip and confirm prompt for creating a new workspace',
     default: false
   })

package/src/commands/app/list/extension-points.js

@@ -12,7 +12,7 @@ governing permissions and limitations under the License.
 const BaseCommand = require('../../../BaseCommand')
 
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:list:extension-points', { provider: 'debug' })
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 
 const { EXTENSION_POINT_LIST } = require('../../../lib/defaults')
 const chalk = require('chalk')
@@ -20,7 +20,7 @@ const yaml = require('js-yaml')
 
 class ListExtensionPointsCommand extends BaseCommand {
   async run () {
-    const { flags } = this.parse(ListExtensionPointsCommand)
+    const { flags } = await this.parse(ListExtensionPointsCommand)
     aioLogger.debug(`list all extensions points with flags: ${JSON.stringify(flags)}`)
 
     // print
@@ -45,11 +45,11 @@ ListExtensionPointsCommand.description = `List all extension points for the sele
 `
 ListExtensionPointsCommand.flags = {
   ...BaseCommand.flags,
-  json: flags.boolean({
+  json: Flags.boolean({
     description: 'Output json',
     char: 'j'
   }),
-  yml: flags.boolean({
+  yml: Flags.boolean({
     description: 'Output yml',
     char: 'y'
   })

package/src/commands/app/list/extension.js

@@ -12,7 +12,7 @@ governing permissions and limitations under the License.
 const BaseCommand = require('../../../BaseCommand')
 
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:list:extensions', { provider: 'debug' })
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 
 const { EXTENSION_POINT_LIST } = require('../../../lib/defaults')
 const chalk = require('chalk')
@@ -20,7 +20,7 @@ const yaml = require('js-yaml')
 
 class ListExtensionCommand extends BaseCommand {
   async run () {
-    const { flags } = this.parse(ListExtensionCommand)
+    const { flags } = await this.parse(ListExtensionCommand)
     aioLogger.debug(`list extensions with flags: ${JSON.stringify(flags)}`)
 
     const extConfig = this.getAppExtConfigs(flags)
@@ -81,11 +81,11 @@ ListExtensionCommand.description = `List implemented extensions
 `
 ListExtensionCommand.flags = {
   ...BaseCommand.flags,
-  json: flags.boolean({
+  json: Flags.boolean({
     description: 'Output json',
     char: 'j'
   }),
-  yml: flags.boolean({
+  yml: Flags.boolean({
     description: 'Output yml',
     char: 'y'
   })

package/src/commands/app/list/index.js

@@ -9,13 +9,13 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const HHelp = require('@oclif/plugin-help').default
+const { Help } = require('@oclif/core')
 const BaseCommand = require('../../../BaseCommand')
 
 class ListCommand extends BaseCommand {
   async run () {
-    const help = new HHelp(this.config)
-    help.showHelp(['app:list', '--help'])
+    const help = new Help(this.config)
+    await help.showHelp(['app:list', '--help'])
   }
 }
 

package/src/commands/app/logs.js

@@ -10,28 +10,32 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 const BaseCommand = require('../../BaseCommand')
 const { wrapError } = require('../../lib/app-helper')
 const rtLib = require('@adobe/aio-lib-runtime')
 const LogForwarding = require('../../lib/log-forwarding')
 
+const SECURED = 'require-adobe-auth'
+
 class Logs extends BaseCommand {
   _processEachAction (fullConfig, processFn) {
+    const isSecuredAction = (pkg, aName) => pkg && pkg.actions && pkg.actions[aName] &&
+      pkg.actions[aName].annotations && pkg.actions[aName].annotations[SECURED]
+
     Object.entries(fullConfig.all).forEach(([, config]) => {
       Object.entries(config.manifest.full.packages).forEach(([packageName, pkg]) => {
         // handle default package
         packageName = packageName.replace(/__APP_PACKAGE__/g, config.ow.package)
-
         Object.keys(pkg.actions).forEach((aName) => {
-          processFn(packageName, aName)
+          processFn(packageName, aName, isSecuredAction(pkg, aName))
         })
       })
     })
   }
 
   async run () {
-    const { flags } = this.parse(Logs)
+    const { flags } = await this.parse(Logs)
     const fullConfig = this.getFullConfig()
 
     // has any backend
@@ -80,14 +84,18 @@ class Logs extends BaseCommand {
         }
       })
     } else {
-      this._processEachAction(fullConfig, (packageName, aName) => {
+      this._processEachAction(fullConfig, (packageName, aName, isSecured) => {
+        if (isSecured) {
+          const securedAName = '__secured_' + aName
+          filterActions.push(`${packageName}/${securedAName}`)
+        }
         filterActions.push(`${packageName}/${aName}`)
       })
     }
 
     try {
       const owConfig = { ow: Object.values(fullConfig.all)[0].ow }
-      await rtLib.printActionLogs(owConfig, this.log, flags.limit, filterActions, flags.strip, flags.poll || flags.tail || flags.watch)
+      await rtLib.printActionLogs(owConfig, this.log.bind(this), flags.limit, filterActions, flags.strip, flags.poll || flags.tail || flags.watch)
     } catch (error) {
       this.error(wrapError(error))
     }
@@ -99,34 +107,34 @@ Logs.description = `Fetch logs for an Adobe I/O App
 
 Logs.flags = {
   ...BaseCommand.flags,
-  limit: flags.integer({
+  limit: Flags.integer({
     description: 'Limit number of activations to fetch logs from ( 1-50 )',
     default: 1,
     char: 'l'
   }),
-  action: flags.string({
+  action: Flags.string({
     description: 'Fetch logs for a specific action',
     char: 'a',
     multiple: true
   }),
-  strip: flags.boolean({
+  strip: Flags.boolean({
     char: 'r',
     description: 'strip timestamp information and output first line only',
     default: false
   }),
-  tail: flags.boolean({
+  tail: Flags.boolean({
     description: 'Fetch logs continuously',
     char: 't',
     default: false,
     exclusive: ['watch', 'poll']
   }),
-  watch: flags.boolean({
+  watch: Flags.boolean({
     description: 'Fetch logs continuously',
     default: false,
     char: 'w',
     exclusive: ['tail', 'poll']
   }),
-  poll: flags.boolean({
+  poll: Flags.boolean({
     description: 'Fetch logs continuously',
     default: false,
     char: 'o',

package/src/commands/app/run.js

@@ -15,9 +15,8 @@ const chalk = require('chalk')
 const fs = require('fs-extra')
 const https = require('https')
 const getPort = require('get-port')
-const { cli } = require('cli-ux')
 
-const { flags } = require('@oclif/command')
+const { Flags, CliUx: { ux: cli } } = require('@oclif/core')
 const coreConfig = require('@adobe/aio-lib-core-config')
 
 const BaseCommand = require('../../BaseCommand')
@@ -33,7 +32,7 @@ const CONFIG_KEY = 'aio-dev.dev-keys'
 class Run extends BaseCommand {
   async run () {
     // cli input
-    const { flags } = this.parse(Run)
+    const { flags } = await this.parse(Run)
     // aliases
     flags.actions = flags.actions && !flags['skip-actions']
 
@@ -42,7 +41,7 @@ class Run extends BaseCommand {
     const runConfigs = this.getAppExtConfigs(flags)
     const entries = Object.entries(runConfigs)
     if (entries.length > 1) {
-      this.error('You can only run one implementation at the time, please filter with the \'-e\' flag.')
+      this.error('Your app implements multiple extensions. You can only run one at the time, please select which extension to run with the \'-e\' flag.')
     }
     const name = entries[0][0]
     const config = entries[0][1]
@@ -60,6 +59,7 @@ class Run extends BaseCommand {
   async runOneExtensionPoint (name, config, flags, spinner) {
     const hasBackend = config.app.hasBackend
     const hasFrontend = config.app.hasFrontend
+    const headlessApp = hasBackend && !hasFrontend
 
     if (!hasBackend && !hasFrontend) {
       this.error(new Error('nothing to run.. there is no frontend and no manifest.yml, are you in a valid app?'))
@@ -77,7 +77,7 @@ class Run extends BaseCommand {
         shouldContentHash: false
       },
       fetchLogs: true,
-      devRemote: !flags.local,
+      isLocal: flags.local,
       verbose: flags.verbose
     }
 
@@ -97,7 +97,8 @@ class Run extends BaseCommand {
       }
     }
 
-    const onProgress = !flags.verbose
+    const verboseOutput = flags.verbose || flags.local || headlessApp
+    const onProgress = !verboseOutput
       ? info => {
         spinner.text = info
       }
@@ -201,31 +202,31 @@ Run.description = 'Run an Adobe I/O App'
 
 Run.flags = {
   ...BaseCommand.flags,
-  local: flags.boolean({
+  local: Flags.boolean({
     description: 'Run/debug actions locally ( requires Docker running )',
     exclusive: ['skip-actions']
   }),
-  serve: flags.boolean({
+  serve: Flags.boolean({
     description: '[default: true] Start frontend server (experimental)',
     default: true,
     allowNo: true
   }),
-  'skip-actions': flags.boolean({
+  'skip-actions': Flags.boolean({
     description: '[deprecated] Please use --no-actions',
     exclusive: ['local'],
     default: false
   }),
-  actions: flags.boolean({
+  actions: Flags.boolean({
     description: '[default: true] Run actions, defaults to true, to skip actions use --no-actions',
     exclusive: ['local'], // no-actions and local don't work together
     default: true,
     allowNo: true
   }),
-  open: flags.boolean({
+  open: Flags.boolean({
     description: 'Open the default web browser after a successful run, only valid if your app has a front-end',
     default: false
   }),
-  extension: flags.string({
+  extension: Flags.string({
     description: 'Run only a specific extension, this flag can only be specified once',
     char: 'e',
     // we do not support multiple yet