npm package diff
Package: @forge/cli
Versions: 11.2.1-next.2-experimental-611b366 - 11.3.0-next.4-experimental-011b3b2
Modified: package/out/command-line/dependency-injection.js
Index: package/out/command-line/dependency-injection.js
===================================================================
--- package/out/command-line/dependency-injection.js
+++ package/out/command-line/dependency-injection.js
@@ -118,9 +118,9 @@
const registerConfigReader = (0, cli_shared_1.configFileReaderForSection)(cli_shared_1.appConfigKey, cli_shared_1.NO_VALIDATION, configFile);
const registerAppCommand = new cli_shared_1.RegisterAppCommand(createAppGraphQLClient, registerConfigReader, appConfigWriter, ui, configFile);
const templater = new cli_shared_1.ComposableTemplater(downloader, extractor, lister, ui);
const npmInstaller = new cli_shared_1.NpmInstaller(ui);
- const createAppCommand = new cli_shared_1.CreateAppCommand(templater, registerAppCommand, npmInstaller);
+ const createAppCommand = new cli_shared_1.CreateAppCommand(templater, registerAppCommand, npmInstaller, statsigService);
const getAppOwnerQuery = new cli_shared_1.GetAppOwnerQuery(graphQLClient, assertiveAppConfigReader);
const environmentVariablesClient = new graphql_client_1.GraphqlClient(graphQLClient);
const setEnvironmentVariableCommand = new set_environment_variable_1.SetEnvironmentVariableCommand(environmentVariablesClient, assertiveAppConfigReader);
const deleteEnvironmentVariableCommand = new delete_environment_variable_1.DeleteEnvironmentVariableCommand(environmentVariablesClient, assertiveAppConfigReader);Modified: package/out/command-line/register-app-commands.js
Index: package/out/command-line/register-app-commands.js
===================================================================
--- package/out/command-line/register-app-commands.js
+++ package/out/command-line/register-app-commands.js
@@ -1,7 +1,7 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerCommands = exports.createCommandHandler = exports.directoryNameFromAppName = exports.templateMatchesProduct = exports.formatProduct = void 0;
+exports.registerCommands = exports.createCommandHandler = exports.directoryNameFromAppName = exports.templateMatchesProduct = exports.formatProduct = exports.CATEGORY_PREDICATES = exports.PRODUCT_OPTIONS_DISPLAY = exports.TemplateContext = exports.TemplateCategory = void 0;
const tslib_1 = require("tslib");
const fs_1 = tslib_1.__importDefault(require("fs"));
const sanitize_filename_1 = tslib_1.__importDefault(require("sanitize-filename"));
const cli_shared_1 = require("@forge/cli-shared");
@@ -11,24 +11,57 @@
TemplateCategory["ROVO"] = "Rovo Agent and action";
TemplateCategory["UI_KIT_2"] = "UI Kit";
TemplateCategory["CUSTOM_UI"] = "Custom UI";
TemplateCategory["BACKEND"] = "Triggers and Validators";
-})(TemplateCategory || (TemplateCategory = {}));
-const PRODUCT_OPTIONS = [
- 'show-all',
- 'bitbucket',
- 'compass',
- 'confluence',
- 'jira',
- 'jira-service-management',
- 'teamwork-graph'
+})(TemplateCategory = exports.TemplateCategory || (exports.TemplateCategory = {}));
+var TemplateContext;
+(function (TemplateContext) {
+ TemplateContext["SHOW_ALL"] = "show-all";
+ TemplateContext["BITBUCKET"] = "bitbucket";
+ TemplateContext["COMPASS"] = "compass";
+ TemplateContext["CONFLUENCE"] = "confluence";
+ TemplateContext["JIRA"] = "jira";
+ TemplateContext["JIRA_SERVICE_MANAGEMENT"] = "jira-service-management";
+ TemplateContext["TEAMWORK_GRAPH"] = "teamwork-graph";
+ TemplateContext["ROVO"] = "rovo";
+ TemplateContext["CROSS_CONTEXT"] = "cross-context";
+})(TemplateContext = exports.TemplateContext || (exports.TemplateContext = {}));
+const PRODUCT_OPTIONS = {
+ [TemplateContext.SHOW_ALL]: [TemplateContext.SHOW_ALL],
+ [TemplateContext.BITBUCKET]: [TemplateContext.BITBUCKET],
+ [TemplateContext.COMPASS]: [TemplateContext.COMPASS],
+ [TemplateContext.CONFLUENCE]: [TemplateContext.CONFLUENCE],
+ [TemplateContext.JIRA]: [TemplateContext.JIRA],
+ [TemplateContext.JIRA_SERVICE_MANAGEMENT]: [TemplateContext.JIRA_SERVICE_MANAGEMENT],
+ [TemplateContext.TEAMWORK_GRAPH]: [TemplateContext.TEAMWORK_GRAPH],
+ [TemplateContext.ROVO]: [TemplateContext.ROVO],
+ [TemplateContext.CROSS_CONTEXT]: [
+ TemplateContext.COMPASS,
+ TemplateContext.CONFLUENCE,
+ TemplateContext.JIRA,
+ TemplateContext.JIRA_SERVICE_MANAGEMENT
+ ]
+};
+exports.PRODUCT_OPTIONS_DISPLAY = {
+ [TemplateContext.CROSS_CONTEXT]: 'Cross-context'
+};
+exports.CATEGORY_PREDICATES = [
+ [TemplateCategory.SHOW_ALL, (name) => !!name],
+ [TemplateCategory.ROVO, (name) => name.includes('rovo')],
+ [TemplateCategory.UI_KIT_2, (name) => name.includes('ui-kit')],
+ [TemplateCategory.CUSTOM_UI, (name) => name.includes('custom-ui')],
+ [
+ TemplateCategory.BACKEND,
+ (name) => !!name && !name.includes('ui-kit') && !name.includes('custom-ui') && !name.includes('rovo') && name !== 'blank'
+ ]
];
const MAX_NAME_LENGTH = 60;
function formatProduct(product) {
- return product
- .split('-')
- .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
- .join(' ');
+ return (exports.PRODUCT_OPTIONS_DISPLAY[product] ??
+ product
+ .split('-')
+ .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+ .join(' '));
}
exports.formatProduct = formatProduct;
function ensureDirectoryDoesntExist(directory) {
if (fs_1.default.existsSync(directory)) {
@@ -39,27 +72,30 @@
if (name.length <= 0 || name.length > MAX_NAME_LENGTH) {
throw new cli_shared_1.ValidationError(cli_shared_1.Text.create.error.name.tooLong(MAX_NAME_LENGTH));
}
}
-async function selectedTemplate(filteredTemplates, type, ui) {
- if (type === TemplateCategory.SHOW_ALL) {
- return await ui.promptForList(cli_shared_1.Text.create.promptTemplate, filteredTemplates);
+async function selectedTemplate(filteredTemplates, ui, categoryPredicates = exports.CATEGORY_PREDICATES) {
+ const categoryMap = filteredTemplates.reduce((map, template) => {
+ for (const [category, matchesCategory] of categoryPredicates) {
+ if (matchesCategory(template)) {
+ const templates = map.get(category) ?? [];
+ templates.push(template);
+ map.set(category, templates);
+ }
+ }
+ return map;
+ }, new Map());
+ if (categoryMap.size) {
+ const sortedCategories = categoryPredicates
+ .filter(([category]) => categoryMap.has(category))
+ .map(([category]) => category);
+ const category = await ui.promptForList(cli_shared_1.Text.create.promptCategory, sortedCategories);
+ const categoryFilteredTemplates = filterTemplatesByCategory(categoryMap.get(category) ?? filteredTemplates, category);
+ const template = await ui.promptForList(cli_shared_1.Text.create.promptTemplate, categoryFilteredTemplates);
+ return modifyTemplateByCategory(template, category);
}
else {
- const productList = PRODUCT_OPTIONS.filter((productName) => productName === 'show-all' ||
- filteredTemplates.some((template) => templateMatchesProduct(productName, template, PRODUCT_OPTIONS)));
- if (productList.length > 1) {
- const product = await ui.promptForList(cli_shared_1.Text.create.promptProduct, productList, {
- format: formatProduct
- });
- const productFilteredTemplates = product === 'show-all'
- ? filteredTemplates
- : filteredTemplates.filter((template) => templateMatchesProduct(product, template, PRODUCT_OPTIONS));
- return await ui.promptForList(cli_shared_1.Text.create.promptTemplate, productFilteredTemplates);
- }
- else {
- return await ui.promptForList(cli_shared_1.Text.create.promptTemplate, filteredTemplates);
- }
+ return await ui.promptForList(cli_shared_1.Text.create.promptTemplate, filteredTemplates);
}
}
function templateMatchesProduct(productName, templateName, products) {
return (templateName.includes(productName) &&
@@ -80,12 +116,18 @@
async function createCommandHandler(ui, createAppCommand, name, { template, directory }) {
directory = prepareDirectoryForApp(ui, name, template, directory);
ui.info(cli_shared_1.Text.ctrlC);
({ name, directory } = await promptAndValidateAppName(ui, name, directory, template));
- template = await promptAndSelectTemplate(ui, createAppCommand, template, directory);
+ const selection = await promptAndSelectTemplate(ui, createAppCommand, template, directory);
+ template = selection.template;
ui.emptyLine();
directory = directory;
- const args = { name, template, directory };
+ const args = {
+ name,
+ template,
+ directory,
+ ...(selection.requiredContext && { requiredProduct: selection.requiredContext })
+ };
const result = await ui.displayProgress(() => createAppCommand.execute(args), cli_shared_1.Text.create.cmd.start, cli_shared_1.Text.create.cmd.success(name));
ui.info(cli_shared_1.Text.create.cmd.successDetails(directory, result.environments));
return result;
}
@@ -123,38 +165,43 @@
if (!template) {
ui.info(cli_shared_1.Text.create.overviewTemplates);
const templates = await ui.displayTemporaryMessage(() => createAppCommand.getAvailableTemplates(), cli_shared_1.Text.create.waitTemplates);
const templatesWithoutCsuik = templates.filter((template) => !template.includes('csuik'));
- const type = await ui.promptForList(cli_shared_1.Text.create.promptCategory, Object.values(TemplateCategory));
- const filteredTemplates = filterTemplatesByCategory(templatesWithoutCsuik, type);
- template = await selectedTemplate(filteredTemplates, type, ui);
- template = modifyTemplateByCategory(template, type);
+ const productOptions = await createAppCommand.filterAvailableProducts(Object.values(TemplateContext), TemplateContext.TEAMWORK_GRAPH, TemplateContext.CROSS_CONTEXT);
+ const productName = await ui.promptForList(cli_shared_1.Text.create.promptProduct, productOptions, {
+ format: formatProduct
+ });
+ const filteredTemplates = (PRODUCT_OPTIONS[productName] ?? [productName])
+ .map((p) => filterTemplatesByProduct(templatesWithoutCsuik, p, productOptions))
+ .flat();
+ const uniqueTemplates = [...new Set(filteredTemplates.length ? filteredTemplates : templatesWithoutCsuik)];
+ template = await selectedTemplate(uniqueTemplates, ui);
if (!directory) {
directory = template;
ensureDirectoryDoesntExist(directory);
}
+ let requiredContext = undefined;
+ if (productName === TemplateContext.CROSS_CONTEXT) {
+ requiredContext = productOptions.find((context) => templateMatchesProduct(context, template, productOptions));
+ }
+ return {
+ template,
+ requiredContext: requiredContext === TemplateContext.JIRA_SERVICE_MANAGEMENT ? TemplateContext.JIRA : requiredContext
+ };
}
- return template;
+ return {
+ template
+ };
}
+function filterTemplatesByProduct(templates, product, productOptions) {
+ return product === 'show-all'
+ ? templates
+ : templates.filter((template) => templateMatchesProduct(product, template, productOptions));
+}
function filterTemplatesByCategory(templates, category) {
return category === TemplateCategory.SHOW_ALL
? templates
- : templates
- .filter((name) => {
- switch (category) {
- case TemplateCategory.BACKEND:
- return (!name.includes('ui-kit') && !name.includes('custom-ui') && !name.includes('rovo') && name !== 'blank');
- case TemplateCategory.CUSTOM_UI:
- return name.includes('custom-ui');
- case TemplateCategory.UI_KIT_2:
- return name.includes('ui-kit');
- case TemplateCategory.ROVO:
- return name.includes('rovo');
- default:
- return true;
- }
- })
- .map((name) => name.replace('-ui-kit', '').replace('-custom-ui', '').replace('-rovo', ''));
+ : templates.map((name) => name.replace('-ui-kit', '').replace('-custom-ui', '').replace('-rovo', ''));
}
function modifyTemplateByCategory(template, category) {
switch (category) {
case TemplateCategory.UI_KIT_2:Modified: package/npm-shrinkwrap.json
Large diffs are not rendered by default.
Modified: package/package.json
Index: package/package.json
===================================================================
--- package/package.json
+++ package/package.json
@@ -1,7 +1,7 @@
{
"name": "@forge/cli",
- "version": "11.2.1-next.2-experimental-611b366",
+ "version": "11.3.0-next.4-experimental-011b3b2",
"description": "A command line interface for managing Atlassian-hosted apps",
"author": "Atlassian",
"license": "SEE LICENSE IN LICENSE.txt",
"bin": {
@@ -17,15 +17,15 @@
"postbuild": "chmod +x out/bin/*.js && ts-node scripts/configureAutocomplete.ts",
"postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
},
"dependencies": {
- "@forge/bundler": "4.21.1-next.2-experimental-611b366",
- "@forge/cli-shared": "6.7.1-next.2-experimental-611b366",
+ "@forge/bundler": "4.21.1-next.4-experimental-011b3b2",
+ "@forge/cli-shared": "6.8.0-next.4-experimental-011b3b2",
"@forge/egress": "1.4.0",
- "@forge/lint": "5.7.3-next.2-experimental-611b366",
- "@forge/manifest": "8.9.0-next.0-experimental-611b366",
+ "@forge/lint": "5.7.3-next.4-experimental-011b3b2",
+ "@forge/manifest": "8.9.0-next.1-experimental-011b3b2",
"@forge/runtime": "5.10.7",
- "@forge/tunnel": "5.10.1-next.2-experimental-611b366",
+ "@forge/tunnel": "5.10.1-next.4-experimental-011b3b2",
"@forge/util": "1.4.8",
"@sentry/node": "7.106.0",
"@forge/i18n": "0.0.4",
"ajv": "^8.12.0",Modified: package/out/command-line/register-app-commands.d.ts.map
Index: package/out/command-line/register-app-commands.d.ts.map
===================================================================
--- package/out/command-line/register-app-commands.d.ts.map
+++ package/out/command-line/register-app-commands.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"register-app-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAqB,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG/G,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAuBtD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAKrD;AA4CD,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAC1B,OAAO,CAQT;AAED,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW7E;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,aAAa,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,MAAM,EACZ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,2BAA2B,GACnD,OAAO,CAAC,sBAAsB,CAAC,CAuBjC;AAmJD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAGlD"}
\ No newline at end of file
+{"version":3,"file":"register-app-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,sBAAsB,EAEtB,aAAa,EACb,gBAAgB,EAEjB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,oBAAY,gBAAgB;IAC1B,QAAQ,aAAa;IACrB,IAAI,0BAA0B;IAC9B,QAAQ,WAAW;IACnB,SAAS,cAAc;IACvB,OAAO,4BAA4B;CACpC;AAED,oBAAY,eAAe;IACzB,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,IAAI,SAAS;IACb,uBAAuB,4BAA4B;IACnD,cAAc,mBAAmB;IACjC,IAAI,SAAS;IACb,aAAa,kBAAkB;CAChC;AAOD,aAAK,0BAA0B,GAAG,CAAC,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,EAAE,CAAC;AAoBlF,eAAO,MAAM,uBAAuB,EAAE,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,CAG5E,CAAC;AAGF,eAAO,MAAM,mBAAmB,EAAE,0BAUjC,CAAC;AAKF,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQrD;AAmDD,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,CAAC,eAAe,GAAG,MAAM,GAAG,IAAI,CAAC,EAAE,GAC5C,OAAO,CAQT;AAED,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW7E;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,aAAa,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,MAAM,EACZ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,2BAA2B,GACnD,OAAO,CAAC,sBAAsB,CAAC,CA+BjC;AAqKD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAGlD"}
\ No newline at end of fileModified: package/CHANGELOG.md
Large diffs are not rendered by default.
Modified: package/out/command-line/register-app-commands.d.ts
Index: package/out/command-line/register-app-commands.d.ts
===================================================================
--- package/out/command-line/register-app-commands.d.ts
+++ package/out/command-line/register-app-commands.d.ts
@@ -1,12 +1,34 @@
import { CreateAppCommandResult, CommandLineUI, CreateAppCommand } from '@forge/cli-shared';
import { Dependencies } from './dependency-injection';
+export declare enum TemplateCategory {
+ SHOW_ALL = "Show All",
+ ROVO = "Rovo Agent and action",
+ UI_KIT_2 = "UI Kit",
+ CUSTOM_UI = "Custom UI",
+ BACKEND = "Triggers and Validators"
+}
+export declare enum TemplateContext {
+ SHOW_ALL = "show-all",
+ BITBUCKET = "bitbucket",
+ COMPASS = "compass",
+ CONFLUENCE = "confluence",
+ JIRA = "jira",
+ JIRA_SERVICE_MANAGEMENT = "jira-service-management",
+ TEAMWORK_GRAPH = "teamwork-graph",
+ ROVO = "rovo",
+ CROSS_CONTEXT = "cross-context"
+}
+declare type TemplateCategoryPredicates = [TemplateCategory, (name: string) => boolean][];
+export declare const PRODUCT_OPTIONS_DISPLAY: Partial<Record<TemplateContext, string>>;
+export declare const CATEGORY_PREDICATES: TemplateCategoryPredicates;
export declare function formatProduct(product: string): string;
-export declare function templateMatchesProduct(productName: string, templateName: string, products: (string | null)[]): boolean;
+export declare function templateMatchesProduct(productName: string, templateName: string, products: (TemplateContext | string | null)[]): boolean;
export declare function directoryNameFromAppName(appName?: string): string | undefined;
export interface CreateCommandHandlerOptions {
template?: string;
directory?: string;
}
export declare function createCommandHandler(ui: CommandLineUI, createAppCommand: CreateAppCommand, name: string, { template, directory }: CreateCommandHandlerOptions): Promise<CreateAppCommandResult>;
export declare function registerCommands(deps: Dependencies): void;
+export {};
//# sourceMappingURL=register-app-commands.d.ts.map
\ No newline at end of file