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

package/lib/DocsTsGenerator.js

@@ -91,8 +91,8 @@ export class DocsTsGenerator {
         if ('update8' === version) {
             return this.schema_update8();
         }
-        else if ('version_1_0_0_0' === version) {
-            return this.schema_version_1_0_0_0();
+        else if ('version_1_0_0_4' === version) {
+            return this.schema_version_1_0_0_4();
         }
         else if ('common' === version) {
             return this.schema_common();
@@ -114,10 +114,10 @@ export class DocsTsGenerator {
         return schema;
     }
     // eslint-disable-next-line max-len
-    async schema_version_1_0_0_0() {
-        const schema = this.schema_data.version_1_0_0_0.en_US.schema;
+    async schema_version_1_0_0_4() {
+        const schema = this.schema_data.version_1_0_0_4.en_US.schema;
         // eslint-disable-next-line max-len
-        await this.validate_schema('version_1_0_0_0', schema);
+        await this.validate_schema('version_1_0_0_4', schema);
         return schema;
     }
     async load(version) {

package/lib/FilesGenerator.js

@@ -29,6 +29,9 @@ export function guess_filename(ref) {
     if (/^FG[A-Za-z]+([-_]{2,}[A-Za-z-_]+)?$/.test(ref)) {
         return `classes/CoreUObject/${ref.split(/[-_]{2,}/)[0]}.ts`;
     }
+    else if (/^common-base--FG[A-Za-z]+([-_]{2,}[A-Za-z-_]+)?$/.test(ref)) {
+        return `classes/CoreUObject/${ref.split(/[-_]{2,}/)[1]}.ts`;
+    }
     else if (ref.startsWith('NativeClass--')
         || ref.startsWith('EditorCurveData--')) {
         return 'classes/base.ts';

package/lib/TypeDefinitionDiscovery/JsonSchema/allOf.d.ts

@@ -0,0 +1,36 @@
+import { IntersectionTypeNode } from 'typescript';
+import { GeneratorDoesDiscovery } from '../GeneratorDoesDiscovery';
+import { TypeDefinitionDiscovery } from '../../TypeDefinitionDiscovery';
+type RawData = {
+    allOf: [
+        {
+            [key: string]: unknown;
+        },
+        ...{
+            [key: string]: unknown;
+        }[]
+    ];
+};
+export declare const schema: {
+    type: string;
+    required: string[];
+    additionalProperties: boolean;
+    properties: {
+        type: {
+            type: string;
+            const: string;
+        };
+        allOf: {
+            type: string;
+            minItems: number;
+            items: {
+                type: string;
+            };
+        };
+    };
+};
+export declare class allOf extends GeneratorDoesDiscovery<RawData, IntersectionTypeNode> {
+    constructor(discovery: TypeDefinitionDiscovery);
+    generate(): (raw_data: RawData) => IntersectionTypeNode;
+}
+export {};

package/lib/TypeDefinitionDiscovery/JsonSchema/allOf.js

@@ -0,0 +1,28 @@
+import ts from 'typescript';
+import { GeneratorDoesDiscovery, } from '../GeneratorDoesDiscovery';
+export const schema = {
+    type: 'object',
+    required: ['allOf'],
+    additionalProperties: false,
+    properties: {
+        type: { type: 'string', const: 'string' },
+        allOf: {
+            type: 'array',
+            minItems: 1,
+            items: { type: 'object' },
+        },
+    },
+};
+export class allOf extends GeneratorDoesDiscovery {
+    constructor(discovery) {
+        super(schema, discovery);
+    }
+    generate() {
+        return (raw_data) => {
+            const source = raw_data.allOf;
+            return ts.factory.createIntersectionTypeNode(source.map((e) => {
+                return this.discovery.find(e);
+            }));
+        };
+    }
+}

package/lib/TypeDefinitionWriter.js

@@ -5,6 +5,7 @@ import { ObjectType, } from './TypeDefinitionDiscovery/JsonSchema/ObjectType';
 import { ArrayType, } from './TypeDefinitionDiscovery/JsonSchema/ArrayType';
 import { ExtendsObject, } from './TypeDefinitionDiscovery/JsonSchema/Object/ExtendsObject';
 import { typed_string, } from './TypeDefinitionDiscovery/CustomParsingTypes/typed_string';
+import { allOf, } from './TypeDefinitionDiscovery/JsonSchema/allOf';
 import { oneOf_or_anyOf, } from './TypeDefinitionDiscovery/JsonSchema/oneOf_or_anyOf';
 import { glob, } from 'glob';
 import { object_has_property, require_non_empty_array, value_is_non_array_object, } from '@satisfactory-dev/predicates.ts';
@@ -245,7 +246,7 @@ export class TypeDefinitionWriter {
             if ('common' === this.version) {
                 discovered_types.push(...Object.keys(common_schema.$defs).map((e) => `#/$defs/${e}`).filter(maybe => !discovered_types.includes(maybe)));
             }
-            discovery.add_candidates(new ObjectType(discovery), new ArrayType(discovered_types, discovery), new ExtendsObject(discovered_types, Object.keys(common_schema.$defs).map(common_ref), discovery), new typed_string(discovered_types, Object.keys(common_schema.$defs).map(common_ref), discovery), new oneOf_or_anyOf(discovery));
+            discovery.add_candidates(new ObjectType(discovery), new ArrayType(discovered_types, discovery), new ExtendsObject(discovered_types, Object.keys(common_schema.$defs).map(common_ref), discovery), new typed_string(discovered_types, Object.keys(common_schema.$defs).map(common_ref), discovery), new oneOf_or_anyOf(discovery), new allOf(discovery));
         }
     }
     static can_class_have_tree(class_node) {

package/lib/TypesDiscovery.js

@@ -70,6 +70,7 @@ export class TypesDiscovery {
             new non_empty_array_property('prefixItems', schema),
             new non_empty_array_property('oneOf', schema),
             new non_empty_array_property('anyOf', schema),
+            new non_empty_array_property('allOf', schema),
             new non_array_object_property('items', schema),
             new properties(schema),
             new $ref(schema),

package/lib/helpers.js

@@ -24,7 +24,7 @@ export const docs = new DocsTsGenerator({
             cache_path: `${__dirname}/../data/common/`,
             UnrealEngineString_quote_mode: 'original',
         }),
-        version_1_0_0_0: new DocsTsGeneratorVersion({
+        version_1_0_0_4: new DocsTsGeneratorVersion({
             docs_path: `${__dirname}/../data/1.0/en-US.json`,
             cache_path: `${__dirname}/../data/1.0/`,
             UnrealEngineString_quote_mode: 'double',

package/package.json

@@ -38,5 +38,5 @@
     "typescript": "~5.5.2",
     "typescript-eslint": "^8.2.0"
   },
-  "version": "0.12.2"
+  "version": "0.13.1"
 }