@originator-profile/model 0.4.0-beta.5 → 0.5.0-beta.1

package/dist/index.mjs

@@ -57,6 +57,36 @@ const CertificationSystem = {
   required: ["id", "type", "name"]
 };
 
+const OpCipContext = {
+  type: "array",
+  additionalItems: false,
+  minItems: 4,
+  items: [
+    {
+      type: "string",
+      const: "https://www.w3.org/ns/credentials/v2"
+    },
+    {
+      type: "string",
+      const: "https://originator-profile.org/ns/credentials/v1"
+    },
+    {
+      type: "string",
+      const: "https://originator-profile.org/ns/cip/v1"
+    },
+    {
+      type: "object",
+      properties: {
+        "@language": {
+          type: "string",
+          title: "\u8A00\u8A9E\u30B3\u30FC\u30C9"
+        }
+      },
+      required: ["@language"]
+    }
+  ]
+};
+
 const OpContextHead = {
   type: "array",
   allOf: [
@@ -135,36 +165,6 @@ const CertificateProperties = {
   required: ["id", "type", "certificationSystem"]
 };
 
-const OpCipContext = {
-  type: "array",
-  additionalItems: false,
-  minItems: 4,
-  items: [
-    {
-      type: "string",
-      const: "https://www.w3.org/ns/credentials/v2"
-    },
-    {
-      type: "string",
-      const: "https://originator-profile.org/ns/credentials/v1"
-    },
-    {
-      type: "string",
-      const: "https://originator-profile.org/ns/cip/v1"
-    },
-    {
-      type: "object",
-      properties: {
-        "@language": {
-          type: "string",
-          title: "\u8A00\u8A9E\u30B3\u30FC\u30C9"
-        }
-      },
-      required: ["@language"]
-    }
-  ]
-};
-
 const Certificate = {
   type: "object",
   allOf: [
@@ -201,12 +201,16 @@ const JapaneseExistenceCertificateProperties = {
   type: "object",
   properties: {
     id: { type: "string", title: "subject \u306E OP ID", format: "uri" },
-    type: { type: "string", const: "ECJPProperties" },
+    type: { type: "string", const: "JP-OrganizationExistenceCertificate" },
     name: {
-      title: "\u6CD5\u4EBA\u540D",
+      title: "PA \u540D",
       type: "string"
     },
     description: { type: "string", title: "\u8AAC\u660E" },
+    corporateName: {
+      title: "\u6CD5\u4EBA\u540D",
+      type: "string"
+    },
     corporateNumber: {
       title: "\u6CD5\u4EBA\u756A\u53F7",
       type: "string"
@@ -237,6 +241,7 @@ const JapaneseExistenceCertificateProperties = {
     "id",
     "type",
     "name",
+    "corporateName",
     "corporateNumber",
     "postalCode",
     "addressCountry",
@@ -277,6 +282,16 @@ const JapaneseExistenceCertificate = {
   ]
 };
 
+const Page = {
+  title: "\u30DA\u30FC\u30B8",
+  type: "object",
+  properties: {
+    id: { title: "\u30DA\u30FC\u30B8 URL", type: "string", format: "uri" },
+    name: { title: "\u30DA\u30FC\u30B8\u8868\u793A\u540D", type: "string" }
+  },
+  required: ["id", "name"]
+};
+
 const BasicTarget = {
   title: "Basic Target",
   type: "object",
@@ -408,16 +423,6 @@ const ContentAttestation = {
   ]
 };
 
-const Page = {
-  title: "\u30DA\u30FC\u30B8",
-  type: "object",
-  properties: {
-    id: { title: "\u30DA\u30FC\u30B8 URL", type: "string", format: "uri" },
-    name: { title: "\u30DA\u30FC\u30B8\u8868\u793A\u540D", type: "string" }
-  },
-  required: ["id", "name"]
-};
-
 const subject$4 = {
   type: "object",
   additionalProperties: false,
@@ -429,15 +434,15 @@ const subject$4 = {
     },
     type: {
       type: "string",
-      const: "Article"
+      const: "Advertorial"
     },
     headline: {
       type: "string",
-      description: "\u30B3\u30F3\u30C6\u30F3\u30C4\u306E\u30BF\u30A4\u30C8\u30EB\u3002"
+      description: "\u8A18\u4E8B\u5E83\u544A\u306E\u30BF\u30A4\u30C8\u30EB\u3002"
     },
     description: {
       type: "string",
-      description: "\u30B3\u30F3\u30C6\u30F3\u30C4\u306E\u8AAC\u660E\uFF08\u6587\u5B57\u5217\uFF09\u3002"
+      description: "\u8A18\u4E8B\u5E83\u544A\u306E\u8AAC\u660E\uFF08\u6587\u5B57\u5217\uFF09\u3002"
     },
     image: Image,
     datePublished: {
@@ -464,6 +469,13 @@ const subject$4 = {
         type: "string"
       }
     },
+    sponsor: {
+      title: "\u30B9\u30DD\u30F3\u30B5\u30FC\u540D",
+      type: "array",
+      items: {
+        type: "string"
+      }
+    },
     genre: {
       title: "\u30B8\u30E3\u30F3\u30EB",
       type: "string"
@@ -471,7 +483,7 @@ const subject$4 = {
   },
   required: ["id", "type", "headline", "description"]
 };
-const ArticleCA = {
+const AdvertorialCA = {
   type: "object",
   additionalProperties: true,
   allOf: [
@@ -496,52 +508,6 @@ const ArticleCA = {
 };
 
 const subject$3 = {
-  type: "object",
-  additionalProperties: true,
-  properties: {
-    id: {
-      title: "CA ID",
-      type: "string",
-      format: "uri"
-    },
-    type: {
-      title: "JSON-LD \u30BF\u30A4\u30D7",
-      type: "string"
-    }
-  },
-  required: ["id", "type"]
-};
-const UnsignedContentAttestation = {
-  type: "object",
-  additionalProperties: true,
-  allOf: [
-    OpVc,
-    {
-      type: "object",
-      additionalProperties: true,
-      properties: {
-        "@context": OpContextHead,
-        type: {
-          type: "array",
-          contains: {
-            const: "ContentAttestation"
-          }
-        },
-        credentialSubject: subject$3,
-        allowedUrl: AllowedUrl,
-        allowedOrigin: AllowedOrigin,
-        target: {
-          type: "array",
-          items: RawTarget,
-          minItems: 1
-        }
-      },
-      required: ["@context", "type", "credentialSubject", "target"]
-    }
-  ]
-};
-
-const subject$2 = {
   type: "object",
   additionalProperties: false,
   properties: {
@@ -552,15 +518,15 @@ const subject$2 = {
     },
     type: {
       type: "string",
-      const: "Advertorial"
+      const: "Article"
     },
     headline: {
       type: "string",
-      description: "\u8A18\u4E8B\u5E83\u544A\u306E\u30BF\u30A4\u30C8\u30EB\u3002"
+      description: "\u30B3\u30F3\u30C6\u30F3\u30C4\u306E\u30BF\u30A4\u30C8\u30EB\u3002"
     },
     description: {
       type: "string",
-      description: "\u8A18\u4E8B\u5E83\u544A\u306E\u8AAC\u660E\uFF08\u6587\u5B57\u5217\uFF09\u3002"
+      description: "\u30B3\u30F3\u30C6\u30F3\u30C4\u306E\u8AAC\u660E\uFF08\u6587\u5B57\u5217\uFF09\u3002"
     },
     image: Image,
     datePublished: {
@@ -587,13 +553,6 @@ const subject$2 = {
         type: "string"
       }
     },
-    sponsor: {
-      title: "\u30B9\u30DD\u30F3\u30B5\u30FC\u540D",
-      type: "array",
-      items: {
-        type: "string"
-      }
-    },
     genre: {
       title: "\u30B8\u30E3\u30F3\u30EB",
       type: "string"
@@ -601,7 +560,7 @@ const subject$2 = {
   },
   required: ["id", "type", "headline", "description"]
 };
-const AdvertorialCA = {
+const ArticleCA = {
   type: "object",
   additionalProperties: true,
   allOf: [
@@ -611,7 +570,7 @@ const AdvertorialCA = {
       additionalProperties: true,
       properties: {
         "@context": OpCipContext,
-        credentialSubject: subject$2,
+        credentialSubject: subject$3,
         allowedUrl: AllowedUrl
       },
       required: ["@context", "type", "credentialSubject", "allowedUrl"]
@@ -625,6 +584,52 @@ const AdvertorialCA = {
   }
 };
 
+const subject$2 = {
+  type: "object",
+  additionalProperties: true,
+  properties: {
+    id: {
+      title: "CA ID",
+      type: "string",
+      format: "uri"
+    },
+    type: {
+      title: "JSON-LD \u30BF\u30A4\u30D7",
+      type: "string"
+    }
+  },
+  required: ["id", "type"]
+};
+const UnsignedContentAttestation = {
+  type: "object",
+  additionalProperties: true,
+  allOf: [
+    OpVc,
+    {
+      type: "object",
+      additionalProperties: true,
+      properties: {
+        "@context": OpContextHead,
+        type: {
+          type: "array",
+          contains: {
+            const: "ContentAttestation"
+          }
+        },
+        credentialSubject: subject$2,
+        allowedUrl: AllowedUrl,
+        allowedOrigin: AllowedOrigin,
+        target: {
+          type: "array",
+          items: RawTarget,
+          minItems: 1
+        }
+      },
+      required: ["@context", "type", "credentialSubject", "target"]
+    }
+  ]
+};
+
 const ContentAttestationSetItem = {
   title: "Content Attestation Set Item",
   oneOf: [
@@ -656,6 +661,20 @@ const ContentAttestationSet = {
   items: ContentAttestationSetItem
 };
 
+const CpContext = {
+  type: "array",
+  additionalItems: false,
+  minItems: 2,
+  items: [
+    {
+      const: "https://www.w3.org/ns/credentials/v2"
+    },
+    {
+      const: "https://originator-profile.org/ns/credentials/v1"
+    }
+  ]
+};
+
 const Jwk = {
   title: "JSON Web Key",
   type: "object",
@@ -711,20 +730,6 @@ const Jwks = {
   additionalProperties: true
 };
 
-const CpContext = {
-  type: "array",
-  additionalItems: false,
-  minItems: 2,
-  items: [
-    {
-      const: "https://www.w3.org/ns/credentials/v2"
-    },
-    {
-      const: "https://originator-profile.org/ns/credentials/v1"
-    }
-  ]
-};
-
 const CoreProfile = {
   type: "object",
   additionalProperties: false,
@@ -780,10 +785,15 @@ const Advertisement = {
   required: ["type"]
 };
 
-const DpUrl = {
-  title: "URL",
-  description: "\u5BFE\u8C61\u306E\u8981\u7D20\u304C\u5B58\u5728\u3059\u308B\u30DA\u30FC\u30B8\u306E URL",
-  type: "string"
+const DpAllowedOrigins = {
+  title: "Allowed Origins",
+  description: "\u5229\u7528\u53EF\u80FD\u306A\u30AA\u30EA\u30B8\u30F3\u306E\u30EA\u30B9\u30C8",
+  type: "array",
+  items: {
+    title: "Allowed Origin",
+    description: "\u5229\u7528\u53EF\u80FD\u306A\u30AA\u30EA\u30B8\u30F3",
+    type: "string"
+  }
 };
 
 const DpLocation = {
@@ -807,12 +817,18 @@ const DpProof = {
   additionalProperties: false
 };
 
-const DpVisibleText = {
-  title: "Document Profile Visible Text",
-  description: "\u5BFE\u8C61\u306E\u8981\u7D20\u306E\u305D\u306E\u5B50\u5B6B\u306E\u30EC\u30F3\u30C0\u30EA\u30F3\u30B0\u3055\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u3068\u305D\u306E\u30C6\u30AD\u30B9\u30C8\u3078\u306E\u7F72\u540D",
+const DpUrl = {
+  title: "URL",
+  description: "\u5BFE\u8C61\u306E\u8981\u7D20\u304C\u5B58\u5728\u3059\u308B\u30DA\u30FC\u30B8\u306E URL",
+  type: "string"
+};
+
+const DpHtml = {
+  title: "Document Profile HTML",
+  description: "\u5BFE\u8C61\u306E\u8981\u7D20\u3068\u305D\u306E\u5B50\u5B6B\u3092\u542B\u3080\u90E8\u5206\u306E HTML \u3068\u305D\u306E HTML \u3078\u306E\u7F72\u540D",
   type: "object",
   properties: {
-    type: { const: "visibleText" },
+    type: { const: "html" },
     url: DpUrl,
     location: DpLocation,
     proof: DpProof
@@ -835,12 +851,12 @@ const DpText = {
   additionalProperties: false
 };
 
-const DpHtml = {
-  title: "Document Profile HTML",
-  description: "\u5BFE\u8C61\u306E\u8981\u7D20\u3068\u305D\u306E\u5B50\u5B6B\u3092\u542B\u3080\u90E8\u5206\u306E HTML \u3068\u305D\u306E HTML \u3078\u306E\u7F72\u540D",
+const DpVisibleText = {
+  title: "Document Profile Visible Text",
+  description: "\u5BFE\u8C61\u306E\u8981\u7D20\u306E\u305D\u306E\u5B50\u5B6B\u306E\u30EC\u30F3\u30C0\u30EA\u30F3\u30B0\u3055\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u3068\u305D\u306E\u30C6\u30AD\u30B9\u30C8\u3078\u306E\u7F72\u540D",
   type: "object",
   properties: {
-    type: { const: "html" },
+    type: { const: "visibleText" },
     url: DpUrl,
     location: DpLocation,
     proof: DpProof
@@ -881,17 +897,6 @@ const DpItem = {
   anyOf: [DpVisibleText, DpText, DpHtml, OgWebsite, Advertisement]
 };
 
-const DpAllowedOrigins = {
-  title: "Allowed Origins",
-  description: "\u5229\u7528\u53EF\u80FD\u306A\u30AA\u30EA\u30B8\u30F3\u306E\u30EA\u30B9\u30C8",
-  type: "array",
-  items: {
-    title: "Allowed Origin",
-    description: "\u5229\u7528\u53EF\u80FD\u306A\u30AA\u30EA\u30B8\u30F3",
-    type: "string"
-  }
-};
-
 const Dp = {
   title: "Document Profile",
   type: "object",
@@ -1424,6 +1429,41 @@ const Profile = {
   anyOf: [Op, Dp]
 };
 
+const Description = {
+  title: "Description",
+  anyOf: [
+    { type: "string" },
+    {
+      type: "object",
+      additionalProperties: true,
+      properties: {
+        text: {
+          type: "string",
+          description: "Text value."
+        },
+        encodingFormat: {
+          type: "string",
+          title: "Encoding format",
+          description: "MIME type. Allowed values: 'text/plain' and 'text/html' (only br, p, ol, ul, li allowed).",
+          enum: ["text/plain", "text/html"]
+        }
+      },
+      required: ["text", "encodingFormat"]
+    }
+  ]
+};
+
+const deprecatedMedia = {
+  type: "string",
+  title: "Web Media Profile"
+};
+const mediaArray = {
+  type: "array",
+  items: {
+    type: "string",
+    title: "Web Media Profile"
+  }
+};
 const OriginatorProfileSetItem = {
   title: "Originator Profile",
   type: "object",
@@ -1442,8 +1482,8 @@ const OriginatorProfileSetItem = {
       }
     },
     media: {
-      title: "Web Media Profile",
-      type: "string"
+      title: "Web Media Profile \u307E\u305F\u306F Web Media Profile \u306E\u914D\u5217",
+      oneOf: [deprecatedMedia, mediaArray]
     }
   },
   required: ["core"]
@@ -1523,12 +1563,21 @@ const SiteProfile = {
       items: OriginatorProfileSetItem,
       minItems: 1
     },
+    sites: {
+      title: "Website Profile \u306E\u914D\u5217",
+      type: "array",
+      items: {
+        type: "string",
+        title: "Website Profile"
+      }
+    },
     credential: {
+      // NOTE: 後方互換性のため 2026-11-01 まで残す。sitesが優先され、存在しない場合にcredentialを使用
       type: "string",
       title: "Credential"
     }
   },
-  required: ["originators", "credential"]
+  required: ["originators"]
 };
 
 const User = {
@@ -1605,21 +1654,7 @@ const subject$1 = {
       required: ["id", "name"]
     },
     description: {
-      title: "\u7D44\u7E54\u306B\u95A2\u3059\u308B\u8AAC\u660E",
-      type: ["string", "object"],
-      properties: {
-        text: {
-          type: "string",
-          description: "Text value."
-        },
-        encodingFormat: {
-          type: "string",
-          title: "Encoding format",
-          description: "MIME type. Allowed values: 'text/plain' and 'text/html' (only br, p, ol, ul, li allowed).",
-          enum: ["text/plain", "text/html"]
-        }
-      },
-      required: ["text", "encodingFormat"]
+      anyOf: [Description, { type: "array", items: Description }]
     }
   },
   required: ["id", "type", "url", "name"]
@@ -1682,7 +1717,7 @@ const subject = {
   properties: {
     id: {
       type: "string",
-      title: "Web \u30B5\u30A4\u30C8\u306E\u30AA\u30EA\u30B8\u30F3 (\u5F62\u5F0F: https://<\u30DB\u30B9\u30C8\u540D>)",
+      description: "It MUST be the Web site URL. If the same content exists on multiple URLs, specify the most representative URL.",
       format: "uri"
     },
     type: {
@@ -1690,12 +1725,12 @@ const subject = {
     },
     name: {
       type: "string",
-      title: "Web \u30B5\u30A4\u30C8\u306E\u540D\u79F0"
+      description: "The name of the Web site."
     },
     image: Image,
     description: {
       type: "string",
-      title: "Web \u30B5\u30A4\u30C8\u306E\u8AAC\u660E"
+      description: "A description of the Web site."
     },
     allowedOrigin: AllowedOrigin
   },
@@ -1728,4 +1763,4 @@ const WebsiteProfile = {
   ]
 };
 
-export { Advertisement, AdvertorialCA, AllowedOrigin, AllowedUrl, ArticleCA, BasicTarget, Certificate, CertificationSystem, ContentAttestation, ContentAttestationSet, ContentAttestationSetItem, CoreProfile, Dp, DpAllowedOrigins, DpHtml, DpItem, DpText, DpVisibleText, ExternalResourceTarget, Image, JapaneseExistenceCertificate, JapaneseExistenceCertificateProperties, Jwk, Jwks, JwtDpPayload, JwtOpPayload, JwtProfilePayload, OgWebsite, Op, OpCertifier, OpCredential, OpHolder, OpItem, OpVc, OpVerifier, OriginatorProfileSet, OriginatorProfileSetItem, Page, Profile, RawTarget, Request, SiteProfile, Target, UnsignedContentAttestation, User, WebMediaProfile, WebsiteProfile };
+export { Advertisement, AdvertorialCA, AllowedOrigin, AllowedUrl, ArticleCA, BasicTarget, Certificate, CertificationSystem, ContentAttestation, ContentAttestationSet, ContentAttestationSetItem, CoreProfile, Description, Dp, DpAllowedOrigins, DpHtml, DpItem, DpText, DpVisibleText, ExternalResourceTarget, Image, JapaneseExistenceCertificate, JapaneseExistenceCertificateProperties, Jwk, Jwks, JwtDpPayload, JwtOpPayload, JwtProfilePayload, OgWebsite, Op, OpCertifier, OpCredential, OpHolder, OpItem, OpVc, OpVerifier, OriginatorProfileSet, OriginatorProfileSetItem, Page, Profile, RawTarget, Request, SiteProfile, Target, UnsignedContentAttestation, User, WebMediaProfile, WebsiteProfile };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@originator-profile/model",
-  "version": "0.4.0-beta.5",
+  "version": "0.5.0-beta.1",
   "license": "Apache-2.0",
   "homepage": "https://docs.originator-profile.org",
   "repository": {
@@ -35,8 +35,8 @@
     "pkgroll": "^2.12.2",
     "typescript": "^5.8.3",
     "vitest": "^4.0.0",
-    "@originator-profile/tsconfig": "0.4.0-beta.5",
-    "eslint-config-originator-profile": "0.4.0-beta.5"
+    "@originator-profile/tsconfig": "0.5.0-beta.1",
+    "eslint-config-originator-profile": "0.5.0-beta.1"
   },
   "scripts": {
     "build": "pkgroll --clean-dist --target=node20",