@pega/custom-dx-components 0.242.56 → 0.242.58

package/package.json

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

package/src/cli.js

@@ -31,6 +31,7 @@ import {
   renameComponent,
   moveComponent,
   renameLibrary,
+  restoreConfig,
   revertWebPack,
   promoteWebPack,
   showStatus,
@@ -61,6 +62,7 @@ const TASKS = {
   PUBLISH_LIB: 'publishLibrary',
   RENAME: 'rename',
   RENAME_LIB: 'renameLibrary',
+  RESTORE_CONFIG: 'restoreConfig',
   QUARANTINE: 'quarantine',
   MOVE: 'moveComponent',
   LIST: 'list',
@@ -164,6 +166,10 @@ export default async (args = []) => {
       renameLibrary(options);
       break;
     }
+    case TASKS.RESTORE_CONFIG: {
+      restoreConfig(options);
+      break;
+    }
     case TASKS.QUARANTINE: {
       quarantine(options);
       break;

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

@@ -19,7 +19,8 @@ import {
   checkLibraryAndArchives,
   getConfigDevBuild,
   checkJWTExpiration,
-  getConfigDefaults
+  getConfigDefaults,
+  getLibraryBased
 } from '../../util.js';
 import bundleComponent from '../bundle/index.js';
 
@@ -125,6 +126,11 @@ addDebugLog("buildLib", "services end", "");
 }
 
 export default async options => {
+  const isLibraryBased = getLibraryBased();
+  if (!isLibraryBased) {
+    console.log(`Command only supported for ${chalk.bold.green('library based')} components.`)
+    process.exit();
+  }
 
   if (options.params.length != 4) {
     // internal so already called

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

@@ -54,7 +54,7 @@ addDebugLog("getCreateLibComponentQuestions", "", "");
 
 }
 
-export const getCreateLibComponentQuestions = async () => {
+export const getCreateLibComponentQuestions = async (libraryName = "") => {
 addDebugLog("getCreateLibComponentQuestions", "", "");
   const archDirectories = await getLibraryArchiveDirectories();
   const orgLib = getConfigDefaults();
@@ -64,6 +64,7 @@ addDebugLog("getCreateLibComponentQuestions", "", "");
     {
       name: 'libraryName',
       message: 'Enter libray name',
+      default: libraryName,
       validate: value => {
         /* value should not be empty
         It should not have spaces

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

@@ -34,7 +34,7 @@ export default async options => {
   await cleanUpTemp();
 
 addDebugLog("createLibrary", "", "+");
-  let libraryName;
+  let libraryName = "";
   let version;
   // permBuild is the opposite of devBuild
   let permBuild;
@@ -56,6 +56,7 @@ addDebugLog("createLibrary", "", "+");
     }
   }
 
+
   if (options.params.length >= 7) {
     libraryName = options.params[3];
     version = options.params[4];
@@ -63,7 +64,13 @@ addDebugLog("createLibrary", "", "+");
     currentOrOriginal = options.params[6];
     permBuild = !!(dPerm === 'Y' || dPerm === 'y' || dPerm === true || dPerm === 'true');
   } else {
-    const questions = await getCreateLibComponentQuestions();
+
+    if (!hasArch) {
+      // if no archives, get library name from tasks.config as default
+      libraryName = orgLib.library;
+    }
+
+    const questions = await getCreateLibComponentQuestions(libraryName);
     const answers = await inquirer.prompt(questions);
     ({ libraryName, version, permBuild } = answers);
   }

package/src/tasks/index.js

@@ -37,3 +37,4 @@ export { default as buildComponent } from './build-comp/index.js';
 export { default as buildAllComponents } from './build-all/index.js';
 export { default as buildLibrary } from './build-lib/index.js';
 export { default as buildJestAssets } from './build-jest-assets/index.js';
+export { default as restoreConfig } from './restore-config/index.js';

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

@@ -53,6 +53,7 @@
     "_internal-build-jest-assets": "custom-dx-components buildJestAssets",
     "_internal-buildLibrary": "custom-dx-components buildLibrary",
     "_internal-publishLibrary": "custom-dx-components publishLibrary",
+    "_internal-restoreConfig": "custom-dx-components restoreConfig",
     "_internal-test-quarantine": "custom-dx-components quarantine",
     "_lint:styles": "stylelint \"./**/*.@(js|jsx|ts|tsx)\"",
     "_lint:format": "prettier -c .",
@@ -100,8 +101,8 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.15.1",
-    "@pega/custom-dx-components": "~0.242.56",
-    "@pega/pcore-pconnect-typedefs": "~3.2.0-alpha.1",
+    "@pega/custom-dx-components": "~0.242.58",
+    "@pega/pcore-pconnect-typedefs": "~3.2.0-alpha.2",
     "@storybook/addon-actions": "^7.6.19",
     "@storybook/addon-essentials": "^7.6.19",
     "@storybook/addon-knobs": "^7.1.1",

package/src/tasks/publish/index.js

@@ -1,6 +1,7 @@
 import inquirer from 'inquirer';
 import { Listr } from 'listr2';
 import chalk from 'chalk';
+import fs from 'fs';
 
 import validate from '../validator/index.js';
 import bundleComponent from '../bundle/index.js';
@@ -11,6 +12,10 @@ import { getPublishComponentQuestions, publishComponentToServer, zipComponent }
 import { default as buildLibrary } from '../build-lib/index.js';
 import { default as publishLibrary } from '../publish-lib/index.js';
 
+import {
+  TOKEN_PATH
+} from '../../constants.js';
+
 export default async options => {
 
   await showVersion();
@@ -74,6 +79,19 @@ addDebugLog("publish", "", "+");
   }
 
 
+  let OauthData;
+  try {
+    OauthData = fs.readFileSync(TOKEN_PATH, 'utf8');
+  }
+  catch (ex) {
+
+  }
+
+  if (!OauthData) {
+    console.log(chalk.redBright("Need to authenticate, missing services token."));
+    process.exit(1);
+  }
+
   // non library based publish
   let componentKey;
   let sourceMap;

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

@@ -0,0 +1,56 @@
+import path from 'path';
+import fs from 'fs';
+import { promisify } from 'util';
+import { join } from 'path';
+
+import inquirer from 'inquirer';
+import ncp from 'ncp';
+import chalk from 'chalk';
+
+import { restoreTopLevelConfigFilesFromTemplate,
+         restoreDependenciesFromTemplate,
+         getLibraryBased,
+         showVersion,
+         addDebugLog
+        } from '../../util.js';
+
+
+
+
+export default async options => {
+addDebugLog("restoreConfig", "", "+");
+  const isLibraryBased =  getLibraryBased();
+  if (!isLibraryBased) {
+    console.log(`Command only supported for ${chalk.bold.green('library based')} components.`);
+    process.exit();
+  }
+
+  await showVersion();
+
+  const restoreAns = await inquirer.prompt([
+
+    {
+      name: 'restoreDev',
+      type: 'confirm',
+      message: 'Also restore package dependencies/devDepencies ?',
+      default: false
+    },
+  ]);
+
+  await restoreTopLevelConfigFilesFromTemplate();
+  console.log(chalk.green("Original config files restored."));
+
+  if (restoreAns.restoreDev) {
+    await restoreDependenciesFromTemplate();
+    console.log(chalk.green("Package dependencies and devDependencies restored."));
+
+    console.log('\n***************************************************************');
+    console.log(chalk.bold.yellow('Dependencies have changed, recommend updating.'));
+    console.log(`>>> PLEASE run ${chalk.bold.yellow("'npm update'")}.`);
+    console.log('***************************************************************\n');
+  }
+
+
+addDebugLog("restoreConfig", "END", "-");
+
+};

package/src/util.js

@@ -558,7 +558,13 @@ if (showDebug) addDebugLog("removeTopLevelConfigFiles", `directory: ${directory}
 
   if (configFiles && configFiles.length > 0) {
     for (const configF of configFiles) {
-      if (configF !== "package-lock.json" && configF !== "package.json" && configF !== "tasks.config.json" ) {
+      // don't remove these files, otherwise, remove it
+      if (configF !== "package-lock.json" &&
+          configF !== "package.json" &&
+          configF !== "tasks.config.json" &&
+          configF !== ".gitignore" &&
+          configF !== ".npmrc" &&
+          configF !== ".prettierignore") {
         fs.rmSync( join(directory, configF), { recursive: true, force: true, maxRetries: 2 });
       }
     }
@@ -1716,7 +1722,7 @@ if (showDebug) addDebugLog("restoreDependenciesFromPackage", "", "");
     retrievedPackageData = fs.readFileSync(tempPackagePath);
   }
   catch (ex) {
-    console.log($chalk.red(`\nUnable to retrieve package.json from store.`))
+    console.log(chalk.red(`\nUnable to retrieve package.json from store.`))
     process.exit(1);
   }
 
@@ -1724,7 +1730,7 @@ if (showDebug) addDebugLog("restoreDependenciesFromPackage", "", "");
     currentPackageData = fs.readFileSync(currentPackagePath);
   }
   catch (ex) {
-    console.log($chalk.red(`\nUnable to retrieve current package.json.`))
+    console.log(chalk.red(`\nUnable to retrieve current package.json.`))
     process.exit(1);
   }
 
@@ -1789,6 +1795,63 @@ if (showDebug) addDebugLog("restoreDependenciesFromPackage", "", "");
 
 }
 
+
+export const restoreDependenciesFromTemplate = async () => {
+  if (showDebug) addDebugLog("restoreDependenciesFromTemplate", "", "");
+    const currentDirectory = process.cwd();
+    const currentPackagePath = join(currentDirectory, PACKAGE_JSON_FILENAME);
+
+    let currentPackageData;
+
+    // reset
+    haveDependencyDifference = true;
+
+    try {
+      currentPackageData = fs.readFileSync(currentPackagePath);
+    }
+    catch (ex) {
+      console.log(chalk.red(`\nUnable to retrieve current package.json.`))
+      process.exit(1);
+    }
+
+
+    let cData = JSON.parse(currentPackageData);
+
+
+    // 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
+    // so won't loose new function if an old archive
+    const initDir = join(currentDirectory, "node_modules", "@pega", "custom-dx-components", "src", "tasks", "init");
+    const templateDir = join(initDir, "template");
+    const packageTemplateJsonPath = path.join(templateDir, 'package.json.mustache');
+    let retrievedTemplateData;
+    try {
+      retrievedTemplateData = fs.readFileSync(packageTemplateJsonPath);
+    }
+    catch (ex) {
+      console.log($chalk.red(`\nUnable to retrieve package.json.mustache from code.`))
+      process.exit(1);
+    }
+    const tData = JSON.parse(retrievedTemplateData);
+    const tDevDep = tData.devDependencies;
+    const tDep = tData.dependencies;
+
+    for (const [key, value] of Object.entries(tDevDep)) {
+      cData.devDependencies[key] = value;
+    }
+
+    for (const [key, value] of Object.entries(tDep)) {
+      cData.dependencies[key] = value;
+    }
+
+
+    // update current package json file
+    fs.writeFileSync(currentPackagePath, JSON.stringify(cData, null, 4), { encoding: 'utf8',flag:'w' });
+
+
+  }
+
+
 export const restoreDependenciesFromPackage_old = async () => {
   if (showDebug) addDebugLog("restoreDependenciesFromPackage", "", "");
     const currentDirectory = process.cwd();