Fixed a CJS circular reference issue

shockpkg · Sep 29, 2023 · d45948f · d45948f
1 parent 49094f8
commit d45948f
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 14 deletions.
diff --git a/spec/fixtures/hdiutil.plist b/spec/fixtures/hdiutil.plist
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>system-entities</key>
+	<array>
+		<dict>
+			<key>content-hint</key>
+			<string>Apple_APFS</string>
+			<key>dev-entry</key>
+			<string>/dev/disk6s1</string>
+			<key>potentially-mountable</key>
+			<false/>
+			<key>unmapped-content-hint</key>
+			<string>7C3457EF-0000-11AA-AA11-00306543ECAC</string>
+		</dict>
+		<dict>
+			<key>content-hint</key>
+			<string>GUID_partition_scheme</string>
+			<key>dev-entry</key>
+			<string>/dev/disk6</string>
+			<key>potentially-mountable</key>
+			<false/>
+			<key>unmapped-content-hint</key>
+			<string>GUID_partition_scheme</string>
+		</dict>
+		<dict>
+			<key>content-hint</key>
+			<string>EF57347C-0000-11AA-AA11-00306543ECAC</string>
+			<key>dev-entry</key>
+			<string>/dev/disk7</string>
+			<key>potentially-mountable</key>
+			<false/>
+			<key>unmapped-content-hint</key>
+			<string>EF57347C-0000-11AA-AA11-00306543ECAC</string>
+		</dict>
+		<dict>
+			<key>content-hint</key>
+			<string>41504653-0000-11AA-AA11-00306543ECAC</string>
+			<key>dev-entry</key>
+			<string>/dev/disk7s1</string>
+			<key>mount-point</key>
+			<string>/Volumes/test</string>
+			<key>potentially-mountable</key>
+			<true/>
+			<key>unmapped-content-hint</key>
+			<string>41504653-0000-11AA-AA11-00306543ECAC</string>
+			<key>volume-kind</key>
+			<string>apfs</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/src/plist.test.ts b/src/plist.test.ts
@@ -1,6 +1,7 @@
 /* eslint-disable max-nested-callbacks */
 import {describe, it} from 'node:test';
 import {ok, strictEqual, throws} from 'node:assert';
+import {readFile} from 'node:fs/promises';
 
 import {Plist} from './plist';
 import {ValueBoolean} from './value/boolean';
@@ -174,6 +175,15 @@ void describe('document', () => {
 					strictEqual(value.toXml(), new ValueBoolean(false).toXml());
 				}
 			});
+
+			void it('hdiutil', async () => {
+				const xml = await readFile(
+					'./spec/fixtures/hdiutil.plist',
+					'utf8'
+				);
+				const doc = new Plist();
+				doc.fromXml(xml);
+			});
 		});
 	});
 });
diff --git a/src/plist.ts b/src/plist.ts
@@ -1,7 +1,7 @@
 import {INDENT_ROOT, IToXmlOptions, NEWLINE_STRING} from './options';
 import {IElement, xmlDecode, xmlElementChildElements} from './util';
 import {Value} from './value';
-import {ValueArray} from './value/array';
+import {ValueDict} from './value/dict';
 
 const xmlDeclaration = '<?xml version="1.0" encoding="UTF-8"?>';
 const xmlDoctype =
@@ -130,7 +130,7 @@ export class Plist {
 	 * @returns Value element.
 	 */
 	public childFromXmlElement(element: IElement) {
-		const a = new ValueArray();
+		const a = new ValueDict();
 		return a.childFromXmlElement(element);
 	}
 

diff --git a/src/value/array.ts b/src/value/array.ts
@@ -2,7 +2,12 @@ import {INDENT_STRING, NEWLINE_STRING, IToXmlOptions} from '../options';
 import {IElement, assertXmlTagName, xmlElementChildElements} from '../util';
 import {Value} from '../value';
 
-import * as tags from './index';
+import {ValueBoolean} from './boolean';
+import {ValueData} from './data';
+import {ValueDict} from './dict';
+import {ValueInteger} from './integer';
+import {ValueReal} from './real';
+import {ValueString} from './string';
 
 let childTagNames: Readonly<Map<string, new () => Value>>;
 
@@ -28,11 +33,17 @@ export class ValueArray extends Value {
 	public static get CHILD_TAG_NAMES() {
 		if (!childTagNames) {
 			childTagNames = new Map();
-			for (const ValueType of Object.values(tags)) {
-				if (ValueType?.prototype instanceof Value) {
-					for (const t of ValueType.TAG_NAMES) {
-						childTagNames.set(t, ValueType);
-					}
+			for (const ValueType of [
+				ValueArray,
+				ValueBoolean,
+				ValueData,
+				ValueDict,
+				ValueInteger,
+				ValueReal,
+				ValueString
+			]) {
+				for (const t of ValueType.TAG_NAMES) {
+					childTagNames.set(t, ValueType);
 				}
 			}
 		}

diff --git a/src/value/dict.ts b/src/value/dict.ts
@@ -7,7 +7,12 @@ import {
 } from '../util';
 import {Value} from '../value';
 
-import * as tags from './index';
+import {ValueArray} from './array';
+import {ValueBoolean} from './boolean';
+import {ValueData} from './data';
+import {ValueInteger} from './integer';
+import {ValueReal} from './real';
+import {ValueString} from './string';
 
 let childTagNames: Readonly<Map<string, new () => Value>>;
 
@@ -33,11 +38,17 @@ export class ValueDict extends Value {
 	public static get CHILD_TAG_NAMES() {
 		if (!childTagNames) {
 			childTagNames = new Map();
-			for (const ValueType of Object.values(tags)) {
-				if (ValueType?.prototype instanceof Value) {
-					for (const t of ValueType.TAG_NAMES) {
-						childTagNames.set(t, ValueType);
-					}
+			for (const ValueType of [
+				ValueArray,
+				ValueBoolean,
+				ValueData,
+				ValueDict,
+				ValueInteger,
+				ValueReal,
+				ValueString
+			]) {
+				for (const t of ValueType.TAG_NAMES) {
+					childTagNames.set(t, ValueType);
 				}
 			}
 		}