@pega/custom-dx-components 0.242.58 → 0.242.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pega/custom-dx-components",
-  "version": "0.242.58",
+  "version": "0.242.60",
   "description": "Utility for building custom UI components",
   "bin": "./bin/index.js",
   "scripts": {

package/src/tasks/export-archive/helper.js

@@ -101,8 +101,11 @@ export const updateSavedExportFilePath = async(filePath) => {
     }
 
     if (filePath.indexOf(defaultPath) === 0) {
-      // same starting path, so we can save the relative
-      const relativePath = filePath.replace(defaultPath.concat(path.sep), "");
+      let relativePath = "";
+      if (filePath !== defaultPath) {
+        // same starting path, so we can save the relative
+        relativePath = filePath.replace(defaultPath.concat("/"), "");
+      }
 
       await setConfigExportRelativePath(relativePath);
       await forceDefaultsUpdate();
@@ -112,8 +115,13 @@ export const updateSavedExportFilePath = async(filePath) => {
   else {
     // mac
     if (filePath.indexOf(defaultPath) === 0) {
-      // same starting path, so we can save the relative
-      const relativePath = filePath.replace(defaultPath.concat("/"), "");
+
+      let relativePath = "";
+      if (filePath !== defaultPath) {
+        // same starting path, so we can save the relative
+        relativePath = filePath.replace(defaultPath.concat("/"), "");
+      }
+
 
       await setConfigExportRelativePath(relativePath);
       await forceDefaultsUpdate();

package/src/tasks/import-archive/helper.js

@@ -287,8 +287,12 @@ export const updateSavedFilePath = async(filePath) => {
     }
 
     if (filePath.indexOf(defaultPath) === 0) {
-      // same starting path, so we can save the relative
-      const relativePath = filePath.replace(defaultPath.concat(path.sep), "");
+
+      let relativePath = "";
+      if (filePath !== defaultPath) {
+        // same starting path, so we can save the relative
+        relativePath = filePath.replace(defaultPath.concat("/"), "");
+      }
 
       await setConfigImportRelativePath(relativePath);
       await forceDefaultsUpdate();
@@ -298,8 +302,12 @@ export const updateSavedFilePath = async(filePath) => {
   else {
     // mac
     if (filePath.indexOf(defaultPath) === 0) {
-      // same starting path, so we can save the relative
-      const relativePath = filePath.replace(defaultPath.concat("/"), "");
+
+      let relativePath = "";
+      if (filePath !== defaultPath) {
+        // same starting path, so we can save the relative
+        relativePath = filePath.replace(defaultPath.concat("/"), "");
+      }
 
       await setConfigImportRelativePath(relativePath);
       await forceDefaultsUpdate();

package/src/tasks/import-comp/helper.js

@@ -54,15 +54,40 @@ export const updateSavedFilePath = async(filePath) => {
 
   let defaultPath = join(path.sep, arPathParts[0], arPathParts[1], arPathParts[2]);
 
-  if (filePath.indexOf(defaultPath) === 0) {
-    // same starting path, so we can save the relative
-    const relativePath = filePath.replace(defaultPath.concat("/"), "");
+  if (path.sep != "/") {
+    // windows
+    if (defaultPath.indexOf(path.sep) === 0) {
+      // if start with \\, then remove
+      defaultPath = defaultPath.substring(1);
+    }
+
+    if (filePath.indexOf(defaultPath) === 0) {
+
+      let relativePath = "";
+      if (filePath !== defaultPath) {
+        // same starting path, so we can save the relative
+        relativePath = filePath.replace(defaultPath.concat("/"), "");
+      }
 
-    if (relativePath != configDef.importRelativePath) {
       await setConfigImportRelativePath(relativePath);
       await forceDefaultsUpdate();
+
     }
+  }
+  else {
+    // mac
+    if (filePath.indexOf(defaultPath) === 0) {
 
+      let relativePath = "";
+      if (filePath !== defaultPath) {
+        // same starting path, so we can save the relative
+        relativePath = filePath.replace(defaultPath.concat("/"), "");
+      }
 
+      await setConfigImportRelativePath(relativePath);
+      await forceDefaultsUpdate();
+
+    }
   }
+
 }

package/src/tasks/import-comp/index.js

@@ -284,7 +284,7 @@ addDebugLog("getFolderList", `filePath: ${filePath}`, "");
   if (fs.existsSync(filePath)) {
     return fs
       .readdirSync(filePath, { withFileTypes: true })
-      .filter(dirent => dirent.isDirectory())
+      .filter(dirent => dirent.isDirectory()  && !dirent.name.startsWith("."))
       .map(dirent => dirent.name);
   }
   else {

package/src/tasks/init/template/package.json.mustache

@@ -101,8 +101,8 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.15.1",
-    "@pega/custom-dx-components": "~0.242.58",
-    "@pega/pcore-pconnect-typedefs": "~3.2.0-alpha.2",
+    "@pega/custom-dx-components": "~0.242.60",
+    "@pega/pcore-pconnect-typedefs": "3.2.1",
     "@storybook/addon-actions": "^7.6.19",
     "@storybook/addon-essentials": "^7.6.19",
     "@storybook/addon-knobs": "^7.1.1",

package/src/tasks/restore-config/index.js

@@ -37,7 +37,7 @@ addDebugLog("restoreConfig", "", "+");
     },
   ]);
 
-  await restoreTopLevelConfigFilesFromTemplate();
+  await restoreTopLevelConfigFilesFromTemplate(false);
   console.log(chalk.green("Original config files restored."));
 
   if (restoreAns.restoreDev) {

package/src/util.js

@@ -604,7 +604,7 @@ if (showDebug) addDebugLog("getTemplateConfigFiles", ``, "");
 
 }
 
-export const restoreTopLevelConfigFilesFromTemplate = async() => {
+export const restoreTopLevelConfigFilesFromTemplate = async(clearDep = true) => {
 if (showDebug) addDebugLog("restoreTopLevelConfigFilesFromTemplate", ``, "");
   // we can't loose devDep that is part of install, so go get the template mustache and push
   // those in, replacing any changes there, but allowing additional, an keeping it updated
@@ -661,9 +661,10 @@ if (showDebug) addDebugLog("restoreTopLevelConfigFilesFromTemplate", ``, "");
 
 
   // clear out
-  cData.dependencies = {};
-  cData.devDependencies = {};
-
+  if (clearDep) {
+    cData.dependencies = {};
+    cData.devDependencies = {};
+  }
 
 
   const tDep = tData.dependencies;
@@ -860,7 +861,7 @@ if (showDebug) addDebugLog("setConfigImportRelativePath", `importRelativePath: $
 }
 
 export const setConfigExportRelativePath = async (exportRelativePath) => {
-if (showDebug) addDebugLog("setConfigImportRelativePath", `exportRelativePath: ${exportRelativePath}`, "");
+if (showDebug) addDebugLog("setConfigExportRelativePath", `exportRelativePath: ${exportRelativePath}`, "");
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
   let configData = await getPegaConfig(true);
@@ -1557,10 +1558,13 @@ if (showDebug) addDebugLog("getComponentsConfigs", "", "");
       const componentDirectory = await getComponentDirectoryPath(componentKey, compDir);
       const configPath = join(componentDirectory, 'config.json');
 
-      let data = fs.readFileSync(configPath, { encoding: 'utf8' });
+      if (fs.existsSync(configPath)) {
+        let data = fs.readFileSync(configPath, { encoding: 'utf8' });
+
+        data = JSON.parse(data);
+        componentsConfigJSON.push(data);
+      }
 
-      data = JSON.parse(data);
-      componentsConfigJSON.push(data);
 
     }
   }