@mce/openxml 0.11.1 → 0.11.3

package/dist/index.js

@@ -1,69 +1,91 @@
-import { definePlugin as b } from "mce";
-import { pptxToDoc as x, docToPptx as U } from "modern-openxml";
-function j() {
-  return b((r) => {
+import { definePlugin } from "mce";
+import { docToPptx, pptxToDoc } from "modern-openxml";
+function plugin() {
+  return definePlugin((editor) => {
     const {
-      log: e,
-      upload: t,
-      config: f,
-      to: o,
-      fonts: s
-    } = r, y = /\.pptx$/i;
+      log,
+      upload,
+      to,
+      fonts
+    } = editor;
+    const RE = /\.pptx$/i;
     return {
       name: "mce:openxml",
-      exporters: [
-        {
-          name: "pptx",
-          saveAs: !0,
-          handle: async (i) => {
-            const m = await o("json", i);
-            return new Blob([
-              await U({
-                ...m,
-                fonts: s
-              })
-            ], {
-              type: "application/vnd.openxmlformats-officedocument.presentationml.presentation"
-            });
-          }
-        }
-      ],
       loaders: [
         {
           name: "pptx",
           accept: ".pptx",
-          test: (i) => !!(i instanceof Blob && i.type.startsWith("application/vnd.openxmlformats-officedocument.presentationml.presentation") || i instanceof File && y.test(i.name)),
-          load: async (i) => {
-            const m = await import("modern-openxml/presetShapeDefinitions").then((n) => n.default), p = await x(await i.arrayBuffer(), {
-              presetShapeDefinitions: m,
-              upload: async (n, a) => {
-                const g = a.image;
-                let c = d(a.image);
-                const u = v(n);
-                if (!c) {
-                  const l = h(u);
-                  l && (c = d(l));
+          test: (source) => {
+            if (source instanceof Blob) {
+              if (source.type.startsWith("application/vnd.openxmlformats-officedocument.presentationml.presentation")) {
+                return true;
+              }
+            }
+            if (source instanceof File) {
+              if (RE.test(source.name)) {
+                return true;
+              }
+            }
+            return false;
+          },
+          load: async (source) => {
+            const presetShapeDefinitions = await import("modern-openxml/presetShapeDefinitions").then((rep) => rep.default);
+            const doc = await pptxToDoc(await source.arrayBuffer(), {
+              presetShapeDefinitions,
+              upload: async (input, meta) => {
+                const filename = meta.image;
+                let mimeType = getMimeType(meta.image);
+                const arrayBuffer = base64ToArrayBuffer(input);
+                if (!mimeType) {
+                  const ext = detectImageExt(arrayBuffer);
+                  if (ext) {
+                    mimeType = getMimeType(ext);
+                  }
                 }
-                return await t(
-                  new File([u], g, {
-                    type: c ?? void 0
+                return await upload(
+                  new File([arrayBuffer], filename, {
+                    type: mimeType ?? void 0
                   })
                 );
               },
-              progress: (n, a, g) => {
-                e("load pptx progress", `${n}/${a}`, g ? "cached" : "");
+              progress: (current, total, cached) => {
+                log("load pptx progress", `${current}/${total}`, cached ? "cached" : "");
               }
             });
-            return p.children?.forEach((n, a) => {
-              n.name = `Slide ${a + 1}`, n.style ??= {}, n.style.left = 0, n.style.top = Number(n.style.top) + a * f.value.frameGap, n.meta.inEditorIs = "Frame";
-            }), p.name = i.name, p.meta.inEditorIs = "Doc", p;
+            doc.children?.forEach((child, index) => {
+              child.name = `Slide ${index + 1}`;
+              child.style ??= {};
+              child.style.left = 0;
+              child.style.top = Number(child.style.top);
+              child.meta.inEditorIs = "Frame";
+            });
+            doc.name = source.name;
+            doc.meta.inEditorIs = "Doc";
+            return doc;
+          }
+        }
+      ],
+      exporters: [
+        {
+          name: "pptx",
+          saveAs: true,
+          handle: async (options) => {
+            const doc = await to("json", options);
+            return new Blob([
+              await docToPptx({
+                ...doc,
+                fonts
+              })
+            ], {
+              type: "application/vnd.openxmlformats-officedocument.presentationml.presentation"
+            });
           }
         }
       ]
     };
   });
 }
-const w = {
+const EXT_TO_MIMES = {
   jpeg: "image/jpeg",
   jpg: "image/jpeg",
   png: "image/png",
@@ -74,47 +96,60 @@ const w = {
   emf: "image/emf",
   wmf: "image/wmf"
 };
-function d(r) {
-  const e = r.split("."), t = e[e.length - 1].toLowerCase();
-  return t in w ? w[t] : null;
+function getMimeType(filename) {
+  const arr = filename.split(".");
+  const ext = arr[arr.length - 1].toLowerCase();
+  return ext in EXT_TO_MIMES ? EXT_TO_MIMES[ext] : null;
 }
-function v(r) {
-  const e = atob(r), t = e.length, f = new ArrayBuffer(t), o = new Uint8Array(f);
-  for (let s = 0; s < t; s++)
-    o[s] = e.charCodeAt(s);
-  return f;
+function base64ToArrayBuffer(base64) {
+  const binaryString = atob(base64);
+  const length = binaryString.length;
+  const buffer = new ArrayBuffer(length);
+  const uint8Array = new Uint8Array(buffer);
+  for (let i = 0; i < length; i++) {
+    uint8Array[i] = binaryString.charCodeAt(i);
+  }
+  return buffer;
 }
-function h(r) {
-  const e = new DataView(r), t = e.byteLength;
-  if (t < 4)
-    return;
-  switch (e.getUint32(0, !1)) {
+function detectImageExt(buffer) {
+  const view = new DataView(buffer);
+  const len = view.byteLength;
+  if (len < 4)
+    return void 0;
+  const magic = view.getUint32(0, false);
+  switch (magic) {
     case 2303741511:
       return "png";
     case 1195984440:
-      if (t >= 6) {
-        const o = e.getUint16(4, !1);
-        if (o === 14177 || o === 14689)
+      if (len >= 6) {
+        const version = view.getUint16(4, false);
+        if (version === 14177 || version === 14689) {
           return "gif";
+        }
       }
       break;
     case 1380533830:
-      if (t >= 12 && e.getUint32(8, !1) === 1464156752)
+      if (len >= 12 && view.getUint32(8, false) === 1464156752) {
         return "webp";
+      }
       break;
   }
-  if (e.getUint8(0) === 255 && e.getUint8(1) === 216 && e.getUint8(2) === 255)
+  if (view.getUint8(0) === 255 && view.getUint8(1) === 216 && view.getUint8(2) === 255) {
     return "jpeg";
-  if (e.getUint8(0) === 66 && e.getUint8(1) === 77)
+  }
+  if (view.getUint8(0) === 66 && view.getUint8(1) === 77) {
     return "bmp";
-  if (t >= 22) {
-    if (e.getUint32(0, !0) === 1179469088)
+  }
+  if (len >= 22) {
+    if (view.getUint32(0, true) === 1179469088) {
       return "emf";
-    if (e.getUint16(0, !0) === 55245 || e.getUint16(6, !0) === 55245)
+    } else if (view.getUint16(0, true) === 55245 || view.getUint16(6, true) === 55245) {
       return "wmf";
+    }
   }
+  return void 0;
 }
 export {
-  j as default,
-  j as plugin
+  plugin as default,
+  plugin
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mce/openxml",
   "type": "module",
-  "version": "0.11.1",
+  "version": "0.11.3",
   "description": "Openxml plugin for mce",
   "author": "wxm",
   "license": "MIT",
@@ -49,7 +49,7 @@
     "modern-openxml": "^1.10.0"
   },
   "devDependencies": {
-    "mce": "0.11.1"
+    "mce": "0.11.3"
   },
   "peerDependencies": {
     "mce": "^0"