From 36bf731ee78461ca9cfd55e35ee4d174ab270326 Mon Sep 17 00:00:00 2001 From: Huy-DNA Date: Sun, 9 Nov 2025 18:40:21 +0700 Subject: [PATCH 01/14] chore(dbml-parse): add fast-check --- packages/dbml-parse/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/dbml-parse/package.json b/packages/dbml-parse/package.json index 1b6651b69..6e9f24a5f 100644 --- a/packages/dbml-parse/package.json +++ b/packages/dbml-parse/package.json @@ -37,6 +37,7 @@ "@types/node": "^20.8.8", "@typescript-eslint/eslint-plugin": "^8.30.1", "@typescript-eslint/parser": "^8.30.1", + "fast-check": "^4.3.0", "monaco-editor-core": "^0.44.0", "typescript": "^5.2.2", "vite": "^6.3.5", From c54229d91f7f149962f7278ca9f76c953e17b38f Mon Sep 17 00:00:00 2001 From: Huy-DNA Date: Sun, 9 Nov 2025 18:43:53 +0700 Subject: [PATCH 02/14] chore(dbml-parse): move example-based tests to tests/examples --- .../{ => examples}/binder/binder.test.ts | 14 +++++------ .../binder/input/duplicate_name.in.dbml | 0 .../binder/input/enum_name.in.dbml | 0 .../binder/input/erroneous.in.dbml | 0 .../input/old_undocumented_syntax.in.dbml | 0 .../{ => examples}/binder/input/ref.in.dbml | 0 .../input/ref_name_and_color_setting.in.dbml | 0 .../binder/input/ref_setting.in.dbml | 0 .../binder/input/sticky_notes.in.dbml | 0 .../binder/input/table_partial.in.dbml | 0 .../input/unknown_table_group_field.in.dbml | 0 .../binder/output/duplicate_name.out.json | 0 .../binder/output/enum_name.out.json | 0 .../binder/output/erroneous.out.json | 0 .../output/old_undocumented_syntax.out.json | 0 .../{ => examples}/binder/output/ref.out.json | 0 .../ref_name_and_color_setting.out.json | 0 .../binder/output/ref_setting.out.json | 0 .../binder/output/sticky_notes.out.json | 0 .../binder/output/table_partial.out.json | 0 .../output/unknown_table_group_field.out.json | 0 .../interpreter/input/array_type.in.dbml | 0 .../circular_ref_1_inline_1_element.in.dbml | 0 .../input/circular_ref_2_elements.in.dbml | 0 .../input/circular_ref_2_inlines.in.dbml | 0 .../input/column_caller_type.in.dbml | 0 .../interpreter/input/comment.in.dbml | 0 .../interpreter/input/composite_pk.in.dbml | 0 .../interpreter/input/constraints.in.dbml | 0 .../interpreter/input/default_tables.in.dbml | 0 .../interpreter/input/enum_tables.in.dbml | 0 .../interpreter/input/erroneous.in.dbml | 0 .../interpreter/input/general_schema.in.dbml | 0 .../input/header_color_tables.in.dbml | 0 .../input/index_table_partial.in.dbml | 0 .../interpreter/input/index_tables.in.dbml | 0 .../interpreter/input/multi_notes.in.dbml | 0 .../input/multiline_string.in.dbml | 0 .../interpreter/input/negative_number.in.dbml | 0 .../interpreter/input/note_normalize.in.dbml | 0 ...ote_normalize_with_top_empty_lines.in.dbml | 0 .../input/old_undocumented_syntax.in.dbml | 0 .../interpreter/input/primary_key.in.dbml | 0 .../interpreter/input/project.in.dbml | 0 .../input/ref_name_and_color_setting.in.dbml | 0 .../interpreter/input/ref_settings.in.dbml | 0 .../input/referential_actions.in.dbml | 0 .../interpreter/input/sticky_notes.in.dbml | 0 .../interpreter/input/table_element.in.dbml | 0 .../interpreter/input/table_group.in.dbml | 0 .../input/table_group_element.in.dbml | 0 .../input/table_group_settings.in.dbml | 0 .../interpreter/input/table_partial.in.dbml | 0 .../input/table_reappear_tablegroup.in.dbml | 0 .../interpreter/input/table_settings.in.dbml | 0 .../interpreter/input/two_inline_refs.in.dbml | 0 .../interpreter/interpreter.test.ts | 25 ++++++++----------- .../interpreter/output/array_type.out.json | 0 .../circular_ref_1_inline_1_element.out.json | 0 .../output/circular_ref_2_elements.out.json | 0 .../output/circular_ref_2_inlines.out.json | 0 .../output/column_caller_type.out.json | 0 .../interpreter/output/comment.out.json | 0 .../interpreter/output/composite_pk.out.json | 0 .../interpreter/output/constraints.out.json | 0 .../output/default_tables.out.json | 0 .../interpreter/output/enum_tables.out.json | 0 .../interpreter/output/erroneous.out.json | 0 .../output/general_schema.out.json | 0 .../output/header_color_tables.out.json | 0 .../output/index_table_partial.out.json | 0 .../interpreter/output/index_tables.out.json | 0 .../interpreter/output/multi_notes.out.json | 0 .../output/multiline_string.out.json | 0 .../output/negative_number.out.json | 0 .../output/note_normalize.out.json | 0 ...te_normalize_with_top_empty_lines.out.json | 0 .../output/old_undocumented_syntax.out.json | 0 .../interpreter/output/primary_key.out.json | 0 .../interpreter/output/project.out.json | 0 .../ref_name_and_color_setting.out.json | 0 .../interpreter/output/ref_settings.out.json | 0 .../output/referential_actions.out.json | 0 .../interpreter/output/sticky_notes.out.json | 0 .../interpreter/output/table_element.out.json | 0 .../interpreter/output/table_group.out.json | 0 .../output/table_group_element.out.json | 0 .../output/table_group_settings.out.json | 0 .../interpreter/output/table_partial.out.json | 0 .../output/table_reappear_tablegroup.out.json | 0 .../output/table_settings.out.json | 0 .../output/two_inline_refs.out.json | 0 .../tests/{ => examples}/jestHelpers.ts | 0 .../{ => examples}/lexer/input/color.in.dbml | 0 .../lexer/input/comment.in.dbml | 0 .../lexer/input/function_expression.in.dbml | 0 .../lexer/input/identifiers.in.dbml | 0 .../identifiers_starting_with_digits.in.dbml | 0 .../input/invalid_escape_sequence.in.dbml | 0 .../{ => examples}/lexer/input/number.in.dbml | 0 .../lexer/input/strings.in.dbml | 0 .../lexer/input/symbols.in.dbml | 0 .../lexer/input/unclosed_strings.in.dbml | 0 .../lexer/input/unicode_identifiers.in.dbml | 0 .../lexer/input/valid_escape_sequence.in.dbml | 0 .../tests/{ => examples}/lexer/lexer.test.ts | 4 +-- .../lexer/output/color.out.json | 0 .../lexer/output/comment.out.json | 0 .../lexer/output/function_expression.out.json | 0 .../lexer/output/identifiers.out.json | 0 .../identifiers_starting_with_digits.out.json | 0 .../output/invalid_escape_sequence.out.json | 0 .../lexer/output/number.out.json | 0 .../lexer/output/strings.out.json | 0 .../lexer/output/symbols.out.json | 0 .../lexer/output/unclosed_strings.out.json | 0 .../lexer/output/unicode_identifiers.out.json | 0 .../output/valid_escape_sequence.out.json | 0 .../input/empty_setting_name.in.dbml | 0 .../nan_errors}/interpreter_NaN.test.ts | 25 ++++++++----------- .../output/empty_setting_name.out.json | 0 .../parser/input/call_expression.in.dbml | 0 .../parser/input/element-declaration.in.dbml | 0 .../input/element_in_simple_body.in.dbml | 0 .../parser/input/erroneous_setting.in.dbml | 0 .../parser/input/expression.in.dbml | 0 .../parser/input/function_application.in.dbml | 0 .../parser/input/last_invalid_number.in.dbml | 0 .../parser/input/list_expression.in.dbml | 0 .../input/literal_element_expression.in.dbml | 0 .../parser/input/nested_element.in.dbml | 0 .../input/old_undocumented_syntax.in.dbml | 0 .../parser/input/ref_setting.in.dbml | 0 .../parser/input/trailing_comments.in.dbml | 0 .../parser/input/tuple_expression.in.dbml | 0 .../parser/output/call_expression.out.json | 0 .../output/element-declaration.out.json | 0 .../output/element_in_simple_body.out.json | 0 .../parser/output/erroneous_setting.out.json | 0 .../parser/output/expression.out.json | 0 .../output/function_application.out.json | 0 .../output/last_invalid_number.out.json | 0 .../parser/output/list_expression.out.json | 0 .../literal_element_expression.out.json | 0 .../parser/output/nested_element.out.json | 0 .../output/old_undocumented_syntax.out.json | 0 .../parser/output/ref_setting.out.json | 0 .../parser/output/trailing_comments.out.json | 0 .../parser/output/tuple_expression.out.json | 0 .../{ => examples}/parser/parser.test.ts | 8 +++--- .../input/alias_of_duplicated_names.in.dbml | 0 .../validator/input/checks.in.dbml | 0 .../input/column_caller_type.in.dbml | 0 .../validator/input/complex_indexes.in.dbml | 0 .../validator/input/complex_names.in.dbml | 0 .../input/duplicate_alias_name.in.dbml | 0 .../validator/input/duplicate_columns.in.dbml | 0 .../input/duplicate_enum_field.in.dbml | 0 .../validator/input/duplicate_names.in.dbml | 0 ...duplicate_table_partial_injections.in.dbml | 0 .../validator/input/enum.in.dbml | 0 .../validator/input/erroneous.in.dbml | 0 .../validator/input/invalid_args.in.dbml | 0 .../multiple_notes_in_table_group.in.dbml | 0 .../validator/input/negative_number.in.dbml | 0 .../input/nested_duplicate_names.in.dbml | 0 .../input/old_undocumented_syntax.in.dbml | 0 .../validator/input/public_schema.in.dbml | 0 .../validator/input/redefined_note.in.dbml | 0 .../validator/input/ref.in.dbml | 0 .../validator/input/ref_error_setting.in.dbml | 0 .../validator/input/ref_in_table.in.dbml | 0 .../ref_name_and_color_setting.in copy.dbml | 0 .../input/schema_nested_tablegroup.in.dbml | 0 .../validator/input/sticky_notes.in.dbml | 0 .../input/table_group_settings.in.dbml | 0 .../input/table_partial_check.in.dbml | 0 .../table_partial_settings_general.in.dbml | 0 .../input/table_settings_check.in.dbml | 0 .../input/table_settings_general.in.dbml | 0 .../input/table_with_no_columns.in.dbml | 0 .../wrong_sub_element_declarations.in.dbml | 0 ...ong_table_partial_injection_syntax.in.dbml | 0 .../output/alias_of_duplicated_names.out.json | 0 .../validator/output/checks.out.json | 0 .../output/column_caller_type.out.json | 0 .../validator/output/complex_indexes.out.json | 0 .../validator/output/complex_names.out.json | 0 .../output/duplicate_alias_name.out.json | 0 .../output/duplicate_columns.out.json | 0 .../output/duplicate_enum_field.out.json | 0 .../validator/output/duplicate_names.out.json | 0 ...uplicate_table_partial_injections.out.json | 0 .../validator/output/enum.out.json | 0 .../validator/output/erroneous.out.json | 0 .../validator/output/invalid_args.out.json | 0 .../multiple_notes_in_table_group.out.json | 0 .../validator/output/negative_number.out.json | 0 .../output/nested_duplicate_names.out.json | 0 .../output/old_undocumented_syntax.out.json | 0 .../validator/output/public_schema.out.json | 0 .../validator/output/redefined_note.out.json | 0 .../validator/output/ref.out.json | 0 .../output/ref_error_setting.out.json | 0 .../validator/output/ref_in_table.out.json | 0 .../output/schema_nested_tablegroup.out.json | 0 .../validator/output/sticky_notes.out.json | 0 .../output/table_group_settings.out.json | 0 .../output/table_partial_check.out.json | 0 .../table_partial_settings_general.out.json | 0 .../output/table_settings_check.out.json | 0 .../output/table_settings_general.out.json | 0 .../output/table_with_no_columns.out.json | 0 .../wrong_sub_element_declarations.out.json | 0 ...ng_table_partial_injection_syntax.out.json | 0 .../validator/validator.test.ts | 19 +++++++------- 216 files changed, 44 insertions(+), 51 deletions(-) rename packages/dbml-parse/tests/{ => examples}/binder/binder.test.ts (68%) rename packages/dbml-parse/tests/{ => examples}/binder/input/duplicate_name.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/binder/input/enum_name.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/binder/input/erroneous.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/binder/input/old_undocumented_syntax.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/binder/input/ref.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/binder/input/ref_name_and_color_setting.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/binder/input/ref_setting.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/binder/input/sticky_notes.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/binder/input/table_partial.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/binder/input/unknown_table_group_field.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/binder/output/duplicate_name.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/binder/output/enum_name.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/binder/output/erroneous.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/binder/output/old_undocumented_syntax.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/binder/output/ref.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/binder/output/ref_name_and_color_setting.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/binder/output/ref_setting.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/binder/output/sticky_notes.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/binder/output/table_partial.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/binder/output/unknown_table_group_field.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/array_type.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/circular_ref_1_inline_1_element.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/circular_ref_2_elements.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/circular_ref_2_inlines.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/column_caller_type.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/comment.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/composite_pk.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/constraints.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/default_tables.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/enum_tables.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/erroneous.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/general_schema.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/header_color_tables.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/index_table_partial.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/index_tables.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/multi_notes.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/multiline_string.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/negative_number.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/note_normalize.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/note_normalize_with_top_empty_lines.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/old_undocumented_syntax.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/primary_key.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/project.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/ref_name_and_color_setting.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/ref_settings.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/referential_actions.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/sticky_notes.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/table_element.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/table_group.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/table_group_element.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/table_group_settings.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/table_partial.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/table_reappear_tablegroup.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/table_settings.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/input/two_inline_refs.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/interpreter.test.ts (61%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/array_type.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/circular_ref_1_inline_1_element.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/circular_ref_2_elements.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/circular_ref_2_inlines.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/column_caller_type.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/comment.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/composite_pk.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/constraints.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/default_tables.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/enum_tables.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/erroneous.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/general_schema.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/header_color_tables.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/index_table_partial.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/index_tables.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/multi_notes.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/multiline_string.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/negative_number.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/note_normalize.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/note_normalize_with_top_empty_lines.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/old_undocumented_syntax.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/primary_key.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/project.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/ref_name_and_color_setting.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/ref_settings.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/referential_actions.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/sticky_notes.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/table_element.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/table_group.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/table_group_element.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/table_group_settings.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/table_partial.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/table_reappear_tablegroup.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/table_settings.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/interpreter/output/two_inline_refs.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/jestHelpers.ts (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/input/color.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/input/comment.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/input/function_expression.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/input/identifiers.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/input/identifiers_starting_with_digits.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/input/invalid_escape_sequence.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/input/number.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/input/strings.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/input/symbols.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/input/unclosed_strings.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/input/unicode_identifiers.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/input/valid_escape_sequence.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/lexer.test.ts (87%) rename packages/dbml-parse/tests/{ => examples}/lexer/output/color.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/output/comment.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/output/function_expression.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/output/identifiers.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/output/identifiers_starting_with_digits.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/output/invalid_escape_sequence.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/output/number.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/output/strings.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/output/symbols.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/output/unclosed_strings.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/output/unicode_identifiers.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/lexer/output/valid_escape_sequence.out.json (100%) rename packages/dbml-parse/tests/{NaN_errors => examples/nan_errors}/input/empty_setting_name.in.dbml (100%) rename packages/dbml-parse/tests/{NaN_errors => examples/nan_errors}/interpreter_NaN.test.ts (62%) rename packages/dbml-parse/tests/{NaN_errors => examples/nan_errors}/output/empty_setting_name.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/parser/input/call_expression.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/parser/input/element-declaration.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/parser/input/element_in_simple_body.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/parser/input/erroneous_setting.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/parser/input/expression.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/parser/input/function_application.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/parser/input/last_invalid_number.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/parser/input/list_expression.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/parser/input/literal_element_expression.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/parser/input/nested_element.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/parser/input/old_undocumented_syntax.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/parser/input/ref_setting.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/parser/input/trailing_comments.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/parser/input/tuple_expression.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/parser/output/call_expression.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/parser/output/element-declaration.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/parser/output/element_in_simple_body.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/parser/output/erroneous_setting.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/parser/output/expression.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/parser/output/function_application.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/parser/output/last_invalid_number.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/parser/output/list_expression.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/parser/output/literal_element_expression.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/parser/output/nested_element.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/parser/output/old_undocumented_syntax.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/parser/output/ref_setting.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/parser/output/trailing_comments.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/parser/output/tuple_expression.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/parser/parser.test.ts (79%) rename packages/dbml-parse/tests/{ => examples}/validator/input/alias_of_duplicated_names.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/checks.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/column_caller_type.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/complex_indexes.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/complex_names.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/duplicate_alias_name.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/duplicate_columns.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/duplicate_enum_field.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/duplicate_names.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/duplicate_table_partial_injections.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/enum.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/erroneous.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/invalid_args.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/multiple_notes_in_table_group.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/negative_number.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/nested_duplicate_names.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/old_undocumented_syntax.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/public_schema.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/redefined_note.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/ref.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/ref_error_setting.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/ref_in_table.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/ref_name_and_color_setting.in copy.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/schema_nested_tablegroup.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/sticky_notes.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/table_group_settings.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/table_partial_check.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/table_partial_settings_general.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/table_settings_check.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/table_settings_general.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/table_with_no_columns.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/wrong_sub_element_declarations.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/input/wrong_table_partial_injection_syntax.in.dbml (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/alias_of_duplicated_names.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/checks.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/column_caller_type.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/complex_indexes.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/complex_names.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/duplicate_alias_name.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/duplicate_columns.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/duplicate_enum_field.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/duplicate_names.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/duplicate_table_partial_injections.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/enum.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/erroneous.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/invalid_args.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/multiple_notes_in_table_group.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/negative_number.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/nested_duplicate_names.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/old_undocumented_syntax.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/public_schema.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/redefined_note.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/ref.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/ref_error_setting.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/ref_in_table.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/schema_nested_tablegroup.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/sticky_notes.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/table_group_settings.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/table_partial_check.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/table_partial_settings_general.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/table_settings_check.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/table_settings_general.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/table_with_no_columns.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/wrong_sub_element_declarations.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/output/wrong_table_partial_injection_syntax.out.json (100%) rename packages/dbml-parse/tests/{ => examples}/validator/validator.test.ts (56%) diff --git a/packages/dbml-parse/tests/binder/binder.test.ts b/packages/dbml-parse/tests/examples/binder/binder.test.ts similarity index 68% rename from packages/dbml-parse/tests/binder/binder.test.ts rename to packages/dbml-parse/tests/examples/binder/binder.test.ts index 6e5088c96..dc2658e4e 100644 --- a/packages/dbml-parse/tests/binder/binder.test.ts +++ b/packages/dbml-parse/tests/examples/binder/binder.test.ts @@ -1,13 +1,13 @@ -import fs, { readFileSync } from 'fs'; +import { readFileSync } from 'fs'; import path from 'path'; import { describe, expect, it } from 'vitest'; import { scanTestNames } from '../jestHelpers'; -import { serialize } from '../../src/lib/serialization/serialize'; -import Lexer from '../../src/lib/lexer/lexer'; -import Parser from '../../src/lib/parser/parser'; -import { NodeSymbolIdGenerator } from '../../src/lib/analyzer/symbol/symbols'; -import { SyntaxNodeIdGenerator } from '../../src/lib/parser/nodes'; -import Analyzer from '../../src/lib/analyzer/analyzer'; +import { serialize } from '../../../src/lib/serialization/serialize'; +import Lexer from '../../../src/lib/lexer/lexer'; +import Parser from '../../../src/lib/parser/parser'; +import { NodeSymbolIdGenerator } from '../../../src/lib/analyzer/symbol/symbols'; +import { SyntaxNodeIdGenerator } from '../../../src/lib/parser/nodes'; +import Analyzer from '../../../src/lib/analyzer/analyzer'; describe('#binder', () => { const testNames = scanTestNames(path.resolve(__dirname, './input/')); diff --git a/packages/dbml-parse/tests/binder/input/duplicate_name.in.dbml b/packages/dbml-parse/tests/examples/binder/input/duplicate_name.in.dbml similarity index 100% rename from packages/dbml-parse/tests/binder/input/duplicate_name.in.dbml rename to packages/dbml-parse/tests/examples/binder/input/duplicate_name.in.dbml diff --git a/packages/dbml-parse/tests/binder/input/enum_name.in.dbml b/packages/dbml-parse/tests/examples/binder/input/enum_name.in.dbml similarity index 100% rename from packages/dbml-parse/tests/binder/input/enum_name.in.dbml rename to packages/dbml-parse/tests/examples/binder/input/enum_name.in.dbml diff --git a/packages/dbml-parse/tests/binder/input/erroneous.in.dbml b/packages/dbml-parse/tests/examples/binder/input/erroneous.in.dbml similarity index 100% rename from packages/dbml-parse/tests/binder/input/erroneous.in.dbml rename to packages/dbml-parse/tests/examples/binder/input/erroneous.in.dbml diff --git a/packages/dbml-parse/tests/binder/input/old_undocumented_syntax.in.dbml b/packages/dbml-parse/tests/examples/binder/input/old_undocumented_syntax.in.dbml similarity index 100% rename from packages/dbml-parse/tests/binder/input/old_undocumented_syntax.in.dbml rename to packages/dbml-parse/tests/examples/binder/input/old_undocumented_syntax.in.dbml diff --git a/packages/dbml-parse/tests/binder/input/ref.in.dbml b/packages/dbml-parse/tests/examples/binder/input/ref.in.dbml similarity index 100% rename from packages/dbml-parse/tests/binder/input/ref.in.dbml rename to packages/dbml-parse/tests/examples/binder/input/ref.in.dbml diff --git a/packages/dbml-parse/tests/binder/input/ref_name_and_color_setting.in.dbml b/packages/dbml-parse/tests/examples/binder/input/ref_name_and_color_setting.in.dbml similarity index 100% rename from packages/dbml-parse/tests/binder/input/ref_name_and_color_setting.in.dbml rename to packages/dbml-parse/tests/examples/binder/input/ref_name_and_color_setting.in.dbml diff --git a/packages/dbml-parse/tests/binder/input/ref_setting.in.dbml b/packages/dbml-parse/tests/examples/binder/input/ref_setting.in.dbml similarity index 100% rename from packages/dbml-parse/tests/binder/input/ref_setting.in.dbml rename to packages/dbml-parse/tests/examples/binder/input/ref_setting.in.dbml diff --git a/packages/dbml-parse/tests/binder/input/sticky_notes.in.dbml b/packages/dbml-parse/tests/examples/binder/input/sticky_notes.in.dbml similarity index 100% rename from packages/dbml-parse/tests/binder/input/sticky_notes.in.dbml rename to packages/dbml-parse/tests/examples/binder/input/sticky_notes.in.dbml diff --git a/packages/dbml-parse/tests/binder/input/table_partial.in.dbml b/packages/dbml-parse/tests/examples/binder/input/table_partial.in.dbml similarity index 100% rename from packages/dbml-parse/tests/binder/input/table_partial.in.dbml rename to packages/dbml-parse/tests/examples/binder/input/table_partial.in.dbml diff --git a/packages/dbml-parse/tests/binder/input/unknown_table_group_field.in.dbml b/packages/dbml-parse/tests/examples/binder/input/unknown_table_group_field.in.dbml similarity index 100% rename from packages/dbml-parse/tests/binder/input/unknown_table_group_field.in.dbml rename to packages/dbml-parse/tests/examples/binder/input/unknown_table_group_field.in.dbml diff --git a/packages/dbml-parse/tests/binder/output/duplicate_name.out.json b/packages/dbml-parse/tests/examples/binder/output/duplicate_name.out.json similarity index 100% rename from packages/dbml-parse/tests/binder/output/duplicate_name.out.json rename to packages/dbml-parse/tests/examples/binder/output/duplicate_name.out.json diff --git a/packages/dbml-parse/tests/binder/output/enum_name.out.json b/packages/dbml-parse/tests/examples/binder/output/enum_name.out.json similarity index 100% rename from packages/dbml-parse/tests/binder/output/enum_name.out.json rename to packages/dbml-parse/tests/examples/binder/output/enum_name.out.json diff --git a/packages/dbml-parse/tests/binder/output/erroneous.out.json b/packages/dbml-parse/tests/examples/binder/output/erroneous.out.json similarity index 100% rename from packages/dbml-parse/tests/binder/output/erroneous.out.json rename to packages/dbml-parse/tests/examples/binder/output/erroneous.out.json diff --git a/packages/dbml-parse/tests/binder/output/old_undocumented_syntax.out.json b/packages/dbml-parse/tests/examples/binder/output/old_undocumented_syntax.out.json similarity index 100% rename from packages/dbml-parse/tests/binder/output/old_undocumented_syntax.out.json rename to packages/dbml-parse/tests/examples/binder/output/old_undocumented_syntax.out.json diff --git a/packages/dbml-parse/tests/binder/output/ref.out.json b/packages/dbml-parse/tests/examples/binder/output/ref.out.json similarity index 100% rename from packages/dbml-parse/tests/binder/output/ref.out.json rename to packages/dbml-parse/tests/examples/binder/output/ref.out.json diff --git a/packages/dbml-parse/tests/binder/output/ref_name_and_color_setting.out.json b/packages/dbml-parse/tests/examples/binder/output/ref_name_and_color_setting.out.json similarity index 100% rename from packages/dbml-parse/tests/binder/output/ref_name_and_color_setting.out.json rename to packages/dbml-parse/tests/examples/binder/output/ref_name_and_color_setting.out.json diff --git a/packages/dbml-parse/tests/binder/output/ref_setting.out.json b/packages/dbml-parse/tests/examples/binder/output/ref_setting.out.json similarity index 100% rename from packages/dbml-parse/tests/binder/output/ref_setting.out.json rename to packages/dbml-parse/tests/examples/binder/output/ref_setting.out.json diff --git a/packages/dbml-parse/tests/binder/output/sticky_notes.out.json b/packages/dbml-parse/tests/examples/binder/output/sticky_notes.out.json similarity index 100% rename from packages/dbml-parse/tests/binder/output/sticky_notes.out.json rename to packages/dbml-parse/tests/examples/binder/output/sticky_notes.out.json diff --git a/packages/dbml-parse/tests/binder/output/table_partial.out.json b/packages/dbml-parse/tests/examples/binder/output/table_partial.out.json similarity index 100% rename from packages/dbml-parse/tests/binder/output/table_partial.out.json rename to packages/dbml-parse/tests/examples/binder/output/table_partial.out.json diff --git a/packages/dbml-parse/tests/binder/output/unknown_table_group_field.out.json b/packages/dbml-parse/tests/examples/binder/output/unknown_table_group_field.out.json similarity index 100% rename from packages/dbml-parse/tests/binder/output/unknown_table_group_field.out.json rename to packages/dbml-parse/tests/examples/binder/output/unknown_table_group_field.out.json diff --git a/packages/dbml-parse/tests/interpreter/input/array_type.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/array_type.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/array_type.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/array_type.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/circular_ref_1_inline_1_element.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/circular_ref_1_inline_1_element.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/circular_ref_1_inline_1_element.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/circular_ref_1_inline_1_element.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/circular_ref_2_elements.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/circular_ref_2_elements.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/circular_ref_2_elements.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/circular_ref_2_elements.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/circular_ref_2_inlines.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/circular_ref_2_inlines.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/circular_ref_2_inlines.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/circular_ref_2_inlines.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/column_caller_type.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/column_caller_type.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/column_caller_type.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/column_caller_type.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/comment.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/comment.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/comment.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/comment.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/composite_pk.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/composite_pk.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/composite_pk.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/composite_pk.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/constraints.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/constraints.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/constraints.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/constraints.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/default_tables.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/default_tables.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/default_tables.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/default_tables.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/enum_tables.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/enum_tables.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/enum_tables.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/enum_tables.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/erroneous.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/erroneous.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/erroneous.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/erroneous.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/general_schema.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/general_schema.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/general_schema.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/general_schema.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/header_color_tables.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/header_color_tables.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/header_color_tables.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/header_color_tables.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/index_table_partial.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/index_table_partial.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/index_table_partial.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/index_table_partial.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/index_tables.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/index_tables.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/index_tables.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/index_tables.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/multi_notes.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/multi_notes.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/multi_notes.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/multi_notes.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/multiline_string.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/multiline_string.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/multiline_string.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/multiline_string.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/negative_number.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/negative_number.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/negative_number.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/negative_number.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/note_normalize.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/note_normalize.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/note_normalize.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/note_normalize.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/note_normalize_with_top_empty_lines.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/note_normalize_with_top_empty_lines.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/note_normalize_with_top_empty_lines.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/note_normalize_with_top_empty_lines.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/old_undocumented_syntax.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/old_undocumented_syntax.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/old_undocumented_syntax.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/old_undocumented_syntax.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/primary_key.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/primary_key.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/primary_key.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/primary_key.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/project.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/project.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/project.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/project.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/ref_name_and_color_setting.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/ref_name_and_color_setting.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/ref_name_and_color_setting.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/ref_name_and_color_setting.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/ref_settings.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/ref_settings.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/ref_settings.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/ref_settings.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/referential_actions.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/referential_actions.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/referential_actions.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/referential_actions.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/sticky_notes.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/sticky_notes.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/sticky_notes.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/sticky_notes.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/table_element.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/table_element.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/table_element.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/table_element.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/table_group.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/table_group.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/table_group.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/table_group.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/table_group_element.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/table_group_element.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/table_group_element.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/table_group_element.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/table_group_settings.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/table_group_settings.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/table_group_settings.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/table_group_settings.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/table_partial.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/table_partial.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/table_partial.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/table_partial.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/table_reappear_tablegroup.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/table_reappear_tablegroup.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/table_reappear_tablegroup.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/table_reappear_tablegroup.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/table_settings.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/table_settings.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/table_settings.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/table_settings.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/input/two_inline_refs.in.dbml b/packages/dbml-parse/tests/examples/interpreter/input/two_inline_refs.in.dbml similarity index 100% rename from packages/dbml-parse/tests/interpreter/input/two_inline_refs.in.dbml rename to packages/dbml-parse/tests/examples/interpreter/input/two_inline_refs.in.dbml diff --git a/packages/dbml-parse/tests/interpreter/interpreter.test.ts b/packages/dbml-parse/tests/examples/interpreter/interpreter.test.ts similarity index 61% rename from packages/dbml-parse/tests/interpreter/interpreter.test.ts rename to packages/dbml-parse/tests/examples/interpreter/interpreter.test.ts index 918bd6ef4..17a01c0d8 100644 --- a/packages/dbml-parse/tests/interpreter/interpreter.test.ts +++ b/packages/dbml-parse/tests/examples/interpreter/interpreter.test.ts @@ -1,13 +1,13 @@ -import fs, { readFileSync } from 'fs'; +import { readFileSync } from 'fs'; import path from 'path'; import { describe, expect, it } from 'vitest'; import { scanTestNames } from '../jestHelpers'; -import { NodeSymbolIdGenerator } from '../../src/lib/analyzer/symbol/symbols'; -import { SyntaxNodeIdGenerator } from '../../src/lib/parser/nodes'; -import Lexer from '../../src/lib/lexer/lexer'; -import Parser from '../../src/lib/parser/parser'; -import Analyzer from '../../src/lib/analyzer/analyzer'; -import Interpreter from '../../src/lib/interpreter/interpreter'; +import { NodeSymbolIdGenerator } from '../../../src/lib/analyzer/symbol/symbols'; +import { SyntaxNodeIdGenerator } from '../../../src/lib/parser/nodes'; +import Lexer from '../../../src/lib/lexer/lexer'; +import Parser from '../../../src/lib/parser/parser'; +import Analyzer from '../../../src/lib/analyzer/analyzer'; +import Interpreter from '../../../src/lib/interpreter/interpreter'; describe('#interpreter', () => { const testNames = scanTestNames(path.resolve(__dirname, './input/')); @@ -16,7 +16,7 @@ describe('#interpreter', () => { const program = readFileSync(path.resolve(__dirname, `./input/${testName}.in.dbml`), 'utf-8'); const symbolIdGenerator = new NodeSymbolIdGenerator(); const nodeIdGenerator = new SyntaxNodeIdGenerator(); - let output: any = undefined; + let output: any; const report = new Lexer(program) .lex() .chain((tokens) => { @@ -29,8 +29,7 @@ describe('#interpreter', () => { if (report.getErrors().length !== 0) { output = JSON.stringify( report.getErrors(), - (key, value) => - ['symbol', 'references', 'referee', 'parent'].includes(key) ? undefined : value, + (key, value) => (['symbol', 'references', 'referee', 'parent'].includes(key) ? undefined : value), 2, ); } else { @@ -38,8 +37,7 @@ describe('#interpreter', () => { if (res.getErrors().length > 0) { output = JSON.stringify( res.getErrors(), - (key, value) => - ['symbol', 'references', 'referee', 'parent'].includes(key) ? undefined : value, + (key, value) => (['symbol', 'references', 'referee', 'parent'].includes(key) ? undefined : value), 2, ); } else { @@ -51,7 +49,6 @@ describe('#interpreter', () => { } } - it(testName, () => - expect(output).toMatchFileSnapshot(path.resolve(__dirname, `./output/${testName}.out.json`))); + it(testName, () => expect(output).toMatchFileSnapshot(path.resolve(__dirname, `./output/${testName}.out.json`))); }); }); diff --git a/packages/dbml-parse/tests/interpreter/output/array_type.out.json b/packages/dbml-parse/tests/examples/interpreter/output/array_type.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/array_type.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/array_type.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/circular_ref_1_inline_1_element.out.json b/packages/dbml-parse/tests/examples/interpreter/output/circular_ref_1_inline_1_element.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/circular_ref_1_inline_1_element.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/circular_ref_1_inline_1_element.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/circular_ref_2_elements.out.json b/packages/dbml-parse/tests/examples/interpreter/output/circular_ref_2_elements.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/circular_ref_2_elements.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/circular_ref_2_elements.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/circular_ref_2_inlines.out.json b/packages/dbml-parse/tests/examples/interpreter/output/circular_ref_2_inlines.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/circular_ref_2_inlines.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/circular_ref_2_inlines.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/column_caller_type.out.json b/packages/dbml-parse/tests/examples/interpreter/output/column_caller_type.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/column_caller_type.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/column_caller_type.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/comment.out.json b/packages/dbml-parse/tests/examples/interpreter/output/comment.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/comment.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/comment.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/composite_pk.out.json b/packages/dbml-parse/tests/examples/interpreter/output/composite_pk.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/composite_pk.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/composite_pk.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/constraints.out.json b/packages/dbml-parse/tests/examples/interpreter/output/constraints.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/constraints.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/constraints.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/default_tables.out.json b/packages/dbml-parse/tests/examples/interpreter/output/default_tables.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/default_tables.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/default_tables.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/enum_tables.out.json b/packages/dbml-parse/tests/examples/interpreter/output/enum_tables.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/enum_tables.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/enum_tables.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/erroneous.out.json b/packages/dbml-parse/tests/examples/interpreter/output/erroneous.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/erroneous.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/erroneous.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/general_schema.out.json b/packages/dbml-parse/tests/examples/interpreter/output/general_schema.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/general_schema.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/general_schema.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/header_color_tables.out.json b/packages/dbml-parse/tests/examples/interpreter/output/header_color_tables.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/header_color_tables.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/header_color_tables.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/index_table_partial.out.json b/packages/dbml-parse/tests/examples/interpreter/output/index_table_partial.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/index_table_partial.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/index_table_partial.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/index_tables.out.json b/packages/dbml-parse/tests/examples/interpreter/output/index_tables.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/index_tables.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/index_tables.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/multi_notes.out.json b/packages/dbml-parse/tests/examples/interpreter/output/multi_notes.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/multi_notes.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/multi_notes.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/multiline_string.out.json b/packages/dbml-parse/tests/examples/interpreter/output/multiline_string.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/multiline_string.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/multiline_string.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/negative_number.out.json b/packages/dbml-parse/tests/examples/interpreter/output/negative_number.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/negative_number.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/negative_number.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/note_normalize.out.json b/packages/dbml-parse/tests/examples/interpreter/output/note_normalize.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/note_normalize.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/note_normalize.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/note_normalize_with_top_empty_lines.out.json b/packages/dbml-parse/tests/examples/interpreter/output/note_normalize_with_top_empty_lines.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/note_normalize_with_top_empty_lines.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/note_normalize_with_top_empty_lines.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/old_undocumented_syntax.out.json b/packages/dbml-parse/tests/examples/interpreter/output/old_undocumented_syntax.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/old_undocumented_syntax.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/old_undocumented_syntax.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/primary_key.out.json b/packages/dbml-parse/tests/examples/interpreter/output/primary_key.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/primary_key.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/primary_key.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/project.out.json b/packages/dbml-parse/tests/examples/interpreter/output/project.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/project.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/project.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/ref_name_and_color_setting.out.json b/packages/dbml-parse/tests/examples/interpreter/output/ref_name_and_color_setting.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/ref_name_and_color_setting.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/ref_name_and_color_setting.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/ref_settings.out.json b/packages/dbml-parse/tests/examples/interpreter/output/ref_settings.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/ref_settings.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/ref_settings.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/referential_actions.out.json b/packages/dbml-parse/tests/examples/interpreter/output/referential_actions.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/referential_actions.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/referential_actions.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/sticky_notes.out.json b/packages/dbml-parse/tests/examples/interpreter/output/sticky_notes.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/sticky_notes.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/sticky_notes.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/table_element.out.json b/packages/dbml-parse/tests/examples/interpreter/output/table_element.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/table_element.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/table_element.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/table_group.out.json b/packages/dbml-parse/tests/examples/interpreter/output/table_group.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/table_group.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/table_group.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/table_group_element.out.json b/packages/dbml-parse/tests/examples/interpreter/output/table_group_element.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/table_group_element.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/table_group_element.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/table_group_settings.out.json b/packages/dbml-parse/tests/examples/interpreter/output/table_group_settings.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/table_group_settings.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/table_group_settings.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/table_partial.out.json b/packages/dbml-parse/tests/examples/interpreter/output/table_partial.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/table_partial.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/table_partial.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/table_reappear_tablegroup.out.json b/packages/dbml-parse/tests/examples/interpreter/output/table_reappear_tablegroup.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/table_reappear_tablegroup.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/table_reappear_tablegroup.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/table_settings.out.json b/packages/dbml-parse/tests/examples/interpreter/output/table_settings.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/table_settings.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/table_settings.out.json diff --git a/packages/dbml-parse/tests/interpreter/output/two_inline_refs.out.json b/packages/dbml-parse/tests/examples/interpreter/output/two_inline_refs.out.json similarity index 100% rename from packages/dbml-parse/tests/interpreter/output/two_inline_refs.out.json rename to packages/dbml-parse/tests/examples/interpreter/output/two_inline_refs.out.json diff --git a/packages/dbml-parse/tests/jestHelpers.ts b/packages/dbml-parse/tests/examples/jestHelpers.ts similarity index 100% rename from packages/dbml-parse/tests/jestHelpers.ts rename to packages/dbml-parse/tests/examples/jestHelpers.ts diff --git a/packages/dbml-parse/tests/lexer/input/color.in.dbml b/packages/dbml-parse/tests/examples/lexer/input/color.in.dbml similarity index 100% rename from packages/dbml-parse/tests/lexer/input/color.in.dbml rename to packages/dbml-parse/tests/examples/lexer/input/color.in.dbml diff --git a/packages/dbml-parse/tests/lexer/input/comment.in.dbml b/packages/dbml-parse/tests/examples/lexer/input/comment.in.dbml similarity index 100% rename from packages/dbml-parse/tests/lexer/input/comment.in.dbml rename to packages/dbml-parse/tests/examples/lexer/input/comment.in.dbml diff --git a/packages/dbml-parse/tests/lexer/input/function_expression.in.dbml b/packages/dbml-parse/tests/examples/lexer/input/function_expression.in.dbml similarity index 100% rename from packages/dbml-parse/tests/lexer/input/function_expression.in.dbml rename to packages/dbml-parse/tests/examples/lexer/input/function_expression.in.dbml diff --git a/packages/dbml-parse/tests/lexer/input/identifiers.in.dbml b/packages/dbml-parse/tests/examples/lexer/input/identifiers.in.dbml similarity index 100% rename from packages/dbml-parse/tests/lexer/input/identifiers.in.dbml rename to packages/dbml-parse/tests/examples/lexer/input/identifiers.in.dbml diff --git a/packages/dbml-parse/tests/lexer/input/identifiers_starting_with_digits.in.dbml b/packages/dbml-parse/tests/examples/lexer/input/identifiers_starting_with_digits.in.dbml similarity index 100% rename from packages/dbml-parse/tests/lexer/input/identifiers_starting_with_digits.in.dbml rename to packages/dbml-parse/tests/examples/lexer/input/identifiers_starting_with_digits.in.dbml diff --git a/packages/dbml-parse/tests/lexer/input/invalid_escape_sequence.in.dbml b/packages/dbml-parse/tests/examples/lexer/input/invalid_escape_sequence.in.dbml similarity index 100% rename from packages/dbml-parse/tests/lexer/input/invalid_escape_sequence.in.dbml rename to packages/dbml-parse/tests/examples/lexer/input/invalid_escape_sequence.in.dbml diff --git a/packages/dbml-parse/tests/lexer/input/number.in.dbml b/packages/dbml-parse/tests/examples/lexer/input/number.in.dbml similarity index 100% rename from packages/dbml-parse/tests/lexer/input/number.in.dbml rename to packages/dbml-parse/tests/examples/lexer/input/number.in.dbml diff --git a/packages/dbml-parse/tests/lexer/input/strings.in.dbml b/packages/dbml-parse/tests/examples/lexer/input/strings.in.dbml similarity index 100% rename from packages/dbml-parse/tests/lexer/input/strings.in.dbml rename to packages/dbml-parse/tests/examples/lexer/input/strings.in.dbml diff --git a/packages/dbml-parse/tests/lexer/input/symbols.in.dbml b/packages/dbml-parse/tests/examples/lexer/input/symbols.in.dbml similarity index 100% rename from packages/dbml-parse/tests/lexer/input/symbols.in.dbml rename to packages/dbml-parse/tests/examples/lexer/input/symbols.in.dbml diff --git a/packages/dbml-parse/tests/lexer/input/unclosed_strings.in.dbml b/packages/dbml-parse/tests/examples/lexer/input/unclosed_strings.in.dbml similarity index 100% rename from packages/dbml-parse/tests/lexer/input/unclosed_strings.in.dbml rename to packages/dbml-parse/tests/examples/lexer/input/unclosed_strings.in.dbml diff --git a/packages/dbml-parse/tests/lexer/input/unicode_identifiers.in.dbml b/packages/dbml-parse/tests/examples/lexer/input/unicode_identifiers.in.dbml similarity index 100% rename from packages/dbml-parse/tests/lexer/input/unicode_identifiers.in.dbml rename to packages/dbml-parse/tests/examples/lexer/input/unicode_identifiers.in.dbml diff --git a/packages/dbml-parse/tests/lexer/input/valid_escape_sequence.in.dbml b/packages/dbml-parse/tests/examples/lexer/input/valid_escape_sequence.in.dbml similarity index 100% rename from packages/dbml-parse/tests/lexer/input/valid_escape_sequence.in.dbml rename to packages/dbml-parse/tests/examples/lexer/input/valid_escape_sequence.in.dbml diff --git a/packages/dbml-parse/tests/lexer/lexer.test.ts b/packages/dbml-parse/tests/examples/lexer/lexer.test.ts similarity index 87% rename from packages/dbml-parse/tests/lexer/lexer.test.ts rename to packages/dbml-parse/tests/examples/lexer/lexer.test.ts index 5d50226b8..b065b2b58 100644 --- a/packages/dbml-parse/tests/lexer/lexer.test.ts +++ b/packages/dbml-parse/tests/examples/lexer/lexer.test.ts @@ -1,8 +1,8 @@ -import fs, { readFileSync } from 'fs'; +import { readFileSync } from 'fs'; import path from 'path'; import { describe, expect, it } from 'vitest'; import { scanTestNames } from '../jestHelpers'; -import Lexer from '../../src/lib/lexer/lexer'; +import Lexer from '../../../src/lib/lexer/lexer'; describe('#lexer', () => { const testNames = scanTestNames(path.resolve(__dirname, './input/')); diff --git a/packages/dbml-parse/tests/lexer/output/color.out.json b/packages/dbml-parse/tests/examples/lexer/output/color.out.json similarity index 100% rename from packages/dbml-parse/tests/lexer/output/color.out.json rename to packages/dbml-parse/tests/examples/lexer/output/color.out.json diff --git a/packages/dbml-parse/tests/lexer/output/comment.out.json b/packages/dbml-parse/tests/examples/lexer/output/comment.out.json similarity index 100% rename from packages/dbml-parse/tests/lexer/output/comment.out.json rename to packages/dbml-parse/tests/examples/lexer/output/comment.out.json diff --git a/packages/dbml-parse/tests/lexer/output/function_expression.out.json b/packages/dbml-parse/tests/examples/lexer/output/function_expression.out.json similarity index 100% rename from packages/dbml-parse/tests/lexer/output/function_expression.out.json rename to packages/dbml-parse/tests/examples/lexer/output/function_expression.out.json diff --git a/packages/dbml-parse/tests/lexer/output/identifiers.out.json b/packages/dbml-parse/tests/examples/lexer/output/identifiers.out.json similarity index 100% rename from packages/dbml-parse/tests/lexer/output/identifiers.out.json rename to packages/dbml-parse/tests/examples/lexer/output/identifiers.out.json diff --git a/packages/dbml-parse/tests/lexer/output/identifiers_starting_with_digits.out.json b/packages/dbml-parse/tests/examples/lexer/output/identifiers_starting_with_digits.out.json similarity index 100% rename from packages/dbml-parse/tests/lexer/output/identifiers_starting_with_digits.out.json rename to packages/dbml-parse/tests/examples/lexer/output/identifiers_starting_with_digits.out.json diff --git a/packages/dbml-parse/tests/lexer/output/invalid_escape_sequence.out.json b/packages/dbml-parse/tests/examples/lexer/output/invalid_escape_sequence.out.json similarity index 100% rename from packages/dbml-parse/tests/lexer/output/invalid_escape_sequence.out.json rename to packages/dbml-parse/tests/examples/lexer/output/invalid_escape_sequence.out.json diff --git a/packages/dbml-parse/tests/lexer/output/number.out.json b/packages/dbml-parse/tests/examples/lexer/output/number.out.json similarity index 100% rename from packages/dbml-parse/tests/lexer/output/number.out.json rename to packages/dbml-parse/tests/examples/lexer/output/number.out.json diff --git a/packages/dbml-parse/tests/lexer/output/strings.out.json b/packages/dbml-parse/tests/examples/lexer/output/strings.out.json similarity index 100% rename from packages/dbml-parse/tests/lexer/output/strings.out.json rename to packages/dbml-parse/tests/examples/lexer/output/strings.out.json diff --git a/packages/dbml-parse/tests/lexer/output/symbols.out.json b/packages/dbml-parse/tests/examples/lexer/output/symbols.out.json similarity index 100% rename from packages/dbml-parse/tests/lexer/output/symbols.out.json rename to packages/dbml-parse/tests/examples/lexer/output/symbols.out.json diff --git a/packages/dbml-parse/tests/lexer/output/unclosed_strings.out.json b/packages/dbml-parse/tests/examples/lexer/output/unclosed_strings.out.json similarity index 100% rename from packages/dbml-parse/tests/lexer/output/unclosed_strings.out.json rename to packages/dbml-parse/tests/examples/lexer/output/unclosed_strings.out.json diff --git a/packages/dbml-parse/tests/lexer/output/unicode_identifiers.out.json b/packages/dbml-parse/tests/examples/lexer/output/unicode_identifiers.out.json similarity index 100% rename from packages/dbml-parse/tests/lexer/output/unicode_identifiers.out.json rename to packages/dbml-parse/tests/examples/lexer/output/unicode_identifiers.out.json diff --git a/packages/dbml-parse/tests/lexer/output/valid_escape_sequence.out.json b/packages/dbml-parse/tests/examples/lexer/output/valid_escape_sequence.out.json similarity index 100% rename from packages/dbml-parse/tests/lexer/output/valid_escape_sequence.out.json rename to packages/dbml-parse/tests/examples/lexer/output/valid_escape_sequence.out.json diff --git a/packages/dbml-parse/tests/NaN_errors/input/empty_setting_name.in.dbml b/packages/dbml-parse/tests/examples/nan_errors/input/empty_setting_name.in.dbml similarity index 100% rename from packages/dbml-parse/tests/NaN_errors/input/empty_setting_name.in.dbml rename to packages/dbml-parse/tests/examples/nan_errors/input/empty_setting_name.in.dbml diff --git a/packages/dbml-parse/tests/NaN_errors/interpreter_NaN.test.ts b/packages/dbml-parse/tests/examples/nan_errors/interpreter_NaN.test.ts similarity index 62% rename from packages/dbml-parse/tests/NaN_errors/interpreter_NaN.test.ts rename to packages/dbml-parse/tests/examples/nan_errors/interpreter_NaN.test.ts index 36d4bfc79..883938583 100644 --- a/packages/dbml-parse/tests/NaN_errors/interpreter_NaN.test.ts +++ b/packages/dbml-parse/tests/examples/nan_errors/interpreter_NaN.test.ts @@ -1,13 +1,13 @@ -import fs, { readFileSync } from 'fs'; +import { readFileSync } from 'fs'; import path from 'path'; import { describe, expect, it } from 'vitest'; import { scanTestNames } from '../jestHelpers'; -import { NodeSymbolIdGenerator } from '../../src/lib/analyzer/symbol/symbols'; -import { SyntaxNodeIdGenerator } from '../../src/lib/parser/nodes'; -import Lexer from '../../src/lib/lexer/lexer'; -import Parser from '../../src/lib/parser/parser'; -import Analyzer from '../../src/lib/analyzer/analyzer'; -import Interpreter from '../../src/lib/interpreter/interpreter'; +import { NodeSymbolIdGenerator } from '../../../src/lib/analyzer/symbol/symbols'; +import { SyntaxNodeIdGenerator } from '../../../src/lib/parser/nodes'; +import Lexer from '../../../src/lib/lexer/lexer'; +import Parser from '../../../src/lib/parser/parser'; +import Analyzer from '../../../src/lib/analyzer/analyzer'; +import Interpreter from '../../../src/lib/interpreter/interpreter'; describe('#interpreter - check for cases that previously cause NaN-positioned errors', () => { const testNames = scanTestNames(path.resolve(__dirname, './input/')); @@ -16,7 +16,7 @@ describe('#interpreter - check for cases that previously cause NaN-positioned er const program = readFileSync(path.resolve(__dirname, `./input/${testName}.in.dbml`), 'utf-8'); const symbolIdGenerator = new NodeSymbolIdGenerator(); const nodeIdGenerator = new SyntaxNodeIdGenerator(); - let output: any = undefined; + let output: any; const report = new Lexer(program) .lex() .chain((tokens) => { @@ -29,8 +29,7 @@ describe('#interpreter - check for cases that previously cause NaN-positioned er if (report.getErrors().length !== 0) { output = JSON.stringify( report.getErrors(), - (key, value) => - ['symbol', 'references', 'referee', 'parent'].includes(key) ? undefined : value, + (key, value) => (['symbol', 'references', 'referee', 'parent'].includes(key) ? undefined : value), 2, ); } else { @@ -38,8 +37,7 @@ describe('#interpreter - check for cases that previously cause NaN-positioned er if (res.getErrors().length > 0) { output = JSON.stringify( res.getErrors(), - (key, value) => - ['symbol', 'references', 'referee', 'parent'].includes(key) ? undefined : value, + (key, value) => (['symbol', 'references', 'referee', 'parent'].includes(key) ? undefined : value), 2, ); } else { @@ -51,7 +49,6 @@ describe('#interpreter - check for cases that previously cause NaN-positioned er } } - it(testName, () => - expect(output).toMatchFileSnapshot(path.resolve(__dirname, `./output/${testName}.out.json`))); + it(testName, () => expect(output).toMatchFileSnapshot(path.resolve(__dirname, `./output/${testName}.out.json`))); }); }); diff --git a/packages/dbml-parse/tests/NaN_errors/output/empty_setting_name.out.json b/packages/dbml-parse/tests/examples/nan_errors/output/empty_setting_name.out.json similarity index 100% rename from packages/dbml-parse/tests/NaN_errors/output/empty_setting_name.out.json rename to packages/dbml-parse/tests/examples/nan_errors/output/empty_setting_name.out.json diff --git a/packages/dbml-parse/tests/parser/input/call_expression.in.dbml b/packages/dbml-parse/tests/examples/parser/input/call_expression.in.dbml similarity index 100% rename from packages/dbml-parse/tests/parser/input/call_expression.in.dbml rename to packages/dbml-parse/tests/examples/parser/input/call_expression.in.dbml diff --git a/packages/dbml-parse/tests/parser/input/element-declaration.in.dbml b/packages/dbml-parse/tests/examples/parser/input/element-declaration.in.dbml similarity index 100% rename from packages/dbml-parse/tests/parser/input/element-declaration.in.dbml rename to packages/dbml-parse/tests/examples/parser/input/element-declaration.in.dbml diff --git a/packages/dbml-parse/tests/parser/input/element_in_simple_body.in.dbml b/packages/dbml-parse/tests/examples/parser/input/element_in_simple_body.in.dbml similarity index 100% rename from packages/dbml-parse/tests/parser/input/element_in_simple_body.in.dbml rename to packages/dbml-parse/tests/examples/parser/input/element_in_simple_body.in.dbml diff --git a/packages/dbml-parse/tests/parser/input/erroneous_setting.in.dbml b/packages/dbml-parse/tests/examples/parser/input/erroneous_setting.in.dbml similarity index 100% rename from packages/dbml-parse/tests/parser/input/erroneous_setting.in.dbml rename to packages/dbml-parse/tests/examples/parser/input/erroneous_setting.in.dbml diff --git a/packages/dbml-parse/tests/parser/input/expression.in.dbml b/packages/dbml-parse/tests/examples/parser/input/expression.in.dbml similarity index 100% rename from packages/dbml-parse/tests/parser/input/expression.in.dbml rename to packages/dbml-parse/tests/examples/parser/input/expression.in.dbml diff --git a/packages/dbml-parse/tests/parser/input/function_application.in.dbml b/packages/dbml-parse/tests/examples/parser/input/function_application.in.dbml similarity index 100% rename from packages/dbml-parse/tests/parser/input/function_application.in.dbml rename to packages/dbml-parse/tests/examples/parser/input/function_application.in.dbml diff --git a/packages/dbml-parse/tests/parser/input/last_invalid_number.in.dbml b/packages/dbml-parse/tests/examples/parser/input/last_invalid_number.in.dbml similarity index 100% rename from packages/dbml-parse/tests/parser/input/last_invalid_number.in.dbml rename to packages/dbml-parse/tests/examples/parser/input/last_invalid_number.in.dbml diff --git a/packages/dbml-parse/tests/parser/input/list_expression.in.dbml b/packages/dbml-parse/tests/examples/parser/input/list_expression.in.dbml similarity index 100% rename from packages/dbml-parse/tests/parser/input/list_expression.in.dbml rename to packages/dbml-parse/tests/examples/parser/input/list_expression.in.dbml diff --git a/packages/dbml-parse/tests/parser/input/literal_element_expression.in.dbml b/packages/dbml-parse/tests/examples/parser/input/literal_element_expression.in.dbml similarity index 100% rename from packages/dbml-parse/tests/parser/input/literal_element_expression.in.dbml rename to packages/dbml-parse/tests/examples/parser/input/literal_element_expression.in.dbml diff --git a/packages/dbml-parse/tests/parser/input/nested_element.in.dbml b/packages/dbml-parse/tests/examples/parser/input/nested_element.in.dbml similarity index 100% rename from packages/dbml-parse/tests/parser/input/nested_element.in.dbml rename to packages/dbml-parse/tests/examples/parser/input/nested_element.in.dbml diff --git a/packages/dbml-parse/tests/parser/input/old_undocumented_syntax.in.dbml b/packages/dbml-parse/tests/examples/parser/input/old_undocumented_syntax.in.dbml similarity index 100% rename from packages/dbml-parse/tests/parser/input/old_undocumented_syntax.in.dbml rename to packages/dbml-parse/tests/examples/parser/input/old_undocumented_syntax.in.dbml diff --git a/packages/dbml-parse/tests/parser/input/ref_setting.in.dbml b/packages/dbml-parse/tests/examples/parser/input/ref_setting.in.dbml similarity index 100% rename from packages/dbml-parse/tests/parser/input/ref_setting.in.dbml rename to packages/dbml-parse/tests/examples/parser/input/ref_setting.in.dbml diff --git a/packages/dbml-parse/tests/parser/input/trailing_comments.in.dbml b/packages/dbml-parse/tests/examples/parser/input/trailing_comments.in.dbml similarity index 100% rename from packages/dbml-parse/tests/parser/input/trailing_comments.in.dbml rename to packages/dbml-parse/tests/examples/parser/input/trailing_comments.in.dbml diff --git a/packages/dbml-parse/tests/parser/input/tuple_expression.in.dbml b/packages/dbml-parse/tests/examples/parser/input/tuple_expression.in.dbml similarity index 100% rename from packages/dbml-parse/tests/parser/input/tuple_expression.in.dbml rename to packages/dbml-parse/tests/examples/parser/input/tuple_expression.in.dbml diff --git a/packages/dbml-parse/tests/parser/output/call_expression.out.json b/packages/dbml-parse/tests/examples/parser/output/call_expression.out.json similarity index 100% rename from packages/dbml-parse/tests/parser/output/call_expression.out.json rename to packages/dbml-parse/tests/examples/parser/output/call_expression.out.json diff --git a/packages/dbml-parse/tests/parser/output/element-declaration.out.json b/packages/dbml-parse/tests/examples/parser/output/element-declaration.out.json similarity index 100% rename from packages/dbml-parse/tests/parser/output/element-declaration.out.json rename to packages/dbml-parse/tests/examples/parser/output/element-declaration.out.json diff --git a/packages/dbml-parse/tests/parser/output/element_in_simple_body.out.json b/packages/dbml-parse/tests/examples/parser/output/element_in_simple_body.out.json similarity index 100% rename from packages/dbml-parse/tests/parser/output/element_in_simple_body.out.json rename to packages/dbml-parse/tests/examples/parser/output/element_in_simple_body.out.json diff --git a/packages/dbml-parse/tests/parser/output/erroneous_setting.out.json b/packages/dbml-parse/tests/examples/parser/output/erroneous_setting.out.json similarity index 100% rename from packages/dbml-parse/tests/parser/output/erroneous_setting.out.json rename to packages/dbml-parse/tests/examples/parser/output/erroneous_setting.out.json diff --git a/packages/dbml-parse/tests/parser/output/expression.out.json b/packages/dbml-parse/tests/examples/parser/output/expression.out.json similarity index 100% rename from packages/dbml-parse/tests/parser/output/expression.out.json rename to packages/dbml-parse/tests/examples/parser/output/expression.out.json diff --git a/packages/dbml-parse/tests/parser/output/function_application.out.json b/packages/dbml-parse/tests/examples/parser/output/function_application.out.json similarity index 100% rename from packages/dbml-parse/tests/parser/output/function_application.out.json rename to packages/dbml-parse/tests/examples/parser/output/function_application.out.json diff --git a/packages/dbml-parse/tests/parser/output/last_invalid_number.out.json b/packages/dbml-parse/tests/examples/parser/output/last_invalid_number.out.json similarity index 100% rename from packages/dbml-parse/tests/parser/output/last_invalid_number.out.json rename to packages/dbml-parse/tests/examples/parser/output/last_invalid_number.out.json diff --git a/packages/dbml-parse/tests/parser/output/list_expression.out.json b/packages/dbml-parse/tests/examples/parser/output/list_expression.out.json similarity index 100% rename from packages/dbml-parse/tests/parser/output/list_expression.out.json rename to packages/dbml-parse/tests/examples/parser/output/list_expression.out.json diff --git a/packages/dbml-parse/tests/parser/output/literal_element_expression.out.json b/packages/dbml-parse/tests/examples/parser/output/literal_element_expression.out.json similarity index 100% rename from packages/dbml-parse/tests/parser/output/literal_element_expression.out.json rename to packages/dbml-parse/tests/examples/parser/output/literal_element_expression.out.json diff --git a/packages/dbml-parse/tests/parser/output/nested_element.out.json b/packages/dbml-parse/tests/examples/parser/output/nested_element.out.json similarity index 100% rename from packages/dbml-parse/tests/parser/output/nested_element.out.json rename to packages/dbml-parse/tests/examples/parser/output/nested_element.out.json diff --git a/packages/dbml-parse/tests/parser/output/old_undocumented_syntax.out.json b/packages/dbml-parse/tests/examples/parser/output/old_undocumented_syntax.out.json similarity index 100% rename from packages/dbml-parse/tests/parser/output/old_undocumented_syntax.out.json rename to packages/dbml-parse/tests/examples/parser/output/old_undocumented_syntax.out.json diff --git a/packages/dbml-parse/tests/parser/output/ref_setting.out.json b/packages/dbml-parse/tests/examples/parser/output/ref_setting.out.json similarity index 100% rename from packages/dbml-parse/tests/parser/output/ref_setting.out.json rename to packages/dbml-parse/tests/examples/parser/output/ref_setting.out.json diff --git a/packages/dbml-parse/tests/parser/output/trailing_comments.out.json b/packages/dbml-parse/tests/examples/parser/output/trailing_comments.out.json similarity index 100% rename from packages/dbml-parse/tests/parser/output/trailing_comments.out.json rename to packages/dbml-parse/tests/examples/parser/output/trailing_comments.out.json diff --git a/packages/dbml-parse/tests/parser/output/tuple_expression.out.json b/packages/dbml-parse/tests/examples/parser/output/tuple_expression.out.json similarity index 100% rename from packages/dbml-parse/tests/parser/output/tuple_expression.out.json rename to packages/dbml-parse/tests/examples/parser/output/tuple_expression.out.json diff --git a/packages/dbml-parse/tests/parser/parser.test.ts b/packages/dbml-parse/tests/examples/parser/parser.test.ts similarity index 79% rename from packages/dbml-parse/tests/parser/parser.test.ts rename to packages/dbml-parse/tests/examples/parser/parser.test.ts index 42f635a3c..149d76bd7 100644 --- a/packages/dbml-parse/tests/parser/parser.test.ts +++ b/packages/dbml-parse/tests/examples/parser/parser.test.ts @@ -1,10 +1,10 @@ -import fs, { readFileSync } from 'fs'; +import { readFileSync } from 'fs'; import path from 'path'; import { describe, expect, it } from 'vitest'; import { scanTestNames } from '../jestHelpers'; -import Lexer from '../../src/lib/lexer/lexer'; -import Parser from '../../src/lib/parser/parser'; -import { SyntaxNodeIdGenerator } from '../../src/lib/parser/nodes'; +import Lexer from '../../../src/lib/lexer/lexer'; +import Parser from '../../../src/lib/parser/parser'; +import { SyntaxNodeIdGenerator } from '../../../src/lib/parser/nodes'; describe('#parser', () => { const testNames = scanTestNames(path.resolve(__dirname, './input/')); diff --git a/packages/dbml-parse/tests/validator/input/alias_of_duplicated_names.in.dbml b/packages/dbml-parse/tests/examples/validator/input/alias_of_duplicated_names.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/alias_of_duplicated_names.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/alias_of_duplicated_names.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/checks.in.dbml b/packages/dbml-parse/tests/examples/validator/input/checks.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/checks.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/checks.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/column_caller_type.in.dbml b/packages/dbml-parse/tests/examples/validator/input/column_caller_type.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/column_caller_type.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/column_caller_type.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/complex_indexes.in.dbml b/packages/dbml-parse/tests/examples/validator/input/complex_indexes.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/complex_indexes.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/complex_indexes.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/complex_names.in.dbml b/packages/dbml-parse/tests/examples/validator/input/complex_names.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/complex_names.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/complex_names.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/duplicate_alias_name.in.dbml b/packages/dbml-parse/tests/examples/validator/input/duplicate_alias_name.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/duplicate_alias_name.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/duplicate_alias_name.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/duplicate_columns.in.dbml b/packages/dbml-parse/tests/examples/validator/input/duplicate_columns.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/duplicate_columns.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/duplicate_columns.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/duplicate_enum_field.in.dbml b/packages/dbml-parse/tests/examples/validator/input/duplicate_enum_field.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/duplicate_enum_field.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/duplicate_enum_field.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/duplicate_names.in.dbml b/packages/dbml-parse/tests/examples/validator/input/duplicate_names.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/duplicate_names.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/duplicate_names.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/duplicate_table_partial_injections.in.dbml b/packages/dbml-parse/tests/examples/validator/input/duplicate_table_partial_injections.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/duplicate_table_partial_injections.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/duplicate_table_partial_injections.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/enum.in.dbml b/packages/dbml-parse/tests/examples/validator/input/enum.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/enum.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/enum.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/erroneous.in.dbml b/packages/dbml-parse/tests/examples/validator/input/erroneous.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/erroneous.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/erroneous.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/invalid_args.in.dbml b/packages/dbml-parse/tests/examples/validator/input/invalid_args.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/invalid_args.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/invalid_args.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/multiple_notes_in_table_group.in.dbml b/packages/dbml-parse/tests/examples/validator/input/multiple_notes_in_table_group.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/multiple_notes_in_table_group.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/multiple_notes_in_table_group.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/negative_number.in.dbml b/packages/dbml-parse/tests/examples/validator/input/negative_number.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/negative_number.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/negative_number.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/nested_duplicate_names.in.dbml b/packages/dbml-parse/tests/examples/validator/input/nested_duplicate_names.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/nested_duplicate_names.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/nested_duplicate_names.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/old_undocumented_syntax.in.dbml b/packages/dbml-parse/tests/examples/validator/input/old_undocumented_syntax.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/old_undocumented_syntax.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/old_undocumented_syntax.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/public_schema.in.dbml b/packages/dbml-parse/tests/examples/validator/input/public_schema.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/public_schema.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/public_schema.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/redefined_note.in.dbml b/packages/dbml-parse/tests/examples/validator/input/redefined_note.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/redefined_note.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/redefined_note.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/ref.in.dbml b/packages/dbml-parse/tests/examples/validator/input/ref.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/ref.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/ref.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/ref_error_setting.in.dbml b/packages/dbml-parse/tests/examples/validator/input/ref_error_setting.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/ref_error_setting.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/ref_error_setting.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/ref_in_table.in.dbml b/packages/dbml-parse/tests/examples/validator/input/ref_in_table.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/ref_in_table.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/ref_in_table.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/ref_name_and_color_setting.in copy.dbml b/packages/dbml-parse/tests/examples/validator/input/ref_name_and_color_setting.in copy.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/ref_name_and_color_setting.in copy.dbml rename to packages/dbml-parse/tests/examples/validator/input/ref_name_and_color_setting.in copy.dbml diff --git a/packages/dbml-parse/tests/validator/input/schema_nested_tablegroup.in.dbml b/packages/dbml-parse/tests/examples/validator/input/schema_nested_tablegroup.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/schema_nested_tablegroup.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/schema_nested_tablegroup.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/sticky_notes.in.dbml b/packages/dbml-parse/tests/examples/validator/input/sticky_notes.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/sticky_notes.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/sticky_notes.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/table_group_settings.in.dbml b/packages/dbml-parse/tests/examples/validator/input/table_group_settings.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/table_group_settings.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/table_group_settings.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/table_partial_check.in.dbml b/packages/dbml-parse/tests/examples/validator/input/table_partial_check.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/table_partial_check.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/table_partial_check.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/table_partial_settings_general.in.dbml b/packages/dbml-parse/tests/examples/validator/input/table_partial_settings_general.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/table_partial_settings_general.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/table_partial_settings_general.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/table_settings_check.in.dbml b/packages/dbml-parse/tests/examples/validator/input/table_settings_check.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/table_settings_check.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/table_settings_check.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/table_settings_general.in.dbml b/packages/dbml-parse/tests/examples/validator/input/table_settings_general.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/table_settings_general.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/table_settings_general.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/table_with_no_columns.in.dbml b/packages/dbml-parse/tests/examples/validator/input/table_with_no_columns.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/table_with_no_columns.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/table_with_no_columns.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/wrong_sub_element_declarations.in.dbml b/packages/dbml-parse/tests/examples/validator/input/wrong_sub_element_declarations.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/wrong_sub_element_declarations.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/wrong_sub_element_declarations.in.dbml diff --git a/packages/dbml-parse/tests/validator/input/wrong_table_partial_injection_syntax.in.dbml b/packages/dbml-parse/tests/examples/validator/input/wrong_table_partial_injection_syntax.in.dbml similarity index 100% rename from packages/dbml-parse/tests/validator/input/wrong_table_partial_injection_syntax.in.dbml rename to packages/dbml-parse/tests/examples/validator/input/wrong_table_partial_injection_syntax.in.dbml diff --git a/packages/dbml-parse/tests/validator/output/alias_of_duplicated_names.out.json b/packages/dbml-parse/tests/examples/validator/output/alias_of_duplicated_names.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/alias_of_duplicated_names.out.json rename to packages/dbml-parse/tests/examples/validator/output/alias_of_duplicated_names.out.json diff --git a/packages/dbml-parse/tests/validator/output/checks.out.json b/packages/dbml-parse/tests/examples/validator/output/checks.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/checks.out.json rename to packages/dbml-parse/tests/examples/validator/output/checks.out.json diff --git a/packages/dbml-parse/tests/validator/output/column_caller_type.out.json b/packages/dbml-parse/tests/examples/validator/output/column_caller_type.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/column_caller_type.out.json rename to packages/dbml-parse/tests/examples/validator/output/column_caller_type.out.json diff --git a/packages/dbml-parse/tests/validator/output/complex_indexes.out.json b/packages/dbml-parse/tests/examples/validator/output/complex_indexes.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/complex_indexes.out.json rename to packages/dbml-parse/tests/examples/validator/output/complex_indexes.out.json diff --git a/packages/dbml-parse/tests/validator/output/complex_names.out.json b/packages/dbml-parse/tests/examples/validator/output/complex_names.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/complex_names.out.json rename to packages/dbml-parse/tests/examples/validator/output/complex_names.out.json diff --git a/packages/dbml-parse/tests/validator/output/duplicate_alias_name.out.json b/packages/dbml-parse/tests/examples/validator/output/duplicate_alias_name.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/duplicate_alias_name.out.json rename to packages/dbml-parse/tests/examples/validator/output/duplicate_alias_name.out.json diff --git a/packages/dbml-parse/tests/validator/output/duplicate_columns.out.json b/packages/dbml-parse/tests/examples/validator/output/duplicate_columns.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/duplicate_columns.out.json rename to packages/dbml-parse/tests/examples/validator/output/duplicate_columns.out.json diff --git a/packages/dbml-parse/tests/validator/output/duplicate_enum_field.out.json b/packages/dbml-parse/tests/examples/validator/output/duplicate_enum_field.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/duplicate_enum_field.out.json rename to packages/dbml-parse/tests/examples/validator/output/duplicate_enum_field.out.json diff --git a/packages/dbml-parse/tests/validator/output/duplicate_names.out.json b/packages/dbml-parse/tests/examples/validator/output/duplicate_names.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/duplicate_names.out.json rename to packages/dbml-parse/tests/examples/validator/output/duplicate_names.out.json diff --git a/packages/dbml-parse/tests/validator/output/duplicate_table_partial_injections.out.json b/packages/dbml-parse/tests/examples/validator/output/duplicate_table_partial_injections.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/duplicate_table_partial_injections.out.json rename to packages/dbml-parse/tests/examples/validator/output/duplicate_table_partial_injections.out.json diff --git a/packages/dbml-parse/tests/validator/output/enum.out.json b/packages/dbml-parse/tests/examples/validator/output/enum.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/enum.out.json rename to packages/dbml-parse/tests/examples/validator/output/enum.out.json diff --git a/packages/dbml-parse/tests/validator/output/erroneous.out.json b/packages/dbml-parse/tests/examples/validator/output/erroneous.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/erroneous.out.json rename to packages/dbml-parse/tests/examples/validator/output/erroneous.out.json diff --git a/packages/dbml-parse/tests/validator/output/invalid_args.out.json b/packages/dbml-parse/tests/examples/validator/output/invalid_args.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/invalid_args.out.json rename to packages/dbml-parse/tests/examples/validator/output/invalid_args.out.json diff --git a/packages/dbml-parse/tests/validator/output/multiple_notes_in_table_group.out.json b/packages/dbml-parse/tests/examples/validator/output/multiple_notes_in_table_group.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/multiple_notes_in_table_group.out.json rename to packages/dbml-parse/tests/examples/validator/output/multiple_notes_in_table_group.out.json diff --git a/packages/dbml-parse/tests/validator/output/negative_number.out.json b/packages/dbml-parse/tests/examples/validator/output/negative_number.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/negative_number.out.json rename to packages/dbml-parse/tests/examples/validator/output/negative_number.out.json diff --git a/packages/dbml-parse/tests/validator/output/nested_duplicate_names.out.json b/packages/dbml-parse/tests/examples/validator/output/nested_duplicate_names.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/nested_duplicate_names.out.json rename to packages/dbml-parse/tests/examples/validator/output/nested_duplicate_names.out.json diff --git a/packages/dbml-parse/tests/validator/output/old_undocumented_syntax.out.json b/packages/dbml-parse/tests/examples/validator/output/old_undocumented_syntax.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/old_undocumented_syntax.out.json rename to packages/dbml-parse/tests/examples/validator/output/old_undocumented_syntax.out.json diff --git a/packages/dbml-parse/tests/validator/output/public_schema.out.json b/packages/dbml-parse/tests/examples/validator/output/public_schema.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/public_schema.out.json rename to packages/dbml-parse/tests/examples/validator/output/public_schema.out.json diff --git a/packages/dbml-parse/tests/validator/output/redefined_note.out.json b/packages/dbml-parse/tests/examples/validator/output/redefined_note.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/redefined_note.out.json rename to packages/dbml-parse/tests/examples/validator/output/redefined_note.out.json diff --git a/packages/dbml-parse/tests/validator/output/ref.out.json b/packages/dbml-parse/tests/examples/validator/output/ref.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/ref.out.json rename to packages/dbml-parse/tests/examples/validator/output/ref.out.json diff --git a/packages/dbml-parse/tests/validator/output/ref_error_setting.out.json b/packages/dbml-parse/tests/examples/validator/output/ref_error_setting.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/ref_error_setting.out.json rename to packages/dbml-parse/tests/examples/validator/output/ref_error_setting.out.json diff --git a/packages/dbml-parse/tests/validator/output/ref_in_table.out.json b/packages/dbml-parse/tests/examples/validator/output/ref_in_table.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/ref_in_table.out.json rename to packages/dbml-parse/tests/examples/validator/output/ref_in_table.out.json diff --git a/packages/dbml-parse/tests/validator/output/schema_nested_tablegroup.out.json b/packages/dbml-parse/tests/examples/validator/output/schema_nested_tablegroup.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/schema_nested_tablegroup.out.json rename to packages/dbml-parse/tests/examples/validator/output/schema_nested_tablegroup.out.json diff --git a/packages/dbml-parse/tests/validator/output/sticky_notes.out.json b/packages/dbml-parse/tests/examples/validator/output/sticky_notes.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/sticky_notes.out.json rename to packages/dbml-parse/tests/examples/validator/output/sticky_notes.out.json diff --git a/packages/dbml-parse/tests/validator/output/table_group_settings.out.json b/packages/dbml-parse/tests/examples/validator/output/table_group_settings.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/table_group_settings.out.json rename to packages/dbml-parse/tests/examples/validator/output/table_group_settings.out.json diff --git a/packages/dbml-parse/tests/validator/output/table_partial_check.out.json b/packages/dbml-parse/tests/examples/validator/output/table_partial_check.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/table_partial_check.out.json rename to packages/dbml-parse/tests/examples/validator/output/table_partial_check.out.json diff --git a/packages/dbml-parse/tests/validator/output/table_partial_settings_general.out.json b/packages/dbml-parse/tests/examples/validator/output/table_partial_settings_general.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/table_partial_settings_general.out.json rename to packages/dbml-parse/tests/examples/validator/output/table_partial_settings_general.out.json diff --git a/packages/dbml-parse/tests/validator/output/table_settings_check.out.json b/packages/dbml-parse/tests/examples/validator/output/table_settings_check.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/table_settings_check.out.json rename to packages/dbml-parse/tests/examples/validator/output/table_settings_check.out.json diff --git a/packages/dbml-parse/tests/validator/output/table_settings_general.out.json b/packages/dbml-parse/tests/examples/validator/output/table_settings_general.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/table_settings_general.out.json rename to packages/dbml-parse/tests/examples/validator/output/table_settings_general.out.json diff --git a/packages/dbml-parse/tests/validator/output/table_with_no_columns.out.json b/packages/dbml-parse/tests/examples/validator/output/table_with_no_columns.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/table_with_no_columns.out.json rename to packages/dbml-parse/tests/examples/validator/output/table_with_no_columns.out.json diff --git a/packages/dbml-parse/tests/validator/output/wrong_sub_element_declarations.out.json b/packages/dbml-parse/tests/examples/validator/output/wrong_sub_element_declarations.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/wrong_sub_element_declarations.out.json rename to packages/dbml-parse/tests/examples/validator/output/wrong_sub_element_declarations.out.json diff --git a/packages/dbml-parse/tests/validator/output/wrong_table_partial_injection_syntax.out.json b/packages/dbml-parse/tests/examples/validator/output/wrong_table_partial_injection_syntax.out.json similarity index 100% rename from packages/dbml-parse/tests/validator/output/wrong_table_partial_injection_syntax.out.json rename to packages/dbml-parse/tests/examples/validator/output/wrong_table_partial_injection_syntax.out.json diff --git a/packages/dbml-parse/tests/validator/validator.test.ts b/packages/dbml-parse/tests/examples/validator/validator.test.ts similarity index 56% rename from packages/dbml-parse/tests/validator/validator.test.ts rename to packages/dbml-parse/tests/examples/validator/validator.test.ts index b2de9eb3f..76b4bb8d9 100644 --- a/packages/dbml-parse/tests/validator/validator.test.ts +++ b/packages/dbml-parse/tests/examples/validator/validator.test.ts @@ -1,14 +1,14 @@ -import { serialize } from '../../src/lib/serialization/serialize'; -import fs, { readFileSync } from 'fs'; +import { readFileSync } from 'fs'; import path from 'path'; import { describe, expect, it } from 'vitest'; +import { serialize } from '../../../src/lib/serialization/serialize'; import { scanTestNames } from '../jestHelpers'; -import { NodeSymbolIdGenerator } from '../../src/lib/analyzer/symbol/symbols'; -import { SyntaxNodeIdGenerator } from '../../src/lib/parser/nodes'; -import Lexer from '../../src/lib/lexer/lexer'; -import Parser from '../../src/lib/parser/parser'; -import Validator from '../../src/lib/analyzer/validator/validator'; -import SymbolFactory from '../../src/lib/analyzer/symbol/factory'; +import { NodeSymbolIdGenerator } from '../../../src/lib/analyzer/symbol/symbols'; +import { SyntaxNodeIdGenerator } from '../../../src/lib/parser/nodes'; +import Lexer from '../../../src/lib/lexer/lexer'; +import Parser from '../../../src/lib/parser/parser'; +import Validator from '../../../src/lib/analyzer/validator/validator'; +import SymbolFactory from '../../../src/lib/analyzer/symbol/factory'; describe('#validator', () => { const testNames = scanTestNames(path.resolve(__dirname, './input/')); @@ -27,7 +27,6 @@ describe('#validator', () => { }); const output = serialize(report, true); - it(testName, () => - expect(output).toMatchFileSnapshot(path.resolve(__dirname, `./output/${testName}.out.json`))); + it(testName, () => expect(output).toMatchFileSnapshot(path.resolve(__dirname, `./output/${testName}.out.json`))); }); }); From f9571e5f657afaf1c95411e92bc28241106ee418 Mon Sep 17 00:00:00 2001 From: Huy-DNA Date: Sun, 9 Nov 2025 18:44:55 +0700 Subject: [PATCH 03/14] chore: update yarn.lock --- yarn.lock | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index cf8f97b15..763f3ada4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7144,6 +7144,13 @@ external-editor@^3.0.3: iconv-lite "^0.4.24" tmp "^0.0.33" +fast-check@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/fast-check/-/fast-check-4.3.0.tgz#85d0a385e25699e12a07eba61558324a1eb4133f" + integrity sha512-JVw/DJSxVKl8uhCb7GrwanT9VWsCIdBkK3WpP37B/Au4pyaspriSjtrY2ApbSFwTg3ViPfniT13n75PhzE7VEQ== + dependencies: + pure-rand "^7.0.0" + fast-deep-equal@^3.1.1: version "3.1.1" resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz" @@ -10961,6 +10968,11 @@ ora@^5.4.1: strip-ansi "^6.0.0" wcwidth "^1.0.1" +os-tmpdir@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== + p-finally@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz" @@ -11606,6 +11618,11 @@ pure-rand@^6.0.0: resolved "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.1.tgz" integrity sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg== +pure-rand@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-7.0.1.tgz#6f53a5a9e3e4a47445822af96821ca509ed37566" + integrity sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ== + python-struct@^1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/python-struct/-/python-struct-1.1.3.tgz" @@ -12790,7 +12807,14 @@ tinyspy@^3.0.2: resolved "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz" integrity sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q== -tmp@0.2.5, tmp@^0.0.33, tmp@~0.2.1: +tmp@^0.0.33: + version "0.0.33" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== + dependencies: + os-tmpdir "~1.0.2" + +tmp@~0.2.1: version "0.2.5" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.5.tgz#b06bcd23f0f3c8357b426891726d16015abfd8f8" integrity sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow== From 88bd7210c329ab6518e0d1ac36cd6240ff23ab10 Mon Sep 17 00:00:00 2001 From: Huy-DNA Date: Sun, 9 Nov 2025 20:59:18 +0700 Subject: [PATCH 04/14] chore: update yarn.lock --- yarn.lock | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 763f3ada4..8f88ea234 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10968,11 +10968,6 @@ ora@^5.4.1: strip-ansi "^6.0.0" wcwidth "^1.0.1" -os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== - p-finally@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz" @@ -12807,14 +12802,7 @@ tinyspy@^3.0.2: resolved "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz" integrity sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q== -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== - dependencies: - os-tmpdir "~1.0.2" - -tmp@~0.2.1: +tmp@0.2.5, tmp@^0.0.33, tmp@~0.2.1: version "0.2.5" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.5.tgz#b06bcd23f0f3c8357b426891726d16015abfd8f8" integrity sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow== From 032599576f8a599624e99fb886830c4b26a30c56 Mon Sep 17 00:00:00 2001 From: Huy-DNA Date: Sun, 9 Nov 2025 21:42:12 +0700 Subject: [PATCH 05/14] fix(dbml-parse): present \r in lexed newlines if there are any --- packages/dbml-parse/src/lib/lexer/lexer.ts | 4 + .../binder/output/duplicate_name.out.json | 50 +- .../examples/binder/output/enum_name.out.json | 220 +- .../binder/output/ref_setting.out.json | 82 +- .../output/unknown_table_group_field.out.json | 74 +- .../examples/lexer/output/color.out.json | 8 +- .../examples/lexer/output/comment.out.json | 24 +- .../lexer/output/function_expression.out.json | 32 +- .../lexer/output/identifiers.out.json | 24 +- .../examples/lexer/output/number.out.json | 16 +- .../examples/lexer/output/strings.out.json | 120 +- .../examples/lexer/output/symbols.out.json | 64 +- .../parser/output/call_expression.out.json | 32 +- .../output/element-declaration.out.json | 3214 ++++++++--------- .../parser/output/expression.out.json | 506 +-- .../output/function_application.out.json | 32 +- .../parser/output/list_expression.out.json | 48 +- .../literal_element_expression.out.json | 74 +- .../parser/output/nested_element.out.json | 100 +- .../parser/output/ref_setting.out.json | 82 +- .../parser/output/trailing_comments.out.json | 130 +- .../parser/output/tuple_expression.out.json | 120 +- .../output/alias_of_duplicated_names.out.json | 84 +- .../validator/output/complex_indexes.out.json | 270 +- .../validator/output/complex_names.out.json | 188 +- .../output/duplicate_columns.out.json | 154 +- .../output/duplicate_enum_field.out.json | 64 +- .../validator/output/duplicate_names.out.json | 330 +- ...uplicate_table_partial_injections.out.json | 114 +- .../examples/validator/output/enum.out.json | 188 +- .../output/nested_duplicate_names.out.json | 192 +- .../validator/output/public_schema.out.json | 100 +- .../validator/output/redefined_note.out.json | 168 +- .../table_partial_settings_general.out.json | 188 +- .../output/table_settings_general.out.json | 146 +- ...ng_table_partial_injection_syntax.out.json | 156 +- 36 files changed, 3701 insertions(+), 3697 deletions(-) diff --git a/packages/dbml-parse/src/lib/lexer/lexer.ts b/packages/dbml-parse/src/lib/lexer/lexer.ts index f053c0a9e..58d6d3135 100644 --- a/packages/dbml-parse/src/lib/lexer/lexer.ts +++ b/packages/dbml-parse/src/lib/lexer/lexer.ts @@ -109,6 +109,10 @@ export default class Lexer { this.addToken(SyntaxTokenKind.SPACE); break; case '\r': + if (this.check('\n')) { + this.advance(); + this.addToken(SyntaxTokenKind.NEWLINE); + } else this.addToken(SyntaxTokenKind.SPACE); break; case '\n': this.addToken(SyntaxTokenKind.NEWLINE); diff --git a/packages/dbml-parse/tests/examples/binder/output/duplicate_name.out.json b/packages/dbml-parse/tests/examples/binder/output/duplicate_name.out.json index cb8fdf72a..df1012560 100644 --- a/packages/dbml-parse/tests/examples/binder/output/duplicate_name.out.json +++ b/packages/dbml-parse/tests/examples/binder/output/duplicate_name.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 11, + "offset": 10, "line": 0, - "column": 11 + "column": 10 }, "endPos": { "offset": 12, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 11, + "start": 10, "end": 12 } ], @@ -234,22 +234,22 @@ { "kind": "", "startPos": { - "offset": 13, + "offset": 12, "line": 1, - "column": 1 + "column": 0 }, "endPos": { "offset": 14, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 13, + "start": 12, "end": 14 } ], @@ -257,22 +257,22 @@ { "kind": "", "startPos": { - "offset": 16, + "offset": 15, "line": 2, - "column": 2 + "column": 1 }, "endPos": { "offset": 17, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 16, + "start": 15, "end": 17 } ], @@ -294,7 +294,7 @@ "line": 4, "column": 0 }, - "fullStart": 18, + "fullStart": 17, "endPos": { "offset": 38, "line": 6, @@ -320,22 +320,22 @@ { "kind": "", "startPos": { - "offset": 18, + "offset": 17, "line": 3, - "column": 1 + "column": 0 }, "endPos": { "offset": 19, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 18, + "start": 17, "end": 19 } ], @@ -482,22 +482,22 @@ { "kind": "", "startPos": { - "offset": 30, + "offset": 29, "line": 4, - "column": 11 + "column": 10 }, "endPos": { "offset": 31, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 30, + "start": 29, "end": 31 } ], @@ -609,22 +609,22 @@ { "kind": "", "startPos": { - "offset": 36, + "offset": 35, "line": 5, - "column": 5 + "column": 4 }, "endPos": { "offset": 37, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 36, + "start": 35, "end": 37 } ], diff --git a/packages/dbml-parse/tests/examples/binder/output/enum_name.out.json b/packages/dbml-parse/tests/examples/binder/output/enum_name.out.json index 1778ae58c..20ecf10e2 100644 --- a/packages/dbml-parse/tests/examples/binder/output/enum_name.out.json +++ b/packages/dbml-parse/tests/examples/binder/output/enum_name.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 14, + "offset": 13, "line": 0, - "column": 14 + "column": 13 }, "endPos": { "offset": 15, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 14, + "start": 13, "end": 15 } ], @@ -451,22 +451,22 @@ { "kind": "", "startPos": { - "offset": 30, + "offset": 29, "line": 1, - "column": 15 + "column": 14 }, "endPos": { "offset": 31, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 30, + "start": 29, "end": 31 } ], @@ -811,22 +811,22 @@ { "kind": "", "startPos": { - "offset": 53, + "offset": 52, "line": 2, - "column": 22 + "column": 21 }, "endPos": { "offset": 54, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 53, + "start": 52, "end": 54 } ], @@ -1173,22 +1173,22 @@ { "kind": "", "startPos": { - "offset": 80, + "offset": 79, "line": 3, - "column": 26 + "column": 25 }, "endPos": { "offset": 81, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 80, + "start": 79, "end": 81 } ], @@ -1535,22 +1535,22 @@ { "kind": "", "startPos": { - "offset": 108, + "offset": 107, "line": 4, - "column": 27 + "column": 26 }, "endPos": { "offset": 109, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 108, + "start": 107, "end": 109 } ], @@ -1896,22 +1896,22 @@ { "kind": "", "startPos": { - "offset": 132, + "offset": 131, "line": 5, - "column": 23 + "column": 22 }, "endPos": { "offset": 133, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 132, + "start": 131, "end": 133 } ], @@ -2285,22 +2285,22 @@ { "kind": "", "startPos": { - "offset": 152, + "offset": 151, "line": 6, - "column": 19 + "column": 18 }, "endPos": { "offset": 153, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 152, + "start": 151, "end": 153 } ], @@ -2532,22 +2532,22 @@ { "kind": "", "startPos": { - "offset": 169, + "offset": 168, "line": 7, - "column": 16 + "column": 15 }, "endPos": { "offset": 170, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 169, + "start": 168, "end": 170 } ], @@ -2656,22 +2656,22 @@ { "kind": "", "startPos": { - "offset": 172, + "offset": 171, "line": 8, - "column": 2 + "column": 1 }, "endPos": { "offset": 173, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 172, + "start": 171, "end": 173 } ], @@ -2693,7 +2693,7 @@ "line": 10, "column": 0 }, - "fullStart": 174, + "fullStart": 173, "endPos": { "offset": 238, "line": 15, @@ -2719,22 +2719,22 @@ { "kind": "", "startPos": { - "offset": 174, + "offset": 173, "line": 9, - "column": 1 + "column": 0 }, "endPos": { "offset": 175, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 174, + "start": 173, "end": 175 } ], @@ -2977,22 +2977,22 @@ { "kind": "", "startPos": { - "offset": 192, + "offset": 191, "line": 10, - "column": 17 + "column": 16 }, "endPos": { "offset": 193, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 192, + "start": 191, "end": 193 } ], @@ -3157,22 +3157,22 @@ { "kind": "", "startPos": { - "offset": 203, + "offset": 202, "line": 11, - "column": 10 + "column": 9 }, "endPos": { "offset": 204, "line": 12, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 203, + "start": 202, "end": 204 } ], @@ -3341,22 +3341,22 @@ { "kind": "", "startPos": { - "offset": 212, + "offset": 211, "line": 12, - "column": 8 + "column": 7 }, "endPos": { "offset": 213, "line": 13, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 212, + "start": 211, "end": 213 } ], @@ -3525,22 +3525,22 @@ { "kind": "", "startPos": { - "offset": 224, + "offset": 223, "line": 13, - "column": 11 + "column": 10 }, "endPos": { "offset": 225, "line": 14, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 224, + "start": 223, "end": 225 } ], @@ -3709,22 +3709,22 @@ { "kind": "", "startPos": { - "offset": 236, + "offset": 235, "line": 14, - "column": 11 + "column": 10 }, "endPos": { "offset": 237, "line": 15, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 236, + "start": 235, "end": 237 } ], @@ -3758,22 +3758,22 @@ { "kind": "", "startPos": { - "offset": 239, + "offset": 238, "line": 15, - "column": 2 + "column": 1 }, "endPos": { "offset": 240, "line": 16, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 239, + "start": 238, "end": 240 } ], @@ -3795,7 +3795,7 @@ "line": 17, "column": 0 }, - "fullStart": 241, + "fullStart": 240, "endPos": { "offset": 302, "line": 22, @@ -3821,22 +3821,22 @@ { "kind": "", "startPos": { - "offset": 241, + "offset": 240, "line": 16, - "column": 1 + "column": 0 }, "endPos": { "offset": 242, "line": 17, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 241, + "start": 240, "end": 242 } ], @@ -3983,22 +3983,22 @@ { "kind": "", "startPos": { - "offset": 256, + "offset": 255, "line": 17, - "column": 14 + "column": 13 }, "endPos": { "offset": 257, "line": 18, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 256, + "start": 255, "end": 257 } ], @@ -4163,22 +4163,22 @@ { "kind": "", "startPos": { - "offset": 267, + "offset": 266, "line": 18, - "column": 10 + "column": 9 }, "endPos": { "offset": 268, "line": 19, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 267, + "start": 266, "end": 268 } ], @@ -4347,22 +4347,22 @@ { "kind": "", "startPos": { - "offset": 276, + "offset": 275, "line": 19, - "column": 8 + "column": 7 }, "endPos": { "offset": 277, "line": 20, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 276, + "start": 275, "end": 277 } ], @@ -4531,22 +4531,22 @@ { "kind": "", "startPos": { - "offset": 288, + "offset": 287, "line": 20, - "column": 11 + "column": 10 }, "endPos": { "offset": 289, "line": 21, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 288, + "start": 287, "end": 289 } ], @@ -4715,22 +4715,22 @@ { "kind": "", "startPos": { - "offset": 300, + "offset": 299, "line": 21, - "column": 11 + "column": 10 }, "endPos": { "offset": 301, "line": 22, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 300, + "start": 299, "end": 301 } ], @@ -5128,22 +5128,22 @@ { "kind": "", "startPos": { - "offset": 53, + "offset": 52, "line": 2, - "column": 22 + "column": 21 }, "endPos": { "offset": 54, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 53, + "start": 52, "end": 54 } ], @@ -5238,22 +5238,22 @@ { "kind": "", "startPos": { - "offset": 80, + "offset": 79, "line": 3, - "column": 26 + "column": 25 }, "endPos": { "offset": 81, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 80, + "start": 79, "end": 81 } ], @@ -5322,22 +5322,22 @@ { "kind": "", "startPos": { - "offset": 172, + "offset": 171, "line": 8, - "column": 2 + "column": 1 }, "endPos": { "offset": 173, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 172, + "start": 171, "end": 173 } ], @@ -5530,22 +5530,22 @@ { "kind": "", "startPos": { - "offset": 152, + "offset": 151, "line": 6, - "column": 19 + "column": 18 }, "endPos": { "offset": 153, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 152, + "start": 151, "end": 153 } ], @@ -5599,22 +5599,22 @@ { "kind": "", "startPos": { - "offset": 169, + "offset": 168, "line": 7, - "column": 16 + "column": 15 }, "endPos": { "offset": 170, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 169, + "start": 168, "end": 170 } ], diff --git a/packages/dbml-parse/tests/examples/binder/output/ref_setting.out.json b/packages/dbml-parse/tests/examples/binder/output/ref_setting.out.json index e1b7df3cb..1bfff9625 100644 --- a/packages/dbml-parse/tests/examples/binder/output/ref_setting.out.json +++ b/packages/dbml-parse/tests/examples/binder/output/ref_setting.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 14, + "offset": 13, "line": 0, - "column": 14 + "column": 13 }, "endPos": { "offset": 15, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 14, + "start": 13, "end": 15 } ], @@ -388,22 +388,22 @@ { "kind": "", "startPos": { - "offset": 27, + "offset": 26, "line": 1, - "column": 12 + "column": 11 }, "endPos": { "offset": 28, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 27, + "start": 26, "end": 28 } ], @@ -995,22 +995,22 @@ { "kind": "", "startPos": { - "offset": 68, + "offset": 67, "line": 2, - "column": 40 + "column": 39 }, "endPos": { "offset": 69, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 68, + "start": 67, "end": 69 } ], @@ -1176,22 +1176,22 @@ { "kind": "", "startPos": { - "offset": 74, + "offset": 73, "line": 3, - "column": 5 + "column": 4 }, "endPos": { "offset": 75, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 74, + "start": 73, "end": 75 }, { @@ -1648,22 +1648,22 @@ { "kind": "", "startPos": { - "offset": 107, + "offset": 106, "line": 4, - "column": 32 + "column": 31 }, "endPos": { "offset": 108, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 107, + "start": 106, "end": 108 } ], @@ -1696,22 +1696,22 @@ { "kind": "", "startPos": { - "offset": 110, + "offset": 109, "line": 5, - "column": 2 + "column": 1 }, "endPos": { "offset": 111, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 110, + "start": 109, "end": 111 } ], @@ -1733,7 +1733,7 @@ "line": 7, "column": 0 }, - "fullStart": 112, + "fullStart": 111, "endPos": { "offset": 182, "line": 10, @@ -1759,22 +1759,22 @@ { "kind": "", "startPos": { - "offset": 112, + "offset": 111, "line": 6, - "column": 1 + "column": 0 }, "endPos": { "offset": 113, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 112, + "start": 111, "end": 113 } ], @@ -2017,22 +2017,22 @@ { "kind": "", "startPos": { - "offset": 130, + "offset": 129, "line": 7, - "column": 17 + "column": 16 }, "endPos": { "offset": 131, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 130, + "start": 129, "end": 131 } ], @@ -2134,22 +2134,22 @@ { "kind": "", "startPos": { - "offset": 138, + "offset": 137, "line": 8, - "column": 7 + "column": 6 }, "endPos": { "offset": 139, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 138, + "start": 137, "end": 139 } ], @@ -2564,22 +2564,22 @@ { "kind": "", "startPos": { - "offset": 180, + "offset": 179, "line": 9, - "column": 41 + "column": 40 }, "endPos": { "offset": 181, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 180, + "start": 179, "end": 181 } ], diff --git a/packages/dbml-parse/tests/examples/binder/output/unknown_table_group_field.out.json b/packages/dbml-parse/tests/examples/binder/output/unknown_table_group_field.out.json index 8bf453267..feb287c8f 100644 --- a/packages/dbml-parse/tests/examples/binder/output/unknown_table_group_field.out.json +++ b/packages/dbml-parse/tests/examples/binder/output/unknown_table_group_field.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 14, + "offset": 13, "line": 0, - "column": 14 + "column": 13 }, "endPos": { "offset": 15, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 14, + "start": 13, "end": 15 } ], @@ -234,22 +234,22 @@ { "kind": "", "startPos": { - "offset": 16, + "offset": 15, "line": 1, - "column": 1 + "column": 0 }, "endPos": { "offset": 17, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 16, + "start": 15, "end": 17 } ], @@ -257,22 +257,22 @@ { "kind": "", "startPos": { - "offset": 19, + "offset": 18, "line": 2, - "column": 2 + "column": 1 }, "endPos": { "offset": 20, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 19, + "start": 18, "end": 20 } ], @@ -294,7 +294,7 @@ "line": 4, "column": 0 }, - "fullStart": 21, + "fullStart": 20, "endPos": { "offset": 68, "line": 7, @@ -320,22 +320,22 @@ { "kind": "", "startPos": { - "offset": 21, + "offset": 20, "line": 3, - "column": 1 + "column": 0 }, "endPos": { "offset": 22, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 21, + "start": 20, "end": 22 } ], @@ -482,22 +482,22 @@ { "kind": "", "startPos": { - "offset": 41, + "offset": 40, "line": 4, - "column": 19 + "column": 18 }, "endPos": { "offset": 42, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 41, + "start": 40, "end": 42 } ], @@ -662,22 +662,22 @@ { "kind": "", "startPos": { - "offset": 52, + "offset": 51, "line": 5, - "column": 10 + "column": 9 }, "endPos": { "offset": 53, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 52, + "start": 51, "end": 53 } ], @@ -847,22 +847,22 @@ { "kind": "", "startPos": { - "offset": 66, + "offset": 65, "line": 6, - "column": 13 + "column": 12 }, "endPos": { "offset": 67, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 66, + "start": 65, "end": 67 } ], @@ -1066,22 +1066,22 @@ { "kind": "", "startPos": { - "offset": 52, + "offset": 51, "line": 5, - "column": 10 + "column": 9 }, "endPos": { "offset": 53, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 52, + "start": 51, "end": 53 } ], @@ -1262,22 +1262,22 @@ { "kind": "", "startPos": { - "offset": 66, + "offset": 65, "line": 6, - "column": 13 + "column": 12 }, "endPos": { "offset": 67, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 66, + "start": 65, "end": 67 } ], diff --git a/packages/dbml-parse/tests/examples/lexer/output/color.out.json b/packages/dbml-parse/tests/examples/lexer/output/color.out.json index c65c32d3c..07e32b881 100644 --- a/packages/dbml-parse/tests/examples/lexer/output/color.out.json +++ b/packages/dbml-parse/tests/examples/lexer/output/color.out.json @@ -39,22 +39,22 @@ { "kind": "", "startPos": { - "offset": 7, + "offset": 6, "line": 0, - "column": 7 + "column": 6 }, "endPos": { "offset": 8, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 7, + "start": 6, "end": 8 } ], diff --git a/packages/dbml-parse/tests/examples/lexer/output/comment.out.json b/packages/dbml-parse/tests/examples/lexer/output/comment.out.json index 8dadefed7..0dcff832c 100644 --- a/packages/dbml-parse/tests/examples/lexer/output/comment.out.json +++ b/packages/dbml-parse/tests/examples/lexer/output/comment.out.json @@ -59,22 +59,22 @@ { "kind": "", "startPos": { - "offset": 35, + "offset": 34, "line": 1, - "column": 1 + "column": 0 }, "endPos": { "offset": 36, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 35, + "start": 34, "end": 36 }, { @@ -101,43 +101,43 @@ { "kind": "", "startPos": { - "offset": 81, + "offset": 80, "line": 9, - "column": 3 + "column": 2 }, "endPos": { "offset": 82, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 81, + "start": 80, "end": 82 }, { "kind": "", "startPos": { - "offset": 83, + "offset": 82, "line": 10, - "column": 1 + "column": 0 }, "endPos": { "offset": 84, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 83, + "start": 82, "end": 84 }, { diff --git a/packages/dbml-parse/tests/examples/lexer/output/function_expression.out.json b/packages/dbml-parse/tests/examples/lexer/output/function_expression.out.json index b45cabd9d..1bd0b3adf 100644 --- a/packages/dbml-parse/tests/examples/lexer/output/function_expression.out.json +++ b/packages/dbml-parse/tests/examples/lexer/output/function_expression.out.json @@ -82,22 +82,22 @@ { "kind": "", "startPos": { - "offset": 15, + "offset": 14, "line": 0, - "column": 15 + "column": 14 }, "endPos": { "offset": 16, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 15, + "start": 14, "end": 16 } ], @@ -124,22 +124,22 @@ { "kind": "", "startPos": { - "offset": 17, + "offset": 16, "line": 1, - "column": 1 + "column": 0 }, "endPos": { "offset": 18, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 17, + "start": 16, "end": 18 } ], @@ -147,22 +147,22 @@ { "kind": "", "startPos": { - "offset": 35, + "offset": 34, "line": 4, - "column": 2 + "column": 1 }, "endPos": { "offset": 36, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 35, + "start": 34, "end": 36 } ], @@ -189,22 +189,22 @@ { "kind": "", "startPos": { - "offset": 37, + "offset": 36, "line": 5, - "column": 1 + "column": 0 }, "endPos": { "offset": 38, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 37, + "start": 36, "end": 38 } ], diff --git a/packages/dbml-parse/tests/examples/lexer/output/identifiers.out.json b/packages/dbml-parse/tests/examples/lexer/output/identifiers.out.json index 61eed117e..ac49c3353 100644 --- a/packages/dbml-parse/tests/examples/lexer/output/identifiers.out.json +++ b/packages/dbml-parse/tests/examples/lexer/output/identifiers.out.json @@ -61,22 +61,22 @@ { "kind": "", "startPos": { - "offset": 17, + "offset": 16, "line": 0, - "column": 17 + "column": 16 }, "endPos": { "offset": 18, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 17, + "start": 16, "end": 18 } ], @@ -104,22 +104,22 @@ { "kind": "", "startPos": { - "offset": 21, + "offset": 20, "line": 1, - "column": 3 + "column": 2 }, "endPos": { "offset": 22, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 21, + "start": 20, "end": 22 } ], @@ -190,22 +190,22 @@ { "kind": "", "startPos": { - "offset": 35, + "offset": 34, "line": 2, - "column": 13 + "column": 12 }, "endPos": { "offset": 36, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 35, + "start": 34, "end": 36 } ], diff --git a/packages/dbml-parse/tests/examples/lexer/output/number.out.json b/packages/dbml-parse/tests/examples/lexer/output/number.out.json index 2aac84464..fda20a3de 100644 --- a/packages/dbml-parse/tests/examples/lexer/output/number.out.json +++ b/packages/dbml-parse/tests/examples/lexer/output/number.out.json @@ -269,22 +269,22 @@ { "kind": "", "startPos": { - "offset": 57, + "offset": 56, "line": 2, - "column": 1 + "column": 0 }, "endPos": { "offset": 58, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 57, + "start": 56, "end": 58 } ], @@ -472,22 +472,22 @@ { "kind": "", "startPos": { - "offset": 57, + "offset": 56, "line": 2, - "column": 1 + "column": 0 }, "endPos": { "offset": 58, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 57, + "start": 56, "end": 58 } ], diff --git a/packages/dbml-parse/tests/examples/lexer/output/strings.out.json b/packages/dbml-parse/tests/examples/lexer/output/strings.out.json index 7f090ba89..6df5805ce 100644 --- a/packages/dbml-parse/tests/examples/lexer/output/strings.out.json +++ b/packages/dbml-parse/tests/examples/lexer/output/strings.out.json @@ -18,22 +18,22 @@ { "kind": "", "startPos": { - "offset": 26, + "offset": 25, "line": 0, - "column": 26 + "column": 25 }, "endPos": { "offset": 27, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 26, + "start": 25, "end": 27 } ], @@ -60,22 +60,22 @@ { "kind": "", "startPos": { - "offset": 28, + "offset": 27, "line": 1, - "column": 1 + "column": 0 }, "endPos": { "offset": 29, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 28, + "start": 27, "end": 29 } ], @@ -83,22 +83,22 @@ { "kind": "", "startPos": { - "offset": 74, + "offset": 73, "line": 2, - "column": 45 + "column": 44 }, "endPos": { "offset": 75, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 74, + "start": 73, "end": 75 } ], @@ -125,22 +125,22 @@ { "kind": "", "startPos": { - "offset": 76, + "offset": 75, "line": 3, - "column": 1 + "column": 0 }, "endPos": { "offset": 77, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 76, + "start": 75, "end": 77 } ], @@ -148,22 +148,22 @@ { "kind": "", "startPos": { - "offset": 104, + "offset": 103, "line": 4, - "column": 27 + "column": 26 }, "endPos": { "offset": 105, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 104, + "start": 103, "end": 105 } ], @@ -190,22 +190,22 @@ { "kind": "", "startPos": { - "offset": 106, + "offset": 105, "line": 5, - "column": 1 + "column": 0 }, "endPos": { "offset": 107, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 106, + "start": 105, "end": 107 } ], @@ -213,22 +213,22 @@ { "kind": "", "startPos": { - "offset": 153, + "offset": 152, "line": 6, - "column": 46 + "column": 45 }, "endPos": { "offset": 154, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 153, + "start": 152, "end": 154 } ], @@ -251,22 +251,22 @@ { "kind": "", "startPos": { - "offset": 155, + "offset": 154, "line": 7, - "column": 1 + "column": 0 }, "endPos": { "offset": 156, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 155, + "start": 154, "end": 156 } ], @@ -316,22 +316,22 @@ { "kind": "", "startPos": { - "offset": 193, + "offset": 192, "line": 9, - "column": 1 + "column": 0 }, "endPos": { "offset": 194, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 193, + "start": 192, "end": 194 } ], @@ -386,22 +386,22 @@ { "kind": "", "startPos": { - "offset": 232, + "offset": 231, "line": 11, - "column": 1 + "column": 0 }, "endPos": { "offset": 233, "line": 12, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 232, + "start": 231, "end": 233 } ], @@ -409,22 +409,22 @@ { "kind": "", "startPos": { - "offset": 268, + "offset": 267, "line": 13, - "column": 4 + "column": 3 }, "endPos": { "offset": 269, "line": 14, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 268, + "start": 267, "end": 269 } ], @@ -447,22 +447,22 @@ { "kind": "", "startPos": { - "offset": 270, + "offset": 269, "line": 14, - "column": 1 + "column": 0 }, "endPos": { "offset": 271, "line": 15, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 270, + "start": 269, "end": 271 } ], @@ -521,22 +521,22 @@ { "kind": "", "startPos": { - "offset": 155, + "offset": 154, "line": 7, - "column": 1 + "column": 0 }, "endPos": { "offset": 156, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 155, + "start": 154, "end": 156 } ], @@ -593,22 +593,22 @@ { "kind": "", "startPos": { - "offset": 193, + "offset": 192, "line": 9, - "column": 1 + "column": 0 }, "endPos": { "offset": 194, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 193, + "start": 192, "end": 194 } ], @@ -665,22 +665,22 @@ { "kind": "", "startPos": { - "offset": 270, + "offset": 269, "line": 14, - "column": 1 + "column": 0 }, "endPos": { "offset": 271, "line": 15, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 270, + "start": 269, "end": 271 } ], diff --git a/packages/dbml-parse/tests/examples/lexer/output/symbols.out.json b/packages/dbml-parse/tests/examples/lexer/output/symbols.out.json index fb8416556..ffaf7d23a 100644 --- a/packages/dbml-parse/tests/examples/lexer/output/symbols.out.json +++ b/packages/dbml-parse/tests/examples/lexer/output/symbols.out.json @@ -147,22 +147,22 @@ { "kind": "", "startPos": { - "offset": 8, + "offset": 7, "line": 0, - "column": 8 + "column": 7 }, "endPos": { "offset": 9, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 8, + "start": 7, "end": 9 } ], @@ -190,22 +190,22 @@ { "kind": "", "startPos": { - "offset": 11, + "offset": 10, "line": 1, - "column": 2 + "column": 1 }, "endPos": { "offset": 12, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 11, + "start": 10, "end": 12 } ], @@ -233,22 +233,22 @@ { "kind": "", "startPos": { - "offset": 14, + "offset": 13, "line": 2, - "column": 2 + "column": 1 }, "endPos": { "offset": 15, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 14, + "start": 13, "end": 15 } ], @@ -491,22 +491,22 @@ { "kind": "", "startPos": { - "offset": 31, + "offset": 30, "line": 3, - "column": 16 + "column": 15 }, "endPos": { "offset": 32, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 31, + "start": 30, "end": 32 } ], @@ -577,22 +577,22 @@ { "kind": "", "startPos": { - "offset": 36, + "offset": 35, "line": 4, - "column": 4 + "column": 3 }, "endPos": { "offset": 37, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 36, + "start": 35, "end": 37 } ], @@ -769,22 +769,22 @@ { "kind": "", "startPos": { - "offset": 46, + "offset": 45, "line": 5, - "column": 9 + "column": 8 }, "endPos": { "offset": 47, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 46, + "start": 45, "end": 47 } ], @@ -812,22 +812,22 @@ { "kind": "", "startPos": { - "offset": 49, + "offset": 48, "line": 6, - "column": 2 + "column": 1 }, "endPos": { "offset": 50, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 49, + "start": 48, "end": 50 } ], @@ -941,22 +941,22 @@ { "kind": "", "startPos": { - "offset": 57, + "offset": 56, "line": 7, - "column": 7 + "column": 6 }, "endPos": { "offset": 58, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 57, + "start": 56, "end": 58 } ], diff --git a/packages/dbml-parse/tests/examples/parser/output/call_expression.out.json b/packages/dbml-parse/tests/examples/parser/output/call_expression.out.json index 733aba9a2..8fb8767b5 100644 --- a/packages/dbml-parse/tests/examples/parser/output/call_expression.out.json +++ b/packages/dbml-parse/tests/examples/parser/output/call_expression.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 22, + "offset": 21, "line": 0, - "column": 22 + "column": 21 }, "endPos": { "offset": 23, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 22, + "start": 21, "end": 23 } ], @@ -543,22 +543,22 @@ { "kind": "", "startPos": { - "offset": 44, + "offset": 43, "line": 1, - "column": 21 + "column": 20 }, "endPos": { "offset": 45, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 44, + "start": 43, "end": 45 } ], @@ -1031,22 +1031,22 @@ { "kind": "", "startPos": { - "offset": 54, + "offset": 53, "line": 2, - "column": 9 + "column": 8 }, "endPos": { "offset": 55, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 54, + "start": 53, "end": 55 } ], @@ -1390,22 +1390,22 @@ { "kind": "", "startPos": { - "offset": 65, + "offset": 64, "line": 3, - "column": 10 + "column": 9 }, "endPos": { "offset": 66, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 65, + "start": 64, "end": 66 } ], diff --git a/packages/dbml-parse/tests/examples/parser/output/element-declaration.out.json b/packages/dbml-parse/tests/examples/parser/output/element-declaration.out.json index d68553ba9..3effc90c1 100644 --- a/packages/dbml-parse/tests/examples/parser/output/element-declaration.out.json +++ b/packages/dbml-parse/tests/examples/parser/output/element-declaration.out.json @@ -1,1608 +1,1608 @@ -{ - "value": { - "id": 22, - "kind": "", - "startPos": { - "offset": 0, - "line": 0, - "column": 0 - }, - "fullStart": 0, - "endPos": { - "offset": 148, - "line": 19, - "column": 1 - }, - "fullEnd": 148, - "start": 0, - "end": 148, - "body": [ - { - "id": 1, - "kind": "", - "startPos": { - "offset": 0, - "line": 0, - "column": 0 - }, - "fullStart": 0, - "endPos": { - "offset": 12, - "line": 2, - "column": 1 - }, - "fullEnd": 14, - "start": 0, - "end": 12, - "type": { - "kind": "", - "startPos": { - "offset": 0, - "line": 0, - "column": 0 - }, - "endPos": { - "offset": 5, - "line": 0, - "column": 5 - }, - "value": "Table", - "leadingTrivia": [], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 5, - "line": 0, - "column": 5 - }, - "endPos": { - "offset": 6, - "line": 0, - "column": 6 - }, - "value": " ", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 5, - "end": 6 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 0, - "end": 5 - }, - "body": { - "id": 0, - "kind": "", - "startPos": { - "offset": 6, - "line": 0, - "column": 6 - }, - "fullStart": 6, - "endPos": { - "offset": 12, - "line": 2, - "column": 1 - }, - "fullEnd": 14, - "start": 6, - "end": 12, - "blockOpenBrace": { - "kind": "", - "startPos": { - "offset": 6, - "line": 0, - "column": 6 - }, - "endPos": { - "offset": 7, - "line": 0, - "column": 7 - }, - "value": "{", - "leadingTrivia": [], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 8, - "line": 0, - "column": 8 - }, - "endPos": { - "offset": 9, - "line": 1, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 8, - "end": 9 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 6, - "end": 7 - }, - "body": [], - "blockCloseBrace": { - "kind": "", - "startPos": { - "offset": 11, - "line": 2, - "column": 0 - }, - "endPos": { - "offset": 12, - "line": 2, - "column": 1 - }, - "value": "}", - "leadingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 10, - "line": 1, - "column": 1 - }, - "endPos": { - "offset": 11, - "line": 2, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 10, - "end": 11 - } - ], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 13, - "line": 2, - "column": 2 - }, - "endPos": { - "offset": 14, - "line": 3, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 13, - "end": 14 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 11, - "end": 12 - } - } - }, - { - "id": 5, - "kind": "", - "startPos": { - "offset": 16, - "line": 4, - "column": 0 - }, - "fullStart": 15, - "endPos": { - "offset": 39, - "line": 6, - "column": 1 - }, - "fullEnd": 41, - "start": 16, - "end": 39, - "type": { - "kind": "", - "startPos": { - "offset": 16, - "line": 4, - "column": 0 - }, - "endPos": { - "offset": 26, - "line": 4, - "column": 10 - }, - "value": "TableGroup", - "leadingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 15, - "line": 3, - "column": 1 - }, - "endPos": { - "offset": 16, - "line": 4, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 15, - "end": 16 - } - ], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 26, - "line": 4, - "column": 10 - }, - "endPos": { - "offset": 27, - "line": 4, - "column": 11 - }, - "value": " ", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 26, - "end": 27 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 16, - "end": 26 - }, - "name": { - "id": 3, - "kind": "", - "startPos": { - "offset": 27, - "line": 4, - "column": 11 - }, - "fullStart": 27, - "endPos": { - "offset": 32, - "line": 4, - "column": 16 - }, - "fullEnd": 33, - "start": 27, - "end": 32, - "expression": { - "id": 2, - "kind": "", - "startPos": { - "offset": 27, - "line": 4, - "column": 11 - }, - "fullStart": 27, - "endPos": { - "offset": 32, - "line": 4, - "column": 16 - }, - "fullEnd": 33, - "start": 27, - "end": 32, - "variable": { - "kind": "", - "startPos": { - "offset": 27, - "line": 4, - "column": 11 - }, - "endPos": { - "offset": 32, - "line": 4, - "column": 16 - }, - "value": "group", - "leadingTrivia": [], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 32, - "line": 4, - "column": 16 - }, - "endPos": { - "offset": 33, - "line": 4, - "column": 17 - }, - "value": " ", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 32, - "end": 33 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 27, - "end": 32 - } - } - }, - "body": { - "id": 4, - "kind": "", - "startPos": { - "offset": 33, - "line": 4, - "column": 17 - }, - "fullStart": 33, - "endPos": { - "offset": 39, - "line": 6, - "column": 1 - }, - "fullEnd": 41, - "start": 33, - "end": 39, - "blockOpenBrace": { - "kind": "", - "startPos": { - "offset": 33, - "line": 4, - "column": 17 - }, - "endPos": { - "offset": 34, - "line": 4, - "column": 18 - }, - "value": "{", - "leadingTrivia": [], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 35, - "line": 4, - "column": 19 - }, - "endPos": { - "offset": 36, - "line": 5, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 35, - "end": 36 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 33, - "end": 34 - }, - "body": [], - "blockCloseBrace": { - "kind": "", - "startPos": { - "offset": 38, - "line": 6, - "column": 0 - }, - "endPos": { - "offset": 39, - "line": 6, - "column": 1 - }, - "value": "}", - "leadingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 37, - "line": 5, - "column": 1 - }, - "endPos": { - "offset": 38, - "line": 6, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 37, - "end": 38 - } - ], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 40, - "line": 6, - "column": 2 - }, - "endPos": { - "offset": 41, - "line": 7, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 40, - "end": 41 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 38, - "end": 39 - } - } - }, - { - "id": 7, - "kind": "", - "startPos": { - "offset": 43, - "line": 8, - "column": 0 - }, - "fullStart": 42, - "endPos": { - "offset": 53, - "line": 10, - "column": 1 - }, - "fullEnd": 55, - "start": 43, - "end": 53, - "type": { - "kind": "", - "startPos": { - "offset": 43, - "line": 8, - "column": 0 - }, - "endPos": { - "offset": 46, - "line": 8, - "column": 3 - }, - "value": "Ref", - "leadingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 42, - "line": 7, - "column": 1 - }, - "endPos": { - "offset": 43, - "line": 8, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 42, - "end": 43 - } - ], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 46, - "line": 8, - "column": 3 - }, - "endPos": { - "offset": 47, - "line": 8, - "column": 4 - }, - "value": " ", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 46, - "end": 47 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 43, - "end": 46 - }, - "body": { - "id": 6, - "kind": "", - "startPos": { - "offset": 47, - "line": 8, - "column": 4 - }, - "fullStart": 47, - "endPos": { - "offset": 53, - "line": 10, - "column": 1 - }, - "fullEnd": 55, - "start": 47, - "end": 53, - "blockOpenBrace": { - "kind": "", - "startPos": { - "offset": 47, - "line": 8, - "column": 4 - }, - "endPos": { - "offset": 48, - "line": 8, - "column": 5 - }, - "value": "{", - "leadingTrivia": [], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 49, - "line": 8, - "column": 6 - }, - "endPos": { - "offset": 50, - "line": 9, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 49, - "end": 50 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 47, - "end": 48 - }, - "body": [], - "blockCloseBrace": { - "kind": "", - "startPos": { - "offset": 52, - "line": 10, - "column": 0 - }, - "endPos": { - "offset": 53, - "line": 10, - "column": 1 - }, - "value": "}", - "leadingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 51, - "line": 9, - "column": 1 - }, - "endPos": { - "offset": 52, - "line": 10, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 51, - "end": 52 - } - ], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 54, - "line": 10, - "column": 2 - }, - "endPos": { - "offset": 55, - "line": 11, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 54, - "end": 55 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 52, - "end": 53 - } - } - }, - { - "id": 11, - "kind": "", - "startPos": { - "offset": 57, - "line": 12, - "column": 0 - }, - "fullStart": 56, - "endPos": { - "offset": 79, - "line": 12, - "column": 22 - }, - "fullEnd": 81, - "start": 57, - "end": 79, - "type": { - "kind": "", - "startPos": { - "offset": 57, - "line": 12, - "column": 0 - }, - "endPos": { - "offset": 61, - "line": 12, - "column": 4 - }, - "value": "Note", - "leadingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 56, - "line": 11, - "column": 1 - }, - "endPos": { - "offset": 57, - "line": 12, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 56, - "end": 57 - } - ], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 57, - "end": 61 - }, - "bodyColon": { - "kind": "", - "startPos": { - "offset": 61, - "line": 12, - "column": 4 - }, - "endPos": { - "offset": 62, - "line": 12, - "column": 5 - }, - "value": ":", - "leadingTrivia": [], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 62, - "line": 12, - "column": 5 - }, - "endPos": { - "offset": 63, - "line": 12, - "column": 6 - }, - "value": " ", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 62, - "end": 63 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 61, - "end": 62 - }, - "body": { - "id": 10, - "kind": "", - "startPos": { - "offset": 63, - "line": 12, - "column": 6 - }, - "fullStart": 63, - "endPos": { - "offset": 79, - "line": 12, - "column": 22 - }, - "fullEnd": 81, - "start": 63, - "end": 79, - "callee": { - "id": 9, - "kind": "", - "startPos": { - "offset": 63, - "line": 12, - "column": 6 - }, - "fullStart": 63, - "endPos": { - "offset": 79, - "line": 12, - "column": 22 - }, - "fullEnd": 81, - "start": 63, - "end": 79, - "expression": { - "id": 8, - "kind": "", - "startPos": { - "offset": 63, - "line": 12, - "column": 6 - }, - "fullStart": 63, - "endPos": { - "offset": 79, - "line": 12, - "column": 22 - }, - "fullEnd": 81, - "start": 63, - "end": 79, - "literal": { - "kind": "", - "startPos": { - "offset": 63, - "line": 12, - "column": 6 - }, - "endPos": { - "offset": 79, - "line": 12, - "column": 22 - }, - "value": "This is a note", - "leadingTrivia": [], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 80, - "line": 12, - "column": 23 - }, - "endPos": { - "offset": 81, - "line": 13, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 80, - "end": 81 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 63, - "end": 79 - } - } - }, - "args": [] - } - }, - { - "id": 15, - "kind": "", - "startPos": { - "offset": 83, - "line": 14, - "column": 0 - }, - "fullStart": 82, - "endPos": { - "offset": 117, - "line": 15, - "column": 15 - }, - "fullEnd": 119, - "start": 83, - "end": 117, - "type": { - "kind": "", - "startPos": { - "offset": 83, - "line": 14, - "column": 0 - }, - "endPos": { - "offset": 87, - "line": 14, - "column": 4 - }, - "value": "Note", - "leadingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 82, - "line": 13, - "column": 1 - }, - "endPos": { - "offset": 83, - "line": 14, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 82, - "end": 83 - } - ], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 83, - "end": 87 - }, - "bodyColon": { - "kind": "", - "startPos": { - "offset": 87, - "line": 14, - "column": 4 - }, - "endPos": { - "offset": 88, - "line": 14, - "column": 5 - }, - "value": ":", - "leadingTrivia": [], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 88, - "line": 14, - "column": 5 - }, - "endPos": { - "offset": 89, - "line": 14, - "column": 6 - }, - "value": " ", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 88, - "end": 89 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 87, - "end": 88 - }, - "body": { - "id": 14, - "kind": "", - "startPos": { - "offset": 89, - "line": 14, - "column": 6 - }, - "fullStart": 89, - "endPos": { - "offset": 117, - "line": 15, - "column": 15 - }, - "fullEnd": 119, - "start": 89, - "end": 117, - "callee": { - "id": 13, - "kind": "", - "startPos": { - "offset": 89, - "line": 14, - "column": 6 - }, - "fullStart": 89, - "endPos": { - "offset": 117, - "line": 15, - "column": 15 - }, - "fullEnd": 119, - "start": 89, - "end": 117, - "expression": { - "id": 12, - "kind": "", - "startPos": { - "offset": 89, - "line": 14, - "column": 6 - }, - "fullStart": 89, - "endPos": { - "offset": 117, - "line": 15, - "column": 15 - }, - "fullEnd": 119, - "start": 89, - "end": 117, - "literal": { - "kind": "", - "startPos": { - "offset": 89, - "line": 14, - "column": 6 - }, - "endPos": { - "offset": 117, - "line": 15, - "column": 15 - }, - "value": "This is \r\nanother note", - "leadingTrivia": [], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 118, - "line": 15, - "column": 16 - }, - "endPos": { - "offset": 119, - "line": 16, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 118, - "end": 119 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 89, - "end": 117 - } - } - }, - "args": [] - } - }, - { - "id": 21, - "kind": "", - "startPos": { - "offset": 121, - "line": 17, - "column": 0 - }, - "fullStart": 120, - "endPos": { - "offset": 148, - "line": 19, - "column": 1 - }, - "fullEnd": 148, - "start": 121, - "end": 148, - "type": { - "kind": "", - "startPos": { - "offset": 121, - "line": 17, - "column": 0 - }, - "endPos": { - "offset": 126, - "line": 17, - "column": 5 - }, - "value": "Table", - "leadingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 120, - "line": 16, - "column": 1 - }, - "endPos": { - "offset": 121, - "line": 17, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 120, - "end": 121 - } - ], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 126, - "line": 17, - "column": 5 - }, - "endPos": { - "offset": 127, - "line": 17, - "column": 6 - }, - "value": " ", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 126, - "end": 127 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 121, - "end": 126 - }, - "name": { - "id": 17, - "kind": "", - "startPos": { - "offset": 127, - "line": 17, - "column": 6 - }, - "fullStart": 127, - "endPos": { - "offset": 132, - "line": 17, - "column": 11 - }, - "fullEnd": 133, - "start": 127, - "end": 132, - "expression": { - "id": 16, - "kind": "", - "startPos": { - "offset": 127, - "line": 17, - "column": 6 - }, - "fullStart": 127, - "endPos": { - "offset": 132, - "line": 17, - "column": 11 - }, - "fullEnd": 133, - "start": 127, - "end": 132, - "variable": { - "kind": "", - "startPos": { - "offset": 127, - "line": 17, - "column": 6 - }, - "endPos": { - "offset": 132, - "line": 17, - "column": 11 - }, - "value": "Users", - "leadingTrivia": [], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 132, - "line": 17, - "column": 11 - }, - "endPos": { - "offset": 133, - "line": 17, - "column": 12 - }, - "value": " ", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 132, - "end": 133 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 127, - "end": 132 - } - } - }, - "as": { - "kind": "", - "startPos": { - "offset": 133, - "line": 17, - "column": 12 - }, - "endPos": { - "offset": 135, - "line": 17, - "column": 14 - }, - "value": "as", - "leadingTrivia": [], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 135, - "line": 17, - "column": 14 - }, - "endPos": { - "offset": 136, - "line": 17, - "column": 15 - }, - "value": " ", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 135, - "end": 136 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 133, - "end": 135 - }, - "alias": { - "id": 19, - "kind": "", - "startPos": { - "offset": 136, - "line": 17, - "column": 15 - }, - "fullStart": 136, - "endPos": { - "offset": 137, - "line": 17, - "column": 16 - }, - "fullEnd": 138, - "start": 136, - "end": 137, - "expression": { - "id": 18, - "kind": "", - "startPos": { - "offset": 136, - "line": 17, - "column": 15 - }, - "fullStart": 136, - "endPos": { - "offset": 137, - "line": 17, - "column": 16 - }, - "fullEnd": 138, - "start": 136, - "end": 137, - "variable": { - "kind": "", - "startPos": { - "offset": 136, - "line": 17, - "column": 15 - }, - "endPos": { - "offset": 137, - "line": 17, - "column": 16 - }, - "value": "U", - "leadingTrivia": [], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 137, - "line": 17, - "column": 16 - }, - "endPos": { - "offset": 138, - "line": 17, - "column": 17 - }, - "value": " ", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 137, - "end": 138 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 136, - "end": 137 - } - } - }, - "body": { - "id": 20, - "kind": "", - "startPos": { - "offset": 138, - "line": 17, - "column": 17 - }, - "fullStart": 138, - "endPos": { - "offset": 148, - "line": 19, - "column": 1 - }, - "fullEnd": 148, - "start": 138, - "end": 148, - "blockOpenBrace": { - "kind": "", - "startPos": { - "offset": 138, - "line": 17, - "column": 17 - }, - "endPos": { - "offset": 139, - "line": 17, - "column": 18 - }, - "value": "{", - "leadingTrivia": [], - "trailingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 140, - "line": 17, - "column": 19 - }, - "endPos": { - "offset": 141, - "line": 18, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 140, - "end": 141 - } - ], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 138, - "end": 139 - }, - "body": [], - "blockCloseBrace": { - "kind": "", - "startPos": { - "offset": 147, - "line": 19, - "column": 0 - }, - "endPos": { - "offset": 148, - "line": 19, - "column": 1 - }, - "value": "}", - "leadingTrivia": [ - { - "kind": "", - "startPos": { - "offset": 141, - "line": 18, - "column": 0 - }, - "endPos": { - "offset": 142, - "line": 18, - "column": 1 - }, - "value": " ", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 141, - "end": 142 - }, - { - "kind": "", - "startPos": { - "offset": 142, - "line": 18, - "column": 1 - }, - "endPos": { - "offset": 143, - "line": 18, - "column": 2 - }, - "value": " ", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 142, - "end": 143 - }, - { - "kind": "", - "startPos": { - "offset": 143, - "line": 18, - "column": 2 - }, - "endPos": { - "offset": 144, - "line": 18, - "column": 3 - }, - "value": " ", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 143, - "end": 144 - }, - { - "kind": "", - "startPos": { - "offset": 144, - "line": 18, - "column": 3 - }, - "endPos": { - "offset": 145, - "line": 18, - "column": 4 - }, - "value": " ", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 144, - "end": 145 - }, - { - "kind": "", - "startPos": { - "offset": 146, - "line": 18, - "column": 5 - }, - "endPos": { - "offset": 147, - "line": 19, - "column": 0 - }, - "value": "\n", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 146, - "end": 147 - } - ], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 147, - "end": 148 - } - } - } - ], - "eof": { - "kind": "", - "startPos": { - "offset": 148, - "line": 19, - "column": 1 - }, - "endPos": { - "offset": 148, - "line": 19, - "column": 1 - }, - "value": "", - "leadingTrivia": [], - "trailingTrivia": [], - "leadingInvalid": [], - "trailingInvalid": [], - "isInvalid": false, - "start": 148, - "end": 148 - } - }, - "errors": [] +{ + "value": { + "id": 22, + "kind": "", + "startPos": { + "offset": 0, + "line": 0, + "column": 0 + }, + "fullStart": 0, + "endPos": { + "offset": 148, + "line": 19, + "column": 1 + }, + "fullEnd": 148, + "start": 0, + "end": 148, + "body": [ + { + "id": 1, + "kind": "", + "startPos": { + "offset": 0, + "line": 0, + "column": 0 + }, + "fullStart": 0, + "endPos": { + "offset": 12, + "line": 2, + "column": 1 + }, + "fullEnd": 14, + "start": 0, + "end": 12, + "type": { + "kind": "", + "startPos": { + "offset": 0, + "line": 0, + "column": 0 + }, + "endPos": { + "offset": 5, + "line": 0, + "column": 5 + }, + "value": "Table", + "leadingTrivia": [], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 5, + "line": 0, + "column": 5 + }, + "endPos": { + "offset": 6, + "line": 0, + "column": 6 + }, + "value": " ", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 5, + "end": 6 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 0, + "end": 5 + }, + "body": { + "id": 0, + "kind": "", + "startPos": { + "offset": 6, + "line": 0, + "column": 6 + }, + "fullStart": 6, + "endPos": { + "offset": 12, + "line": 2, + "column": 1 + }, + "fullEnd": 14, + "start": 6, + "end": 12, + "blockOpenBrace": { + "kind": "", + "startPos": { + "offset": 6, + "line": 0, + "column": 6 + }, + "endPos": { + "offset": 7, + "line": 0, + "column": 7 + }, + "value": "{", + "leadingTrivia": [], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 7, + "line": 0, + "column": 7 + }, + "endPos": { + "offset": 9, + "line": 1, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 7, + "end": 9 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 6, + "end": 7 + }, + "body": [], + "blockCloseBrace": { + "kind": "", + "startPos": { + "offset": 11, + "line": 2, + "column": 0 + }, + "endPos": { + "offset": 12, + "line": 2, + "column": 1 + }, + "value": "}", + "leadingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 9, + "line": 1, + "column": 0 + }, + "endPos": { + "offset": 11, + "line": 2, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 9, + "end": 11 + } + ], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 12, + "line": 2, + "column": 1 + }, + "endPos": { + "offset": 14, + "line": 3, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 12, + "end": 14 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 11, + "end": 12 + } + } + }, + { + "id": 5, + "kind": "", + "startPos": { + "offset": 16, + "line": 4, + "column": 0 + }, + "fullStart": 14, + "endPos": { + "offset": 39, + "line": 6, + "column": 1 + }, + "fullEnd": 41, + "start": 16, + "end": 39, + "type": { + "kind": "", + "startPos": { + "offset": 16, + "line": 4, + "column": 0 + }, + "endPos": { + "offset": 26, + "line": 4, + "column": 10 + }, + "value": "TableGroup", + "leadingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 14, + "line": 3, + "column": 0 + }, + "endPos": { + "offset": 16, + "line": 4, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 14, + "end": 16 + } + ], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 26, + "line": 4, + "column": 10 + }, + "endPos": { + "offset": 27, + "line": 4, + "column": 11 + }, + "value": " ", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 26, + "end": 27 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 16, + "end": 26 + }, + "name": { + "id": 3, + "kind": "", + "startPos": { + "offset": 27, + "line": 4, + "column": 11 + }, + "fullStart": 27, + "endPos": { + "offset": 32, + "line": 4, + "column": 16 + }, + "fullEnd": 33, + "start": 27, + "end": 32, + "expression": { + "id": 2, + "kind": "", + "startPos": { + "offset": 27, + "line": 4, + "column": 11 + }, + "fullStart": 27, + "endPos": { + "offset": 32, + "line": 4, + "column": 16 + }, + "fullEnd": 33, + "start": 27, + "end": 32, + "variable": { + "kind": "", + "startPos": { + "offset": 27, + "line": 4, + "column": 11 + }, + "endPos": { + "offset": 32, + "line": 4, + "column": 16 + }, + "value": "group", + "leadingTrivia": [], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 32, + "line": 4, + "column": 16 + }, + "endPos": { + "offset": 33, + "line": 4, + "column": 17 + }, + "value": " ", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 32, + "end": 33 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 27, + "end": 32 + } + } + }, + "body": { + "id": 4, + "kind": "", + "startPos": { + "offset": 33, + "line": 4, + "column": 17 + }, + "fullStart": 33, + "endPos": { + "offset": 39, + "line": 6, + "column": 1 + }, + "fullEnd": 41, + "start": 33, + "end": 39, + "blockOpenBrace": { + "kind": "", + "startPos": { + "offset": 33, + "line": 4, + "column": 17 + }, + "endPos": { + "offset": 34, + "line": 4, + "column": 18 + }, + "value": "{", + "leadingTrivia": [], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 34, + "line": 4, + "column": 18 + }, + "endPos": { + "offset": 36, + "line": 5, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 34, + "end": 36 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 33, + "end": 34 + }, + "body": [], + "blockCloseBrace": { + "kind": "", + "startPos": { + "offset": 38, + "line": 6, + "column": 0 + }, + "endPos": { + "offset": 39, + "line": 6, + "column": 1 + }, + "value": "}", + "leadingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 36, + "line": 5, + "column": 0 + }, + "endPos": { + "offset": 38, + "line": 6, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 36, + "end": 38 + } + ], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 39, + "line": 6, + "column": 1 + }, + "endPos": { + "offset": 41, + "line": 7, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 39, + "end": 41 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 38, + "end": 39 + } + } + }, + { + "id": 7, + "kind": "", + "startPos": { + "offset": 43, + "line": 8, + "column": 0 + }, + "fullStart": 41, + "endPos": { + "offset": 53, + "line": 10, + "column": 1 + }, + "fullEnd": 55, + "start": 43, + "end": 53, + "type": { + "kind": "", + "startPos": { + "offset": 43, + "line": 8, + "column": 0 + }, + "endPos": { + "offset": 46, + "line": 8, + "column": 3 + }, + "value": "Ref", + "leadingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 41, + "line": 7, + "column": 0 + }, + "endPos": { + "offset": 43, + "line": 8, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 41, + "end": 43 + } + ], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 46, + "line": 8, + "column": 3 + }, + "endPos": { + "offset": 47, + "line": 8, + "column": 4 + }, + "value": " ", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 46, + "end": 47 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 43, + "end": 46 + }, + "body": { + "id": 6, + "kind": "", + "startPos": { + "offset": 47, + "line": 8, + "column": 4 + }, + "fullStart": 47, + "endPos": { + "offset": 53, + "line": 10, + "column": 1 + }, + "fullEnd": 55, + "start": 47, + "end": 53, + "blockOpenBrace": { + "kind": "", + "startPos": { + "offset": 47, + "line": 8, + "column": 4 + }, + "endPos": { + "offset": 48, + "line": 8, + "column": 5 + }, + "value": "{", + "leadingTrivia": [], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 48, + "line": 8, + "column": 5 + }, + "endPos": { + "offset": 50, + "line": 9, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 48, + "end": 50 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 47, + "end": 48 + }, + "body": [], + "blockCloseBrace": { + "kind": "", + "startPos": { + "offset": 52, + "line": 10, + "column": 0 + }, + "endPos": { + "offset": 53, + "line": 10, + "column": 1 + }, + "value": "}", + "leadingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 50, + "line": 9, + "column": 0 + }, + "endPos": { + "offset": 52, + "line": 10, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 50, + "end": 52 + } + ], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 53, + "line": 10, + "column": 1 + }, + "endPos": { + "offset": 55, + "line": 11, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 53, + "end": 55 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 52, + "end": 53 + } + } + }, + { + "id": 11, + "kind": "", + "startPos": { + "offset": 57, + "line": 12, + "column": 0 + }, + "fullStart": 55, + "endPos": { + "offset": 79, + "line": 12, + "column": 22 + }, + "fullEnd": 81, + "start": 57, + "end": 79, + "type": { + "kind": "", + "startPos": { + "offset": 57, + "line": 12, + "column": 0 + }, + "endPos": { + "offset": 61, + "line": 12, + "column": 4 + }, + "value": "Note", + "leadingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 55, + "line": 11, + "column": 0 + }, + "endPos": { + "offset": 57, + "line": 12, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 55, + "end": 57 + } + ], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 57, + "end": 61 + }, + "bodyColon": { + "kind": "", + "startPos": { + "offset": 61, + "line": 12, + "column": 4 + }, + "endPos": { + "offset": 62, + "line": 12, + "column": 5 + }, + "value": ":", + "leadingTrivia": [], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 62, + "line": 12, + "column": 5 + }, + "endPos": { + "offset": 63, + "line": 12, + "column": 6 + }, + "value": " ", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 62, + "end": 63 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 61, + "end": 62 + }, + "body": { + "id": 10, + "kind": "", + "startPos": { + "offset": 63, + "line": 12, + "column": 6 + }, + "fullStart": 63, + "endPos": { + "offset": 79, + "line": 12, + "column": 22 + }, + "fullEnd": 81, + "start": 63, + "end": 79, + "callee": { + "id": 9, + "kind": "", + "startPos": { + "offset": 63, + "line": 12, + "column": 6 + }, + "fullStart": 63, + "endPos": { + "offset": 79, + "line": 12, + "column": 22 + }, + "fullEnd": 81, + "start": 63, + "end": 79, + "expression": { + "id": 8, + "kind": "", + "startPos": { + "offset": 63, + "line": 12, + "column": 6 + }, + "fullStart": 63, + "endPos": { + "offset": 79, + "line": 12, + "column": 22 + }, + "fullEnd": 81, + "start": 63, + "end": 79, + "literal": { + "kind": "", + "startPos": { + "offset": 63, + "line": 12, + "column": 6 + }, + "endPos": { + "offset": 79, + "line": 12, + "column": 22 + }, + "value": "This is a note", + "leadingTrivia": [], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 79, + "line": 12, + "column": 22 + }, + "endPos": { + "offset": 81, + "line": 13, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 79, + "end": 81 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 63, + "end": 79 + } + } + }, + "args": [] + } + }, + { + "id": 15, + "kind": "", + "startPos": { + "offset": 83, + "line": 14, + "column": 0 + }, + "fullStart": 81, + "endPos": { + "offset": 117, + "line": 15, + "column": 15 + }, + "fullEnd": 119, + "start": 83, + "end": 117, + "type": { + "kind": "", + "startPos": { + "offset": 83, + "line": 14, + "column": 0 + }, + "endPos": { + "offset": 87, + "line": 14, + "column": 4 + }, + "value": "Note", + "leadingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 81, + "line": 13, + "column": 0 + }, + "endPos": { + "offset": 83, + "line": 14, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 81, + "end": 83 + } + ], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 83, + "end": 87 + }, + "bodyColon": { + "kind": "", + "startPos": { + "offset": 87, + "line": 14, + "column": 4 + }, + "endPos": { + "offset": 88, + "line": 14, + "column": 5 + }, + "value": ":", + "leadingTrivia": [], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 88, + "line": 14, + "column": 5 + }, + "endPos": { + "offset": 89, + "line": 14, + "column": 6 + }, + "value": " ", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 88, + "end": 89 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 87, + "end": 88 + }, + "body": { + "id": 14, + "kind": "", + "startPos": { + "offset": 89, + "line": 14, + "column": 6 + }, + "fullStart": 89, + "endPos": { + "offset": 117, + "line": 15, + "column": 15 + }, + "fullEnd": 119, + "start": 89, + "end": 117, + "callee": { + "id": 13, + "kind": "", + "startPos": { + "offset": 89, + "line": 14, + "column": 6 + }, + "fullStart": 89, + "endPos": { + "offset": 117, + "line": 15, + "column": 15 + }, + "fullEnd": 119, + "start": 89, + "end": 117, + "expression": { + "id": 12, + "kind": "", + "startPos": { + "offset": 89, + "line": 14, + "column": 6 + }, + "fullStart": 89, + "endPos": { + "offset": 117, + "line": 15, + "column": 15 + }, + "fullEnd": 119, + "start": 89, + "end": 117, + "literal": { + "kind": "", + "startPos": { + "offset": 89, + "line": 14, + "column": 6 + }, + "endPos": { + "offset": 117, + "line": 15, + "column": 15 + }, + "value": "This is \r\nanother note", + "leadingTrivia": [], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 117, + "line": 15, + "column": 15 + }, + "endPos": { + "offset": 119, + "line": 16, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 117, + "end": 119 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 89, + "end": 117 + } + } + }, + "args": [] + } + }, + { + "id": 21, + "kind": "", + "startPos": { + "offset": 121, + "line": 17, + "column": 0 + }, + "fullStart": 119, + "endPos": { + "offset": 148, + "line": 19, + "column": 1 + }, + "fullEnd": 148, + "start": 121, + "end": 148, + "type": { + "kind": "", + "startPos": { + "offset": 121, + "line": 17, + "column": 0 + }, + "endPos": { + "offset": 126, + "line": 17, + "column": 5 + }, + "value": "Table", + "leadingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 119, + "line": 16, + "column": 0 + }, + "endPos": { + "offset": 121, + "line": 17, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 119, + "end": 121 + } + ], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 126, + "line": 17, + "column": 5 + }, + "endPos": { + "offset": 127, + "line": 17, + "column": 6 + }, + "value": " ", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 126, + "end": 127 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 121, + "end": 126 + }, + "name": { + "id": 17, + "kind": "", + "startPos": { + "offset": 127, + "line": 17, + "column": 6 + }, + "fullStart": 127, + "endPos": { + "offset": 132, + "line": 17, + "column": 11 + }, + "fullEnd": 133, + "start": 127, + "end": 132, + "expression": { + "id": 16, + "kind": "", + "startPos": { + "offset": 127, + "line": 17, + "column": 6 + }, + "fullStart": 127, + "endPos": { + "offset": 132, + "line": 17, + "column": 11 + }, + "fullEnd": 133, + "start": 127, + "end": 132, + "variable": { + "kind": "", + "startPos": { + "offset": 127, + "line": 17, + "column": 6 + }, + "endPos": { + "offset": 132, + "line": 17, + "column": 11 + }, + "value": "Users", + "leadingTrivia": [], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 132, + "line": 17, + "column": 11 + }, + "endPos": { + "offset": 133, + "line": 17, + "column": 12 + }, + "value": " ", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 132, + "end": 133 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 127, + "end": 132 + } + } + }, + "as": { + "kind": "", + "startPos": { + "offset": 133, + "line": 17, + "column": 12 + }, + "endPos": { + "offset": 135, + "line": 17, + "column": 14 + }, + "value": "as", + "leadingTrivia": [], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 135, + "line": 17, + "column": 14 + }, + "endPos": { + "offset": 136, + "line": 17, + "column": 15 + }, + "value": " ", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 135, + "end": 136 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 133, + "end": 135 + }, + "alias": { + "id": 19, + "kind": "", + "startPos": { + "offset": 136, + "line": 17, + "column": 15 + }, + "fullStart": 136, + "endPos": { + "offset": 137, + "line": 17, + "column": 16 + }, + "fullEnd": 138, + "start": 136, + "end": 137, + "expression": { + "id": 18, + "kind": "", + "startPos": { + "offset": 136, + "line": 17, + "column": 15 + }, + "fullStart": 136, + "endPos": { + "offset": 137, + "line": 17, + "column": 16 + }, + "fullEnd": 138, + "start": 136, + "end": 137, + "variable": { + "kind": "", + "startPos": { + "offset": 136, + "line": 17, + "column": 15 + }, + "endPos": { + "offset": 137, + "line": 17, + "column": 16 + }, + "value": "U", + "leadingTrivia": [], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 137, + "line": 17, + "column": 16 + }, + "endPos": { + "offset": 138, + "line": 17, + "column": 17 + }, + "value": " ", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 137, + "end": 138 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 136, + "end": 137 + } + } + }, + "body": { + "id": 20, + "kind": "", + "startPos": { + "offset": 138, + "line": 17, + "column": 17 + }, + "fullStart": 138, + "endPos": { + "offset": 148, + "line": 19, + "column": 1 + }, + "fullEnd": 148, + "start": 138, + "end": 148, + "blockOpenBrace": { + "kind": "", + "startPos": { + "offset": 138, + "line": 17, + "column": 17 + }, + "endPos": { + "offset": 139, + "line": 17, + "column": 18 + }, + "value": "{", + "leadingTrivia": [], + "trailingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 139, + "line": 17, + "column": 18 + }, + "endPos": { + "offset": 141, + "line": 18, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 139, + "end": 141 + } + ], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 138, + "end": 139 + }, + "body": [], + "blockCloseBrace": { + "kind": "", + "startPos": { + "offset": 147, + "line": 19, + "column": 0 + }, + "endPos": { + "offset": 148, + "line": 19, + "column": 1 + }, + "value": "}", + "leadingTrivia": [ + { + "kind": "", + "startPos": { + "offset": 141, + "line": 18, + "column": 0 + }, + "endPos": { + "offset": 142, + "line": 18, + "column": 1 + }, + "value": " ", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 141, + "end": 142 + }, + { + "kind": "", + "startPos": { + "offset": 142, + "line": 18, + "column": 1 + }, + "endPos": { + "offset": 143, + "line": 18, + "column": 2 + }, + "value": " ", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 142, + "end": 143 + }, + { + "kind": "", + "startPos": { + "offset": 143, + "line": 18, + "column": 2 + }, + "endPos": { + "offset": 144, + "line": 18, + "column": 3 + }, + "value": " ", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 143, + "end": 144 + }, + { + "kind": "", + "startPos": { + "offset": 144, + "line": 18, + "column": 3 + }, + "endPos": { + "offset": 145, + "line": 18, + "column": 4 + }, + "value": " ", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 144, + "end": 145 + }, + { + "kind": "", + "startPos": { + "offset": 145, + "line": 18, + "column": 4 + }, + "endPos": { + "offset": 147, + "line": 19, + "column": 0 + }, + "value": "\r\n", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 145, + "end": 147 + } + ], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 147, + "end": 148 + } + } + } + ], + "eof": { + "kind": "", + "startPos": { + "offset": 148, + "line": 19, + "column": 1 + }, + "endPos": { + "offset": 148, + "line": 19, + "column": 1 + }, + "value": "", + "leadingTrivia": [], + "trailingTrivia": [], + "leadingInvalid": [], + "trailingInvalid": [], + "isInvalid": false, + "start": 148, + "end": 148 + } + }, + "errors": [] } \ No newline at end of file diff --git a/packages/dbml-parse/tests/examples/parser/output/expression.out.json b/packages/dbml-parse/tests/examples/parser/output/expression.out.json index 2c8509163..4161d1a82 100644 --- a/packages/dbml-parse/tests/examples/parser/output/expression.out.json +++ b/packages/dbml-parse/tests/examples/parser/output/expression.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 18, + "offset": 17, "line": 0, - "column": 18 + "column": 17 }, "endPos": { "offset": 19, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 18, + "start": 17, "end": 19 } ], @@ -357,22 +357,22 @@ { "kind": "", "startPos": { - "offset": 27, + "offset": 26, "line": 1, - "column": 8 + "column": 7 }, "endPos": { "offset": 28, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 27, + "start": 26, "end": 28 } ], @@ -637,22 +637,22 @@ { "kind": "", "startPos": { - "offset": 33, + "offset": 32, "line": 2, - "column": 5 + "column": 4 }, "endPos": { "offset": 34, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 33, + "start": 32, "end": 34 }, { @@ -962,22 +962,22 @@ { "kind": "", "startPos": { - "offset": 48, + "offset": 47, "line": 3, - "column": 14 + "column": 13 }, "endPos": { "offset": 49, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 48, + "start": 47, "end": 49 } ], @@ -1426,22 +1426,22 @@ { "kind": "", "startPos": { - "offset": 63, + "offset": 62, "line": 4, - "column": 14 + "column": 13 }, "endPos": { "offset": 64, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 63, + "start": 62, "end": 64 } ], @@ -1928,22 +1928,22 @@ { "kind": "", "startPos": { - "offset": 79, + "offset": 78, "line": 5, - "column": 15 + "column": 14 }, "endPos": { "offset": 80, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 79, + "start": 78, "end": 80 } ], @@ -2454,22 +2454,22 @@ { "kind": "", "startPos": { - "offset": 96, + "offset": 95, "line": 6, - "column": 16 + "column": 15 }, "endPos": { "offset": 97, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 96, + "start": 95, "end": 97 } ], @@ -2917,22 +2917,22 @@ { "kind": "", "startPos": { - "offset": 115, + "offset": 114, "line": 7, - "column": 18 + "column": 17 }, "endPos": { "offset": 116, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 115, + "start": 114, "end": 116 } ], @@ -2955,7 +2955,7 @@ "line": 9, "column": 4 }, - "fullStart": 117, + "fullStart": 116, "endPos": { "offset": 141, "line": 11, @@ -2972,7 +2972,7 @@ "line": 9, "column": 4 }, - "fullStart": 117, + "fullStart": 116, "endPos": { "offset": 141, "line": 11, @@ -2999,22 +2999,22 @@ { "kind": "", "startPos": { - "offset": 135, + "offset": 134, "line": 10, - "column": 8 + "column": 7 }, "endPos": { "offset": 136, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 135, + "start": 134, "end": 136 } ], @@ -3032,7 +3032,7 @@ "line": 9, "column": 4 }, - "fullStart": 117, + "fullStart": 116, "endPos": { "offset": 132, "line": 10, @@ -3059,22 +3059,22 @@ { "kind": "", "startPos": { - "offset": 126, + "offset": 125, "line": 9, - "column": 8 + "column": 7 }, "endPos": { "offset": 127, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 126, + "start": 125, "end": 127 } ], @@ -3092,7 +3092,7 @@ "line": 9, "column": 4 }, - "fullStart": 117, + "fullStart": 116, "endPos": { "offset": 123, "line": 9, @@ -3109,7 +3109,7 @@ "line": 9, "column": 4 }, - "fullStart": 117, + "fullStart": 116, "endPos": { "offset": 123, "line": 9, @@ -3135,22 +3135,22 @@ { "kind": "", "startPos": { - "offset": 117, + "offset": 116, "line": 8, - "column": 1 + "column": 0 }, "endPos": { "offset": 118, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 117, + "start": 116, "end": 118 }, { @@ -3571,22 +3571,22 @@ { "kind": "", "startPos": { - "offset": 142, + "offset": 141, "line": 11, - "column": 6 + "column": 5 }, "endPos": { "offset": 143, "line": 12, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 142, + "start": 141, "end": 143 } ], @@ -3609,7 +3609,7 @@ "line": 13, "column": 4 }, - "fullStart": 144, + "fullStart": 143, "endPos": { "offset": 168, "line": 15, @@ -3626,7 +3626,7 @@ "line": 13, "column": 4 }, - "fullStart": 144, + "fullStart": 143, "endPos": { "offset": 168, "line": 15, @@ -3771,7 +3771,7 @@ "line": 13, "column": 4 }, - "fullStart": 144, + "fullStart": 143, "endPos": { "offset": 159, "line": 14, @@ -3916,7 +3916,7 @@ "line": 13, "column": 4 }, - "fullStart": 144, + "fullStart": 143, "endPos": { "offset": 150, "line": 13, @@ -3933,7 +3933,7 @@ "line": 13, "column": 4 }, - "fullStart": 144, + "fullStart": 143, "endPos": { "offset": 150, "line": 13, @@ -3959,22 +3959,22 @@ { "kind": "", "startPos": { - "offset": 144, + "offset": 143, "line": 12, - "column": 1 + "column": 0 }, "endPos": { "offset": 145, "line": 13, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 144, + "start": 143, "end": 145 }, { @@ -4066,22 +4066,22 @@ { "kind": "", "startPos": { - "offset": 151, + "offset": 150, "line": 13, - "column": 6 + "column": 5 }, "endPos": { "offset": 152, "line": 14, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 151, + "start": 150, "end": 152 } ], @@ -4145,22 +4145,22 @@ { "kind": "", "startPos": { - "offset": 160, + "offset": 159, "line": 14, - "column": 8 + "column": 7 }, "endPos": { "offset": 161, "line": 15, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 160, + "start": 159, "end": 161 } ], @@ -4225,22 +4225,22 @@ { "kind": "", "startPos": { - "offset": 169, + "offset": 168, "line": 15, - "column": 8 + "column": 7 }, "endPos": { "offset": 170, "line": 16, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 169, + "start": 168, "end": 170 } ], @@ -4263,7 +4263,7 @@ "line": 17, "column": 4 }, - "fullStart": 171, + "fullStart": 170, "endPos": { "offset": 181, "line": 17, @@ -4280,7 +4280,7 @@ "line": 17, "column": 4 }, - "fullStart": 171, + "fullStart": 170, "endPos": { "offset": 181, "line": 17, @@ -4318,7 +4318,7 @@ "line": 17, "column": 4 }, - "fullStart": 171, + "fullStart": 170, "endPos": { "offset": 179, "line": 17, @@ -4356,7 +4356,7 @@ "line": 17, "column": 4 }, - "fullStart": 171, + "fullStart": 170, "endPos": { "offset": 177, "line": 17, @@ -4373,7 +4373,7 @@ "line": 17, "column": 4 }, - "fullStart": 171, + "fullStart": 170, "endPos": { "offset": 177, "line": 17, @@ -4399,22 +4399,22 @@ { "kind": "", "startPos": { - "offset": 171, + "offset": 170, "line": 16, - "column": 1 + "column": 0 }, "endPos": { "offset": 172, "line": 17, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 171, + "start": 170, "end": 172 }, { @@ -4621,22 +4621,22 @@ { "kind": "", "startPos": { - "offset": 182, + "offset": 181, "line": 17, - "column": 10 + "column": 9 }, "endPos": { "offset": 183, "line": 18, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 182, + "start": 181, "end": 183 } ], @@ -4659,7 +4659,7 @@ "line": 19, "column": 4 }, - "fullStart": 184, + "fullStart": 183, "endPos": { "offset": 206, "line": 21, @@ -4676,7 +4676,7 @@ "line": 19, "column": 4 }, - "fullStart": 184, + "fullStart": 183, "endPos": { "offset": 206, "line": 21, @@ -4703,22 +4703,22 @@ { "kind": "", "startPos": { - "offset": 200, + "offset": 199, "line": 20, - "column": 7 + "column": 6 }, "endPos": { "offset": 201, "line": 21, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 200, + "start": 199, "end": 201 } ], @@ -4736,7 +4736,7 @@ "line": 19, "column": 4 }, - "fullStart": 184, + "fullStart": 183, "endPos": { "offset": 198, "line": 20, @@ -4763,22 +4763,22 @@ { "kind": "", "startPos": { - "offset": 192, + "offset": 191, "line": 19, - "column": 7 + "column": 6 }, "endPos": { "offset": 193, "line": 20, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 192, + "start": 191, "end": 193 } ], @@ -4796,7 +4796,7 @@ "line": 19, "column": 4 }, - "fullStart": 184, + "fullStart": 183, "endPos": { "offset": 190, "line": 19, @@ -4813,7 +4813,7 @@ "line": 19, "column": 4 }, - "fullStart": 184, + "fullStart": 183, "endPos": { "offset": 190, "line": 19, @@ -4839,22 +4839,22 @@ { "kind": "", "startPos": { - "offset": 184, + "offset": 183, "line": 18, - "column": 1 + "column": 0 }, "endPos": { "offset": 185, "line": 19, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 184, + "start": 183, "end": 185 }, { @@ -5231,22 +5231,22 @@ { "kind": "", "startPos": { - "offset": 207, + "offset": 206, "line": 21, - "column": 6 + "column": 5 }, "endPos": { "offset": 208, "line": 22, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 207, + "start": 206, "end": 208 } ], @@ -5269,7 +5269,7 @@ "line": 23, "column": 4 }, - "fullStart": 209, + "fullStart": 208, "endPos": { "offset": 226, "line": 24, @@ -5286,7 +5286,7 @@ "line": 23, "column": 4 }, - "fullStart": 209, + "fullStart": 208, "endPos": { "offset": 226, "line": 24, @@ -5430,7 +5430,7 @@ "line": 23, "column": 4 }, - "fullStart": 209, + "fullStart": 208, "endPos": { "offset": 217, "line": 23, @@ -5468,7 +5468,7 @@ "line": 23, "column": 4 }, - "fullStart": 209, + "fullStart": 208, "endPos": { "offset": 215, "line": 23, @@ -5485,7 +5485,7 @@ "line": 23, "column": 4 }, - "fullStart": 209, + "fullStart": 208, "endPos": { "offset": 215, "line": 23, @@ -5511,22 +5511,22 @@ { "kind": "", "startPos": { - "offset": 209, + "offset": 208, "line": 22, - "column": 1 + "column": 0 }, "endPos": { "offset": 210, "line": 23, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 209, + "start": 208, "end": 210 }, { @@ -5675,22 +5675,22 @@ { "kind": "", "startPos": { - "offset": 218, + "offset": 217, "line": 23, - "column": 8 + "column": 7 }, "endPos": { "offset": 219, "line": 24, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 218, + "start": 217, "end": 219 } ], @@ -5755,22 +5755,22 @@ { "kind": "", "startPos": { - "offset": 227, + "offset": 226, "line": 24, - "column": 8 + "column": 7 }, "endPos": { "offset": 228, "line": 25, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 227, + "start": 226, "end": 228 } ], @@ -5793,7 +5793,7 @@ "line": 26, "column": 4 }, - "fullStart": 229, + "fullStart": 228, "endPos": { "offset": 237, "line": 26, @@ -5810,7 +5810,7 @@ "line": 26, "column": 4 }, - "fullStart": 229, + "fullStart": 228, "endPos": { "offset": 237, "line": 26, @@ -5827,7 +5827,7 @@ "line": 26, "column": 4 }, - "fullStart": 229, + "fullStart": 228, "endPos": { "offset": 235, "line": 26, @@ -5844,7 +5844,7 @@ "line": 26, "column": 4 }, - "fullStart": 229, + "fullStart": 228, "endPos": { "offset": 235, "line": 26, @@ -5870,22 +5870,22 @@ { "kind": "", "startPos": { - "offset": 229, + "offset": 228, "line": 25, - "column": 1 + "column": 0 }, "endPos": { "offset": 230, "line": 26, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 229, + "start": 228, "end": 230 }, { @@ -6040,22 +6040,22 @@ { "kind": "", "startPos": { - "offset": 238, + "offset": 237, "line": 26, - "column": 8 + "column": 7 }, "endPos": { "offset": 239, "line": 27, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 238, + "start": 237, "end": 239 } ], @@ -6077,7 +6077,7 @@ "line": 28, "column": 4 }, - "fullStart": 240, + "fullStart": 239, "endPos": { "offset": 254, "line": 28, @@ -6094,7 +6094,7 @@ "line": 28, "column": 4 }, - "fullStart": 240, + "fullStart": 239, "endPos": { "offset": 254, "line": 28, @@ -6120,22 +6120,22 @@ { "kind": "", "startPos": { - "offset": 240, + "offset": 239, "line": 27, - "column": 1 + "column": 0 }, "endPos": { "offset": 241, "line": 28, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 240, + "start": 239, "end": 241 }, { @@ -6509,22 +6509,22 @@ { "kind": "", "startPos": { - "offset": 255, + "offset": 254, "line": 28, - "column": 14 + "column": 13 }, "endPos": { "offset": 256, "line": 29, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 255, + "start": 254, "end": 256 } ], @@ -6956,22 +6956,22 @@ { "kind": "", "startPos": { - "offset": 270, + "offset": 269, "line": 29, - "column": 14 + "column": 13 }, "endPos": { "offset": 271, "line": 30, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 270, + "start": 269, "end": 271 } ], @@ -6992,7 +6992,7 @@ "line": 31, "column": 4 }, - "fullStart": 272, + "fullStart": 271, "endPos": { "offset": 296, "line": 32, @@ -7009,7 +7009,7 @@ "line": 31, "column": 4 }, - "fullStart": 272, + "fullStart": 271, "endPos": { "offset": 296, "line": 32, @@ -7035,22 +7035,22 @@ { "kind": "", "startPos": { - "offset": 272, + "offset": 271, "line": 30, - "column": 1 + "column": 0 }, "endPos": { "offset": 273, "line": 31, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 272, + "start": 271, "end": 273 }, { @@ -7215,22 +7215,22 @@ { "kind": "", "startPos": { - "offset": 280, + "offset": 279, "line": 31, - "column": 7 + "column": 6 }, "endPos": { "offset": 281, "line": 32, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 280, + "start": 279, "end": 281 } ], @@ -7690,22 +7690,22 @@ { "kind": "", "startPos": { - "offset": 297, + "offset": 296, "line": 32, - "column": 16 + "column": 15 }, "endPos": { "offset": 298, "line": 33, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 297, + "start": 296, "end": 298 } ], @@ -7726,7 +7726,7 @@ "line": 34, "column": 4 }, - "fullStart": 299, + "fullStart": 298, "endPos": { "offset": 316, "line": 35, @@ -7743,7 +7743,7 @@ "line": 34, "column": 4 }, - "fullStart": 299, + "fullStart": 298, "endPos": { "offset": 316, "line": 35, @@ -7769,22 +7769,22 @@ { "kind": "", "startPos": { - "offset": 299, + "offset": 298, "line": 33, - "column": 1 + "column": 0 }, "endPos": { "offset": 300, "line": 34, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 299, + "start": 298, "end": 300 }, { @@ -8120,22 +8120,22 @@ { "kind": "", "startPos": { - "offset": 308, + "offset": 307, "line": 34, - "column": 8 + "column": 7 }, "endPos": { "offset": 309, "line": 35, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 308, + "start": 307, "end": 309 } ], @@ -8164,22 +8164,22 @@ { "kind": "", "startPos": { - "offset": 317, + "offset": 316, "line": 35, - "column": 8 + "column": 7 }, "endPos": { "offset": 318, "line": 36, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 317, + "start": 316, "end": 318 } ], @@ -8200,7 +8200,7 @@ "line": 37, "column": 4 }, - "fullStart": 319, + "fullStart": 318, "endPos": { "offset": 348, "line": 37, @@ -8217,7 +8217,7 @@ "line": 37, "column": 4 }, - "fullStart": 319, + "fullStart": 318, "endPos": { "offset": 348, "line": 37, @@ -8277,7 +8277,7 @@ "line": 37, "column": 4 }, - "fullStart": 319, + "fullStart": 318, "endPos": { "offset": 333, "line": 37, @@ -8337,7 +8337,7 @@ "line": 37, "column": 4 }, - "fullStart": 319, + "fullStart": 318, "endPos": { "offset": 329, "line": 37, @@ -8397,7 +8397,7 @@ "line": 37, "column": 4 }, - "fullStart": 319, + "fullStart": 318, "endPos": { "offset": 325, "line": 37, @@ -8414,7 +8414,7 @@ "line": 37, "column": 4 }, - "fullStart": 319, + "fullStart": 318, "endPos": { "offset": 325, "line": 37, @@ -8440,22 +8440,22 @@ { "kind": "", "startPos": { - "offset": 319, + "offset": 318, "line": 36, - "column": 1 + "column": 0 }, "endPos": { "offset": 320, "line": 37, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 319, + "start": 318, "end": 320 }, { @@ -9129,22 +9129,22 @@ { "kind": "", "startPos": { - "offset": 349, + "offset": 348, "line": 37, - "column": 29 + "column": 28 }, "endPos": { "offset": 350, "line": 38, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 349, + "start": 348, "end": 350 } ], @@ -9167,7 +9167,7 @@ "line": 39, "column": 4 }, - "fullStart": 351, + "fullStart": 350, "endPos": { "offset": 362, "line": 39, @@ -9184,7 +9184,7 @@ "line": 39, "column": 4 }, - "fullStart": 351, + "fullStart": 350, "endPos": { "offset": 362, "line": 39, @@ -9244,7 +9244,7 @@ "line": 39, "column": 4 }, - "fullStart": 351, + "fullStart": 350, "endPos": { "offset": 357, "line": 39, @@ -9261,7 +9261,7 @@ "line": 39, "column": 4 }, - "fullStart": 351, + "fullStart": 350, "endPos": { "offset": 357, "line": 39, @@ -9287,22 +9287,22 @@ { "kind": "", "startPos": { - "offset": 351, + "offset": 350, "line": 38, - "column": 1 + "column": 0 }, "endPos": { "offset": 352, "line": 39, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 351, + "start": 350, "end": 352 }, { @@ -9473,22 +9473,22 @@ { "kind": "", "startPos": { - "offset": 363, + "offset": 362, "line": 39, - "column": 11 + "column": 10 }, "endPos": { "offset": 364, "line": 40, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 363, + "start": 362, "end": 364 } ], @@ -9511,7 +9511,7 @@ "line": 41, "column": 4 }, - "fullStart": 365, + "fullStart": 364, "endPos": { "offset": 384, "line": 41, @@ -9528,7 +9528,7 @@ "line": 41, "column": 4 }, - "fullStart": 365, + "fullStart": 364, "endPos": { "offset": 384, "line": 41, @@ -9588,7 +9588,7 @@ "line": 41, "column": 4 }, - "fullStart": 365, + "fullStart": 364, "endPos": { "offset": 371, "line": 41, @@ -9605,7 +9605,7 @@ "line": 41, "column": 4 }, - "fullStart": 365, + "fullStart": 364, "endPos": { "offset": 371, "line": 41, @@ -9631,22 +9631,22 @@ { "kind": "", "startPos": { - "offset": 365, + "offset": 364, "line": 40, - "column": 1 + "column": 0 }, "endPos": { "offset": 366, "line": 41, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 365, + "start": 364, "end": 366 }, { @@ -10095,22 +10095,22 @@ { "kind": "", "startPos": { - "offset": 385, + "offset": 384, "line": 41, - "column": 19 + "column": 18 }, "endPos": { "offset": 386, "line": 42, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 385, + "start": 384, "end": 386 } ], @@ -10135,7 +10135,7 @@ "line": 43, "column": 4 }, - "fullStart": 387, + "fullStart": 386, "endPos": { "offset": 402, "line": 43, @@ -10152,7 +10152,7 @@ "line": 43, "column": 4 }, - "fullStart": 387, + "fullStart": 386, "endPos": { "offset": 402, "line": 43, @@ -10212,7 +10212,7 @@ "line": 43, "column": 4 }, - "fullStart": 387, + "fullStart": 386, "endPos": { "offset": 393, "line": 43, @@ -10229,7 +10229,7 @@ "line": 43, "column": 4 }, - "fullStart": 387, + "fullStart": 386, "endPos": { "offset": 393, "line": 43, @@ -10255,22 +10255,22 @@ { "kind": "", "startPos": { - "offset": 387, + "offset": 386, "line": 42, - "column": 1 + "column": 0 }, "endPos": { "offset": 388, "line": 43, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 387, + "start": 386, "end": 388 }, { @@ -10580,22 +10580,22 @@ { "kind": "", "startPos": { - "offset": 403, + "offset": 402, "line": 43, - "column": 15 + "column": 14 }, "endPos": { "offset": 404, "line": 44, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 403, + "start": 402, "end": 404 } ], @@ -10619,7 +10619,7 @@ "line": 45, "column": 4 }, - "fullStart": 405, + "fullStart": 404, "endPos": { "offset": 458, "line": 48, @@ -10636,7 +10636,7 @@ "line": 45, "column": 4 }, - "fullStart": 405, + "fullStart": 404, "endPos": { "offset": 458, "line": 48, @@ -10696,7 +10696,7 @@ "line": 45, "column": 4 }, - "fullStart": 405, + "fullStart": 404, "endPos": { "offset": 411, "line": 45, @@ -10713,7 +10713,7 @@ "line": 45, "column": 4 }, - "fullStart": 405, + "fullStart": 404, "endPos": { "offset": 411, "line": 45, @@ -10739,22 +10739,22 @@ { "kind": "", "startPos": { - "offset": 405, + "offset": 404, "line": 44, - "column": 1 + "column": 0 }, "endPos": { "offset": 406, "line": 45, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 405, + "start": 404, "end": 406 }, { @@ -11030,22 +11030,22 @@ { "kind": "", "startPos": { - "offset": 426, + "offset": 425, "line": 46, - "column": 1 + "column": 0 }, "endPos": { "offset": 427, "line": 47, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 426, + "start": 425, "end": 427 }, { @@ -11433,22 +11433,22 @@ { "kind": "", "startPos": { - "offset": 424, + "offset": 423, "line": 45, - "column": 18 + "column": 17 }, "endPos": { "offset": 425, "line": 46, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 424, + "start": 423, "end": 425 } ], @@ -11855,22 +11855,22 @@ { "kind": "", "startPos": { - "offset": 443, + "offset": 442, "line": 47, - "column": 16 + "column": 15 }, "endPos": { "offset": 444, "line": 48, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 443, + "start": 442, "end": 444 } ], @@ -12248,22 +12248,22 @@ { "kind": "", "startPos": { - "offset": 459, + "offset": 458, "line": 48, - "column": 15 + "column": 14 }, "endPos": { "offset": 460, "line": 49, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 459, + "start": 458, "end": 460 } ], diff --git a/packages/dbml-parse/tests/examples/parser/output/function_application.out.json b/packages/dbml-parse/tests/examples/parser/output/function_application.out.json index 4b30bf30b..5e9d2a913 100644 --- a/packages/dbml-parse/tests/examples/parser/output/function_application.out.json +++ b/packages/dbml-parse/tests/examples/parser/output/function_application.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 27, + "offset": 26, "line": 0, - "column": 27 + "column": 26 }, "endPos": { "offset": 28, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 27, + "start": 26, "end": 28 } ], @@ -639,22 +639,22 @@ { "kind": "", "startPos": { - "offset": 57, + "offset": 56, "line": 1, - "column": 29 + "column": 28 }, "endPos": { "offset": 58, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 57, + "start": 56, "end": 58 } ], @@ -1206,22 +1206,22 @@ { "kind": "", "startPos": { - "offset": 87, + "offset": 86, "line": 2, - "column": 29 + "column": 28 }, "endPos": { "offset": 88, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 87, + "start": 86, "end": 88 } ], @@ -1253,22 +1253,22 @@ { "kind": "", "startPos": { - "offset": 90, + "offset": 89, "line": 3, - "column": 2 + "column": 1 }, "endPos": { "offset": 91, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 90, + "start": 89, "end": 91 } ], diff --git a/packages/dbml-parse/tests/examples/parser/output/list_expression.out.json b/packages/dbml-parse/tests/examples/parser/output/list_expression.out.json index e89bdcf75..12ccbc201 100644 --- a/packages/dbml-parse/tests/examples/parser/output/list_expression.out.json +++ b/packages/dbml-parse/tests/examples/parser/output/list_expression.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 22, + "offset": 21, "line": 0, - "column": 22 + "column": 21 }, "endPos": { "offset": 23, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 22, + "start": 21, "end": 23 } ], @@ -1305,22 +1305,22 @@ { "kind": "", "startPos": { - "offset": 98, + "offset": 97, "line": 2, - "column": 41 + "column": 40 }, "endPos": { "offset": 99, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 98, + "start": 97, "end": 99 } ], @@ -1913,22 +1913,22 @@ { "kind": "", "startPos": { - "offset": 56, + "offset": 55, "line": 1, - "column": 33 + "column": 32 }, "endPos": { "offset": 57, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 56, + "start": 55, "end": 57 } ], @@ -2043,22 +2043,22 @@ { "kind": "", "startPos": { - "offset": 144, + "offset": 143, "line": 3, - "column": 45 + "column": 44 }, "endPos": { "offset": 145, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 144, + "start": 143, "end": 145 } ], @@ -2629,22 +2629,22 @@ { "kind": "", "startPos": { - "offset": 187, + "offset": 186, "line": 4, - "column": 42 + "column": 41 }, "endPos": { "offset": 188, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 187, + "start": 186, "end": 188 } ], @@ -2776,22 +2776,22 @@ { "kind": "", "startPos": { - "offset": 187, + "offset": 186, "line": 4, - "column": 42 + "column": 41 }, "endPos": { "offset": 188, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 187, + "start": 186, "end": 188 } ], diff --git a/packages/dbml-parse/tests/examples/parser/output/literal_element_expression.out.json b/packages/dbml-parse/tests/examples/parser/output/literal_element_expression.out.json index eb443eb60..ff4a6013e 100644 --- a/packages/dbml-parse/tests/examples/parser/output/literal_element_expression.out.json +++ b/packages/dbml-parse/tests/examples/parser/output/literal_element_expression.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 32, + "offset": 31, "line": 0, - "column": 32 + "column": 31 }, "endPos": { "offset": 33, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 32, + "start": 31, "end": 33 } ], @@ -641,22 +641,22 @@ { "kind": "", "startPos": { - "offset": 82, + "offset": 81, "line": 1, - "column": 49 + "column": 48 }, "endPos": { "offset": 83, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 82, + "start": 81, "end": 83 } ], @@ -1240,22 +1240,22 @@ { "kind": "", "startPos": { - "offset": 120, + "offset": 119, "line": 2, - "column": 37 + "column": 36 }, "endPos": { "offset": 121, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 120, + "start": 119, "end": 121 } ], @@ -1652,22 +1652,22 @@ { "kind": "", "startPos": { - "offset": 143, + "offset": 142, "line": 3, - "column": 22 + "column": 21 }, "endPos": { "offset": 144, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 143, + "start": 142, "end": 144 } ], @@ -1784,22 +1784,22 @@ { "kind": "", "startPos": { - "offset": 150, + "offset": 149, "line": 4, - "column": 6 + "column": 5 }, "endPos": { "offset": 151, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 150, + "start": 149, "end": 151 } ], @@ -1819,7 +1819,7 @@ "line": 6, "column": 4 }, - "fullStart": 152, + "fullStart": 151, "endPos": { "offset": 224, "line": 10, @@ -1845,22 +1845,22 @@ { "kind": "", "startPos": { - "offset": 152, + "offset": 151, "line": 5, - "column": 1 + "column": 0 }, "endPos": { "offset": 153, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 152, + "start": 151, "end": 153 }, { @@ -2012,22 +2012,22 @@ { "kind": "", "startPos": { - "offset": 164, + "offset": 163, "line": 6, - "column": 11 + "column": 10 }, "endPos": { "offset": 165, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 164, + "start": 163, "end": 165 } ], @@ -2276,22 +2276,22 @@ { "kind": "", "startPos": { - "offset": 218, + "offset": 217, "line": 9, - "column": 12 + "column": 11 }, "endPos": { "offset": 219, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 218, + "start": 217, "end": 219 } ], @@ -2409,22 +2409,22 @@ { "kind": "", "startPos": { - "offset": 225, + "offset": 224, "line": 10, - "column": 6 + "column": 5 }, "endPos": { "offset": 226, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 225, + "start": 224, "end": 226 } ], diff --git a/packages/dbml-parse/tests/examples/parser/output/nested_element.out.json b/packages/dbml-parse/tests/examples/parser/output/nested_element.out.json index 1202a310c..71ee4caf7 100644 --- a/packages/dbml-parse/tests/examples/parser/output/nested_element.out.json +++ b/packages/dbml-parse/tests/examples/parser/output/nested_element.out.json @@ -112,22 +112,22 @@ { "kind": "", "startPos": { - "offset": 10, + "offset": 9, "line": 0, - "column": 10 + "column": 9 }, "endPos": { "offset": 11, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 10, + "start": 9, "end": 11 } ], @@ -397,22 +397,22 @@ { "kind": "", "startPos": { - "offset": 25, + "offset": 24, "line": 1, - "column": 14 + "column": 13 }, "endPos": { "offset": 26, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 25, + "start": 24, "end": 26 } ], @@ -440,22 +440,22 @@ { "kind": "", "startPos": { - "offset": 27, + "offset": 26, "line": 2, - "column": 1 + "column": 0 }, "endPos": { "offset": 28, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 27, + "start": 26, "end": 28 }, { @@ -547,22 +547,22 @@ { "kind": "", "startPos": { - "offset": 34, + "offset": 33, "line": 3, - "column": 6 + "column": 5 }, "endPos": { "offset": 35, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 34, + "start": 33, "end": 35 } ], @@ -582,7 +582,7 @@ "line": 5, "column": 4 }, - "fullStart": 36, + "fullStart": 35, "endPos": { "offset": 72, "line": 7, @@ -608,22 +608,22 @@ { "kind": "", "startPos": { - "offset": 36, + "offset": 35, "line": 4, - "column": 1 + "column": 0 }, "endPos": { "offset": 37, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 36, + "start": 35, "end": 37 }, { @@ -976,22 +976,22 @@ { "kind": "", "startPos": { - "offset": 56, + "offset": 55, "line": 5, - "column": 19 + "column": 18 }, "endPos": { "offset": 57, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 56, + "start": 55, "end": 57 } ], @@ -1187,22 +1187,22 @@ { "kind": "", "startPos": { - "offset": 66, + "offset": 65, "line": 6, - "column": 9 + "column": 8 }, "endPos": { "offset": 67, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 66, + "start": 65, "end": 67 }, { @@ -1294,22 +1294,22 @@ { "kind": "", "startPos": { - "offset": 73, + "offset": 72, "line": 7, - "column": 6 + "column": 5 }, "endPos": { "offset": 74, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 73, + "start": 72, "end": 74 } ], @@ -1340,22 +1340,22 @@ { "kind": "", "startPos": { - "offset": 76, + "offset": 75, "line": 8, - "column": 2 + "column": 1 }, "endPos": { "offset": 77, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 76, + "start": 75, "end": 77 } ], @@ -1375,7 +1375,7 @@ "line": 10, "column": 0 }, - "fullStart": 78, + "fullStart": 77, "endPos": { "offset": 197, "line": 12, @@ -1401,22 +1401,22 @@ { "kind": "", "startPos": { - "offset": 78, + "offset": 77, "line": 9, - "column": 1 + "column": 0 }, "endPos": { "offset": 79, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 78, + "start": 77, "end": 79 } ], @@ -1647,22 +1647,22 @@ { "kind": "", "startPos": { - "offset": 111, + "offset": 110, "line": 10, - "column": 32 + "column": 31 }, "endPos": { "offset": 112, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 111, + "start": 110, "end": 112 } ], @@ -2238,22 +2238,22 @@ { "kind": "", "startPos": { - "offset": 198, + "offset": 197, "line": 12, - "column": 2 + "column": 1 }, "endPos": { "offset": 199, "line": 13, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 198, + "start": 197, "end": 199 } ], diff --git a/packages/dbml-parse/tests/examples/parser/output/ref_setting.out.json b/packages/dbml-parse/tests/examples/parser/output/ref_setting.out.json index bf1f3c9d6..51e49e191 100644 --- a/packages/dbml-parse/tests/examples/parser/output/ref_setting.out.json +++ b/packages/dbml-parse/tests/examples/parser/output/ref_setting.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 14, + "offset": 13, "line": 0, - "column": 14 + "column": 13 }, "endPos": { "offset": 15, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 14, + "start": 13, "end": 15 } ], @@ -388,22 +388,22 @@ { "kind": "", "startPos": { - "offset": 27, + "offset": 26, "line": 1, - "column": 12 + "column": 11 }, "endPos": { "offset": 28, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 27, + "start": 26, "end": 28 } ], @@ -1184,22 +1184,22 @@ { "kind": "", "startPos": { - "offset": 74, + "offset": 73, "line": 2, - "column": 46 + "column": 45 }, "endPos": { "offset": 75, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 74, + "start": 73, "end": 75 } ], @@ -1364,22 +1364,22 @@ { "kind": "", "startPos": { - "offset": 80, + "offset": 79, "line": 3, - "column": 5 + "column": 4 }, "endPos": { "offset": 81, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 80, + "start": 79, "end": 81 }, { @@ -1835,22 +1835,22 @@ { "kind": "", "startPos": { - "offset": 113, + "offset": 112, "line": 4, - "column": 32 + "column": 31 }, "endPos": { "offset": 114, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 113, + "start": 112, "end": 114 } ], @@ -1882,22 +1882,22 @@ { "kind": "", "startPos": { - "offset": 116, + "offset": 115, "line": 5, - "column": 2 + "column": 1 }, "endPos": { "offset": 117, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 116, + "start": 115, "end": 117 } ], @@ -1917,7 +1917,7 @@ "line": 7, "column": 0 }, - "fullStart": 118, + "fullStart": 117, "endPos": { "offset": 188, "line": 10, @@ -1943,22 +1943,22 @@ { "kind": "", "startPos": { - "offset": 118, + "offset": 117, "line": 6, - "column": 1 + "column": 0 }, "endPos": { "offset": 119, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 118, + "start": 117, "end": 119 } ], @@ -2201,22 +2201,22 @@ { "kind": "", "startPos": { - "offset": 136, + "offset": 135, "line": 7, - "column": 17 + "column": 16 }, "endPos": { "offset": 137, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 136, + "start": 135, "end": 137 } ], @@ -2318,22 +2318,22 @@ { "kind": "", "startPos": { - "offset": 144, + "offset": 143, "line": 8, - "column": 7 + "column": 6 }, "endPos": { "offset": 145, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 144, + "start": 143, "end": 145 } ], @@ -2747,22 +2747,22 @@ { "kind": "", "startPos": { - "offset": 186, + "offset": 185, "line": 9, - "column": 41 + "column": 40 }, "endPos": { "offset": 187, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 186, + "start": 185, "end": 187 } ], diff --git a/packages/dbml-parse/tests/examples/parser/output/trailing_comments.out.json b/packages/dbml-parse/tests/examples/parser/output/trailing_comments.out.json index d03ccbbf4..5cd8314f3 100644 --- a/packages/dbml-parse/tests/examples/parser/output/trailing_comments.out.json +++ b/packages/dbml-parse/tests/examples/parser/output/trailing_comments.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 17, + "offset": 16, "line": 0, - "column": 17 + "column": 16 }, "endPos": { "offset": 18, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 17, + "start": 16, "end": 18 } ], @@ -409,22 +409,22 @@ { "kind": "", "startPos": { - "offset": 31, + "offset": 30, "line": 1, - "column": 13 + "column": 12 }, "endPos": { "offset": 32, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 31, + "start": 30, "end": 32 } ], @@ -630,22 +630,22 @@ { "kind": "", "startPos": { - "offset": 50, + "offset": 49, "line": 2, - "column": 18 + "column": 17 }, "endPos": { "offset": 51, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 50, + "start": 49, "end": 51 } ], @@ -851,22 +851,22 @@ { "kind": "", "startPos": { - "offset": 71, + "offset": 70, "line": 3, - "column": 20 + "column": 19 }, "endPos": { "offset": 72, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 71, + "start": 70, "end": 72 } ], @@ -1072,22 +1072,22 @@ { "kind": "", "startPos": { - "offset": 95, + "offset": 94, "line": 4, - "column": 23 + "column": 22 }, "endPos": { "offset": 96, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 95, + "start": 94, "end": 96 } ], @@ -1109,7 +1109,7 @@ "line": 6, "column": 2 }, - "fullStart": 97, + "fullStart": 96, "endPos": { "offset": 374, "line": 15, @@ -1135,22 +1135,22 @@ { "kind": "", "startPos": { - "offset": 97, + "offset": 96, "line": 5, - "column": 1 + "column": 0 }, "endPos": { "offset": 98, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 97, + "start": 96, "end": 98 }, { @@ -1260,22 +1260,22 @@ { "kind": "", "startPos": { - "offset": 110, + "offset": 109, "line": 6, - "column": 12 + "column": 11 }, "endPos": { "offset": 111, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 110, + "start": 109, "end": 111 } ], @@ -2507,22 +2507,22 @@ { "kind": "", "startPos": { - "offset": 220, + "offset": 219, "line": 8, - "column": 58 + "column": 57 }, "endPos": { "offset": 221, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 220, + "start": 219, "end": 221 } ], @@ -2731,22 +2731,22 @@ { "kind": "", "startPos": { - "offset": 240, + "offset": 239, "line": 9, - "column": 19 + "column": 18 }, "endPos": { "offset": 241, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 240, + "start": 239, "end": 241 } ], @@ -3266,22 +3266,22 @@ { "kind": "", "startPos": { - "offset": 280, + "offset": 279, "line": 10, - "column": 39 + "column": 38 }, "endPos": { "offset": 281, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 280, + "start": 279, "end": 281 } ], @@ -3736,22 +3736,22 @@ { "kind": "", "startPos": { - "offset": 313, + "offset": 312, "line": 11, - "column": 32 + "column": 31 }, "endPos": { "offset": 314, "line": 12, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 313, + "start": 312, "end": 314 } ], @@ -4120,22 +4120,22 @@ { "kind": "", "startPos": { - "offset": 327, + "offset": 326, "line": 12, - "column": 13 + "column": 12 }, "endPos": { "offset": 328, "line": 13, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 327, + "start": 326, "end": 328 } ], @@ -4565,22 +4565,22 @@ { "kind": "", "startPos": { - "offset": 353, + "offset": 352, "line": 13, - "column": 25 + "column": 24 }, "endPos": { "offset": 354, "line": 14, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 353, + "start": 352, "end": 354 } ], @@ -5028,22 +5028,22 @@ { "kind": "", "startPos": { - "offset": 370, + "offset": 369, "line": 14, - "column": 16 + "column": 15 }, "endPos": { "offset": 371, "line": 15, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 370, + "start": 369, "end": 371 } ], @@ -5118,22 +5118,22 @@ { "kind": "", "startPos": { - "offset": 375, + "offset": 374, "line": 15, - "column": 4 + "column": 3 }, "endPos": { "offset": 376, "line": 16, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 375, + "start": 374, "end": 376 } ], @@ -5164,22 +5164,22 @@ { "kind": "", "startPos": { - "offset": 378, + "offset": 377, "line": 16, - "column": 2 + "column": 1 }, "endPos": { "offset": 379, "line": 17, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 378, + "start": 377, "end": 379 } ], diff --git a/packages/dbml-parse/tests/examples/parser/output/tuple_expression.out.json b/packages/dbml-parse/tests/examples/parser/output/tuple_expression.out.json index 7cd477ed2..261879f45 100644 --- a/packages/dbml-parse/tests/examples/parser/output/tuple_expression.out.json +++ b/packages/dbml-parse/tests/examples/parser/output/tuple_expression.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 23, + "offset": 22, "line": 0, - "column": 23 + "column": 22 }, "endPos": { "offset": 24, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 23, + "start": 22, "end": 24 } ], @@ -377,22 +377,22 @@ { "kind": "", "startPos": { - "offset": 31, + "offset": 30, "line": 1, - "column": 7 + "column": 6 }, "endPos": { "offset": 32, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 31, + "start": 30, "end": 32 } ], @@ -542,22 +542,22 @@ { "kind": "", "startPos": { - "offset": 38, + "offset": 37, "line": 2, - "column": 6 + "column": 5 }, "endPos": { "offset": 39, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 38, + "start": 37, "end": 39 } ], @@ -586,22 +586,22 @@ { "kind": "", "startPos": { - "offset": 40, + "offset": 39, "line": 3, - "column": 1 + "column": 0 }, "endPos": { "offset": 41, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 40, + "start": 39, "end": 41 }, { @@ -693,22 +693,22 @@ { "kind": "", "startPos": { - "offset": 47, + "offset": 46, "line": 4, - "column": 6 + "column": 5 }, "endPos": { "offset": 48, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 47, + "start": 46, "end": 48 } ], @@ -729,7 +729,7 @@ "line": 6, "column": 4 }, - "fullStart": 49, + "fullStart": 48, "endPos": { "offset": 75, "line": 8, @@ -746,7 +746,7 @@ "line": 6, "column": 4 }, - "fullStart": 49, + "fullStart": 48, "endPos": { "offset": 75, "line": 8, @@ -772,22 +772,22 @@ { "kind": "", "startPos": { - "offset": 49, + "offset": 48, "line": 5, - "column": 1 + "column": 0 }, "endPos": { "offset": 50, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 49, + "start": 48, "end": 50 }, { @@ -1283,22 +1283,22 @@ { "kind": "", "startPos": { - "offset": 59, + "offset": 58, "line": 6, - "column": 9 + "column": 8 }, "endPos": { "offset": 60, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 59, + "start": 58, "end": 60 } ], @@ -1326,22 +1326,22 @@ { "kind": "", "startPos": { - "offset": 67, + "offset": 66, "line": 7, - "column": 7 + "column": 6 }, "endPos": { "offset": 68, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 67, + "start": 66, "end": 68 } ], @@ -1391,22 +1391,22 @@ { "kind": "", "startPos": { - "offset": 76, + "offset": 75, "line": 8, - "column": 8 + "column": 7 }, "endPos": { "offset": 77, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 76, + "start": 75, "end": 77 } ], @@ -1427,7 +1427,7 @@ "line": 10, "column": 4 }, - "fullStart": 78, + "fullStart": 77, "endPos": { "offset": 139, "line": 12, @@ -1444,7 +1444,7 @@ "line": 10, "column": 4 }, - "fullStart": 78, + "fullStart": 77, "endPos": { "offset": 139, "line": 12, @@ -1470,22 +1470,22 @@ { "kind": "", "startPos": { - "offset": 78, + "offset": 77, "line": 9, - "column": 1 + "column": 0 }, "endPos": { "offset": 79, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 78, + "start": 77, "end": 79 }, { @@ -2404,22 +2404,22 @@ { "kind": "", "startPos": { - "offset": 118, + "offset": 117, "line": 10, - "column": 39 + "column": 38 }, "endPos": { "offset": 119, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 118, + "start": 117, "end": 119 } ], @@ -2686,22 +2686,22 @@ { "kind": "", "startPos": { - "offset": 131, + "offset": 130, "line": 11, - "column": 12 + "column": 11 }, "endPos": { "offset": 132, "line": 12, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 131, + "start": 130, "end": 132 } ], @@ -3169,22 +3169,22 @@ { "kind": "", "startPos": { - "offset": 140, + "offset": 139, "line": 12, - "column": 8 + "column": 7 }, "endPos": { "offset": 141, "line": 13, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 140, + "start": 139, "end": 141 } ], @@ -3266,22 +3266,22 @@ { "kind": "", "startPos": { - "offset": 76, + "offset": 75, "line": 8, - "column": 8 + "column": 7 }, "endPos": { "offset": 77, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 76, + "start": 75, "end": 77 } ], diff --git a/packages/dbml-parse/tests/examples/validator/output/alias_of_duplicated_names.out.json b/packages/dbml-parse/tests/examples/validator/output/alias_of_duplicated_names.out.json index cdb2d41ff..2ff76f4a8 100644 --- a/packages/dbml-parse/tests/examples/validator/output/alias_of_duplicated_names.out.json +++ b/packages/dbml-parse/tests/examples/validator/output/alias_of_duplicated_names.out.json @@ -313,22 +313,22 @@ { "kind": "", "startPos": { - "offset": 20, + "offset": 19, "line": 0, - "column": 20 + "column": 19 }, "endPos": { "offset": 21, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 20, + "start": 19, "end": 21 } ], @@ -356,22 +356,22 @@ { "kind": "", "startPos": { - "offset": 22, + "offset": 21, "line": 1, - "column": 1 + "column": 0 }, "endPos": { "offset": 23, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 22, + "start": 21, "end": 23 } ], @@ -379,22 +379,22 @@ { "kind": "", "startPos": { - "offset": 25, + "offset": 24, "line": 2, - "column": 2 + "column": 1 }, "endPos": { "offset": 26, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 25, + "start": 24, "end": 26 } ], @@ -416,7 +416,7 @@ "line": 4, "column": 0 }, - "fullStart": 27, + "fullStart": 26, "endPos": { "offset": 52, "line": 6, @@ -442,22 +442,22 @@ { "kind": "", "startPos": { - "offset": 27, + "offset": 26, "line": 3, - "column": 1 + "column": 0 }, "endPos": { "offset": 28, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 27, + "start": 26, "end": 28 } ], @@ -726,22 +726,22 @@ { "kind": "", "startPos": { - "offset": 48, + "offset": 47, "line": 4, - "column": 20 + "column": 19 }, "endPos": { "offset": 49, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 48, + "start": 47, "end": 49 } ], @@ -769,22 +769,22 @@ { "kind": "", "startPos": { - "offset": 50, + "offset": 49, "line": 5, - "column": 1 + "column": 0 }, "endPos": { "offset": 51, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 50, + "start": 49, "end": 51 } ], @@ -792,22 +792,22 @@ { "kind": "", "startPos": { - "offset": 53, + "offset": 52, "line": 6, - "column": 2 + "column": 1 }, "endPos": { "offset": 54, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 53, + "start": 52, "end": 54 } ], @@ -829,7 +829,7 @@ "line": 8, "column": 0 }, - "fullStart": 55, + "fullStart": 54, "endPos": { "offset": 87, "line": 10, @@ -855,22 +855,22 @@ { "kind": "", "startPos": { - "offset": 55, + "offset": 54, "line": 7, - "column": 1 + "column": 0 }, "endPos": { "offset": 56, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 55, + "start": 54, "end": 56 } ], @@ -1139,22 +1139,22 @@ { "kind": "", "startPos": { - "offset": 79, + "offset": 78, "line": 8, - "column": 23 + "column": 22 }, "endPos": { "offset": 80, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 79, + "start": 78, "end": 80 } ], @@ -1266,22 +1266,22 @@ { "kind": "", "startPos": { - "offset": 85, + "offset": 84, "line": 9, - "column": 5 + "column": 4 }, "endPos": { "offset": 86, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 85, + "start": 84, "end": 86 } ], diff --git a/packages/dbml-parse/tests/examples/validator/output/complex_indexes.out.json b/packages/dbml-parse/tests/examples/validator/output/complex_indexes.out.json index 5a63b348b..9d4332c8d 100644 --- a/packages/dbml-parse/tests/examples/validator/output/complex_indexes.out.json +++ b/packages/dbml-parse/tests/examples/validator/output/complex_indexes.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 30, + "offset": 29, "line": 0, - "column": 30 + "column": 29 }, "endPos": { "offset": 31, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 30, + "start": 29, "end": 31 } ], @@ -409,22 +409,22 @@ { "kind": "", "startPos": { - "offset": 44, + "offset": 43, "line": 1, - "column": 13 + "column": 12 }, "endPos": { "offset": 45, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 44, + "start": 43, "end": 45 } ], @@ -631,22 +631,22 @@ { "kind": "", "startPos": { - "offset": 63, + "offset": 62, "line": 2, - "column": 18 + "column": 17 }, "endPos": { "offset": 64, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 63, + "start": 62, "end": 64 } ], @@ -853,22 +853,22 @@ { "kind": "", "startPos": { - "offset": 84, + "offset": 83, "line": 3, - "column": 20 + "column": 19 }, "endPos": { "offset": 85, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 84, + "start": 83, "end": 85 } ], @@ -1075,22 +1075,22 @@ { "kind": "", "startPos": { - "offset": 108, + "offset": 107, "line": 4, - "column": 23 + "column": 22 }, "endPos": { "offset": 109, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 108, + "start": 107, "end": 109 } ], @@ -1113,7 +1113,7 @@ "line": 6, "column": 2 }, - "fullStart": 110, + "fullStart": 109, "endPos": { "offset": 377, "line": 15, @@ -1139,22 +1139,22 @@ { "kind": "", "startPos": { - "offset": 110, + "offset": 109, "line": 5, - "column": 1 + "column": 0 }, "endPos": { "offset": 111, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 110, + "start": 109, "end": 111 }, { @@ -1264,22 +1264,22 @@ { "kind": "", "startPos": { - "offset": 123, + "offset": 122, "line": 6, - "column": 12 + "column": 11 }, "endPos": { "offset": 124, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 123, + "start": 122, "end": 124 } ], @@ -2427,22 +2427,22 @@ { "kind": "", "startPos": { - "offset": 229, + "offset": 228, "line": 8, - "column": 56 + "column": 55 }, "endPos": { "offset": 230, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 229, + "start": 228, "end": 230 } ], @@ -2609,22 +2609,22 @@ { "kind": "", "startPos": { - "offset": 247, + "offset": 246, "line": 9, - "column": 17 + "column": 16 }, "endPos": { "offset": 248, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 247, + "start": 246, "end": 248 } ], @@ -3102,22 +3102,22 @@ { "kind": "", "startPos": { - "offset": 285, + "offset": 284, "line": 10, - "column": 37 + "column": 36 }, "endPos": { "offset": 286, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 285, + "start": 284, "end": 286 } ], @@ -3530,22 +3530,22 @@ { "kind": "", "startPos": { - "offset": 316, + "offset": 315, "line": 11, - "column": 30 + "column": 29 }, "endPos": { "offset": 317, "line": 12, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 316, + "start": 315, "end": 317 } ], @@ -3758,22 +3758,22 @@ { "kind": "", "startPos": { - "offset": 330, + "offset": 329, "line": 12, - "column": 13 + "column": 12 }, "endPos": { "offset": 331, "line": 13, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 330, + "start": 329, "end": 331 } ], @@ -4047,22 +4047,22 @@ { "kind": "", "startPos": { - "offset": 356, + "offset": 355, "line": 13, - "column": 25 + "column": 24 }, "endPos": { "offset": 357, "line": 14, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 356, + "start": 355, "end": 357 } ], @@ -4354,22 +4354,22 @@ { "kind": "", "startPos": { - "offset": 373, + "offset": 372, "line": 14, - "column": 16 + "column": 15 }, "endPos": { "offset": 374, "line": 15, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 373, + "start": 372, "end": 374 } ], @@ -4444,22 +4444,22 @@ { "kind": "", "startPos": { - "offset": 378, + "offset": 377, "line": 15, - "column": 4 + "column": 3 }, "endPos": { "offset": 379, "line": 16, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 378, + "start": 377, "end": 379 } ], @@ -4491,22 +4491,22 @@ { "kind": "", "startPos": { - "offset": 381, + "offset": 380, "line": 16, - "column": 2 + "column": 1 }, "endPos": { "offset": 382, "line": 17, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 381, + "start": 380, "end": 382 } ], @@ -4528,7 +4528,7 @@ "line": 18, "column": 0 }, - "fullStart": 383, + "fullStart": 382, "endPos": { "offset": 751, "line": 34, @@ -4554,22 +4554,22 @@ { "kind": "", "startPos": { - "offset": 383, + "offset": 382, "line": 17, - "column": 1 + "column": 0 }, "endPos": { "offset": 384, "line": 18, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 383, + "start": 382, "end": 384 } ], @@ -4716,22 +4716,22 @@ { "kind": "", "startPos": { - "offset": 401, + "offset": 400, "line": 18, - "column": 17 + "column": 16 }, "endPos": { "offset": 402, "line": 19, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 401, + "start": 400, "end": 402 } ], @@ -4934,22 +4934,22 @@ { "kind": "", "startPos": { - "offset": 415, + "offset": 414, "line": 19, - "column": 13 + "column": 12 }, "endPos": { "offset": 416, "line": 20, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 415, + "start": 414, "end": 416 } ], @@ -5156,22 +5156,22 @@ { "kind": "", "startPos": { - "offset": 434, + "offset": 433, "line": 20, - "column": 18 + "column": 17 }, "endPos": { "offset": 435, "line": 21, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 434, + "start": 433, "end": 435 } ], @@ -5378,22 +5378,22 @@ { "kind": "", "startPos": { - "offset": 455, + "offset": 454, "line": 21, - "column": 20 + "column": 19 }, "endPos": { "offset": 456, "line": 22, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 455, + "start": 454, "end": 456 } ], @@ -5600,22 +5600,22 @@ { "kind": "", "startPos": { - "offset": 479, + "offset": 478, "line": 22, - "column": 23 + "column": 22 }, "endPos": { "offset": 480, "line": 23, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 479, + "start": 478, "end": 480 } ], @@ -5638,7 +5638,7 @@ "line": 24, "column": 2 }, - "fullStart": 481, + "fullStart": 480, "endPos": { "offset": 748, "line": 33, @@ -5664,22 +5664,22 @@ { "kind": "", "startPos": { - "offset": 481, + "offset": 480, "line": 23, - "column": 1 + "column": 0 }, "endPos": { "offset": 482, "line": 24, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 481, + "start": 480, "end": 482 }, { @@ -5789,22 +5789,22 @@ { "kind": "", "startPos": { - "offset": 494, + "offset": 493, "line": 24, - "column": 12 + "column": 11 }, "endPos": { "offset": 495, "line": 25, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 494, + "start": 493, "end": 495 } ], @@ -6952,22 +6952,22 @@ { "kind": "", "startPos": { - "offset": 600, + "offset": 599, "line": 26, - "column": 56 + "column": 55 }, "endPos": { "offset": 601, "line": 27, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 600, + "start": 599, "end": 601 } ], @@ -7134,22 +7134,22 @@ { "kind": "", "startPos": { - "offset": 618, + "offset": 617, "line": 27, - "column": 17 + "column": 16 }, "endPos": { "offset": 619, "line": 28, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 618, + "start": 617, "end": 619 } ], @@ -7627,22 +7627,22 @@ { "kind": "", "startPos": { - "offset": 656, + "offset": 655, "line": 28, - "column": 37 + "column": 36 }, "endPos": { "offset": 657, "line": 29, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 656, + "start": 655, "end": 657 } ], @@ -8055,22 +8055,22 @@ { "kind": "", "startPos": { - "offset": 687, + "offset": 686, "line": 29, - "column": 30 + "column": 29 }, "endPos": { "offset": 688, "line": 30, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 687, + "start": 686, "end": 688 } ], @@ -8283,22 +8283,22 @@ { "kind": "", "startPos": { - "offset": 701, + "offset": 700, "line": 30, - "column": 13 + "column": 12 }, "endPos": { "offset": 702, "line": 31, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 701, + "start": 700, "end": 702 } ], @@ -8572,22 +8572,22 @@ { "kind": "", "startPos": { - "offset": 727, + "offset": 726, "line": 31, - "column": 25 + "column": 24 }, "endPos": { "offset": 728, "line": 32, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 727, + "start": 726, "end": 728 } ], @@ -8879,22 +8879,22 @@ { "kind": "", "startPos": { - "offset": 744, + "offset": 743, "line": 32, - "column": 16 + "column": 15 }, "endPos": { "offset": 745, "line": 33, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 744, + "start": 743, "end": 745 } ], @@ -8969,22 +8969,22 @@ { "kind": "", "startPos": { - "offset": 749, + "offset": 748, "line": 33, - "column": 4 + "column": 3 }, "endPos": { "offset": 750, "line": 34, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 749, + "start": 748, "end": 750 } ], @@ -9016,22 +9016,22 @@ { "kind": "", "startPos": { - "offset": 752, + "offset": 751, "line": 34, - "column": 2 + "column": 1 }, "endPos": { "offset": 753, "line": 35, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 752, + "start": 751, "end": 753 } ], diff --git a/packages/dbml-parse/tests/examples/validator/output/complex_names.out.json b/packages/dbml-parse/tests/examples/validator/output/complex_names.out.json index ae378b94e..db0f4e7ec 100644 --- a/packages/dbml-parse/tests/examples/validator/output/complex_names.out.json +++ b/packages/dbml-parse/tests/examples/validator/output/complex_names.out.json @@ -112,22 +112,22 @@ { "kind": "", "startPos": { - "offset": 10, + "offset": 9, "line": 0, - "column": 10 + "column": 9 }, "endPos": { "offset": 11, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 10, + "start": 9, "end": 11 } ], @@ -493,22 +493,22 @@ { "kind": "", "startPos": { - "offset": 32, + "offset": 31, "line": 1, - "column": 21 + "column": 20 }, "endPos": { "offset": 33, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 32, + "start": 31, "end": 33 } ], @@ -837,22 +837,22 @@ { "kind": "", "startPos": { - "offset": 52, + "offset": 51, "line": 2, - "column": 19 + "column": 18 }, "endPos": { "offset": 53, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 52, + "start": 51, "end": 53 } ], @@ -1718,22 +1718,22 @@ { "kind": "", "startPos": { - "offset": 103, + "offset": 102, "line": 3, - "column": 50 + "column": 49 }, "endPos": { "offset": 104, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 103, + "start": 102, "end": 104 } ], @@ -1851,22 +1851,22 @@ { "kind": "", "startPos": { - "offset": 110, + "offset": 109, "line": 4, - "column": 6 + "column": 5 }, "endPos": { "offset": 111, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 110, + "start": 109, "end": 111 } ], @@ -1888,7 +1888,7 @@ "line": 6, "column": 4 }, - "fullStart": 112, + "fullStart": 111, "endPos": { "offset": 200, "line": 11, @@ -1914,22 +1914,22 @@ { "kind": "", "startPos": { - "offset": 112, + "offset": 111, "line": 5, - "column": 1 + "column": 0 }, "endPos": { "offset": 113, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 112, + "start": 111, "end": 113 }, { @@ -2256,22 +2256,22 @@ { "kind": "", "startPos": { - "offset": 134, + "offset": 133, "line": 6, - "column": 21 + "column": 20 }, "endPos": { "offset": 135, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 134, + "start": 133, "end": 135 } ], @@ -2520,22 +2520,22 @@ { "kind": "", "startPos": { - "offset": 147, + "offset": 146, "line": 7, - "column": 12 + "column": 11 }, "endPos": { "offset": 148, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 147, + "start": 146, "end": 148 } ], @@ -2788,22 +2788,22 @@ { "kind": "", "startPos": { - "offset": 162, + "offset": 161, "line": 8, - "column": 14 + "column": 13 }, "endPos": { "offset": 163, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 162, + "start": 161, "end": 163 } ], @@ -3056,22 +3056,22 @@ { "kind": "", "startPos": { - "offset": 178, + "offset": 177, "line": 9, - "column": 15 + "column": 14 }, "endPos": { "offset": 179, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 178, + "start": 177, "end": 179 } ], @@ -3324,22 +3324,22 @@ { "kind": "", "startPos": { - "offset": 194, + "offset": 193, "line": 10, - "column": 15 + "column": 14 }, "endPos": { "offset": 195, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 194, + "start": 193, "end": 195 } ], @@ -3458,22 +3458,22 @@ { "kind": "", "startPos": { - "offset": 201, + "offset": 200, "line": 11, - "column": 6 + "column": 5 }, "endPos": { "offset": 202, "line": 12, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 201, + "start": 200, "end": 202 } ], @@ -3956,22 +3956,22 @@ { "kind": "", "startPos": { - "offset": 32, + "offset": 31, "line": 1, - "column": 21 + "column": 20 }, "endPos": { "offset": 33, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 32, + "start": 31, "end": 33 } ], @@ -4300,22 +4300,22 @@ { "kind": "", "startPos": { - "offset": 52, + "offset": 51, "line": 2, - "column": 19 + "column": 18 }, "endPos": { "offset": 53, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 52, + "start": 51, "end": 53 } ], @@ -5181,22 +5181,22 @@ { "kind": "", "startPos": { - "offset": 103, + "offset": 102, "line": 3, - "column": 50 + "column": 49 }, "endPos": { "offset": 104, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 103, + "start": 102, "end": 104 } ], @@ -5314,22 +5314,22 @@ { "kind": "", "startPos": { - "offset": 110, + "offset": 109, "line": 4, - "column": 6 + "column": 5 }, "endPos": { "offset": 111, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 110, + "start": 109, "end": 111 } ], @@ -5614,7 +5614,7 @@ "line": 6, "column": 4 }, - "fullStart": 112, + "fullStart": 111, "endPos": { "offset": 200, "line": 11, @@ -5640,22 +5640,22 @@ { "kind": "", "startPos": { - "offset": 112, + "offset": 111, "line": 5, - "column": 1 + "column": 0 }, "endPos": { "offset": 113, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 112, + "start": 111, "end": 113 }, { @@ -5982,22 +5982,22 @@ { "kind": "", "startPos": { - "offset": 134, + "offset": 133, "line": 6, - "column": 21 + "column": 20 }, "endPos": { "offset": 135, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 134, + "start": 133, "end": 135 } ], @@ -6246,22 +6246,22 @@ { "kind": "", "startPos": { - "offset": 147, + "offset": 146, "line": 7, - "column": 12 + "column": 11 }, "endPos": { "offset": 148, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 147, + "start": 146, "end": 148 } ], @@ -6514,22 +6514,22 @@ { "kind": "", "startPos": { - "offset": 162, + "offset": 161, "line": 8, - "column": 14 + "column": 13 }, "endPos": { "offset": 163, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 162, + "start": 161, "end": 163 } ], @@ -6782,22 +6782,22 @@ { "kind": "", "startPos": { - "offset": 178, + "offset": 177, "line": 9, - "column": 15 + "column": 14 }, "endPos": { "offset": 179, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 178, + "start": 177, "end": 179 } ], @@ -7050,22 +7050,22 @@ { "kind": "", "startPos": { - "offset": 194, + "offset": 193, "line": 10, - "column": 15 + "column": 14 }, "endPos": { "offset": 195, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 194, + "start": 193, "end": 195 } ], @@ -7184,22 +7184,22 @@ { "kind": "", "startPos": { - "offset": 201, + "offset": 200, "line": 11, - "column": 6 + "column": 5 }, "endPos": { "offset": 202, "line": 12, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 201, + "start": 200, "end": 202 } ], diff --git a/packages/dbml-parse/tests/examples/validator/output/duplicate_columns.out.json b/packages/dbml-parse/tests/examples/validator/output/duplicate_columns.out.json index 3b073b7bd..ac2539a8c 100644 --- a/packages/dbml-parse/tests/examples/validator/output/duplicate_columns.out.json +++ b/packages/dbml-parse/tests/examples/validator/output/duplicate_columns.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 14, + "offset": 13, "line": 0, - "column": 14 + "column": 13 }, "endPos": { "offset": 15, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 14, + "start": 13, "end": 15 } ], @@ -451,22 +451,22 @@ { "kind": "", "startPos": { - "offset": 30, + "offset": 29, "line": 1, - "column": 15 + "column": 14 }, "endPos": { "offset": 31, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 30, + "start": 29, "end": 31 } ], @@ -715,22 +715,22 @@ { "kind": "", "startPos": { - "offset": 46, + "offset": 45, "line": 2, - "column": 15 + "column": 14 }, "endPos": { "offset": 47, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 46, + "start": 45, "end": 47 } ], @@ -979,22 +979,22 @@ { "kind": "", "startPos": { - "offset": 62, + "offset": 61, "line": 3, - "column": 15 + "column": 14 }, "endPos": { "offset": 63, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 62, + "start": 61, "end": 63 } ], @@ -1028,22 +1028,22 @@ { "kind": "", "startPos": { - "offset": 65, + "offset": 64, "line": 4, - "column": 2 + "column": 1 }, "endPos": { "offset": 66, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 65, + "start": 64, "end": 66 } ], @@ -1065,7 +1065,7 @@ "line": 6, "column": 0 }, - "fullStart": 67, + "fullStart": 66, "endPos": { "offset": 133, "line": 10, @@ -1091,22 +1091,22 @@ { "kind": "", "startPos": { - "offset": 67, + "offset": 66, "line": 5, - "column": 1 + "column": 0 }, "endPos": { "offset": 68, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 67, + "start": 66, "end": 68 } ], @@ -1253,22 +1253,22 @@ { "kind": "", "startPos": { - "offset": 95, + "offset": 94, "line": 6, - "column": 27 + "column": 26 }, "endPos": { "offset": 96, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 95, + "start": 94, "end": 96 } ], @@ -1513,22 +1513,22 @@ { "kind": "", "startPos": { - "offset": 107, + "offset": 106, "line": 7, - "column": 11 + "column": 10 }, "endPos": { "offset": 108, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 107, + "start": 106, "end": 108 } ], @@ -1777,22 +1777,22 @@ { "kind": "", "startPos": { - "offset": 119, + "offset": 118, "line": 8, - "column": 11 + "column": 10 }, "endPos": { "offset": 120, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 119, + "start": 118, "end": 120 } ], @@ -2041,22 +2041,22 @@ { "kind": "", "startPos": { - "offset": 131, + "offset": 130, "line": 9, - "column": 11 + "column": 10 }, "endPos": { "offset": 132, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 131, + "start": 130, "end": 132 } ], @@ -2090,22 +2090,22 @@ { "kind": "", "startPos": { - "offset": 134, + "offset": 133, "line": 10, - "column": 2 + "column": 1 }, "endPos": { "offset": 135, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 134, + "start": 133, "end": 135 } ], @@ -2410,22 +2410,22 @@ { "kind": "", "startPos": { - "offset": 46, + "offset": 45, "line": 2, - "column": 15 + "column": 14 }, "endPos": { "offset": 47, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 46, + "start": 45, "end": 47 } ], @@ -2681,22 +2681,22 @@ { "kind": "", "startPos": { - "offset": 30, + "offset": 29, "line": 1, - "column": 15 + "column": 14 }, "endPos": { "offset": 31, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 30, + "start": 29, "end": 31 } ], @@ -2952,22 +2952,22 @@ { "kind": "", "startPos": { - "offset": 62, + "offset": 61, "line": 3, - "column": 15 + "column": 14 }, "endPos": { "offset": 63, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 62, + "start": 61, "end": 63 } ], @@ -3223,22 +3223,22 @@ { "kind": "", "startPos": { - "offset": 30, + "offset": 29, "line": 1, - "column": 15 + "column": 14 }, "endPos": { "offset": 31, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 30, + "start": 29, "end": 31 } ], @@ -3494,22 +3494,22 @@ { "kind": "", "startPos": { - "offset": 119, + "offset": 118, "line": 8, - "column": 11 + "column": 10 }, "endPos": { "offset": 120, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 119, + "start": 118, "end": 120 } ], @@ -3765,22 +3765,22 @@ { "kind": "", "startPos": { - "offset": 107, + "offset": 106, "line": 7, - "column": 11 + "column": 10 }, "endPos": { "offset": 108, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 107, + "start": 106, "end": 108 } ], @@ -4036,22 +4036,22 @@ { "kind": "", "startPos": { - "offset": 131, + "offset": 130, "line": 9, - "column": 11 + "column": 10 }, "endPos": { "offset": 132, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 131, + "start": 130, "end": 132 } ], @@ -4307,22 +4307,22 @@ { "kind": "", "startPos": { - "offset": 107, + "offset": 106, "line": 7, - "column": 11 + "column": 10 }, "endPos": { "offset": 108, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 107, + "start": 106, "end": 108 } ], diff --git a/packages/dbml-parse/tests/examples/validator/output/duplicate_enum_field.out.json b/packages/dbml-parse/tests/examples/validator/output/duplicate_enum_field.out.json index 9f7056ea3..2690d6337 100644 --- a/packages/dbml-parse/tests/examples/validator/output/duplicate_enum_field.out.json +++ b/packages/dbml-parse/tests/examples/validator/output/duplicate_enum_field.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 14, + "offset": 13, "line": 0, - "column": 14 + "column": 13 }, "endPos": { "offset": 15, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 14, + "start": 13, "end": 15 } ], @@ -371,22 +371,22 @@ { "kind": "", "startPos": { - "offset": 25, + "offset": 24, "line": 1, - "column": 10 + "column": 9 }, "endPos": { "offset": 26, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 25, + "start": 24, "end": 26 } ], @@ -555,22 +555,22 @@ { "kind": "", "startPos": { - "offset": 36, + "offset": 35, "line": 2, - "column": 10 + "column": 9 }, "endPos": { "offset": 37, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 36, + "start": 35, "end": 37 } ], @@ -739,22 +739,22 @@ { "kind": "", "startPos": { - "offset": 47, + "offset": 46, "line": 3, - "column": 10 + "column": 9 }, "endPos": { "offset": 48, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 47, + "start": 46, "end": 48 } ], @@ -994,22 +994,22 @@ { "kind": "", "startPos": { - "offset": 36, + "offset": 35, "line": 2, - "column": 10 + "column": 9 }, "endPos": { "offset": 37, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 36, + "start": 35, "end": 37 } ], @@ -1185,22 +1185,22 @@ { "kind": "", "startPos": { - "offset": 25, + "offset": 24, "line": 1, - "column": 10 + "column": 9 }, "endPos": { "offset": 26, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 25, + "start": 24, "end": 26 } ], @@ -1376,22 +1376,22 @@ { "kind": "", "startPos": { - "offset": 47, + "offset": 46, "line": 3, - "column": 10 + "column": 9 }, "endPos": { "offset": 48, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 47, + "start": 46, "end": 48 } ], @@ -1567,22 +1567,22 @@ { "kind": "", "startPos": { - "offset": 25, + "offset": 24, "line": 1, - "column": 10 + "column": 9 }, "endPos": { "offset": 26, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 25, + "start": 24, "end": 26 } ], diff --git a/packages/dbml-parse/tests/examples/validator/output/duplicate_names.out.json b/packages/dbml-parse/tests/examples/validator/output/duplicate_names.out.json index e23e4d4f2..8fb36dc83 100644 --- a/packages/dbml-parse/tests/examples/validator/output/duplicate_names.out.json +++ b/packages/dbml-parse/tests/examples/validator/output/duplicate_names.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 14, + "offset": 13, "line": 0, - "column": 14 + "column": 13 }, "endPos": { "offset": 15, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 14, + "start": 13, "end": 15 } ], @@ -409,22 +409,22 @@ { "kind": "", "startPos": { - "offset": 28, + "offset": 27, "line": 1, - "column": 13 + "column": 12 }, "endPos": { "offset": 29, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 28, + "start": 27, "end": 29 } ], @@ -458,22 +458,22 @@ { "kind": "", "startPos": { - "offset": 31, + "offset": 30, "line": 2, - "column": 2 + "column": 1 }, "endPos": { "offset": 32, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 31, + "start": 30, "end": 32 } ], @@ -495,7 +495,7 @@ "line": 4, "column": 0 }, - "fullStart": 33, + "fullStart": 32, "endPos": { "offset": 68, "line": 6, @@ -521,22 +521,22 @@ { "kind": "", "startPos": { - "offset": 33, + "offset": 32, "line": 3, - "column": 1 + "column": 0 }, "endPos": { "offset": 34, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 33, + "start": 32, "end": 34 } ], @@ -683,22 +683,22 @@ { "kind": "", "startPos": { - "offset": 48, + "offset": 47, "line": 4, - "column": 14 + "column": 13 }, "endPos": { "offset": 49, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 48, + "start": 47, "end": 49 } ], @@ -1039,22 +1039,22 @@ { "kind": "", "startPos": { - "offset": 66, + "offset": 65, "line": 5, - "column": 17 + "column": 16 }, "endPos": { "offset": 67, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 66, + "start": 65, "end": 67 } ], @@ -1088,22 +1088,22 @@ { "kind": "", "startPos": { - "offset": 69, + "offset": 68, "line": 6, - "column": 2 + "column": 1 }, "endPos": { "offset": 70, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 69, + "start": 68, "end": 70 } ], @@ -1125,7 +1125,7 @@ "line": 8, "column": 0 }, - "fullStart": 71, + "fullStart": 70, "endPos": { "offset": 95, "line": 10, @@ -1151,22 +1151,22 @@ { "kind": "", "startPos": { - "offset": 71, + "offset": 70, "line": 7, - "column": 1 + "column": 0 }, "endPos": { "offset": 72, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 71, + "start": 70, "end": 72 } ], @@ -1313,22 +1313,22 @@ { "kind": "", "startPos": { - "offset": 91, + "offset": 90, "line": 8, - "column": 19 + "column": 18 }, "endPos": { "offset": 92, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 91, + "start": 90, "end": 92 } ], @@ -1356,22 +1356,22 @@ { "kind": "", "startPos": { - "offset": 93, + "offset": 92, "line": 9, - "column": 1 + "column": 0 }, "endPos": { "offset": 94, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 93, + "start": 92, "end": 94 } ], @@ -1379,22 +1379,22 @@ { "kind": "", "startPos": { - "offset": 96, + "offset": 95, "line": 10, - "column": 2 + "column": 1 }, "endPos": { "offset": 97, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 96, + "start": 95, "end": 97 } ], @@ -1416,7 +1416,7 @@ "line": 12, "column": 0 }, - "fullStart": 98, + "fullStart": 97, "endPos": { "offset": 122, "line": 14, @@ -1442,22 +1442,22 @@ { "kind": "", "startPos": { - "offset": 98, + "offset": 97, "line": 11, - "column": 1 + "column": 0 }, "endPos": { "offset": 99, "line": 12, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 98, + "start": 97, "end": 99 } ], @@ -1604,22 +1604,22 @@ { "kind": "", "startPos": { - "offset": 118, + "offset": 117, "line": 12, - "column": 19 + "column": 18 }, "endPos": { "offset": 119, "line": 13, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 118, + "start": 117, "end": 119 } ], @@ -1647,22 +1647,22 @@ { "kind": "", "startPos": { - "offset": 120, + "offset": 119, "line": 13, - "column": 1 + "column": 0 }, "endPos": { "offset": 121, "line": 14, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 120, + "start": 119, "end": 121 } ], @@ -1670,22 +1670,22 @@ { "kind": "", "startPos": { - "offset": 123, + "offset": 122, "line": 14, - "column": 2 + "column": 1 }, "endPos": { "offset": 124, "line": 15, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 123, + "start": 122, "end": 124 } ], @@ -1707,7 +1707,7 @@ "line": 16, "column": 0 }, - "fullStart": 125, + "fullStart": 124, "endPos": { "offset": 143, "line": 18, @@ -1733,22 +1733,22 @@ { "kind": "", "startPos": { - "offset": 125, + "offset": 124, "line": 15, - "column": 1 + "column": 0 }, "endPos": { "offset": 126, "line": 16, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 125, + "start": 124, "end": 126 } ], @@ -1895,22 +1895,22 @@ { "kind": "", "startPos": { - "offset": 139, + "offset": 138, "line": 16, - "column": 13 + "column": 12 }, "endPos": { "offset": 140, "line": 17, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 139, + "start": 138, "end": 140 } ], @@ -1938,22 +1938,22 @@ { "kind": "", "startPos": { - "offset": 141, + "offset": 140, "line": 17, - "column": 1 + "column": 0 }, "endPos": { "offset": 142, "line": 18, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 141, + "start": 140, "end": 142 } ], @@ -1961,22 +1961,22 @@ { "kind": "", "startPos": { - "offset": 144, + "offset": 143, "line": 18, - "column": 2 + "column": 1 }, "endPos": { "offset": 145, "line": 19, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 144, + "start": 143, "end": 145 } ], @@ -1998,7 +1998,7 @@ "line": 20, "column": 0 }, - "fullStart": 146, + "fullStart": 145, "endPos": { "offset": 164, "line": 22, @@ -2024,22 +2024,22 @@ { "kind": "", "startPos": { - "offset": 146, + "offset": 145, "line": 19, - "column": 1 + "column": 0 }, "endPos": { "offset": 147, "line": 20, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 146, + "start": 145, "end": 147 } ], @@ -2186,22 +2186,22 @@ { "kind": "", "startPos": { - "offset": 160, + "offset": 159, "line": 20, - "column": 13 + "column": 12 }, "endPos": { "offset": 161, "line": 21, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 160, + "start": 159, "end": 161 } ], @@ -2229,22 +2229,22 @@ { "kind": "", "startPos": { - "offset": 162, + "offset": 161, "line": 21, - "column": 1 + "column": 0 }, "endPos": { "offset": 163, "line": 22, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 162, + "start": 161, "end": 163 } ], @@ -2252,22 +2252,22 @@ { "kind": "", "startPos": { - "offset": 165, + "offset": 164, "line": 22, - "column": 2 + "column": 1 }, "endPos": { "offset": 166, "line": 23, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 165, + "start": 164, "end": 166 } ], @@ -2289,7 +2289,7 @@ "line": 24, "column": 0 }, - "fullStart": 167, + "fullStart": 166, "endPos": { "offset": 193, "line": 26, @@ -2315,22 +2315,22 @@ { "kind": "", "startPos": { - "offset": 167, + "offset": 166, "line": 23, - "column": 1 + "column": 0 }, "endPos": { "offset": 168, "line": 24, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 167, + "start": 166, "end": 168 } ], @@ -2477,22 +2477,22 @@ { "kind": "", "startPos": { - "offset": 189, + "offset": 188, "line": 24, - "column": 21 + "column": 20 }, "endPos": { "offset": 190, "line": 25, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 189, + "start": 188, "end": 190 } ], @@ -2520,22 +2520,22 @@ { "kind": "", "startPos": { - "offset": 191, + "offset": 190, "line": 25, - "column": 1 + "column": 0 }, "endPos": { "offset": 192, "line": 26, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 191, + "start": 190, "end": 192 } ], @@ -2543,22 +2543,22 @@ { "kind": "", "startPos": { - "offset": 194, + "offset": 193, "line": 26, - "column": 2 + "column": 1 }, "endPos": { "offset": 195, "line": 27, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 194, + "start": 193, "end": 195 } ], @@ -2580,7 +2580,7 @@ "line": 28, "column": 0 }, - "fullStart": 196, + "fullStart": 195, "endPos": { "offset": 222, "line": 30, @@ -2606,22 +2606,22 @@ { "kind": "", "startPos": { - "offset": 196, + "offset": 195, "line": 27, - "column": 1 + "column": 0 }, "endPos": { "offset": 197, "line": 28, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 196, + "start": 195, "end": 197 } ], @@ -2768,22 +2768,22 @@ { "kind": "", "startPos": { - "offset": 218, + "offset": 217, "line": 28, - "column": 21 + "column": 20 }, "endPos": { "offset": 219, "line": 29, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 218, + "start": 217, "end": 219 } ], @@ -2811,22 +2811,22 @@ { "kind": "", "startPos": { - "offset": 220, + "offset": 219, "line": 29, - "column": 1 + "column": 0 }, "endPos": { "offset": 221, "line": 30, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 220, + "start": 219, "end": 221 } ], @@ -2834,22 +2834,22 @@ { "kind": "", "startPos": { - "offset": 223, + "offset": 222, "line": 30, - "column": 2 + "column": 1 }, "endPos": { "offset": 224, "line": 31, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 223, + "start": 222, "end": 224 } ], @@ -3106,7 +3106,7 @@ "line": 16, "column": 0 }, - "fullStart": 125, + "fullStart": 124, "endPos": { "offset": 143, "line": 18, @@ -3132,22 +3132,22 @@ { "kind": "", "startPos": { - "offset": 125, + "offset": 124, "line": 15, - "column": 1 + "column": 0 }, "endPos": { "offset": 126, "line": 16, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 125, + "start": 124, "end": 126 } ], @@ -3294,22 +3294,22 @@ { "kind": "", "startPos": { - "offset": 139, + "offset": 138, "line": 16, - "column": 13 + "column": 12 }, "endPos": { "offset": 140, "line": 17, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 139, + "start": 138, "end": 140 } ], @@ -3337,22 +3337,22 @@ { "kind": "", "startPos": { - "offset": 141, + "offset": 140, "line": 17, - "column": 1 + "column": 0 }, "endPos": { "offset": 142, "line": 18, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 141, + "start": 140, "end": 142 } ], @@ -3360,22 +3360,22 @@ { "kind": "", "startPos": { - "offset": 144, + "offset": 143, "line": 18, - "column": 2 + "column": 1 }, "endPos": { "offset": 145, "line": 19, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 144, + "start": 143, "end": 145 } ], @@ -3490,7 +3490,7 @@ "line": 20, "column": 0 }, - "fullStart": 146, + "fullStart": 145, "endPos": { "offset": 164, "line": 22, @@ -3516,22 +3516,22 @@ { "kind": "", "startPos": { - "offset": 146, + "offset": 145, "line": 19, - "column": 1 + "column": 0 }, "endPos": { "offset": 147, "line": 20, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 146, + "start": 145, "end": 147 } ], @@ -3678,22 +3678,22 @@ { "kind": "", "startPos": { - "offset": 160, + "offset": 159, "line": 20, - "column": 13 + "column": 12 }, "endPos": { "offset": 161, "line": 21, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 160, + "start": 159, "end": 161 } ], @@ -3721,22 +3721,22 @@ { "kind": "", "startPos": { - "offset": 162, + "offset": 161, "line": 21, - "column": 1 + "column": 0 }, "endPos": { "offset": 163, "line": 22, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 162, + "start": 161, "end": 163 } ], @@ -3744,22 +3744,22 @@ { "kind": "", "startPos": { - "offset": 165, + "offset": 164, "line": 22, - "column": 2 + "column": 1 }, "endPos": { "offset": 166, "line": 23, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 165, + "start": 164, "end": 166 } ], diff --git a/packages/dbml-parse/tests/examples/validator/output/duplicate_table_partial_injections.out.json b/packages/dbml-parse/tests/examples/validator/output/duplicate_table_partial_injections.out.json index 2ea79a892..bd9af62e1 100644 --- a/packages/dbml-parse/tests/examples/validator/output/duplicate_table_partial_injections.out.json +++ b/packages/dbml-parse/tests/examples/validator/output/duplicate_table_partial_injections.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 22, + "offset": 21, "line": 0, - "column": 22 + "column": 21 }, "endPos": { "offset": 23, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 22, + "start": 21, "end": 23 } ], @@ -409,22 +409,22 @@ { "kind": "", "startPos": { - "offset": 35, + "offset": 34, "line": 1, - "column": 12 + "column": 11 }, "endPos": { "offset": 36, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 35, + "start": 34, "end": 36 } ], @@ -458,22 +458,22 @@ { "kind": "", "startPos": { - "offset": 38, + "offset": 37, "line": 2, - "column": 2 + "column": 1 }, "endPos": { "offset": 39, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 38, + "start": 37, "end": 39 } ], @@ -495,7 +495,7 @@ "line": 4, "column": 0 }, - "fullStart": 40, + "fullStart": 39, "endPos": { "offset": 100, "line": 9, @@ -521,22 +521,22 @@ { "kind": "", "startPos": { - "offset": 40, + "offset": 39, "line": 3, - "column": 1 + "column": 0 }, "endPos": { "offset": 41, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 40, + "start": 39, "end": 41 } ], @@ -683,22 +683,22 @@ { "kind": "", "startPos": { - "offset": 55, + "offset": 54, "line": 4, - "column": 14 + "column": 13 }, "endPos": { "offset": 56, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 55, + "start": 54, "end": 56 } ], @@ -901,22 +901,22 @@ { "kind": "", "startPos": { - "offset": 65, + "offset": 64, "line": 5, - "column": 9 + "column": 8 }, "endPos": { "offset": 66, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 65, + "start": 64, "end": 66 } ], @@ -983,22 +983,22 @@ { "kind": "", "startPos": { - "offset": 76, + "offset": 75, "line": 6, - "column": 10 + "column": 9 }, "endPos": { "offset": 77, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 76, + "start": 75, "end": 77 } ], @@ -1063,22 +1063,22 @@ { "kind": "", "startPos": { - "offset": 87, + "offset": 86, "line": 7, - "column": 10 + "column": 9 }, "endPos": { "offset": 88, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 87, + "start": 86, "end": 88 } ], @@ -1143,22 +1143,22 @@ { "kind": "", "startPos": { - "offset": 98, + "offset": 97, "line": 8, - "column": 10 + "column": 9 }, "endPos": { "offset": 99, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 98, + "start": 97, "end": 99 } ], @@ -1190,22 +1190,22 @@ { "kind": "", "startPos": { - "offset": 101, + "offset": 100, "line": 9, - "column": 2 + "column": 1 }, "endPos": { "offset": 102, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 101, + "start": 100, "end": 102 } ], @@ -1333,22 +1333,22 @@ { "kind": "", "startPos": { - "offset": 87, + "offset": 86, "line": 7, - "column": 10 + "column": 9 }, "endPos": { "offset": 88, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 87, + "start": 86, "end": 88 } ], @@ -1420,22 +1420,22 @@ { "kind": "", "startPos": { - "offset": 76, + "offset": 75, "line": 6, - "column": 10 + "column": 9 }, "endPos": { "offset": 77, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 76, + "start": 75, "end": 77 } ], @@ -1507,22 +1507,22 @@ { "kind": "", "startPos": { - "offset": 98, + "offset": 97, "line": 8, - "column": 10 + "column": 9 }, "endPos": { "offset": 99, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 98, + "start": 97, "end": 99 } ], @@ -1594,22 +1594,22 @@ { "kind": "", "startPos": { - "offset": 76, + "offset": 75, "line": 6, - "column": 10 + "column": 9 }, "endPos": { "offset": 77, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 76, + "start": 75, "end": 77 } ], diff --git a/packages/dbml-parse/tests/examples/validator/output/enum.out.json b/packages/dbml-parse/tests/examples/validator/output/enum.out.json index f8fb1c675..c58ce464e 100644 --- a/packages/dbml-parse/tests/examples/validator/output/enum.out.json +++ b/packages/dbml-parse/tests/examples/validator/output/enum.out.json @@ -287,22 +287,22 @@ { "kind": "", "startPos": { - "offset": 13, + "offset": 12, "line": 0, - "column": 13 + "column": 12 }, "endPos": { "offset": 14, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 13, + "start": 12, "end": 14 } ], @@ -330,22 +330,22 @@ { "kind": "", "startPos": { - "offset": 15, + "offset": 14, "line": 1, - "column": 1 + "column": 0 }, "endPos": { "offset": 16, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 15, + "start": 14, "end": 16 } ], @@ -353,22 +353,22 @@ { "kind": "", "startPos": { - "offset": 18, + "offset": 17, "line": 2, - "column": 2 + "column": 1 }, "endPos": { "offset": 19, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 18, + "start": 17, "end": 19 } ], @@ -390,7 +390,7 @@ "line": 4, "column": 0 }, - "fullStart": 20, + "fullStart": 19, "endPos": { "offset": 72, "line": 10, @@ -416,22 +416,22 @@ { "kind": "", "startPos": { - "offset": 20, + "offset": 19, "line": 3, - "column": 1 + "column": 0 }, "endPos": { "offset": 21, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 20, + "start": 19, "end": 21 } ], @@ -499,22 +499,22 @@ { "kind": "", "startPos": { - "offset": 28, + "offset": 27, "line": 4, - "column": 7 + "column": 6 }, "endPos": { "offset": 29, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 28, + "start": 27, "end": 29 } ], @@ -679,22 +679,22 @@ { "kind": "", "startPos": { - "offset": 37, + "offset": 36, "line": 5, - "column": 8 + "column": 7 }, "endPos": { "offset": 38, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 37, + "start": 36, "end": 38 } ], @@ -863,22 +863,22 @@ { "kind": "", "startPos": { - "offset": 46, + "offset": 45, "line": 6, - "column": 8 + "column": 7 }, "endPos": { "offset": 47, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 46, + "start": 45, "end": 47 } ], @@ -1047,22 +1047,22 @@ { "kind": "", "startPos": { - "offset": 53, + "offset": 52, "line": 7, - "column": 6 + "column": 5 }, "endPos": { "offset": 54, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 53, + "start": 52, "end": 54 } ], @@ -1230,22 +1230,22 @@ { "kind": "", "startPos": { - "offset": 60, + "offset": 59, "line": 8, - "column": 6 + "column": 5 }, "endPos": { "offset": 61, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 60, + "start": 59, "end": 61 } ], @@ -1414,22 +1414,22 @@ { "kind": "", "startPos": { - "offset": 70, + "offset": 69, "line": 9, - "column": 9 + "column": 8 }, "endPos": { "offset": 71, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 70, + "start": 69, "end": 71 } ], @@ -1785,22 +1785,22 @@ { "kind": "", "startPos": { - "offset": 13, + "offset": 12, "line": 0, - "column": 13 + "column": 12 }, "endPos": { "offset": 14, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 13, + "start": 12, "end": 14 } ], @@ -1828,22 +1828,22 @@ { "kind": "", "startPos": { - "offset": 15, + "offset": 14, "line": 1, - "column": 1 + "column": 0 }, "endPos": { "offset": 16, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 15, + "start": 14, "end": 16 } ], @@ -1851,22 +1851,22 @@ { "kind": "", "startPos": { - "offset": 18, + "offset": 17, "line": 2, - "column": 2 + "column": 1 }, "endPos": { "offset": 19, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 18, + "start": 17, "end": 19 } ], @@ -1895,7 +1895,7 @@ "line": 4, "column": 0 }, - "fullStart": 20, + "fullStart": 19, "endPos": { "offset": 72, "line": 10, @@ -1921,22 +1921,22 @@ { "kind": "", "startPos": { - "offset": 20, + "offset": 19, "line": 3, - "column": 1 + "column": 0 }, "endPos": { "offset": 21, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 20, + "start": 19, "end": 21 } ], @@ -2004,22 +2004,22 @@ { "kind": "", "startPos": { - "offset": 28, + "offset": 27, "line": 4, - "column": 7 + "column": 6 }, "endPos": { "offset": 29, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 28, + "start": 27, "end": 29 } ], @@ -2184,22 +2184,22 @@ { "kind": "", "startPos": { - "offset": 37, + "offset": 36, "line": 5, - "column": 8 + "column": 7 }, "endPos": { "offset": 38, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 37, + "start": 36, "end": 38 } ], @@ -2368,22 +2368,22 @@ { "kind": "", "startPos": { - "offset": 46, + "offset": 45, "line": 6, - "column": 8 + "column": 7 }, "endPos": { "offset": 47, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 46, + "start": 45, "end": 47 } ], @@ -2552,22 +2552,22 @@ { "kind": "", "startPos": { - "offset": 53, + "offset": 52, "line": 7, - "column": 6 + "column": 5 }, "endPos": { "offset": 54, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 53, + "start": 52, "end": 54 } ], @@ -2735,22 +2735,22 @@ { "kind": "", "startPos": { - "offset": 60, + "offset": 59, "line": 8, - "column": 6 + "column": 5 }, "endPos": { "offset": 61, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 60, + "start": 59, "end": 61 } ], @@ -2919,22 +2919,22 @@ { "kind": "", "startPos": { - "offset": 70, + "offset": 69, "line": 9, - "column": 9 + "column": 8 }, "endPos": { "offset": 71, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 70, + "start": 69, "end": 71 } ], @@ -3136,22 +3136,22 @@ { "kind": "", "startPos": { - "offset": 46, + "offset": 45, "line": 6, - "column": 8 + "column": 7 }, "endPos": { "offset": 47, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 46, + "start": 45, "end": 47 } ], @@ -3327,22 +3327,22 @@ { "kind": "", "startPos": { - "offset": 37, + "offset": 36, "line": 5, - "column": 8 + "column": 7 }, "endPos": { "offset": 38, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 37, + "start": 36, "end": 38 } ], @@ -3501,22 +3501,22 @@ { "kind": "", "startPos": { - "offset": 53, + "offset": 52, "line": 7, - "column": 6 + "column": 5 }, "endPos": { "offset": 54, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 53, + "start": 52, "end": 54 } ], diff --git a/packages/dbml-parse/tests/examples/validator/output/nested_duplicate_names.out.json b/packages/dbml-parse/tests/examples/validator/output/nested_duplicate_names.out.json index b985b2dbf..358f60662 100644 --- a/packages/dbml-parse/tests/examples/validator/output/nested_duplicate_names.out.json +++ b/packages/dbml-parse/tests/examples/validator/output/nested_duplicate_names.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 12, + "offset": 11, "line": 0, - "column": 12 + "column": 11 }, "endPos": { "offset": 13, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 12, + "start": 11, "end": 13 } ], @@ -476,22 +476,22 @@ { "kind": "", "startPos": { - "offset": 27, + "offset": 26, "line": 1, - "column": 14 + "column": 13 }, "endPos": { "offset": 28, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 27, + "start": 26, "end": 28 } ], @@ -519,22 +519,22 @@ { "kind": "", "startPos": { - "offset": 29, + "offset": 28, "line": 2, - "column": 1 + "column": 0 }, "endPos": { "offset": 30, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 29, + "start": 28, "end": 30 }, { @@ -626,22 +626,22 @@ { "kind": "", "startPos": { - "offset": 36, + "offset": 35, "line": 3, - "column": 6 + "column": 5 }, "endPos": { "offset": 37, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 36, + "start": 35, "end": 37 } ], @@ -663,7 +663,7 @@ "line": 5, "column": 4 }, - "fullStart": 38, + "fullStart": 37, "endPos": { "offset": 61, "line": 7, @@ -689,22 +689,22 @@ { "kind": "", "startPos": { - "offset": 38, + "offset": 37, "line": 4, - "column": 1 + "column": 0 }, "endPos": { "offset": 39, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 38, + "start": 37, "end": 39 }, { @@ -935,22 +935,22 @@ { "kind": "", "startPos": { - "offset": 53, + "offset": 52, "line": 5, - "column": 14 + "column": 13 }, "endPos": { "offset": 54, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 53, + "start": 52, "end": 54 } ], @@ -978,22 +978,22 @@ { "kind": "", "startPos": { - "offset": 55, + "offset": 54, "line": 6, - "column": 1 + "column": 0 }, "endPos": { "offset": 56, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 55, + "start": 54, "end": 56 }, { @@ -1085,22 +1085,22 @@ { "kind": "", "startPos": { - "offset": 62, + "offset": 61, "line": 7, - "column": 6 + "column": 5 }, "endPos": { "offset": 63, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 62, + "start": 61, "end": 63 } ], @@ -1122,7 +1122,7 @@ "line": 9, "column": 4 }, - "fullStart": 64, + "fullStart": 63, "endPos": { "offset": 95, "line": 11, @@ -1148,22 +1148,22 @@ { "kind": "", "startPos": { - "offset": 64, + "offset": 63, "line": 8, - "column": 1 + "column": 0 }, "endPos": { "offset": 65, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 64, + "start": 63, "end": 65 }, { @@ -1394,22 +1394,22 @@ { "kind": "", "startPos": { - "offset": 79, + "offset": 78, "line": 9, - "column": 14 + "column": 13 }, "endPos": { "offset": 80, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 79, + "start": 78, "end": 80 } ], @@ -1605,22 +1605,22 @@ { "kind": "", "startPos": { - "offset": 89, + "offset": 88, "line": 10, - "column": 9 + "column": 8 }, "endPos": { "offset": 90, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 89, + "start": 88, "end": 90 }, { @@ -1712,22 +1712,22 @@ { "kind": "", "startPos": { - "offset": 96, + "offset": 95, "line": 11, - "column": 6 + "column": 5 }, "endPos": { "offset": 97, "line": 12, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 96, + "start": 95, "end": 97 } ], @@ -2070,22 +2070,22 @@ { "kind": "", "startPos": { - "offset": 27, + "offset": 26, "line": 1, - "column": 14 + "column": 13 }, "endPos": { "offset": 28, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 27, + "start": 26, "end": 28 } ], @@ -2113,22 +2113,22 @@ { "kind": "", "startPos": { - "offset": 29, + "offset": 28, "line": 2, - "column": 1 + "column": 0 }, "endPos": { "offset": 30, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 29, + "start": 28, "end": 30 }, { @@ -2220,22 +2220,22 @@ { "kind": "", "startPos": { - "offset": 36, + "offset": 35, "line": 3, - "column": 6 + "column": 5 }, "endPos": { "offset": 37, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 36, + "start": 35, "end": 37 } ], @@ -2264,7 +2264,7 @@ "line": 5, "column": 4 }, - "fullStart": 38, + "fullStart": 37, "endPos": { "offset": 61, "line": 7, @@ -2290,22 +2290,22 @@ { "kind": "", "startPos": { - "offset": 38, + "offset": 37, "line": 4, - "column": 1 + "column": 0 }, "endPos": { "offset": 39, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 38, + "start": 37, "end": 39 }, { @@ -2536,22 +2536,22 @@ { "kind": "", "startPos": { - "offset": 53, + "offset": 52, "line": 5, - "column": 14 + "column": 13 }, "endPos": { "offset": 54, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 53, + "start": 52, "end": 54 } ], @@ -2579,22 +2579,22 @@ { "kind": "", "startPos": { - "offset": 55, + "offset": 54, "line": 6, - "column": 1 + "column": 0 }, "endPos": { "offset": 56, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 55, + "start": 54, "end": 56 }, { @@ -2686,22 +2686,22 @@ { "kind": "", "startPos": { - "offset": 62, + "offset": 61, "line": 7, - "column": 6 + "column": 5 }, "endPos": { "offset": 63, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 62, + "start": 61, "end": 63 } ], @@ -2816,7 +2816,7 @@ "line": 9, "column": 4 }, - "fullStart": 64, + "fullStart": 63, "endPos": { "offset": 95, "line": 11, @@ -2842,22 +2842,22 @@ { "kind": "", "startPos": { - "offset": 64, + "offset": 63, "line": 8, - "column": 1 + "column": 0 }, "endPos": { "offset": 65, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 64, + "start": 63, "end": 65 }, { @@ -3088,22 +3088,22 @@ { "kind": "", "startPos": { - "offset": 79, + "offset": 78, "line": 9, - "column": 14 + "column": 13 }, "endPos": { "offset": 80, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 79, + "start": 78, "end": 80 } ], @@ -3299,22 +3299,22 @@ { "kind": "", "startPos": { - "offset": 89, + "offset": 88, "line": 10, - "column": 9 + "column": 8 }, "endPos": { "offset": 90, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 89, + "start": 88, "end": 90 }, { @@ -3406,22 +3406,22 @@ { "kind": "", "startPos": { - "offset": 96, + "offset": 95, "line": 11, - "column": 6 + "column": 5 }, "endPos": { "offset": 97, "line": 12, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 96, + "start": 95, "end": 97 } ], diff --git a/packages/dbml-parse/tests/examples/validator/output/public_schema.out.json b/packages/dbml-parse/tests/examples/validator/output/public_schema.out.json index 2b2fc7e5d..4f4c3ecd2 100644 --- a/packages/dbml-parse/tests/examples/validator/output/public_schema.out.json +++ b/packages/dbml-parse/tests/examples/validator/output/public_schema.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 14, + "offset": 13, "line": 0, - "column": 14 + "column": 13 }, "endPos": { "offset": 15, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 14, + "start": 13, "end": 15 } ], @@ -234,22 +234,22 @@ { "kind": "", "startPos": { - "offset": 16, + "offset": 15, "line": 1, - "column": 1 + "column": 0 }, "endPos": { "offset": 17, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 16, + "start": 15, "end": 17 } ], @@ -257,22 +257,22 @@ { "kind": "", "startPos": { - "offset": 19, + "offset": 18, "line": 2, - "column": 2 + "column": 1 }, "endPos": { "offset": 20, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 19, + "start": 18, "end": 20 } ], @@ -294,7 +294,7 @@ "line": 4, "column": 0 }, - "fullStart": 21, + "fullStart": 20, "endPos": { "offset": 51, "line": 6, @@ -320,22 +320,22 @@ { "kind": "", "startPos": { - "offset": 21, + "offset": 20, "line": 3, - "column": 1 + "column": 0 }, "endPos": { "offset": 22, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 21, + "start": 20, "end": 22 } ], @@ -578,22 +578,22 @@ { "kind": "", "startPos": { - "offset": 43, + "offset": 42, "line": 4, - "column": 21 + "column": 20 }, "endPos": { "offset": 44, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 43, + "start": 42, "end": 44 } ], @@ -705,22 +705,22 @@ { "kind": "", "startPos": { - "offset": 49, + "offset": 48, "line": 5, - "column": 5 + "column": 4 }, "endPos": { "offset": 50, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 49, + "start": 48, "end": 50 } ], @@ -948,22 +948,22 @@ { "kind": "", "startPos": { - "offset": 14, + "offset": 13, "line": 0, - "column": 14 + "column": 13 }, "endPos": { "offset": 15, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 14, + "start": 13, "end": 15 } ], @@ -991,22 +991,22 @@ { "kind": "", "startPos": { - "offset": 16, + "offset": 15, "line": 1, - "column": 1 + "column": 0 }, "endPos": { "offset": 17, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 16, + "start": 15, "end": 17 } ], @@ -1014,22 +1014,22 @@ { "kind": "", "startPos": { - "offset": 19, + "offset": 18, "line": 2, - "column": 2 + "column": 1 }, "endPos": { "offset": 20, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 19, + "start": 18, "end": 20 } ], @@ -1240,7 +1240,7 @@ "line": 4, "column": 0 }, - "fullStart": 21, + "fullStart": 20, "endPos": { "offset": 51, "line": 6, @@ -1266,22 +1266,22 @@ { "kind": "", "startPos": { - "offset": 21, + "offset": 20, "line": 3, - "column": 1 + "column": 0 }, "endPos": { "offset": 22, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 21, + "start": 20, "end": 22 } ], @@ -1524,22 +1524,22 @@ { "kind": "", "startPos": { - "offset": 43, + "offset": 42, "line": 4, - "column": 21 + "column": 20 }, "endPos": { "offset": 44, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 43, + "start": 42, "end": 44 } ], @@ -1651,22 +1651,22 @@ { "kind": "", "startPos": { - "offset": 49, + "offset": 48, "line": 5, - "column": 5 + "column": 4 }, "endPos": { "offset": 50, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 49, + "start": 48, "end": 50 } ], diff --git a/packages/dbml-parse/tests/examples/validator/output/redefined_note.out.json b/packages/dbml-parse/tests/examples/validator/output/redefined_note.out.json index add433979..0e2c5eaf3 100644 --- a/packages/dbml-parse/tests/examples/validator/output/redefined_note.out.json +++ b/packages/dbml-parse/tests/examples/validator/output/redefined_note.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 10, + "offset": 9, "line": 0, - "column": 10 + "column": 9 }, "endPos": { "offset": 11, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 10, + "start": 9, "end": 11 } ], @@ -452,22 +452,22 @@ { "kind": "", "startPos": { - "offset": 50, + "offset": 49, "line": 1, - "column": 39 + "column": 38 }, "endPos": { "offset": 51, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 50, + "start": 49, "end": 51 } ], @@ -663,22 +663,22 @@ { "kind": "", "startPos": { - "offset": 62, + "offset": 61, "line": 2, - "column": 11 + "column": 10 }, "endPos": { "offset": 63, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 62, + "start": 61, "end": 63 } ], @@ -927,22 +927,22 @@ { "kind": "", "startPos": { - "offset": 100, + "offset": 99, "line": 3, - "column": 37 + "column": 36 }, "endPos": { "offset": 101, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 100, + "start": 99, "end": 101 } ], @@ -1060,22 +1060,22 @@ { "kind": "", "startPos": { - "offset": 107, + "offset": 106, "line": 4, - "column": 6 + "column": 5 }, "endPos": { "offset": 108, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 107, + "start": 106, "end": 108 } ], @@ -1107,22 +1107,22 @@ { "kind": "", "startPos": { - "offset": 110, + "offset": 109, "line": 5, - "column": 2 + "column": 1 }, "endPos": { "offset": 111, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 110, + "start": 109, "end": 111 } ], @@ -1144,7 +1144,7 @@ "line": 7, "column": 0 }, - "fullStart": 112, + "fullStart": 111, "endPos": { "offset": 151, "line": 9, @@ -1170,22 +1170,22 @@ { "kind": "", "startPos": { - "offset": 112, + "offset": 111, "line": 6, - "column": 1 + "column": 0 }, "endPos": { "offset": 113, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 112, + "start": 111, "end": 113 } ], @@ -1253,22 +1253,22 @@ { "kind": "", "startPos": { - "offset": 120, + "offset": 119, "line": 7, - "column": 7 + "column": 6 }, "endPos": { "offset": 121, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 120, + "start": 119, "end": 121 } ], @@ -1433,22 +1433,22 @@ { "kind": "", "startPos": { - "offset": 149, + "offset": 148, "line": 8, - "column": 28 + "column": 27 }, "endPos": { "offset": 150, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 149, + "start": 148, "end": 150 } ], @@ -1481,22 +1481,22 @@ { "kind": "", "startPos": { - "offset": 152, + "offset": 151, "line": 9, - "column": 2 + "column": 1 }, "endPos": { "offset": 153, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 152, + "start": 151, "end": 153 } ], @@ -1517,7 +1517,7 @@ "line": 11, "column": 0 }, - "fullStart": 154, + "fullStart": 153, "endPos": { "offset": 202, "line": 13, @@ -1543,22 +1543,22 @@ { "kind": "", "startPos": { - "offset": 154, + "offset": 153, "line": 10, - "column": 1 + "column": 0 }, "endPos": { "offset": 155, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 154, + "start": 153, "end": 155 } ], @@ -1964,22 +1964,22 @@ { "kind": "", "startPos": { - "offset": 50, + "offset": 49, "line": 1, - "column": 39 + "column": 38 }, "endPos": { "offset": 51, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 50, + "start": 49, "end": 51 } ], @@ -2182,22 +2182,22 @@ { "kind": "", "startPos": { - "offset": 62, + "offset": 61, "line": 2, - "column": 11 + "column": 10 }, "endPos": { "offset": 63, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 62, + "start": 61, "end": 63 } ], @@ -2446,22 +2446,22 @@ { "kind": "", "startPos": { - "offset": 100, + "offset": 99, "line": 3, - "column": 37 + "column": 36 }, "endPos": { "offset": 101, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 100, + "start": 99, "end": 101 } ], @@ -2579,22 +2579,22 @@ { "kind": "", "startPos": { - "offset": 107, + "offset": 106, "line": 4, - "column": 6 + "column": 5 }, "endPos": { "offset": 108, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 107, + "start": 106, "end": 108 } ], @@ -2622,7 +2622,7 @@ "line": 7, "column": 0 }, - "fullStart": 112, + "fullStart": 111, "endPos": { "offset": 151, "line": 9, @@ -2648,22 +2648,22 @@ { "kind": "", "startPos": { - "offset": 112, + "offset": 111, "line": 6, - "column": 1 + "column": 0 }, "endPos": { "offset": 113, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 112, + "start": 111, "end": 113 } ], @@ -2731,22 +2731,22 @@ { "kind": "", "startPos": { - "offset": 120, + "offset": 119, "line": 7, - "column": 7 + "column": 6 }, "endPos": { "offset": 121, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 120, + "start": 119, "end": 121 } ], @@ -2911,22 +2911,22 @@ { "kind": "", "startPos": { - "offset": 149, + "offset": 148, "line": 8, - "column": 28 + "column": 27 }, "endPos": { "offset": 150, "line": 9, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 149, + "start": 148, "end": 150 } ], @@ -2959,22 +2959,22 @@ { "kind": "", "startPos": { - "offset": 152, + "offset": 151, "line": 9, - "column": 2 + "column": 1 }, "endPos": { "offset": 153, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 152, + "start": 151, "end": 153 } ], @@ -3002,7 +3002,7 @@ "line": 11, "column": 0 }, - "fullStart": 154, + "fullStart": 153, "endPos": { "offset": 202, "line": 13, @@ -3028,22 +3028,22 @@ { "kind": "", "startPos": { - "offset": 154, + "offset": 153, "line": 10, - "column": 1 + "column": 0 }, "endPos": { "offset": 155, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 154, + "start": 153, "end": 155 } ], diff --git a/packages/dbml-parse/tests/examples/validator/output/table_partial_settings_general.out.json b/packages/dbml-parse/tests/examples/validator/output/table_partial_settings_general.out.json index 371366967..8cf00b3c7 100644 --- a/packages/dbml-parse/tests/examples/validator/output/table_partial_settings_general.out.json +++ b/packages/dbml-parse/tests/examples/validator/output/table_partial_settings_general.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 27, + "offset": 26, "line": 0, - "column": 27 + "column": 26 }, "endPos": { "offset": 28, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 27, + "start": 26, "end": 28 } ], @@ -900,22 +900,22 @@ { "kind": "", "startPos": { - "offset": 119, + "offset": 118, "line": 3, - "column": 37 + "column": 36 }, "endPos": { "offset": 120, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 119, + "start": 118, "end": 120 } ], @@ -1012,22 +1012,22 @@ { "kind": "", "startPos": { - "offset": 52, + "offset": 51, "line": 1, - "column": 24 + "column": 23 }, "endPos": { "offset": 53, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 52, + "start": 51, "end": 53 } ], @@ -1055,22 +1055,22 @@ { "kind": "", "startPos": { - "offset": 81, + "offset": 80, "line": 2, - "column": 28 + "column": 27 }, "endPos": { "offset": 82, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 81, + "start": 80, "end": 82 } ], @@ -1160,22 +1160,22 @@ { "kind": "", "startPos": { - "offset": 124, + "offset": 123, "line": 4, - "column": 4 + "column": 3 }, "endPos": { "offset": 125, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 124, + "start": 123, "end": 125 } ], @@ -2311,22 +2311,22 @@ { "kind": "", "startPos": { - "offset": 211, + "offset": 210, "line": 6, - "column": 47 + "column": 46 }, "endPos": { "offset": 212, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 211, + "start": 210, "end": 212 } ], @@ -3224,22 +3224,22 @@ { "kind": "", "startPos": { - "offset": 296, + "offset": 295, "line": 7, - "column": 84 + "column": 83 }, "endPos": { "offset": 297, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 296, + "start": 295, "end": 297 } ], @@ -3426,22 +3426,22 @@ { "kind": "", "startPos": { - "offset": 327, + "offset": 326, "line": 9, - "column": 16 + "column": 15 }, "endPos": { "offset": 328, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 327, + "start": 326, "end": 328 }, { @@ -4146,22 +4146,22 @@ { "kind": "", "startPos": { - "offset": 374, + "offset": 373, "line": 10, - "column": 46 + "column": 45 }, "endPos": { "offset": 375, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 374, + "start": 373, "end": 375 } ], @@ -4692,22 +4692,22 @@ { "kind": "", "startPos": { - "offset": 400, + "offset": 399, "line": 11, - "column": 25 + "column": 24 }, "endPos": { "offset": 401, "line": 12, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 400, + "start": 399, "end": 401 } ], @@ -4740,22 +4740,22 @@ { "kind": "", "startPos": { - "offset": 403, + "offset": 402, "line": 12, - "column": 2 + "column": 1 }, "endPos": { "offset": 404, "line": 13, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 403, + "start": 402, "end": 404 } ], @@ -4777,7 +4777,7 @@ "line": 14, "column": 0 }, - "fullStart": 405, + "fullStart": 404, "endPos": { "offset": 469, "line": 19, @@ -4803,22 +4803,22 @@ { "kind": "", "startPos": { - "offset": 405, + "offset": 404, "line": 13, - "column": 1 + "column": 0 }, "endPos": { "offset": 406, "line": 14, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 405, + "start": 404, "end": 406 } ], @@ -5061,22 +5061,22 @@ { "kind": "", "startPos": { - "offset": 423, + "offset": 422, "line": 14, - "column": 17 + "column": 16 }, "endPos": { "offset": 424, "line": 15, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 423, + "start": 422, "end": 424 } ], @@ -5241,22 +5241,22 @@ { "kind": "", "startPos": { - "offset": 434, + "offset": 433, "line": 15, - "column": 10 + "column": 9 }, "endPos": { "offset": 435, "line": 16, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 434, + "start": 433, "end": 435 } ], @@ -5425,22 +5425,22 @@ { "kind": "", "startPos": { - "offset": 443, + "offset": 442, "line": 16, - "column": 8 + "column": 7 }, "endPos": { "offset": 444, "line": 17, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 443, + "start": 442, "end": 444 } ], @@ -5609,22 +5609,22 @@ { "kind": "", "startPos": { - "offset": 455, + "offset": 454, "line": 17, - "column": 11 + "column": 10 }, "endPos": { "offset": 456, "line": 18, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 455, + "start": 454, "end": 456 } ], @@ -5793,22 +5793,22 @@ { "kind": "", "startPos": { - "offset": 467, + "offset": 466, "line": 18, - "column": 11 + "column": 10 }, "endPos": { "offset": 468, "line": 19, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 467, + "start": 466, "end": 468 } ], @@ -5842,22 +5842,22 @@ { "kind": "", "startPos": { - "offset": 470, + "offset": 469, "line": 19, - "column": 2 + "column": 1 }, "endPos": { "offset": 471, "line": 20, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 470, + "start": 469, "end": 471 } ], @@ -5879,7 +5879,7 @@ "line": 21, "column": 0 }, - "fullStart": 472, + "fullStart": 471, "endPos": { "offset": 505, "line": 23, @@ -5905,22 +5905,22 @@ { "kind": "", "startPos": { - "offset": 472, + "offset": 471, "line": 20, - "column": 1 + "column": 0 }, "endPos": { "offset": 473, "line": 21, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 472, + "start": 471, "end": 473 } ], @@ -6067,22 +6067,22 @@ { "kind": "", "startPos": { - "offset": 487, + "offset": 486, "line": 21, - "column": 14 + "column": 13 }, "endPos": { "offset": 488, "line": 22, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 487, + "start": 486, "end": 488 } ], @@ -6327,22 +6327,22 @@ { "kind": "", "startPos": { - "offset": 503, + "offset": 502, "line": 22, - "column": 15 + "column": 14 }, "endPos": { "offset": 504, "line": 23, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 503, + "start": 502, "end": 504 } ], @@ -6376,22 +6376,22 @@ { "kind": "", "startPos": { - "offset": 506, + "offset": 505, "line": 23, - "column": 2 + "column": 1 }, "endPos": { "offset": 507, "line": 24, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 506, + "start": 505, "end": 507 } ], @@ -6961,22 +6961,22 @@ { "kind": "", "startPos": { - "offset": 119, + "offset": 118, "line": 3, - "column": 37 + "column": 36 }, "endPos": { "offset": 120, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 119, + "start": 118, "end": 120 } ], diff --git a/packages/dbml-parse/tests/examples/validator/output/table_settings_general.out.json b/packages/dbml-parse/tests/examples/validator/output/table_settings_general.out.json index 769792be9..002eb3698 100644 --- a/packages/dbml-parse/tests/examples/validator/output/table_settings_general.out.json +++ b/packages/dbml-parse/tests/examples/validator/output/table_settings_general.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 14, + "offset": 13, "line": 0, - "column": 14 + "column": 13 }, "endPos": { "offset": 15, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 14, + "start": 13, "end": 15 } ], @@ -900,22 +900,22 @@ { "kind": "", "startPos": { - "offset": 106, + "offset": 105, "line": 3, - "column": 37 + "column": 36 }, "endPos": { "offset": 107, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 106, + "start": 105, "end": 107 } ], @@ -1012,22 +1012,22 @@ { "kind": "", "startPos": { - "offset": 39, + "offset": 38, "line": 1, - "column": 24 + "column": 23 }, "endPos": { "offset": 40, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 39, + "start": 38, "end": 40 } ], @@ -1055,22 +1055,22 @@ { "kind": "", "startPos": { - "offset": 68, + "offset": 67, "line": 2, - "column": 28 + "column": 27 }, "endPos": { "offset": 69, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 68, + "start": 67, "end": 69 } ], @@ -1160,22 +1160,22 @@ { "kind": "", "startPos": { - "offset": 111, + "offset": 110, "line": 4, - "column": 4 + "column": 3 }, "endPos": { "offset": 112, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 111, + "start": 110, "end": 112 } ], @@ -2311,22 +2311,22 @@ { "kind": "", "startPos": { - "offset": 198, + "offset": 197, "line": 6, - "column": 47 + "column": 46 }, "endPos": { "offset": 199, "line": 7, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 198, + "start": 197, "end": 199 } ], @@ -3224,22 +3224,22 @@ { "kind": "", "startPos": { - "offset": 283, + "offset": 282, "line": 7, - "column": 84 + "column": 83 }, "endPos": { "offset": 284, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 283, + "start": 282, "end": 284 } ], @@ -3426,22 +3426,22 @@ { "kind": "", "startPos": { - "offset": 314, + "offset": 313, "line": 9, - "column": 16 + "column": 15 }, "endPos": { "offset": 315, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 314, + "start": 313, "end": 315 }, { @@ -4146,22 +4146,22 @@ { "kind": "", "startPos": { - "offset": 361, + "offset": 360, "line": 10, - "column": 46 + "column": 45 }, "endPos": { "offset": 362, "line": 11, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 361, + "start": 360, "end": 362 } ], @@ -4692,22 +4692,22 @@ { "kind": "", "startPos": { - "offset": 387, + "offset": 386, "line": 11, - "column": 25 + "column": 24 }, "endPos": { "offset": 388, "line": 12, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 387, + "start": 386, "end": 388 } ], @@ -4740,22 +4740,22 @@ { "kind": "", "startPos": { - "offset": 390, + "offset": 389, "line": 12, - "column": 2 + "column": 1 }, "endPos": { "offset": 391, "line": 13, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 390, + "start": 389, "end": 391 } ], @@ -4777,7 +4777,7 @@ "line": 14, "column": 0 }, - "fullStart": 392, + "fullStart": 391, "endPos": { "offset": 456, "line": 19, @@ -4803,22 +4803,22 @@ { "kind": "", "startPos": { - "offset": 392, + "offset": 391, "line": 13, - "column": 1 + "column": 0 }, "endPos": { "offset": 393, "line": 14, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 392, + "start": 391, "end": 393 } ], @@ -5061,22 +5061,22 @@ { "kind": "", "startPos": { - "offset": 410, + "offset": 409, "line": 14, - "column": 17 + "column": 16 }, "endPos": { "offset": 411, "line": 15, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 410, + "start": 409, "end": 411 } ], @@ -5241,22 +5241,22 @@ { "kind": "", "startPos": { - "offset": 421, + "offset": 420, "line": 15, - "column": 10 + "column": 9 }, "endPos": { "offset": 422, "line": 16, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 421, + "start": 420, "end": 422 } ], @@ -5425,22 +5425,22 @@ { "kind": "", "startPos": { - "offset": 430, + "offset": 429, "line": 16, - "column": 8 + "column": 7 }, "endPos": { "offset": 431, "line": 17, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 430, + "start": 429, "end": 431 } ], @@ -5609,22 +5609,22 @@ { "kind": "", "startPos": { - "offset": 442, + "offset": 441, "line": 17, - "column": 11 + "column": 10 }, "endPos": { "offset": 443, "line": 18, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 442, + "start": 441, "end": 443 } ], @@ -5793,22 +5793,22 @@ { "kind": "", "startPos": { - "offset": 454, + "offset": 453, "line": 18, - "column": 11 + "column": 10 }, "endPos": { "offset": 455, "line": 19, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 454, + "start": 453, "end": 455 } ], @@ -6393,22 +6393,22 @@ { "kind": "", "startPos": { - "offset": 106, + "offset": 105, "line": 3, - "column": 37 + "column": 36 }, "endPos": { "offset": 107, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 106, + "start": 105, "end": 107 } ], diff --git a/packages/dbml-parse/tests/examples/validator/output/wrong_table_partial_injection_syntax.out.json b/packages/dbml-parse/tests/examples/validator/output/wrong_table_partial_injection_syntax.out.json index 728149f3a..1a1853e95 100644 --- a/packages/dbml-parse/tests/examples/validator/output/wrong_table_partial_injection_syntax.out.json +++ b/packages/dbml-parse/tests/examples/validator/output/wrong_table_partial_injection_syntax.out.json @@ -191,22 +191,22 @@ { "kind": "", "startPos": { - "offset": 14, + "offset": 13, "line": 0, - "column": 14 + "column": 13 }, "endPos": { "offset": 15, "line": 1, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 14, + "start": 13, "end": 15 } ], @@ -409,22 +409,22 @@ { "kind": "", "startPos": { - "offset": 24, + "offset": 23, "line": 1, - "column": 9 + "column": 8 }, "endPos": { "offset": 25, "line": 2, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 24, + "start": 23, "end": 25 } ], @@ -447,7 +447,7 @@ "line": 3, "column": 2 }, - "fullStart": 26, + "fullStart": 25, "endPos": { "offset": 58, "line": 5, @@ -464,7 +464,7 @@ "line": 3, "column": 2 }, - "fullStart": 26, + "fullStart": 25, "endPos": { "offset": 58, "line": 5, @@ -545,7 +545,7 @@ "line": 3, "column": 2 }, - "fullStart": 26, + "fullStart": 25, "endPos": { "offset": 47, "line": 4, @@ -626,7 +626,7 @@ "line": 3, "column": 2 }, - "fullStart": 26, + "fullStart": 25, "endPos": { "offset": 36, "line": 3, @@ -652,22 +652,22 @@ { "kind": "", "startPos": { - "offset": 26, + "offset": 25, "line": 2, - "column": 1 + "column": 0 }, "endPos": { "offset": 27, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 26, + "start": 25, "end": 27 }, { @@ -772,22 +772,22 @@ { "kind": "", "startPos": { - "offset": 37, + "offset": 36, "line": 3, - "column": 10 + "column": 9 }, "endPos": { "offset": 38, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 37, + "start": 36, "end": 38 } ], @@ -852,22 +852,22 @@ { "kind": "", "startPos": { - "offset": 48, + "offset": 47, "line": 4, - "column": 10 + "column": 9 }, "endPos": { "offset": 49, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 48, + "start": 47, "end": 49 } ], @@ -932,22 +932,22 @@ { "kind": "", "startPos": { - "offset": 59, + "offset": 58, "line": 5, - "column": 10 + "column": 9 }, "endPos": { "offset": 60, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 59, + "start": 58, "end": 60 } ], @@ -983,22 +983,22 @@ { "kind": "", "startPos": { - "offset": 75, + "offset": 74, "line": 9, - "column": 2 + "column": 1 }, "endPos": { "offset": 76, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 75, + "start": 74, "end": 76 } ], @@ -1075,22 +1075,22 @@ { "kind": "", "startPos": { - "offset": 67, + "offset": 66, "line": 7, - "column": 5 + "column": 4 }, "endPos": { "offset": 68, "line": 8, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 67, + "start": 66, "end": 68 } ], @@ -1125,22 +1125,22 @@ { "kind": "", "startPos": { - "offset": 75, + "offset": 74, "line": 9, - "column": 2 + "column": 1 }, "endPos": { "offset": 76, "line": 10, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 75, + "start": 74, "end": 76 } ], @@ -1165,7 +1165,7 @@ "line": 3, "column": 2 }, - "fullStart": 26, + "fullStart": 25, "endPos": { "offset": 58, "line": 5, @@ -1246,7 +1246,7 @@ "line": 3, "column": 2 }, - "fullStart": 26, + "fullStart": 25, "endPos": { "offset": 47, "line": 4, @@ -1327,7 +1327,7 @@ "line": 3, "column": 2 }, - "fullStart": 26, + "fullStart": 25, "endPos": { "offset": 36, "line": 3, @@ -1353,22 +1353,22 @@ { "kind": "", "startPos": { - "offset": 26, + "offset": 25, "line": 2, - "column": 1 + "column": 0 }, "endPos": { "offset": 27, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 26, + "start": 25, "end": 27 }, { @@ -1473,22 +1473,22 @@ { "kind": "", "startPos": { - "offset": 37, + "offset": 36, "line": 3, - "column": 10 + "column": 9 }, "endPos": { "offset": 38, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 37, + "start": 36, "end": 38 } ], @@ -1553,22 +1553,22 @@ { "kind": "", "startPos": { - "offset": 48, + "offset": 47, "line": 4, - "column": 10 + "column": 9 }, "endPos": { "offset": 49, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 48, + "start": 47, "end": 49 } ], @@ -1633,22 +1633,22 @@ { "kind": "", "startPos": { - "offset": 59, + "offset": 58, "line": 5, - "column": 10 + "column": 9 }, "endPos": { "offset": 60, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 59, + "start": 58, "end": 60 } ], @@ -1676,7 +1676,7 @@ "line": 3, "column": 2 }, - "fullStart": 26, + "fullStart": 25, "endPos": { "offset": 58, "line": 5, @@ -1757,7 +1757,7 @@ "line": 3, "column": 2 }, - "fullStart": 26, + "fullStart": 25, "endPos": { "offset": 47, "line": 4, @@ -1838,7 +1838,7 @@ "line": 3, "column": 2 }, - "fullStart": 26, + "fullStart": 25, "endPos": { "offset": 36, "line": 3, @@ -1864,22 +1864,22 @@ { "kind": "", "startPos": { - "offset": 26, + "offset": 25, "line": 2, - "column": 1 + "column": 0 }, "endPos": { "offset": 27, "line": 3, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 26, + "start": 25, "end": 27 }, { @@ -1984,22 +1984,22 @@ { "kind": "", "startPos": { - "offset": 37, + "offset": 36, "line": 3, - "column": 10 + "column": 9 }, "endPos": { "offset": 38, "line": 4, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 37, + "start": 36, "end": 38 } ], @@ -2064,22 +2064,22 @@ { "kind": "", "startPos": { - "offset": 48, + "offset": 47, "line": 4, - "column": 10 + "column": 9 }, "endPos": { "offset": 49, "line": 5, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 48, + "start": 47, "end": 49 } ], @@ -2144,22 +2144,22 @@ { "kind": "", "startPos": { - "offset": 59, + "offset": 58, "line": 5, - "column": 10 + "column": 9 }, "endPos": { "offset": 60, "line": 6, "column": 0 }, - "value": "\n", + "value": "\r\n", "leadingTrivia": [], "trailingTrivia": [], "leadingInvalid": [], "trailingInvalid": [], "isInvalid": false, - "start": 59, + "start": 58, "end": 60 } ], From 79978a9a408b5252976ba456247b9326ac6450ce Mon Sep 17 00:00:00 2001 From: Huy-DNA Date: Sun, 9 Nov 2025 22:41:23 +0700 Subject: [PATCH 06/14] test(dbml-parse): add property-based tests for lexer --- .../tests/properties/lexer_props.test.ts | 139 ++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 packages/dbml-parse/tests/properties/lexer_props.test.ts diff --git a/packages/dbml-parse/tests/properties/lexer_props.test.ts b/packages/dbml-parse/tests/properties/lexer_props.test.ts new file mode 100644 index 000000000..f57a2d86f --- /dev/null +++ b/packages/dbml-parse/tests/properties/lexer_props.test.ts @@ -0,0 +1,139 @@ +import { describe, expect, it } from 'vitest'; +import * as fc from 'fast-check'; +import Lexer from '../../src/lib/lexer/lexer'; +import { SyntaxTokenKind } from '../../src'; + +describe('lexing', () => { + const numberRegex = /(\d+\.\d*|\.\d+|\d+)/; + const singleLineStringRegex = /'(\\.|[^'\\\n\r])*'/; + const multiLineStringRegex = /'''(\\.|[^'\\])*'''/; + const quotedIdentifierRegex = /"(\\.|[^"\\\n\r])*"/; + const functionExpressionRegex = /`[^`]*`/; + const identifierRegex = /[a-zA-Z_][a-zA-Z_0-9]*/; + const seppuncRegex = /[:;.,[\]{}(),]/; + const wsRegex = /[ \t\n]/; + const singleLineCommentRegex = /\/\/[^\r\n]*\n/; + const multiLineCommentRegex = /\/\*([^*]|\*[^/])*(\*)?\*\//; + const colorRegex = /#([A-Fa-f0-9]{3}|[A-Fa-f0-9]{6})/; + const opRegex = /(!=|>=|<=|==|=|>|<|-|\+|\*|\/|%|~)/; + + const sourceRegex = new RegExp( + `^([ ](${numberRegex.source}|${singleLineStringRegex.source}|${multiLineStringRegex.source}|${quotedIdentifierRegex.source}|${functionExpressionRegex.source}|${identifierRegex.source}|${seppuncRegex.source}|${wsRegex.source}|${singleLineCommentRegex.source}|${multiLineCommentRegex.source}|${colorRegex.source}|${opRegex.source}))*\$`, + ); + + it('should roundtrip', () => { + // Process: Source 1 -lex-> Tokens -Serialize-> Source 2 + // Property: Source 1 == Source 2 + fc.assert( + fc.property(fc.stringMatching(sourceRegex), (source: string) => { + const lexer = new Lexer(source); + const tokens = lexer.lex().getValue().flatMap((token) => [...token.leadingTrivia, token, ...token.trailingTrivia]); + const newSource = tokens.map((token) => source.slice(token.start, token.end)).join(''); + expect(newSource).toEqual(source); + }), + ); + }); + + it('should produce no gap', () => { + // Property: Lexed tokens should be contiguous + fc.assert( + fc.property(fc.stringMatching(sourceRegex), (source: string) => { + const lexer = new Lexer(source); + const tokens = lexer.lex().getValue().flatMap((token) => [...token.leadingTrivia, token, ...token.trailingTrivia]); + tokens.reduce((prevTokenEnd, token) => { + expect(prevTokenEnd).toBe(token.start); + return token.end; + }, 0); + }), + ); + }); + + it('should produce consistent lines/columns and offsets', () => { + // Property: Lexed tokens' lines and columns should locate the same text as their offsets + function convertLineAndColumnToOffset (source: string, line: number, col: number): number { + return source.split(/(?<=\n|\r\n)/).slice(0, line).map((str) => str.length).reduce((acc, cur) => acc + cur, 0) + col; + } + + fc.assert( + fc.property(fc.stringMatching(sourceRegex), (source: string) => { + const lexer = new Lexer(source); + const tokens = lexer.lex().getValue().flatMap((token) => [...token.leadingTrivia, token, ...token.trailingTrivia]); + tokens.forEach((token) => { + const { startPos, endPos } = token; + expect(startPos.offset).toEqual(convertLineAndColumnToOffset(source, startPos.line, startPos.column)); + expect(endPos.offset).toEqual(convertLineAndColumnToOffset(source, endPos.line, endPos.column)); + }); + }), + ); + }); + + it('should reset column after newline', () => { + // Property: After a newline token, the column should be reset to 0 + fc.assert( + fc.property(fc.stringMatching(sourceRegex), (source: string) => { + const lexer = new Lexer(source); + const tokens = lexer.lex().getValue().flatMap((token) => [...token.leadingTrivia, token, ...token.trailingTrivia]); + tokens.reduce((isNewlinePrevious, token) => { + if (isNewlinePrevious) expect(token.startPos.column).toBe(0); + return token.kind === SyntaxTokenKind.NEWLINE; + }, true); + }), + ); + }); + + it('should increase line after newline', () => { + // Property: After a newline token, the line should increase by 1 + fc.assert( + fc.property(fc.stringMatching(sourceRegex), (source: string) => { + const lexer = new Lexer(source); + const tokens = lexer.lex().getValue().flatMap((token) => [...token.leadingTrivia, token, ...token.trailingTrivia]); + tokens.reduce(([isNewlinePrevious, previousLine], token) => { + if (isNewlinePrevious) expect(token.startPos.line).toBe(previousLine + 1); + return [ + token.kind === SyntaxTokenKind.NEWLINE, + token.startPos.line, + ] as [boolean, number]; + }, [true, -1] as [boolean, number]); + }), + ); + }); + + it('should concatenate', () => { + // Property: Lexing the concatenated string would be the same as concatenating two lexed strings + fc.assert( + fc.property(fc.stringMatching(sourceRegex), fc.stringMatching(sourceRegex), (source1: string, source2: string) => { + const tokens1 = (new Lexer(source1)).lex().getValue() + .flatMap((token) => [...token.leadingTrivia, token, ...token.trailingTrivia]) + .slice(0, -1) + .map((token) => `${token.kind}:${token.value}`); + const tokens2 = (new Lexer(source2)).lex().getValue().flatMap((token) => [...token.leadingTrivia, token, ...token.trailingTrivia]) + .slice(0, -1) + .map((token) => `${token.kind}:${token.value}`); + + const source3 = `${source1}\n${source2}`; + const tokens3 = (new Lexer(source3)).lex().getValue().flatMap((token) => [...token.leadingTrivia, token, ...token.trailingTrivia]) + .map((token) => `${token.kind}:${token.value}`); + + expect([...tokens1, `${SyntaxTokenKind.NEWLINE}:\n`, ...tokens2, `${SyntaxTokenKind.EOF}:`]).toEqual(tokens3); + }), + ); + }); + + it('should have only whitespaces and comments as trivial tokens', () => { + fc.assert( + fc.property(fc.stringMatching(sourceRegex), (source: string) => { + const tokens = (new Lexer(source)).lex().getValue() + .flatMap((token) => [...token.leadingTrivia, ...token.trailingTrivia]) + .map((token) => token.kind); + + tokens.forEach((token) => expect(token).toBeOneOf([ + SyntaxTokenKind.NEWLINE, + SyntaxTokenKind.SPACE, + SyntaxTokenKind.TAB, + SyntaxTokenKind.MULTILINE_COMMENT, + SyntaxTokenKind.SINGLE_LINE_COMMENT, + ])); + }), + ); + }); +}); From 108f683c98c54f8b05482eefa612b3215a9230b5 Mon Sep 17 00:00:00 2001 From: Huy-DNA Date: Sun, 9 Nov 2025 22:44:29 +0700 Subject: [PATCH 07/14] fix(dbml-parse): remove serialize from exposed interface and move to tests instead --- packages/dbml-parse/src/index.ts | 3 +-- .../dbml-parse/tests/examples/binder/binder.test.ts | 2 +- .../lib/serialization => tests/examples}/serialize.ts | 10 +++++----- .../tests/examples/validator/validator.test.ts | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) rename packages/dbml-parse/{src/lib/serialization => tests/examples}/serialize.ts (89%) diff --git a/packages/dbml-parse/src/index.ts b/packages/dbml-parse/src/index.ts index 63732fd79..b02ffeb9a 100644 --- a/packages/dbml-parse/src/index.ts +++ b/packages/dbml-parse/src/index.ts @@ -1,4 +1,3 @@ -import { serialize } from './lib/serialization/serialize'; import Compiler from './compiler'; import * as services from './services/index'; @@ -51,4 +50,4 @@ export { type TablePartial, } from './lib/interpreter/types'; -export { serialize, Compiler, services }; +export { Compiler, services }; diff --git a/packages/dbml-parse/tests/examples/binder/binder.test.ts b/packages/dbml-parse/tests/examples/binder/binder.test.ts index dc2658e4e..bb21e27d0 100644 --- a/packages/dbml-parse/tests/examples/binder/binder.test.ts +++ b/packages/dbml-parse/tests/examples/binder/binder.test.ts @@ -2,7 +2,7 @@ import { readFileSync } from 'fs'; import path from 'path'; import { describe, expect, it } from 'vitest'; import { scanTestNames } from '../jestHelpers'; -import { serialize } from '../../../src/lib/serialization/serialize'; +import { serialize } from '../serialize'; import Lexer from '../../../src/lib/lexer/lexer'; import Parser from '../../../src/lib/parser/parser'; import { NodeSymbolIdGenerator } from '../../../src/lib/analyzer/symbol/symbols'; diff --git a/packages/dbml-parse/src/lib/serialization/serialize.ts b/packages/dbml-parse/tests/examples/serialize.ts similarity index 89% rename from packages/dbml-parse/src/lib/serialization/serialize.ts rename to packages/dbml-parse/tests/examples/serialize.ts index cf6df251a..195bab0c4 100644 --- a/packages/dbml-parse/src/lib/serialization/serialize.ts +++ b/packages/dbml-parse/tests/examples/serialize.ts @@ -1,9 +1,9 @@ -import { NodeSymbol } from '../analyzer/symbol/symbols'; -import { ProgramNode, SyntaxNode } from '../parser/nodes'; -import Report from '../report'; -import { CompileError } from '../errors'; +import { NodeSymbol } from '../../src/lib/analyzer/symbol/symbols'; +import { ProgramNode, SyntaxNode } from '../../src/lib/parser/nodes'; +import Report from '../../src/lib/report'; +import { CompileError } from '../../src/lib/errors'; -export function serialize( +export function serialize ( report: Readonly>, pretty: boolean = false, ): string { diff --git a/packages/dbml-parse/tests/examples/validator/validator.test.ts b/packages/dbml-parse/tests/examples/validator/validator.test.ts index 76b4bb8d9..e93e14062 100644 --- a/packages/dbml-parse/tests/examples/validator/validator.test.ts +++ b/packages/dbml-parse/tests/examples/validator/validator.test.ts @@ -1,7 +1,7 @@ import { readFileSync } from 'fs'; import path from 'path'; import { describe, expect, it } from 'vitest'; -import { serialize } from '../../../src/lib/serialization/serialize'; +import { serialize } from '../serialize'; import { scanTestNames } from '../jestHelpers'; import { NodeSymbolIdGenerator } from '../../../src/lib/analyzer/symbol/symbols'; import { SyntaxNodeIdGenerator } from '../../../src/lib/parser/nodes'; From e660894b9e58779578db47c233f74f9cb651fa93 Mon Sep 17 00:00:00 2001 From: Huy-DNA Date: Sun, 9 Nov 2025 23:27:51 +0700 Subject: [PATCH 08/14] chore: bump vite and add coverage script --- package.json | 1 + packages/dbml-parse/package.json | 5 +- yarn.lock | 511 ++++++++++++++----------------- 3 files changed, 242 insertions(+), 275 deletions(-) diff --git a/package.json b/package.json index e59023215..1ad3249e9 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ ], "scripts": { "test": "npx lerna run test", + "coverage": "npx lerna run coverage", "build": "yarn clean-build && npx lerna run build", "clean-build": "rm -rf ./packages/dbml-cli/lib ./packages/dbml-core/lib ./packages/dbml-parse/dist ./packages/dbml-connector/dist" }, diff --git a/packages/dbml-parse/package.json b/packages/dbml-parse/package.json index 6e9f24a5f..6bcde73e9 100644 --- a/packages/dbml-parse/package.json +++ b/packages/dbml-parse/package.json @@ -37,12 +37,13 @@ "@types/node": "^20.8.8", "@typescript-eslint/eslint-plugin": "^8.30.1", "@typescript-eslint/parser": "^8.30.1", + "@vitest/coverage-v8": "4.0.8", "fast-check": "^4.3.0", "monaco-editor-core": "^0.44.0", "typescript": "^5.2.2", - "vite": "^6.3.5", + "vite": "^7.2.2", "vite-plugin-dts": "^4.5.4", - "vitest": "^3.1.4" + "vitest": "^4.0.8" }, "dependencies": { "lodash-es": "^4.17.21" diff --git a/yarn.lock b/yarn.lock index 8f88ea234..abe500c55 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1016,6 +1016,11 @@ resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz" integrity sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow== +"@babel/helper-validator-identifier@^7.28.5": + version "7.28.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4" + integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q== + "@babel/helper-validator-option@^7.27.1": version "7.27.1" resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz" @@ -1064,6 +1069,13 @@ dependencies: "@babel/types" "^7.28.0" +"@babel/parser@^7.28.5": + version "7.28.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.5.tgz#0b0225ee90362f030efd644e8034c99468893b08" + integrity sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ== + dependencies: + "@babel/types" "^7.28.5" + "@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.27.1": version "7.27.1" resolved "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz" @@ -1787,11 +1799,24 @@ "@babel/helper-string-parser" "^7.27.1" "@babel/helper-validator-identifier" "^7.27.1" +"@babel/types@^7.28.5": + version "7.28.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.5.tgz#10fc405f60897c35f07e85493c932c7b5ca0592b" + integrity sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA== + dependencies: + "@babel/helper-string-parser" "^7.27.1" + "@babel/helper-validator-identifier" "^7.28.5" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@bcoe/v8-coverage@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-1.0.2.tgz#bbe12dca5b4ef983a0d0af4b07b9bc90ea0ababa" + integrity sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA== + "@colors/colors@1.6.0", "@colors/colors@^1.6.0": version "1.6.0" resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz" @@ -2814,6 +2839,11 @@ resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz" integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ== +"@jridgewell/sourcemap-codec@^1.5.5": + version "1.5.5" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba" + integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og== + "@jridgewell/trace-mapping@0.3.9": version "0.3.9" resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz" @@ -2838,6 +2868,14 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" +"@jridgewell/trace-mapping@^0.3.23", "@jridgewell/trace-mapping@^0.3.31": + version "0.3.31" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0" + integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw== + dependencies: + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" + "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": version "0.3.25" resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz" @@ -3285,101 +3323,51 @@ estree-walker "^2.0.2" picomatch "^4.0.2" -"@rollup/rollup-android-arm-eabi@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.45.1.tgz#8560592f0dcf43b8cb0949af9f1d916205148d12" - integrity sha512-NEySIFvMY0ZQO+utJkgoMiCAjMrGvnbDLHvcmlA33UXJpYBCvlBEbMMtV837uCkS+plG2umfhn0T5mMAxGrlRA== - "@rollup/rollup-android-arm-eabi@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.3.tgz#7050c2acdc1214a730058e21f613ab0e1fe1ced9" integrity sha512-h6cqHGZ6VdnwliFG1NXvMPTy/9PS3h8oLh7ImwR+kl+oYnQizgjxsONmmPSb2C66RksfkfIxEVtDSEcJiO0tqw== -"@rollup/rollup-android-arm64@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.45.1.tgz#6bfb777bbce998691b6fd3e916b05cd46392d020" - integrity sha512-ujQ+sMXJkg4LRJaYreaVx7Z/VMgBBd89wGS4qMrdtfUFZ+TSY5Rs9asgjitLwzeIbhwdEhyj29zhst3L1lKsRQ== - "@rollup/rollup-android-arm64@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.3.tgz#3f5b2afbfcbe9021649701cf6ff0d54b1fb7e4a5" integrity sha512-wd+u7SLT/u6knklV/ifG7gr5Qy4GUbH2hMWcDauPFJzmCZUAJ8L2bTkVXC2niOIxp8lk3iH/QX8kSrUxVZrOVw== -"@rollup/rollup-darwin-arm64@4.45.1": - version "4.45.1" - resolved "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.45.1.tgz" - integrity sha512-FSncqHvqTm3lC6Y13xncsdOYfxGSLnP+73k815EfNmpewPs+EyM49haPS105Rh4aF5mJKywk9X0ogzLXZzN9lA== - "@rollup/rollup-darwin-arm64@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.3.tgz#70a1679fb4393ba7bafb730ee56a5278cbcdafb0" integrity sha512-lj9ViATR1SsqycwFkJCtYfQTheBdvlWJqzqxwc9f2qrcVrQaF/gCuBRTiTolkRWS6KvNxSk4KHZWG7tDktLgjg== -"@rollup/rollup-darwin-x64@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.45.1.tgz#c617a8ece21050bfbea299c126767d2e70cfa79a" - integrity sha512-2/vVn/husP5XI7Fsf/RlhDaQJ7x9zjvC81anIVbr4b/f0xtSmXQTFcGIQ/B1cXIYM6h2nAhJkdMHTnD7OtQ9Og== - "@rollup/rollup-darwin-x64@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.3.tgz#ae75aec88fa72069de9bca3a3ec22bf4e6a962bf" integrity sha512-+Dyo7O1KUmIsbzx1l+4V4tvEVnVQqMOIYtrxK7ncLSknl1xnMHLgn7gddJVrYPNZfEB8CIi3hK8gq8bDhb3h5A== -"@rollup/rollup-freebsd-arm64@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.45.1.tgz#5a6af0a9acf82162d2910933649ae24fc0ea3ecb" - integrity sha512-4g1kaDxQItZsrkVTdYQ0bxu4ZIQ32cotoQbmsAnW1jAE4XCMbcBPDirX5fyUzdhVCKgPcrwWuucI8yrVRBw2+g== - "@rollup/rollup-freebsd-arm64@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.3.tgz#8a2bda997faa1d7e335ce1961ce71d1a76ac6288" integrity sha512-u9Xg2FavYbD30g3DSfNhxgNrxhi6xVG4Y6i9Ur1C7xUuGDW3banRbXj+qgnIrwRN4KeJ396jchwy9bCIzbyBEQ== -"@rollup/rollup-freebsd-x64@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.45.1.tgz#ae9709463560196fc275bd0da598668a2e341023" - integrity sha512-L/6JsfiL74i3uK1Ti2ZFSNsp5NMiM4/kbbGEcOCps99aZx3g8SJMO1/9Y0n/qKlWZfn6sScf98lEOUe2mBvW9A== - "@rollup/rollup-freebsd-x64@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.3.tgz#fc287bcc39b9a9c0df97336d68fd5f4458f87977" integrity sha512-5M8kyi/OX96wtD5qJR89a/3x5x8x5inXBZO04JWhkQb2JWavOWfjgkdvUqibGJeNNaz1/Z1PPza5/tAPXICI6A== -"@rollup/rollup-linux-arm-gnueabihf@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.45.1.tgz#6ec52661764dbd54c19d6520a403aa385a5c0fbf" - integrity sha512-RkdOTu2jK7brlu+ZwjMIZfdV2sSYHK2qR08FUWcIoqJC2eywHbXr0L8T/pONFwkGukQqERDheaGTeedG+rra6Q== - "@rollup/rollup-linux-arm-gnueabihf@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.3.tgz#5b5a2a55dffaa64d7c7a231e80e491219e33d4f3" integrity sha512-IoerZJ4l1wRMopEHRKOO16e04iXRDyZFZnNZKrWeNquh5d6bucjezgd+OxG03mOMTnS1x7hilzb3uURPkJ0OfA== -"@rollup/rollup-linux-arm-musleabihf@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.45.1.tgz#fd33ba4a43ef8419e96811236493d19436271923" - integrity sha512-3kJ8pgfBt6CIIr1o+HQA7OZ9mp/zDk3ctekGl9qn/pRBgrRgfwiffaUmqioUGN9hv0OHv2gxmvdKOkARCtRb8Q== - "@rollup/rollup-linux-arm-musleabihf@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.3.tgz#979eab95003c21837ea0fdd8a721aa3e69fa4aa3" integrity sha512-ZYdtqgHTDfvrJHSh3W22TvjWxwOgc3ThK/XjgcNGP2DIwFIPeAPNsQxrJO5XqleSlgDux2VAoWQ5iJrtaC1TbA== -"@rollup/rollup-linux-arm64-gnu@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.45.1.tgz#933b3d99b73c9d7bf4506cab0d5d313c7e74fd2d" - integrity sha512-k3dOKCfIVixWjG7OXTCOmDfJj3vbdhN0QYEqB+OuGArOChek22hn7Uy5A/gTDNAcCy5v2YcXRJ/Qcnm4/ma1xw== - "@rollup/rollup-linux-arm64-gnu@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.3.tgz#53b89f1289cbeca5ed9b6ca1602a6fe1a29dd4e2" integrity sha512-NcViG7A0YtuFDA6xWSgmFb6iPFzHlf5vcqb2p0lGEbT+gjrEEz8nC/EeDHvx6mnGXnGCC1SeVV+8u+smj0CeGQ== -"@rollup/rollup-linux-arm64-musl@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.45.1.tgz#dbe9ae24ee9e97b75662fddcb69eb7f23c89280a" - integrity sha512-PmI1vxQetnM58ZmDFl9/Uk2lpBBby6B6rF4muJc65uZbxCs0EA7hhKCk2PKlmZKuyVSHAyIw3+/SiuMLxKxWog== - "@rollup/rollup-linux-arm64-musl@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.3.tgz#3bbcf5e13c09d0c4c55bd9c75ec6a7aeee56fe28" @@ -3390,66 +3378,31 @@ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.3.tgz#1cc71838465a8297f92ccc5cc9c29756b71f6e73" integrity sha512-3y5GA0JkBuirLqmjwAKwB0keDlI6JfGYduMlJD/Rl7fvb4Ni8iKdQs1eiunMZJhwDWdCvrcqXRY++VEBbvk6Eg== -"@rollup/rollup-linux-loongarch64-gnu@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.45.1.tgz#818c5a071eec744436dbcdd76fe9c3c869dc9a8d" - integrity sha512-9UmI0VzGmNJ28ibHW2GpE2nF0PBQqsyiS4kcJ5vK+wuwGnV5RlqdczVocDSUfGX/Na7/XINRVoUgJyFIgipoRg== - -"@rollup/rollup-linux-powerpc64le-gnu@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.45.1.tgz#6b8591def27d886fa147fb0340126c7d6682a7e4" - integrity sha512-7nR2KY8oEOUTD3pBAxIBBbZr0U7U+R9HDTPNy+5nVVHDXI4ikYniH1oxQz9VoB5PbBU1CZuDGHkLJkd3zLMWsg== - "@rollup/rollup-linux-ppc64-gnu@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.3.tgz#fe3fdf2ef57dc2d58fedd4f1e0678660772c843a" integrity sha512-AUUH65a0p3Q0Yfm5oD2KVgzTKgwPyp9DSXc3UA7DtxhEb/WSPfbG4wqXeSN62OG5gSo18em4xv6dbfcUGXcagw== -"@rollup/rollup-linux-riscv64-gnu@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.45.1.tgz#f1861ac4ee8da64e0b0d23853ff26fe2baa876cf" - integrity sha512-nlcl3jgUultKROfZijKjRQLUu9Ma0PeNv/VFHkZiKbXTBQXhpytS8CIj5/NfBeECZtY2FJQubm6ltIxm/ftxpw== - "@rollup/rollup-linux-riscv64-gnu@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.3.tgz#eebc99e75832891d58532501879ca749b1592f93" integrity sha512-1makPhFFVBqZE+XFg3Dkq+IkQ7JvmUrwwqaYBL2CE+ZpxPaqkGaiWFEWVGyvTwZace6WLJHwjVh/+CXbKDGPmg== -"@rollup/rollup-linux-riscv64-musl@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.45.1.tgz#320c961401a923b374e358664527b188e374e1ae" - integrity sha512-HJV65KLS51rW0VY6rvZkiieiBnurSzpzore1bMKAhunQiECPuxsROvyeaot/tcK3A3aGnI+qTHqisrpSgQrpgA== - "@rollup/rollup-linux-riscv64-musl@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.3.tgz#9a2df234d61763a44601eba17c36844a18f20539" integrity sha512-OOFJa28dxfl8kLOPMUOQBCO6z3X2SAfzIE276fwT52uXDWUS178KWq0pL7d6p1kz7pkzA0yQwtqL0dEPoVcRWg== -"@rollup/rollup-linux-s390x-gnu@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.45.1.tgz#1763eed3362b50b6164d3f0947486c03cc7e616d" - integrity sha512-NITBOCv3Qqc6hhwFt7jLV78VEO/il4YcBzoMGGNxznLgRQf43VQDae0aAzKiBeEPIxnDrACiMgbqjuihx08OOw== - "@rollup/rollup-linux-s390x-gnu@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.3.tgz#f0e45ea7e41ee473c85458b1ec8fab9572cc1834" integrity sha512-jMdsML2VI5l+V7cKfZx3ak+SLlJ8fKvLJ0Eoa4b9/vCUrzXKgoKxvHqvJ/mkWhFiyp88nCkM5S2v6nIwRtPcgg== -"@rollup/rollup-linux-x64-gnu@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.45.1.tgz#0d4c8d0b8f801902f0844a40a9d981a0179f4971" - integrity sha512-+E/lYl6qu1zqgPEnTrs4WysQtvc/Sh4fC2nByfFExqgYrqkKWp1tWIbe+ELhixnenSpBbLXNi6vbEEJ8M7fiHw== - "@rollup/rollup-linux-x64-gnu@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.3.tgz#ed63dec576799fa5571eee5b2040f65faa82b49b" integrity sha512-tPgGd6bY2M2LJTA1uGq8fkSPK8ZLYjDjY+ZLK9WHncCnfIz29LIXIqUgzCR0hIefzy6Hpbe8Th5WOSwTM8E7LA== -"@rollup/rollup-linux-x64-musl@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.45.1.tgz#ec30bb48b5fe22a3aaba98072f2d5b7139e1a8eb" - integrity sha512-a6WIAp89p3kpNoYStITT9RbTbTnqarU7D8N8F2CV+4Cl9fwCOZraLVuVFvlpsW0SbIiYtEnhCZBPLoNdRkjQFw== - "@rollup/rollup-linux-x64-musl@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.3.tgz#755c56ac79b17fbdf0359bce7e2293a11de30ad0" @@ -3460,21 +3413,11 @@ resolved "https://registry.yarnpkg.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.3.tgz#84b4170fe28c2b41e406add6ccf8513bf91195ea" integrity sha512-KTD/EqjZF3yvRaWUJdD1cW+IQBk4fbQaHYJUmP8N4XoKFZilVL8cobFSTDnjTtxWJQ3JYaMgF4nObY/+nYkumA== -"@rollup/rollup-win32-arm64-msvc@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.45.1.tgz#27a6e48d1502e8e4bed96bedfb533738655874f2" - integrity sha512-T5Bi/NS3fQiJeYdGvRpTAP5P02kqSOpqiopwhj0uaXB6nzs5JVi2XMJb18JUSKhCOX8+UE1UKQufyD6Or48dJg== - "@rollup/rollup-win32-arm64-msvc@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.3.tgz#4fb0cd004183da819bec804eba70f1ef6936ccbf" integrity sha512-+zteHZdoUYLkyYKObGHieibUFLbttX2r+58l27XZauq0tcWYYuKUwY2wjeCN9oK1Um2YgH2ibd6cnX/wFD7DuA== -"@rollup/rollup-win32-ia32-msvc@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.45.1.tgz#a2fbad3bec20ff879f3fd51720adf33692ca8f3d" - integrity sha512-lxV2Pako3ujjuUe9jiU3/s7KSrDfH6IgTSQOnDWr9aJ92YsFd7EurmClK0ly/t8dzMkDtd04g60WX6yl0sGfdw== - "@rollup/rollup-win32-ia32-msvc@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.3.tgz#1788ba80313477a31e6214390906201604ee38eb" @@ -3485,11 +3428,6 @@ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.3.tgz#867222f288a9557487900c7836998123ebbadc9d" integrity sha512-s0hybmlHb56mWVZQj8ra9048/WZTPLILKxcvcq+8awSZmyiSUZjjem1AhU3Tf4ZKpYhK4mg36HtHDOe8QJS5PQ== -"@rollup/rollup-win32-x64-msvc@4.45.1": - version "4.45.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.45.1.tgz#e5085c6d13da15b4c5133cd2a6bb11f25b6bb77a" - integrity sha512-M/fKi4sasCdM8i0aWJjCSFm2qEnYRR8AMLG2kxp6wD13+tMGA4Z1tVAuHkNRjud5SW2EM3naLuK35w9twvf6aA== - "@rollup/rollup-win32-x64-msvc@4.52.3": version "4.52.3" resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.3.tgz#3f55b6e8fe809a7d29959d6bc686cce1804581f0" @@ -4069,6 +4007,11 @@ "@smithy/types" "^4.2.0" tslib "^2.6.2" +"@standard-schema/spec@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@standard-schema/spec/-/spec-1.0.0.tgz#f193b73dc316c4170f2e82a881da0f550d551b9c" + integrity sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA== + "@tailwindcss/node@4.1.11": version "4.1.11" resolved "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.11.tgz" @@ -4295,11 +4238,24 @@ resolved "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.5.tgz" integrity sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg== +"@types/chai@^5.2.2": + version "5.2.3" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-5.2.3.tgz#8e9cd9e1c3581fa6b341a5aed5588eb285be0b4a" + integrity sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA== + dependencies: + "@types/deep-eql" "*" + assertion-error "^2.0.1" + "@types/color-name@^1.1.1": version "1.1.1" resolved "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz" integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== +"@types/deep-eql@*": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/deep-eql/-/deep-eql-4.0.2.tgz#334311971d3a07121e7eb91b684a605e7eea9cbd" + integrity sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw== + "@types/estree@1.0.8", "@types/estree@^1.0.6": version "1.0.8" resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz" @@ -4715,64 +4671,80 @@ dependencies: "@rolldown/pluginutils" "1.0.0-beta.19" -"@vitest/expect@3.1.4": - version "3.1.4" - resolved "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.4.tgz" - integrity sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA== +"@vitest/coverage-v8@4.0.8": + version "4.0.8" + resolved "https://registry.yarnpkg.com/@vitest/coverage-v8/-/coverage-v8-4.0.8.tgz#d7295a424964387d237a138a979340c13577e26c" + integrity sha512-wQgmtW6FtPNn4lWUXi8ZSYLpOIb92j3QCujxX3sQ81NTfQ/ORnE0HtK7Kqf2+7J9jeveMGyGyc4NWc5qy3rC4A== + dependencies: + "@bcoe/v8-coverage" "^1.0.2" + "@vitest/utils" "4.0.8" + ast-v8-to-istanbul "^0.3.8" + debug "^4.4.3" + istanbul-lib-coverage "^3.2.2" + istanbul-lib-report "^3.0.1" + istanbul-lib-source-maps "^5.0.6" + istanbul-reports "^3.2.0" + magicast "^0.5.1" + std-env "^3.10.0" + tinyrainbow "^3.0.3" + +"@vitest/expect@4.0.8": + version "4.0.8" + resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-4.0.8.tgz#02df33fb1f99091df660a80b7113e6d2f176ee10" + integrity sha512-Rv0eabdP/xjAHQGr8cjBm+NnLHNoL268lMDK85w2aAGLFoVKLd8QGnVon5lLtkXQCoYaNL0wg04EGnyKkkKhPA== dependencies: - "@vitest/spy" "3.1.4" - "@vitest/utils" "3.1.4" - chai "^5.2.0" - tinyrainbow "^2.0.0" + "@standard-schema/spec" "^1.0.0" + "@types/chai" "^5.2.2" + "@vitest/spy" "4.0.8" + "@vitest/utils" "4.0.8" + chai "^6.2.0" + tinyrainbow "^3.0.3" -"@vitest/mocker@3.1.4": - version "3.1.4" - resolved "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.4.tgz" - integrity sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA== +"@vitest/mocker@4.0.8": + version "4.0.8" + resolved "https://registry.yarnpkg.com/@vitest/mocker/-/mocker-4.0.8.tgz#8fe875716e742635beb132a5e93ef8c151b0a4ec" + integrity sha512-9FRM3MZCedXH3+pIh+ME5Up2NBBHDq0wqwhOKkN4VnvCiKbVxddqH9mSGPZeawjd12pCOGnl+lo/ZGHt0/dQSg== dependencies: - "@vitest/spy" "3.1.4" + "@vitest/spy" "4.0.8" estree-walker "^3.0.3" - magic-string "^0.30.17" + magic-string "^0.30.21" -"@vitest/pretty-format@3.1.4", "@vitest/pretty-format@^3.1.4": - version "3.1.4" - resolved "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.4.tgz" - integrity sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg== +"@vitest/pretty-format@4.0.8": + version "4.0.8" + resolved "https://registry.yarnpkg.com/@vitest/pretty-format/-/pretty-format-4.0.8.tgz#752866f7dc62aa448af34404b2f9f1a4e1e6f656" + integrity sha512-qRrjdRkINi9DaZHAimV+8ia9Gq6LeGz2CgIEmMLz3sBDYV53EsnLZbJMR1q84z1HZCMsf7s0orDgZn7ScXsZKg== dependencies: - tinyrainbow "^2.0.0" + tinyrainbow "^3.0.3" -"@vitest/runner@3.1.4": - version "3.1.4" - resolved "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.4.tgz" - integrity sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ== +"@vitest/runner@4.0.8": + version "4.0.8" + resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-4.0.8.tgz#bfa9605eb5dc498dda8abe66d900caef31269ff6" + integrity sha512-mdY8Sf1gsM8hKJUQfiPT3pn1n8RF4QBcJYFslgWh41JTfrK1cbqY8whpGCFzBl45LN028g0njLCYm0d7XxSaQQ== dependencies: - "@vitest/utils" "3.1.4" + "@vitest/utils" "4.0.8" pathe "^2.0.3" -"@vitest/snapshot@3.1.4": - version "3.1.4" - resolved "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.4.tgz" - integrity sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg== +"@vitest/snapshot@4.0.8": + version "4.0.8" + resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-4.0.8.tgz#3ec18bdfa96f8e383d12f156d1c73c7dcfe1fd3d" + integrity sha512-Nar9OTU03KGiubrIOFhcfHg8FYaRaNT+bh5VUlNz8stFhCZPNrJvmZkhsr1jtaYvuefYFwK2Hwrq026u4uPWCw== dependencies: - "@vitest/pretty-format" "3.1.4" - magic-string "^0.30.17" + "@vitest/pretty-format" "4.0.8" + magic-string "^0.30.21" pathe "^2.0.3" -"@vitest/spy@3.1.4": - version "3.1.4" - resolved "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.4.tgz" - integrity sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg== - dependencies: - tinyspy "^3.0.2" +"@vitest/spy@4.0.8": + version "4.0.8" + resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-4.0.8.tgz#d8f071143901bd2ee31a805b468c054e481ec615" + integrity sha512-nvGVqUunyCgZH7kmo+Ord4WgZ7lN0sOULYXUOYuHr55dvg9YvMz3izfB189Pgp28w0vWFbEEfNc/c3VTrqrXeA== -"@vitest/utils@3.1.4": - version "3.1.4" - resolved "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.4.tgz" - integrity sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg== +"@vitest/utils@4.0.8": + version "4.0.8" + resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-4.0.8.tgz#00dcf405df47a64157c0edcc3832f678ab577cef" + integrity sha512-pdk2phO5NDvEFfUTxcTP8RFYjVj/kfLSPIN5ebP2Mu9kcIMeAQTbknqcFEyBcC4z2pJlJI9aS5UQjcYfhmKAow== dependencies: - "@vitest/pretty-format" "3.1.4" - loupe "^3.1.3" - tinyrainbow "^2.0.0" + "@vitest/pretty-format" "4.0.8" + tinyrainbow "^3.0.3" "@volar/language-core@2.4.14", "@volar/language-core@~2.4.11": version "2.4.14" @@ -5344,6 +5316,15 @@ assertion-error@^2.0.1: resolved "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz" integrity sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA== +ast-v8-to-istanbul@^0.3.8: + version "0.3.8" + resolved "https://registry.yarnpkg.com/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.8.tgz#0a3faf070dc780dcebdf9d48af78dbd174a497a9" + integrity sha512-szgSZqUxI5T8mLKvS7WTjF9is+MVbOeLADU73IseOcrqhxr/VAvy6wfoVE39KnKzA7JRhjF5eUagNlHwvZPlKQ== + dependencies: + "@jridgewell/trace-mapping" "^0.3.31" + estree-walker "^3.0.3" + js-tokens "^9.0.1" + async-retry@^1.3.3: version "1.3.3" resolved "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz" @@ -5686,11 +5667,6 @@ byte-size@8.1.1: resolved "https://registry.npmjs.org/byte-size/-/byte-size-8.1.1.tgz" integrity sha512-tUkzZWK0M/qdoLEqikxBWe4kumyuwjl3HO6zHTr4yEI23EojPtLYXdG1+AQY7MN0cGyNDvEaJ8wiYQm6P2bPxg== -cac@^6.7.14: - version "6.7.14" - resolved "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz" - integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ== - cacache@^15.2.0: version "15.3.0" resolved "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz" @@ -5803,16 +5779,10 @@ caniuse-lite@^1.0.30001716: resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz" integrity sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw== -chai@^5.2.0: - version "5.2.0" - resolved "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz" - integrity sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw== - dependencies: - assertion-error "^2.0.1" - check-error "^2.1.1" - deep-eql "^5.0.1" - loupe "^3.1.0" - pathval "^2.0.0" +chai@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/chai/-/chai-6.2.0.tgz#181bca6a219cddb99c3eeefb82483800ffa550ce" + integrity sha512-aUTnJc/JipRzJrNADXVvpVqi6CO0dn3nx4EVPxijri+fj3LUUDyZQOgVeW54Ob3Y1Xh9Iz8f+CgaCl8v0mn9bA== chalk@4.1.0: version "4.1.0" @@ -5849,11 +5819,6 @@ chardet@^0.7.0: resolved "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== -check-error@^2.1.1: - version "2.1.1" - resolved "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz" - integrity sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw== - chokidar@^3.6.0: version "3.6.0" resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz" @@ -6308,6 +6273,13 @@ debug@^4.4.0: dependencies: ms "^2.1.3" +debug@^4.4.3: + version "4.4.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a" + integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA== + dependencies: + ms "^2.1.3" + decamelize-keys@^1.1.0: version "1.1.1" resolved "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz" @@ -6331,11 +6303,6 @@ dedent@^1.0.0: resolved "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz" integrity sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ== -deep-eql@^5.0.1: - version "5.0.2" - resolved "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz" - integrity sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q== - deep-is@^0.1.3: version "0.1.4" resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz" @@ -7087,10 +7054,10 @@ expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -expect-type@^1.2.1: - version "1.2.1" - resolved "https://registry.npmjs.org/expect-type/-/expect-type-1.2.1.tgz" - integrity sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw== +expect-type@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-1.2.2.tgz#c030a329fb61184126c8447585bc75a7ec6fbff3" + integrity sha512-JhFGDVJ7tmDJItKhYgJCGLOWjuK9vPxiXoUFLwLDc99NlmklilbiQJwoctZtt13+xMw91MCk/REan6MWHqDjyA== expect@^29.0.0, expect@^29.7.0: version "29.7.0" @@ -8492,6 +8459,11 @@ istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz" integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== +istanbul-lib-coverage@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756" + integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg== + istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0: version "5.2.1" resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz" @@ -8523,6 +8495,15 @@ istanbul-lib-report@^3.0.0: make-dir "^3.0.0" supports-color "^7.1.0" +istanbul-lib-report@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d" + integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw== + dependencies: + istanbul-lib-coverage "^3.0.0" + make-dir "^4.0.0" + supports-color "^7.1.0" + istanbul-lib-source-maps@^4.0.0: version "4.0.1" resolved "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz" @@ -8532,6 +8513,15 @@ istanbul-lib-source-maps@^4.0.0: istanbul-lib-coverage "^3.0.0" source-map "^0.6.1" +istanbul-lib-source-maps@^5.0.6: + version "5.0.6" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz#acaef948df7747c8eb5fbf1265cb980f6353a441" + integrity sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A== + dependencies: + "@jridgewell/trace-mapping" "^0.3.23" + debug "^4.1.1" + istanbul-lib-coverage "^3.0.0" + istanbul-reports@^3.1.3: version "3.1.5" resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz" @@ -8540,6 +8530,14 @@ istanbul-reports@^3.1.3: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" +istanbul-reports@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.2.0.tgz#cb4535162b5784aa623cee21a7252cf2c807ac93" + integrity sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA== + dependencies: + html-escaper "^2.0.0" + istanbul-lib-report "^3.0.0" + jackspeak@^3.1.2: version "3.4.3" resolved "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz" @@ -9426,6 +9424,11 @@ js-tokens@^4.0.0: resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== +js-tokens@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-9.0.1.tgz#2ec43964658435296f6761b34e10671c2d9527f4" + integrity sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ== + js-yaml@4.1.0, js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz" @@ -9968,11 +9971,6 @@ long@^5.2.1: resolved "https://registry.npmjs.org/long/-/long-5.2.3.tgz" integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q== -loupe@^3.1.0, loupe@^3.1.3: - version "3.1.3" - resolved "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz" - integrity sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug== - lru-cache@^10.2.0: version "10.4.3" resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz" @@ -10009,6 +10007,22 @@ magic-string@^0.30.17: dependencies: "@jridgewell/sourcemap-codec" "^1.5.0" +magic-string@^0.30.21: + version "0.30.21" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.21.tgz#56763ec09a0fa8091df27879fd94d19078c00d91" + integrity sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ== + dependencies: + "@jridgewell/sourcemap-codec" "^1.5.5" + +magicast@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.5.1.tgz#518959aea78851cd35d4bb0da92f780db3f606d3" + integrity sha512-xrHS24IxaLrvuo613F719wvOIv9xPHFWQHuvGUBmPnCA/3MQxKI3b+r7n1jAoDHmsbC5bRhTZYR77invLAxVnw== + dependencies: + "@babel/parser" "^7.28.5" + "@babel/types" "^7.28.5" + source-map-js "^1.2.1" + make-dir@3.1.0, make-dir@^3.0.0: version "3.1.0" resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz" @@ -10024,6 +10038,13 @@ make-dir@^2.0.0, make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" +make-dir@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e" + integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw== + dependencies: + semver "^7.5.3" + make-error@1.x, make-error@^1.1.1: version "1.3.6" resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz" @@ -11241,11 +11262,6 @@ pathe@^2.0.1, pathe@^2.0.3: resolved "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz" integrity sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w== -pathval@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz" - integrity sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA== - pegjs-require-import@0.0.6: version "0.0.6" resolved "https://registry.npmjs.org/pegjs-require-import/-/pegjs-require-import-0.0.6.tgz" @@ -11441,7 +11457,7 @@ postcss-selector-parser@^6.0.15: cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss@^8.5.3, postcss@^8.5.6: +postcss@^8.5.6: version "8.5.6" resolved "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz" integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg== @@ -11941,35 +11957,6 @@ rimraf@^4.4.1: dependencies: glob "^9.2.0" -rollup@^4.34.9: - version "4.45.1" - resolved "https://registry.npmjs.org/rollup/-/rollup-4.45.1.tgz" - integrity sha512-4iya7Jb76fVpQyLoiVpzUrsjQ12r3dM7fIVz+4NwoYvZOShknRmiv+iu9CClZml5ZLGb0XMcYLutK6w9tgxHDw== - dependencies: - "@types/estree" "1.0.8" - optionalDependencies: - "@rollup/rollup-android-arm-eabi" "4.45.1" - "@rollup/rollup-android-arm64" "4.45.1" - "@rollup/rollup-darwin-arm64" "4.45.1" - "@rollup/rollup-darwin-x64" "4.45.1" - "@rollup/rollup-freebsd-arm64" "4.45.1" - "@rollup/rollup-freebsd-x64" "4.45.1" - "@rollup/rollup-linux-arm-gnueabihf" "4.45.1" - "@rollup/rollup-linux-arm-musleabihf" "4.45.1" - "@rollup/rollup-linux-arm64-gnu" "4.45.1" - "@rollup/rollup-linux-arm64-musl" "4.45.1" - "@rollup/rollup-linux-loongarch64-gnu" "4.45.1" - "@rollup/rollup-linux-powerpc64le-gnu" "4.45.1" - "@rollup/rollup-linux-riscv64-gnu" "4.45.1" - "@rollup/rollup-linux-riscv64-musl" "4.45.1" - "@rollup/rollup-linux-s390x-gnu" "4.45.1" - "@rollup/rollup-linux-x64-gnu" "4.45.1" - "@rollup/rollup-linux-x64-musl" "4.45.1" - "@rollup/rollup-win32-arm64-msvc" "4.45.1" - "@rollup/rollup-win32-ia32-msvc" "4.45.1" - "@rollup/rollup-win32-x64-msvc" "4.45.1" - fsevents "~2.3.2" - rollup@^4.43.0: version "4.52.3" resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.52.3.tgz#cc5c28d772b022ce48b235a97b347ccd9d88c1a3" @@ -12392,10 +12379,10 @@ stackback@0.0.2: resolved "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz" integrity sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw== -std-env@^3.9.0: - version "3.9.0" - resolved "https://registry.npmjs.org/std-env/-/std-env-3.9.0.tgz" - integrity sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw== +std-env@^3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.10.0.tgz#d810b27e3a073047b2b5e40034881f5ea6f9c83b" + integrity sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg== stoppable@^1.1.0: version "1.1.0" @@ -12771,7 +12758,7 @@ tinyexec@^0.3.2: resolved "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz" integrity sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA== -tinyglobby@^0.2.12, tinyglobby@^0.2.13: +tinyglobby@^0.2.12: version "0.2.14" resolved "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz" integrity sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ== @@ -12787,20 +12774,10 @@ tinyglobby@^0.2.15: fdir "^6.5.0" picomatch "^4.0.3" -tinypool@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz" - integrity sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA== - -tinyrainbow@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz" - integrity sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw== - -tinyspy@^3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz" - integrity sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q== +tinyrainbow@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/tinyrainbow/-/tinyrainbow-3.0.3.tgz#984a5b1c1b25854a9b6bccbe77964d0593d1ea42" + integrity sha512-PSkbLUoxOFRzJYjjxHJt9xro7D+iilgMX/C9lawzVuYiIdcihh9DXmVibBe8lmcFrRi/VzlPjBxbN7rH24q8/Q== tmp@0.2.5, tmp@^0.0.33, tmp@~0.2.1: version "0.2.5" @@ -13267,17 +13244,6 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" -vite-node@3.1.4: - version "3.1.4" - resolved "https://registry.npmjs.org/vite-node/-/vite-node-3.1.4.tgz" - integrity sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA== - dependencies: - cac "^6.7.14" - debug "^4.4.0" - es-module-lexer "^1.7.0" - pathe "^2.0.3" - vite "^5.0.0 || ^6.0.0" - vite-plugin-dts@^4.5.4: version "4.5.4" resolved "https://registry.npmjs.org/vite-plugin-dts/-/vite-plugin-dts-4.5.4.tgz" @@ -13293,17 +13259,17 @@ vite-plugin-dts@^4.5.4: local-pkg "^1.0.0" magic-string "^0.30.17" -"vite@^5.0.0 || ^6.0.0", vite@^6.3.5: - version "6.3.6" - resolved "https://registry.yarnpkg.com/vite/-/vite-6.3.6.tgz#69a976b64930750d40219fbc68c5200874d315c1" - integrity sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA== +"vite@^6.0.0 || ^7.0.0", vite@^7.2.2: + version "7.2.2" + resolved "https://registry.yarnpkg.com/vite/-/vite-7.2.2.tgz#17dd62eac2d0ca0fa90131c5f56e4fefb8845362" + integrity sha512-BxAKBWmIbrDgrokdGZH1IgkIk/5mMHDreLDmCJ0qpyJaAteP8NvMhkwr/ZCQNqNH97bw/dANTE9PDzqwJghfMQ== dependencies: esbuild "^0.25.0" - fdir "^6.4.4" - picomatch "^4.0.2" - postcss "^8.5.3" - rollup "^4.34.9" - tinyglobby "^0.2.13" + fdir "^6.5.0" + picomatch "^4.0.3" + postcss "^8.5.6" + rollup "^4.43.0" + tinyglobby "^0.2.15" optionalDependencies: fsevents "~2.3.3" @@ -13321,31 +13287,30 @@ vite@^7.1.7: optionalDependencies: fsevents "~2.3.3" -vitest@^3.1.4: - version "3.1.4" - resolved "https://registry.npmjs.org/vitest/-/vitest-3.1.4.tgz" - integrity sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ== - dependencies: - "@vitest/expect" "3.1.4" - "@vitest/mocker" "3.1.4" - "@vitest/pretty-format" "^3.1.4" - "@vitest/runner" "3.1.4" - "@vitest/snapshot" "3.1.4" - "@vitest/spy" "3.1.4" - "@vitest/utils" "3.1.4" - chai "^5.2.0" - debug "^4.4.0" - expect-type "^1.2.1" - magic-string "^0.30.17" +vitest@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/vitest/-/vitest-4.0.8.tgz#0c61a81261cf51450c70bc3c9a05a31d8526b14d" + integrity sha512-urzu3NCEV0Qa0Y2PwvBtRgmNtxhj5t5ULw7cuKhIHh3OrkKTLlut0lnBOv9qe5OvbkMH2g38G7KPDCTpIytBVg== + dependencies: + "@vitest/expect" "4.0.8" + "@vitest/mocker" "4.0.8" + "@vitest/pretty-format" "4.0.8" + "@vitest/runner" "4.0.8" + "@vitest/snapshot" "4.0.8" + "@vitest/spy" "4.0.8" + "@vitest/utils" "4.0.8" + debug "^4.4.3" + es-module-lexer "^1.7.0" + expect-type "^1.2.2" + magic-string "^0.30.21" pathe "^2.0.3" - std-env "^3.9.0" + picomatch "^4.0.3" + std-env "^3.10.0" tinybench "^2.9.0" tinyexec "^0.3.2" - tinyglobby "^0.2.13" - tinypool "^1.0.2" - tinyrainbow "^2.0.0" - vite "^5.0.0 || ^6.0.0" - vite-node "3.1.4" + tinyglobby "^0.2.15" + tinyrainbow "^3.0.3" + vite "^6.0.0 || ^7.0.0" why-is-node-running "^2.3.0" vscode-uri@^3.0.8: From 87720ebce9434a1a43dd6e967edde417f75e01cb Mon Sep 17 00:00:00 2001 From: Huy-DNA Date: Sun, 9 Nov 2025 23:29:45 +0700 Subject: [PATCH 09/14] chore: ignore coverage/ --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index d32f16299..c1a6b8874 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ packages/dbml-core/benchmarks/* tsconfig.tsbuildinfo packages/dbml-connector/keys + +# coverage +coverage/ From d1a8cc40356be7f90c16c3b180d42f0455fa0db1 Mon Sep 17 00:00:00 2001 From: Huy-DNA Date: Sun, 9 Nov 2025 23:35:36 +0700 Subject: [PATCH 10/14] chore: setup coverage workflow --- .github/workflows/coverage.yml | 74 ++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 .github/workflows/coverage.yml diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml new file mode 100644 index 000000000..3f02d35f3 --- /dev/null +++ b/.github/workflows/coverage.yml @@ -0,0 +1,74 @@ +name: coverage +on: + push: + branches: [ master ] + paths-ignore: + - 'dbml-homepage/**' + pull_request: + branches: [ master ] + types: [opened, synchronize] + paths-ignore: + - 'dbml-homepage/**' +jobs: + test: + runs-on: ubuntu-22.04 + strategy: + matrix: + node-version: [22.x] + services: + postgres: + image: postgres:15-bullseye + env: + POSTGRES_USER: dbml + POSTGRES_PASSWORD: testtest + POSTGRES_DB: dbml_test + ports: + - 5432:5432 + # Set health checks to wait until postgres has started + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + mssql: + image: mcr.microsoft.com/mssql/server:2019-latest + env: + ACCEPT_EULA: Y + SA_PASSWORD: dbml.123.123 + ports: + - 1433:1433 + options: >- + --health-cmd "exit 0" + --health-interval 10s + --health-timeout 5s + --health-retries 5 + mysql-8.0: + image: mysql:8.0 + env: + MYSQL_DATABASE: dbml_test + MYSQL_ROOT_PASSWORD: root + ports: + - 3306:3306 + options: >- + --health-cmd "mysqladmin ping" + --health-interval 10s + --health-timeout 5s + --health-retries 10 + steps: + - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + cache: 'yarn' + - name: Install dependencies + run: yarn install --frozen-lockfile + - name: Run build + run: yarn build + - name: Run coverage + run: yarn coverage + - name: Upload coverage artifact + uses: actions/upload-artifact@v4 + with: + name: "@dbml/parse coverage report" + path: packages/dbml-parse/coverage/ From 84332cbe0629315746ff1cc7e5fc119500a5831d Mon Sep 17 00:00:00 2001 From: Huy-DNA Date: Sun, 9 Nov 2025 23:39:37 +0700 Subject: [PATCH 11/14] chore: run coverage and unit tests even on PR not targeting master --- .github/workflows/coverage.yml | 3 +-- .github/workflows/test.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 3f02d35f3..c7305d1ad 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -1,11 +1,10 @@ -name: coverage +name: Run coverage test on: push: branches: [ master ] paths-ignore: - 'dbml-homepage/**' pull_request: - branches: [ master ] types: [opened, synchronize] paths-ignore: - 'dbml-homepage/**' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c2b860528..878977f35 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,11 +1,10 @@ name: Run unit test on: push: - branches: [ master] + branches: [ master ] paths-ignore: - 'dbml-homepage/**' pull_request: - branches: [ master ] types: [opened, synchronize] paths-ignore: - 'dbml-homepage/**' From eed2ad64349226fb610fc7766832df9073a24304 Mon Sep 17 00:00:00 2001 From: Huy-DNA Date: Sun, 9 Nov 2025 23:41:29 +0700 Subject: [PATCH 12/14] chore: update PR template --- .github/PULL_REQUEST_TEMPLATE.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index afdf9759a..2d43a78c3 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -17,6 +17,7 @@ Please check directly on the box once each of these are done - [ ] Documentation (if necessary) -- [ ] Tests (integration test/unit test) +- [ ] Unit Tests Passed +- [ ] Coverage Tests - [ ] Integration Tests Passed -- [ ] Code Review \ No newline at end of file +- [ ] Code Review From 0698e3dd588f645ce8483bd66fa15143587639dc Mon Sep 17 00:00:00 2001 From: Huy-DNA Date: Mon, 10 Nov 2025 00:02:58 +0700 Subject: [PATCH 13/14] chore: change artifact name --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index c7305d1ad..2cab34098 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -69,5 +69,5 @@ jobs: - name: Upload coverage artifact uses: actions/upload-artifact@v4 with: - name: "@dbml/parse coverage report" + name: dbml-parse-coverage-report path: packages/dbml-parse/coverage/ From 648455b9d1ba3966a4ea87d9448c46c25f0ac892 Mon Sep 17 00:00:00 2001 From: Huy-DNA Date: Mon, 10 Nov 2025 15:30:27 +0700 Subject: [PATCH 14/14] fix: typo --- packages/dbml-parse/tests/properties/lexer_props.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dbml-parse/tests/properties/lexer_props.test.ts b/packages/dbml-parse/tests/properties/lexer_props.test.ts index f57a2d86f..88d39e873 100644 --- a/packages/dbml-parse/tests/properties/lexer_props.test.ts +++ b/packages/dbml-parse/tests/properties/lexer_props.test.ts @@ -22,7 +22,7 @@ describe('lexing', () => { ); it('should roundtrip', () => { - // Process: Source 1 -lex-> Tokens -Serialize-> Source 2 + // Process: Source 1 -lex-> Tokens -serialize-> Source 2 // Property: Source 1 == Source 2 fc.assert( fc.property(fc.stringMatching(sourceRegex), (source: string) => {