@originator-profile/opvc 0.6.1 → 0.7.0-beta.2

package/README.md

@@ -1,5 +1,7 @@
 # opvc - Originator Profile Verifiable Credential command line tool
 
+[![npm version](https://img.shields.io/npm/v/@originator-profile/opvc)](https://www.npmjs.com/package/@originator-profile/opvc) [![jsDocs.io](https://img.shields.io/badge/jsDocs.io-reference-blue)](https://www.jsdocs.io/package/@originator-profile/opvc)
+
 Originator Profile (OP) 仕様に準拠した Verifiable Credential (VC) を作成・管理するためのツールです。
 
 <!-- prettier-ignore-start -->
@@ -135,7 +137,7 @@ FLAG DESCRIPTIONS
     }
 ```
 
-_See code: [src/commands/ca/sign.ts](https://github.com/originator-profile/originator-profile/blob/v0.6.1/packages/opvc/src/commands/ca/sign.ts)_
+_See code: [src/commands/ca/sign.ts](https://github.com/originator-profile/originator-profile/blob/v0.7.0-beta.2/packages/opvc/src/commands/ca/sign.ts)_
 
 ## `opvc ca:unsigned`
 
@@ -220,7 +222,7 @@ FLAG DESCRIPTIONS
     }
 ```
 
-_See code: [src/commands/ca/unsigned.ts](https://github.com/originator-profile/originator-profile/blob/v0.6.1/packages/opvc/src/commands/ca/unsigned.ts)_
+_See code: [src/commands/ca/unsigned.ts](https://github.com/originator-profile/originator-profile/blob/v0.7.0-beta.2/packages/opvc/src/commands/ca/unsigned.ts)_
 
 ## `opvc help [COMMAND]`
 
@@ -240,7 +242,7 @@ DESCRIPTION
   Display help for opvc.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/6.2.48/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/6.2.55/src/commands/help.ts)_
 
 ## `opvc key-gen`
 
@@ -258,7 +260,7 @@ DESCRIPTION
   鍵ペアの生成
 ```
 
-_See code: [src/commands/key-gen/index.ts](https://github.com/originator-profile/originator-profile/blob/v0.6.1/packages/opvc/src/commands/key-gen/index.ts)_
+_See code: [src/commands/key-gen/index.ts](https://github.com/originator-profile/originator-profile/blob/v0.7.0-beta.2/packages/opvc/src/commands/key-gen/index.ts)_
 
 ## `opvc sign`
 
@@ -425,7 +427,7 @@ FLAG DESCRIPTIONS
     }
 ```
 
-_See code: [src/commands/sign.ts](https://github.com/originator-profile/originator-profile/blob/v0.6.1/packages/opvc/src/commands/sign.ts)_
+_See code: [src/commands/sign.ts](https://github.com/originator-profile/originator-profile/blob/v0.7.0-beta.2/packages/opvc/src/commands/sign.ts)_
 
 ## `opvc wsp:sign`
 
@@ -563,7 +565,7 @@ FLAG DESCRIPTIONS
     ]
 ```
 
-_See code: [src/commands/wsp/sign.ts](https://github.com/originator-profile/originator-profile/blob/v0.6.1/packages/opvc/src/commands/wsp/sign.ts)_
+_See code: [src/commands/wsp/sign.ts](https://github.com/originator-profile/originator-profile/blob/v0.7.0-beta.2/packages/opvc/src/commands/wsp/sign.ts)_
 
 ## `opvc wsp:unsigned`
 
@@ -693,7 +695,7 @@ FLAG DESCRIPTIONS
     ]
 ```
 
-_See code: [src/commands/wsp/unsigned.ts](https://github.com/originator-profile/originator-profile/blob/v0.6.1/packages/opvc/src/commands/wsp/unsigned.ts)_
+_See code: [src/commands/wsp/unsigned.ts](https://github.com/originator-profile/originator-profile/blob/v0.7.0-beta.2/packages/opvc/src/commands/wsp/unsigned.ts)_
 <!-- commandsstop -->
 <!-- prettier-ignore-end -->
 

package/dist/commands/ca/sign.js

@@ -1,4 +1,4 @@
-import { n as sign } from "../../content-attestation-Dd-YcVIv.js";
+import { n as sign } from "../../content-attestation-BydW0zgM.js";
 import { r as privateKey, t as expirationDate } from "../../flags-BSM3ANoc.js";
 import { Command, Flags } from "@oclif/core";
 import fs from "node:fs/promises";

package/dist/commands/ca/unsigned.js

@@ -1,4 +1,4 @@
-import { r as unsignedCa } from "../../content-attestation-Dd-YcVIv.js";
+import { r as unsignedCa } from "../../content-attestation-BydW0zgM.js";
 import { t as expirationDate } from "../../flags-BSM3ANoc.js";
 import { Command, Flags } from "@oclif/core";
 import fs from "node:fs/promises";

package/dist/commands/wsp/sign.js

@@ -1,4 +1,4 @@
-import { t as sign } from "../../website-profile-Brt0iuRN.js";
+import { t as sign } from "../../website-profile-B_7x7iSY.js";
 import { r as privateKey, t as expirationDate } from "../../flags-BSM3ANoc.js";
 import { Command, Flags } from "@oclif/core";
 import fs from "node:fs/promises";

package/dist/commands/wsp/unsigned.js

@@ -1,4 +1,4 @@
-import { n as unsignedWsp } from "../../website-profile-Brt0iuRN.js";
+import { n as unsignedWsp } from "../../website-profile-B_7x7iSY.js";
 import { t as expirationDate } from "../../flags-BSM3ANoc.js";
 import { Command, Flags } from "@oclif/core";
 import fs from "node:fs/promises";

package/dist/{content-attestation-Dd-YcVIv.js → content-attestation-BydW0zgM.js}

@@ -34,9 +34,9 @@ var content_attestation_exports = /* @__PURE__ */ __exportAll({
 * @throws {BadRequestError} 入力が UnsignedContentAttestation スキーマに適合しない場合/検証対象のコンテンツが存在しない/コンテンツにアクセスできない/Integrityの計算に失敗
 * @return 未署名 Content Attestation オブジェクト
 */
-async function unsignedCa(uca, { integrityAlg = "sha256", documentProvider: documentProvider$1 = documentProvider, ...timingOptions }) {
+async function unsignedCa(uca, { integrityAlg = "sha256", documentProvider: documentProvider$1 = documentProvider, assignId = true, ...timingOptions }) {
 	const { issuedAt, expiredAt } = parseDates(timingOptions);
-	uca.credentialSubject.id ??= `urn:uuid:${crypto.randomUUID()}`;
+	if (assignId) uca.credentialSubject.id ??= `urn:uuid:${crypto.randomUUID()}`;
 	try {
 		UnsignedContentAttestation.parse(uca);
 		await Promise.all([fetchAndSetDigestSri(integrityAlg, uca.credentialSubject.image), fetchAndSetTargetIntegrity(integrityAlg, uca, documentProvider$1)]);
@@ -54,16 +54,16 @@ async function unsignedCa(uca, { integrityAlg = "sha256", documentProvider: docu
 /**
 * Content Attestation への署名
 * @param uca 未署名 Content Attestation オブジェクト
-* @param privateKey プライベート鍵
+* @param signer プライベート鍵、または HSM・KMS・WebAuthn等の外部署名者 (JwtSigner)
 * @throws {BadRequestError} 入力が UnsignedContentAttestation スキーマに適合しない場合/検証対象のコンテンツが存在しない/コンテンツにアクセスできない/Integrityの計算に失敗
 * @return Content Attestation
 */
-async function sign(uca, privateKey, options = {}) {
+async function sign(uca, signer, options = {}) {
 	const { issuedAt, expiredAt } = parseDates(options);
 	return await signCa(await unsignedCa(uca, {
 		issuedAt,
 		expiredAt
-	}), privateKey, {
+	}), signer, {
 		issuedAt,
 		expiredAt,
 		documentProvider
@@ -82,7 +82,8 @@ async function signByServer(uca, { endpoint, accessToken, ...options }) {
 	const payload = await unsignedCa(uca, {
 		...options,
 		issuedAt,
-		expiredAt
+		expiredAt,
+		assignId: false
 	});
 	const response = await fetch(endpoint, {
 		method: "POST",

package/dist/index.d.ts

@@ -1,5 +1,6 @@
-import { Jwk, RawTarget, UnsignedContentAttestation, UnsignedWebsiteProfile, UnsignedWebsiteProfileSet } from "@originator-profile/model";
+import { RawTarget, UnsignedContentAttestation, UnsignedWebsiteProfile, UnsignedWebsiteProfileSet } from "@originator-profile/model";
 import { DocumentProvider, UnsignedWebsiteProfileInput } from "@originator-profile/sign";
+import { JwtSigner, KeyMaterial } from "@originator-profile/securing-mechanism";
 
 //#region src/document-provider.d.ts
 declare function documentProvider$1({
@@ -30,6 +31,11 @@ declare namespace content_attestation_d_exports {
 type UnsignedCaOptions = TimingOptions & {
   integrityAlg?: HashAlgorithm;
   documentProvider?: DocumentProvider;
+  /**
+   * 入力に credentialSubject.id が無い場合に urn:uuid を採番するか。
+   * @default true
+   */
+  assignId?: boolean;
 };
 /**
  * 未署名 Content Attestation の取得
@@ -40,16 +46,17 @@ type UnsignedCaOptions = TimingOptions & {
 declare function unsignedCa(uca: UnsignedContentAttestation, {
   integrityAlg,
   documentProvider,
+  assignId,
   ...timingOptions
 }: UnsignedCaOptions): Promise<UnsignedContentAttestation>;
 /**
  * Content Attestation への署名
  * @param uca 未署名 Content Attestation オブジェクト
- * @param privateKey プライベート鍵
+ * @param signer プライベート鍵、または HSM・KMS・WebAuthn等の外部署名者 (JwtSigner)
  * @throws {BadRequestError} 入力が UnsignedContentAttestation スキーマに適合しない場合/検証対象のコンテンツが存在しない/コンテンツにアクセスできない/Integrityの計算に失敗
  * @return Content Attestation
  */
-declare function sign$1(uca: UnsignedContentAttestation, privateKey: Jwk, options?: TimingOptions): Promise<string>;
+declare function sign$1(uca: UnsignedContentAttestation, signer: KeyMaterial | JwtSigner, options?: TimingOptions): Promise<string>;
 /**
  * CA server 経由で Content Attestation を作成
  * @param uca 未署名 Content Attestation オブジェクト
@@ -86,10 +93,10 @@ declare function unsignedWsp<U extends UnsignedWebsiteProfileInput>(uwsp: U, opt
  * 配列を渡した場合、各要素を個別に署名して JWT 文字列の配列を返します。
  *
  * @param uwsp 未署名 Website Profile (単一または配列)
- * @param privateKey プライベート鍵
+ * @param signer プライベート鍵、または HSM・KMS・WebAuthn等の外部署名者 (JwtSigner)
  * @throws {BadRequestError} 配列入力の整合性違反や入力が UnsignedWebsiteProfile スキーマに適合しない場合
  * @return 単一入力時は JWT 文字列、配列入力時は JWT 文字列の配列
  */
-declare function sign<U extends UnsignedWebsiteProfileInput>(uwsp: U, privateKey: Jwk, options?: TimingOptions): Promise<U extends unknown[] ? string[] : string>;
+declare function sign<U extends UnsignedWebsiteProfileInput>(uwsp: U, signer: KeyMaterial | JwtSigner, options?: TimingOptions): Promise<U extends unknown[] ? string[] : string>;
 //#endregion
 export { content_attestation_d_exports as ContentAttestation, website_profile_d_exports as WebsiteProfile, documentProvider$1 as documentProvider };

package/dist/index.js

@@ -1,3 +1,3 @@
-import { i as documentProvider, t as content_attestation_exports } from "./content-attestation-Dd-YcVIv.js";
-import { r as website_profile_exports } from "./website-profile-Brt0iuRN.js";
+import { i as documentProvider, t as content_attestation_exports } from "./content-attestation-BydW0zgM.js";
+import { r as website_profile_exports } from "./website-profile-B_7x7iSY.js";
 export { content_attestation_exports as ContentAttestation, website_profile_exports as WebsiteProfile, documentProvider };

package/dist/{website-profile-Brt0iuRN.js → website-profile-B_7x7iSY.js}

@@ -44,14 +44,14 @@ async function unsignedWsp(uwsp, options) {
 * 配列を渡した場合、各要素を個別に署名して JWT 文字列の配列を返します。
 *
 * @param uwsp 未署名 Website Profile (単一または配列)
-* @param privateKey プライベート鍵
+* @param signer プライベート鍵、または HSM・KMS・WebAuthn等の外部署名者 (JwtSigner)
 * @throws {BadRequestError} 配列入力の整合性違反や入力が UnsignedWebsiteProfile スキーマに適合しない場合
 * @return 単一入力時は JWT 文字列、配列入力時は JWT 文字列の配列
 */
-async function sign(uwsp, privateKey, options = {}) {
+async function sign(uwsp, signer, options = {}) {
 	const timing = parseDates(options);
 	try {
-		return await signWsp(uwsp, privateKey, timing);
+		return await signWsp(uwsp, signer, timing);
 	} catch (e) {
 		throw new BadRequestError(e.message, { cause: e });
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@originator-profile/opvc",
-  "version": "0.6.1",
+  "version": "0.7.0-beta.2",
   "license": "Apache-2.0",
   "homepage": "https://docs.originator-profile.org",
   "repository": {
@@ -40,26 +40,25 @@
     "jose": "^6.2.2",
     "jsdom": "^29.0.1",
     "wrap-ansi": "^9.0.2",
-    "@originator-profile/core": "0.6.1",
-    "@originator-profile/model": "0.6.1",
-    "@originator-profile/cryptography": "0.6.1",
-    "@originator-profile/securing-mechanism": "0.6.1",
-    "@originator-profile/sign": "0.6.1"
+    "@originator-profile/cryptography": "0.7.0-beta.2",
+    "@originator-profile/core": "0.7.0-beta.2",
+    "@originator-profile/model": "0.7.0-beta.2",
+    "@originator-profile/securing-mechanism": "0.7.0-beta.2",
+    "@originator-profile/sign": "0.7.0-beta.2"
   },
   "devDependencies": {
     "@types/node": "25.6.0",
-    "eslint": "10.2.0",
     "oclif": "4.23.0",
+    "oxlint": "^1.73.0",
+    "oxlint-tsgolint": "^0.24.0",
     "tsdown": "0.21.7",
     "typescript": "6.0.2",
     "websri": "1.0.1",
-    "@originator-profile/tsconfig": "0.6.1",
-    "eslint-config-originator-profile": "0.6.1"
+    "@originator-profile/tsconfig": "0.7.0-beta.2"
   },
   "scripts": {
     "build": "tsdown && oclif manifest && oclif readme",
-    "lint": "eslint --fix .",
-    "type-check": "tsc",
+    "lint": "oxlint --fix .",
     "test": "node --test"
   },
   "bin": {