@pubid/pubid 0.1.34 → 0.1.36

package/dist/flavors/api/grammar.js

@@ -53,9 +53,16 @@ function buildRules() {
     rule("typeless_identifier", () => ref(rules, "publisher")
         .then(docTail())
         .then(ref(rules, "reaffirmation").maybe()));
-    rule("second_identifier", () => ref(rules, "doc_type")
+    rule("second_identifier", () => 
+    // The reference's grammar binds the second side's captures under
+    // second_* names (second_type/second_number/second_part), so the
+    // builder can fold first+second and let the second side overwrite.
+    ref(rules, "doc_type").as("second_type")
         .then(ref(rules, "space"))
-        .then(docTail()));
+        .then(match("[0-9A-Z]").repeat(1, Infinity).as("second_number")
+        .then((ref(rules, "dash").then((match("[0-9A-Z]").repeat(1, Infinity)).as("second_part"))).maybe())
+        .then(ref(rules, "part_notation").maybe())
+        .then(ref(rules, "date_dash").or(ref(rules, "date_colon")).maybe())));
     rule("combined_identifier", () => ref(rules, "mpms_identifier")
         .or(ref(rules, "typed_identifier"))
         .or(ref(rules, "typeless_identifier"))

package/dist/flavors/api/index.js

@@ -52,13 +52,42 @@ function assignAttributes(identifier, data) {
             self[key] = realized;
     }
 }
+// The bound grammar wraps the combined form's first/second identifiers
+// under "first"/"second"; the reference folds both wrappers into one
+// hash in parse order, so the second side's number/part/year overwrite
+// the first's — and select_class saw no top-level :type, so a combined
+// form always built the typeless class. Reproduce both.
+const SECOND_KEYS = ["second_number", "second_part", "second_year", "second_type"];
+const SECOND_OVERWRITES = {
+    second_number: "number",
+    second_part: "part",
+    second_year: "year",
+};
+function unflattenCombined(data) {
+    if (!SECOND_KEYS.some((k) => k in data))
+        return data;
+    const out = { ...data };
+    delete out["type"];
+    for (const [source, target] of Object.entries(SECOND_OVERWRITES)) {
+        if (source in out)
+            out[target] = out[source];
+    }
+    return out;
+}
 export function buildApiIdentifier(tree) {
     const data = flatten(tree);
-    const typeStr = strv(data["type"]);
+    const first = isObj(data["first"]) ? data["first"] : undefined;
+    const second = isObj(data["second"]) ? data["second"] : undefined;
+    // Parse-order fold: the first side's captures, then the second's.
+    const combined = { ...data, ...(first ?? {}), ...(second ?? {}) };
+    delete combined["first"];
+    delete combined["second"];
+    const unflattened = unflattenCombined(combined);
+    const typeStr = strv(unflattened["type"]);
     const klass = (typeStr !== undefined ? TYPE_CLASS_MAP[typeStr] : undefined)
         ?? TypelessStandardClass;
     const identifier = new klass();
-    assignAttributes(identifier, data);
+    assignAttributes(identifier, unflattened);
     return identifier;
 }
 export function apiGrammarImplementation() {

package/dist/flavors/bipm/index.js

@@ -4,13 +4,14 @@ import { BaseIdentifier, registerType } from "../../model/identifier.js";
 import { extendAttributes, keyValue } from "../../model/attribute.js";
 import { BaseUrnGenerator } from "../../model/urn-generator.js";
 /**
- * 1:1 port of lib/pubid/bipm/ — 90 corpus rows across six families:
+ * 1:1 port of lib/pubid/bipm/ — corpus rows across six families:
  * committee documents (REC/RES/DECN/ACT/DECL in short and long EN/FR
- * forms), meetings (EN ordinals, FR <sup>e</sup> réunion), the
- * Metrologia journal, the SI Brochure and its derived products, mises
- * en pratique (incl. Rapport BIPM-YYYY/NN), and CC guides. Historic
- * group names (CCDS) and two-letter language codes (EN/FR) normalize
- * at parse time and never reach the hash.
+ * forms, with the appendix/annex complement and the publisher-prefixed
+ * decision spelling), meetings (EN ordinals and double-dash forms, FR
+ * <sup>e</sup> réunion), the Metrologia journal, the SI Brochure and
+ * its derived products, mises en pratique (incl. Rapport BIPM-YYYY/NN),
+ * and CC guides. Historic group names (CCDS) and two-letter language
+ * codes (EN/FR) normalize at parse time and never reach the hash.
  */
 const GROUPS = [
     "CIPM", "CGPM", "JCRB", "CCTF", "CCQM", "CCT", "CCL", "CCAUV",
@@ -66,15 +67,31 @@ function buildRules() {
     const connective = () => str("de la").or(str("du"));
     const ordinal = () => str("st").or(str("nd"), str("rd"), str("th"));
     const meetingWordFr = () => str("Réunion").or(str("réunion"));
-    // The trailing date is optional so "CCTF REC 2" parses date-less.
+    // The trailing date is optional so "CCTF REC 2" parses date-less. The
+    // appendix/annex complement tail ("CIPM DECN 112 A3.5 (2022, F)")
+    // rides the number: "A" + digits [ "." + digits ].
     rule("committee_short", () => rules["group"]
-        .then(space, rules["type_abbrev"], space.then(rules["number"]).maybe(), space.then(rules["year_paren"]).maybe())
+        .then(space, rules["type_abbrev"], space.then(rules["number"], space
+        .then(str("A").then(digits.as("appendix"), str(".").then(digits.as("annex")).maybe()))
+        .maybe()).maybe(), space.then(rules["year_paren"]).maybe())
         .as("committee_short"));
+    // The publisher-prefixed decision form the corpus cites
+    // ("BIPM DECN CIPM/101-1 (2012, EN)"): a literal BIPM publisher lead,
+    // the outcome type, then the body-qualified resource-specific-id
+    // "{body}/{id}". It names the same document as the unprefixed
+    // "<body> <TYPE> <id>" form, so the builder dispatches it through the
+    // same CommitteeDocument path.
+    rule("committee_prefixed", () => str("BIPM")
+        .then(space, rules["type_abbrev"], space, rules["group"], str("/"), rules["number"], space.then(rules["year_paren"]).maybe())
+        .as("committee_prefixed"));
     rule("committee_long_en", () => rules["group"]
         .then(space, rules["type_name_en"], space.then(rules["number"]).maybe(), space.then(rules["year_paren_nolang"]).maybe())
         .as("committee_long_en"));
     rule("committee_long_fr", () => rules["type_name_fr"]
         .then(space.then(rules["number"]).maybe(), space, connective(), space, rules["group"], space.then(rules["year_paren_nolang"]).maybe())
+        // The corpus-cited French body-qualified form ("Décision
+        // CIPM/101-1 (2012)").
+        .or(rules["type_name_fr"].then(space, rules["group"], str("/"), rules["number"], space.then(rules["year_paren_nolang"]).maybe()))
         .as("committee_long_fr"));
     // Loose consumer form: a French type name in group-leading order.
     rule("committee_group_fr", () => rules["group"]
@@ -87,6 +104,9 @@ function buildRules() {
     rule("meeting_en", () => rules["group"]
         .then(space, rules["number"], ordinal(), space, str("Meeting"), space.then(rules["year_paren"]).maybe())
         .or(rules["group"].then(space, str("Meeting"), space, rules["number"], space.then(rules["year_paren"]).maybe()))
+        // The double-dash consumer spellings ("CGPM -- Meeting 1 (1889)").
+        .or(rules["group"].then(space, str("--"), space, rules["number"], ordinal(), space, str("Meeting"), space.then(rules["year_paren"]).maybe()))
+        .or(rules["group"].then(space, str("--"), space, str("Meeting"), space, rules["number"], space.then(rules["year_paren"]).maybe()))
         .as("meeting_en"));
     rule("meeting_fr", () => rules["group"]
         .then(space, rules["number"], str("<sup>e</sup>"), space, str("réunion"), space.then(rules["year_paren"]).maybe())
@@ -102,10 +122,23 @@ function buildRules() {
     rule("edition", () => digits.then(str("e")).as("edition"));
     rule("version", () => str("v").then(match("[0-9.]").repeat(1, Infinity)).as("version"));
     rule("years", () => digits.then(str("/").then(digits).maybe()).as("years"));
-    rule("si_brochure", () => str("BIPM SI Brochure")
+    rule("si_brochure", () => 
+    // The guide's French publication identifier leads with
+    // "Brochure sur le SI" instead of the English brochure name; all
+    // three leads render in the canonical "BIPM SI Brochure …" spelling.
+    str("BIPM SI Brochure")
         .or(str("SI Brochure"))
-        .then(space, str("sur le SI").then(space).maybe(), rules["edition"], space, rules["version"], space, str("("), rules["years"], str(", "), lang(), str(")"))
+        .or(str("Brochure sur le SI"))
+        .then(space, str("sur le SI").then(space).maybe(), rules["edition"], 
+    // The version and the language code are optional (the guide's
+    // language-independent form, "SI Brochure 9e (2019, E)").
+    space.then(rules["version"]).maybe(), space, str("("), rules["years"], str(", ").then(lang()).maybe(), str(")"))
         .as("si_brochure"));
+    // The corpus-cited ordinal-edition spelling ("SI Brochure 9th edition
+    // (2019)") normalizes the English ordinal onto the canonical "9e".
+    rule("si_brochure_ordinal_edition", () => str("SI Brochure")
+        .then(space, digits.then(ordinal()).as("ordinal_edition"), space, str("edition"), space.then(rules["year_paren"]).maybe())
+        .as("si_brochure_ordinal_edition"));
     rule("brochure_variant", () => str("Appendix")
         .then(space, digits)
         .or(str("Concise"), str("FAQ"))
@@ -134,7 +167,7 @@ function buildRules() {
         .or(guideBody())
         .as("guide"));
     rule("group_leading", () => rules["meeting_en"].or(rules["meeting_fr"], rules["committee_short"], rules["committee_long_en"], rules["committee_group_fr"], rules["committee_bare"]));
-    rule("identifier", () => rules["metrologia"].or(rules["si_brochure"], rules["si_brochure_variant"], rules["si_brochure_section"], rules["mep"], rules["guide"], rules["committee_long_fr"], rules["group_leading"]));
+    rule("identifier", () => rules["metrologia"].or(rules["si_brochure"], rules["si_brochure_variant"], rules["si_brochure_section"], rules["si_brochure_ordinal_edition"], rules["mep"], rules["guide"], rules["committee_long_fr"], rules["committee_prefixed"], rules["group_leading"]));
     rule("root", () => rules["identifier"]);
     return rules;
 }
@@ -183,6 +216,16 @@ function ordinalSuffix(number) {
 function frenchConnective(group) {
     return group === "CGPM" ? "de la" : "du";
 }
+/** The appendix/annex complement folds into the identifier segment as
+ *  "-a{appendix}[.{annex}]" (ruby committee_number_segment); a bare
+ *  number is digits and dashes only, so the suffix is unambiguous. */
+function committeeNumberSegment(id) {
+    if (id.number === undefined)
+        return "";
+    if (id.appendix === undefined)
+        return id.number;
+    return `${id.number}-a${id.appendix}${id.annex === undefined ? "" : `.${id.annex}`}`;
+}
 export class BipmIdentifier extends BaseIdentifier {
     static attributes = extendAttributes(BaseIdentifier, BIPM_ATTRS);
     static mappings = BIPM_MAPPINGS;
@@ -205,7 +248,7 @@ class BipmUrnGenerator extends BaseUrnGenerator {
         if (id instanceof BipmCommitteeDocument) {
             const parts = [
                 "urn", "bipm", id.group?.toLowerCase() ?? "",
-                id.type_code?.toLowerCase() ?? "", id.number ?? "",
+                id.type_code?.toLowerCase() ?? "", committeeNumberSegment(id),
             ];
             if (id.year !== undefined)
                 parts.push(String(id.year));
@@ -248,7 +291,15 @@ class BipmCommitteeDocument extends BipmIdentifier {
         }
         const lang = this.language === undefined ? "" : `, ${this.language}`;
         const type = this.type_code === undefined ? "" : ` ${this.type_code}`;
-        return `${this.group ?? ""}${type}${this.numberSegment()}${this.yearSegment(lang)}`;
+        return `${this.group ?? ""}${type}${this.numberSegment()}${this.appendixSegment()}${this.yearSegment(lang)}`;
+    }
+    /** The complement tail "{identifier} A{appendix}[.{annex}]" — parts and
+     *  subparts are dash forms inside `number` itself; appendices and
+     *  annexes are this separate tail. */
+    appendixSegment() {
+        if (this.appendix === undefined)
+            return "";
+        return ` A${this.appendix}${this.annex === undefined ? "" : `.${this.annex}`}`;
     }
 }
 registerType(BipmCommitteeDocument);
@@ -294,7 +345,8 @@ class BipmSiBrochure extends BipmIdentifier {
         }
         const phrase = this.language === "F" ? "sur le SI " : "";
         const lang = this.language === undefined ? "" : `, ${this.language}`;
-        return `BIPM SI Brochure ${phrase}${this.edition} ${this.version} (${this.years}${lang})`;
+        const version = this.version === undefined ? "" : ` ${this.version}`;
+        return `BIPM SI Brochure ${phrase}${this.edition}${version} (${this.years}${lang})`;
     }
 }
 registerType(BipmSiBrochure);
@@ -336,6 +388,12 @@ class BipmBuilder {
         };
         if (tree["committee_short"] !== undefined)
             return this.buildCommittee(node("committee_short"), "short");
+        if (tree["committee_prefixed"] !== undefined) {
+            // The corpus's "BIPM DECN CIPM/101-1 (2012, EN)" publisher-prefixed
+            // spelling names the same document as the unprefixed short form; the
+            // BIPM lead is the constant publisher, so it carries no attribute.
+            return this.buildCommittee(node("committee_prefixed"), "short");
+        }
         if (tree["committee_long_en"] !== undefined)
             return this.buildCommittee(node("committee_long_en"), "long", "E");
         if (tree["committee_bare"] !== undefined)
@@ -373,6 +431,21 @@ class BipmBuilder {
             const n = node("si_brochure_section");
             return new BipmSiBrochure({ part: s(n["part"]) });
         }
+        if (tree["si_brochure_ordinal_edition"] !== undefined) {
+            // The guide prints the edition "9e"; the corpus-cited "9th edition"
+            // spelling is the English ordinal form of the same edition,
+            // normalized onto the canonical "9e" value. The version is absent
+            // from the input, so it stays nil and drops from the hash.
+            const n = node("si_brochure_ordinal_edition");
+            const edition = `${(s(n["ordinal_edition"]) ?? "").replace(/(st|nd|rd|th)$/, "")}e`;
+            const year = s(n["year"]);
+            return new BipmSiBrochure({
+                number: edition,
+                edition,
+                ...(year !== undefined ? { years: year } : {}),
+                language: normalizeLanguage(s(n["language"])),
+            });
+        }
         if (tree["mep"] !== undefined) {
             const n = node("mep");
             const mepCode = s(n["mep_code"]);
@@ -407,6 +480,8 @@ class BipmBuilder {
             ...(year !== undefined ? { year: Number(year) } : {}),
             language: normalizeLanguage(language ?? s(n["language"])),
             form,
+            appendix: s(n["appendix"]),
+            annex: s(n["annex"]),
         });
     }
     buildMeeting(n, language) {

package/dist/flavors/iec/index.js

@@ -133,12 +133,16 @@ class IecBuilder {
         const kind = typedStage.typeCode === "wp" ? "is" : typedStage.typeCode;
         const attrs = {};
         this.commonAttrs(tree, attrs);
-        // TRF with an embedded CISPR document: the CISPR number is runtime-only
-        // (hash carries just year/publisher; the URN names the CISPR document).
+        // TRF with an embedded CISPR document: the form itself has no number
+        // — the document it reports on is built as the nested identifier and
+        // serializes under `cispr_identifier` (pubid#687). The runtime
+        // columns stay for the renderer and the official-URN slot.
         if (tree["trf_org"] !== undefined) {
             const cisprComponents = numberComponents(tree["number_with_part"]);
             attrs["cispr_number"] = cisprComponents["number"];
             attrs["cispr_part"] = cisprComponents["part"];
+            const cispr = new IEC_CLASSES.KIND_CLASSES["is"]({ publisher: "CISPR", ...cisprComponents });
+            attrs["cispr_identifier"] = cispr;
             delete attrs["number"];
             delete attrs["part"];
             delete attrs["subpart"];
@@ -300,9 +304,14 @@ class IecBuilder {
         });
     }
     buildWorkingProgramme(tree) {
+        // The grammar captures a trailing space on wp_type ("PWI TR 100-36"
+        // -> "TR "); ruby strips it at the construction site (its builder's
+        // :wp_type cast) so the stored value — and the hash and URN — is the
+        // stripped form, an all-space value dropping out entirely.
+        const wpTypeRaw = s(tree["wp_type"])?.replace(/\s+$/, "");
         const attrs = {
             wp_stage: s(tree["wp_stage"]),
-            wp_type: s(tree["wp_type"]),
+            wp_type: wpTypeRaw === "" ? undefined : wpTypeRaw,
         };
         if (tree["wp_raw"] !== undefined) {
             // TC-style name ("SyCCOMM-1"): split the trailing number as the part.
@@ -329,7 +338,9 @@ class IecBuilder {
     buildWorkingDocument(tree) {
         const attrs = {
             technical_committee: s(tree["technical_committee"]),
-            wd_number: s(tree["wd_number"]),
+            // The document number is the inherited `number` (pubid#687: the
+            // parallel wd_number slot used to serialize nowhere).
+            number: s(tree["wd_number"]),
             wd_language: s(tree["wd_language"]),
             wd_stage: s(tree["wd_stage"]),
         };

package/dist/flavors/iec/model.js

@@ -190,7 +190,10 @@ function iecSingleClass(kind) {
     registerType(IecSingleIdentifier);
     return IecSingleIdentifier;
 }
-/** Working documents: the TC/wd fields are runtime-only (hash is bare). */
+/** Working documents: the committee/number/language/stage identity
+ *  serializes (pubid#687) — the document number is the inherited
+ *  `number`, and the five plain strings sit in the hash under their own
+ *  keys (ruby WorkingDocument's key_value block, render_default off). */
 function iecWorkingDocumentClass() {
     class IecWorkingDocument extends IecIdentifier {
         static polymorphicName = "pubid:iec:working-document";
@@ -199,11 +202,10 @@ function iecWorkingDocumentClass() {
             wp_stage: { type: "string" },
             wp_type: { type: "string" },
             technical_committee: { type: "string" },
-            wd_number: { type: "string" },
             wd_language: { type: "string" },
             wd_stage: { type: "string" },
         });
-        static mappings = keyValue({ wire: "number", to: "number" }, { wire: "part", to: "part" }, { wire: "subpart", to: "subpart" }, { wire: "edition", to: "edition" });
+        static mappings = keyValue({ wire: "number", to: "number" }, { wire: "part", to: "part" }, { wire: "subpart", to: "subpart" }, { wire: "edition", to: "edition" }, { wire: "technical_committee", to: "technical_committee" }, { wire: "wd_language", to: "wd_language" }, { wire: "wd_stage", to: "wd_stage" }, { wire: "wp_stage", to: "wp_stage" }, { wire: "wp_type", to: "wp_type" });
         render() {
             if (this.wp_stage !== undefined) {
                 const parts = [this.wp_stage];
@@ -225,8 +227,8 @@ function iecWorkingDocumentClass() {
             const parts = [];
             if (this.technical_committee !== undefined)
                 parts.push(this.technical_committee);
-            if (this.wd_number !== undefined) {
-                let numPart = this.wd_number;
+            if (this.number !== undefined) {
+                let numPart = String(this.number);
                 if (this.wd_language !== undefined)
                     numPart += `(${this.wd_language})`;
                 parts.push(numPart);
@@ -249,6 +251,10 @@ function iecTrfClass() {
             cispr_number: { type: "string" },
             cispr_part: { type: "string" },
             trf_info: { type: "string" },
+            // The embedded CISPR document is part of the form's identity and
+            // serializes under its own key (pubid#687), dispatching on the
+            // nested _type like ruby's polymorphic attribute.
+            cispr_identifier: { type: IecIdentifier },
         });
         static mappings = keyValue({ wire: "number", to: "number" }, { wire: "part", to: "part" }, { wire: "subpart", to: "subpart" }, { wire: "year", to: "date", toWire: (m) => m["date"]?.year, fromWire: yearFromWire }, { wire: "month", to: "date", toWire: (m) => m["date"]?.month, fromWire: () => undefined }, { wire: "day", to: "date", toWire: (m) => m["date"]?.day, fromWire: () => undefined }, {
             wire: "publisher",
@@ -263,13 +269,23 @@ function iecTrfClass() {
                 return list !== undefined && list.length > 0 ? list : undefined;
             },
             fromWire: (h) => (Array.isArray(h["copublishers"]) ? h["copublishers"].map(String) : undefined),
-        });
+        }, { wire: "cispr_identifier", to: "cispr_identifier" });
         render() {
             let result = this.publisherPortion() + " ";
-            if (this.cispr_number !== undefined) {
-                let numStr = this.cispr_number;
-                if (this.cispr_part !== undefined && this.cispr_part !== "")
-                    numStr += `-${this.cispr_part}`;
+            // The parse path carries the CISPR document in the runtime columns;
+            // a fromHash-built form carries the nested identifier — read the
+            // document from whichever one is set (ruby renderer).
+            const cispr = this.cispr_identifier;
+            const cisprNumber = this.cispr_number ??
+                (cispr?.number === undefined || cispr.number === null ? undefined : String(cispr.number));
+            const cisprPart = this.cispr_part ??
+                (cispr?.part === undefined || cispr.part === null || cispr.part === ""
+                    ? undefined
+                    : String(cispr.part));
+            if (cisprNumber !== undefined) {
+                let numStr = cisprNumber;
+                if (cisprPart !== undefined && cisprPart !== "")
+                    numStr += `-${cisprPart}`;
                 let cisprStr = `CISPR ${numStr}`;
                 if (this.date !== undefined)
                     cisprStr += `:${this.date.render()}`;

package/dist/flavors/ieee/model.js

@@ -227,10 +227,18 @@ export class IeeeDraft {
         // are accepted aliases. Captures [stage, iteration]. The iteration
         // ordinal stays short (one or two digits): a glued D= date
         // ("-201908", the pubid#203 convention) must ride the version body
-        // verbatim, not fold into the iteration slot.
-        const compound = /=D?(PWI|NP|WD|CDV|FDIS|DIS|CD)(\d{1,2}[a-z]?)?(?:[.-](\d{1,2}[a-z]?))?$/;
+        // verbatim, not fold into the iteration slot. The glued designator
+        // date decomposes ("-201908" -> year + zero-padded month): the
+        // reference's builder carries it on the parse-path Draft object
+        // (iso_stage + year + month), and the render's stage-draft guard
+        // reads the stage — a re-parse that kept it in the version body
+        // would print the type word the designator face never takes.
+        // FCD rides the stage list (the ECHO_SUFFIX spelling).
+        const compound = /=D?(PWI|NP|WD|CDV|FDIS|FCD|DIS|CD)(\d{1,2}[a-z]?)?(?:[.-](\d{1,2}[a-z]?))?(?:-(\d{4})(\d{2}))?$/;
         let isoStage;
         let isoIteration;
+        let glueYear;
+        let glueMonth;
         const cm = compound.exec(body);
         if (cm !== null) {
             // The glued digits ride the STAGE ("D=CD1", matching the reference's
@@ -238,6 +246,8 @@ export class IeeeDraft {
             // ".iter" slot ("=DIS.3").
             isoStage = cm[1] + (cm[2] ?? "");
             isoIteration = cm[3];
+            glueYear = cm[4];
+            glueMonth = cm[5];
             body = body.slice(0, cm.index);
         }
         const monthAlt = Object.keys(DRAFT_MONTH_NAMES)
@@ -247,7 +257,16 @@ export class IeeeDraft {
         const suffix = new RegExp(`(?:(, | )(${monthAlt})(?: (\\d{1,2}))?(?:, | )|, | )((?:19|20)\\d{2}[a-z]{0,2})$`);
         const m = suffix.exec(body);
         if (m === null) {
-            return new IeeeDraft({ version: body, iso_stage: isoStage, iso_iteration: isoIteration });
+            // A glue-consumed body ("=FDIS-201908") carries the designator's
+            // own date on the year/month slots (the parse-path Draft object's
+            // shape), so the render re-composes the glued face verbatim.
+            return new IeeeDraft({
+                version: body,
+                iso_stage: isoStage,
+                iso_iteration: isoIteration,
+                year: glueYear,
+                month: glueMonth,
+            });
         }
         return new IeeeDraft({
             version: body.slice(0, m.index),
@@ -536,7 +555,15 @@ export function renderIeeeBase(id) {
     // 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) &&
+    // An ISO/IEC stage-token draft (CD1, FDIS - the draft carries the
+    // stage) is its own draft marker: the designator face it renders
+    // (".../D=CD1", pubid#203) never takes the word Draft, so the type
+    // word is skipped whatever the publisher arrangement - the joint rows
+    // ("IEEE/IEC Draft P60076-57-129/D=FDIS-201707") would otherwise
+    // print Draft on one construction path and drop it on the re-parsed
+    // designation path, and the render would not re-parse to itself.
+    const stageDraft = id.draftObject()?.isoStage !== undefined;
+    if (shouldRenderType && !stageDraft && !(stageObj?.projectStatus === true) &&
         ((id.type !== undefined && id.type.trim() !== "" && id.type !== "P") ||
             isProjectDraft) &&
         !/unapproved/i.test(id.draft_status ?? "")) {
@@ -1298,7 +1325,17 @@ export const JointDevelopmentClass = ieeeClass({ kind: "joint-development" }, {
         let result = parts.join(" ");
         if (id.year !== undefined && !designatorCarriesYear &&
             !(ieeeDraft ?? "").endsWith(`-${id.year}`)) {
-            result += `-${id.year}`;
+            // The month face follows the standing month rule (the reference's
+            // to_ieee_format): a numeric month is the glued short form
+            // ("-2018-05", the grammar reads only two digits), a text month
+            // the comma long form (", February 2018", which re-parses through
+            // the joint date clause). Dropping the month published a different
+            // date ("P90003, February 2018 (E)" printed as "P90003-2018").
+            result += /^\d+$/.test(id.month ?? "")
+                ? `-${id.year}-${(id.month ?? "").padStart(2, "0")}`
+                : id.month !== undefined
+                    ? `, ${id.month} ${id.year}`
+                    : `-${id.year}`;
         }
         const marker = id["parenthetical_content"];
         if (marker !== undefined)

package/dist/pubid-urn/schemas/iec.js

@@ -23,6 +23,12 @@ export const iecSchema = define("iec", (s) => {
     s.atom("sheet_number", "sheet");
     s.atom("sheet_year", "sheetyear");
     s.atom("vap", "vap", "list");
+    s.atom("technical_committee", "tc");
+    s.atom("wd_language", "wdlang");
+    s.atom("wd_stage", "wdstage");
+    s.atom("wp_stage", "wpstage");
+    s.atom("wp_type", "wptype");
+    s.atom("cispr_identifier", "cispr", "id");
     s.atom("languages.*.code", "lang");
     s.atom("identifiers", "ids", "ids");
     s.facet("languages.*.original_code", "langsrc");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pubid/pubid",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "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",
@@ -19,7 +19,7 @@
     "doc:api": "node scripts/api-reference.mjs"
   },
   "dependencies": {
-    "parsanol": "0.10.37",
+    "parsanol": "0.10.45",
     "yaml": "^2.5.0"
   },
   "devDependencies": {