@office-open/core 0.8.0 → 0.9.0

package/dist/theme/index.d.mts

@@ -1,2 +1,2 @@
-import { a as FontSchemeOptions, i as ColorSchemeOptions, n as buildThemeXml, o as ThemeOptions, r as DefaultTheme, t as DEFAULT_COLORS } from "../index-Cj2Yf5mk.mjs";
-export { type ColorSchemeOptions, DEFAULT_COLORS, DefaultTheme, type FontSchemeOptions, type ThemeOptions, buildThemeXml };
+import { a as ColorSchemeOptions, i as createThemeXml, n as DEFAULT_COLORS, o as FontSchemeOptions, r as buildThemeXml, s as ThemeOptions, t as themeDesc } from "../index-DByjp6ug.mjs";
+export { type ColorSchemeOptions, DEFAULT_COLORS, type FontSchemeOptions, type ThemeOptions, buildThemeXml, createThemeXml, themeDesc };

package/dist/theme/index.mjs

@@ -1,2 +1,2 @@
-import { n as buildThemeXml, r as DEFAULT_COLORS, t as DefaultTheme } from "../theme-DmJXjgQs.mjs";
-export { DEFAULT_COLORS, DefaultTheme, buildThemeXml };
+import { i as DEFAULT_COLORS, n as createThemeXml, r as buildThemeXml, t as themeDesc } from "../theme-CiNzdl-9.mjs";
+export { DEFAULT_COLORS, buildThemeXml, createThemeXml, themeDesc };

package/dist/{theme-DmJXjgQs.mjs → theme-CiNzdl-9.mjs}

@@ -1,4 +1,4 @@
-import { b as BaseXmlComponent } from "./xml-components-DEU24Y1T.mjs";
+import { findChild } from "@office-open/xml";
 //#region src/theme/default-colors.ts
 /** Office 2016+ default theme colors (hex without #). */
 const DEFAULT_COLORS = {
@@ -41,10 +41,10 @@ function buildThemeXml(options) {
 //#endregion
 //#region src/theme/default-theme.ts
 /**
-* DefaultTheme — cached theme XML component.
+* Theme XML generation — pure function with caching.
 *
-* - No-arg constructor returns module-level pre-computed constant (zero allocation).
-* - With options, builds XML string and caches by key.
+* Replaces the DefaultTheme class with a functionally equivalent
+* pure function. Caches by serialized options key.
 *
 * @module
 */
@@ -55,26 +55,121 @@ function themeKey(o) {
 	const f = o.fonts;
 	return `n${o.name ?? ""}c${c?.dark1 ?? ""}${c?.light1 ?? ""}${c?.dark2 ?? ""}${c?.light2 ?? ""}${c?.accent1 ?? ""}${c?.accent2 ?? ""}${c?.accent3 ?? ""}${c?.accent4 ?? ""}${c?.accent5 ?? ""}${c?.accent6 ?? ""}${c?.hyperlink ?? ""}${c?.followedHyperlink ?? ""}f${f?.majorFont ?? ""}${f?.minorFont ?? ""}${f?.majorFontAsian ?? ""}${f?.minorFontAsian ?? ""}`;
 }
-var DefaultTheme = class extends BaseXmlComponent {
-	xml;
-	constructor(options) {
-		super("a:theme");
-		if (!options) {
-			this.xml = DEFAULT_XML;
-			return;
+/**
+* Generate theme XML string from options.
+* Returns cached default when no options provided.
+*/
+function createThemeXml(options) {
+	if (!options) return DEFAULT_XML;
+	const key = themeKey(options);
+	const cached = customCache.get(key);
+	if (cached) return cached;
+	const built = buildThemeXml(options);
+	customCache.set(key, built);
+	return built;
+}
+//#endregion
+//#region src/theme/theme-descriptors.ts
+/**
+* Theme descriptors — bidirectional mapping between ThemeOptions and theme XML.
+*
+* @module
+*/
+/** Color scheme XML tag → ThemeOptions.colors key mapping. */
+const COLOR_TAGS = [
+	{
+		tag: "a:dk1",
+		key: "dark1"
+	},
+	{
+		tag: "a:lt1",
+		key: "light1"
+	},
+	{
+		tag: "a:dk2",
+		key: "dark2"
+	},
+	{
+		tag: "a:lt2",
+		key: "light2"
+	},
+	{
+		tag: "a:accent1",
+		key: "accent1"
+	},
+	{
+		tag: "a:accent2",
+		key: "accent2"
+	},
+	{
+		tag: "a:accent3",
+		key: "accent3"
+	},
+	{
+		tag: "a:accent4",
+		key: "accent4"
+	},
+	{
+		tag: "a:accent5",
+		key: "accent5"
+	},
+	{
+		tag: "a:accent6",
+		key: "accent6"
+	},
+	{
+		tag: "a:hlink",
+		key: "hyperlink"
+	},
+	{
+		tag: "a:folHlink",
+		key: "followedHyperlink"
+	}
+];
+/** Read the hex color value from a color element (a:dk1/a:lt1 may be sysClr or srgbClr). */
+function readColorValue(el) {
+	if (!el) return void 0;
+	const srgb = findChild(el, "a:srgbClr");
+	if (srgb) return String(srgb.attributes?.["val"] ?? "");
+	const sysClr = findChild(el, "a:sysClr");
+	if (sysClr) return String(sysClr.attributes?.["lastClr"] ?? "");
+}
+const themeDesc = {
+	kind: "custom",
+	stringify(opts, _ctx) {
+		return buildThemeXml(opts);
+	},
+	parse(el, _ctx) {
+		const result = {};
+		const name = el.attributes?.["name"];
+		if (name) result.name = String(name);
+		const themeElements = findChild(el, "a:themeElements");
+		const clrScheme = themeElements ? findChild(themeElements, "a:clrScheme") : void 0;
+		if (clrScheme) {
+			const colors = {};
+			for (const { tag, key } of COLOR_TAGS) {
+				const value = readColorValue(findChild(clrScheme, tag));
+				if (value) colors[key] = value;
+			}
+			if (Object.keys(colors).length > 0) result.colors = colors;
 		}
-		const key = themeKey(options);
-		const cached = customCache.get(key);
-		if (cached) this.xml = cached;
-		else {
-			const built = buildThemeXml(options);
-			customCache.set(key, built);
-			this.xml = built;
+		const fontScheme = themeElements ? findChild(themeElements, "a:fontScheme") : void 0;
+		if (fontScheme) {
+			const majorFontEl = findChild(fontScheme, "a:majorFont");
+			const minorFontEl = findChild(fontScheme, "a:minorFont");
+			const majorLatin = majorFontEl ? findChild(majorFontEl, "a:latin") : void 0;
+			const minorLatin = minorFontEl ? findChild(minorFontEl, "a:latin") : void 0;
+			const majorTypeface = majorLatin?.attributes?.["typeface"];
+			const minorTypeface = minorLatin?.attributes?.["typeface"];
+			if (majorTypeface || minorTypeface) {
+				const fonts = {};
+				if (majorTypeface) fonts.majorFont = String(majorTypeface);
+				if (minorTypeface) fonts.minorFont = String(minorTypeface);
+				result.fonts = fonts;
+			}
 		}
-	}
-	toXml(_context) {
-		return this.xml;
+		return result;
 	}
 };
 //#endregion
-export { buildThemeXml as n, DEFAULT_COLORS as r, DefaultTheme as t };
+export { DEFAULT_COLORS as i, createThemeXml as n, buildThemeXml as r, themeDesc as t };

package/dist/{values.d.mts → util/values.d.mts}

@@ -1,2 +1,2 @@
-import { C as uCharHexNumber, S as twipsMeasureValue, T as unsignedDecimalNumber, _ as pointMeasureValue, a as ThemeColor, b as signedHpsMeasureValue, c as dateTimeValue, d as hexBinary, f as hexColorValue, g as percentageValue, h as measurementOrPercentValue, i as RelativeMeasure, l as decimalNumber, m as longHexNumber, n as PositivePercentage, o as ThemeFont, p as hpsMeasureValue, r as PositiveUniversalMeasure, s as UniversalMeasure, t as Percentage, u as eighthPointMeasureValue, v as positiveUniversalMeasureValue, w as universalMeasureValue, x as signedTwipsMeasureValue, y as shortHexNumber } from "./values-COjPGYkS.mjs";
+import { C as uCharHexNumber, S as twipsMeasureValue, T as unsignedDecimalNumber, _ as pointMeasureValue, a as ThemeColor, b as signedHpsMeasureValue, c as dateTimeValue, d as hexBinary, f as hexColorValue, g as percentageValue, h as measurementOrPercentValue, i as RelativeMeasure, l as decimalNumber, m as longHexNumber, n as PositivePercentage, o as ThemeFont, p as hpsMeasureValue, r as PositiveUniversalMeasure, s as UniversalMeasure, t as Percentage, u as eighthPointMeasureValue, v as positiveUniversalMeasureValue, w as universalMeasureValue, x as signedTwipsMeasureValue, y as shortHexNumber } from "../values-Dqj8cbcy.mjs";
 export { Percentage, PositivePercentage, PositiveUniversalMeasure, RelativeMeasure, ThemeColor, ThemeFont, UniversalMeasure, dateTimeValue, decimalNumber, eighthPointMeasureValue, hexBinary, hexColorValue, hpsMeasureValue, longHexNumber, measurementOrPercentValue, percentageValue, pointMeasureValue, positiveUniversalMeasureValue, shortHexNumber, signedHpsMeasureValue, signedTwipsMeasureValue, twipsMeasureValue, uCharHexNumber, universalMeasureValue, unsignedDecimalNumber };

package/dist/{values.mjs → util/values.mjs}

@@ -1,2 +1,2 @@
-import { _ as twipsMeasureValue, a as eighthPointMeasureValue, b as unsignedDecimalNumber, c as hpsMeasureValue, d as percentageValue, f as pointMeasureValue, g as signedTwipsMeasureValue, h as signedHpsMeasureValue, i as decimalNumber, l as longHexNumber, m as shortHexNumber, n as ThemeFont, o as hexBinary, p as positiveUniversalMeasureValue, r as dateTimeValue, s as hexColorValue, t as ThemeColor, u as measurementOrPercentValue, v as uCharHexNumber, y as universalMeasureValue } from "./values-zMCu5EoQ.mjs";
+import { _ as twipsMeasureValue, a as eighthPointMeasureValue, b as unsignedDecimalNumber, c as hpsMeasureValue, d as percentageValue, f as pointMeasureValue, g as signedTwipsMeasureValue, h as signedHpsMeasureValue, i as decimalNumber, l as longHexNumber, m as shortHexNumber, n as ThemeFont, o as hexBinary, p as positiveUniversalMeasureValue, r as dateTimeValue, s as hexColorValue, t as ThemeColor, u as measurementOrPercentValue, v as uCharHexNumber, y as universalMeasureValue } from "../values-CVIZcTRw.mjs";
 export { ThemeColor, ThemeFont, dateTimeValue, decimalNumber, eighthPointMeasureValue, hexBinary, hexColorValue, hpsMeasureValue, longHexNumber, measurementOrPercentValue, percentageValue, pointMeasureValue, positiveUniversalMeasureValue, shortHexNumber, signedHpsMeasureValue, signedTwipsMeasureValue, twipsMeasureValue, uCharHexNumber, universalMeasureValue, unsignedDecimalNumber };

package/dist/{values-zMCu5EoQ.mjs → values-CVIZcTRw.mjs}

@@ -1,4 +1,4 @@
-//#region src/values.ts
+//#region src/util/values.ts
 /**
 * Validates and converts a number to an integer (decimal number).
 *
@@ -15,7 +15,7 @@
 * ```
 */
 const decimalNumber = (val) => {
-	if (isNaN(val)) throw new Error(`Invalid value '${val}' specified. Must be an integer.`);
+	if (!Number.isFinite(val)) throw new Error(`Invalid value '${val}' specified. Must be a finite number.`);
 	return Math.floor(val);
 };
 /**

package/dist/{values-COjPGYkS.d.mts → values-Dqj8cbcy.d.mts}

@@ -1,4 +1,4 @@
-//#region src/values.d.ts
+//#region src/util/values.d.ts
 /**
  * Runtime validation and type conversion functions for OOXML specification values.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@office-open/core",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Shared OOXML infrastructure — XML components, validators, converters, charts, and SmartArt",
   "keywords": [
     "core",
@@ -17,7 +17,7 @@
   "author": {
     "name": "Demo Macro",
     "email": "abc@imst.xyz",
-    "url": "https://imst.xyz/"
+    "url": "https://www.demomacro.com/"
   },
   "repository": {
     "type": "git",
@@ -34,9 +34,9 @@
       "types": "./dist/index.d.mts",
       "import": "./dist/index.mjs"
     },
-    "./values": {
-      "types": "./dist/values.d.mts",
-      "import": "./dist/values.mjs"
+    "./util/values": {
+      "types": "./dist/util/values.d.mts",
+      "import": "./dist/util/values.mjs"
     },
     "./smartart": {
       "types": "./dist/smartart/index.d.mts",
@@ -50,6 +50,10 @@
       "types": "./dist/drawingml/index.d.mts",
       "import": "./dist/drawingml/index.mjs"
     },
+    "./descriptor": {
+      "types": "./dist/descriptor/index.d.mts",
+      "import": "./dist/descriptor/index.mjs"
+    },
     "./patch": {
       "types": "./dist/patch/index.d.mts",
       "import": "./dist/patch/index.mjs"
@@ -64,12 +68,13 @@
     "hash.js": "1.1.7",
     "nanoid": "5.1.11",
     "undio": "0.2.0",
-    "@office-open/xml": "0.8.0"
+    "@office-open/xml": "0.9.0"
   },
   "scripts": {
     "dev": "basis build --stub",
     "build": "vp pack",
     "test": "vp test run",
-    "check": "vp check --fix"
+    "check": "vp check --fix",
+    "bench": "vp test bench"
   }
 }