@fgv/ts-res 5.0.0-18 → 5.0.0-19

package/dist/ts-res.d.ts

@@ -2197,6 +2197,7 @@ declare namespace Convert_8 {
 
 declare namespace Convert_9 {
     export {
+        validateSystemConfiguration,
         systemConfiguration,
         predefinedSystemConfiguration
     }
@@ -4945,6 +4946,18 @@ declare interface IResourceManagerCloneOptions extends IResourceDeclarationOptio
      * These conditions can modify or extend the resource candidates in the cloned manager.
      */
     readonly candidates?: ReadonlyArray<ResourceJson.Json.ILooseResourceCandidateDecl>;
+    /**
+     * Optional qualifier collector to use for the cloned manager.
+     * If not provided, uses the same qualifiers as the original manager.
+     * This allows creating clones with different qualifier configurations.
+     */
+    readonly qualifiers?: IReadOnlyQualifierCollector;
+    /**
+     * Optional resource type collector to use for the cloned manager.
+     * If not provided, uses the same resource types as the original manager.
+     * This allows creating clones with different resource type configurations.
+     */
+    readonly resourceTypes?: ReadOnlyResourceTypeCollector;
 }
 
 /**
@@ -7758,15 +7771,53 @@ export { ResourceJson }
  * @public
  */
 export declare class ResourceManagerBuilder implements IResourceManager<Resource> {
+    /**
+     * The {@link Qualifiers.IReadOnlyQualifierCollector | qualifiers} used by this resource manager.
+     */
     readonly qualifiers: IReadOnlyQualifierCollector;
+    /**
+     * The {@link ResourceTypes.ReadOnlyResourceTypeCollector | resource types} used by this resource manager.
+     */
     readonly resourceTypes: ReadOnlyResourceTypeCollector;
+    /**
+     * The {@link Conditions.ConditionCollector | condition collector} used by this resource manager.
+     * @internal
+     */
     protected readonly _conditions: ConditionCollector;
+    /**
+     * The {@link Conditions.ConditionSetCollector | condition set collector} used by this resource manager.
+     * @internal
+     */
     protected readonly _conditionSets: ConditionSetCollector;
+    /**
+     * The {@link Decisions.AbstractDecisionCollector | abstract decision collector} used by this resource manager.
+     * @internal
+     */
     protected readonly _decisions: AbstractDecisionCollector;
+    /**
+     * The {@link Resources.ResourceBuilder | resource builders} used by this resource manager.
+     * @internal
+     */
     protected readonly _resources: ValidatingResultMap<ResourceId, ResourceBuilder>;
-    readonly _builtResources: ValidatingResultMap<ResourceId, Resource>;
+    /**
+     * The {@link Resources.Resource | resources} built by this resource manager.
+     * @internal
+     */
+    protected readonly _builtResources: ValidatingResultMap<ResourceId, Resource>;
+    /**
+     * Whether the resources have been built.
+     * @internal
+     */
     protected _built: boolean;
+    /**
+     * The cached resource tree for this resource manager.
+     * @internal
+     */
     protected _cachedResourceTree?: ResourceTree.IReadOnlyResourceTreeRoot<Resource>;
+    /**
+     * The {@link QualifierTypes.ReadOnlyQualifierTypeCollector | qualifier types} used by this resource manager.
+     */
+    get qualifierTypes(): ReadOnlyQualifierTypeCollector;
     /**
      * A {@link Conditions.ConditionCollector | ConditionCollector} which
      * contains the {@link Conditions.Condition | conditions} used so far by
@@ -7982,12 +8033,17 @@ export declare class ResourceManagerBuilder implements IResourceManager<Resource
      */
     getResourceCollectionDecl(options?: IResourceDeclarationOptions): Result<ResourceJson.Normalized.IResourceCollectionDecl>;
     /**
-     * Creates a filtered clone of this ResourceManagerBuilder using the specified context.
-     * This is a convenience method that creates a new ResourceManagerBuilder with the same
-     * configuration but filtered to include only candidates that match the provided context.
-     * If candidates are provided for editing, they will be applied with collision detection.
-     * @param options - Options for the cloning operation, including the strongly-typed filterForContext property and optional candidates for edits.
-     * @returns A Result containing the new filtered ResourceManagerBuilder.
+     * Creates a clone of this ResourceManagerBuilder with optional configuration overrides.
+     * This method creates a new ResourceManagerBuilder that can optionally use different
+     * qualifiers and/or resource types than the original. It can also be filtered to include
+     * only candidates that match the provided context and apply candidate edits.
+     *
+     * @param options - Options for the cloning operation:
+     *   - `qualifiers`: Optional qualifier collector to use instead of the original
+     *   - `resourceTypes`: Optional resource type collector to use instead of the original
+     *   - `filterForContext`: Optional context filter for candidates
+     *   - `candidates`: Optional candidate edits to apply during cloning
+     * @returns A Result containing the new ResourceManagerBuilder with the specified configuration.
      * @public
      */
     clone(options?: IResourceManagerCloneOptions): Result<ResourceManagerBuilder>;
@@ -9320,6 +9376,15 @@ declare const validatedContextQualifierValueDecl: Converter<IValidatedContextQua
  */
 declare const validatedQualifierDecl: Converter<IValidatedQualifierDecl, IQualifierDeclConvertContext>;
 
+/**
+ * Validate a {@link Config.Model.ISystemConfiguration | ISystemConfiguration} object.
+ * @param config - The system configuration to validate
+ * @returns `Success` with the validated system configuration if successful,
+ * or `Failure` with an error message if validation fails.
+ * @public
+ */
+declare function validateSystemConfiguration(config: unknown): Result<ISystemConfiguration>;
+
 /**
  * Validate a ZIP archive manifest object
  * @param manifest - Object to validate as manifest

package/lib/packlets/config/convert.d.ts

@@ -1,3 +1,4 @@
+import { Result } from '@fgv/ts-utils';
 import { ISystemConfiguration } from './json';
 /**
  * A `Converter` for {@link Config.Model.ISystemConfiguration | ISystemConfiguration} objects.
@@ -11,4 +12,12 @@ export declare const systemConfiguration: import("@fgv/ts-utils").ObjectConverte
  * @public
  */
 export declare const predefinedSystemConfiguration: import("@fgv/ts-utils").Converter<import("./common").PredefinedSystemConfiguration, readonly import("./common").PredefinedSystemConfiguration[]>;
+/**
+ * Validate a {@link Config.Model.ISystemConfiguration | ISystemConfiguration} object.
+ * @param config - The system configuration to validate
+ * @returns `Success` with the validated system configuration if successful,
+ * or `Failure` with an error message if validation fails.
+ * @public
+ */
+export declare function validateSystemConfiguration(config: unknown): Result<ISystemConfiguration>;
 //# sourceMappingURL=convert.d.ts.map

package/lib/packlets/config/convert.js

@@ -55,6 +55,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.predefinedSystemConfiguration = exports.systemConfiguration = void 0;
+exports.validateSystemConfiguration = validateSystemConfiguration;
 /* eslint-disable @rushstack/typedef-var */
 const ts_utils_1 = require("@fgv/ts-utils");
 const QualifierTypes = __importStar(require("../qualifier-types"));
@@ -79,4 +80,14 @@ exports.systemConfiguration = ts_utils_1.Converters.strictObject({
  * @public
  */
 exports.predefinedSystemConfiguration = ts_utils_1.Converters.enumeratedValue(common_1.allPredefinedSystemConfigurations);
+/**
+ * Validate a {@link Config.Model.ISystemConfiguration | ISystemConfiguration} object.
+ * @param config - The system configuration to validate
+ * @returns `Success` with the validated system configuration if successful,
+ * or `Failure` with an error message if validation fails.
+ * @public
+ */
+function validateSystemConfiguration(config) {
+    return exports.systemConfiguration.convert(config);
+}
 //# sourceMappingURL=convert.js.map

package/lib/packlets/resources/common.d.ts

@@ -1,5 +1,7 @@
 import * as ResourceJson from '../resource-json';
 import { IValidatedContextDecl } from '../context';
+import { IReadOnlyQualifierCollector } from '../qualifiers';
+import { ReadOnlyResourceTypeCollector } from '../resource-types';
 /**
  * Options for resource declaration operations with strongly-typed context filtering.
  * Extends the base IDeclarationOptions with proper type safety for context filtering.
@@ -68,5 +70,17 @@ export interface IResourceManagerCloneOptions extends IResourceDeclarationOption
      * These conditions can modify or extend the resource candidates in the cloned manager.
      */
     readonly candidates?: ReadonlyArray<ResourceJson.Json.ILooseResourceCandidateDecl>;
+    /**
+     * Optional qualifier collector to use for the cloned manager.
+     * If not provided, uses the same qualifiers as the original manager.
+     * This allows creating clones with different qualifier configurations.
+     */
+    readonly qualifiers?: IReadOnlyQualifierCollector;
+    /**
+     * Optional resource type collector to use for the cloned manager.
+     * If not provided, uses the same resource types as the original manager.
+     * This allows creating clones with different resource type configurations.
+     */
+    readonly resourceTypes?: ReadOnlyResourceTypeCollector;
 }
 //# sourceMappingURL=common.d.ts.map

package/lib/packlets/resources/resourceManagerBuilder.d.ts

@@ -12,6 +12,7 @@ import { IResourceDeclarationOptions, IResourceManagerCloneOptions } from './com
 import * as ResourceJson from '../resource-json';
 import * as Context from '../context';
 import * as Config from '../config';
+import { ReadOnlyQualifierTypeCollector } from '../qualifier-types';
 /**
  * Interface for parameters to the {@link Resources.ResourceManagerBuilder.create | ResourceManagerBuilder create method}.
  * @public
@@ -33,15 +34,53 @@ export type ResourceManagerBuilderResultDetail = Collections.ResultMapResultDeta
  * @public
  */
 export declare class ResourceManagerBuilder implements IResourceManager<Resource> {
+    /**
+     * The {@link Qualifiers.IReadOnlyQualifierCollector | qualifiers} used by this resource manager.
+     */
     readonly qualifiers: IReadOnlyQualifierCollector;
+    /**
+     * The {@link ResourceTypes.ReadOnlyResourceTypeCollector | resource types} used by this resource manager.
+     */
     readonly resourceTypes: ReadOnlyResourceTypeCollector;
+    /**
+     * The {@link Conditions.ConditionCollector | condition collector} used by this resource manager.
+     * @internal
+     */
     protected readonly _conditions: ConditionCollector;
+    /**
+     * The {@link Conditions.ConditionSetCollector | condition set collector} used by this resource manager.
+     * @internal
+     */
     protected readonly _conditionSets: ConditionSetCollector;
+    /**
+     * The {@link Decisions.AbstractDecisionCollector | abstract decision collector} used by this resource manager.
+     * @internal
+     */
     protected readonly _decisions: AbstractDecisionCollector;
+    /**
+     * The {@link Resources.ResourceBuilder | resource builders} used by this resource manager.
+     * @internal
+     */
     protected readonly _resources: ValidatingResultMap<ResourceId, ResourceBuilder>;
-    readonly _builtResources: ValidatingResultMap<ResourceId, Resource>;
+    /**
+     * The {@link Resources.Resource | resources} built by this resource manager.
+     * @internal
+     */
+    protected readonly _builtResources: ValidatingResultMap<ResourceId, Resource>;
+    /**
+     * Whether the resources have been built.
+     * @internal
+     */
     protected _built: boolean;
+    /**
+     * The cached resource tree for this resource manager.
+     * @internal
+     */
     protected _cachedResourceTree?: ResourceTree.IReadOnlyResourceTreeRoot<Resource>;
+    /**
+     * The {@link QualifierTypes.ReadOnlyQualifierTypeCollector | qualifier types} used by this resource manager.
+     */
+    get qualifierTypes(): ReadOnlyQualifierTypeCollector;
     /**
      * A {@link Conditions.ConditionCollector | ConditionCollector} which
      * contains the {@link Conditions.Condition | conditions} used so far by
@@ -257,12 +296,17 @@ export declare class ResourceManagerBuilder implements IResourceManager<Resource
      */
     getResourceCollectionDecl(options?: IResourceDeclarationOptions): Result<ResourceJson.Normalized.IResourceCollectionDecl>;
     /**
-     * Creates a filtered clone of this ResourceManagerBuilder using the specified context.
-     * This is a convenience method that creates a new ResourceManagerBuilder with the same
-     * configuration but filtered to include only candidates that match the provided context.
-     * If candidates are provided for editing, they will be applied with collision detection.
-     * @param options - Options for the cloning operation, including the strongly-typed filterForContext property and optional candidates for edits.
-     * @returns A Result containing the new filtered ResourceManagerBuilder.
+     * Creates a clone of this ResourceManagerBuilder with optional configuration overrides.
+     * This method creates a new ResourceManagerBuilder that can optionally use different
+     * qualifiers and/or resource types than the original. It can also be filtered to include
+     * only candidates that match the provided context and apply candidate edits.
+     *
+     * @param options - Options for the cloning operation:
+     *   - `qualifiers`: Optional qualifier collector to use instead of the original
+     *   - `resourceTypes`: Optional resource type collector to use instead of the original
+     *   - `filterForContext`: Optional context filter for candidates
+     *   - `candidates`: Optional candidate edits to apply during cloning
+     * @returns A Result containing the new ResourceManagerBuilder with the specified configuration.
      * @public
      */
     clone(options?: IResourceManagerCloneOptions): Result<ResourceManagerBuilder>;

package/lib/packlets/resources/resourceManagerBuilder.js

@@ -75,6 +75,12 @@ const ts_json_1 = require("@fgv/ts-json");
  * @public
  */
 class ResourceManagerBuilder {
+    /**
+     * The {@link QualifierTypes.ReadOnlyQualifierTypeCollector | qualifier types} used by this resource manager.
+     */
+    get qualifierTypes() {
+        return this.qualifiers.qualifierTypes;
+    }
     /**
      * A {@link Conditions.ConditionCollector | ConditionCollector} which
      * contains the {@link Conditions.Condition | conditions} used so far by
@@ -528,20 +534,26 @@ class ResourceManagerBuilder {
         });
     }
     /**
-     * Creates a filtered clone of this ResourceManagerBuilder using the specified context.
-     * This is a convenience method that creates a new ResourceManagerBuilder with the same
-     * configuration but filtered to include only candidates that match the provided context.
-     * If candidates are provided for editing, they will be applied with collision detection.
-     * @param options - Options for the cloning operation, including the strongly-typed filterForContext property and optional candidates for edits.
-     * @returns A Result containing the new filtered ResourceManagerBuilder.
+     * Creates a clone of this ResourceManagerBuilder with optional configuration overrides.
+     * This method creates a new ResourceManagerBuilder that can optionally use different
+     * qualifiers and/or resource types than the original. It can also be filtered to include
+     * only candidates that match the provided context and apply candidate edits.
+     *
+     * @param options - Options for the cloning operation:
+     *   - `qualifiers`: Optional qualifier collector to use instead of the original
+     *   - `resourceTypes`: Optional resource type collector to use instead of the original
+     *   - `filterForContext`: Optional context filter for candidates
+     *   - `candidates`: Optional candidate edits to apply during cloning
+     * @returns A Result containing the new ResourceManagerBuilder with the specified configuration.
      * @public
      */
     /* c8 ignore next 21 - functional code path tested but coverage intermittently missed */
     clone(options) {
         return this.getResourceCollectionDecl(options).onSuccess((collection) => {
+            var _a, _b;
             return ResourceManagerBuilder.create({
-                qualifiers: this.qualifiers,
-                resourceTypes: this.resourceTypes
+                qualifiers: (_a = options === null || options === void 0 ? void 0 : options.qualifiers) !== null && _a !== void 0 ? _a : this.qualifiers,
+                resourceTypes: (_b = options === null || options === void 0 ? void 0 : options.resourceTypes) !== null && _b !== void 0 ? _b : this.resourceTypes
             }).onSuccess((newManager) => {
                 // Check if we have candidates to apply as edits
                 const editCandidates = (options === null || options === void 0 ? void 0 : options.candidates) || [];

package/lib/test/unit/resources/resourceManagerBuilder.clone.test.d.ts

@@ -0,0 +1,2 @@
+import '@fgv/ts-utils-jest';
+//# sourceMappingURL=resourceManagerBuilder.clone.test.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fgv/ts-res",
-  "version": "5.0.0-18",
+  "version": "5.0.0-19",
   "description": "Multi-dimensional Resource Runtime",
   "main": "lib/index.js",
   "types": "dist/ts-res.d.ts",
@@ -44,16 +44,16 @@
     "@rushstack/heft-node-rig": "~2.9.3",
     "@types/heft-jest": "1.0.6",
     "eslint-plugin-tsdoc": "~0.4.0",
-    "@fgv/ts-utils-jest": "5.0.0-18",
-    "@fgv/ts-extras": "5.0.0-18"
+    "@fgv/ts-utils-jest": "5.0.0-19",
+    "@fgv/ts-extras": "5.0.0-19"
   },
   "dependencies": {
     "luxon": "^3.7.1",
     "fflate": "~0.8.2",
-    "@fgv/ts-utils": "5.0.0-18",
-    "@fgv/ts-json-base": "5.0.0-18",
-    "@fgv/ts-json": "5.0.0-18",
-    "@fgv/ts-bcp47": "5.0.0-18"
+    "@fgv/ts-utils": "5.0.0-19",
+    "@fgv/ts-json": "5.0.0-19",
+    "@fgv/ts-json-base": "5.0.0-19",
+    "@fgv/ts-bcp47": "5.0.0-19"
   },
   "scripts": {
     "build": "heft build --clean",

package/src/packlets/config/convert.ts

@@ -22,7 +22,7 @@
 
 /* eslint-disable @rushstack/typedef-var */
 
-import { Converters } from '@fgv/ts-utils';
+import { Converters, Result } from '@fgv/ts-utils';
 import { ISystemConfiguration } from './json';
 import * as QualifierTypes from '../qualifier-types';
 import * as Qualifiers from '../qualifiers';
@@ -48,3 +48,14 @@ export const systemConfiguration = Converters.strictObject<ISystemConfiguration>
  * @public
  */
 export const predefinedSystemConfiguration = Converters.enumeratedValue(allPredefinedSystemConfigurations);
+
+/**
+ * Validate a {@link Config.Model.ISystemConfiguration | ISystemConfiguration} object.
+ * @param config - The system configuration to validate
+ * @returns `Success` with the validated system configuration if successful,
+ * or `Failure` with an error message if validation fails.
+ * @public
+ */
+export function validateSystemConfiguration(config: unknown): Result<ISystemConfiguration> {
+  return systemConfiguration.convert(config);
+}

package/src/packlets/resources/common.ts

@@ -22,6 +22,8 @@
 
 import * as ResourceJson from '../resource-json';
 import { IValidatedContextDecl } from '../context';
+import { IReadOnlyQualifierCollector } from '../qualifiers';
+import { ReadOnlyResourceTypeCollector } from '../resource-types';
 
 /**
  * Options for resource declaration operations with strongly-typed context filtering.
@@ -95,4 +97,18 @@ export interface IResourceManagerCloneOptions extends IResourceDeclarationOption
    * These conditions can modify or extend the resource candidates in the cloned manager.
    */
   readonly candidates?: ReadonlyArray<ResourceJson.Json.ILooseResourceCandidateDecl>;
+
+  /**
+   * Optional qualifier collector to use for the cloned manager.
+   * If not provided, uses the same qualifiers as the original manager.
+   * This allows creating clones with different qualifier configurations.
+   */
+  readonly qualifiers?: IReadOnlyQualifierCollector;
+
+  /**
+   * Optional resource type collector to use for the cloned manager.
+   * If not provided, uses the same resource types as the original manager.
+   * This allows creating clones with different resource type configurations.
+   */
+  readonly resourceTypes?: ReadOnlyResourceTypeCollector;
 }

package/src/packlets/resources/resourceManagerBuilder.ts

@@ -58,6 +58,7 @@ import * as ResourceJson from '../resource-json';
 import * as Context from '../context';
 import * as Config from '../config';
 import { JsonEditor } from '@fgv/ts-json';
+import { ReadOnlyQualifierTypeCollector } from '../qualifier-types';
 
 /**
  * Interface for parameters to the {@link Resources.ResourceManagerBuilder.create | ResourceManagerBuilder create method}.
@@ -84,18 +85,65 @@ export type ResourceManagerBuilderResultDetail =
  * @public
  */
 export class ResourceManagerBuilder implements IResourceManager<Resource> {
+  /**
+   * The {@link Qualifiers.IReadOnlyQualifierCollector | qualifiers} used by this resource manager.
+   */
   public readonly qualifiers: IReadOnlyQualifierCollector;
+
+  /**
+   * The {@link ResourceTypes.ReadOnlyResourceTypeCollector | resource types} used by this resource manager.
+   */
   public readonly resourceTypes: ReadOnlyResourceTypeCollector;
 
+  /**
+   * The {@link Conditions.ConditionCollector | condition collector} used by this resource manager.
+   * @internal
+   */
   protected readonly _conditions: ConditionCollector;
+
+  /**
+   * The {@link Conditions.ConditionSetCollector | condition set collector} used by this resource manager.
+   * @internal
+   */
   protected readonly _conditionSets: ConditionSetCollector;
+
+  /**
+   * The {@link Decisions.AbstractDecisionCollector | abstract decision collector} used by this resource manager.
+   * @internal
+   */
   protected readonly _decisions: AbstractDecisionCollector;
+
+  /**
+   * The {@link Resources.ResourceBuilder | resource builders} used by this resource manager.
+   * @internal
+   */
   protected readonly _resources: ValidatingResultMap<ResourceId, ResourceBuilder>;
-  public readonly _builtResources: ValidatingResultMap<ResourceId, Resource>;
 
+  /**
+   * The {@link Resources.Resource | resources} built by this resource manager.
+   * @internal
+   */
+  protected readonly _builtResources: ValidatingResultMap<ResourceId, Resource>;
+
+  /**
+   * Whether the resources have been built.
+   * @internal
+   */
   protected _built: boolean;
+
+  /**
+   * The cached resource tree for this resource manager.
+   * @internal
+   */
   protected _cachedResourceTree?: ResourceTree.IReadOnlyResourceTreeRoot<Resource>;
 
+  /**
+   * The {@link QualifierTypes.ReadOnlyQualifierTypeCollector | qualifier types} used by this resource manager.
+   */
+  public get qualifierTypes(): ReadOnlyQualifierTypeCollector {
+    return this.qualifiers.qualifierTypes;
+  }
+
   /**
    * A {@link Conditions.ConditionCollector | ConditionCollector} which
    * contains the {@link Conditions.Condition | conditions} used so far by
@@ -646,20 +694,25 @@ export class ResourceManagerBuilder implements IResourceManager<Resource> {
   }
 
   /**
-   * Creates a filtered clone of this ResourceManagerBuilder using the specified context.
-   * This is a convenience method that creates a new ResourceManagerBuilder with the same
-   * configuration but filtered to include only candidates that match the provided context.
-   * If candidates are provided for editing, they will be applied with collision detection.
-   * @param options - Options for the cloning operation, including the strongly-typed filterForContext property and optional candidates for edits.
-   * @returns A Result containing the new filtered ResourceManagerBuilder.
+   * Creates a clone of this ResourceManagerBuilder with optional configuration overrides.
+   * This method creates a new ResourceManagerBuilder that can optionally use different
+   * qualifiers and/or resource types than the original. It can also be filtered to include
+   * only candidates that match the provided context and apply candidate edits.
+   *
+   * @param options - Options for the cloning operation:
+   *   - `qualifiers`: Optional qualifier collector to use instead of the original
+   *   - `resourceTypes`: Optional resource type collector to use instead of the original
+   *   - `filterForContext`: Optional context filter for candidates
+   *   - `candidates`: Optional candidate edits to apply during cloning
+   * @returns A Result containing the new ResourceManagerBuilder with the specified configuration.
    * @public
    */
   /* c8 ignore next 21 - functional code path tested but coverage intermittently missed */
   public clone(options?: IResourceManagerCloneOptions): Result<ResourceManagerBuilder> {
     return this.getResourceCollectionDecl(options).onSuccess((collection) => {
       return ResourceManagerBuilder.create({
-        qualifiers: this.qualifiers,
-        resourceTypes: this.resourceTypes
+        qualifiers: options?.qualifiers ?? this.qualifiers,
+        resourceTypes: options?.resourceTypes ?? this.resourceTypes
       }).onSuccess((newManager) => {
         // Check if we have candidates to apply as edits
         const editCandidates = options?.candidates || [];