Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 35 additions & 8 deletions apps/cli/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,37 @@ targets:
sources:
exclude:
- "fixtures/**"
- "lib/database/**"
auto_apply_builders: false
- "lib/src/database/**"
builders:
drift_dev:
enabled: false

json_serializable:
enabled: true
options:
explicit_to_json: true

$default:
drift:
sources:
include:
- "lib/database/**"
- "lib/src/database/**"
dependencies:
- ":json"
- :json
builders:
json_serializable:
enabled: false

drift_dev:
# disable drift's default builder, we're using the modular setup
# instead.
enabled: false

# Instead, enable drift_dev:analyzer and drift_dev:modular manually:
drift_dev:analyzer:
enabled: true
options:
named_parameters: true
store_date_time_values_as_text: false
generate_for:
- "lib/src/database/**"
options: &options
sql:
dialect: sqlite
options:
Expand All @@ -31,7 +42,23 @@ targets:
- json1
known_functions:
typeid: text(text)

named_parameters: true
store_date_time_values_as_text: false

# Reduces generated code
skip_verification_code: true
data_class_to_companions: false

drift_dev:modular:
enabled: true
generate_for:
- "lib/src/database/**"
# We use yaml anchors to give the two builders the same options
options: *options

$default:
auto_apply_builders: false
dependencies:
- :drift
- :json
4 changes: 2 additions & 2 deletions apps/cli/fixtures/standalone/data/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
celest: ^1.0.0
celest_cloud_auth: 'any'
celest_core: ^1.0.0
drift: '>=2.25.0 <2.26.0'
drift: '>=2.26.0 <2.27.0'
drift_hrana: ^1.0.2
meta: ^1.12.0

Expand All @@ -28,6 +28,6 @@ dependency_overrides:

dev_dependencies:
build_runner: ^2.4.13
drift_dev: '>=2.25.0 <2.26.0'
drift_dev: '>=2.26.0 <2.27.0'
lints: ^5.0.0
test: ^1.25.0
14 changes: 8 additions & 6 deletions apps/cli/lib/src/analyzer/resolver/config_value_resolver.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'package:analyzer/dart/element/element.dart';
import 'package:celest_ast/celest_ast.dart' as ast;
import 'package:celest_cli/src/analyzer/resolver/project_resolver.dart';
import 'package:celest_cli/src/context.dart';
import 'package:celest_cli/src/database/project/project.drift.dart';
import 'package:celest_cli/src/database/project/project_database.dart';
import 'package:celest_cli/src/utils/analyzer.dart';
import 'package:celest_cli/src/utils/run.dart';
Expand Down Expand Up @@ -258,13 +259,14 @@ extension WithEnvironment on ProjectDatabase {
required String environmentId,
}) {
return transaction(() async {
if (await lookupEnvironment(id: environmentId).get()
if (await projectDrift.lookupEnvironment(id: environmentId).get()
case [
final environment,
]) {
return withEnv(environment);
}
final [environment] = await createEnvironment(id: environmentId);
final [environment] =
await projectDrift.createEnvironment(id: environmentId);
return withEnv(environment);
});
}
Expand All @@ -278,15 +280,15 @@ extension ResolveConfigurationVariable on ast.ConfigurationVariable {
) async {
switch (this) {
case ast.Variable(:final name):
final value = await db
final value = await db.projectDrift
.getEnvironmentVariable(
environmentId: environment.id,
name: name,
)
.get();
return value.singleOrNull;
case ast.Secret(:final name):
final value = await db
final value = await db.projectDrift
.getSecret(environmentId: environment.id, name: name)
.get();
final ref = value.singleOrNull;
Expand Down Expand Up @@ -316,7 +318,7 @@ extension ResolveConfigurationVariables<T extends ast.ConfigurationVariable>
final values = <String, String>{};
switch (first) {
case ast.Variable():
final dbValues = await db
final dbValues = await db.projectDrift
.getEnvironmentVariables(
environmentId: environment.id,
names: variableNames,
Expand All @@ -326,7 +328,7 @@ extension ResolveConfigurationVariables<T extends ast.ConfigurationVariable>
values[value.name] = value.value;
}
case ast.Secret():
final dbValues = await db
final dbValues = await db.projectDrift
.getSecrets(
environmentId: environment.id,
names: variableNames,
Expand Down
Loading