colonynote 1.0.0-beta.9 → 1.0.0

package/README.md

@@ -35,7 +35,7 @@ colonynote [options]
 
 | Option | Alias | Description | Default |
 |--------|-------|-------------|---------|
-| `--root` | `-r` | Root directory for documents | Current directory |
+| `--dir` | `-d` | Directory for documents | Current directory |
 | `--port` | `-p` | Server port | `5787` |
 | `--host` | | Server host | `0.0.0.0` |
 | `--config` | `-c` | Config file path | `colonynote.config.js` |
@@ -48,8 +48,8 @@ colonynote [options]
 # Start with default settings
 colonynote
 
-# Specify root directory
-colonynote -r /path/to/docs
+# Specify directory
+colonynote -d /path/to/docs
 
 # Specify port
 colonynote -p 3000
@@ -58,16 +58,16 @@ colonynote -p 3000
 colonynote -c ./my-config.js
 
 # Combine options
-colonynote -r ./docs -p 8080
+colonynote -d ./docs -p 8080
 ```
 
 ## Configuration
 
-Create a `colonynote.config.js` file in your project root:
+Create a `colonynote.config.js` file in your project directory:
 
 ```javascript
 export default {
-  root: './docs',       // Root directory for documents
+  dirs: ['./docs'],  // Directories for documents
   port: 5787,           // Server port
   host: '0.0.0.0',      // Server host
   allowedExtensions: ['.md', '.markdown'],  // Supported file extensions

package/README.zh.md

@@ -35,7 +35,7 @@ colonynote [选项]
 
 | 选项 | 别名 | 描述 | 默认值 |
 |------|------|------|--------|
-| `--root` | `-r` | 文档根目录 | 当前目录 |
+| `--dir` | `-d` | 目录 | 当前目录 |
 | `--port` | `-p` | 服务器端口 | `5787` |
 | `--host` | | 服务器地址 | `0.0.0.0` |
 | `--config` | `-c` | 配置文件路径 | `colonynote.config.js` |
@@ -48,8 +48,8 @@ colonynote [选项]
 # 使用默认设置启动
 colonynote
 
-# 指定根目录
-colonynote -r /path/to/docs
+# 指定目录
+colonynote -d /path/to/docs
 
 # 指定端口
 colonynote -p 3000
@@ -58,16 +58,16 @@ colonynote -p 3000
 colonynote -c ./my-config.js
 
 # 组合选项
-colonynote -r ./docs -p 8080
+colonynote -d ./docs -p 8080
 ```
 
 ## 配置
 
-在项目根目录创建 `colonynote.config.js` 文件：
+在项目目录创建 `colonynote.config.js` 文件：
 
 ```javascript
 export default {
-  root: './docs',       // 文档根目录
+  dirs: ['./docs'],  // 文档目录
   port: 5787,           // 服务器端口
   host: '0.0.0.0',      // 服务器地址
   allowedExtensions: ['.md', '.markdown'],  // 支持的文件扩展名

package/bin/colonynote.js

@@ -3,97 +3,64 @@
 import { serve } from '@hono/node-server'
 import { Hono } from 'hono'
 import { cors } from 'hono/cors'
-import { createFileRouter } from '../dist/server/api.js'
-import { loadConfig } from '../dist/config.js'
+import { createFileRouter, createMutableConfigHolder } from '../dist/server/api.js'
+import { loadConfig, DEFAULT_PORT, DEFAULT_HOST } from '../dist/config.js'
 import { setupWatcher } from '../dist/server/watcher.js'
+import { IgnoreMatcher } from '../dist/server/ignore.js'
 import { WebSocketServer, WebSocket } from 'ws'
 import { readFileSync, existsSync } from 'fs'
 import { fileURLToPath } from 'url'
-import { dirname, join, extname } from 'path'
+import { dirname, join, extname, resolve } from 'path'
+import { Command } from 'commander'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = dirname(__filename)
 const pkg = JSON.parse(readFileSync(join(__dirname, '../package.json'), 'utf-8'))
 
-const argv = process.argv.slice(2)
-const args = {}
-const validOptions = new Set(['root', 'r', 'port', 'p', 'host', 'config', 'c', 'help', 'h', 'version'])
-
-for (let i = 0; i < argv.length; i++) {
-  const arg = argv[i]
-  if (arg.startsWith('--')) {
-    const key = arg.slice(2)
-    const next = argv[i + 1]
-    if (next && !next.startsWith('-')) {
-      args[key] = next
-      i++
-    } else {
-      args[key] = true
-    }
-  } else if (arg.startsWith('-')) {
-    const key = arg.slice(1)
-    const next = argv[i + 1]
-    if (next && !next.startsWith('-')) {
-      args[key] = next
-      i++
-    } else {
-      args[key] = true
-    }
-  } else {
-    console.error(`Unknown argument: ${arg}`)
-    console.error(`Run 'colonynote --help' for usage.`)
-    process.exit(1)
-  }
-}
+const program = new Command()
 
-for (const key of Object.keys(args)) {
-  if (!validOptions.has(key)) {
-    console.error(`Unknown option: --${key}`)
-    console.error(`Run 'colonynote --help' for usage.`)
-    process.exit(1)
-  }
-}
+program
+  .name('colonynote')
+  .description('Markdown online editor')
+  .version(pkg.version)
+  .option('-d, --dir <path>', 'Root directory (can be specified multiple times)', collect, [])
+  .option('-p, --port <number>', 'Server port', DEFAULT_PORT.toString())
+  .option('--host <host>', 'Server host', DEFAULT_HOST)
+  .parse()
 
-if (args.h || args.help) {
-  console.log(`
-colonynote - Markdown online editor
-
-Usage:
-  colonynote [options]
-
-Options:
-  -r, --root <path>      Root directory (default: current directory)
-  -p, --port <number>    Server port (default: 5787)
-  --host <host>          Server host (default: 0.0.0.0)
-  -c, --config <path>    Config file path
-  -h, --help             Show this help
-  --version              Show version
-`)
-  process.exit(0)
-}
+const options = program.opts()
 
-if (args.version) {
-  console.log(`colonynote v${pkg.version}`)
-  process.exit(0)
+function collect(value, previous) {
+  return previous.concat([value])
 }
 
 async function main() {
-  const config = await loadConfig(args.config)
-
-  if (args.r || args.root) {
-    config.root = args.r || args.root
-  }
-  if (args.p || args.port) {
-    config.port = parseInt(args.p || args.port, 10)
-  }
-  if (args.host) {
-    config.host = args.host
+  const config = await loadConfig()
+
+  if (options.dir && options.dir.length > 0) {
+    for (const rootPath of options.dir) {
+      const resolvedPath = resolve(rootPath)
+      const exists = config.dirs.some((r) => resolve(r.path) === resolvedPath)
+      if (exists) {
+        console.warn(`Skipping duplicate dir: ${rootPath}`)
+        continue
+      }
+      config.dirs.unshift({ path: resolvedPath, isCli: true })
+    }
   }
 
+  const port = parseInt(options.port, 10)
+  const host = options.host
+
+  const matcher = new IgnoreMatcher(config.dirs.map(d => d.path), {
+    globalPatterns: config.ignore.patterns,
+  })
+
   const app = new Hono()
   app.use('*', cors())
 
-  const fileRouter = createFileRouter(config)
+  const holder = createMutableConfigHolder(config, matcher)
+  const fileRouter = createFileRouter(holder)
   app.route('/api/files', fileRouter)
 
   const publicDir = join(dirname(fileURLToPath(import.meta.url)), '../dist/client')
@@ -141,8 +108,8 @@ async function main() {
 
   const server = serve({
     fetch: app.fetch,
-    port: config.port,
-    hostname: config.host,
+    port,
+    hostname: host,
   })
 
   const clients = new Set()
@@ -161,10 +128,10 @@ async function main() {
     }
   })
 
-  setupWatcher(config, {
-    onFileChange: (event, path) => {
-      const relativePath = path.replace(config.root, '')
-      const message = JSON.stringify({ type: 'file:change', event, path: relativePath })
+  setupWatcher(config, matcher, {
+    onFileChange: (rootPath, event, filePath) => {
+      const relativePath = filePath.replace(rootPath, '')
+      const message = JSON.stringify({ type: 'file:change', event, path: relativePath, rootPath })
       clients.forEach((client) => {
         if (client.readyState === WebSocket.OPEN) {
           client.send(message)
@@ -174,12 +141,12 @@ async function main() {
   })
 
   console.log(`\n  ColonyNote is running!\n`)
-  console.log(`  Local:   http://localhost:${config.port}`)
-  console.log(`  Network: http://${config.host}:${config.port}`)
-  console.log(`  Root:    ${config.root}\n`)
+  console.log(`  Local:   http://localhost:${port}`)
+  console.log(`  Network: http://${host}:${port}`)
+  console.log(`  Dirs:    ${config.dirs.map(r => r.path).join(', ')}\n`)
 }
 
 main().catch((e) => {
   console.error('Failed to start:', e)
   process.exit(1)
-})
+})

package/dist/client/assets/arc-Ezd9GmKE.js

@@ -0,0 +1 @@
+import{n as e,t}from"./path-yo4Xej8w.js";import{Ct as n,St as r,_t as i,bt as a,dt as o,ft as s,ht as c,mt as l,pt as u,vt as d,xt as f,yt as p}from"./index-Ts5WhtRB.js";function m(e){return e.innerRadius}function h(e){return e.outerRadius}function g(e){return e.startAngle}function _(e){return e.endAngle}function v(e){return e&&e.padAngle}function y(e,t,n,r,i,a,o,s){var c=n-e,l=r-t,u=o-i,d=s-a,f=d*c-u*l;if(!(f*f<1e-12))return f=(u*(t-a)-d*(e-i))/f,[e+f*c,t+f*l]}function b(e,t,n,i,a,o,s){var c=e-n,l=t-i,u=(s?o:-o)/r(c*c+l*l),f=u*l,p=-u*c,m=e+f,h=t+p,g=n+f,_=i+p,v=(m+g)/2,y=(h+_)/2,b=g-m,x=_-h,S=b*b+x*x,C=a-o,w=m*_-g*h,T=(x<0?-1:1)*r(d(0,C*C*S-w*w)),E=(w*x-b*T)/S,D=(-w*b-x*T)/S,O=(w*x+b*T)/S,k=(-w*b+x*T)/S,A=E-v,j=D-y,M=O-v,N=k-y;return A*A+j*j>M*M+N*N&&(E=O,D=k),{cx:E,cy:D,x01:-f,y01:-p,x11:E*(a/C-1),y11:D*(a/C-1)}}function x(){var d=m,x=h,S=e(0),C=null,w=g,T=_,E=v,D=null,O=t(k);function k(){var e,t,m=+d.apply(this,arguments),h=+x.apply(this,arguments),g=w.apply(this,arguments)-i,_=T.apply(this,arguments)-i,v=o(_-g),k=_>g;if(D||=e=O(),h<m&&(t=h,h=m,m=t),!(h>1e-12))D.moveTo(0,0);else if(v>n-1e-12)D.moveTo(h*c(g),h*f(g)),D.arc(0,0,h,g,_,!k),m>1e-12&&(D.moveTo(m*c(_),m*f(_)),D.arc(0,0,m,_,g,k));else{var A=g,j=_,M=g,N=_,P=v,F=v,I=E.apply(this,arguments)/2,L=I>1e-12&&(C?+C.apply(this,arguments):r(m*m+h*h)),R=p(o(h-m)/2,+S.apply(this,arguments)),z=R,B=R,V,H;if(L>1e-12){var U=u(L/m*f(I)),W=u(L/h*f(I));(P-=U*2)>1e-12?(U*=k?1:-1,M+=U,N-=U):(P=0,M=N=(g+_)/2),(F-=W*2)>1e-12?(W*=k?1:-1,A+=W,j-=W):(F=0,A=j=(g+_)/2)}var G=h*c(A),K=h*f(A),q=m*c(N),J=m*f(N);if(R>1e-12){var Y=h*c(j),X=h*f(j),Z=m*c(M),Q=m*f(M),$;if(v<a)if($=y(G,K,Z,Q,Y,X,q,J)){var ee=G-$[0],te=K-$[1],ne=Y-$[0],re=X-$[1],ie=1/f(s((ee*ne+te*re)/(r(ee*ee+te*te)*r(ne*ne+re*re)))/2),ae=r($[0]*$[0]+$[1]*$[1]);z=p(R,(m-ae)/(ie-1)),B=p(R,(h-ae)/(ie+1))}else z=B=0}F>1e-12?B>1e-12?(V=b(Z,Q,G,K,h,B,k),H=b(Y,X,q,J,h,B,k),D.moveTo(V.cx+V.x01,V.cy+V.y01),B<R?D.arc(V.cx,V.cy,B,l(V.y01,V.x01),l(H.y01,H.x01),!k):(D.arc(V.cx,V.cy,B,l(V.y01,V.x01),l(V.y11,V.x11),!k),D.arc(0,0,h,l(V.cy+V.y11,V.cx+V.x11),l(H.cy+H.y11,H.cx+H.x11),!k),D.arc(H.cx,H.cy,B,l(H.y11,H.x11),l(H.y01,H.x01),!k))):(D.moveTo(G,K),D.arc(0,0,h,A,j,!k)):D.moveTo(G,K),!(m>1e-12)||!(P>1e-12)?D.lineTo(q,J):z>1e-12?(V=b(q,J,Y,X,m,-z,k),H=b(G,K,Z,Q,m,-z,k),D.lineTo(V.cx+V.x01,V.cy+V.y01),z<R?D.arc(V.cx,V.cy,z,l(V.y01,V.x01),l(H.y01,H.x01),!k):(D.arc(V.cx,V.cy,z,l(V.y01,V.x01),l(V.y11,V.x11),!k),D.arc(0,0,m,l(V.cy+V.y11,V.cx+V.x11),l(H.cy+H.y11,H.cx+H.x11),k),D.arc(H.cx,H.cy,z,l(H.y11,H.x11),l(H.y01,H.x01),!k))):D.arc(0,0,m,N,M,k)}if(D.closePath(),e)return D=null,e+``||null}return k.centroid=function(){var e=(+d.apply(this,arguments)+ +x.apply(this,arguments))/2,t=(+w.apply(this,arguments)+ +T.apply(this,arguments))/2-a/2;return[c(t)*e,f(t)*e]},k.innerRadius=function(t){return arguments.length?(d=typeof t==`function`?t:e(+t),k):d},k.outerRadius=function(t){return arguments.length?(x=typeof t==`function`?t:e(+t),k):x},k.cornerRadius=function(t){return arguments.length?(S=typeof t==`function`?t:e(+t),k):S},k.padRadius=function(t){return arguments.length?(C=t==null?null:typeof t==`function`?t:e(+t),k):C},k.startAngle=function(t){return arguments.length?(w=typeof t==`function`?t:e(+t),k):w},k.endAngle=function(t){return arguments.length?(T=typeof t==`function`?t:e(+t),k):T},k.padAngle=function(t){return arguments.length?(E=typeof t==`function`?t:e(+t),k):E},k.context=function(e){return arguments.length?(D=e??null,k):D},k}export{x as t};

package/dist/client/assets/architecture-YZFGNWBL-Dns9u0e5.js

@@ -0,0 +1 @@
+import"./chunk-K5T4RW27-Dzh5Xx8O.js";import{n as e}from"./chunk-7N4EOEYR-BFd0Oy6w.js";export{e as createArchitectureServices};