Merge branch 'master' into add-normalize-note-content

Huy-DNA · Mar 11, 2024 · 6488c47 · 6488c47
2 parents 39d5b88 + 6e9b22b
commit 6488c47
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 9 deletions.
diff --git a/packages/parser/CHANGELOG.md b/packages/parser/CHANGELOG.md
@@ -1,11 +1,17 @@
 # @dbml-experimental/parser
 
-## 1.2.3
+## 1.2.4
 
 ### Patch Changes
 
 - add a note normalization step for more ui-friendly markdown notes
 
+## 1.2.3
+
+### Patch Changes
+
+- fix catch tables reappearing in multiple tablegroups
+
 ## 1.2.2
 
 ### Patch Changes

diff --git a/packages/parser/src/lib/errors.ts b/packages/parser/src/lib/errors.ts
@@ -95,6 +95,7 @@ export enum CompileErrorCode {
   SAME_ENDPOINT,
   UNEQUAL_FIELDS_BINARY_REF,
   CONFLICTING_SETTING,
+  TABLE_REAPPEAR_IN_TABLEGROUP,
 }
 
 export class CompileError extends Error {

diff --git a/packages/parser/src/lib/interpreter/elementInterpreter/tableGroup.ts b/packages/parser/src/lib/interpreter/elementInterpreter/tableGroup.ts
@@ -17,7 +17,7 @@ export class TableGroupInterpreter implements ElementInterpreter {
     this.env = env;
     this.tableGroup = { tables: [] };
   }
-
+ 
   interpret(): CompileError[] {
     const errors: CompileError[] = [];
     this.tableGroup.token = getTokenPosition(this.declarationNode);
@@ -57,13 +57,13 @@ export class TableGroupInterpreter implements ElementInterpreter {
       }
 
       const tableid = destructureMemberAccessExpression((field as FunctionApplicationNode).callee!).unwrap().pop()!.referee!.id;
-      if (this.env.tableOwnerGroup[tableid]) {
-        const tableGroup = this.env.tableOwnerGroup[tableid];
+      if (this.env.groupOfTable[tableid]) {
+        const tableGroup = this.env.groupOfTable[tableid];
         const { schemaName, name } = this.env.tableGroups.get(tableGroup)!;
         const groupName = schemaName ? `${schemaName}.${name}` : name;
         errors.push(new CompileError(CompileErrorCode.TABLE_REAPPEAR_IN_TABLEGROUP, `Table "${fragments.join('.')}" already appears in group "${groupName}"`, field));
       } else {
-        this.env.tableOwnerGroup[tableid] = this.declarationNode;
+        this.env.groupOfTable[tableid] = this.declarationNode;
       }
 
       return {
@@ -74,4 +74,4 @@ export class TableGroupInterpreter implements ElementInterpreter {
 
     return errors;
   }
-}
+}
diff --git a/packages/parser/src/lib/interpreter/interpreter.ts b/packages/parser/src/lib/interpreter/interpreter.ts
@@ -23,8 +23,8 @@ export default class Interpreter {
       refIds: { },
       ref: new Map(),
       enums: new Map(),
-      tableOwnerGroup: { },
       tableGroups: new Map(),
+      groupOfTable: { },
       aliases: [],
       project: new Map(),
     };

diff --git a/packages/parser/src/lib/interpreter/types.ts b/packages/parser/src/lib/interpreter/types.ts
@@ -18,7 +18,8 @@ export interface InterpreterDatabase {
   refIds: { [refid: string]: ElementDeclarationNode };
   ref: Map<ElementDeclarationNode, Ref>;
   enums: Map<ElementDeclarationNode, Enum>;
-  tableOwnerGroup: { [tableid: string]: ElementDeclarationNode };
+  // for keeping track of the owner table group of a table
+  groupOfTable: { [tableid: string]: ElementDeclarationNode };
   tableGroups: Map<ElementDeclarationNode, TableGroup>;
   aliases: Alias[];
   project: Map<ElementDeclarationNode, Project>;

diff --git a/packages/parser/src/lib/interpreter/utils.ts b/packages/parser/src/lib/interpreter/utils.ts
@@ -1,7 +1,9 @@
 import _ from 'lodash';
 import { ColumnSymbol } from '../analyzer/symbol/symbols';
 import {
- destructureComplexVariableTuple, destructureComplexVariable, destructureMemberAccessExpression, extractVarNameFromPrimaryVariable,
+  destructureComplexVariable,
+  destructureComplexVariableTuple,
+  destructureMemberAccessExpression, extractVarNameFromPrimaryVariable,
 } from '../analyzer/utils';
 import {
  LiteralNode, PrimaryExpressionNode, SyntaxNode, TupleExpressionNode,

diff --git a/packages/parser/tests/interpreter/output/reappearing_tables_in_tablegroups.out.json b/packages/parser/tests/interpreter/output/reappearing_tables_in_tablegroups.out.json
@@ -1,5 +1,6 @@
 [
   {
+    "code": 5005,
     "diagnostic": "Table \"users\" already appears in group \"A1\"",
     "nodeOrToken": {
       "id": 36,
@@ -168,6 +169,7 @@
     "name": "CompileError"
   },
   {
+    "code": 5005,
     "diagnostic": "Table \"AU\" already appears in group \"A3\"",
     "nodeOrToken": {
       "id": 53,