adapt-cli 3.0.2 → 3.0.6

package/lib/integration/PluginManagement/print.js

@@ -1,52 +1,52 @@
-import chalk from 'chalk'
-import semver from 'semver'
-import { ADAPT_ALLOW_PRERELEASE } from '../../util/constants.js'
-const semverOptions = { includePrerelease: ADAPT_ALLOW_PRERELEASE }
-
-function highlight (pluginname) {
-  return ['adapt-contrib', 'adapt-'].reduce((output, prefix) => {
-    if (output || !pluginname.startsWith(prefix)) return output
-    return chalk.reset(prefix) + chalk.yellowBright(pluginname.substring(prefix.length))
-  }, null) || pluginname
-}
-
-function greenIfEqual (v1, v2) {
-  if (v1 === '*') return chalk.greenBright(v2)
-  return semver.satisfies(v1, v2, semverOptions)
-    ? chalk.greenBright(v2)
-    : chalk.magentaBright(v2)
-}
-
-export function versionPrinter (plugin, logger) {
-  const {
-    versionToApply,
-    latestCompatibleSourceVersion
-  } = plugin
-  logger?.log(highlight(plugin.packageName), latestCompatibleSourceVersion === null
-    ? '(no version information)'
-    : `${chalk.greenBright(versionToApply)}${plugin.isLocalSource ? ' (local)' : ` (latest compatible version is ${greenIfEqual(versionToApply, latestCompatibleSourceVersion)})`}`
-  )
-}
-
-export function existingVersionPrinter (plugin, logger) {
-  const {
-    preUpdateProjectVersion,
-    projectVersion,
-    latestCompatibleSourceVersion
-  } = plugin
-  const fromTo = preUpdateProjectVersion !== null
-    ? `from ${chalk.greenBright(preUpdateProjectVersion)} to ${chalk.greenBright(projectVersion)}`
-    : `${chalk.greenBright(projectVersion)}`
-  logger?.log(highlight(plugin.packageName), latestCompatibleSourceVersion === null
-    ? fromTo
-    : `${fromTo}${plugin.isLocalSource ? ' (local)' : ` (latest compatible version is ${greenIfEqual(projectVersion, latestCompatibleSourceVersion)})`}`
-  )
-}
-
-export function errorPrinter (plugin, logger) {
-  logger?.log(highlight(plugin.packageName), plugin.installError ? '(error: ' + plugin.installError + ')' : '(unknown error)')
-}
-
-export function packageNamePrinter (plugin, logger) {
-  logger?.log(highlight(plugin.packageName))
-}
+import chalk from 'chalk'
+import semver from 'semver'
+import { ADAPT_ALLOW_PRERELEASE } from '../../util/constants.js'
+const semverOptions = { includePrerelease: ADAPT_ALLOW_PRERELEASE }
+
+function highlight (pluginname) {
+  return ['adapt-contrib', 'adapt-'].reduce((output, prefix) => {
+    if (output || !pluginname.startsWith(prefix)) return output
+    return chalk.reset(prefix) + chalk.yellowBright(pluginname.substring(prefix.length))
+  }, null) || pluginname
+}
+
+function greenIfEqual (v1, v2) {
+  if (v1 === '*') return chalk.greenBright(v2)
+  return semver.satisfies(v1, v2, semverOptions)
+    ? chalk.greenBright(v2)
+    : chalk.magentaBright(v2)
+}
+
+export function versionPrinter (plugin, logger) {
+  const {
+    versionToApply,
+    latestCompatibleSourceVersion
+  } = plugin
+  logger?.log(highlight(plugin.packageName), latestCompatibleSourceVersion === null
+    ? '(no version information)'
+    : `${chalk.greenBright(versionToApply)}${plugin.isLocalSource ? ' (local)' : ` (latest compatible version is ${greenIfEqual(versionToApply, latestCompatibleSourceVersion)})`}`
+  )
+}
+
+export function existingVersionPrinter (plugin, logger) {
+  const {
+    preUpdateProjectVersion,
+    projectVersion,
+    latestCompatibleSourceVersion
+  } = plugin
+  const fromTo = preUpdateProjectVersion !== null
+    ? `from ${chalk.greenBright(preUpdateProjectVersion)} to ${chalk.greenBright(projectVersion)}`
+    : `${chalk.greenBright(projectVersion)}`
+  logger?.log(highlight(plugin.packageName), latestCompatibleSourceVersion === null
+    ? fromTo
+    : `${fromTo}${plugin.isLocalSource ? ' (local)' : ` (latest compatible version is ${greenIfEqual(projectVersion, latestCompatibleSourceVersion)})`}`
+  )
+}
+
+export function errorPrinter (plugin, logger) {
+  logger?.log(highlight(plugin.packageName), plugin.installError ? '(error: ' + plugin.installError + ')' : '(unknown error)')
+}
+
+export function packageNamePrinter (plugin, logger) {
+  logger?.log(highlight(plugin.packageName))
+}

package/lib/integration/PluginManagement/register.js

@@ -1,130 +1,130 @@
-
-import getBowerRegistryConfig from '../getBowerRegistryConfig.js'
-import fs from 'fs-extra'
-import path from 'path'
-import bower from 'bower'
-import chalk from 'chalk'
-import inquirer from 'inquirer'
-import { readValidateJSON } from '../../util/JSONReadValidate.js'
-import Plugin from '../Plugin.js'
-import semver from 'semver'
-import { ADAPT_ALLOW_PRERELEASE } from '../../util/constants.js'
-const semverOptions = { includePrerelease: ADAPT_ALLOW_PRERELEASE }
-
-export default async function register ({
-  logger,
-  cwd = process.cwd()
-} = {}) {
-  cwd = path.resolve(process.cwd(), cwd)
-  const BOWER_REGISTRY_CONFIG = getBowerRegistryConfig({ cwd })
-  logger?.warn('Using registry at', BOWER_REGISTRY_CONFIG.register)
-  try {
-    const bowerJSONPath = path.join(cwd, 'bower.json')
-    const hasBowerJSON = fs.existsSync(bowerJSONPath)
-
-    const bowerJSON = {
-      name: undefined,
-      repository: undefined,
-      framework: undefined,
-      ...(hasBowerJSON ? await readValidateJSON(bowerJSONPath) : {})
-    }
-    const properties = await confirm(bowerJSON)
-    hasBowerJSON && await fs.writeJSON(bowerJSONPath, properties, { spaces: 2, replacer: null })
-
-    // given a package name, create two Plugin representations
-    // if supplied name is adapt-contrib-myPackageName do a check against this name only
-    // if suppled name is adapt-myPackageName check against this name and adapt-contrib-myPackageName
-    // becase we don't want to allow adapt-myPackageName if adapt-contrib-myPackageName exists
-    const plugin = new Plugin({ name: properties.name, logger })
-    const contribPlugin = new Plugin({ name: properties.name, isContrib: true, logger })
-    const contribExists = await exists(BOWER_REGISTRY_CONFIG, contribPlugin)
-    const pluginExists = await exists(BOWER_REGISTRY_CONFIG, plugin)
-
-    if (contribExists || pluginExists) {
-      logger?.warn(plugin.toString(), 'has been previously registered. Plugin names must be unique. Try again with a different name.')
-      return
-    }
-
-    const result = await registerWithBowerRepo(BOWER_REGISTRY_CONFIG, plugin, properties.repository)
-    if (!result) throw new Error('The plugin was unable to register.')
-    logger?.log(chalk.green(plugin.packageName), 'has been registered successfully.')
-  } catch (err) {
-    logger?.error(err)
-  }
-}
-
-async function confirm (properties) {
-  const plugin = new Plugin({ name: properties.name })
-  const schema = [
-    {
-      name: 'name',
-      message: chalk.cyan('name'),
-      validate: v => {
-        return /^adapt-[\w|-]+?$/.test(v) ||
-            'Name must prefixed with \'adapt\' and each word separated with a hyphen(-)'
-      },
-      type: 'input',
-      default: plugin.toString() || 'not specified'
-    },
-    {
-      name: 'repositoryUrl',
-      message: chalk.cyan('repository URL'),
-      validate: v => {
-        return /https:\/\/([\w.@:/\-~]+)(\.git)(\/)?/.test(v) ||
-            'Please provide a repository URL of the form https://<domain><path>.git'
-      },
-      type: 'input',
-      default: properties.repository ? properties.repository.url : undefined
-    },
-    {
-      name: 'framework',
-      message: chalk.cyan('framework'),
-      validate: v => {
-        return semver.validRange(v, semverOptions) !== null ||
-            'Please provide a valid semver (see https://semver.org/)'
-      },
-      type: 'input',
-      default: properties.framework || '>=5.15'
-    },
-    {
-      name: 'ready',
-      message: chalk.cyan('Register now?'),
-      type: 'confirm',
-      default: true
-    }
-  ]
-  const confirmation = await inquirer.prompt(schema)
-  if (!confirmation.ready) throw new Error('Aborted. Nothing has been registered.')
-  properties.name = confirmation.name
-  properties.repository = { type: 'git', url: confirmation.repositoryUrl }
-  properties.framework = confirmation.framework
-  return properties
-}
-
-/**
- * @param {Plugin} plugin
- * @returns {boolean}
- */
-async function exists (BOWER_REGISTRY_CONFIG, plugin) {
-  const pluginName = plugin.toString().toLowerCase()
-  return new Promise((resolve, reject) => {
-    bower.commands.search(pluginName, {
-      registry: BOWER_REGISTRY_CONFIG.register
-    })
-      .on('end', result => {
-        const matches = result.filter(({ name }) => name.toLowerCase() === pluginName)
-        resolve(Boolean(matches.length))
-      })
-      .on('error', reject)
-  })
-}
-
-async function registerWithBowerRepo (BOWER_REGISTRY_CONFIG, plugin, repository) {
-  return new Promise((resolve, reject) => {
-    bower.commands.register(plugin.toString(), repository.url || repository, {
-      registry: BOWER_REGISTRY_CONFIG
-    })
-      .on('end', resolve)
-      .on('error', reject)
-  })
-}
+
+import getBowerRegistryConfig from '../getBowerRegistryConfig.js'
+import fs from 'fs-extra'
+import path from 'path'
+import bower from 'bower'
+import chalk from 'chalk'
+import inquirer from 'inquirer'
+import { readValidateJSON } from '../../util/JSONReadValidate.js'
+import Plugin from '../Plugin.js'
+import semver from 'semver'
+import { ADAPT_ALLOW_PRERELEASE } from '../../util/constants.js'
+const semverOptions = { includePrerelease: ADAPT_ALLOW_PRERELEASE }
+
+export default async function register ({
+  logger,
+  cwd = process.cwd()
+} = {}) {
+  cwd = path.resolve(process.cwd(), cwd)
+  const BOWER_REGISTRY_CONFIG = getBowerRegistryConfig({ cwd })
+  logger?.warn('Using registry at', BOWER_REGISTRY_CONFIG.register)
+  try {
+    const bowerJSONPath = path.join(cwd, 'bower.json')
+    const hasBowerJSON = fs.existsSync(bowerJSONPath)
+
+    const bowerJSON = {
+      name: undefined,
+      repository: undefined,
+      framework: undefined,
+      ...(hasBowerJSON ? await readValidateJSON(bowerJSONPath) : {})
+    }
+    const properties = await confirm(bowerJSON)
+    hasBowerJSON && await fs.writeJSON(bowerJSONPath, properties, { spaces: 2, replacer: null })
+
+    // given a package name, create two Plugin representations
+    // if supplied name is adapt-contrib-myPackageName do a check against this name only
+    // if suppled name is adapt-myPackageName check against this name and adapt-contrib-myPackageName
+    // becase we don't want to allow adapt-myPackageName if adapt-contrib-myPackageName exists
+    const plugin = new Plugin({ name: properties.name, logger })
+    const contribPlugin = new Plugin({ name: properties.name, isContrib: true, logger })
+    const contribExists = await exists(BOWER_REGISTRY_CONFIG, contribPlugin)
+    const pluginExists = await exists(BOWER_REGISTRY_CONFIG, plugin)
+
+    if (contribExists || pluginExists) {
+      logger?.warn(plugin.toString(), 'has been previously registered. Plugin names must be unique. Try again with a different name.')
+      return
+    }
+
+    const result = await registerWithBowerRepo(BOWER_REGISTRY_CONFIG, plugin, properties.repository)
+    if (!result) throw new Error('The plugin was unable to register.')
+    logger?.log(chalk.green(plugin.packageName), 'has been registered successfully.')
+  } catch (err) {
+    logger?.error(err)
+  }
+}
+
+async function confirm (properties) {
+  const plugin = new Plugin({ name: properties.name })
+  const schema = [
+    {
+      name: 'name',
+      message: chalk.cyan('name'),
+      validate: v => {
+        return /^adapt-[\w|-]+?$/.test(v) ||
+            'Name must prefixed with \'adapt\' and each word separated with a hyphen(-)'
+      },
+      type: 'input',
+      default: plugin.toString() || 'not specified'
+    },
+    {
+      name: 'repositoryUrl',
+      message: chalk.cyan('repository URL'),
+      validate: v => {
+        return /https:\/\/([\w.@:/\-~]+)(\.git)(\/)?/.test(v) ||
+            'Please provide a repository URL of the form https://<domain><path>.git'
+      },
+      type: 'input',
+      default: properties.repository ? properties.repository.url : undefined
+    },
+    {
+      name: 'framework',
+      message: chalk.cyan('framework'),
+      validate: v => {
+        return semver.validRange(v, semverOptions) !== null ||
+            'Please provide a valid semver (see https://semver.org/)'
+      },
+      type: 'input',
+      default: properties.framework || '>=5.15'
+    },
+    {
+      name: 'ready',
+      message: chalk.cyan('Register now?'),
+      type: 'confirm',
+      default: true
+    }
+  ]
+  const confirmation = await inquirer.prompt(schema)
+  if (!confirmation.ready) throw new Error('Aborted. Nothing has been registered.')
+  properties.name = confirmation.name
+  properties.repository = { type: 'git', url: confirmation.repositoryUrl }
+  properties.framework = confirmation.framework
+  return properties
+}
+
+/**
+ * @param {Plugin} plugin
+ * @returns {boolean}
+ */
+async function exists (BOWER_REGISTRY_CONFIG, plugin) {
+  const pluginName = plugin.toString().toLowerCase()
+  return new Promise((resolve, reject) => {
+    bower.commands.search(pluginName, {
+      registry: BOWER_REGISTRY_CONFIG.register
+    })
+      .on('end', result => {
+        const matches = result.filter(({ name }) => name.toLowerCase() === pluginName)
+        resolve(Boolean(matches.length))
+      })
+      .on('error', reject)
+  })
+}
+
+async function registerWithBowerRepo (BOWER_REGISTRY_CONFIG, plugin, repository) {
+  return new Promise((resolve, reject) => {
+    bower.commands.register(plugin.toString(), repository.url || repository, {
+      registry: BOWER_REGISTRY_CONFIG
+    })
+      .on('end', resolve)
+      .on('error', reject)
+  })
+}

package/lib/integration/PluginManagement/rename.js

@@ -1,101 +1,101 @@
-import getBowerRegistryConfig from '../getBowerRegistryConfig.js'
-import authenticate from './autenticate.js'
-import bower from 'bower'
-import chalk from 'chalk'
-import inquirer from 'inquirer'
-import request from 'request'
-import path from 'path'
-import Plugin from '../Plugin.js'
-
-export default async function rename ({
-  logger,
-  oldName,
-  newName,
-  cwd = process.cwd()
-} = {}) {
-  cwd = path.resolve(process.cwd(), cwd)
-  const BOWER_REGISTRY_CONFIG = getBowerRegistryConfig({ cwd })
-  if (!oldName || !newName) {
-    logger?.error('You must call rename with the following arguments: <plugin name> <new plugin name>')
-    return
-  }
-  // use Plugin to standardise name
-  newName = new Plugin({ name: newName, logger }).packageName
-  oldName = new Plugin({ name: oldName, logger }).packageName
-  logger?.warn('Using registry at', BOWER_REGISTRY_CONFIG.register)
-  logger?.warn(`Plugin will be renamed from ${oldName} to ${newName}`)
-  try {
-    const oldExists = await exists(BOWER_REGISTRY_CONFIG, oldName)
-    if (!oldExists) throw new Error(`Plugin "${oldName}" does not exist`)
-    const newExists = await exists(BOWER_REGISTRY_CONFIG, newName)
-    if (newExists) throw new Error(`Name "${newName}" already exists`)
-    const { username, token, type } = await authenticate({ pluginName: oldName })
-    logger?.log(`${username} authenticated as ${type}`)
-    await confirm()
-    await renameInBowerRepo({
-      username,
-      token,
-      oldName,
-      newName,
-      BOWER_REGISTRY_CONFIG
-    })
-    logger?.log(chalk.green('The plugin was successfully renamed.'))
-  } catch (err) {
-    logger?.error(err)
-    logger?.error('The plugin was not renamed.')
-  }
-}
-
-async function confirm () {
-  const schema = [
-    {
-      name: 'ready',
-      message: chalk.cyan('Confirm rename now?'),
-      type: 'confirm',
-      default: true
-    }
-  ]
-  const confirmation = await inquirer.prompt(schema)
-  if (!confirmation.ready) throw new Error('Aborted. Nothing has been renamed.')
-}
-
-async function renameInBowerRepo ({
-  username,
-  token,
-  oldName,
-  newName,
-  BOWER_REGISTRY_CONFIG
-}) {
-  const path = 'packages/rename/' + username + '/' + oldName + '/' + newName
-  const query = '?access_token=' + token
-  return new Promise((resolve, reject) => {
-    request({
-      url: BOWER_REGISTRY_CONFIG.register + path + query,
-      method: 'GET',
-      headers: { 'User-Agent': 'adapt-cli' },
-      followRedirect: false
-    }, (err, res) => {
-      if (err) return reject(err)
-      if (res.statusCode !== 201) reject(new Error(`The server responded with ${res.statusCode}`))
-      resolve()
-    })
-  })
-}
-
-/**
- * @param {Plugin} plugin
- * @returns {boolean}
- */
-async function exists (BOWER_REGISTRY_CONFIG, plugin) {
-  const pluginName = plugin.toString().toLowerCase()
-  return new Promise((resolve, reject) => {
-    bower.commands.search(pluginName, {
-      registry: BOWER_REGISTRY_CONFIG.register
-    })
-      .on('end', result => {
-        const matches = result.filter(({ name }) => name.toLowerCase() === pluginName)
-        resolve(Boolean(matches.length))
-      })
-      .on('error', reject)
-  })
-}
+import getBowerRegistryConfig from '../getBowerRegistryConfig.js'
+import authenticate from './autenticate.js'
+import bower from 'bower'
+import chalk from 'chalk'
+import inquirer from 'inquirer'
+import request from 'request'
+import path from 'path'
+import Plugin from '../Plugin.js'
+
+export default async function rename ({
+  logger,
+  oldName,
+  newName,
+  cwd = process.cwd()
+} = {}) {
+  cwd = path.resolve(process.cwd(), cwd)
+  const BOWER_REGISTRY_CONFIG = getBowerRegistryConfig({ cwd })
+  if (!oldName || !newName) {
+    logger?.error('You must call rename with the following arguments: <plugin name> <new plugin name>')
+    return
+  }
+  // use Plugin to standardise name
+  newName = new Plugin({ name: newName, logger }).packageName
+  oldName = new Plugin({ name: oldName, logger }).packageName
+  logger?.warn('Using registry at', BOWER_REGISTRY_CONFIG.register)
+  logger?.warn(`Plugin will be renamed from ${oldName} to ${newName}`)
+  try {
+    const oldExists = await exists(BOWER_REGISTRY_CONFIG, oldName)
+    if (!oldExists) throw new Error(`Plugin "${oldName}" does not exist`)
+    const newExists = await exists(BOWER_REGISTRY_CONFIG, newName)
+    if (newExists) throw new Error(`Name "${newName}" already exists`)
+    const { username, token, type } = await authenticate({ pluginName: oldName })
+    logger?.log(`${username} authenticated as ${type}`)
+    await confirm()
+    await renameInBowerRepo({
+      username,
+      token,
+      oldName,
+      newName,
+      BOWER_REGISTRY_CONFIG
+    })
+    logger?.log(chalk.green('The plugin was successfully renamed.'))
+  } catch (err) {
+    logger?.error(err)
+    logger?.error('The plugin was not renamed.')
+  }
+}
+
+async function confirm () {
+  const schema = [
+    {
+      name: 'ready',
+      message: chalk.cyan('Confirm rename now?'),
+      type: 'confirm',
+      default: true
+    }
+  ]
+  const confirmation = await inquirer.prompt(schema)
+  if (!confirmation.ready) throw new Error('Aborted. Nothing has been renamed.')
+}
+
+async function renameInBowerRepo ({
+  username,
+  token,
+  oldName,
+  newName,
+  BOWER_REGISTRY_CONFIG
+}) {
+  const path = 'packages/rename/' + username + '/' + oldName + '/' + newName
+  const query = '?access_token=' + token
+  return new Promise((resolve, reject) => {
+    request({
+      url: BOWER_REGISTRY_CONFIG.register + path + query,
+      method: 'GET',
+      headers: { 'User-Agent': 'adapt-cli' },
+      followRedirect: false
+    }, (err, res) => {
+      if (err) return reject(err)
+      if (res.statusCode !== 201) reject(new Error(`The server responded with ${res.statusCode}`))
+      resolve()
+    })
+  })
+}
+
+/**
+ * @param {Plugin} plugin
+ * @returns {boolean}
+ */
+async function exists (BOWER_REGISTRY_CONFIG, plugin) {
+  const pluginName = plugin.toString().toLowerCase()
+  return new Promise((resolve, reject) => {
+    bower.commands.search(pluginName, {
+      registry: BOWER_REGISTRY_CONFIG.register
+    })
+      .on('end', result => {
+        const matches = result.filter(({ name }) => name.toLowerCase() === pluginName)
+        resolve(Boolean(matches.length))
+      })
+      .on('error', reject)
+  })
+}

package/lib/integration/PluginManagement/schemas.js

@@ -1,8 +1,8 @@
-import Project from '../Project.js'
-import path from 'path'
-
-export default async function schemas ({ cwd = process.cwd() } = {}) {
-  cwd = path.resolve(process.cwd(), cwd)
-  const project = new Project({ cwd })
-  return await project.getSchemaPaths({ cwd })
-}
+import Project from '../Project.js'
+import path from 'path'
+
+export default async function schemas ({ cwd = process.cwd() } = {}) {
+  cwd = path.resolve(process.cwd(), cwd)
+  const project = new Project({ cwd })
+  return await project.getSchemaPaths({ cwd })
+}