@pega/custom-dx-components 0.25.42 → 0.25.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pega/custom-dx-components",
-  "version": "0.25.42",
+  "version": "0.25.44",
   "description": "Utility for building custom UI components",
   "bin": "./bin/index.js",
   "scripts": {
@@ -19,7 +19,7 @@
     "@babel/plugin-transform-class-properties": "^7.27.1",
     "@babel/preset-react": "^7.27.1",
     "@pega/auth": "^0.2.24",
-    "@pega/constellation-dx-components-build-utils": "^2.0.5",
+    "@pega/constellation-dx-components-build-utils": "^2.0.6",
     "@pega/inquirer-fuzzy-path": "^3.0.0",
     "ajv": "^8.17.1",
     "ajv-keywords": "^5.1.0",

package/src/tasks/create/index.js

@@ -119,7 +119,7 @@ const compileMustacheTemplates = async (
       TYPE: type,
       SUB_TYPE: JSON.stringify(mustacheSubType),
       SUB_TYPE_LABEL: subTypeLabel,
-      DESCRIPTION: description,
+      DESCRIPTION: description || componentLabel,
       IS_TEMPLATE: isTemplate,
       IS_PICKLIST: isPicklist,
       IS_BOOLEAN: isBool,
@@ -190,6 +190,8 @@ const validateCompile = async (
     framework = "Constellation";
   }
 
+
+
   const orgLib = getConfigDefaults();
   if (isLibraryBased) {
     // library comes from config
@@ -440,6 +442,7 @@ addDebugLog("create", "", "+");
         description,
         allowedApplications
       } = answers;
+
       await validateCompile(
         {
           componentName,

package/src/tasks/dev-server/index.js

@@ -32,7 +32,7 @@ import {
 
   console.log("");
   console.log(`Debugging Library: ${chalk.bold.green(`${confDef.currentOrgLib}/${confDef.version}`)}`);
-  console.log(`Starting dev server: ${chalk.bold.green(`http://localhost:${confDef.devServerPort}`)}\n`);
+  console.log(`Starting dev server: ${chalk.bold.green(`http://localhost:${confDef.devServerPort}/`)}\n`);
   console.log(chalk.yellow(`Be sure you have your PegaInfinity Operator using the above URL.`));
   console.log("");
 

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

@@ -380,9 +380,25 @@ export const importArch = async(filePath, fileName, hadArchive) => {
 
 
     if (hadArchive) {
-      console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
-      console.log(`You can switch to ${chalk.green(`${orgLibName}/${version}`)} via npm run switchLib.`);
-      console.log("");
+
+      if (orgLibName === configDef.currentOrgLib && version === configDef.version) {
+        console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
+        console.log(`It is the same library/version as your current source.`);
+        console.log(`--> You can retrieve and replace current source via ${chalk.green(`npm run restoreLibVersion`)}.`);
+        console.log("\n");
+      }
+      else if (orgLibName === configDef.currentOrgLib && version != configDef.version) {
+        console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
+        console.log(`--> You can switch to ${chalk.green(`${orgLibName}/${version}`)} via ${chalk.green(`npm run switchLibVersion`)}.`);
+        console.log("\n");
+      }
+      else {
+        console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
+        console.log(`--> You can switch to ${chalk.green(`${orgLibName}/${version}`)} via ${chalk.green(`npm run switchLib`)}.`);
+        console.log("\n");
+      }
+
+
     }
     else {
       const switchToFileName = `${orgLibName}_${version}.arch.zip`;
@@ -578,9 +594,23 @@ addDebugLog("importArch", `filePath: ${filePath}, fileName: ${fileName}`, "");
 
 
   if (hadArchive) {
-    console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
-    console.log(`You can switch to ${chalk.green(`${orgLibName}/${version}`)} via npm run switchLib.`);
-    console.log("");
+      if (orgLibName === configDef.currentOrgLib && version === configDef.version) {
+        console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
+        console.log(`It is the same library/version as your current source.`);
+        console.log(`--> You can retrieve and replace current source via ${chalk.green(`npm run restoreLibVersion`)}.`);
+        console.log("\n");
+      }
+      else if (orgLibName === configDef.currentOrgLib && version != configDef.version) {
+        console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
+        console.log(`--> You can switch to ${chalk.green(`${orgLibName}/${version}`)} via ${chalk.green(`npm run switchLibVersion`)}.`);
+        console.log("\n");
+      }
+      else {
+        console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
+        console.log(`--> You can switch to ${chalk.green(`${orgLibName}/${version}`)} via ${chalk.green(`npm run switchLib`)}.`);
+        console.log("\n");
+      }
+
   }
   else {
     const switchToFileName = `${orgLibName}_${version}.arch.zip`;

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

@@ -108,7 +108,7 @@
     "@babel/preset-react": "^7.27.1",
     "@babel/preset-typescript": "^7.27.1",
     "@pega/configs": "^0.16.3",
-    "@pega/custom-dx-components": "~0.25.42",
+    "@pega/custom-dx-components": "~0.25.44",
     "@pega/pcore-pconnect-typedefs": "^4.1.0-alpha.1",
     "@storybook/addon-actions": "^8.6.14",
     "@storybook/addon-essentials": "^8.6.14",

package/src/tasks/validator/index.js

@@ -370,10 +370,18 @@ export default async (option) => {
     throw new Error(`Invalid schema json in config.json: ${er}`);
   }
 
+
+
+
   const valid = validateSchema(data);
 
   if (valid) {
 
+    if (data.description === "") {
+      throw new Error(`Invalid schema json in config.json: 'description' cannot be blank.`);
+      process.exit(1);
+    }
+
     if (
       componentToValidate &&
       !/^[A-Za-z0-9]+_[A-Za-z0-9]+_[A-Za-z0-9]+$/.test(componentToValidate)

package/src/util.js

@@ -760,6 +760,11 @@ if (showDebug) addDebugLog("restoreTopLevelConfigFiles", `directory: ${directory
   const tempDirectory = join(currentDirectory, TEMP_PATH);
   const configFiles = await getTopLevelConfigFiles(tempDirectory);
 
+  // we force to get the tasks.config.json and store it locally
+  // when we call updateComponentTaskConfig we will use this stored version to bring back server-config (except ruleset/version)
+  // and component objects
+  await getPegaConfig(true);
+
   if (configFiles && configFiles.length > 0) {
     for (const configF of configFiles) {
       if (configF !== "package-lock.json" && configF !== "package.json") {
@@ -936,9 +941,9 @@ if (showDebug) { addDebugLog("getPegaConfig", "END", "-"); }
   return pegaData;
 };
 
-export const getPegaServerConfig = async () => {
+export const getPegaServerConfig = async (force = false) => {
 if (showDebug) addDebugLog("getPegaServerConfig", "", "+");
-  if (!pegaConfig) {
+  if (!pegaConfig || force) {
     pegaConfig = await getPegaConfig();
 
     if (getServerType() === "launchpad") {
@@ -2218,19 +2223,28 @@ if (showDebug) addDebugLog("updateComponentTaskConfig", "", "");
   const currentDirectory = process.cwd();
   const tempDirectory = join(currentDirectory, TEMP_PATH);
 
-  const tempConfigPath = join(tempDirectory, TASKS_CONFIG_JSON_FILENAME);
   const currentConfigPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
-
-  const contents = fs.readFileSync(tempConfigPath);
   const originalContents = fs.readFileSync(currentConfigPath);
 
-  let contentsData = JSON.parse(contents);
+  // was previously stored in
+  let contentsData = await getPegaConfig();
+
   let originalContentsData = JSON.parse(originalContents);
+  const orgRuleset = originalContentsData["server-config"].rulesetName;
+  const orgRulesetVersion = originalContentsData["server-config"].rulesetVersion;
 
-  // only copy "components" from archived task.config and "devBuild"
-  // that way, your current tasks.config isn't messed up
-  originalContentsData["server-config"].devBuild = contentsData["server-config"].devBuild;
-  originalContentsData["component"] = contentsData["component"];
+  // we keep server-config but we will restore from archive the
+  // rulset/version.  Other stuff in task.config will come from archive
+  originalContentsData["server-config"] = contentsData["server-config"];
+  // restore ruleset and verion
+  originalContentsData["server-config"].rulesetName = orgRuleset;
+  originalContentsData["server-config"].rulesetVersion = orgRulesetVersion;
+
+
+  // if we don't have a devServerPort, add the default
+  if (originalContentsData["server-config"].devServerPort === undefined) {
+    originalContentsData["server-config"].devServerPort = "3030"
+  }
 
   fs.writeFileSync(currentConfigPath, JSON.stringify(originalContentsData, null, 4), { encoding: 'utf8',flag:'w' });
 

package/tests/functional/localLibCreateLibExportImportLib.test.js

@@ -196,7 +196,7 @@ describe(`createLib createAll exportStore importStore deleteLib: ${serverDir} -
     const { stdout, stderr } = await exec(script);
 
     expect(stdout).toContain('Pega_DXIL_0.0.1.arch.zip has been imported!');
-    expect(stdout).toContain('You can switch to Pega_DXIL/0.0.1 via npm run switchLib.');
+    expect(stdout).toContain('--> You can retrieve and replace current source via npm run restoreLibVersion.');
 
     const zipFile = path.join(defaultPath, "Pega_DXIL_0.0.1.arch.zip");
     expect(fs.existsSync(zipFile)).toBeTruthy();