@adobe/aio-cli-plugin-app 14.7.0 → 14.8.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adobe/aio-cli-plugin-app",
   "description": "Create, Build and Deploy Adobe I/O Applications",
-  "version": "14.7.0",
+  "version": "14.8.0",
   "author": "Adobe Inc.",
   "bugs": "https://github.com/adobe/aio-cli-plugin-app/issues",
   "dependencies": {
@@ -19,7 +19,7 @@
     "@adobe/generator-aio-app": "^9",
     "@adobe/generator-app-common-lib": "^3",
     "@adobe/inquirer-table-checkbox": "^2",
-    "@oclif/core": "^2.11.6",
+    "@oclif/core": "^4.9.0",
     "@octokit/rest": "^19.0.11",
     "@parcel/core": "^2.7.0",
     "@parcel/reporter-cli": "^2.7.0",
@@ -51,26 +51,21 @@
   },
   "devDependencies": {
     "@adobe/aio-lib-test-proxy": "^2",
-    "@adobe/eslint-config-aio-lib-config": "^4.0.0",
+    "@adobe/eslint-config-aio-lib-config": "^5.0.0",
     "@types/jest": "^29",
     "babel-runtime": "^6.26.0",
     "core-js": "^3",
     "eol": "^0.9.1",
-    "eslint": "^8.57.1",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jest": "^27.9.0",
+    "eslint": "^9",
     "eslint-plugin-jsdoc": "^48.11.0",
-    "eslint-plugin-n": "^15.7.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.6.0",
+    "neostandard": "^0",
     "jest": "^29.5.0",
     "nock": "^13.2.9",
     "oclif": "^4.17.13",
     "stdout-stderr": "^0.1.9"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "files": [
     "bin/run",

package/src/BaseCommand.js

@@ -40,6 +40,31 @@ class BaseCommand extends Command {
 
   async init () {
     await super.init()
+    // Normalize hooks from plugins loaded by oclif v2 into this v4 Config.
+    // oclif v2 stores hooks as string arrays; v4 expects {identifier, target} objects.
+    // Only mutate when string hooks are present; guard against frozen plugin references.
+    const pluginList = typeof this.config.getPluginsList === 'function'
+      ? this.config.getPluginsList()
+      : [...(this.config.plugins?.values() ?? [])]
+    for (const plugin of pluginList) {
+      if (!plugin.hooks) {
+        continue
+      }
+      for (const [event, hooks] of Object.entries(plugin.hooks)) {
+        const hooksArr = Array.isArray(hooks) ? hooks : [hooks]
+        if (!hooksArr.some(h => typeof h === 'string')) {
+          continue
+        }
+        try {
+          plugin.hooks[event] = hooksArr.map(h =>
+            typeof h === 'string' ? { identifier: 'default', target: h } : h
+          )
+        } catch {
+          // plugin.hooks is frozen or sealed; skip normalization for this event
+        }
+      }
+    }
+
     // setup a prompt that outputs to stderr
     this.prompt = inquirer.createPromptModule({ output: process.stderr })
 

package/src/commands/app/deploy.js

@@ -30,6 +30,7 @@ const LogForwarding = require('../../lib/log-forwarding')
 const { sendAppAssetsDeployedAuditLog, sendAppDeployAuditLog } = require('../../lib/audit-logger')
 const { setRuntimeApiHostAndAuthHandler, getAccessToken } = require('../../lib/auth-helper')
 const logActions = require('../../lib/log-actions')
+const aioConfigLoader = require('@adobe/aio-lib-core-config')
 
 const PRE_DEPLOY_EVENT_REG = 'pre-deploy-event-reg'
 const POST_DEPLOY_EVENT_REG = 'post-deploy-event-reg'
@@ -230,6 +231,7 @@ class Deploy extends BuildCommand {
               // output should be "Error : <plugin-name> : <error-message>\n" for each failure
               this.error(hookResults.failures.map(f => `${f.plugin.name} : ${f.error.message}`).join('\nError: '), { exit: 1 })
             }
+            aioConfigLoader.reload()
             deployedRuntimeEntities = await rtLib.deployActions(config, { filterEntities, useForce: flags['force-deploy'] }, onProgress)
           }
 

package/src/commands/app/init.js

@@ -192,6 +192,9 @@ class InitCommand extends TemplatesCommand {
         this.error(`Extension(s) '${notFound.join(', ')}' not found in the Template Registry.`)
       }
       return extensionTemplates.map(t => t.name)
+    } else if (flags.yes) {
+      // with --yes and no explicit template, default to standalone app (no prompts)
+      return []
     } else if (!flags['standalone-app']) {
       const noLogin = flags.import || !flags.login
       let [searchCriteria, orderByCriteria] = await this.getSearchCriteria(orgSupportedServices)
@@ -210,9 +213,12 @@ class InitCommand extends TemplatesCommand {
     }
   }
 
-  async ensureDevTermAccepted (consoleCLI, orgId) {
+  async ensureDevTermAccepted (consoleCLI, orgId, skipPrompts = false) {
     const isTermAccepted = await consoleCLI.checkDevTermsForOrg(orgId)
     if (!isTermAccepted) {
+      if (skipPrompts) {
+        this.error('Developer Terms of Service have not been accepted for this organization. Please run `aio app init` without --yes to accept the terms first.')
+      }
       const terms = await consoleCLI.getDevTermsForOrg()
       const confirmDevTerms = await consoleCLI.prompt.promptConfirm(`${terms.text}
       \nYou have not accepted the Developer Terms of Service. Go to ${hyperlinker('https://www.adobe.com/go/developer-terms', 'https://www.adobe.com/go/developer-terms')} to view the terms. Do you accept the terms? (y/n):`)
@@ -294,26 +300,110 @@ class InitCommand extends TemplatesCommand {
 
   async selectConsoleOrg (consoleCLI, flags) {
     const organizations = await consoleCLI.getOrganizations()
-    const selectedOrg = await consoleCLI.promptForSelectOrganization(organizations, { orgId: flags.org, orgCode: flags.org })
-    await this.ensureDevTermAccepted(consoleCLI, selectedOrg.id)
+    if (!organizations || organizations.length === 0) {
+      this.error('No organizations found for the logged-in user')
+    }
+    // If --org was supplied, validate it against the full list regardless of how many orgs
+    // exist. This prevents silent mismatches when there is only one org but the caller
+    // passed a wrong id or code.
+    let selectedOrg
+    if (flags.org) {
+      selectedOrg = organizations.find(o => o.id === flags.org || o.code === flags.org)
+      if (!selectedOrg) {
+        this.error(`--org ${flags.org} not found`)
+      }
+    } else if (organizations.length > 1 && !flags.yes) {
+      // Multiple orgs and no --org: prompt interactively (only when not in --yes mode).
+      selectedOrg = await consoleCLI.promptForSelectOrganization(organizations, {})
+    } else {
+      // Single org, or --yes with no --org: auto-select the first (and likely only) org.
+      selectedOrg = organizations[0]
+      this.log(`Auto-selecting organization: '${selectedOrg.name || selectedOrg.id}'`)
+    }
+    await this.ensureDevTermAccepted(consoleCLI, selectedOrg.id, flags.yes)
     return selectedOrg
   }
 
   async selectOrCreateConsoleProject (consoleCLI, org, flags) {
+    // Fetch all projects in the org upfront. This list is used both for uniqueness
+    // checks (--yes path) and for the interactive selection prompt (non-yes path).
     const projects = await consoleCLI.getProjects(org.id)
+
+    if (flags.yes) {
+      // Non-interactive path: no prompts are shown. Behavior depends on whether
+      // --project was explicitly supplied by the caller.
+
+      if (flags.project) {
+        // --project was supplied. Try to find it in the existing list by id or name.
+        // Matching by id supports callers who pass a project id rather than a name.
+        const existing = projects.find(p => p.id === flags.project || p.name === flags.project)
+        if (existing) {
+          // Project already exists — return it as-is. isNew is intentionally NOT set
+          // so downstream code knows not to treat this as a newly created project.
+          this.log(`Using existing project: '${existing.name}'`)
+          return existing
+        }
+        // Project does not exist — create it using the caller-supplied name directly.
+        // title and description are derived from the name since no other info is available.
+        this.log(`Project '${flags.project}' not found, creating it`)
+        const project = await consoleCLI.createProject(org.id, {
+          name: flags.project,
+          title: flags.project,
+          description: `App Builder Project ${flags.project} - generated by an agent`
+        })
+        project.isNew = true
+        return project
+      }
+
+      // No --project supplied. Auto-generate a unique name of the form "App{N}"
+      // where N is the lowest positive integer not already used by an existing project.
+      // This mimics sequential behaviour (App1, App2, ...) and fills
+      // gaps left by deleted projects (e.g. if App2 was deleted, it is reused
+      // before App4 is attempted).
+      const existingNames = new Set(projects.map(p => p.name))
+      const MAX_SUFFIX = 10000
+      let suffix = 1
+      while (existingNames.has(`App${suffix}`)) {
+        suffix++
+        if (suffix > MAX_SUFFIX) {
+          this.error(`Could not find an available generated App name after ${MAX_SUFFIX} attempts`)
+        }
+      }
+
+      const generatedName = `App${suffix}`
+      const generatedTitle = `App Builder Project ${suffix}`
+      const generatedDescription = `App Builder Project ${suffix} - generated`
+
+      this.log(`Auto-generating project name: '${generatedName}'`)
+      const project = await consoleCLI.createProject(org.id, {
+        name: generatedName,
+        title: generatedTitle,
+        description: generatedDescription
+      })
+      project.isNew = true
+      return project
+    }
+
+    // Interactive path: prompt the user to select an existing project or create a new one.
+    // If --project was supplied it is used to pre-populate the selection (by id or name)
+    // but the prompt is still shown so the user can confirm or change it.
     let project = await consoleCLI.promptForSelectProject(
       projects,
       { projectId: flags.project, projectName: flags.project },
       { allowCreate: true }
     )
     if (!project) {
+      // promptForSelectProject returns null when the user selects "Create new project" or
+      // escapes the prompt. If --project was explicitly provided but not found/selected,
+      // always error — never silently create a different project.
       if (flags.project) {
         this.error(`--project ${flags.project} not found`)
+      } else {
+        // User chose to create a new project — collect details interactively and create it.
+        const projectDetails = await consoleCLI.promptForCreateProjectDetails()
+        project = await consoleCLI.createProject(org.id, projectDetails)
+        project.isNew = true
       }
-      // user has escaped project selection prompt, let's create a new one
-      const projectDetails = await consoleCLI.promptForCreateProjectDetails()
-      project = await consoleCLI.createProject(org.id, projectDetails)
-      project.isNew = true
     }
     return project
   }
@@ -324,7 +414,7 @@ class InitCommand extends TemplatesCommand {
     const workspaces = await consoleCLI.getWorkspaces(org.id, project.id)
     let workspace = workspaces.find(w => w.name.toLowerCase() === workspaceName.toLowerCase())
     if (!workspace) {
-      if (flags['confirm-new-workspace']) {
+      if (!flags.yes && flags['confirm-new-workspace']) {
         const shouldNewWorkspace = await consoleCLI.prompt.promptConfirm(`Workspace '${workspaceName}' does not exist \n > Do you wish to create a new workspace?`)
         if (!shouldNewWorkspace) {
           this.error(`Workspace '${workspaceName}' does not exist and creation aborted`)

package/src/commands/app/install.js

@@ -22,7 +22,6 @@ const jsYaml = require('js-yaml')
 const { USER_CONFIG_FILE, DEPLOY_CONFIG_FILE, PACKAGE_LOCK_FILE } = require('../../lib/defaults')
 const ora = require('ora')
 
-// eslint-disable-next-line node/no-missing-require
 const libConfig = require('@adobe/aio-cli-lib-app-config')
 
 class InstallCommand extends BaseCommand {

package/src/commands/app/pack.js

@@ -22,7 +22,6 @@ const { getObjectValue } = require('../../lib/app-helper')
 const ora = require('ora')
 const junk = require('junk')
 
-// eslint-disable-next-line node/no-missing-require
 const libConfig = require('@adobe/aio-cli-lib-app-config')
 
 const DIST_FOLDER = 'dist'

package/src/lib/cleanup.js

@@ -40,11 +40,11 @@ class Cleanup {
       try {
         await this.run()
         aioLogger.info('exiting!')
-        process.exit(0) // eslint-disable-line no-process-exit
+        process.exit(0)
       } catch (e) {
         aioLogger.error('unexpected error while cleaning up!')
         aioLogger.error(e)
-        process.exit(1) // eslint-disable-line no-process-exit
+        process.exit(1)
       }
     })
   }

package/src/lib/install-helper.js

@@ -20,7 +20,6 @@ const ajvAddFormats = require('ajv-formats')
  * @returns {object} with keys valid (boolean) and errors (object). errors is null if no errors
  */
 function validateJsonWithSchema (fileJson, schemaName) {
-  /* eslint-disable-next-line node/no-unpublished-require */
   const schemas = require('../../schema/index')
   const ajv = new Ajv({
     allErrors: true,

package/src/lib/run-dev.js

@@ -9,7 +9,6 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
-/* eslint-disable no-template-curly-in-string */
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:runDev', { provider: 'debug' })
 const rtLib = require('@adobe/aio-lib-runtime')
 const rtLibUtils = rtLib.utils