@workday/canvas-kit-codemod 7.0.0-alpha.95-next.21 → 7.0.0

package/dist/es6/v6/moveAndRenameSearchBar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"moveAndRenameSearchBar.d.ts","sourceRoot":"","sources":["../../../lib/v6/moveAndRenameSearchBar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,SAAS,EAAqC,MAAM,aAAa,CAAC;AAyBnF,QAAA,MAAM,SAAS,EAAE,SA0EhB,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"moveAndRenameSearchBar.d.ts","sourceRoot":"","sources":["../../../lib/v6/moveAndRenameSearchBar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,SAAS,EAAqC,MAAM,aAAa,CAAC;AAyBnF,QAAA,MAAM,SAAS,EAAE,SAyGhB,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/dist/es6/v6/moveAndRenameSearchBar.js

@@ -5,7 +5,7 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
             r[k] = a[j];
     return r;
 };
-import { filterImportSpecifiers, renameImportSpecifiers, renameImports, hasImportSpecifiers, } from './utils';
+import { filterImportSpecifiers, renameImports, hasImportSpecifiers, } from './utils';
 var mainPackage = '@workday/canvas-kit-labs-react';
 var headerPackage = '@workday/canvas-kit-labs-react/header';
 var searchBarRenameImports = ['SearchBar', 'SearchBarProps', 'SearchBarState'];
@@ -27,6 +27,7 @@ var transform = function (file, api) {
     function insertImportDeclarationBefore(nodePath, specifiers, sourcePath) {
         nodePath.insertBefore(j.importDeclaration(specifiers, j.stringLiteral(sourcePath)));
     }
+    var discoveredImportSpecifiers = {};
     // Rename search-bar named imports from @workday/canvas-kit-labs-react
     // e.g. import { SearchBar, SearchBarProps } from '@workday/canvas-kit-labs-react';
     // becomes import { SearchForm, SearchFormProps } from '@workday/canvas-kit-labs-react';
@@ -35,7 +36,16 @@ var transform = function (file, api) {
         // Filter search bar imports
         var searchBarImports = filterImportSpecifiers(importSpecifiers);
         // Rename search bar imports
-        renameImportSpecifiers(searchBarImports, renameMap);
+        searchBarImports.forEach(function (specifier) {
+            var specifierName = specifier.imported.name;
+            if (specifierName in renameMap) {
+                // if it hasn't been aliased, track it for updating JSX
+                if (!specifier.local || specifier.local.name === specifier.imported.name) {
+                    discoveredImportSpecifiers[specifier.imported.name] = true;
+                }
+                specifier.imported.name = renameMap[specifierName];
+            }
+        });
     });
     // Handle imports from @workday/canvas-kit-react/header
     // e.g import { Header, SearchBar, SearchBarProps } from '@workday/canvas-kit-labs-react/header';
@@ -62,8 +72,17 @@ var transform = function (file, api) {
         root.find(j.ImportDeclaration, { source: { value: headerPackage } }).remove();
         // If SearchBar import specifiers were found, insert a new import declaration above the original import declaration
         if (searchBarSpecifiers.length) {
-            var renamedSearchBarSpecifiers = renameImportSpecifiers(searchBarSpecifiers, renameMap);
-            insertImportDeclarationBefore(nodePath, renamedSearchBarSpecifiers, '@workday/canvas-kit-labs-react/search-form');
+            searchBarSpecifiers.forEach(function (specifier) {
+                var specifierName = specifier.imported.name;
+                if (specifierName in renameMap) {
+                    // if it hasn't been aliased, track it for updating JSX
+                    if (!specifier.local || specifier.local.name === specifier.imported.name) {
+                        discoveredImportSpecifiers[specifier.imported.name] = true;
+                    }
+                    specifier.imported.name = renameMap[specifierName];
+                }
+            });
+            insertImportDeclarationBefore(nodePath, searchBarSpecifiers, '@workday/canvas-kit-labs-react/search-form');
         }
         // If other header import specifiers were found, insert a new import declaration above the original import declaration
         // This will replace the import declaration that was removed above
@@ -71,6 +90,6 @@ var transform = function (file, api) {
             insertImportDeclarationBefore(nodePath, headerSpecifiers, headerPackage);
         }
     });
-    return renameImports(api, root, '@workday/canvas-kit-labs-react/header', renameMap).toSource();
+    return renameImports(api, root, '@workday/canvas-kit-labs-react/search-form', renameMap, discoveredImportSpecifiers).toSource();
 };
 export default transform;

package/dist/es6/v6/utils/index.d.ts

@@ -16,17 +16,6 @@ export declare function filterImportSpecifiers(importSpecifiers: ImportSpecifier
 export declare type RenameMap = {
     [key: string]: string;
 };
-/**
- *  Renames import specifiers for a given rename map
- * @example
- * const renameMap = {
- *   'PageHeader': 'DeprecatedPageHeader',
- *   'PageHeaderProps': 'DeprecatedPageHeaderProps',
- * };
- * const pageHeaderImports = filterImportSpecifiers(importSpecifiers, importNames);
- * renameImportSpecifiers(pageHeaderSpecifiers, renameMap);
- */
-export declare function renameImportSpecifiers(importSpecifiers: ImportSpecifier[], renameMap: RenameMap): ImportSpecifier[];
 /**
  * Returns a filtered array of ImportDefaultSpecifiers
  * You can filter all ImportDefaultSpecifiers or additionally filter by providing an array of import names.
@@ -66,5 +55,5 @@ export declare function renameImportDefaultSpecifiers(importSpecifiers: ImportDe
  * }
  */
 export declare function hasImportSpecifiers(api: API, root: Collection<any>, packageName: string | string[], specifiers: string[]): boolean;
-export declare function renameImports(api: API, root: Collection<any>, packageName: string, specifierMap: Record<string, string>): Collection<any>;
+export declare function renameImports(api: API, root: Collection<any>, packageName: string, specifierMap: Record<string, string>, discoveredImportSpecifiers?: Record<string, boolean>): Collection<any>;
 //# sourceMappingURL=index.d.ts.map

package/dist/es6/v6/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../lib/v6/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,sBAAsB,EACtB,wBAAwB,EACxB,UAAU,EACV,GAAG,EACJ,MAAM,aAAa,CAAC;AAErB,oBAAY,oBAAoB,GAAG,CAC/B,eAAe,GACf,wBAAwB,GACxB,sBAAsB,CACzB,EAAE,CAAC;AAEJ;;;;;;;;;;;GAWG;AACH,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,oBAAoB,EACtC,WAAW,CAAC,EAAE,MAAM,EAAE,qBAevB;AAED,oBAAY,SAAS,GAAG;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,gBAAgB,EAAE,eAAe,EAAE,EAAE,SAAS,EAAE,SAAS,qBAQ/F;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,6BAA6B,CAC3C,gBAAgB,EAAE,oBAAoB,EACtC,WAAW,CAAC,EAAE,MAAM,EAAE,4BAevB;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,gBAAgB,EAAE,sBAAsB,EAAE,EAC1C,SAAS,EAAE,SAAS,4BASrB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,EACrB,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,EAC9B,UAAU,EAAE,MAAM,EAAE,WAkCrB;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,EACrB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACnC,UAAU,CAAC,GAAG,CAAC,CAsFjB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../lib/v6/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,sBAAsB,EACtB,wBAAwB,EACxB,UAAU,EACV,GAAG,EACJ,MAAM,aAAa,CAAC;AAErB,oBAAY,oBAAoB,GAAG,CAC/B,eAAe,GACf,wBAAwB,GACxB,sBAAsB,CACzB,EAAE,CAAC;AAEJ;;;;;;;;;;;GAWG;AACH,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,oBAAoB,EACtC,WAAW,CAAC,EAAE,MAAM,EAAE,qBAevB;AAED,oBAAY,SAAS,GAAG;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAgB,6BAA6B,CAC3C,gBAAgB,EAAE,oBAAoB,EACtC,WAAW,CAAC,EAAE,MAAM,EAAE,4BAevB;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,gBAAgB,EAAE,sBAAsB,EAAE,EAC1C,SAAS,EAAE,SAAS,4BASrB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,EACrB,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,EAC9B,UAAU,EAAE,MAAM,EAAE,WAkCrB;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,EACrB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,0BAA0B,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACvD,UAAU,CAAC,GAAG,CAAC,CA+GjB"}

package/dist/es6/v6/utils/index.js

@@ -24,25 +24,6 @@ export function filterImportSpecifiers(importSpecifiers, importNames) {
     });
     return filteredSpecifiers;
 }
-/**
- *  Renames import specifiers for a given rename map
- * @example
- * const renameMap = {
- *   'PageHeader': 'DeprecatedPageHeader',
- *   'PageHeaderProps': 'DeprecatedPageHeaderProps',
- * };
- * const pageHeaderImports = filterImportSpecifiers(importSpecifiers, importNames);
- * renameImportSpecifiers(pageHeaderSpecifiers, renameMap);
- */
-export function renameImportSpecifiers(importSpecifiers, renameMap) {
-    importSpecifiers.forEach(function (specifier) {
-        var specifierName = specifier.imported.name;
-        if (specifierName in renameMap) {
-            specifier.imported.name = renameMap[specifierName];
-        }
-    });
-    return importSpecifiers;
-}
 /**
  * Returns a filtered array of ImportDefaultSpecifiers
  * You can filter all ImportDefaultSpecifiers or additionally filter by providing an array of import names.
@@ -134,7 +115,8 @@ export function hasImportSpecifiers(api, root, packageName, specifiers) {
         return false;
     });
 }
-export function renameImports(api, root, packageName, specifierMap) {
+export function renameImports(api, root, packageName, specifierMap, discoveredImportSpecifiers) {
+    if (discoveredImportSpecifiers === void 0) { discoveredImportSpecifiers = {}; }
     var j = api.jscodeshift;
     if (!hasImportSpecifiers(api, root, packageName, Object.keys(specifierMap))) {
         return root;
@@ -146,27 +128,41 @@ export function renameImports(api, root, packageName, specifierMap) {
     // Transform import statements
     // e.g. import { CookieBanner, CookieBannerProps } from '@workday/canvas-kit-react';
     // becomes import { DeprecatedCookieBanner, DeprecatedCookieBannerProps } from '@workday/canvas-kit-react';
+    // Find imports from main packages
+    // ex. '@workday/canvas-kit-labs-react'
     root.find(j.ImportDeclaration, { source: { value: mainPackage } }).forEach(function (nodePath) {
         var _a;
         (_a = nodePath.value.specifiers) === null || _a === void 0 ? void 0 : _a.forEach(function (specifier) {
             if (specifier.type === 'ImportSpecifier') {
                 if (Object.keys(specifierMap).includes(specifier.imported.name)) {
+                    // if it hasn't been aliased, track it for updating JSX
+                    if (!specifier.local || specifier.local.name === specifier.imported.name) {
+                        discoveredImportSpecifiers[specifier.imported.name] = true;
+                    }
                     specifier.imported.name = specifierMap[specifier.imported.name];
                 }
             }
         });
     });
-    // Transforms default imports from package
+    // Find imports from component specific packages
+    // ex. '@workday/canvas-kit-labs-react/header'
     root.find(j.ImportDeclaration, { source: { value: packageName } }).forEach(function (nodePath) {
         var _a;
         (_a = nodePath.value.specifiers) === null || _a === void 0 ? void 0 : _a.forEach(function (specifier) {
+            // Transforms default imports
             if (specifier.type === 'ImportDefaultSpecifier') {
                 if (specifier.local && Object.keys(specifierMap).includes(specifier.local.name)) {
+                    discoveredImportSpecifiers[specifier.local.name] = true;
                     specifier.local.name = specifierMap[specifier.local.name];
                 }
             }
+            // Transform named exports
             if (specifier.type === 'ImportSpecifier') {
                 if (Object.keys(specifierMap).includes(specifier.imported.name)) {
+                    // if it hasn't been aliased, track it for updating JSX
+                    if (!specifier.local || specifier.local.name === specifier.imported.name) {
+                        discoveredImportSpecifiers[specifier.imported.name] = true;
+                    }
                     specifier.imported.name = specifierMap[specifier.imported.name];
                 }
             }
@@ -195,7 +191,10 @@ export function renameImports(api, root, packageName, specifierMap) {
     // Transform JSXElements
     // e.g. `<CookieBanner>` becomes `<DeprecatedCookieBanner>`
     root.find(j.JSXIdentifier).forEach(function (nodePath) {
-        if (Object.keys(specifierMap).includes(nodePath.value.name)) {
+        if (
+        // Check to see if it was imported from Canvas Kit
+        discoveredImportSpecifiers[nodePath.value.name] &&
+            Object.keys(specifierMap).includes(nodePath.value.name)) {
             nodePath.node.name = specifierMap[nodePath.value.name];
         }
     });
@@ -203,6 +202,8 @@ export function renameImports(api, root, packageName, specifierMap) {
     // e.g. `CookieBanner.DefaultNotice` becomes `DeprecatedCookieBanner.DefaultNotice`
     root.find(j.MemberExpression, { object: { type: 'Identifier' } }).forEach(function (nodePath) {
         if (nodePath.value.object.type === 'Identifier' &&
+            // Check to see if it was imported from Canvas Kit
+            discoveredImportSpecifiers[nodePath.value.object.name] &&
             Object.keys(specifierMap).includes(nodePath.value.object.name)) {
             nodePath.value.object.name = specifierMap[nodePath.value.object.name];
         }

package/dist/es6/v7/compoundActionBar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compoundActionBar.d.ts","sourceRoot":"","sources":["../../../lib/v7/compoundActionBar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAyC,MAAM,aAAa,CAAC;AAM3F,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,UAmD7E"}
+{"version":3,"file":"compoundActionBar.d.ts","sourceRoot":"","sources":["../../../lib/v7/compoundActionBar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAyC,MAAM,aAAa,CAAC;AAM3F,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,UA0H7E"}

package/dist/es6/v7/compoundActionBar.js

@@ -1,3 +1,10 @@
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
 import { getImportRenameMap } from './utils/getImportRenameMap';
 import { hasImportSpecifiers } from '../v6/utils';
 var actionBarPackage = '@workday/canvas-kit-react/action-bar';
@@ -18,7 +25,6 @@ export default function transformer(file, api, options) {
         }
     });
     var _a = getImportRenameMap(j, root, '@workday/canvas-kit-react/action-bar'), importMap = _a.importMap, styledMap = _a.styledMap;
-    // Remove fixed prop from ActionBar component
     root
         .find(j.JSXElement, function (value) {
         return value.openingElement.name.type === 'JSXIdentifier' &&
@@ -26,17 +32,60 @@ export default function transformer(file, api, options) {
                 value.openingElement.name.name === styledMap.ActionBar);
     })
         .forEach(function (nodePath) {
+        (nodePath.value.children || []).forEach(function (child, index) {
+            if (child.type === 'JSXElement') {
+                // bail early if we find a `ActionBar.List` as a child
+                if (child.openingElement.name.type === 'JSXMemberExpression' &&
+                    child.openingElement.name.object.type === 'JSXIdentifier' &&
+                    child.openingElement.name.object.name === 'ActionBar' &&
+                    child.openingElement.name.property.type === 'JSXIdentifier' &&
+                    child.openingElement.name.property.name === 'List') {
+                    return;
+                }
+                // Transform Primary and Secondary button to ActionBar.Item
+                if (child.openingElement.name.type === 'JSXIdentifier') {
+                    var buttonAttrs = child.openingElement.attributes || [];
+                    var ActionItemJSX = j.jsxMemberExpression(j.jsxIdentifier(importMap.ActionBar), j.jsxIdentifier('Item'));
+                    if (nodePath.value.children &&
+                        ['PrimaryButton', 'SecondaryButton'].includes(child.openingElement.name.name)) {
+                        // Add isPrimary attribute to primary Action Item
+                        var elementAttrs = child.openingElement.name.name === 'PrimaryButton'
+                            ? __spreadArrays(buttonAttrs, [j.jsxAttribute(j.jsxIdentifier('isPrimary'))]) : buttonAttrs;
+                        nodePath.value.children[index] = j.jsxElement(j.jsxOpeningElement(ActionItemJSX, elementAttrs), j.jsxClosingElement(ActionItemJSX), child.children);
+                    }
+                }
+            }
+        });
+        var children = nodePath.value.children || [];
+        // Remove all attributes from ActionBar to replace them to ActionBar.List
         var attributes = nodePath.value.openingElement.attributes;
         if (attributes) {
-            // remove these attributes from ActionBar
-            nodePath.value.openingElement.attributes = attributes.filter(function (item) {
-                return item.type === 'JSXAttribute' &&
-                    item.name.type === 'JSXIdentifier' &&
-                    ['fixed'].includes(item.name.name)
-                    ? false
-                    : true;
-            });
+            nodePath.value.openingElement.attributes = attributes.filter(function (item) { return !(item.type === 'JSXAttribute' && item.name.type === 'JSXIdentifier'); });
         }
+        // Create closing element for ActionBar without closing tag
+        if (nodePath.value.openingElement.selfClosing) {
+            nodePath.value.openingElement.selfClosing = false;
+            nodePath.value.closingElement = j.jsxClosingElement(nodePath.value.openingElement.name);
+        }
+        // Create ActionBar.List component
+        var ActionBarListJSX = j.jsxMemberExpression(j.jsxIdentifier(importMap.ActionBar), j.jsxIdentifier('List'));
+        var subComponentJSX = j.jsxElement(j.jsxOpeningElement(ActionBarListJSX, 
+        // All attributes except fixed should be passed
+        attributes === null || 
+        // All attributes except fixed should be passed
+        attributes === void 0 ? void 0 : 
+        // All attributes except fixed should be passed
+        attributes.filter(function (attr) { return !(attr.type === 'JSXAttribute' && attr.name.name === 'fixed'); })), j.jsxClosingElement(ActionBarListJSX), children);
+        // Keep space for code structure
+        var textLiteralStart = children.find(function (child) { return child.type === 'JSXText'; });
+        var textLiteralEnd = children
+            .slice()
+            .reverse()
+            .find(function (child) { return child.type === 'JSXText'; });
+        nodePath.value.children =
+            textLiteralStart && textLiteralEnd
+                ? [textLiteralStart, subComponentJSX, textLiteralEnd]
+                : [subComponentJSX];
     });
     return root.toSource();
 }

package/dist/es6/v7/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/v7/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAatC,QAAA,MAAM,SAAS,EAAE,SAgBhB,CAAC;AACF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/v7/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AActC,QAAA,MAAM,SAAS,EAAE,SAiBhB,CAAC;AACF,eAAe,SAAS,CAAC"}

package/dist/es6/v7/index.js

@@ -19,6 +19,7 @@ import renameIconPosition from './renameIconPosition';
 import recategorizeIconButtons from './recategorizeIconButtons';
 import updateModelSignatures from './updateModelSignatures';
 import updateTabs from './updateTabs';
+import updateDisclosureShowHide from './updateDisclosureShowHide';
 var transform = function (file, api, options) {
     // These will run in order. If your transform depends on others, place yours after dependent transforms
     var fixes = [
@@ -32,6 +33,7 @@ var transform = function (file, api, options) {
         updateSegmentedControl,
         updateModelSignatures,
         updateTabs,
+        updateDisclosureShowHide,
     ];
     return fixes.reduce(function (source, fix) { return fix(__assign(__assign({}, file), { source: source }), api, options); }, file.source);
 };

package/dist/es6/v7/recategorizeIconButtons.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recategorizeIconButtons.d.ts","sourceRoot":"","sources":["../../../lib/v7/recategorizeIconButtons.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,QAAQ,EACR,OAAO,EAMR,MAAM,aAAa,CAAC;AAcrB,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,UAiK7E"}
+{"version":3,"file":"recategorizeIconButtons.d.ts","sourceRoot":"","sources":["../../../lib/v7/recategorizeIconButtons.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,QAAQ,EACR,OAAO,EAMR,MAAM,aAAa,CAAC;AAcrB,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,UAoK7E"}

package/dist/es6/v7/recategorizeIconButtons.js

@@ -96,7 +96,11 @@ export default function transformer(file, api, options) {
      * Add new required imports
      */
     var buttonImports = root.find(j.ImportDeclaration, {
-        source: { value: function (value) { return value.includes('@workday/canvas-kit-react'); } },
+        source: {
+            value: function (value) {
+                return value === '@workday/canvas-kit-react' || value === '@workday/canvas-kit-react/button';
+            },
+        },
     });
     if (!buttonImports.length) {
         // Add new specifiers to a new import

package/dist/es6/v7/renameLayoutImports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renameLayoutImports.d.ts","sourceRoot":"","sources":["../../../lib/v7/renameLayoutImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAA6B,MAAM,aAAa,CAAC;AAelE,QAAA,MAAM,SAAS,EAAE,SAuFhB,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"renameLayoutImports.d.ts","sourceRoot":"","sources":["../../../lib/v7/renameLayoutImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAA6B,MAAM,aAAa,CAAC;AAoDlE,QAAA,MAAM,SAAS,EAAE,SAyEhB,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/dist/es6/v7/renameLayoutImports.js

@@ -6,6 +6,42 @@ var commonSpecifiers = [
     'useThemeRTL',
     'useThemedRing',
 ];
+var layoutSpecifiers = [
+    'Flex',
+    'Stack',
+    'StackProps',
+    'HStackProps',
+    'VStack',
+    'VStackProps',
+    'HStack',
+    'Box',
+    'BoxProps',
+    'FlexProps',
+    'ColorStyleProps',
+    'StackSpacing',
+    'StackDirection',
+    'StackStyleProps',
+    'FlexStyleProps',
+    'SpaceStyleProps',
+    'DepthStyleProps',
+    'BorderShorthandStyleProps',
+    'BorderColorStyleProps',
+    'BorderRadiusStyleProps',
+    'BorderLineStyleProps',
+    'BorderWidthStyleProps',
+    'BorderLogicalStyleProps',
+    'BorderStyleProps',
+    'border',
+    'ColorTokens',
+    'ColorStyleProps',
+    'color',
+    'FlexItemStyleProps',
+    'flexItem',
+    'PositionStandardProps',
+    'PositionLogicalProps',
+    'PositionStyleProps',
+    'position',
+];
 // 1. Gather all import specifiers from @workday/canvas-kit-labs-react/layout
 // 2. Filter through all imports from @workday/canvas-kit-labs-react/common and gather specifiers we care about
 // 3. If there's an existing @workday/canvas-kit-react/layout add gathered specifiers to that import
@@ -15,39 +51,24 @@ var transform = function (file, api) {
     var root = j(file.source);
     var reactLayoutSpecifiers = [];
     var foundImport = [];
-    // for each specifier in @workday/canvas-kit-labs-react/layout it pushes
-    // the specifier to reactLayoutSpecifiers
-    // We also push the found import to foundImport
-    root
-        .find(j.ImportDeclaration, { source: { value: '@workday/canvas-kit-labs-react/layout' } })
-        .forEach(function (nodePath) {
-        var _a;
-        (_a = nodePath.value.specifiers) === null || _a === void 0 ? void 0 : _a.forEach(function (specifier) {
-            var _a, _b;
-            if (specifier.type === 'ImportSpecifier') {
-                reactLayoutSpecifiers.push({
-                    importedName: (_a = specifier === null || specifier === void 0 ? void 0 : specifier.local) === null || _a === void 0 ? void 0 : _a.name,
-                    name: (_b = specifier === null || specifier === void 0 ? void 0 : specifier.imported) === null || _b === void 0 ? void 0 : _b.name,
-                });
-            }
-        });
-        foundImport.push(nodePath);
-    });
-    // We filter through @workday/canvas-kit-labs-react/common specifiers and
-    // if it includes specifiers that we want, we push those to reactLayoutSpecifiers
     root
-        .find(j.ImportDeclaration, { source: { value: '@workday/canvas-kit-labs-react/common' } })
+        .find(j.ImportDeclaration, {
+        source: { value: function (value) { return value.includes('@workday/canvas-kit-labs-react'); } },
+    })
         .forEach(function (nodePath) {
         var _a;
         nodePath.value.specifiers = (_a = nodePath.value.specifiers) === null || _a === void 0 ? void 0 : _a.filter(function (specifier) {
-            var _a, _b;
+            var _a, _b, _c, _d;
             if (specifier.type === 'ImportSpecifier' &&
                 !commonSpecifiers.includes(specifier.imported.name)) {
-                reactLayoutSpecifiers.push({
-                    importedName: (_a = specifier === null || specifier === void 0 ? void 0 : specifier.local) === null || _a === void 0 ? void 0 : _a.name,
-                    name: (_b = specifier === null || specifier === void 0 ? void 0 : specifier.imported) === null || _b === void 0 ? void 0 : _b.name,
-                });
-                return false;
+                if (((_a = specifier === null || specifier === void 0 ? void 0 : specifier.local) === null || _a === void 0 ? void 0 : _a.name) !== undefined &&
+                    layoutSpecifiers.includes((_b = specifier === null || specifier === void 0 ? void 0 : specifier.local) === null || _b === void 0 ? void 0 : _b.name)) {
+                    reactLayoutSpecifiers.push({
+                        importedName: (_c = specifier === null || specifier === void 0 ? void 0 : specifier.local) === null || _c === void 0 ? void 0 : _c.name,
+                        name: (_d = specifier === null || specifier === void 0 ? void 0 : specifier.imported) === null || _d === void 0 ? void 0 : _d.name,
+                    });
+                    return false;
+                }
             }
             return true;
         });
@@ -74,7 +95,6 @@ var transform = function (file, api) {
     }
     foundImport.forEach(function (importPath) {
         var _a;
-        // remove imports we no longer need
         if (((_a = importPath.value.specifiers) === null || _a === void 0 ? void 0 : _a.length) === 0 ||
             importPath.value.source.value === '@workday/canvas-kit-labs-react/layout') {
             importPath.prune();

package/dist/es6/v7/updateDisclosureShowHide.d.ts

@@ -0,0 +1,3 @@
+import { API, FileInfo, Options } from 'jscodeshift';
+export default function transformer(file: FileInfo, api: API, options: Options): string;
+//# sourceMappingURL=updateDisclosureShowHide.d.ts.map

package/dist/es6/v7/updateDisclosureShowHide.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"updateDisclosureShowHide.d.ts","sourceRoot":"","sources":["../../../lib/v7/updateDisclosureShowHide.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,QAAQ,EAA6B,OAAO,EAAC,MAAM,aAAa,CAAC;AAK9E,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,UAiH7E"}

package/dist/es6/v7/updateDisclosureShowHide.js

@@ -0,0 +1,96 @@
+import { getImportRenameMap } from './utils/getImportRenameMap';
+var keys = function (input) { return Object.keys(input); };
+export default function transformer(file, api, options) {
+    var j = api.jscodeshift;
+    var root = j(file.source);
+    var _a = getImportRenameMap(j, root), containsCanvasImports = _a.containsCanvasImports, importMap = _a.importMap;
+    if (!containsCanvasImports) {
+        return file.source;
+    }
+    var disclosureModels = [
+        'useDisclosureModel',
+        'usePopupModel',
+        'useModalModel',
+        'useDialogModel',
+    ];
+    // inverse the import map. It is more useful this way for this function
+    var imports = Object.keys(importMap).reduce(function (result, key) {
+        result[importMap[key]] = key;
+        return result;
+    }, {});
+    root.find(j.CallExpression).forEach(function (nodePath) {
+        var value = nodePath.value;
+        // check if the identifier was imported from CK AND follows the `use{*}Model` naming convention
+        if (value.callee.type === 'Identifier' &&
+            disclosureModels.includes(imports[value.callee.name])) {
+            // loop over all the arguments of the `use{*}Model` hook
+            value.arguments.forEach(function (argument) {
+                // look for object expressions: `use{*}Model({ /* here */ })`
+                if (argument.type === 'ObjectExpression') {
+                    // loop over all the properties looking for `ObjectMethod` and `ObjectProperties` where
+                    // the value is a function matching `on{*}` or `should{*}` naming convention
+                    argument.properties.forEach(function (property) {
+                        // If it is an `ObjectMethod` or an `ObjectProperty` with an arrow function expression:
+                        // {
+                        //   onShow() {}, // ObjectMethod
+                        //   onHide: () => {}, ObjectProperty with arrow function expression
+                        // }
+                        if ((property.type === 'ObjectMethod' ||
+                            (property.type === 'ObjectProperty' &&
+                                property.value.type === 'ArrowFunctionExpression')) &&
+                            property.key.type === 'Identifier') {
+                            var propertyName_1 = property.key.name;
+                            // Both types have a `params`, but are at different places in the AST
+                            var params_1 = property.type === 'ObjectMethod'
+                                ? property.params
+                                : property.value.type === 'ArrowFunctionExpression'
+                                    ? property.value.params
+                                    : [];
+                            // create a mapping for param names of callbacks and guards. This makes the logic more
+                            // difficult to follow, but decreases duplication
+                            var paramMapping_1 = {
+                                on: ['event'],
+                                should: ['event'],
+                            };
+                            // We will be overriding the params with this variable later
+                            var finalParams_1 = [];
+                            // loop over each `paramMapping` type. `on*` and `should*` functions have different signatures
+                            keys(paramMapping_1).forEach(function (key) {
+                                // matches `onShow` and `shouldShow`
+                                if (new RegExp(key + "[A-Za-z]+").test(propertyName_1)) {
+                                    params_1.forEach(function (param) {
+                                        if (param.type === 'ObjectPattern') {
+                                            param.properties.forEach(function (property) {
+                                                if (property.type === 'ObjectProperty' &&
+                                                    property.key.type === 'Identifier') {
+                                                    if (property.value.type === 'Identifier' ||
+                                                        property.value.type === 'ObjectPattern') {
+                                                        var index = paramMapping_1[key].indexOf(property.key.name);
+                                                        // use `property.value` instead of `property.key.name` in case they
+                                                        // renamed it example `shouldShow({ data: myData })`. The key name is
+                                                        // `data` while the value is `myData`
+                                                        finalParams_1[index] = property.value;
+                                                    }
+                                                }
+                                            });
+                                        }
+                                    });
+                                    // `ObjectMethod` and `ObjectProperty` have params in a different place in the
+                                    // AST, so apply `finalParams` where appropriate
+                                    if (property.type === 'ObjectMethod') {
+                                        property.params = finalParams_1;
+                                    }
+                                    else if (property.type === 'ObjectProperty' &&
+                                        property.value.type === 'ArrowFunctionExpression') {
+                                        property.value.params = finalParams_1;
+                                    }
+                                }
+                            });
+                        }
+                    });
+                }
+            });
+        }
+    });
+    return root.toSource();
+}

package/dist/es6/v7/utils/getImportRenameMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getImportRenameMap.d.ts","sourceRoot":"","sources":["../../../../lib/v7/utils/getImportRenameMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,WAAW,EAAiB,MAAM,aAAa,CAAC;AAEpE,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,WAAW,SAAK;;;;EAyDzF"}
+{"version":3,"file":"getImportRenameMap.d.ts","sourceRoot":"","sources":["../../../../lib/v7/utils/getImportRenameMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,WAAW,EAAiB,MAAM,aAAa,CAAC;AAEpE,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,WAAW,SAAK;;;;EA2DzF"}

package/dist/es6/v7/utils/getImportRenameMap.js

@@ -9,7 +9,9 @@ export function getImportRenameMap(j, root, packageName) {
         // imports our module
         var value = node.source.value;
         if (typeof value === 'string' &&
-            (value.startsWith('@workday/canvas-kit-react') || value === packageName)) {
+            (value === '@workday/canvas-kit-react' ||
+                value.startsWith('@workday/canvas-kit-react/') ||
+                value === packageName)) {
             containsCanvasImports = true;
             (node.specifiers || []).forEach(function (specifier) {
                 if (specifier.type === 'ImportSpecifier') {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@workday/canvas-kit-codemod",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",
-  "version": "7.0.0-alpha.95-next.21+da657912",
+  "version": "7.0.0",
   "description": "A collection of codemods for use on Workday Canvas Kit packages.",
   "main": "dist/es6/index.js",
   "sideEffects": false,
@@ -42,5 +42,5 @@
     "test": "TZ=UTC jest -c ../../jest.config.js",
     "typecheck:src": "tsc -p . --noEmit --incremental false"
   },
-  "gitHead": "da657912adb9b86971737b33838e6f8f22d3264a"
+  "gitHead": "5f2a5c83ce927fa64ac24447f5391e467f51a406"
 }