change generator folder name

mmvergara · Aug 24, 2024 · b2f7840 · b2f7840
1 parent 32fb4c4
commit b2f7840
Show file tree

Hide file tree

Showing 23 changed files with 30 additions and 30 deletions.
diff --git a/cli/bin/supadart.dart b/cli/bin/supadart.dart
@@ -1,7 +1,8 @@
 import 'dart:io';
 import 'package:args/args.dart';
 import 'package:supadart/config_init.dart';
-import 'package:supadart/new/index.dart';
+import 'package:supadart/generators/index.dart';
+import 'package:supadart/generators/utils/fetch_swagger.dart';
 import 'package:yaml/yaml.dart';
 
 const String version = 'v1.5.4';

diff --git a/cli/lib/new/class/class.dart → cli/lib/generators/class/class.dart b/cli/lib/new/class/class.dart → cli/lib/generators/class/class.dart
diff --git a/cli/lib/new/class/converters.dart → cli/lib/generators/class/converters.dart b/cli/lib/new/class/converters.dart → cli/lib/generators/class/converters.dart
diff --git a/cli/lib/new/class/from_json.dart → cli/lib/generators/class/from_json.dart b/cli/lib/new/class/from_json.dart → cli/lib/generators/class/from_json.dart
diff --git a/cli/lib/new/class/insert.dart → cli/lib/generators/class/insert.dart b/cli/lib/new/class/insert.dart → cli/lib/generators/class/insert.dart
diff --git a/cli/lib/new/class/static_column_names.dart → ...generators/class/static_column_names.dart b/cli/lib/new/class/static_column_names.dart → ...generators/class/static_column_names.dart
diff --git a/cli/lib/new/class/to_json.dart → cli/lib/generators/class/to_json.dart b/cli/lib/new/class/to_json.dart → cli/lib/generators/class/to_json.dart
diff --git a/cli/lib/new/class/update.dart → cli/lib/generators/class/update.dart b/cli/lib/new/class/update.dart → cli/lib/generators/class/update.dart
diff --git a/cli/lib/new/index.dart → cli/lib/generators/index.dart b/cli/lib/new/index.dart → cli/lib/generators/index.dart
@@ -1,5 +1,4 @@
-import 'dart:convert';
-import 'package:http/http.dart' as http;
+
 import 'package:yaml/yaml.dart';
 
 import 'swagger/swagger.dart';
@@ -11,27 +10,7 @@ import 'utils/get_imports.dart';
 import 'utils/string_formatters.dart';
 import 'class/class.dart';
 
-Future<DatabaseSwagger?> fetchDatabaseSwagger(
-    String url, String anonKey) async {
-  final response = await http.get(Uri.parse('$url/rest/v1/?apikey=$anonKey'));
-  String responseBody = "";
-  if (response.statusCode == 200) {
-    return DatabaseSwagger.fromJson(jsonDecode(response.body));
-  } else {
-    print("Error Fetching Supabase Swagger");
-    responseBody = response.body;
-  }
 
-  print("Trying without the api key...");
-  final response2 = await http.get(Uri.parse('$url/rest/v1/'));
-  if (response2.statusCode == 200) {
-    print("Fetched Supabase Swagger!");
-    return DatabaseSwagger.fromJson(jsonDecode(response.body));
-  }
-
-  print(responseBody);
-  return null;
-}
 
 List<GeneratedFile> supadartRun(
   DatabaseSwagger swagger,

diff --git a/cli/lib/new/standalone/client_extension.dart → ...nerators/standalone/client_extension.dart b/cli/lib/new/standalone/client_extension.dart → ...nerators/standalone/client_extension.dart
diff --git a/cli/lib/new/standalone/enums.dart → cli/lib/generators/standalone/enums.dart b/cli/lib/new/standalone/enums.dart → cli/lib/generators/standalone/enums.dart
diff --git a/cli/lib/new/standalone/exports.dart → cli/lib/generators/standalone/exports.dart b/cli/lib/new/standalone/exports.dart → cli/lib/generators/standalone/exports.dart
diff --git a/...w/standalone/supadart_abstract_class.dart → ...s/standalone/supadart_abstract_class.dart b/...w/standalone/supadart_abstract_class.dart → ...s/standalone/supadart_abstract_class.dart
diff --git a/cli/lib/new/swagger/column.dart → cli/lib/generators/swagger/column.dart b/cli/lib/new/swagger/column.dart → cli/lib/generators/swagger/column.dart
diff --git a/cli/lib/new/swagger/swagger.dart → cli/lib/generators/swagger/swagger.dart b/cli/lib/new/swagger/swagger.dart → cli/lib/generators/swagger/swagger.dart
diff --git a/cli/lib/new/swagger/table.dart → cli/lib/generators/swagger/table.dart b/cli/lib/new/swagger/table.dart → cli/lib/generators/swagger/table.dart
diff --git a/cli/lib/new/swagger/utils.dart → cli/lib/generators/swagger/utils.dart b/cli/lib/new/swagger/utils.dart → cli/lib/generators/swagger/utils.dart
diff --git a/cli/lib/generators/utils/fetch_swagger.dart b/cli/lib/generators/utils/fetch_swagger.dart
@@ -0,0 +1,25 @@
+import 'dart:convert';
+import 'package:http/http.dart' as http;
+import '../swagger/swagger.dart';
+
+Future<DatabaseSwagger?> fetchDatabaseSwagger(
+    String url, String anonKey) async {
+  final response = await http.get(Uri.parse('$url/rest/v1/?apikey=$anonKey'));
+  String responseBody = "";
+  if (response.statusCode == 200) {
+    return DatabaseSwagger.fromJson(jsonDecode(response.body));
+  } else {
+    print("Error Fetching Supabase Swagger");
+    responseBody = response.body;
+  }
+
+  print("Trying without the api key...");
+  final response2 = await http.get(Uri.parse('$url/rest/v1/'));
+  if (response2.statusCode == 200) {
+    print("Fetched Supabase Swagger!");
+    return DatabaseSwagger.fromJson(jsonDecode(response.body));
+  }
+
+  print(responseBody);
+  return null;
+}
diff --git a/cli/lib/new/utils/get_imports.dart → cli/lib/generators/utils/get_imports.dart b/cli/lib/new/utils/get_imports.dart → cli/lib/generators/utils/get_imports.dart
diff --git a/cli/lib/new/utils/string_formatters.dart → ...b/generators/utils/string_formatters.dart b/cli/lib/new/utils/string_formatters.dart → ...b/generators/utils/string_formatters.dart
@@ -31,9 +31,3 @@ String pascalCasingToSnakeCasing(String name) {
 
 String classNameToFileName(String name) =>
     '${pascalCasingToSnakeCasing(name)}.dart';
-
-// extension EqualCaseInsensitiveExtension on String {
-//   bool equalCaseInsensitive(String other) {
-//     return toLowerCase() == other.toLowerCase();
-//   }
-// }
diff --git a/cli/lib/new/utils/to_json_encodable.dart → ...b/generators/utils/to_json_encodable.dart b/cli/lib/new/utils/to_json_encodable.dart → ...b/generators/utils/to_json_encodable.dart
diff --git a/cli/lib/new/utils/fetch_swagger.dart b/cli/lib/new/utils/fetch_swagger.dart
diff --git a/cli/test/supadart_test.dart b/cli/test/supadart_test.dart
@@ -1,6 +1,7 @@
 import 'package:dotenv/dotenv.dart';
 import 'package:supabase/supabase.dart';
-import 'package:supadart/new/index.dart';
+import 'package:supadart/generators/index.dart';
+import 'package:supadart/generators/utils/fetch_swagger.dart';
 import '../bin/supadart.dart';
 import 'boolean_bit_types.dart';
 import 'datatypes/enums.dart';