Skip to content

Commit

Permalink
chore: Fix dart options imports (#13)
Browse files Browse the repository at this point in the history
Instead of vending wkt, fix the import in `dart_options.proto` to point to the correct `plugin.proto` path.
  • Loading branch information
dnys1 committed Jul 17, 2024
1 parent 37879a6 commit cbaa51d
Show file tree
Hide file tree
Showing 34 changed files with 467 additions and 2,775 deletions.
14 changes: 0 additions & 14 deletions dart/lib/src/proto/cedar/v3/context.pbserver.dart

This file was deleted.

14 changes: 0 additions & 14 deletions dart/lib/src/proto/cedar/v3/entity.pbserver.dart

This file was deleted.

14 changes: 0 additions & 14 deletions dart/lib/src/proto/cedar/v3/entity_id.pbserver.dart

This file was deleted.

14 changes: 0 additions & 14 deletions dart/lib/src/proto/cedar/v3/expr.pbserver.dart

This file was deleted.

14 changes: 0 additions & 14 deletions dart/lib/src/proto/cedar/v3/policy.pbserver.dart

This file was deleted.

14 changes: 0 additions & 14 deletions dart/lib/src/proto/cedar/v3/value.pbserver.dart

This file was deleted.

14 changes: 0 additions & 14 deletions dart/lib/src/proto/corks/v1/cork.pbserver.dart

This file was deleted.

14 changes: 0 additions & 14 deletions dart/lib/src/proto/dart/dart_options.pbserver.dart

This file was deleted.

14 changes: 0 additions & 14 deletions dart/lib/src/proto/google/protobuf/any.pbserver.dart

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Generated code. Do not modify.
// source: google/protobuf/plugin.proto
// source: google/protobuf/compiler/plugin.proto
//
// @dart = 2.12

Expand All @@ -14,7 +14,7 @@ import 'dart:core' as $core;
import 'package:fixnum/fixnum.dart' as $fixnum;
import 'package:protobuf/protobuf.dart' as $pb;

import 'descriptor.pb.dart' as $0;
import '../descriptor.pb.dart' as $0;

export 'plugin.pbenum.dart';

Expand Down Expand Up @@ -120,6 +120,7 @@ class CodeGeneratorRequest extends $pb.GeneratedMessage {
$core.String? parameter,
Version? compilerVersion,
$core.Iterable<$0.FileDescriptorProto>? protoFile,
$core.Iterable<$0.FileDescriptorProto>? sourceFileDescriptors,
}) {
final $result = create();
if (fileToGenerate != null) {
Expand All @@ -134,6 +135,9 @@ class CodeGeneratorRequest extends $pb.GeneratedMessage {
if (protoFile != null) {
$result.protoFile.addAll(protoFile);
}
if (sourceFileDescriptors != null) {
$result.sourceFileDescriptors.addAll(sourceFileDescriptors);
}
return $result;
}
CodeGeneratorRequest._() : super();
Expand All @@ -145,6 +149,7 @@ class CodeGeneratorRequest extends $pb.GeneratedMessage {
..aOS(2, _omitFieldNames ? '' : 'parameter')
..aOM<Version>(3, _omitFieldNames ? '' : 'compilerVersion', subBuilder: Version.create)
..pc<$0.FileDescriptorProto>(15, _omitFieldNames ? '' : 'protoFile', $pb.PbFieldType.PM, subBuilder: $0.FileDescriptorProto.create)
..pc<$0.FileDescriptorProto>(17, _omitFieldNames ? '' : 'sourceFileDescriptors', $pb.PbFieldType.PM, subBuilder: $0.FileDescriptorProto.create)
;

@$core.Deprecated(
Expand Down Expand Up @@ -200,6 +205,11 @@ class CodeGeneratorRequest extends $pb.GeneratedMessage {
/// they import. The files will appear in topological order, so each file
/// appears before any file that imports it.
///
/// Note: the files listed in files_to_generate will include runtime-retention
/// options only, but all other files will include source-retention options.
/// The source_file_descriptors field below is available in case you need
/// source-retention options for files_to_generate.
///
/// protoc guarantees that all proto_files will be written after
/// the fields above, even though this is not technically guaranteed by the
/// protobuf wire format. This theoretically could allow a plugin to stream
Expand All @@ -212,6 +222,12 @@ class CodeGeneratorRequest extends $pb.GeneratedMessage {
/// fully qualified.
@$pb.TagNumber(15)
$core.List<$0.FileDescriptorProto> get protoFile => $_getList(3);

/// File descriptors with all options, including source-retention options.
/// These descriptors are only provided for the files listed in
/// files_to_generate.
@$pb.TagNumber(17)
$core.List<$0.FileDescriptorProto> get sourceFileDescriptors => $_getList(4);
}

/// Represents a single generated file.
Expand Down Expand Up @@ -366,6 +382,8 @@ class CodeGeneratorResponse extends $pb.GeneratedMessage {
factory CodeGeneratorResponse({
$core.String? error,
$fixnum.Int64? supportedFeatures,
$core.int? minimumEdition,
$core.int? maximumEdition,
$core.Iterable<CodeGeneratorResponse_File>? file,
}) {
final $result = create();
Expand All @@ -375,6 +393,12 @@ class CodeGeneratorResponse extends $pb.GeneratedMessage {
if (supportedFeatures != null) {
$result.supportedFeatures = supportedFeatures;
}
if (minimumEdition != null) {
$result.minimumEdition = minimumEdition;
}
if (maximumEdition != null) {
$result.maximumEdition = maximumEdition;
}
if (file != null) {
$result.file.addAll(file);
}
Expand All @@ -387,6 +411,8 @@ class CodeGeneratorResponse extends $pb.GeneratedMessage {
static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CodeGeneratorResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'google.protobuf.compiler'), createEmptyInstance: create)
..aOS(1, _omitFieldNames ? '' : 'error')
..a<$fixnum.Int64>(2, _omitFieldNames ? '' : 'supportedFeatures', $pb.PbFieldType.OU6, defaultOrMaker: $fixnum.Int64.ZERO)
..a<$core.int>(3, _omitFieldNames ? '' : 'minimumEdition', $pb.PbFieldType.O3)
..a<$core.int>(4, _omitFieldNames ? '' : 'maximumEdition', $pb.PbFieldType.O3)
..pc<CodeGeneratorResponse_File>(15, _omitFieldNames ? '' : 'file', $pb.PbFieldType.PM, subBuilder: CodeGeneratorResponse_File.create)
..hasRequiredFields = false
;
Expand Down Expand Up @@ -440,8 +466,34 @@ class CodeGeneratorResponse extends $pb.GeneratedMessage {
@$pb.TagNumber(2)
void clearSupportedFeatures() => clearField(2);

/// The minimum edition this plugin supports. This will be treated as an
/// Edition enum, but we want to allow unknown values. It should be specified
/// according the edition enum value, *not* the edition number. Only takes
/// effect for plugins that have FEATURE_SUPPORTS_EDITIONS set.
@$pb.TagNumber(3)
$core.int get minimumEdition => $_getIZ(2);
@$pb.TagNumber(3)
set minimumEdition($core.int v) { $_setSignedInt32(2, v); }
@$pb.TagNumber(3)
$core.bool hasMinimumEdition() => $_has(2);
@$pb.TagNumber(3)
void clearMinimumEdition() => clearField(3);

/// The maximum edition this plugin supports. This will be treated as an
/// Edition enum, but we want to allow unknown values. It should be specified
/// according the edition enum value, *not* the edition number. Only takes
/// effect for plugins that have FEATURE_SUPPORTS_EDITIONS set.
@$pb.TagNumber(4)
$core.int get maximumEdition => $_getIZ(3);
@$pb.TagNumber(4)
set maximumEdition($core.int v) { $_setSignedInt32(3, v); }
@$pb.TagNumber(4)
$core.bool hasMaximumEdition() => $_has(3);
@$pb.TagNumber(4)
void clearMaximumEdition() => clearField(4);

@$pb.TagNumber(15)
$core.List<CodeGeneratorResponse_File> get file => $_getList(2);
$core.List<CodeGeneratorResponse_File> get file => $_getList(4);
}


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Generated code. Do not modify.
// source: google/protobuf/plugin.proto
// source: google/protobuf/compiler/plugin.proto
//
// @dart = 2.12

Expand All @@ -17,10 +17,12 @@ import 'package:protobuf/protobuf.dart' as $pb;
class CodeGeneratorResponse_Feature extends $pb.ProtobufEnum {
static const CodeGeneratorResponse_Feature FEATURE_NONE = CodeGeneratorResponse_Feature._(0, _omitEnumNames ? '' : 'FEATURE_NONE');
static const CodeGeneratorResponse_Feature FEATURE_PROTO3_OPTIONAL = CodeGeneratorResponse_Feature._(1, _omitEnumNames ? '' : 'FEATURE_PROTO3_OPTIONAL');
static const CodeGeneratorResponse_Feature FEATURE_SUPPORTS_EDITIONS = CodeGeneratorResponse_Feature._(2, _omitEnumNames ? '' : 'FEATURE_SUPPORTS_EDITIONS');

static const $core.List<CodeGeneratorResponse_Feature> values = <CodeGeneratorResponse_Feature> [
FEATURE_NONE,
FEATURE_PROTO3_OPTIONAL,
FEATURE_SUPPORTS_EDITIONS,
];

static final $core.Map<$core.int, CodeGeneratorResponse_Feature> _byValue = $pb.ProtobufEnum.initByValue(values);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Generated code. Do not modify.
// source: google/protobuf/plugin.proto
// source: google/protobuf/compiler/plugin.proto
//
// @dart = 2.12

Expand Down Expand Up @@ -36,6 +36,7 @@ const CodeGeneratorRequest$json = {
{'1': 'file_to_generate', '3': 1, '4': 3, '5': 9, '10': 'fileToGenerate'},
{'1': 'parameter', '3': 2, '4': 1, '5': 9, '10': 'parameter'},
{'1': 'proto_file', '3': 15, '4': 3, '5': 11, '6': '.google.protobuf.FileDescriptorProto', '10': 'protoFile'},
{'1': 'source_file_descriptors', '3': 17, '4': 3, '5': 11, '6': '.google.protobuf.FileDescriptorProto', '10': 'sourceFileDescriptors'},
{'1': 'compiler_version', '3': 3, '4': 1, '5': 11, '6': '.google.protobuf.compiler.Version', '10': 'compilerVersion'},
],
};
Expand All @@ -44,16 +45,20 @@ const CodeGeneratorRequest$json = {
final $typed_data.Uint8List codeGeneratorRequestDescriptor = $convert.base64Decode(
'ChRDb2RlR2VuZXJhdG9yUmVxdWVzdBIoChBmaWxlX3RvX2dlbmVyYXRlGAEgAygJUg5maWxlVG'
'9HZW5lcmF0ZRIcCglwYXJhbWV0ZXIYAiABKAlSCXBhcmFtZXRlchJDCgpwcm90b19maWxlGA8g'
'AygLMiQuZ29vZ2xlLnByb3RvYnVmLkZpbGVEZXNjcmlwdG9yUHJvdG9SCXByb3RvRmlsZRJMCh'
'Bjb21waWxlcl92ZXJzaW9uGAMgASgLMiEuZ29vZ2xlLnByb3RvYnVmLmNvbXBpbGVyLlZlcnNp'
'b25SD2NvbXBpbGVyVmVyc2lvbg==');
'AygLMiQuZ29vZ2xlLnByb3RvYnVmLkZpbGVEZXNjcmlwdG9yUHJvdG9SCXByb3RvRmlsZRJcCh'
'dzb3VyY2VfZmlsZV9kZXNjcmlwdG9ycxgRIAMoCzIkLmdvb2dsZS5wcm90b2J1Zi5GaWxlRGVz'
'Y3JpcHRvclByb3RvUhVzb3VyY2VGaWxlRGVzY3JpcHRvcnMSTAoQY29tcGlsZXJfdmVyc2lvbh'
'gDIAEoCzIhLmdvb2dsZS5wcm90b2J1Zi5jb21waWxlci5WZXJzaW9uUg9jb21waWxlclZlcnNp'
'b24=');

@$core.Deprecated('Use codeGeneratorResponseDescriptor instead')
const CodeGeneratorResponse$json = {
'1': 'CodeGeneratorResponse',
'2': [
{'1': 'error', '3': 1, '4': 1, '5': 9, '10': 'error'},
{'1': 'supported_features', '3': 2, '4': 1, '5': 4, '10': 'supportedFeatures'},
{'1': 'minimum_edition', '3': 3, '4': 1, '5': 5, '10': 'minimumEdition'},
{'1': 'maximum_edition', '3': 4, '4': 1, '5': 5, '10': 'maximumEdition'},
{'1': 'file', '3': 15, '4': 3, '5': 11, '6': '.google.protobuf.compiler.CodeGeneratorResponse.File', '10': 'file'},
],
'3': [CodeGeneratorResponse_File$json],
Expand All @@ -77,17 +82,20 @@ const CodeGeneratorResponse_Feature$json = {
'2': [
{'1': 'FEATURE_NONE', '2': 0},
{'1': 'FEATURE_PROTO3_OPTIONAL', '2': 1},
{'1': 'FEATURE_SUPPORTS_EDITIONS', '2': 2},
],
};

/// Descriptor for `CodeGeneratorResponse`. Decode as a `google.protobuf.DescriptorProto`.
final $typed_data.Uint8List codeGeneratorResponseDescriptor = $convert.base64Decode(
'ChVDb2RlR2VuZXJhdG9yUmVzcG9uc2USFAoFZXJyb3IYASABKAlSBWVycm9yEi0KEnN1cHBvcn'
'RlZF9mZWF0dXJlcxgCIAEoBFIRc3VwcG9ydGVkRmVhdHVyZXMSSAoEZmlsZRgPIAMoCzI0Lmdv'
'b2dsZS5wcm90b2J1Zi5jb21waWxlci5Db2RlR2VuZXJhdG9yUmVzcG9uc2UuRmlsZVIEZmlsZR'
'qxAQoERmlsZRISCgRuYW1lGAEgASgJUgRuYW1lEicKD2luc2VydGlvbl9wb2ludBgCIAEoCVIO'
'aW5zZXJ0aW9uUG9pbnQSGAoHY29udGVudBgPIAEoCVIHY29udGVudBJSChNnZW5lcmF0ZWRfY2'
'9kZV9pbmZvGBAgASgLMiIuZ29vZ2xlLnByb3RvYnVmLkdlbmVyYXRlZENvZGVJbmZvUhFnZW5l'
'cmF0ZWRDb2RlSW5mbyI4CgdGZWF0dXJlEhAKDEZFQVRVUkVfTk9ORRAAEhsKF0ZFQVRVUkVfUF'
'JPVE8zX09QVElPTkFMEAE=');
'RlZF9mZWF0dXJlcxgCIAEoBFIRc3VwcG9ydGVkRmVhdHVyZXMSJwoPbWluaW11bV9lZGl0aW9u'
'GAMgASgFUg5taW5pbXVtRWRpdGlvbhInCg9tYXhpbXVtX2VkaXRpb24YBCABKAVSDm1heGltdW'
'1FZGl0aW9uEkgKBGZpbGUYDyADKAsyNC5nb29nbGUucHJvdG9idWYuY29tcGlsZXIuQ29kZUdl'
'bmVyYXRvclJlc3BvbnNlLkZpbGVSBGZpbGUasQEKBEZpbGUSEgoEbmFtZRgBIAEoCVIEbmFtZR'
'InCg9pbnNlcnRpb25fcG9pbnQYAiABKAlSDmluc2VydGlvblBvaW50EhgKB2NvbnRlbnQYDyAB'
'KAlSB2NvbnRlbnQSUgoTZ2VuZXJhdGVkX2NvZGVfaW5mbxgQIAEoCzIiLmdvb2dsZS5wcm90b2'
'J1Zi5HZW5lcmF0ZWRDb2RlSW5mb1IRZ2VuZXJhdGVkQ29kZUluZm8iVwoHRmVhdHVyZRIQCgxG'
'RUFUVVJFX05PTkUQABIbChdGRUFUVVJFX1BST1RPM19PUFRJT05BTBABEh0KGUZFQVRVUkVfU1'
'VQUE9SVFNfRURJVElPTlMQAg==');

Loading

0 comments on commit cbaa51d

Please sign in to comment.