ddex-json-codec 0.2.0 → 0.3.0

package/dist/index.d.mts

@@ -69,6 +69,7 @@ interface ResourceContributor {
   name: string;
   role: string;
   sequenceNumber?: number;
+  instrumentType?: string;
   /** UserDefined時の属性 */
   roleNamespace?: string;
   roleUserDefinedValue?: string;
@@ -88,16 +89,19 @@ interface Contributor {
 }
 //#endregion
 //#region src/types/image.d.ts
-interface Image {
+interface ImageBase {
   resourceReference: string;
   type?: string;
   imageId?: ImageId;
-  /** 3.8系: territory別の詳細 */
+}
+interface Image38 extends ImageBase {
   detailsByTerritory?: ImageDetailsByTerritory[];
-  /** 4系: フラット */
+}
+interface Image4 extends ImageBase {
   parentalWarningType?: string;
   technicalDetails?: TechnicalImageDetails;
 }
+type Image = Image38 | Image4;
 interface ImageId {
   proprietaryId?: string;
   proprietaryIdNamespace?: string;
@@ -125,25 +129,26 @@ interface HashSum {
 }
 //#endregion
 //#region src/types/sound-recording.d.ts
-interface SoundRecording {
+interface SoundRecordingBase {
   resourceReference: string;
   type?: string;
   soundRecordingId?: SoundRecordingId;
-  referenceTitle?: ReferenceTitle$1;
   displayArtists: DisplayArtist[];
   duration?: string;
   creationDate?: string;
   languageOfPerformance?: string;
   pLine?: PLine;
-  /** 3.8系: territory別の詳細 */
+}
+interface SoundRecording38 extends SoundRecordingBase {
+  referenceTitle?: ReferenceTitle$1;
   detailsByTerritory?: SoundRecordingDetailsByTerritory[];
-  /** 4系: フラットなタイトルテキスト */
+}
+interface SoundRecording4 extends SoundRecordingBase {
   displayTitleText?: string;
-  /** 4系: 複数のDisplayTitle（territory+lang属性） */
   displayTitles?: DisplayTitle[];
-  /** 4系: PartyReference参照のContributor */
   contributors?: Contributor[];
 }
+type SoundRecording = SoundRecording38 | SoundRecording4;
 interface SoundRecordingId {
   isrc?: string;
   catalogNumber?: string;
@@ -157,6 +162,7 @@ interface TechnicalSoundRecordingDetails {
   audioCodecType?: string;
   bitRate?: number;
   bitRateUnit?: string;
+  bitsPerSample?: number;
   numberOfChannels?: number;
   samplingRate?: number;
   samplingRateUnit?: string;
@@ -179,28 +185,30 @@ interface SoundRecordingDetailsByTerritory {
 }
 //#endregion
 //#region src/types/release.d.ts
-interface Release {
+interface ReleaseBase {
   releaseReference: string;
   releaseType?: string;
   releaseId?: ReleaseId;
-  referenceTitle?: ReferenceTitle;
   displayArtists: DisplayArtist[];
   releaseResourceReferences?: ReleaseResourceReference[];
-  resourceGroup?: ResourceGroup;
   duration?: string;
   pLine?: PLine;
   cLine?: CLine;
-  /** 3.8系: territory別の詳細 */
+}
+interface Release38 extends ReleaseBase {
+  referenceTitle?: ReferenceTitle;
   detailsByTerritory?: ReleaseDetailsByTerritory[];
-  /** 4系: フラットなタイトルテキスト */
+  resourceGroup?: ResourceGroup;
+}
+interface Release4 extends ReleaseBase {
   displayTitleText?: string;
-  /** 4系: 複数のDisplayTitle（territory+lang属性） */
   displayTitles?: DisplayTitle[];
-  /** 4系: ReleaseLabelReference（PartyRef値） */
   releaseLabelReferences?: string[];
   genre?: Genre;
   parentalWarningType?: string;
+  resourceGroup?: ResourceGroup;
 }
+type Release = Release38 | Release4;
 interface ReferenceTitle {
   titleText: string;
   subTitle?: string;
@@ -211,6 +219,7 @@ interface ReleaseId {
   isrc?: string;
   gridOrIcpn?: string;
   catalogNumber?: string;
+  catalogNumberNamespace?: string;
   proprietaryId?: string;
 }
 interface ReleaseResourceReference {
@@ -234,9 +243,7 @@ interface TrackRelease {
   referenceTitle?: ReferenceTitle;
   displayArtists?: DisplayArtist[];
   releaseResourceReference: string;
-  /** 4系: 複数のDisplayTitle */
   displayTitles?: DisplayTitle[];
-  /** 4系: ReleaseLabelReference */
   releaseLabelReferences?: string[];
   genre?: Genre;
 }
@@ -289,7 +296,9 @@ interface PriceInformation {
 /**
  * パッチレベルまでのバージョン（namespace URIから検出）
  */
-type ErnVersion = '3.8' | '3.8.1' | '3.8.2' | '3.8.3' | '4.1' | '4.1.1' | '4.2' | '4.3' | '4.3.1' | '4.3.2';
+type ErnVersion38 = '3.8' | '3.8.1' | '3.8.2' | '3.8.3';
+type ErnVersion4 = '4.1' | '4.1.1' | '4.2' | '4.3' | '4.3.1' | '4.3.2';
+type ErnVersion = ErnVersion38 | ErnVersion4;
 /**
  * 変換ロジックの分岐用（メジャー系統のみ）
  */
@@ -308,19 +317,27 @@ interface MessageHeader {
   messageRecipient: MessageParty;
   messageCreatedDateTime: string;
 }
-interface DdexMessage {
-  ernVersion: ErnVersion;
+interface DdexMessageBase {
   messageHeader: MessageHeader;
   updateIndicator?: string;
-  resourceList: SoundRecording[];
-  imageList?: Image[];
-  releaseList: Release[];
+}
+interface DdexMessage38 extends DdexMessageBase {
+  ernVersion: ErnVersion38;
+  resourceList: SoundRecording38[];
+  imageList?: Image38[];
+  releaseList: Release38[];
+  dealList: ReleaseDeal[];
+}
+interface DdexMessage4 extends DdexMessageBase {
+  ernVersion: ErnVersion4;
+  resourceList: SoundRecording4[];
+  imageList?: Image4[];
+  releaseList: Release4[];
   dealList: ReleaseDeal[];
-  /** 4系のみ: PartyList（ラウンドトリップ用に保持） */
   partyList?: Party[];
-  /** 4系のみ: TrackRelease */
   trackReleaseList?: TrackRelease[];
 }
+type DdexMessage = DdexMessage38 | DdexMessage4;
 //#endregion
 //#region src/converter/xml-to-json/index.d.ts
 /**
@@ -346,4 +363,4 @@ declare function jsonToXml(message: DdexMessage, version?: ErnVersion): string;
  */
 declare function detectVersion(xml: string): ErnVersion;
 //#endregion
-export { type Artist, type ArtistRole, type CLine, type Contributor, type DdexMessage, type Deal, type DealTerms, type DisplayArtist, type DisplayTitle, type ErnMajorVersion, type ErnVersion, type FileDetails, type Genre, type HashSum, type Image, type ImageDetailsByTerritory, type ImageId, type IndirectResourceContributor, type MessageHeader, type MessageParty, type PLine, type Party, type Release, type ReleaseDeal, type ReleaseResourceReference, type ResourceContributor, type ResourceGroup, type SoundRecording, type TechnicalImageDetails, type TechnicalSoundRecordingDetails, type TextWithAttribute, type Title, type TrackRelease, type Usage, detectVersion, jsonToXml, xmlToJson };
+export { type Artist, type ArtistRole, type CLine, type Contributor, type DdexMessage, type DdexMessage38, type DdexMessage4, type DdexMessageBase, type Deal, type DealTerms, type DisplayArtist, type DisplayTitle, type ErnMajorVersion, type ErnVersion, type ErnVersion38, type ErnVersion4, type FileDetails, type Genre, type HashSum, type Image, type Image38, type Image4, type ImageBase, type ImageDetailsByTerritory, type ImageId, type IndirectResourceContributor, type MessageHeader, type MessageParty, type PLine, type Party, type PartyName, type Release, type Release38, type Release4, type ReleaseBase, type ReleaseDeal, type ReleaseDetailsByTerritory, type ReleaseId, type ReleaseResourceReference, type ResourceContributor, type ResourceGroup, type SoundRecording, type SoundRecording38, type SoundRecording4, type SoundRecordingBase, type SoundRecordingDetailsByTerritory, type TechnicalImageDetails, type TechnicalSoundRecordingDetails, type TextWithAttribute, type Title, type TrackRelease, type Usage, detectVersion, jsonToXml, xmlToJson };

package/dist/index.mjs

@@ -230,6 +230,7 @@ var Ern38Converter = class {
 			audioCodecType: raw.AudioCodecType ?? void 0,
 			bitRate: bitRate ? Number(typeof bitRate === "string" ? bitRate : bitRate["#text"]) : void 0,
 			bitRateUnit: typeof bitRate === "object" ? bitRate["@_UnitOfMeasure"] ?? void 0 : void 0,
+			bitsPerSample: raw.BitsPerSample ? Number(raw.BitsPerSample) : void 0,
 			numberOfChannels: raw.NumberOfChannels ? Number(raw.NumberOfChannels) : void 0,
 			samplingRate: samplingRate ? Number(typeof samplingRate === "string" ? samplingRate : samplingRate["#text"]) : void 0,
 			samplingRateUnit: typeof samplingRate === "object" ? samplingRate["@_UnitOfMeasure"] ?? void 0 : void 0,
@@ -316,10 +317,19 @@ var Ern38Converter = class {
 			icpn: typeof icpnRaw === "string" ? icpnRaw : icpnRaw["#text"],
 			isEan: typeof icpnRaw === "object" && icpnRaw["@_IsEan"] === "true" ? true : void 0
 		};
+		const catalogNumberRaw = raw.CatalogNumber;
+		let catalogNumber;
+		let catalogNumberNamespace;
+		if (catalogNumberRaw) if (typeof catalogNumberRaw === "string") catalogNumber = catalogNumberRaw;
+		else {
+			catalogNumber = catalogNumberRaw["#text"] ?? void 0;
+			catalogNumberNamespace = catalogNumberRaw["@_Namespace"] ?? void 0;
+		}
 		return {
 			isrc: raw.ISRC ?? void 0,
 			gridOrIcpn: raw.GRid ?? void 0,
-			catalogNumber: raw.CatalogNumber ?? void 0
+			catalogNumber,
+			catalogNumberNamespace
 		};
 	}
 	parseReleaseResourceReferences(raw) {
@@ -455,6 +465,7 @@ var Ern38Converter = class {
 				name: c.PartyName?.FullName ?? "",
 				role,
 				sequenceNumber: c["@_SequenceNumber"] ? Number(c["@_SequenceNumber"]) : void 0,
+				instrumentType: c.InstrumentType ?? void 0,
 				roleNamespace,
 				roleUserDefinedValue
 			};
@@ -510,6 +521,7 @@ var Ern4Converter = class {
 		return {
 			ernVersion: version,
 			messageHeader: this.parseMessageHeader(root.MessageHeader),
+			updateIndicator: root["@_UpdateIndicator"] ?? void 0,
 			resourceList: this.parseSoundRecordings(root.ResourceList),
 			imageList: this.parseImages(root.ResourceList),
 			releaseList: this.parseReleases(root.ReleaseList),
@@ -694,10 +706,19 @@ var Ern4Converter = class {
 		const propId = raw.ProprietaryId;
 		let proprietaryId;
 		if (propId) proprietaryId = typeof propId === "string" ? propId : propId["#text"];
+		const catalogNumberRaw = raw.CatalogNumber;
+		let catalogNumber;
+		let catalogNumberNamespace;
+		if (catalogNumberRaw) if (typeof catalogNumberRaw === "string") catalogNumber = catalogNumberRaw;
+		else {
+			catalogNumber = catalogNumberRaw["#text"] ?? void 0;
+			catalogNumberNamespace = catalogNumberRaw["@_Namespace"] ?? void 0;
+		}
 		return {
 			isrc: raw.ISRC ?? void 0,
 			gridOrIcpn: raw.GRid ?? void 0,
-			catalogNumber: raw.CatalogNumber ?? void 0,
+			catalogNumber,
+			catalogNumberNamespace,
 			proprietaryId
 		};
 	}
@@ -874,6 +895,7 @@ var Ern4Converter = class {
 //#region src/converter/json-to-xml/ern38-builder.ts
 var Ern38Builder = class {
 	build(message, version) {
+		const msg = message;
 		const nsUri = VERSION_NAMESPACE_MAP.get(version);
 		if (!nsUri) throw new Error(`Unknown version: ${version}`);
 		const nsPath = new URL(nsUri).pathname.replace(/^\/xml\//, "");
@@ -882,11 +904,11 @@ var Ern38Builder = class {
 			"@_xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
 			"@_MessageSchemaVersionId": nsPath,
 			"@_xsi:schemaLocation": `${nsUri} ${nsUri}/release-notification.xsd`,
-			MessageHeader: this.buildMessageHeader(message.messageHeader),
-			...message.updateIndicator ? { UpdateIndicator: message.updateIndicator } : {},
-			ResourceList: this.buildResourceList(message.resourceList, message.imageList),
-			ReleaseList: this.buildReleaseList(message.releaseList),
-			DealList: this.buildDealList(message.dealList)
+			MessageHeader: this.buildMessageHeader(msg.messageHeader),
+			...msg.updateIndicator ? { UpdateIndicator: msg.updateIndicator } : {},
+			ResourceList: this.buildResourceList(msg.resourceList, msg.imageList),
+			ReleaseList: this.buildReleaseList(msg.releaseList),
+			DealList: this.buildDealList(msg.dealList)
 		} };
 		return `<?xml version="1.0" encoding="UTF-8"?>\n${new XMLBuilder(BUILDER_OPTIONS).build(root)}`.trimEnd();
 	}
@@ -960,6 +982,7 @@ var Ern38Builder = class {
 			"#text": String(td.bitRate),
 			"@_UnitOfMeasure": td.bitRateUnit
 		} : String(td.bitRate);
+		if (td.bitsPerSample != null) result.BitsPerSample = String(td.bitsPerSample);
 		if (td.numberOfChannels != null) result.NumberOfChannels = String(td.numberOfChannels);
 		if (td.samplingRate != null) result.SamplingRate = td.samplingRateUnit ? {
 			"#text": String(td.samplingRate),
@@ -1044,7 +1067,10 @@ var Ern38Builder = class {
 		const result = {};
 		if (id.isrc) result.ISRC = id.isrc;
 		if (id.gridOrIcpn) result.GRid = id.gridOrIcpn;
-		if (id.catalogNumber) result.CatalogNumber = id.catalogNumber;
+		if (id.catalogNumber) result.CatalogNumber = id.catalogNumberNamespace ? {
+			"#text": id.catalogNumber,
+			"@_Namespace": id.catalogNumberNamespace
+		} : id.catalogNumber;
 		return result;
 	}
 	buildReleaseResourceReference(ref) {
@@ -1139,6 +1165,7 @@ var Ern38Builder = class {
 			"@_UserDefinedValue": c.roleUserDefinedValue
 		};
 		else result.ResourceContributorRole = c.role;
+		if (c.instrumentType) result.InstrumentType = c.instrumentType;
 		return result;
 	}
 	buildIndirectResourceContributor(c) {
@@ -1178,6 +1205,7 @@ var Ern38Builder = class {
 //#region src/converter/json-to-xml/ern4-builder.ts
 var Ern4Builder = class {
 	build(message, version) {
+		const msg = message;
 		const nsUri = VERSION_NAMESPACE_MAP.get(version);
 		if (!nsUri) throw new Error(`Unknown version: ${version}`);
 		const root = { "ern:NewReleaseMessage": {
@@ -1185,11 +1213,12 @@ var Ern4Builder = class {
 			"@_xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
 			"@_xsi:schemaLocation": `${nsUri} ${nsUri}/release-notification.xsd`,
 			"@_LanguageAndScriptCode": "en",
-			MessageHeader: this.buildMessageHeader(message.messageHeader),
-			PartyList: this.buildPartyList(message.partyList ?? []),
-			ResourceList: this.buildResourceList(message.resourceList, message.imageList, version),
-			ReleaseList: this.buildReleaseList(message.releaseList, message.trackReleaseList),
-			DealList: this.buildDealList(message.dealList)
+			...msg.updateIndicator ? { "@_UpdateIndicator": msg.updateIndicator } : {},
+			MessageHeader: this.buildMessageHeader(msg.messageHeader),
+			PartyList: this.buildPartyList(msg.partyList ?? []),
+			ResourceList: this.buildResourceList(msg.resourceList, msg.imageList, version),
+			ReleaseList: this.buildReleaseList(msg.releaseList, msg.trackReleaseList),
+			DealList: this.buildDealList(msg.dealList)
 		} };
 		return `<?xml version="1.0" encoding="UTF-8"?>\n${new XMLBuilder(BUILDER_OPTIONS).build(root)}`.trimEnd();
 	}
@@ -1312,7 +1341,10 @@ var Ern4Builder = class {
 		if (id.isrc) result.ISRC = id.isrc;
 		if (id.gridOrIcpn) result.GRid = id.gridOrIcpn;
 		if (id.proprietaryId) result.ProprietaryId = id.proprietaryId;
-		if (id.catalogNumber) result.CatalogNumber = id.catalogNumber;
+		if (id.catalogNumber) result.CatalogNumber = id.catalogNumberNamespace ? {
+			"#text": id.catalogNumber,
+			"@_Namespace": id.catalogNumberNamespace
+		} : id.catalogNumber;
 		return result;
 	}
 	buildTrackRelease(tr) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ddex-json-codec",
   "type": "module",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "DDEX ERN XML ↔ JSON converter for TypeScript",
   "license": "MIT",
   "author": "kazhs",