Merge pull request #249 from hypermod-io/match-app-dls

Fixes app module dls + silences experimental loader logs

Author: danieldelcore

packages/cli/src/main.ts

@@ -43,6 +43,7 @@ export default async function main(
     ? ModuleLoader({
         authToken: flags.registryToken,
         npmRegistryUrl: flags.registry,
+        verbose: Boolean(flags.verbose),
       })
     : (new PluginManager(pluginManagerConfig) as unknown as MdlLoader);
 

packages/cli/src/utils/module-loader.ts

@@ -7,6 +7,7 @@ import { ModuleLoader } from '@hypermod/fetcher';
 const ModuleLoader = (config: {
   npmRegistryUrl?: string;
   authToken?: string;
+  verbose?: boolean;
 }): ModuleLoader => {
   const getInfo = (packageName: string) => {
     const entryPath = require.resolve(packageName);
@@ -26,6 +27,7 @@ const ModuleLoader = (config: {
 
   const install = async (packageName: string) => {
     await installPackage(packageName, {
+      silent: !config.verbose,
       cwd: __dirname,
       packageManager: 'npm',
       additionalArgs: [

packages/core/lib/Worker.js

@@ -48,7 +48,8 @@ function prepareJscodeshift(options) {
 
 function retrieveTransformId(str) {
   if (str.includes('#')) return false;
-  return (str.match(/[^@]*(?:[@](?!.*[@]))(.*)$/) || [, ''])[1];
+  const match = str.match(/(?<!\/)@([^\/]+)$/);
+  return match ? match[1] : '';
 }
 function retrievePresetId(str) {
   return (str.match(/[^#]*(?:[#](?!.*[#]))(.*)$/) || [, ''])[1];