Merge branch 'main' into feat/erd-header

.github/workflows/release.yml

@@ -28,11 +28,19 @@ jobs:
       - uses: ./.github/actions/pnpm-setup
         with:
           working-directory: ${{ env.working-directory }}
+
+      - name: Create GitHub App Token
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ vars.CI_TRIGGER_APP_ID }}
+          private-key: ${{ secrets.CI_TRIGGER_APP_PRIVATE_KEY }}
+
       - name: Create Release Pull Request or Publish to npm
         uses: changesets/[email protected]
         with:
           cwd: ${{ env.working-directory }}
           publish: pnpm changeset publish
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

frontend/.changeset/metal-crabs-destroy.md

@@ -0,0 +1,5 @@
+---
+"@liam-hq/cli": patch
+---
+
+Use GitHub App Token for release workflow in GitHub Actions

frontend/docs/packages-license.md

@@ -7,7 +7,7 @@ As of December  3, 2024  6:41am. 996 total
 * 59 ISC
 * 28 Apache 2.0
 * 14 Simplified BSD
-* 12 New BSD
+* 11 New BSD
 * 3 MIT OR Apache-2.0
 * 3 BlueOak-1.0.0
 * 2 LGPL-3.0-or-later

frontend/packages/cli/package.json

@@ -36,9 +36,10 @@
   },
   "scripts": {
     "build": "pnpm run '/^build:.*/'",
-    "build:cli": "rollup -c",
+    "build:cli": "rollup -c  && pnpm run cp:prism",
     "build:vite": "vite build",
     "command:build": "node ./dist-cli/bin/cli.js erd build --input fixtures/input.schema.rb",
+    "cp:prism": "cp ../db-structure/node_modules/@ruby/prism/src/prism.wasm ./dist-cli/bin/prism.wasm",
     "dev": "pnpm command:build && cp dist/schema.json public/ && pnpm run '/^dev:.*/'",
     "dev:app": "vite",
     "dev:css": "tcm src --watch",

frontend/packages/cli/src/cli/runPreprocess.test.ts

@@ -5,14 +5,14 @@ import { describe, expect, it } from 'vitest'
 import { runPreprocess } from './runPreprocess'
 
 describe('runPreprocess', () => {
-  it('should create schema.json with the SQL content in the specified directory', () => {
+  it('should create schema.json with the SQL content in the specified directory', async () => {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'test-distDir-'))
     const inputPath = path.join(tmpDir, 'input.sql')
 
     const sqlContent = 'CREATE TABLE test (id INT, name VARCHAR(255));'
     fs.writeFileSync(inputPath, sqlContent, 'utf8')
 
-    const outputFilePath = runPreprocess(inputPath, tmpDir)
+    const outputFilePath = await runPreprocess(inputPath, tmpDir)
     if (!outputFilePath) throw new Error('Implement the test')
 
     expect(fs.existsSync(outputFilePath)).toBe(true)
@@ -21,11 +21,11 @@ describe('runPreprocess', () => {
     expect(outputContent.tables).toBeDefined()
   })
 
-  it('should throw an error if the input file does not exist', () => {
+  it('should throw an error if the input file does not exist', async () => {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'test-distDir-'))
     const nonExistentPath = path.join(tmpDir, 'non-existent.sql')
 
-    expect(() => runPreprocess(nonExistentPath, tmpDir)).toThrow(
+    await expect(runPreprocess(nonExistentPath, tmpDir)).rejects.toThrow(
       'Invalid input path. Please provide a valid file.',
     )
   })

frontend/packages/cli/src/cli/runPreprocess.ts

@@ -2,7 +2,7 @@ import fs, { readFileSync } from 'node:fs'
 import path from 'node:path'
 import { parse } from '@liam-hq/db-structure/parser'
 
-export function runPreprocess(inputPath: string, outputDir: string) {
+export async function runPreprocess(inputPath: string, outputDir: string) {
   if (!fs.existsSync(inputPath)) {
     throw new Error('Invalid input path. Please provide a valid file.')
   }
@@ -11,7 +11,7 @@ export function runPreprocess(inputPath: string, outputDir: string) {
 
   // TODO: Expand support to additional formats, e.g., 'postgres'
   const format = 'schemarb'
-  const json = parse(input, format)
+  const json = await parse(input, format)
 
   const filePath = path.join(outputDir, 'schema.json')
 

frontend/packages/db-structure/package.json

@@ -16,17 +16,13 @@
     "@biomejs/biome": "1.9.3",
     "@liam-hq/configs": "workspace:*",
     "@pgsql/types": "15.0.2",
-    "lodash-es": "4.17.21",
-    "peggy": "4.1.1",
-    "pluralize-esm": "9.0.5",
     "typescript": "5",
     "vitest": "2.1.4"
   },
   "scripts": {
     "build": "tsc",
     "fmt": "pnpm run '/^fmt:.*/'",
     "fmt:biome": "biome check --write --unsafe .",
-    "gen:parser": "./scripts/generateParser.sh",
     "lint": "pnpm run '/^lint:.*/'",
     "lint:biome": "biome check .",
     "lint:tsc": "tsc --noEmit",

frontend/packages/db-structure/src/parser/__snapshots__/index.test.ts.snap

@@ -104,10 +104,10 @@ exports[`parse > should parse schema.rb to JSON correctly 1`] = `
           "default": null,
           "increment": false,
           "name": "id",
-          "notNull": false,
+          "notNull": true,
           "primary": true,
-          "type": "varchar",
-          "unique": false,
+          "type": "uuid",
+          "unique": true,
         },
         "is_deleted": {
           "check": null,

frontend/packages/db-structure/src/parser/index.ts

@@ -1,9 +1,8 @@
 import type { DBStructure } from 'src/schema/index.js'
-import { processor as schemarbPrismProcessor } from './schemarb-prism/index.js'
 import { processor as schemarbProcessor } from './schemarb/index.js'
 import { processor as postgresqlProcessor } from './sql/index.js'
 
-type SupportedFormat = 'schemarb' | 'postgres' | 'schemarb-prism'
+type SupportedFormat = 'schemarb' | 'postgres'
 
 // TODO: Add error handling and tests
 export const parse = (
@@ -13,8 +12,6 @@ export const parse = (
   switch (format) {
     case 'schemarb':
       return schemarbProcessor(str)
-    case 'schemarb-prism':
-      return schemarbPrismProcessor(str)
     case 'postgres':
       return postgresqlProcessor(str)
     default: