@paroicms/quill-editor-plugin 1.34.0 → 1.36.0

package/backend/dist/formatters.js

@@ -1,19 +1,20 @@
-import { boolValOrUndef, objVal, strVal, strValOrUndef } from "@paroi/data-formatters-lib";
 import { isResizeRule } from "@paroicms/public-anywhere-lib";
-export function formatMediaBlotValues(val) {
-    const obj = objVal(val);
-    const resizeRule = strVal(obj.resizeRule);
-    if (!isResizeRule(resizeRule))
-        throw new Error(`Invalid resizeRule: ${resizeRule}`);
-    const align = strValOrUndef(obj.align);
-    if (align && !["center", "left", "right"].includes(align)) {
-        throw new Error(`Invalid align value: ${align}`);
-    }
+import { type } from "arktype";
+export const MediaBlotInputAT = type({
+    mediaId: "string",
+    resizeRule: "string",
+    "align?": '"center"|"left"|"right"|undefined|null',
+    "href?": "string|undefined|null",
+    "zoomable?": "boolean|undefined|null",
+    "+": "reject",
+}).pipe((data) => {
+    if (!isResizeRule(data.resizeRule))
+        throw new Error(`Invalid resizeRule: ${data.resizeRule}`);
     return {
-        mediaId: strVal(obj.mediaId),
-        resizeRule,
-        align: align,
-        href: strValOrUndef(obj.href),
-        zoomable: boolValOrUndef(obj.zoomable),
+        mediaId: data.mediaId,
+        resizeRule: data.resizeRule,
+        align: data.align ?? undefined,
+        href: data.href ?? undefined,
+        zoomable: data.zoomable ?? undefined,
     };
-}
+});

package/backend/dist/plugin.js

@@ -1,18 +1,22 @@
-import { isObj, strVal, strValOrUndef } from "@paroi/data-formatters-lib";
-import { isJsonFieldValue } from "@paroicms/public-anywhere-lib";
+import { isJsonFieldValue, isObj } from "@paroicms/public-anywhere-lib";
 import { escapeHtml, makeStylesheetLinkAsyncTag, resolveModuleDirectory, } from "@paroicms/public-server-lib";
+import { type } from "arktype";
 import { readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { convertQuillDeltaToHtml, convertQuillDeltaToPlainText } from "./quill-delta.js";
+const MediaIdQueryAT = type({
+    "mediaId?": "string|undefined",
+    "+": "reject",
+});
 const projectDir = resolveModuleDirectory(import.meta.url, { parent: true });
 const packageDir = dirname(projectDir);
-const version = strVal(JSON.parse(readFileSync(join(packageDir, "package.json"), "utf-8")).version);
+const version = type({ version: "string", "+": "ignore" }).assert(JSON.parse(readFileSync(join(packageDir, "package.json"), "utf-8"))).version;
 const plugin = {
     version,
     slug: "quill-editor",
     siteInit(service) {
-        service.setPublicAssetsDirectory(join(packageDir, "public-front", "dist"));
-        service.setBoAssetsDirectory(join(packageDir, "bo-front", "dist"));
+        service.setPublicAssetsDirectory(join(packageDir, "frontend", "dist"));
+        service.setAdminUiAssetsDirectory(join(packageDir, "admin-ui-plugin", "dist"));
         service.registerSiteSchemaLibrary(join(packageDir, "site-schema-lib"));
         service.registerFieldPreprocessor((service, value, options) => {
             if (!isJsonFieldValue(value))
@@ -29,14 +33,14 @@ const plugin = {
             if (!state.get("paQuillEditor:html"))
                 return;
             const tags = [
-                makeStylesheetLinkAsyncTag(`${service.pluginAssetsUrl}/public-front-plugin.css`),
+                makeStylesheetLinkAsyncTag(`${service.pluginAssetsUrl}/quill-editor-plugin.css`),
             ];
             if (state.get("paQuillEditor:zoomable")) {
-                tags.push(`<script type="module" src="${escapeHtml(`${service.pluginAssetsUrl}/public-front-plugin.mjs`)}" async></script>`);
+                tags.push(`<script type="module" src="${escapeHtml(`${service.pluginAssetsUrl}/quill-editor-plugin.mjs`)}" async></script>`);
             }
             return tags;
         });
-        if (service.configuration.backOffice?.code) {
+        if (service.configuration.adminUi?.code) {
             service.registerHeadTags(({ state }) => {
                 if (!state.get("paQuillEditor:html"))
                     return;
@@ -80,7 +84,7 @@ document.addEventListener("DOMContentLoaded", () => {
         service.setPublicApiHandler(async (service, httpContext, relativePath) => {
             const { req, res } = httpContext;
             if (relativePath === "/zoom-image") {
-                const mediaId = strValOrUndef(req.query.mediaId);
+                const { mediaId } = MediaIdQueryAT.assert(req.query);
                 if (!mediaId) {
                     res.append("Content-Type", "application/json; charset=utf-8");
                     res.status(400).send({ error: "mediaId parameter is required" });

package/backend/dist/quill-delta.js

@@ -1,8 +1,13 @@
-import { strVal, strValOrUndef } from "@paroi/data-formatters-lib";
 import { QuillDeltaToHtmlAsyncConverter, QuillDeltaToHtmlConverter, } from "@paroi/quill-delta-to-html";
 import { escapeHtml, generateObfuscatedHtml, obfuscateAsHtmlLink, stripHtmlTags, } from "@paroicms/public-server-lib";
-import { formatMediaBlotValues } from "./formatters.js";
+import { type } from "arktype";
+import { MediaBlotInputAT } from "./formatters.js";
 import { shouldOpenInBlankTab } from "./url-blank-tab.js";
+const ObfuscateAttributesAT = type({
+    obfuscate: "string",
+    "+": "reject",
+});
+const StringOrUndefinedAT = type("string|undefined|null").pipe((data) => data ?? undefined);
 export async function convertQuillDeltaToHtml(service, delta, options) {
     const { pluginService } = service;
     const ops = delta.ops;
@@ -51,7 +56,7 @@ export function convertQuillDeltaToPlainText(service, delta) {
 }
 async function mediaBlotProcessing(service, obj, options) {
     const { useImage, pluginService } = service;
-    const value = formatMediaBlotValues(obj);
+    const value = MediaBlotInputAT.assert(obj);
     const media = await pluginService.getMedia({ mediaId: value.mediaId }, { withAttachedData: { language: service.language } });
     if (media?.kind !== "image") {
         pluginService.logger.warn(`media '${value.mediaId}' is not an image`);
@@ -102,16 +107,17 @@ export function preprocessDelta(ops) {
     }
 }
 function obfuscateBlotProcessing(value, inlineAttributes) {
-    const textVal = strValOrUndef(value);
-    if (!textVal)
+    const textValue = StringOrUndefinedAT.assert(value);
+    if (!textValue)
         return "";
-    const asALink = formatObfuscateAsALink(strVal(inlineAttributes.obfuscate));
+    const { obfuscate } = ObfuscateAttributesAT.assert(inlineAttributes);
+    const asALink = formatObfuscateAsALink(obfuscate);
     let obfuscatedVal;
     if (asALink === "mailto" || asALink === "tel") {
-        obfuscatedVal = obfuscateAsHtmlLink(textVal);
+        obfuscatedVal = obfuscateAsHtmlLink(textValue);
     }
     else {
-        obfuscatedVal = generateObfuscatedHtml(textVal);
+        obfuscatedVal = generateObfuscatedHtml(textValue);
     }
     let result = obfuscatedVal;
     if (inlineAttributes.strike) {
@@ -135,7 +141,7 @@ function formatObfuscateAsALink(val) {
     throw new Error(`invalid link-type '${val}'`);
 }
 function videoPluginBlotProcessing(_service, value, _options) {
-    const videoId = strValOrUndef(value);
+    const videoId = StringOrUndefinedAT.assert(value);
     if (!videoId)
         return "";
     return `
@@ -147,12 +153,12 @@ function videoPluginBlotProcessing(_service, value, _options) {
   `;
 }
 async function internalLinkPluginBlotProcessing(service, value, options) {
-    const documentId = strValOrUndef(value);
+    const documentId = StringOrUndefinedAT.assert(value);
     if (!documentId)
         return "";
     const doc = await service.getDocument(documentId);
     if (!doc)
         return "";
     const url = await doc.getUrl({ absoluteUrl: !!options?.absoluteUrls });
-    return `<a class="InternalLink" href="${url}">${strValOrUndef(doc.title)}</a>`;
+    return `<a class="InternalLink" href="${url}">${StringOrUndefinedAT.assert(doc.title) ?? ""}</a>`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paroicms/quill-editor-plugin",
-  "version": "1.34.0",
+  "version": "1.36.0",
   "description": "Quill Editor plugin for ParoiCMS",
   "keywords": [
     "paroicms",
@@ -16,31 +16,31 @@
   "author": "Paroi Team",
   "license": "MIT",
   "scripts": {
-    "dev:bo": "(cd bo-front && vite)",
-    "build": "npm run build:backend && npm run build:bo && npm run build:public",
+    "dev:admin-ui": "(cd admin-ui-plugin && vite)",
+    "build": "npm run build:backend && npm run build:admin-ui && npm run build:public",
     "build:backend": "(cd backend && tsc)",
     "build:backend:watch": "(cd backend && tsc --watch --preserveWatchOutput)",
-    "build:bo": "(cd bo-front && tsc && vite build && npm run minify:bo)",
-    "minify:bo": "terser bo-front/dist/bo-plugin.mjs --output bo-front/dist/bo-plugin.mjs",
-    "build:public": "(cd public-front && tsc && vite build && npm run minify:public)",
-    "minify:public": "terser public-front/dist/public-front-plugin.mjs --output public-front/dist/public-front-plugin.mjs",
-    "build:public:watch": "(cd public-front && tsc && vite build --watch)",
-    "build:bo:watch": "(cd bo-front && vite build --watch)",
-    "bo:tsc": "(cd bo-front && tsc)",
-    "clear": "rimraf backend/dist/* bo-front/dist/*"
+    "build:admin-ui": "(cd admin-ui-plugin && tsc && vite build && npm run minify:admin-ui)",
+    "minify:admin-ui": "terser admin-ui-plugin/dist/admin-ui-plugin.mjs --output admin-ui-plugin/dist/admin-ui-plugin.mjs",
+    "build:public": "(cd frontend && tsc && vite build && npm run minify:public)",
+    "minify:public": "terser frontend/dist/quill-editor-plugin.mjs --output frontend/dist/quill-editor-plugin.mjs",
+    "build:public:watch": "(cd frontend && tsc && vite build --watch)",
+    "build:admin-ui:watch": "(cd admin-ui-plugin && vite build --watch)",
+    "bo:tsc": "(cd admin-ui-plugin && tsc)",
+    "clear": "rimraf backend/dist/* frontend/dist/* admin-ui-plugin/dist/*"
   },
   "dependencies": {
     "@paroi/quill-delta-to-html": "~0.12.3",
-    "@paroi/data-formatters-lib": "~0.4.0"
+    "arktype": "~2.1.20"
   },
   "peerDependencies": {
     "@paroicms/public-anywhere-lib": "0",
     "@paroicms/public-server-lib": "0"
   },
   "devDependencies": {
-    "@paroicms/public-anywhere-lib": "0.23.1",
-    "@paroicms/public-bo-lib": "0.24.1",
-    "@paroicms/public-server-lib": "0.35.0",
+    "@paroicms/public-admin-ui-lib": "0.26.0",
+    "@paroicms/public-anywhere-lib": "0.25.0",
+    "@paroicms/public-server-lib": "0.37.0",
     "@solid-primitives/i18n": "~2.2.1",
     "@types/node": "~24.0.1",
     "highlight.js": "~11.11.1",
@@ -50,18 +50,18 @@
     "sass": "~1.89.2",
     "solid-devtools": "~0.34.0",
     "solid-js": "1.9.7",
+    "terser": "~5.42.0",
     "typescript": "~5.8.3",
     "vite": "~6.3.5",
-    "vite-plugin-solid": "~2.11.6",
-    "terser": "~5.42.0"
+    "vite-plugin-solid": "~2.11.6"
   },
   "type": "module",
   "main": "backend/dist/plugin.js",
   "types": "types/html-editor-public-types.d.ts",
   "files": [
     "backend/dist",
-    "public-front/dist",
-    "bo-front/dist",
+    "frontend/dist",
+    "admin-ui-plugin/dist",
     "site-schema-lib",
     "types"
   ]

package/site-schema-lib/field-lib.site-schema.json

@@ -1,5 +1,5 @@
 {
-  "version": "8",
+  "ParoiCMSSiteSchemaFormatVersion": "9",
   "languages": ["en", "fr"],
   "fieldTypes": [
     {
@@ -9,7 +9,7 @@
       "dataType": "json",
       "renderAs": "html",
       "useAsExcerpt": 1,
-      "backOffice": {
+      "adminUi": {
         "editorRows": 4
       },
       "plugin": "@paroicms/quill-editor-plugin"
@@ -32,7 +32,7 @@
       "dataType": "json",
       "renderAs": "html",
       "useAsExcerpt": 1,
-      "backOffice": {
+      "adminUi": {
         "editorRows": 8
       },
       "plugin": "@paroicms/quill-editor-plugin"
@@ -43,7 +43,7 @@
       "storedAs": "text",
       "dataType": "json",
       "renderAs": "html",
-      "backOffice": {
+      "adminUi": {
         "editorRows": 4
       },
       "plugin": "@paroicms/quill-editor-plugin"