@dbml/core 6.2.0 → 6.3.0-alpha.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/core",
-  "version": "6.2.0",
+  "version": "6.3.0-alpha.0",
   "description": "> TODO: description",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -48,7 +48,7 @@
     "lint:fix": "eslint --fix ."
   },
   "dependencies": {
-    "@dbml/parse": "^6.2.0",
+    "@dbml/parse": "^6.3.0-alpha.0",
     "antlr4": "^4.13.1",
     "lodash": "^4.17.15",
     "lodash-es": "^4.17.15",
@@ -58,7 +58,7 @@
   "devDependencies": {
     "bluebird": "^3.5.5"
   },
-  "gitHead": "10e5ddf632432ea6a1636504fd33a8c53f6108ed",
+  "gitHead": "9187af4387902a08a1721bffdcc94586b49340fe",
   "engines": {
     "node": ">=16"
   }

package/types/export/index.d.ts

@@ -1,4 +1,5 @@
 import { ExportFormatOption } from './ModelExporter';
+import { RecordValueType } from '../model_structure/database';
 
 declare function _export(str: string, format: ExportFormatOption): string;
 declare const _default: {

package/types/index.d.ts

@@ -2,44 +2,36 @@ import ModelExporter from './export/ModelExporter';
 import Parser from './parse/Parser';
 import importer from './import';
 import exporter from './export';
-import { renameTable } from './transform';
-export { renameTable, importer, exporter, ModelExporter, Parser };
+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 type * from './model_structure';
+export { RecordValueType, RecordValue } from './model_structure/database';
+export {
+  isIntegerType,
+  isFloatType,
+  isNumericType,
+  isBooleanType,
+  isStringType,
+  isBinaryType,
+  isDateTimeType,
+  isSerialType,
+  tryExtractBoolean,
+  tryExtractNumeric,
+  tryExtractInteger,
+  tryExtractString,
+  tryExtractDateTime,
+  tryExtractEnum,
+  addDoubleQuoteIfNeeded,
+  formatRecordValue,
+} from '@dbml/parse';

package/types/model_structure/database.d.ts

@@ -19,13 +19,20 @@ export interface Project {
     name: string;
 }
 
-interface RawTableRecord {
+export type RecordValueType = 'string' | 'bool' | 'integer' | 'real' | 'date' | 'time' | 'datetime' | string;
+
+export interface RecordValue {
+    value: any;
+    type: RecordValueType;
+}
+
+export interface RawTableRecord {
     schemaName: string | undefined;
     tableName: string;
     columns: string[];
     values: {
         value: any;
-        type: string;
+        type: RecordValueType;
     }[][];
 }
 
@@ -33,8 +40,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 +316,6 @@ export interface NormalizedModel {
     notes: NormalizedNoteIdMap;
     checks: NormalizedCheckIdMap;
     tablePartials: NormalizedTablePartialIdMap;
+    records: NormalizedRecordIdMap;
 }
 export default Database;

package/types/model_structure/endpoint.d.ts

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

package/types/model_structure/field.d.ts

@@ -83,7 +83,10 @@ export interface NormalizedField {
     pk: boolean;
     not_null: boolean;
     note: string | null;
-    dbdefault: unknown;
+    dbdefault?: {
+      type: 'number' | 'string' | 'boolean' | 'expression';
+      value: number | string;
+    };
     increment: boolean;
     endpointIds: number[];
     tableId: number;

package/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';

package/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;