@ifc-lite/bcf 2.0.1 → 3.0.0

package/dist/xml-text.js

@@ -2,24 +2,79 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 /**
- * Reading text back out of BCF's XML.
+ * Reading text out of BCF's XML, and escaping it back in.
  *
  * Split out of `reader.ts` so the component parsers can share it without a
- * cycle. `writer.ts::escapeXml` is the inverse of `unescapeXml` here, and the
- * two are pinned against each other in `writer.test.ts`.
+ * cycle. `escapeXml` here is the inverse of `unescapeXml`, and the two are
+ * pinned against each other in `writer.test.ts`.
  */
 /**
  * Extract a simple element value from XML
  *
- * Values are unescaped so writer.ts's escapeXml() round-trips correctly
- * (see escapeXml/unescapeXml regression: & < > " ' in titles/descriptions/
+ * Values are unescaped so {@link escapeXml} round-trips correctly (see
+ * escapeXml/unescapeXml regression: & < > " ' in titles/descriptions/
  * comments must come back exactly as written, not as literal entities).
+ *
+ * The content between the tags is read with {@link decodeXmlCharData}
+ * rather than a bare `[^<]*` match, so a CDATA-wrapped value (whose content
+ * starts with the literal `<![CDATA[`) is read instead of silently
+ * rejected -- the same defect `parseLabels` was fixed for, but present on
+ * every other caller of this function (Title, Comment, and the rest).
+ * `decodeXmlCharData` still returns `null`, and this still returns
+ * `undefined`, when the content holds real child-element markup.
  */
 export function extractElement(content, elementName) {
-    const match = content.match(new RegExp(`<${elementName}>([^<]*)<\\/${elementName}>`));
-    return match?.[1] !== undefined ? unescapeXml(match[1]) : undefined;
+    const match = content.match(new RegExp(`<${elementName}>([\\s\\S]*?)<\\/${elementName}>`));
+    if (match?.[1] === undefined)
+        return undefined;
+    const decoded = decodeXmlCharData(match[1]);
+    return decoded ?? undefined;
+}
+/**
+ * Parse a captured `xs:boolean` value per its lexical space
+ * `{true, false, 1, 0}` (whiteSpace=collapse, so leading/trailing
+ * whitespace is ignored; matched case-sensitively, per the XSD's literal
+ * lexical space -- BCF markup never emits `True`/`TRUE`).
+ *
+ * Does NOT decide what an *absent* attribute means, nor a *blank* one: a
+ * value that collapses to the empty string is schema-invalid for
+ * `xs:boolean` and is treated the same as absent, not as recognised-false or
+ * as garbage -- so every caller checks `raw === undefined` (or blank, after
+ * a `.trim()`) itself and supplies its own absent-case default, which
+ * differs by call site (`DefaultVisibility` leans true on BCF 2.1, false on
+ * 3.0; the others are `undefined`-optional or lean false). This unifies the
+ * four hand-rolled xs:boolean parses this package had (`parseVisibility`,
+ * `parseViewSetupHints`'s `flag()`, and the two `isExternal` sites in
+ * `reader.ts`), which is exactly the drift #3713 warns about: one behaviour,
+ * several hand-rolled implementations, each patched independently.
+ *
+ * A present value outside the lexical space (garbage, e.g. `"yes"`) resolves
+ * to `ifUnrecognized` rather than a hardcoded pick, because callers
+ * genuinely disagree on which way an unrecognised value should lean.
+ *
+ * @param raw a non-blank, already-captured attribute or element value (the
+ *   caller has already ruled out absent/blank)
+ */
+export function parseXsBoolean(raw, { ifUnrecognized }) {
+    const trimmed = raw.trim();
+    if (trimmed === 'true' || trimmed === '1')
+        return true;
+    if (trimmed === 'false' || trimmed === '0')
+        return false;
+    return ifUnrecognized;
+}
+/**
+ * Escape XML special characters
+ */
+export function escapeXml(str) {
+    return str
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&apos;');
 }
-/** The five entities `writer.ts::escapeXml` produces. */
+/** The five entities {@link escapeXml} produces. */
 const NAMED_ENTITIES = {
     lt: '<',
     gt: '>',
@@ -52,4 +107,72 @@ export function unescapeXml(str) {
             : whole;
     });
 }
+/**
+ * Extract topic `<Labels>` values, tolerant of both BCF markup.xsd shapes.
+ *
+ * BCF 2.1 repeats the label element itself: `<Labels>Structural</Labels>
+ * <Labels>Urgent</Labels>`. BCF 3.0 instead wraps ONE `<Labels>` container
+ * around repeated `<Label>` children: `<Labels><Label>Structural</Label>
+ * <Label>Urgent</Label></Labels>`. A regex that only matched the 2.1 shape
+ * (immediate non-tag text) silently dropped every label from a conformant
+ * 3.0 archive, since its `<Labels>` is immediately followed by a nested `<`,
+ * not text. This walks each `<Labels>` block and prefers nested `<Label>`
+ * children when present, falling back to the 2.1 direct-text shape.
+ *
+ * Label content goes through {@link decodeXmlCharData} rather than a bare
+ * `[^<]*` match, so a CDATA label (`<Label><![CDATA[Urgent & Important]]>
+ * </Label>` — whose content starts with `<`) is read instead of dropped.
+ */
+export function parseLabels(topicContent) {
+    const labels = [];
+    // One emptiness rule for both shapes, so `<Labels><Label></Label></Labels>`
+    // and `<Labels></Labels>` agree. The 3.0 branch used to push
+    // decodeXmlCharData's '' straight through while the 2.1 branch skipped it,
+    // so only the 3.0 shape produced a phantom empty label. Whitespace-only
+    // content is NOT empty and is kept: markup.xsd types both elements as
+    // xs:string (whiteSpace=preserve), so '   ' is a legal value, and that is
+    // what the 2.1 path has always returned.
+    const push = (raw) => {
+        const text = decodeXmlCharData(raw);
+        if (text !== null && text.length > 0)
+            labels.push(text);
+    };
+    for (const block of topicContent.matchAll(/<Labels>([\s\S]*?)<\/Labels>/g)) {
+        const inner = block[1];
+        const nested = [...inner.matchAll(/<Label>([\s\S]*?)<\/Label>/g)];
+        if (nested.length > 0) {
+            for (const label of nested)
+                push(label[1]);
+        }
+        else {
+            push(inner);
+        }
+    }
+    return labels;
+}
+/**
+ * Decode element content that should be XML character data, tolerating CDATA
+ * sections.
+ *
+ * Per the XML spec, CDATA content is literal — `&amp;` inside CDATA stays
+ * `&amp;` — while text outside CDATA is entity-decoded via
+ * {@link unescapeXml}. Returns `null` when the content holds real markup (a
+ * `<` outside any CDATA section): that is child elements, not character
+ * data, and the caller should not treat it as a text value.
+ */
+function decodeXmlCharData(raw) {
+    let out = '';
+    let last = 0;
+    for (const m of raw.matchAll(/<!\[CDATA\[([\s\S]*?)\]\]>/g)) {
+        const text = raw.slice(last, m.index);
+        if (text.includes('<'))
+            return null;
+        out += unescapeXml(text) + m[1];
+        last = m.index + m[0].length;
+    }
+    const tail = raw.slice(last);
+    if (tail.includes('<'))
+        return null;
+    return out + unescapeXml(tail);
+}
 //# sourceMappingURL=xml-text.js.map

package/dist/xml-text.js.map

@@ -1 +1 @@
-{"version":3,"file":"xml-text.js","sourceRoot":"","sources":["../src/xml-text.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D;;;;;;GAMG;AAEH;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,OAAe,EAAE,WAAmB;IACjE,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,WAAW,eAAe,WAAW,GAAG,CAAC,CAAC,CAAC;IACtF,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACtE,CAAC;AAED,yDAAyD;AACzD,MAAM,cAAc,GAA2B;IAC7C,EAAE,EAAE,GAAG;IACP,EAAE,EAAE,GAAG;IACP,IAAI,EAAE,GAAG;IACT,IAAI,EAAE,GAAG;IACT,GAAG,EAAE,GAAG;CACT,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,WAAW,CAAC,GAAW;IACrC,OAAO,GAAG,CAAC,OAAO,CAChB,yDAAyD,EACzD,CAAC,KAAK,EAAE,GAAuB,EAAE,GAAuB,EAAE,IAAwB,EAAE,EAAE;QACpF,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,EAAE,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5E,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,QAAQ;YAC3D,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC;YAC5B,CAAC,CAAC,KAAK,CAAC;IACZ,CAAC,CACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"xml-text.js","sourceRoot":"","sources":["../src/xml-text.ts"],"names":[],"mappings":"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"}

package/dist/xsd-required-string.d.ts

@@ -0,0 +1,38 @@
+/**
+ * Normalize a date-ish string to a valid `xs:dateTime`, or `undefined` if it
+ * can't be made into one. A value already matching `xs:dateTime` is returned
+ * trimmed but otherwise UNCHANGED -- never reformatted or shifted. A bare
+ * `YYYY-MM-DD` becomes midnight UTC on that date. Anything else (an empty
+ * string, free text, a malformed timestamp) is unparseable and comes back
+ * `undefined`; the caller decides whether that means "omit the element" or
+ * "refuse to write".
+ */
+export declare function normalizeXsdDateTime(value: string): string | undefined;
+export declare const XML_WHITESPACE_ONLY: RegExp;
+/**
+ * A required `xs:dateTime` on its way into an archive: normalized (a bare
+ * date becomes midnight UTC; an already-valid dateTime passes through
+ * unchanged), escaped -- or an error. `minOccurs="1"` with no default means
+ * there is no valid element to omit here, so an absent or unparseable value
+ * both refuse rather than write something invalid or invented.
+ */
+export declare function xsdDateTime(value: string | undefined, element: string, where: string): string;
+/**
+ * An optional `xs:dateTime` on its way into an archive: normalized the same
+ * way as `xsdDateTime`, but `undefined` (never a throw) for anything absent
+ * or unparseable. `minOccurs="0"` makes omitting the element schema-valid,
+ * and that is always preferable to writing invalid text that poisons the
+ * whole file -- the caller checks the return value and skips the element
+ * when it is `undefined`.
+ */
+export declare function xsdOptionalDateTime(value: string | undefined): string | undefined;
+/**
+ * A required author-like string on its way into an archive, escaped -- or an error.
+ *
+ * BCF 2.1 uses `UserIdType`, an unrestricted `xs:string`, so an explicitly
+ * supplied empty or whitespace-only author is schema-valid. BCF 3.0 replaced
+ * it with `NonEmptyOrBlankString`, whose collapsed value must be non-empty.
+ * Absence is invalid in both versions because the element itself is required.
+ */
+export declare function xsdRequiredString(value: string | undefined, element: string, where: string, version: '2.1' | '3.0'): string;
+//# sourceMappingURL=xsd-required-string.d.ts.map

package/dist/xsd-required-string.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"xsd-required-string.d.ts","sourceRoot":"","sources":["../src/xsd-required-string.ts"],"names":[],"mappings":"AA8EA;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAOtE;AAQD,eAAO,MAAM,mBAAmB,QAAiB,CAAC;AAElD;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAkB7F;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAIjF;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,KAAK,GAAG,KAAK,GACrB,MAAM,CASR"}

package/dist/xsd-required-string.js

@@ -0,0 +1,158 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+/**
+ * Write-side guards for `markup.xsd` elements declared `minOccurs="1"` with
+ * no schema default: `Topic/CreationDate`, `Comment/Date`,
+ * `Topic/CreationAuthor`, `Topic/ModifiedAuthor` and `Comment/Author`. Also
+ * the normalizer shared by every `xs:dateTime` element in `markup.xsd`,
+ * required or not: `Topic/CreationDate`, `Topic/ModifiedDate`,
+ * `Topic/DueDate`, `Comment/Date`, `Comment/ModifiedDate` and
+ * `Header/File/Date`.
+ *
+ * Split out of `writer.ts`, which was pushing its module-size budget. Mirrors
+ * `numeric.ts`'s split for the numeric xsd guards (`xsdDouble`/`xsdInt`).
+ *
+ * `reader.ts` no longer invents a value for these fields when a source
+ * `.bcfzip` omits them (a wall-clock `CreationDate`, a placeholder `'Unknown'`
+ * author) -- so a `BCFTopic`/`BCFComment` read back from a non-conformant
+ * archive can arrive with any of them unset. Inventing one HERE, on write,
+ * would be that same fabrication under a different name; dropping the element
+ * entirely hands the caller an archive that already fails the schema. So both
+ * refuse, the same way the `TopicType`/`TopicStatus` check in `writer.ts`
+ * does for BCF 3.0.
+ *
+ * `xs:dateTime` is stricter than the callers ever validated: an HTML
+ * `<input type="date">` yields a bare `YYYY-MM-DD`, which every one of the
+ * elements above rejects as "not a valid value of the atomic type
+ * xs:dateTime" (buildingSMART/BCF-XML `markup.xsd`, confirmed against a real
+ * reported archive -- issue #3612's `markup.bcf` carried exactly this on
+ * `DueDate`). `normalizeXsdDateTime` turns a bare date into midnight UTC,
+ * passes an already-valid `xs:dateTime` through UNCHANGED (no reformatting,
+ * no timezone shift), and returns `undefined` for anything else.
+ */
+import { escapeXml } from './xml-text.js';
+// A full `xs:dateTime`: date, mandatory 'T', time, optional fractional
+// seconds, optional timezone (Z or ±HH:MM). The lexical match only decides
+// pass-through-unchanged vs normalize-or-reject and never reformats a value
+// that already matches; `isCalendarValid` below then rejects lexically-valid
+// but calendar-impossible values the xs:dateTime VALUE space excludes.
+const XSD_DATETIME_RE = /^-?(\d{4,})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.\d+)?(Z|[+-]\d{2}:\d{2})?$/;
+// A bare xs:date, e.g. what an HTML `<input type="date">` yields.
+const BARE_DATE_RE = /^-?(\d{4,})-(\d{2})-(\d{2})$/;
+const DAYS_IN_MONTH = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+/**
+ * Value-space check behind the lexical regexes: the xs:dateTime/xs:date VALUE
+ * space excludes calendar-impossible lexemes (month 13, February 30, minute
+ * 99, a timezone beyond ±14:00), and a schema validator rejects them — so a
+ * writer that emitted one would hand the caller an archive that fails
+ * validation, exactly what this module exists to refuse. Hour 24 is legal in
+ * XSD only as 24:00:00 (end of day).
+ */
+function isCalendarValid(m, hasTime) {
+    const year = Number(m[1]);
+    const month = Number(m[2]);
+    const day = Number(m[3]);
+    if (month < 1 || month > 12 || day < 1)
+        return false;
+    const leap = (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
+    const maxDay = month === 2 && leap ? 29 : DAYS_IN_MONTH[month - 1];
+    if (day > maxDay)
+        return false;
+    if (!hasTime)
+        return true;
+    const hour = Number(m[4]);
+    const minute = Number(m[5]);
+    const second = Number(m[6]);
+    if (minute > 59 || second > 59)
+        return false;
+    if (hour > 24 || (hour === 24 && (minute !== 0 || second !== 0)))
+        return false;
+    const tz = m[7];
+    if (tz !== undefined && tz !== 'Z') {
+        const tzHour = Number(tz.slice(1, 3));
+        const tzMinute = Number(tz.slice(4, 6));
+        if (tzHour > 14 || tzMinute > 59 || (tzHour === 14 && tzMinute !== 0))
+            return false;
+    }
+    return true;
+}
+/**
+ * Normalize a date-ish string to a valid `xs:dateTime`, or `undefined` if it
+ * can't be made into one. A value already matching `xs:dateTime` is returned
+ * trimmed but otherwise UNCHANGED -- never reformatted or shifted. A bare
+ * `YYYY-MM-DD` becomes midnight UTC on that date. Anything else (an empty
+ * string, free text, a malformed timestamp) is unparseable and comes back
+ * `undefined`; the caller decides whether that means "omit the element" or
+ * "refuse to write".
+ */
+export function normalizeXsdDateTime(value) {
+    const trimmed = value.trim();
+    const dateTime = trimmed.match(XSD_DATETIME_RE);
+    if (dateTime)
+        return isCalendarValid(dateTime, true) ? trimmed : undefined;
+    const bareDate = trimmed.match(BARE_DATE_RE);
+    if (bareDate)
+        return isCalendarValid(bareDate, false) ? `${trimmed}T00:00:00Z` : undefined;
+    return undefined;
+}
+// BCF 3.0's markup.xsd types `Topic/@TopicType` and `Topic/@TopicStatus` as
+// `NonEmptyOrBlankString`: after XML whitespace (#x9, #xA, #xD, #x20) is
+// collapsed, the value must have length >= 1. A value that is present but
+// consists entirely of XML whitespace collapses to nothing and is therefore
+// as invalid as an absent one -- which is why the guards below reuse it, and
+// why `writer.ts`'s own TopicType/TopicStatus checks import it too.
+export const XML_WHITESPACE_ONLY = /^[\t\n\r ]*$/;
+/**
+ * A required `xs:dateTime` on its way into an archive: normalized (a bare
+ * date becomes midnight UTC; an already-valid dateTime passes through
+ * unchanged), escaped -- or an error. `minOccurs="1"` with no default means
+ * there is no valid element to omit here, so an absent or unparseable value
+ * both refuse rather than write something invalid or invented.
+ */
+export function xsdDateTime(value, element, where) {
+    if (!value || XML_WHITESPACE_ONLY.test(value)) {
+        throw new Error(`BCF requires ${element} (${where} has none). markup.xsd declares it ` +
+            `minOccurs="1" with no default, and a time the source never stated is ` +
+            `not the writer's to invent. Set it before writing.`);
+    }
+    const normalized = normalizeXsdDateTime(value);
+    if (normalized === undefined) {
+        throw new Error(`BCF requires ${element} to be a valid xs:dateTime (${where} has ` +
+            `"${value}", which is neither a dateTime nor a bare YYYY-MM-DD date). ` +
+            `markup.xsd types it xs:dateTime with no default, so an unparseable ` +
+            `value is not the writer's to invent a fallback for. Fix it before writing.`);
+    }
+    return escapeXml(normalized);
+}
+/**
+ * An optional `xs:dateTime` on its way into an archive: normalized the same
+ * way as `xsdDateTime`, but `undefined` (never a throw) for anything absent
+ * or unparseable. `minOccurs="0"` makes omitting the element schema-valid,
+ * and that is always preferable to writing invalid text that poisons the
+ * whole file -- the caller checks the return value and skips the element
+ * when it is `undefined`.
+ */
+export function xsdOptionalDateTime(value) {
+    if (!value || XML_WHITESPACE_ONLY.test(value))
+        return undefined;
+    const normalized = normalizeXsdDateTime(value);
+    return normalized === undefined ? undefined : escapeXml(normalized);
+}
+/**
+ * A required author-like string on its way into an archive, escaped -- or an error.
+ *
+ * BCF 2.1 uses `UserIdType`, an unrestricted `xs:string`, so an explicitly
+ * supplied empty or whitespace-only author is schema-valid. BCF 3.0 replaced
+ * it with `NonEmptyOrBlankString`, whose collapsed value must be non-empty.
+ * Absence is invalid in both versions because the element itself is required.
+ */
+export function xsdRequiredString(value, element, where, version) {
+    if (value === undefined || (version === '3.0' && XML_WHITESPACE_ONLY.test(value))) {
+        throw new Error(`BCF requires ${element} (${where} has none). markup.xsd declares it ` +
+            `minOccurs="1" with no default, and a value the source never stated is ` +
+            `not the writer's to invent. Set it before writing.`);
+    }
+    return escapeXml(value);
+}
+//# sourceMappingURL=xsd-required-string.js.map

package/dist/xsd-required-string.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"xsd-required-string.js","sourceRoot":"","sources":["../src/xsd-required-string.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ifc-lite/bcf",
-  "version": "2.0.1",
+  "version": "3.0.0",
   "description": "BIM Collaboration Format (BCF) support for IFC-Lite",
   "type": "module",
   "main": "./dist/index.js",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "jszip": "^3.10.0",
-    "@ifc-lite/encoding": "^2.1.0"
+    "@ifc-lite/encoding": "^2.2.0"
   },
   "devDependencies": {
     "typescript": "^6.0.3",