@pega/dx-component-builder-sdk 0.1.21 → 0.1.22

package/package.json

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

package/src/constants.js

@@ -5,7 +5,7 @@ export const SDK_LOCAL_COMPONENT_MAP_FILENAME = "sdk-local-component-map.js";
 export const DXCB_CONFIG = 'dxcbConfig';
 export const DXCB_PUBLISH_ACCESS = 'publishAccess';
 export const DXCB_COMPONENT_DEFAULTS = 'componentDefaults';
-export const COMPONENTS_DIRECTORY_PATH = 'components-directory-path';
+export const COMPONENTS_DIRECTORY_PATH = 'src/components';
 export const TOKEN_PATH = '../.access_token';
 export const OOTB_COMPONENTS = '../.ootb_components';
 export const FIELD_PATH = '/field';
@@ -19,6 +19,7 @@ export const COMPONENT_PREFIX_WIDGET_PATH = "widget/";
 export const COMPONENT_PREFIX_DSE_PATH = "designSystemExtension/";
 export const COMPONENT_PREFIX_INFRA_PATH = "infra/";
 
+export const CUSTOM_TEMPLATES = "componentTemplates";
 export const CUSTOM_TEMPLATE_PATH = 'customTemplatesPath';
 export const OVERRIDE_TEMPLATE_PATH = 'overrideTemplatesPath';
 export const OVERRIDE_LIB_PATH = 'node_modules/@pega/react-sdk-overrides/lib';
@@ -36,6 +37,9 @@ export const OOTB_COMPONENT_SERVICE_REST_ENDPOINT = 'PRRestService/dev/v1/ootb_c
 export const DELETE_COMPONENT_SERVICE_REST_ENDPOINT = 'PRRestService/dev/v1/delete_component';
 export const TOKEN_URL_V1 = 'PRRestService/oauth2/v1/token';
 
+export const SERVER_CONFIG = "serverConfig";
+export const SERVER_REST_URL = "infinityRestServerUrl";
+
 export const COMPONENT_SCHEMA = {
   framework: [
     {

package/src/tasks/authenticate/index.js

@@ -6,8 +6,8 @@ import chalk from 'chalk';
 import inquirer from 'inquirer';
 import fetch from 'node-fetch';
 
-import { checkPathAccess, getTokenUrl, showVersion } from '../../util.js';
-import { TOKEN_PATH, SDK_CONFIG_JSON_FILENAME, DXCB_CONFIG, DXCB_PUBLISH_ACCESS } from '../../constants.js';
+import { checkPathAccess, getPegaServerConfig, getTokenUrl, showVersion } from '../../util.js';
+import { TOKEN_PATH, SDK_CONFIG_JSON_FILENAME, SERVER_CONFIG, SERVER_REST_URL } from '../../constants.js';
 
 import { getAuthQuestions } from './helper.js';
 
@@ -63,14 +63,15 @@ export default async options => {
   let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
   data = data && JSON.parse(data);
 
-  if (!data[DXCB_CONFIG] || !data[DXCB_CONFIG][DXCB_PUBLISH_ACCESS]) {
+  if (!data[SERVER_CONFIG] || !data[SERVER_CONFIG][SERVER_REST_URL]) {
     console.error(
       `${chalk.red.bold('ERROR')} Could not able find publish access path in config.json`
     );
     process.exit(1);
   }
 
-  const serverConfig = data[DXCB_CONFIG][DXCB_PUBLISH_ACCESS];
+  //const serverConfig = data[SERVER_CONFIG][SERVER_REST_URL];
+  const serverConfig = await getPegaServerConfig();
   const params = options.params;
 
   const questions = await getAuthQuestions(params);

package/src/tasks/create/index.js

@@ -13,6 +13,7 @@ import { CATEGORY_CONSTELLATION,
   SDK_CONFIG_JSON_FILENAME,
   DXCB_CONFIG, 
   DXCB_COMPONENT_DEFAULTS,
+  CUSTOM_TEMPLATES,
   CUSTOM_TEMPLATE_PATH } from '../../constants.js';
 
 
@@ -168,9 +169,10 @@ export const validateCompile = async (
   let pegaConfig = await getPegaConfig();
   let templateParentDir = `./templates/${framework}`;
   if (pegaConfig[DXCB_CONFIG] &&
-      pegaConfig[DXCB_CONFIG][CUSTOM_TEMPLATE_PATH] && 
-      pegaConfig[DXCB_CONFIG][CUSTOM_TEMPLATE_PATH] != "") {
-    templateParentDir = pegaConfig[DXCB_CONFIG][CUSTOM_TEMPLATE_PATH];
+      pegaConfig[DXCB_CONFIG][CUSTOM_TEMPLATES] &&
+      pegaConfig[DXCB_CONFIG][CUSTOM_TEMPLATES][CUSTOM_TEMPLATE_PATH] && 
+      pegaConfig[DXCB_CONFIG][CUSTOM_TEMPLATES][CUSTOM_TEMPLATE_PATH] != "") {
+    templateParentDir = pegaConfig[DXCB_CONFIG][CUSTOM_TEMPLATES][CUSTOM_TEMPLATE_PATH];
   }
 
   const templateDir = `${templateParentDir}/${typeLC}/${sSubType}`;
@@ -358,7 +360,7 @@ export default async options => {
       },
       {
         name: 'componentName',
-        message: 'Enter component name (required)',
+        message: 'Enter component name (required, no spaces)',
         validate: value => {
           /* value should not be empty
           It should not have spaces
@@ -415,7 +417,7 @@ export default async options => {
       },
       {
         name: 'description',
-        message: 'Enter description for the component',
+        message: 'Enter description for the component (defaults to label)',
         default: componentDefaults.description,
         /* if left blank and no defaults, mustache will use componentLabel, because description is used in app studio and
         shouldn't be blank */

package/src/tasks/delete/helper.js

@@ -71,19 +71,20 @@ export const deleteLocalComponents = async (sourceOfComponents, category = CATEG
         await deleteLocalComponent(answers.componentKey, CATEGORY_CONSTELLATION);
       }
 
-      if (category === CATEGORY_OVERRIDE) {
+      if (category === CATEGORY_OVERRIDE || category === CATEGORY_CUSTOM) {
         // need to remove the map as well
         if (answers.componentKey != undefined) {
           await deleteFromComponentMap(answers.componentKey, category);
         }
         else {
-          console.log(chalk.bold.redBright(`No component in map: ` + componentName));
+          console.log(chalk.bold.yellow(`No component in map: ` + componentName));
         }
 
       }
     }
   } else {
-    console.log(chalk.bold.redBright(`No custom components in ${sourceOfComponents}`));
+    const categoryLC = category.toLowerCase();
+    console.log(chalk.bold.redBright(`No ${categoryLC} components in ${sourceOfComponents}`));
   }
 };
 
@@ -140,7 +141,7 @@ export const deleteServerComponents = async (sourceOfComponents, answers) => {
       await deleteFromComponentMap(componentKey.value);
     }
     else {
-      console.log(chalk.bold.redBright(`No component in map: ` + componentName));
+      console.log(chalk.bold.yellow(`No component in map: ` + componentName));
     }
 
   } else {

package/src/tasks/delete-all/helper.js

@@ -95,7 +95,8 @@ export const deleteLocalComponents = async (sourceOfComponents, category = CATEG
       }
     }
   } else {
-    console.log(chalk.bold.redBright(`No custom components in ${sourceOfComponents}`));
+    const categoryLC = category.toLowerCase();
+    console.log(chalk.bold.redBright(`No ${categoryLC} components in ${sourceOfComponents}`));
   }
 };
 

package/src/tasks/map/map.js

@@ -35,14 +35,7 @@ export const updateComponentMap = async (componentKey, category = CATEGORY_CUSTO
   let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
   data = JSON.parse(data);
 
-  if (!data[DXCB_CONFIG] || !data[DXCB_CONFIG][COMPONENTS_DIRECTORY_PATH]) {
-    console.error(
-      `${chalk.red.bold('ERROR')} Could not able find components directory path in config.json`
-    );
-    process.exit(1);
-  }
-
-  let importComponent = join(data[DXCB_CONFIG][COMPONENTS_DIRECTORY_PATH], categoryDirectory, componentKey);
+  let importComponent = join(COMPONENTS_DIRECTORY_PATH, categoryDirectory, componentKey);
   importComponent = "./".concat(importComponent);
 
   let importFull = "import ".concat(componentName).concat(" from '").concat(importComponent).concat("/';");
@@ -86,14 +79,7 @@ export const deleteFromComponentMap = async (componentKey, category = CATEGORY_C
   let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
   data = JSON.parse(data);
 
-  if (!data[DXCB_CONFIG] || !data[DXCB_CONFIG][COMPONENTS_DIRECTORY_PATH]) {
-    console.error(
-      `${chalk.red.bold('ERROR')} Could not able find components directory path in config.json`
-    );
-    process.exit(1);
-  }
-
-  let importComponent = join(data[DXCB_CONFIG][COMPONENTS_DIRECTORY_PATH], categoryDirectory, componentKey);
+  let importComponent = join(COMPONENTS_DIRECTORY_PATH, categoryDirectory, componentKey);
   importComponent = "./".concat(importComponent);
 
   let importFull = "import ".concat(componentName).concat(" from '").concat(importComponent).concat("/';");

package/src/tasks/override/index.js

@@ -20,6 +20,7 @@ import { COMPONENT_SCHEMA,
   SDK_CONFIG_JSON_FILENAME, 
   DXCB_CONFIG, 
   DXCB_COMPONENT_DEFAULTS,
+  CUSTOM_TEMPLATES,
   OVERRIDE_TEMPLATE_PATH,
   OVERRIDE_LIB_PATH } from '../../constants.js';
 
@@ -110,9 +111,10 @@ const validateCompile = async (
   let templateParentDir = OVERRIDE_LIB_PATH;
 
   if (pegaConfig[DXCB_CONFIG] &&
-    pegaConfig[DXCB_CONFIG][OVERRIDE_TEMPLATE_PATH] && 
-    pegaConfig[DXCB_CONFIG][OVERRIDE_TEMPLATE_PATH] != "") {
-    templateParentDir = pegaConfig[DXCB_CONFIG][OVERRIDE_TEMPLATE_PATH];
+    pegaConfig[DXCB_CONFIG][CUSTOM_TEMPLATES] &&
+    pegaConfig[DXCB_CONFIG][CUSTOM_TEMPLATES][OVERRIDE_TEMPLATE_PATH] && 
+    pegaConfig[DXCB_CONFIG][CUSTOM_TEMPLATES][OVERRIDE_TEMPLATE_PATH] != "") {
+    templateParentDir = pegaConfig[DXCB_CONFIG][CUSTOM_TEMPLATES][OVERRIDE_TEMPLATE_PATH];
   }
 
 

package/src/util.js

@@ -34,7 +34,9 @@ import {
   CATEGORY_OVERRIDE,
   CATEGORY_CONSTELLATION,
   COMPONENT_DIRECTORY_PREFIX_CUSTOM,
-  DXCB_COMPONENT_DEFAULTS
+  DXCB_COMPONENT_DEFAULTS,
+  SERVER_CONFIG,
+  SERVER_REST_URL
 } from './constants.js';
 
 
@@ -64,14 +66,8 @@ export const deleteLocalComponent = async (componentKey, category = CATEGORY_CUS
   let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
   data = JSON.parse(data);
 
-  if (!data[DXCB_CONFIG] || !data[DXCB_CONFIG][COMPONENTS_DIRECTORY_PATH]) {
-    console.error(
-      `${chalk.red.bold('ERROR')} Could not able find components directory path in config.json`
-    );
-    process.exit(1);
-  }
 
-  const directory = join(currentDirectory, data[DXCB_CONFIG][COMPONENTS_DIRECTORY_PATH], categoryDirectory, componentKey);
+  const directory = join(currentDirectory, COMPONENTS_DIRECTORY_PATH, categoryDirectory, componentKey);
 
   // test for the directory
   if (fs.existsSync(directory)) {
@@ -81,7 +77,8 @@ export const deleteLocalComponent = async (componentKey, category = CATEGORY_CUS
         throw err;
       }
 
-      console.log(`${chalk.red.bold(componentKey)} is deleted from Local ${category} `);
+      const sCat = (category === CATEGORY_CONSTELLATION) ? `custom ${category}` : category;
+      console.log(`${chalk.red.bold(componentKey)} is deleted from Local ${sCat} `);
 
 
     });
@@ -176,15 +173,7 @@ export const getComponents = async (showSeparator = false, category = CATEGORY_C
   let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
   data = JSON.parse(data);
 
-  if (!data[DXCB_CONFIG] || !data[DXCB_CONFIG][COMPONENTS_DIRECTORY_PATH]) {
-    console.error(
-      `${chalk.red.bold('ERROR')} Could not able find components directory path in config.json`
-    );
-    process.exit(1);
-  }
-
-
-  const directory = join(currentDirectory, data[DXCB_CONFIG][COMPONENTS_DIRECTORY_PATH], categoryDirectory);
+  const directory = join(currentDirectory, COMPONENTS_DIRECTORY_PATH, categoryDirectory);
   let compList = new Array();
 
   switch (category) {
@@ -281,14 +270,7 @@ export const getComponentsObj = async (showSeparator = false, category = CATEGOR
   let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
   data = JSON.parse(data);
 
-  if (!data[DXCB_CONFIG] || !data[DXCB_CONFIG][COMPONENTS_DIRECTORY_PATH]) {
-    console.error(
-      `${chalk.red.bold('ERROR')} Could not able find components directory path in config.json`
-    );
-    process.exit(1);
-  }
-
-  const directory = join(currentDirectory, data[DXCB_CONFIG][COMPONENTS_DIRECTORY_PATH], categoryDirectory);
+  const directory = join(currentDirectory, COMPONENTS_DIRECTORY_PATH, categoryDirectory);
   let compList = new Array();
 
   switch (category) {
@@ -441,14 +423,7 @@ export const getComponentsAndSubDirectory = async (category = CATEGORY_CUSTOM) =
   let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
   data = JSON.parse(data);
 
-  if (!data[DXCB_CONFIG] || !data[DXCB_CONFIG][COMPONENTS_DIRECTORY_PATH]) {
-    console.error(
-      `${chalk.red.bold('ERROR')} Could not able find components directory path in config.json`
-    );
-    process.exit(1);
-  }
-
-  const directory = join(currentDirectory, data[DXCB_CONFIG][COMPONENTS_DIRECTORY_PATH], categoryDirectory);
+  const directory = join(currentDirectory, COMPONENTS_DIRECTORY_PATH, categoryDirectory);
 
   const fieldComps = await getSubComponentsAndDir(directory, FIELD_PATH);
   const templateComps = await getSubComponentsAndDir(directory, TEMPLATE_PATH);
@@ -498,7 +473,8 @@ export const getPegaConfig = async () => {
 
 export const getPegaServerConfig = async () => {
   const config = await getPegaConfig();
-  return config[DXCB_CONFIG][DXCB_PUBLISH_ACCESS];
+  const server = config[SERVER_CONFIG][SERVER_REST_URL];
+  return { ...config[DXCB_CONFIG][DXCB_PUBLISH_ACCESS], server };
 };
 
 export const getComponentDefaults = async () => {
@@ -516,14 +492,7 @@ export const getComponentDirectoryPath = async (componentKey, category = CATEGOR
   let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
   data = JSON.parse(data);
 
-  if (!data[DXCB_CONFIG] || !data[DXCB_CONFIG][COMPONENTS_DIRECTORY_PATH]) {
-    console.error(
-      `${chalk.red.bold('ERROR')} Could not able find components directory path in config.json`
-    );
-    process.exit(1);
-  }
-
-  return join(currentDirectory, data[DXCB_CONFIG][COMPONENTS_DIRECTORY_PATH], categoryDirectory, componentKey);
+  return join(currentDirectory, COMPONENTS_DIRECTORY_PATH, categoryDirectory, componentKey);
 };