@hirokisakabe/pom 7.1.0 → 7.2.0

package/README.md

@@ -38,6 +38,7 @@
 - **AI Friendly** — Simple XML structure designed for LLM code generation. Include [llm.txt](./website/public/llm.txt) in your system prompt for XML reference. Also available at `https://pom.pptx.app/llm.txt`.
 - **Declarative** — Describe slides as XML. No imperative API calls needed — just data in, PPTX out.
 - **Flexible Layout** — Flexbox-style layout with VStack / HStack, powered by yoga-layout.
+- **Shorthand + Dot Notation** — Layout/style attributes (e.g. `padding`, `margin`, `border`, `fill`, `shadow`) can mix shorthand and dot notation on the same node. Shorthand sets defaults and dot notation overrides specific keys.
 - **Rich Nodes** — 18 built-in node types: charts, flowcharts, tables, timelines, org trees, and more.
 - **Schema-validated** — XML input is validated with Zod schemas at runtime with clear error messages.
 - **PowerPoint Native** — Generates real editable PowerPoint shapes — not images. Recipients can modify everything.

package/dist/parseXml/coercionRules.d.ts

@@ -30,6 +30,24 @@ export declare function getObjectShapeFromRule(rule: CoercionRule): Record<strin
  * endArrow="true" と endArrow.type="triangle" の共存を許可するために使用。
  */
 export declare function isBooleanObjectUnionRule(rule: CoercionRule): boolean;
+type ResolvedMixedNotationShorthand = {
+    mode: "merge";
+    value: Record<string, unknown>;
+} | {
+    mode: "ignore";
+} | {
+    mode: "conflict";
+};
+/**
+ * 同一属性で shorthand と dot notation を併用したときに、
+ * shorthand 側をどのように扱うかを解決する。
+ *
+ * - merge: shorthand をオブジェクト化して dot notation 側で上書き
+ * - ignore: boolean shorthand を無視して dot notation を優先
+ * - conflict: 併用不可（従来どおりエラー）
+ */
+export declare function resolveMixedNotationShorthand(value: string, rule: CoercionRule): ResolvedMixedNotationShorthand;
 export declare const NODE_COERCION_MAP: Record<string, Record<string, CoercionRule>>;
 export declare const CHILD_ELEMENT_COERCION_MAP: Record<string, Record<string, CoercionRule>>;
+export {};
 //# sourceMappingURL=coercionRules.d.ts.map

package/dist/parseXml/coercionRules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coercionRules.d.ts","sourceRoot":"","sources":["../../src/parseXml/coercionRules.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,MAAM,MAAM,YAAY,GACpB,QAAQ,GACR,SAAS,GACT,QAAQ,GACR,MAAM,GACN;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;CAAE,GACrD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,YAAY,EAAE,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;CAAE,CAAC;AAI5D,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,YAAY,GACjB;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAyD1C;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EAAE,GACtB,OAAO,CAuCT;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAarD;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,YAAY,GACjB,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,SAAS,CAY1C;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAQpE;AA8HD,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CA2I1E,CAAC;AAGF,eAAO,MAAM,0BAA0B,EAAE,MAAM,CAC7C,MAAM,EACN,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAgF7B,CAAC"}
+{"version":3,"file":"coercionRules.d.ts","sourceRoot":"","sources":["../../src/parseXml/coercionRules.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,MAAM,MAAM,YAAY,GACpB,QAAQ,GACR,SAAS,GACT,QAAQ,GACR,MAAM,GACN;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;CAAE,GACrD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,YAAY,EAAE,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;CAAE,CAAC;AAI5D,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,YAAY,GACjB;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAyD1C;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EAAE,GACtB,OAAO,CAuCT;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAarD;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,YAAY,GACjB,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,SAAS,CAY1C;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAQpE;AAED,KAAK,8BAA8B,GAC/B;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC;AAiBzB;;;;;;;GAOG;AACH,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,YAAY,GACjB,8BAA8B,CA+BhC;AA8HD,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CA2I1E,CAAC;AAGF,eAAO,MAAM,0BAA0B,EAAE,MAAM,CAC7C,MAAM,EACN,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAgF7B,CAAC"}

package/dist/parseXml/coercionRules.js

@@ -143,6 +143,52 @@ export function isBooleanObjectUnionRule(rule) {
     const hasObject = rule.options.some((opt) => typeof opt === "object" && opt.type === "object");
     return hasBoolean && hasObject;
 }
+function isPlainObject(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isDirectionalBoxShape(shape) {
+    const keys = Object.keys(shape).sort();
+    return (keys.length === 4 &&
+        keys[0] === "bottom" &&
+        keys[1] === "left" &&
+        keys[2] === "right" &&
+        keys[3] === "top");
+}
+/**
+ * 同一属性で shorthand と dot notation を併用したときに、
+ * shorthand 側をどのように扱うかを解決する。
+ *
+ * - merge: shorthand をオブジェクト化して dot notation 側で上書き
+ * - ignore: boolean shorthand を無視して dot notation を優先
+ * - conflict: 併用不可（従来どおりエラー）
+ */
+export function resolveMixedNotationShorthand(value, rule) {
+    const objectShape = getObjectShapeFromRule(rule);
+    if (!objectShape)
+        return { mode: "conflict" };
+    if (isBooleanObjectUnionRule(rule) &&
+        (value === "true" || value === "false")) {
+        return { mode: "ignore" };
+    }
+    const coerced = coerceWithRule(value, rule);
+    if (coerced.error !== null)
+        return { mode: "conflict" };
+    if (isPlainObject(coerced.value)) {
+        return { mode: "merge", value: coerced.value };
+    }
+    if (typeof coerced.value === "number" && isDirectionalBoxShape(objectShape)) {
+        return {
+            mode: "merge",
+            value: {
+                top: coerced.value,
+                right: coerced.value,
+                bottom: coerced.value,
+                left: coerced.value,
+            },
+        };
+    }
+    return { mode: "conflict" };
+}
 // ===== 共通変換ルール =====
 const LENGTH_RULE = {
     type: "union",

package/dist/parseXml/parseXml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseXml.d.ts","sourceRoot":"","sources":["../../src/parseXml/parseXml.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,OAAO,EAgBb,MAAM,aAAa,CAAC;AAYrB,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAgB,MAAM,EAAE,MAAM,EAAE,CAAC;gBACrB,MAAM,EAAE,MAAM,EAAE;CAM7B;AAGD,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAmB9C,CAAC;AA2oCF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,EAAE,CAiCrD"}
+{"version":3,"file":"parseXml.d.ts","sourceRoot":"","sources":["../../src/parseXml/parseXml.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,OAAO,EAgBb,MAAM,aAAa,CAAC;AAYrB,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAgB,MAAM,EAAE,MAAM,EAAE,CAAC;gBACrB,MAAM,EAAE,MAAM,EAAE;CAM7B;AAGD,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAmB9C,CAAC;AAgpCF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,EAAE,CAiCrD"}

package/dist/parseXml/parseXml.js

@@ -1,6 +1,6 @@
 import { XMLBuilder, XMLParser } from "fast-xml-parser";
 import { textNodeSchema, ulNodeSchema, olNodeSchema, imageNodeSchema, tableNodeSchema, shapeNodeSchema, chartNodeSchema, timelineNodeSchema, matrixNodeSchema, treeNodeSchema, flowNodeSchema, processArrowNodeSchema, pyramidNodeSchema, lineNodeSchema, iconNodeSchema, } from "../types.js";
-import { NODE_COERCION_MAP, CHILD_ELEMENT_COERCION_MAP, coerceWithRule, coerceFallback, getObjectShapeFromRule, isBooleanObjectUnionRule, } from "./coercionRules.js";
+import { NODE_COERCION_MAP, CHILD_ELEMENT_COERCION_MAP, coerceWithRule, coerceFallback, getObjectShapeFromRule, resolveMixedNotationShorthand, } from "./coercionRules.js";
 // ===== ParseXmlError =====
 export class ParseXmlError extends Error {
     errors;
@@ -381,14 +381,18 @@ function coerceChildAttrs(parentTagName, tagName, attrs, errors) {
     // Process regular attributes
     for (const [key, value] of Object.entries(regularAttrs)) {
         if (key in dotGroups) {
-            // When the rule is a union of boolean and object,
-            // allow boolean shorthand to coexist with dot-notation by ignoring the boolean value.
-            if (rules &&
-                rules[key] &&
-                isBooleanObjectUnionRule(rules[key]) &&
-                (value === "true" || value === "false")) {
-                // Silently skip the boolean value; dot-notation takes priority
-                continue;
+            if (rules && rules[key]) {
+                const resolved = resolveMixedNotationShorthand(value, rules[key]);
+                if (resolved.mode === "ignore") {
+                    continue;
+                }
+                if (resolved.mode === "merge") {
+                    result[key] = {
+                        ...resolved.value,
+                        ...result[key],
+                    };
+                    continue;
+                }
             }
             errors.push(`<${parentTagName}>.<${tagName}>: Attribute "${key}" conflicts with dot-notation attributes. Use one or the other, not both`);
             continue;
@@ -765,14 +769,19 @@ function convertPomNode(nodeType, tagName, attrs, childElements, textContent, er
             continue;
         // Conflict check: dot-notation and regular attribute for the same key
         if (key in dotGroups) {
-            // When the rule is a union of boolean and object (e.g., endArrow),
-            // allow boolean shorthand to coexist with dot-notation by ignoring the boolean value.
             const ruleForConflict = getCoercionRule(nodeType, key);
-            if (ruleForConflict &&
-                isBooleanObjectUnionRule(ruleForConflict) &&
-                (value === "true" || value === "false")) {
-                // Silently skip the boolean value; dot-notation takes priority
-                continue;
+            if (ruleForConflict) {
+                const resolved = resolveMixedNotationShorthand(value, ruleForConflict);
+                if (resolved.mode === "ignore") {
+                    continue;
+                }
+                if (resolved.mode === "merge") {
+                    result[key] = {
+                        ...resolved.value,
+                        ...result[key],
+                    };
+                    continue;
+                }
             }
             errors.push(`<${tagName}>: Attribute "${key}" conflicts with dot-notation attributes (e.g., "${key}.xxx"). Use one or the other, not both`);
             continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hirokisakabe/pom",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "AI-friendly PowerPoint generation with a Flexbox layout engine.",
   "type": "module",
   "main": "./dist/index.js",
@@ -46,17 +46,17 @@
   },
   "devDependencies": {
     "@size-limit/file": "^12.0.1",
-    "@types/node": "^25.5.0",
+    "@types/node": "^25.5.2",
     "@types/opentype.js": "^1.3.8",
     "@types/pngjs": "6.0.5",
-    "@vitest/coverage-v8": "^4.1.0",
-    "@vitest/ui": "^4.1.0",
-    "lucide-static": "^0.577.0",
+    "@vitest/coverage-v8": "^4.1.2",
+    "@vitest/ui": "^4.1.2",
+    "lucide-static": "^1.7.0",
     "pixelmatch": "7.1.0",
     "pngjs": "7.0.0",
     "size-limit": "^12.0.1",
     "tsx": "4.21.0",
-    "typescript-eslint": "^8.47.0"
+    "typescript-eslint": "^8.58.0"
   },
   "dependencies": {
     "@resvg/resvg-wasm": "^2.6.2",