Fix Bugs With Option Parsing

jest.config.ts

@@ -8,4 +8,4 @@ const config: JestConfigWithTsJest = {
     injectGlobals: true,
 };
 
-export default config;
+export default config;

package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "fomod",
   "description": "A library for creating, parsing, editing, and validating XML-based Fomod installers, widely popularized in the Bethesda modding scene",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "main": "dist/index.js",
   "repository": "https://github.com/BellCubeDev/fomod-js/",
   "bugs": {

src/definitions/Dependencies.ts

@@ -158,14 +158,13 @@ export class FlagDependency extends Dependency {
     get desiredValue() { return this.flagInstance.usedValue; }
     set desiredValue(value: string|boolean) { this.flagInstance.usedValue = value; }
 
-    constructor()
-    constructor(flagName: string, desiredValue: string)
+    constructor(flagName?: string, desiredValue?: string)
     constructor(flagName: Option<boolean>, desiredValue: boolean)
     constructor(flagName: string|Option<boolean> = '', desiredValue: string|boolean = '') {
         super();
 
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        this.flagInstance = new FlagInstance(flagName as any ?? '', desiredValue as any, false);
+        this.flagInstance = new FlagInstance(flagName as any, desiredValue as any, false);
     }
 
     isValid() { return true; }

src/definitions/FlagInstance.ts

@@ -65,7 +65,7 @@ export class FlagInstance<TIsOption extends boolean, TWrite extends (TIsOption e
 
         document?: Document
     ) {
-        if (typeof name === 'string' && typeof usedValue !== 'string') throw new Error(`FlagInstance's 'usedValue' property must be a string when name is a string`);
+        if (typeof _name === 'string' && typeof usedValue !== 'string') throw new Error(`FlagInstance's 'usedValue' property must be a string when name is a string`);
         else if (_name instanceof Option && typeof usedValue !== 'boolean') throw new Error(`FlagInstance's 'usedValue' property must be a boolean when name is an Option`);
 
         this.usedValue = usedValue as TIsOption extends true ? boolean : string;

src/definitions/Group.ts

@@ -87,7 +87,7 @@ export class Group<TStrict extends boolean = true> extends XmlRepresentation<TSt
         const sortingOrder = optionsContainer.getAttribute('order');
         if (sortingOrder !== null) group.sortingOrder = sortingOrder;
 
-        for (const optionElement of optionsContainer.querySelectorAll('option')) {
+        for (const optionElement of optionsContainer.querySelectorAll('plugin')) {
             const option = Option.parse(optionElement);
             if (option !== null) group.options.add(option);
         }

src/definitions/Option.ts

@@ -29,7 +29,8 @@ export class Option<TStrict extends boolean = true> extends XmlRepresentation<TS
         public description: string = '',
         public image: string|null = null,
         public typeDescriptor: TypeDescriptor<TStrict> = new TypeDescriptor(),
-        public flagsToSet: Set<FlagSetter> = new Set()
+        public flagsToSet: Set<FlagSetter> = new Set(),
+        public installsToSet: InstallPattern = new InstallPattern(),
     ) {
         super();
     }
@@ -113,7 +114,7 @@ export class Option<TStrict extends boolean = true> extends XmlRepresentation<TS
         if (name === null) return null;
 
         const description = element.getElementsByTagName('description')[0]?.textContent ?? '';
-        const image = element.getElementsByTagName('image')[0]?.textContent ?? null;
+        const image = element.getElementsByTagName('image')[0]?.getAttribute('path') ?? null;
 
         const flagsToSet = new Set<FlagSetter>();
         const conditionFlags = element.getElementsByTagName('conditionFlags')[0];
@@ -143,6 +144,7 @@ export class Option<TStrict extends boolean = true> extends XmlRepresentation<TS
 
         const option = new Option<false>(name, description, image, typeDescriptor);
         option.flagsToSet = flagsToSet;
+        option.installsToSet = installsToSet;
 
         const dependencyOnThis = new FlagDependency(option, true);
         installsToSet.dependencies?.dependencies.add(dependencyOnThis);
@@ -448,7 +450,7 @@ export class TypeNameDescriptor<TTagName extends 'type'|'defaultType', TStrict e
 
     // Overwrite to handle the interchangeable `file` and `folder` tags
     override assignElement(element: Element) {
-        ensureXmlDoctype(document);
+        ensureXmlDoctype(element.ownerDocument);
 
         // @ts-ignore: The logic is fine but TypeScript can't figure it out
         if (!this.tagNameIsReadonly && (element.tagName === 'type' || element.tagName === 'defaultType')) this.tagName = element.tagName;

tests/definitions/Option.test.ts

@@ -1,4 +1,5 @@
 import { Option, OptionType, TypeDescriptor, TypeNameDescriptor } from "../../src";
+import { parseTag } from "../testUtils";
 
 describe('Basic Option', () => {
     const obj = new Option('apple', 'banana', 'someImage.png');
@@ -19,3 +20,24 @@ describe('Option With Type', () => {
     test('Type is Correct', () => expect(obj.typeDescriptor.defaultTypeNameDescriptor.targetType).toBe(OptionType.Required));
     test('Is Valid', () => expect(obj.isValid()).toBe(true));
 });
+
+describe('Parsing Option From Element #1', () => {
+    const doc = parseTag`<plugin name="lungs">
+        <description />
+        <image path="12345" />
+        <files />
+        <typeDescriptor>
+            <type name="CouldBeUsable" />
+        </typeDescriptor>
+    </plugin>`;
+
+    const obj = Option.parse(doc);
+
+    test('We Got An Option', () => expect(obj).toBeInstanceOf(Option));
+    test('Name Is Correct', () => expect(obj?.name).toBe('lungs'));
+    test('Description Is Correct', () => expect(obj?.description).toBe(''));
+    test('Image Is Correct', () => expect(obj?.image).toBe('12345'));
+    test('Default Type is Correct', () => expect(obj?.typeDescriptor.defaultTypeNameDescriptor.targetType).toBe(OptionType.CouldBeUsable));
+    test('Has No Installs', () => expect(obj?.installsToSet.filesWrapper.installs.size).toBe(0));
+    test('Is Valid', () => expect(obj?.isValid()).toBe(true));
+});