wip

kee-org · Feb 20, 2024 · 585bd27 · 585bd27
1 parent 7cb986e
commit 585bd27
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 29 deletions.
diff --git a/lib/kdbx.dart b/lib/kdbx.dart
@@ -1,31 +1,19 @@
 /// dart library for reading keepass file format (kdbx).
 library kdbx;
 
-import 'package:kdbx/src/kee_vault_model/enums.dart';
-import 'package:kdbx/src/kee_vault_model/form_field_type.dart';
-
 export 'src/credentials/credentials.dart'
     show Credentials, CredentialsPart, HashCredentials, PasswordCredentials;
 export 'src/credentials/keyfile.dart' show KeyFileComposite, KeyFileCredentials;
 export 'src/crypto/key_encrypter_kdf.dart'
     show KeyEncrypterKdf, KdfType, KdfField;
 export 'src/crypto/protected_value.dart'
     show ProtectedValue, StringValue, PlainValue;
-export 'src/kee_vault_model/kee_vault_model.dart'
-    show BrowserFieldModel, FormFieldType, FieldStorage;
 export 'src/internal/kdf_cache.dart' show KdfCache;
 export 'src/kdbx_binary.dart' show KdbxBinary;
 export 'src/kdbx_consts.dart';
 export 'src/kdbx_custom_data.dart';
 export 'src/kdbx_dao.dart' show KdbxDao;
-export 'src/kdbx_entry.dart'
-    show
-        KdbxEntry,
-        KdbxKey,
-        KdbxKeyCommon,
-        BrowserEntrySettings,
-        BrowserAutoFillBehaviour,
-        MatchAccuracy;
+export 'src/kdbx_entry.dart' show KdbxEntry, KdbxKey, KdbxKeyCommon;
 export 'src/kdbx_exceptions.dart';
 export 'src/kdbx_file.dart';
 export 'src/kdbx_format.dart' show KdbxBody, MergeContext, KdbxFormat;
@@ -41,4 +29,12 @@ export 'src/kdbx_object.dart'
         ChangeEvent,
         KdbxNodeContext;
 export 'src/kdbx_var_dictionary.dart' show VarDictionary;
+export 'src/kee_vault_model/browser_entry_settings.dart'
+    show BrowserEntrySettings;
+export 'src/kee_vault_model/entry_matcher.dart';
+export 'src/kee_vault_model/entry_matcher_config.dart';
+export 'src/kee_vault_model/enums.dart';
+export 'src/kee_vault_model/field.dart' show Field;
+export 'src/kee_vault_model/field_matcher.dart' show FieldMatcher;
+export 'src/kee_vault_model/field_matcher_config.dart';
 export 'src/utils/byte_utils.dart' show ByteUtils;
diff --git a/lib/src/kdbx_entry.dart b/lib/src/kdbx_entry.dart
@@ -3,7 +3,6 @@ import 'dart:convert';
 import 'dart:typed_data';
 import 'package:collection/collection.dart';
 import 'package:kdbx/src/kee_vault_model/browser_entry_settings_v1.dart';
-import 'package:kdbx/src/kee_vault_model/kee_vault_model.dart';
 import 'package:kdbx/src/internal/extension_utils.dart';
 import 'package:kdbx/src/kdbx_format.dart';
 import 'package:kdbx/src/kdbx_object.dart';

diff --git a/lib/src/kdbx_meta.dart b/lib/src/kdbx_meta.dart
@@ -6,7 +6,6 @@ import 'package:collection/collection.dart';
 import 'package:kdbx/src/internal/extension_utils.dart';
 import 'package:kdbx/src/kdbx_binary.dart';
 import 'package:kdbx/src/kdbx_custom_data.dart';
-import 'package:kdbx/src/kdbx_entry.dart';
 import 'package:kdbx/src/kdbx_exceptions.dart';
 import 'package:kdbx/src/kdbx_format.dart';
 import 'package:kdbx/src/kdbx_header.dart';
@@ -19,8 +18,6 @@ import 'package:uuid/uuid.dart';
 import 'package:xml/xml.dart' as xml;
 import 'package:xml/xml.dart';
 
-import 'kee_vault_model/kee_vault_model.dart';
-
 final _logger = Logger('kdbx_meta');
 
 class KdbxMeta extends KdbxNode implements KdbxNodeContext {

diff --git a/lib/src/kee_vault_model/browser_entry_settings_v1.dart b/lib/src/kee_vault_model/browser_entry_settings_v1.dart
@@ -2,10 +2,10 @@ import 'dart:convert';
 import 'dart:math';
 import 'package:collection/collection.dart';
 import 'package:kdbx/src/kee_vault_model/browser_entry_settings.dart';
+import 'package:kdbx/src/kee_vault_model/browser_field_model_v1.dart';
 import 'package:kdbx/src/kee_vault_model/entry_matcher_config.dart';
 import 'package:kdbx/src/kee_vault_model/enums.dart';
 import 'package:kdbx/src/kee_vault_model/field.dart';
-import 'package:kdbx/src/kee_vault_model/kee_vault_model.dart';
 
 import '../utils/field_type_utils.dart';
 import '../utils/guid_service.dart';

diff --git a/lib/src/kee_vault_model/kee_vault_model.dart → ...e_vault_model/browser_field_model_v1.dart b/lib/src/kee_vault_model/kee_vault_model.dart → ...e_vault_model/browser_field_model_v1.dart
@@ -1,13 +1,6 @@
 import 'dart:convert';
-
-import 'package:collection/collection.dart';
-
-import 'package:kdbx/src/kee_vault_model/entry_matcher.dart';
-import 'package:kdbx/src/kee_vault_model/enums.dart';
 import 'package:kdbx/src/kee_vault_model/form_field_type.dart';
 
-import 'field_matcher_config.dart';
-
 class BrowserFieldModelV1 {
   BrowserFieldModelV1({
     this.displayName,

diff --git a/lib/src/kee_vault_model/field.dart b/lib/src/kee_vault_model/field.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
 import 'package:collection/collection.dart';
+import 'package:kdbx/src/kee_vault_model/browser_field_model_v1.dart';
 import 'package:kdbx/src/kee_vault_model/enums.dart';
 import 'package:kdbx/src/kee_vault_model/field_matcher_config.dart';
 import 'package:kdbx/src/kee_vault_model/form_field_type.dart';
-import 'package:kdbx/src/kee_vault_model/kee_vault_model.dart';
 import 'package:kdbx/src/utils/field_type_utils.dart';
 
 class Field {

diff --git a/lib/src/utils/field_type_utils.dart b/lib/src/utils/field_type_utils.dart
@@ -1,6 +1,5 @@
 import 'package:kdbx/src/kee_vault_model/enums.dart';
 import 'package:kdbx/src/kee_vault_model/form_field_type.dart';
-import 'package:kdbx/src/kee_vault_model/kee_vault_model.dart';
 
 class Utilities {
   static String formFieldTypeToHtmlType(String fft) {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: kdbx
 description: KeepassX format implementation in pure dart. (kdbx 3.x and 4.x support).
-version: 0.6.0+1
+version: 0.6.0+2
 homepage: https://github.com/kee-org/kdbx.dart
 publish_to: none
 

diff --git a/test/internal/test_utils.dart b/test/internal/test_utils.dart
@@ -5,7 +5,7 @@ import 'dart:typed_data';
 
 import 'package:argon2_ffi_base/argon2_ffi_base.dart';
 import 'package:kdbx/kdbx.dart';
-import 'package:kdbx/src/kee_vault_model/kee_vault_model.dart';
+import 'package:kdbx/src/kee_vault_model/browser_field_model_v1.dart';
 import 'package:logging/logging.dart';
 import 'package:logging_appenders/logging_appenders.dart';