forceios 13.0.2 → 13.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "forceios",
-    "version": "13.0.2",
+    "version": "13.1.0",
     "description": "Utilities for creating mobile apps based on the Salesforce Mobile SDK for iOS",
     "keywords": [ "mobilesdk", "ios", "salesforce", "mobile", "sdk" ],
     "homepage": "https://github.com/forcedotcom/SalesforceMobileSDK-iOS",

package/shared/configHelper.js

@@ -32,33 +32,37 @@ var path = require('path'),
     COLOR = require('./outputColors'),
     commandLineUtils = require('./commandLineUtils'),
     logInfo = require('./utils').logInfo,
+    separateRepoUrlPathBranch = require('./utils').separateRepoUrlPathBranch,
     getTemplates = require('./templateHelper').getTemplates,
+    getTemplate = require('./templateHelper').getTemplate,
+    displayTemplateList = require('./templateHelper').displayTemplateList,
+    displayTemplateDetail = require('./templateHelper').displayTemplateDetail,
     validateJson = require('./jsonChecker').validateJson;
 
 function applyCli(f, cli) {
-    return typeof f === 'function' ? f(cli): f;
+    return typeof f === 'function' ? f(cli) : f;
 }
 
 function getArgsExpanded(cli, commandName) {
     var argNames = applyCli(SDK.commands[commandName].args, cli);
     return argNames
         .map(argName => SDK.args[argName])
-        .map(arg =>
-             ({
-                 name: arg.name,
-                 'char': arg.char,
-                 description: applyCli(arg.description, cli),
-                 longDescription: applyCli(arg.longDescription, cli),
-                 prompt: applyCli(arg.prompt, cli),
-                 error: applyCli(arg.error, cli),
-                 validate: applyCli(arg.validate, cli),
-                 promptIf: arg.promptIf,
-                 required: arg.required === undefined ? true : arg.required,
-                 hasValue: arg.hasValue === undefined ? true : arg.hasValue,
-                 hidden: applyCli(arg.hidden, cli),
-                 type: arg.type
-             })
-            );
+        .map(arg => 
+            ({
+                name: arg.name,
+                'char': arg.char,
+                description: applyCli(arg.description, cli),
+                longDescription: applyCli(arg.longDescription, cli),
+                prompt: applyCli(arg.prompt, cli),
+                error: applyCli(arg.error, cli),
+                validate: applyCli(arg.validate, cli),
+                promptIf: arg.promptIf,
+                required: arg.required === undefined ? true : arg.required,
+                hasValue: arg.hasValue === undefined ? true : arg.hasValue,
+                hidden: applyCli(arg.hidden, cli),
+                type: arg.type
+            })
+        );
 
 }
 
@@ -81,28 +85,32 @@ function readConfig(args, cli, handler) {
     var processorList = null;
 
     switch (commandName || '') {
-    case SDK.commands.version.name:
-        printVersion(cli);
-        process.exit(0);
-        break;
-    case SDK.commands.create.name:
-    case SDK.commands.createwithtemplate.name:
-        processorList = buildArgsProcessorList(cli, commandName);
-        commandLineUtils.processArgsInteractive(commandLineArgs, processorList, handler);
-        break;
-    case SDK.commands.checkconfig.name:
-        processorList = buildArgsProcessorList(cli, commandName);
-        commandLineUtils.processArgsInteractive(commandLineArgs, processorList, function (config) {
-            validateJson(config.configpath, config.configtype);
-        });
-        break;
-    case SDK.commands.listtemplates.name:
-        listTemplates(cli);
-        process.exit(0);
-        break;
-    default:
-        usage(cli);
-        process.exit(1);
+        case SDK.commands.version.name:
+            printVersion(cli);
+            process.exit(0);
+            break;
+        case SDK.commands.create.name:
+        case SDK.commands.createwithtemplate.name:
+            processorList = buildArgsProcessorList(cli, commandName);
+            commandLineUtils.processArgsInteractive(commandLineArgs, processorList, handler);
+            break;
+        case SDK.commands.checkconfig.name:
+            processorList = buildArgsProcessorList(cli, commandName);
+            commandLineUtils.processArgsInteractive(commandLineArgs, processorList, function (config) {
+                validateJson(config.configpath, config.configtype);
+            });
+            break;
+        case SDK.commands.listtemplates.name:
+            listTemplates(cli, commandLineArgs);
+            process.exit(0);
+            break;
+        case SDK.commands.describetemplate.name:
+            describeTemplate(cli, commandLineArgs);
+            process.exit(0);
+            break;
+        default:
+            usage(cli);
+            process.exit(1);
     };
 
 
@@ -115,20 +123,76 @@ function printVersion(cli) {
 function printArgs(cli, commandName) {
     getArgsExpanded(cli, commandName)
         .filter(arg => !arg.hidden)
-        .forEach(arg => logInfo('    ' + (!arg.required  ? '[' : '') + '--' + arg.name + '=' + arg.description + (!arg.required ? ']' : ''), COLOR.magenta));
+        .forEach(arg => logInfo('    ' + (!arg.required ? '[' : '') + '--' + arg.name + '=' + arg.description + (!arg.required ? ']' : ''), COLOR.magenta));
+}
+
+function listTemplates(cli, commandLineArgs) {
+    var cliName = cli.name;
+
+    // Parse command line arguments to extract templatesource or templaterepouri
+    var templateSource = null;
+    var templateRepoUri = null;
+    var includeDescriptions = false;
+    var outputJson = false;
+    if (commandLineArgs && commandLineArgs.length > 0) {
+        try {
+            var argsMap = commandLineUtils.parseArgs(commandLineArgs);
+            templateSource = argsMap[SDK.args.templateSource.name];
+            templateRepoUri = argsMap[SDK.args.templateRepoUri.name];
+            includeDescriptions = argsMap.hasOwnProperty(SDK.args.doc.name);
+            outputJson = argsMap.hasOwnProperty(SDK.args.json.name);
+        } catch (error) {
+            // If argument parsing fails, continue without templateRepoUri
+        }
+    }
+
+    var source = templateSource || templateRepoUri;
+    var applicableTemplates = getTemplates(cli, source, includeDescriptions);
+
+    // Use shared display function
+    var commandPrefix = cliName + ' ' + SDK.commands.createwithtemplate.name;
+    displayTemplateList(applicableTemplates, source, cliName, commandPrefix, includeDescriptions, null, outputJson);
 }
 
-function listTemplates(cli) {
+function describeTemplate(cli, commandLineArgs) {
     var cliName = cli.name;
-    var applicableTemplates = getTemplates(cli);
 
-    logInfo('\nAvailable templates:\n', COLOR.cyan);
-    for (var i=0; i<applicableTemplates.length; i++) {
-        var template = applicableTemplates[i];
-        logInfo((i+1) + ') ' + template.description, COLOR.cyan);
-        logInfo(cliName + ' ' + SDK.commands.createwithtemplate.name + ' --' + SDK.args.templateRepoUri.name + '=' + template.path, COLOR.magenta);
+    // Parse command line arguments to extract templatesource, template, and doc
+    var templateSource = null;
+    var templateRepoUri = null;
+    var templateName = null;
+    var includeDescriptions = false;
+    var outputJson = false;
+    if (commandLineArgs && commandLineArgs.length > 0) {
+        try {
+            var argsMap = commandLineUtils.parseArgs(commandLineArgs);
+            templateSource = argsMap[SDK.args.templateSource.name];
+            templateRepoUri = argsMap[SDK.args.templateRepoUri.name];
+            templateName = argsMap[SDK.args.template.name];
+            includeDescriptions = argsMap.hasOwnProperty(SDK.args.doc.name);
+            outputJson = argsMap.hasOwnProperty(SDK.args.json.name);
+        } catch (error) {
+            // If argument parsing fails, continue without templateRepoUri
+        }
     }
-    logInfo('');
+
+    // Check if template name is provided
+    if (!templateName) {
+        logInfo('Error: Template name is required. Use --template to specify the template name.', COLOR.red);
+        process.exit(1);
+    }
+
+    var source = templateSource || templateRepoUri;
+    var template = getTemplate(templateName, source, includeDescriptions);
+
+    if (!template) {
+        logInfo('Error: Template "' + templateName + '" not found.', COLOR.red);
+        process.exit(1);
+    }
+
+    // Use shared display function
+    var commandPrefix = cliName + ' ' + SDK.commands.createwithtemplate.name;
+    displayTemplateDetail(template, source, cliName, commandPrefix, includeDescriptions, null, outputJson);
 }
 
 function usage(cli) {
@@ -184,7 +248,7 @@ function buildArgsProcessorList(cli, commandName) {
 // * preprocessor: function or null
 //
 function addProcessorFor(argProcessorList, argName, prompt, error, validation, preprocessor) {
-    argProcessorList.addArgProcessor(argName, prompt, function(val) {
+    argProcessorList.addArgProcessor(argName, prompt, function (val) {
         val = val.trim();
 
         // validation is either a function or null

package/shared/constants.js

@@ -28,7 +28,7 @@
 var path = require('path'),
     shelljs = require('shelljs');
 
-var VERSION= '13.0.2';
+var VERSION= '13.1.0';
 
 module.exports = {
     version: VERSION,
@@ -65,7 +65,7 @@ module.exports = {
              pluginRepoUri: 'salesforce-mobilesdk-cordova-plugin@v' + VERSION, // GA
             platformVersion: {
                 ios: '7.1.1',
-                android: '13.0.0'
+                android: '14.0.1'
             }
         },
         sf: {
@@ -95,7 +95,7 @@ module.exports = {
                 'native': 'iOSNativeTemplate',
                 'native_swift': 'iOSNativeSwiftTemplate'
             },
-            commands: ['create', 'createwithtemplate', 'version', 'listtemplates', 'checkconfig']
+            commands: ['create', 'createwithtemplate', 'version', 'listtemplates', 'describetemplate', 'checkconfig']
         },
         forcedroid: {
             name: 'forcedroid',
@@ -109,7 +109,7 @@ module.exports = {
                 'native': 'AndroidNativeTemplate',
                 'native_kotlin': 'AndroidNativeKotlinTemplate'
             },
-            commands: ['create', 'createwithtemplate', 'version', 'listtemplates', 'checkconfig']
+            commands: ['create', 'createwithtemplate', 'version', 'listtemplates', 'describetemplate', 'checkconfig']
         },
         forcehybrid: {
             name: 'forcehybrid',
@@ -123,7 +123,7 @@ module.exports = {
                 'hybrid_local': 'HybridLocalTemplate',
                 'hybrid_remote': 'HybridRemoteTemplate'
             },
-            commands: ['create', 'createwithtemplate', 'version', 'listtemplates', 'checkconfig']
+            commands: ['create', 'createwithtemplate', 'version', 'listtemplates', 'describetemplate', 'checkconfig']
         },
         forcereact: {
             name: 'forcereact',
@@ -137,7 +137,7 @@ module.exports = {
                 'react_native': 'ReactNativeTemplate',
                 'react_native_typescript': 'ReactNativeTypeScriptTemplate'
             },
-            commands: ['create', 'createwithtemplate', 'version', 'listtemplates', 'checkconfig']
+            commands: ['create', 'createwithtemplate', 'version', 'listtemplates', 'describetemplate', 'checkconfig']
         }
     },
 
@@ -171,6 +171,34 @@ module.exports = {
             prompt: 'Enter URI of repo containing template application or a Mobile SDK template name:',
             error: cli => val => 'Invalid value for template repo uri: \'' + val + '\'.',
             validate: cli => val => /^\S+$/.test(val),
+            promptIf: otherArgs => !otherArgs.templatesource,
+            required: false,
+            type: 'string'
+        },
+        templateSource: {
+            name: 'templatesource',
+            'char': 'S',
+            description: 'git repo URL (optionally with #branch) or local path to a templates suite (root must contain templates.json)',
+            longDescription: 'Location of a suite of templates. Can be a git URL with optional #branch suffix or a local filesystem path whose root contains templates.json.',
+            prompt: 'Enter git URL or local path to your templates suite:',
+            error: cli => val => 'Invalid value for template source: \'' + val + '\'.',
+            validate: cli => val => /\S+/.test(val),
+            // Process only when explicitly provided to avoid prompting during interactive flows
+            promptIf: otherArgs => typeof otherArgs.templatesource !== 'undefined',
+            required: false,
+            type: 'string'
+        },
+        template: {
+            name: 'template',
+            'char': 'm',
+            description: 'template name within the templates suite (e.g. ReactNativeTemplate)',
+            longDescription: 'Name of the template to use from the suite specified by --templatesource. Should match the directory name or the path field in templates.json.',
+            prompt: 'Enter the template name from your template source:',
+            error: cli => val => 'Invalid value for template: \'' + val + '\'.',
+            validate: cli => val => /\S+/.test(val),
+            // Only prompt for template when a templatesource is provided
+            promptIf: otherArgs => !!otherArgs.templatesource,
+            required: false,
             type: 'string'
         },
         appName: {
@@ -277,7 +305,31 @@ module.exports = {
             required: false,
             type: 'string',
             hidden: true
-	},
+	        },
+        doc: {
+            name: 'doc',
+            'char': 'D',
+            description: 'include verbose documentation from template.json files',
+            longDescription: 'When specified, includes detailed metadata from each template\'s template.json file if available (displayName, description, useCase, features, complexity).',
+            prompt: null,
+            error: cli => val => 'Invalid value for doc flag: \'' + val + '\'.',
+            validate: cli => val => true, // Boolean flag, no validation needed
+            required: false,
+            type: 'boolean',
+            hidden: false
+        },
+        json: {
+            name: 'json',
+            'char': 'j',
+            description: 'output response in JSON format',
+            longDescription: 'When specified, outputs the response in JSON format instead of human-readable text. Useful for programmatic consumption.',
+            prompt: null,
+            error: cli => val => 'Invalid value for json flag: \'' + val + '\'.',
+            validate: cli => val => true, // Boolean flag, no validation needed
+            required: false,
+            type: 'boolean',
+            hidden: false
+        }
     },
 
     commands: {
@@ -301,7 +353,9 @@ module.exports = {
         createwithtemplate: {
             name: 'createwithtemplate',
             args: cli => [cli.platforms.length > 1 ? 'platform' : null,
+                          'templateSource',
                           'templateRepoUri',
+                          'template',
                           'appName',
                           'packageName',
                           'organization',
@@ -309,7 +363,7 @@ module.exports = {
                           'outputDir',
                           'verbose',
                           cli.name === 'forcehybrid' ? 'pluginRepoUri' : null,
-			  'sdkDependencies'			  
+                          'sdkDependencies'              
                          ].filter(x=>x!=null),
             description: cli => 'create ' + cli.purpose + ' from a template',
             longDescription: cli => 'Create ' + cli.purpose + ' from a template.',
@@ -324,10 +378,17 @@ module.exports = {
         },
         listtemplates: {
             name: 'listtemplates',
-            args: [],
+            args: ['templateSource', 'doc', 'json'],
             description: cli => 'list available Mobile SDK templates to create ' + cli.purpose,
             longDescription: cli => 'List available Mobile SDK templates to create ' + cli.purpose + '.',
-            help: 'This command displays the list of available Mobile SDK templates. You can copy repo paths from the output for use with the createwithtemplate command.'
+            help: 'This command displays the list of available Mobile SDK templates. You can copy repo paths from the output for use with the createwithtemplate command. Use --templatesource to specify a custom template repository or leave blank to use the default template repository. Use --doc to include detailed metadata from template.json files (displayName, description, useCase, features, complexity). Use --json to output the response in JSON format.'
+        },
+        describetemplate: {
+            name: 'describetemplate',
+            args: ['templateSource', 'template', 'doc', 'json'],
+            description: cli => 'list details for a specific Mobile SDK template to create ' + cli.purpose,
+            longDescription: cli => 'List details for a specific Mobile SDK template to create ' + cli.purpose + '.',
+            help: 'This command displays detailed information about a specific Mobile SDK template. Use --templatesource to specify a custom template repository or leave blank to use the default template repository. Use --template to specify the template name. Use --doc to include verbose metadata from template.json files. Use --json to output the response in JSON format.'
         },
         checkconfig: {
             name: 'checkconfig',

package/shared/createHelper.js

@@ -109,10 +109,38 @@ function createHybridApp(config) {
     // Run cordova prepare
     utils.runProcessThrowError('cordova prepare', config.projectDir);
 
+    // Add theme for Android API 35
+    if (config.platform.split(',').includes('android')) {
+        createAndroidAPI35Theme(config.projectDir);
+    }
+
     // Done
     return prepareResult;
 }
 
+//
+// Add Android API 35 theme file
+// 
+function createAndroidAPI35Theme(projectDir) {
+    const dirPath = path.join(projectDir, 'platforms', 'android', 'app', 'src', 'main', 'res', 'values-v35');
+    const filePath = path.join(dirPath, 'themes.xml');
+    const fileContents = `<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <!-- Override for API 35+ to fix white status bar with white icons issue -->
+    <style name="SalesforceSDK_SplashScreen" parent="Theme.SplashScreen.IconBackground">
+        <item name="postSplashScreenTheme">@style/Theme.AppCompat.NoActionBar</item>
+        <!-- Use dark icons on light status bar background -->
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>` 
+
+    // Ensure the directory exists
+    utils.mkDirIfNeeded(dirPath);
+
+    // Write the file
+    fs.writeFileSync(filePath, fileContents, 'utf8');
+}
+
 //
 // Print details
 //
@@ -324,13 +352,41 @@ function actuallyCreateApp(forcecli, config) {
         config.version = SDK.version;
         
         // Figuring out template repo uri and path
-        if (config.templaterepouri) {
-            if (!config.templaterepouri.startsWith("https://")) {
+        let localTemplatesRoot;
+        if (config.templatesource) {
+            const source = config.templatesource;
+            if (fs.existsSync(source)) {
+                // Local path to templates suite
+                localTemplatesRoot = path.resolve(source);
+                if (!config.template) {
+                    throw new Error('Missing --template when using --templatesource pointing to a local path');
+                }
+                config.templatepath = config.template;
+                // For display purposes
+                config.templaterepouri = source;
+            } else {
+                // Git URL with optional #branch
+                const parsed = utils.separateRepoUrlPathBranch(source);
+                config.templaterepouri = parsed.repo + '#' + parsed.branch;
+                config.templatepath = config.template || parsed.path;
+                if (!config.templatepath) {
+                    throw new Error('Missing template name. Use --template to specify a template within your --templatesource repository.');
+                }
+            }
+        }
+        else if (config.templaterepouri) {
+            if (fs.existsSync(config.templaterepouri)) {
+                // Local path directly to a specific template directory
+                localTemplatesRoot = path.resolve(config.templaterepouri);
+                config.templaterepouri = localTemplatesRoot;
+                // Use the directory itself as the template root
+                config.templatepath = '';
+            } else if (!config.templaterepouri.startsWith("https://")) {
                 // Given a Mobile SDK template name
                 config.templatepath = config.templaterepouri;
                 config.templaterepouri = SDK.templatesRepoUri;
             } else {
-                // Given a full URI
+                // Given a full URI to a specific template path
                 var templateUriParsed = utils.separateRepoUrlPathBranch(config.templaterepouri);
                 config.templaterepouri = templateUriParsed.repo + '#' + templateUriParsed.branch;
                 config.templatepath = templateUriParsed.path;
@@ -344,8 +400,13 @@ function actuallyCreateApp(forcecli, config) {
         // Creating tmp dir for template clone
         var tmpDir = utils.mkTmpDir();
 
-        // Cloning template repo
-        var repoDir = utils.cloneRepo(tmpDir, config.templaterepouri);
+        // Resolve template source directory (clone if needed)
+        var repoDir;
+        if (localTemplatesRoot) {
+            repoDir = localTemplatesRoot;
+        } else {
+            repoDir = utils.cloneRepo(tmpDir, config.templaterepouri);
+        }
         config.templateLocalPath = path.join(repoDir, config.templatepath);
 
         // Override sdk dependencies in package.json if any were provided

package/shared/oclifAdapter.js

@@ -30,9 +30,11 @@ const SDK = require('./constants');
 const configHelper = require('./configHelper');
 const createHelper = require('./createHelper');
 const templateHelper = require('./templateHelper');
+const { getTemplates, getTemplate, displayTemplateList, displayTemplateDetail } = require('./templateHelper');
 const jsonChecker = require('./jsonChecker');
 const logInfo = require('./utils').logInfo;
 const logError = require('./utils').logError;
+const separateRepoUrlPathBranch = require('./utils').separateRepoUrlPathBranch;
 const os = require('os');
 
 const { SfdxError } = require('@salesforce/core');
@@ -46,21 +48,36 @@ class OclifAdapter extends Command {
         return `${description}${os.EOL}${os.EOL}${help}`;
     }
 
-    static listTemplates(cli) {
-        const applicableTemplates = templateHelper.getTemplates(cli);
+    static listTemplates(cli, templateSourceOrRepoUri, includeDescriptions, outputJson) {
+        const applicableTemplates = getTemplates(cli, templateSourceOrRepoUri, includeDescriptions);
 
-        logInfo('\nAvailable templates:\n', COLOR.cyan);
-        for (let i=0; i<applicableTemplates.length; i++) {
-            const template = applicableTemplates[i];
-            logInfo((i+1) + ') ' + template.description, COLOR.cyan);
-            logInfo('sfdx ' +  [namespace, cli.topic, SDK.commands.createwithtemplate.name].join(':') + ' --' +
-                SDK.args.templateRepoUri.name + '=' + template.path, COLOR.magenta);
+        // Use shared display function
+        const commandPrefix = 'sf ' + [namespace, cli.topic, SDK.commands.createwithtemplate.name].join(':');
+        const usageExample = '--' + SDK.args.appName.name + '=<YOUR_APP_NAME> --' + SDK.args.packageName.name + '=<YOUR_PACKAGE_NAME> --' + SDK.args.organization.name + '=<YOUR_ORGANIZATION_NAME>';
+        displayTemplateList(applicableTemplates, templateSourceOrRepoUri, cli.name, commandPrefix, includeDescriptions, usageExample, outputJson);
+    }
+
+    static describeTemplate(cli, templateSourceOrRepoUri, templateName, includeDescriptions, outputJson) {
+        if (!templateName) {
+            logError('Error: Template name is required. Use --template to specify the template name.');
+            process.exit(1);
+        }
+
+        const template = getTemplate(templateName, templateSourceOrRepoUri, includeDescriptions);
+
+        if (!template) {
+            logError('Error: Template "' + templateName + '" not found.');
+            process.exit(1);
         }
-        logInfo('');
+
+        // Use shared display function
+        const commandPrefix = 'sf ' + [namespace, cli.topic, SDK.commands.createwithtemplate.name].join(':');
+        const usageExample = '--' + SDK.args.appName.name + '=<YOUR_APP_NAME> --' + SDK.args.packageName.name + '=<YOUR_PACKAGE_NAME> --' + SDK.args.organization.name + '=<YOUR_ORGANIZATION_NAME>';
+        displayTemplateDetail(template, templateSourceOrRepoUri, cli.name, commandPrefix, includeDescriptions, usageExample, outputJson);
     }
 
     static runCommand(cli, commandName, vals) {
-        switch(commandName) {
+        switch (commandName) {
             case SDK.commands.create.name:
             case SDK.commands.createwithtemplate.name:
                 createHelper.createApp(cli, vals);
@@ -69,7 +86,11 @@ class OclifAdapter extends Command {
                 configHelper.printVersion(cli);
                 break;
             case SDK.commands.listtemplates.name:
-                OclifAdapter.listTemplates(cli);
+                OclifAdapter.listTemplates(cli, vals.templatesource, vals.doc, vals.json);
+                process.exit(0);
+                break;
+            case SDK.commands.describetemplate.name:
+                OclifAdapter.describeTemplate(cli, vals.templatesource, vals.template, vals.doc, vals.json);
                 process.exit(0);
                 break;
             case SDK.commands.checkconfig.name:
@@ -189,7 +210,7 @@ class OclifAdapter extends Command {
     }
 }
 
-OclifAdapter.getCommand = function(cli, commandName) {
+OclifAdapter.getCommand = function (cli, commandName) {
     if (!this._command) {
         this._command = configHelper.getCommandExpanded(cli, commandName);
     }

package/shared/templateHelper.js

@@ -28,7 +28,8 @@
 // Dependencies
 var path = require('path'),
     SDK = require('./constants'),
-    utils = require('./utils');
+    utils = require('./utils'),
+    fs = require('fs');
 
 //
 // Helper to prepare template
@@ -36,7 +37,7 @@ var path = require('path'),
 function prepareTemplate(config, templateDir) {
     var template = require(path.join(templateDir, 'template.js'));
     return utils.runFunctionThrowError(
-        function() {
+        function () {
             return template.prepare(config, utils.replaceInFiles, utils.moveFile, utils.removeFile);
         },
         templateDir);
@@ -45,14 +46,22 @@ function prepareTemplate(config, templateDir) {
 //
 // Get templates for the given cli
 //
-function getTemplates(cli) {
+function getTemplates(cli, templateSourceOrRepoUri, includeDescriptions) {
     try {
 
         // Creating tmp dir for template clone
         var tmpDir = utils.mkTmpDir();
 
-        // Cloning template repo
-        var repoDir = utils.cloneRepo(tmpDir, SDK.templatesRepoUri);
+        // Use provided source (git URL or local path) or fall back to default
+        var source = templateSourceOrRepoUri || SDK.templatesRepoUri;
+        var repoDir;
+        if (fs.existsSync(source)) {
+            // Local path
+            repoDir = path.resolve(source);
+        } else {
+            // Git URL
+            repoDir = utils.cloneRepo(tmpDir, source);
+        }
 
         // Getting list of templates
         var templates = require(path.join(repoDir, 'templates.json'));
@@ -61,6 +70,13 @@ function getTemplates(cli) {
         var applicableTemplates = templates
             .filter(template => cli.appTypes.includes(template.appType) && cli.platforms.filter(platform => template.platforms.includes(platform)).length > 0);
 
+        // If descriptions are requested, add them to each template
+        if (includeDescriptions) {
+            applicableTemplates.forEach(function(template) {
+                template.metadata = getTemplateMetadata(template.path, repoDir);
+            });
+        }
+
         // Cleanup
         utils.removeFile(tmpDir);
 
@@ -96,9 +112,236 @@ function getAppTypeFromTemplate(templateRepoUriWithPossiblePath) {
     return appType;
 }
 
+//
+// Extract template metadata from template.json file
+//
+function getTemplateMetadata(templatePath, repoDir) {
+    try {
+        var templateJsonPath = path.join(repoDir, templatePath, 'template.json');
+        if (fs.existsSync(templateJsonPath)) {
+            var templateJsonContent = fs.readFileSync(templateJsonPath, 'utf8');
+            var templateData = JSON.parse(templateJsonContent);
+            
+            // Return all metadata properties from the template.json file
+            // This makes the function more flexible for future use cases
+            return templateData;
+        }
+    } catch (error) {
+        // If there's any error reading or parsing the template.json, just return null
+        // This ensures the command continues to work even if template.json parsing fails
+    }
+    return null;
+}
+
+//
+// Get a single template by name
+//
+function getTemplate(templateName, templateSourceOrRepoUri, includeDescriptions) {
+    try {
+        // Creating tmp dir for template clone
+        var tmpDir = utils.mkTmpDir();
+
+        // Use provided source (git URL or local path) or fall back to default
+        var source = templateSourceOrRepoUri || SDK.templatesRepoUri;
+        var repoDir;
+        if (fs.existsSync(source)) {
+            // Local path
+            repoDir = path.resolve(source);
+        } else {
+            // Git URL
+            repoDir = utils.cloneRepo(tmpDir, source);
+        }
+
+        // Getting list of templates
+        var templates = require(path.join(repoDir, 'templates.json'));
+
+        // Finding the specific template
+        var template = templates.find(t => t.path === templateName);
+        
+        if (!template) {
+            utils.removeFile(tmpDir);
+            return null;
+        }
+        
+        // If descriptions are requested, add metadata
+        if (includeDescriptions) {
+            template.metadata = getTemplateMetadata(template.path, repoDir);
+        }
+        
+        // Cleanup
+        utils.removeFile(tmpDir);
+        
+        return template;
+    } catch (error) {
+        return null;
+    }
+}
+
+//
+// Display template list with optional metadata
+//
+function displayTemplateList(templates, source, cliName, commandPrefix, includeDescriptions, extraRequiredArgs, outputJson) {
+    var utils = require('./utils');
+    var COLOR = require('./outputColors');
+    var logInfo = utils.logInfo;
+    var SDK = require('./constants');
+
+    if (outputJson) {
+        // Output in JSON format
+        var jsonOutput = {
+            repository: source || 'default',
+            templates: templates.map(function(template, index) {
+                var sourceForCommand = source || SDK.templatesRepoUri;
+                var command = commandPrefix + ' --' + SDK.args.templateSource.name + '=' + sourceForCommand
+                    + ' --' + SDK.args.template.name + '=' + template.path;
+                
+                if (extraRequiredArgs) {
+                    command += ` ${extraRequiredArgs}`;
+                }
+
+                var jsonTemplate = {
+                    index: index + 1,
+                    path: template.path,
+                    description: template.description,
+                    appType: template.appType,
+                    platforms: template.platforms,
+                    command: command
+                };
+
+                if (includeDescriptions && template.metadata) {
+                    jsonTemplate.metadata = template.metadata;
+                }
+
+                return jsonTemplate;
+            })
+        };
+        
+        logInfo(JSON.stringify(jsonOutput, null, 2), COLOR.white);
+        return;
+    }
+
+    // Show which template repository is being used
+    if (source) {
+        logInfo('\nAvailable templates from custom repository:\n', COLOR.cyan);
+        logInfo('Repository: ' + source, COLOR.cyan);
+    } else {
+        logInfo('\nAvailable templates:\n', COLOR.cyan);
+    }
+
+    for (var i = 0; i < templates.length; i++) {
+        var template = templates[i];
+        logInfo((i + 1) + ') ' + template.description, COLOR.cyan);
+
+        var sourceForCommand = source || SDK.templatesRepoUri;
+        var command = commandPrefix + ' --' + SDK.args.templateSource.name + '=' + sourceForCommand
+            + ' --' + SDK.args.template.name + '=' + template.path;
+        
+        // Add additional required args if provided
+        if (extraRequiredArgs) {
+            command += ` ${extraRequiredArgs}`;
+        }
+        
+        logInfo(command, COLOR.magenta);
+        
+        // If descriptions are requested and available, show them
+        if (includeDescriptions && template.metadata) {
+            if (template.metadata.description) {
+                logInfo('   Description: ' + template.metadata.description, COLOR.white);
+            }
+            if (template.metadata.useCase) {
+                logInfo('   Use Case: ' + template.metadata.useCase, COLOR.white);
+            }
+            if (template.metadata.features && Array.isArray(template.metadata.features)) {
+                logInfo('   Features: ' + template.metadata.features.join(', '), COLOR.white);
+            }
+            if (template.metadata.complexity) {
+                logInfo('   Complexity: ' + template.metadata.complexity, COLOR.white);
+            }
+        }
+    }
+    logInfo('');
+}
+
+//
+// Display detailed information about a single template
+//
+function displayTemplateDetail(template, source, cliName, commandPrefix, includeDescriptions, extraRequiredArgs, outputJson) {
+    var utils = require('./utils');
+    var COLOR = require('./outputColors');
+    var logInfo = utils.logInfo;
+    var SDK = require('./constants');
+
+    if (outputJson) {
+        // Output in JSON format
+        var sourceForCommand = source || SDK.templatesRepoUri;
+        var command = commandPrefix + ' --' + SDK.args.templateSource.name + '=' + sourceForCommand
+            + ' --' + SDK.args.template.name + '=' + template.path;
+        
+        if (extraRequiredArgs) {
+            command += ` ${extraRequiredArgs}`;
+        }
+
+        var jsonOutput = {
+            repository: source || 'default',
+            template: {
+                path: template.path,
+                description: template.description,
+                appType: template.appType,
+                platforms: template.platforms,
+                command: command
+            }
+        };
+
+        if (includeDescriptions && template.metadata) {
+            jsonOutput.template.metadata = template.metadata;
+        }
+        
+        logInfo(JSON.stringify(jsonOutput, null, 2), COLOR.white);
+        return;
+    }
+
+    // Show which template repository is being used
+    if (source) {
+        logInfo('\nTemplate from custom repository:\n', COLOR.cyan);
+        logInfo('Repository: ' + source, COLOR.cyan);
+    } else {
+        logInfo('\nTemplate from default repository:\n', COLOR.cyan);
+    }
+
+    // Display template basic info
+    logInfo('Template: ' + template.path, COLOR.cyan);
+    logInfo('Description: ' + template.description, COLOR.cyan);
+    logInfo('App Type: ' + template.appType, COLOR.cyan);
+    logInfo('Platforms: ' + template.platforms.join(', '), COLOR.cyan);
+
+    // Display command usage
+    var sourceForCommand = source || SDK.templatesRepoUri;
+    var command = commandPrefix + ' --' + SDK.args.templateSource.name + '=' + sourceForCommand
+        + ' --' + SDK.args.template.name + '=' + template.path;
+    
+    // Add additional required args if provided
+    if (extraRequiredArgs) {
+        command += ` ${extraRequiredArgs}`;
+    }
+    
+    logInfo('\nUsage:', COLOR.magenta);
+    logInfo(command, COLOR.magenta);
+    
+    // If descriptions are requested and available, show raw JSON metadata
+    if (includeDescriptions && template.metadata) {
+        logInfo('\nTemplate Metadata (template.json):', COLOR.cyan);
+        logInfo(JSON.stringify(template.metadata, null, 2), COLOR.white);
+    }
+    
+    logInfo('');
+}
 
 module.exports = {
     prepareTemplate,
     getTemplates,
-    getAppTypeFromTemplate
+    getTemplate,
+    getAppTypeFromTemplate,
+    getTemplateMetadata,
+    displayTemplateList,
+    displayTemplateDetail
 };