@dbml/core 2.4.3 → 2.5.0

package/lib/parse/postgresql/Base_rules.pegjs

@@ -101,6 +101,7 @@ data_type "VALID TYPE" = c1:"CHARACTER"i _ c2:"VARYING"i _ args:("("expression")
     args: null
   } 
 }
+
 type_name = pathName:path_name? c:(character)+ _ args:("(" expression ")")? {
 	let type_name = c.join("");
 	args = args ? args[1] : null;

package/lib/parse/postgresql/Commands/Create_table/Create_table_normal.pegjs

@@ -94,13 +94,12 @@ table_property =
 	}
 	/ column_name:column_name __ data_type:data_type (__ COLLATE __ collation:identifier)? column_constraints:(_ column_constraint)* {
 		const column = { name: column_name , type: data_type};
-
-		// process type (if type === "serial")
-		if (column.type.type_name.toLowerCase() === "serial") {
-			column.type.type_name = "int";
+		const columnTypeName = column.type.type_name.toLowerCase();
+		const serialIncrementType = new Set(['serial', 'smallserial', 'bigserial']);
+		// process type for increment
+		if (serialIncrementType.has(columnTypeName)) {
 			column.increment = true;
 		}
-
 		// map from grammar to right object
 		column_constraints = column_constraints.map(c => c[1]);
 		// process column_constraints
@@ -109,6 +108,9 @@ table_property =
 				case "not_null":
 					column.not_null = value;
 					break;
+				case "increment":
+					column.increment = true;
+					break;
 				case "dbdefault":
 					column.dbdefault = value;
 					break;
@@ -138,7 +140,7 @@ column_constraint = constraint_name:(CONSTRAINT __ constraint_name:identifier __
 	/ NULL { return { type: "not_null" , value: false } }
 	/ CHECK _ "("_ expression _")" (__ NO __ INHERIT)? { return { type: "not_supported" } }
 	/ DEFAULT __ default_expr:default_expr { return { type: "dbdefault", value: default_expr } }
-	/ GENERATED __ (ALWAYS/ BY __ DEFAULT) __ AS __ IDENTITY { return { type: "not_supported" } } // (_ "("_ sequence_options _ ")")? { return { type: "not_supported" } }
+	/ GENERATED __ (ALWAYS/ BY __ DEFAULT) __ AS __ IDENTITY { return { type: "increment" } } // (_ "("_ sequence_options _ ")")? { return { type: "not_supported" } }
 	/ UNIQUE (__ index_parameters)? { return { type: "unique" } }
 	/ PRIMARY_KEY (__ index_parameters)? { return { type: "pk" } }
 	/ REFERENCES __ reftable:table_name refcolumn:(_ "(" _ refcolumn:column_name _ ")" {return refcolumn})? (__ MATCH __ FULL/__ MATCH __ PARTIAL/__ MATCH __ SIMPLE)?

package/lib/parse/postgresql/parser.pegjs

@@ -112,14 +112,14 @@ parser = commands:command* {
 						const foundTable = findTable(schemaName, tableName);
 						if (foundTable) {
 							const foundField = findField(foundTable, columnName);
-							if (foundField) foundField.note = value.text;
+							if (foundField) foundField.note = value.text ? { value: value.text } : null;
 						}
 						break;
 					}
 					case "table":	{
 						const { schemaName, name: tableName } = value.table_name;
 						const foundTable = findTable(schemaName, tableName);
-						if (foundTable) foundTable.note = value.text;
+						if (foundTable) foundTable.note = value.text ? { value: value.text } : null;
 						break;
 					}
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/core",
-  "version": "2.4.3",
+  "version": "2.5.0",
   "description": "> TODO: description",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -56,5 +56,5 @@
       "\\.(?!json$)[^.]*$": "jest-raw-loader"
     }
   },
-  "gitHead": "9cc6f3b75433df2cfc482d305de9f53587e9f22c"
+  "gitHead": "b78340400449b8ef88f785556916a3a91c925c9a"
 }

package/types/model_structure/database.d.ts

@@ -3,7 +3,7 @@ import Ref, { NormalizedRef } from './ref';
 import Enum, { NormalizedEnum } from './enum';
 import TableGroup, { NormalizedTableGroup } from './tableGroup';
 import Table, { NormalizedTable } from './table';
-import Element from './element';
+import Element, { RawNote, Token } from './element';
 import DbState from './dbState';
 import { NormalizedEndpoint } from './endpoint';
 import { NormalizedEnumValue } from './enumValue';
@@ -11,7 +11,7 @@ import { NormalizedField } from './field';
 import { NormalizedIndexColumn } from './indexColumn';
 import { NormalizedIndex } from './indexes';
 export interface Project {
-    note: string;
+    note: RawNote;
     database_type: string;
     name: string;
 }
@@ -28,6 +28,7 @@ declare class Database extends Element {
     hasDefaultSchema: boolean;
     schemas: Schema[];
     note: string;
+    noteToken: Token;
     databaseType: string;
     name: string;
     id: number;

package/types/model_structure/element.d.ts

@@ -10,6 +10,12 @@ export interface Token {
         offset: number;
     };
 }
+
+export interface RawNote {
+    value: string;
+    token: Token;
+}
+
 declare class Element {
     token: Token;
     id: number;

package/types/model_structure/enum.d.ts

@@ -1,6 +1,6 @@
 import { NormalizedDatabase } from './database';
 import DbState from './dbState';
-import Element, { Token } from './element';
+import Element, { Token, RawNote } from './element';
 import EnumValue from './enumValue';
 import Field from './field';
 import Schema from './schema';
@@ -8,7 +8,7 @@ interface RawEnum {
     name: string;
     token: Token;
     values: EnumValue[];
-    note: string;
+    note: RawNote;
     schema: Schema;
 }
 declare class Enum extends Element {
@@ -16,6 +16,7 @@ declare class Enum extends Element {
     token: Token;
     values: EnumValue[];
     note: string;
+    noteToken: Token;
     schema: Schema;
     fields: Field[];
     dbState: DbState;

package/types/model_structure/enumValue.d.ts

@@ -1,16 +1,17 @@
 import { NormalizedDatabase } from './database';
 import DbState from './dbState';
-import Element, { Token } from './element';
+import Element, { Token, RawNote } from './element';
 import Enum from './enum';
 interface RawEnumValue {
     name: string;
     token: Token;
-    note: string;
+    note: RawNote;
     _enum: Enum;
 }
 declare class EnumValue extends Element {
     name: string;
     note: string;
+    noteToken: Token;
     _enum: Enum;
     dbState: DbState;
     constructor({ name, token, note, _enum }: RawEnumValue);

package/types/model_structure/field.d.ts

@@ -1,6 +1,6 @@
 import { NormalizedDatabase } from './database';
 import DbState from './dbState';
-import Element, { Token } from './element';
+import Element, { Token, RawNote } from './element';
 import Endpoint from './endpoint';
 import Enum from './enum';
 import Table from './table';
@@ -11,7 +11,7 @@ interface RawField {
     pk: boolean;
     token: Token;
     not_null: boolean;
-    note: string;
+    note: RawNote;
     dbdefault: any;
     increment: boolean;
     table: Table;
@@ -24,6 +24,7 @@ declare class Field extends Element {
     dbState: DbState;
     not_null: boolean;
     note: string;
+    noteToken: Token;
     dbdefault: any;
     increment: boolean;
     table: Table;
@@ -72,6 +73,9 @@ export interface NormalizedField {
         note: string;
         dbdefault: any;
         increment: boolean;
+        tableId: number;
+        endpointIds: number[];
+        enumId: number;
     };
 }
 export default Field;

package/types/model_structure/indexes.d.ts

@@ -1,6 +1,6 @@
 import { NormalizedDatabase } from './database';
 import DbState from './dbState';
-import Element, { Token } from './element';
+import Element, { RawNote, Token } from './element';
 import IndexColumn from './indexColumn';
 import Table from './table';
 interface RawIndex {
@@ -9,7 +9,7 @@ interface RawIndex {
     unique: boolean;
     pk: string;
     name: string;
-    note: string;
+    note: RawNote;
     table: Table;
     token: Token;
 }
@@ -20,6 +20,7 @@ declare class Index extends Element {
     pk: string;
     name: string;
     note: string;
+    noteToken: Token;
     table: Table;
     dbState: DbState;
     constructor({ columns, type, unique, pk, token, name, note, table }: RawIndex);

package/types/model_structure/schema.d.ts

@@ -1,5 +1,5 @@
 import Table from './table';
-import Element, { Token } from './element';
+import Element, { RawNote, Token } from './element';
 import Enum from './enum';
 import TableGroup from './tableGroup';
 import Ref from './ref';
@@ -8,7 +8,7 @@ import DbState from './dbState';
 export interface RawSchema {
     name: string;
     alias?: string;
-    note?: string;
+    note?: RawNote;
     tables?: Table[];
     refs?: Ref[];
     enums?: Enum[];
@@ -20,6 +20,7 @@ declare class Schema extends Element {
     name: string;
     alias: string;
     note: string;
+    noteToken: Token;
     tables: Table[];
     refs: Ref[];
     enums: Enum[];

package/types/model_structure/table.d.ts

@@ -1,4 +1,4 @@
-import Element, { Token } from './element';
+import Element, { RawNote, Token } from './element';
 import Field from './field';
 import Index from './indexes';
 import Schema from './schema';
@@ -8,7 +8,7 @@ import { NormalizedDatabase } from './database';
 interface RawTable {
     name: string;
     alias: string;
-    note: string;
+    note: RawNote;
     fields: Field[];
     indexes: Index[];
     schema: Schema;
@@ -19,6 +19,7 @@ declare class Table extends Element {
     name: string;
     alias: string;
     note: string;
+    noteToken: Token;
     fields: Field[];
     indexes: Index[];
     schema: Schema;