@eui/tools 6.3.31 → 6.3.32

package/.version.properties

@@ -1 +1 @@
-6.3.31
+6.3.32

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 6.3.32 (2023-02-14)
+
+##### Chores
+
+* **other:**
+  * refactor and cleanup - added remotes sync on global sync and skipRemotes option - gather installable remotes for MWP - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([a6cfdff9](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a6cfdff96d90334382fa9501c277ea8332190831))
+##### Bug Fixes
+
+* **other:**
+  * registration of remotes at init - sync and creation time - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([d1d972de](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d1d972de9de724de4180d72ce024fc7070395cbc))
+
+* * *
+* * *
 ## 6.3.31 (2023-02-13)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.3.31",
+    "version": "6.3.32",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/sandbox.js

@@ -916,17 +916,6 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 //     console.log(tools.sortArray(a, 'name'));
 //   })
 
-// Promise.resolve()
-//   .then(() => {
-//     const prj = configUtils.projects.getCsdrProject('my-workplace-host-playground');
-//     return installUtils.projects.getLocalProjectRemoteDeps(prj);
-//   })
-
-// Promise.resolve()
-//   .then(() => {
-
-//   })
-
 
 
 
@@ -1144,3 +1133,23 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 //   .catch((e) => {
 //     console.log(e);
 //   })
+
+Promise.resolve()
+  .then(() => {
+    // const remotes = configUtils.remotes.getRemotes();
+    // console.log(remotes);
+    return installUtils.remotes.installDeps();
+  })
+
+
+// Promise.resolve()
+//   .then(() => {
+//     const prj = configUtils.projects.getCsdrProject('my-workplace-host-playground');
+//     return installUtils.projects.getLocalProjectRemoteDeps(prj);
+//   })
+//   .then((deps) => {
+//     console.log(deps);
+//   })
+
+
+

package/scripts/csdr/audit/yarn.js

@@ -129,7 +129,7 @@ module.exports.audit = (pkg) => {
       const configOptions = configUtils.global.getConfigOptions();
 
       // getting local csdr euiVersion
-      const euiVersion = initUtils.global.getLocalEuiVersion();
+      const euiVersion = configUtils.global.getLocalEuiVersion();
 
       // if eUI version not found, no action
       if (!euiVersion) {

package/scripts/csdr/config/angular.js

@@ -8,6 +8,7 @@ const tools = require('../../utils/tools');
 
 const innerPackages = require('./packages');
 const innerProjects = require('./projects');
+const innerRemotes = require('./remotes');
 
 // CONFIGS skeletons
 const {
@@ -177,7 +178,7 @@ module.exports.registerAngularProjectDef = (project, build = false, element = fa
   let angularRootPath;
 
   if (element) {
-    euiVersion = innerPackages.getRemoteEuiVersion(project);
+    euiVersion = innerPackages.getPackageEuiVersion(project);
     angularRootPath = project.paths.root;
   } else {
     euiVersion = innerProjects.getProjectEuiVersion(project);
@@ -349,7 +350,7 @@ module.exports.registerAngularElementModule = (pkg) => {
 
 
 module.exports.registerModulePaths = (pkg, isReset) => {
-  tools.logTitle(`Registering tsconfig paths for package : ${pkg.name}`);
+  tools.logInfo(`Registering tsconfig paths for package : ${pkg.name}`);
 
   const fileDev = path.join(process.cwd(), 'tsconfig.json');
   const fileBuild = path.join(process.cwd(), 'tsconfig.build.json');

package/scripts/csdr/config/global.js

@@ -6,17 +6,23 @@ const path = require('path');
 // LOCAL
 const tools = require('../../utils/tools');
 
+// INNER MODULES
+const innerPackages = require('./packages');
+const innerProjects = require('./projects');
+
 
 
 module.exports.getCsdrConfig = (full = true) => {
   const globalConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-config.json'));
   const appsConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-apps.json'));
   const packagesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json'));
+  const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
 
   const config = globalConfig;
 
   config.projects = {};
   config.packages = {};
+  config.remotes = {};
 
   Object.keys(appsConfig).forEach((p) => {
     config.projects[p] = appsConfig[p];
@@ -42,6 +48,10 @@ module.exports.getCsdrConfig = (full = true) => {
     }
   })
 
+  Object.keys(remotesConfig).forEach((r) => {
+    config.remotes[r] = remotesConfig[r];
+  })
+
   if (full) {
     // flatten children packages
     Object.keys(config.packages).forEach((p) => {
@@ -75,6 +85,7 @@ const getGeneratedConfig = (euircBaseFile) => {
   // initializing projects and packages objects
   genConfig.projects = {};
   genConfig.packages = {};
+  genConfig.remotes = {};
 
   // remapping projects against csdr projects config
   configContent.projects.forEach((p) => {
@@ -115,6 +126,13 @@ const getGeneratedConfig = (euircBaseFile) => {
     }
   })
 
+  // remapping remotes
+  if (configContent.remotes) {
+    configContent.remotes.forEach((r) => {
+      genConfig.remotes[r] = globalConfig.remotes[r];
+    })
+  }
+
   return genConfig;
 }
 
@@ -146,32 +164,41 @@ module.exports.getConfig = () => {
 
 
 
-module.exports.updateConfig = (project, packages, reset = false) => {
+module.exports.updateConfig = (args = { project, packages, remotes, reset}) => {
+
   const configFile = path.join(process.cwd(), '.csdr', '.euirc.json');
 
   let newConfig = {};
 
-  if (!tools.isFileExists(configFile) || reset) {
+  if (!tools.isFileExists(configFile) || args.reset) {
     newConfig.projects = [];
-    if (project && project !== 'NONE') {
-      newConfig.projects.push(project);
+    if (args.project && args.project !== 'NONE') {
+      newConfig.projects.push(args.project);
     }
     newConfig.packages = [];
-    if (packages) {
-      newConfig.packages = packages;
+    if (args.packages) {
+      newConfig.packages = args.packages;
+    }
+    newConfig.remotes = [];
+    if (args.remotes) {
+      newConfig.remotes = args.remotes;
     }
 
   } else {
     newConfig = require(configFile);
 
-    if (project && project !== 'NONE') {
-      if (newConfig.projects.indexOf(project) < 0) {
-        newConfig.projects.push(project);
+    if (args.project && args.project !== 'NONE') {
+      if (newConfig.projects.indexOf(args.project) < 0) {
+        newConfig.projects.push(args.project);
       }
     }
 
-    if (packages) {
-      newConfig.packages = tools.removeArrayDuplicates([...newConfig.packages, ...packages]);
+    if (args.packages) {
+      newConfig.packages = tools.removeArrayDuplicates([...newConfig.packages, ...args.packages]);
+    }
+
+    if (args.remotes) {
+      newConfig.remotes = tools.removeArrayDuplicates([...newConfig.remotes, ...args.remotes]);
     }
   }
 
@@ -381,3 +408,28 @@ module.exports.getNotificationMailAddress = (channelName) => {
   return channelPrefix + config.notification.mail.addressSuffix;
 }
 
+
+module.exports.getLocalEuiVersion = () => {
+  let euiVersionsLocal = [
+    ...innerPackages.getLocalPackagesEuiVersion(),
+    ...innerProjects.getLocalProjectsEuiVersion(),
+  ];
+  euiVersionsLocal = tools.removeArrayDuplicates(euiVersionsLocal);
+
+  if (euiVersionsLocal.length > 1) {
+    tools.logError('Multiple versions of eUI found in local CSDR...aborting');
+    tools.logError(`Ensure tha you've not installed packages that differs in versions, check the log above to identify which one is problematic`);
+    console.log(euiVersionsLocal);
+    throw new Error('MULTIPLE_LOCAL_EUI_VERSIONS_FOUND');
+
+  } else {
+    tools.logSuccess('eUI version checked OK');
+  }
+
+  if (euiVersionsLocal) {
+    return euiVersionsLocal[0];
+
+  } else {
+    return null;
+  }
+}

package/scripts/csdr/config/init.js

@@ -9,6 +9,7 @@ const tools = require('../../utils/tools');
 // INNER MODULES
 const innerProjects = require('./projects');
 const innerPackages = require('./packages');
+const innerRemotes = require('./remotes');
 const innerGlobal = require('./global');
 
 
@@ -18,14 +19,21 @@ module.exports.run = (args) => {
     .then(() => {
       tools.logInfo('Updating local configuration')
 
-      return getInputPackages(args.project, args.pkg, args.team, args.prjOnly, args.containerOnly);
-    })
+      let packages = [], remotes = [];
+      if (args.project || args.pkg) {
+        packages = getInputPackages(args.project, args.pkg, args.team, args.prjOnly, args.containerOnly);
+        tools.logInfo('Found packages : ');
+        console.log(packages);
+      }
 
-    .then((packages) => {
-      tools.logInfo('Found packages : ');
-      console.log(packages);
+      if (args.remote) {
+        const remote = innerRemotes.getRemote(args.remote);
+        if (remote) {
+          remotes.push(args.remote);
+        }
+      }
 
-      return innerGlobal.updateConfig(args.project, packages, args.reset);
+      return innerGlobal.updateConfig({ project: args.project, packages: packages, remotes: remotes, reset: args.reset });
     })
 
     .catch((e) => {
@@ -46,7 +54,7 @@ const getInputPackages = (project, pkg, team, prjOnly, containerOnly) => {
     tools.logTitle(`Creating package entry for : ${pkg}`);
     addPackage(pkg);
 
-    // when project or project and team are provided
+  // when project or project and team are provided
   } else {
     if (!containerOnly && !prjOnly) {
       tools.logTitle(`Creating packages entries for project:${project} / team:${team}`);

package/scripts/csdr/config/packages.js

@@ -14,15 +14,6 @@ module.exports.getCsdrPackages = () => {
   return innerGlobal.getCsdrConfig(false).packages;
 }
 
-module.exports.getCsdrPackagesArray = () => {
-  const pkgs = this.getCsdrPackages();
-  const pkgsArray = Object.keys(this.getCsdrPackages()).map((p) => {
-    return pkgs[p];
-  });
-
-  return pkgsArray;
-}
-
 module.exports.getCsdrPackagesFull = (flattenChildren = true) => {
   const packages = innerGlobal.getCsdrConfig(flattenChildren).packages;
   const packagesKeys = Object.keys(packages);
@@ -32,8 +23,8 @@ module.exports.getCsdrPackagesFull = (flattenChildren = true) => {
     try {
       outputPackages.push(this.getPackage(p, true));
     } catch (e) {
-      // tools.logInfo(`Package: ${p} is in local config but not found in global... should be cleaned up`);
-      // console.log(e);
+      tools.logInfo(`Package: ${p} is in local config but not found in global... should be cleaned up`);
+      console.log(e);
     }
   })
   return outputPackages;
@@ -48,8 +39,8 @@ const getPackages = module.exports.getPackages = () => {
     try {
       outputPackages.push(this.getPackage(p));
     } catch (e) {
-      // tools.logInfo(`Package: ${p} is in local config but not found in global... should be cleaned up`);
-      // console.log(e);
+      tools.logInfo(`Package: ${p} is in local config but not found in global... should be cleaned up`);
+      console.log(e);
     }
   })
   return outputPackages;
@@ -217,58 +208,6 @@ module.exports.getRemotePackages = () => {
   })
 }
 
-module.exports.getCsdrRemotePackages = (euiVersionNumber, hostNameTarget) => {
-
-  const euiVersionFilterFn = (r) => {
-    return r.name.indexOf(`eui${euiVersionNumber}`) > -1;
-  }
-
-  const appTargetFilterFn = (r) => {
-    if (r.build) {
-      if (!r.build.appTarget || r.build.appTarget === 'MWP_ONLY') {
-        if (hostNameTarget === 'my-workplace') {
-          return true;
-        }
-      } else if (r.build.appTarget === 'SEDIA_ONLY') {
-        if (hostNameTarget === 'sedia') {
-          return true;
-        }
-      } else if (r.build.appTarget === 'MWP_SEDIA') {
-        if (hostNameTarget === 'my-workplace' || hostNameTarget === 'sedia') {
-          return true;
-        }
-      } else {
-        return false;
-      }
-    }
-  }
-
-  const remotes = this.getCsdrPackagesArray().filter(pkg => {
-    return pkg.remote;
-  })
-
-  if (!euiVersionNumber && !hostNameTarget) {
-    return remotes;
-
-  } else if (euiVersionNumber && !hostNameTarget) {
-    return remotes.filter((r) => {
-      return euiVersionFilterFn(r);
-    });
-
-  } else if (!euiVersionNumber && hostNameTarget) {
-    return remotes.filter((r) => {
-      return appTargetFilterFn(r);
-    });
-
-  } else {
-    return remotes.filter((r) => {
-      return euiVersionFilterFn(r);
-    }).filter((r) => {
-      return appTargetFilterFn(r);
-    })
-  }
-}
-
 module.exports.getBuildablePackagesWithDeps = () => {
   return this.getDepGraph().overallOrder().filter(pkg => {
     if (!pkg.build) {
@@ -306,12 +245,8 @@ const getEuiVersionCore = (pkg) => {
   let version;
 
   const depsCompositeFile = path.join(pkg.paths.root, 'dependencies-composite.json');
-  tools.logInfo(`---- Try fetching version from ${depsCompositeFile}`);
-
-  if (!tools.isFileExists(depsCompositeFile)) {
-    tools.logInfo('---- no dependencies-composite.json file found');
 
-  } else {
+  if (tools.isFileExists(depsCompositeFile)) {
     const deps = tools.getJsonFileContent(depsCompositeFile);
     const euiDepsBase = deps['@eui/deps-base'];
 
@@ -333,47 +268,26 @@ const getEuiVersionCore = (pkg) => {
 }
 
 
-module.exports.getRemoteEuiVersion = (pkg) => {
+const getPackageEuiVersion = module.exports.getPackageEuiVersion = (pkg, log = false) => {
   if (pkg.parent !== true && pkg.tsPackage !== false) {
-    tools.logInfo(`checking --> ${pkg.name} <--`);
-
     let version;
 
     if (pkg.build && pkg.build.euiVersion) {
       version = pkg.build.euiVersion;
 
-    } else {
-      version = getEuiVersionCore(pkg);
-    }
-
-    if (version) {
-      tools.logInfo(`---- version found : ${version}\n`);
-    } else {
-      tools.logInfo('---- version detection skipped');
-    }
-
-    return version;
-  }
-}
-
-
-const getPackageEuiVersion = module.exports.getPackageEuiVersion = (pkg) => {
-  if (pkg.parent !== true && pkg.tsPackage !== false) {
-    tools.logInfo(`checking --> ${pkg.name} <--`);
-
-    let version;
-
-    if (pkg.build && pkg.build.euiVersion) {
-      version = pkg.build.euiVersion;
+    } else if (pkg.euiVersion) {
+      version = pkg.euiVersion;
 
     } else if (!pkg.remote) {
       version = getEuiVersionCore(pkg);
     }
 
-    if (version) {
-      tools.logInfo(`---- version found : ${version}\n`);
-    } else {
-      tools.logInfo('---- version detection skipped');
+    if (log) {
+      if (version) {
+        tools.logInfo(`checking -->${pkg.name}<-- => version found : ${version}\n`);
+      } else {
+        tools.logInfo(`checking -->${pkg.name}<-- => version detection skipped`);
+      }
     }
 
     return version;
@@ -382,14 +296,14 @@ const getPackageEuiVersion = module.exports.getPackageEuiVersion = (pkg) => {
 
 
 
-module.exports.getLocalPackagesEuiVersion = () => {
+module.exports.getLocalPackagesEuiVersion = (log = true) => {
   tools.logTitle('getting local packages installed eUI version...');
 
   const pkgs = getPackages();
   let versionsFound = [];
 
   pkgs.forEach((p) => {
-    const version = getPackageEuiVersion(p);
+    const version = getPackageEuiVersion(p, log);
 
     if (version) {
       versionsFound.push(version);

package/scripts/csdr/config/projects.js

@@ -224,12 +224,8 @@ const getEuiVersionCore = (project) => {
   let version;
 
   const depsCompositeFile = path.join(project.folder, 'dependencies-composite.json');
-  tools.logInfo(`---- Try fetching version from ${depsCompositeFile}`);
 
-  if (!tools.isFileExists(depsCompositeFile)) {
-    tools.logInfo('---- no dependencies-composite.json file found');
-
-  } else {
+  if (tools.isFileExists(depsCompositeFile)) {
     const jsonFileContnet = JSON.parse(tools.getFileContent(depsCompositeFile));
     const deps = jsonFileContnet.dependencies;
 
@@ -263,9 +259,9 @@ module.exports.getProjectEuiVersion = (project) => {
   const version = getEuiVersionCore(project);
 
   if (version) {
-    tools.logInfo(`---- version found : ${version}\n`);
+    tools.logInfo(`checking ${project.name} => version found : ${version}\n`);
   } else {
-    tools.logInfo('---- version detection skipped');
+    tools.logInfo(`checking ${project.name} => version detection skipped`);
   }
 
   return version;
@@ -279,18 +275,14 @@ module.exports.getLocalProjectsEuiVersion = () => {
   let versionsFound = [];
 
   prjs.forEach((p) => {
-    tools.logInfo(`checking ${p.name}`);
-
     let version = 'DEFAULT';
 
     if (p.build && p.build.euiVersion) {
       version = p.build.euiVersion;
     } else {
-      version = getEuiVersionCore(p);
+      version = this.getProjectEuiVersion(p);
     }
 
-    tools.logInfo(`---- version found : ${version}`);
-
     versionsFound.push(version);
   })
 

package/scripts/csdr/config/register.js

@@ -58,7 +58,7 @@ module.exports.registerCsdrProject = (name, isFullSkeleton) => {
   tools.writeJsonFileSync(file, jsonFile);
 
   // inserting project entry into local config
-  innerGlobal.updateConfig(name, null);
+  innerGlobal.updateConfig({ project: name });
 }
 
 
@@ -182,7 +182,6 @@ module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName,
     }
   }
 
-
   // inserting package in root config
   let packageDef;
 
@@ -202,6 +201,7 @@ module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName,
     packageDef = JSON.stringify(csdrConfigPackage);
   }
 
+  // replacing tokens
   let replaceModule = tools.replaceAll(packageDef, '@module.full.name@', pkg.name);
   replaceModule = tools.replaceAll(replaceModule, '@module.repo.name@', pkg.repoName);
   replaceModule = tools.replaceAll(replaceModule, '@module.npmPkg.name@', pkg.npmPkgName);
@@ -221,5 +221,12 @@ module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName,
   // inserting project entry into local config
   const packages = [];
   packages.push(pkg.name);
-  innerGlobal.updateConfig(null, packages);
+
+  // updating euirc.json local config
+  if (isRemote && isVirtualRemote) {
+    innerGlobal.updateConfig({ remotes: packages });
+
+  } else {
+    innerGlobal.updateConfig({ packages: packages });
+  }
 }

package/scripts/csdr/config/remotes.js

@@ -6,6 +6,11 @@ const path = require('path');
 // LOCAL
 const tools = require('../../utils/tools');
 
+// INNER
+const innerGlobal = require('./global');
+
+
+
 
 module.exports.getRemote = (remoteName) => {
 
@@ -14,18 +19,13 @@ module.exports.getRemote = (remoteName) => {
     remoteName = tools.getArgs().root;
   }
 
-  tools.logTitle(`Getting remote config for ${remoteName}`);
+  tools.logInfo(`Getting remote config for ${remoteName}`);
 
   const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
   const remoteConfig = remotesConfig[remoteName];
 
-  tools.logInfo('Global config found');
-  console.log(remoteConfig);
-
   const remotePath = path.join(process.cwd(), 'packages', 'csdr-remotes-config', 'assets', remoteName);
 
-  tools.logInfo(`Getting remote information from ${remotePath}`);
-
   if (!tools.isDirExists(remotePath)) {
     throw new Error(`Remote ${remoteName} cannot be found in the remotes global config - check packages/csdr-remotes-config for available remotes`);
   }
@@ -37,8 +37,6 @@ module.exports.getRemote = (remoteName) => {
     element: true,
     remote: true,
     virtual: true,
-    angularConfig: tools.getJsonFileContent(path.join(remotePath, 'angular-config.json')),
-    dependencies: tools.getJsonFileContent(path.join(remotePath, 'dependencies.json')),
     paths: {
       root: remoteRootPath,
       dist: path.join(remoteRootPath, 'dist'),
@@ -46,6 +44,8 @@ module.exports.getRemote = (remoteName) => {
       fromRoot: `remotes/${remoteName}`,
       repoNodeModules: path.join(remoteRootPath, 'node_modules'),
     },
+    angularConfig: tools.getJsonFileContent(path.join(remotePath, 'angular-config.json')),
+    dependencies: tools.getJsonFileContent(path.join(remotePath, 'dependencies.json')),
     devopsMetadataFile: `${remoteName}-build-metadata.json`,
     devopsVersionsMetadataFile: `${remoteName}-versions-metadata.json`,
     devopsHistoryMetadataFile: `${remoteName}-history-metadata.json`,
@@ -59,3 +59,59 @@ module.exports.getRemote = (remoteName) => {
 
   return remote;
 }
+
+
+module.exports.getCsdrRemotes = (hostName, euiVersion) => {
+
+  const hostNameFilterFn = (r) => {
+    if (r.build) {
+      if (!r.build.appTarget || r.build.appTarget === 'MWP_ONLY') {
+        if (hostName === 'my-workplace') {
+          return true;
+        }
+      } else if (r.build.appTarget === 'SEDIA_ONLY') {
+        if (hostName === 'sedia') {
+          return true;
+        }
+      } else if (r.build.appTarget === 'MWP_SEDIA') {
+        if (hostName === 'my-workplace' || hostName === 'sedia') {
+          return true;
+        }
+      } else {
+        return false;
+      }
+    }
+  }
+
+  tools.logInfo(`Getting remotes for host: ${hostName} - euiVersion: ${euiVersion}`);
+
+  const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+  const remotesArray = Object.keys(remotesConfig).map((r) => {
+    const remote = remotesConfig[r];
+    remote.name = r;
+    return remote;
+  });
+
+  let outRemotes = remotesArray;
+
+  if (hostName) {
+    outRemotes = outRemotes.filter(r => hostNameFilterFn(r));
+  }
+  if (euiVersion) {
+    outRemotes = outRemotes.filter(r => r.euiVersion === euiVersion);
+  }
+
+  return outRemotes;
+}
+
+
+module.exports.getRemotes = () => {
+  const remotes = innerGlobal.getConfig().remotes;
+  const remotesKeys = Object.keys(remotes);
+
+  let outputRemotes = [];
+  remotesKeys.forEach((r) => {
+    outputRemotes.push(this.getRemote(r));
+  })
+  return outputRemotes;
+}

package/scripts/csdr/config/sync.js

@@ -22,7 +22,7 @@ module.exports.run = () => {
   tools.logInfo('Synching packages and local config');
 
   // just for recall of the config getter which potentially execute the migrate from old config version
-  const packages = innerPackages.getPackages();
+  // const packages = innerPackages.getPackages();
 
   const pkgFolders = tools.getFolders(path.join(process.cwd(), 'packages'));
   const prjFolders = tools.getFolders(path.join(process.cwd(), 'apps'));
@@ -40,6 +40,8 @@ module.exports.run = () => {
   tools.logInfo('Host projects folders found:');
   console.log(hostFolders);
 
+  tools.logInfo('Remotes folders found:');
+  console.log(remoteFolders);
 
   // for projects, we need to take the known rootName based on the folder from the CSDR global config
   let projects = [];
@@ -69,7 +71,8 @@ module.exports.run = () => {
   // update the local config file
   const config = {
     projects: projects,
-    packages: [...pkgFolders, ...remoteFolders]
+    packages: pkgFolders,
+    remotes: remoteFolders
   };
 
   tools.writeJsonFileSync(path.join(process.cwd(), '.csdr', '.euirc.json'), config);

package/scripts/csdr/init/global.js

@@ -8,40 +8,12 @@ const tools = require('../../utils/tools');
 const configUtils = require('../config/config-utils');
 
 
-
-const getLocalEuiVersion = module.exports.getLocalEuiVersion = () => {
-  let euiVersionsLocal = [
-    ...configUtils.packages.getLocalPackagesEuiVersion(),
-    ...configUtils.projects.getLocalProjectsEuiVersion(),
-  ];
-  euiVersionsLocal = tools.removeArrayDuplicates(euiVersionsLocal);
-
-  if (euiVersionsLocal.length > 1) {
-    tools.logError('Multiple versions of eUI found in local CSDR...aborting');
-    tools.logError(`Ensure tha you've not installed packages that differs in versions, check the log above to identify which one is problematic`);
-    console.log(euiVersionsLocal);
-    throw new Error('MULTIPLE_LOCAL_EUI_VERSIONS_FOUND');
-
-  } else {
-    tools.logSuccess('eUI version checked OK');
-  }
-
-  if (euiVersionsLocal) {
-    return euiVersionsLocal[0];
-
-  } else {
-    return null;
-  }
-}
-
-
-
 module.exports.processLocalEuiVersions = () => {
  tools.logTitle('Processing injections for local installed eUI versions if needed');
 
   return Promise.resolve()
     .then(() => {
-      const euiVersion = getLocalEuiVersion();
+      const euiVersion = configUtils.global.getLocalEuiVersion();
 
       if (!euiVersion || euiVersion === 'DEFAULT') {
         tools.logInfo('Default eUI version found or empty...skipping');

package/scripts/csdr/init/init.js

@@ -61,7 +61,16 @@ module.exports.init = () => {
 
       // if no project has been provided we prompt for project and team selection
       if (!project && !pkg && !remote) {
-        return initUtils.prompt.start();
+        // TODO refactor to handle dynamic mywp-host-playground install (pre-remotes install etc...)
+        // return initUtils.prompt.start();
+        tools.logError('****************************************');
+        tools.logError('*************** ERROR ******************');
+        tools.logError('****************************************\n');
+        tools.logError('At least "pkg" or "project" or "remote" type should be used for init, for example :\n');
+        tools.logError('npm run init -- --pkg PKG_NAME [--branch BRANCH_NAME|default develop] [--git local] [--pkgOnly] [--skipInstall]');
+        tools.logError('npm run init -- --project PROJECT_NAME [--branch BRANCH_NAME|default develop] [--git local] [--prjOnly] [--skipInstall]');
+        tools.logError('npm run init -- --remote VIRTUAL_REMOTE_NAME [--remoteOnly] [--skipInstall]');
+        process.exit(0);
 
         // if provided, we are on automated mode, we use the initialized response
       } else {
@@ -80,9 +89,7 @@ module.exports.init = () => {
     // Initializing .euirc.json local file - the core of CSDR operations
     .then(() => {
       // Initialize config
-      if (!finalResponse.remote) {
-        return configUtils.init.run(finalResponse);
-      }
+      return configUtils.init.run(finalResponse);
     })
 
     // clone or install linked host package to project if any

package/scripts/csdr/init/packages.js

@@ -17,37 +17,23 @@ const importPackage = (pkg, args) => {
 
   if (pkg.parent) {
     tools.logInfo('Parent package ... skipping import');
-    return Promise.resolve();
 
   } else {
     if (pkg.tsPackage !== false) {
-      return Promise.resolve()
-      .then(() => {
-        if (!pkg.element) {
-          return configUtils.angular.registerAngularPackage(pkg, args.reset);
-        } else if (pkg.element) {
-          return configUtils.angular.registerAngularProjectDef(pkg, args.reset, true);
-        } else {
-          return configUtils.angular.registerAngularProjectDef(pkg, args.reset);
-        }
-      })
-      .then(() => {
-        if (pkg.pathInclude !== false && !pkg.element) {
-          return configUtils.angular.registerModulePaths(pkg, args.reset);
-        }
-      })
-
-      .then(() => {
-        tools.logSuccess('OK => package imported');
-      })
-
-      .catch((e) => {
-        throw e;
-      })
+      if (!pkg.element) {
+        configUtils.angular.registerAngularPackage(pkg, args.reset);
+      } else if (pkg.element) {
+        configUtils.angular.registerAngularProjectDef(pkg, args.reset, true);
+      } else {
+        configUtils.angular.registerAngularProjectDef(pkg, args.reset);
+      }
+      if (pkg.pathInclude !== false && !pkg.element) {
+        configUtils.angular.registerModulePaths(pkg, args.reset);
+      }
+      tools.logSuccess('OK => package imported');
 
     } else {
       tools.logInfo('Non TS package... skipping registration');
-      return Promise.resolve();
     }
   }
 }
@@ -55,43 +41,31 @@ const importPackage = (pkg, args) => {
 
 
 
-
 module.exports.importPackages = (args = {}) => {
 
   tools.logTitle('Importing configuration of packages');
 
-  const packages = configUtils.packages.getPackages();
+  // checking configFiles / force reset on sync
+  configUtils.angular.checkConfigFiles(args.reset);
 
-  return Promise.resolve()
-    .then(() => {
-      configUtils.angular.checkConfigFiles(args.reset);
-    })
+  // registering package in local config
 
-    .then(() => {
-      if (args.pkgOnly || args.remoteOnly) {
-        if (args.pkg) {
-          return importPackage(configUtils.packages.getPackage(args.pkg), args);
-        } else if (args.remote) {
-          return importPackage(configUtils.remotes.getRemote(args.remote), args);
-        }
-      } else {
-        Promise.resolve().then(() => {
-          return packages.reduce((promise, pkg) => {
-            return promise.then(() => (
-              importPackage(pkg, args)
-            ));
-          }, Promise.resolve());
-        })
-      }
-    })
+  // in case of "only" param we initialize only the package or remote provided as arg
+  if (args.pkgOnly || args.remoteOnly) {
+    if (args.pkg) {
+      importPackage(configUtils.packages.getPackage(args.pkg), args);
+    } else if (args.remote) {
+      importPackage(configUtils.remotes.getRemote(args.remote), args);
+    }
 
-    .then(() => {
-      tools.logSuccess('OK => all packages successfully imported');
-    })
+  // otherwise all known packages are re-registered (in case of sync this happens by default to force refresh packages config)
+  } else {
+    const packages = configUtils.packages.getPackages();
 
-    .catch((e) => {
-      throw e;
+    packages.forEach((p) => {
+      importPackage(p, args);
     })
+  }
 }
 
 
@@ -119,7 +93,7 @@ module.exports.cloneHostPackage = (projectName) => {
     .then(() => {
       const newPackages = [];
       newPackages.push(pkg.name);
-      return configUtils.global.updateConfig(null, newPackages);
+      return configUtils.global.updateConfig({ packages: newPackages });
     })
 
     .catch((e) => {

package/scripts/csdr/init/remotes.js

@@ -22,7 +22,7 @@ const cloneRemotesConfig = module.exports.cloneRemotesConfig = () => {
 
       const newPackages = [];
       newPackages.push(pkg.name);
-      return configUtils.global.updateConfig(null, newPackages);
+      return configUtils.global.updateConfig({ packages: newPackages });
     })
 
     .then(() => {

package/scripts/csdr/install/projects.js

@@ -191,36 +191,26 @@ const getLocalProjectRemoteDeps = module.exports.getLocalProjectRemoteDeps = (pr
 
   if (prj.initRemoteDependencies && remotesImport) {
 
-    tools.logTitle('Importing remotes deps');
+    tools.logTitle(`Detecting remotes deps for project : ${prj.name}`);
 
-    return Promise.resolve()
-      .then(() => {
-        return metadataUtils.package.getPackagesDeps('packages');
-      })
-
-      .then((snapshotsMetadata) => {
-        let remoteDeps = {};
-
-        const euiVersion = configUtils.projects.getProjectEuiVersion(prj).split('.')[0];
-        const remotes = configUtils.packages.getCsdrRemotePackages(euiVersion, prj.hostName);
-
-        remotes
-          .map((p) => {
-            return { npmgPkg: p.npmPkg, version: snapshotsMetadata[p.npmPkg] }
-          })
-          .forEach((r) => {
-            if (!r.version) {
-              tools.logInfo(`${r.npmgPkg} => no version found, probably the remote hasn't been released yet...skipping`)
-            } else {
-              remoteDeps[r.npmgPkg] = r.version;
-            }
-          })
-
-        tools.logInfo('Remotes found :');
-        console.log(remoteDeps);
+    const euiVersion = configUtils.global.getLocalEuiVersion();
+    const remotes = configUtils.remotes.getCsdrRemotes(prj.hostName, euiVersion);
 
-        return remoteDeps;
+    let remoteDeps = {};
+    remotes
+      .map(r => configUtils.remotes.getRemote(r.name))
+      .map((r) => {
+        return { npmgPkg: r.npmPkg, version: metadataUtils.package.getPackageVersionLast(r) }
       })
+      .forEach((r) => {
+        if (!r.version) {
+          tools.logInfo(`${r.npmgPkg} => no version found, probably the remote hasn't been released yet...skipping`)
+        } else {
+          remoteDeps[r.npmgPkg] = r.version;
+        }
+      })
+
+      return remoteDeps;
   }
 }
 

package/scripts/csdr/install/remotes.js

@@ -13,7 +13,7 @@ const innerCommon = require('./common');
 const innerCompositeCore = require('./composite-core');
 
 // FETCH ARGS
-const { dryRun } = tools.getArgs();
+const { dryRun, skipRemotes } = tools.getArgs();
 
 
 const allPkgInstall = (envTarget, compositeType) => {
@@ -24,11 +24,17 @@ const allPkgInstall = (envTarget, compositeType) => {
       tools.logInfo('Getting remote installable packages');
 
       // filter on packages who are considered remote and for which dependencies have been found
-      let packages = configUtils.packages.getRemotePackages().filter((p) => {
+      const packages = configUtils.packages.getRemotePackages().filter((p) => {
         return p.paths.remoteNodeModules;
       });
 
-      return packages;
+      // adding new "remotes" type for new stand-alone remote config
+      let remotes = [];
+      if (!skipRemotes) {
+        remotes = configUtils.remotes.getRemotes();
+      }
+
+      return [...packages, ...remotes];
     })
 
     // iterate on all packages found earlier

package/scripts/csdr/metadata/package.js

@@ -230,9 +230,7 @@ module.exports.getPackageVersionsLatest = (pkg) => {
 module.exports.getPackageVersionLast = (pkg) => {
   const pkgVersionsJson = this.getPackageVersionsJson(pkg);
 
-
-
-  if (pkgVersionsJson) {
+  if (pkgVersionsJson && pkgVersionsJson.versions) {
     return pkgVersionsJson.versions.splice(-1)[0].version;
   }
 

package/scripts/utils/api-utils.js

@@ -4,9 +4,6 @@
 const tools = require('./tools');
 const configUtils = require('../csdr/config/config-utils');
 
-// FETCH OPTIONS
-const { API_HOST } = configUtils.global.getConfigOptions();
-
 // FETCH ARGS
 const { apiUserId, apiPassword } = tools.getArgs();
 
@@ -26,6 +23,7 @@ const handleResponse = (response) => {
 
 module.exports.login = () => {
   const fetch = require('node-fetch');
+  const { API_HOST } = configUtils.global.getConfigOptions();
 
   tools.logInfo(`API Login - userId:${apiUserId}`);
 
@@ -57,6 +55,7 @@ module.exports.login = () => {
 
 module.exports.get = (pathName) => {
   const fetch = require('node-fetch');
+  const { API_HOST } = configUtils.global.getConfigOptions();
 
   tools.logInfo(`API get - pathName: ${pathName}`);
 
@@ -91,6 +90,7 @@ module.exports.get = (pathName) => {
 
 module.exports.post = (pathName, body) => {
   const fetch = require('node-fetch');
+  const { API_HOST } = configUtils.global.getConfigOptions();
 
   tools.logInfo(`API post - pathName: ${pathName} - body: ${JSON.stringify(body)}`);
 

package/scripts/utils/build/package/element.js

@@ -16,7 +16,7 @@ let { configuration, baseHref, dryRun, statsJson, sourceMap, build } = tools.get
 module.exports.build = (pkg, isMaster) => {
 
   const ng = path.resolve(pkg.paths.repoNodeModules, '@angular', 'cli', 'bin', 'ng');
-  const remoteEuiVersion = configUtils.packages.getRemoteEuiVersion(pkg);
+  const remoteEuiVersion = configUtils.packages.getPackageEuiVersion(pkg, true);
   const pkgName = pkg.name;
 
   tools.logTitle(`Building element : ${pkgName}...`);
@@ -94,7 +94,7 @@ module.exports.build = (pkg, isMaster) => {
 module.exports.postBuild = (pkg, version) => {
   tools.logInfo('Executing element post-build...');
 
-  const remoteEuiVersion = configUtils.packages.getRemoteEuiVersion(pkg);
+  const remoteEuiVersion = configUtils.packages.getPackageEuiVersion(pkg);
   const euiVersionNumber = remoteEuiVersion.split('.')[0];
 
   if (dryRun) {

package/scripts/utils/serve/element.js

@@ -23,7 +23,7 @@ module.exports.serve = (remote = false) => {
 
   const pkgName = pkg.name;
 
-  const remoteEuiVersion = configUtils.packages.getRemoteEuiVersion(pkg);
+  const remoteEuiVersion = configUtils.packages.getPackageEuiVersion(pkg);
   const euiVersionNumber = remoteEuiVersion.split('.')[0];
 
   const ng = path.resolve(pkg.paths.repoNodeModules, '@angular', 'cli', 'bin', 'ng');