Release 5.1.0

README.md

@@ -1,4 +1,4 @@
-# @oracle/ojet-cli 5.0.0
+# @oracle/ojet-cli 5.1.0
 
 ## About the module
 This module contains a command line interface for Oracle JET web and hybrid mobile application development.
@@ -64,7 +64,7 @@ Or view help on adding a plugin:
 ojet help add plugin
 ```
 
-For more information on the Oracle JET CLI, refer to the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet500&id=homepage).
+For more information on the Oracle JET CLI, refer to the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet510&id=homepage).
 
 ## [Contributing](https://github.com/oracle/ojet-cli/tree/master/CONTRIBUTING.md)
 Oracle JET is an open source project.  Pull Requests are currently not being accepted. See [CONTRIBUTING](https://github.com/oracle/ojet-cli/tree/master/CONTRIBUTING.md) for details.

RELEASENOTES.md

@@ -1,5 +1,17 @@
 ## Release Notes for ojet-cli ##
 
+### 5.1.0
+When using Cordova-Android 7.0.0+, users may encounter an error like:
+
+ENOENT: no such file or directory, open ‘App\hybrid\platforms\android\res\xml\config.xml’
+
+This is because Cordova changed the Android project file structure, and some third-party plugins/tools are not updated yet.
+The error is harmless.  Users can also choose to downgrade to Cordova-Android 6.4.0 to completely avoid the issue. 
+
+More information is in the Cordova-Android 7.0.0 release note: 
+
+https://cordova.apache.org/announcements/2017/12/04/cordova-android-7.0.0.html
+
 ### 5.0.0
 * The main-release-paths.json file has been replaced by the path-mapping.json file in templates used to scaffold applications
 * As a continued effort toward abstraction of direct library calls in the JET CLI, the direct use of yeoman and grunt will be removed in the JET v7.0.0 release.  A new hooks API will be provided to allow for customization of tasks.

lib/tasks/add.js

@@ -31,9 +31,18 @@ module.exports = function (scope, parameters, options) {
     case scopes.component.name:
       utils.ensureParameters(parameters);
       utils.ensureJetApp();
-      component.add(parameters);
+
+      // Keep this if only for the course of 5.X
+      // https://jira.oraclecorp.com/jira/browse/JET-21713
+      if (utils.isTooling50x()) {
+        component.add(parameters);
+      } else {
+        const tooling = utils.loadTooling();
+        tooling.add(scope, parameters);
+      }
       break;
     case scopes.hybrid.name:
+      utils.validateParametersCount(parameters, 0);
       utils.ensureJetApp();
       if (parameter) {
         utils.log.error(utils.toNotSupportedMessage(`${task} ${scope} ${parameter}`));
@@ -55,6 +64,7 @@ module.exports = function (scope, parameters, options) {
       break;
     }
     case scopes.sass.name:
+      utils.validateParametersCount(parameters, 0);
       utils.ensureJetApp();
       if (parameter) {
         utils.log.error(utils.toNotSupportedMessage(`${task} ${scope} ${parameter}`));

lib/tasks/build.serve.js

@@ -20,10 +20,12 @@ const CONSTANTS = require('../utils.constants');
  * @public
  * @param {string} task
  * @param {string} [scope]
- * @param {string} [parameter]
+ * @param {Array} [parameters]
  * @param {Object} [options]
  */
-module.exports = function (task, scope, parameter, options) {
+module.exports = function (task, scope, parameters, options) {
+  utils.validateParametersCount(parameters, 1);
+  const parameter = parameters[0];
   switch (scope) {
     case config.tasks.build.scopes.app.name:
     case config.tasks.serve.scopes.app.name:

lib/tasks/clean.js

@@ -22,9 +22,13 @@ const utils = require('../utils');
  * # Invoked platform clean
  *
  * @public
- * @param {string} platform
+ * @param {string} scope
+ * @param {Array} [parameters]
  */
-module.exports = function (scope, parameter) {
+module.exports = function (scope, parameters) {
+  utils.ensureJetApp();
+  utils.validateParametersCount(parameters, 1);
+  const parameter = parameters[0];
   const toolingPath = path.join(process.cwd(), 'node_modules/@oracle/oraclejet-tooling');
   // Oracle command libs
   if (fs.existsSync(toolingPath)) {
@@ -37,7 +41,7 @@ module.exports = function (scope, parameter) {
         if (CONSTANTS.SUPPORTED_PLATFORMS.indexOf(platform) > -1) {
           tooling.clean.platform(platform);
         } else {
-          utils.log.error(`Missing or invalid platform ${platform}`);
+          utils.log.error(`Invalid platform ${platform}`);
         }
     }
   } else {

lib/tasks/configure.js

@@ -18,16 +18,24 @@ const utils = require('../utils');
  *
  * @public
  * @param {string} task
+ * @param {Array} [parameters] - Passed in just to show warning if present
  * @param {string} scope
  */
-module.exports = function (task, scope, options) {
-  const opts = options;
+module.exports = function (task, scope, parameters, options) {
+  utils.validateParametersCount(parameters, 0);
   switch (scope) {
     case config.tasks[task].scopes.app.name:
     case undefined:
       utils.ensureJetApp();
-      if (opts && utils.hasProperty(opts, 'catalog-url')) {
-        catalog.configureCatalogUrl(opts['catalog-url']);
+      if (options && utils.hasProperty(options, 'catalog-url')) {
+        // Keep this if only for the course of 5.X
+        // https://jira.oraclecorp.com/jira/browse/JET-21713
+        if (utils.isTooling50x()) {
+          catalog.configureCatalogUrl(options['catalog-url']);
+        } else {
+          const tooling = utils.loadTooling();
+          tooling.configure('catalog', options);
+        }
       } else {
         utils.log.error(utils.toError(`Please check 'ojet help ${task}' and provide valid configuration options.`));
       }

lib/tasks/create.js

@@ -18,12 +18,13 @@ const utils = require('../utils');
  *
  * @public
  * @param {string} scope
- * @param {string} [parameter]
+ * @param {Array} [parameters]
  * @param {Object} [options]
  */
-module.exports = function (scope, parameter, options) {
+module.exports = function (scope, parameters, options) {
   const scopes = config.tasks.create.scopes;
-
+  utils.validateParametersCount(parameters, 1);
+  const parameter = parameters[0];
   switch (scope) {
     case scopes.app.name:
       app.create(parameter, options);

lib/tasks/help.js

@@ -31,6 +31,8 @@ module.exports = function (commands) {
   const task = commands[n];
   const scope = commands[n + 1];
 
+  utils.validateParametersCount(commands.slice(2), 0);
+
   if (task) {
     _validateCommand(task, scope, helpTaskNameUsed);
     // Print one task

lib/tasks/list.js

@@ -19,26 +19,31 @@ const utils = require('../utils');
  *
  * @public
  * @param {string} scope
- * @param {string} [parameter] - Passed in just to show error if present
+ * @param {Array} [parameters] - Passed in just to show warning if present
  */
-module.exports = function (scope, parameter) {
+module.exports = function (scope, parameters) {
   const task = config.tasks.list.name;
   const scopes = config.tasks.list.scopes;
+  utils.validateParametersCount(parameters, 0);
 
   switch (scope) {
     case scopes.component.name: {
       utils.ensureJetApp();
-      component.list();
+
+      // Keep this if only for the course of 5.X
+      // https://jira.oraclecorp.com/jira/browse/JET-21713
+      if (utils.isTooling50x()) {
+        component.list();
+      } else {
+        const tooling = utils.loadTooling();
+        tooling.list(scope);
+      }
       break;
     }
     case scopes.platform.name:
     case scopes.plugin.name: {
       utils.ensureJetHybridApp();
-      if (parameter) {
-        utils.log.error(utils.toNotSupportedMessage(`${task} ${scope} ${parameter}`));
-      } else {
-        platformAndPlugin(task, scope);
-      }
+      platformAndPlugin(task, scope);
       break;
     }
     case undefined:

lib/tasks/publish.js

@@ -22,13 +22,24 @@ const utils = require('../utils');
  * @param {Array} parameters
  * @param {Object} [options]
  */
-module.exports = function (task, scope, parameter, options) {
+module.exports = function (task, scope, parameters, options) {
+  utils.validateParametersCount(parameters, 1);
+  const parameter = parameters[0];
+
   switch (scope) {
     case config.tasks[task].scopes.component.name:
       utils.ensureParameters(parameter);
       utils.ensureJetApp();
       utils.ensureCatalogUrl();
-      component.publish(parameter, options);
+
+      // Keep this if only for the course of 5.X
+      // https://jira.oraclecorp.com/jira/browse/JET-21713
+      if (utils.isTooling50x()) {
+        component.publish(parameter, options);
+      } else {
+        const tooling = utils.loadTooling();
+        tooling.publish(scope, parameter, options);
+      }
       break;
     case undefined:
       utils.log.error(utils.toMissingInputMessage(`${task}`));

lib/tasks/remove.js

@@ -29,7 +29,15 @@ module.exports = function (scope, parameters) {
     case scopes.component.name: {
       utils.ensureJetApp();
       utils.ensureParameters(parameters);
-      component.remove(parameters);
+
+      // Keep this if only for the course of 5.X
+      // https://jira.oraclecorp.com/jira/browse/JET-21713
+      if (utils.isTooling50x()) {
+        component.remove(parameters);
+      } else {
+        const tooling = utils.loadTooling();
+        tooling.remove(scope, parameters);
+      }
       break;
     }
     case scopes.platform.name:

lib/tasks/restore.js

@@ -20,18 +20,15 @@ const utils = require('../utils');
  * @public
  * @param {string} task
  * @param {string} [scope]
- * @param {string} [parameter]
+ * @param {Array} [parameters] - Passed in just to show warning if present
  */
-module.exports = function (task, scope, parameter) {
+module.exports = function (task, scope, parameters) {
   switch (scope) {
     case undefined:
     case config.tasks[task].scopes.app.name:
+      utils.validateParametersCount(parameters, 0);
       utils.ensureJetApp();
-      if (parameter) {
-        utils.log.error(utils.toNotSupportedMessage(`${task} ${scope} ${parameter}`));
-      } else {
-        app.restore(task);
-      }
+      app.restore(task);
       break;
     default:
       utils.log.error(utils.toNotSupportedMessage(`${task} ${scope}`));

lib/tasks/search.js

@@ -20,15 +20,25 @@ const utils = require('../utils');
  * @public
  * @param {string} task
  * @param {string} scope
- * @param {string} parameter
+ * @param {Array} parameters
  */
-module.exports = function (task, scope, parameter) {
+module.exports = function (task, scope, parameters) {
+  utils.validateParametersCount(parameters, 1);
+  const parameter = parameters[0];
   switch (scope) {
     case config.tasks[task].scopes.catalog.name:
       utils.ensureParameters(parameter);
       utils.ensureJetApp();
       utils.ensureCatalogUrl();
-      catalog.search(parameter);
+
+      // Keep this if only for the course of 5.X
+      // https://jira.oraclecorp.com/jira/browse/JET-21713
+      if (utils.isTooling50x()) {
+        catalog.search(parameter);
+      } else {
+        const tooling = utils.loadTooling();
+        tooling.search(scope, parameter);
+      }
       break;
     case undefined:
       utils.log.error(utils.toMissingInputMessage(`${task}`));

lib/tasks/strip.js

@@ -21,11 +21,12 @@ const config = require('../../config');
  * # Invoke 'strip' task
  *
  * @public
+ * @param {Array} [parameters] - Passed in just to show warning if present
  */
-module.exports = function () {
-  const toolingPath = path.join(process.cwd(), 'node_modules/@oracle/oraclejet-tooling');
-  // Oracle command libs
+module.exports = function (parameters) {
+  utils.validateParametersCount(parameters, 0);
   utils.ensureJetApp();
+  const toolingPath = path.join(process.cwd(), 'node_modules/@oracle/oraclejet-tooling');
   if (fs.existsSync(toolingPath)) {
     const tooling = require(toolingPath); // eslint-disable-line
     tooling.strip();
@@ -37,7 +38,15 @@ module.exports = function () {
 
 function _removeRegisteredComponents() {
   const names = _getComponentNames() || [];
-  component.remove(names, true);
+
+  // Keep this if only for the course of 5.X
+  // https://jira.oraclecorp.com/jira/browse/JET-21713
+  if (utils.isTooling50x()) {
+    component.remove(names, true);
+  } else {
+    const tooling = utils.loadTooling();
+    tooling.remove(config.tasks.remove.scopes.component.name, names, true);
+  }
 }
 
 function _getComponentNames() {

lib/utils.js

@@ -740,6 +740,21 @@ utils.validateOptions = (options, jobType) => {
   return options;
 };
 
+/**
+ * ## validateParameters
+ *
+ * @public
+ * @param {Array} parameters
+ * @param {number} max - max allowed parameters
+ */
+utils.validateParametersCount = (parameters, max) => {
+  let params = parameters;
+  if (params && params.constructor === Array && params.length > max) {
+    params = params.slice(max, params.length);
+    utils.log.warning(`Invalid parameters: ${params.toString()}`);
+  }
+};
+
 utils.validatePlatform = (platform) => {
   let validPlatform;
   if (!platform) {
@@ -852,6 +867,17 @@ utils.validateServeOptions = (serveOptions, targetKey, platform) => {
   return customOptions;
 };
 
+// For the course of 5.x keep CCA functionality in ojet-cli
+// https://jira.oraclecorp.com/jira/browse/JET-21713
+utils.isTooling50x = () => {
+  const toolingPckgPath = path.join(process.cwd(), 'node_modules/@oracle/oraclejet-tooling/package.json');
+  if (fs.existsSync(toolingPckgPath)) {
+    const toolingPckg = utils.readJsonAndReturnObject(toolingPckgPath);
+    return toolingPckg.version.substring(0, 3) === '5.0';
+  }
+  return false;
+};
+
 utils.loadTooling = () => {
   const toolingPath = path.join(process.cwd(), 'node_modules/@oracle/oraclejet-tooling');
   // Oracle command libs