@pega/dx-component-builder-sdk 0.1.37 → 0.1.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pega/dx-component-builder-sdk",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "description": "Utility for building custom UI components",
   "bin": "./bin/index.js",
   "scripts": {

package/src/tasks/authenticate/index.js

@@ -17,7 +17,7 @@ let server = null;
 const generateAccessToken = async config => {
 
   let authSuccess = false;
-  const { serverType, isolationId, grantType, clientId, clientSecret, user, password } = config;
+  const { serverType, authService, isolationId, grantType, clientId, clientSecret, user, password } = config;
   // Try to gracefully deal with missing trailing slashes for server (and later conditionally for redirectUri)
   const server = config.server.endsWith('/') ? config.server : `${config.server}/`;
 
@@ -38,6 +38,7 @@ const generateAccessToken = async config => {
     // Build auth config structure
     const authConfig = {
       serverType: serverType,
+      authService: authService,
       grantType: grantType,
       tokenUri: sTokenUri,
       clientId: clientId,
@@ -46,7 +47,6 @@ const generateAccessToken = async config => {
       ...authCodeConfig
     };
     if (serverType === 'infinity') {
-      authConfig.authService = 'pega';
       if (grantType !== 'clientCreds' && user && password) {
         authConfig.userIdentifier = user;
         authConfig.password = Buffer.from(password).toString('base64');
@@ -114,6 +114,7 @@ export default async options => {
   const serverConfig = data[DXCB_CONFIG][DXCB_PUBLISH_ACCESS];
   serverConfig.serverType = data[SERVER_CONFIG][SERVER_TYPE] || "infinity";
   serverConfig.server = data[SERVER_CONFIG][serverConfig.serverType === "infinity" ? SERVER_REST_URL : LP_SERVER_REST_URL];
+  serverConfig.authService = data.authConfig?.authService || 'pega';
   const isPwdNonEmpty = serverConfig['password'] ? true : false;
 
   const questions = await getAuthQuestions(serverConfig);

package/src/tasks/build/index.js

@@ -51,7 +51,7 @@ export default async options => {
         task: async () => await bundleComponent(componentKey, sourceMap, devBuild, category),
       },
       {
-        title: 'Lint companion component',
+        title: 'Lint associated component',
         task: async () => {
           const targetDirectory = await getComponentDirectoryPath(componentKey, "constellation");
           // console.log(`in buildComponent Lint component task: componentKey: ${componentKey} targetDirectory: ${targetDirectory}`);
@@ -59,7 +59,7 @@ export default async options => {
         }
       },
       {
-        title: 'Bundle companion component',
+        title: 'Bundle associated component',
         task: async () => await bundleComponent(componentKey, sourceMap, devBuild, "constellation")
       }
     ],

package/src/tasks/build-all/index.js

@@ -34,7 +34,7 @@ export function getCustomTasks(componentKey, category, sourceMap, devBuild, cont
         task: async () => await bundleComponent(componentKey, sourceMap, devBuild, category),
       },
       {
-        title: 'Lint companion component',
+        title: 'Lint associated component',
         task: async () => {
           const targetDirectory = await getComponentDirectoryPath(componentKey, "constellation");
           // console.log(`in buildComponent Lint component task: componentKey: ${componentKey} targetDirectory: ${targetDirectory}`);
@@ -42,7 +42,7 @@ export function getCustomTasks(componentKey, category, sourceMap, devBuild, cont
         }
       },
       {
-        title: 'Bundle companion component',
+        title: 'Bundle associated component',
         task: async () => await bundleComponent(componentKey, sourceMap, devBuild, "constellation")
       }
     ],

package/src/tasks/create/index.js

@@ -200,7 +200,7 @@ export const validateCompile = async (
 
       let componentsConstellation = await getComponents(false, CATEGORY_CONSTELLATION);
       if (components.includes(componentKey)) {
-        console.log(chalk.red(`${componentKey} companion component already exists in ${targetDirectoryConstellation}`));
+        console.log(chalk.red(`${componentKey} associated component already exists in ${targetDirectoryConstellation}`));
       }
 
       return;
@@ -208,7 +208,7 @@ export const validateCompile = async (
     // test for constellation
     const componentsConstellation = await getComponents(false, CATEGORY_CONSTELLATION);
     if (componentsConstellation.includes(componentKey)) {
-      console.log(chalk.red(`${componentKey} companion component already exists in ${targetDirectoryConstellation}`));
+      console.log(chalk.red(`${componentKey} associated component already exists in ${targetDirectoryConstellation}`));
       return;
     }
   }
@@ -216,7 +216,7 @@ export const validateCompile = async (
     // test for constellation
     const componentsConstellation = await getComponents(false, CATEGORY_CONSTELLATION);
     if (componentsConstellation.includes(componentKey)) {
-      console.log(chalk.red(`${componentKey} companion component already exists in ${targetDirectoryConstellation}`));
+      console.log(chalk.red(`${componentKey} associated component already exists in ${targetDirectoryConstellation}`));
       return;
     }
   }
@@ -266,7 +266,7 @@ export const validateCompile = async (
     console.log(chalk.green(`created ${componentKey} component in ${targetDirectory}`));
   }
 
-  console.log(chalk.green(`created ${componentKey} companion component in ${targetDirectoryConstellation}`));
+  console.log(chalk.green(`created ${componentKey} associated component in ${targetDirectoryConstellation}`));
 
 };
 

package/src/tasks/map/map.js

@@ -39,7 +39,7 @@ export const updateComponentMap = async (componentKey, category = CATEGORY_CUSTO
   let importFull = "import ".concat(componentName).concat(" from '").concat(importComponent).concat("/';");
   let mapFull = "\"".concat(componentNameNoPrefix).concat("\" : " ).concat(componentName).concat(",");
 
-  if (mapData.indexOf(importComponent) < 0) {
+  if (mapData.indexOf(importComponent.concat("/")) < 0) {
     // not present so we can add
 
     // add import
@@ -108,8 +108,15 @@ export const renameComponentInMap = async (oldComponentKey, newComponentKey) =>
   let mapData = fs.readFileSync(pegaLocalComponentMapPath, { encoding: 'utf8' });
 
   if (mapData.indexOf(oldComponentName) >= 0) {
-    mapData = mapData.replaceAll(oldComponentName, newComponentName);
-    mapData = mapData.replaceAll(oldComponentNameNoPrefix, newComponentNameNoPrefix);
+
+
+
+    mapData = mapData.replaceAll(oldComponentName + " ", newComponentName + " ");
+    mapData = mapData.replaceAll(oldComponentName + ",", newComponentName + ",");
+
+    mapData = mapData.replaceAll(oldComponentNameNoPrefix + "/", newComponentNameNoPrefix + "/");
+    mapData = mapData.replaceAll( '"' + oldComponentNameNoPrefix + '"' , '"' + newComponentNameNoPrefix + '"');
+
     fs.writeFileSync(pegaLocalComponentMapPath, mapData, { encoding: 'utf8' });
 
   }

package/src/tasks/publish/index.js

@@ -66,7 +66,7 @@ export default async options => {
         }
       },
       {
-        title: 'Lint companion component',
+        title: 'Lint associated component',
         task: async () => {
           const targetDirectory = await getComponentDirectoryPath(componentKey, CATEGORY_CONSTELLATION);
           // console.log(`in buildComponent Lint component task: componentKey: ${componentKey} targetDirectory: ${targetDirectory}`);
@@ -74,31 +74,31 @@ export default async options => {
         }
       },
       {
-        title: 'Map config to companion component',
+        title: 'Map config to associated component',
         task: async () => {
           mapConfigJsonToCompanion(componentKey);
         }
       },
       {
-        title: 'Bundle companion component',
+        title: 'Bundle associated component',
         task: async () => await bundleComponent(componentKey, sourceMap, devBuild, CATEGORY_CONSTELLATION),
         skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined)
       },
       {
-        title: 'Zip companion component',
+        title: 'Zip associated component',
         task: async () => {
           const output = await zipComponent(componentKey, CATEGORY_CONSTELLATION);
           content = { ...content, ...output };
         }
       },
       {
-        title: 'Publish companion component',
+        title: 'Publish associated component',
         task: async () => {
           await publishComponentToServer(content);
         }
       },
       {
-        title: 'Clean up companion',
+        title: 'Clean up associated',
         task: async () => {
           await removeCompanionConfigJson(componentKey);
         }

package/src/tasks/rename/index.js

@@ -63,6 +63,18 @@ export const updateConfig = async (
   configData.library = library;
   configData.version = version;
   configData.description = (description != '') ? description : componentLabel;
+
+  if (allowedApplications.trim() === '') {
+    allowedApplications = [];
+  } else {
+    if (allowedApplications.indexOf(',') !== -1) {
+      allowedApplications = allowedApplications.split(',');
+    }
+    allowedApplications = [].concat(allowedApplications);
+  }
+
+  allowedApplications = allowedApplications.filter(el => !!el.trim()).map(el => el.trim());
+
   configData.allowedApplications = allowedApplications;
 
   // stringify "4", makes the json string look like JSON in the file, formated instead of a single line