@satisfactory-dev/docs.json.ts 0.12.2 → 0.13.1

package/generated-types/update8/classes/CoreUObject/FGVehicleDescriptor.d.ts

@@ -1,19 +1,13 @@
 import { FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type } from './FGItemDescriptor';
-import { decimal_string__type, integer_string__type } from '../../../common/common/scalar';
+import { common_base__FGVehicleDescriptor__fueled_with_inventory__type, common_base__FGVehicleDescriptor__powered_no_inventory__type, common_base__FGVehicleDescriptor__with_inventory__type } from '../../../common/classes/CoreUObject/FGVehicleDescriptor';
 import { NativeClass__type } from '../../../common/common/unassigned';
-export type FGVehicleDescriptor__fueled_with_inventory__type = FGVehicleDescriptor__with_inventory__type & {
-    mFuelConsumption: decimal_string__type;
-};
-export type FGVehicleDescriptor__powered_no_inventory__type = FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
-    mPowerConsumption: {
-        Min: decimal_string__type;
-        Max: decimal_string__type;
-    };
-};
+export type FGVehicleDescriptor__fueled_with_inventory__type = FGVehicleDescriptor__fueled_with_inventory__merged__type;
+export type FGVehicleDescriptor__fueled_with_inventory__merged__type = common_base__FGVehicleDescriptor__fueled_with_inventory__type & FGVehicleDescriptor__with_inventory__type;
+export type FGVehicleDescriptor__powered_no_inventory__type = FGVehicleDescriptor__powered_no_inventory__merged__type;
+export type FGVehicleDescriptor__powered_no_inventory__merged__type = common_base__FGVehicleDescriptor__powered_no_inventory__type & FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
 export type FGVehicleDescriptor__unfueled_with_inventory__type = FGVehicleDescriptor__with_inventory__type;
-export type FGVehicleDescriptor__with_inventory__type = FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
-    mInventorySize: integer_string__type;
-};
+export type FGVehicleDescriptor__with_inventory__type = FGVehicleDescriptor__with_inventory__merged__type;
+export type FGVehicleDescriptor__with_inventory__merged__type = common_base__FGVehicleDescriptor__with_inventory__type & FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
 export type FGVehicleDescriptor__NativeClass = NativeClass__type & {
     Classes: [
         (FGVehicleDescriptor__powered_no_inventory__type | FGVehicleDescriptor__unfueled_with_inventory__type | FGVehicleDescriptor__fueled_with_inventory__type),

package/generated-types/update8/classes/CoreUObject/FGWeapon.d.ts

@@ -1,46 +1,21 @@
-import { weaponState__type } from '../../common/unassigned';
 import { FGEquipment__base__type } from './FGEquipment';
-import { empty_object__type, UnrealEngineString__array__type, NativeClass__type } from '../../../common/common/unassigned';
-import { boolean__type, decimal_string__type, integer_string__type } from '../../../common/common/scalar';
-export type FGWeapon__base__type = FGEquipment__base__type & {
-    mShowCycleAmmoRadialMenuTimer: empty_object__type;
-    mOnWeaponStateChanged: empty_object__type;
-    mWeaponState: weaponState__type;
-    mAutomaticallyReload: boolean__type;
-    mAutoReloadDelay: decimal_string__type;
-    mAutoReloadTimerHandle: empty_object__type;
-    mCurrentAmmoCount: integer_string__type;
-    mAllowedAmmoClasses: UnrealEngineString__array__type;
-    mAttachMagazineToPlayer: boolean__type;
-    mMuzzleSocketName: 'muzzleSocket' | 'MuzzleSocket' | 'None';
-    mCurrentMagazineBoneName: 'CurrentMagazine' | 'hand_rSocket';
-    mEjectMagazineBoneName: 'EjectMagazine' | 'hand_rSocket';
-    mDispersionOnNoMagazine: decimal_string__type;
-    mWeaponDamageMultiplier: decimal_string__type;
-    mFiringBlocksDispersionReduction: boolean__type;
-    mCurrentDispersion: decimal_string__type;
-    mReloadTime: decimal_string__type;
-    mAmmoSwitchUsedRadialMenu: boolean__type;
-    mOnAmmoCyclingPressed: empty_object__type;
-    mOnAmmoCyclingReleased: empty_object__type;
-    mBlockSprintWhenFiring: boolean__type;
-};
-export type FGWeapon__rebar_gun__type = FGWeapon__base__type & {
-    ClassName?: 'Equip_RebarGun_Projectile_C';
+import { boolean__type, integer_string__type } from '../../../common/common/scalar';
+import { common_base__FGWeapon__base__type, common_base__FGWeapon__gun_base__type, common_base__FGWeapon__rebar_gun__type, common_base__FGWeapon__rifle__type } from '../../../common/classes/CoreUObject/FGWeapon';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGWeapon__base__type = FGWeapon__base__merged__type;
+export type FGWeapon__base__merged__type = common_base__FGWeapon__base__type & FGEquipment__base__type;
+export type FGWeapon__gun_base__type = FGWeapon__gun_base__merged__type;
+export type FGWeapon__gun_base__merged__type = common_base__FGWeapon__gun_base__type & FGWeapon__base__type;
+export type FGWeapon__rebar_gun__type = FGWeapon__rebar_gun__merged__type & {
     mMuteDryFire: boolean__type;
     mRandomReloadAnim: integer_string__type;
     mRandomStingerAnim: integer_string__type;
     mRebarGunStingerID: integer_string__type;
     mRebarGunEquipID: integer_string__type;
 };
-export type FGWeapon__rifle__type = FGWeapon__base__type & {
-    ClassName?: 'Equip_Rifle_C';
-    Fire: empty_object__type;
-    mHasReloadedOnce: boolean__type;
-};
+export type FGWeapon__rebar_gun__merged__type = common_base__FGWeapon__rebar_gun__type & FGWeapon__gun_base__type;
+export type FGWeapon__rifle__type = FGWeapon__rifle__merged__type;
+export type FGWeapon__rifle__merged__type = common_base__FGWeapon__rifle__type & FGWeapon__gun_base__type;
 export type FGWeapon__NativeClass = NativeClass__type & {
-    Classes: [
-        FGWeapon__rebar_gun__type | FGWeapon__rifle__type,
-        ...(FGWeapon__rebar_gun__type | FGWeapon__rifle__type)[]
-    ];
+    Classes: [FGWeapon__rebar_gun__type, FGWeapon__rifle__type];
 };

package/generated-types/update8/common/unassigned.d.ts

@@ -1,138 +1,46 @@
-import { UnrealEngineString } from '../utils/validators';
+import { UnrealEngineString, StringStartsWith } from '../utils/validators';
 import { FGBuildableResourceExtractor__miner__base__type } from '../classes/CoreUObject/FGBuildableResourceExtractor';
-import { decimal_string__type, boolean__type } from '../../common/common/scalar';
-import { InfinityExtrap__type, None__type, empty_object__type } from '../../common/common/unassigned';
-export type EditorCurveData__type = {
-    EditorCurveData: {
-        DefaultValue: decimal_string__type;
-        PreInfinityExtrap: InfinityExtrap__type;
-        PostInfinityExtrap: InfinityExtrap__type;
-    };
-    ExternalCurve?: UnrealEngineString<'/Script/Engine.CurveFloat', '/Game/FactoryGame/Resource/Parts/SpikedRebar/SpikedRebar_Falloff.SpikedRebar_Falloff' | '/Game/FactoryGame/Resource/Parts/CartridgeStandard/LinearDamageFalloff.LinearDamageFalloff'>;
+import { empty_object__type, common_base__FGBuildableResourceExtractor__miner_mk3__type } from '../../common/common/unassigned';
+import { decimal_string__type, integer_string__type, boolean__type } from '../../common/common/scalar';
+import { common_base__FGBuildable__consumes_power_base__type } from '../../common/classes/CoreUObject/FGBuildable';
+import { common_base__FGBuildableDroneStation__type } from '../../common/classes/CoreUObject/FGBuildableDroneStation';
+import { common_base__FGBuildableTradingPost__type } from '../../common/classes/CoreUObject/FGBuildableTradingPost';
+export type FGBuildable__consumes_power_base__update8__type = common_base__FGBuildable__consumes_power_base__type & {
+    mMaxPotentialIncreasePerCrystal: decimal_string__type;
+    OnReplicationDetailActorCreatedEvent: empty_object__type;
+    mInventoryPotentialHandlerData: empty_object__type;
 };
-export type FGBuildableResourceExtractor__miner_mk3__type = FGBuildableResourceExtractor__miner__base__type & {
-    mInternalMiningState_0: 'NewEnumerator0';
-    mToggleMiningStateHandle_0: empty_object__type;
-    mMinimumDrillTime_0: decimal_string__type;
-    mMaximumDrillTime_0: decimal_string__type;
+export type FGBuildableDroneStation__update8__type = common_base__FGBuildableDroneStation__type & {
+    mBatteryClasses: [
+        UnrealEngineString<'/Script/Engine.BlueprintGeneratedClass', StringStartsWith<'/Game/FactoryGame/Resource/Parts/Battery/'>>,
+        ...UnrealEngineString<'/Script/Engine.BlueprintGeneratedClass', StringStartsWith<'/Game/FactoryGame/Resource/Parts/Battery/'>>[]
+    ];
+    mBatteryStorageSizeX: integer_string__type;
+    mBatteryStorageSizeY: integer_string__type;
+    mInputInventoryHandler: empty_object__type;
+    mOutputInventoryHandler: empty_object__type;
+    mBatteryInventoryHandler: empty_object__type;
 };
-export type MaterialSlotName__type = 'lambert1' | 'lambert10' | 'lambert9_001' | 'lambert2' | 'Material_002' | 'Material_003' | 'Rocket1' | 'Rocket2' | 'Rifle' | '01 - Default';
-export type mChainsawState__type = None__type;
-export type mDisableSnapOn__type = {
-    Front: boolean__type;
-    Right: boolean__type;
-    Left: boolean__type;
-    Top: boolean__type;
-    Bottom: boolean__type;
-} | {
-    Right: boolean__type;
-    Left: boolean__type;
-    Top: boolean__type;
-    Bottom: boolean__type;
-} | {
-    Left: boolean__type;
-    Top: boolean__type;
-    Bottom: boolean__type;
-} | {
-    Top: boolean__type;
-    Bottom: boolean__type;
-} | {
-    Bottom: boolean__type;
-} | {
-    Top: boolean__type;
-} | {
-    Left: boolean__type;
-    Bottom: boolean__type;
-} | {
-    Left: boolean__type;
-} | {
-    Left: boolean__type;
-    Top: boolean__type;
-} | {
-    Right: boolean__type;
-    Top: boolean__type;
-    Bottom: boolean__type;
-} | {
-    Right: boolean__type;
-    Bottom: boolean__type;
-} | {
-    Right: boolean__type;
-} | {
-    Right: boolean__type;
-    Top: boolean__type;
-} | {
-    Right: boolean__type;
-    Left: boolean__type;
-    Bottom: boolean__type;
-} | {
-    Right: boolean__type;
-    Left: boolean__type;
-} | {
-    Right: boolean__type;
-    Left: boolean__type;
-    Top: boolean__type;
-} | {
-    Front: boolean__type;
-    Left: boolean__type;
-    Top: boolean__type;
-    Bottom: boolean__type;
-} | {
-    Front: boolean__type;
-    Top: boolean__type;
-    Bottom: boolean__type;
-} | {
-    Front: boolean__type;
-    Bottom: boolean__type;
-} | {
-    Front: boolean__type;
-} | {
-    Front: boolean__type;
-    Top: boolean__type;
-} | {
-    Front: boolean__type;
-    Left: boolean__type;
-    Bottom: boolean__type;
-} | {
-    Front: boolean__type;
-    Left: boolean__type;
-} | {
-    Front: boolean__type;
-    Left: boolean__type;
-    Top: boolean__type;
-} | {
-    Front: boolean__type;
-    Right: boolean__type;
-    Top: boolean__type;
-    Bottom: boolean__type;
-} | {
-    Front: boolean__type;
-    Right: boolean__type;
-    Bottom: boolean__type;
-} | {
-    Front: boolean__type;
-    Right: boolean__type;
-} | {
-    Front: boolean__type;
-    Right: boolean__type;
-    Top: boolean__type;
-} | {
-    Front: boolean__type;
-    Right: boolean__type;
-    Left: boolean__type;
-    Bottom: boolean__type;
-} | {
-    Front: boolean__type;
-    Right: boolean__type;
-    Left: boolean__type;
-} | {
-    Front: boolean__type;
-    Right: boolean__type;
-    Left: boolean__type;
-    Top: boolean__type;
-};
-export type mLightControlData__type = {
-    Intensity: decimal_string__type;
+export type FGBuildableResourceExtractor__miner_mk3__type = FGBuildableResourceExtractor__miner_mk3__merged__type;
+export type FGBuildableResourceExtractor__miner_mk3__merged__type = common_base__FGBuildableResourceExtractor__miner_mk3__type & FGBuildableResourceExtractor__miner__base__type;
+export type FGBuildableTradingPost__update8__type = common_base__FGBuildableTradingPost__type & {
+    mWorkBenchOccupied: 'Craft Bench occupied';
+    mWorkBenchFree: 'Use Craft Bench';
+    Meshes?: [
+        UnrealEngineString<'/Script/Engine.StaticMesh', StringStartsWith<'/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/'>>,
+        ...UnrealEngineString<'/Script/Engine.StaticMesh', StringStartsWith<'/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/'>>[]
+    ];
+    mMamFreeText?: 'Use MAM';
+    mMamOccupiedText?: 'MAM is occupied';
+    mMeshes: [
+        ('/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_1.Tradingpost_Stage_1' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_2.Tradingpost_Stage_2' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_3.Tradingpost_Stage_3' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_4.Tradingpost_Stage_4' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_5.Tradingpost_Stage_5' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_6.Tradingpost_Stage_6'),
+        ('/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_1.Tradingpost_Stage_1' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_2.Tradingpost_Stage_2' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_3.Tradingpost_Stage_3' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_4.Tradingpost_Stage_4' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_5.Tradingpost_Stage_5' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_6.Tradingpost_Stage_6'),
+        ('/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_1.Tradingpost_Stage_1' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_2.Tradingpost_Stage_2' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_3.Tradingpost_Stage_3' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_4.Tradingpost_Stage_4' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_5.Tradingpost_Stage_5' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_6.Tradingpost_Stage_6'),
+        ('/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_1.Tradingpost_Stage_1' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_2.Tradingpost_Stage_2' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_3.Tradingpost_Stage_3' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_4.Tradingpost_Stage_4' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_5.Tradingpost_Stage_5' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_6.Tradingpost_Stage_6'),
+        ('/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_1.Tradingpost_Stage_1' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_2.Tradingpost_Stage_2' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_3.Tradingpost_Stage_3' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_4.Tradingpost_Stage_4' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_5.Tradingpost_Stage_5' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_6.Tradingpost_Stage_6'),
+        ('/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_1.Tradingpost_Stage_1' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_2.Tradingpost_Stage_2' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_3.Tradingpost_Stage_3' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_4.Tradingpost_Stage_4' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_5.Tradingpost_Stage_5' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_6.Tradingpost_Stage_6'),
+        ...('/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_1.Tradingpost_Stage_1' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_2.Tradingpost_Stage_2' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_3.Tradingpost_Stage_3' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_4.Tradingpost_Stage_4' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_5.Tradingpost_Stage_5' | '/Game/FactoryGame/Buildable/Factory/TradingPost/Mesh/Tradingpost_Stage_6.Tradingpost_Stage_6')[]
+    ];
+    mNeedPlayingBuildEffectNotification: boolean__type;
 };
 export type mOutputInventoryHandlerData__type = empty_object__type;
-export type mSnappedPassthroughs__type = '';
-export type weaponState__type = 'EWS_Unequipped';

package/lib/DataDiscovery/JsonSchema/AllOf.d.ts

@@ -0,0 +1,13 @@
+import { ConverterMatchesSchema, ExpressionResult } from '../Generator';
+import { DataDiscovery } from '../../DataDiscovery';
+import { SchemaObject } from 'ajv/dist/2020';
+type allOf = {
+    allOf: [SchemaObject, ...SchemaObject[]];
+};
+export declare class AllOfConverter extends ConverterMatchesSchema<allOf> {
+    private readonly discovery;
+    constructor(discovery: DataDiscovery);
+    can_convert_schema_and_raw_data(schema: SchemaObject, raw_data: unknown): Promise<boolean>;
+    convert(schema: allOf, raw_data: unknown): Promise<ExpressionResult>;
+}
+export {};

package/lib/DataDiscovery/JsonSchema/AllOf.js

@@ -0,0 +1,74 @@
+import { Converter, ConverterMatchesSchema, } from '../Generator';
+import { NoMatchError, } from '../../Exceptions';
+const schema = {
+    type: 'object',
+    required: ['allOf'],
+    additionalProperties: false,
+    properties: {
+        allOf: {
+            type: 'array',
+            minItems: 1,
+            items: { type: 'object', minProperties: 1 },
+        },
+    },
+};
+export class AllOfConverter extends ConverterMatchesSchema {
+    discovery;
+    constructor(discovery) {
+        super(discovery.docs.ajv, schema);
+        this.discovery = discovery;
+    }
+    async can_convert_schema_and_raw_data(schema, raw_data) {
+        if (this.can_convert_schema(schema)) {
+            let response = true;
+            for (const entry of schema.allOf) {
+                if (!await Converter.has_matching_schema_and_raw_data(await this.discovery.candidates, entry, raw_data)) {
+                    response = false;
+                }
+                if (!response) {
+                    break;
+                }
+            }
+            return response;
+        }
+        return false;
+    }
+    async convert(schema, raw_data) {
+        const candidates = await this.discovery.candidates;
+        const failures = [];
+        for (const entry of schema.allOf) {
+            const converter = await Converter.has_matching_schema_and_raw_data(candidates, entry, raw_data);
+            if (converter
+                && await converter.can_convert_schema_and_raw_data(entry, raw_data)) {
+                try {
+                    return await converter.convert(entry, raw_data);
+                }
+                catch (err) {
+                    if (err instanceof NoMatchError) {
+                        failures.push(err);
+                    }
+                    else {
+                        throw err;
+                    }
+                }
+            }
+        }
+        throw new NoMatchError({
+            schema,
+            raw_data,
+            failures,
+            allOf: await Promise.all(schema.allOf.map(async (e) => {
+                // eslint-disable-next-line max-len
+                const converter = await Converter.has_matching_schema_and_raw_data(candidates, e, raw_data);
+                return [
+                    e,
+                    converter,
+                    (converter
+                        // eslint-disable-next-line max-len
+                        ? await converter.can_convert_schema_and_raw_data(e, raw_data)
+                        : 'no converter'),
+                ];
+            })),
+        }, 'Unable to convert data!');
+    }
+}

package/lib/DataDiscovery/JsonSchema/Object.d.ts

@@ -44,6 +44,16 @@ declare abstract class ObjectConverterMatchesSchema<Schema extends SchemaObject,
     protected resolve_schema(schema: SchemaObject, depth?: number, is_common?: boolean): Promise<{
         [key: string]: SchemaObject;
     }>;
+    protected schema_is_allOf_$refs(maybe: unknown): maybe is {
+        allOf: [
+            {
+                $ref: local_ref<string> | common_ref<string>;
+            },
+            ...{
+                $ref: local_ref<string> | common_ref<string>;
+            }[]
+        ];
+    };
 }
 export declare class ObjectConverter extends ObjectConverterMatchesSchema<schema_type, {
     [key: string]: unknown;

package/lib/DataDiscovery/JsonSchema/Object.js

@@ -1,5 +1,5 @@
 import { Converter, ConverterMatchesSchema, ExpressionResult, } from '../Generator';
-import { is_string, object_has_property, value_is_non_array_object, } from '@satisfactory-dev/predicates.ts';
+import { is_string, object_has_property, object_only_has_that_property, value_is_non_array_object, } from '@satisfactory-dev/predicates.ts';
 import { NoMatchError, } from '../../Exceptions';
 import { pattern_properties_regex, } from '../../CustomParsingTypes/TypedString';
 class ObjectConverterMatchesSchema extends ConverterMatchesSchema {
@@ -37,6 +37,19 @@ class ObjectConverterMatchesSchema extends ConverterMatchesSchema {
     async resolve_converters(schema) {
         performance.mark(`${this.constructor.name}.resolve_converters() start`);
         const converters = {};
+        if (this.schema_is_allOf_$refs(schema)) {
+            for (const sub_schema of schema.allOf) {
+                const $ref_converters = Object.entries(sub_schema.$ref.startsWith('#/$defs/')
+                    ? await this.resolve_converters_for_$ref(sub_schema.$ref)
+                    : await this.resolve_converters_for_common_$ref(sub_schema.$ref));
+                for (const entry of $ref_converters) {
+                    const [property, converter] = entry;
+                    if (!(property in converters)) {
+                        converters[property] = converter;
+                    }
+                }
+            }
+        }
         if (object_has_property(schema, 'properties', (maybe) => {
             return (value_is_non_array_object(maybe)
                 && Object.values(maybe).every(e => value_is_non_array_object(e)));
@@ -87,6 +100,26 @@ class ObjectConverterMatchesSchema extends ConverterMatchesSchema {
             return this.already_resolved[json_string];
         }
         const resolved_schema = {};
+        if (this.schema_is_allOf_$refs(schema)) {
+            for (const allOf_schema_entry of schema.allOf) {
+                if (allOf_schema_entry.$ref.startsWith('#/$defs/')) {
+                    for (const entry of Object.entries(await this.resolve_schema(await this.discovery.docs.definition(is_common ? 'common' : this.discovery.version, allOf_schema_entry.$ref.substring(8)), depth + 1, is_common))) {
+                        const [property, sub_schema] = entry;
+                        if (!(property in resolved_schema)) {
+                            resolved_schema[property] = sub_schema;
+                        }
+                    }
+                }
+                else {
+                    for (const entry of Object.entries(await this.resolve_schema(await this.discovery.docs.definition_from_common(allOf_schema_entry.$ref.substring(26)), depth + 1, true))) {
+                        const [property, sub_schema] = entry;
+                        if (!(property in resolved_schema)) {
+                            resolved_schema[property] = sub_schema;
+                        }
+                    }
+                }
+            }
+        }
         if (object_has_property(schema, 'properties', (e) => {
             return (value_is_non_array_object(e)
                 && Object.values(e).every(value_is_non_array_object));
@@ -121,6 +154,18 @@ class ObjectConverterMatchesSchema extends ConverterMatchesSchema {
         this.already_resolved[json_string] = resolved_schema;
         return resolved_schema;
     }
+    schema_is_allOf_$refs(maybe) {
+        return object_has_property(maybe, 'allOf', (maybe) => {
+            return (Array.isArray(maybe)
+                && maybe.every((inner) => {
+                    return object_only_has_that_property(inner, '$ref', (maybe_inner) => {
+                        return (is_string(maybe_inner)
+                            && (maybe_inner.startsWith('#/$defs/')
+                                || maybe_inner.startsWith('common.schema.json#/$defs/')));
+                    });
+                }));
+        });
+    }
 }
 export class ObjectConverter extends ObjectConverterMatchesSchema {
     constructor(discovery) {
@@ -161,6 +206,7 @@ export class ObjectConverter extends ObjectConverterMatchesSchema {
                     converter: converters[property].constructor.name,
                     can_convert_schema: converters[property].can_convert_schema(sub_schema[property]),
                     value,
+                    has_sub_schema: !!sub_schema[property],
                     sub_schema: sub_schema[property],
                     instance: converters[property].constructor.name,
                     schema,

package/lib/DataDiscovery.js

@@ -12,6 +12,7 @@ import { Literal, } from './DataDiscovery/Literal';
 import { TypedStringConverter, } from './DataDiscovery/CustomTypes/TypedString';
 import { BasicStringConverter, ConstStringConverter, EnumStringConverter, PatternConverter, } from './DataDiscovery/JsonSchema/StringType';
 import { OneOfConverter, } from './DataDiscovery/JsonSchema/OneOf';
+import { AllOfConverter, } from './DataDiscovery/JsonSchema/AllOf';
 import { StringStartsWithConverter, } from './DataDiscovery/CustomTypes/StringStartsWith';
 import { UnrealEngineStringConverter, } from './DataDiscovery/CustomTypes/UnrealEngineString';
 import { Ref, } from './DataDiscovery/JsonSchema/Ref';
@@ -42,6 +43,7 @@ export class DataDiscovery extends FilesGenerator {
                 new PatternedObjectConverter(this),
                 new TypedStringConverter(this, $defs, common_$defs),
                 new OneOfConverter(this),
+                new AllOfConverter(this),
                 new Ref(this),
             ];
         });

package/lib/DocsSchema.d.ts

@@ -1,4 +1,4 @@
-import version_1_0_0_0_schema from '../schema/1.0.schema.json';
+import version_1_0_0_4_schema from '../schema/1.0.schema.json';
 import update8_schema from '../schema/update8.schema.json';
 import common_schema from '../schema/common.schema.json';
 export declare class DocsSchema<schema> {
@@ -16,7 +16,7 @@ declare class DocsSchemaByLanguageCode<en_US> {
 export declare class DocsSchemaByVersion {
     readonly common: DocsSchemaByLanguageCode<typeof common_schema>;
     readonly update8: DocsSchemaByLanguageCode<typeof update8_schema>;
-    readonly version_1_0_0_0: DocsSchemaByLanguageCode<typeof version_1_0_0_0_schema>;
+    readonly version_1_0_0_4: DocsSchemaByLanguageCode<typeof version_1_0_0_4_schema>;
     constructor();
 }
 export {};

package/lib/DocsSchema.js

@@ -1,4 +1,4 @@
-import version_1_0_0_0_schema from '../schema/1.0.schema.json' with {
+import version_1_0_0_4_schema from '../schema/1.0.schema.json' with {
     type: 'json'
 };
 import update8_schema from '../schema/update8.schema.json' with {
@@ -22,13 +22,13 @@ class DocsSchemaByLanguageCode {
 export class DocsSchemaByVersion {
     common;
     update8;
-    version_1_0_0_0;
+    version_1_0_0_4;
     constructor() {
         this.common = new DocsSchemaByLanguageCode({
             en_US: common_schema,
         });
-        this.version_1_0_0_0 = new DocsSchemaByLanguageCode({
-            en_US: version_1_0_0_0_schema,
+        this.version_1_0_0_4 = new DocsSchemaByLanguageCode({
+            en_US: version_1_0_0_4_schema,
         });
         this.update8 = new DocsSchemaByLanguageCode({
             en_US: update8_schema,