@eui/tools 6.14.10 → 6.14.12

package/scripts/csdr/config/packages.js

@@ -9,10 +9,9 @@ const tools = require('../../utils/tools');
 // INNER MODULES
 const innerGlobal = require('./global');
 
-
 module.exports.getCsdrPackages = () => {
   return innerGlobal.getCsdrConfig(false).packages;
-}
+};
 
 module.exports.getCsdrPackagesFull = (flattenChildren = true) => {
   const packages = innerGlobal.getCsdrConfig(flattenChildren).packages;
@@ -26,11 +25,11 @@ module.exports.getCsdrPackagesFull = (flattenChildren = true) => {
       // tools.logInfo(`Package: ${p} is in local config but not found in global... should be cleaned up`);
       // console.log(e);
     }
-  })
+  });
   return outputPackages;
-}
+};
 
-const getPackages = module.exports.getPackages = () => {
+const getPackages = (module.exports.getPackages = () => {
   const packages = innerGlobal.getConfig().packages;
   const packagesKeys = Object.keys(packages);
 
@@ -42,10 +41,9 @@ const getPackages = module.exports.getPackages = () => {
       // tools.logInfo(`Package: ${p} is in local config but not found in global... should be cleaned up`);
       // console.log(e);
     }
-  })
+  });
   return outputPackages;
-}
-
+});
 
 module.exports.getPackageByNpmPkg = (npmPkg, fromCsdrConfig) => {
   let packages;
@@ -54,7 +52,7 @@ module.exports.getPackageByNpmPkg = (npmPkg, fromCsdrConfig) => {
   if (fromCsdrConfig) {
     packages = innerGlobal.getCsdrConfig().packages;
 
-  // get only packages installed config based on super .euirc.json file generated
+    // get only packages installed config based on super .euirc.json file generated
   } else {
     packages = innerGlobal.getConfig().packages;
   }
@@ -69,7 +67,7 @@ module.exports.getPackageByNpmPkg = (npmPkg, fromCsdrConfig) => {
   }
 
   return;
-}
+};
 
 module.exports.getPackageByRepository = (repository, fromCsdrConfig) => {
   let packages;
@@ -78,7 +76,7 @@ module.exports.getPackageByRepository = (repository, fromCsdrConfig) => {
   if (fromCsdrConfig) {
     packages = innerGlobal.getCsdrConfig().packages;
 
-  // get only packages installed config based on super .euirc.json file generated
+    // get only packages installed config based on super .euirc.json file generated
   } else {
     packages = innerGlobal.getConfig().packages;
   }
@@ -93,16 +91,15 @@ module.exports.getPackageByRepository = (repository, fromCsdrConfig) => {
   }
 
   return;
-}
+};
 
-module.exports.isLocalPackage = (npmPkg) => {
+const isLocalPackage = module.exports.isLocalPackage = (npmPkg) => {
   tools.logInfo(`Checking if ${npmPkg} is localled installed`);
 
-  const packagesFound = getPackages().filter(p => p.npmPkg === npmPkg);
+  const packagesFound = getPackages().filter((p) => p.npmPkg === npmPkg);
 
   return packagesFound.length > 0;
-}
-
+};
 
 module.exports.getPackage = (pkgName, fromCsdrConfig, optional) => {
   let packages;
@@ -111,12 +108,11 @@ module.exports.getPackage = (pkgName, fromCsdrConfig, optional) => {
   if (fromCsdrConfig) {
     packages = innerGlobal.getCsdrConfig().packages;
 
-  // get only packages installed config based on super .euirc.json file generated
+    // get only packages installed config based on super .euirc.json file generated
   } else {
     packages = innerGlobal.getConfig().packages;
   }
 
-
   // checking if package has been provided as input param, if not we default to command line root argument
   // if that case package name is f.e. : pkg:build <package-name>
   if (!pkgName) {
@@ -126,7 +122,6 @@ module.exports.getPackage = (pkgName, fromCsdrConfig, optional) => {
   // fetch package from config
   let pkg = packages[pkgName];
 
-
   if (!pkg && !optional) {
     throw 'PACKAGE_NOT_FOUND';
   }
@@ -136,7 +131,7 @@ module.exports.getPackage = (pkgName, fromCsdrConfig, optional) => {
 
   // additional pkg infos
   pkg.paths = this.getPackagePaths(pkg);
-  pkg.tsConfigFileName = `${path.parse(pkg.paths.tsConfig).name}.json` ;
+  pkg.tsConfigFileName = `${path.parse(pkg.paths.tsConfig).name}.json`;
 
   // devops file location
   if (pkg.child) {
@@ -166,13 +161,28 @@ module.exports.getPackage = (pkgName, fromCsdrConfig, optional) => {
     }
   }
 
-  return pkg;
-}
+  // set local package flag
+  if (tools.isDirExists(pkg.paths.root)) {
+    pkg.local = true;
+  } else {
+    pkg.local = false;
+  }
 
+  // derive srcRoot structure flag
+  if (pkg.local) {
+    if (tools.isDirExists(pkg.paths.srcLib)) {
+      pkg.srcRootDefault = true;
+    } else {
+      pkg.srcRootDefault = false;
+    }
+  }
+
+  return pkg;
+};
 
 module.exports.getPackagePaths = (pkg) => {
   const rootDirectory = process.cwd();
-  const resolvePath = relativePath => path.resolve(rootDirectory, relativePath);
+  const resolvePath = (relativePath) => path.resolve(rootDirectory, relativePath);
 
   const packagesBasePath = 'packages';
 
@@ -197,7 +207,8 @@ module.exports.getPackagePaths = (pkg) => {
   }
 
   // Remotes specific, to switch install root dir to the remote folder itself (independent dependencies / angular & eUI version, etc...)
-  var repoNodeModules, remoteNodeModules = false;
+  var repoNodeModules,
+    remoteNodeModules = false;
   const depsBaseFile = path.join(resolvePath(packagesPath + '/' + folder), 'dependencies-base.json');
   const depsCompositeFile = path.join(resolvePath(packagesPath + '/' + folder), 'dependencies-composite.json');
   if (pkg.remote && (tools.isFileExists(depsBaseFile) || tools.isFileExists(depsCompositeFile))) {
@@ -207,7 +218,6 @@ module.exports.getPackagePaths = (pkg) => {
     repoNodeModules = resolvePath('node_modules');
   }
 
-
   // Central gathering for pkg paths, always refer to this when fetching pkg paths in code, single sources of truth
   const paths = {
     rootDirectory,
@@ -220,37 +230,38 @@ module.exports.getPackagePaths = (pkg) => {
     publish: resolvePath(packagesPath + '/' + folder + publishFolder),
     src: resolvePath(packagesPath + '/' + folder + '/src'),
     lib: resolvePath(packagesPath + '/' + folder + '/src/lib'),
+    srcLib: resolvePath(packagesPath + '/' + folder + '/src/lib'),
     tsConfig: this.getTSConfigPath(resolvePath, packagesPath + '/' + folder),
   };
 
   return paths;
-}
-
-
+};
 
 module.exports.getBuildablePackages = () => {
-  return this.getPackages().filter(pkg => {
+  return this.getPackages().filter((pkg) => {
     if (!pkg.build) {
       return true;
     }
     return pkg.build.exec !== false;
-  })
-}
+  });
+};
 
 module.exports.getRemotePackages = () => {
-  return this.getPackages().filter(pkg => {
+  return this.getPackages().filter((pkg) => {
     return pkg.remote;
-  })
-}
+  });
+};
 
 module.exports.getBuildablePackagesWithDeps = () => {
-  return this.getDepGraph().overallOrder().filter(pkg => {
-    if (!pkg.build) {
-      return true;
-    }
-    return pkg.build.exec !== false;
-  })
-}
+  return this.getDepGraph()
+    .overallOrder()
+    .filter((pkg) => {
+      if (!pkg.build) {
+        return true;
+      }
+      return pkg.build.exec !== false;
+    });
+};
 
 module.exports.getDepGraph = () => {
   const DepGraph = require('dependency-graph').DepGraph;
@@ -273,8 +284,7 @@ module.exports.getDepGraph = () => {
   });
 
   return graph;
-}
-
+};
 
 const getEuiVersionCore = (pkg) => {
   let version;
@@ -288,7 +298,7 @@ const getEuiVersionCore = (pkg) => {
     if (euiDepsBase) {
       let euiVersion = euiDepsBase.split('.')[0];
 
-      if (euiVersion.substr(0,1) === '^') {
+      if (euiVersion.substr(0, 1) === '^') {
         euiVersion = euiVersion.substr(1);
       }
       version = `${euiVersion}.x`;
@@ -300,10 +310,9 @@ const getEuiVersionCore = (pkg) => {
   }
 
   return version;
-}
-
+};
 
-const getPackageEuiVersion = module.exports.getPackageEuiVersion = (pkg, log = false) => {
+const getPackageEuiVersion = (module.exports.getPackageEuiVersion = (pkg, log = false) => {
   if (pkg.parent !== true && pkg.tsPackage !== false) {
     let version;
 
@@ -331,9 +340,7 @@ const getPackageEuiVersion = module.exports.getPackageEuiVersion = (pkg, log = f
 
     return version;
   }
-}
-
-
+});
 
 module.exports.getLocalPackagesEuiVersion = (log = true) => {
   tools.logTitle('getting local packages installed eUI version...');
@@ -347,29 +354,29 @@ module.exports.getLocalPackagesEuiVersion = (log = true) => {
     if (version) {
       versionsFound.push(version);
     }
-  })
+  });
 
   versionsFound = tools.removeArrayDuplicates(versionsFound);
 
   return versionsFound;
-}
+};
 
 module.exports.getTSConfigPath = (resolvePath, packagePath) => {
   const tsPath = resolvePath(`${packagePath}/tsconfig.json`);
   const oldPath = resolvePath(`${packagePath}/tsconfig.lib.json`);
 
   return tools.isFileExists(tsPath) ? tsPath : oldPath;
-}
+};
 
 module.exports.getTSConfigFileName = (tsConfigPath) => {
   return tsConfigPath.split('/')[tsConfigPath.split('/').length - 1];
-}
+};
 
 module.exports.getPackageScopes = () => {
   const packagesObj = this.getCsdrPackages();
   let packages = Object.keys(packagesObj);
-  packages = packages.map(p => packagesObj[p]).filter(p => !p.backend && !p.remote && p.npmPkg !== undefined);
-  const scopes = packages.map(p => p.npmPkg.split('/')[0]);
+  packages = packages.map((p) => packagesObj[p]).filter((p) => !p.backend && !p.remote && p.npmPkg !== undefined);
+  const scopes = packages.map((p) => p.npmPkg.split('/')[0]);
 
   return tools.removeArrayDuplicates(scopes);
-}
+};

package/scripts/csdr/install/common.js

@@ -16,7 +16,7 @@ const getInstallRegistry = () => {
   const NPM_REGISTRY_INSTALL = configUtils.global.getConfigOptions().NPM_REGISTRY_INSTALL;
 
   // check if registry has been passed as argument
-  var installRegistry;
+  let installRegistry;
   if (registry) {
     installRegistry = registry;
   } else {
@@ -88,7 +88,7 @@ module.exports.executeInstallPackage = (cwdPath, npmPkg) => {
 };
 
 module.exports.getResolvedCarretDeps = (deps, isMaster, isDevEnvTarget) => {
-  tools.logTitle('Resolving carret versions for prev or next version packages');
+  tools.logTitle('Resolving carret versions of detected packages');
 
   tools.logInfo('processing dependencies : ');
   console.log(deps);
@@ -101,24 +101,29 @@ module.exports.getResolvedCarretDeps = (deps, isMaster, isDevEnvTarget) => {
             const npmPkg = k;
             const version = deps[k];
 
-            tools.logInfo(`Processing ${npmPkg}:${version}`);
+            tools.logInfo(`\nProcessing ${npmPkg}:${version}`);
 
             // getting package from npmPkg
             const pkg = configUtils.packages.getPackageByNpmPkg(npmPkg, true);
 
-            // getting last major version from metadata history for pkg found
-            const lastMajorVersion = metadataUtils.package.getLastMajorVersion(
-              pkg,
-              version.substr(1).split('.')[0],
-              isMaster,
-              isDevEnvTarget
-            );
-
-            if (lastMajorVersion) {
-              tools.logInfo(`--version found : ${lastMajorVersion}`);
-              acc[k] = lastMajorVersion;
+            if (!pkg) {
+              tools.logWarning(`npmPkg: ${npmPkg} is not a CSDR package`);
+
             } else {
-              tools.logWarning(`WARNING : Can't resolve carret version from history for pkg: ${npmPkg} for version ${version}`);
+              // getting last major version from metadata history for pkg found
+              const lastMajorVersion = metadataUtils.package.getLastMajorVersion(
+                pkg,
+                version.substr(1).split('.')[0],
+                isMaster,
+                isDevEnvTarget
+              );
+
+              if (lastMajorVersion) {
+                tools.logInfo(`--version found : ${lastMajorVersion}`);
+                acc[k] = lastMajorVersion;
+              } else {
+                tools.logWarning(`WARNING : Can't resolve carret version from history for pkg: ${npmPkg} for version ${version}`);
+              }
             }
           }
           return acc;

package/scripts/csdr/metadata/app.js

@@ -166,7 +166,6 @@ const storeMetadataAssetsStandAlone = () => {
               repository: pkgVersionMetadata.name,
               version: pkgVersionMetadata.version,
               releaseDate: pkgVersionMetadata.date,
-              buildDuration: pkgVersionMetadata.duration,
             };
           }
         });

package/scripts/csdr/metadata/package-versions.js

@@ -37,22 +37,19 @@ module.exports.getMetadataSync = (pkg) => {
   return tools.getJsonFileContent(path.join(DEVOPS_METADATA_PATH, pkg.devopsVersionsMetadataFile));
 }
 
-module.exports.storeMetadata = (pkg, pkgVersion, pkgCompositeDeps, duration, envTarget, branches, auditStylesReport) => {
+module.exports.storeMetadata = (pkg, pkgVersion, pkgCompositeDeps, duration, envTarget) => {
   return Promise.resolve()
     .then(() => {
       tools.logInfo('Storing package version history metadata...');
 
       const configOptions = configUtils.global.getConfigOptions();
 
-      var generatedMetadata = {};
-      var versions = [];
-
-      let pkgMetadataFile;
+      let generatedMetadata = {};
+      let versions = [];
 
+      let pkgMetadataFile = path.join(configOptions.DEVOPS_METADATA_PATH, pkg.devopsVersionsMetadataFile);
       if (pkg.backend) {
         pkgMetadataFile = path.join(pkg.paths.root, 'package-versions-metadata.json');
-      } else {
-        pkgMetadataFile = path.join(configOptions.DEVOPS_METADATA_PATH, pkg.devopsVersionsMetadataFile);
       }
 
       if (tools.isFileExists(pkgMetadataFile)) {
@@ -60,11 +57,6 @@ module.exports.storeMetadata = (pkg, pkgVersion, pkgCompositeDeps, duration, env
         versions = generatedMetadata.versions;
       }
 
-      let isHotfixVersion = false;
-      if (branches) {
-        isHotfixVersion = branches.isHotfix;
-      }
-
       const newVersionMetadata = {
         name: pkg.name,
         version: pkgVersion,
@@ -72,23 +64,14 @@ module.exports.storeMetadata = (pkg, pkgVersion, pkgCompositeDeps, duration, env
         npmPkg: pkg.npmPkg,
         duration: duration,
         envTarget: envTarget,
-        hotfix: isHotfixVersion,
       };
 
-      if (auditStylesReport) {
-        if (!pkg.backend && !pkg.remote) {
-          newVersionMetadata.auditStylesReport = auditStylesReport;
-        }
-      }
-
       if (pkg.remote) {
         tools.logInfo('Writing remote composite dependencies');
         newVersionMetadata.dependencies = pkgCompositeDeps;
       }
       console.log(newVersionMetadata);
-
       versions.push(newVersionMetadata);
-
       generatedMetadata.versions = versions;
 
       tools.logInfo(`Write metadata on ${pkgMetadataFile}`);
@@ -100,7 +83,6 @@ module.exports.storeMetadata = (pkg, pkgVersion, pkgCompositeDeps, duration, env
       } else {
         tools.writeJsonFileSync(pkgMetadataFile, generatedMetadata);
       }
-
     })
 
     .catch((e) => {