@pega/dx-component-builder-sdk 0.1.38 → 0.1.40

package/package.json

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

package/src/cli.js

@@ -5,6 +5,7 @@ import {
   authenticate,
   buildComponent,
   buildAllComponents,
+  clearMap,
   createComponent,
   createAllComponents,
   deleteComponent,
@@ -23,6 +24,7 @@ import {
 } from './tasks/index.js';
 
 const TASKS = {
+  CLEAR_MAP: 'clearMap',
   CREATE: 'create',
   CREATE_ALL: 'createAll',
   OVERRIDE: 'override',
@@ -66,6 +68,10 @@ export default async (args = []) => {
   const options = parseArgumentsIntoOptions(args);
   const { task } = options;
   switch (task) {
+    case TASKS.CLEAR_MAP: {
+      clearMap(options);
+      break;
+    }
     case TASKS.CREATE: {
       createComponent(options);
       break;

package/src/constants.js

@@ -22,7 +22,9 @@ 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';
+
+export const COMPONENT_REACT_LIB_PATH = 'node_modules/@pega/react-sdk-components/lib';
+export const OVERRIDE_REACT_LIB_PATH = 'node_modules/@pega/react-sdk-overrides/lib';
 
 export const COMPONENT_DIRECTORY_PREFIX_CUSTOM = "/custom-";
 export const COMPONENT_DIRECTORY_SUFFIX_SDK = "-sdk";

package/src/tasks/clear-map/index.js

@@ -0,0 +1,18 @@
+
+import fs from 'fs';
+import path from 'path';
+import { join } from 'path';
+import chalk from 'chalk';
+
+import { clearComponentMap  } from '../map/map.js';
+import { showVersion } from '../../util.js';
+
+
+export default async options => {
+  showVersion();
+
+  await clearComponentMap();
+
+  console.log(chalk.bold.green("Clear component map"));
+  
+};

package/src/tasks/create/index.js

@@ -8,7 +8,7 @@ import inquirer from 'inquirer';
 import ncp from 'ncp';
 import chalk from 'chalk';
 
-import { checkPathAccess, showVersion } from '../../util.js';
+import { checkPathAccess, showVersion, getFramework } from '../../util.js';
 import { CATEGORY_CONSTELLATION, 
   SDK_CONFIG_JSON_FILENAME,
   DXCB_CONFIG, 
@@ -166,10 +166,7 @@ export const validateCompile = async (
 
   await checkPathAccess(pegaConfigInternalJsonPath);
 
-  let internalData = fs.readFileSync(pegaConfigInternalJsonPath, { encoding: 'utf8' });
-  internalData = internalData && JSON.parse(internalData);
-
-  framework = internalData.sdkType;
+  framework = await getFramework();
 
   let pegaConfig = await getPegaConfig();
   let templateParentDir = `./templates/${framework}`;

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

@@ -8,7 +8,7 @@ import inquirer from 'inquirer';
 import ncp from 'ncp';
 import chalk from 'chalk';
 
-import { checkPathAccess, showVersion } from '../../util.js';
+import { checkPathAccess, showVersion, getFramework } from '../../util.js';
 import { CATEGORY_CONSTELLATION, 
   SDK_CONFIG_JSON_FILENAME,
   DXCB_CONFIG, 
@@ -269,10 +269,7 @@ export const validateCompile = async (
 
   await checkPathAccess(pegaConfigInternalJsonPath);
 
-  let internalData = fs.readFileSync(pegaConfigInternalJsonPath, { encoding: 'utf8' });
-  internalData = internalData && JSON.parse(internalData);
-
-  framework = internalData.sdkType;
+  framework = await getFramework();
 
   let pegaConfig = await getPegaConfig();
   let templateParentDir = `./templates/${framework}`;

package/src/tasks/index.js

@@ -1,3 +1,4 @@
+export { default as clearMap } from './clear-map/index.js';
 export { default as createComponent } from './create/index.js';
 export { default as createAllComponents } from './create-all/index.js';
 export { default as overrideComponent } from './override/index.js';

package/src/tasks/map/map.js

@@ -5,7 +5,8 @@ import { join } from 'path';
 
 import {
   convertIntoPascalCase,
-  removeComponentPrefix
+  removeComponentPrefix,
+  getFramework
 } from '../../util.js';
 
 import {
@@ -15,110 +16,177 @@ import {
   CATEGORY_CONSTELLATION,
   COMPONENT_DIRECTORY_PREFIX_CUSTOM,
   COMPONENT_DIRECTORY_SUFFIX_SDK,
-  DXCB_CONFIG
+  COMPONENT_REACT_LIB_PATH
 } from '../../constants.js';
 
 export const SDK_LOCAL_COMPONENT_MAP_FILENAME = "sdk-local-component-map.js";
 export const IMPORT_END_TAG = "/*import end";
 export const MAP_END_TAG = "/*map end";
 
-export const updateComponentMap = async (componentKey, category = CATEGORY_CUSTOM) => {
-
-  const pegaConfigJsonPath = path.join(path.resolve(), SDK_CONFIG_JSON_FILENAME);
-  const pegaLocalComponentMapPath = path.join(path.resolve(), SDK_LOCAL_COMPONENT_MAP_FILENAME);
-  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase() + COMPONENT_DIRECTORY_SUFFIX_SDK);
-
-  const componentNameNoPrefix = removeComponentPrefix(componentKey);
-  const componentName = convertIntoPascalCase(componentNameNoPrefix);
-
-  let mapData = fs.readFileSync(pegaLocalComponentMapPath, { encoding: 'utf8' });
-
-  let importComponent = join(COMPONENTS_DIRECTORY_PATH, categoryDirectory, componentKey);
-  importComponent = "./".concat(importComponent);
-
-  let importFull = "import ".concat(componentName).concat(" from '").concat(importComponent).concat("/';");
-  let mapFull = "\"".concat(componentNameNoPrefix).concat("\" : " ).concat(componentName).concat(",");
-
-  if (mapData.indexOf(importComponent) < 0) {
-    // not present so we can add
+export const DXCB_CONFIG_INTERNAL_JSON_FILENAME = 'src/dxcb.config.json';
+const pegaConfigInternalJsonPath = path.join(path.resolve(), DXCB_CONFIG_INTERNAL_JSON_FILENAME);
+const pegaLocalComponentMapPath = path.join(path.resolve(), SDK_LOCAL_COMPONENT_MAP_FILENAME);
 
-    // add import
-    let endImportIndex = mapData.indexOf(IMPORT_END_TAG);
-    let mapDataStart = mapData.substring(0, endImportIndex);
-    let mapDataEnd = mapData.substring(endImportIndex);
-
-    mapData = mapDataStart.concat(importFull).concat("\n").concat(mapDataEnd);
-
-    // add map
-    let endMapIndex = mapData.indexOf(MAP_END_TAG);
-    mapDataStart = mapData.substring(0, endMapIndex);
-    mapDataEnd = mapData.substring(endMapIndex);
-
-    mapData = mapDataStart.concat("  ").concat(mapFull).concat("\n").concat(mapDataEnd);
+export const updateComponentMap = async (componentKey, category = CATEGORY_CUSTOM) => {
 
-    fs.writeFileSync(pegaLocalComponentMapPath, mapData, { encoding: 'utf8' });
+  const framework = await getFramework();
+
+  switch (framework) {
+    case 'SDK-React' :
+
+      const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase() + COMPONENT_DIRECTORY_SUFFIX_SDK);
+    
+      const componentNameNoPrefix = removeComponentPrefix(componentKey);
+      const componentName = convertIntoPascalCase(componentNameNoPrefix);
+    
+      let mapData = fs.readFileSync(pegaLocalComponentMapPath, { encoding: 'utf8' });
+    
+      let importComponent = join(COMPONENTS_DIRECTORY_PATH, categoryDirectory, componentKey);
+      importComponent = "./".concat(importComponent);
+    
+      let importFull = "import ".concat(componentName).concat(" from '").concat(importComponent).concat("/';");
+      let mapFull = "\"".concat(componentNameNoPrefix).concat("\" : " ).concat(componentName).concat(",");
+    
+      if (mapData.indexOf(importComponent.concat("/")) < 0) {
+        // not present so we can add
+    
+        // add import
+        let endImportIndex = mapData.indexOf(IMPORT_END_TAG);
+        let mapDataStart = mapData.substring(0, endImportIndex);
+        let mapDataEnd = mapData.substring(endImportIndex);
+    
+        mapData = mapDataStart.concat(importFull).concat("\n").concat(mapDataEnd);
+    
+        // add map
+        let endMapIndex = mapData.indexOf(MAP_END_TAG);
+        mapDataStart = mapData.substring(0, endMapIndex);
+        mapDataEnd = mapData.substring(endMapIndex);
+    
+        mapData = mapDataStart.concat("  ").concat(mapFull).concat("\n").concat(mapDataEnd);
+    
+        fs.writeFileSync(pegaLocalComponentMapPath, mapData, { encoding: 'utf8' });
+    
+    
+      }
+      break;
+    case 'SDK-Angular' :
+      break;
+    case 'WebComponents' :
+      break;
+    
+  }
 
 
-  }
 
 
 };
 
 export const deleteFromComponentMap = async (componentKey, category = CATEGORY_CUSTOM) =>  {
-  const pegaLocalComponentMapPath = path.join(path.resolve(), SDK_LOCAL_COMPONENT_MAP_FILENAME);
-  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase() + COMPONENT_DIRECTORY_SUFFIX_SDK);
-  const pegaConfigJsonPath = path.join(path.resolve(), SDK_CONFIG_JSON_FILENAME);
-
-  const componentNameNoPrefix = removeComponentPrefix(componentKey);
-  const componentName = convertIntoPascalCase(componentNameNoPrefix);
-
-  let mapData = fs.readFileSync(pegaLocalComponentMapPath, { encoding: 'utf8' });
-
-  let importComponent = join(COMPONENTS_DIRECTORY_PATH, categoryDirectory, componentKey);
-  importComponent = "./".concat(importComponent);
-
-  let importFull = "import ".concat(componentName).concat(" from '").concat(importComponent).concat("/';");
-  let mapFull = "\"".concat(componentNameNoPrefix).concat("\" : " ).concat(componentName).concat(",");
-
-
-  if (mapData.indexOf(importFull) >= 0) {
-
-    let removeImport = importFull.concat("\n");
-    let removeMap = "  ".concat(mapFull).concat("\n");
-
-    mapData = mapData.replace(removeImport, "");
-    mapData = mapData.replace(removeMap, "");
-
-    fs.writeFileSync(pegaLocalComponentMapPath, mapData, { encoding: 'utf8' });
 
+  const framework = await getFramework();
+
+  switch (framework) {
+    case 'SDK-React' :
+      const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase() + COMPONENT_DIRECTORY_SUFFIX_SDK);
+    
+      const componentNameNoPrefix = removeComponentPrefix(componentKey);
+      const componentName = convertIntoPascalCase(componentNameNoPrefix);
+    
+      let mapData = fs.readFileSync(pegaLocalComponentMapPath, { encoding: 'utf8' });
+    
+      let importComponent = join(COMPONENTS_DIRECTORY_PATH, categoryDirectory, componentKey);
+      importComponent = "./".concat(importComponent);
+    
+      let importFull = "import ".concat(componentName).concat(" from '").concat(importComponent).concat("/';");
+      let mapFull = "\"".concat(componentNameNoPrefix).concat("\" : " ).concat(componentName).concat(",");
+    
+    
+      if (mapData.indexOf(importFull) >= 0) {
+    
+        let removeImport = importFull.concat("\n");
+        let removeMap = "  ".concat(mapFull).concat("\n");
+    
+        mapData = mapData.replace(removeImport, "");
+        mapData = mapData.replace(removeMap, "");
+    
+        fs.writeFileSync(pegaLocalComponentMapPath, mapData, { encoding: 'utf8' });
+    
+      }
+      break;
+    case 'SDK-Angular' :
+      break;
+    case 'WebComponents' :
+      break;
+    
   }
 
+ 
+
 
 };
 
 export const renameComponentInMap = async (oldComponentKey, newComponentKey) =>  {
-  const pegaLocalComponentMapPath = path.join(path.resolve(), SDK_LOCAL_COMPONENT_MAP_FILENAME);
 
-  const oldComponentNameNoPrefix = removeComponentPrefix(oldComponentKey);
-  const oldComponentName = convertIntoPascalCase(oldComponentNameNoPrefix);
+  const framework = await getFramework();
+
+  switch (framework) {
+    case 'SDK-React' :
+
+      const oldComponentNameNoPrefix = removeComponentPrefix(oldComponentKey);
+      const oldComponentName = convertIntoPascalCase(oldComponentNameNoPrefix);
+    
+      const newComponentNameNoPrefix = removeComponentPrefix(newComponentKey);
+      const newComponentName = convertIntoPascalCase(newComponentNameNoPrefix);
+    
+      let mapData = fs.readFileSync(pegaLocalComponentMapPath, { encoding: 'utf8' });
+    
+      if (mapData.indexOf(oldComponentName) >= 0) {
+    
+    
+    
+        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' });
+    
+      }
+      break;
+    case 'SDK-Angular' :
+      break;
+    case 'WebComponents' :
+      break;
+    
+  }
 
-  const newComponentNameNoPrefix = removeComponentPrefix(newComponentKey);
-  const newComponentName = convertIntoPascalCase(newComponentNameNoPrefix);
 
-  let mapData = fs.readFileSync(pegaLocalComponentMapPath, { encoding: 'utf8' });
 
-  if (mapData.indexOf(oldComponentName) >= 0) {
+};
 
 
+export const clearComponentMap = async () =>  {
 
-    mapData = mapData.replaceAll(oldComponentName + " ", newComponentName + " ");
-    mapData = mapData.replaceAll(oldComponentName + ",", newComponentName + ",");
+  const framework = await getFramework();
 
-    mapData = mapData.replaceAll(oldComponentNameNoPrefix + "/", newComponentNameNoPrefix + "/");
-    mapData = mapData.replaceAll( '"' + oldComponentNameNoPrefix + '"' , '"' + newComponentNameNoPrefix + '"');
+  switch (framework) {
+    case 'SDK-React' :
+      // get blank version
+      let blankMap = path.join(path.resolve(), COMPONENT_REACT_LIB_PATH, SDK_LOCAL_COMPONENT_MAP_FILENAME);
 
-    fs.writeFileSync(pegaLocalComponentMapPath, mapData, { encoding: 'utf8' });
+      let blankMapData = fs.readFileSync(blankMap, { encoding: 'utf8' });
 
+      // store blank version in sdk-local-component-map.js
+      fs.writeFileSync(pegaLocalComponentMapPath, blankMapData, { encoding: 'utf8' });
+
+      break;
+    case 'SDK-Angular' :
+      break;
+    case 'WebComponents' :
+      break;
+    
   }
-}
+
+};
 

package/src/tasks/override/index.js

@@ -22,7 +22,7 @@ import { COMPONENT_SCHEMA,
   DXCB_COMPONENT_DEFAULTS,
   CUSTOM_TEMPLATES,
   OVERRIDE_TEMPLATE_PATH,
-  OVERRIDE_LIB_PATH } from '../../constants.js';
+  OVERRIDE_REACT_LIB_PATH } from '../../constants.js';
 
 const pegaConfigJsonPath = path.join(path.resolve(), SDK_CONFIG_JSON_FILENAME);
 
@@ -110,7 +110,9 @@ const validateCompile = async (
 
   let pegaConfig =
   await getPegaConfig();
-  let templateParentDir = OVERRIDE_LIB_PATH;
+
+  // will need to put a case statement here checking framework
+  let templateParentDir = OVERRIDE_REACT_LIB_PATH;
 
   if (pegaConfig[DXCB_CONFIG] &&
     pegaConfig[DXCB_CONFIG][CUSTOM_TEMPLATES] &&

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

@@ -22,7 +22,7 @@ import { COMPONENT_SCHEMA,
   DXCB_COMPONENT_DEFAULTS,
   CUSTOM_TEMPLATES,
   OVERRIDE_TEMPLATE_PATH,
-  OVERRIDE_LIB_PATH } from '../../constants.js';
+  OVERRIDE_REACT_LIB_PATH } from '../../constants.js';
 import { compileMustacheTemplates } from '@pega/dx-component-builder-sdk/src/tasks/create/index.js';
 
 const pegaConfigJsonPath = path.join(path.resolve(), SDK_CONFIG_JSON_FILENAME);
@@ -111,7 +111,9 @@ const validateCompile = async (
 
   let pegaConfig =
   await getPegaConfig();
-  let templateParentDir = OVERRIDE_LIB_PATH;
+
+  // will need to put a case statement here checking framework
+  let templateParentDir = OVERRIDE_REACT_LIB_PATH;
 
   if (pegaConfig[DXCB_CONFIG] &&
     pegaConfig[DXCB_CONFIG][CUSTOM_TEMPLATES] &&

package/src/tasks/scan-and-fix/index.js

@@ -6,7 +6,8 @@ import { validateCompile } from '../create/index.js';
 import {
   showVersion,
   getComponentDirectoryPath,
-  getComponentsAndSubDirectory
+  getComponentsAndSubDirectory, 
+  getFramework
 } from '../../util.js';
 import {CATEGORY_CONSTELLATION, CATEGORY_CUSTOM } from '../..//constants.js';
 import { or } from 'ajv/dist/compile/codegen/index.js';
@@ -44,10 +45,8 @@ const generateMissingCompanion = async (componentKey) => {
     const componentName = componentKey.split("_")[2];
 
     // look up the framework
-    let internalData = fs.readFileSync(pegaConfigInternalJsonPath, { encoding: 'utf8' });
-    internalData = internalData && JSON.parse(internalData);
+    const framework = await getFramework();
 
-    const framework = internalData.sdkType;
     allowedApplications = allowedApplications.toString();
 
 

package/src/util.js

@@ -1,4 +1,5 @@
 import fs from 'fs';
+import path from 'path';
 import { join } from 'path';
 import { promisify } from 'util';
 import https from 'https';
@@ -39,7 +40,7 @@ import {
   SERVER_REST_URL
 } from './constants.js';
 
-
+export const DXCB_CONFIG_INTERNAL_JSON_FILENAME = 'src/dxcb.config.json';
 
 const access = promisify(fs.access);
 
@@ -69,6 +70,15 @@ export const visualLCCategory = (category) => {
   return category.toLowerCase();
 }
 
+export const getFramework = async () => {
+  const pegaConfigInternalJsonPath = path.join(path.resolve(), DXCB_CONFIG_INTERNAL_JSON_FILENAME);
+
+  let internalData = fs.readFileSync(pegaConfigInternalJsonPath, { encoding: 'utf8' });
+  internalData = internalData && JSON.parse(internalData);
+
+  return (internalData.sdkType);
+}
+
 export const deleteLocalComponent = async (componentKey, category = CATEGORY_CUSTOM) => {
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, SDK_CONFIG_JSON_FILENAME);