asn1-ts 9.0.3 → 11.0.0

package/dist/types/ObjectIdentifier.d.mts

@@ -1,8 +1,7 @@
-import type { Buffer } from "node:buffer";
+import { Buffer } from "node:buffer";
 export default class ObjectIdentifier {
-    private _nodes;
-    constructor(nodes: number[], prefix?: ObjectIdentifier | number);
-    get uint32ArrayRef(): Uint32Array;
+    protected encoding: Uint8Array;
+    static fromParts(nodes: number[], prefix?: ObjectIdentifier | number): ObjectIdentifier;
     get nodes(): number[];
     get dotDelimitedNotation(): string;
     get asn1Notation(): string;
@@ -11,6 +10,7 @@ export default class ObjectIdentifier {
     toBytes(): Buffer;
     static fromString(str: string): ObjectIdentifier;
     static fromBytes(bytes: Uint8Array): ObjectIdentifier;
+    static fromBytesUnsafe(bytes: Uint8Array): ObjectIdentifier;
     static compare(a: ObjectIdentifier, b: ObjectIdentifier): boolean;
     isEqualTo(other: ObjectIdentifier): boolean;
 }

package/dist/types/ObjectIdentifier.mjs

@@ -1,36 +1,52 @@
-import decodeObjectIdentifier from "../codecs/x690/decoders/decodeObjectIdentifier.mjs";
-import encodeObjectIdentifier from "../codecs/x690/encoders/encodeObjectIdentifier.mjs";
+import encodeRelativeObjectIdentifier from "../codecs/x690/encoders/encodeRelativeObjectIdentifier.mjs";
+import decodeRelativeObjectIdentifier from "../codecs/x690/decoders/decodeRelativeObjectIdentifier.mjs";
+import { Buffer } from "node:buffer";
+import * as errors from "../errors.mjs";
 const PERIOD = ".".charCodeAt(0);
 export default class ObjectIdentifier {
-    constructor(nodes, prefix) {
-        const _nodes = prefix
-            ? typeof prefix === "number"
-                ? [prefix, ...nodes]
-                : [...prefix.nodes, ...nodes]
-            : nodes.slice(0);
-        if (_nodes.length < 2) {
-            throw new Error("Cannot construct an OID with less than two nodes!");
+    constructor() {
+        this.encoding = new Uint8Array(0);
+    }
+    static fromParts(nodes, prefix) {
+        let _nodes = typeof prefix === "number" ? [prefix, ...nodes] : nodes;
+        if (!prefix || typeof prefix === "number") {
+            if (_nodes.length < 2) {
+                throw new Error("Cannot construct an OID with less than two nodes!");
+            }
+            if ((_nodes[0] < 0) || (_nodes[0] > 2)) {
+                throw new Error("OIDs first node must be 0, 1, or 2!");
+            }
+            if (((_nodes[0] < 2) && (_nodes[1] > 39))) {
+                throw new Error(`OID Node #2 cannot exceed 39 if node #1 is 0 or 1. Received these nodes: ${_nodes}.`);
+            }
         }
-        if ((_nodes[0] < 0) || (_nodes[0] > 2)) {
-            throw new Error("OIDs first node must be 0, 1, or 2!");
+        const oid = new ObjectIdentifier();
+        if (prefix && typeof prefix !== "number") {
+            oid.encoding = Buffer.concat([prefix.encoding, encodeRelativeObjectIdentifier(_nodes)]);
         }
-        if (((_nodes[0] < 2) && (_nodes[1] > 39)) || (_nodes[1] > 175)) {
-            throw new Error("OID Node #2 cannot exceed 39 if node #1 is 0 or 1, and 175 "
-                + `if node #1 is 2. Received these nodes: ${_nodes}.`);
+        else {
+            oid.encoding = encodeRelativeObjectIdentifier([
+                (_nodes[0] * 40) + _nodes[1],
+                ..._nodes.slice(2),
+            ]);
         }
-        this._nodes = new Uint32Array(_nodes);
-    }
-    get uint32ArrayRef() {
-        return this._nodes;
+        return oid;
     }
     get nodes() {
-        return Array.from(this._nodes);
+        const subcomponents = decodeRelativeObjectIdentifier(this.encoding);
+        return [
+            Math.min(2, Math.floor(subcomponents[0] / 40)),
+            ((subcomponents[0] >= 80)
+                ? (subcomponents[0] - 80)
+                : (subcomponents[0] % 40)),
+            ...subcomponents.slice(1),
+        ];
     }
     get dotDelimitedNotation() {
-        return this._nodes.join(".");
+        return this.nodes.join(".");
     }
     get asn1Notation() {
-        return `{ ${Array.from(this._nodes).map((node) => node.toString()).join(" ")} }`;
+        return `{ ${Array.from(this.nodes).map((node) => node.toString()).join(" ")} }`;
     }
     toString() {
         return this.dotDelimitedNotation;
@@ -39,7 +55,7 @@ export default class ObjectIdentifier {
         return this.dotDelimitedNotation;
     }
     toBytes() {
-        return encodeObjectIdentifier(this);
+        return Buffer.from(this.encoding);
     }
     static fromString(str) {
         const arcs = [];
@@ -55,24 +71,39 @@ export default class ObjectIdentifier {
         }
         const arc = Number.parseInt(str.slice(last, i), 10);
         arcs.push(arc);
-        return new ObjectIdentifier(arcs);
+        return ObjectIdentifier.fromParts(arcs);
     }
     static fromBytes(bytes) {
-        return decodeObjectIdentifier(bytes);
-    }
-    static compare(a, b) {
-        if (a._nodes.length !== b._nodes.length) {
-            return false;
+        if (bytes.length === 0) {
+            throw new errors.ASN1TruncationError("Encoded value was too short to be an OBJECT IDENTIFIER!");
         }
-        const len = a._nodes.length;
-        let i = len - 1;
-        while (i >= 0) {
-            if (a._nodes[i] !== b._nodes[i]) {
-                return false;
+        if (bytes[bytes.length - 1] & 0b10000000) {
+            throw new errors.ASN1TruncationError("OID was truncated.");
+        }
+        let current_node = 0;
+        for (let i = 1; i < bytes.length; i++) {
+            const byte = bytes[i];
+            if ((current_node === 0) && (byte === 0x80)) {
+                throw new errors.ASN1PaddingError("Prohibited padding on OBJECT IDENTIFIER node.");
+            }
+            if (byte < 0x80) {
+                current_node = 0;
+            }
+            else {
+                current_node++;
             }
-            i--;
         }
-        return true;
+        const oid = new ObjectIdentifier();
+        oid.encoding = bytes;
+        return oid;
+    }
+    static fromBytesUnsafe(bytes) {
+        const oid = new ObjectIdentifier();
+        oid.encoding = bytes;
+        return oid;
+    }
+    static compare(a, b) {
+        return Buffer.compare(a.encoding, b.encoding) === 0;
     }
     isEqualTo(other) {
         return ObjectIdentifier.compare(this, other);

package/dist/types/TypeIdentifier.mjs

@@ -1,3 +1,4 @@
+import ObjectIdentifier from "./ObjectIdentifier.mjs";
 export default class TypeIdentifier {
     constructor(id, type) {
         this.id = id;

package/dist/types/time/DATE-ENCODING.d.mts

@@ -1,4 +1,4 @@
-import { INTEGER } from "../../macros.mjs";
+import type { INTEGER } from "../../macros.mjs";
 export default class DATE_ENCODING {
     readonly year: INTEGER;
     readonly month: INTEGER;

package/dist/types/time/DURATION-EQUIVALENT.d.mts

@@ -1,4 +1,4 @@
-import { INTEGER, OPTIONAL } from "../../macros.mjs";
+import type { INTEGER, OPTIONAL } from "../../macros.mjs";
 export default class DURATION_EQUIVALENT {
     readonly years: OPTIONAL<INTEGER>;
     readonly months: OPTIONAL<INTEGER>;

package/dist/types/time/DURATION-INTERVAL-ENCODING.d.mts

@@ -1,4 +1,4 @@
-import { INTEGER, OPTIONAL } from "../../macros.mjs";
+import type { INTEGER, OPTIONAL } from "../../macros.mjs";
 export default class DURATION_INTERVAL_ENCODING {
     readonly years: OPTIONAL<INTEGER>;
     readonly months: OPTIONAL<INTEGER>;

package/dist/types/time/HOURS-DIFF-ENCODING.d.mts

@@ -1,4 +1,4 @@
-import { INTEGER } from "../../macros.mjs";
+import type { INTEGER } from "../../macros.mjs";
 export default class HOURS_DIFF_ENCODING {
     readonly hours: INTEGER;
     readonly minutes_diff: INTEGER;

package/dist/types/time/HOURS-ENCODING.d.mts

@@ -1,4 +1,4 @@
-import { INTEGER } from "../../macros.mjs";
+import type { INTEGER } from "../../macros.mjs";
 export default class HOURS_ENCODING {
     readonly hours: INTEGER;
     constructor(hours: INTEGER);

package/dist/types/time/HOURS-MINUTES-DIFF-ENCODING.d.mts

@@ -1,4 +1,4 @@
-import { INTEGER } from "../../macros.mjs";
+import type { INTEGER } from "../../macros.mjs";
 export default class HOURS_MINUTES_DIFF_ENCODING {
     readonly hours: INTEGER;
     readonly minutes: INTEGER;

package/dist/types/time/HOURS-MINUTES-ENCODING.d.mts

@@ -1,4 +1,4 @@
-import { INTEGER } from "../../macros.mjs";
+import type { INTEGER } from "../../macros.mjs";
 export default class HOURS_MINUTES_ENCODING {
     readonly hours: INTEGER;
     readonly minutes: INTEGER;

package/dist/types/time/TIME-OF-DAY-DIFF-ENCODING.d.mts

@@ -1,4 +1,4 @@
-import { INTEGER } from "../../macros.mjs";
+import type { INTEGER } from "../../macros.mjs";
 export default class TIME_OF_DAY_DIFF_ENCODING {
     readonly hours: INTEGER;
     readonly minutes: INTEGER;

package/dist/types/time/TIME-OF-DAY-ENCODING.d.mts

@@ -1,4 +1,4 @@
-import { INTEGER } from "../../macros.mjs";
+import type { INTEGER } from "../../macros.mjs";
 export default class TIME_OF_DAY_ENCODING {
     readonly hours: INTEGER;
     readonly minutes: INTEGER;

package/dist/types/time/TIME-OF-DAY-FRACTION-DIFF-ENCODING.d.mts

@@ -1,4 +1,4 @@
-import { INTEGER } from "../../macros.mjs";
+import type { INTEGER } from "../../macros.mjs";
 export default class TIME_OF_DAY_FRACTION_DIFF_ENCODING {
     readonly hours: INTEGER;
     readonly minutes: INTEGER;

package/dist/types/time/TIME-OF-DAY-FRACTION-ENCODING.d.mts

@@ -1,4 +1,4 @@
-import { INTEGER } from "../../macros.mjs";
+import type { INTEGER } from "../../macros.mjs";
 export default class TIME_OF_DAY_FRACTION_ENCODING {
     readonly hours: INTEGER;
     readonly minutes: INTEGER;

package/dist/types/time/YEAR-ENCODING.d.mts

@@ -1,4 +1,4 @@
-import { INTEGER } from "../../macros.mjs";
+import type { INTEGER } from "../../macros.mjs";
 export default class YEAR_ENCODING {
     readonly year: INTEGER;
     constructor(year: INTEGER);

package/dist/types/time/YEAR-MONTH-ENCODING.d.mts

@@ -1,4 +1,4 @@
-import { INTEGER } from "../../macros.mjs";
+import type { INTEGER } from "../../macros.mjs";
 export default class YEAR_MONTH_ENCODING {
     readonly year: INTEGER;
     readonly month: INTEGER;

package/dist/utils/isInCanonicalOrder.mjs

@@ -1,4 +1,4 @@
-import { CANONICAL_TAG_CLASS_ORDERING } from "../values.mjs";
+import { ASN1TagClass, CANONICAL_TAG_CLASS_ORDERING } from "../values.mjs";
 export default function isInCanonicalOrder(elements) {
     let previousTagClass = null;
     let previousTagNumber = null;

package/dist/utils/packBits.d.mts

@@ -1,2 +1,2 @@
-import { BIT_STRING } from "../macros.mjs";
+import type { BIT_STRING } from "../macros.mjs";
 export default function packBits(bits: BIT_STRING): Uint8Array;

package/dist/utils/unpackBits.d.mts

@@ -1,2 +1,2 @@
-import { BIT_STRING } from "../macros.mjs";
+import type { BIT_STRING } from "../macros.mjs";
 export default function unpackBits(bytes: Uint8Array): BIT_STRING;

package/dist/validators/datetimeComponentValidator.d.mts

@@ -1,2 +1,2 @@
-import { INTEGER } from "../macros.mjs";
+import type { INTEGER } from "../macros.mjs";
 export default function datetimeComponentValidator(unitName: string, min: INTEGER, max: INTEGER): (dataType: string, value: INTEGER) => void;

package/dist/validators/isObjectDescriptorCharacter.d.mts

@@ -1 +1,3 @@
-export default function isObjectDescriptorCharacter(characterCode: number): boolean;
+import isGraphicCharacter from "./isGraphicCharacter.mjs";
+declare const isObjectDescriptorCharacter: typeof isGraphicCharacter;
+export default isObjectDescriptorCharacter;

package/dist/validators/isObjectDescriptorCharacter.mjs

@@ -1,4 +1,3 @@
 import isGraphicCharacter from "./isGraphicCharacter.mjs";
-export default function isObjectDescriptorCharacter(characterCode) {
-    return isGraphicCharacter(characterCode);
-}
+const isObjectDescriptorCharacter = isGraphicCharacter;
+export default isObjectDescriptorCharacter;

package/dist/validators/isVisibleCharacter.d.mts

@@ -1 +1,3 @@
-export default function isVisibleCharacter(characterCode: number): boolean;
+import isGraphicCharacter from "./isGraphicCharacter.mjs";
+declare const isVisibleCharacter: typeof isGraphicCharacter;
+export default isVisibleCharacter;

package/dist/validators/isVisibleCharacter.mjs

@@ -1,4 +1,3 @@
 import isGraphicCharacter from "./isGraphicCharacter.mjs";
-export default function isVisibleCharacter(characterCode) {
-    return isGraphicCharacter(characterCode);
-}
+const isVisibleCharacter = isGraphicCharacter;
+export default isVisibleCharacter;

package/dist/values.d.mts

@@ -85,4 +85,5 @@ export declare const canonicalNR3Regex: RegExp;
 export declare const distinguishedNR3Regex: RegExp;
 export declare const CANONICAL_TAG_CLASS_ORDERING: ASN1TagClass[];
 export declare const numberRegex: string;
+export declare const durationRegex: RegExp;
 export declare const datetimeRegex: RegExp;

package/dist/values.mjs

@@ -97,7 +97,7 @@ export const CANONICAL_TAG_CLASS_ORDERING = [
     ASN1TagClass.private,
 ];
 export const numberRegex = "(?:0|[1-9]\\d*)(?:\\.\\d+)?";
-export const datetimeRegex = new RegExp("^(?:(" + numberRegex + ")Y)?"
+export const durationRegex = new RegExp("^(?:(" + numberRegex + ")Y)?"
     + "(?:(" + numberRegex + ")M)?"
     + "(?:(" + numberRegex + ")D)?"
     + "(?:T"
@@ -105,3 +105,4 @@ export const datetimeRegex = new RegExp("^(?:(" + numberRegex + ")Y)?"
     + "(?:(" + numberRegex + ")M)?"
     + "(?:(" + numberRegex + ")S)?"
     + ")?$");
+export const datetimeRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$/;

package/dist/x690.mjs

@@ -36,9 +36,6 @@ export default class X690Element extends ASN1Element {
         if (this.construction !== ASN1Construction.primitive) {
             throw new errors.ASN1ConstructionError("OBJECT IDENTIFIER cannot be constructed.", this);
         }
-        if (this.value.length === 0) {
-            throw new errors.ASN1TruncationError("Encoded value was too short to be an OBJECT IDENTIFIER!", this);
-        }
         return decodeObjectIdentifier(this.value);
     }
     set enumerated(value) {

package/package.json

@@ -48,5 +48,5 @@
         "test": "node --test"
     },
     "types": "./dist/index.d.mts",
-    "version": "9.0.3"
+    "version": "11.0.0"
 }