[refactor] re-arrage files and folder

GarinZ · Jan 13, 2023 · bcac63c · bcac63c
1 parent dce0f2c
commit bcac63c
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 28 deletions.
diff --git a/src/tree/configs.ts → src/tree/fancy-tab-master-tree/configs.ts b/src/tree/configs.ts → src/tree/fancy-tab-master-tree/configs.ts
@@ -1,6 +1,6 @@
 import { tabs } from 'webextension-polyfill';
 
-import { BrowserExtensionUtils, FancyTreeUtils, logLazy } from './utils';
+import { BrowserExtensionUtils, FancyTreeUtils, logLazy } from '../utils';
 
 interface DND5Data {
     dataTransfer: {

diff --git a/src/tree/fancy-tab-master-tree.ts → ...-tab-master-tree/fancy-tab-master-tree.ts b/src/tree/fancy-tab-master-tree.ts → ...-tab-master-tree/fancy-tab-master-tree.ts
@@ -1,13 +1,13 @@
 import type { Tabs, Windows } from 'webextension-polyfill';
 import browser from 'webextension-polyfill';
 
-import TreeNodeTpl, { TPL_CONSTANTS } from '../templates/tree-node-tpl';
+import TreeNodeTpl, { TPL_CONSTANTS } from '../../templates/tree-node-tpl';
+import * as TabNodes from '../node-builders';
+import { createWindowNode } from '../node-builders';
+import type { NodeType, TreeData, TreeNode } from '../nodes';
+import { NodeUtils } from '../utils';
 import { DND5_CONFIG } from './configs';
-import * as TabNodes from './node-builders';
-import { createWindowNode } from './node-builders';
-import type { NodeType, TreeData, TreeNode } from './nodes';
 import { ViewTabIndexUtils } from './tab-index-utils';
-import { NodeUtils } from './utils';
 
 type Tab = Tabs.Tab;
 

diff --git a/src/tree/tab-index-utils.ts → .../fancy-tab-master-tree/tab-index-utils.ts b/src/tree/tab-index-utils.ts → .../fancy-tab-master-tree/tab-index-utils.ts
@@ -1,17 +1,4 @@
 export const ViewTabIndexUtils = {
-    // 添加tab
-    // 1. 根据index找到元素
-    // 2. 选择适合的方式添加元素
-    // 3. 后面元素的index + 1
-
-    // 删除tab
-    // 1. 删除元素
-    // 2. 后面元素的index - 1
-
-    // 移动tab
-    // 1. 根据index找到元素
-    // 2. 和目标元素交换index
-
     increaseIndex: (tree: Fancytree.Fancytree, windowId: number, index: number) => {
         const parentNode = tree.getNodeByKey(`${windowId}`);
         parentNode.visit((node) => {

diff --git a/src/tree/main.ts b/src/tree/main.ts
@@ -1,6 +1,6 @@
 import { onMessage } from '@garinz/webext-bridge';
 
-import { FancyTabMasterTree } from './fancy-tab-master-tree';
+import { FancyTabMasterTree } from './fancy-tab-master-tree/fancy-tab-master-tree';
 
 const tree = new FancyTabMasterTree('#tree');
 tree.initTree();

diff --git a/src/tsconfig.json b/src/tsconfig.json
@@ -31,7 +31,8 @@
         "module": "ESNext",
         "baseUrl": "./",
         "paths": {
-            "@/*": ["src/*"]
+            "@/*": ["src/*"],
+            "?/*": ["test/*"]
         },
         "typeRoots": ["../node_modules/@types", "./typings"],
         "types": ["jquery", "webext-bridge", "jquery.fancytree"]

diff --git a/test/tree/fancy-tab-master-tree.spec.ts → ...master-tree/fancy-tab-master-tree.spec.ts b/test/tree/fancy-tab-master-tree.spec.ts → ...master-tree/fancy-tab-master-tree.spec.ts
@@ -5,9 +5,10 @@
 
 import type { Tabs } from 'webextension-polyfill';
 
-import type { TabData } from '../../src/tree/nodes';
-import { createTab, initFancytree } from '../utils/gen-utils';
-import { toAsciiTree } from '../utils/print-utils';
+import type { TabData } from '@/tree/nodes';
+
+import { createTab, initFancytree } from '../../utils/gen-utils';
+import { toAsciiTree } from '../../utils/print-utils';
 import { SINGLE_TAB_WINDOW } from './mock-data';
 
 type FancytreeNode = Fancytree.FancytreeNode;

diff --git a/test/tree/mock-data.ts → test/tree/fancy-tab-master-tree/mock-data.ts b/test/tree/mock-data.ts → test/tree/fancy-tab-master-tree/mock-data.ts
@@ -1,4 +1,4 @@
-import type { TabData, TreeData, TreeNode, WindowData } from '../../src/tree/nodes';
+import type { TabData, TreeData, TreeNode, WindowData } from '../../../src/tree/nodes';
 
 export const SINGLE_TAB_WINDOW = [
     {

diff --git a/test/utils/gen-utils.ts b/test/utils/gen-utils.ts
@@ -4,14 +4,14 @@
 
 import type { Tabs } from 'webextension-polyfill';
 
-import { FancyTabMasterTree } from '../../src/tree/fancy-tab-master-tree';
+import { FancyTabMasterTree } from '../../src/tree/fancy-tab-master-tree/fancy-tab-master-tree';
 import type { TreeData, TreeNode } from '../../src/tree/nodes';
 
 import 'jquery.fancytree';
 import 'jquery.fancytree/dist/modules/jquery.fancytree.dnd5';
 import 'jquery.fancytree/dist/modules/jquery.fancytree.childcounter';
 
-export function initFancytree(source: TreeNode<TreeData>[]) {
+export function initFancytree(source: TreeNode<TreeData>[]): FancyTabMasterTree {
     document.body.innerHTML = '<div id="tree">';
     const tree = new FancyTabMasterTree('#tree');
     tree.initTree(source);

diff --git a/tsconfig.json b/tsconfig.json
@@ -24,7 +24,10 @@
         "module": "ESNext",
         "baseUrl": "./",
         "types": ["jquery", "webext-bridge", "jquery.fancytree", "jest"],
-        "typeRoots": ["node_modules/@types", "src/typings"]
+        "typeRoots": ["node_modules/@types", "src/typings"],
+        "paths": {
+            "@/*": ["src/*"]
+        }
     },
     "exclude": ["manifest.ts"]
 }