@pega/custom-dx-components 24.2.10 → 24.2.11

package/package.json

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

package/src/constants.js

@@ -15,6 +15,7 @@ export const LIBRARY_BASED = 'libraryMode';
 export const SHARED_DIRECTORY = 'shared';
 export const SHOW_DEBUG = 'showDebug';
 export const ARCHIVES_PATH = 'store';
+export const BIN_ARCHIVES_PATH = 'bin-arch';
 export const TEMP_PATH = 'store/temp';
 export const COMPONENTS_CONFIG_FILE_NAME = 'componentsconfig.json';
 

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

@@ -86,6 +86,20 @@ addDebugLog("getLibraryVersionQuestion", "", "");
   ];
 };
 
+export const getFullArchiveQuestions = async () => {
+
+  return [
+    {
+      name: 'fullArchive',
+      type: 'rawlist',
+      message: 'Type of export',
+      choices: [{name: 'Full Archive (code)', value: 'Full'}, {name: 'CL Binary (runtime only)', value: 'Binary'}],
+      default: 'Full'
+    }
+
+  ];
+}
+
 export const updateSavedExportFilePath = async(filePath) => {
   const currentDirectory = process.cwd();
   const arPathParts = currentDirectory.split(path.sep);

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

@@ -15,11 +15,12 @@ import {
   getConfigDefaults,
   getLibraryBased,
   zipVersionAndArchive,
+  zipVersionAndArchiveCL,
   cleanUpTemp
  } from '../../util.js';
-import { TASKS_CONFIG_JSON_FILENAME, ARCHIVES_PATH } from '../../constants.js';
-import { getFilePathQuestions, getLibraryQuestion, getLibraryVersionQuestion, updateSavedExportFilePath  } from './helper.js';
-import { or } from 'ajv/dist/compile/codegen/index.js';
+import { TASKS_CONFIG_JSON_FILENAME, ARCHIVES_PATH, BIN_ARCHIVES_PATH } from '../../constants.js';
+import { getFilePathQuestions, getLibraryQuestion, getLibraryVersionQuestion, updateSavedExportFilePath, getFullArchiveQuestions  } from './helper.js';
+import { localBuildLibrary } from '../build-lib/index.js';
 
 export const DXCB_CONFIG_INTERNAL_JSON_FILENAME = 'src/dxcb.config.json';
 const currentDirectory = process.cwd();
@@ -75,9 +76,95 @@ addDebugLog("updateFile", `fileName: ${fileName}, oldComponentKeyPC: ${oldCompon
 };
 
 
+export const exportCLArch = async(exportPath, orgLibName, selectedVersion) => {
+addDebugLog("exportCLArch", `exportPath: ${exportPath}, orgLibName: ${orgLibName}, selectedVersion: ${selectedVersion}`, "");
+  const currentDirectory = process.cwd();
+  const archiveDirectory = join (currentDirectory, BIN_ARCHIVES_PATH);
+  const fileName = `${orgLibName}_${selectedVersion}.zip`;
+  const archFileName = join(archiveDirectory, fileName);
+  const configDef = await getConfigDefaults();
+
+  const exportFile = join(exportPath, fileName);
+  let output;
+
+    // need to build the libary
+    console.log(chalk.green(`\nBuilding binaries...\n`));
+    const arOrgLib = orgLibName.split("_")
+    const arVersion = selectedVersion.split("-");
+    const devBuild = arVersion.length > 1 ? true : false;
+
+    await localBuildLibrary(arOrgLib[0], arOrgLib[1], arVersion[0], devBuild);
+
+    const libraryDir = join(currentDirectory, orgLibName, selectedVersion );
+    if (fs.existsSync(libraryDir)) {
+      console.log(chalk.green(`\nExporting binaries...\n`));
+
+      if (!fs.existsSync(exportPath)) {
+        console.log(`\Path: ${chalk.yellow(`${exportPath}`)} doesn't exist.`);
+        const newPathAnswer = await inquirer.prompt([
+          {
+            name: 'createNewPath',
+            type: 'confirm',
+            message: 'Create path',
+            default: true
+          },
+        ]);
+        const createNewPath = newPathAnswer.createNewPath;
+        if (createNewPath) {
+          fs.mkdirSync(exportPath, { recursive: true });
+
+          await updateSavedExportFilePath(exportPath);
+        }
+        else {
+          console.log(chalk.green("Store not exported."));
+          process.exit();
+        }
+      }
+
+      if (fs.existsSync(exportFile)) {
+        console.log(`\nFile: ${chalk.yellow(`${fileName}`)} already exists in ${chalk.yellow(`${exportPath}`)}.`);
+        const overwriteQuestion = await inquirer.prompt([
+          {
+            name: 'overWriteFile',
+            type: 'confirm',
+            message: 'Overrwrite',
+            default: true
+          },
+        ]);
+
+        if (!overwriteQuestion.overWriteFile) {
+          console.log(chalk.green("Store not exported."));
+          process.exit();
+        }
+      }
+
+
+
+      // archive it
+      output = await zipVersionAndArchiveCL(configDef.currentOrgLib, configDef.buildVersion);
+
+      // if archiving, need to wait before copying
+      output.on('close', function() {
+        fs.copyFileSync(archFileName, exportFile );
+
+        console.log(`\n${chalk.green(`${fileName}`)} has been exported to ${chalk.green(`${exportPath}`)}`);
+
+      });
+
+    }
+    else {
+      console.log.chalk.green(`\nBinary does not exist.`);
+    }
+
 
 
-export const exportArch = async(exportPath, orgLibName, selectedVersion, currentOrArchive = "") => {
+
+
+
+}
+
+
+export const exportArch = async(exportPath, orgLibName, selectedVersion, fullArchive = "Full", currentOrArchive = "" ) => {
 addDebugLog("exportArch", `exportPath: ${exportPath}, orgLibName: ${orgLibName}, selectedVersion: ${selectedVersion}`, "");
   const currentDirectory = process.cwd();
   const archiveDirectory = join (currentDirectory, ARCHIVES_PATH, `${orgLibName}`, `${selectedVersion}`);
@@ -91,6 +178,11 @@ addDebugLog("exportArch", `exportPath: ${exportPath}, orgLibName: ${orgLibName},
 
   let archiveBeforeStore = false;
 
+  if (fullArchive != "Full") {
+    await exportCLArch(exportPath, orgLibName, selectedVersion);
+    return;
+  }
+
 
   if (orgLibName === configDef.currentOrgLib && selectedVersion === configDef.buildVersion) {
 
@@ -210,46 +302,77 @@ export default async options => {
   addDebugLog("exportArchive", "", "+");
 
 
-  if (options.params.length >= 7) {
-    const libraryName = options.params[3];
-    const libraryVersion = options.params[4];
-    const filePath = options.params[5];
-    const currentOrArchive = options.params[6];
+  if (options.params.length >= 8) {
+    let fullArchive = options.params[3];
+    const libraryName = options.params[4];
+    const libraryVersion = options.params[5];
+    const filePath = options.params[6];
+
 
-    await exportArch(filePath, libraryName, libraryVersion, currentOrArchive );
+    const currentOrArchive = options.params[7];
+
+    await exportArch(filePath, libraryName, libraryVersion, fullArchive, currentOrArchive );
 
   }
   else {
     let orgLibName = "";
     let selectedVersion = "";
+    let fullArchive = "";
 
-    if (options.params.length >= 4) {
-      orgLibName = options.params[3];
-      if (options.params.length >= 5) {
-        selectedVersion = options.params[4];
+    if (options.params.length >= 5) {
+      fullArchive = options.params[3];
+      orgLibName = options.params[4];
+      if (options.params.length >= 6) {
+        selectedVersion = options.params[5];
       }
     }
 
-
-    if (orgLibName === "") {
-      const libraryQuestion = await getLibraryQuestion();
-      const libraryAnswers = await inquirer.prompt(libraryQuestion);
-      ({ orgLibName } = libraryAnswers);
+    if (fullArchive === "" ) {
+      const fullArchiveQuestions = await getFullArchiveQuestions();
+      const fullArchiveAnswers = await inquirer.prompt(fullArchiveQuestions);
+      ({ fullArchive } = fullArchiveAnswers);
     }
 
-    if (selectedVersion === "") {
-      const libraryVersionQuestion = await getLibraryVersionQuestion(orgLibName);
-      const libraryVersionAnswer = await inquirer.prompt(libraryVersionQuestion);
-      ({ selectedVersion } = libraryVersionAnswer);
+    let filePathQuestions;
+    let filePathAnswers;
+    let filePath;
+
+    // if Binary, then we need to just build the current library, get the results and
+    // and export an archive as zip
+    if (fullArchive === "Binary") {
+      filePathQuestions = await getFilePathQuestions();
+      filePathAnswers = await inquirer.prompt(filePathQuestions);
+      ({ filePath } = filePathAnswers);
+
+      await updateSavedExportFilePath(filePath);
+
+      const configDef = getConfigDefaults();
+      orgLibName = configDef.currentOrgLib;
+      selectedVersion = configDef.buildVersion;
+
+
     }
+    else {
+      if (orgLibName === "") {
+        const libraryQuestion = await getLibraryQuestion();
+        const libraryAnswers = await inquirer.prompt(libraryQuestion);
+        ({ orgLibName } = libraryAnswers);
+      }
 
+      if (selectedVersion === "") {
+        const libraryVersionQuestion = await getLibraryVersionQuestion(orgLibName);
+        const libraryVersionAnswer = await inquirer.prompt(libraryVersionQuestion);
+        ({ selectedVersion } = libraryVersionAnswer);
+      }
 
-    const filePathQuestions = await getFilePathQuestions();
-    const filePathAnswers = await inquirer.prompt(filePathQuestions);
-    let { filePath } = filePathAnswers;
 
-    await updateSavedExportFilePath(filePath);
+      filePathQuestions = await getFilePathQuestions();
+      filePathAnswers = await inquirer.prompt(filePathQuestions);
+      ({ filePath } = filePathAnswers);
 
+      await updateSavedExportFilePath(filePath);
+
+    }
 
     // if (path.sep === "/") {
     //   if (filePath.lastIndexOf(path.sep) != filePath.length - 1) {
@@ -257,7 +380,7 @@ export default async options => {
     //   }
     // }
 
-    await exportArch( filePath, orgLibName, selectedVersion);
+    await exportArch( filePath, orgLibName, selectedVersion, fullArchive);
 
   }
 

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

@@ -78,9 +78,9 @@
   "author": "",
   "license": "Enter License",
   "dependencies": {
-    "@pega/cosmos-react-condition-builder": "~7.0.6",
-    "@pega/cosmos-react-core": "~7.0.6",
-    "@pega/cosmos-react-work": "~7.0.6",
+    "@pega/cosmos-react-condition-builder": "^7.1.2",
+    "@pega/cosmos-react-core": "^7.1.2",
+    "@pega/cosmos-react-work": "^7.1.2",
     "@pega/eslint-config": "^0.10.2",
     "@pega/tsconfig": "^0.15.1",
     "babel-loader": "^9.1.3",
@@ -101,7 +101,7 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.15.1",
-    "@pega/custom-dx-components": "~24.2.10",
+    "@pega/custom-dx-components": "~24.2.11",
     "@pega/pcore-pconnect-typedefs": "3.2.1",
     "@storybook/addon-actions": "^7.6.19",
     "@storybook/addon-essentials": "^7.6.19",

package/src/util.js

@@ -33,6 +33,7 @@ import {
   SHOW_DEBUG,
   COMPONENTS_PATH,
   ARCHIVES_PATH,
+  BIN_ARCHIVES_PATH,
   TEMP_PATH,
   JEST_TESTS_FUNCTIONAL_PATH,
   IMPORT_RELATIVE_PATH,
@@ -1633,17 +1634,6 @@ if (showDebug) addDebugLog("zipVersionAndArchive", `orgLibName: ${orgLibName}, v
     }
   }
 
-  // // Add config.json file
-  // if (fs.existsSync(tasksConfig)) {
-  //   archive.file(tasksConfig, { name: path.basename(tasksConfig) });
-  // }
-
-  // // Add package.json file
-  // if (fs.existsSync(packageJson)) {
-  //   archive.file(packageJson, { name: path.basename(packageJson) });
-  // }
-
-
   // pipe archive data to the file
   archive.pipe(output);
 
@@ -1669,11 +1659,71 @@ if (showDebug) addDebugLog("zipVersionAndArchive", `orgLibName: ${orgLibName}, v
 
   await archive.finalize();
 
+  return output;
+
+};
+
+export const zipVersionAndArchiveCL = async (orgLibName, version, currentDirectory = "") => {
+if (showDebug) addDebugLog("zipVersionAndArchiveCL", `orgLibName: ${orgLibName}, version: ${version}, currentDirectory: ${currentDirectory}`, "");
+  // const srcDirectoryPath = await getSrcDirectoryPath();
+  if (currentDirectory === "") {
+    currentDirectory = process.cwd();
+  }
+  const libDirectoryPath = join(currentDirectory, orgLibName, version);
+  const tasksConfig = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
+  const packageJson = join(currentDirectory, PACKAGE_JSON_FILENAME);
+  const archiveFileName = `${orgLibName}_${version}.zip`;
+
+
+  // const configContent = Buffer.from(fs.readFileSync(configJson)).toString();
+  const mainDirectory = process.cwd();
+  const archiveDirectory = join (mainDirectory, BIN_ARCHIVES_PATH);
+  if (!fs.existsSync(archiveDirectory)) {
+    fs.mkdirSync(archiveDirectory, { recursive: true });
+  }
+
 
+  const archiveFile = join(archiveDirectory, archiveFileName);
+  if (fs.existsSync(orgLibName)) {
+
+  }
 
-  // const zipBuffer = Buffer.concat(zipChunks);
-  // console.log(chalk.green(`component zipped with size: ${Math.ceil(zipBuffer.length / 1024)} KB`));
-  // const zipContent = zipBuffer.toString('base64');
+  const output = fs.createWriteStream(archiveFile);
+  const archive = archiver('zip', {
+    zlib: { level: 9 } // Sets the compression level.
+  });
+
+  const zipChunks = [];
+  archive.on('data', chunk => zipChunks.push(chunk));
+
+  // Add src directory
+  archive.directory(libDirectoryPath, false);
+
+
+  // pipe archive data to the file
+  archive.pipe(output);
+
+  output.on('end', function() {
+    console.log('Data has been drained');
+  });
+
+
+  // good practice to catch warnings (ie stat failures and other non-blocking errors)
+  archive.on('warning', function(err) {
+    if (err.code === 'ENOENT') {
+      // log warning
+    } else {
+      // throw error
+      throw err;
+    }
+  });
+
+  // good practice to catch this error explicitly
+  archive.on('error', function(err) {
+    throw err;
+  });
+
+  await archive.finalize();
 
   return output;
 

package/tests/functional/localLibCreateLibExportImportLib.test.js

@@ -173,7 +173,7 @@ describe(`createLib createAll exportStore importStore deleteLib: ${serverDir} -
       defaultPath = "/".concat(defaultPath);
     }
 
-    const script = `npm run exportLibVersion Pega_DXIL 0.0.1-dev ${defaultPath} Current --prefix ../../..`;
+    const script = `npm run exportLibVersion Full Pega_DXIL 0.0.1-dev ${defaultPath} Current --prefix ../../..`;
     const { stdout, stderr } = await exec(script);
 
     expect(stdout).toContain('Pega_DXIL_0.0.1-dev.zip has been exported');

package/tests/functional/localLibCreateLibExportLib.test.js

@@ -173,7 +173,7 @@ describe(`createLib createAll exportStore deleteLib: ${serverDir} - ${compType}`
       defaultPath = "/".concat(defaultPath);
     }
 
-    const script = `npm run exportLibVersion Pega_DXIL 0.0.1-dev ${defaultPath} Current --prefix ../../..`;
+    const script = `npm run exportLibVersion Full Pega_DXIL 0.0.1-dev ${defaultPath} Current --prefix ../../..`;
     const { stdout, stderr } = await exec(script);
 
     expect(stdout).toContain('Pega_DXIL_0.0.1-dev.zip has been exported');