piral-cli 1.10.3 → 1.11.0-beta.efd8b71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-cli",
-  "version": "1.10.3",
+  "version": "1.11.0-beta.efd8b71",
   "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
   "keywords": [
     "portal",
@@ -72,11 +72,11 @@
     "yargs": "^15"
   },
   "dependencies": {
-    "css-conflict-inspector": "^0.2",
-    "dets": "^0.17.0",
+    "css-conflict-inspector": "^0.3",
+    "dets": "^0.18",
     "kras": "^1.0.1",
     "open": "^10",
     "typescript": "^5"
   },
-  "gitHead": "d01fa2763b3ef45efc823c148cf7198e105387de"
+  "gitHead": "efd8b7195334dd209c5bb4373873f04d823d8eea"
 }

package/src/apps/declaration-pilet.ts

@@ -62,11 +62,13 @@ export async function declarationPilet(baseDir = process.cwd(), options: Declara
 
   for (const item of allEntries) {
     const targetDir = dirname(item);
-    const { peerDependencies, peerModules, root, apps, importmap } = await retrievePiletData(targetDir);
+    const { peerDependencies, peerModules, root, apps, importmap, definition } = await retrievePiletData(targetDir);
     const piralInstances = apps.map((m) => m.appPackage.name);
     const externals = combinePiletExternals(piralInstances, peerDependencies, peerModules, importmap);
     const dest = resolve(root, target);
-    results.push(await createPiletDeclaration(piralInstances, root, item, externals, dest, forceOverwrite, logLevel));
+    results.push(
+      await createPiletDeclaration(piralInstances, root, definition, item, externals, dest, forceOverwrite, logLevel),
+    );
   }
 
   if (results.every(Boolean)) {

package/src/common/declaration.ts

@@ -1,12 +1,14 @@
 import { DeclOptions, generateDeclaration, createDiffPlugin, Logger } from 'dets';
 import { basename, dirname, extname, join, resolve } from 'path';
+
 import { progress, log, logWarn, logVerbose, logInfo } from './log';
 import { ForceOverwrite } from './enums';
-import { retrievePiralRoot, retrievePiletsInfo, flattenExternals, validateSharedDependencies } from './package';
+import { retrievePiralRoot, retrievePiletsInfo, flattenExternals } from './package';
+import { getRemoteTypesTarget, validateSharedDependencies } from './package';
 import { entryModuleExtensions, piralBaseRoot, packageJson } from './constants';
 import { readText, getEntryFiles, matchFiles, createFileIfNotExists, readJson } from './io';
 import { getModulePath } from '../external';
-import { LogLevels } from '../types';
+import { LogLevels, PiletDefinition } from '../types';
 
 const piletApiName = 'PiletApi';
 
@@ -146,6 +148,7 @@ async function createDeclarationFile(options: DeclOptions, target: string, force
 export async function createPiletDeclaration(
   piralInstances: Array<string>,
   root: string,
+  definition: PiletDefinition,
   entry: string,
   allowedImports: Array<string>,
   target: string,
@@ -159,15 +162,17 @@ export async function createPiletDeclaration(
   if (file) {
     const files = await getAllFiles([entry]);
     const types = findDeclaredTypings(root);
+    const excluded = getRemoteTypesTarget(root, definition);
     const options: DeclOptions = {
       name: piralInstance,
       root,
       files,
       types,
+      excluded: excluded ? [excluded] : [],
       plugins: [createDiffPlugin(file)],
       apis,
       noModuleDeclaration: true,
-      imports: allowedImports.filter(m => !piralInstances.includes(m)),
+      imports: allowedImports.filter((m) => !piralInstances.includes(m)),
       logLevel,
       logger: createLogger(),
     };

package/src/common/package.ts

@@ -16,11 +16,12 @@ import { makePiletExternals, makeExternals, findPackageRoot, findSpecificVersion
 import { scaffoldFromEmulatorWebsite, updateFromEmulatorWebsite, retrieveExtraTypings } from './website';
 import { getDependencies, getDependencyPackages, getDevDependencies } from './language';
 import { getDevDependencyPackages, getFrameworkDependencies } from './language';
-import { piralJsonSchemaUrl, filesTar, filesOnceTar, bundlerNames, packageJson } from './constants';
-import { frameworkLibs, declarationEntryExtensions, piralJson, piletJson } from './constants';
+import { piralJsonSchemaUrl, filesTar, filesOnceTar, bundlerNames } from './constants';
+import { frameworkLibs, defaultRemoteTypesTarget, packageJson } from './constants';
+import { declarationEntryExtensions, piralJson, piletJson } from './constants';
 import { satisfies } from './version';
 import { getModulePath } from '../external';
-import { PiletsInfo, SharedDependency, PiletDefinition, AppDefinition, NpmClient } from '../types';
+import type { PiletsInfo, SharedDependency, PiletDefinition, AppDefinition, NpmClient } from '../types';
 import type { SourceLanguage, PiralInstancePackageData, PiralInstanceDetails } from '../types';
 import type { Framework, FileInfo, TemplateFileLocation, PiletPackageData, PiralPackageData } from '../types';
 
@@ -236,6 +237,17 @@ async function saveRemoteTypes(generatedText: string, target: string) {
   }
 }
 
+export function getRemoteTypesTarget(rootDir: string, piletDefinition: PiletDefinition) {
+  const { remoteTypesTarget } = piletDefinition || {};
+  const proposedTarget =
+    typeof remoteTypesTarget === 'string'
+      ? remoteTypesTarget
+      : remoteTypesTarget
+        ? defaultRemoteTypesTarget
+        : undefined;
+  return proposedTarget ? resolve(rootDir, proposedTarget) : undefined;
+}
+
 async function writeRemoteTypes(
   rootDir: string,
   appPackages: Array<PiralInstancePackageData>,
@@ -243,14 +255,11 @@ async function writeRemoteTypes(
   piletDefinition: PiletDefinition,
   agent: Agent,
 ) {
-  const { remoteTypesTarget } = piletDefinition || {};
-  const proposedTarget =
-    typeof remoteTypesTarget === 'string' ? remoteTypesTarget : remoteTypesTarget ? './src/remote.d.ts' : undefined;
+  const target = getRemoteTypesTarget(rootDir, piletDefinition);
 
-  if (proposedTarget) {
+  if (target) {
     const snippets = await retrieveRemoteTypes(appPackages, piletPackage, agent);
     const generatedText = combineRemoteTypes(snippets);
-    const target = resolve(rootDir, proposedTarget);
 
     if (generatedText) {
       await saveRemoteTypes(generatedText, target);
@@ -959,6 +968,7 @@ export async function retrievePiletData(target: string, app?: string, agent?: Ag
     peerModules: piletPackage.peerModules || [],
     ignored: checkArrayOrUndefined(piletPackage, 'preservedDependencies'),
     schema: piletDefinition?.schemaVersion,
+    definition: piletDefinition,
     importmap,
     apps,
     piletPackage,

package/src/common/pilet.ts

@@ -68,7 +68,7 @@ export async function triggerBuildPilet({
   _,
 }: BuildPiletOptions) {
   const targetDir = dirname(entryModule);
-  const { peerDependencies, peerModules, root, apps, piletPackage, ignored, importmap, schema } =
+  const { peerDependencies, peerModules, root, apps, piletPackage, ignored, importmap, schema, definition } =
     await retrievePiletData(targetDir, app);
   const schemaVersion = originalSchemaVersion || schema || config.schemaVersion || defaultSchemaVersion;
   const piralInstances = apps.map((m) => m.appPackage.name);
@@ -119,6 +119,7 @@ export async function triggerBuildPilet({
     await createPiletDeclaration(
       piralInstances,
       root,
+      definition,
       entryModule,
       externals,
       outDir,