@uipath/solution-sdk 1.205.0-preview.290 → 1.205.0-preview.300
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/THIRD-PARTY-NOTICES.md +2 -2
- package/dist/deployment-search.js +1 -1
- package/dist/{embedded-file-reader-z4becc02.js → embedded-file-reader-1r9d51g0.js} +16 -16
- package/dist/{index-gdtpsdn7.js → index-j98qvwdt.js} +8 -2
- package/dist/{index-mknsnjy1.js → index-saxssfbe.js} +3 -3
- package/dist/{index-dqa169gp.js → index-ys3gmgf0.js} +1 -1
- package/dist/index.js +1 -1
- package/dist/package-search.js +1 -1
- package/dist/resources/index.js +219 -70
- package/package.json +2 -2
|
@@ -21,6 +21,10 @@ var JsonSerializerNames = {
|
|
|
21
21
|
};
|
|
22
22
|
|
|
23
23
|
// ../../node_modules/@uipath/resource-builder-sdk/dist/serialization/json-serializer.js
|
|
24
|
+
var VERBATIM_VALUE_PROPERTIES = new Set([
|
|
25
|
+
"spec"
|
|
26
|
+
]);
|
|
27
|
+
|
|
24
28
|
class JsonSerializer {
|
|
25
29
|
serialize(value) {
|
|
26
30
|
if (value == null)
|
|
@@ -110,7 +114,9 @@ class JsonSerializer {
|
|
|
110
114
|
const result = {};
|
|
111
115
|
const currentClassName = obj.constructor?.name !== "Object" ? obj.constructor.name : className;
|
|
112
116
|
for (const [key, val] of Object.entries(obj))
|
|
113
|
-
if (
|
|
117
|
+
if (VERBATIM_VALUE_PROPERTIES.has(key))
|
|
118
|
+
result[key] = val;
|
|
119
|
+
else if (typeof val == "string")
|
|
114
120
|
result[key] = this.tryConvertEnumStringToCamelCase(val, currentClassName, key);
|
|
115
121
|
else if (Array.isArray(val))
|
|
116
122
|
result[key] = val.map((item) => {
|
|
@@ -339,4 +345,4 @@ class StreamSerializer {
|
|
|
339
345
|
}
|
|
340
346
|
export { JsonSerializerNames, JsonSerializer, CAMEL_CASE_ENUM_PROPERTIES, SHARED_CORE_ABSTRACTIONS_PASCAL_CASE_PROPERTIES, RESOURCE_BUILDER_PASCAL_CASE_PROPERTIES, PASCAL_CASE_ENUM_PROPERTIES, JsonSerializerFactory, JsonSerializerProxy, StreamSerializer };
|
|
341
347
|
|
|
342
|
-
//# debugId=
|
|
348
|
+
//# debugId=C9C96784831F2C9F64756E2164756E21
|
|
@@ -303,7 +303,7 @@ var package_default = {
|
|
|
303
303
|
name: "@uipath/solution-sdk",
|
|
304
304
|
author: "UiPath",
|
|
305
305
|
license: "SEE LICENSE IN LICENSE.txt",
|
|
306
|
-
version: "1.205.0-preview.
|
|
306
|
+
version: "1.205.0-preview.300",
|
|
307
307
|
repository: {
|
|
308
308
|
type: "git",
|
|
309
309
|
url: "https://github.com/UiPath/cli.git",
|
|
@@ -363,7 +363,7 @@ var package_default = {
|
|
|
363
363
|
"@uipath/filesystem": "workspace:*",
|
|
364
364
|
"@uipath/orchestrator-sdk": "workspace:*",
|
|
365
365
|
"@uipath/pipelines-sdk": "workspace:*",
|
|
366
|
-
"@uipath/resource-builder-sdk": "
|
|
366
|
+
"@uipath/resource-builder-sdk": "1.0.0-s205-17620",
|
|
367
367
|
"@uipath/solutionpackager-tool-core": "workspace:*",
|
|
368
368
|
"@uipath/studioweb-sdk": "workspace:*",
|
|
369
369
|
"@types/node": "^25.5.2",
|
|
@@ -3001,4 +3001,4 @@ class SettingsApi extends BaseAPI {
|
|
|
3001
3001
|
}
|
|
3002
3002
|
export { BASE_PATH, Configuration, DefaultConfig, BaseAPI, ResponseError, FetchError, RequiredError, COLLECTION_FORMATS, querystring, exists, mapValues, canConsumeForm, JSONApiResponse, VoidApiResponse, BlobApiResponse, TextApiResponse, SDK_USER_AGENT, instanceOfResponseDictionaryDto, ResponseDictionaryDtoFromJSON, ResponseDictionaryDtoFromJSONTyped, ResponseDictionaryDtoToJSON, ResponseDictionaryDtoToJSONTyped, instanceOfBlobFileAccessDto, BlobFileAccessDtoFromJSON, BlobFileAccessDtoFromJSONTyped, BlobFileAccessDtoToJSON, BlobFileAccessDtoToJSONTyped, instanceOfCreateConfigurationCommand, CreateConfigurationCommandFromJSON, CreateConfigurationCommandFromJSONTyped, CreateConfigurationCommandToJSON, CreateConfigurationCommandToJSONTyped, DeploymentActivationStatus, instanceOfDeploymentActivationStatus, DeploymentActivationStatusFromJSON, DeploymentActivationStatusFromJSONTyped, DeploymentActivationStatusToJSON, DeploymentActivationStatusToJSONTyped, OverwriteType, instanceOfOverwriteType, OverwriteTypeFromJSON, OverwriteTypeFromJSONTyped, OverwriteTypeToJSON, OverwriteTypeToJSONTyped, instanceOfOverwrite, OverwriteFromJSON, OverwriteFromJSONTyped, OverwriteToJSON, OverwriteToJSONTyped, instanceOfResourceOverwrite, ResourceOverwriteFromJSON, ResourceOverwriteFromJSONTyped, ResourceOverwriteToJSON, ResourceOverwriteToJSONTyped, instanceOfRuntimeSetup, RuntimeSetupFromJSON, RuntimeSetupFromJSONTyped, RuntimeSetupToJSON, RuntimeSetupToJSONTyped, instanceOfDeploymentAutoRequest, DeploymentAutoRequestFromJSON, DeploymentAutoRequestFromJSONTyped, DeploymentAutoRequestToJSON, DeploymentAutoRequestToJSONTyped, instanceOfDeploymentDto, DeploymentDtoFromJSON, DeploymentDtoFromJSONTyped, DeploymentDtoToJSON, DeploymentDtoToJSONTyped, WorkflowAction, instanceOfWorkflowAction, WorkflowActionFromJSON, WorkflowActionFromJSONTyped, WorkflowActionToJSON, WorkflowActionToJSONTyped, DeploymentOperation, instanceOfDeploymentOperation, DeploymentOperationFromJSON, DeploymentOperationFromJSONTyped, DeploymentOperationToJSON, DeploymentOperationToJSONTyped, PackageVersionOrigin, instanceOfPackageVersionOrigin, PackageVersionOriginFromJSON, PackageVersionOriginFromJSONTyped, PackageVersionOriginToJSON, PackageVersionOriginToJSONTyped, DeploymentOperationStatus, instanceOfDeploymentOperationStatus, DeploymentOperationStatusFromJSON, DeploymentOperationStatusFromJSONTyped, DeploymentOperationStatusToJSON, DeploymentOperationStatusToJSONTyped, DeploymentUpgradeType, instanceOfDeploymentUpgradeType, DeploymentUpgradeTypeFromJSON, DeploymentUpgradeTypeFromJSONTyped, DeploymentUpgradeTypeToJSON, DeploymentUpgradeTypeToJSONTyped, DeploymentStatus, instanceOfDeploymentStatus, DeploymentStatusFromJSON, DeploymentStatusFromJSONTyped, DeploymentStatusToJSON, DeploymentStatusToJSONTyped, instanceOfDeploymentItemDto, DeploymentItemDtoFromJSON, DeploymentItemDtoFromJSONTyped, DeploymentItemDtoToJSON, DeploymentItemDtoToJSONTyped, instanceOfDeploymentRequest, DeploymentRequestFromJSON, DeploymentRequestFromJSONTyped, DeploymentRequestToJSON, DeploymentRequestToJSONTyped, DeploymentResourceValidationAction, instanceOfDeploymentResourceValidationAction, DeploymentResourceValidationActionFromJSON, DeploymentResourceValidationActionFromJSONTyped, DeploymentResourceValidationActionToJSON, DeploymentResourceValidationActionToJSONTyped, ResetConfigurationSource, instanceOfResetConfigurationSource, ResetConfigurationSourceFromJSON, ResetConfigurationSourceFromJSONTyped, ResetConfigurationSourceToJSON, ResetConfigurationSourceToJSONTyped, DeploymentUpgradeState, instanceOfDeploymentUpgradeState, DeploymentUpgradeStateFromJSON, DeploymentUpgradeStateFromJSONTyped, DeploymentUpgradeStateToJSON, DeploymentUpgradeStateToJSONTyped, instanceOfDeploymentResourceReplacementDto, DeploymentResourceReplacementDtoFromJSON, DeploymentResourceReplacementDtoFromJSONTyped, DeploymentResourceReplacementDtoToJSON, DeploymentResourceReplacementDtoToJSONTyped, instanceOfFolderInfo, FolderInfoFromJSON, FolderInfoFromJSONTyped, FolderInfoToJSON, FolderInfoToJSONTyped, instanceOfDeploymentResourceInfo, DeploymentResourceInfoFromJSON, DeploymentResourceInfoFromJSONTyped, DeploymentResourceInfoToJSON, DeploymentResourceInfoToJSONTyped, DeploymentResourceValidationErrorKind, instanceOfDeploymentResourceValidationErrorKind, DeploymentResourceValidationErrorKindFromJSON, DeploymentResourceValidationErrorKindFromJSONTyped, DeploymentResourceValidationErrorKindToJSON, DeploymentResourceValidationErrorKindToJSONTyped, DeploymentResourceValidationErrorLevel, instanceOfDeploymentResourceValidationErrorLevel, DeploymentResourceValidationErrorLevelFromJSON, DeploymentResourceValidationErrorLevelFromJSONTyped, DeploymentResourceValidationErrorLevelToJSON, DeploymentResourceValidationErrorLevelToJSONTyped, DeploymentType, instanceOfDeploymentType, DeploymentTypeFromJSON, DeploymentTypeFromJSONTyped, DeploymentTypeToJSON, DeploymentTypeToJSONTyped, instanceOfDeploymentSearchItemDto2, DeploymentSearchItemDto2FromJSON, DeploymentSearchItemDto2FromJSONTyped, DeploymentSearchItemDto2ToJSON, DeploymentSearchItemDto2ToJSONTyped, instanceOfServiceMessage, ServiceMessageFromJSON, ServiceMessageFromJSONTyped, ServiceMessageToJSON, ServiceMessageToJSONTyped, instanceOfResourceValidationError, ResourceValidationErrorFromJSON, ResourceValidationErrorFromJSONTyped, ResourceValidationErrorToJSON, ResourceValidationErrorToJSONTyped, instanceOfResourceValidationDto, ResourceValidationDtoFromJSON, ResourceValidationDtoFromJSONTyped, ResourceValidationDtoToJSON, ResourceValidationDtoToJSONTyped, instanceOfDeploymentValidationResultDto, DeploymentValidationResultDtoFromJSON, DeploymentValidationResultDtoFromJSONTyped, DeploymentValidationResultDtoToJSON, DeploymentValidationResultDtoToJSONTyped, OrderByDirection, instanceOfOrderByDirection, OrderByDirectionFromJSON, OrderByDirectionFromJSONTyped, OrderByDirectionToJSON, OrderByDirectionToJSONTyped, instanceOfDeploymentsSearchRequest2, DeploymentsSearchRequest2FromJSON, DeploymentsSearchRequest2FromJSONTyped, DeploymentsSearchRequest2ToJSON, DeploymentsSearchRequest2ToJSONTyped, ExtendedPackageVersionState, instanceOfExtendedPackageVersionState, ExtendedPackageVersionStateFromJSON, ExtendedPackageVersionStateFromJSONTyped, ExtendedPackageVersionStateToJSON, ExtendedPackageVersionStateToJSONTyped, instanceOfLocationDto, LocationDtoFromJSON, LocationDtoFromJSONTyped, LocationDtoToJSON, LocationDtoToJSONTyped, instanceOfPackageInfo, PackageInfoFromJSON, PackageInfoFromJSONTyped, PackageInfoToJSON, PackageInfoToJSONTyped, instanceOfResourceStats, ResourceStatsFromJSON, ResourceStatsFromJSONTyped, ResourceStatsToJSON, ResourceStatsToJSONTyped, instanceOfPackageVersionResourceDto, PackageVersionResourceDtoFromJSON, PackageVersionResourceDtoFromJSONTyped, PackageVersionResourceDtoToJSON, PackageVersionResourceDtoToJSONTyped, instanceOfPackageVersionComponentsDto, PackageVersionComponentsDtoFromJSON, PackageVersionComponentsDtoFromJSONTyped, PackageVersionComponentsDtoToJSON, PackageVersionComponentsDtoToJSONTyped, instanceOfPackageVersionInfoDto, PackageVersionInfoDtoFromJSON, PackageVersionInfoDtoFromJSONTyped, PackageVersionInfoDtoToJSON, PackageVersionInfoDtoToJSONTyped, instanceOfPageInfoDtoOfDeploymentResourceInfo, PageInfoDtoOfDeploymentResourceInfoFromJSON, PageInfoDtoOfDeploymentResourceInfoFromJSONTyped, PageInfoDtoOfDeploymentResourceInfoToJSON, PageInfoDtoOfDeploymentResourceInfoToJSONTyped, instanceOfPageInfoDtoOfDeploymentSearchItemDto2, PageInfoDtoOfDeploymentSearchItemDto2FromJSON, PageInfoDtoOfDeploymentSearchItemDto2FromJSONTyped, PageInfoDtoOfDeploymentSearchItemDto2ToJSON, PageInfoDtoOfDeploymentSearchItemDto2ToJSONTyped, instanceOfPageInfoDtoOfPackageInfo, PageInfoDtoOfPackageInfoFromJSON, PageInfoDtoOfPackageInfoFromJSONTyped, PageInfoDtoOfPackageInfoToJSON, PageInfoDtoOfPackageInfoToJSONTyped, instanceOfProblemDetails, ProblemDetailsFromJSON, ProblemDetailsFromJSONTyped, ProblemDetailsToJSON, ProblemDetailsToJSONTyped, instanceOfProjectCreateRequest, ProjectCreateRequestFromJSON, ProjectCreateRequestFromJSONTyped, ProjectCreateRequestToJSON, ProjectCreateRequestToJSONTyped, ProjectImportStatus, instanceOfProjectImportStatus, ProjectImportStatusFromJSON, ProjectImportStatusFromJSONTyped, ProjectImportStatusToJSON, ProjectImportStatusToJSONTyped, instanceOfProjectDto, ProjectDtoFromJSON, ProjectDtoFromJSONTyped, ProjectDtoToJSON, ProjectDtoToJSONTyped, instanceOfSearchFilter, SearchFilterFromJSON, SearchFilterFromJSONTyped, SearchFilterToJSON, SearchFilterToJSONTyped, SolutionDeploymentAction, instanceOfSolutionDeploymentAction, SolutionDeploymentActionFromJSON, SolutionDeploymentActionFromJSONTyped, SolutionDeploymentActionToJSON, SolutionDeploymentActionToJSONTyped, ConfigurationsApi, DeploymentsApi, PackagesApi, ProjectsApi, SearchApi, SettingsApi };
|
|
3003
3003
|
|
|
3004
|
-
//# debugId=
|
|
3004
|
+
//# debugId=BC4B14EB151A4B9564756E2164756E21
|
package/dist/index.js
CHANGED
package/dist/package-search.js
CHANGED
package/dist/resources/index.js
CHANGED
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
JsonSerializerNames,
|
|
4
4
|
JsonSerializerProxy,
|
|
5
5
|
StreamSerializer
|
|
6
|
-
} from "../index-
|
|
6
|
+
} from "../index-j98qvwdt.js";
|
|
7
7
|
import {
|
|
8
8
|
FirstPartyServiceApi
|
|
9
9
|
} from "../index-53w8skv5.js";
|
|
@@ -3616,6 +3616,7 @@ var ErrorCodes = {
|
|
|
3616
3616
|
ResourceAttributeMismatch: "2023",
|
|
3617
3617
|
AppSystemNameConflict: "2024",
|
|
3618
3618
|
InvalidResourceFile: "2025",
|
|
3619
|
+
DuplicatePackageName: "2026",
|
|
3619
3620
|
ResourceNotFound: "1000",
|
|
3620
3621
|
ResourceAlreadyExists: "Resources.ResourceAlreadyExists",
|
|
3621
3622
|
ResourceDependencyNotFound: "Resources.ResourceDependencyNotFound",
|
|
@@ -4144,6 +4145,30 @@ function getPackageType(processResourceType) {
|
|
|
4144
4145
|
return processResourceType;
|
|
4145
4146
|
return processTypeToPackageTypeMap[processResourceType.toLowerCase()] ?? processResourceType;
|
|
4146
4147
|
}
|
|
4148
|
+
function generatePackageName(solutionName, projectName, processResourceType) {
|
|
4149
|
+
const packageType = getPackageType(processResourceType) ?? "";
|
|
4150
|
+
const truncateCharsNo = Math.floor((PACKAGE_NAME_MAX_LENGTH - PACKAGE_NAME_SEPARATION_CHARS - packageType.length) / 2);
|
|
4151
|
+
return sanitizeNuGetPackageName(`${truncate(solutionName, truncateCharsNo)}.${packageType}.${truncate(projectName, truncateCharsNo)}`);
|
|
4152
|
+
}
|
|
4153
|
+
function resolvePackageNameAfterRename(processResource, solutionName, projectName, oldSolutionName, oldProjectName) {
|
|
4154
|
+
const currentPackageName = processResource.spec?.[WellKnownPropertyNames.PackageName];
|
|
4155
|
+
if (!solutionName)
|
|
4156
|
+
return currentPackageName ?? undefined;
|
|
4157
|
+
const oldGeneratedPackageName = generatePackageName(oldSolutionName ?? "", oldProjectName ?? processResource.name, processResource.type);
|
|
4158
|
+
return currentPackageName && currentPackageName.toLowerCase() !== oldGeneratedPackageName.toLowerCase() ? currentPackageName : generatePackageName(solutionName, projectName, processResource.type);
|
|
4159
|
+
}
|
|
4160
|
+
function findPackageNameConflict(solution, projectKey, solutionName, packageName) {
|
|
4161
|
+
if (!packageName)
|
|
4162
|
+
return;
|
|
4163
|
+
const wanted = packageName.toLowerCase();
|
|
4164
|
+
return solution.resources.find((resource) => resource.projectKey !== undefined && resource.projectKey !== projectKey && resource.kind.toLowerCase() === WellKnownProjectType.Process.toLowerCase() && effectivePackageName(resource, solutionName)?.toLowerCase() === wanted);
|
|
4165
|
+
}
|
|
4166
|
+
function effectivePackageName(processResource, solutionName) {
|
|
4167
|
+
const packageName = processResource.spec?.[WellKnownPropertyNames.PackageName];
|
|
4168
|
+
if (packageName)
|
|
4169
|
+
return packageName;
|
|
4170
|
+
return solutionName ? generatePackageName(solutionName, processResource.name, processResource.type) : undefined;
|
|
4171
|
+
}
|
|
4147
4172
|
function changePackageName(processResource, solutionName, projectName, oldSolutionName, oldProjectName) {
|
|
4148
4173
|
if (!solutionName)
|
|
4149
4174
|
return false;
|
|
@@ -4152,11 +4177,9 @@ function changePackageName(processResource, solutionName, projectName, oldSoluti
|
|
|
4152
4177
|
spec[WellKnownPropertyNames.PackageName] = null;
|
|
4153
4178
|
processResource.spec = spec;
|
|
4154
4179
|
const currentPackageName = spec[WellKnownPropertyNames.PackageName];
|
|
4155
|
-
const
|
|
4156
|
-
const truncateCharsNo = Math.floor((PACKAGE_NAME_MAX_LENGTH - PACKAGE_NAME_SEPARATION_CHARS - packageType.length) / 2);
|
|
4157
|
-
const newPackageName = sanitizeNuGetPackageName(`${truncate(solutionName, truncateCharsNo)}.${packageType}.${truncate(projectName, truncateCharsNo)}`);
|
|
4180
|
+
const newPackageName = generatePackageName(solutionName, projectName, processResource.type);
|
|
4158
4181
|
const projectNameForOldPackage = oldProjectName ?? processResource.name;
|
|
4159
|
-
const oldGeneratedPackageName =
|
|
4182
|
+
const oldGeneratedPackageName = generatePackageName(oldSolutionName ?? "", projectNameForOldPackage, processResource.type);
|
|
4160
4183
|
if (!currentPackageName || currentPackageName.toLowerCase() === oldGeneratedPackageName.toLowerCase()) {
|
|
4161
4184
|
spec[WellKnownPropertyNames.PackageName] = newPackageName;
|
|
4162
4185
|
renamePackageDependencies(processResource, projectNameForOldPackage, projectName);
|
|
@@ -4367,8 +4390,15 @@ class MultiFileSolutionDefinitionProvider {
|
|
|
4367
4390
|
return withFileOperationTimeout2(provider, resolveFileOperationTimeoutMs(this.options));
|
|
4368
4391
|
}
|
|
4369
4392
|
async readAsync(context, cancellationToken) {
|
|
4393
|
+
return this.readWithKindsAsync(context, undefined, cancellationToken);
|
|
4394
|
+
}
|
|
4395
|
+
async readKindsAsync(context, kinds, cancellationToken) {
|
|
4396
|
+
return this.readWithKindsAsync(context, context.isReadOnly ? kinds : undefined, cancellationToken);
|
|
4397
|
+
}
|
|
4398
|
+
async readWithKindsAsync(context, kinds, cancellationToken) {
|
|
4370
4399
|
this.logger.info("Reading multi-file solution definition for solution %s", context.path);
|
|
4371
4400
|
const loadStarted = nowMs();
|
|
4401
|
+
let listedFileCount = 0;
|
|
4372
4402
|
let fileCount = 0;
|
|
4373
4403
|
let listMs = 0;
|
|
4374
4404
|
let readStarted = loadStarted;
|
|
@@ -4406,9 +4436,11 @@ class MultiFileSolutionDefinitionProvider {
|
|
|
4406
4436
|
loaded: loadedCount,
|
|
4407
4437
|
missing: missingFiles.length,
|
|
4408
4438
|
invalid: invalidFiles.length,
|
|
4409
|
-
parseErrors: parseErrors.length
|
|
4439
|
+
parseErrors: parseErrors.length,
|
|
4440
|
+
kinds: kinds?.join(",") ?? "*",
|
|
4441
|
+
listedFileCount
|
|
4410
4442
|
};
|
|
4411
|
-
const message = `Solution read ${outcome} for solution ${context.path}: ${metrics.fileCount} files in ${metrics.totalMs} ms (list ${metrics.listMs} ms, read ${metrics.readWallMs} ms wall, io ${metrics.ioMs} ms summed, max file io ${metrics.maxFileIoMs} ms, parse ${metrics.parseMs} ms, hash ${metrics.hashMs} ms, merge ${metrics.mergeMs} ms); ${metrics.chars} chars; parallelism ${metrics.degreeOfParallelism}; readOnly ${metrics.isReadOnly}; loaded ${metrics.loaded}, missing ${metrics.missing}, invalid ${metrics.invalid}, parseErrors ${metrics.parseErrors}`;
|
|
4443
|
+
const message = `Solution read ${outcome} for solution ${context.path}: ${metrics.fileCount} files in ${metrics.totalMs} ms (list ${metrics.listMs} ms, read ${metrics.readWallMs} ms wall, io ${metrics.ioMs} ms summed, max file io ${metrics.maxFileIoMs} ms, parse ${metrics.parseMs} ms, hash ${metrics.hashMs} ms, merge ${metrics.mergeMs} ms); ${metrics.chars} chars; parallelism ${metrics.degreeOfParallelism}; readOnly ${metrics.isReadOnly}; loaded ${metrics.loaded}, missing ${metrics.missing}, invalid ${metrics.invalid}, parseErrors ${metrics.parseErrors}; kinds ${metrics.kinds}, listed ${metrics.listedFileCount}`;
|
|
4412
4444
|
if (outcome === "Success")
|
|
4413
4445
|
this.logger.info(message, metrics);
|
|
4414
4446
|
else
|
|
@@ -4434,8 +4466,11 @@ class MultiFileSolutionDefinitionProvider {
|
|
|
4434
4466
|
tree.length = 0;
|
|
4435
4467
|
}
|
|
4436
4468
|
const listStarted = nowMs();
|
|
4437
|
-
const
|
|
4469
|
+
const listedFiles = await fileStorageProvider.getFilesAsync(SolutionConstants.RESOURCE_FILES_FOLDER_NAME, "*.json", cancellationToken);
|
|
4438
4470
|
listMs = nowMs() - listStarted;
|
|
4471
|
+
listedFileCount = listedFiles.length;
|
|
4472
|
+
const wantedKinds = kinds && new Set(kinds.map((k) => k.toLowerCase()));
|
|
4473
|
+
const resourceFiles = wantedKinds === undefined ? listedFiles : listedFiles.filter((resourceFile) => MultiFileSolutionDefinitionProvider.mayHoldAnyKind(resourceFile, wantedKinds));
|
|
4439
4474
|
fileCount = resourceFiles.length;
|
|
4440
4475
|
readStarted = nowMs();
|
|
4441
4476
|
const readResults = await this.readResourceFilesAsync(context, fileStorageProvider, resourceFiles, cancellationToken);
|
|
@@ -4678,6 +4713,10 @@ class MultiFileSolutionDefinitionProvider {
|
|
|
4678
4713
|
};
|
|
4679
4714
|
}
|
|
4680
4715
|
}
|
|
4716
|
+
static mayHoldAnyKind(resourceFile, lowerCaseKinds) {
|
|
4717
|
+
const segments = resourceFile.replace(/\\/g, "/").split("/").filter((s) => s.length > 0);
|
|
4718
|
+
return segments.slice(0, -1).some((segment) => lowerCaseKinds.has(segment.toLowerCase()));
|
|
4719
|
+
}
|
|
4681
4720
|
applyFolders(resource, resourceFile) {
|
|
4682
4721
|
const relPath = resourceFile.replace(/\\/g, "/");
|
|
4683
4722
|
const segments = relPath.split("/").filter((s) => s.length > 0);
|
|
@@ -4781,6 +4820,8 @@ class MultiFileSolutionDefinitionProvider {
|
|
|
4781
4820
|
newPaths.forEach((value, key) => {
|
|
4782
4821
|
existingPaths.set(key, value);
|
|
4783
4822
|
});
|
|
4823
|
+
existingTree.length = 0;
|
|
4824
|
+
existingTree.push(...orderedResourceKeys);
|
|
4784
4825
|
}
|
|
4785
4826
|
async deleteFilesAsync(context, filesToDelete, cancellationToken) {
|
|
4786
4827
|
if (!filesToDelete || filesToDelete.length === 0 || context.isReadOnly)
|
|
@@ -5010,8 +5051,8 @@ class MultiFileSolutionDefinitionFactory {
|
|
|
5010
5051
|
// ../../node_modules/@uipath/resource-builder-sdk/dist/embedded-files-default.js
|
|
5011
5052
|
async function createDefaultEmbeddedFileReaderAsync() {
|
|
5012
5053
|
const [{ EmbeddedFileReader }, { JsonSerializerFactory: JsonSerializerFactory2 }] = await Promise.all([
|
|
5013
|
-
import("../embedded-file-reader-
|
|
5014
|
-
import("../index-
|
|
5054
|
+
import("../embedded-file-reader-1r9d51g0.js"),
|
|
5055
|
+
import("../index-ys3gmgf0.js")
|
|
5015
5056
|
]);
|
|
5016
5057
|
return new EmbeddedFileReader(new JsonSerializerFactory2);
|
|
5017
5058
|
}
|
|
@@ -5625,7 +5666,103 @@ class BindingOverwritesMappingRequest {
|
|
|
5625
5666
|
}
|
|
5626
5667
|
}
|
|
5627
5668
|
|
|
5669
|
+
// ../../node_modules/@uipath/resource-builder-sdk/dist/bindings/jit-debug-project-types.js
|
|
5670
|
+
var JIT_DEBUG_PROJECT_TYPES_FEATURE_FLAG = "FE.JitDebugProjectTypes";
|
|
5671
|
+
var PROCESS_KIND = "process";
|
|
5672
|
+
var BUSINESS_RULE_KIND = "businessrule";
|
|
5673
|
+
var APP_KIND = "app";
|
|
5674
|
+
var LOW_CODE_APP_PROJECT_TYPE = "webapp";
|
|
5675
|
+
var LOW_CODE_APP_TYPES = new Set([
|
|
5676
|
+
"workflow action"
|
|
5677
|
+
]);
|
|
5678
|
+
var CODED_APP_PROJECT_TYPE = "appv2";
|
|
5679
|
+
var CODED_APP_TYPES = new Set([
|
|
5680
|
+
"coded",
|
|
5681
|
+
"codedaction"
|
|
5682
|
+
]);
|
|
5683
|
+
var DEFAULT_PROCESS_PROJECT_TYPE = "process";
|
|
5684
|
+
var KNOWN_PROCESS_PROJECT_TYPES = new Set([
|
|
5685
|
+
DEFAULT_PROCESS_PROJECT_TYPE,
|
|
5686
|
+
"processorchestration",
|
|
5687
|
+
"agent",
|
|
5688
|
+
"api",
|
|
5689
|
+
"flow",
|
|
5690
|
+
"function",
|
|
5691
|
+
"casemanagement",
|
|
5692
|
+
"webapp",
|
|
5693
|
+
"businessrules"
|
|
5694
|
+
]);
|
|
5695
|
+
var BUSINESS_RULE_PROJECT_TYPE = "businessrules";
|
|
5696
|
+
function parseJitDebugProjectTypes(flagValue) {
|
|
5697
|
+
if (!flagValue || !flagValue.trim())
|
|
5698
|
+
return [];
|
|
5699
|
+
return flagValue.split(",").map((t) => t.trim()).filter((t) => t.length > 0);
|
|
5700
|
+
}
|
|
5701
|
+
function solutionSupportsJitDebug(solution, flagValue) {
|
|
5702
|
+
const enabledProjectTypes = parseJitDebugProjectTypes(flagValue).map((t) => t.toLowerCase());
|
|
5703
|
+
if (enabledProjectTypes.length === 0)
|
|
5704
|
+
return false;
|
|
5705
|
+
return (solution.resources ?? []).filter((r) => (r.projectKey != null || r.isArtefactResource === true) && isDecisionKind(r.kind)).every((r) => enabledProjectTypes.some((projectType) => matches(projectType, r)));
|
|
5706
|
+
}
|
|
5707
|
+
function isDecisionKind(kind) {
|
|
5708
|
+
const normalized = (kind ?? "").toLowerCase();
|
|
5709
|
+
return normalized === PROCESS_KIND || normalized === BUSINESS_RULE_KIND || normalized === APP_KIND;
|
|
5710
|
+
}
|
|
5711
|
+
function matches(projectType, resource) {
|
|
5712
|
+
if ((resource.kind ?? "").toLowerCase() === BUSINESS_RULE_KIND)
|
|
5713
|
+
return projectType === BUSINESS_RULE_PROJECT_TYPE;
|
|
5714
|
+
if ((resource.kind ?? "").toLowerCase() === APP_KIND) {
|
|
5715
|
+
const appType = (resource.type ?? "").toLowerCase();
|
|
5716
|
+
if (appType === "" || LOW_CODE_APP_TYPES.has(appType))
|
|
5717
|
+
return projectType === LOW_CODE_APP_PROJECT_TYPE;
|
|
5718
|
+
return CODED_APP_TYPES.has(appType) && projectType === CODED_APP_PROJECT_TYPE;
|
|
5719
|
+
}
|
|
5720
|
+
const resourceType = (resource.type ?? "").toLowerCase();
|
|
5721
|
+
const processType = resourceType === "" ? DEFAULT_PROCESS_PROJECT_TYPE : resourceType;
|
|
5722
|
+
return !KNOWN_PROCESS_PROJECT_TYPES.has(processType) || projectType === processType;
|
|
5723
|
+
}
|
|
5724
|
+
|
|
5725
|
+
// ../../node_modules/@uipath/resource-builder-sdk/dist/services/overwrites/models.js
|
|
5726
|
+
var models_ValidationSeverity = /* @__PURE__ */ function(ValidationSeverity) {
|
|
5727
|
+
ValidationSeverity["Warning"] = "Warning";
|
|
5728
|
+
ValidationSeverity["Critical"] = "Critical";
|
|
5729
|
+
return ValidationSeverity;
|
|
5730
|
+
}({});
|
|
5731
|
+
var models_OverwriteType = /* @__PURE__ */ function(OverwriteType) {
|
|
5732
|
+
OverwriteType["Install"] = "Install";
|
|
5733
|
+
OverwriteType["Reference"] = "Reference";
|
|
5734
|
+
return OverwriteType;
|
|
5735
|
+
}({});
|
|
5736
|
+
function createLocalizableMessage(key, ...args) {
|
|
5737
|
+
return {
|
|
5738
|
+
key,
|
|
5739
|
+
args: args.length > 0 ? args : undefined
|
|
5740
|
+
};
|
|
5741
|
+
}
|
|
5742
|
+
function createMissingRcsResources(missingKeys, error) {
|
|
5743
|
+
return {
|
|
5744
|
+
missingResourceKeys: missingKeys instanceof Set ? missingKeys : new Set(missingKeys),
|
|
5745
|
+
error
|
|
5746
|
+
};
|
|
5747
|
+
}
|
|
5748
|
+
function setValidationError(errors, resourceKey, dto) {
|
|
5749
|
+
const error = errors.get(resourceKey);
|
|
5750
|
+
if (error)
|
|
5751
|
+
dto.validationError = error;
|
|
5752
|
+
}
|
|
5753
|
+
var DebugOverwritesConstants = {
|
|
5754
|
+
ResourceOverwritesFileName: "debug_overwrites.json",
|
|
5755
|
+
CurrentOverwritesDocVersion: "1.0"
|
|
5756
|
+
};
|
|
5757
|
+
|
|
5628
5758
|
// ../../node_modules/@uipath/resource-builder-sdk/dist/bindings/binding-overwrites-handler.js
|
|
5759
|
+
var FOLDER_KEY_RESOURCE_TYPES = new Set([
|
|
5760
|
+
models_BindingsResourceType.Entity,
|
|
5761
|
+
models_BindingsResourceType.Asset,
|
|
5762
|
+
models_BindingsResourceType.Queue,
|
|
5763
|
+
models_BindingsResourceType.Process
|
|
5764
|
+
]);
|
|
5765
|
+
|
|
5629
5766
|
class BindingOverwritesHandler {
|
|
5630
5767
|
async handleAsync(request, cancellationToken) {
|
|
5631
5768
|
if (request instanceof BindingOverwritesValidationCommand)
|
|
@@ -5640,6 +5777,10 @@ class BindingOverwritesHandler {
|
|
|
5640
5777
|
if (bindingResources.length === 0)
|
|
5641
5778
|
return {};
|
|
5642
5779
|
const result = {};
|
|
5780
|
+
const solution = await request.context.loadAsync(cancellationToken);
|
|
5781
|
+
const jitDebugProjectTypes = this.featureFlagProvider.getString(JIT_DEBUG_PROJECT_TYPES_FEATURE_FLAG, "");
|
|
5782
|
+
const emptyFolderPathForArtefacts = solutionSupportsJitDebug(solution, jitDebugProjectTypes);
|
|
5783
|
+
this.logger.info(`Binding overwrites for solution ${request.context.path}: JIT debug ${emptyFolderPathForArtefacts ? "on" : "off"} (FE.JitDebugProjectTypes = '${jitDebugProjectTypes}')`);
|
|
5643
5784
|
const resourceOverwrites = await this.resourceOverwritesService.getResourceOverwritesAsync(request.context, cancellationToken);
|
|
5644
5785
|
for (const bindingResource of bindingResources) {
|
|
5645
5786
|
const resourceOverwrite = resourceOverwrites.get(bindingResource.resourceKey.toLowerCase());
|
|
@@ -5652,13 +5793,15 @@ class BindingOverwritesHandler {
|
|
|
5652
5793
|
[BindingsKnownKeys.FolderKeyPropertyName]: resourceOverwrite.folderKey ?? ""
|
|
5653
5794
|
};
|
|
5654
5795
|
else {
|
|
5655
|
-
const
|
|
5796
|
+
const resolvesInDebugFolder = emptyFolderPathForArtefacts && bindingResource.isArtefactResource;
|
|
5797
|
+
const folderPath = resolvesInDebugFolder ? "" : resourceOverwrite.folderFullyQualifiedName ?? "";
|
|
5798
|
+
const name = resourceOverwrite.type === models_OverwriteType.Install && bindingResource.isArtefactResource && bindingResource.resourceName ? bindingResource.resourceName : resourceOverwrite.resourceName;
|
|
5656
5799
|
overwrite = {
|
|
5657
5800
|
[BindingsKnownKeys.FolderPathPropertyName]: folderPath,
|
|
5658
|
-
[BindingsKnownKeys.NamePropertyName]:
|
|
5801
|
+
[BindingsKnownKeys.NamePropertyName]: name
|
|
5659
5802
|
};
|
|
5660
|
-
if (bindingResource.binding.resourceType
|
|
5661
|
-
overwrite[BindingsKnownKeys.FolderKeyPropertyName] = resourceOverwrite.folderKey ?? "";
|
|
5803
|
+
if (FOLDER_KEY_RESOURCE_TYPES.has(bindingResource.binding.resourceType))
|
|
5804
|
+
overwrite[BindingsKnownKeys.FolderKeyPropertyName] = resolvesInDebugFolder ? "" : resourceOverwrite.folderKey ?? "";
|
|
5662
5805
|
}
|
|
5663
5806
|
const key = getOverrideKey(bindingResource.binding);
|
|
5664
5807
|
result[key] = overwrite;
|
|
@@ -5674,9 +5817,10 @@ class BindingOverwritesHandler {
|
|
|
5674
5817
|
throw new BadRequestException("Bindings.ValidationFailed", `Binding validation failed: ${failureMessages}`);
|
|
5675
5818
|
}
|
|
5676
5819
|
}
|
|
5677
|
-
constructor(mediator, resourceOverwritesService, loggerFactory) {
|
|
5820
|
+
constructor(mediator, resourceOverwritesService, loggerFactory, featureFlagProvider) {
|
|
5678
5821
|
this.mediator = mediator;
|
|
5679
5822
|
this.resourceOverwritesService = resourceOverwritesService;
|
|
5823
|
+
this.featureFlagProvider = featureFlagProvider;
|
|
5680
5824
|
this.logger = loggerFactory.create("BindingOverwritesHandler");
|
|
5681
5825
|
}
|
|
5682
5826
|
}
|
|
@@ -5716,7 +5860,8 @@ class BindingOverwritesMappingRequestHandler {
|
|
|
5716
5860
|
binding: bindingsResource,
|
|
5717
5861
|
resourceKey: resource.key,
|
|
5718
5862
|
isArtefactResource: resource.projectKey != null,
|
|
5719
|
-
isCodedApp: bindingsResource.resourceType === models_BindingsResourceType.App && isCodedAppType(resource.type)
|
|
5863
|
+
isCodedApp: bindingsResource.resourceType === models_BindingsResourceType.App && isCodedAppType(resource.type),
|
|
5864
|
+
resourceName: resource.name
|
|
5720
5865
|
});
|
|
5721
5866
|
} else {
|
|
5722
5867
|
this.logger.error(`Solution does not contain binding resource of type ${models_BindingsResourceType[bindingsResource.resourceType]}.`);
|
|
@@ -5839,6 +5984,9 @@ class SolutionContext {
|
|
|
5839
5984
|
signal = forceOrSignal;
|
|
5840
5985
|
return this.doWithLockAsync((token) => this.internalLoadAsync(force, token), signal);
|
|
5841
5986
|
}
|
|
5987
|
+
async loadKindsAsync(kinds, cancellationToken) {
|
|
5988
|
+
return this.doWithLockAsync((token) => this.isReadOnly && this._definition === null && this._definitionProvider.readKindsAsync ? this._definitionProvider.readKindsAsync(this, kinds, token) : this.internalLoadAsync(false, token), cancellationToken);
|
|
5989
|
+
}
|
|
5842
5990
|
async getSolutionDefinitionAsync(cancellationToken) {
|
|
5843
5991
|
return this._definitionProvider.readAsync(this, cancellationToken);
|
|
5844
5992
|
}
|
|
@@ -5856,20 +6004,17 @@ class SolutionContext {
|
|
|
5856
6004
|
this.validateResourceDependencies(this._definition);
|
|
5857
6005
|
await this.deleteSavedFilesAsync(filesToDelete, token);
|
|
5858
6006
|
await this.internalSaveChanges(this._definition, token);
|
|
5859
|
-
this._definition = null;
|
|
5860
6007
|
}, signal);
|
|
5861
6008
|
else
|
|
5862
6009
|
await this.doWithLockAsync(async (token) => {
|
|
5863
6010
|
this.validateResourceDependencies(this._definition);
|
|
5864
6011
|
await this.internalSaveChanges(this._definition, token);
|
|
5865
|
-
this._definition = null;
|
|
5866
6012
|
}, signal);
|
|
5867
6013
|
}
|
|
5868
6014
|
async forceSaveChangesAsync(cancellationToken) {
|
|
5869
6015
|
await this.doWithLockAsync(async (token) => {
|
|
5870
6016
|
this.validateResourceDependencies(this._definition);
|
|
5871
6017
|
await this.internalSaveChanges(this._definition, token);
|
|
5872
|
-
this._definition = null;
|
|
5873
6018
|
}, cancellationToken);
|
|
5874
6019
|
}
|
|
5875
6020
|
async saveAsync(solution, cancellationToken) {
|
|
@@ -5880,7 +6025,7 @@ class SolutionContext {
|
|
|
5880
6025
|
this.validateResourceDependencies(solution);
|
|
5881
6026
|
await this.internalLoadAsync(false, token);
|
|
5882
6027
|
await this.internalSaveChanges(solution, token);
|
|
5883
|
-
this._definition =
|
|
6028
|
+
this._definition = solution;
|
|
5884
6029
|
}, cancellationToken);
|
|
5885
6030
|
}
|
|
5886
6031
|
toString() {
|
|
@@ -6961,39 +7106,6 @@ SettingsRequestHandler = _ts_decorate4([
|
|
|
6961
7106
|
])
|
|
6962
7107
|
], SettingsRequestHandler);
|
|
6963
7108
|
|
|
6964
|
-
// ../../node_modules/@uipath/resource-builder-sdk/dist/services/overwrites/models.js
|
|
6965
|
-
var models_ValidationSeverity = /* @__PURE__ */ function(ValidationSeverity) {
|
|
6966
|
-
ValidationSeverity["Warning"] = "Warning";
|
|
6967
|
-
ValidationSeverity["Critical"] = "Critical";
|
|
6968
|
-
return ValidationSeverity;
|
|
6969
|
-
}({});
|
|
6970
|
-
var models_OverwriteType = /* @__PURE__ */ function(OverwriteType) {
|
|
6971
|
-
OverwriteType["Install"] = "Install";
|
|
6972
|
-
OverwriteType["Reference"] = "Reference";
|
|
6973
|
-
return OverwriteType;
|
|
6974
|
-
}({});
|
|
6975
|
-
function createLocalizableMessage(key, ...args) {
|
|
6976
|
-
return {
|
|
6977
|
-
key,
|
|
6978
|
-
args: args.length > 0 ? args : undefined
|
|
6979
|
-
};
|
|
6980
|
-
}
|
|
6981
|
-
function createMissingRcsResources(missingKeys, error) {
|
|
6982
|
-
return {
|
|
6983
|
-
missingResourceKeys: missingKeys instanceof Set ? missingKeys : new Set(missingKeys),
|
|
6984
|
-
error
|
|
6985
|
-
};
|
|
6986
|
-
}
|
|
6987
|
-
function setValidationError(errors, resourceKey, dto) {
|
|
6988
|
-
const error = errors.get(resourceKey);
|
|
6989
|
-
if (error)
|
|
6990
|
-
dto.validationError = error;
|
|
6991
|
-
}
|
|
6992
|
-
var DebugOverwritesConstants = {
|
|
6993
|
-
ResourceOverwritesFileName: "debug_overwrites.json",
|
|
6994
|
-
CurrentOverwritesDocVersion: "1.0"
|
|
6995
|
-
};
|
|
6996
|
-
|
|
6997
7109
|
// ../../node_modules/@uipath/resource-builder-sdk/dist/mappings/resource-subtype-mapper.js
|
|
6998
7110
|
var solutionsSubtypesMap = {
|
|
6999
7111
|
Text: "stringAsset",
|
|
@@ -8334,8 +8446,8 @@ class SolutionDefinitionHelper {
|
|
|
8334
8446
|
if (references.length === 0)
|
|
8335
8447
|
continue;
|
|
8336
8448
|
const referenceKind = refProp["referenceKind"];
|
|
8337
|
-
const
|
|
8338
|
-
const filtered = references.filter((r) => !
|
|
8449
|
+
const matches2 = (ref) => ref.name != null && invariantEquals(resource.name, ref.name) && referenceKind != null && invariantEquals(referenceKind, resource.kind);
|
|
8450
|
+
const filtered = references.filter((r) => !matches2(r));
|
|
8339
8451
|
if (filtered.length !== references.length)
|
|
8340
8452
|
spec[refProp.property] = isSingleReferenceProperty(refProp) ? filtered[0] ?? null : filtered;
|
|
8341
8453
|
}
|
|
@@ -8482,7 +8594,9 @@ class ResourcesSearchRequestHandler {
|
|
|
8482
8594
|
async getSolutionResourcesAsync(request, cancellationToken) {
|
|
8483
8595
|
if (request.pageSize <= 0 || !request.includeSolutionResources)
|
|
8484
8596
|
return null;
|
|
8485
|
-
const solution = await request.context.
|
|
8597
|
+
const solution = await (request.context.loadKindsAsync?.([
|
|
8598
|
+
request.kind
|
|
8599
|
+
], cancellationToken) ?? request.context.loadAsync(cancellationToken));
|
|
8486
8600
|
let resources = solution.resources.filter((x) => !x.projectKey || request.projectKey && x.projectKey !== request.projectKey).filter((x) => x.kind.toLowerCase() === request.kind.toLowerCase()).filter((x) => !request.types || request.types.some((t) => t.toLowerCase() === x.type?.toLowerCase())).filter((x) => !request.searchTerm || x.name.toLowerCase().includes(request.searchTerm.toLowerCase()));
|
|
8487
8601
|
if (request.cursor?.pageDirection === internal_InternalPageDirection.Previous) {
|
|
8488
8602
|
if (request.cursor.name) {
|
|
@@ -9981,6 +10095,7 @@ class GenerateArtefactResourcesCommandHandler {
|
|
|
9981
10095
|
apiVersion: metadataVersion.version.uri,
|
|
9982
10096
|
name: command.projectName,
|
|
9983
10097
|
projectKey: command.projectKey,
|
|
10098
|
+
isArtefactResource: !!command.projectKey,
|
|
9984
10099
|
folders: [],
|
|
9985
10100
|
files: []
|
|
9986
10101
|
};
|
|
@@ -13670,7 +13785,7 @@ class ProjectCreateCommandHandler {
|
|
|
13670
13785
|
const solution = await command.context.loadAsync(cancellationToken);
|
|
13671
13786
|
const resourceIdentifiers = new Set(this.projectConfigurationReader.getTemplateResourcesByType(command.type, command.subType, true).map((r) => JSON.stringify(r)));
|
|
13672
13787
|
const projectResources = solution.resources.filter((x) => x.projectKey === command.projectKey);
|
|
13673
|
-
const duplicateProject = solution.resources.find((r) => r.
|
|
13788
|
+
const duplicateProject = solution.resources.find((r) => r.projectKey !== undefined && r.projectKey !== command.projectKey && r.name.toLowerCase() === command.name.toLowerCase());
|
|
13674
13789
|
if (duplicateProject) {
|
|
13675
13790
|
this.logger.error("Project name already exists", undefined, {
|
|
13676
13791
|
projectName: command.name,
|
|
@@ -13679,15 +13794,16 @@ class ProjectCreateCommandHandler {
|
|
|
13679
13794
|
throw new BadRequestException("Project.DuplicateProjectName", "Project name already exists");
|
|
13680
13795
|
}
|
|
13681
13796
|
if (projectResources.length === 0)
|
|
13682
|
-
await this.
|
|
13797
|
+
this.addArtefacts(command, solution, await this.generateAndValidateArtefacts(command, solution, cancellationToken));
|
|
13683
13798
|
else {
|
|
13684
13799
|
const existingResourceIdentifiers = new Set(projectResources.map((x) => JSON.stringify(toResourceIdentifier2(x))));
|
|
13685
13800
|
const needsRegeneration = existingResourceIdentifiers.size !== resourceIdentifiers.size || [
|
|
13686
13801
|
...resourceIdentifiers
|
|
13687
13802
|
].some((id) => !existingResourceIdentifiers.has(id));
|
|
13688
13803
|
if (needsRegeneration) {
|
|
13804
|
+
const artefacts = await this.generateAndValidateArtefacts(command, solution, cancellationToken);
|
|
13689
13805
|
await this.removeExistingProjectResources(command, cancellationToken);
|
|
13690
|
-
|
|
13806
|
+
this.addArtefacts(command, solution, artefacts);
|
|
13691
13807
|
} else if (projectResources.some((x) => x.name !== command.name))
|
|
13692
13808
|
await this.mediator.sendCommandAsync(new ProjectEditCommand(command.context, command.projectKey, {
|
|
13693
13809
|
name: command.name,
|
|
@@ -13697,13 +13813,13 @@ class ProjectCreateCommandHandler {
|
|
|
13697
13813
|
}
|
|
13698
13814
|
await command.context.saveChangesAsync(cancellationToken);
|
|
13699
13815
|
}
|
|
13700
|
-
async
|
|
13816
|
+
async generateAndValidateArtefacts(command, solution, cancellationToken) {
|
|
13701
13817
|
this.logger.info("Generate artefact resources for project", {
|
|
13702
13818
|
projectName: command.name,
|
|
13703
13819
|
projectKey: command.projectKey
|
|
13704
13820
|
});
|
|
13705
13821
|
const artefactResources = await this.mediator.sendCommandAsync(new GenerateArtefactResourcesCommand(command.context, command.name, command.type, command.projectKey, command.subType), cancellationToken);
|
|
13706
|
-
const existingConflictResource = solution.resources.find((r) =>
|
|
13822
|
+
const existingConflictResource = solution.resources.find((r) => r.projectKey === undefined && r.name.toLowerCase() === command.name.toLowerCase() && artefactResources.some((pr) => r.kind.toLowerCase() === pr.kind.toLowerCase()));
|
|
13707
13823
|
if (existingConflictResource) {
|
|
13708
13824
|
this.logger.error("Resource name conflict", undefined, {
|
|
13709
13825
|
context: command.context,
|
|
@@ -13712,6 +13828,23 @@ class ProjectCreateCommandHandler {
|
|
|
13712
13828
|
});
|
|
13713
13829
|
throw new BadRequestException("Resources.DuplicateResourceName", `Solution already contains a ${existingConflictResource.kind} resource named "${existingConflictResource.name}"`);
|
|
13714
13830
|
}
|
|
13831
|
+
for (const artefact of artefactResources) {
|
|
13832
|
+
if (artefact.kind.toLowerCase() !== WellKnownProjectType.Process.toLowerCase())
|
|
13833
|
+
continue;
|
|
13834
|
+
const packageName = resolvePackageNameAfterRename(artefact, command.solutionName, command.name, command.solutionName);
|
|
13835
|
+
const conflictingProject = findPackageNameConflict(solution, command.projectKey, command.solutionName, packageName);
|
|
13836
|
+
if (conflictingProject) {
|
|
13837
|
+
this.logger.error("Package name conflict", undefined, {
|
|
13838
|
+
context: command.context,
|
|
13839
|
+
packageName,
|
|
13840
|
+
conflictingProject: conflictingProject.name
|
|
13841
|
+
});
|
|
13842
|
+
throw new BadRequestException(ErrorCodes.Resources.DuplicatePackageName, `The name '${command.name}' would publish under the same package name as project '${conflictingProject.name}': '${packageName}'. Long names are shortened when the package name is composed, so choose a name that differs earlier.`);
|
|
13843
|
+
}
|
|
13844
|
+
}
|
|
13845
|
+
return artefactResources;
|
|
13846
|
+
}
|
|
13847
|
+
addArtefacts(command, solution, artefactResources) {
|
|
13715
13848
|
for (const artefact of artefactResources) {
|
|
13716
13849
|
if (artefact.kind.toLowerCase() === WellKnownProjectType.Process.toLowerCase())
|
|
13717
13850
|
changePackageName(artefact, command.solutionName, command.name, command.solutionName);
|
|
@@ -13752,18 +13885,32 @@ class ProjectEditCommandHandler {
|
|
|
13752
13885
|
const newProjectName = command.projectDetails.name.trim();
|
|
13753
13886
|
const projectDescription = command.projectDetails.description;
|
|
13754
13887
|
const solutionName = command.projectDetails.solutionName;
|
|
13755
|
-
const duplicateProject = solution.resources.find((r) => r.
|
|
13888
|
+
const duplicateProject = solution.resources.find((r) => r.projectKey !== undefined && r.projectKey !== command.projectKey && r.name.toLowerCase() === newProjectName.toLowerCase());
|
|
13756
13889
|
if (duplicateProject) {
|
|
13757
13890
|
this.logger.error("Project name already exists");
|
|
13758
13891
|
throw new BadRequestException(ErrorCodes.Resources.DuplicateResourceName, "Project name already exists");
|
|
13759
13892
|
}
|
|
13760
|
-
const existingConflictResource = solution.resources.find((r) =>
|
|
13893
|
+
const existingConflictResource = solution.resources.find((r) => r.projectKey === undefined && r.name.toLowerCase() === newProjectName.toLowerCase() && projectResources.some((pr) => r.kind.toLowerCase() === pr.kind.toLowerCase()));
|
|
13761
13894
|
if (existingConflictResource) {
|
|
13762
13895
|
this.logger.error("Solution already contains resource of kind with same name");
|
|
13763
13896
|
throw new BadRequestException(ErrorCodes.Resources.DuplicateResourceName, `Solution already contains a ${existingConflictResource.kind} resource named "${existingConflictResource.name}"`);
|
|
13764
13897
|
}
|
|
13765
13898
|
const firstProjectResource = projectResources[0];
|
|
13766
13899
|
const oldProjectName = firstProjectResource ? firstProjectResource.name : "";
|
|
13900
|
+
for (const resource of projectResources) {
|
|
13901
|
+
if (resource.kind.toLowerCase() !== WellKnownProjectType.Process.toLowerCase())
|
|
13902
|
+
continue;
|
|
13903
|
+
const packageName = resolvePackageNameAfterRename(resource, solutionName, newProjectName, solutionName, oldProjectName);
|
|
13904
|
+
const conflictingProject = findPackageNameConflict(solution, command.projectKey, solutionName, packageName);
|
|
13905
|
+
if (conflictingProject) {
|
|
13906
|
+
this.logger.error("Package name conflict", undefined, {
|
|
13907
|
+
context: command.context,
|
|
13908
|
+
packageName,
|
|
13909
|
+
conflictingProject: conflictingProject.name
|
|
13910
|
+
});
|
|
13911
|
+
throw new BadRequestException(ErrorCodes.Resources.DuplicatePackageName, `The name '${newProjectName}' would publish under the same package name as project '${conflictingProject.name}': '${packageName}'. Long names are shortened when the package name is composed, so choose a name that differs earlier.`);
|
|
13912
|
+
}
|
|
13913
|
+
}
|
|
13767
13914
|
const dependencyMapper = new Map;
|
|
13768
13915
|
for (const resource of projectResources) {
|
|
13769
13916
|
const depKey = `${oldProjectName.toLowerCase()}|${resource.kind.toLowerCase()}`;
|
|
@@ -15998,7 +16145,8 @@ function registerHandlers(diContainer) {
|
|
|
15998
16145
|
const mediator = c.resolve(ServiceTokens.Mediator);
|
|
15999
16146
|
const resourceOverwritesService = c.resolve(Tokens.IResourceOverwritesService);
|
|
16000
16147
|
const loggerFactory = c.resolve(ServiceTokens.LoggerFactory);
|
|
16001
|
-
|
|
16148
|
+
const featureFlagProvider = c.resolve(ServiceTokens.FeatureFlagProvider);
|
|
16149
|
+
return new BindingOverwritesHandler(mediator, resourceOverwritesService, loggerFactory, featureFlagProvider);
|
|
16002
16150
|
}
|
|
16003
16151
|
});
|
|
16004
16152
|
diContainer.register(createCommandHandlerToken(BindingOverwritesValidationCommand.name), {
|
|
@@ -16006,7 +16154,8 @@ function registerHandlers(diContainer) {
|
|
|
16006
16154
|
const mediator = c.resolve(ServiceTokens.Mediator);
|
|
16007
16155
|
const resourceOverwritesService = c.resolve(Tokens.IResourceOverwritesService);
|
|
16008
16156
|
const loggerFactory = c.resolve(ServiceTokens.LoggerFactory);
|
|
16009
|
-
|
|
16157
|
+
const featureFlagProvider = c.resolve(ServiceTokens.FeatureFlagProvider);
|
|
16158
|
+
return new BindingOverwritesHandler(mediator, resourceOverwritesService, loggerFactory, featureFlagProvider);
|
|
16010
16159
|
}
|
|
16011
16160
|
});
|
|
16012
16161
|
diContainer.register(createRequestHandlerToken(BindingOverwritesMappingRequest.name), {
|
|
@@ -19109,12 +19258,12 @@ async function findResourceByKeyInRcs(builder, kind, expectedKey, folderPath, pr
|
|
|
19109
19258
|
return;
|
|
19110
19259
|
}
|
|
19111
19260
|
async function searchRcsResources(builder, kind, name) {
|
|
19112
|
-
const [searchError,
|
|
19261
|
+
const [searchError, matches2] = await catchError(searchRcsResourcesStrict(builder, kind, name));
|
|
19113
19262
|
if (searchError) {
|
|
19114
19263
|
logger.warn(`Failed to search ${kind} resources in RCS: ${searchError.message}`);
|
|
19115
19264
|
return [];
|
|
19116
19265
|
}
|
|
19117
|
-
return
|
|
19266
|
+
return matches2;
|
|
19118
19267
|
}
|
|
19119
19268
|
async function searchRcsResourcesStrict(builder, kind, name) {
|
|
19120
19269
|
let pageCursor;
|
|
@@ -19122,8 +19271,8 @@ async function searchRcsResourcesStrict(builder, kind, name) {
|
|
|
19122
19271
|
do {
|
|
19123
19272
|
const result = await builder.searchResourcesAsync(kind, undefined, name, pageCursor, 50, undefined, false);
|
|
19124
19273
|
for (const folderResources of result.availableResources) {
|
|
19125
|
-
const
|
|
19126
|
-
for (const match of
|
|
19274
|
+
const matches2 = folderResources.resources.filter((r) => r.name.toLowerCase() === name.toLowerCase());
|
|
19275
|
+
for (const match of matches2) {
|
|
19127
19276
|
allMatches.push({
|
|
19128
19277
|
key: match.key,
|
|
19129
19278
|
name: match.name,
|
|
@@ -19728,4 +19877,4 @@ export {
|
|
|
19728
19877
|
writeSolutionFile
|
|
19729
19878
|
};
|
|
19730
19879
|
|
|
19731
|
-
//# debugId=
|
|
19880
|
+
//# debugId=7B32A5B3053B84F164756E2164756E21
|