@pega/custom-dx-components 0.242.29 → 0.242.31

package/package.json

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

package/src/cli.js

@@ -32,6 +32,7 @@ import {
   revertWebPack,
   promoteWebPack,
   showStatus,
+  setPermanent,
   storeComponents,
   updateComponent,
   validate,
@@ -62,6 +63,7 @@ const TASKS = {
   LIST_LIB: 'listLibrary',
   LIST_PUB: 'listPublished',
   SHOW_STATUS: 'showStatus',
+  SET_PERM: 'setPermanent',
   STORE: 'storeComponents',
   VALIDATE_SCHEMA: 'validateSchema',
   UPDATE: 'update',
@@ -188,6 +190,10 @@ export default async (args = []) => {
       showStatus(options);
       break;
     }
+    case TASKS.SET_PERM: {
+      setPermanent(options);
+      break;
+    }
     case TASKS.STORE: {
       storeComponents(options);
       break;

package/src/tasks/create-lib/helper.js

@@ -73,7 +73,7 @@ addDebugLog("getCreateLibComponentQuestions", "", "");
     {
       name: 'permBuild',
       type: 'confirm',
-      message: `Version to be ${chalk.bold.yellow('PERMENANT')} upon publish `,
+      message: `Version to be ${chalk.bold.yellow('PERMANENT')} upon publish `,
       default: false
     }
   ];

package/src/tasks/create-version/helper.js

@@ -69,7 +69,7 @@ addDebugLog("getCreateVersionComponentQuestions", "", "");
     {
       name: 'permBuild',
       type: 'confirm',
-      message: `Version ${chalk.bold.yellow('PERMENANT')} upon publish ?`,
+      message: `Version ${chalk.bold.yellow('PERMANENT')} upon publish ?`,
       default: !componentDefaults.devBuild
     },
     {

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

@@ -151,22 +151,12 @@ addDebugLog("exportArch", `exportPath: ${exportPath}, orgLibName: ${orgLibName},
 
 }
 
-export const convertPath = (filePath) => {
-
-  if (filePath.indexOf(":") > 0) {
-    const arFileData = filePath.split("\\");
-    filePath = join(arFileData);
-  }
-
-  return filePath;
-}
 
 export const getZipFileList = async(filePath) => {
 
-  const zipFilePath = convertPath(filePath);
-  if (fs.existsSync(zipFilePath)) {
+  if (fs.existsSync(filePath)) {
     return fs
-      .readdirSync(zipFilePath, { withFileTypes: true })
+      .readdirSync(filePath, { withFileTypes: true })
       .filter(dirent => !dirent.isDirectory() && dirent.name.match(/.*\.(zip?)/ig))
       .map(dirent => dirent.name);
   }
@@ -191,7 +181,6 @@ export default async options => {
 
 
   if (options.params.length >= 6) {
-    const filePath = convertPath(options.params[3]);
     const libraryName = options.params[4];
     const libraryVersion = options.params[5];
 
@@ -212,9 +201,6 @@ export default async options => {
     const filePathAnswers = await inquirer.prompt(filePathQuestions);
     const { filePath } = filePathAnswers;
 
-    const zipFilePath = convertPath(filePath);
-
-
     await exportArch( zipFilePath, orgLibName, selectedVersion);
 
   }

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

@@ -227,22 +227,13 @@ addDebugLog("importArch", `filePath: ${filePath}, fileName: ${fileName}`, "");
 
 }
 
-export const convertPath = (filePath) => {
 
-  if (filePath.indexOf(":") > 0) {
-    const arFileData = filePath.split("\\");
-    filePath = join(arFileData);
-  }
-
-  return filePath;
-}
 
 export const getZipFileList = async(filePath) => {
 
-  const zipFilePath = convertPath(filePath);
-  if (fs.existsSync(zipFilePath)) {
+  if (fs.existsSync(filePath)) {
     return fs
-      .readdirSync(zipFilePath, { withFileTypes: true })
+      .readdirSync(filePath, { withFileTypes: true })
       .filter(dirent => !dirent.isDirectory() && dirent.name.match(/.*\.(zip?)/ig))
       .map(dirent => dirent.name);
   }
@@ -267,10 +258,7 @@ export default async options => {
 
 
   if (options.params.length >= 5) {
-    const filePath = convertPath(options.params[3]);
     const fileName = options.params[4];
-
-
     await importArch( filePath, fileName);
 
   }
@@ -279,12 +267,11 @@ export default async options => {
     const filePathQuestions = await getFilePathQuestions();
     const filePathAnswers = await inquirer.prompt(filePathQuestions);
     const { filePath } = filePathAnswers;
-
-    const zipFilePath = convertPath(filePath);
     const zipFileList = await getZipFileList(filePath);
 
     if (!zipFileList || zipFileList.length === 0) {
       console.log(chalk.red.bold(`No zip files exist at path: ${filePath}`));
+      process.exit();
     }
 
     const fileNameQuestions = await getFileNameQuestions(zipFileList);

package/src/tasks/index.js

@@ -22,6 +22,7 @@ export { default as listComponents } from './list/index.js';
 export { default as listLibrary } from './list-lib/index.js';
 export { default as listPublished } from './list-pub/index.js';
 export { default as showStatus } from './show-status/index.js';
+export { default as setPermanent } from './set-perm/index.js';
 export { default as storeComponents } from './store/index.js';
 export { default as importArchive } from './import-archive/index.js';
 export { default as exportArchive } from './export-archive/index.js';

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

@@ -37,6 +37,7 @@
     "publishLibVersion": "custom-dx-components publish",
     "storeLibVersion": "custom-dx-components storeComponents",
     "showStatus": "custom-dx-components showStatus",
+    "setPermanent": "custom-dx-components setPermanent",
     "moveLibVersion": "custom-dx-components moveComponent",
     "importLibVersion": "custom-dx-components importArchive",
     "exportLibVersion": "custom-dx-components exportArchive",
@@ -96,7 +97,7 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.6.0",
-    "@pega/custom-dx-components": "0.242.29",
+    "@pega/custom-dx-components": "0.242.31",
     "@pega/pcore-pconnect-typedefs": "~3.0.0",
     "@storybook/addon-actions": "^7.6.7",
     "@storybook/addon-essentials": "^7.6.19",

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

@@ -36,6 +36,6 @@
     "icon": ""
   },
   "usePromotedWebPack": false,
-  "libraryBased": false,
+  "libraryMode": false,
   "showDebug": false
 }

package/src/tasks/set-perm/index.js

@@ -0,0 +1,134 @@
+import fs from 'fs';
+import path from 'path';
+import inquirer from 'inquirer';
+import chalk from 'chalk';
+
+
+import {
+  showVersion,
+  getLibraryBased,
+  addDebugLog,
+  getComponents,
+  getConfigDefaults,
+  setConfigDevBuild,
+  updateConfigVersion,
+  checkLibraryAndArchives,
+  forceDefaultsUpdate } from '../../util.js';
+import { showCurrentStatus } from '../show-status/index.js';
+
+export const updateAllComponentsConfig = async( newVersion ) => {
+addDebugLog("updateAllComponentsConfig", `newVersion: ${newVersion}`, "");
+  const componentList = await getComponents();
+  const orgLib =  getConfigDefaults();
+  // const currentOrgLib = `${orgLib.organization}_${orgLib.library}`;
+  const currentOrgLib = orgLib.currentOrgLib;
+
+  for (const index in componentList) {
+    const componentKey = componentList[index];
+    await updateConfigVersion(componentKey, newVersion, currentOrgLib);
+
+  }
+
+};
+
+
+export const setPermVersion = async (isPerm) => {
+addDebugLog("setPermVersion", `isPerm: ${isPerm}`, "");
+  const configDefaults = await getConfigDefaults();
+  const devBuild = !isPerm;
+
+  let version = configDefaults.version;
+  if (devBuild) {
+    version = version.concat("-dev");
+  }
+
+  await updateAllComponentsConfig(version);
+  await setConfigDevBuild(devBuild);
+
+
+}
+
+
+export const setPermanent = async () => {
+addDebugLog("setPermanent", "", "");
+
+  const configDefaults = await getConfigDefaults();
+
+  const isOrNot = configDefaults.devBuild ? "NOT PERMANENT" : "PERMANENT";
+
+  console.log(`Currently ${chalk.green(`${configDefaults.displayLibVersion}`)} is ${chalk.yellow(`${isOrNot}`)}.`);
+
+  if (configDefaults.devBuild) {
+    console.log(`You can switch ${chalk.green(`${configDefaults.displayLibVersion}`)} to be ${chalk.yellow('PERMANENT')}.`);
+    console.log(`\nNotes after change:`);
+    console.log(`\tUpon publish you will ${chalk.yellow('NOT')} be able to delete the published version from the server.`);
+    console.log(`\tYou CAN delete the local copies, etc. and you can revert local copies to NON permanent.\n`)
+
+    const makePermAnswer = await inquirer.prompt([
+
+      {
+        name: 'makePerm',
+        type: 'confirm',
+        message: `Make ${chalk.green(`${configDefaults.displayLibVersion}`)} ${chalk.yellow('PERMANENT')} ?`,
+        default: false
+      }
+    ]);
+
+    if (makePermAnswer.makePerm) {
+      await setPermVersion(makePermAnswer.makePerm);
+      await forceDefaultsUpdate();
+      await showCurrentStatus();
+    }
+    else {
+      console.log(chalk.green("No changes made."));
+    }
+
+  }
+  else {
+    console.log(`\nYou can switch ${chalk.green(`${configDefaults.displayLibVersion}`)} to be ${chalk.yellow('NON PERMANENT')}.`);
+    console.log(`\nNotes after change:`);
+    console.log(`\tIf ${chalk.green(`${configDefaults.displayLibVersion}`)} has been published, it can not deleted.`);
+    console.log(`\tIf not published, then a future publish can be deleted.\n`);
+
+    const makeNonPermAnswer = await inquirer.prompt([
+
+      {
+        name: 'makeNonPerm',
+        type: 'confirm',
+        message: `Make this library/version ${chalk.yellow('NON PERMANENT')} ?`,
+        default: true
+      }
+    ]);
+
+    if (makeNonPermAnswer.makeNonPerm) {
+      await setPermVersion(!makeNonPermAnswer.makeNonPerm);
+
+      await forceDefaultsUpdate();
+      await showCurrentStatus();
+    }
+    else {
+      console.log(chalk.green("No changes made."));
+    }
+  }
+
+
+}
+
+
+export default async options => {
+  const isLibraryBased =  getLibraryBased();
+  if (!isLibraryBased) {
+    console.log(`Command only supported for ${chalk.bold.green('library mode')} components.`);
+    process.exit();
+  }
+addDebugLog("setPerm", "", "+");
+
+  await showVersion();
+  await checkLibraryAndArchives();
+  // await showCurrentStatus();
+  await setPermanent();
+
+
+addDebugLog("setPerm", "END", "-");
+
+}

package/src/tasks/show-status/index.js

@@ -16,7 +16,12 @@ export const showCurrentStatus = async () => {
   console.log(`\tOrganization:\t ${chalk.bold.green(`${configDefaults.organization}`)}`);
   console.log(`\tLibrary:\t ${chalk.bold.green(`${configDefaults.library}`)}`);
   console.log(`\tVersion:\t ${chalk.bold.green(`${configDefaults.buildVersion}`)}`);
-  console.log(`\tPermanent:\t ${chalk.bold.green(`${!configDefaults.devBuild}`)}`);
+  if (!configDefaults.devBuild) {
+    console.log(`\tPermanent:\t ${chalk.bold.magentaBright(`${!configDefaults.devBuild}`)}`);
+  }
+  else {
+    console.log(`\tPermanent:\t ${chalk.bold.green(`${!configDefaults.devBuild}`)}`);
+  }
   console.log(`\tComponent count: ${chalk.bold.green(`${componentList.length}`)}`);
 
   console.log("");

package/src/util.js

@@ -122,6 +122,7 @@ export const setUpDefaults = async () => {
     retrievedConfigData.library = data.component.library;
     retrievedConfigData.version = data.component.version;
 
+
     const { organization } = JSON.parse(fs.readFileSync(path.resolve('package.json'), 'utf8'));
     retrievedConfigData.organization = organization;
 
@@ -131,6 +132,7 @@ export const setUpDefaults = async () => {
     }
 
     retrievedConfigData.serverType = data["server-config"].serverType;
+    retrievedConfigData.devBuild = data["server-config"].devBuild;
 
     retrievedConfigData.buildVersion = retrievedConfigData.devBuild ? `${retrievedConfigData.version}-dev` : retrievedConfigData.version;
     retrievedConfigData.currentOrgLib = `${retrievedConfigData.organization}_${retrievedConfigData.library}`;
@@ -1538,10 +1540,20 @@ export const restoreFromArchive = async (fileName, orgLibName, version) => {
   }
 
   // copy temp src/components
-  fs.cpSync(tempDirectoryComponents, currentComponentsPath, { recursive: true, force: true  });
-
-  // remove temp
-  fs.rmSync(tempDirectory, { recursive: true, force: true, maxRetries: 2  });
+  if (fs.existsSync(tempDirectoryComponents)) {
+    fs.cpSync(tempDirectoryComponents, currentComponentsPath, { recursive: true, force: true  });
+   }
+   else {
+     // nothing was archived (no src/components)
+     // so make a src/components if doesn't exist
+     if (!fs.existsSync(currentComponentsPath)) {
+       fs.mkdirSync(currentComponentsPath, { "recursive" : true});
+     }
+   }
+
+
+   // remove temp  (windows not working well with "sync", can be async, since as long as deleted, fine)
+   fs.rm(tempDirectory, { recursive: true, force: true, maxRetries: 5  },  () => {});
 
 };