@pubid/pubid 0.1.9 → 0.1.10

package/dist/flavors/ieee/index.js

@@ -119,7 +119,7 @@ class IeeeBuilder {
         }
         const dash = drafts.find((e) => isObj(e) && e["dash_year"] !== undefined) ??
             (d["dash_year"] !== undefined ? d : undefined);
-        if (dash === undefined || d["year"] !== undefined)
+        if (dash === undefined)
             return;
         const objs = drafts.filter(isObj);
         const joined = objs
@@ -151,7 +151,7 @@ class IeeeBuilder {
                 delete dash["dash_year"];
                 delete dash["dash_month"];
             }
-            else {
+            else if (d["year"] === undefined) {
                 d["year"] = dashYear;
                 d["month"] = dm;
             }
@@ -163,7 +163,7 @@ class IeeeBuilder {
                 delete dash["dash_year"];
                 delete dash["dash_month"];
             }
-            else {
+            else if (d["year"] === undefined) {
                 d["year"] = dashYear;
                 d["month"] = extractValue(dashMonth);
             }
@@ -874,13 +874,28 @@ class IeeeBuilder {
                 // the ISO face, which prints the date from the identity slots
                 // (", March 2017", pubid#216).
                 if (parsed["draft_month"] !== undefined && parsed["iso_stage"] === undefined) {
-                    const draftObj = new IeeeDraft({
-                        version: draftVer,
-                        month: extractValue(parsed["draft_month"]),
-                        year: extractValue(parsed["draft_year"]),
-                        comma_before_month: true,
-                    });
-                    attributes["draft"] = draftObj.render();
+                    const dm = extractValue(parsed["draft_month"]) ?? "";
+                    const dy = extractValue(parsed["draft_year"]) ?? "";
+                    const monthNum = DRAFT_MONTH_NAMES[dm.replace(/\.$/, "")];
+                    if (JSON.stringify(attributes["publishers"]) === JSON.stringify(["IEEE", "CSA"]) &&
+                        monthNum !== undefined && dy !== "") {
+                        // The joint IEEE/CSA drafts glue their date into the
+                        // designator with the month numeric (pubid ruling
+                        // 2026-10-14: no comma dates on these rows).
+                        const glued = new IeeeDraft({
+                            version: `${draftVer}-${dy}-${monthNum.padStart(2, "0")}`,
+                        });
+                        attributes["draft"] = glued.render();
+                    }
+                    else {
+                        const draftObj = new IeeeDraft({
+                            version: draftVer,
+                            month: dm === "" ? undefined : dm,
+                            year: dy === "" ? undefined : dy,
+                            comma_before_month: true,
+                        });
+                        attributes["draft"] = draftObj.render();
+                    }
                     if (parsed["year"] === undefined)
                         delete attributes["year"];
                     if (parsed["month"] === undefined)
@@ -895,6 +910,21 @@ class IeeeBuilder {
                     if (parsed["year"] === undefined)
                         delete attributes["year"];
                 }
+                else if (JSON.stringify(attributes["publishers"]) === JSON.stringify(["IEEE", "CSA"]) &&
+                    parsed["iso_stage"] === undefined &&
+                    /^(19|20)\d\d$/.test(extractValue(parsed["year"]) ?? "") &&
+                    /^\d{1,2}$/.test(extractValue(parsed["month"]) ?? "")) {
+                    // The glued face re-parses with the date in the identity
+                    // slots ("D2-2016-09" -> year/month + a bare D2): it
+                    // normalizes back onto the draft-embedded date so the
+                    // round trip closes on the CSA canonical.
+                    const glued = new IeeeDraft({
+                        version: `${draftVer}-${extractValue(parsed["year"])}-${extractValue(parsed["month"])}`,
+                    });
+                    attributes["draft"] = glued.render();
+                    delete attributes["year"];
+                    delete attributes["month"];
+                }
                 else {
                     attributes["ieee_draft"] = `D${draftVer}`;
                 }
@@ -1049,9 +1079,20 @@ class IeeeBuilder {
             parsed["amd_number"] === undefined) {
             const pubs = (attributes["publishers"] ?? []);
             const projectAttrs = {
-                code: attributes["code"],
                 draft: attributes["draft"],
             };
+            // The code columns (number/parts/separator/prefix) are the
+            // ProjectDraft render/hash face; the spelled P is the project
+            // marker (identity), whatever the lead publisher.
+            for (const k of ["number", "prefix", "parts", "separator"]) {
+                // A "P" prefix is the project marker itself (the generic path
+                // deletes it on the strip) - it must not ride the code columns.
+                if (attributes[k] !== undefined && !(k === "prefix" && attributes[k] === "P")) {
+                    projectAttrs[k] = attributes[k];
+                }
+            }
+            if (parsed["project_marker"] !== undefined)
+                projectAttrs["project_marker"] = true;
             if (pubs.length > 0) {
                 projectAttrs["publisher"] = pubs[0];
                 if (pubs.length > 1)

package/dist/flavors/ieee/model.js

@@ -515,7 +515,8 @@ export function renderIeeeBase(id) {
         // spelling ("IEEE P15026.1, 05 2014" renders "P15026.1-2014-05").
         const yearOnCode = id.year !== undefined && id.edition === undefined &&
             (id.month === undefined || gluedMonth) &&
-            (draftObj === undefined || draftObj.year !== undefined);
+            (draftObj === undefined || draftObj.year !== undefined ||
+                (draftObj.version ?? "").match(/-\d{4}-\d{2}$/) !== null);
         if (yearOnCode) {
             result += `-${id.year}`;
         }
@@ -575,7 +576,8 @@ export function renderIeeeBase(id) {
             result += ` ${id.year}`;
     }
     else if (id.year !== undefined && draftObj !== undefined && id.edition === undefined &&
-        draftObj?.year === undefined && !iecIeeOnly) {
+        draftObj?.year === undefined &&
+        (draftObj.version ?? "").match(/-\d{4}-\d{2}$/) === null && !iecIeeOnly) {
         // A year-only date trailing the draft ("ANSI N42.34/D9a, 2015")
         // keeps its comma form instead of being silently dropped; a year
         // whose draft carries its own date dash-attached to the code above

package/dist/flavors/ieee/preprocessor.js

@@ -259,6 +259,31 @@ function normalizeRevisionNotation(input) {
     cleaned = cleaned.replace(/(\/D-?[0-9A-Za-z.]+)\s+[Rr][Ee][Vv]\s*(\d+)/, "$1/R-$2");
     cleaned = cleaned.replace(/[-/_.]?\s?[Rr][Ee][Vv][-\s]?(\d+)(\/D-?[0-9A-Za-z.]+)/, "$2/R-$1");
     cleaned = cleaned.replace(/(\d)[-._]?\s?[Rr][Ee][Vv]\s*(\d+)\s*$/, "$1/R-$2");
+    // The joint IEEE/CSA catalogue spells the type word before the
+    // project number ("IEEE/CSA Draft P844.1/D2, Sept, 2016"): the P
+    // already carries the project semantics (docs/IEEE-DRAFT-STAGES.md
+    // §1.1), so the redundant word drops and the joint route parses.
+    cleaned = cleaned.replace(/IEEE\/CSA Draft (P[A-Z0-9])/g, "IEEE/CSA $1");
+    // The corrigendum's own draft rides before the ordinal in the house
+    // order ("PC37.101-2006/D2, 2007/Cor. 1"): the catalogue spellings
+    // ".../Cor 1, D4, July 2015" and ".../Cor 1-201x/D5, April 2012"
+    // re-order into it, with the draft's date glued -YYYY-MM (pubid
+    // ruling 2026-10-14: no comma dates).
+    const COR_MONTHS = {
+        January: "01", February: "02", March: "03", April: "04", May: "05",
+        June: "06", July: "07", August: "08", September: "09", Sept: "09",
+        October: "10", November: "11", December: "12", Jan: "01", Feb: "02",
+        Mar: "03", Apr: "04", Jun: "06", Jul: "07", Aug: "08", Sep: "09",
+        Oct: "10", Nov: "11", Dec: "12",
+    };
+    cleaned = cleaned.replace(/\/Cor(?:rigendum)? (\d+(?:-[0-9xX]{4})?)\/(D[A-Z0-9][^,]*), ([A-Za-z]+) (\d{4})/g, (_m, cor, draft, mon, year) => {
+        const month = COR_MONTHS[mon.charAt(0).toUpperCase() + mon.slice(1).toLowerCase()];
+        return month === undefined ? _m : `/${draft}-${year}-${month}/Cor. ${cor}`;
+    });
+    cleaned = cleaned.replace(/\/Cor(?:rigendum)? (\d+), (D[A-Z0-9][^,]*), ([A-Za-z]+) (\d{4})/g, (_m, cor, draft, mon, year) => {
+        const month = COR_MONTHS[mon.charAt(0).toUpperCase() + mon.slice(1).toLowerCase()];
+        return month === undefined ? _m : `/${draft}-${year}-${month}/Cor. ${cor}`;
+    });
     // Lettered inline revisions are IDENTITY (pubid ruling 2026-10-14):
     // the grammar captures them natively with their separator; the former
     // strip rewrite here dropped the letters and is gone.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pubid/pubid",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "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",