@peculiar/certificates-viewer 4.7.1-alpha.5 → 4.8.0

package/dist/cjs/{ssh_certificate-DnXj2sM0.js → ssh_certificate-Bh14rhzR.js}

@@ -4307,6 +4307,7 @@ const AsnProp = (options) => (target, propertyKey) => {
         }
         copyOptions.converter = defaultConverter$1;
     }
+    copyOptions.raw = options.raw;
     schema.items[propertyKey] = copyOptions;
 };
 
@@ -4343,15 +4344,11 @@ class AsnParser {
                 targetSchema = choiceResult.targetSchema;
             }
             const sequenceResult = this.handleSequenceTypes(asn1Schema, schema, target, targetSchema);
-            if (sequenceResult && "isManualMapping" in sequenceResult) {
-                return sequenceResult.result;
-            }
-            const asn1ComparedSchema = sequenceResult;
             const res = new target();
             if (isTypeOfArray(target)) {
                 return this.handleArrayTypes(asn1Schema, schema, target);
             }
-            this.processSchemaItems(schema, asn1ComparedSchema, res);
+            this.processSchemaItems(schema, sequenceResult, res);
             return res;
         }
         catch (error) {
@@ -4405,65 +4402,20 @@ class AsnParser {
     }
     static handleSequenceTypes(asn1Schema, schema, target, targetSchema) {
         if (schema.type === exports.AsnTypeTypes.Sequence) {
-            const optionalChoiceFields = Object.keys(schema.items).filter((key) => {
-                const item = schema.items[key];
-                return (item.optional &&
-                    typeof item.type === "function" &&
-                    schemaStorage.has(item.type) &&
-                    schemaStorage.get(item.type).type === exports.AsnTypeTypes.Choice);
-            });
-            if (optionalChoiceFields.length > 0 &&
-                "value" in asn1Schema.valueBlock &&
-                Array.isArray(asn1Schema.valueBlock.value) &&
-                target.name === "CertReqMsg") {
-                return this.handleManualMapping(asn1Schema, schema, target);
-            }
             const asn1ComparedSchema = compareSchema({}, asn1Schema, targetSchema);
             if (!asn1ComparedSchema.verified) {
-                throw new AsnSchemaValidationError(`Data does not match to ${target.name} ASN1 schema. ${asn1ComparedSchema.result.error}`);
+                throw new AsnSchemaValidationError(`Data does not match to ${target.name} ASN1 schema.${asn1ComparedSchema.result.error ? ` ${asn1ComparedSchema.result.error}` : ""}`);
             }
             return asn1ComparedSchema;
         }
         else {
             const asn1ComparedSchema = compareSchema({}, asn1Schema, targetSchema);
             if (!asn1ComparedSchema.verified) {
-                throw new AsnSchemaValidationError(`Data does not match to ${target.name} ASN1 schema. ${asn1ComparedSchema.result.error}`);
+                throw new AsnSchemaValidationError(`Data does not match to ${target.name} ASN1 schema.${asn1ComparedSchema.result.error ? ` ${asn1ComparedSchema.result.error}` : ""}`);
             }
             return asn1ComparedSchema;
         }
     }
-    static handleManualMapping(asn1Schema, schema, target) {
-        const res = new target();
-        const asn1Elements = asn1Schema.valueBlock.value;
-        const schemaKeys = Object.keys(schema.items);
-        let asn1Index = 0;
-        for (let i = 0; i < schemaKeys.length; i++) {
-            const key = schemaKeys[i];
-            const schemaItem = schema.items[key];
-            if (asn1Index >= asn1Elements.length)
-                break;
-            if (schemaItem.repeated) {
-                res[key] = this.processRepeatedField(asn1Elements, asn1Index, schemaItem);
-                break;
-            }
-            else if (typeof schemaItem.type === "number") {
-                res[key] = this.processPrimitiveField(asn1Elements[asn1Index], schemaItem);
-                asn1Index++;
-            }
-            else if (this.isOptionalChoiceField(schemaItem)) {
-                const result = this.processOptionalChoiceField(asn1Elements[asn1Index], schemaItem);
-                if (result.processed) {
-                    res[key] = result.value;
-                    asn1Index++;
-                }
-            }
-            else {
-                res[key] = this.fromASN(asn1Elements[asn1Index], schemaItem.type);
-                asn1Index++;
-            }
-        }
-        return { result: res, verified: true, isManualMapping: true };
-    }
     static processRepeatedField(asn1Elements, asn1Index, schemaItem) {
         let elementsToProcess = asn1Elements.slice(asn1Index);
         if (elementsToProcess.length === 1 && elementsToProcess[0].constructor.name === "Sequence") {
@@ -4551,11 +4503,22 @@ class AsnParser {
             }
             const schemaItem = schema.items[key];
             const schemaItemType = schemaItem.type;
+            let parsedValue;
             if (typeof schemaItemType === "number" || isConvertible(schemaItemType)) {
-                res[key] = this.processPrimitiveSchemaItem(asn1SchemaValue, schemaItem, schemaItemType);
+                parsedValue = this.processPrimitiveSchemaItem(asn1SchemaValue, schemaItem, schemaItemType);
             }
             else {
-                res[key] = this.processComplexSchemaItem(asn1SchemaValue, schemaItem, schemaItemType);
+                parsedValue = this.processComplexSchemaItem(asn1SchemaValue, schemaItem, schemaItemType);
+            }
+            if (parsedValue &&
+                typeof parsedValue === "object" &&
+                "value" in parsedValue &&
+                "raw" in parsedValue) {
+                res[key] = parsedValue.value;
+                res[`${key}Raw`] = parsedValue.raw;
+            }
+            else {
+                res[key] = parsedValue;
             }
         }
     }
@@ -4636,7 +4599,14 @@ class AsnParser {
                 }
             }
             else {
-                return this.fromASN(valueToProcess, schemaItemType);
+                const parsedValue = this.fromASN(valueToProcess, schemaItemType);
+                if (schemaItem.raw) {
+                    return {
+                        value: parsedValue,
+                        raw: asn1SchemaValue.valueBeforeDecodeView,
+                    };
+                }
+                return parsedValue;
             }
         }
     }
@@ -6104,7 +6074,7 @@ class Certificate {
     }
 }
 __decorate$1([
-    AsnProp({ type: TBSCertificate })
+    AsnProp({ type: TBSCertificate, raw: true })
 ], Certificate.prototype, "tbsCertificate", void 0);
 __decorate$1([
     AsnProp({ type: AlgorithmIdentifier })
@@ -6168,7 +6138,7 @@ class CertificateList {
     }
 }
 __decorate$1([
-    AsnProp({ type: TBSCertList })
+    AsnProp({ type: TBSCertList, raw: true })
 ], CertificateList.prototype, "tbsCertList", void 0);
 __decorate$1([
     AsnProp({ type: AlgorithmIdentifier })
@@ -9248,14 +9218,19 @@ const OIDs = {
  * LICENSE file in the root directory of this source tree.
  */
 var __classPrivateFieldSet$2 = (undefined && undefined.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    if (kind === "m")
+        throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f)
+        throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver))
+        throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
 var __classPrivateFieldGet$2 = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    if (kind === "a" && !f)
+        throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver))
+        throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _Name_asn;
@@ -9342,7 +9317,6 @@ const id_pe_qcStatements = `${id_pe$1}.3`;
 class QCStatement {
     constructor() {
         this.statementId = "";
-        this.statementInfo = new ArrayBuffer(0);
     }
 }
 __decorate$1([
@@ -10761,8 +10735,12 @@ __decorate$1([
 
 var __decorate = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+        r = Reflect.decorate(decorators, target, key, desc);
+    else
+        for (var i = decorators.length - 1; i >= 0; i--)
+            if (d = decorators[i])
+                r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 /**
@@ -10813,14 +10791,19 @@ __decorate([
  * LICENSE file in the root directory of this source tree.
  */
 var __classPrivateFieldSet$1 = (undefined && undefined.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    if (kind === "m")
+        throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f)
+        throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver))
+        throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
 var __classPrivateFieldGet$1 = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    if (kind === "a" && !f)
+        throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver))
+        throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AsnData_asn, _AsnData_raw;
@@ -11755,7 +11738,14 @@ __decorate$1([
     AsnProp({ type: DigestAlgorithmIdentifier })
 ], SignerInfo.prototype, "digestAlgorithm", void 0);
 __decorate$1([
-    AsnProp({ type: Attribute, repeated: "set", context: 0, implicit: true, optional: true })
+    AsnProp({
+        type: Attribute,
+        repeated: "set",
+        context: 0,
+        implicit: true,
+        optional: true,
+        raw: true,
+    })
 ], SignerInfo.prototype, "signedAttrs", void 0);
 __decorate$1([
     AsnProp({ type: SignatureAlgorithmIdentifier })
@@ -11776,17 +11766,18 @@ SignerInfos = SignerInfos_1 = __decorate$1([
     AsnType({ type: exports.AsnTypeTypes.Set, itemType: SignerInfo })
 ], SignerInfos);
 
-let SigningTime$1 = class SigningTime extends Time {
-};
-SigningTime$1 = __decorate$1([
-    AsnType({ type: exports.AsnTypeTypes.Choice })
-], SigningTime$1);
 let CounterSignature$1 = class CounterSignature extends SignerInfo {
 };
 CounterSignature$1 = __decorate$1([
     AsnType({ type: exports.AsnTypeTypes.Sequence })
 ], CounterSignature$1);
 
+let SigningTime$1 = class SigningTime extends Time {
+};
+SigningTime$1 = __decorate$1([
+    AsnType({ type: exports.AsnTypeTypes.Choice })
+], SigningTime$1);
+
 var CertificateSet_1;
 class OtherCertificateFormat {
     constructor(params = {}) {
@@ -12689,7 +12680,7 @@ __decorate$1([
     AsnProp({ type: SubjectPublicKeyInfo })
 ], CertificationRequestInfo.prototype, "subjectPKInfo", void 0);
 __decorate$1([
-    AsnProp({ type: Attributes, implicit: true, context: 0 })
+    AsnProp({ type: Attributes, implicit: true, context: 0, optional: true })
 ], CertificationRequestInfo.prototype, "attributes", void 0);
 
 class CertificationRequest {
@@ -12701,7 +12692,7 @@ class CertificationRequest {
     }
 }
 __decorate$1([
-    AsnProp({ type: CertificationRequestInfo })
+    AsnProp({ type: CertificationRequestInfo, raw: true })
 ], CertificationRequest.prototype, "certificationRequestInfo", void 0);
 __decorate$1([
     AsnProp({ type: AlgorithmIdentifier })
@@ -14293,21 +14284,28 @@ let SshCertificate$1 = class SshCertificate extends SshObject {
 };
 
 var __classPrivateFieldSet = (undefined && undefined.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    if (kind === "m")
+        throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f)
+        throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver))
+        throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
 var __classPrivateFieldGet = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    if (kind === "a" && !f)
+        throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver))
+        throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SshCertificate_cert;
 class SshCertificate {
     constructor(raw) {
         _SshCertificate_cert.set(this, void 0);
-        const blob = parse(raw.trim());
+        const blob = parse(buildExports.Convert.isBase64Url(raw.trim())
+            ? buildExports.Convert.ToString(buildExports.Convert.FromBase64Url(raw.trim()))
+            : raw.trim());
         // @ts-expect-error - SshCertificateType is not a constructor
         __classPrivateFieldSet(this, _SshCertificate_cert, new SshCertificate$1(blob), "f");
         this.notBefore = __classPrivateFieldGet(this, _SshCertificate_cert, "f").validAfter;
@@ -14342,8 +14340,11 @@ class SshCertificate {
             thumbprint: buildExports.Convert.ToBase64(thumbprint),
         };
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async toString(_format = 'pem') {
+    async toString(format = 'pem') {
+        if (format === 'base64url') {
+            const blob = await __classPrivateFieldGet(this, _SshCertificate_cert, "f").toSSH();
+            return buildExports.Convert.ToBase64Url(buildExports.Convert.FromString(blob));
+        }
         return __classPrivateFieldGet(this, _SshCertificate_cert, "f").toSSH();
     }
     get commonName() {
@@ -14465,6 +14466,6 @@ exports.id_qcs_pkixQCSyntax_v2 = id_qcs_pkixQCSyntax_v2;
 exports.id_role = id_role;
 exports.id_rsaEncryption = id_rsaEncryption;
 exports.l10n = l10n;
-//# sourceMappingURL=ssh_certificate-DnXj2sM0.js.map
+//# sourceMappingURL=ssh_certificate-Bh14rhzR.js.map
 
-//# sourceMappingURL=ssh_certificate-DnXj2sM0.js.map
+//# sourceMappingURL=ssh_certificate-Bh14rhzR.js.map