piral-cli 0.14.2 → 0.14.3-beta.3295

package/src/injectors/pilet.ts

@@ -3,8 +3,8 @@ import { join } from 'path';
 import { EventEmitter } from 'events';
 import { readFileSync, existsSync, statSync } from 'fs';
 import { KrasInjector, KrasResponse, KrasRequest, KrasInjectorConfig, KrasConfiguration, KrasResult } from 'kras';
-import { computeHash, computeIntegrity } from '../common/hash';
 import { log } from '../common/log';
+import { getPiletSpecMeta } from '../common/spec';
 import { axios, mime } from '../external';
 import { Bundler } from '../types';
 
@@ -26,62 +26,6 @@ interface PiletMetadata {
   [key: string]: unknown;
 }
 
-const checkV1 = /^\/\/\s*@pilet\s+v:1\s*\(([A-Za-z0-9\_\:\-]+)\)/;
-const checkV2 = /^\/\/\s*@pilet\s+v:2\s*(?:\(([A-Za-z0-9\_\:\-]+),\s*(.*)\))?/;
-
-function getDependencies(deps: string, basePath: string) {
-  try {
-    const depMap = JSON.parse(deps);
-
-    if (depMap && typeof depMap === 'object') {
-      return Object.keys(depMap).reduce((obj, depName) => {
-        const depUrl = depMap[depName];
-
-        if (typeof depUrl === 'string') {
-          const url = new URL(depUrl, basePath);
-          obj[depName] = url.href;
-        }
-
-        return obj;
-      }, {});
-    }
-  } catch {}
-
-  return {};
-}
-
-function getPiletSpecMeta(target: string, basePath: string) {
-  if (existsSync(target) && statSync(target).isFile()) {
-    const content = readFileSync(target, 'utf8');
-
-    if (checkV1.test(content)) {
-      // uses single argument; requireRef (required)
-      const [, requireRef] = checkV1.exec(content);
-      return {
-        spec: 'v1',
-        requireRef,
-        integrity: computeIntegrity(content),
-      };
-    } else if (checkV2.test(content)) {
-      // uses two arguments; requireRef and dependencies as JSON (required)
-      const [, requireRef, plainDependencies] = checkV2.exec(content);
-      return {
-        spec: 'v2',
-        requireRef,
-        dependencies: getDependencies(plainDependencies, basePath),
-      };
-    } else {
-      return {
-        spec: 'v0',
-        hash: computeHash(content),
-        noCache: true,
-      };
-    }
-  }
-
-  return {};
-}
-
 function fillPiletMeta(pilet: Pilet, basePath: string) {
   const { root, bundler } = pilet;
   const def = JSON.parse(readFileSync(join(root, 'package.json'), 'utf8'));
@@ -100,6 +44,24 @@ function fillPiletMeta(pilet: Pilet, basePath: string) {
   return JSON.stringify(meta);
 }
 
+async function loadFeed(feed: string) {
+  try {
+    const response = await axios.default.get<{ items?: Array<PiletMetadata> } | Array<PiletMetadata> | PiletMetadata>(
+      feed,
+    );
+
+    if (Array.isArray(response.data)) {
+      return response.data;
+    } else if (Array.isArray(response.data?.items)) {
+      return response.data.items;
+    } else {
+      return [response.data];
+    }
+  } catch (e) {
+    log('generalWarning_0001', `Couldn't load feed at ${feed}.`);
+  }
+}
+
 export default class PiletInjector implements KrasInjector {
   public config: PiletInjectorConfig;
   private piletApi: string;
@@ -165,35 +127,26 @@ export default class PiletInjector implements KrasInjector {
     return JSON.stringify(mergedPilets);
   }
 
-  async loadRemoteFeed(feed?: string): Promise<Array<PiletMetadata>> {
+  async loadRemoteFeed(feed?: string | Array<string>): Promise<Array<Array<PiletMetadata>>> {
     if (feed) {
-      try {
-        const response = await axios.default.get<{ items?: Array<PiletMetadata> } | Array<PiletMetadata> | PiletMetadata>(feed);
-  
-        if (Array.isArray(response.data)) {
-          return response.data;
-        } else if (Array.isArray(response.data?.items)) {
-          return response.data.items;
-        } else {
-          return [response.data];
-        }
-      } catch (e) {
-        log('generalWarning_0001', `Couldn't load feed at ${feed}.`);
-      }
+      const feeds = Array.isArray(feed) ? feed : [feed];
+      return await Promise.all(feeds.map(loadFeed));
     }
-
   }
 
-  mergePilets(localPilets: Array<PiletMetadata>, remotePilets: Array<PiletMetadata>) {
-    if (!remotePilets) {
+  mergePilets(localPilets: Array<PiletMetadata>, remoteFeeds: Array<Array<PiletMetadata>>) {
+    if (!remoteFeeds) {
       return localPilets;
     }
 
     const names = localPilets.map((pilet) => pilet.name);
-    const merged = [
-      ...localPilets,
-      ...remotePilets.filter((pilet) => pilet.name !== undefined && !names.includes(pilet.name)),
-    ];
+    const merged = [...localPilets];
+
+    for (const remotePilets of remoteFeeds) {
+      const newPilets = remotePilets.filter((pilet) => pilet.name !== undefined && !names.includes(pilet.name));
+      names.push(...newPilets.map((p) => p.name));
+      merged.push(...newPilets);
+    }
 
     return merged;
   }

package/src/messages.ts

@@ -1026,8 +1026,8 @@ export function missingPiletFeedUrl_0060(): QuickMessage {
  * Using multiple commands is preferred if you use custom options, otherwise
  * just go for the single command.
  */
-export function missingPiletTarball_0061(source: string): QuickMessage {
-  return [LogLevels.error, '0061', `No files found using pattern "${source}".`];
+export function missingPiletTarball_0061(sources: Array<string>): QuickMessage {
+  return [LogLevels.error, '0061', `No files found using pattern "${sources.join('", "')}".`];
 }
 
 /**
@@ -1842,6 +1842,26 @@ export function toolingIncompatible_0101(piralVersion: string, cliVersion: strin
   ];
 }
 
+/**
+ * @kind Info
+ *
+ * @summary
+ * The Piral CLI could not detect the tooling version used by the app shell. Therefore, it may be incompatible to the
+ * currently used version of the piral-cli. Keep an eye on weird errors.
+ *
+ * @abstract
+ * The emulator contains a special section to inform the Piral CLI about the used version of the tooling. This is
+ * important to detect potential alignment or incompatibilities. The used version of the emulator does not contain
+ * this information and therefore may be incompatible.
+ */
+export function appShellMaybeIncompatible_0102(cliVersion: string): QuickMessage {
+  return [
+    LogLevels.info,
+    '0100',
+    `The Piral instance's CLI version is unknown and may be incompatible to the used version (${cliVersion}).`,
+  ];
+}
+
 /**
  * @kind Error
  *

package/src/rules/pilet-uses-latest-piral.ts

@@ -1,4 +1,4 @@
-import { findLatestVersion } from '../common';
+import { isMonorepoPackageRef, findLatestVersion } from '../common';
 import { PiletRuleContext } from '../types';
 
 export type Options = 'suggest' | 'required' | 'ignore';
@@ -13,17 +13,27 @@ export default async function (context: PiletRuleContext, options: Options = 'su
     const isfixed = demanded.startsWith('git+') || demanded.startsWith('file:');
 
     if (!isfixed) {
-      const latestVersion = await findLatestVersion(name);
+      const isMonorepoRef = await isMonorepoPackageRef(name, context.root);
 
-      if (version !== latestVersion) {
-        const notify = options === 'required' ? context.error : context.warning;
-        notify(
-          `
-The used version of "${name}" is outdated.
-  Expected: v${latestVersion}.
-  Received: v${version}.
-`,
-        );
+      // either we are not in a monorepo or the app shell is not part of the monorepo
+      if (!isMonorepoRef) {
+        const latestVersion = await findLatestVersion(name).catch((err) => {
+          context.warning(`
+  The used version of "${name}" could not be determined: ${err}.
+          `);
+          return version;
+        });
+
+        if (version !== latestVersion) {
+          const notify = options === 'required' ? context.error : context.warning;
+          notify(
+            `
+  The used version of "${name}" is outdated.
+    Expected: v${latestVersion}.
+    Received: v${version}.
+  `,
+          );
+        }
       }
     }
   }

package/src/types/public.ts

@@ -217,6 +217,8 @@ export type PiletPublishSource = 'local' | 'npm' | 'remote';
 
 export type PiralBuildType = 'all' | 'release' | 'emulator' | 'emulator-sources';
 
+export type PiletBuildType = 'default' | 'standalone';
+
 export type PackageType = 'registry' | 'file' | 'git';
 
 export type NpmClientType = 'npm' | 'yarn' | 'pnpm';