@dbml/core 6.2.1 → 6.3.0-alpha.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/core",
-  "version": "6.2.1",
+  "version": "6.3.0-alpha.1",
   "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.1",
+    "@dbml/parse": "^6.3.0-alpha.1",
     "antlr4": "^4.13.1",
     "lodash": "^4.17.15",
     "lodash-es": "^4.17.15",
@@ -58,7 +58,7 @@
   "devDependencies": {
     "bluebird": "^3.5.5"
   },
-  "gitHead": "403ffd5a0d15bbf0f2b22db2c507659ce3f8fe35",
+  "gitHead": "58d2942cf407869367ed7f41a7cd4f24fc1317d3",
   "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,8 +2,34 @@ 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 };
-export { CompilerDiagnostic, CompilerError as CompilerDiagnostics, EditorPosition, ErrorCode, WarningLevel, } from './parse/error';
+import {
+  renameTable,
+} from './transform';
+export {
+  renameTable,
+  importer,
+  exporter,
+  ModelExporter,
+  Parser,
+};
+export { CompilerDiagnostic, CompilerError as CompilerDiagnostics, EditorPosition, ErrorCode, WarningLevel } from './parse/error';
 
 export * from './model_structure';
+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;
     }[][];
 }
 

package/types/model_structure/endpoint.d.ts

@@ -1,8 +1,9 @@
-import Element, { Token } from './element';
+import Element from './element';
 import Field from './field';
 import Ref from './ref';
 import DbState from './dbState';
 import { NormalizedModel } from './database';
+import { Token } from './element';
 
 export interface RawEndpoint {
     schemaName: string | null;

package/types/model_structure/field.d.ts

@@ -6,7 +6,22 @@ import Enum from './enum';
 import Table from './table';
 import TablePartial from './tablePartial';
 import Check from './check';
-interface RawField {
+
+export interface InlineRef {
+    schemaName: string | null;
+    tableName: string;
+    fieldNames: string[];
+    relation: '>' | '<' | '-' | '<>';
+    token: Token;
+}
+
+export interface ColumnType {
+    schemaName: string | null;
+    type_name: string;
+    args: string | null;
+}
+
+export interface RawField {
     name: string;
     type: any;
     unique: boolean;
@@ -14,14 +29,12 @@ interface RawField {
     token: Token;
     not_null: boolean;
     note: RawNote;
-    dbdefault?: {
-      type: 'number' | 'string' | 'boolean' | 'expression';
-      value: number | string;
-    };
+    dbdefault: any;
     increment: boolean;
     checks?: any[];
     table: Table;
 }
+
 declare class Field extends Element {
     name: string;
     type: any;
@@ -75,6 +88,7 @@ declare class Field extends Element {
     };
     normalize(model: NormalizedModel): void;
 }
+
 export interface NormalizedField {
     id: number;
     name: string;
@@ -86,7 +100,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;