9116585466

Committed 16 May 2024 05:25PM UTC coverage: 54.388% (-0.03%) from 54.421%

Build # 9116585466

Build Type

push

github

Committed by

web-flow

Commit Message

fix: [#9506] Update About page to show correct SDK runtime version (#9520)

* Update About page to retrieve BotBuilder versions from BotFramework-Components repository.

* Update TelemetryClient BotBuilder version

* Fix yarn-berry.lock files

* Fix hash

* Fix eslint

---------

Co-authored-by: sw-joelmut <joel.mut@southworks.com>
Co-authored-by: Eugene <EOlonov@gmail.com>

Run Details

7575 of 18352 branches covered (41.28%)

Branch coverage included in aggregate %.

13 of 37 new or added lines in 6 files covered. (35.14%)

1 existing line in 1 file now uncovered.

19756 of 31900 relevant lines covered (61.93%)

26.56 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

8.11

/Composer/packages/lib/shared/src/getBotBuilderVersion.ts

// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

import axios from 'axios';

/**
 * Function created to retrieve BotBuilder versions from BotFramework-Components repository containing the following example content as reference:
 *
 * ```js
 * // Copyright (c) Microsoft Corporation.
 * // Licensed under the MIT License.
 *
 * const dotnet = {
 *   name: 'dotnet',
 *   defaultSdkVersion: '4.18.1',
 * };
 *
 * const js = {
 *   name: 'js',
 *   defaultSdkVersion: '4.18.0-preview',
 * };
 *
 * module.exports = { dotnet, js };
 * ```
 */
const getField = (content: string, path: string) => {
  const [key, ...fields] = path.split('.');
  const objectPath = fields.reduce((acc, val, i, arr) => {
    const objKey = i < arr.length - 1 ? '{' : '';
    return acc + `.+?(?<=${val}:${objKey})`;
  }, '');
  const withQuotes = `('|")(.+?)('|")(}|,)`;
  const withoutQuotes = `\\w+|\\d+`;
  const pattern = `${key}={${objectPath}(${withQuotes}|${withoutQuotes})`;
  const oneLine = content.replace(/\r?\n|\r|\s+/g, '');
  // eslint-disable-next-line security/detect-non-literal-regexp
  const regex = oneLine.match(new RegExp(pattern));
  if (!regex) {
    return;
  }
  const value = regex[1].match(withQuotes) ? regex[3] : regex[1];
  return value;
};

/**
 * Gets BotBuilder version for DotNet and JavaScript from BotFramework-Components repository.
 */
export const getBotBuilderVersion = async () => {
  const defaultValues = { dotnet: 'unknown', js: 'unknown' };
  try {
    const url =
      'https://raw.githubusercontent.com/microsoft/botframework-components/main/generators/generator-bot-adaptive/platforms.js';
    const { data } = await axios.get(url);
    const version = {
      dotnet: getField(data, 'dotnet.defaultSdkVersion') || defaultValues.dotnet,
      js: getField(data, 'js.defaultSdkVersion') || defaultValues.js,
    };
    return version;
  } catch (e) {
    console?.error(e);
    return defaultValues;
  }
};

1	// Copyright (c) Microsoft Corporation.
2	// Licensed under the MIT License.
3
4	import axios from 'axios';	6✔
5
6	/**
7	* Function created to retrieve BotBuilder versions from BotFramework-Components repository containing the following example content as reference:
8	*
9	* ```js
10	* // Copyright (c) Microsoft Corporation.
11	* // Licensed under the MIT License.
12	*
13	* const dotnet = {
14	* name: 'dotnet',
15	* defaultSdkVersion: '4.18.1',
16	* };
17	*
18	* const js = {
19	* name: 'js',
20	* defaultSdkVersion: '4.18.0-preview',
21	* };
22	*
23	* module.exports = { dotnet, js };
24	* ```
25	*/
26	const getField = (content: string, path: string) => {	6✔
NEW 27	const [key, ...fields] = path.split('.');	×
NEW 28	const objectPath = fields.reduce((acc, val, i, arr) => {	×
NEW 29	const objKey = i < arr.length - 1 ? '{' : '';	×
NEW 30	return acc + `.+?(?<=${val}:${objKey})`;	×
31	}, '');
NEW 32	const withQuotes = `('\|")(.+?)('\|")(}\|,)`;	×
NEW 33	const withoutQuotes = `\\w+\|\\d+`;	×
NEW 34	const pattern = `${key}={${objectPath}(${withQuotes}\|${withoutQuotes})`;	×
NEW 35	const oneLine = content.replace(/\r?\n\|\r\|\s+/g, '');	×
36	// eslint-disable-next-line security/detect-non-literal-regexp
NEW 37	const regex = oneLine.match(new RegExp(pattern));	×
NEW 38	if (!regex) {	×
NEW 39	return;	×
40	}
NEW 41	const value = regex[1].match(withQuotes) ? regex[3] : regex[1];	×
NEW 42	return value;	×
43	};
44
45	/**
46	* Gets BotBuilder version for DotNet and JavaScript from BotFramework-Components repository.
47	*/
48	export const getBotBuilderVersion = async () => {	6✔
NEW 49	const defaultValues = { dotnet: 'unknown', js: 'unknown' };	×
NEW 50	try {	×
51	const url =
NEW 52	'https://raw.githubusercontent.com/microsoft/botframework-components/main/generators/generator-bot-adaptive/platforms.js';	×
NEW 53	const { data } = await axios.get(url);	×
NEW 54	const version = {	×
55	dotnet: getField(data, 'dotnet.defaultSdkVersion') \|\| defaultValues.dotnet,	×
56	js: getField(data, 'js.defaultSdkVersion') \|\| defaultValues.js,	×
57	};
NEW 58	return version;	×
59	} catch (e) {
NEW 60	console?.error(e);	×
NEW 61	return defaultValues;	×
62	}
63	};

microsoft / BotFramework-Composer / 9116585466

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous