style: lint
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import { defineConfig } from 'tsdown'
|
||||
|
||||
export default defineConfig({
|
||||
entry: ['src/index.ts'],
|
||||
dts: true,
|
||||
entry: ['src/index.ts'],
|
||||
format: 'esm',
|
||||
})
|
||||
|
||||
@@ -14,7 +14,7 @@ const dir = typeof __dirname === 'string' ? __dirname : dirname(fileURLToPath(im
|
||||
const root = dirname(dir)
|
||||
|
||||
async function publish() {
|
||||
const { restore, isPreview } = await packageJSONForVSCode('airi-vscode')
|
||||
const { isPreview, restore } = await packageJSONForVSCode('airi-vscode')
|
||||
const pkgPath = join(root, 'package.json')
|
||||
const rawJSON = await readFile(pkgPath, 'utf-8')
|
||||
|
||||
|
||||
@@ -2,40 +2,6 @@
|
||||
|
||||
import { readFile, writeFile } from 'node:fs/promises'
|
||||
|
||||
export async function packageJSONForVSCode(name: string) {
|
||||
const json = JSON.parse(await readFile(new URL('../package.json', import.meta.url), 'utf-8'))
|
||||
const originalName = json.name
|
||||
const originalVersion = json.version
|
||||
|
||||
if (json.name !== name) {
|
||||
json.name = name
|
||||
|
||||
await writeFile(new URL('../package.json', import.meta.url), `${JSON.stringify(json, null, 2)}\n`, 'utf-8')
|
||||
}
|
||||
|
||||
const numericVersion = encodeNumericVersion(originalVersion)
|
||||
if (json.version !== numericVersion.version) {
|
||||
json.version = numericVersion.version
|
||||
|
||||
await writeFile(new URL('../package.json', import.meta.url), `${JSON.stringify(json, null, 2)}\n`, 'utf-8')
|
||||
}
|
||||
|
||||
return {
|
||||
json,
|
||||
originalName,
|
||||
originalVersion,
|
||||
name,
|
||||
version: numericVersion.version,
|
||||
isPreview: numericVersion.preview,
|
||||
restore: async () => {
|
||||
json.name = originalName
|
||||
json.version = originalVersion
|
||||
|
||||
await writeFile(new URL('../package.json', import.meta.url), `${JSON.stringify(json, null, 2)}\n`, 'utf-8')
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// NOTICE: VSCE rejects prerelease identifiers, so we encode stage+sequence into a numeric-only patch bucket:
|
||||
// encodedPatch = patch*10000 + stageBucket + sequence.
|
||||
// stageBucket: alpha=1000, beta=2000, rc=3000, stable=9000.
|
||||
@@ -62,7 +28,7 @@ export function encodeNumericVersion(version: string) {
|
||||
stable: 9_000,
|
||||
} as const
|
||||
|
||||
const { stage, sequence } = parsePrerelease(prerelease)
|
||||
const { sequence, stage } = parsePrerelease(prerelease)
|
||||
const maxSequence = (multiplier - 1) - stageBuckets[stage]
|
||||
if (sequence > maxSequence) {
|
||||
throw new Error(`Prerelease sequence overflow for ${stage}: ${sequence} exceeds limit ${maxSequence}`)
|
||||
@@ -75,14 +41,48 @@ export function encodeNumericVersion(version: string) {
|
||||
const encoded = `${major}.${minor}.${encodedPatch}`
|
||||
|
||||
return {
|
||||
version: encoded,
|
||||
preview: stage !== 'stable',
|
||||
version: encoded,
|
||||
}
|
||||
}
|
||||
|
||||
export async function packageJSONForVSCode(name: string) {
|
||||
const json = JSON.parse(await readFile(new URL('../package.json', import.meta.url), 'utf-8'))
|
||||
const originalName = json.name
|
||||
const originalVersion = json.version
|
||||
|
||||
if (json.name !== name) {
|
||||
json.name = name
|
||||
|
||||
await writeFile(new URL('../package.json', import.meta.url), `${JSON.stringify(json, null, 2)}\n`, 'utf-8')
|
||||
}
|
||||
|
||||
const numericVersion = encodeNumericVersion(originalVersion)
|
||||
if (json.version !== numericVersion.version) {
|
||||
json.version = numericVersion.version
|
||||
|
||||
await writeFile(new URL('../package.json', import.meta.url), `${JSON.stringify(json, null, 2)}\n`, 'utf-8')
|
||||
}
|
||||
|
||||
return {
|
||||
isPreview: numericVersion.preview,
|
||||
json,
|
||||
name,
|
||||
originalName,
|
||||
originalVersion,
|
||||
restore: async () => {
|
||||
json.name = originalName
|
||||
json.version = originalVersion
|
||||
|
||||
await writeFile(new URL('../package.json', import.meta.url), `${JSON.stringify(json, null, 2)}\n`, 'utf-8')
|
||||
},
|
||||
version: numericVersion.version,
|
||||
}
|
||||
}
|
||||
|
||||
function parsePrerelease(prerelease?: string) {
|
||||
if (!prerelease) {
|
||||
return { stage: 'stable' as const, sequence: 0 }
|
||||
return { sequence: 0, stage: 'stable' as const }
|
||||
}
|
||||
|
||||
const [stageRaw, sequenceRaw] = prerelease.split('.')
|
||||
@@ -90,5 +90,5 @@ function parsePrerelease(prerelease?: string) {
|
||||
const sequenceParsed = Number.parseInt(sequenceRaw ?? '', 10)
|
||||
const sequence = Number.isFinite(sequenceParsed) ? sequenceParsed : 0
|
||||
|
||||
return { stage, sequence }
|
||||
return { sequence, stage }
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ import { generate } from 'vscode-ext-gen'
|
||||
import { packageJSONForVSCode } from './shared'
|
||||
|
||||
async function run() {
|
||||
const { restore, json } = await packageJSONForVSCode('airi-vscode')
|
||||
const { json, restore } = await packageJSONForVSCode('airi-vscode')
|
||||
const generated = await generate(json, { extensionScope: 'airi-vscode' })
|
||||
const url = fileURLToPath(new URL('.', import.meta.url))
|
||||
const dir = dirname(url)
|
||||
|
||||
@@ -7,7 +7,12 @@ import { ContextUpdateStrategy, Client as ServerClient } from '@proj-airi/server
|
||||
import { nanoid } from 'nanoid'
|
||||
|
||||
export class Client {
|
||||
private client: ServerClient<Events> | null = null
|
||||
private client: null | ServerClient<Events> = null
|
||||
|
||||
async appendContext(context: string): Promise<void> {
|
||||
const id = nanoid()
|
||||
this.send({ data: { contextId: id, id, strategy: ContextUpdateStrategy.AppendSelf, text: context }, type: 'context:update' })
|
||||
}
|
||||
|
||||
async connect(): Promise<boolean> {
|
||||
try {
|
||||
@@ -30,6 +35,15 @@ export class Client {
|
||||
}
|
||||
}
|
||||
|
||||
isConnected(): boolean {
|
||||
return !!this.client
|
||||
}
|
||||
|
||||
async replaceContext(context: string): Promise<void> {
|
||||
const id = nanoid()
|
||||
this.send({ data: { contextId: id, id, strategy: ContextUpdateStrategy.ReplaceSelf, text: context }, type: 'context:update' })
|
||||
}
|
||||
|
||||
private async send(event: WebSocketEventOptionalSource<Events>): Promise<void> {
|
||||
if (!this.client) {
|
||||
useLogger().warn('Cannot send event: not connected to AIRI Server Channel')
|
||||
@@ -44,18 +58,4 @@ export class Client {
|
||||
useLogger().errorWithError('Failed to send event to AIRI:', error)
|
||||
}
|
||||
}
|
||||
|
||||
async replaceContext(context: string): Promise<void> {
|
||||
const id = nanoid()
|
||||
this.send({ type: 'context:update', data: { strategy: ContextUpdateStrategy.ReplaceSelf, text: context, id, contextId: id } })
|
||||
}
|
||||
|
||||
async appendContext(context: string): Promise<void> {
|
||||
const id = nanoid()
|
||||
this.send({ type: 'context:update', data: { strategy: ContextUpdateStrategy.AppendSelf, text: context, id, contextId: id } })
|
||||
}
|
||||
|
||||
isConnected(): boolean {
|
||||
return !!this.client
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,31 +22,31 @@ export class ContextCollector {
|
||||
|
||||
// File information
|
||||
const file = {
|
||||
path: document.uri.fsPath,
|
||||
languageId: document.languageId,
|
||||
fileName: document.fileName,
|
||||
languageId: document.languageId,
|
||||
path: document.uri.fsPath,
|
||||
workspaceFolder: this.getWorkspaceFolder(document.uri),
|
||||
}
|
||||
|
||||
// Cursor position
|
||||
const cursor = {
|
||||
line: position.line,
|
||||
character: position.character,
|
||||
line: position.line,
|
||||
}
|
||||
|
||||
// Selected text
|
||||
const selection = editor.selection.isEmpty
|
||||
? undefined
|
||||
: {
|
||||
text: document.getText(editor.selection),
|
||||
start: {
|
||||
line: editor.selection.start.line,
|
||||
character: editor.selection.start.character,
|
||||
},
|
||||
end: {
|
||||
line: editor.selection.end.line,
|
||||
character: editor.selection.end.character,
|
||||
line: editor.selection.end.line,
|
||||
},
|
||||
start: {
|
||||
character: editor.selection.start.character,
|
||||
line: editor.selection.start.line,
|
||||
},
|
||||
text: document.getText(editor.selection),
|
||||
}
|
||||
|
||||
// Current line
|
||||
@@ -62,12 +62,12 @@ export class ContextCollector {
|
||||
const git = await this.getGitInfo(document.uri)
|
||||
|
||||
return {
|
||||
file,
|
||||
cursor,
|
||||
selection,
|
||||
currentLine,
|
||||
context,
|
||||
currentLine,
|
||||
cursor,
|
||||
file,
|
||||
git,
|
||||
selection,
|
||||
timestamp: Date.now(),
|
||||
}
|
||||
}
|
||||
@@ -96,21 +96,13 @@ export class ContextCollector {
|
||||
after.push(document.lineAt(i).text)
|
||||
}
|
||||
|
||||
return { before, after }
|
||||
}
|
||||
|
||||
/**
|
||||
* Get workspace folder path
|
||||
*/
|
||||
private getWorkspaceFolder(uri: vscode.Uri): string | undefined {
|
||||
const folder = vscode.workspace.getWorkspaceFolder(uri)
|
||||
return folder?.uri.fsPath
|
||||
return { after, before }
|
||||
}
|
||||
|
||||
/**
|
||||
* Get Git information (simplified)
|
||||
*/
|
||||
private async getGitInfo(uri: vscode.Uri): Promise<{ branch: string, isDirty: boolean } | undefined> {
|
||||
private async getGitInfo(uri: vscode.Uri): Promise<undefined | { branch: string, isDirty: boolean }> {
|
||||
try {
|
||||
const gitExtension = vscode.extensions.getExtension('vscode.git')?.exports
|
||||
if (!gitExtension)
|
||||
@@ -130,4 +122,12 @@ export class ContextCollector {
|
||||
return undefined
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get workspace folder path
|
||||
*/
|
||||
private getWorkspaceFolder(uri: vscode.Uri): string | undefined {
|
||||
const folder = vscode.workspace.getWorkspaceFolder(uri)
|
||||
return folder?.uri.fsPath
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,82 +50,44 @@ export async function activate(context: vscode.ExtensionContext) {
|
||||
})
|
||||
|
||||
const extension = injeca.provide('extension', {
|
||||
dependsOn: { client, vscodeContext, contextCollector, eventListeners, lifecycle, controlLoopInterval },
|
||||
build: ({ dependsOn }) => setup({ ...dependsOn, isEnabled, sendInterval }),
|
||||
dependsOn: { client, contextCollector, controlLoopInterval, eventListeners, lifecycle, vscodeContext },
|
||||
})
|
||||
|
||||
injeca.invoke({
|
||||
dependsOn: { extension },
|
||||
callback: noop,
|
||||
dependsOn: { extension },
|
||||
})
|
||||
|
||||
await injeca.start()
|
||||
}
|
||||
|
||||
async function setup(params: {
|
||||
client: Client
|
||||
vscodeContext: vscode.ExtensionContext
|
||||
contextCollector: ContextCollector
|
||||
eventListeners: vscode.Disposable[]
|
||||
lifecycle: Lifecycle
|
||||
controlLoopInterval: IntervalHandle
|
||||
isEnabled: boolean
|
||||
sendInterval: number
|
||||
}) {
|
||||
// Connect to Airi Channel Server
|
||||
if (params.isEnabled) {
|
||||
const connected = await params.client.connect()
|
||||
if (connected) {
|
||||
window.showInformationMessage('AIRI Server Channel connected!')
|
||||
}
|
||||
else {
|
||||
window.showWarningMessage('AIRI Server Channel connection failed!')
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Deactivate the plugin
|
||||
*/
|
||||
export async function deactivate() {
|
||||
const { client } = await injeca.resolve({ client: { key: 'proj-airi:client' } as unknown as ProvidedBy<Client> })
|
||||
const { eventListeners } = await injeca.resolve({ eventListeners: { key: 'self:event-listeners' } as unknown as ProvidedBy<vscode.Disposable[]> })
|
||||
const { controlLoopInterval } = await injeca.resolve({ controlLoopInterval: { key: 'self:control-loop:interval:send' } as unknown as ProvidedBy<IntervalHandle> })
|
||||
|
||||
// Register commands
|
||||
params.vscodeContext.subscriptions.push(
|
||||
commands.registerCommand('airi-vscode.enable', async () => {
|
||||
params.isEnabled = true
|
||||
await params.client.connect()
|
||||
await registerListeners({ ...params })
|
||||
window.showInformationMessage('AIRI enabled!')
|
||||
}),
|
||||
|
||||
commands.registerCommand('airi-vscode.disable', () => {
|
||||
params.isEnabled = false
|
||||
unregisterListeners({ eventListeners: params.eventListeners, controlLoopInterval: params.controlLoopInterval })
|
||||
params.client.disconnect()
|
||||
window.showInformationMessage('AIRI disabled!')
|
||||
}),
|
||||
|
||||
commands.registerCommand('airi-vscode.status', () => {
|
||||
const status = params.isEnabled && params.client ? 'Connected' : 'Disconnected'
|
||||
window.showInformationMessage(`AIRI Server Channel status: ${status}.`)
|
||||
}),
|
||||
)
|
||||
|
||||
// Register event listeners if enabled
|
||||
if (params.isEnabled) {
|
||||
await registerListeners({ ...params })
|
||||
}
|
||||
|
||||
useLogger().log('AIRI activated successfully')
|
||||
unregisterListeners({ controlLoopInterval, eventListeners })
|
||||
client?.disconnect()
|
||||
useLogger().log('AIRI deactivated!')
|
||||
}
|
||||
|
||||
/**
|
||||
* Register event listeners for file save and editor switch
|
||||
*/
|
||||
async function registerListeners(params: {
|
||||
contextCollector: ContextCollector
|
||||
lifecycle: Lifecycle
|
||||
eventListeners: vscode.Disposable[]
|
||||
client: Client
|
||||
contextCollector: ContextCollector
|
||||
controlLoopInterval: IntervalHandle
|
||||
eventListeners: vscode.Disposable[]
|
||||
isEnabled: boolean
|
||||
lifecycle: Lifecycle
|
||||
sendInterval: number
|
||||
}) {
|
||||
unregisterListeners({ eventListeners: params.eventListeners, controlLoopInterval: params.controlLoopInterval })
|
||||
unregisterListeners({ controlLoopInterval: params.controlLoopInterval, eventListeners: params.eventListeners })
|
||||
|
||||
// File save event
|
||||
params.eventListeners.push(
|
||||
@@ -175,24 +137,66 @@ async function registerListeners(params: {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Unregister all event listeners
|
||||
*/
|
||||
function unregisterListeners(params: { eventListeners: vscode.Disposable[], controlLoopInterval: IntervalHandle }) {
|
||||
params.eventListeners.forEach(listener => listener.dispose())
|
||||
params.eventListeners = []
|
||||
stopMonitoring({ controlLoopInterval: params.controlLoopInterval })
|
||||
async function setup(params: {
|
||||
client: Client
|
||||
contextCollector: ContextCollector
|
||||
controlLoopInterval: IntervalHandle
|
||||
eventListeners: vscode.Disposable[]
|
||||
isEnabled: boolean
|
||||
lifecycle: Lifecycle
|
||||
sendInterval: number
|
||||
vscodeContext: vscode.ExtensionContext
|
||||
}) {
|
||||
// Connect to Airi Channel Server
|
||||
if (params.isEnabled) {
|
||||
const connected = await params.client.connect()
|
||||
if (connected) {
|
||||
window.showInformationMessage('AIRI Server Channel connected!')
|
||||
}
|
||||
else {
|
||||
window.showWarningMessage('AIRI Server Channel connection failed!')
|
||||
}
|
||||
}
|
||||
|
||||
// Register commands
|
||||
params.vscodeContext.subscriptions.push(
|
||||
commands.registerCommand('airi-vscode.enable', async () => {
|
||||
params.isEnabled = true
|
||||
await params.client.connect()
|
||||
await registerListeners({ ...params })
|
||||
window.showInformationMessage('AIRI enabled!')
|
||||
}),
|
||||
|
||||
commands.registerCommand('airi-vscode.disable', () => {
|
||||
params.isEnabled = false
|
||||
unregisterListeners({ controlLoopInterval: params.controlLoopInterval, eventListeners: params.eventListeners })
|
||||
params.client.disconnect()
|
||||
window.showInformationMessage('AIRI disabled!')
|
||||
}),
|
||||
|
||||
commands.registerCommand('airi-vscode.status', () => {
|
||||
const status = params.isEnabled && params.client ? 'Connected' : 'Disconnected'
|
||||
window.showInformationMessage(`AIRI Server Channel status: ${status}.`)
|
||||
}),
|
||||
)
|
||||
|
||||
// Register event listeners if enabled
|
||||
if (params.isEnabled) {
|
||||
await registerListeners({ ...params })
|
||||
}
|
||||
|
||||
useLogger().log('AIRI activated successfully')
|
||||
}
|
||||
|
||||
/**
|
||||
* Start monitoring the coding context
|
||||
*/
|
||||
function startMonitoring(params: {
|
||||
contextCollector: ContextCollector
|
||||
lifecycle: Lifecycle
|
||||
client: Client
|
||||
contextCollector: ContextCollector
|
||||
controlLoopInterval: IntervalHandle
|
||||
isEnabled: boolean
|
||||
lifecycle: Lifecycle
|
||||
sendInterval: number
|
||||
}) {
|
||||
stopMonitoring({ controlLoopInterval: params.controlLoopInterval })
|
||||
@@ -229,14 +233,10 @@ function stopMonitoring(params: { controlLoopInterval: IntervalHandle }) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Deactivate the plugin
|
||||
* Unregister all event listeners
|
||||
*/
|
||||
export async function deactivate() {
|
||||
const { client } = await injeca.resolve({ client: { key: 'proj-airi:client' } as unknown as ProvidedBy<Client> })
|
||||
const { eventListeners } = await injeca.resolve({ eventListeners: { key: 'self:event-listeners' } as unknown as ProvidedBy<vscode.Disposable[]> })
|
||||
const { controlLoopInterval } = await injeca.resolve({ controlLoopInterval: { key: 'self:control-loop:interval:send' } as unknown as ProvidedBy<IntervalHandle> })
|
||||
|
||||
unregisterListeners({ eventListeners, controlLoopInterval })
|
||||
client?.disconnect()
|
||||
useLogger().log('AIRI deactivated!')
|
||||
function unregisterListeners(params: { controlLoopInterval: IntervalHandle, eventListeners: vscode.Disposable[] }) {
|
||||
params.eventListeners.forEach(listener => listener.dispose())
|
||||
params.eventListeners = []
|
||||
stopMonitoring({ controlLoopInterval: params.controlLoopInterval })
|
||||
}
|
||||
|
||||
@@ -2,44 +2,6 @@
|
||||
* Coding context information
|
||||
*/
|
||||
export interface CodingContext {
|
||||
/**
|
||||
* File information
|
||||
*
|
||||
* @example {
|
||||
* "path": "/home/neko/Git/github.com/moeru-ai/airi/package.json",
|
||||
* "languageId": "json",
|
||||
* "fileName": "/home/neko/Git/github.com/moeru-ai/airi/package.json"
|
||||
* }
|
||||
*/
|
||||
file: {
|
||||
path: string
|
||||
languageId: string
|
||||
fileName: string
|
||||
workspaceFolder?: string
|
||||
}
|
||||
/**
|
||||
* Cursor position
|
||||
*
|
||||
* {
|
||||
* "line": 5,
|
||||
* "character": 35
|
||||
* }
|
||||
*/
|
||||
cursor: {
|
||||
line: number
|
||||
character: number
|
||||
}
|
||||
/** Selected text */
|
||||
selection?: {
|
||||
text: string
|
||||
start: { line: number, character: number }
|
||||
end: { line: number, character: number }
|
||||
}
|
||||
/** Current line */
|
||||
currentLine: {
|
||||
lineNumber: number
|
||||
text: string
|
||||
}
|
||||
/**
|
||||
* Context (previous and next N lines)
|
||||
*
|
||||
@@ -61,14 +23,52 @@ export interface CodingContext {
|
||||
* }
|
||||
*/
|
||||
context: {
|
||||
before: string[]
|
||||
after: string[]
|
||||
before: string[]
|
||||
}
|
||||
/** Current line */
|
||||
currentLine: {
|
||||
lineNumber: number
|
||||
text: string
|
||||
}
|
||||
/**
|
||||
* Cursor position
|
||||
*
|
||||
* {
|
||||
* "line": 5,
|
||||
* "character": 35
|
||||
* }
|
||||
*/
|
||||
cursor: {
|
||||
character: number
|
||||
line: number
|
||||
}
|
||||
/**
|
||||
* File information
|
||||
*
|
||||
* @example {
|
||||
* "path": "/home/neko/Git/github.com/moeru-ai/airi/package.json",
|
||||
* "languageId": "json",
|
||||
* "fileName": "/home/neko/Git/github.com/moeru-ai/airi/package.json"
|
||||
* }
|
||||
*/
|
||||
file: {
|
||||
fileName: string
|
||||
languageId: string
|
||||
path: string
|
||||
workspaceFolder?: string
|
||||
}
|
||||
/** Git information */
|
||||
git?: {
|
||||
branch: string
|
||||
isDirty: boolean
|
||||
}
|
||||
/** Selected text */
|
||||
selection?: {
|
||||
end: { character: number, line: number }
|
||||
start: { character: number, line: number }
|
||||
text: string
|
||||
}
|
||||
/**
|
||||
* Timestamp
|
||||
*
|
||||
@@ -81,6 +81,6 @@ export interface CodingContext {
|
||||
* Event types sent to Airi
|
||||
*/
|
||||
export interface Events {
|
||||
type: 'coding:context' | 'coding:save' | 'coding:switch-file'
|
||||
data: CodingContext
|
||||
type: 'coding:context' | 'coding:save' | 'coding:switch-file'
|
||||
}
|
||||
|
||||
@@ -2,13 +2,13 @@ import { defineConfig } from 'tsdown'
|
||||
|
||||
export default defineConfig([
|
||||
{
|
||||
entry: ['./src/extension.ts'],
|
||||
format: 'cjs',
|
||||
platform: 'node',
|
||||
external: ['vscode'],
|
||||
sourcemap: true,
|
||||
clean: true,
|
||||
dts: false,
|
||||
entry: ['./src/extension.ts'],
|
||||
external: ['vscode'],
|
||||
format: 'cjs',
|
||||
inlineOnly: false,
|
||||
platform: 'node',
|
||||
sourcemap: true,
|
||||
},
|
||||
])
|
||||
|
||||
Reference in New Issue
Block a user