piral-cli 0.15.0-beta.4815 → 0.15.0-beta.4820

package/src/common/importmap.ts

@@ -38,7 +38,27 @@ function getLocalDependencyVersion(
   return [details.version, details.version];
 }
 
-async function resolveImportmap(dir: string, importmap: Importmap) {
+function getInheritedDependencies(inheritedImport: string, dir: string): Promise<Array<SharedDependency>> {
+  const packageJson = tryResolvePackage(`${inheritedImport}/package.json`, dir);
+
+  if (inheritedImport) {
+    const packageDir = dirname(packageJson);
+    const packageDetails = require(packageJson);
+    return readImportmap(packageDir, packageDetails, true);
+  } else {
+    const directImportmap = tryResolvePackage(inheritedImport, dir);
+
+    if (directImportmap) {
+      const content = require(directImportmap);
+      const baseDir = dirname(directImportmap);
+      return resolveImportmap(baseDir, content);
+    }
+  }
+
+  return Promise.resolve([]);
+}
+
+async function resolveImportmap(dir: string, importmap: Importmap): Promise<Array<SharedDependency>> {
   const dependencies: Array<SharedDependency> = [];
   const sharedImports = importmap?.imports;
   const inheritedImports = importmap?.inherit;
@@ -142,24 +162,18 @@ async function resolveImportmap(dir: string, importmap: Importmap) {
 
   if (Array.isArray(inheritedImports)) {
     for (const inheritedImport of inheritedImports) {
-      const packageJson = tryResolvePackage(`${inheritedImport}/package.json`, dir);
-
-      if (packageJson) {
-        const packageDir = dirname(packageJson);
-        const packageDetails = require(packageJson);
-        const otherDependencies = await readImportmap(packageDir, packageDetails, true);
+      const otherDependencies = await getInheritedDependencies(inheritedImport, dir);
 
-        for (const dependency of otherDependencies) {
-          const entry = dependencies.find((dep) => dep.name === dependency.name);
+      for (const dependency of otherDependencies) {
+        const entry = dependencies.find((dep) => dep.name === dependency.name);
 
-          if (!entry) {
-            dependencies.push({
-              ...dependency,
-              parents: [inheritedImport],
-            });
-          } else if (Array.isArray(entry.parents)) {
-            entry.parents.push(inheritedImport);
-          }
+        if (!entry) {
+          dependencies.push({
+            ...dependency,
+            parents: [inheritedImport],
+          });
+        } else if (Array.isArray(entry.parents)) {
+          entry.parents.push(inheritedImport);
         }
       }
     }
@@ -184,7 +198,7 @@ export async function readImportmap(
     }
 
     const baseDir = dirname(resolve(dir, importmap));
-    return resolveImportmap(baseDir, content);
+    return await resolveImportmap(baseDir, content);
   } else if (typeof importmap === 'undefined' && inherited) {
     // Fall back to sharedDependencies or pilets.external if available
     const shared: Array<string> = packageDetails.sharedDependencies ?? packageDetails.pilets?.externals;
@@ -201,5 +215,5 @@ export async function readImportmap(
     }
   }
 
-  return resolveImportmap(dir, importmap);
+  return await resolveImportmap(dir, importmap);
 }

package/src/common/io.ts

@@ -141,20 +141,28 @@ export function getFileNames(target: string) {
   });
 }
 
-export async function findFile(topDir: string, fileName: string, stopDir = resolve(topDir, '/')): Promise<string> {
-  const path = join(topDir, fileName);
-  const exists = await checkExists(path);
-
-  if (!exists) {
-    if (topDir !== stopDir) {
-      const parentDir = resolve(topDir, '..');
-      return await findFile(parentDir, fileName, stopDir);
+export async function findFile(
+  topDir: string,
+  fileName: string | Array<string>,
+  stopDir = resolve(topDir, '/'),
+): Promise<string> {
+  const fileNames = Array.isArray(fileName) ? fileName : [fileName];
+
+  for (const fn of fileNames) {
+    const path = join(topDir, fn);
+    const exists = await checkExists(path);
+
+    if (exists) {
+      return path;
     }
+  }
 
-    return undefined;
+  if (topDir !== stopDir) {
+    const parentDir = resolve(topDir, '..');
+    return await findFile(parentDir, fileNames, stopDir);
   }
 
-  return path;
+  return undefined;
 }
 
 interface AnyPattern {

package/src/common/log.ts

@@ -62,8 +62,9 @@ export function logFail(message: string, ...args: Array<string | number | boolea
 }
 
 export function progress(message: string, ...args: Array<string | number | boolean>) {
-  currentProgress = format(message, ...args)
-  instance.start(message);
+  const msg = format(message, ...args)
+  instance.start(msg);
+  currentProgress = msg;
 }
 
 export function logReset() {

package/src/common/npm.ts

@@ -360,37 +360,9 @@ function tryResolve(packageName: string, baseDir = process.cwd()) {
 }
 
 export function tryResolvePackage(name: string, baseDir: string = undefined) {
-  let path = baseDir ? tryResolve(name, baseDir) : tryResolve(name);
+  const path = baseDir ? tryResolve(name, baseDir) : tryResolve(name);
   const root = baseDir || process.cwd();
 
-  if (!path) {
-    if (name.startsWith('.')) {
-      path = resolve(root, name);
-    } else if (isAbsolute(name)) {
-      path = name;
-    } else if (name.includes('/', name.startsWith('@') ? name.indexOf('/') + 1 : 0)) {
-      const parts = name.split('/');
-      const mainPart = name.startsWith('@') ? parts.slice(0, 2).join('/') : parts[0];
-      const mainPath = baseDir ? tryResolve(mainPart, baseDir) : tryResolve(mainPart);
-      const searchStr = `${sep}${mainPart.replace('/', sep)}${sep}`;
-
-      if (mainPath?.includes(searchStr)) {
-        const rest = name.startsWith('@') ? parts.slice(2) : parts.slice(1);
-        path = mainPath.substring(0, mainPath.indexOf(searchStr) + searchStr.length) + rest.join(sep);
-      }
-    } else {
-      path = resolve(root, 'node_modules', name);
-    }
-
-    if (!existsSync(path)) {
-      path = `${path}.js`;
-
-      if (!existsSync(path)) {
-        path = undefined;
-      }
-    }
-  }
-
   if (!path) {
     log('generalDebug_0003', `Could not resolve the package "${name}" in "${root}".`);
   } else {

package/src/common/package.ts

@@ -11,6 +11,7 @@ import { getHash, checkIsDirectory, matchFiles } from './io';
 import { readJson, copy, updateExistingJson, findFile, checkExists } from './io';
 import { isGitPackage, isLocalPackage, makeGitUrl, makeFilePath } from './npm';
 import { makePiletExternals, makeExternals, findPackageRoot, findSpecificVersion } from './npm';
+import { getModulePath } from '../external';
 import {
   filesTar,
   filesOnceTar,
@@ -18,8 +19,8 @@ import {
   bundlerNames,
   piralJsonSchemaUrl,
   piletJsonSchemaUrl,
+  frameworkLibs,
 } from './constants';
-import { getModulePath } from '../external';
 import {
   SourceLanguage,
   Framework,
@@ -496,16 +497,20 @@ export function findDependencyVersion(
   return findPackageVersion(rootPath, packageName);
 }
 
-export async function findPackageVersion(rootPath: string, packageName: string): Promise<string> {
-  try {
-    log('generalDebug_0003', `Finding the version of "${packageName}" in "${rootPath}".`);
-    const moduleName = getModulePath(rootPath, packageName);
-    const packageJson = await findFile(moduleName, 'package.json');
-    return require(packageJson).version;
-  } catch (e) {
-    log('cannotResolveDependency_0053', packageName, rootPath);
-    return 'latest';
+export async function findPackageVersion(rootPath: string, packageName: string | Array<string>): Promise<string> {
+  const packages = Array.isArray(packageName) ? packageName : [packageName];
+
+  for (const pckg of packages) {
+    try {
+      log('generalDebug_0003', `Finding the version of "${packageName}" in "${rootPath}".`);
+      const moduleName = getModulePath(rootPath, pckg);
+      const packageJson = await findFile(moduleName, 'package.json');
+      return require(packageJson).version;
+    } catch {}
   }
+
+  log('cannotResolveDependency_0053', packages, rootPath);
+  return 'latest';
 }
 
 export async function retrieveExternals(root: string, packageInfo: any) {
@@ -540,17 +545,20 @@ export async function retrievePiletsInfo(entryFile: string) {
   const packageInfo = require(packageJson);
   const info = getPiletsInfo(packageInfo);
   const externals = await retrieveExternals(root, packageInfo);
+  const dependencies = {
+    std: packageInfo.dependencies || {},
+    dev: packageInfo.devDependencies || {},
+    peer: packageInfo.peerDependencies || {},
+  };
+  const framework = frameworkLibs.find((lib) => lib in dependencies.std || lib in dependencies.dev);
 
   return {
     ...info,
     externals,
     name: packageInfo.name,
     version: packageInfo.version,
-    dependencies: {
-      std: packageInfo.dependencies || {},
-      dev: packageInfo.devDependencies || {},
-      peer: packageInfo.peerDependencies || {},
-    },
+    framework,
+    dependencies,
     scripts: packageInfo.scripts,
     ignored: checkArrayOrUndefined(packageInfo, 'preservedDependencies'),
     root,

package/src/messages.ts

@@ -1231,8 +1231,12 @@ export function cannotResolveVersion_0052(name: string): QuickMessage {
  * }
  * ```
  */
-export function cannotResolveDependency_0053(name: string, rootDir: string): QuickMessage {
-  return [LogLevels.warning, '0053', `Could not resolve "${name}" from "${rootDir}". Taking "latest" version.`];
+export function cannotResolveDependency_0053(names: Array<string>, rootDir: string): QuickMessage {
+  return [
+    LogLevels.warning,
+    '0053',
+    `Could not resolve any package (tried "${names.join('", "')}") from "${rootDir}". Taking "latest" version.`,
+  ];
 }
 
 /**
@@ -2387,7 +2391,11 @@ export function publishFeedMissingUrl_0115(): QuickMessage {
  * ```
  */
 export function publishFeedMissingVersion_0116(): QuickMessage {
-  return [LogLevels.error, '0116', `The "feed" provider requires either a "--opts.version" argument or a package.json with a version.`];
+  return [
+    LogLevels.error,
+    '0116',
+    `The "feed" provider requires either a "--opts.version" argument or a package.json with a version.`,
+  ];
 }
 
 /**
@@ -2624,11 +2632,7 @@ export function bundlerUnspecified_0175(available: Array<string>): QuickMessage
  * ```
  */
 export function bundlerNotInstalled_0176(): QuickMessage {
-  return [
-    LogLevels.warning,
-    '0176',
-    `Installing default bundler since no bundler has been found.`,
-  ];
+  return [LogLevels.warning, '0176', `Installing default bundler since no bundler has been found.`];
 }
 
 /**