up

azkadev · Jan 20, 2025 · 8013009 · 8013009
1 parent 3e54d28
commit 8013009
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 23 deletions.
diff --git a/lib/general_lib.dart b/lib/general_lib.dart
@@ -39,7 +39,7 @@ export 'src/json_each.dart';
 export "json_to_script_dart/json_to_script.dart";
 export "json_to_sql_supabase/json_to_sql_supabase.dart";
 export 'src/json_to_dart.dart';
-export "src/json_to_isar.dart";
+export "src/json_to_database_universe.dart";
 export "src/json_to_message.dart";
 export 'src/json_to_update.dart';
 export 'src/production.dart';

diff --git a/lib/general_lib_core.dart b/lib/general_lib_core.dart
@@ -82,8 +82,7 @@ String getUuid(int length, {String? text}) {
     ch = text;
   }
   Random r = Random();
-  return String.fromCharCodes(
-      Iterable.generate(length, (_) => ch.codeUnitAt(r.nextInt(ch.length))));
+  return String.fromCharCodes(Iterable.generate(length, (_) => ch.codeUnitAt(r.nextInt(ch.length))));
 }
 
 /// GeneralLib
@@ -120,13 +119,13 @@ class JsonDataScript {
   List<String> datas;
 
   /// GeneralLib
-  bool is_isar;
+  bool is_databaseUniverse;
 
   /// GeneralLib
   JsonDataScript({
     required this.className,
     required this.datas,
-    this.is_isar = false,
+    this.is_databaseUniverse = false,
   });
 
   /// GeneralLib
@@ -165,12 +164,11 @@ class JsonDataScript {
       output_first_name = "${output_path}${first_name}";
       output_last_name = "${output_path}${last_name}";
     } else {
-      output_first_name =
-          "${output_path}${Platform.pathSeparator}${first_name}";
+      output_first_name = "${output_path}${Platform.pathSeparator}${first_name}";
       output_last_name = "${output_path}${Platform.pathSeparator}${last_name}";
     }
     await File(output_first_name).writeAsString(first);
-    if (is_isar) {
+    if (is_databaseUniverse) {
       // await File(output_last_name).writeAsString(last);
     }
     return output;

diff --git a/lib/src/json_to_isar.dart → lib/src/json_to_database_universe.dart b/lib/src/json_to_isar.dart → lib/src/json_to_database_universe.dart
@@ -48,7 +48,7 @@ JsonDataScript jsonToDatabaseUniverse(
   bool isMain = true,
   bool isUseClassName = false,
   String? comment,
-  int isarVersion = 4,
+  int databaseUniverseVersion = 4,
 }) {
   return JsonDataScript(
     className: className,
@@ -59,14 +59,14 @@ JsonDataScript jsonToDatabaseUniverse(
         isMain: isMain,
         isUseClassName: isUseClassName,
         comment: comment,
-        isarVersion: isarVersion,
+        databaseUniverseVersion: databaseUniverseVersion,
         packageName: packageName,
       ),
       """
 part "${className.snakeCaseClass().toLowerCase()}.dart";
 """
     ],
-    is_isar: true,
+    is_databaseUniverse: true,
   );
 }
 
@@ -78,7 +78,7 @@ JsonDataScript jsonToIsar(
   bool isMain = true,
   bool isUseClassName = false,
   String? comment,
-  int isarVersion = 3,
+  int databaseUniverseVersion = 3,
 }) {
   return JsonDataScript(
     className: className,
@@ -89,14 +89,14 @@ JsonDataScript jsonToIsar(
         isMain: isMain,
         isUseClassName: isUseClassName,
         comment: comment,
-        isarVersion: isarVersion,
+        databaseUniverseVersion: databaseUniverseVersion,
         packageName: packageName,
       ),
       """
 part "${className.snakeCaseClass().toLowerCase()}.dart";
 """
     ],
-    is_isar: true,
+    is_databaseUniverse: true,
   );
 }
 
@@ -108,7 +108,7 @@ String jsonToIsarDynamic(
   bool isMain = true,
   bool isUseClassName = false,
   String? comment,
-  required int isarVersion,
+  required int databaseUniverseVersion,
 }) {
   comment ??= "";
   List<String> classMessages = [];
@@ -130,13 +130,13 @@ class ${className} {
 
   ${() {
     if (isMain) {
-      if (isarVersion >= 4) {
+      if (databaseUniverseVersion >= 4) {
         if (data["id"] is num == false) {
           return "int id = 0;";
         }
         return "";
       }
-      return "Id isar_data_id = Isar.autoIncrement;";
+      return "Id databaseUniverse_data_id = Isar.autoIncrement;";
     }
     return "";
   }.call()}
@@ -281,7 +281,7 @@ class ${className} {
         isMain: false,
         isUseClassName: isUseClassName,
         comment: comment,
-        isarVersion: isarVersion,
+        databaseUniverseVersion: databaseUniverseVersion,
       ).first);
     }
 
@@ -313,7 +313,7 @@ class ${className} {
               isMain: false,
               isUseClassName: isUseClassName,
               comment: comment,
-              isarVersion: isarVersion,
+              databaseUniverseVersion: databaseUniverseVersion,
             ).first,
           );
         }
@@ -608,10 +608,7 @@ String textToFunctionIsar({
     nameClass = "${className}${key.camelCaseClass()}";
   }
 
-  String nameMethod = key
-      .replaceAll(RegExp(r"^(@|[0-9]+)", caseSensitive: false), "special_")
-      .replaceAll(RegExp(r"([\-]+)", caseSensitive: false), "_")
-      .replaceAll(RegExp(r"^(_)", caseSensitive: false), "special_");
+  String nameMethod = key.replaceAll(RegExp(r"^(@|[0-9]+)", caseSensitive: false), "special_").replaceAll(RegExp(r"([\-]+)", caseSensitive: false), "_").replaceAll(RegExp(r"^(_)", caseSensitive: false), "special_");
   if (RegExp(r"^(do|is|in)$", caseSensitive: false).hasMatch(nameMethod)) {
     nameMethod += "_";
   }