@dbml/core 6.4.0-alpha.0 → 6.5.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/core",
-  "version": "6.4.0-alpha.0",
+  "version": "6.5.0",
   "description": "> TODO: description",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -46,7 +46,7 @@
     "lint:fix": "eslint --fix ."
   },
   "dependencies": {
-    "@dbml/parse": "^6.4.0-alpha.0",
+    "@dbml/parse": "^6.5.0",
     "antlr4": "^4.13.1",
     "lodash": "^4.17.15",
     "lodash-es": "^4.17.15",
@@ -57,7 +57,7 @@
   "devDependencies": {
     "bluebird": "^3.5.5"
   },
-  "gitHead": "ba26cc72483183193335e053d122c28d0aa13575",
+  "gitHead": "9ed15e01a00d4f58564ccdfb75f2f85bf5de5199",
   "engines": {
     "node": ">=16"
   }

package/types/export/DbmlExporter.d.ts

@@ -0,0 +1,30 @@
+import type { NormalizedModel } from '../model_structure/database';
+import type { NormalizedTable } from '../model_structure/table';
+import type { NormalizedTableGroup } from '../model_structure/tableGroup';
+
+export interface DbmlExporterOptions {
+    /** When false, TableData (Records) blocks are omitted from the output. Defaults to true. */
+    includeRecords: boolean;
+}
+
+declare class DbmlExporter {
+    static hasWhiteSpace(str: string): boolean;
+    static hasSquareBracket(str: string): boolean;
+    static isExpression(str: string): boolean;
+    static escapeNote(str: string | null): string;
+    static exportEnums(enumIds: number[], model: NormalizedModel): string;
+    static getFieldLines(tableId: number, model: NormalizedModel): string[];
+    static getIndexLines(tableId: number, model: NormalizedModel): string[];
+    static getCheckLines(tableId: number, model: NormalizedModel): string[];
+    static getTableSettings(table: NormalizedTable): string;
+    static exportTables(tableIds: number[], model: NormalizedModel): string;
+    static buildFieldName(fieldIds: number[], model: NormalizedModel): string;
+    static exportRefs(refIds: number[], model: NormalizedModel): string;
+    static getTableGroupSettings(tableGroup: NormalizedTableGroup): string;
+    static exportTableGroups(tableGroupIds: number[], model: NormalizedModel): string;
+    static exportStickyNotes(model: NormalizedModel): string;
+    static exportRecords(model: NormalizedModel): string;
+    static export(model: NormalizedModel, options: DbmlExporterOptions): string;
+}
+
+export default DbmlExporter;

package/types/export/JsonExporter.d.ts

@@ -0,0 +1,13 @@
+import type Database from '../model_structure/database';
+import type { NormalizedModel } from '../model_structure/database';
+
+export interface JsonExporterOptions {
+    /** When false, the model is exported via its `.export()` method before stringifying. Defaults to true. */
+    isNormalized: boolean;
+}
+
+declare class JsonExporter {
+    static export(model: Database | NormalizedModel, options: JsonExporterOptions): string;
+}
+
+export default JsonExporter;

package/types/export/ModelExporter.d.ts

@@ -1,15 +1,13 @@
-import Database, { NormalizedModel } from '../model_structure/database';
+import type Database from '../model_structure/database';
+import type { NormalizedModel } from '../model_structure/database';
+import type { ExportFormat, ExportOptions } from './index';
 
-export declare type ExportFormatOption = 'dbml' | 'mysql' | 'postgres' | 'json' | 'mssql' | 'oracle';
-export interface ExportFlags {
-    isNormalized?: boolean;
-    includeRecords?: boolean;
-}
 declare class ModelExporter {
     /**
-     * @deprecated Passing a boolean as the third argument is deprecated. Use `{ isNormalized: boolean }` instead.
+     * @deprecated Passing a boolean as the third argument is deprecated. Use `ExportOptions` instead.
      */
-    static export(model: Database | NormalizedModel, format: ExportFormatOption, isNormalized: boolean): string;
-    static export(model: Database | NormalizedModel, format: ExportFormatOption, flags?: ExportFlags): string;
+    static export(model: Database | NormalizedModel, format: ExportFormat, options: boolean): string;
+    static export(model: Database | NormalizedModel, format: ExportFormat, options?: ExportOptions): string;
 }
+
 export default ModelExporter;

package/types/export/index.d.ts

@@ -1,7 +1,15 @@
-import { ExportFormatOption, ExportFlags } from './ModelExporter';
-import { RecordValueType } from '../model_structure/database';
+import type { DbmlExporterOptions } from './DbmlExporter';
+import type { JsonExporterOptions } from './JsonExporter';
+
+export type ExportFormat = 'dbml' | 'mysql' | 'postgres' | 'json' | 'mssql' | 'oracle';
+
+export type ExportOptions =
+  Partial<DbmlExporterOptions> &
+  Partial<JsonExporterOptions>;
+
+declare function _export(str: string, format: ExportFormat, options: boolean): string;
+declare function _export(str: string, format: ExportFormat, options?: ExportOptions): string;
 
-declare function _export(str: string, format: ExportFormatOption, flags?: ExportFlags): string;
 declare const _default: {
     export: typeof _export;
 };

package/types/import/index.d.ts

@@ -1,11 +1,18 @@
-declare function _import(str: string, format: 'dbml' | 'mysql' | 'postgres' | 'json' | 'mssql' | 'postgresLegacy' | 'mssqlLegacy' | 'oracle'): string;
+import type { DbmlExporterOptions } from '../export/DbmlExporter';
+
+export type ImportFormat = 'dbml' | 'mysql' | 'postgres' | 'json' | 'mssql' | 'postgresLegacy' | 'mssqlLegacy' | 'schemarb' | 'snowflake' | 'oracle';
+
+export type ImportOptions = Partial<DbmlExporterOptions>;
+
+declare function _import(str: string, format: ImportFormat, options?: ImportOptions): string;
 
 /**
- * @param {any} schemaJson
+ * @param schemaJson
  * @description Type of schemaJson is `DatabaseSchema`.
  * The type definition of `DatabaseSchema` object can be found [here](https://github.com/holistics/dbml/blob/a4dcb110f1d79f5d95b0d3db4b919914439e039d/packages/dbml-connector/src/connectors/types.ts#L89)
  */
-declare function generateDbml(schemaJson: any): string;
+declare function generateDbml(schemaJson: unknown): string;
+
 declare const _default: {
     import: typeof _import;
     generateDbml: typeof generateDbml;

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import ModelExporter, { ExportFormatOption } from './export/ModelExporter';
+import ModelExporter from './export/ModelExporter';
 import Parser from './parse/Parser';
 import importer from './import';
 import exporter from './export';
@@ -10,9 +10,12 @@ export {
   importer,
   exporter,
   ModelExporter,
-  ExportFormatOption,
   Parser,
 };
+export type { ExportFormat, ExportOptions } from './export/index';
+export type { DbmlExporterOptions } from './export/DbmlExporter';
+export type { JsonExporterOptions } from './export/JsonExporter';
+export type { ImportFormat, ImportOptions } from './import/index';
 export { CompilerDiagnostic, CompilerError as CompilerDiagnostics, EditorPosition, ErrorCode, WarningLevel } from './parse/error';
 
 export * from './model_structure';

package/types/model_structure/check.d.ts

@@ -4,7 +4,7 @@ import Field from './field';
 import Table from './table';
 import TablePartial from './tablePartial';
 
-interface RawCheck {
+export interface RawCheck {
     token: Token;
     name: string;
     expression: string;

package/types/model_structure/database.d.ts

@@ -38,6 +38,7 @@ export interface RawTableRecord {
 
 export interface TableRecord extends RawTableRecord {
     id: number;
+    tableId?: number;
 }
 
 export type NormalizedRecord = TableRecord;

package/types/model_structure/dbState.d.ts

@@ -13,5 +13,5 @@ export default class DbState {
     fieldId: number;
     indexColumnId: number;
     tablePartialId: number;
-    generateId(el: string): any;
+    generateId(el: string): number;
 }

package/types/model_structure/enum.d.ts

@@ -4,7 +4,7 @@ import Element, { Token, RawNote } from './element';
 import EnumValue from './enumValue';
 import Field from './field';
 import Schema from './schema';
-interface RawEnum {
+export interface RawEnum {
     name: string;
     token: Token;
     values: EnumValue[];

package/types/model_structure/enumValue.d.ts

@@ -2,7 +2,7 @@ import { NormalizedModel } from './database';
 import DbState from './dbState';
 import Element, { Token, RawNote } from './element';
 import Enum from './enum';
-interface RawEnumValue {
+export interface RawEnumValue {
     name: string;
     token: Token;
     note: RawNote;

package/types/model_structure/indexColumn.d.ts

@@ -1,7 +1,15 @@
 import { NormalizedModel } from './database';
 import DbState from './dbState';
-import Element from './element';
+import Element, { Token } from './element';
 import Index from './indexes';
+
+export interface RawIndexColumn {
+    type: any;
+    value: any;
+    index: Index;
+    token: Token;
+}
+
 declare class IndexColumn extends Element {
     type: any;
     value: any;

package/types/model_structure/indexes.d.ts

@@ -4,7 +4,7 @@ import Element, { RawNote, Token } from './element';
 import IndexColumn from './indexColumn';
 import Table from './table';
 import TablePartial from './tablePartial';
-interface RawIndex {
+export interface RawIndex {
     columns: IndexColumn;
     type: any;
     unique: boolean;

package/types/model_structure/ref.d.ts

@@ -4,7 +4,7 @@ import Schema from './schema';
 import DbState from './dbState';
 import Database, { NormalizedModel } from './database';
 import TablePartial from './tablePartial';
-interface RawRef {
+export interface RawRef {
     name: string;
     color?: string;
     endpoints: Endpoint[];

package/types/model_structure/table.d.ts

@@ -6,9 +6,9 @@ import Schema from './schema';
 import DbState from './dbState';
 import TableGroup from './tableGroup';
 import TablePartial from './tablePartial';
-import { NormalizedModel } from './database';
+import { NormalizedModel, TableRecord } from './database';
 
-interface RawTable {
+export interface RawTable {
     name: string;
     alias: string;
     note: RawNote;
@@ -35,6 +35,7 @@ declare class Table extends Element {
     id: number;
     group: TableGroup;
     partials: TablePartial[];
+    records: TableRecord[];
 
     constructor({ name, alias, note, fields, indexes, checks, schema, token, headerColor }: RawTable);
     generateId(): void;
@@ -115,6 +116,7 @@ declare class Table extends Element {
         note: string;
         headerColor: string;
         partials: TablePartial[];
+        recordIds: number[];
     };
     normalize(model: NormalizedModel): void;
 }
@@ -128,6 +130,7 @@ export interface NormalizedTable {
     fieldIds: number[];
     indexIds: number[];
     checkIds: number[];
+    recordIds: number[];
     schemaId: number;
     groupId: number | null;
     partials: TablePartial[];

package/types/model_structure/tableGroup.d.ts

@@ -4,7 +4,7 @@ import Element, { RawNote, Token} from './element';
 import Schema from './schema';
 import Table from './table';
 
-interface RawTableGroup {
+export interface RawTableGroup {
     name: string;
     tables: Table[];
     schema: Schema;

package/types/model_structure/tablePartial.d.ts

@@ -5,7 +5,7 @@ import Check from './check';
 import DbState from './dbState';
 import { NormalizedModel } from './database';
 
-interface RawTablePartial {
+export interface RawTablePartial {
     name: string;
     note: RawNote;
     fields: Field[];