@carbon/upgrade 11.38.0 → 11.39.0

package/README.md

@@ -48,6 +48,8 @@ Options:
                                                       [boolean] [default: false]
   -v, --verbose  optionally include additional logs, useful for debugging
                                                       [boolean] [default: false]
+      --decoratorsBeforeExport  parse decorators before export declarations
+                                                      [boolean] [default: false]
 ```
 
 ### Migrations

package/cli.js

@@ -1672,6 +1672,22 @@ var require_execa = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	};
 }));
 //#endregion
+//#region ../../node_modules/concat-map/index.js
+var require_concat_map = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+	module.exports = function(xs, fn) {
+		var res = [];
+		for (var i = 0; i < xs.length; i++) {
+			var x = fn(xs[i], i);
+			if (isArray(x)) res.push.apply(res, x);
+			else res.push(x);
+		}
+		return res;
+	};
+	var isArray = Array.isArray || function(xs) {
+		return Object.prototype.toString.call(xs) === "[object Array]";
+	};
+}));
+//#endregion
 //#region ../../node_modules/balanced-match/index.js
 var require_balanced_match = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = balanced;
@@ -1721,8 +1737,9 @@ var require_balanced_match = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 	}
 }));
 //#endregion
-//#region ../../node_modules/brace-expansion/index.js
+//#region ../../node_modules/minimatch/node_modules/brace-expansion/index.js
 var require_brace_expansion = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+	var concatMap = require_concat_map();
 	var balanced = require_balanced_match();
 	module.exports = expandTop;
 	var escSlash = "\0SLASH" + Math.random() + "\0";
@@ -1757,10 +1774,12 @@ var require_brace_expansion = /* @__PURE__ */ __commonJSMin(((exports, module) =
 		parts.push.apply(parts, p);
 		return parts;
 	}
-	function expandTop(str) {
+	function expandTop(str, options) {
 		if (!str) return [];
+		options = options || {};
+		var max = options.max == null ? Infinity : options.max;
 		if (str.substr(0, 2) === "{}") str = "\\{\\}" + str.substr(2);
-		return expand(escapeBraces(str), true).map(unescapeBraces);
+		return expand(escapeBraces(str), max, true).map(unescapeBraces);
 	}
 	function embrace(str) {
 		return "{" + str + "}";
@@ -1774,78 +1793,74 @@ var require_brace_expansion = /* @__PURE__ */ __commonJSMin(((exports, module) =
 	function gte(i, y) {
 		return i >= y;
 	}
-	function expand(str, isTop) {
+	function expand(str, max, isTop) {
 		var expansions = [];
 		var m = balanced("{", "}", str);
-		if (!m) return [str];
-		var pre = m.pre;
-		var post = m.post.length ? expand(m.post, false) : [""];
-		if (/\$$/.test(m.pre)) for (var k = 0; k < post.length; k++) {
-			var expansion = pre + "{" + m.body + "}" + post[k];
-			expansions.push(expansion);
-		}
+		if (!m || /\$$/.test(m.pre)) return [str];
+		var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
+		var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
+		var isSequence = isNumericSequence || isAlphaSequence;
+		var isOptions = m.body.indexOf(",") >= 0;
+		if (!isSequence && !isOptions) {
+			if (m.post.match(/,(?!,).*\}/)) {
+				str = m.pre + "{" + m.body + escClose + m.post;
+				return expand(str, max, true);
+			}
+			return [str];
+		}
+		var n;
+		if (isSequence) n = m.body.split(/\.\./);
 		else {
-			var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
-			var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
-			var isSequence = isNumericSequence || isAlphaSequence;
-			var isOptions = m.body.indexOf(",") >= 0;
-			if (!isSequence && !isOptions) {
-				if (m.post.match(/,(?!,).*\}/)) {
-					str = m.pre + "{" + m.body + escClose + m.post;
-					return expand(str);
-				}
-				return [str];
-			}
-			var n;
-			if (isSequence) n = m.body.split(/\.\./);
-			else {
-				n = parseCommaParts(m.body);
+			n = parseCommaParts(m.body);
+			if (n.length === 1) {
+				n = expand(n[0], max, false).map(embrace);
 				if (n.length === 1) {
-					n = expand(n[0], false).map(embrace);
-					if (n.length === 1) return post.map(function(p) {
+					var post = m.post.length ? expand(m.post, max, false) : [""];
+					return post.map(function(p) {
 						return m.pre + n[0] + p;
 					});
 				}
 			}
-			var N;
-			if (isSequence) {
-				var x = numeric(n[0]);
-				var y = numeric(n[1]);
-				var width = Math.max(n[0].length, n[1].length);
-				var incr = n.length == 3 ? Math.max(Math.abs(numeric(n[2])), 1) : 1;
-				var test = lte;
-				if (y < x) {
-					incr *= -1;
-					test = gte;
-				}
-				var pad = n.some(isPadded);
-				N = [];
-				for (var i = x; test(i, y); i += incr) {
-					var c;
-					if (isAlphaSequence) {
-						c = String.fromCharCode(i);
-						if (c === "\\") c = "";
-					} else {
-						c = String(i);
-						if (pad) {
-							var need = width - c.length;
-							if (need > 0) {
-								var z = new Array(need + 1).join("0");
-								if (i < 0) c = "-" + z + c.slice(1);
-								else c = z + c;
-							}
+		}
+		var pre = m.pre;
+		var post = m.post.length ? expand(m.post, max, false) : [""];
+		var N;
+		if (isSequence) {
+			var x = numeric(n[0]);
+			var y = numeric(n[1]);
+			var width = Math.max(n[0].length, n[1].length);
+			var incr = n.length == 3 ? Math.max(Math.abs(numeric(n[2])), 1) : 1;
+			var test = lte;
+			if (y < x) {
+				incr *= -1;
+				test = gte;
+			}
+			var pad = n.some(isPadded);
+			N = [];
+			for (var i = x; test(i, y); i += incr) {
+				var c;
+				if (isAlphaSequence) {
+					c = String.fromCharCode(i);
+					if (c === "\\") c = "";
+				} else {
+					c = String(i);
+					if (pad) {
+						var need = width - c.length;
+						if (need > 0) {
+							var z = new Array(need + 1).join("0");
+							if (i < 0) c = "-" + z + c.slice(1);
+							else c = z + c;
 						}
 					}
-					N.push(c);
 				}
-			} else {
-				N = [];
-				for (var j = 0; j < n.length; j++) N.push.apply(N, expand(n[j], false));
-			}
-			for (var j = 0; j < N.length; j++) for (var k = 0; k < post.length; k++) {
-				var expansion = pre + N[j] + post[k];
-				if (!isTop || isSequence || expansion) expansions.push(expansion);
+				N.push(c);
 			}
+		} else N = concatMap(n, function(el) {
+			return expand(el, max, false);
+		});
+		for (var j = 0; j < N.length; j++) for (var k = 0; k < post.length && expansions.length < max; k++) {
+			var expansion = pre + N[j] + post[k];
+			if (!isTop || isSequence || expansion) expansions.push(expansion);
 		}
 		return expansions;
 	}
@@ -3204,7 +3219,7 @@ var require_cli_width = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	}
 }));
 //#endregion
-//#region ../../node_modules/ansi-regex/index.js
+//#region ../../node_modules/strip-ansi/node_modules/ansi-regex/index.js
 var require_ansi_regex = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = ({ onlyFirst = false } = {}) => {
 		const pattern = ["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)", "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"].join("|");
@@ -30688,6 +30703,39 @@ var require_coerce = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = coerce;
 }));
 //#endregion
+//#region ../../node_modules/semver/functions/truncate.js
+var require_truncate = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+	const parse = require_parse$2();
+	const constants = require_constants$3();
+	const SemVer = require_semver$1();
+	const truncate = (version, truncation, options) => {
+		if (!constants.RELEASE_TYPES.includes(truncation)) return null;
+		const clonedVersion = cloneInputVersion(version, options);
+		return clonedVersion && doTruncation(clonedVersion, truncation);
+	};
+	const cloneInputVersion = (version, options) => {
+		return parse(version instanceof SemVer ? version.version : version, options);
+	};
+	const doTruncation = (version, truncation) => {
+		if (isPrerelease(truncation)) return version.version;
+		version.prerelease = [];
+		switch (truncation) {
+			case "major":
+				version.minor = 0;
+				version.patch = 0;
+				break;
+			case "minor":
+				version.patch = 0;
+				break;
+		}
+		return version.format();
+	};
+	const isPrerelease = (type) => {
+		return type.startsWith("pre");
+	};
+	module.exports = truncate;
+}));
+//#endregion
 //#region ../../node_modules/semver/internal/lrucache.js
 var require_lrucache = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var LRUCache = class {
@@ -31422,6 +31470,7 @@ var import_semver = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((exp
 		lte: require_lte(),
 		cmp: require_cmp(),
 		coerce: require_coerce(),
+		truncate: require_truncate(),
 		Comparator: require_comparator(),
 		Range: require_range(),
 		satisfies: require_satisfies(),
@@ -43742,8 +43791,9 @@ async function getSelectedWorkspace(workspaces) {
 * LICENSE file in the root directory of this source tree.
 */
 async function run$1(options) {
-	const { dry, parser = "babylon", paths, print = dry, transform, verbose } = options;
+	const { dry, parser = "babylon", decoratorsBeforeExport = false, paths, print = dry, transform, verbose, ...transformOptions } = options;
 	await jscodeshift_src_Runner_js.run(transform, paths, {
+		...transformOptions,
 		dry,
 		parser,
 		parserConfig: {
@@ -43769,7 +43819,7 @@ async function run$1(options) {
 				"dynamicImport",
 				"nullishCoalescingOperator",
 				"optionalChaining",
-				["decorators", { decoratorsBeforeExport: false }]
+				["decorators", { decoratorsBeforeExport }]
 			]
 		},
 		print,
@@ -43801,6 +43851,12 @@ async function run$1(options) {
 * LICENSE file in the root directory of this source tree.
 */
 const TRANSFORM_DIR = path.default.join(__dirname, "transforms");
+async function runCodemod(options, config) {
+	await run$1({
+		...config,
+		decoratorsBeforeExport: options.decoratorsBeforeExport
+	});
+}
 /**
 * @typedef Upgrade
 * @property {string} name
@@ -43922,7 +43978,7 @@ const upgrades = [
 							"**/storybook-static/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -43945,7 +44001,7 @@ const upgrades = [
 							"**/storybook-static/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -43968,7 +44024,7 @@ const upgrades = [
 							"**/storybook-static/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -43991,7 +44047,7 @@ const upgrades = [
 							"**/storybook-static/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -44014,7 +44070,7 @@ const upgrades = [
 							"**/storybook-static/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -44051,7 +44107,7 @@ const upgrades = [
 							"**/storybook-static/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -44085,7 +44141,7 @@ const upgrades = [
 							"**/storybook-static/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -44130,7 +44186,7 @@ const upgrades = [
 							"**/coverage/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -44165,7 +44221,7 @@ const upgrades = [
 							"**/storybook-static/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -44221,7 +44277,7 @@ const upgrades = [
 							"**/coverage/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -44250,7 +44306,7 @@ const upgrades = [
 							"**/storybook-static/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -44305,7 +44361,7 @@ const upgrades = [
 							"**/coverage/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -44334,7 +44390,7 @@ const upgrades = [
 							"**/storybook-static/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -44342,6 +44398,35 @@ const upgrades = [
 					});
 				}
 			},
+			{
+				name: "ibm-products-update-page-header",
+				description: "Rewrites PageHeader imports to IBM Products packages",
+				migrate: async (options) => {
+					const transform = path.default.join(TRANSFORM_DIR, "ibm-products-update-page-header.js");
+					const paths = Array.isArray(options.paths) && options.paths.length > 0 ? options.paths : await (0, import_out.default)([
+						"**/*.js",
+						"**/*.jsx",
+						"**/*.ts",
+						"**/*.tsx"
+					], {
+						cwd: options.workspaceDir,
+						ignore: [
+							"**/es/**",
+							"**/lib/**",
+							"**/umd/**",
+							"**/node_modules/**",
+							"**/storybook-static/**"
+						]
+					});
+					await runCodemod(options, {
+						dry: !options.write,
+						transform,
+						paths,
+						verbose: options.verbose,
+						parser: "tsx"
+					});
+				}
+			},
 			{
 				name: "ibm-products-update-userprofileimage",
 				description: "Rewrites UserProfileImage to UserAvatar",
@@ -44362,7 +44447,35 @@ const upgrades = [
 							"**/storybook-static/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
+						dry: !options.write,
+						transform,
+						paths,
+						verbose: options.verbose
+					});
+				}
+			},
+			{
+				name: "ibm-products-update-coachmark",
+				description: "Rewrites old Coachmark to new composable Coachmark",
+				migrate: async (options) => {
+					const transform = path.default.join(TRANSFORM_DIR, "ibm-products-update-coachmark.js");
+					const paths = Array.isArray(options.paths) && options.paths.length > 0 ? options.paths : await (0, import_out.default)([
+						"**/*.js",
+						"**/*.jsx",
+						"**/*.ts",
+						"**/*.tsx"
+					], {
+						cwd: options.workspaceDir,
+						ignore: [
+							"**/es/**",
+							"**/lib/**",
+							"**/umd/**",
+							"**/node_modules/**",
+							"**/storybook-static/**"
+						]
+					});
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -44390,7 +44503,7 @@ const upgrades = [
 							"**/storybook-static/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -44418,7 +44531,7 @@ const upgrades = [
 							"**/storybook-static/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -44446,7 +44559,7 @@ const upgrades = [
 							"**/storybook-static/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -44516,7 +44629,7 @@ const upgrades = [
 							"**/coverage/**"
 						]
 					});
-					await run$1({
+					await runCodemod(options, {
 						dry: !options.write,
 						transform,
 						paths,
@@ -44545,7 +44658,7 @@ const upgrades = [
 //#endregion
 //#region package.json
 var name = "@carbon/upgrade";
-var version = "11.38.0";
+var version = "11.39.0";
 //#endregion
 //#region ../../node_modules/y18n/build/index.cjs
 var require_build$3 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
@@ -45462,7 +45575,7 @@ var require_build$2 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = yargsParser;
 }));
 //#endregion
-//#region ../../node_modules/wrap-ansi/index.js
+//#region ../../node_modules/cliui/node_modules/wrap-ansi/index.js
 var require_wrap_ansi = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const stringWidth = require_string_width();
 	const stripAnsi = require_strip_ansi();
@@ -47819,13 +47932,19 @@ async function main({ argv, cwd }) {
 		default: true,
 		describe: "wrap the migration with a feature flag",
 		type: "boolean"
+	}).option("decoratorsBeforeExport", {
+		default: false,
+		describe: "parse decorators before export declarations",
+		type: "boolean"
 	});
 	cli.usage("Usage: $0 [options]").command(["upgrade", "$0"], "upgrade your project", {}, run(async (args) => {
-		const { verbose, write } = args;
+		const { decoratorsBeforeExport, verbose, write, wrapWithFeatureFlag } = args;
 		await upgrade({
 			cwd: cwd(),
+			decoratorsBeforeExport,
 			verbose,
-			write
+			write,
+			wrapWithFeatureFlag
 		}, upgrades);
 	}));
 	cli.command("migrate <migration> [paths...]", "run a Carbon migration on your source files", async (cli) => {
@@ -47838,17 +47957,16 @@ async function main({ argv, cwd }) {
 			}, upgrades);
 		}, true));
 	}, run(async (args) => {
-		const { verbose, migration, write, paths, wrapWithFeatureFlag } = args;
-		const options = {
+		const { verbose, decoratorsBeforeExport, migration, write, paths, wrapWithFeatureFlag } = args;
+		await migrate({
 			cwd: cwd(),
 			verbose,
+			decoratorsBeforeExport,
 			write,
 			migration,
 			paths,
 			wrapWithFeatureFlag
-		};
-		console.log("CLI options wrapWithFeatureFlag:", options.wrapWithFeatureFlag);
-		await migrate(options, upgrades);
+		}, upgrades);
 	}));
 	cli.strict().parse(argv.slice(2));
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/upgrade",
   "description": "A tool for upgrading Carbon versions",
-  "version": "11.38.0",
+  "version": "11.39.0",
   "license": "Apache-2.0",
   "bin": {
     "carbon-upgrade": "./bin/carbon-upgrade.js"
@@ -60,5 +60,5 @@
     "@ibm/telemetry-js": "^1.5.0",
     "jscodeshift": "^17.0.0"
   },
-  "gitHead": "5e89339998bd16c8ddd42e1cc6a2d0c15b3b0af5"
+  "gitHead": "2d98f4ee9914fa44acba58f62599c3f5382acad0"
 }

package/transforms/__testfixtures__/ibm-products-update-coachmark.input.js

@@ -0,0 +1,73 @@
+import React from 'react';
+import {
+  Coachmark,
+  CoachmarkBeacon,
+  CoachmarkButton,
+  CoachmarkOverlayElements,
+  CoachmarkOverlayElement,
+  BEACON_KIND,
+  COACHMARK_OVERLAY_KIND,
+} from '@carbon/ibm-products';
+import { Crossroads } from '@carbon/react/icons';
+
+// Example 1: Basic Coachmark with Beacon and dark theme
+export const Example1 = () => (
+  <Coachmark
+    align="bottom"
+    closeIconDescription="Close"
+    positionTune={{ x: 0, y: 0 }}
+    target={
+      <CoachmarkBeacon label="Show information" kind={BEACON_KIND.DEFAULT} />
+    }
+    theme="light">
+    <CoachmarkOverlayElements closeButtonLabel="Done">
+      <CoachmarkOverlayElement
+        title="Hello World"
+        description="this is a description test"
+      />
+    </CoachmarkOverlayElements>
+  </Coachmark>
+);
+
+// Example 2: Coachmark with Button target and light theme
+export const Example2 = () => (
+  <Coachmark
+    align="top"
+    closeIconDescription="Close"
+    positionTune={{ x: 10, y: 20 }}
+    target={
+      <CoachmarkButton
+        kind="tertiary"
+        size="md"
+        label="Show information"
+        renderIcon={Crossroads}>
+        Click Me
+      </CoachmarkButton>
+    }
+    theme="light">
+    <CoachmarkOverlayElements closeButtonLabel="Got it">
+      <CoachmarkOverlayElement
+        title="Welcome"
+        description="This is your dashboard"
+      />
+    </CoachmarkOverlayElements>
+  </Coachmark>
+);
+
+// Example 3: Floating Coachmark
+export const Example3 = () => (
+  <Coachmark
+    align="bottom-left"
+    closeIconDescription="Dismiss"
+    positionTune={{ x: 5, y: 5 }}
+    overlayKind={COACHMARK_OVERLAY_KIND.FLOATING}
+    target={<CoachmarkBeacon label="Learn more" kind={BEACON_KIND.DEFAULT} />}
+    theme="dark">
+    <CoachmarkOverlayElements closeButtonLabel="Close">
+      <CoachmarkOverlayElement
+        title="New Feature"
+        description="Check out this new feature"
+      />
+    </CoachmarkOverlayElements>
+  </Coachmark>
+);