@pubid/pubid 0.1.27 → 0.1.29

package/dist/flavors/ecma/index.js

@@ -37,6 +37,9 @@ function ecmaClass(kind) {
     const prefix = KIND_PREFIXES[kind];
     class EcmaKindIdentifier extends BaseIdentifier {
         static polymorphicName = `pubid:ecma:${kind}`;
+        // Ruby Pubid::Ecma declares subset_strict :part: a part-less ECMA
+        // reference means "this document has none", not "any part".
+        static subsetStrict = ["part"];
         static attributes = extendAttributes(BaseIdentifier, {
             number: { type: "string" },
             part: { type: "string" },

package/dist/flavors/ieee/index.js

@@ -320,9 +320,14 @@ class IeeeBuilder {
                 const copubs = Array.isArray(pubData["copublishers"])
                     ? pubData["copublishers"]
                     : [pubData["copublishers"]];
+                // A capture may carry its own separators ("/IEC/ISO" — a joint
+                // token glued to the leading slash); the collection renders
+                // join("/"), so entries hold bare orgs.
                 attributes["copublisher"] = copubs
                     .map((cp) => extractValue(asHash(cp)["copublisher"]))
-                    .filter((cp) => cp !== undefined);
+                    .filter((cp) => cp !== undefined)
+                    .flatMap((c) => c.replace(/^\//, "").split("/"))
+                    .filter((c) => c !== "");
             }
         }
         else if (parsed["publisher"] !== undefined) {
@@ -637,7 +642,15 @@ class IeeeBuilder {
             }
         }
         else {
-            version = extractValue(draftData);
+            // A degraded wire leaf carries the whole draft clause verbatim
+            // ("/D2.1.1" — the three-segment designator the engine cannot
+            // structure): IeeeDraft.parse is the inverse of render, so it
+            // strips the prefix instead of double-appending it.
+            const reparsed = IeeeDraft.parse(extractValue(draftData) ?? "");
+            if (reparsed !== undefined) {
+                attributes["draft"] = reparsed.render();
+                return;
+            }
         }
         // A REV-carrying draft embeds its print date into the designator
         // with the month canonicalized numeric (pubid ruling 2026-10-14):
@@ -1098,7 +1111,10 @@ class IeeeBuilder {
                     // strip it (the #471 separator-in-capture rule). The stored
                     // form keeps the comma so it re-parses through the same tail.
                     const draftYear = (extractValue(parsed["draft_year"]) ?? "").replace(/^[, ]+/, "");
-                    attributes["draft"] = `/D${draftVer}, ${draftYear}`;
+                    // Compose through the render so a designator-word version
+                    // ("ED1") keeps its word instead of concatenating D ("DED1").
+                    attributes["draft"] =
+                        new IeeeDraft({ version: draftVer, year: draftYear }).render();
                     if (parsed["year"] === undefined)
                         delete attributes["year"];
                 }
@@ -1178,7 +1194,21 @@ class IeeeBuilder {
         // the P and keep the joint spelling.
         const numericDraft = parsed["draft_version"] !== undefined &&
             /^\d/.test(extractValue(parsed["draft_version"]) ?? "");
-        if (parsed["iso_published"] !== undefined &&
+        // P + a /D designator (any draft capture) is a DRAFT, never a
+        // printed Std (the owner's 2026-10-24 ruling) -- the joint/
+        // project-draft family owns the row whatever date trails the
+        // designator. The ruling extends to the P-less joint rows
+        // (pubid#597): a numeric /D designator alone is project status
+        // too -- the row is a draft AND takes the P, so the marker is set
+        // below when the source spelling lacked it.
+        const pWithDraft = (parsed["project_marker"] !== undefined || numericDraft) &&
+            (parsed["draft_version"] !== undefined || parsed["draft_iso_stage"] !== undefined ||
+                parsed["draft_month"] !== undefined || parsed["draft_year"] !== undefined);
+        if (pWithDraft && parsed["project_marker"] === undefined) {
+            attributes["project_marker"] = true;
+            parsed["project_marker"] = "P";
+        }
+        if (parsed["iso_published"] !== undefined && !pWithDraft &&
             (parsed["printed_dash_year"] !== undefined || parsed["printed_month_year"] !== undefined ||
                 (numericDraft && parsed["draft_month"] !== undefined) ||
                 (parsed["year"] === undefined && parsed["parameters"] !== undefined &&
@@ -1193,6 +1223,11 @@ class IeeeBuilder {
             if (partVal !== undefined) {
                 printedCode += /^[._-]/.test(partVal) ? partVal : `${sep}${partVal}`;
             }
+            // the subpart carries its separator too (C1 separator-in-capture);
+            // the two-party rows split "-57-1202"-class parts into both
+            const subVal = parsed["subpart"] !== undefined ? extractValue(parsed["subpart"]) : undefined;
+            if (subVal !== undefined && subVal !== "")
+                printedCode += subVal;
             // P = project: the marker is identity, preserved as spelled.
             if (parsed["project_marker"] !== undefined)
                 printedCode = `P${printedCode}`;
@@ -1217,9 +1252,11 @@ class IeeeBuilder {
                 printedAttrs["month"] = attributes["month"];
             }
             else if (parsed["draft_month"] !== undefined) {
-                // The date trails the draft itself; keep it inside the draft so
-                // the code stays date-less.
-                printedDraft = `${printedDraft}, ${extractValue(parsed["draft_month"])} ${extractValue(parsed["draft_year"])}`;
+                // The date trails the draft itself ("D31, Aug 2010"): the
+                // normalization ledger strips the ordinal draft on the printed
+                // joint face and surfaces the date as the printed date.
+                printedAttrs["year"] = extractValue(parsed["draft_year"]);
+                printedAttrs["month"] = extractValue(parsed["draft_month"]);
             }
             const codeObj = IeeeCode.parse(finalCode);
             if (codeObj !== undefined) {
@@ -1254,6 +1291,20 @@ class IeeeBuilder {
         // date-less form ("/D=CD1") elects the same face only when the input
         // spells the designator (the reference's original_input gate) — the
         // stage-first rows keep their ISO rendering.
+        // The designation route ("IEEE P24748-4/D=FDIS") has no
+        // publishers group; IEEE is the sole publisher of the D=
+        // designator face, and the elections below read the builder-local
+        // slots.
+        if (attributes["publisher"] === undefined)
+            attributes["publisher"] = "IEEE";
+        if (attributes["copublisher"] === undefined)
+            attributes["copublisher"] = [];
+        // The model rebuilds publishers from publisher+copublisher when
+        // the publishers group is absent (the reference initialize).
+        if (attributes["publishers"] === undefined) {
+            attributes["publishers"] = [attributes["publisher"],
+                ...(attributes["copublisher"] ?? [])];
+        }
         const dEqInput = this.originalInput.includes("/D=");
         const stageWordForGate = extractValue(parsed["iso_stage"]) ?? "";
         if (parsed["iso_stage"] !== undefined &&
@@ -1284,6 +1335,29 @@ class IeeeBuilder {
             if (!bareIeeeProject)
                 attributes["lead_party"] = "ISO";
             let stageAbbr = extractValue(parsed["iso_stage"]);
+            // The bare-IEEE project row carries the stage on the D=
+            // designator with the IEEE date convention ("D=FDIS-201008",
+            // pubid#203); the ISO stage-word face is not elected.
+            if (bareIeeeProject && parsed["draft_stage_year"] === undefined) {
+                let date = "";
+                const y = attributes["year"];
+                const m = String(attributes["month"] ?? "");
+                if (y !== undefined) {
+                    date = `-${y}`;
+                    if (m !== "") {
+                        const monthNum = /^\d+$/.test(m) ? Number(m) : DRAFT_MONTH_NAMES[String(m).replace(/\.$/, "")];
+                        if (monthNum !== undefined)
+                            date += String(monthNum).padStart(2, "0");
+                    }
+                }
+                attributes["ieee_draft"] = `D=${stageAbbr}${date}`;
+                const record = stageAbbr !== undefined ? locateStage(stageAbbr) : undefined;
+                if (record !== undefined)
+                    attributes["typed_stage"] = new IeeeTypedStage(record);
+                attributes["lead_party"] = "IEEE";
+                delete attributes["year"];
+                delete attributes["month"];
+            }
             // The IEC "/V<version>" iteration rides glued onto the stage word
             // ("_CDV/V3" -> "CDV3") — the family's lossless spelling (the
             // reference's builder, pubid#477).
@@ -1347,8 +1421,11 @@ class IeeeBuilder {
                     projectAttrs[k] = attributes[k];
                 }
             }
-            if (parsed["project_marker"] !== undefined)
-                projectAttrs["project_marker"] = true;
+            // The ruling (pubid#597): a joint row with a numeric /D designator
+            // is a draft AND takes the P project marker, whatever the source
+            // spelling printed -- the marker rides the identifier even when
+            // the row reached it without one.
+            projectAttrs["project_marker"] = true;
             if (pubs.length > 0) {
                 projectAttrs["publisher"] = pubs[0];
                 if (pubs.length > 1)
@@ -1364,8 +1441,17 @@ class IeeeBuilder {
         // builds the base [ISO, IEC, IEEE], lead ISO); the CD-stage rows and
         // the IEEE-led project rows preserve the printed order (P90003 stays
         // IEEE/ISO/IEC).
+        // The reorder is the PUBLISHED stage-less doctrine (pubid#317)
+        // only: the project rows (the P marker) and every draft-bearing
+        // row keep the printed publisher order (the 2026-10-24 corpus
+        // faces, pubid#595).
+        const draftBearing = parsed["project_marker"] !== undefined ||
+            parsed["draft_version"] !== undefined ||
+            parsed["draft"] !== undefined ||
+            parsed["draft_iso_stage"] !== undefined ||
+            parsed["draft_stage_year"] !== undefined;
         if (parsed["iso_published"] !== undefined && parsed["iso_stage"] === undefined &&
-            Array.isArray(attributes["publishers"])) {
+            !draftBearing && Array.isArray(attributes["publishers"])) {
             const pubs = attributes["publishers"];
             attributes["publishers"] = [...pubs.filter((p) => p !== "IEEE"), ...pubs.filter((p) => p === "IEEE")];
             attributes["publisher"] = attributes["publishers"][0];

package/dist/flavors/ieee/model.js

@@ -222,7 +222,12 @@ export class IeeeDraft {
         });
     }
     render() {
-        let result = `/D${this.version ?? ""}`;
+        // A version that already opens with a designator word ("ED4", the
+        // IEC edition-draft ordinal; an ISO/IEC stage token such as
+        // "FDIS_March") renders verbatim — prepending D concatenates a
+        // hallucinated token ("DED4", "DFDIS") that no face spells.
+        const designatorVerbatim = /^(ED\d|(FDIS|FCD|CDV|DIS|CD|WD|PWI|NP))/.test(this.version);
+        let result = designatorVerbatim ? `/${this.version}` : `/D${this.version}`;
         if (this.isoStage !== undefined)
             result += `=${this.isoStage}`;
         if (this.isoStage !== undefined && this.isoIteration !== undefined) {
@@ -487,12 +492,17 @@ export function renderIeeeBase(id) {
     }
     if (id.draft_status !== undefined)
         parts.push(id.draft_status);
-    const shouldRenderType = /^(IEEE|AIEE)/.test(id.publisher ?? "");
+    const isProjectDraft = id.constructor.polymorphicName ===
+        "pubid:ieee:project-draft-identifier";
+    // A project draft carries the word Draft whatever the lead
+    // publisher -- the ISO-led joint drafts (pubid#597) print it too.
+    const shouldRenderType = /^(IEEE|AIEE)/.test(id.publisher ?? "") || isProjectDraft;
     const stageObj = id.typed_stage;
     if (shouldRenderType && !(stageObj?.projectStatus === true) &&
-        id.type !== undefined && id.type.trim() !== "" && id.type !== "P" &&
+        ((id.type !== undefined && id.type.trim() !== "" && id.type !== "P") ||
+            isProjectDraft) &&
         !/unapproved/i.test(id.draft_status ?? "")) {
-        let typeStr = id.type;
+        let typeStr = id.type ?? "Draft";
         if (typeStr.startsWith("P"))
             typeStr = typeStr.slice(1);
         // A draft carries the word Draft alone in every face (the C2

package/dist/flavors/iso/model.d.ts

@@ -40,6 +40,10 @@ export declare class IsoEdition extends Component {
     toWire(): Record<string, unknown>;
 }
 export declare abstract class IsoIdentifier extends BaseIdentifier {
+    /** The typed-stage state joins the match (the published default is
+     * stated: ISO 9004 does not match ISO/DIS 9004) but never the wire
+     * hash — the attribute table drives toHash, so it is named here. */
+    static subsetAttributes: string[];
     static attributes: import("../../model/attribute.js").AttributeTable;
     readonly number: string | undefined;
     readonly part: string | undefined;
@@ -75,7 +79,16 @@ export declare abstract class IsoIdentifier extends BaseIdentifier {
 /** identifier.rb's base key_value block (the single-document whitelist). */
 export declare const ISO_MAPPINGS: FieldMapping[];
 /** The ISO Publisher component: "ISO/IEC/IEEE". */
-export declare class IsoPublisher {
+export declare class IsoPublisher extends Component {
+    static attributes: {
+        publisher: {
+            type: string;
+        };
+        copublisher: {
+            type: string;
+            collection: boolean;
+        };
+    };
     readonly publisher: string;
     readonly copublisher: string[] | undefined;
     constructor(attrs: {
@@ -83,6 +96,7 @@ export declare class IsoPublisher {
         copublisher?: unknown;
     });
     render(): string;
+    toWire(): Record<string, unknown>;
 }
 /** Single documents (everything except supplements, TcDocument, Bundled). */
 export declare abstract class IsoSingleIdentifier extends IsoIdentifier {

package/dist/flavors/iso/model.js

@@ -60,6 +60,10 @@ export class IsoEdition extends Component {
     }
 }
 export class IsoIdentifier extends BaseIdentifier {
+    /** The typed-stage state joins the match (the published default is
+     * stated: ISO 9004 does not match ISO/DIS 9004) but never the wire
+     * hash — the attribute table drives toHash, so it is named here. */
+    static subsetAttributes = ["typedStageState"];
     static attributes = extendAttributes(BaseIdentifier, {
         number: { type: "string" },
         part: { type: "string" },
@@ -275,10 +279,15 @@ const stageMapping = () => ({
     },
 });
 /** The ISO Publisher component: "ISO/IEC/IEEE". */
-export class IsoPublisher {
+export class IsoPublisher extends Component {
+    static attributes = {
+        publisher: { type: "string" },
+        copublisher: { type: "string", collection: true },
+    };
     publisher;
     copublisher;
     constructor(attrs) {
+        super();
         this.publisher = attrs.publisher === undefined || attrs.publisher === null ? "ISO" : String(attrs.publisher);
         this.copublisher = Array.isArray(attrs.copublisher) ? attrs.copublisher.map(String) : [];
     }
@@ -287,6 +296,12 @@ export class IsoPublisher {
             return this.publisher;
         return this.publisher + this.copublisher.map((cp) => `/${cp}`).join("");
     }
+    toWire() {
+        return {
+            publisher: this.publisher,
+            ...(this.copublisher && this.copublisher.length > 0 ? { copublisher: this.copublisher } : {}),
+        };
+    }
 }
 /** Single documents (everything except supplements, TcDocument, Bundled). */
 export class IsoSingleIdentifier extends IsoIdentifier {

package/dist/index.d.ts

@@ -7,3 +7,4 @@ export { PendingRegistry } from "./conformance/pending.js";
 export { checkCase, runFlavor, runCorpus } from "./conformance/runner.js";
 export { corpusModeImplementation, CorpusBackedIdentifier } from "./implementations/corpus-mode.js";
 export { grammarImplementation } from "./flavors/index.js";
+export { subsetMatch, valueMatch, exactMatch } from "./model/subset-match.js";

package/dist/index.js

@@ -7,3 +7,4 @@ export { corpusModeImplementation, CorpusBackedIdentifier } from "./implementati
 // Root re-export so consumers needn't deep-import flavor modules
 // (pubid/pubid-ts#63 - the estate serving codec).
 export { grammarImplementation } from "./flavors/index.js";
+export { subsetMatch, valueMatch, exactMatch } from "./model/subset-match.js";

package/dist/model/subset-match.js

@@ -121,7 +121,8 @@ export function subsetMatch(reference, candidate) {
             ? ALL_PARTS_ATTRIBUTES
             : []),
     ]);
-    return Object.keys(ctor.attributes).every((name) => {
+    const names = [...Object.keys(ctor.attributes), ...(ctor.subsetAttributes ?? [])];
+    return names.every((name) => {
         if (ignored.has(name))
             return true;
         const mine = reference[name];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pubid/pubid",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "TypeScript PubID identifiers: resolution, normalization and canonical hashes for every identifier in the pubid-testsuite corpus (41 standards bodies), with a conformance runner mirroring the Ruby reference",
   "type": "module",
   "license": "MIT",