Merge pull request #9 from wflixu/dev

v0.4.0

.github/workflows/build-pkg.yml

@@ -2,7 +2,7 @@ name: "build pkg"
 
 on:
   push:
-    -branches:
+     branches:
       - release
 
 jobs:
@@ -37,8 +37,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           args: ${{ matrix.platform == 'macos-latest' && '--target universal-apple-darwin' || '' }}
-          tagName: v__VERSION__-dev.${{ github.run_number }} # the action automatically replaces \_\_VERSION\_\_ with the app version
-          releaseName: "Development Build v__VERSION__-dev.${{ github.run_number }}"
+          tagName: v__VERSION__.${{ github.run_number }} # the action automatically replaces \_\_VERSION\_\_ with the app version
+          releaseName: "Development Build v__VERSION__.${{ github.run_number }}"
           releaseBody: "This is a development release from the master branch (Commit ${{ github.sha }})."
           releaseDraft: false
           prerelease: true

README.md

@@ -6,7 +6,12 @@ A W.I.P desktop application for a new markup-based typesetting language, [typst]
 Typster is built using [Tauri](https://tauri.app/).
 
 
-# screenshot
+# features
+- [ ]
+- [ ] 
+
+
+## screenshot
 
 
 ![typster](./public/imgs/screen_projects.png)
@@ -29,7 +34,7 @@ Typster is built using [Tauri](https://tauri.app/).
 
 
 ```
- xattr -c /Applications/appname.app
+ xattr -c /Applications/typster.app
 ```
 ### rebuild app icon
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "typster",
   "private": true,
-  "version": "0.3.0",
+  "version": "0.4.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -17,14 +17,14 @@
     "@ant-design/icons-vue": "^7.0.1",
     "@tauri-apps/api": "^1.5.3",
     "ant-design-vue": "4.x",
-    "github-markdown-css": "^5.5.1",
     "monaco-editor": "^0.46.0",
     "pinia": "^2.1.7",
+    "radash": "^12.1.0",
     "today-ui": "^0.0.23",
-    "vue": "^3.4.21",
-    "vue-router": "^4.3.0",
     "vscode-oniguruma": "^2.0.1",
-    "vscode-textmate": "^9.0.0"
+    "vscode-textmate": "^9.0.0",
+    "vue": "^3.4.21",
+    "vue-router": "^4.3.0"
   },
   "devDependencies": {
     "@tauri-apps/cli": "^1.5.10",

src-tauri/tauri.conf.json

@@ -11,7 +11,7 @@
   },
   "package": {
     "productName": "typster",
-    "version": "0.3.0"
+    "version": "0.4.0"
   },
   "tauri": {
     "macOSPrivateApi": true,

src/components/MonacoEditor.vue

@@ -4,12 +4,13 @@
 
 <script setup lang="ts">
 import * as monaco from "monaco-editor/esm/vs/editor/editor.api";
-import { PropType, onMounted, ref, watch } from "vue";
-import { TypstCompileResult, TypstPage } from "../pages/typst/interface";
+import { PropType, onMounted, ref, warn, watch } from "vue";
+import { TypstCompileResult } from "../pages/typst/interface";
 import type { editor as editorType } from "monaco-editor";
 import { invoke } from "@tauri-apps/api";
-import { throttle, debounce, relativePath } from './../shared/util'
+import { relativePath } from './../shared/util'
 
+import { throttle, debounce } from 'radash'
 
 type IModelChangedEvent = editorType.IModelChangedEvent;
 type IModelContentChangedEvent = editorType.IModelContentChangedEvent;
@@ -26,18 +27,12 @@ const emit = defineEmits<{
   (e: 'compiled', data: TypstCompileResult): void
 }>()
 
-
-
 const boxRef = ref<HTMLElement>();
 let monacoEditor: monaco.editor.IStandaloneCodeEditor | null = null;
 
 
-
-
-
-
 const updateContent = async (editor: ICodeEditor, path: string) => {
-
+   console.warn('updateContent -------')
   if (!editor) return;
 
   // Prevent further updates and immediately flush pending updates
@@ -83,23 +78,23 @@ const handleSave = async () => {
   const model = monacoEditor?.getModel();
   if (model) {
     // Removing the preceding slash
-    const path =  relativePath(props.root!, props.path!);
+    const path = relativePath(props.root!, props.path!);
     await invoke("fs_write_file_text", { path, content: model.getValue() });
+    await handleCompile();
   }
 };
 
 
 //@ts-ignore
-const handleCompileThrottle = throttle(handleCompile);
-const handleSaveDebounce = debounce(handleSave, 200, { maxWait: 5000 });
+const handleCompileThrottle = throttle({ interval: 1000 }, handleCompile);
+const handleSaveDebounce = debounce({ delay: 500 }, handleSave);
 
 
 onMounted(() => {
   if (!boxRef.value) {
     return;
   }
 
-
   monacoEditor = monaco.editor.create(boxRef.value!, {
     language: "typst",
     fontSize: 16,
@@ -113,11 +108,10 @@ onMounted(() => {
     handleCompileThrottle();
   });
   monacoEditor.onDidChangeModelContent((evt: IModelContentChangedEvent) => {
-    // Compile will update the source file directly in the memory without
-    // writing to the file system first, this will reduce the preview delay.
+    // 输入的时候 每隔1秒执行一次编译
     handleCompileThrottle();
+    // 输入完毕后 500ms 后执行一次保存
     handleSaveDebounce();
-    // handleCompile()
   });
 
   updateContent(monacoEditor, props.path!)

src/main.ts

@@ -1,5 +1,4 @@
 import { createApp } from "vue";
-import "github-markdown-css";
 import "ant-design-vue/dist/reset.css";
 import "./style/styles.css";
 import "./shared/monaco-hook";

src/pages/home/Sidebar.vue

@@ -15,6 +15,7 @@
           <template #overlay>
             <a-menu @click="({ key: menuKey }: any) => onContextMenuClick(treeKey, menuKey)">
               <a-menu-item key="delete">删除</a-menu-item>
+              <a-menu-item key="rename">重命名</a-menu-item>
             </a-menu>
           </template>
         </a-dropdown>
@@ -35,7 +36,6 @@
             <a-menu-item v-for="pro in projects" :key="pro.path">
               <span>{{ pro.title }}</span> : <span>{{ pro.path }}</span>
             </a-menu-item>
-
           </a-menu>
         </template>
       </a-dropdown>
@@ -48,27 +48,27 @@
 import type { TreeProps } from 'ant-design-vue';
 import { ref, h, reactive, onMounted, computed } from 'vue';
 import { PlusOutlined, FolderOpenOutlined } from '@ant-design/icons-vue'
-import { readDir, FileEntry, writeTextFile, removeFile } from '@tauri-apps/api/fs';
+import { readDir, FileEntry, writeTextFile, removeFile, renameFile } from '@tauri-apps/api/fs';
 import { useSystemStoreHook } from '../../store/store';
 import { DataNode } from 'ant-design-vue/es/tree';
 import SidebarToggle from './SidebarToggle.vue';
-import { save } from '@tauri-apps/api/dialog';
+import { save , } from '@tauri-apps/api/dialog';
 
 const systemStore = useSystemStoreHook();
 
 const expandedKeys = ref<string[]>([]);
 const selectedKeys = ref<string[]>([]);
 const treeData: TreeProps['treeData'] = reactive([]);
 
-const projects = computed(() =>{
+const projects = computed(() => {
   return systemStore.projects;
 })
 
 const initFiles = async () => {
   if (treeData.length > 0) {
     treeData.splice(0, treeData.length);
   }
-  
+
   const curProject = systemStore.editingProject
   if (!curProject) {
     return
@@ -93,6 +93,7 @@ const initFiles = async () => {
       const node = { title: entry.path.split('/').pop(), key: entry.path, children: [], selectable: true };
       if (entry.children) {
         node.selectable = false;
+        
         processEntries(entry.children, node)
       }
       parent.children?.push(node)
@@ -109,10 +110,28 @@ const initFiles = async () => {
 
 const onContextMenuClick = async (treeKey: string, menuKey: string | number) => {
   console.log(`treeKey: ${treeKey}, menuKey: ${menuKey}`);
+
   if (menuKey == 'delete' && treeKey) {
+    if (treeKey.endsWith('main.typ')) {
+      alert('The main.typ file cannot be deleted')
+      return
+    }
     await removeFile(treeKey);
-    await initFiles();
   }
+  if (menuKey == 'rename' && treeKey) {
+    const filePath = await save({
+      title: "Rename file",
+      filters: [{
+        name: 'untitled',
+        extensions: ['typ', 'bib', 'yml']
+      }],
+      defaultPath: treeKey
+    });
+    if (filePath) {
+      await renameFile(treeKey, filePath);
+    }
+  }
+  await initFiles();
 };
 
 const onSelect = (selectedKeys: string[]) => {
@@ -136,12 +155,11 @@ const onCreateFile = async () => {
   }
 }
 
-const onSelectProject = ({key}:any) =>{
+const onSelectProject = ({ key }: any) => {
 
   let selectedProject = systemStore.projects.find(item => item.path == key)
-  if(selectedProject) {
+  if (selectedProject) {
     systemStore.selectProject(selectedProject)
-    systemStore.setEditingFilePath(selectedProject.path + '/main.typ');
     window.location.reload();
   }
 }

src/pages/home/SidebarToggle.vue

@@ -21,7 +21,9 @@ const systemStore = useSystemStoreHook();
 
 const router = useRouter();
 const back = () => {
+    systemStore.selectProject(null);
     router.push('/project')
+
 }
 
 const onToggle = () => {