Merge pull request #821 from holistics/chore/expose-non-normalized-model-structure-types

Expose non-normalized model structure types

Author: huydo862003

packages/dbml-core/types/index.d.ts

@@ -6,40 +6,4 @@ import { renameTable } from './transform';
 export { renameTable, importer, exporter, ModelExporter, Parser };
 export { CompilerDiagnostic, CompilerError as CompilerDiagnostics, EditorPosition, ErrorCode, WarningLevel, } from './parse/error';
 
-// Export normalized types
-export type {
-    NormalizedDatabase,
-    NormalizedDatabaseIdMap,
-    NormalizedModel,
-    NormalizedSchema,
-    NormalizedSchemaIdMap,
-    NormalizedTable,
-    NormalizedTableIdMap,
-    NormalizedField,
-    NormalizedFieldIdMap,
-    NormalizedIndex,
-    NormalizedIndexIdMap,
-    NormalizedIndexColumn,
-    NormalizedIndexColumnIdMap,
-    NormalizedEnum,
-    NormalizedEnumIdMap,
-    NormalizedEnumValue,
-    NormalizedEnumValueIdMap,
-    NormalizedRef,
-    NormalizedRefIdMap,
-    NormalizedEndpoint,
-    NormalizedEndpointIdMap,
-    NormalizedTableGroup,
-    NormalizedTableGroupIdMap,
-    NormalizedNote,
-    NormalizedNoteIdMap,
-    NormalizedCheck,
-    NormalizedCheckIdMap,
-    NormalizedTablePartial,
-    NormalizedTablePartialIdMap,
-    Project,
-    RawDatabase,
-    TableRecord,
-    NormalizedRecords,
-    RawSchema,
-} from './model_structure';
+export * from './model_structure';

packages/dbml-core/types/model_structure/database.d.ts

@@ -33,8 +33,10 @@ export interface TableRecord extends RawTableRecord {
     id: number;
 }
 
-export interface NormalizedRecords {
-    [_id: number]: TableRecord;
+export type NormalizedRecord = TableRecord;
+
+export interface NormalizedRecordIdMap {
+    [_id: number]: NormalizedRecord;
 }
 
 export interface RawDatabase {
@@ -307,5 +309,6 @@ export interface NormalizedModel {
     notes: NormalizedNoteIdMap;
     checks: NormalizedCheckIdMap;
     tablePartials: NormalizedTablePartialIdMap;
+    records: NormalizedRecordIdMap;
 }
 export default Database;

packages/dbml-core/types/model_structure/endpoint.d.ts

@@ -1,8 +1,17 @@
-import Element from './element';
+import Element, { Token } from './element';
 import Field from './field';
 import Ref from './ref';
 import DbState from './dbState';
 import { NormalizedModel } from './database';
+
+export interface RawEndpoint {
+    schemaName: string | null;
+    tableName: string;
+    fieldNames: string[];
+    relation: '1' | '*';
+    token: Token;
+}
+
 declare class Endpoint extends Element {
     relation: any;
     schemaName: string;

packages/dbml-core/types/model_structure/field.d.ts

@@ -14,7 +14,10 @@ interface RawField {
     token: Token;
     not_null: boolean;
     note: RawNote;
-    dbdefault: any;
+    dbdefault?: {
+      type: 'number' | 'string' | 'boolean' | 'expression';
+      value: number | string;
+    };
     increment: boolean;
     checks?: any[];
     table: Table;

packages/dbml-core/types/model_structure/index.d.ts

@@ -14,78 +14,17 @@ export { default as StickyNote } from './stickyNote';
 export { default as Check } from './check';
 export { default as TablePartial } from './tablePartial';
 
-// Export normalized individual types
-export type {
-    NormalizedDatabase,
-    NormalizedDatabaseIdMap,
-    NormalizedModel,
-} from './database';
-
-export type {
-    NormalizedSchema,
-    NormalizedSchemaIdMap,
-} from './schema';
-
-export type {
-    NormalizedTable,
-    NormalizedTableIdMap,
-} from './table';
-
-export type {
-    NormalizedField,
-    NormalizedFieldIdMap,
-} from './field';
-
-export type {
-    NormalizedIndex,
-    NormalizedIndexIdMap,
-} from './indexes';
-
-export type {
-    NormalizedIndexColumn,
-    NormalizedIndexColumnIdMap,
-} from './indexColumn';
-
-export type {
-    NormalizedEnum,
-    NormalizedEnumIdMap,
-} from './enum';
-
-export type {
-    NormalizedEnumValue,
-    NormalizedEnumValueIdMap,
-} from './enumValue';
-
-export type {
-    NormalizedRef,
-    NormalizedRefIdMap,
-} from './ref';
-
-export type {
-    NormalizedEndpoint,
-    NormalizedEndpointIdMap,
-} from './endpoint';
-
-export type {
-    NormalizedTableGroup,
-    NormalizedTableGroupIdMap,
-} from './tableGroup';
-
-export type {
-    NormalizedNote,
-    NormalizedNoteIdMap,
-} from './stickyNote';
-
-export type {
-    NormalizedTablePartial,
-    NormalizedTablePartialIdMap,
-} from './tablePartial';
-
-export type {
-    NormalizedCheck,
-    NormalizedCheckIdMap,
-} from './check';
-
-// Export other types
-export type { Project, RawDatabase, TableRecord, NormalizedRecords } from './database';
-export type { RawSchema } from './schema';
+export * from './database';
+export * from './schema';
+export * from './table';
+export * from './field';
+export * from './indexes';
+export * from './indexColumn';
+export * from './enum';
+export * from './enumValue';
+export * from './ref';
+export * from './endpoint';
+export * from './tableGroup';
+export * from './stickyNote';
+export * from './tablePartial';
+export * from './check';

packages/dbml-core/types/model_structure/stickyNote.d.ts

@@ -2,13 +2,15 @@ import Element, { Token } from './element';
 import Database from './database';
 import DbState from './dbState';
 import { NormalizedModel } from './database';
-interface RawStickyNote {
+
+export interface RawStickyNote {
     name: string;
     content: string;
     database: Database;
     token: Token;
     headerColor: string;
 }
+
 declare class StickyNote extends Element {
     name: string;
     content: string;