chore: move to byorg framework (#60)

* chore: move to byorg framework

* chore: fix building and running

* chore: pipeline fix

* chore: fixing the pipeline

* chore: brought back non-streaming response

* chore: add typing for update

* chore: code review changes

* refactor: revert provider info naming

* refactor: code review changes

* chore: fix rsbuild output

---------

Co-authored-by: Maciej Jastrzebski <[email protected]>

Author: Q1w1N

.eslintignore

@@ -2,3 +2,6 @@ node_modules/
 build/
 dist/
 website/
+rsbuild.config.ts
+vitest.config.ts
+bin.js

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
         uses: ./.github/actions/setup
 
       - name: Run unit tests
-        run: yarn test --maxWorkers=2 --coverage
+        run: yarn test --coverage
 
   build-library:
     runs-on: ubuntu-latest

bin.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+import './dist/bin.cjs';

package.json

@@ -13,22 +13,22 @@
   "main": "build/index.js",
   "source": "src/index.js",
   "bin": {
-    "ai": "build/bin.js"
+    "ai": "./bin.js"
   },
   "files": [
-    "build",
+    "bin.js",
+    "dist",
     "!**/__tests__",
     "!**/__mocks__"
   ],
   "scripts": {
-    "build": "tsc",
-    "build:watch": "tsc --watch",
-    "test": "jest",
+    "build": "rsbuild build",
+    "test": "vitest run",
     "typecheck": "tsc --noEmit",
     "lint": "eslint \"**/*.{js,ts,tsx}\"",
     "clean": "del-cli build",
     "release": "release-it",
-    "ai": "chmod +x ./build/bin.js && ./build/bin.js"
+    "ai": "yarn build && ./bin.js"
   },
   "repository": {
     "type": "git",
@@ -41,7 +41,11 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
+    "@ai-sdk/anthropic": "^0.0.54",
+    "@ai-sdk/mistral": "^0.0.46",
+    "@ai-sdk/openai": "^0.0.71",
     "@anthropic-ai/sdk": "^0.26.1",
+    "@callstack/byorg-core": "0.1.2",
     "@inkjs/ui": "^1.0.0",
     "@mistralai/mistralai": "^1.0.2",
     "chalk": "^5.3.0",
@@ -50,7 +54,6 @@
     "ink": "^4.4.1",
     "ink-link": "^3.0.0",
     "ink-text-input": "^5.0.1",
-    "openai": "^4.56.0",
     "prompts": "^2.4.2",
     "react": "^18.2.0",
     "redent": "^4.0.0",
@@ -63,32 +66,31 @@
   "devDependencies": {
     "@callstack/eslint-config": "^14.1.1",
     "@release-it/conventional-changelog": "^5.1.1",
+    "@rsbuild/core": "^1.0.3",
     "@types/jest": "^29.5.12",
     "@types/mock-fs": "^4.13.4",
     "@types/prompts": "^2.4.9",
     "@types/react": "^18.2.63",
     "@types/update-notifier": "^6.0.8",
+    "@vitest/coverage-v8": "^2.1.4",
     "del-cli": "^5.1.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-prettier": "^5.1.3",
     "jest": "^29.7.0",
+    "memfs": "^4.14.0",
     "mock-fs": "^5.2.0",
     "prettier": "^3.2.5",
     "release-it": "^15.11.0",
-    "typescript": "^5.4.5"
+    "typescript": "^5.4.5",
+    "vitest": "^2.1.4"
   },
   "packageManager": "[email protected]",
   "engines": {
     "node": ">= 18.0.0"
   },
-  "jest": {
-    "modulePathIgnorePatterns": [
-      "<rootDir>/build/"
-    ]
-  },
   "prettier": {
     "quoteProps": "consistent",
     "singleQuote": true,

rsbuild.config.ts

@@ -0,0 +1,41 @@
+import { defineConfig } from '@rsbuild/core';
+
+export default defineConfig({
+  dev: { progressBar: false },
+  source: {
+    entry: {
+      bin: './src/bin.ts',
+    },
+    tsconfigPath: './tsconfig.build.json',
+  },
+  output: {
+    target: 'node',
+    minify: false,
+    filename: {
+      js: '[name].cjs',
+    },
+    externals: ['react-devtools-core'],
+  },
+  tools: {
+    rspack: {
+      module: {
+        parser: {
+          javascript: {
+            dynamicImportMode: 'eager',
+          },
+        },
+      },
+      resolve: {
+        extensionAlias: {
+          '.js': ['.js', '.ts', '.tsx'],
+        },
+      },
+      ignoreWarnings: [
+        /require function is used in a way in which dependencies cannot be statically extracted/,
+        /the request of a dependency is an expression/,
+        /Can't resolve 'bufferutil'/,
+        /Can't resolve 'utf-8-validate'/,
+      ],
+    },
+  },
+});

src/__tests__/file-utils.test.ts

@@ -1,81 +1,61 @@
-/* eslint-disable jest/no-commented-out-tests */
-it.todo('Move tests to AVA');
-
-// import type { SessionContext } from '../commands/prompt/types.js';
-// import { DEFAULT_SYSTEM_PROMPT } from '../default-config.js';
-// import { getDefaultFilename, getUniqueFilename } from '../file-utils.js';
-// import openAi from '../engine/providers/openAi.js';
-
-// const mockFs = require('mock-fs');
-
-// const mockContext: SessionContext = {
-//   config: {
-//     model: 'gpt-4',
-//     systemPrompt: DEFAULT_SYSTEM_PROMPT,
-//     apiKey: '***',
-//   },
-//   provider: openAi,
-//   messages: [],
-//   totalUsage: { inputTokens: 0, outputTokens: 0, requests: 0 },
-// };
-
-// // Allows for mocking the time on CLI
-// Object.defineProperty(global, 'performance', {
-//   writable: true,
-// });
-
-// beforeAll(() => {
-//   jest.useFakeTimers();
-//   jest.setSystemTime(new Date(2020, 3, 1, 12, 0));
-// });
-
-// beforeEach(() => {
-//   mockFs({
-//     '/path/to/': {
-//       'file.txt': 'Content',
-//       'incr.txt': 'Content',
-//       'incr-1.txt': 'Content',
-//     },
-//   });
-// });
-
-// // Restores the filesystem functions
-// afterEach(() => {
-//   mockFs.restore();
-// });
-
-// afterAll(() => {
-//   jest.useRealTimers();
-// });
-
-// describe('getDefaultFilename', () => {
-//   it('should return the default file name', () => {
-//     // Test case 1
-//     const context = mockContext;
-//     context.messages.push({ role: 'user', content: 'Hi How Are You Doing Today?' });
-
-//     const defaultFilename = getDefaultFilename(context);
-
-//     expect(defaultFilename).toBe('2020-04-01 12-00 Hi How Are You Doing');
-//   });
-// });
-
-// describe('getUniqueFilename', () => {
-//   it('should return a unique file name', () => {
-//     const filePath = '/path/to/file.txt';
-//     const uniqueFilename = getUniqueFilename(filePath);
-//     expect(uniqueFilename).toMatch(`/path/to/file-1.txt`);
-//   });
-
-//   it('should properly increment the name', () => {
-//     const filePath = '/path/to/incr.txt';
-//     const uniqueFilename = getUniqueFilename(filePath);
-//     expect(uniqueFilename).toMatch(`/path/to/incr-2.txt`);
-//   });
-
-//   it('should not modify already unique name', () => {
-//     const filePath = '/path/to/another/file.txt';
-//     const uniqueFilename = getUniqueFilename(filePath);
-//     expect(uniqueFilename).toMatch(`/path/to/another/file.txt`);
-//   });
-// });
+import { Message } from '@callstack/byorg-core';
+import { beforeAll, beforeEach, describe, expect, test, vi } from 'vitest';
+import { fs, vol } from 'memfs';
+import { getDefaultFilename, getUniqueFilename } from '../file-utils.js';
+
+vi.mock('node:fs', () => fs);
+
+beforeAll(() => {
+  vi.useFakeTimers();
+  vi.setSystemTime(new Date(2020, 3, 1, 12, 0));
+  return () => {
+    vi.useRealTimers();
+  };
+});
+
+beforeEach(() => {
+  vol.fromJSON(
+    {
+      'file.txt': 'Content',
+      'incr.txt': 'Content',
+      'incr-1.txt': 'Content',
+    },
+    '/path/to/',
+  );
+
+  return () => {
+    // // Restores the filesystem functions
+    vol.reset();
+  };
+});
+
+describe('getDefaultFilename', () => {
+  test('should return the default file name', () => {
+    // Test case 1
+    const messages: Message[] = [{ role: 'user', content: 'Hi How Are You Doing Today?' }];
+
+    const defaultFilename = getDefaultFilename(messages);
+
+    expect(defaultFilename).toBe('2020-04-01 12-00 Hi How Are You Doing');
+  });
+});
+
+describe('getUniqueFilename', () => {
+  test('should return a unique file name', () => {
+    const filePath = '/path/to/file.txt';
+    const uniqueFilename = getUniqueFilename(filePath);
+    expect(uniqueFilename).toMatch(`/path/to/file-1.txt`);
+  });
+
+  test('should properly increment the name', () => {
+    const filePath = '/path/to/incr.txt';
+    const uniqueFilename = getUniqueFilename(filePath);
+    expect(uniqueFilename).toMatch(`/path/to/incr-2.txt`);
+  });
+
+  test('should not modify already unique name', () => {
+    const filePath = '/path/to/another/file.txt';
+    const uniqueFilename = getUniqueFilename(filePath);
+    expect(uniqueFilename).toMatch(`/path/to/another/file.txt`);
+  });
+});

src/__tests__/index.test.ts

@@ -1,39 +1,36 @@
-import type { ModelResponse } from '../../../engine/inference.js';
+import { type AssistantMessage, type AssistantResponse } from '@callstack/byorg-core';
 import { useChatState, type MessageLevel } from './state.js';
 
-export function addUserMessage(text: string) {
+export function addUserMessage(content: string) {
   useChatState.setState((state) => {
     return {
       activeView: null,
-      contextMessages: [...state.contextMessages, { role: 'user', content: text }],
-      chatMessages: [...state.chatMessages, { type: 'user', text }],
+      contextMessages: [...state.contextMessages, { role: 'user', content }],
+      chatMessages: [...state.chatMessages, { role: 'user', content }],
     };
   });
 }
 
-export function addAiResponse(response: ModelResponse) {
+export function addAssistantResponse(response: AssistantResponse) {
   useChatState.setState((state) => {
-    const outputMessages = {
-      type: 'ai',
-      text: response.message.content,
-      responseTime: response.responseTime,
-      usage: response.usage,
-      data: response.data,
-    } as const;
+    const message: AssistantMessage = {
+      role: 'assistant',
+      content: response.content,
+    };
 
     return {
       activeView: null,
-      contextMessages: [...state.contextMessages, response.message],
-      chatMessages: [...state.chatMessages, outputMessages],
+      contextMessages: [...state.contextMessages, message],
+      chatMessages: [...state.chatMessages, response],
     };
   });
 }
 
-export function addProgramMessage(text: string, level: MessageLevel = 'info') {
+export function addProgramMessage(content: string, level: MessageLevel = 'info') {
   useChatState.setState((state) => {
     return {
       activeView: null,
-      chatMessages: [...state.chatMessages, { type: 'program', level, text }],
+      chatMessages: [...state.chatMessages, { role: 'program', level, content }],
     };
   });
 }
@@ -57,7 +54,7 @@ export function forgetContextMessages() {
       contextMessages: [],
       chatMessages: [
         ...state.chatMessages,
-        { type: 'program', level: 'info', text: 'AI will forget previous messages.' },
+        { role: 'program', level: 'info', content: 'AI will forget previous messages.' },
       ],
     };
   });
@@ -92,7 +89,7 @@ export function triggerExit() {
     return {
       activeView: null,
       shouldExit: true,
-      chatMessages: [...state.chatMessages, { type: 'program', level: 'info', text: 'Bye! 👋' }],
+      chatMessages: [...state.chatMessages, { role: 'program', level: 'info', content: 'Bye! 👋' }],
     };
   });
 }
@@ -103,7 +100,7 @@ export function setVerbose(verbose: boolean) {
       verbose,
       chatMessages: [
         ...state.chatMessages,
-        { type: 'program', level: 'info', text: `Verbose mode: ${verbose ? 'on' : 'off'}` },
+        { role: 'program', level: 'info', content: `Verbose mode: ${verbose ? 'on' : 'off'}` },
       ],
     };
   });