@blocklet/editor 1.6.198 → 1.6.200

package/lib/ext/AITranslationPlugin/selection.d.ts

@@ -1,3 +1,3 @@
 import { LexicalEditor } from 'lexical';
-import type { TranslationOptions, TranslateSelectionOperations } from './types';
-export declare const translateSelection: (editor: LexicalEditor, options: TranslationOptions) => Promise<TranslateSelectionOperations | null>;
+import type { TranslationOptions, TranslationResult } from './types';
+export declare const translateSelection: (editor: LexicalEditor, options: TranslationOptions) => Promise<TranslationResult | null>;

package/lib/ext/AITranslationPlugin/translation.d.ts

@@ -1,3 +1,3 @@
 import { type LexicalEditor } from 'lexical';
-import type { TranslationOptions, TranslateSelectionOperations } from './types';
-export declare const translateFullContent: (editor: LexicalEditor, options: TranslationOptions) => Promise<TranslateSelectionOperations | null>;
+import type { TranslationOptions, TranslationResult } from './types';
+export declare const translateFullContent: (editor: LexicalEditor, options: TranslationOptions) => Promise<TranslationResult | null>;

package/lib/ext/AITranslationPlugin/translation.js

@@ -12,8 +12,16 @@ export const translateFullContent = async (editor, options) => {
             sourceTextsWithPlaceholder[key] = processPlaceholders(text);
         });
         const targetTexts = {};
-        await translateAPI({ texts: sourceTextsWithPlaceholder, sourceLanguage, targetLanguage }, ({ data, progress }) => {
-            targetTexts[data.key] = restorePlaceholders(sourceTexts[data.key], data.text);
+        const errorsMap = {};
+        await translateAPI({ texts: sourceTextsWithPlaceholder, sourceLanguage, targetLanguage }, ({ data, progress, error }) => {
+            const sourceText = sourceTexts[data.key];
+            if (error) {
+                targetTexts[data.key] = sourceText;
+                errorsMap[data.key] = error;
+            }
+            else {
+                targetTexts[data.key] = restorePlaceholders(sourceText, data.text);
+            }
             if (options.onProgress && progress) {
                 options.onProgress(progress);
             }
@@ -28,8 +36,13 @@ export const translateFullContent = async (editor, options) => {
             };
         })
             .filter((x) => !!x.text);
+        const errors = translationBlocks
+            .filter((x) => !!errorsMap[x.key])
+            .map((item) => ({ ...item, error: errorsMap[item.key] }));
         // eslint-disable-next-line no-console
         console.log('translations: ', translations);
+        // eslint-disable-next-line no-console
+        console.log('errors: ', errors);
         // 默认自动替换
         const autoReplace = options.autoReplace !== false;
         if (autoReplace && !signal?.aborted) {
@@ -39,6 +52,7 @@ export const translateFullContent = async (editor, options) => {
         }
         return {
             translations,
+            errors,
             preview: () => {
                 return editor.getEditorState().read(() => $preview(translations));
             },

package/lib/ext/AITranslationPlugin/types.d.ts

@@ -20,9 +20,10 @@ export interface TranslatePayload {
         [key: string]: string;
     };
 }
-export type TranslateAPI = (payload: TranslatePayload, onData: ({ data, progress }: {
+export type TranslateAPI = (payload: TranslatePayload, onData: ({ data, progress, error }: {
     data: TranslationBlock;
     progress?: number;
+    error?: string;
 }) => void) => Promise<void>;
 export interface TranslationOptions {
     sourceLanguage?: string;
@@ -33,8 +34,16 @@ export interface TranslationOptions {
     autoReplace?: boolean;
 }
 export interface TranslateSelectionOperations {
-    translations: TranslationBlock[];
     preview: () => string;
     replace: (editor?: LexicalEditor) => void;
     insertBelow: () => void;
 }
+export interface TranslationError {
+    key: string;
+    text: string;
+    error: string;
+}
+export interface TranslationResult extends TranslateSelectionOperations {
+    translations: TranslationBlock[];
+    errors?: TranslationError[];
+}

package/lib/ext/AITranslationPlugin/utils.js

@@ -4,8 +4,9 @@ import { $isListNode, $isListItemNode } from '@lexical/list';
 import { $dfs, $findMatchingParent } from '@lexical/utils';
 import { fetchEventSource } from '@microsoft/fetch-event-source';
 import { $createLinkNode, $isLinkNode } from '@lexical/link';
-import { blockletExists, getBlockletMountPointInfo } from '../utils';
+import { blockletExists, getBlockletMountPointInfo, isValidUrl } from '../utils';
 import { $getDepth } from '../../lexical-utils';
+const PLACEHOLDER = '[[PLACEHOLDER]]';
 export const defaultTranslateAPI = async ({ texts, sourceLanguage, targetLanguage }, onData) => {
     if (!blockletExists('did-comments')) {
         throw new Error('Discuss Kit component must be installed.');
@@ -23,11 +24,12 @@ export const defaultTranslateAPI = async ({ texts, sourceLanguage, targetLanguag
             // @see: https://github.com/Azure/fetch-event-source/issues/36
             openWhenHidden: true,
             onmessage: (ev) => {
-                const parsed = JSON.parse(ev.data);
-                if (ev.event === 'error') {
-                    throw new Error(parsed.message);
-                }
-                const data = { data: parsed, progress: Number((++done / total).toFixed(2)) * 100 };
+                const { error, ...parsed } = JSON.parse(ev.data);
+                const data = {
+                    data: parsed,
+                    progress: Number((++done / total).toFixed(2)) * 100,
+                    error,
+                };
                 // eslint-disable-next-line no-console
                 console.log('onmessage: ', ev, data);
                 onData(data);
@@ -158,7 +160,14 @@ export const $extractTranslationBlocks = (translationNodes) => {
         const text = $extractTextContentFromTranslationNode(node);
         return { key: node.getKey(), text };
     })
-        .filter((item) => !!item.text);
+        .filter((item) => {
+        const trim = item.text?.trim();
+        // 如果为空或 url, 则不翻译
+        if (!trim || isValidUrl(trim)) {
+            return false;
+        }
+        return true;
+    });
 };
 /**
  * 处理带有 `###key###` 的文本, 将普通文本转成 TextNode, 将 `###key###` 替换成 key 对应的 Node
@@ -366,14 +375,14 @@ export const $extractTranslationBlocksFromSelection = (selection) => {
     // console.log({ firstTranslationBlock, blocks, lastTranslationBlock });
     return [firstTranslationBlock, ...blocks, lastTranslationBlock].filter((item) => !!item?.text);
 };
-export const processPlaceholders = (text, placeholder = '@@@@@') => {
+export const processPlaceholders = (text, placeholder = PLACEHOLDER) => {
     const matches = text.match(/###\d+###/g);
     if (matches) {
         return text.replaceAll(/###\d+###/g, placeholder);
     }
     return text;
 };
-export const restorePlaceholders = (original, replacedText, placeholder = '@@@@@') => {
+export const restorePlaceholders = (original, replacedText, placeholder = PLACEHOLDER) => {
     const matches = original.match(/###\d+###/g);
     if (matches) {
         return matches.reduce((acc, cur) => {

package/lib/ext/utils.d.ts

@@ -1,6 +1,7 @@
 import { LinkNode } from '@lexical/link';
 import { type LexicalEditor } from 'lexical';
 export declare function joinUrl(...paths: string[]): string;
+export declare function isValidUrl(url: string): boolean;
 export declare const safeParseJSON: (json: string, defaultValue?: any) => any;
 export declare const getBlockletMountPointInfo: (name: string) => any;
 export declare const blockletExists: (name: string) => boolean;

package/lib/ext/utils.js

@@ -7,6 +7,16 @@ function dedupeSlashes(path) {
 export function joinUrl(...paths) {
     return dedupeSlashes(paths.join('/'));
 }
+export function isValidUrl(url) {
+    try {
+        // eslint-disable-next-line no-new
+        new URL(url);
+    }
+    catch {
+        return false;
+    }
+    return true;
+}
 export const safeParseJSON = (json, defaultValue = null) => {
     try {
         return JSON.parse(json);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/editor",
-  "version": "1.6.198",
+  "version": "1.6.200",
   "main": "lib/index.js",
   "scripts": {
     "dev": "npm run storybook",
@@ -39,7 +39,7 @@
   "dependencies": {
     "@arcblock/ux": "^2.9.63",
     "@blocklet/embed": "^0.1.11",
-    "@blocklet/pdf": "1.6.198",
+    "@blocklet/pdf": "1.6.200",
     "@excalidraw/excalidraw": "^0.14.2",
     "@iconify/iconify": "^3.0.1",
     "@lexical/clipboard": "0.13.1",
@@ -108,5 +108,5 @@
     "react": "*",
     "react-dom": "*"
   },
-  "gitHead": "9dd144eeaf7f42dfeb617e9260565114f220e206"
+  "gitHead": "9a1304683bb3a7775d995c6cb5e5ffcee39be438"
 }