@uipath/solution-packager 1.204.0-preview.255 → 1.205.0-preview.256

package/dist/index.js

@@ -394,7 +394,7 @@ import { BaseBrowserPackagerFactory } from "@uipath/project-packager/browser";
 import { carriedInstructions } from "@uipath/common/error-handler";
 import {
   GovernancePolicyService,
-  PackService,
+  PackService as PackService2,
   ProjectToolExecutor,
   ToolLogger,
   ToolsFactory
@@ -558,6 +558,9 @@ class OptionsBuilder {
 }
 
 // src/services/package-id-reader.ts
+import {
+  PackService
+} from "@uipath/project-packager";
 import { Path as Path2 } from "@uipath/solutionpackager-tool-core";
 var legacySolutionResourcesFileName = "resources.json";
 
@@ -714,6 +717,11 @@ class PackageIdReader {
     return matchingKey ? obj[matchingKey] : null;
   }
 }
+async function readMemberPackageIdAsync(fileSystem, project, solutionPath, solutionName) {
+  const packService = new PackService;
+  const packageId = await new PackageIdReader(fileSystem, packService).read(project, solutionPath, solutionName);
+  return packageId ? packService.sanitizePackageId(packageId) : packageId;
+}
 
 // src/services/solution-cleanup-service.ts
 import { PackagerDimensions } from "@uipath/common/telemetry";
@@ -956,6 +964,16 @@ function hasFailedResults(results) {
 function getFailedResultsMessage(results) {
   return results.filter((result) => !result.isSuccess).map((r) => r.message || "Unknown error").join(", ");
 }
+function getFailedResultsInstructions(results) {
+  const instructions = new Set;
+  for (const result of results) {
+    const next = result.isSuccess ? undefined : result.instructions?.trim();
+    if (next) {
+      instructions.add(next);
+    }
+  }
+  return instructions.size > 0 ? [...instructions].join(" ") : undefined;
+}
 function toProjectDiagnostics(projects, results) {
   return projects.map((project, index) => {
     const result = results[index];
@@ -1036,7 +1054,7 @@ class SolutionPackService {
           ...projectResults
         ];
         if (hasFailedResults(restoreAndPackResults)) {
-          const failure = ToolResult2.error(ToolErrorCodes2.InternalError, `Solution pack failed: ${getFailedResultsMessage(restoreAndPackResults)}`);
+          const failure = ToolResult2.error(ToolErrorCodes2.InternalError, `Solution pack failed: ${getFailedResultsMessage(restoreAndPackResults)}`, getFailedResultsInstructions(restoreAndPackResults));
           failure.details = {
             projects: toProjectDiagnostics(solution.Projects, projectResults)
           };
@@ -1196,7 +1214,7 @@ class SolutionRestoreService {
           })
         ]);
         if (hasFailedResults(restoreResults)) {
-          return ToolResult3.error(ToolErrorCodes3.InternalError, `Solution restore failed: ${getFailedResultsMessage(restoreResults)}`);
+          return ToolResult3.error(ToolErrorCodes3.InternalError, `Solution restore failed: ${getFailedResultsMessage(restoreResults)}`, getFailedResultsInstructions(restoreResults));
         }
         return ToolResult3.success();
       }, { [PackagerDimensions3.SolutionId]: solution.SolutionId });
@@ -1279,7 +1297,7 @@ class SolutionPackager {
     this.logger = new ToolLogger("SolutionPackager", "PackSolution");
     this.packOptionsValidator = new SolutionPackOptionsValidator(this.logger, this.fileSystem);
     this.validateOptionsValidator = new SolutionValidateOptionsValidator(this.logger, this.fileSystem);
-    const packService = new PackService;
+    const packService = new PackService2;
     const packageIdReader = new PackageIdReader(this.fileSystem, packService);
     this.optionsBuilder = new OptionsBuilder(packageIdReader, packService, this.fileSystem);
     this.toolsFactory = new ToolsFactory(this.repository, this.fileSystem);
@@ -1444,6 +1462,7 @@ class SolutionPackager {
     return {
       id: crypto.randomUUID(),
       projects: solution.Projects,
+      solutionRoot: this.fileSystem.path.dirname(solution.filePath),
       downloadUrl: options.downloadUrl,
       solutionId: solution.SolutionId,
       configuration: options.configuration,
@@ -1451,6 +1470,8 @@ class SolutionPackager {
       connection: options.connection,
       logger: this.logger,
       workflowCompilerVersion: options.workflowCompilerVersion,
+      functionsPackagerVersion: options.functionsPackagerVersion,
+      codedAppsPackagerVersion: options.codedAppsPackagerVersion,
       lockKey: options.lockKey,
       jobTarget: options.jobTarget,
       localSourcePath: options.localSourcePath
@@ -1522,7 +1543,6 @@ class SolutionPackOptions extends PackagerParameters {
     skipImports: false
   };
   lockKey;
-  jobTarget;
   localSourcePath;
 }
 export {
@@ -1532,7 +1552,9 @@ export {
   RulesConfigFileType2 as RulesConfigFileType,
   SolutionPackOptions,
   SolutionPackager,
-  createBrowserSolutionPackager
+  createBrowserSolutionPackager,
+  readMemberPackageIdAsync,
+  toProjectDiagnostics
 };
 
-//# debugId=6EC477FD4EFE43E964756E2164756E21
+//# debugId=3230F107E64723A464756E2164756E21

package/dist/node.js

@@ -410,7 +410,6 @@ class SolutionPackOptions extends PackagerParameters {
     skipImports: false
   };
   lockKey;
-  jobTarget;
   localSourcePath;
 }
 // src/node-solution-packager-factory.ts
@@ -425,7 +424,7 @@ import {
 import { carriedInstructions } from "@uipath/common/error-handler";
 import {
   GovernancePolicyService,
-  PackService,
+  PackService as PackService2,
   ProjectToolExecutor,
   ToolLogger,
   ToolsFactory
@@ -589,6 +588,9 @@ class OptionsBuilder {
 }
 
 // src/services/package-id-reader.ts
+import {
+  PackService
+} from "@uipath/project-packager";
 import { Path as Path2 } from "@uipath/solutionpackager-tool-core";
 var legacySolutionResourcesFileName = "resources.json";
 
@@ -745,6 +747,11 @@ class PackageIdReader {
     return matchingKey ? obj[matchingKey] : null;
   }
 }
+async function readMemberPackageIdAsync(fileSystem, project, solutionPath, solutionName) {
+  const packService = new PackService;
+  const packageId = await new PackageIdReader(fileSystem, packService).read(project, solutionPath, solutionName);
+  return packageId ? packService.sanitizePackageId(packageId) : packageId;
+}
 
 // src/services/solution-cleanup-service.ts
 import { PackagerDimensions } from "@uipath/common/telemetry";
@@ -987,6 +994,16 @@ function hasFailedResults(results) {
 function getFailedResultsMessage(results) {
   return results.filter((result) => !result.isSuccess).map((r) => r.message || "Unknown error").join(", ");
 }
+function getFailedResultsInstructions(results) {
+  const instructions = new Set;
+  for (const result of results) {
+    const next = result.isSuccess ? undefined : result.instructions?.trim();
+    if (next) {
+      instructions.add(next);
+    }
+  }
+  return instructions.size > 0 ? [...instructions].join(" ") : undefined;
+}
 function toProjectDiagnostics(projects, results) {
   return projects.map((project, index) => {
     const result = results[index];
@@ -1067,7 +1084,7 @@ class SolutionPackService {
           ...projectResults
         ];
         if (hasFailedResults(restoreAndPackResults)) {
-          const failure = ToolResult2.error(ToolErrorCodes2.InternalError, `Solution pack failed: ${getFailedResultsMessage(restoreAndPackResults)}`);
+          const failure = ToolResult2.error(ToolErrorCodes2.InternalError, `Solution pack failed: ${getFailedResultsMessage(restoreAndPackResults)}`, getFailedResultsInstructions(restoreAndPackResults));
           failure.details = {
             projects: toProjectDiagnostics(solution.Projects, projectResults)
           };
@@ -1227,7 +1244,7 @@ class SolutionRestoreService {
           })
         ]);
         if (hasFailedResults(restoreResults)) {
-          return ToolResult3.error(ToolErrorCodes3.InternalError, `Solution restore failed: ${getFailedResultsMessage(restoreResults)}`);
+          return ToolResult3.error(ToolErrorCodes3.InternalError, `Solution restore failed: ${getFailedResultsMessage(restoreResults)}`, getFailedResultsInstructions(restoreResults));
         }
         return ToolResult3.success();
       }, { [PackagerDimensions3.SolutionId]: solution.SolutionId });
@@ -1310,7 +1327,7 @@ class SolutionPackager {
     this.logger = new ToolLogger("SolutionPackager", "PackSolution");
     this.packOptionsValidator = new SolutionPackOptionsValidator(this.logger, this.fileSystem);
     this.validateOptionsValidator = new SolutionValidateOptionsValidator(this.logger, this.fileSystem);
-    const packService = new PackService;
+    const packService = new PackService2;
     const packageIdReader = new PackageIdReader(this.fileSystem, packService);
     this.optionsBuilder = new OptionsBuilder(packageIdReader, packService, this.fileSystem);
     this.toolsFactory = new ToolsFactory(this.repository, this.fileSystem);
@@ -1475,6 +1492,7 @@ class SolutionPackager {
     return {
       id: crypto.randomUUID(),
       projects: solution.Projects,
+      solutionRoot: this.fileSystem.path.dirname(solution.filePath),
       downloadUrl: options.downloadUrl,
       solutionId: solution.SolutionId,
       configuration: options.configuration,
@@ -1482,6 +1500,8 @@ class SolutionPackager {
       connection: options.connection,
       logger: this.logger,
       workflowCompilerVersion: options.workflowCompilerVersion,
+      functionsPackagerVersion: options.functionsPackagerVersion,
+      codedAppsPackagerVersion: options.codedAppsPackagerVersion,
       lockKey: options.lockKey,
       jobTarget: options.jobTarget,
       localSourcePath: options.localSourcePath
@@ -1533,7 +1553,9 @@ export {
   RulesConfigFileType2 as RulesConfigFileType,
   SolutionPackOptions,
   SolutionPackager,
-  createNodeSolutionPackager
+  createNodeSolutionPackager,
+  readMemberPackageIdAsync,
+  toProjectDiagnostics
 };
 
-//# debugId=DDB17EA8D8CBC61964756E2164756E21
+//# debugId=5407E726C8B2B72364756E2164756E21

package/dist/package-id.js

@@ -0,0 +1,170 @@
+// src/services/package-id-reader.ts
+import {
+  PackService
+} from "@uipath/project-packager";
+import { Path } from "@uipath/solutionpackager-tool-core";
+var legacySolutionResourcesFileName = "resources.json";
+
+class PackageIdReader {
+  fileSystem;
+  packService;
+  projectTypesToFolderNameMapping = {
+    processorchestration: "processOrchestration",
+    casemanagement: "caseManagement",
+    agent: "agent",
+    api: "api",
+    webapp: "webApp",
+    process: "process",
+    flow: "flow"
+  };
+  static projectTypeMap = {
+    process: "Rpa",
+    library: "Lib",
+    tests: "Tests",
+    webapp: "App",
+    processorchestration: "Agentic",
+    casemanagement: "Case",
+    api: "Api",
+    agent: "Agent",
+    flow: "Flow"
+  };
+  constructor(fileSystem, packService) {
+    this.fileSystem = fileSystem;
+    this.packService = packService;
+  }
+  async read(project, solutionPath, solutionName) {
+    try {
+      if (!solutionPath || solutionPath.trim() === "") {
+        return this.defaultToProjectFolder(project, solutionPath, solutionName);
+      }
+      return await this.readFromResourcesDirectory(project, solutionPath) || await this.readFromLegacyResourcesJson(project, solutionPath) || this.defaultToProjectFolder(project, solutionPath, solutionName);
+    } catch (ex) {
+      console.error("Error reading package ID:", ex);
+      return this.defaultToProjectFolder(project, solutionPath, solutionName);
+    }
+  }
+  defaultToProjectFolder(project, solutionPath, solutionName) {
+    const projectFolderName = Path.dirname(project.ProjectRelativePath);
+    const id = this.packService.sanitizePackageId(projectFolderName);
+    return this.getPackageId(id, project, solutionPath, solutionName);
+  }
+  getPackageId(rootPackageId, project, solutionPath, solutionName) {
+    const packageId = this.composePackageId(rootPackageId, project, solutionPath, solutionName);
+    return this.packService.sanitizePackageId(packageId);
+  }
+  composePackageId(rootPackageId, project, solutionPath, solutionName) {
+    if (!solutionName && (!solutionPath || solutionPath.trim() === "")) {
+      return rootPackageId;
+    }
+    const resolvedSolutionName = solutionName || this.deriveSolutionName(solutionPath);
+    const parts = [resolvedSolutionName];
+    if (project.Type) {
+      parts.push(PackageIdReader.normalizeProjectType(project.Type));
+    }
+    parts.push(rootPackageId);
+    return parts.join(".");
+  }
+  static normalizeProjectType(projectType) {
+    const normalizedKey = projectType.toLowerCase();
+    return PackageIdReader.projectTypeMap[normalizedKey] || projectType;
+  }
+  deriveSolutionName(solutionPath) {
+    const ext = Path.extname(solutionPath);
+    const base = Path.basename(solutionPath);
+    return ext ? base.substring(0, base.length - ext.length) : base;
+  }
+  async readFromLegacyResourcesJson(project, solutionPath) {
+    const resourcesFilePath = Path.join(solutionPath, legacySolutionResourcesFileName);
+    const exists = await this.fileSystem.exists(resourcesFilePath);
+    if (!exists) {
+      return null;
+    }
+    const data = await this.fileSystem.readFile(resourcesFilePath);
+    if (!data) {
+      return null;
+    }
+    const json = new TextDecoder().decode(data);
+    return this.getProjectIdFromJson(project, json);
+  }
+  getProjectIdFromJson(project, json) {
+    try {
+      const jsonObject = JSON.parse(json);
+      const resources = this.getProperty(jsonObject, "resources");
+      if (!Array.isArray(resources)) {
+        return null;
+      }
+      const resource = resources.find((r) => {
+        const projectKey = this.getProperty(r, "projectKey");
+        const kind = this.getProperty(r, "kind");
+        return projectKey === project.Id && typeof kind === "string" && kind.toLowerCase() === "process";
+      });
+      if (!resource) {
+        return null;
+      }
+      const spec = this.getProperty(resource, "spec");
+      if (!spec) {
+        return null;
+      }
+      const packageName = this.getProperty(spec, "packageName");
+      if (!packageName || typeof packageName !== "string" || packageName.trim() === "") {
+        return null;
+      }
+      return packageName;
+    } catch (ex) {
+      console.error("Error parsing legacy resources JSON:", ex);
+      return null;
+    }
+  }
+  async readFromResourcesDirectory(project, solutionPath) {
+    const projectTypeLower = project.Type.toLowerCase();
+    const projectTypeFolder = this.projectTypesToFolderNameMapping[projectTypeLower] || Path.dirname(project.ProjectRelativePath);
+    const processDirectory = Path.join(solutionPath, "resources", "solution_folder", "process", projectTypeFolder);
+    const stats = await this.fileSystem.stat(processDirectory);
+    if (!stats?.isDirectory()) {
+      return null;
+    }
+    const files = await this.fileSystem.readdir(processDirectory);
+    const jsonFiles = files.filter((f) => f.endsWith(".json")).map((f) => Path.join(processDirectory, f));
+    for (const jsonFile of jsonFiles) {
+      try {
+        const data = await this.fileSystem.readFile(jsonFile);
+        if (!data) {
+          continue;
+        }
+        const json = new TextDecoder().decode(data);
+        const jsonObject = JSON.parse(json);
+        const resource = this.getProperty(jsonObject, "resource");
+        const projectKey = this.getProperty(resource, "projectKey");
+        if (projectKey === project.Id) {
+          const spec = this.getProperty(resource, "spec");
+          const packageName = this.getProperty(spec, "packageName");
+          if (typeof packageName !== "string" || packageName.trim() === "") {
+            return null;
+          }
+          return packageName;
+        }
+      } catch (ex) {
+        console.error("Error reading resource file:", jsonFile, ex);
+      }
+    }
+    return null;
+  }
+  getProperty(obj, propertyName) {
+    if (!obj || typeof obj !== "object") {
+      return null;
+    }
+    const keys = Object.keys(obj);
+    const matchingKey = keys.find((key) => key.toLowerCase() === propertyName.toLowerCase());
+    return matchingKey ? obj[matchingKey] : null;
+  }
+}
+async function readMemberPackageIdAsync(fileSystem, project, solutionPath, solutionName) {
+  const packService = new PackService;
+  const packageId = await new PackageIdReader(fileSystem, packService).read(project, solutionPath, solutionName);
+  return packageId ? packService.sanitizePackageId(packageId) : packageId;
+}
+export {
+  readMemberPackageIdAsync
+};
+
+//# debugId=A19C538096761EE264756E2164756E21

package/dist/src/index.d.ts

@@ -5,5 +5,8 @@ export { BuildConfiguration, LogLevel, } from "@uipath/solutionpackager-tool-cor
 export { createBrowserSolutionPackager } from "./browser-solution-packager-factory.js";
 export { SolutionPackOptions } from "./models/solution-pack-options.js";
 export { INVALID_PACKAGE_ID } from "./services/member-package-ids.js";
+export { readMemberPackageIdAsync } from "./services/package-id-reader.js";
 export type { ISolutionPackager } from "./services/solution-packager.js";
 export { SolutionPackager } from "./services/solution-packager.js";
+export type { ProjectDiagnostics } from "./services/tool-result-helpers.js";
+export { toProjectDiagnostics } from "./services/tool-result-helpers.js";

package/dist/src/models/solution-pack-options.d.ts

@@ -1,6 +1,6 @@
 import type { PackageSigningInfo, PackOptions, PublishInfo, ValidateOptions } from "@uipath/project-packager";
 import { PackagerParameters } from "@uipath/project-packager";
-import { BuildConfiguration, type NugetPackageInfo, type PackJobTarget } from "@uipath/solutionpackager-tool-core";
+import { BuildConfiguration, type NugetPackageInfo } from "@uipath/solutionpackager-tool-core";
 /**
  * Solution-specific parameters extending base packager parameters
  */
@@ -55,11 +55,6 @@ export declare class SolutionPackOptions extends PackagerParameters {
      * by that session. Set by the caller that holds the lock.
      */
     lockKey?: string;
-    /**
-     * Where the remote-agent job that compiles RPA projects should run. Omit for
-     * serverless, which is the default and the only prior behaviour.
-     */
-    jobTarget?: PackJobTarget;
     /**
      * Absolute path of the workspace sources on the machine that runs the
      * remote-agent pack job, letting the agent pack them in place instead of

package/dist/src/node.d.ts

@@ -3,5 +3,8 @@ export { RulesConfigFileType } from "@uipath/project-packager";
 export { SolutionPackOptions } from "./models/solution-pack-options.js";
 export { createNodeSolutionPackager } from "./node-solution-packager-factory.js";
 export { INVALID_PACKAGE_ID } from "./services/member-package-ids.js";
+export { readMemberPackageIdAsync } from "./services/package-id-reader.js";
 export type { ISolutionPackager } from "./services/solution-packager.js";
 export { SolutionPackager } from "./services/solution-packager.js";
+export type { ProjectDiagnostics } from "./services/tool-result-helpers.js";
+export { toProjectDiagnostics } from "./services/tool-result-helpers.js";

package/dist/src/package-id.d.ts

@@ -0,0 +1 @@
+export { readMemberPackageIdAsync } from "./services/package-id-reader.js";

package/dist/src/services/package-id-reader.d.ts

@@ -1,4 +1,4 @@
-import type { IPackService, UiPathProject } from "@uipath/project-packager";
+import { type IPackService, type UiPathProject } from "@uipath/project-packager";
 import { type IFileSystem } from "@uipath/solutionpackager-tool-core";
 /**
  * Interface for reading package IDs from projects
@@ -59,3 +59,11 @@ export declare class PackageIdReader implements IPackageIdReader {
      */
     private getProperty;
 }
+/**
+ * The package id a solution pack gives one member, for a host that packs the
+ * member on its own but has to name it the way the solution does: the id the
+ * solution saved for it, else `<solution>.<short type>.<member folder>`,
+ * sanitized as the pack sanitizes it. Throws, as the pack does, for an id
+ * longer than NuGet allows.
+ */
+export declare function readMemberPackageIdAsync(fileSystem: IFileSystem, project: UiPathProject, solutionPath: string, solutionName: string): Promise<string | null>;

package/dist/src/services/tool-result-helpers.d.ts

@@ -9,6 +9,15 @@ import { type ToolResult } from "@uipath/solutionpackager-tool-core";
 export declare function hasFailedResults(results: ToolResult[]): boolean;
 /** Combined, comma-separated message of every failed result in the batch. */
 export declare function getFailedResultsMessage(results: ToolResult[]): string;
+/**
+ * The next steps the failed results carried, de-duplicated and joined, or
+ * `undefined` when none did. A project tool that says what to run (an
+ * uninitialized Function project, a member that needs re-saving in Studio
+ * Web) must not lose that at the solution layer: the CLI prints a tool's
+ * `instructions` as the envelope's `Instructions` only when the solution
+ * result still has them.
+ */
+export declare function getFailedResultsInstructions(results: ToolResult[]): string | undefined;
 /**
  * One project's outcome inside a solution operation, in the shape the CLI puts on the wire under
  * `Data.Projects`. Field names mirror the flattened findings the workflow compiler already emits, so

package/package.json

@@ -2,7 +2,7 @@
     "name": "@uipath/solution-packager",
     "author": "UiPath",
     "license": "SEE LICENSE IN LICENSE.txt",
-    "version": "1.204.0-preview.255",
+    "version": "1.205.0-preview.256",
     "description": "UiPath Solution Packager - core library for packing UiPath solutions",
     "type": "module",
     "main": "./dist/index.js",
@@ -14,6 +14,10 @@
         "./node": {
             "types": "./dist/src/node.d.ts",
             "default": "./dist/node.js"
+        },
+        "./package-id": {
+            "types": "./dist/src/package-id.d.ts",
+            "default": "./dist/package-id.js"
         }
     },
     "types": "./dist/src/index.d.ts",
@@ -29,11 +33,11 @@
         "dist"
     ],
     "dependencies": {
-        "@uipath/project-packager": "1.204.0",
-        "@uipath/solutionpackager-tool-core": "1.204.0"
+        "@uipath/project-packager": "1.205.0",
+        "@uipath/solutionpackager-tool-core": "1.205.0"
     },
     "peerDependencies": {
         "fflate": "^0.8.2"
     },
-    "gitHead": "699c58dabb59414557755a8933bcbe40aa420df3"
+    "gitHead": "63740c6cbb7ff282fa9118cc16a148eb030b245f"
 }