@fgv/ts-res 5.0.0-21 → 5.0.0-23
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/README.md +794 -137
- package/dist/ts-res.d.ts +506 -33
- package/lib/packlets/common/convert.d.ts +10 -0
- package/lib/packlets/common/convert.js +11 -1
- package/lib/packlets/common/resources.d.ts +40 -1
- package/lib/packlets/common/validate/regularExpressions.d.ts +4 -0
- package/lib/packlets/common/validate/regularExpressions.js +5 -1
- package/lib/packlets/common/validate/resources.d.ts +35 -1
- package/lib/packlets/common/validate/resources.js +54 -0
- package/lib/packlets/config/convert.js +1 -1
- package/lib/packlets/config/json.d.ts +1 -1
- package/lib/packlets/qualifier-types/config/convert.d.ts +22 -1
- package/lib/packlets/qualifier-types/config/convert.js +67 -2
- package/lib/packlets/qualifier-types/config/json.d.ts +11 -2
- package/lib/packlets/qualifier-types/helpers.d.ts +1 -2
- package/lib/packlets/qualifier-types/languageQualifierType.d.ts +27 -1
- package/lib/packlets/qualifier-types/languageQualifierType.js +75 -0
- package/lib/packlets/qualifier-types/literalQualifierType.d.ts +30 -4
- package/lib/packlets/qualifier-types/literalQualifierType.js +77 -0
- package/lib/packlets/qualifier-types/literalValueHierarchy.d.ts +6 -10
- package/lib/packlets/qualifier-types/literalValueHierarchy.js +10 -0
- package/lib/packlets/qualifier-types/qualifierType.d.ts +28 -0
- package/lib/packlets/qualifier-types/territoryQualifierType.d.ts +28 -4
- package/lib/packlets/qualifier-types/territoryQualifierType.js +77 -0
- package/lib/packlets/resource-json/compiled/convert.js +2 -1
- package/lib/packlets/resource-json/compiled/json.d.ts +6 -2
- package/lib/packlets/resource-types/config/convert.js +3 -1
- package/lib/packlets/resource-types/config/json.d.ts +2 -0
- package/lib/packlets/resource-types/jsonResourceType.d.ts +10 -6
- package/lib/packlets/resource-types/jsonResourceType.js +7 -10
- package/lib/packlets/resource-types/resourceType.d.ts +20 -8
- package/lib/packlets/resource-types/resourceType.js +20 -16
- package/lib/packlets/resources/candidateValue.d.ts +92 -0
- package/lib/packlets/resources/candidateValue.js +128 -0
- package/lib/packlets/resources/candidateValueCollector.d.ts +55 -0
- package/lib/packlets/resources/candidateValueCollector.js +96 -0
- package/lib/packlets/resources/index.d.ts +2 -0
- package/lib/packlets/resources/index.js +2 -0
- package/lib/packlets/resources/resource.js +2 -2
- package/lib/packlets/resources/resourceBuilder.d.ts +6 -0
- package/lib/packlets/resources/resourceBuilder.js +3 -1
- package/lib/packlets/resources/resourceCandidate.d.ts +10 -1
- package/lib/packlets/resources/resourceCandidate.js +11 -5
- package/lib/packlets/resources/resourceManagerBuilder.d.ts +7 -0
- package/lib/packlets/resources/resourceManagerBuilder.js +13 -6
- package/lib/packlets/runtime/compiledResourceCollection.d.ts +20 -8
- package/lib/packlets/runtime/compiledResourceCollection.js +25 -4
- package/lib/packlets/runtime/resource-tree/common.d.ts +1 -1
- package/lib/packlets/runtime/resourceResolver.d.ts +39 -1
- package/lib/packlets/runtime/resourceResolver.js +45 -28
- package/lib/test/unit/qualifier-types/testQualifierType.d.ts +4 -0
- package/lib/test/unit/qualifier-types/testQualifierType.js +24 -0
- package/lib/test/unit/resource-types/derivedResourceType.test.d.ts +2 -0
- package/lib/test/unit/resource-types/testDerivedResourceType.d.ts +79 -0
- package/lib/test/unit/resource-types/testDerivedResourceType.js +113 -0
- package/lib/test/unit/resources/candidateValue.test.d.ts +2 -0
- package/lib/test/unit/resources/candidateValueCollector.test.d.ts +2 -0
- package/lib/test/unit/runtime/resourceResolver.coverage.test.d.ts +2 -0
- package/lib/test/unit/runtime/resourceResolver.newFeatures.test.d.ts +2 -0
- package/package.json +7 -7
- package/src/index.ts +0 -75
- package/src/packlets/bundle/bundleBuilder.ts +0 -159
- package/src/packlets/bundle/bundleLoader.ts +0 -157
- package/src/packlets/bundle/bundleNormalizer.ts +0 -173
- package/src/packlets/bundle/bundleUtils.ts +0 -142
- package/src/packlets/bundle/convert.ts +0 -87
- package/src/packlets/bundle/index.ts +0 -52
- package/src/packlets/bundle/model.ts +0 -138
- package/src/packlets/common/conditions.ts +0 -226
- package/src/packlets/common/convert.ts +0 -184
- package/src/packlets/common/helpers/conditions.ts +0 -84
- package/src/packlets/common/helpers/context.ts +0 -88
- package/src/packlets/common/helpers/index.ts +0 -26
- package/src/packlets/common/helpers/qualifierDefaultValues.ts +0 -91
- package/src/packlets/common/helpers/resources.ts +0 -96
- package/src/packlets/common/index.ts +0 -30
- package/src/packlets/common/resources.ts +0 -78
- package/src/packlets/common/validate/conditions.ts +0 -595
- package/src/packlets/common/validate/index.ts +0 -27
- package/src/packlets/common/validate/regularExpressions.ts +0 -92
- package/src/packlets/common/validate/resources.ts +0 -170
- package/src/packlets/conditions/condition.ts +0 -351
- package/src/packlets/conditions/conditionCollector.ts +0 -103
- package/src/packlets/conditions/conditionDecls.ts +0 -50
- package/src/packlets/conditions/conditionSet.ts +0 -318
- package/src/packlets/conditions/conditionSetCollector.ts +0 -127
- package/src/packlets/conditions/conditionSetDecls.ts +0 -41
- package/src/packlets/conditions/conditionToken.ts +0 -180
- package/src/packlets/conditions/convert/conditionSetDecls.ts +0 -72
- package/src/packlets/conditions/convert/decls.ts +0 -95
- package/src/packlets/conditions/convert/index.ts +0 -24
- package/src/packlets/conditions/index.ts +0 -33
- package/src/packlets/config/common.ts +0 -107
- package/src/packlets/config/configInitFactory.ts +0 -142
- package/src/packlets/config/convert.ts +0 -61
- package/src/packlets/config/index.ts +0 -30
- package/src/packlets/config/json.ts +0 -43
- package/src/packlets/config/predefined/default.ts +0 -150
- package/src/packlets/config/predefined/extended.ts +0 -198
- package/src/packlets/config/predefined/index.ts +0 -26
- package/src/packlets/config/systemConfiguration.ts +0 -217
- package/src/packlets/context/contextDecls.ts +0 -76
- package/src/packlets/context/contextToken.ts +0 -252
- package/src/packlets/context/convert/decls.ts +0 -126
- package/src/packlets/context/convert/index.ts +0 -23
- package/src/packlets/context/index.ts +0 -27
- package/src/packlets/decisions/abstractDecision.ts +0 -87
- package/src/packlets/decisions/abstractDecisionCollector.ts +0 -122
- package/src/packlets/decisions/candidate.ts +0 -101
- package/src/packlets/decisions/common.ts +0 -37
- package/src/packlets/decisions/concreteDecision.ts +0 -157
- package/src/packlets/decisions/decision.ts +0 -172
- package/src/packlets/decisions/index.ts +0 -28
- package/src/packlets/import/fsItem.ts +0 -212
- package/src/packlets/import/importContext.ts +0 -183
- package/src/packlets/import/importManager.ts +0 -187
- package/src/packlets/import/importable.ts +0 -107
- package/src/packlets/import/importers/collectionImporter.ts +0 -153
- package/src/packlets/import/importers/fsItemImporter.ts +0 -154
- package/src/packlets/import/importers/importer.ts +0 -58
- package/src/packlets/import/importers/index.ts +0 -27
- package/src/packlets/import/importers/jsonImporter.ts +0 -133
- package/src/packlets/import/importers/pathImporter.ts +0 -134
- package/src/packlets/import/index.ts +0 -29
- package/src/packlets/qualifier-types/config/convert.ts +0 -108
- package/src/packlets/qualifier-types/config/index.ts +0 -27
- package/src/packlets/qualifier-types/config/json.ts +0 -126
- package/src/packlets/qualifier-types/convert.ts +0 -77
- package/src/packlets/qualifier-types/helpers.ts +0 -94
- package/src/packlets/qualifier-types/index.ts +0 -34
- package/src/packlets/qualifier-types/languageQualifierType.ts +0 -143
- package/src/packlets/qualifier-types/literalQualifierType.ts +0 -244
- package/src/packlets/qualifier-types/literalValueHierarchy.ts +0 -332
- package/src/packlets/qualifier-types/qualifierType.ts +0 -360
- package/src/packlets/qualifier-types/qualifierTypeCollector.ts +0 -102
- package/src/packlets/qualifier-types/territoryQualifierType.ts +0 -255
- package/src/packlets/qualifiers/convert/decls.ts +0 -90
- package/src/packlets/qualifiers/convert/index.ts +0 -24
- package/src/packlets/qualifiers/convert/qualifier.ts +0 -55
- package/src/packlets/qualifiers/index.ts +0 -31
- package/src/packlets/qualifiers/qualifier.ts +0 -169
- package/src/packlets/qualifiers/qualifierCollector.ts +0 -194
- package/src/packlets/qualifiers/qualifierDecl.ts +0 -80
- package/src/packlets/qualifiers/qualifierDefaultValueDecls.ts +0 -57
- package/src/packlets/qualifiers/qualifierDefaultValueToken.ts +0 -230
- package/src/packlets/resource-json/compiled/common.ts +0 -35
- package/src/packlets/resource-json/compiled/convert.ts +0 -143
- package/src/packlets/resource-json/compiled/index.ts +0 -27
- package/src/packlets/resource-json/compiled/json.ts +0 -239
- package/src/packlets/resource-json/convert.ts +0 -236
- package/src/packlets/resource-json/helpers.ts +0 -284
- package/src/packlets/resource-json/index.ts +0 -33
- package/src/packlets/resource-json/json.ts +0 -295
- package/src/packlets/resource-json/normalized.ts +0 -211
- package/src/packlets/resource-json/resourceDeclCollection.ts +0 -117
- package/src/packlets/resource-json/resourceDeclContainer.ts +0 -48
- package/src/packlets/resource-json/resourceDeclTree.ts +0 -116
- package/src/packlets/resource-types/config/convert.ts +0 -36
- package/src/packlets/resource-types/config/index.ts +0 -27
- package/src/packlets/resource-types/config/json.ts +0 -30
- package/src/packlets/resource-types/helpers.ts +0 -44
- package/src/packlets/resource-types/index.ts +0 -30
- package/src/packlets/resource-types/jsonResourceType.ts +0 -104
- package/src/packlets/resource-types/resourceType.ts +0 -259
- package/src/packlets/resource-types/resourceTypeCollector.ts +0 -79
- package/src/packlets/resources/candidateReducer.ts +0 -331
- package/src/packlets/resources/common.ts +0 -114
- package/src/packlets/resources/index.ts +0 -28
- package/src/packlets/resources/resource.ts +0 -307
- package/src/packlets/resources/resourceBuilder.ts +0 -269
- package/src/packlets/resources/resourceCandidate.ts +0 -333
- package/src/packlets/resources/resourceManagerBuilder.ts +0 -1169
- package/src/packlets/runtime/cacheListener.ts +0 -113
- package/src/packlets/runtime/cacheMetrics.ts +0 -206
- package/src/packlets/runtime/compiledResourceCollection.ts +0 -607
- package/src/packlets/runtime/conditionSetResolutionResult.ts +0 -160
- package/src/packlets/runtime/context/contextQualifierProvider.ts +0 -117
- package/src/packlets/runtime/context/contextQualifierProviderValidator.ts +0 -281
- package/src/packlets/runtime/context/index.ts +0 -26
- package/src/packlets/runtime/context/simpleContextQualifierProvider.ts +0 -225
- package/src/packlets/runtime/context/validatingSimpleContextQualifierProvider.ts +0 -96
- package/src/packlets/runtime/iResourceManager.ts +0 -130
- package/src/packlets/runtime/index.ts +0 -35
- package/src/packlets/runtime/resource-tree/common.ts +0 -126
- package/src/packlets/runtime/resource-tree/index.ts +0 -26
- package/src/packlets/runtime/resource-tree/readOnlyResourceTree.ts +0 -342
- package/src/packlets/runtime/resource-tree/resourceTreeChildren.ts +0 -125
- package/src/packlets/runtime/resource-tree/resourceTreeChildrenValidator.ts +0 -187
- package/src/packlets/runtime/resourceResolver.ts +0 -626
- package/src/packlets/runtime/validate.ts +0 -63
- package/src/packlets/zip-archive/convert.ts +0 -121
- package/src/packlets/zip-archive/index.ts +0 -76
- package/src/packlets/zip-archive/json.ts +0 -91
- package/src/packlets/zip-archive/types.ts +0 -140
- package/src/packlets/zip-archive/zipArchiveCreator.ts +0 -229
- package/src/packlets/zip-archive/zipArchiveFormat.ts +0 -158
- package/src/packlets/zip-archive/zipArchiveLoader.ts +0 -370
|
@@ -1,79 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Copyright (c) 2025 Erik Fortune
|
|
3
|
-
*
|
|
4
|
-
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
5
|
-
* of this software and associated documentation files (the "Software"), to deal
|
|
6
|
-
* in the Software without restriction, including without limitation the rights
|
|
7
|
-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
8
|
-
* copies of the Software, and to permit persons to whom the Software is
|
|
9
|
-
* furnished to do so, subject to the following conditions:
|
|
10
|
-
*
|
|
11
|
-
* The above copyright notice and this permission notice shall be included in all
|
|
12
|
-
* copies or substantial portions of the Software.
|
|
13
|
-
*
|
|
14
|
-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
15
|
-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
16
|
-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
17
|
-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
18
|
-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
19
|
-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
20
|
-
* SOFTWARE.
|
|
21
|
-
*/
|
|
22
|
-
|
|
23
|
-
import { Collections, Result, fail, succeed, ValidatingCollector, captureResult } from '@fgv/ts-utils';
|
|
24
|
-
import { ResourceType } from './resourceType';
|
|
25
|
-
import { Convert as CommonConvert, ResourceTypeName } from '../common';
|
|
26
|
-
|
|
27
|
-
/**
|
|
28
|
-
* Parameters for creating a {@link ResourceTypes.ResourceTypeCollector | ResourceTypeCollector}.
|
|
29
|
-
* @public
|
|
30
|
-
*/
|
|
31
|
-
export interface IResourceCollectorCreateParams {
|
|
32
|
-
resourceTypes?: ResourceType[];
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
/**
|
|
36
|
-
* Map {@link ResourceTypeName | resource type names} to {@link ResourceTypes.ResourceType | resource types}.
|
|
37
|
-
* @public
|
|
38
|
-
*/
|
|
39
|
-
export class ResourceTypeCollector extends ValidatingCollector<ResourceType> {
|
|
40
|
-
protected constructor({ resourceTypes }: IResourceCollectorCreateParams) {
|
|
41
|
-
/* c8 ignore next 1 - coverage having a rough day */
|
|
42
|
-
resourceTypes = resourceTypes ?? [];
|
|
43
|
-
|
|
44
|
-
super({
|
|
45
|
-
converters: new Collections.KeyValueConverters<ResourceTypeName, ResourceType>({
|
|
46
|
-
key: CommonConvert.resourceTypeName,
|
|
47
|
-
value: (from: unknown) => this._toResourceType(from)
|
|
48
|
-
})
|
|
49
|
-
});
|
|
50
|
-
resourceTypes.forEach((resourceType) => {
|
|
51
|
-
this.add(resourceType).orThrow();
|
|
52
|
-
});
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
/**
|
|
56
|
-
* Creates a new {@link ResourceTypes.ResourceTypeCollector | ResourceTypeCollector}.
|
|
57
|
-
* @param params - Optional for creating the new collector.
|
|
58
|
-
* @returns `Success` with the new instance, or `Failure` with an error
|
|
59
|
-
* message if the collector could not be created.
|
|
60
|
-
*/
|
|
61
|
-
public static create(params?: IResourceCollectorCreateParams): Result<ResourceTypeCollector> {
|
|
62
|
-
/* c8 ignore next 1 - coverage having a rough day */
|
|
63
|
-
params = params ?? {};
|
|
64
|
-
return captureResult(() => new ResourceTypeCollector(params));
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
protected _toResourceType(from: unknown): Result<ResourceType> {
|
|
68
|
-
if (from instanceof ResourceType) {
|
|
69
|
-
return succeed(from);
|
|
70
|
-
}
|
|
71
|
-
return fail('Not a resource type.');
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
/**
|
|
76
|
-
* A read-only version of {@link ResourceTypes.ResourceTypeCollector | ResourceTypeCollector}.
|
|
77
|
-
* @public
|
|
78
|
-
*/
|
|
79
|
-
export type ReadOnlyResourceTypeCollector = Collections.IReadOnlyValidatingCollector<ResourceType>;
|
|
@@ -1,331 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Copyright (c) 2025 Erik Fortune
|
|
3
|
-
*
|
|
4
|
-
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
5
|
-
* of this software and associated documentation files (the "Software"), to deal
|
|
6
|
-
* in the Software without restriction, including without limitation the rights
|
|
7
|
-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
8
|
-
* copies of the Software, and to permit persons to whom the Software is
|
|
9
|
-
* furnished to do so, subject to the following conditions:
|
|
10
|
-
*
|
|
11
|
-
* The above copyright notice and this permission notice shall be included in all
|
|
12
|
-
* copies or substantial portions of the Software.
|
|
13
|
-
*
|
|
14
|
-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
15
|
-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
16
|
-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
17
|
-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
18
|
-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
19
|
-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
20
|
-
* SOFTWARE.
|
|
21
|
-
*/
|
|
22
|
-
|
|
23
|
-
import { QualifierName, ResourceId, ResourceValueMergeMethod } from '../common';
|
|
24
|
-
import * as Context from '../context';
|
|
25
|
-
import * as ResourceJson from '../resource-json';
|
|
26
|
-
import { ResourceCandidate } from './resourceCandidate';
|
|
27
|
-
import { JsonObject } from '@fgv/ts-json-base';
|
|
28
|
-
import { JsonEditor } from '@fgv/ts-json';
|
|
29
|
-
import { Result, succeed, fail, mapResults } from '@fgv/ts-utils';
|
|
30
|
-
|
|
31
|
-
/**
|
|
32
|
-
* Action taken on a candidate during reduction processing.
|
|
33
|
-
* @public
|
|
34
|
-
*/
|
|
35
|
-
export type CandidateAction = 'unchanged' | 'reduced' | 'suppressed';
|
|
36
|
-
|
|
37
|
-
/**
|
|
38
|
-
* Information about a candidate being processed by the reducer.
|
|
39
|
-
* @public
|
|
40
|
-
*/
|
|
41
|
-
export interface ICandidateInfo {
|
|
42
|
-
readonly originalCandidate: ResourceCandidate;
|
|
43
|
-
action: CandidateAction;
|
|
44
|
-
conditions: ResourceJson.Json.ILooseConditionDecl[];
|
|
45
|
-
conditionSetKey: string;
|
|
46
|
-
readonly json?: JsonObject;
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
/**
|
|
50
|
-
* Represents a reduced candidate after applying reduction logic.
|
|
51
|
-
* @public
|
|
52
|
-
*/
|
|
53
|
-
export interface IReducedCandidate {
|
|
54
|
-
readonly candidate: ResourceCandidate;
|
|
55
|
-
readonly conditions: ResourceJson.Json.ConditionSetDecl;
|
|
56
|
-
readonly json?: JsonObject;
|
|
57
|
-
readonly isPartial?: boolean;
|
|
58
|
-
readonly mergeMethod?: ResourceValueMergeMethod;
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
/**
|
|
62
|
-
* Manages candidate reduction logic for filtering and qualifier reduction operations.
|
|
63
|
-
* Encapsulates the state and logic needed to consistently process candidates for reduction.
|
|
64
|
-
* @public
|
|
65
|
-
*/
|
|
66
|
-
export class CandidateReducer {
|
|
67
|
-
private readonly _candidateInfos: ICandidateInfo[];
|
|
68
|
-
private readonly _filterForContext: Context.IValidatedContextDecl;
|
|
69
|
-
private readonly _qualifiersToReduce: ReadonlySet<QualifierName>;
|
|
70
|
-
|
|
71
|
-
/**
|
|
72
|
-
* Constructor for CandidateReducer.
|
|
73
|
-
* @param candidates - The set of candidates to potentially reduce
|
|
74
|
-
* @param filterForContext - Context to filter candidates against
|
|
75
|
-
*/
|
|
76
|
-
public constructor(
|
|
77
|
-
candidates: ReadonlyArray<ResourceCandidate>,
|
|
78
|
-
filterForContext: Context.IValidatedContextDecl
|
|
79
|
-
) {
|
|
80
|
-
this._filterForContext = filterForContext;
|
|
81
|
-
|
|
82
|
-
// Use existing logic to determine reducible qualifiers
|
|
83
|
-
this._qualifiersToReduce =
|
|
84
|
-
ResourceCandidate.findReducibleQualifiers(candidates, filterForContext) ?? new Set();
|
|
85
|
-
|
|
86
|
-
// Initialize candidate info array with initial reduction attempts
|
|
87
|
-
this._candidateInfos = candidates.map((candidate): ICandidateInfo => {
|
|
88
|
-
const filteredConditions = candidate.conditions.conditions.filter(
|
|
89
|
-
(c) => !this._qualifiersToReduce.has(c.qualifier.name)
|
|
90
|
-
);
|
|
91
|
-
|
|
92
|
-
const reducedConditions = filteredConditions.map((c) => c.toLooseConditionDecl());
|
|
93
|
-
const conditionSetKey = CandidateReducer._computeConditionSetKey(reducedConditions);
|
|
94
|
-
|
|
95
|
-
const action: CandidateAction =
|
|
96
|
-
filteredConditions.length < candidate.conditions.conditions.length ? 'reduced' : 'unchanged';
|
|
97
|
-
|
|
98
|
-
return {
|
|
99
|
-
originalCandidate: candidate,
|
|
100
|
-
action,
|
|
101
|
-
conditions: reducedConditions,
|
|
102
|
-
conditionSetKey,
|
|
103
|
-
json: undefined // Will be set later when needed
|
|
104
|
-
};
|
|
105
|
-
});
|
|
106
|
-
|
|
107
|
-
// Resolve collisions by reverting reduced candidates to unchanged when they collide
|
|
108
|
-
this._resolveCollisions();
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
/**
|
|
112
|
-
* Computes a string key for a set of condition declarations for collision detection.
|
|
113
|
-
* @param conditions - The conditions to compute a key for
|
|
114
|
-
* @returns A string key representing the condition set
|
|
115
|
-
*/
|
|
116
|
-
private static _computeConditionSetKey(conditions: ResourceJson.Json.ILooseConditionDecl[]): string {
|
|
117
|
-
if (conditions.length === 0) {
|
|
118
|
-
return '{}';
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
// Sort conditions by qualifier name for consistent keys
|
|
122
|
-
const sortedConditions = [...conditions].sort((a, b) => a.qualifierName.localeCompare(b.qualifierName));
|
|
123
|
-
const pairs = sortedConditions.map((c) => `${c.qualifierName}:${c.value}`);
|
|
124
|
-
return `{${pairs.join(',')}}`;
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
/**
|
|
128
|
-
* Merges a partial candidate's JSON value into a base candidate's JSON value.
|
|
129
|
-
* @param baseJson - The base JSON value to merge into
|
|
130
|
-
* @param partialJson - The partial JSON value to merge from
|
|
131
|
-
* @returns The merged JSON value
|
|
132
|
-
* @internal
|
|
133
|
-
*/
|
|
134
|
-
private static _mergeJsonValues(baseJson: JsonObject, partialJson: JsonObject): JsonObject {
|
|
135
|
-
// Create JsonEditor with array replacement behavior for candidate merging
|
|
136
|
-
const editor = JsonEditor.create({
|
|
137
|
-
merge: {
|
|
138
|
-
arrayMergeBehavior: 'replace'
|
|
139
|
-
}
|
|
140
|
-
}).orThrow(); // Should never fail with valid options
|
|
141
|
-
|
|
142
|
-
return editor.mergeObjectsInPlace({}, [baseJson, partialJson]).orThrow(); // Internal method should throw on error - this indicates a serious bug
|
|
143
|
-
}
|
|
144
|
-
|
|
145
|
-
/**
|
|
146
|
-
* Resolves collisions using smart collision resolution rules.
|
|
147
|
-
* - If a reduced candidate collides with an unchanged candidate and only one reduced candidate collides:
|
|
148
|
-
* - If reduced candidate is complete: suppress unchanged, keep reduced
|
|
149
|
-
* - If reduced candidate is partial: merge into unchanged, suppress reduced
|
|
150
|
-
* - Otherwise: revert reduced candidates to unchanged to avoid collisions
|
|
151
|
-
* @internal
|
|
152
|
-
*/
|
|
153
|
-
private _resolveCollisions(): void {
|
|
154
|
-
let hasCollisions = true;
|
|
155
|
-
let iterationCount = 0;
|
|
156
|
-
const maxIterations = this._candidateInfos.length; // Safety limit
|
|
157
|
-
|
|
158
|
-
while (hasCollisions && iterationCount < maxIterations) {
|
|
159
|
-
hasCollisions = false;
|
|
160
|
-
iterationCount++;
|
|
161
|
-
|
|
162
|
-
// Group candidates by their condition set keys (excluding suppressed)
|
|
163
|
-
const conditionKeyGroups = new Map<string, ICandidateInfo[]>();
|
|
164
|
-
|
|
165
|
-
for (const candidateInfo of this._candidateInfos) {
|
|
166
|
-
if (candidateInfo.action !== 'suppressed') {
|
|
167
|
-
// Don't include suppressed candidates
|
|
168
|
-
const key = candidateInfo.conditionSetKey;
|
|
169
|
-
if (!conditionKeyGroups.has(key)) {
|
|
170
|
-
conditionKeyGroups.set(key, []);
|
|
171
|
-
}
|
|
172
|
-
conditionKeyGroups.get(key)!.push(candidateInfo);
|
|
173
|
-
}
|
|
174
|
-
}
|
|
175
|
-
|
|
176
|
-
// Apply smart collision resolution
|
|
177
|
-
for (const [, candidatesWithSameKey] of conditionKeyGroups) {
|
|
178
|
-
if (candidatesWithSameKey.length > 1) {
|
|
179
|
-
// Categorize candidates
|
|
180
|
-
const unchangedCandidates = candidatesWithSameKey.filter((c) => c.action === 'unchanged');
|
|
181
|
-
const reducedCandidates = candidatesWithSameKey.filter((c) => c.action === 'reduced');
|
|
182
|
-
|
|
183
|
-
if (unchangedCandidates.length === 1 && reducedCandidates.length === 1) {
|
|
184
|
-
// Simple case: one unchanged vs one reduced - apply smart resolution
|
|
185
|
-
const unchangedCandidate = unchangedCandidates[0];
|
|
186
|
-
const reducedCandidate = reducedCandidates[0];
|
|
187
|
-
|
|
188
|
-
if (!reducedCandidate.originalCandidate.isPartial) {
|
|
189
|
-
// Complete reduced candidate wins - suppress unchanged
|
|
190
|
-
unchangedCandidate.action = 'suppressed';
|
|
191
|
-
hasCollisions = true;
|
|
192
|
-
} else {
|
|
193
|
-
// Partial reduced candidate - merge into unchanged and suppress reduced
|
|
194
|
-
const mergedJson = CandidateReducer._mergeJsonValues(
|
|
195
|
-
unchangedCandidate.originalCandidate.json,
|
|
196
|
-
reducedCandidate.originalCandidate.json
|
|
197
|
-
);
|
|
198
|
-
|
|
199
|
-
// Update unchanged candidate with merged JSON, keeping its isPartial status
|
|
200
|
-
(unchangedCandidate as { json?: JsonObject }).json = mergedJson;
|
|
201
|
-
|
|
202
|
-
// Suppress the reduced candidate
|
|
203
|
-
reducedCandidate.action = 'suppressed';
|
|
204
|
-
hasCollisions = true;
|
|
205
|
-
}
|
|
206
|
-
} else {
|
|
207
|
-
// Complex collision case - revert all reduced candidates to unchanged
|
|
208
|
-
for (const candidateInfo of reducedCandidates) {
|
|
209
|
-
// Revert to original conditions and mark as unchanged
|
|
210
|
-
const originalConditions = candidateInfo.originalCandidate.conditions.conditions.map((c) =>
|
|
211
|
-
c.toLooseConditionDecl()
|
|
212
|
-
);
|
|
213
|
-
const originalKey = CandidateReducer._computeConditionSetKey(originalConditions);
|
|
214
|
-
|
|
215
|
-
// Update the candidate info to revert to original state
|
|
216
|
-
candidateInfo.action = 'unchanged';
|
|
217
|
-
candidateInfo.conditions = originalConditions;
|
|
218
|
-
candidateInfo.conditionSetKey = originalKey;
|
|
219
|
-
|
|
220
|
-
hasCollisions = true;
|
|
221
|
-
}
|
|
222
|
-
}
|
|
223
|
-
}
|
|
224
|
-
}
|
|
225
|
-
}
|
|
226
|
-
}
|
|
227
|
-
|
|
228
|
-
/**
|
|
229
|
-
* Static convenience method to construct an array of properly reduced
|
|
230
|
-
* {@link ResourceJson.Json.IChildResourceCandidateDecl | child resource candidate declarations}
|
|
231
|
-
* from a set of {@link Resources.ResourceCandidate | resource candidates}.
|
|
232
|
-
* @param candidates - The candidates to reduce
|
|
233
|
-
* @param filterForContext - Optional context to filter against
|
|
234
|
-
* @returns Result with array of reduced candidate declarations, or Failure if reduction fails
|
|
235
|
-
*/
|
|
236
|
-
public static reduceToChildResourceCandidateDecls(
|
|
237
|
-
candidates: ReadonlyArray<ResourceCandidate>,
|
|
238
|
-
filterForContext?: Context.IValidatedContextDecl
|
|
239
|
-
): Result<ResourceJson.Json.IChildResourceCandidateDecl[]> {
|
|
240
|
-
if (!filterForContext || Object.keys(filterForContext).length === 0) {
|
|
241
|
-
return succeed(candidates.map((candidate) => candidate.toChildResourceCandidateDecl()));
|
|
242
|
-
}
|
|
243
|
-
|
|
244
|
-
const reducer = new CandidateReducer(candidates, filterForContext);
|
|
245
|
-
const reductionResults = mapResults(candidates.map((candidate) => reducer.reduceCandidate(candidate)));
|
|
246
|
-
|
|
247
|
-
return reductionResults.onSuccess((reductions) => {
|
|
248
|
-
const validReductions = reductions.filter(
|
|
249
|
-
(reduction): reduction is IReducedCandidate => reduction !== undefined
|
|
250
|
-
);
|
|
251
|
-
|
|
252
|
-
return succeed(
|
|
253
|
-
validReductions.map((reduction) => ({
|
|
254
|
-
/* c8 ignore next 3 -- defense in depth */
|
|
255
|
-
json: reduction.json ?? reduction.candidate.json,
|
|
256
|
-
isPartial: reduction.isPartial ?? reduction.candidate.isPartial,
|
|
257
|
-
mergeMethod: reduction.mergeMethod ?? reduction.candidate.mergeMethod,
|
|
258
|
-
conditions: reduction.conditions
|
|
259
|
-
}))
|
|
260
|
-
);
|
|
261
|
-
});
|
|
262
|
-
}
|
|
263
|
-
|
|
264
|
-
/**
|
|
265
|
-
* Static convenience method to construct an array of properly reduced
|
|
266
|
-
* {@link ResourceJson.Json.ILooseResourceCandidateDecl | loose resource candidate declarations}
|
|
267
|
-
* from a set of {@link Resources.ResourceCandidate | resource candidates}.
|
|
268
|
-
* @param id - The id of the resource
|
|
269
|
-
* @param candidates - The candidates to reduce
|
|
270
|
-
* @param filterForContext - Optional context to filter against
|
|
271
|
-
* @returns Result with array of reduced candidate declarations, or Failure if reduction fails
|
|
272
|
-
*/
|
|
273
|
-
public static reduceToLooseResourceCandidateDecls(
|
|
274
|
-
id: ResourceId,
|
|
275
|
-
candidates: ReadonlyArray<ResourceCandidate>,
|
|
276
|
-
filterForContext?: Context.IValidatedContextDecl
|
|
277
|
-
): Result<ResourceJson.Json.ILooseResourceCandidateDecl[]> {
|
|
278
|
-
if (!filterForContext || Object.keys(filterForContext).length === 0) {
|
|
279
|
-
return succeed(candidates.map((candidate) => candidate.toLooseResourceCandidateDecl()));
|
|
280
|
-
}
|
|
281
|
-
|
|
282
|
-
const reducer = new CandidateReducer(candidates, filterForContext);
|
|
283
|
-
const reductionResults = mapResults(candidates.map((candidate) => reducer.reduceCandidate(candidate)));
|
|
284
|
-
|
|
285
|
-
return reductionResults.onSuccess((reductions) => {
|
|
286
|
-
const validReductions = reductions.filter(
|
|
287
|
-
(reduction): reduction is IReducedCandidate => reduction !== undefined
|
|
288
|
-
);
|
|
289
|
-
|
|
290
|
-
return succeed(
|
|
291
|
-
validReductions.map((reduction) => ({
|
|
292
|
-
id,
|
|
293
|
-
/* c8 ignore next 3 -- defense in depth */
|
|
294
|
-
json: reduction.json ?? reduction.candidate.json,
|
|
295
|
-
isPartial: reduction.isPartial ?? reduction.candidate.isPartial,
|
|
296
|
-
mergeMethod: reduction.mergeMethod ?? reduction.candidate.mergeMethod,
|
|
297
|
-
conditions: reduction.conditions
|
|
298
|
-
}))
|
|
299
|
-
);
|
|
300
|
-
});
|
|
301
|
-
}
|
|
302
|
-
|
|
303
|
-
/**
|
|
304
|
-
* Reduces a single candidate according to the configured reduction rules.
|
|
305
|
-
* @param candidate - The candidate to reduce
|
|
306
|
-
* @returns Either a reduced candidate declaration or an error if the candidate is not found
|
|
307
|
-
*/
|
|
308
|
-
public reduceCandidate(candidate: ResourceCandidate): Result<IReducedCandidate | undefined> {
|
|
309
|
-
const candidateInfo = this._candidateInfos.find((info) => info.originalCandidate === candidate);
|
|
310
|
-
if (!candidateInfo) {
|
|
311
|
-
return fail(`Candidate not found in reducer state`);
|
|
312
|
-
}
|
|
313
|
-
|
|
314
|
-
if (candidateInfo.action === 'suppressed') {
|
|
315
|
-
return succeed(undefined);
|
|
316
|
-
}
|
|
317
|
-
|
|
318
|
-
// Convert array of conditions back to ConditionSetDecl for compatibility
|
|
319
|
-
const conditionsAsRecord = candidateInfo.conditions.reduce((acc, condition) => {
|
|
320
|
-
return { ...acc, [condition.qualifierName]: condition.value };
|
|
321
|
-
}, {} as ResourceJson.Json.ConditionSetDecl);
|
|
322
|
-
|
|
323
|
-
return succeed({
|
|
324
|
-
candidate,
|
|
325
|
-
conditions: conditionsAsRecord,
|
|
326
|
-
json: candidateInfo.json ?? candidate.json,
|
|
327
|
-
isPartial: candidate.isPartial,
|
|
328
|
-
mergeMethod: candidate.mergeMethod
|
|
329
|
-
});
|
|
330
|
-
}
|
|
331
|
-
}
|
|
@@ -1,114 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Copyright (c) 2025 Erik Fortune
|
|
3
|
-
*
|
|
4
|
-
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
5
|
-
* of this software and associated documentation files (the "Software"), to deal
|
|
6
|
-
* in the Software without restriction, including without limitation the rights
|
|
7
|
-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
8
|
-
* copies of the Software, and to permit persons to whom the Software is
|
|
9
|
-
* furnished to do so, subject to the following conditions:
|
|
10
|
-
*
|
|
11
|
-
* The above copyright notice and this permission notice shall be included in all
|
|
12
|
-
* copies or substantial portions of the Software.
|
|
13
|
-
*
|
|
14
|
-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
15
|
-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
16
|
-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
17
|
-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
18
|
-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
19
|
-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
20
|
-
* SOFTWARE.
|
|
21
|
-
*/
|
|
22
|
-
|
|
23
|
-
import * as ResourceJson from '../resource-json';
|
|
24
|
-
import { IValidatedContextDecl } from '../context';
|
|
25
|
-
import { IReadOnlyQualifierCollector } from '../qualifiers';
|
|
26
|
-
import { ReadOnlyResourceTypeCollector } from '../resource-types';
|
|
27
|
-
|
|
28
|
-
/**
|
|
29
|
-
* Options for resource declaration operations with strongly-typed context filtering.
|
|
30
|
-
* Extends the base IDeclarationOptions with proper type safety for context filtering.
|
|
31
|
-
*
|
|
32
|
-
* @example
|
|
33
|
-
* ```typescript
|
|
34
|
-
* // Preferred Result pattern with onSuccess chaining
|
|
35
|
-
* resourceManager.validateContext({ language: 'en' })
|
|
36
|
-
* .onSuccess((validatedContext) => {
|
|
37
|
-
* return resourceManager.clone({ filterForContext: validatedContext });
|
|
38
|
-
* })
|
|
39
|
-
* .onSuccess((clonedManager) => {
|
|
40
|
-
* return clonedManager.getResourceCollectionDecl();
|
|
41
|
-
* })
|
|
42
|
-
* .onFailure((error) => {
|
|
43
|
-
* console.error('Failed to create filtered clone:', error);
|
|
44
|
-
* });
|
|
45
|
-
* ```
|
|
46
|
-
* @public
|
|
47
|
-
*/
|
|
48
|
-
export interface IResourceDeclarationOptions extends ResourceJson.Helpers.IDeclarationOptions {
|
|
49
|
-
/**
|
|
50
|
-
* If provided, filters resource candidates to only include those that can match the
|
|
51
|
-
* specified validated context. This provides strongly-typed context filtering.
|
|
52
|
-
*
|
|
53
|
-
* Use resourceManager.validateContext() to create a validated context from an IContextDecl.
|
|
54
|
-
*/
|
|
55
|
-
filterForContext?: IValidatedContextDecl;
|
|
56
|
-
|
|
57
|
-
/**
|
|
58
|
-
* If true, reduces the qualifiers of the resource candidates by removing qualifiers that are made
|
|
59
|
-
* irrelevant by the filterForContext.
|
|
60
|
-
* @defaultValue false
|
|
61
|
-
*/
|
|
62
|
-
reduceQualifiers?: boolean;
|
|
63
|
-
|
|
64
|
-
/**
|
|
65
|
-
* Whether to include metadata in compiled outputs.
|
|
66
|
-
* Metadata includes human-readable information like semantic keys
|
|
67
|
-
* that can be useful for debugging or tooling.
|
|
68
|
-
* @defaultValue false
|
|
69
|
-
*/
|
|
70
|
-
includeMetadata?: boolean;
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
/**
|
|
74
|
-
* Extended compiled resource options that includes context filtering capabilities.
|
|
75
|
-
* This interface combines the standard compilation options with strongly-typed
|
|
76
|
-
* context filtering for resource candidates.
|
|
77
|
-
* @public
|
|
78
|
-
*/
|
|
79
|
-
export interface ICompiledResourceOptionsWithFilter extends ResourceJson.Compiled.ICompiledResourceOptions {
|
|
80
|
-
/**
|
|
81
|
-
* If provided, filters resource candidates to only include those that can match the
|
|
82
|
-
* specified validated context. This provides strongly-typed context filtering.
|
|
83
|
-
*
|
|
84
|
-
* Use resourceManager.validateContext() to create a validated context from an IContextDecl.
|
|
85
|
-
*/
|
|
86
|
-
filterForContext?: IValidatedContextDecl;
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
/**
|
|
90
|
-
* Options for ResourceManagerBuilder clone operations.
|
|
91
|
-
* Extends IDeclarationOptions to include support for applying edits when cloning.
|
|
92
|
-
* @public
|
|
93
|
-
*/
|
|
94
|
-
export interface IResourceManagerCloneOptions extends IResourceDeclarationOptions {
|
|
95
|
-
/**
|
|
96
|
-
* Optional array of loose condition declarations to be applied as edits during the clone operation.
|
|
97
|
-
* These conditions can modify or extend the resource candidates in the cloned manager.
|
|
98
|
-
*/
|
|
99
|
-
readonly candidates?: ReadonlyArray<ResourceJson.Json.ILooseResourceCandidateDecl>;
|
|
100
|
-
|
|
101
|
-
/**
|
|
102
|
-
* Optional qualifier collector to use for the cloned manager.
|
|
103
|
-
* If not provided, uses the same qualifiers as the original manager.
|
|
104
|
-
* This allows creating clones with different qualifier configurations.
|
|
105
|
-
*/
|
|
106
|
-
readonly qualifiers?: IReadOnlyQualifierCollector;
|
|
107
|
-
|
|
108
|
-
/**
|
|
109
|
-
* Optional resource type collector to use for the cloned manager.
|
|
110
|
-
* If not provided, uses the same resource types as the original manager.
|
|
111
|
-
* This allows creating clones with different resource type configurations.
|
|
112
|
-
*/
|
|
113
|
-
readonly resourceTypes?: ReadOnlyResourceTypeCollector;
|
|
114
|
-
}
|
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Copyright (c) 2025 Erik Fortune
|
|
3
|
-
*
|
|
4
|
-
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
5
|
-
* of this software and associated documentation files (the "Software"), to deal
|
|
6
|
-
* in the Software without restriction, including without limitation the rights
|
|
7
|
-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
8
|
-
* copies of the Software, and to permit persons to whom the Software is
|
|
9
|
-
* furnished to do so, subject to the following conditions:
|
|
10
|
-
*
|
|
11
|
-
* The above copyright notice and this permission notice shall be included in all
|
|
12
|
-
* copies or substantial portions of the Software.
|
|
13
|
-
*
|
|
14
|
-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
15
|
-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
16
|
-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
17
|
-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
18
|
-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
19
|
-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
20
|
-
* SOFTWARE.
|
|
21
|
-
*/
|
|
22
|
-
|
|
23
|
-
export * from './candidateReducer';
|
|
24
|
-
export * from './resourceCandidate';
|
|
25
|
-
export * from './resource';
|
|
26
|
-
export * from './resourceBuilder';
|
|
27
|
-
export * from './resourceManagerBuilder';
|
|
28
|
-
export * from './common';
|