@opensumi/ide-notebook 3.7.1-next-1739781685.0 → 3.7.1

package/src/browser/libro/diff-view/libro-diff-color-registry.ts

@@ -1,132 +0,0 @@
-import { Color, ColorContribution, singleton } from '@difizen/mana-app';
-
-import type { ColorRegistry } from '@difizen/mana-app';
-
-@singleton({ contrib: ColorContribution })
-export class LibroDiffColorRegistry implements ColorContribution {
-  registerColors(colors: ColorRegistry): void {
-    colors.register(
-      // #region antd variable
-      {
-        id: 'libro.diff.added.cell.header.color',
-        defaults: { dark: '#404C34', light: '#E4EADC' },
-        description: '',
-      },
-      {
-        id: 'libro.diff.removed.cell.header.color',
-        defaults: { dark: '#5A3433', light: '#F2E7EA' },
-        description: '',
-      },
-      {
-        id: 'libro.diff.cell.header.text.color',
-        defaults: { dark: '#e3e4e6', light: Color.rgba(0, 10, 26, 0.47) },
-        description: '',
-      },
-      {
-        id: 'libro.diff.cell.header.execution.color',
-        defaults: { dark: '#6A83AA', light: '#6A83AA' },
-        description: '',
-      },
-      {
-        id: 'libro.diff.unchanged.cell.header.color',
-        defaults: { dark: Color.rgba(255, 255, 255, 0.06), light: '#EAECF2' },
-        description: '',
-      },
-      {
-        id: 'libro.diff.container.color',
-        defaults: { dark: '#1f2022', light: '#ffffff' },
-        description: '',
-      },
-      {
-        id: 'libro.diff.input.background.color',
-        defaults: { dark: '#19191B', light: '#F4F6FB' },
-        description: '',
-      },
-      {
-        id: 'libro.diff.editor.background.color',
-        defaults: { dark: '#1F2022', light: '#ffffff' },
-        description: '',
-      },
-      {
-        id: 'libro.diff.cell.border.color',
-        defaults: { dark: '#3B3C42', light: '#D7DBE7' },
-        description: '',
-      },
-      {
-        id: 'libro.diff.editor.removed.color',
-        defaults: { dark: '#4F2726', light: '#FAF0F0' },
-        description: '',
-      },
-      {
-        id: 'libro.diff.editor.added.color',
-        defaults: { dark: '#334126', light: '#ECF4E3' },
-        description: '',
-      },
-      {
-        id: 'libro.diff.editor.line.insert.color',
-        defaults: { dark: Color.rgba(83, 104, 48, 0.45), light: Color.rgba(189, 214, 151, 0.25) },
-        description: '',
-      },
-      {
-        id: 'libro.diff.editor.line.delete.color',
-        defaults: { dark: Color.rgba(126, 50, 45, 0.45), light: Color.rgba(241, 212, 216, 0.35) },
-        description: '',
-      },
-      {
-        id: 'libro.diff.editor.char.insert.color',
-        defaults: { dark: Color.rgba(16, 22, 3, 0.7), light: Color.rgba(67, 151, 36, 0.25) },
-        description: '',
-      },
-      {
-        id: 'libro.diff.editor.char.delete.color',
-        defaults: { dark: Color.rgba(53, 15, 14, 0.7), light: Color.rgba(255, 0, 0, 0.2) },
-        description: '',
-      },
-      {
-        id: 'libro.diff.fold.background.color',
-        defaults: { dark: Color.rgba(255, 255, 255, 0.08), light: Color.rgba(0, 10, 26, 0.02) },
-        description: '',
-      },
-      {
-        id: 'libro.diff.fold.hover.background.color',
-        defaults: { dark: Color.rgba(255, 255, 255, 0.1), light: Color.rgba(0, 10, 26, 0.04) },
-        description: '',
-      },
-      {
-        id: 'libro.diff.fold.text.color',
-        defaults: { dark: '#BDC0C4', light: Color.rgba(0, 10, 26, 0.47) },
-        description: '',
-      },
-      {
-        id: 'libro.diff.content.same.text.color',
-        defaults: { dark: '#E3E4E6', light: Color.rgba(0, 10, 26, 0.68) },
-        description: '',
-      },
-      {
-        id: 'libro.diff.select.background.color',
-        defaults: { dark: '#BCCEFF', light: '#e5ebf1' },
-        description: '',
-      },
-      {
-        id: 'libro.diff.select.highlight.background.color',
-        defaults: { dark: '#C8D1E7', light: '#DDE6FF' },
-        description: '',
-      },
-      {
-        id: 'libro.diff.editor.gutter.number.color',
-        defaults: { dark: '#a8aebf', light: '#A4AECB' },
-        description: '',
-      },
-      {
-        id: 'libro.diff.editor.intent.color',
-        defaults: { dark: '#565C6D', light: '#A4AECB' },
-        description: '',
-      },
-      {
-        id: 'libro.editor.cursor.color',
-        defaults: { dark: '#ffffff', light: '#000000' },
-        description: '',
-      },
-    );
-  }
-}

package/src/browser/libro/diff-view/libro-diff-component.tsx

@@ -1,25 +0,0 @@
-import { ViewManager, ViewRender, useInject } from '@difizen/mana-app';
-import React, { useEffect, useState } from 'react';
-
-import { libroDiffViewFactoryId } from './libro-diff-protocol';
-
-import type { DiffOption } from './libro-diff-protocol';
-import type { LibroDiffView } from './libro-diff-view';
-
-export function LibroDiffComponent(props: { options: DiffOption }) {
-  const [libroDiffView, setLibroDiffView] = useState<LibroDiffView | undefined>(undefined);
-  const viewManager = useInject(ViewManager);
-  useEffect(() => {
-    viewManager
-      .getOrCreateView<LibroDiffView>(libroDiffViewFactoryId, {
-        ...(props.options || {}),
-      })
-      .then((view) => {
-        setLibroDiffView(view);
-      });
-  }, []);
-  if (!libroDiffView || !libroDiffView.view) {
-    return null;
-  }
-  return <ViewRender view={libroDiffView} />;
-}

package/src/browser/libro/diff-view/libro-diff-protocol.ts

@@ -1,94 +0,0 @@
-import { concatMultilineString } from '@difizen/libro-common';
-
-import type { ICell, INotebookContent } from '@difizen/libro-common';
-import type { URI, View } from '@difizen/mana-app';
-
-export const libroDiffViewFactoryId = 'libro-diff-view-factory';
-
-export const getLibroCellType = (cell: ICell) => {
-  const cellType = (cell.metadata?.libroCellType as string) ?? cell.cell_type;
-  if (cellType === 'sql') {
-    return 'SQL';
-  }
-  return cellType.charAt(0).toUpperCase() + cellType.slice(1);
-};
-
-export const getSource = (cell: ICell) => {
-  let codeValue = concatMultilineString(cell.source);
-  if (getLibroCellType(cell) === 'SQL' && codeValue.includes(',tmp_table:')) {
-    codeValue = decodeURIComponent(escape(atob(codeValue.split(',tmp_table:')[0].substring(6))));
-  }
-  if (getLibroCellType(cell) === 'SQL' && codeValue.includes(',variable:')) {
-    codeValue = decodeURIComponent(escape(atob(codeValue.split(',variable:')[0].substring(6))));
-  }
-  return codeValue;
-};
-
-export type DiffCellItemResult = DiffCellItem | DiffCellUnchangedItems;
-export interface DiffView extends View {
-  diffCellsResult: DiffCellItemResult[];
-  originContent: IDiffNotebookContent;
-  targetContent: IDiffNotebookContent;
-  diffUnchangedCellsRenderStatus: 'all' | 'part' | 'none';
-  options?: Record<string, any>;
-}
-export interface IDiffNotebookContent {
-  content: INotebookContent;
-  diffTag: string;
-}
-
-export type DiffType = 'added' | 'removed' | 'changed' | 'unchanged';
-export interface DiffCellItem {
-  diffType: DiffType;
-  origin: ICell;
-  target: ICell;
-}
-
-export const DiffCellItem = {
-  is: (arg: Record<any, any>): arg is DiffCellItem =>
-    !!arg &&
-    'diffType' in arg &&
-    typeof (arg as any).diffType === 'string' &&
-    'origin' in arg &&
-    typeof (arg as any).origin === 'object' &&
-    'target' in arg &&
-    typeof (arg as any).target === 'object',
-};
-
-export interface DiffCellUnchangedItems {
-  isShown: boolean;
-  unchangedResultItems: DiffCellItem[];
-}
-
-export const DiffCellUnchangedItems = {
-  is: (arg: Record<any, any>): arg is DiffCellUnchangedItems =>
-    !!arg &&
-    'isShown' in arg &&
-    typeof (arg as any).isShown === 'boolean' &&
-    'unchangedResultItems' in arg &&
-    typeof (arg as any).unchangedResultItems === 'object',
-};
-
-export interface DiffArrayItem {
-  count: number;
-  added?: undefined | string;
-  removed?: undefined | string;
-  value: ICell[];
-}
-
-export interface DiffEditorProps {
-  diffCellResultItem: DiffCellItem & { originFilePath?: string; targetFilePath?: string };
-}
-
-export const DiffOption = Symbol('DiffOption');
-/**
- * LibroDiff 创建参数
- * 默认可 json 序列化
- */
-export interface DiffOption {
-  loadType: string;
-  id?: string;
-  origin: URI;
-  target: URI;
-  [key: string]: any;
-}

package/src/browser/libro/diff-view/libro-diff-view.tsx

@@ -1,351 +0,0 @@
-import { ColumnHeightOutlined } from '@ant-design/icons';
-import { LibroContentService } from '@difizen/libro-core';
-import {
-  BaseView,
-  ViewInstance,
-  ViewOption,
-  getOrigin,
-  inject,
-  prop,
-  transient,
-  useInject,
-  view,
-} from '@difizen/mana-app';
-import { Spin } from 'antd';
-import { diffArrays } from 'diff';
-import React, { forwardRef, useEffect } from 'react';
-
-import './index.less';
-import { ContentLoaderType } from '../../mana';
-
-import { ContentSameIcon } from './components/libro-diff-all-cells-same-components';
-import { LibroDiffChangedCellComponent } from './components/libro-diff-changed-cell-components';
-import { LibroDiffSideCellComponent } from './components/libro-diff-side-cell-components';
-import { DiffCellItem, DiffCellUnchangedItems, DiffOption, libroDiffViewFactoryId } from './libro-diff-protocol';
-
-import type { DiffArrayItem, DiffCellItemResult, DiffView, IDiffNotebookContent } from './libro-diff-protocol';
-import type { ICell, MultilineString } from '@difizen/libro-common';
-import type { ViewComponent } from '@difizen/mana-app';
-
-function comparator(compareLeft: ICell, compareRight: ICell) {
-  return compareLeft.id === compareRight.id;
-}
-
-function multilineStringEqual(a: MultilineString, b: MultilineString) {
-  if (a.length !== b.length) {
-    return false;
-  }
-  for (let i = 0; i < a.length; i++) {
-    if (a[i] !== b[i]) {
-      return false;
-    }
-  }
-  return true;
-}
-export const LibroDiffRender = forwardRef(() => {
-  const libroDiffView = useInject<LibroDiffView>(ViewInstance);
-  useEffect(() => {}, [
-    libroDiffView.diffUnchangedCellsRenderStatus,
-    libroDiffView.diffCellsResult,
-    libroDiffView.isDiffSame,
-  ]);
-  if (!libroDiffView.diffCellsResult) {
-    return (
-      <div className='libro-diff-content-loading-container'>
-        <Spin size='large' />
-      </div>
-    );
-  }
-
-  if (libroDiffView.isDiffSame) {
-    return (
-      <div className='libro-diff-content-same-container'>
-        <ContentSameIcon />
-        <span className='libro-diff-content-same-text'>内容一致</span>
-      </div>
-    );
-  }
-
-  return (
-    <div className='libro-diff-content-container'>
-      {libroDiffView.diffCellsResult &&
-        libroDiffView.diffCellsResult.map((item) => {
-          if (DiffCellItem.is(item) && item.diffType === 'added') {
-            return (
-              <LibroDiffSideCellComponent
-                diffCellResultItem={item}
-                key={libroDiffView.id + item.origin.id?.toString()}
-              />
-            );
-          } else if (DiffCellItem.is(item) && item.diffType === 'removed') {
-            return (
-              <LibroDiffSideCellComponent
-                diffCellResultItem={item}
-                key={libroDiffView.id + item.origin.id?.toString()}
-              />
-            );
-          } else if (DiffCellItem.is(item) && item.diffType === 'changed') {
-            return (
-              <LibroDiffChangedCellComponent
-                diffCellResultItem={item}
-                key={libroDiffView.id + item.origin.id?.toString()}
-              />
-            );
-          } else {
-            if (!DiffCellUnchangedItems.is(item) || item.unchangedResultItems.length === 0) {
-              return null;
-            }
-            if (item.isShown) {
-              return item.unchangedResultItems.map((unchangedItem) => (
-                <LibroDiffChangedCellComponent
-                  diffCellResultItem={unchangedItem}
-                  key={libroDiffView.id + unchangedItem.origin.id?.toString()}
-                />
-              ));
-            } else {
-              return (
-                <div
-                  className='libro-diff-fold-container'
-                  key={libroDiffView.id + item.unchangedResultItems[0].origin.id}
-                >
-                  <div
-                    className='libro-diff-fold'
-                    onClick={() => {
-                      item.isShown = true;
-                      libroDiffView.diffUnchangedCellsRenderStatus = libroDiffView.getUnchangedDiffCellsRenderStatus();
-                    }}
-                  >
-                    <ColumnHeightOutlined />
-                    <span className='libro-diff-fold-text'>展开{item.unchangedResultItems.length}个未更改的 Cell</span>
-                  </div>
-                </div>
-              );
-            }
-          }
-        })}
-    </div>
-  );
-});
-
-@transient()
-@view(libroDiffViewFactoryId)
-export class LibroDiffView extends BaseView implements DiffView {
-  view: ViewComponent = LibroDiffRender;
-  libroContentService: LibroContentService;
-  @prop()
-  diffUnchangedCellsRenderStatus: 'all' | 'part' | 'none' = 'none';
-  @prop()
-  diffCellsResult: DiffCellItemResult[];
-  @prop()
-  isDiffSame: boolean = true;
-  @prop()
-  hasUnchangedCells: boolean = false;
-  options: Record<string, any>;
-  originContent: IDiffNotebookContent;
-  targetContent: IDiffNotebookContent;
-  targetFilePath: string;
-  originFilePath: string;
-  constructor(
-    @inject(ViewOption) options: DiffOption,
-    @inject(LibroContentService) libroContentService: LibroContentService,
-  ) {
-    super();
-    this.libroContentService = libroContentService;
-    this.options = options;
-    this.targetFilePath = options.target.path.toString();
-    this.originFilePath = options.origin.path.toString();
-    this.loadDiffContent(options).then(() => {
-      this.diffCellsResult = this.getDiffCellsResult(
-        this.originContent.content.cells,
-        this.targetContent.content.cells,
-      );
-    });
-  }
-
-  loadDiffContent = async (options: DiffOption) => {
-    const originContent = await this.libroContentService.loadLibroContent(
-      { loadType: ContentLoaderType, resource: options.origin },
-      this,
-    );
-    this.originContent = {
-      // FIXME: 干啥的？
-      diffTag: options.origin.toString(),
-      content: originContent,
-    };
-    const targetContent = await this.libroContentService.loadLibroContent(
-      { loadType: ContentLoaderType, resource: options.target },
-      this,
-    );
-    this.targetContent = {
-      diffTag: options.target.toString(),
-      content: targetContent,
-    };
-  };
-
-  foldAllUnchangedDiffCells = () => {
-    this.diffCellsResult.map((item) => {
-      if (DiffCellUnchangedItems.is(item)) {
-        item.isShown = false;
-      }
-    });
-  };
-
-  expandAllUnchangedDiffCells = () => {
-    this.diffCellsResult.map((item) => {
-      if (DiffCellUnchangedItems.is(item)) {
-        item.isShown = true;
-      }
-    });
-  };
-
-  getUnchangedDiffCellsRenderStatus = () => {
-    let unchanedDiffCellsGroups = 0;
-    let unchanedDiffCellsfolded = 0;
-    let unchanedDiffCellsExpanded = 0;
-    for (const item of this.diffCellsResult) {
-      if (DiffCellUnchangedItems.is(item)) {
-        unchanedDiffCellsGroups = unchanedDiffCellsGroups + 1;
-        if (item.isShown) {
-          unchanedDiffCellsExpanded = unchanedDiffCellsExpanded + 1;
-        } else {
-          unchanedDiffCellsfolded = unchanedDiffCellsfolded + 1;
-        }
-      }
-    }
-    if (unchanedDiffCellsfolded > 0) {
-      return unchanedDiffCellsExpanded > 0 ? 'part' : 'none';
-    } else {
-      return 'all';
-    }
-  };
-
-  getAddedCellResult = (valueItem: ICell) => {
-    const originDiffCellItem = JSON.parse(JSON.stringify(valueItem)) as ICell;
-    originDiffCellItem.source = '';
-    const addedCellResult: DiffCellItem = {
-      diffType: 'added',
-      origin: originDiffCellItem,
-      target: valueItem,
-    };
-    return Object.assign(addedCellResult, {
-      originFilePath: this.originFilePath,
-      targetFilePath: this.targetFilePath,
-    });
-  };
-
-  getRemovedCellResult = (valueItem: ICell) => {
-    const targetDiffCellItem = JSON.parse(JSON.stringify(valueItem)) as ICell;
-    targetDiffCellItem.source = '';
-    const removedCellResult: DiffCellItem = {
-      diffType: 'removed',
-      origin: valueItem,
-      target: targetDiffCellItem,
-    };
-    return Object.assign(removedCellResult, {
-      originFilePath: this.originFilePath,
-      targetFilePath: this.targetFilePath,
-    });
-  };
-
-  getUnchangedCellResult = (originItem: ICell, targetItem: ICell) => {
-    const unchangedCellResult: DiffCellItem = {
-      diffType: 'unchanged',
-      origin: originItem,
-      target: targetItem,
-    };
-    return Object.assign(unchangedCellResult, {
-      originFilePath: this.originFilePath,
-      targetFilePath: this.targetFilePath,
-    });
-  };
-
-  getChangedCellResult = (originItem: ICell, targetItem: ICell) => {
-    const changedCellResult: DiffCellItem = {
-      diffType: 'changed',
-      origin: originItem,
-      target: targetItem,
-    };
-    return Object.assign(changedCellResult, {
-      originFilePath: this.originFilePath,
-      targetFilePath: this.targetFilePath,
-    });
-  };
-
-  getDiffCellsResult = (origin: ICell[], target: ICell[]) => {
-    const diffCellsResult: (DiffCellItemResult & { originFilePath?: string; targetFilePath?: string })[] = [];
-    let diffCellUnchangedItems: (DiffCellItem & { originFilePath: string; targetFilePath: string })[] = [];
-    let lastDiffItemTypeIsUnchanged: boolean = false;
-
-    const diffArray = diffArrays(getOrigin(origin), getOrigin(target), {
-      comparator,
-    }) as DiffArrayItem[];
-    diffArray.map((item, index) => {
-      if (item.added) {
-        if (this.isDiffSame) {
-          this.isDiffSame = false;
-        }
-        if (lastDiffItemTypeIsUnchanged === true) {
-          lastDiffItemTypeIsUnchanged = false;
-          diffCellsResult.push({
-            isShown: false,
-            unchangedResultItems: diffCellUnchangedItems,
-          });
-          diffCellUnchangedItems = [];
-        }
-        item.value.map((valueItem) => {
-          diffCellsResult.push(this.getAddedCellResult(valueItem));
-        });
-      } else if (item.removed) {
-        if (this.isDiffSame) {
-          this.isDiffSame = false;
-        }
-        if (lastDiffItemTypeIsUnchanged === true) {
-          lastDiffItemTypeIsUnchanged = false;
-          diffCellsResult.push({
-            isShown: false,
-            unchangedResultItems: diffCellUnchangedItems,
-          });
-          diffCellUnchangedItems = [];
-        }
-        item.value.map((valueItem) => {
-          diffCellsResult.push(this.getRemovedCellResult(valueItem));
-        });
-      } else {
-        item.value.map((valueItem) => {
-          const originCell = this.originContent.content.cells.find((cell) => cell.id === valueItem.id);
-          const targetCell = this.targetContent.content.cells.find((cell) => cell.id === valueItem.id);
-          if (!originCell || !targetCell) {
-            return;
-          }
-          if (multilineStringEqual(originCell.source, targetCell.source)) {
-            if (this.hasUnchangedCells === false) {
-              this.hasUnchangedCells = true;
-            }
-            lastDiffItemTypeIsUnchanged = true;
-            diffCellUnchangedItems.push(this.getUnchangedCellResult(originCell, targetCell));
-          } else {
-            if (this.isDiffSame) {
-              this.isDiffSame = false;
-            }
-            if (lastDiffItemTypeIsUnchanged === true) {
-              lastDiffItemTypeIsUnchanged = false;
-              diffCellsResult.push({
-                isShown: false,
-                unchangedResultItems: diffCellUnchangedItems,
-              });
-              diffCellUnchangedItems = [];
-            }
-            diffCellsResult.push(this.getChangedCellResult(originCell, targetCell));
-          }
-        });
-        if (index === diffArray.length - 1) {
-          diffCellsResult.push({
-            isShown: false,
-            unchangedResultItems: diffCellUnchangedItems,
-          });
-        }
-      }
-    });
-    return diffCellsResult;
-  };
-}