@wildboar/asn1-parser 2.7.1 → 2.7.3

package/dist/lib/resolve.mjs

@@ -1,7 +1,8 @@
 import {} from './constructs/Assignment.mjs';
 import TYPE_IDENTIFIER from './constructs/BuiltinClasses/TYPE-IDENTIFIER.mjs';
 import ABSTRACT_SYNTAX from './constructs/BuiltinClasses/ABSTRACT-SYNTAX.mjs';
-export default function resolve(def, currentModule, modulesInScope) {
+import { asn1ModuleOidMatch } from '../index.mjs';
+export default function resolve(def, currentModule, modulesInScope, tolerateModuleNameMismatch = false) {
     if (def.module === undefined && def.reference === 'TYPE-IDENTIFIER') {
         return TYPE_IDENTIFIER;
     }
@@ -18,7 +19,7 @@ export default function resolve(def, currentModule, modulesInScope) {
     }
     let assn = module_.assignments[def.reference];
     if (!assn) {
-        let moduleName = undefined;
+        let sfm = undefined;
         const importedModules = Object.values(module_.imports.modules);
         for (let m = 0; m < importedModules.length; m++) {
             const importedModule = importedModules[m];
@@ -26,18 +27,33 @@ export default function resolve(def, currentModule, modulesInScope) {
             for (let s = 0; s < importedSymbols.length; s++) {
                 const symbol = importedSymbols[s];
                 if (symbol === def.reference) {
-                    moduleName = importedModule.identifier;
+                    sfm = importedModule;
                     break;
                 }
             }
-            if (moduleName) {
+            if (sfm) {
                 break;
             }
         }
-        if (!moduleName) {
+        if (!sfm) {
             return undefined;
         }
-        module_ = modulesInScope.find((mod) => mod.name === moduleName);
+        const importoid = (tolerateModuleNameMismatch
+            && sfm.assignedIdentifier
+            && ("components" in sfm.assignedIdentifier)
+            && (!sfm.assignedIdentifier.prefix))
+            ? sfm
+                .assignedIdentifier
+                .components
+                .map((component) => ((("number" in component)
+                && (typeof component.number === "number"))
+                ? component.number
+                : -1))
+            : undefined;
+        module_ = modulesInScope.find((mod) => ((mod.name === sfm.identifier)
+            || (mod.oid
+                && importoid
+                && asn1ModuleOidMatch(mod.oid.map((n) => ("number" in n) ? n.number : -2), importoid, sfm.selectionOption))));
         if (!module_) {
             return undefined;
         }

package/dist/lib/resolve.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.mjs","sourceRoot":"","sources":["../../src/lib/resolve.mts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,MAAM,6BAA6B,CAAC;AAG9D,OAAO,eAAe,MAAM,iDAAiD,CAAC;AAC9E,OAAO,eAAe,MAAM,iDAAiD,CAAC;AAkB9E,MAAM,CAAC,OAAO,UAAU,OAAO,CAC7B,GAAY,EACZ,aAAqB,EACrB,cAAwB;IAExB,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,GAAG,CAAC,SAAS,KAAK,iBAAiB,EAAE,CAAC;QACpE,OAAO,eAAe,CAAC;IACzB,CAAC;IACD,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,GAAG,CAAC,SAAS,KAAK,iBAAiB,EAAE,CAAC;QACpE,OAAO,eAAe,CAAC;IACzB,CAAC;IACD,IAAI,OAAO,GAAuB,GAAG,CAAC,MAAM;QAC1C,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,GAAW,EAAW,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,MAAM,CAAC;QACxE,CAAC,CAAC,GAAG,CAAC,cAAc;YACpB,CAAC,CAAC,cAAc,CAAC,IAAI,CACjB,CAAC,GAAW,EAAW,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,cAAc,CAC1D;YACH,CAAC,CAAC,aAAa,CAAC;IAClB,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,IAAI,GAA2B,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAMtE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,IAAI,UAAU,GAAuB,SAAS,CAAC;QAG/C,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/D,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACxD,MAAM,cAAc,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;YAC/D,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACxD,MAAM,MAAM,GAAW,eAAe,CAAC,CAAC,CAAC,CAAC;gBAC1C,IAAI,MAAM,KAAK,GAAG,CAAC,SAAS,EAAE,CAAC;oBAC7B,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC;oBACvC,MAAM;gBACR,CAAC;YACH,CAAC;YACD,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM;YACR,CAAC;QACH,CAAC;QAED,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,GAAG,cAAc,CAAC,IAAI,CAC3B,CAAC,GAAW,EAAW,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,UAAU,CAClD,CAAC;QACF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,SAAS,CAAC;QACnB,CAAC;QAGD,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG;YACZ,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"resolve.mjs","sourceRoot":"","sources":["../../src/lib/resolve.mts"],"names":[],"mappings":"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"}

package/package.json

@@ -31,7 +31,7 @@
   "main": "./dist/libs/parser/src/index.mjs",
   "name": "@wildboar/asn1-parser",
   "types": "./dist/libs/parser/src/index.d.mts",
-  "version": "2.7.1",
+  "version": "2.7.3",
   "type": "module",
   "dependencies": {
     "dependency-graph": "^1.0.0"