Merge pull request #2116 from undb-io/release/v1.0.0-111

Release version v1.0.0-111

.github/workflows/ci.yaml

@@ -28,6 +28,9 @@ jobs:
       - name: Install dependencies
         run: bun install
 
+      - name: Run tests
+        run: bun test
+
       - name: Build
         run: bun run build
 

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.0.0-111
+
+
+### 🚀 Enhancements
+
+- Support formula field aggregate ([b1ceece](https://github.com/undb-io/undb/commit/b1ceece))
+
+### ❤️ Contributors
+
+- Nichenqin ([@nichenqin](http://github.com/nichenqin))
+
 ## v1.0.0-110
 
 ## v1.0.0-109

apps/frontend/package.json

@@ -22,6 +22,7 @@
     "@sveltejs/adapter-static": "^3.0.5",
     "@sveltejs/kit": "^2.7.1",
     "@sveltejs/vite-plugin-svelte": "^3.1.2",
+    "@tailwindcss/typography": "^0.5.15",
     "@tanstack/eslint-plugin-query": "^5.59.7",
     "@types/eslint": "^8.56.12",
     "@types/lodash.unzip": "^3.4.9",
@@ -31,6 +32,7 @@
     "@typescript-eslint/parser": "^8.10.0",
     "@undb/commands": "workspace:*",
     "@undb/domain": "workspace:*",
+    "@undb/formula": "workspace:*",
     "@undb/i18n": "workspace:*",
     "@undb/openapi": "workspace:*",
     "@undb/queries": "workspace:*",
@@ -73,11 +75,16 @@
     "type-fest": "^4.26.1",
     "typescript": "^5.6.3",
     "vite": "^5.4.9",
+    "vite-plugin-node-polyfills": "^0.22.0",
     "vitest": "^2.1.3",
     "xlsx": "^0.18.5"
   },
   "type": "module",
   "dependencies": {
+    "@codemirror/commands": "^6.7.1",
+    "@codemirror/language": "^6.10.3",
+    "@codemirror/state": "^6.4.1",
+    "@codemirror/view": "^6.34.1",
     "@formkit/auto-animate": "^0.8.2",
     "@internationalized/date": "^3.5.6",
     "@svelte-put/clickoutside": "^3.0.2",

apps/frontend/schema.graphql

@@ -44,6 +44,7 @@ type Field {
   defaultValue: JSON
   display: Boolean
   id: ID!
+  metadata: JSON
   name: String!
   option: JSON
   type: FieldType!

apps/frontend/src/lib/components/blocks/aggregate/config/aggregate-config.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
   import * as Tabs from "$lib/components/ui/tabs"
-  import { getTable } from "$lib/store/table.store"
   import { invalidate } from "$app/navigation"
   import {
     filterAggregateField,

apps/frontend/src/lib/components/blocks/dashboard/dashboard-widget-share-table.gql

@@ -16,6 +16,7 @@ query GetDashboardWidgetShareTable($shareId: ID!, $tableId: ID!) {
       display
       constraint
       option
+      metadata
     }
 
     views {

apps/frontend/src/lib/components/blocks/dashboard/dashboard-widget-table.gql

@@ -16,6 +16,7 @@ query GetDashboardWidgetTable($tableId: ID!) {
       display
       constraint
       option
+      metadata
     }
 
     views {

apps/frontend/src/lib/components/blocks/field-options/field-options.svelte

@@ -19,6 +19,7 @@
   import ButtonFieldOption from "./button-field-option.svelte"
   import DurationFieldOption from "./duration-field-option.svelte"
   import PercentageFieldOption from "./percentage-field-option.svelte"
+  import FormulaFieldOption from "./formula-field-option.svelte"
 
   export let constraint: IFieldConstraint | undefined
   export let option: any | undefined
@@ -47,6 +48,7 @@
     date: DateFieldOption,
     duration: DurationFieldOption,
     percentage: PercentageFieldOption,
+    formula: FormulaFieldOption,
   }
 
   export let type: NoneSystemFieldType

apps/frontend/src/lib/components/blocks/field-options/foreign-table.gql

@@ -10,6 +10,7 @@ query GetForeignTableQuery($tableId: ID!) {
       display
       constraint
       option
+      metadata
     }
     views {
       id

apps/frontend/src/lib/components/blocks/field-options/formula-field-option.svelte

@@ -0,0 +1,18 @@
+<script lang="ts">
+  import { Label } from "$lib/components/ui/label/index.js"
+  import FormulaEditor from "$lib/components/formula/formula-editor.svelte"
+  import { FormulaField, type IFormulaFieldOption } from "@undb/table"
+
+  export let option: IFormulaFieldOption = {
+    fn: "",
+  }
+
+  export let field: FormulaField | undefined = undefined
+</script>
+
+<div class="space-y-2">
+  <div class="space-y-1">
+    <Label for="Formula" class="text-xs font-normal">Formula</Label>
+  </div>
+  <FormulaEditor bind:value={option.fn} {field} />
+</div>

apps/frontend/src/lib/components/blocks/field-value/long-text-field.svelte

@@ -1,12 +1,24 @@
 <script lang="ts">
+  import type { LongTextField } from "@undb/table"
+
   export let value: string | undefined = undefined
   export let placeholder: string | undefined = undefined
+
+  export let field: LongTextField
 </script>
 
 {#if !value}
   <div>
     {placeholder || ""}
   </div>
 {:else}
-  <div class={$$restProps.class}>{value}</div>
+  <div class={$$restProps.class}>
+    {#if field.allowRichText}
+      <article class="prose-sm max-w-full">
+        {@html value}
+      </article>
+    {:else}
+      {value}
+    {/if}
+  </div>
 {/if}

apps/frontend/src/lib/components/blocks/field/get-rollup-foreign-tables.gql

@@ -9,6 +9,7 @@ query GetRollupForeignTables($tableId: ID!, $fieldId: ID!) {
       constraint
       option
       display
+      metadata
     }
     views {
       id

apps/frontend/src/lib/components/blocks/filters-editor/filter-input.svelte

@@ -269,6 +269,39 @@
     is_not_empty: null,
   }
 
+  $: formula = {}
+
+  $: if (field?.type === "formula") {
+    if (field.returnType === "number") {
+      formula = {
+        eq: NumberInput,
+        neq: NumberInput,
+        gt: NumberInput,
+        gte: NumberInput,
+        lt: NumberInput,
+        lte: NumberInput,
+        is_empty: null,
+        is_not_empty: null,
+      }
+    } else if (field.returnType === "boolean") {
+      formula = {
+        is_true: null,
+        is_false: null,
+      }
+    } else if (field.returnType === "string") {
+      formula = {
+        eq: Input,
+        neq: Input,
+        contains: Input,
+        does_not_contain: Input,
+        starts_with: Input,
+        ends_with: Input,
+        is_empty: null,
+        is_not_empty: null,
+      }
+    }
+  }
+
   $: filterFieldInput = {
     string,
     number,
@@ -289,6 +322,7 @@
     url,
     longText,
     duration,
+    formula,
     percentage,
   }
 </script>

apps/frontend/src/lib/components/blocks/reference/foreign-table.gql

@@ -16,6 +16,7 @@ query GetForeignTable($tableId: ID!) {
       display
       constraint
       option
+      metadata
     }
 
     views {

apps/frontend/src/lib/components/formula/formula-cursor.visitor.ts

@@ -0,0 +1,117 @@
+import {
+  AbstractParseTreeVisitor,
+  AddSubExprContext,
+  AndExprContext,
+  ArgumentListContext,
+  ComparisonExprContext,
+  ExpressionContext,
+  FormulaContext,
+  FormulaParserVisitor,
+  FunctionCallContext,
+  FunctionExprContext,
+  MulDivModExprContext,
+  NotExprContext,
+  OrExprContext,
+  type ParseTree,
+  VariableContext,
+} from "@undb/formula"
+
+export class FormulaCursorVisitor extends AbstractParseTreeVisitor<void> implements FormulaParserVisitor<void> {
+  private pathNodes: ParseTree[] = []
+  private variables: Set<string> = new Set()
+  public readonly targetPosition: number
+
+  constructor(position: number) {
+    super()
+    this.targetPosition = position
+  }
+
+  public hasAggumentList(): boolean {
+    return this.pathNodes.some((node) => node instanceof ArgumentListContext)
+  }
+
+  public hasFunctionCall(): boolean {
+    return this.pathNodes.some((node) => node instanceof FunctionCallContext)
+  }
+
+  public getNearestFunctionNode() {
+    for (let i = this.pathNodes.length - 1; i >= 0; i--) {
+      const node = this.pathNodes[i]
+      if (node instanceof FunctionCallContext) {
+        return node
+      }
+    }
+    return null
+  }
+
+  public getFunctionName(): string | undefined {
+    const functionCall = this.getNearestFunctionNode()
+    return functionCall?.IDENTIFIER()?.text
+  }
+
+  protected defaultResult(): void {
+    return undefined
+  }
+
+  public getPathNodes() {
+    return this.pathNodes
+  }
+
+  visitPositionInRange(ctx: ExpressionContext) {
+    if (!ctx.start || !ctx.stop) return
+
+    const start = ctx.start.startIndex
+    const stop = ctx.stop.stopIndex
+    const isPositionWithinRange = start <= this.targetPosition && stop >= this.targetPosition
+
+    if (isPositionWithinRange) {
+      this.pathNodes.push(ctx)
+      this.visitChildren(ctx)
+    }
+  }
+
+  visitFormula(ctx: FormulaContext) {
+    this.visitPositionInRange(ctx)
+  }
+
+  visitComparisonExpr(ctx: ComparisonExprContext) {
+    this.visitPositionInRange(ctx)
+  }
+
+  visitAndExpr(ctx: AndExprContext) {
+    this.visitPositionInRange(ctx)
+  }
+
+  visitOrExpr(ctx: OrExprContext) {
+    this.visitPositionInRange(ctx)
+  }
+
+  visitNotExpr(ctx: NotExprContext) {
+    this.visitPositionInRange(ctx)
+  }
+
+  visitMulDivModExpr(ctx: MulDivModExprContext) {
+    this.visitPositionInRange(ctx)
+  }
+
+  visitAddSubExpr(ctx: AddSubExprContext) {
+    this.visitPositionInRange(ctx)
+  }
+
+  visitFunctionExpr(ctx: FunctionExprContext) {
+    this.visitPositionInRange(ctx)
+  }
+
+  visitFunctionCall(ctx: FunctionCallContext) {
+    this.visitPositionInRange(ctx)
+  }
+
+  visitArgumentList(ctx: ArgumentListContext) {
+    this.visitPositionInRange(ctx)
+  }
+
+  visitVariable(ctx: VariableContext) {
+    this.variables.add(ctx.IDENTIFIER().text)
+    this.visitPositionInRange(ctx)
+  }
+}