@wildboar/asn1-parser 2.4.1 → 2.5.0

package/dist/lib/normalizers/translateDefinedSyntaxToDefaultSyntax.mjs

@@ -23,69 +23,25 @@ function convertSettingToToken(setting) {
         setting.value.valueType === ValueType.DefinedValue) {
         return setting.value.value.reference;
     }
-    // else if (("valueSet" in setting) && (setting.valueSet.)) {
-    // }
     else if ('object' in setting && 'reference' in setting.object) {
         return setting.object.reference;
     }
-    // else if (("objectSet" in setting)) {
-    // }
     else {
         return undefined;
     }
 }
-/**
- * @summary Translates object defined using `DefinedSyntax` into equivalent
- *  objects defined using `DefaultSyntax`.
- * @description
- * Objects defined with the default syntax are easier to work with, because the
- * settings can be queried as simple key-value pairs. For example, querying an
- * X.500 `ATTRIBUTE`'s `&Type` is a lot easier than navigating the defined
- * syntax to find the `&Type` parameter. Objects defined using the default
- * syntax are also easier for compilation; in most programming languages, they
- * can simply be represented as the language's native equivalent of an "object."
- *
- * This function recurses. If it encounters an `OptionalGroup` in the
- * `TokenOrGroupSpec`, it recurses, using that `OptionalGroup` as its own
- * independent `TokenOrGroupSpec[]`, and continuing to read tokens or settings
- * from where the parent recursion left off using this child recursion with
- * the `OptionalGroup`s subset of the syntax. At the end of the child
- * recursion, the settings that were picked up by the child recursion are
- * merged into the parent recursion's settings.
- *
- * @param {DefinedSyntax} obj The object that is to be translated to the
- *  default syntax.
- * @param {TokenOrGroupSpec[]} syntax The syntax used to define objects of the
- *  object class to which `obj` belongs.
- * @param {Module} currentModule The current ASN.1 module.
- * @returns {Array} A tuple whose first element is the `DefaultSyntax`
- *  constructed from that recursion, and whose second element is the number of
- *  tokens read
- * @function
- */
 export default function translateDefinedSyntaxToDefaultSyntax(obj, syntax, currentModule) {
-    let s = 0; // Our index into the syntax tokens.
-    let t = 0; // Our index into the object's tokens.
+    let s = 0;
+    let t = 0;
     const settings = {};
     while (t < obj.tokens.length) {
         const expected = syntax[s];
         const token = obj.tokens[t];
         if (typeof expected === 'string') {
             if (expected.startsWith('&')) {
-                // Expecting a field setting.
                 if (typeof token === 'string') {
-                    // We got a Literal when we were expecting a Setting.
-                    /**
-                     * We look for that token in the assignments of the current
-                     * module. If we find an assignment, we just replace that
-                     * token with a Defined* that points to it.
-                     */
                     if (token in currentModule.assignments) {
                         const assignment = currentModule.assignments[token];
-                        /**
-                         * Only a Type, ValueSet, or ObjectSet could be mistaken
-                         * for a Setting. ObjectClass cannot be a Setting.
-                         */
                         switch (assignment.assignmentType) {
                             case AssignmentType.TypeAssignment:
                             case AssignmentType.ValueSetTypeAssignment: {
@@ -102,7 +58,6 @@ export default function translateDefinedSyntaxToDefaultSyntax(obj, syntax, curre
                                 break;
                             }
                             case AssignmentType.ObjectSetAssignment: {
-                                // I don't know what to do in this case.
                                 throw new ASN1ParserExpectationError(`Failed to translate defined syntax in ${currentModule.name} using ObjectSetAssignment reference ${token} to default syntax: 6578ad9d-c5f5-4225-a7ff-7f47874e3e99`, obj.production, currentModule.name);
                             }
                             default: {
@@ -118,7 +73,6 @@ export default function translateDefinedSyntaxToDefaultSyntax(obj, syntax, curre
                     const upperCasedFieldName = isUpperCase(expected.charCodeAt(1));
                     if (upperCasedFieldName) {
                         if ('value' in token || 'object' in token) {
-                            // We parsed a value or object when we should have parsed a type, value set, or object set.
                             const lexemes = Array.from(lex(token.text)).filter((l) => l.type !== LexicalProductionType.comment);
                             const parsing = uppercasedFieldParser.start(lexemes, token.text);
                             if (!parsing.error &&
@@ -142,7 +96,6 @@ export default function translateDefinedSyntaxToDefaultSyntax(obj, syntax, curre
                     else if ('type' in token ||
                         'valueSet' in token ||
                         'objectSet' in token) {
-                        // We parsed a type, value set, or object set when we should have parsed a value or object.
                         const lexemes = Array.from(lex(token.text)).filter((l) => l.type !== LexicalProductionType.comment);
                         const parsing = lowercasedFieldParser.start(lexemes, token.text);
                         if (!parsing.error &&
@@ -169,18 +122,6 @@ export default function translateDefinedSyntaxToDefaultSyntax(obj, syntax, curre
                 }
             }
             else if (token !== expected) {
-                // Expecting a Literal.
-                /**
-                 * The token may have been misidentified as a "Setting" instead
-                 * of a "Literal" in some circumstances. Here, we "cast" the
-                 * setting to a Literal, then check if it still doesn't match.
-                 *
-                 * This "cast" was implemented because the X.400 specifications
-                 * use "MATCHING-RULE" as a keyword in defined syntax. Because
-                 * "MATCHING-RULE" was already imported as symbol, it was
-                 * guessed to be a reference to that symbol instead of a literal
-                 * at parsing-time.
-                 */
                 if (typeof token !== 'string') {
                     const tokenized = convertSettingToToken(token);
                     if (tokenized !== expected) {
@@ -193,7 +134,6 @@ export default function translateDefinedSyntaxToDefaultSyntax(obj, syntax, curre
             }
         }
         else if (typeof expected === 'object' && Array.isArray(expected)) {
-            // Expecting a group.
             const [results, tokensRead] = translateDefinedSyntaxToDefaultSyntax({ tokens: obj.tokens.slice(t) }, expected, currentModule);
             if (results) {
                 Object.assign(settings, results.fieldSettings);
@@ -203,7 +143,7 @@ export default function translateDefinedSyntaxToDefaultSyntax(obj, syntax, curre
             continue;
         }
         else if (typeof expected === 'undefined') {
-            break; // If we are at the end of the syntax list.
+            break;
         }
         else {
             throw new ASN1ParserExpectationError("Encountered some unexpected state while trying to translate defined syntax to default syntax", obj.production, currentModule.name);

package/dist/lib/normalizers/translateDefinedSyntaxToDefaultSyntax.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"translateDefinedSyntaxToDefaultSyntax.mjs","sourceRoot":"","sources":["../../../src/lib/normalizers/translateDefinedSyntaxToDefaultSyntax.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"translateDefinedSyntaxToDefaultSyntax.mjs","sourceRoot":"","sources":["../../../src/lib/normalizers/translateDefinedSyntaxToDefaultSyntax.mts"],"names":[],"mappings":"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"}

package/dist/lib/normalizers/unnest.d.mts

@@ -5,54 +5,8 @@ import type Parameter from '../constructs/Parameter.mjs';
 import type ObjectClassAssignment from '../constructs/AssignmentTypes/ObjectClassAssignment.mjs';
 import type ObjectSetAssignment from '../constructs/AssignmentTypes/ObjectSetAssignment.mjs';
 import { type Object_ } from '../constructs/AssignmentTypes/ObjectAssignment/Object.mjs';
-/**
- * @summary Unnest a type
- * @param {Type} type_ The type to be simplified by unnesting.
- * @param {Module} currentModule The current ASN.1 module.
- * @param {Module[]} modulesInScope All ASN.1 modules in scope.
- * @param {string} path The path of the thing to be unnested.
- * @param {Parameter[] | undefined} parameters The parameters of the assignment.
- * @function
- */
-export default function unnestType(type_: Type, currentModule: Module, modulesInScope: Module[], path: string[], // This can be used as a recursion counter.
-parameters?: Parameter[]): void;
-/**
- * @summary Unnest an object
- * @param {Object_} obj The information object to be simplified by unnesting.
- * @param {ObjectClassAssignment} oca The information object class of which
- *  `obj` is a member.
- * @param {Module} currentModule The current ASN.1 module.
- * @param {Module[]} modulesInScope All ASN.1 modules in scope.
- * @param {string} path The path of the thing to be unnested.
- * @param {Parameter[] | undefined} parameters The parameters of the assignment.
- * @function
- */
-export declare function unnestObject(// eslint-disable-line
-obj: Object_, oca: ObjectClassAssignment, currentModule: Module, modulesInScope: Module[], path: string[], // This can be used as a recursion counter.
-parameters?: Parameter[]): void;
-/**
- * @summary Unnest an information object from an information object set
- * @param {Object_} obj The information object to be simplified by unnesting.
- * @param {Defined} definedObjectClass A reference to the information object
- *  class of which `obj` is a member.
- * @param {Module} currentModule The current ASN.1 module.
- * @param {Module[]} modulesInScope All ASN.1 modules in scope.
- * @param {string} path The path of the thing to be unnested.
- * @param {Parameter[] | undefined} parameters The parameters of the assignment.
- * @function
- */
-export declare function unnestObjectFromObjectSet(// eslint-disable-line
-obj: Object_, definedObjectClass: Defined, currentModule: Module, modulesInScope: Module[], path: string[], // This can be used as a recursion counter.
-parameters?: Parameter[]): void;
-/**
- * @summary Unnest an information object from an information object set
- * @param {ObjectSetAssignment} osa The information object set assignment to be
- *  simplified by unnesting.
- * @param {Module} currentModule The current ASN.1 module.
- * @param {Module[]} modulesInScope All ASN.1 modules in scope.
- * @param {string} path The path of the thing to be unnested.
- * @param {Parameter[] | undefined} parameters The parameters of the assignment.
- * @function
- */
+export default function unnestType(type_: Type, currentModule: Module, modulesInScope: Module[], path: string[], parameters?: Parameter[]): void;
+export declare function unnestObject(obj: Object_, oca: ObjectClassAssignment, currentModule: Module, modulesInScope: Module[], path: string[], parameters?: Parameter[]): void;
+export declare function unnestObjectFromObjectSet(obj: Object_, definedObjectClass: Defined, currentModule: Module, modulesInScope: Module[], path: string[], parameters?: Parameter[]): void;
 export declare function unnestObjectSetAssignment(osa: ObjectSetAssignment, currentModule: Module, modulesInScope: Module[], path: string[]): void;
 //# sourceMappingURL=unnest.d.mts.map

package/dist/lib/normalizers/unnest.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"unnest.d.mts","sourceRoot":"","sources":["../../../src/lib/normalizers/unnest.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAInD,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AAErD,OAAO,KAAK,MAAM,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,SAAS,MAAM,6BAA6B,CAAC;AAMzD,OAAO,KAAK,qBAAqB,MAAM,yDAAyD,CAAC;AACjG,OAAO,KAAK,mBAAmB,MAAM,uDAAuD,CAAC;AAC7F,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,2DAA2D,CAAC;AAggBzF;;;;;;;;GAQG;AACH,MAAM,CAAC,OAAO,UAAU,UAAU,CAChC,KAAK,EAAE,IAAI,EACX,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,EAAE,EACxB,IAAI,EAAE,MAAM,EAAE,EAAE,2CAA2C;AAC3D,UAAU,CAAC,EAAE,SAAS,EAAE,GACvB,IAAI,CAoFN;AAQD;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAE,sBAAsB;AAClD,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,qBAAqB,EAC1B,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,EAAE,EACxB,IAAI,EAAE,MAAM,EAAE,EAAE,2CAA2C;AAC3D,UAAU,CAAC,EAAE,SAAS,EAAE,GACvB,IAAI,CAgFN;AAsBD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CAAE,sBAAsB;AAC/D,GAAG,EAAE,OAAO,EACZ,kBAAkB,EAAE,OAAO,EAC3B,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,EAAE,EACxB,IAAI,EAAE,MAAM,EAAE,EAAE,2CAA2C;AAC3D,UAAU,CAAC,EAAE,SAAS,EAAE,GACvB,IAAI,CAyBN;AAED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,mBAAmB,EACxB,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,EAAE,EACxB,IAAI,EAAE,MAAM,EAAE,GACb,IAAI,CAuEN"}
+{"version":3,"file":"unnest.d.mts","sourceRoot":"","sources":["../../../src/lib/normalizers/unnest.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAInD,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AAErD,OAAO,KAAK,MAAM,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,SAAS,MAAM,6BAA6B,CAAC;AAMzD,OAAO,KAAK,qBAAqB,MAAM,yDAAyD,CAAC;AACjG,OAAO,KAAK,mBAAmB,MAAM,uDAAuD,CAAC;AAC7F,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,2DAA2D,CAAC;AAygBzF,MAAM,CAAC,OAAO,UAAU,UAAU,CAChC,KAAK,EAAE,IAAI,EACX,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,EAAE,EACxB,IAAI,EAAE,MAAM,EAAE,EACd,UAAU,CAAC,EAAE,SAAS,EAAE,GACvB,IAAI,CAoFN;AAmBD,wBAAgB,YAAY,CAC1B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,qBAAqB,EAC1B,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,EAAE,EACxB,IAAI,EAAE,MAAM,EAAE,EACd,UAAU,CAAC,EAAE,SAAS,EAAE,GACvB,IAAI,CAgFN;AAiCD,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,OAAO,EACZ,kBAAkB,EAAE,OAAO,EAC3B,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,EAAE,EACxB,IAAI,EAAE,MAAM,EAAE,EACd,UAAU,CAAC,EAAE,SAAS,EAAE,GACvB,IAAI,CAyBN;AAYD,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,mBAAmB,EACxB,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,EAAE,EACxB,IAAI,EAAE,MAAM,EAAE,GACb,IAAI,CAuEN"}

package/dist/lib/normalizers/unnest.mjs

@@ -8,33 +8,19 @@ import normalizeObjectAssignment from './Assignment/ObjectAssignment.mjs';
 import {} from '../constructs/AssignmentTypes/ObjectAssignment/Object.mjs';
 import FieldSpecType from '../constructs/FieldSpecType.mjs';
 import ASN1ParserExpectationError from '../errors/ASN1ParserExpectationError.mjs';
-/**
- * @summary Unnest a `BIT STRING` type with a named bit list
- * @param {Type} type_ The type to be simplified by unnesting.
- * @param {Module} currentModule The current ASN.1 module.
- * @param {Module[]} modulesInScope All ASN.1 modules in scope.
- * @param {string} path The path of the thing to be unnested.
- * @param {Parameter[] | undefined} parameters The parameters of the assignment.
- * @function
- */
-function unnestBitStringType(type_, currentModule, modulesInScope, path, // This can be used as a recursion counter.
-parameters) {
+function unnestBitStringType(type_, currentModule, modulesInScope, path, parameters) {
     if (type_.typeType !== TypeType.BitStringType) {
         throw new ASN1ParserExpectationError(`Call to ${unnestBitStringType.name}() using type ${type_.typeType}.`, type_.production, currentModule.name);
     }
     if (!type_.type.namedBitList) {
         return;
     }
-    /**
-     * We only unnest if the path length is greater than one. If we did not,
-     * root-level constructed types would attempt to unnest themselves!
-     */
     if (path.length <= 1) {
         return;
     }
     const newPath = path.join('-');
     if (newPath in currentModule.assignments) {
-        return; // Completely abort unnesting so we don't wreck something.
+        return;
     }
     const typeParams = parameters?.filter((param) => param.assignmentType === AssignmentType.TypeAssignment);
     const newAssignment = {
@@ -63,33 +49,19 @@ parameters) {
     delete type_.type.selfContained;
     normalizeTypeAssignment(newAssignment, currentModule, modulesInScope);
 }
-/**
- * @summary Unnest an `INTEGER` type with a named number list
- * @param {Type} type_ The type to be simplified by unnesting.
- * @param {Module} currentModule The current ASN.1 module.
- * @param {Module[]} modulesInScope All ASN.1 modules in scope.
- * @param {string} path The path of the thing to be unnested.
- * @param {Parameter[] | undefined} parameters The parameters of the assignment.
- * @function
- */
-function unnestIntegerType(type_, currentModule, modulesInScope, path, // This can be used as a recursion counter.
-parameters) {
+function unnestIntegerType(type_, currentModule, modulesInScope, path, parameters) {
     if (type_.typeType !== TypeType.IntegerType) {
         throw new ASN1ParserExpectationError(`Call to ${unnestIntegerType.name}() using type ${type_.typeType}.`, type_.production, currentModule.name);
     }
     if (!type_.type.namedNumberList) {
         return;
     }
-    /**
-     * We only unnest if the path length is greater than one. If we did not,
-     * root-level constructed types would attempt to unnest themselves!
-     */
     if (path.length <= 1) {
         return;
     }
     const newPath = path.join('-');
     if (newPath in currentModule.assignments) {
-        return; // Completely abort unnesting so we don't wreck something.
+        return;
     }
     const typeParams = parameters?.filter((param) => param.assignmentType === AssignmentType.TypeAssignment);
     const newAssignment = {
@@ -118,30 +90,16 @@ parameters) {
     delete type_.type.selfContained;
     normalizeTypeAssignment(newAssignment, currentModule, modulesInScope);
 }
-/**
- * @summary Unnest an `ENUMERATED` type
- * @param {Type} type_ The type to be simplified by unnesting.
- * @param {Module} currentModule The current ASN.1 module.
- * @param {Module[]} modulesInScope All ASN.1 modules in scope.
- * @param {string} path The path of the thing to be unnested.
- * @param {Parameter[] | undefined} parameters The parameters of the assignment.
- * @function
- */
-function unnestEnumeratedType(type_, currentModule, modulesInScope, path, // This can be used as a recursion counter.
-parameters) {
+function unnestEnumeratedType(type_, currentModule, modulesInScope, path, parameters) {
     if (type_.typeType !== TypeType.EnumeratedType) {
         throw new ASN1ParserExpectationError(`Call to ${unnestEnumeratedType.name}() using type ${type_.typeType}.`, type_.production, currentModule.name);
     }
-    /**
-     * We only unnest if the path length is greater than one. If we did not,
-     * root-level constructed types would attempt to unnest themselves!
-     */
     if (path.length <= 1) {
         return;
     }
     const newPath = path.join('-');
     if (newPath in currentModule.assignments) {
-        return; // Completely abort unnesting so we don't wreck something.
+        return;
     }
     const typeParams = parameters?.filter((param) => param.assignmentType === AssignmentType.TypeAssignment);
     const newAssignment = {
@@ -173,17 +131,7 @@ parameters) {
     delete type_.type.selfContained;
     normalizeTypeAssignment(newAssignment, currentModule, modulesInScope);
 }
-/**
- * @summary Unnest a `SET` or `SEQUENCE` type
- * @param {Type} type_ The type to be simplified by unnesting.
- * @param {Module} currentModule The current ASN.1 module.
- * @param {Module[]} modulesInScope All ASN.1 modules in scope.
- * @param {string} path The path of the thing to be unnested.
- * @param {Parameter[] | undefined} parameters The parameters of the assignment.
- * @function
- */
-function unnestSetOrSequenceType(type_, currentModule, modulesInScope, path, // This can be used as a recursion counter.
-parameters) {
+function unnestSetOrSequenceType(type_, currentModule, modulesInScope, path, parameters) {
     if (type_.typeType !== TypeType.SetType &&
         type_.typeType !== TypeType.SequenceType) {
         throw new ASN1ParserExpectationError(`Call to unnestSetOrSequenceType() using type ${type_.typeType}.`, type_.production, currentModule.name);
@@ -194,7 +142,6 @@ parameters) {
         if ('componentsOf' in ct) {
             return;
         }
-        // eslint-disable-next-line
         unnestType(ct.namedType.type, currentModule, modulesInScope, path.concat([ct.namedType.identifier]), parameters);
     });
     (type_.type.extensionAdditionList || []).forEach((ea) => {
@@ -206,25 +153,19 @@ parameters) {
                 if ('componentsOf' in ct) {
                     return;
                 }
-                // eslint-disable-next-line
                 unnestType(ct.namedType.type, currentModule, modulesInScope, path.concat([ct.namedType.identifier]), parameters);
             });
         }
         else {
-            // eslint-disable-next-line
             unnestType(ea.namedType.type, currentModule, modulesInScope, path.concat([ea.namedType.identifier]), parameters);
         }
     });
-    /**
-     * We only unnest if the path length is greater than one. If we did not,
-     * root-level constructed types would attempt to unnest themselves!
-     */
     if (path.length <= 1) {
         return;
     }
     const newPath = path.join('-');
     if (newPath in currentModule.assignments) {
-        return; // Completely abort unnesting so we don't wreck something.
+        return;
     }
     const typeParams = parameters?.filter((param) => param.assignmentType === AssignmentType.TypeAssignment);
     const newAssignment = {
@@ -258,46 +199,29 @@ parameters) {
     delete type_.type.hasOptionalRootComponentTypes;
     normalizeTypeAssignment(newAssignment, currentModule, modulesInScope);
 }
-/**
- * @summary Unnest a `CHOICE` type
- * @param {Type} type_ The type to be simplified by unnesting.
- * @param {Module} currentModule The current ASN.1 module.
- * @param {Module[]} modulesInScope All ASN.1 modules in scope.
- * @param {string} path The path of the thing to be unnested.
- * @param {Parameter[] | undefined} parameters The parameters of the assignment.
- * @function
- */
-function unnestChoiceType(type_, currentModule, modulesInScope, path, // This can be used as a recursion counter.
-parameters) {
+function unnestChoiceType(type_, currentModule, modulesInScope, path, parameters) {
     if (type_.typeType !== TypeType.ChoiceType) {
         throw new ASN1ParserExpectationError(`Call to unnestChoiceType() using type ${type_.typeType}.`, type_.production, currentModule.name);
     }
     type_.type.rootAlternativeTypeList.forEach((nt) => {
-        // eslint-disable-next-line
         unnestType(nt.type, currentModule, modulesInScope, path.concat([nt.identifier]), parameters);
     });
     (type_.type.extensionAdditionAlternatives || []).forEach((eat) => {
         if ('alternativeTypeList' in eat) {
             eat.alternativeTypeList.forEach((nt) => {
-                // eslint-disable-next-line
                 unnestType(nt.type, currentModule, modulesInScope, path.concat([nt.identifier]), parameters);
             });
         }
         else {
-            // eslint-disable-next-line
             unnestType(eat.type, currentModule, modulesInScope, path.concat([eat.identifier]), parameters);
         }
     });
-    /**
-     * We only unnest if the path length is greater than one. If we did not,
-     * root-level constructed types would attempt to unnest themselves!
-     */
     if (path.length <= 1) {
         return;
     }
     const newPath = path.join('-');
     if (newPath in currentModule.assignments) {
-        return; // Completely abort unnesting so we don't wreck something.
+        return;
     }
     const typeParams = parameters?.filter((param) => param.assignmentType === AssignmentType.TypeAssignment);
     const newAssignment = {
@@ -328,17 +252,7 @@ parameters) {
     delete type_.type.extensionAdditionAlternatives;
     normalizeTypeAssignment(newAssignment, currentModule, modulesInScope);
 }
-/**
- * @summary Unnest a `SET OF` or `SEQUENCE OF` type
- * @param {Type} type_ The type to be simplified by unnesting.
- * @param {Module} currentModule The current ASN.1 module.
- * @param {Module[]} modulesInScope All ASN.1 modules in scope.
- * @param {string} path The path of the thing to be unnested.
- * @param {Parameter[] | undefined} parameters The parameters of the assignment.
- * @function
- */
-function unnestSetOrSequenceOfType(type_, currentModule, modulesInScope, path, // This can be used as a recursion counter.
-parameters) {
+function unnestSetOrSequenceOfType(type_, currentModule, modulesInScope, path, parameters) {
     if (type_.typeType !== TypeType.SetOfType &&
         type_.typeType !== TypeType.SequenceOfType) {
         throw new ASN1ParserExpectationError(`Call to unnestSetOrSequenceOfType() using type ${type_.typeType}.`, type_.production, currentModule.name);
@@ -347,17 +261,15 @@ parameters) {
     path = path.concat([
         'identifier' in type_.type.of ? type_.type.of.identifier : 'Item',
     ]);
-    // eslint-disable-next-line
     unnestType(t, currentModule, modulesInScope, path, parameters);
     if (t.typeType !== TypeType.SetType &&
         t.typeType !== TypeType.SequenceType &&
         t.typeType !== TypeType.ChoiceType) {
-        // If it is not one of these, we do not have to unnest it.
         return;
     }
     const newPath = path.join('-');
     if (newPath in currentModule.assignments) {
-        return; // Completely abort unnesting so we don't wreck something.
+        return;
     }
     const typeParams = parameters?.filter((param) => param.assignmentType === AssignmentType.TypeAssignment);
     const newAssignment = {
@@ -382,20 +294,9 @@ parameters) {
         assignmentType: AssignmentType.TypeAssignment,
         computedModule: currentModule.name,
     };
-    // REVIEW: Aren't there extra properties here?
     normalizeTypeAssignment(newAssignment, currentModule, modulesInScope);
 }
-/**
- * @summary Unnest a type
- * @param {Type} type_ The type to be simplified by unnesting.
- * @param {Module} currentModule The current ASN.1 module.
- * @param {Module[]} modulesInScope All ASN.1 modules in scope.
- * @param {string} path The path of the thing to be unnested.
- * @param {Parameter[] | undefined} parameters The parameters of the assignment.
- * @function
- */
-export default function unnestType(type_, currentModule, modulesInScope, path, // This can be used as a recursion counter.
-parameters) {
+export default function unnestType(type_, currentModule, modulesInScope, path, parameters) {
     if (path.length > 20) {
         throw new ASN1ParserExpectationError(`Unnesting exceeded recursion limits. Path started with '${path[0]}'.`, type_.production, currentModule.name);
     }
@@ -426,21 +327,8 @@ parameters) {
             unnestSetOrSequenceOfType(type_, currentModule, modulesInScope, path, parameters);
             break;
         }
-        // Commented out because this should never really contain anything other
-        // than a DefinedType, ObjectClassFieldType, or TypeFromObjects.
-        // It is pointless for it to reference a hard-coded CHOICE or PrefixedType.
-        // case (TypeType.SelectionType): {
-        //     unnest(
-        //         type_.type.type,
-        //         currentModule,
-        //         path.concat([ type_.type.identifier ]),
-        //     );
-        //     break;
-        // }
         case TypeType.PrefixedType: {
-            unnestType(type_.type, currentModule, modulesInScope, path
-            // FIXME: I think this needs parameters
-            );
+            unnestType(type_.type, currentModule, modulesInScope, path);
             break;
         }
         default: {
@@ -448,25 +336,7 @@ parameters) {
         }
     }
 }
-// Object ::=
-//     DefinedObject
-//     | ObjectDefn
-//     | ObjectFromObject
-//     | ParameterizedObject
-/**
- * @summary Unnest an object
- * @param {Object_} obj The information object to be simplified by unnesting.
- * @param {ObjectClassAssignment} oca The information object class of which
- *  `obj` is a member.
- * @param {Module} currentModule The current ASN.1 module.
- * @param {Module[]} modulesInScope All ASN.1 modules in scope.
- * @param {string} path The path of the thing to be unnested.
- * @param {Parameter[] | undefined} parameters The parameters of the assignment.
- * @function
- */
-export function unnestObject(// eslint-disable-line
-obj, oca, currentModule, modulesInScope, path, // This can be used as a recursion counter.
-parameters) {
+export function unnestObject(obj, oca, currentModule, modulesInScope, path, parameters) {
     if ('reference' in obj ||
         'referencedObjects' in obj ||
         ('tokens' in obj) ||
@@ -478,12 +348,11 @@ parameters) {
         const spec = specs[name];
         switch (spec.specType) {
             case FieldSpecType.ObjectFieldSpec: {
-                // The setting is an ObjectDefn.
                 if ('object' in setting &&
                     (('fieldSettings' in setting.object) || ('tokens' in setting.object))) {
                     const newPath = [...path, name.replace('&', '')].join('-');
                     if (newPath in currentModule.assignments) {
-                        return; // Completely abort unnesting so we don't wreck something.
+                        return;
                     }
                     const typeParams = parameters?.filter((p) => p.assignmentType === AssignmentType.TypeAssignment);
                     const newAssignment = {
@@ -526,39 +395,10 @@ parameters) {
         }
     });
 }
-// ObjectSetElements ::=
-//     Object
-//     | DefinedObjectSet
-//     | ObjectSetFromObjects
-//     | ParameterizedObjectSet
-// Object ::=
-//     DefinedObject
-//     | ObjectDefn
-//     | ObjectFromObject
-//     | ParameterizedObject
-// This is what this unnests:
-// ObjectDefn ::=
-//     DefaultSyntax
-//     | DefinedSyntax
-// type ObjectSetElements = (Object_ | Defined | SomethingFromObject);
-// export default ObjectSetElements;
-/**
- * @summary Unnest an information object from an information object set
- * @param {Object_} obj The information object to be simplified by unnesting.
- * @param {Defined} definedObjectClass A reference to the information object
- *  class of which `obj` is a member.
- * @param {Module} currentModule The current ASN.1 module.
- * @param {Module[]} modulesInScope All ASN.1 modules in scope.
- * @param {string} path The path of the thing to be unnested.
- * @param {Parameter[] | undefined} parameters The parameters of the assignment.
- * @function
- */
-export function unnestObjectFromObjectSet(// eslint-disable-line
-obj, definedObjectClass, currentModule, modulesInScope, path, // This can be used as a recursion counter.
-parameters) {
+export function unnestObjectFromObjectSet(obj, definedObjectClass, currentModule, modulesInScope, path, parameters) {
     const newPath = path.join('-');
     if (newPath in currentModule.assignments) {
-        return; // Completely abort unnesting so we don't wreck something.
+        return;
     }
     const typeParams = parameters?.filter((p) => p.assignmentType === AssignmentType.TypeAssignment);
     const newAssignment = {
@@ -579,16 +419,6 @@ parameters) {
     currentModule.assignments[newPath] = newAssignment;
     normalizeObjectAssignment(newAssignment, currentModule, modulesInScope);
 }
-/**
- * @summary Unnest an information object from an information object set
- * @param {ObjectSetAssignment} osa The information object set assignment to be
- *  simplified by unnesting.
- * @param {Module} currentModule The current ASN.1 module.
- * @param {Module[]} modulesInScope All ASN.1 modules in scope.
- * @param {string} path The path of the thing to be unnested.
- * @param {Parameter[] | undefined} parameters The parameters of the assignment.
- * @function
- */
 export function unnestObjectSetAssignment(osa, currentModule, modulesInScope, path) {
     const ress = osa.objectSetSpec.rootElementSetSpec;
     const aess = osa.objectSetSpec.additionalElementSetSpec;
@@ -604,7 +434,6 @@ export function unnestObjectSetAssignment(osa, currentModule, modulesInScope, pa
             ess.unions.forEach((union, unionIndex) => union.intersections.forEach((intersection, intersectionIndex) => {
                 if (('tokens' in intersection.elements) ||
                     ('fieldSettings' in intersection.elements)) {
-                    // DefinedSyntax or DefaultSyntax
                     const obj = intersection.elements;
                     const newPath = [
                         ...path,
@@ -619,7 +448,7 @@ export function unnestObjectSetAssignment(osa, currentModule, modulesInScope, pa
                         assignmentType: AssignmentType.ObjectAssignment,
                     };
                 }
-                if (intersection.exclusions && // DefinedSyntax or DefaultSyntax
+                if (intersection.exclusions &&
                     (Array.isArray(intersection.exclusions) ||
                         'fieldSettings' in intersection.exclusions)) {
                     const obj = intersection.exclusions;