piral-cli 1.3.1-beta.6128 → 1.3.1-beta.6135

package/lib/types/common.js

@@ -29,5 +29,5 @@ var LogLevels;
      * timestamps.
      */
     LogLevels[LogLevels["debug"] = 5] = "debug";
-})(LogLevels = exports.LogLevels || (exports.LogLevels = {}));
+})(LogLevels || (exports.LogLevels = LogLevels = {}));
 //# sourceMappingURL=common.js.map

package/lib/types/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/types/common.ts"],"names":[],"mappings":";;;AAoDA,IAAY,SA2BX;AA3BD,WAAY,SAAS;IACnB;;OAEG;IACH,iDAAY,CAAA;IACZ;;OAEG;IACH,2CAAS,CAAA;IACT;;OAEG;IACH,+CAAW,CAAA;IACX;;OAEG;IACH,yCAAQ,CAAA;IACR;;;OAGG;IACH,+CAAW,CAAA;IACX;;;OAGG;IACH,2CAAS,CAAA;AACX,CAAC,EA3BW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QA2BpB"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/types/common.ts"],"names":[],"mappings":";;;AAoDA,IAAY,SA2BX;AA3BD,WAAY,SAAS;IACnB;;OAEG;IACH,iDAAY,CAAA;IACZ;;OAEG;IACH,2CAAS,CAAA;IACT;;OAEG;IACH,+CAAW,CAAA;IACX;;OAEG;IACH,yCAAQ,CAAA;IACR;;;OAGG;IACH,+CAAW,CAAA;IACX;;;OAGG;IACH,2CAAS,CAAA;AACX,CAAC,EA3BW,SAAS,yBAAT,SAAS,QA2BpB"}

package/lib/types/public.d.ts

@@ -192,6 +192,7 @@ export interface BundlerDefinition {
     buildPilet: BuildPiletBundlerDefinition;
 }
 export type ImportmapVersions = 'all' | 'match-major' | 'any-patch' | 'exact';
+export type ImportmapMode = 'host' | 'remote';
 export type PiletSchemaVersion = 'none' | 'v0' | 'v1' | 'v2' | 'v3';
 export type SourceLanguage = 'js' | 'ts';
 export type PiletPublishScheme = 'none' | 'digest' | 'bearer' | 'basic';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-cli",
-  "version": "1.3.1-beta.6128",
+  "version": "1.3.1-beta.6135",
   "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
   "keywords": [
     "portal",
@@ -81,5 +81,5 @@
     "typescript": "^5.0.0",
     "yargs": "^15.0.0"
   },
-  "gitHead": "0a7041321aa3b3c86371377f74094df506ec3bae"
+  "gitHead": "553fea569c05719bdd52e2d0f4e141f165721243"
 }

package/src/common/importmap.ts

@@ -4,7 +4,7 @@ import { satisfies, validate } from './version';
 import { computeHash } from './hash';
 import { getHash, readJson, findFile, checkExists, checkIsDirectory } from './io';
 import { tryResolvePackage } from './npm';
-import { SharedDependency, Importmap, ImportmapVersions } from '../types';
+import { SharedDependency, Importmap, ImportmapVersions, ImportmapMode } from '../types';
 
 const shorthandsUrls = ['', '.', '...'];
 
@@ -105,13 +105,14 @@ async function getInheritedDependencies(
   inheritedImport: string,
   dir: string,
   excludedDependencies: Array<string>,
+  inheritanceBehavior: ImportmapMode,
 ): Promise<Array<SharedDependency>> {
   const packageJson = tryResolvePackage(`${inheritedImport}/package.json`, dir);
 
   if (packageJson) {
     const packageDir = dirname(packageJson);
     const packageDetails = await readJson(packageDir, 'package.json');
-    return await consumeImportmap(packageDir, packageDetails, true, 'exact', excludedDependencies);
+    return await consumeImportmap(packageDir, packageDetails, true, 'exact', inheritanceBehavior, excludedDependencies);
   } else {
     const directImportmap = tryResolvePackage(inheritedImport, dir);
 
@@ -120,6 +121,7 @@ async function getInheritedDependencies(
       const content = await readJson(baseDir, basename(directImportmap));
       return await resolveImportmap(baseDir, content, {
         availableSpecs: {},
+        inheritanceBehavior,
         excludedDependencies,
         ignoreFailure: true,
         versionBehavior: 'exact',
@@ -134,6 +136,7 @@ interface ImportmapResolutionOptions {
   availableSpecs: Record<string, string>;
   excludedDependencies: Array<string>;
   versionBehavior: ImportmapVersions;
+  inheritanceBehavior: ImportmapMode;
   ignoreFailure: boolean;
 }
 
@@ -147,11 +150,12 @@ async function resolveImportmap(
   const inheritedImports = importmap?.inherit;
   const excludedImports = importmap?.exclude;
 
-  const onUnresolved = (entry: string) => {
+  const onUnresolved = (name: string, version: string) => {
     if (options.ignoreFailure) {
-      log('skipUnresolvedDependency_0054', entry);
+      const id = version ? `${name}@${version}` : name;
+      log('skipUnresolvedDependency_0054', id);
     } else {
-      fail('importMapReferenceNotFound_0027', dir, entry);
+      fail('importMapReferenceNotFound_0027', dir, name);
     }
   };
 
@@ -199,7 +203,7 @@ async function resolveImportmap(
             isAsync,
           );
         } else {
-          onUnresolved(identifier);
+          onUnresolved(identifier, versionSpec);
         }
       } else if (!url.startsWith('.') && !isAbsolute(url)) {
         const entry = tryResolvePackage(url, dir);
@@ -224,7 +228,7 @@ async function resolveImportmap(
             isAsync,
           );
         } else {
-          onUnresolved(url);
+          onUnresolved(url, versionSpec);
         }
       } else {
         const entry = resolve(dir, url);
@@ -256,7 +260,7 @@ async function resolveImportmap(
               isAsync,
             );
           } else if (isDirectory) {
-            onUnresolved(entry);
+            onUnresolved(entry, versionSpec);
           } else {
             const hash = await getHash(entry);
 
@@ -271,19 +275,23 @@ async function resolveImportmap(
             });
           }
         } else {
-          onUnresolved(url);
+          onUnresolved(url, versionSpec);
         }
       }
     }
   }
 
   if (Array.isArray(inheritedImports)) {
-    const excluded = Array.isArray(excludedImports)
-      ? [...options.excludedDependencies, ...excludedImports]
-      : options.excludedDependencies;
+    const includedImports = [...options.excludedDependencies, ...dependencies.map((m) => m.name)];
+    const excluded = Array.isArray(excludedImports) ? [...includedImports, ...excludedImports] : includedImports;
 
     for (const inheritedImport of inheritedImports) {
-      const otherDependencies = await getInheritedDependencies(inheritedImport, dir, excluded);
+      const otherDependencies = await getInheritedDependencies(
+        inheritedImport,
+        dir,
+        excluded,
+        options.inheritanceBehavior,
+      );
 
       for (const dependency of otherDependencies) {
         const entry = dependencies.find((dep) => dep.name === dependency.name);
@@ -307,10 +315,13 @@ async function consumeImportmap(
   packageDetails: any,
   inherited: boolean,
   versionBehavior: ImportmapVersions,
+  mode: ImportmapMode,
   excludedDependencies: Array<string>,
 ): Promise<Array<SharedDependency>> {
   const importmap = packageDetails.importmap;
-  const availableSpecs = inherited ? packageDetails.devDependencies : {};
+  const appShell = inherited && mode === 'remote';
+  const availableSpecs = appShell ? packageDetails.devDependencies : {};
+  const inheritanceBehavior = appShell ? 'host' : mode;
 
   if (typeof importmap === 'string') {
     const notFound = {};
@@ -326,6 +337,7 @@ async function consumeImportmap(
       ignoreFailure: inherited,
       excludedDependencies,
       versionBehavior,
+      inheritanceBehavior,
     });
   } else if (typeof importmap === 'undefined' && inherited) {
     // Fall back to sharedDependencies or pilets.external if available
@@ -348,6 +360,7 @@ async function consumeImportmap(
     excludedDependencies,
     ignoreFailure: inherited,
     versionBehavior,
+    inheritanceBehavior,
   });
 }
 
@@ -355,6 +368,7 @@ export function readImportmap(
   dir: string,
   packageDetails: any,
   versionBehavior: ImportmapVersions = 'exact',
+  inheritanceBehavior: ImportmapMode = 'remote',
 ): Promise<Array<SharedDependency>> {
-  return consumeImportmap(dir, packageDetails, false, versionBehavior, []);
+  return consumeImportmap(dir, packageDetails, false, versionBehavior, inheritanceBehavior, []);
 }

package/src/common/package.ts

@@ -558,9 +558,9 @@ export function flattenExternals(dependencies: Array<SharedDependency>, disableA
 }
 
 export async function retrieveExternals(root: string, packageInfo: any): Promise<Array<SharedDependency>> {
-  const sharedDependencies = await readImportmap(root, packageInfo);
+  const importmap = await readImportmap(root, packageInfo, 'exact', 'host');
 
-  if (sharedDependencies.length === 0) {
+  if (importmap.length === 0) {
     const allDeps = {
       ...packageInfo.devDependencies,
       ...packageInfo.dependencies,
@@ -577,7 +577,7 @@ export async function retrieveExternals(root: string, packageInfo: any): Promise
     }));
   }
 
-  return sharedDependencies;
+  return importmap;
 }
 
 export async function retrievePiletsInfo(entryFile: string) {
@@ -819,7 +819,7 @@ export async function retrievePiletData(target: string, app?: string) {
     });
   }
 
-  const importmap = await readImportmap(root, piletPackage, piletDefinition?.importmapVersions);
+  const importmap = await readImportmap(root, piletPackage, piletDefinition?.importmapVersions, 'remote');
 
   return {
     dependencies: piletPackage.dependencies || {},

package/src/types/public.ts

@@ -221,6 +221,8 @@ export interface BundlerDefinition {
 
 export type ImportmapVersions = 'all' | 'match-major' | 'any-patch' | 'exact';
 
+export type ImportmapMode = 'host' | 'remote';
+
 export type PiletSchemaVersion = 'none' | 'v0' | 'v1' | 'v2' | 'v3';
 
 export type SourceLanguage = 'js' | 'ts';