json2pptx-schema 0.1.1 → 0.2.0

package/dist/index.mjs

@@ -91,6 +91,118 @@ function migrateSlideType(type) {
   const normalized = type.trim().toLowerCase();
   return LEGACY_SLIDE_TYPE_MAP[normalized] ?? type;
 }
+function toFiniteNumber(value) {
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  if (!trimmed) return void 0;
+  const numeric = Number.parseFloat(trimmed);
+  return Number.isFinite(numeric) ? numeric : void 0;
+}
+function normalizeGradientType(value) {
+  if (typeof value !== "string" || !value.trim()) return "linear";
+  return value === "line" ? "linear" : value;
+}
+function normalizeGradientStopPosition(value) {
+  const numeric = toFiniteNumber(value);
+  if (numeric === void 0) return 0;
+  if (typeof value === "string" && value.trim().endsWith("%")) {
+    return numeric;
+  }
+  if (numeric > 1e3) return numeric / 1e3;
+  if (numeric > 100) return numeric / 1e3;
+  return numeric;
+}
+function migrateGradient(value) {
+  if (!isRecord(value)) return value;
+  const gradient = cloneValue(value);
+  const sourceColors = Array.isArray(gradient.colors) ? gradient.colors : [];
+  const rotate = toFiniteNumber(gradient.rotate ?? gradient.rot) ?? 0;
+  gradient.type = normalizeGradientType(gradient.type ?? gradient.path);
+  gradient.rotate = rotate;
+  gradient.colors = sourceColors.map((stop) => {
+    if (!isRecord(stop)) return stop;
+    const nextStop = cloneValue(stop);
+    nextStop.pos = normalizeGradientStopPosition(nextStop.pos);
+    return nextStop;
+  });
+  delete gradient.rot;
+  delete gradient.path;
+  return gradient;
+}
+function migrateFill(fill, options = {}) {
+  if (isRecord(options.gradient)) {
+    return {
+      type: "gradient",
+      gradient: migrateGradient(options.gradient)
+    };
+  }
+  if (typeof options.pattern === "string" && options.pattern.trim()) {
+    return {
+      type: "image",
+      src: options.pattern
+    };
+  }
+  if (typeof fill === "string") {
+    if (!fill.trim()) return void 0;
+    return {
+      type: "solid",
+      color: fill
+    };
+  }
+  if (!isRecord(fill)) {
+    return fill;
+  }
+  if (fill.type === "color" && typeof fill.value === "string") {
+    return {
+      type: "solid",
+      color: fill.value
+    };
+  }
+  if (isRecord(fill.gradient)) {
+    return {
+      type: "gradient",
+      gradient: migrateGradient(fill.gradient)
+    };
+  }
+  if (fill.type === "solid" || fill.type === void 0 && typeof fill.color === "string") {
+    return {
+      ...fill,
+      type: "solid",
+      color: fill.color
+    };
+  }
+  if (fill.type === "gradient") {
+    return {
+      type: "gradient",
+      gradient: migrateGradient(fill.gradient ?? fill.value ?? fill)
+    };
+  }
+  if (fill.type === "image" || fill.type === "pattern" || typeof fill.src === "string" || isRecord(fill.value)) {
+    const imageValue = isRecord(fill.value) ? fill.value : void 0;
+    const src = typeof fill.src === "string" ? fill.src : typeof imageValue?.picBase64 === "string" ? imageValue.picBase64 : void 0;
+    const opacity = toFiniteNumber(fill.opacity ?? imageValue?.opacity);
+    if (src) {
+      return {
+        type: "image",
+        src,
+        ...opacity === void 0 ? {} : { opacity }
+      };
+    }
+  }
+  return fill;
+}
+function migrateElement(element) {
+  if (!isRecord(element)) return element;
+  const nextElement = cloneValue(element);
+  nextElement.fill = migrateFill(nextElement.fill, {
+    gradient: nextElement.gradient,
+    pattern: nextElement.pattern
+  });
+  delete nextElement.gradient;
+  delete nextElement.pattern;
+  return nextElement;
+}
 function migrateDocument(input, toVersion = DEFAULT_SCHEMA_VERSION) {
   if (!isRecord(input)) return input;
   const migrated = cloneValue(input);
@@ -117,6 +229,10 @@ function migrateDocument(input, toVersion = DEFAULT_SCHEMA_VERSION) {
       if (!isRecord(slide)) return slide;
       const nextSlide = cloneValue(slide);
       nextSlide.type = migrateSlideType(nextSlide.type);
+      nextSlide.background = migrateFill(nextSlide.background);
+      if (Array.isArray(nextSlide.elements)) {
+        nextSlide.elements = nextSlide.elements.map((element) => migrateElement(element));
+      }
       return nextSlide;
     });
   }
@@ -124,6 +240,7 @@ function migrateDocument(input, toVersion = DEFAULT_SCHEMA_VERSION) {
 }
 
 // runtime/normalize.ts
+var TRANSPARENT_FILL = "rgba(255,255,255,0)";
 function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -139,6 +256,9 @@ function asString(value, fallback) {
 function asNumber(value, fallback) {
   return typeof value === "number" && Number.isFinite(value) ? value : fallback;
 }
+function asOptionalNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
 function asBoolean(value, fallback) {
   return typeof value === "boolean" ? value : fallback;
 }
@@ -184,17 +304,58 @@ function normalizeTheme(value) {
     outline: normalizeOutline(source.outline)
   };
 }
-function normalizeBackground(value, fallbackColor) {
+function normalizeGradient(value) {
   if (!isRecord2(value)) return void 0;
-  const type = typeof value.type === "string" && value.type.trim().length > 0 ? value.type : "solid";
-  const normalized = {
+  const colors = Array.isArray(value.colors) ? value.colors.filter((stop) => isRecord2(stop)).map((stop) => ({
+    ...stop,
+    pos: asNumber(stop.pos, 0),
+    color: asString(stop.color, "#000000")
+  })) : [];
+  return {
     ...value,
-    type
+    type: asString(value.type, "linear"),
+    rotate: asNumber(value.rotate, 0),
+    colors
   };
-  if (type === "solid" && typeof normalized.color !== "string") {
-    normalized.color = fallbackColor;
+}
+function normalizeFill(value, options = {}) {
+  if (!isRecord2(value)) {
+    if (!options.required) return void 0;
+    return {
+      type: "solid",
+      color: options.fallbackSolidColor ?? TRANSPARENT_FILL
+    };
   }
-  return normalized;
+  if (value.type === "gradient") {
+    return {
+      ...value,
+      type: "gradient",
+      gradient: normalizeGradient(value.gradient) ?? normalizeGradient(void 0) ?? {
+        type: "linear",
+        rotate: 0,
+        colors: [
+          { pos: 0, color: options.fallbackSolidColor ?? TRANSPARENT_FILL },
+          { pos: 100, color: options.fallbackSolidColor ?? TRANSPARENT_FILL }
+        ]
+      }
+    };
+  }
+  if (value.type === "image") {
+    return {
+      ...value,
+      type: "image",
+      src: asString(value.src, ""),
+      ...asOptionalNumber(value.opacity) === void 0 ? {} : { opacity: asOptionalNumber(value.opacity) }
+    };
+  }
+  return {
+    ...value,
+    type: "solid",
+    color: asString(value.color, options.fallbackSolidColor ?? TRANSPARENT_FILL)
+  };
+}
+function normalizeBackground(value, fallbackColor) {
+  return normalizeFill(value, { fallbackSolidColor: fallbackColor });
 }
 function normalizeElement(value, slideIndex, elementIndex, theme) {
   const fallbackId = `slide-${slideIndex + 1}-element-${elementIndex + 1}`;
@@ -225,6 +386,7 @@ function normalizeElement(value, slideIndex, elementIndex, theme) {
       content: asString(value.content, ""),
       defaultColor: asString(value.defaultColor, theme.fontColor || DEFAULT_TEXT_COLOR),
       defaultFontName: asString(value.defaultFontName, theme.fontName),
+      fill: normalizeFill(value.fill),
       vertical: asBoolean(value.vertical, false)
     };
     return textElement;
@@ -239,7 +401,10 @@ function normalizeElement(value, slideIndex, elementIndex, theme) {
       height,
       path: asString(value.path, ""),
       viewBox: asPair(value.viewBox, [width, height]),
-      fill: asString(value.fill, ""),
+      fill: normalizeFill(value.fill, {
+        fallbackSolidColor: TRANSPARENT_FILL,
+        required: true
+      }),
       fixedRatio: asBoolean(value.fixedRatio, DEFAULT_SHAPE_FIXED_RATIO)
     };
     return shapeElement;
@@ -329,18 +494,24 @@ import Ajv from "ajv";
 // versions/v1/schema.json
 var schema_default = {
   $schema: "http://json-schema.org/draft-07/schema#",
-  $id: "https://json2pptx.dev/schema/v1",
+  $id: "https://json2pptx.dev/json2pptx-schema/v1",
   title: "json2pptx document schema v1",
   type: "object",
-  required: ["slides"],
+  required: [
+    "slides"
+  ],
   properties: {
     schemaVersion: {
       const: "1.0.0"
     },
     version: {
       oneOf: [
-        { type: "string" },
-        { type: "number" }
+        {
+          type: "string"
+        },
+        {
+          type: "number"
+        }
       ]
     },
     title: {
@@ -368,40 +539,78 @@ var schema_default = {
   definitions: {
     shadow: {
       type: "object",
-      required: ["h", "v", "blur", "color"],
+      required: [
+        "h",
+        "v",
+        "blur",
+        "color"
+      ],
       properties: {
-        h: { type: "number" },
-        v: { type: "number" },
-        blur: { type: "number" },
-        color: { type: "string" }
+        h: {
+          type: "number"
+        },
+        v: {
+          type: "number"
+        },
+        blur: {
+          type: "number"
+        },
+        color: {
+          type: "string"
+        }
       },
       additionalProperties: true
     },
     outline: {
       type: "object",
-      required: ["width", "color", "style"],
+      required: [
+        "width",
+        "color",
+        "style"
+      ],
       properties: {
-        width: { type: "number" },
-        color: { type: "string" },
-        style: { type: "string" }
+        width: {
+          type: "number"
+        },
+        color: {
+          type: "string"
+        },
+        style: {
+          type: "string"
+        }
       },
       additionalProperties: true
     },
     gradientStop: {
       type: "object",
-      required: ["pos", "color"],
+      required: [
+        "pos",
+        "color"
+      ],
       properties: {
-        pos: { type: "number" },
-        color: { type: "string" }
+        pos: {
+          type: "number"
+        },
+        color: {
+          type: "string"
+        }
       },
       additionalProperties: true
     },
     gradient: {
       type: "object",
-      required: ["type", "rotate", "colors"],
+      required: [
+        "type",
+        "rotate",
+        "colors"
+      ],
       properties: {
-        type: { type: "string" },
-        rotate: { type: "number" },
+        type: {
+          type: "string"
+        },
+        rotate: {
+          type: "number"
+        },
         colors: {
           type: "array",
           minItems: 2,
@@ -412,18 +621,94 @@ var schema_default = {
       },
       additionalProperties: true
     },
+    solidFill: {
+      type: "object",
+      required: [
+        "type",
+        "color"
+      ],
+      properties: {
+        type: {
+          const: "solid"
+        },
+        color: {
+          type: "string"
+        }
+      },
+      additionalProperties: true
+    },
+    gradientFill: {
+      type: "object",
+      required: [
+        "type",
+        "gradient"
+      ],
+      properties: {
+        type: {
+          const: "gradient"
+        },
+        gradient: {
+          $ref: "#/definitions/gradient"
+        }
+      },
+      additionalProperties: true
+    },
+    imageFill: {
+      type: "object",
+      required: [
+        "type",
+        "src"
+      ],
+      properties: {
+        type: {
+          const: "image"
+        },
+        src: {
+          type: "string"
+        },
+        opacity: {
+          type: "number"
+        }
+      },
+      additionalProperties: true
+    },
+    fill: {
+      oneOf: [
+        {
+          $ref: "#/definitions/solidFill"
+        },
+        {
+          $ref: "#/definitions/gradientFill"
+        },
+        {
+          $ref: "#/definitions/imageFill"
+        }
+      ]
+    },
     theme: {
       type: "object",
       properties: {
         themeColors: {
           type: "array",
-          items: { type: "string" }
+          items: {
+            type: "string"
+          }
+        },
+        fontColor: {
+          type: "string"
         },
-        fontColor: { type: "string" },
-        fontName: { type: "string" },
-        backgroundColor: { type: "string" },
-        shadow: { $ref: "#/definitions/shadow" },
-        outline: { $ref: "#/definitions/outline" }
+        fontName: {
+          type: "string"
+        },
+        backgroundColor: {
+          type: "string"
+        },
+        shadow: {
+          $ref: "#/definitions/shadow"
+        },
+        outline: {
+          $ref: "#/definitions/outline"
+        }
       },
       additionalProperties: true
     },
@@ -431,32 +716,55 @@ var schema_default = {
       type: "array",
       minItems: 2,
       maxItems: 2,
-      items: { type: "number" }
+      items: {
+        type: "number"
+      }
     },
     linePoints: {
       type: "array",
       minItems: 2,
       maxItems: 2,
-      items: { type: "string" }
+      items: {
+        type: "string"
+      }
     },
     shapeText: {
       type: "object",
-      required: ["content"],
+      required: [
+        "content"
+      ],
       properties: {
-        content: { type: "string" },
-        defaultColor: { type: "string" },
-        defaultFontName: { type: "string" },
-        align: { type: "string" },
-        lineHeight: { type: "number" },
-        type: { type: "string" }
+        content: {
+          type: "string"
+        },
+        defaultColor: {
+          type: "string"
+        },
+        defaultFontName: {
+          type: "string"
+        },
+        align: {
+          type: "string"
+        },
+        lineHeight: {
+          type: "number"
+        },
+        type: {
+          type: "string"
+        }
       },
       additionalProperties: true
     },
     clip: {
       type: "object",
-      required: ["shape", "range"],
+      required: [
+        "shape",
+        "range"
+      ],
       properties: {
-        shape: { type: "string" },
+        shape: {
+          type: "string"
+        },
         range: {
           type: "array",
           minItems: 2,
@@ -473,32 +781,52 @@ var schema_default = {
       properties: {
         opacity: {
           oneOf: [
-            { type: "string" },
-            { type: "number" }
+            {
+              type: "string"
+            },
+            {
+              type: "number"
+            }
           ]
         },
         grayscale: {
           oneOf: [
-            { type: "string" },
-            { type: "number" }
+            {
+              type: "string"
+            },
+            {
+              type: "number"
+            }
           ]
         },
         blur: {
           oneOf: [
-            { type: "string" },
-            { type: "number" }
+            {
+              type: "string"
+            },
+            {
+              type: "number"
+            }
           ]
         },
         sepia: {
           oneOf: [
-            { type: "string" },
-            { type: "number" }
+            {
+              type: "string"
+            },
+            {
+              type: "number"
+            }
           ]
         },
         saturate: {
           oneOf: [
-            { type: "string" },
-            { type: "number" }
+            {
+              type: "string"
+            },
+            {
+              type: "number"
+            }
           ]
         }
       },
@@ -507,72 +835,154 @@ var schema_default = {
     tableCellStyle: {
       type: "object",
       properties: {
-        fontname: { type: "string" },
-        color: { type: "string" },
-        align: { type: "string" },
-        fontsize: { type: "string" },
-        backcolor: { type: "string" }
+        fontname: {
+          type: "string"
+        },
+        color: {
+          type: "string"
+        },
+        align: {
+          type: "string"
+        },
+        fontsize: {
+          type: "string"
+        },
+        backcolor: {
+          type: "string"
+        }
       },
       additionalProperties: true
     },
     tableCell: {
       type: "object",
       properties: {
-        id: { type: "string" },
-        colspan: { type: "number" },
-        rowspan: { type: "number" },
-        text: { type: "string" },
-        style: { $ref: "#/definitions/tableCellStyle" }
+        id: {
+          type: "string"
+        },
+        colspan: {
+          type: "number"
+        },
+        rowspan: {
+          type: "number"
+        },
+        text: {
+          type: "string"
+        },
+        style: {
+          $ref: "#/definitions/tableCellStyle"
+        }
       },
       additionalProperties: true
     },
     element: {
       type: "object",
-      required: ["type"],
+      required: [
+        "type"
+      ],
       properties: {
-        type: { type: "string" },
-        id: { type: "string" },
-        groupId: { type: "string" },
-        left: { type: "number" },
-        top: { type: "number" },
-        width: { type: "number" },
-        height: { type: "number" },
-        rotate: { type: "number" },
-        lock: { type: "boolean" },
-        opacity: { type: "number" },
-        flipH: { type: "boolean" },
-        flipV: { type: "boolean" },
-        shadow: { $ref: "#/definitions/shadow" },
-        outline: { $ref: "#/definitions/outline" }
+        type: {
+          type: "string"
+        },
+        id: {
+          type: "string"
+        },
+        groupId: {
+          type: "string"
+        },
+        left: {
+          type: "number"
+        },
+        top: {
+          type: "number"
+        },
+        width: {
+          type: "number"
+        },
+        height: {
+          type: "number"
+        },
+        rotate: {
+          type: "number"
+        },
+        lock: {
+          type: "boolean"
+        },
+        opacity: {
+          type: "number"
+        },
+        flipH: {
+          type: "boolean"
+        },
+        flipV: {
+          type: "boolean"
+        },
+        shadow: {
+          $ref: "#/definitions/shadow"
+        },
+        outline: {
+          $ref: "#/definitions/outline"
+        }
       },
       allOf: [
         {
           if: {
-            required: ["type"],
+            required: [
+              "type"
+            ],
             properties: {
-              type: { const: "text" }
+              type: {
+                const: "text"
+              }
             }
           },
           then: {
-            required: ["content", "left", "top", "width", "height"],
+            required: [
+              "content",
+              "left",
+              "top",
+              "width",
+              "height"
+            ],
             properties: {
-              content: { type: "string" },
-              defaultColor: { type: "string" },
-              defaultFontName: { type: "string" },
-              fill: { type: "string" },
-              lineHeight: { type: "number" },
-              paragraphSpace: { type: "number" },
-              textType: { type: "string" },
-              vertical: { type: "boolean" },
-              wordSpace: { type: "number" }
+              content: {
+                type: "string"
+              },
+              defaultColor: {
+                type: "string"
+              },
+              defaultFontName: {
+                type: "string"
+              },
+              fill: {
+                $ref: "#/definitions/fill"
+              },
+              lineHeight: {
+                type: "number"
+              },
+              paragraphSpace: {
+                type: "number"
+              },
+              textType: {
+                type: "string"
+              },
+              vertical: {
+                type: "boolean"
+              },
+              wordSpace: {
+                type: "number"
+              }
             }
           }
         },
         {
           if: {
-            required: ["type"],
+            required: [
+              "type"
+            ],
             properties: {
-              type: { const: "shape" }
+              type: {
+                const: "shape"
+              }
             }
           },
           then: {
@@ -586,26 +996,45 @@ var schema_default = {
               "height"
             ],
             properties: {
-              path: { type: "string" },
-              viewBox: { $ref: "#/definitions/pair" },
-              fill: { type: "string" },
-              fixedRatio: { type: "boolean" },
+              path: {
+                type: "string"
+              },
+              viewBox: {
+                $ref: "#/definitions/pair"
+              },
+              fill: {
+                $ref: "#/definitions/fill"
+              },
+              fixedRatio: {
+                type: "boolean"
+              },
               keypoints: {
                 type: "array",
-                items: { type: "number" }
+                items: {
+                  type: "number"
+                }
+              },
+              pathFormula: {
+                type: "string"
               },
-              pathFormula: { type: "string" },
-              gradient: { $ref: "#/definitions/gradient" },
-              special: { type: "boolean" },
-              text: { $ref: "#/definitions/shapeText" }
+              special: {
+                type: "boolean"
+              },
+              text: {
+                $ref: "#/definitions/shapeText"
+              }
             }
           }
         },
         {
           if: {
-            required: ["type"],
+            required: [
+              "type"
+            ],
             properties: {
-              type: { const: "line" }
+              type: {
+                const: "line"
+              }
             }
           },
           then: {
@@ -619,49 +1048,98 @@ var schema_default = {
               "top"
             ],
             properties: {
-              start: { $ref: "#/definitions/pair" },
-              end: { $ref: "#/definitions/pair" },
-              points: { $ref: "#/definitions/linePoints" },
-              broken: { $ref: "#/definitions/pair" },
-              color: { type: "string" },
-              style: { type: "string" },
-              width: { type: "number" }
+              start: {
+                $ref: "#/definitions/pair"
+              },
+              end: {
+                $ref: "#/definitions/pair"
+              },
+              points: {
+                $ref: "#/definitions/linePoints"
+              },
+              broken: {
+                $ref: "#/definitions/pair"
+              },
+              color: {
+                type: "string"
+              },
+              style: {
+                type: "string"
+              },
+              width: {
+                type: "number"
+              }
             }
           }
         },
         {
           if: {
-            required: ["type"],
+            required: [
+              "type"
+            ],
             properties: {
-              type: { const: "image" }
+              type: {
+                const: "image"
+              }
             }
           },
           then: {
-            required: ["src", "left", "top", "width", "height"],
+            required: [
+              "src",
+              "left",
+              "top",
+              "width",
+              "height"
+            ],
             properties: {
-              src: { type: "string" },
-              fixedRatio: { type: "boolean" },
-              clip: { $ref: "#/definitions/clip" },
-              filters: { $ref: "#/definitions/filters" },
-              imageType: { type: "string" },
-              radius: { type: "number" },
-              colorMask: { type: "string" }
+              src: {
+                type: "string"
+              },
+              fixedRatio: {
+                type: "boolean"
+              },
+              clip: {
+                $ref: "#/definitions/clip"
+              },
+              filters: {
+                $ref: "#/definitions/filters"
+              },
+              imageType: {
+                type: "string"
+              },
+              radius: {
+                type: "number"
+              },
+              colorMask: {
+                type: "string"
+              }
             }
           }
         },
         {
           if: {
-            required: ["type"],
+            required: [
+              "type"
+            ],
             properties: {
-              type: { const: "table" }
+              type: {
+                const: "table"
+              }
             }
           },
           then: {
-            required: ["left", "top", "width", "height"],
+            required: [
+              "left",
+              "top",
+              "width",
+              "height"
+            ],
             properties: {
               colWidths: {
                 type: "array",
-                items: { type: "number" }
+                items: {
+                  type: "number"
+                }
               },
               data: {
                 type: "array",
@@ -672,7 +1150,9 @@ var schema_default = {
                   }
                 }
               },
-              cellMinHeight: { type: "number" }
+              cellMinHeight: {
+                type: "number"
+              }
             }
           }
         }
@@ -680,23 +1160,26 @@ var schema_default = {
       additionalProperties: true
     },
     slideBackground: {
-      type: "object",
-      properties: {
-        type: { type: "string" },
-        color: { type: "string" },
-        src: { type: "string" },
-        gradient: { $ref: "#/definitions/gradient" }
-      },
-      additionalProperties: true
+      $ref: "#/definitions/fill"
     },
     slide: {
       type: "object",
-      required: ["elements"],
+      required: [
+        "elements"
+      ],
       properties: {
-        id: { type: "string" },
-        type: { type: "string" },
-        remark: { type: "string" },
-        background: { $ref: "#/definitions/slideBackground" },
+        id: {
+          type: "string"
+        },
+        type: {
+          type: "string"
+        },
+        remark: {
+          type: "string"
+        },
+        background: {
+          $ref: "#/definitions/slideBackground"
+        },
         elements: {
           type: "array",
           items: {