@pega/custom-dx-components 0.25.22 → 0.25.24

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

@@ -6,7 +6,6 @@ import inquirer from 'inquirer';
 import ncp from 'ncp';
 import chalk from 'chalk';
 import { Listr } from 'listr2';
-import archiver from 'archiver';
 
 import StreamZip from 'node-stream-zip';
 
@@ -19,7 +18,6 @@ import {
   getDirectoryFiles,
   addDebugLog,
   checkAccessTokenExpiration,
-  checkLibraryAndArchives,
   getConfigDefaults,
   getLibraryBased,
   unZipFromArchive,
@@ -233,16 +231,193 @@ export const moveComp = async(componentKey, orgLibName, version, copyShared, opt
     fs.rmSync(tempDirectory, { recursive: true, force: true, maxRetries: 2  });
 }
 
+
 export const importArch = async(filePath, fileName, hadArchive) => {
+  addDebugLog("importArch", `filePath: ${filePath}, fileName: ${fileName}`, "");
+
+    const currentDirectory = process.cwd();
+    const tempDirectory = join(currentDirectory, TEMP_PATH);
+
+
+    const zipFilePath = join(filePath, fileName);
+
+
+    // we are going to use node stream zip to list contents of archive first,
+    // before we un archive to a temp directory.  If pass, then un archive
+    let passCount = 0;
+
+    // check to see if have a tasks.config.json  and package,json file, if not, archive not good
+    const tempTasksConfig = join(tempDirectory, "tasks.config.json");
+    const tempPackage = join(tempDirectory, "package.json");
+    const tasksConfig = "tasks.config.json";
+    const packageJson = "package.json";
+    try {
+      const testZip = new StreamZip.async({ file: zipFilePath});
+      const entries = await testZip.entries();
+
+      for (const entry of Object.values(entries)) {
+        if ( entry.name.indexOf(packageJson) >= 0 || entry.name.indexOf(tasksConfig) >= 0) {
+          passCount++;
+        }
+      }
+
+      // Do not forget to close the file once you're done
+      await testZip.close();
+    }
+    catch (ex) {
+      passCount = 0;
+    }
+
+
+    if (passCount < 2) {
+      console.log(chalk.red.bold(`Zip file: ${fileName} not a compatible DX Component archive.`));
+      process.exit(1);
+
+    }
+
+    await unZipFromArchive(zipFilePath);
+
+    // need to get info from tasks.config and package.json
+    // we won't rely on name of file, as owner can change it
+
+    let organization = await getPackgeOrg(tempPackage);
+    let localConfig = await getLocalConfigData(tempTasksConfig);
+
+    let libName = localConfig.library;
+    let orgLibName = `${organization}_${libName}`;
+    const version = localConfig.buildVersion;
+    const devBuild = localConfig.devBuild;
+
+    const configDef = getConfigDefaults();
+
+    if (organization !== configDef.organization) {
+      console.log(`\nImported ${chalk.yellow(`${orgLibName}/${version}`)} is not the same organization as your current organization: ${chalk.yellow(`${configDef.organization}`)}.`);
+      console.log(`\nTo import, the organization of the components will be changed to match your organization.`);
+      console.log(`\n\t>>> If you don't want this to happen, then end and create a new project with an organization`);
+      console.log(`\t    of ${chalk.yellow(`${organization}`)} and import there.\n`);
+
+      const proceedAnswers = await inquirer.prompt([
+
+        {
+          name: 'okToContinue',
+          type: 'confirm',
+          message: `Ok to proceed ?`,
+          default: true
+        }
+      ]);
+
+      if (proceedAnswers.okToContinue) {
+        // check if new version matches existing
+        // -dev is already on version, if present, so "false", for devBuild here
+        const alreadyExists = await hasLibraryAndVersion(libName, version, false);
+        if (alreadyExists) {
+          console.log(`${chalk.yellow(`${configDef.organization}_${libName}/${version}`)} already exists.`);
+          const archDirectories = await getLibraryArchiveDirectories();
+          const newLibNameAnswers = await inquirer.prompt([
+            {
+              name: 'libraryName',
+              message: 'Enter new libray name',
+              validate: value => {
+                /* value should not be empty
+                It should not have spaces
+                It should not start with a number
+                Only case-insensitive alphanumeric values are allowed
+              */
+                if (value && !/^\d/.test(value) && value === sanitize(value)) {
+                  if (archDirectories && archDirectories.length > 0) {
+                    const newOrgLib = `${configDef.organization}_${value}`;
+                    if (archDirectories.includes(newOrgLib)) {
+                      return `Library ${value} already exists.`;
+                    }
+                    else {
+                      return true;
+                    }
+                  }
+                  else {
+                    return true;
+                  }
+
+                }
+                else {
+                  return 'Only alphanumeric values are allowed, starting with alphabets, no spaces.';
+                }
+              }
+            }
+          ]);
+
+          libName = newLibNameAnswers.libraryName;
+        }
+
+        // rename orgLibName
+        orgLibName = `${configDef.organization}_${libName}`;
+
+        // update temp with new info
+        await updateTempArchive(libName, version, devBuild);
+
+      }
+      else {
+        process.exit();
+      }
+
+
+    }
+
+    // rearchive temp directory
+    await zipVersionAndArchive(orgLibName, version, tempDirectory);
+
+    // delete temp directory
+    fs.rmSync(tempDirectory, { recursive: true, force: true, maxRetries: 2  });
+
+
+    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("");
+    }
+    else {
+      const switchToFileName = `${orgLibName}_${version}.arch.zip`;
+
+      const tasks = new Listr(
+        [
+          {
+            title: `Restoring ${orgLibName}/${version}`,
+            task: async () => {
+              await restoreFromArchive(switchToFileName, orgLibName, version);
+            }
+          }
+        ],
+        { concurrent: false, exitOnError: true }
+      );
+
+      console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
+
+      await tasks.run().catch(err => {
+        console.log(chalk.bold.red(err.toString()));
+        process.exit(1);
+      });
+
+      console.log(`${chalk.bold.green(`\nSwitched to ${orgLibName}/${version}!\n`)}`);
+
+      await forceDefaultsUpdate();
+      await showCurrentStatus();
+
+      console.log('\n***************************************************************');
+      console.log(chalk.bold.yellow('Dependencies have changed between versions, recommend updating.'));
+      console.log(`>>> PLEASE run ${chalk.bold.yellow("'npm update'")}.`);
+      console.log('***************************************************************\n');
+    }
+
+
+  }
+
+export const importArchServer = async(filePath, fileName, hadArchive) => {
 addDebugLog("importArch", `filePath: ${filePath}, fileName: ${fileName}`, "");
 
   const currentDirectory = process.cwd();
   const tempDirectory = join(currentDirectory, TEMP_PATH);
 
-
   const zipFilePath = join(filePath, fileName);
 
-
   // we are going to use node stream zip to list contents of archive first,
   // before we un archive to a temp directory.  If pass, then un archive
   let passCount = 0;
@@ -252,8 +427,9 @@ addDebugLog("importArch", `filePath: ${filePath}, fileName: ${fileName}`, "");
   const tempPackage = join(tempDirectory, "package.json");
   const tasksConfig = "tasks.config.json";
   const packageJson = "package.json";
+  let testZip;
   try {
-    const testZip = new StreamZip.async({ file: zipFilePath});
+    testZip = new StreamZip.async({ file: zipFilePath});
     const entries = await testZip.entries();
 
     for (const entry of Object.values(entries)) {
@@ -262,32 +438,34 @@ addDebugLog("importArch", `filePath: ${filePath}, fileName: ${fileName}`, "");
       }
     }
 
-    // Do not forget to close the file once you're done
-    await testZip.close();
   }
   catch (ex) {
     passCount = 0;
   }
 
-
   if (passCount < 2) {
     console.log(chalk.red.bold(`Zip file: ${fileName} not a compatible DX Component archive.`));
+    // Do not forget to close the file once you're done
+    await testZip.close();
+
     process.exit(1);
 
   }
 
-  await unZipFromArchive(zipFilePath);
+  // make directory in temp dir, can NOT be the same directory as the zip file is in
+  const dirName = fileName.replaceAll(".zip", "");
+  const newDirPath = join(TEMP_PATH, dirName);
+  fs.mkdirSync(newDirPath);
 
+  const count = await testZip.extract(null, newDirPath);
 
+  // Do not forget to close the file once you're done
+  await testZip.close();
 
-  // if (!fs.existsSync(tempTasksConfig) || !fs.existsSync(tempPackage)) {
-  //   console.log(chalk.red.bold(`Zip file: ${fileName} not a compatible DX Component archive.`));
-  //   console.log(chalk.red.bold("Cleaning up..."));
-  //   fs.rmSync(tempDirectory, { recursive: true, force: true, maxRetries: 5  });
-  //   console.log(chalk.red.bold("Done."));
-  //   process.exit(1);
+  // we want file contents to be in the TEMP_PATH (copying, but temp directory eventually will be deleted)
+  fs.cpSync(newDirPath, TEMP_PATH, {recursive: true});
 
-  // }
+  // await unZipFromArchive(zipFilePath);
 
   // need to get info from tasks.config and package.json
   // we won't rely on name of file, as owner can change it
@@ -383,7 +561,8 @@ 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.\n`);
+    console.log(`You can switch to ${chalk.green(`${orgLibName}/${version}`)} via npm run switchLib.`);
+    console.log("");
   }
   else {
     const switchToFileName = `${orgLibName}_${version}.arch.zip`;
@@ -451,19 +630,11 @@ export const writeZipBuffer = async(fileName, fileBuffer) => {
   const currentDirectory = process.cwd();
   const tempDirectory = join(currentDirectory, TEMP_PATH);
 
-  // have to decode it and then re-encode it.
-  let decodedString;
-  try {
-    decodedString = atob(fileBuffer);
-  } catch (error) {
-  }
-
   if (!fs.existsSync (tempDirectory)) {
     fs.mkdirSync(tempDirectory);
   }
 
   const filePath = join(tempDirectory, fileName);
-
   fs.writeFileSync(filePath, fileBuffer, 'base64');
 
 }
@@ -539,18 +710,39 @@ export default async options => {
 
           const arArchData = archiveData.split(",");
           let fileName = `${arArchData[1]}.${arArchData[2]}`;
+          let fileData;
+
+          console.log("");
 
-          // get archive
-          const fileData = await getServerLibraryArchive(arArchData[0],arArchData[1], arArchData[2], arArchData[3], arArchData[4]);
-          await writeZipBuffer(fileName, fileData.pyFileSource);
+          const tasks = new Listr(
+            [
+              {
+                title: 'Fetching archive from server',
+                task: async () => {
+                  // get archive
+                  fileData = await getServerLibraryArchive(arArchData[0],arArchData[1], arArchData[2], arArchData[3], arArchData[4]);
+                }
+              },
+              {
+                title: 'Saving archive in store',
+                task: async () => {
+                  await writeZipBuffer(fileName, fileData.pyFileSource);
+
+                  // import archive
+                  const currentDirectory = process.cwd();
+                  const tempDirectory = join(currentDirectory, TEMP_PATH);
 
-          // import archive
-          const currentDirectory = process.cwd();
-          const tempDirectory = join(currentDirectory, TEMP_PATH);
+                  await importArchServer( tempDirectory, fileName, hasArch);
+                }
+              }
+            ],
+            { concurrent: false, exitOnError: true }
+          );
 
-          await importArch( tempDirectory, fileName, hasArch);
-          // const zipFilePath = join(tempDirectory, fileName);
-          //await unZipFromArchive(zipFilePath);
+          await tasks.run().catch(err => {
+            console.log(chalk.bold.red(err.toString()));
+            process.exit(1);
+          });
 
         }
 
@@ -595,8 +787,28 @@ export default async options => {
       const fileNameAnswers = await inquirer.prompt(fileNameQuestions);
       const {fileName} = fileNameAnswers;
 
+      console.log("");
+
+      const tasks = new Listr(
+        [
+          {
+            title: `Importing archive`,
+            task: async () => {
+              await importArch( filePath, fileName, hasArch);
+            }
+          }
+        ],
+        { concurrent: false, exitOnError: true }
+      );
+
+
+      await tasks.run().catch(err => {
+        console.log(chalk.bold.red(err.toString()));
+        process.exit(1);
+      });
+
+      console.log("");
 
-      await importArch( filePath, fileName, hasArch);
 
       // reapply to save if changed, because imported task.config may have overriden and we want
       // to keep what was entered as the latest

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

@@ -1,5 +1,3 @@
-import chalk from 'chalk';
-import fs from 'fs';
 import path from 'path';
 import { join } from 'path';
 import { addDebugLog, getConfigDefaults, setConfigImportRelativePath, forceDefaultsUpdate } from '../../util.js';

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

@@ -107,7 +107,7 @@
     "@babel/preset-react": "^7.26.3",
     "@babel/preset-typescript": "^7.26.0",
     "@pega/configs": "^0.16.2",
-    "@pega/custom-dx-components": "~0.25.22",
+    "@pega/custom-dx-components": "~0.25.24",
     "@pega/pcore-pconnect-typedefs": "^4.1.0-alpha.1",
     "@storybook/addon-actions": "^7.6.19",
     "@storybook/addon-essentials": "^7.6.19",

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

@@ -38,6 +38,6 @@
     "icon": ""
   },
   "usePromotedWebPack": false,
-  "libraryMode": false,
+  "libraryModeCL": false,
   "showDebug": false
 }

package/src/tasks/list/helper.js

@@ -4,8 +4,23 @@ import chalk from 'chalk';
 import fetch from 'node-fetch';
 import { join } from 'path';
 
-import { LIST_COMPONENT_SERVICE_REST_ENDPOINT, LP_LIST_COMPONENT_SERVICE_REST_ENDPOINT, TOKEN_PATH, COMPONENT_SCHEMA, TASKS_CONFIG_JSON_FILENAME, COMPONENTS_DIRECTORY_PATH, COMPONENTS_PATH } from '../../constants.js';
-import { constructCompleteUrl, getComponents, getPegaServerConfig, getHttpsAgent, addDebugLog, getLibraryBased, getComponentsConfigs, getConfigDefaults, checkAccessTokenExpiration } from '../../util.js';
+import {
+  LIST_COMPONENT_SERVICE_REST_ENDPOINT,
+  LP_LIST_COMPONENT_SERVICE_REST_ENDPOINT,
+  TOKEN_PATH, COMPONENT_SCHEMA,
+  TASKS_CONFIG_JSON_FILENAME,
+  COMPONENTS_DIRECTORY_PATH,
+  COMPONENTS_PATH } from '../../constants.js';
+import {
+  constructCompleteUrl,
+  getComponents,
+  getPegaServerConfig,
+  getHttpsAgent,
+  addDebugLog,
+  getLibraryBased,
+  getComponentsConfigs,
+  getConfigDefaults,
+  checkAccessTokenExpiration } from '../../util.js';
 
 export const SOURCE_OF_COMPONENT_TYPES = {
   SERVER: 'Server',

package/src/tasks/list-lib/index.js

@@ -1,7 +1,16 @@
 import inquirer from 'inquirer';
 import chalk from 'chalk';
 
-import {showVersion, getLibraryBased, addDebugLog, checkLibraryAndArchives, getLibraryArchivesVersions, getConfigDefaults, getLocalArchivedLibrraryVersionData, getComponentsConfigs, cleanUpTemp } from '../../util.js';
+import {
+  showVersion,
+  getLibraryBased,
+  addDebugLog,
+  checkLibraryAndArchives,
+  getLibraryArchivesVersions,
+  getConfigDefaults,
+  getLocalArchivedLibrraryVersionData,
+  getComponentsConfigs,
+  cleanUpTemp } from '../../util.js';
 import { getArchiveLibraryQuestions } from './helper.js';
 
 export default async (options) => {

package/src/tasks/list-pub/helper.js

@@ -1,9 +1,8 @@
 
 import fs from 'fs';
-import path from 'path';
 import chalk from 'chalk';
 import fetch from 'node-fetch';
-import { join } from 'path';
+
 
 import {
   getPegaServerConfig,
@@ -11,8 +10,7 @@ import {
   getC11NB2STokenAndStaticServer,
   getApplicationAndVersionFromToken,
   constructCompleteUrl,
-  getHttpsAgent,
-  getConfigDefaults
+  getHttpsAgent
 } from '../../util.js';
 
 import { listLibJSONResponse } from '@pega/constellation-dx-components-build-utils/index.js';

package/src/tasks/list-pub/index.js

@@ -1,11 +1,24 @@
 import inquirer from 'inquirer';
 import chalk from 'chalk';
 
-import {showVersion, getC11NB2STokenAndStaticServer, getLocalLibraries, getLocalLibraryVersions, getLocalLibraryVersionData, getLibraryBased, addDebugLog, checkLibraryAndArchives, getConfigDefaults, cleanUpTemp, getPegaServerConfig, getLibraryBasedCL, getApplicationAndVersionFromToken } from '../../util.js';
+import {
+  showVersion,
+  getC11NB2STokenAndStaticServer,
+  getLocalLibraries,
+  getLocalLibraryVersions,
+  getLocalLibraryVersionData,
+  getLibraryBased,
+  addDebugLog,
+  checkLibraryAndArchives,
+  getConfigDefaults,
+  cleanUpTemp,
+  getPegaServerConfig,
+  getLibraryBasedCL,
+  getApplicationAndVersionFromToken } from '../../util.js';
 
 import { listLibJSONResponse } from '@pega/constellation-dx-components-build-utils/index.js';
 
-import { getListLibraryQuestions, SOURCE_OF_COMPONENT_TYPES, getServerLibraries, getInfinityLibraries,  getServerLocalQuestion } from './helper.js';
+import { SOURCE_OF_COMPONENT_TYPES, getServerLibraries, getInfinityLibraries,  getServerLocalQuestion } from './helper.js';
 
 
 

package/src/tasks/publish/helper.js

@@ -17,7 +17,6 @@ import {
 import {
   PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
   LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
-  PUBLISH_COMPONENT_LIBRARY_SERVICE_REST_ENDPOINT,
   TOKEN_PATH
 } from '../../constants.js';
 

package/src/tasks/publish/index.js

@@ -6,7 +6,19 @@ import fs from 'fs';
 import validate from '../validator/index.js';
 import bundleComponent from '../bundle/index.js';
 import { lintComponent } from '../linter/index.js';
-import { getComponentDirectoryPath, getPegaServerConfig, showVersion, getLibraryBased, addDebugLog, updateServerConfigRuleSetAndVersion, checkLibraryAndArchives, getConfigDevBuild, checkAccessTokenExpiration, checkJWTExpiration, getConfigDefaults, getLibraryBasedCL } from '../../util.js';
+import {
+  getComponentDirectoryPath,
+  getPegaServerConfig,
+  showVersion,
+  getLibraryBased,
+  addDebugLog,
+  updateServerConfigRuleSetAndVersion,
+  checkLibraryAndArchives,
+  getConfigDevBuild,
+  checkAccessTokenExpiration,
+  checkJWTExpiration,
+  getConfigDefaults,
+  getLibraryBasedCL } from '../../util.js';
 
 import { getPublishComponentQuestions, publishComponentToServer, zipComponent } from './helper.js';
 import { default as buildLibrary } from '../build-lib/index.js';

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

@@ -5,7 +5,16 @@ import chalk from 'chalk';
 import validate from '../validator/index.js';
 import bundleComponent from '../bundle/index.js';
 import { lintComponent } from '../linter/index.js';
-import { getComponents, getComponentDirectoryPath, checkAccessTokenExpiration, showVersion, getLibraryBased, addDebugLog, getPegaServerConfig, updateServerConfigRuleSetAndVersion, checkLibraryAndArchives } from '../../util.js';
+import {
+  getComponents,
+  getComponentDirectoryPath,
+  checkAccessTokenExpiration,
+  showVersion,
+  getLibraryBased,
+  addDebugLog,
+  getPegaServerConfig,
+  updateServerConfigRuleSetAndVersion,
+  checkLibraryAndArchives } from '../../util.js';
 
 import {
   getPublishComponentQuestions,