@dbml/core 2.3.1 → 2.4.2

package/lib/parse/dbml/parser.pegjs

@@ -5,9 +5,16 @@
     refs: [],
     enums: [],
     tableGroups: [],
+    aliases: [],
     project: {},
   };
   let projectCnt = 0;
+  function getRelations(operator) {
+    if(operator === '<>') return ['*','*'];
+    if(operator === '>') return ['*','1'];
+    if(operator === '<') return ['1','*'];
+    if(operator === '-') return ['1','1'];
+  }
 }
 
 rules
@@ -122,23 +129,31 @@ ProjectField
     }
   }
 
-TableGroupSyntax = table_group sp+ name:name _ "{" _ body:table_group_body _ "}" {
+TableGroupSyntax = table_group sp+ schemaName:schema_name? name:name _ "{" _ body:table_group_body _ "}" {
   return {
     name: name,
+    schemaName,
     tables: body,
     token: location()
   }
 }
 
-table_group_body = tables:(name __)* {
+table_group_body = tables:(schema_name? name __)* {
   return tables.map(t => ({
-    name: t[0]
+    name: t[1],
+    schemaName: t[0]
   }));
 }
 
 // References
 RefSyntax
-  = r: (ref_long / ref_short) { return r; }
+  = r: (ref_long / ref_short) {
+    const schemaName = r.endpoints[0].schemaName;
+    return {
+      ...r,
+      schemaName,
+    }; 
+  }
 
 ref_long
   = ref name:(__ name)? _ "{" _ body:ref_body _ "}" {
@@ -163,18 +178,21 @@ ref_short
     }
 
 ref_body
-  = table1:name "." field1:RefField sp+ relation:relation sp+ table2:name "." field2:RefField sp* ref_settings:RefSettings? {
+  = field1:field_identifier sp+ relation:relation sp+ field2:field_identifier sp* ref_settings:RefSettings? {
+    const rel = getRelations(relation);
     const endpoints = [
       {
-        tableName: table1,
-        fieldNames: field1,
-        relation: relation === ">" ? "*" : "1",
+        schemaName: field1.schemaName,
+        tableName: field1.tableName,
+        fieldNames: field1.fieldNames,
+        relation: rel[0],
         token: location()
       },
       {
-        tableName: table2,
-        fieldNames: field2,
-        relation: relation === "<" ? "*" : "1",
+        schemaName: field2.schemaName,
+        tableName: field2.tableName,
+        fieldNames: field2.fieldNames,
+        relation: rel[1],
         token: location()
       }
     ];
@@ -224,7 +242,7 @@ OnDelete
 
 // Tables
 TableSyntax
-  = table sp+ name:name alias:alias_def? sp* table_settings:TableSettings? _ "{" body:TableBody "}" {
+  = table sp+ schemaName:schema_name? name:name alias:alias_def? sp* table_settings:TableSettings? _ "{" body:TableBody "}" {
       let fields = body.fields || [];
       let indexes = body.indexes || [];
       // Handle list of partial inline_refs
@@ -232,21 +250,25 @@ TableSyntax
 
       fields.forEach((field) => {
         (field.inline_refs || []).forEach((iref) => {
+          const rel = getRelations(iref.relation);
           const endpoints = [
           {
+            schemaName: iref.schemaName,
             tableName: iref.tableName,
             fieldNames: iref.fieldNames,
-            relation: iref.relation === "<" ? "*" : "1",
+            relation: rel[1],
             token: iref.token
           },
           {
+            schemaName: schemaName,
             tableName: name,
             fieldNames: [field.name],
-            relation: iref.relation === ">" ? "*" : "1",
+            relation: rel[0],
             token: iref.token
           }];
 
           let ref = {
+            schemaName,
             name: null, // no name
             endpoints: endpoints,
             token: iref.token
@@ -255,8 +277,21 @@ TableSyntax
         })
       });
 
+      if (alias) {
+        if (data.aliases.find(a => a.name === alias)) error(`Alias "${alias}" is already defined`);
+        data.aliases.push({
+          name: alias,
+          kind: 'table',
+          value: {
+            tableName: name,
+            schemaName: schemaName,
+          }
+        })
+      }
+
       let res = {
         name: name,
+        schemaName,
         alias: alias,
         fields: fields,
         token: location(),
@@ -323,10 +358,13 @@ TableElement
   }
 
 Field
-  = _ name:name sp+ type:type constrains:(sp+ constrain)* field_settings:(sp+ FieldSettings)? sp* comment? newline {
+  = _ name:name sp+ typeSchemaName:schema_name? type:type constrains:(sp+ constrain)* field_settings:(sp+ FieldSettings)? sp* comment? newline {
     const field = {
       name: name,
-      type: type,
+      type:  {
+        schemaName: typeSchemaName,
+        ...type,
+      },
       token: location(),
       inline_refs: []
     }
@@ -338,9 +376,10 @@ Field
   }
 
 EnumSyntax
-  = enum sp+ name:name _ "{" body: EnumBody "}" {
+  = enum sp+ schemaName:schema_name? name:name _ "{" body: EnumBody "}" {
     return {
       name: name,
+      schemaName,
       token: location(),
       values: body.enum_values
     };
@@ -437,7 +476,7 @@ FieldSetting
   / _ a:"unique"i _ { return a }
   / _ a:"increment" _ { return a }
   / _ v:ObjectNote _ { return { type: 'note', value: v } }
-  / _ v:RefInline { return { type: 'ref_inline', value: v } }
+  / _ v:RefInline _ { return { type: 'ref_inline', value: v } }
   / _ v:Default _ {return {type: 'default', value: v} }
 
 Indexes
@@ -523,10 +562,11 @@ ObjectNote
 IndexType
   = "type:"i _ val:(btree/hash) { return val }
 RefInline
-  = "ref:" sp* relation:relation sp+ table2:name "." field2:name {
+  = "ref:" sp* relation:relation sp+ field:inline_field_identifier{
       return {
-        tableName: table2,
-        fieldNames: [field2],
+        schemaName: field.schemaName,
+        tableName: field.tableName,
+        fieldNames: [field.fieldName],
         relation: relation,
         token: location(),
       }
@@ -579,11 +619,21 @@ set_null "set null" = "set null"i
 set_default "set default" = "set default"i
 
 // Commonly used tokens
-relation ">, - or <" = [>\-<]
+relation "<>, >, - or <" = '<>' / '>' / '<' / '-'
 name "valid name"
   = c:(character+) { return c.join("") }
   / quote c:[^\"\n]+ quote { return c.join("") }
 
+schema_name "schema name" = name:name "." { return name }
+
+field_identifier = 
+  schemaName:name "." tableName:name "." fieldNames:RefField { return { schemaName, tableName, fieldNames } } /
+  tableName:name "." fieldNames:RefField { return { schemaName: null, tableName, fieldNames } }
+
+inline_field_identifier = 
+  schemaName:name "." tableName:name "." fieldName:name { return { schemaName, tableName, fieldName } } /
+  tableName:name "." fieldName:name { return { schemaName: null, tableName, fieldName } }
+
 type_name "valid name"
   = c:(type_character+) { return c.join("") }
   / quote c:[^\"\n]+ quote { return c.join("") }
@@ -707,10 +757,10 @@ BooleanLiteral = boolean: ('true'i/'false'i/'null'i) {
     value: boolean
   };
 }
-NumberLiteral = number:(float / integer) {
+NumberLiteral = minus:"-"? number:(float / integer) {
   return {
     type: 'number',
-    value: number
+    value: minus ? -number : number
   };
 }
 float