@dbml/core 3.11.0 → 3.12.0-alpha-0

package/lib/parse/Parser.js

@@ -58,6 +58,11 @@ var Parser = /*#__PURE__*/function () {
           case 'mssql':
             rawDatabase = Parser.parseMSSQLToJSON(str);
             break;
+
+          // When we finish implementing the new parser, it should be mssql and the old one will be mssqlLegacy
+          case 'mssqlv2':
+            rawDatabase = Parser.parseMSSQLToJSONv2(str);
+            break;
           case 'json':
             if (_typeof(str) === 'object') {
               rawDatabase = str;
@@ -139,6 +144,11 @@ var Parser = /*#__PURE__*/function () {
     value: function parseMSSQLToJSON(str) {
       return _mssqlParser["default"].parseWithPegError(str);
     }
+  }, {
+    key: "parseMSSQLToJSONv2",
+    value: function parseMSSQLToJSONv2(str) {
+      return (0, _ASTGeneration.parse)(str, 'mssql');
+    }
   }, {
     key: "parseSnowflakeToJSON",
     value: function parseSnowflakeToJSON(str) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/core",
-  "version": "3.11.0",
+  "version": "3.12.0-alpha-0",
   "description": "> TODO: description",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -32,7 +32,7 @@
     "prepublish": "npm run build"
   },
   "dependencies": {
-    "@dbml/parse": "^3.11.0",
+    "@dbml/parse": "^3.12.0-alpha-0",
     "antlr4": "^4.13.1",
     "lodash": "^4.17.15",
     "parsimmon": "^1.13.0",
@@ -59,7 +59,7 @@
       "\\.(?!json$)[^.]*$": "@glen/jest-raw-loader"
     }
   },
-  "gitHead": "eb05b8cd85092e62152c6a994d9c0568a1d898de",
+  "gitHead": "da2bec56f10f32db65a06856105f08b522556661",
   "engines": {
     "node": ">=16"
   }

package/types/model_structure/database.d.ts

@@ -16,6 +16,25 @@ export interface Project {
     database_type: string;
     name: string;
 }
+
+interface RawRecord {
+    schemaName: string | undefined;
+    tableName: string;
+    columns: string[];
+    values: {
+        value: any;
+        type: string;
+    }[][];
+}
+
+export interface Record extends RawRecord {
+    id: number;
+}
+
+export interface NormalizedRecord {
+    [_id: number]: Record;
+}
+
 export interface RawDatabase {
     schemas: Schema[];
     tables: Table[];
@@ -24,6 +43,7 @@ export interface RawDatabase {
     refs: Ref[];
     tableGroups: TableGroup[];
     project: Project;
+    records: RawRecord[];
 }
 declare class Database extends Element {
     dbState: DbState;
@@ -34,9 +54,11 @@ declare class Database extends Element {
     noteToken: Token;
     databaseType: string;
     name: string;
+    records: Record[];
     id: number;
-    constructor({ schemas, tables, enums, refs, tableGroups, project }: RawDatabase);
+    constructor({ schemas, tables, enums, refs, tableGroups, project, records }: RawDatabase);
     generateId(): void;
+    processRecords(rawRecords: RawRecord[]): void;
     processSchemas(rawSchemas: RawSchema[]): void;
     pushSchema(schema: Schema): void;
     checkSchema(schema: Schema): void;
@@ -108,6 +130,16 @@ declare class Database extends Element {
             content: string;
             headerColor: string;
         }[];
+        records: {
+            id: number;
+            schemaName: string;
+            tableName: string;
+            columns: string[];
+            values: {
+                value: any;
+                type: string;
+            }[][];
+        }[];
     };
     shallowExport(): {
         hasDefaultSchema: boolean;
@@ -210,5 +242,6 @@ export interface NormalizedDatabase {
     indexes: NormalizedIndex;
     indexColumns: NormalizedIndexColumn;
     fields: NormalizedField;
+    records: NormalizedRecord;
 }
 export default Database;

package/types/parse/Parser.d.ts

@@ -5,7 +5,7 @@ declare type ParseFormat = 'json'
     | 'mysql' | 'mysqlLegacy'
     | 'postgres' | 'postgresLegacy'
     | 'dbml' | 'dbmlv2'
-    | 'mssql'
+    | 'mssql' | 'mssqlv2'
     | 'schemarb'
     | 'snowflake';
 
@@ -18,9 +18,10 @@ declare class Parser {
     static parsePostgresToJSON(str: string): RawDatabase;
     static parsePostgresToJSONv2(str: string): RawDatabase;
     static parseDBMLToJSON(str: string): RawDatabase;
-    static parseDBMLToJSONv2(str: string, dbmlCompiler: Compiler): RawDatabase;
+    static parseDBMLToJSONv2(str: string, dbmlCompiler?: Compiler): RawDatabase;
     static parseSchemaRbToJSON(str: string): RawDatabase;
     static parseMSSQLToJSON(str: string): RawDatabase;
+    static parseMSSQLToJSONv2(str: string): RawDatabase;
     static parseSnowflakeToJSON(str: string): RawDatabase;
     /**
      * Should use parse() instance method instead of this static method whenever possible