diff --git a/core/generator/gapic-generator-typescript/WORKSPACE b/core/generator/gapic-generator-typescript/WORKSPACE index 7f9eef47df52..2a714a454317 100644 --- a/core/generator/gapic-generator-typescript/WORKSPACE +++ b/core/generator/gapic-generator-typescript/WORKSPACE @@ -43,6 +43,12 @@ rules_js_register_toolchains(node_version = DEFAULT_NODE_VERSION) load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock", "pnpm_repository") +pnpm_repository(name = "pnpm") + +load("//:pnpm_install.bzl", "pnpm_install") +pnpm_install(name = "pnpm_install_lockfile") + +load("@pnpm_install_lockfile//:pnpm_install.bzl", "PNPM_INSTALL_STATUS") npm_translate_lock( name = "npm", diff --git a/core/generator/gapic-generator-typescript/baselines/asset-esm/package.json b/core/generator/gapic-generator-typescript/baselines/asset-esm/package.json index 659bdec70889..815692f3d89d 100644 --- a/core/generator/gapic-generator-typescript/baselines/asset-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/asset-esm/package.json @@ -73,7 +73,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/asset/package.json b/core/generator/gapic-generator-typescript/baselines/asset/package.json index ee6499cbe0c7..9eb92af3d683 100644 --- a/core/generator/gapic-generator-typescript/baselines/asset/package.json +++ b/core/generator/gapic-generator-typescript/baselines/asset/package.json @@ -35,7 +35,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/bigquery-storage-esm/package.json b/core/generator/gapic-generator-typescript/baselines/bigquery-storage-esm/package.json index 8a6f9cea3dc2..8c81ee0208a8 100644 --- a/core/generator/gapic-generator-typescript/baselines/bigquery-storage-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/bigquery-storage-esm/package.json @@ -73,7 +73,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/bigquery-storage/package.json b/core/generator/gapic-generator-typescript/baselines/bigquery-storage/package.json index d7bb5b125abf..a50671bc4fc3 100644 --- a/core/generator/gapic-generator-typescript/baselines/bigquery-storage/package.json +++ b/core/generator/gapic-generator-typescript/baselines/bigquery-storage/package.json @@ -35,7 +35,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/bigquery-v2-esm/package.json b/core/generator/gapic-generator-typescript/baselines/bigquery-v2-esm/package.json index 39b7ea64a005..ab2d70ff1b1c 100644 --- a/core/generator/gapic-generator-typescript/baselines/bigquery-v2-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/bigquery-v2-esm/package.json @@ -79,7 +79,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/bigquery-v2/package.json b/core/generator/gapic-generator-typescript/baselines/bigquery-v2/package.json index d4c98eed0cc8..3f7b46d3e050 100644 --- a/core/generator/gapic-generator-typescript/baselines/bigquery-v2/package.json +++ b/core/generator/gapic-generator-typescript/baselines/bigquery-v2/package.json @@ -41,7 +41,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/compute-esm/package.json b/core/generator/gapic-generator-typescript/baselines/compute-esm/package.json index 574539631ffa..fd1894265fe8 100644 --- a/core/generator/gapic-generator-typescript/baselines/compute-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/compute-esm/package.json @@ -74,7 +74,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/compute/package.json b/core/generator/gapic-generator-typescript/baselines/compute/package.json index 341a8d6bb41f..4b1adf624315 100644 --- a/core/generator/gapic-generator-typescript/baselines/compute/package.json +++ b/core/generator/gapic-generator-typescript/baselines/compute/package.json @@ -36,7 +36,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/deprecatedtest-esm/package.json b/core/generator/gapic-generator-typescript/baselines/deprecatedtest-esm/package.json index 843f1661d115..a870d148d9a4 100644 --- a/core/generator/gapic-generator-typescript/baselines/deprecatedtest-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/deprecatedtest-esm/package.json @@ -73,7 +73,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/deprecatedtest/package.json b/core/generator/gapic-generator-typescript/baselines/deprecatedtest/package.json index 88c1982c292e..5d6cd52b44fe 100644 --- a/core/generator/gapic-generator-typescript/baselines/deprecatedtest/package.json +++ b/core/generator/gapic-generator-typescript/baselines/deprecatedtest/package.json @@ -35,7 +35,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/disable-packing-test-esm/package.json b/core/generator/gapic-generator-typescript/baselines/disable-packing-test-esm/package.json index 6de66ad2bdaf..ea1758e41d38 100644 --- a/core/generator/gapic-generator-typescript/baselines/disable-packing-test-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/disable-packing-test-esm/package.json @@ -78,7 +78,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/disable-packing-test/package.json b/core/generator/gapic-generator-typescript/baselines/disable-packing-test/package.json index e02a97d7b12a..b9e39b2260f9 100644 --- a/core/generator/gapic-generator-typescript/baselines/disable-packing-test/package.json +++ b/core/generator/gapic-generator-typescript/baselines/disable-packing-test/package.json @@ -40,7 +40,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/dlp-esm/package.json b/core/generator/gapic-generator-typescript/baselines/dlp-esm/package.json index 7f1c4d87c4af..ea8661fa545e 100644 --- a/core/generator/gapic-generator-typescript/baselines/dlp-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/dlp-esm/package.json @@ -73,7 +73,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/dlp/package.json b/core/generator/gapic-generator-typescript/baselines/dlp/package.json index 9de123fa37a0..c4d20b3e22eb 100644 --- a/core/generator/gapic-generator-typescript/baselines/dlp/package.json +++ b/core/generator/gapic-generator-typescript/baselines/dlp/package.json @@ -35,7 +35,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/duplicate_methods_test-esm/package.json b/core/generator/gapic-generator-typescript/baselines/duplicate_methods_test-esm/package.json index 71c6fe0a2007..bcdba62fac17 100644 --- a/core/generator/gapic-generator-typescript/baselines/duplicate_methods_test-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/duplicate_methods_test-esm/package.json @@ -73,7 +73,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/duplicate_methods_test/package.json b/core/generator/gapic-generator-typescript/baselines/duplicate_methods_test/package.json index 3f72914705f8..e65791e89852 100644 --- a/core/generator/gapic-generator-typescript/baselines/duplicate_methods_test/package.json +++ b/core/generator/gapic-generator-typescript/baselines/duplicate_methods_test/package.json @@ -35,7 +35,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/kms-esm/package.json b/core/generator/gapic-generator-typescript/baselines/kms-esm/package.json index afb55956344b..a51408129c4b 100644 --- a/core/generator/gapic-generator-typescript/baselines/kms-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/kms-esm/package.json @@ -73,7 +73,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/kms/package.json b/core/generator/gapic-generator-typescript/baselines/kms/package.json index 407ed881406f..c36fa844cecc 100644 --- a/core/generator/gapic-generator-typescript/baselines/kms/package.json +++ b/core/generator/gapic-generator-typescript/baselines/kms/package.json @@ -35,7 +35,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/logging-esm/package.json b/core/generator/gapic-generator-typescript/baselines/logging-esm/package.json index 51e69ba5b936..45537fb4a6ad 100644 --- a/core/generator/gapic-generator-typescript/baselines/logging-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/logging-esm/package.json @@ -75,7 +75,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/logging/package.json b/core/generator/gapic-generator-typescript/baselines/logging/package.json index 6b10e452bd2c..909d52dfc1fb 100644 --- a/core/generator/gapic-generator-typescript/baselines/logging/package.json +++ b/core/generator/gapic-generator-typescript/baselines/logging/package.json @@ -37,7 +37,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/monitoring-esm/package.json b/core/generator/gapic-generator-typescript/baselines/monitoring-esm/package.json index df3eec55f353..2e8d3ac048c5 100644 --- a/core/generator/gapic-generator-typescript/baselines/monitoring-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/monitoring-esm/package.json @@ -78,7 +78,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/monitoring/package.json b/core/generator/gapic-generator-typescript/baselines/monitoring/package.json index 8a476819d8c6..3b72ab0ef905 100644 --- a/core/generator/gapic-generator-typescript/baselines/monitoring/package.json +++ b/core/generator/gapic-generator-typescript/baselines/monitoring/package.json @@ -40,7 +40,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/naming-esm/package.json b/core/generator/gapic-generator-typescript/baselines/naming-esm/package.json index cd6f9ad7dfb8..8b50e5351027 100644 --- a/core/generator/gapic-generator-typescript/baselines/naming-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/naming-esm/package.json @@ -73,7 +73,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/naming/package.json b/core/generator/gapic-generator-typescript/baselines/naming/package.json index 6e82b91d416d..b646e7e67fa1 100644 --- a/core/generator/gapic-generator-typescript/baselines/naming/package.json +++ b/core/generator/gapic-generator-typescript/baselines/naming/package.json @@ -35,7 +35,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/pubsub-api-dump-esm/api.json.baseline b/core/generator/gapic-generator-typescript/baselines/pubsub-api-dump-esm/api.json.baseline index 22b35ea23025..e212ca062b41 100644 --- a/core/generator/gapic-generator-typescript/baselines/pubsub-api-dump-esm/api.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/pubsub-api-dump-esm/api.json.baseline @@ -686,6 +686,14 @@ " For Google-internal migration only. Do not use." ] }, + "FileDescriptorProto:option_dependency": { + "paramName": "option_dependency", + "paramType": "TYPE_STRING[]", + "comments": [ + " Names of files imported by this file purely for the purpose of providing", + " option extensions. These are excluded from the dependency list above." + ] + }, "FileDescriptorProto:message_type": { "paramName": "message_type", "paramType": "TYPE_MESSAGE[]", @@ -730,14 +738,20 @@ " The syntax of the proto file.", " The supported values are \"proto2\", \"proto3\", and \"editions\".", "", - " If `edition` is present, this value must be \"editions\"." + " If `edition` is present, this value must be \"editions\".", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "FileDescriptorProto:edition": { "paramName": "edition", "paramType": ".google.protobuf.Edition", "comments": [ - " The edition of the proto file." + " The edition of the proto file.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "DescriptorProto:name": { @@ -793,6 +807,13 @@ " A given name may only be reserved once." ] }, + "DescriptorProto:visibility": { + "paramName": "visibility", + "paramType": ".google.protobuf.SymbolVisibility", + "comments": [ + " Support for `export` and `local` keywords on enums." + ] + }, "ExtensionRangeOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -969,6 +990,13 @@ " be reserved once." ] }, + "EnumDescriptorProto:visibility": { + "paramName": "visibility", + "paramType": ".google.protobuf.SymbolVisibility", + "comments": [ + " Support for `export` and `local` keywords on enums." + ] + }, "EnumValueDescriptorProto:name": { "paramName": "name", "paramType": "TYPE_STRING", @@ -1216,7 +1244,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "FileOptions:uninterpreted_option": { @@ -1317,7 +1348,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "MessageOptions:uninterpreted_option": { @@ -1331,12 +1365,13 @@ "paramName": "ctype", "paramType": ".google.protobuf.FieldOptions.CType", "comments": [ + " NOTE: ctype is deprecated. Use `features.(pb.cpp).string_type` instead.", " The ctype option instructs the C++ code generator to use a different", " representation of the field than it normally would. See the specific", " options below. This option is only implemented to support use of", " [ctype=CORD] and [ctype=STRING] (the default) on non-repeated fields of", - " type \"bytes\" in the open source release -- sorry, we'll try to include", - " other types in a future version!" + " type \"bytes\" in the open source release.", + " TODO: make ctype actually deprecated." ] }, "FieldOptions:packed": { @@ -1420,6 +1455,7 @@ "paramName": "weak", "paramType": "TYPE_BOOL", "comments": [ + " DEPRECATED. DO NOT USE!", " For Google-internal migration only. Do not use." ] }, @@ -1450,9 +1486,17 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, + "FieldOptions:feature_support": { + "paramName": "feature_support", + "paramType": ".google.protobuf.FieldOptions.FeatureSupport", + "comments": [] + }, "FieldOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -1464,7 +1508,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "OneofOptions:uninterpreted_option": { @@ -1508,7 +1555,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "EnumOptions:uninterpreted_option": { @@ -1532,7 +1582,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "EnumValueOptions:debug_redact": { @@ -1544,6 +1597,13 @@ " credentials." ] }, + "EnumValueOptions:feature_support": { + "paramName": "feature_support", + "paramType": ".google.protobuf.FieldOptions.FeatureSupport", + "comments": [ + " Information about the support window of a feature value." + ] + }, "EnumValueOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -1555,7 +1615,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "ServiceOptions:deprecated": { @@ -1594,7 +1657,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "MethodOptions:uninterpreted_option": { @@ -1672,6 +1738,16 @@ "paramType": ".google.protobuf.FeatureSet.JsonFormat", "comments": [] }, + "FeatureSet:enforce_naming_style": { + "paramName": "enforce_naming_style", + "paramType": ".google.protobuf.FeatureSet.EnforceNamingStyle", + "comments": [] + }, + "FeatureSet:default_symbol_visibility": { + "paramName": "default_symbol_visibility", + "paramType": ".google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility", + "comments": [] + }, "FeatureSetDefaults:defaults": { "paramName": "defaults", "paramType": "TYPE_MESSAGE[]", @@ -1786,6 +1862,13 @@ " The destination where API teams want this client library to be published." ] }, + "CommonLanguageSettings:selective_gapic_generation": { + "paramName": "selective_gapic_generation", + "paramType": ".google.api.SelectiveGapicGeneration", + "comments": [ + " Configuration for which RPCs should be generated in the GAPIC client." + ] + }, "ClientLibrarySettings:version": { "paramName": "version", "paramType": "TYPE_STRING", @@ -2019,6 +2102,13 @@ " Some settings." ] }, + "PythonSettings:experimental_features": { + "paramName": "experimental_features", + "paramType": ".google.api.PythonSettings.ExperimentalFeatures", + "comments": [ + " Experimental features to be included during client library generation." + ] + }, "NodeSettings:common": { "paramName": "common", "paramType": ".google.api.CommonLanguageSettings", @@ -2097,12 +2187,33 @@ " Some settings." ] }, + "GoSettings:renamed_services": { + "paramName": "renamed_services", + "paramType": "TYPE_MESSAGE[]", + "comments": [ + " Map of service names to renamed services. Keys are the package relative", + " service names and values are the name to be used for the service client", + " and call options.", + "", + " publishing:", + " go_settings:", + " renamed_services:", + " Publisher: TopicAdmin" + ] + }, "MethodSettings:selector": { "paramName": "selector", "paramType": "TYPE_STRING", "comments": [ " The fully qualified name of the method, for which the options below apply.", - " This is used to find the method to apply the options." + " This is used to find the method to apply the options.", + "", + " Example:", + "", + " publishing:", + " method_settings:", + " - selector: google.storage.control.v2.StorageControl.CreateFolder", + " # method settings for CreateFolder..." ] }, "MethodSettings:long_running": { @@ -2115,17 +2226,14 @@ "", " Example of a YAML configuration::", "", - " publishing:", - " method_settings:", + " publishing:", + " method_settings:", " - selector: google.cloud.speech.v2.Speech.BatchRecognize", " long_running:", - " initial_poll_delay:", - " seconds: 60 # 1 minute", + " initial_poll_delay: 60s # 1 minute", " poll_delay_multiplier: 1.5", - " max_poll_delay:", - " seconds: 360 # 6 minutes", - " total_poll_timeout:", - " seconds: 54000 # 90 minutes" + " max_poll_delay: 360s # 6 minutes", + " total_poll_timeout: 54000s # 90 minutes" ] }, "MethodSettings:auto_populated_fields": { @@ -2138,13 +2246,33 @@ "", " Example of a YAML configuration:", "", - " publishing:", - " method_settings:", + " publishing:", + " method_settings:", " - selector: google.example.v1.ExampleService.CreateExample", " auto_populated_fields:", " - request_id" ] }, + "SelectiveGapicGeneration:methods": { + "paramName": "methods", + "paramType": "TYPE_STRING[]", + "comments": [ + " An allowlist of the fully qualified names of RPCs that should be included", + " on public client surfaces." + ] + }, + "SelectiveGapicGeneration:generate_omitted_as_internal": { + "paramName": "generate_omitted_as_internal", + "paramType": "TYPE_BOOL", + "comments": [ + " Setting this to true indicates to the client generators that methods", + " that would be excluded from the generation should instead be generated", + " in a way that indicates these methods should not be consumed by", + " end users. How this is expressed is up to individual language", + " implementations to decide. Some examples may be: added annotations,", + " obfuscated identifiers, or other language idiomatic patterns." + ] + }, "ResourceDescriptor:type": { "paramName": "type", "paramType": "TYPE_STRING", @@ -2221,8 +2349,13 @@ "comments": [ " The plural name used in the resource name and permission names, such as", " 'projects' for the resource name of 'projects/{project}' and the permission", - " name of 'cloudresourcemanager.googleapis.com/projects.get'. It is the same", - " concept of the `plural` field in k8s CRD spec", + " name of 'cloudresourcemanager.googleapis.com/projects.get'. One exception", + " to this is for Nested Collections that have stuttering names, as defined", + " in [AIP-122](https://google.aip.dev/122#nested-collections), where the", + " collection ID in the resource name pattern does not necessarily directly", + " match the `plural` value.", + "", + " It is the same concept of the `plural` field in k8s CRD spec", " https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/", "", " Note: The plural form is required even for singleton resources. See", @@ -5596,6 +5729,14 @@ " For Google-internal migration only. Do not use." ] }, + "FileDescriptorProto:option_dependency": { + "paramName": "option_dependency", + "paramType": "TYPE_STRING[]", + "comments": [ + " Names of files imported by this file purely for the purpose of providing", + " option extensions. These are excluded from the dependency list above." + ] + }, "FileDescriptorProto:message_type": { "paramName": "message_type", "paramType": "TYPE_MESSAGE[]", @@ -5640,14 +5781,20 @@ " The syntax of the proto file.", " The supported values are \"proto2\", \"proto3\", and \"editions\".", "", - " If `edition` is present, this value must be \"editions\"." + " If `edition` is present, this value must be \"editions\".", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "FileDescriptorProto:edition": { "paramName": "edition", "paramType": ".google.protobuf.Edition", "comments": [ - " The edition of the proto file." + " The edition of the proto file.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "DescriptorProto:name": { @@ -5703,6 +5850,13 @@ " A given name may only be reserved once." ] }, + "DescriptorProto:visibility": { + "paramName": "visibility", + "paramType": ".google.protobuf.SymbolVisibility", + "comments": [ + " Support for `export` and `local` keywords on enums." + ] + }, "ExtensionRangeOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -5879,6 +6033,13 @@ " be reserved once." ] }, + "EnumDescriptorProto:visibility": { + "paramName": "visibility", + "paramType": ".google.protobuf.SymbolVisibility", + "comments": [ + " Support for `export` and `local` keywords on enums." + ] + }, "EnumValueDescriptorProto:name": { "paramName": "name", "paramType": "TYPE_STRING", @@ -6126,7 +6287,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "FileOptions:uninterpreted_option": { @@ -6227,7 +6391,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "MessageOptions:uninterpreted_option": { @@ -6241,12 +6408,13 @@ "paramName": "ctype", "paramType": ".google.protobuf.FieldOptions.CType", "comments": [ + " NOTE: ctype is deprecated. Use `features.(pb.cpp).string_type` instead.", " The ctype option instructs the C++ code generator to use a different", " representation of the field than it normally would. See the specific", " options below. This option is only implemented to support use of", " [ctype=CORD] and [ctype=STRING] (the default) on non-repeated fields of", - " type \"bytes\" in the open source release -- sorry, we'll try to include", - " other types in a future version!" + " type \"bytes\" in the open source release.", + " TODO: make ctype actually deprecated." ] }, "FieldOptions:packed": { @@ -6330,6 +6498,7 @@ "paramName": "weak", "paramType": "TYPE_BOOL", "comments": [ + " DEPRECATED. DO NOT USE!", " For Google-internal migration only. Do not use." ] }, @@ -6360,9 +6529,17 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, + "FieldOptions:feature_support": { + "paramName": "feature_support", + "paramType": ".google.protobuf.FieldOptions.FeatureSupport", + "comments": [] + }, "FieldOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -6374,7 +6551,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "OneofOptions:uninterpreted_option": { @@ -6418,7 +6598,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "EnumOptions:uninterpreted_option": { @@ -6442,7 +6625,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "EnumValueOptions:debug_redact": { @@ -6454,6 +6640,13 @@ " credentials." ] }, + "EnumValueOptions:feature_support": { + "paramName": "feature_support", + "paramType": ".google.protobuf.FieldOptions.FeatureSupport", + "comments": [ + " Information about the support window of a feature value." + ] + }, "EnumValueOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -6465,7 +6658,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "ServiceOptions:deprecated": { @@ -6504,7 +6700,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "MethodOptions:uninterpreted_option": { @@ -6582,6 +6781,16 @@ "paramType": ".google.protobuf.FeatureSet.JsonFormat", "comments": [] }, + "FeatureSet:enforce_naming_style": { + "paramName": "enforce_naming_style", + "paramType": ".google.protobuf.FeatureSet.EnforceNamingStyle", + "comments": [] + }, + "FeatureSet:default_symbol_visibility": { + "paramName": "default_symbol_visibility", + "paramType": ".google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility", + "comments": [] + }, "FeatureSetDefaults:defaults": { "paramName": "defaults", "paramType": "TYPE_MESSAGE[]", @@ -6696,6 +6905,13 @@ " The destination where API teams want this client library to be published." ] }, + "CommonLanguageSettings:selective_gapic_generation": { + "paramName": "selective_gapic_generation", + "paramType": ".google.api.SelectiveGapicGeneration", + "comments": [ + " Configuration for which RPCs should be generated in the GAPIC client." + ] + }, "ClientLibrarySettings:version": { "paramName": "version", "paramType": "TYPE_STRING", @@ -6929,6 +7145,13 @@ " Some settings." ] }, + "PythonSettings:experimental_features": { + "paramName": "experimental_features", + "paramType": ".google.api.PythonSettings.ExperimentalFeatures", + "comments": [ + " Experimental features to be included during client library generation." + ] + }, "NodeSettings:common": { "paramName": "common", "paramType": ".google.api.CommonLanguageSettings", @@ -7007,12 +7230,33 @@ " Some settings." ] }, + "GoSettings:renamed_services": { + "paramName": "renamed_services", + "paramType": "TYPE_MESSAGE[]", + "comments": [ + " Map of service names to renamed services. Keys are the package relative", + " service names and values are the name to be used for the service client", + " and call options.", + "", + " publishing:", + " go_settings:", + " renamed_services:", + " Publisher: TopicAdmin" + ] + }, "MethodSettings:selector": { "paramName": "selector", "paramType": "TYPE_STRING", "comments": [ " The fully qualified name of the method, for which the options below apply.", - " This is used to find the method to apply the options." + " This is used to find the method to apply the options.", + "", + " Example:", + "", + " publishing:", + " method_settings:", + " - selector: google.storage.control.v2.StorageControl.CreateFolder", + " # method settings for CreateFolder..." ] }, "MethodSettings:long_running": { @@ -7025,17 +7269,14 @@ "", " Example of a YAML configuration::", "", - " publishing:", - " method_settings:", + " publishing:", + " method_settings:", " - selector: google.cloud.speech.v2.Speech.BatchRecognize", " long_running:", - " initial_poll_delay:", - " seconds: 60 # 1 minute", + " initial_poll_delay: 60s # 1 minute", " poll_delay_multiplier: 1.5", - " max_poll_delay:", - " seconds: 360 # 6 minutes", - " total_poll_timeout:", - " seconds: 54000 # 90 minutes" + " max_poll_delay: 360s # 6 minutes", + " total_poll_timeout: 54000s # 90 minutes" ] }, "MethodSettings:auto_populated_fields": { @@ -7048,13 +7289,33 @@ "", " Example of a YAML configuration:", "", - " publishing:", - " method_settings:", + " publishing:", + " method_settings:", " - selector: google.example.v1.ExampleService.CreateExample", " auto_populated_fields:", " - request_id" ] }, + "SelectiveGapicGeneration:methods": { + "paramName": "methods", + "paramType": "TYPE_STRING[]", + "comments": [ + " An allowlist of the fully qualified names of RPCs that should be included", + " on public client surfaces." + ] + }, + "SelectiveGapicGeneration:generate_omitted_as_internal": { + "paramName": "generate_omitted_as_internal", + "paramType": "TYPE_BOOL", + "comments": [ + " Setting this to true indicates to the client generators that methods", + " that would be excluded from the generation should instead be generated", + " in a way that indicates these methods should not be consumed by", + " end users. How this is expressed is up to individual language", + " implementations to decide. Some examples may be: added annotations,", + " obfuscated identifiers, or other language idiomatic patterns." + ] + }, "ResourceDescriptor:type": { "paramName": "type", "paramType": "TYPE_STRING", @@ -7131,8 +7392,13 @@ "comments": [ " The plural name used in the resource name and permission names, such as", " 'projects' for the resource name of 'projects/{project}' and the permission", - " name of 'cloudresourcemanager.googleapis.com/projects.get'. It is the same", - " concept of the `plural` field in k8s CRD spec", + " name of 'cloudresourcemanager.googleapis.com/projects.get'. One exception", + " to this is for Nested Collections that have stuttering names, as defined", + " in [AIP-122](https://google.aip.dev/122#nested-collections), where the", + " collection ID in the resource name pattern does not necessarily directly", + " match the `plural` value.", + "", + " It is the same concept of the `plural` field in k8s CRD spec", " https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/", "", " Note: The plural form is required even for singleton resources. See", @@ -11150,6 +11416,14 @@ " For Google-internal migration only. Do not use." ] }, + "FileDescriptorProto:option_dependency": { + "paramName": "option_dependency", + "paramType": "TYPE_STRING[]", + "comments": [ + " Names of files imported by this file purely for the purpose of providing", + " option extensions. These are excluded from the dependency list above." + ] + }, "FileDescriptorProto:message_type": { "paramName": "message_type", "paramType": "TYPE_MESSAGE[]", @@ -11194,14 +11468,20 @@ " The syntax of the proto file.", " The supported values are \"proto2\", \"proto3\", and \"editions\".", "", - " If `edition` is present, this value must be \"editions\"." + " If `edition` is present, this value must be \"editions\".", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "FileDescriptorProto:edition": { "paramName": "edition", "paramType": ".google.protobuf.Edition", "comments": [ - " The edition of the proto file." + " The edition of the proto file.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "DescriptorProto:name": { @@ -11257,6 +11537,13 @@ " A given name may only be reserved once." ] }, + "DescriptorProto:visibility": { + "paramName": "visibility", + "paramType": ".google.protobuf.SymbolVisibility", + "comments": [ + " Support for `export` and `local` keywords on enums." + ] + }, "ExtensionRangeOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -11433,6 +11720,13 @@ " be reserved once." ] }, + "EnumDescriptorProto:visibility": { + "paramName": "visibility", + "paramType": ".google.protobuf.SymbolVisibility", + "comments": [ + " Support for `export` and `local` keywords on enums." + ] + }, "EnumValueDescriptorProto:name": { "paramName": "name", "paramType": "TYPE_STRING", @@ -11680,7 +11974,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "FileOptions:uninterpreted_option": { @@ -11781,7 +12078,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "MessageOptions:uninterpreted_option": { @@ -11795,12 +12095,13 @@ "paramName": "ctype", "paramType": ".google.protobuf.FieldOptions.CType", "comments": [ + " NOTE: ctype is deprecated. Use `features.(pb.cpp).string_type` instead.", " The ctype option instructs the C++ code generator to use a different", " representation of the field than it normally would. See the specific", " options below. This option is only implemented to support use of", " [ctype=CORD] and [ctype=STRING] (the default) on non-repeated fields of", - " type \"bytes\" in the open source release -- sorry, we'll try to include", - " other types in a future version!" + " type \"bytes\" in the open source release.", + " TODO: make ctype actually deprecated." ] }, "FieldOptions:packed": { @@ -11884,6 +12185,7 @@ "paramName": "weak", "paramType": "TYPE_BOOL", "comments": [ + " DEPRECATED. DO NOT USE!", " For Google-internal migration only. Do not use." ] }, @@ -11914,9 +12216,17 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, + "FieldOptions:feature_support": { + "paramName": "feature_support", + "paramType": ".google.protobuf.FieldOptions.FeatureSupport", + "comments": [] + }, "FieldOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -11928,7 +12238,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "OneofOptions:uninterpreted_option": { @@ -11972,7 +12285,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "EnumOptions:uninterpreted_option": { @@ -11996,7 +12312,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "EnumValueOptions:debug_redact": { @@ -12008,6 +12327,13 @@ " credentials." ] }, + "EnumValueOptions:feature_support": { + "paramName": "feature_support", + "paramType": ".google.protobuf.FieldOptions.FeatureSupport", + "comments": [ + " Information about the support window of a feature value." + ] + }, "EnumValueOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -12019,7 +12345,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "ServiceOptions:deprecated": { @@ -12058,7 +12387,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "MethodOptions:uninterpreted_option": { @@ -12136,6 +12468,16 @@ "paramType": ".google.protobuf.FeatureSet.JsonFormat", "comments": [] }, + "FeatureSet:enforce_naming_style": { + "paramName": "enforce_naming_style", + "paramType": ".google.protobuf.FeatureSet.EnforceNamingStyle", + "comments": [] + }, + "FeatureSet:default_symbol_visibility": { + "paramName": "default_symbol_visibility", + "paramType": ".google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility", + "comments": [] + }, "FeatureSetDefaults:defaults": { "paramName": "defaults", "paramType": "TYPE_MESSAGE[]", @@ -12250,6 +12592,13 @@ " The destination where API teams want this client library to be published." ] }, + "CommonLanguageSettings:selective_gapic_generation": { + "paramName": "selective_gapic_generation", + "paramType": ".google.api.SelectiveGapicGeneration", + "comments": [ + " Configuration for which RPCs should be generated in the GAPIC client." + ] + }, "ClientLibrarySettings:version": { "paramName": "version", "paramType": "TYPE_STRING", @@ -12483,6 +12832,13 @@ " Some settings." ] }, + "PythonSettings:experimental_features": { + "paramName": "experimental_features", + "paramType": ".google.api.PythonSettings.ExperimentalFeatures", + "comments": [ + " Experimental features to be included during client library generation." + ] + }, "NodeSettings:common": { "paramName": "common", "paramType": ".google.api.CommonLanguageSettings", @@ -12561,12 +12917,33 @@ " Some settings." ] }, + "GoSettings:renamed_services": { + "paramName": "renamed_services", + "paramType": "TYPE_MESSAGE[]", + "comments": [ + " Map of service names to renamed services. Keys are the package relative", + " service names and values are the name to be used for the service client", + " and call options.", + "", + " publishing:", + " go_settings:", + " renamed_services:", + " Publisher: TopicAdmin" + ] + }, "MethodSettings:selector": { "paramName": "selector", "paramType": "TYPE_STRING", "comments": [ " The fully qualified name of the method, for which the options below apply.", - " This is used to find the method to apply the options." + " This is used to find the method to apply the options.", + "", + " Example:", + "", + " publishing:", + " method_settings:", + " - selector: google.storage.control.v2.StorageControl.CreateFolder", + " # method settings for CreateFolder..." ] }, "MethodSettings:long_running": { @@ -12579,17 +12956,14 @@ "", " Example of a YAML configuration::", "", - " publishing:", - " method_settings:", + " publishing:", + " method_settings:", " - selector: google.cloud.speech.v2.Speech.BatchRecognize", " long_running:", - " initial_poll_delay:", - " seconds: 60 # 1 minute", + " initial_poll_delay: 60s # 1 minute", " poll_delay_multiplier: 1.5", - " max_poll_delay:", - " seconds: 360 # 6 minutes", - " total_poll_timeout:", - " seconds: 54000 # 90 minutes" + " max_poll_delay: 360s # 6 minutes", + " total_poll_timeout: 54000s # 90 minutes" ] }, "MethodSettings:auto_populated_fields": { @@ -12602,13 +12976,33 @@ "", " Example of a YAML configuration:", "", - " publishing:", - " method_settings:", + " publishing:", + " method_settings:", " - selector: google.example.v1.ExampleService.CreateExample", " auto_populated_fields:", " - request_id" ] }, + "SelectiveGapicGeneration:methods": { + "paramName": "methods", + "paramType": "TYPE_STRING[]", + "comments": [ + " An allowlist of the fully qualified names of RPCs that should be included", + " on public client surfaces." + ] + }, + "SelectiveGapicGeneration:generate_omitted_as_internal": { + "paramName": "generate_omitted_as_internal", + "paramType": "TYPE_BOOL", + "comments": [ + " Setting this to true indicates to the client generators that methods", + " that would be excluded from the generation should instead be generated", + " in a way that indicates these methods should not be consumed by", + " end users. How this is expressed is up to individual language", + " implementations to decide. Some examples may be: added annotations,", + " obfuscated identifiers, or other language idiomatic patterns." + ] + }, "ResourceDescriptor:type": { "paramName": "type", "paramType": "TYPE_STRING", @@ -12685,8 +13079,13 @@ "comments": [ " The plural name used in the resource name and permission names, such as", " 'projects' for the resource name of 'projects/{project}' and the permission", - " name of 'cloudresourcemanager.googleapis.com/projects.get'. It is the same", - " concept of the `plural` field in k8s CRD spec", + " name of 'cloudresourcemanager.googleapis.com/projects.get'. One exception", + " to this is for Nested Collections that have stuttering names, as defined", + " in [AIP-122](https://google.aip.dev/122#nested-collections), where the", + " collection ID in the resource name pattern does not necessarily directly", + " match the `plural` value.", + "", + " It is the same concept of the `plural` field in k8s CRD spec", " https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/", "", " Note: The plural form is required even for singleton resources. See", diff --git a/core/generator/gapic-generator-typescript/baselines/pubsub-api-dump/api.json.baseline b/core/generator/gapic-generator-typescript/baselines/pubsub-api-dump/api.json.baseline index 22b35ea23025..e212ca062b41 100644 --- a/core/generator/gapic-generator-typescript/baselines/pubsub-api-dump/api.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/pubsub-api-dump/api.json.baseline @@ -686,6 +686,14 @@ " For Google-internal migration only. Do not use." ] }, + "FileDescriptorProto:option_dependency": { + "paramName": "option_dependency", + "paramType": "TYPE_STRING[]", + "comments": [ + " Names of files imported by this file purely for the purpose of providing", + " option extensions. These are excluded from the dependency list above." + ] + }, "FileDescriptorProto:message_type": { "paramName": "message_type", "paramType": "TYPE_MESSAGE[]", @@ -730,14 +738,20 @@ " The syntax of the proto file.", " The supported values are \"proto2\", \"proto3\", and \"editions\".", "", - " If `edition` is present, this value must be \"editions\"." + " If `edition` is present, this value must be \"editions\".", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "FileDescriptorProto:edition": { "paramName": "edition", "paramType": ".google.protobuf.Edition", "comments": [ - " The edition of the proto file." + " The edition of the proto file.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "DescriptorProto:name": { @@ -793,6 +807,13 @@ " A given name may only be reserved once." ] }, + "DescriptorProto:visibility": { + "paramName": "visibility", + "paramType": ".google.protobuf.SymbolVisibility", + "comments": [ + " Support for `export` and `local` keywords on enums." + ] + }, "ExtensionRangeOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -969,6 +990,13 @@ " be reserved once." ] }, + "EnumDescriptorProto:visibility": { + "paramName": "visibility", + "paramType": ".google.protobuf.SymbolVisibility", + "comments": [ + " Support for `export` and `local` keywords on enums." + ] + }, "EnumValueDescriptorProto:name": { "paramName": "name", "paramType": "TYPE_STRING", @@ -1216,7 +1244,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "FileOptions:uninterpreted_option": { @@ -1317,7 +1348,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "MessageOptions:uninterpreted_option": { @@ -1331,12 +1365,13 @@ "paramName": "ctype", "paramType": ".google.protobuf.FieldOptions.CType", "comments": [ + " NOTE: ctype is deprecated. Use `features.(pb.cpp).string_type` instead.", " The ctype option instructs the C++ code generator to use a different", " representation of the field than it normally would. See the specific", " options below. This option is only implemented to support use of", " [ctype=CORD] and [ctype=STRING] (the default) on non-repeated fields of", - " type \"bytes\" in the open source release -- sorry, we'll try to include", - " other types in a future version!" + " type \"bytes\" in the open source release.", + " TODO: make ctype actually deprecated." ] }, "FieldOptions:packed": { @@ -1420,6 +1455,7 @@ "paramName": "weak", "paramType": "TYPE_BOOL", "comments": [ + " DEPRECATED. DO NOT USE!", " For Google-internal migration only. Do not use." ] }, @@ -1450,9 +1486,17 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, + "FieldOptions:feature_support": { + "paramName": "feature_support", + "paramType": ".google.protobuf.FieldOptions.FeatureSupport", + "comments": [] + }, "FieldOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -1464,7 +1508,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "OneofOptions:uninterpreted_option": { @@ -1508,7 +1555,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "EnumOptions:uninterpreted_option": { @@ -1532,7 +1582,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "EnumValueOptions:debug_redact": { @@ -1544,6 +1597,13 @@ " credentials." ] }, + "EnumValueOptions:feature_support": { + "paramName": "feature_support", + "paramType": ".google.protobuf.FieldOptions.FeatureSupport", + "comments": [ + " Information about the support window of a feature value." + ] + }, "EnumValueOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -1555,7 +1615,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "ServiceOptions:deprecated": { @@ -1594,7 +1657,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "MethodOptions:uninterpreted_option": { @@ -1672,6 +1738,16 @@ "paramType": ".google.protobuf.FeatureSet.JsonFormat", "comments": [] }, + "FeatureSet:enforce_naming_style": { + "paramName": "enforce_naming_style", + "paramType": ".google.protobuf.FeatureSet.EnforceNamingStyle", + "comments": [] + }, + "FeatureSet:default_symbol_visibility": { + "paramName": "default_symbol_visibility", + "paramType": ".google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility", + "comments": [] + }, "FeatureSetDefaults:defaults": { "paramName": "defaults", "paramType": "TYPE_MESSAGE[]", @@ -1786,6 +1862,13 @@ " The destination where API teams want this client library to be published." ] }, + "CommonLanguageSettings:selective_gapic_generation": { + "paramName": "selective_gapic_generation", + "paramType": ".google.api.SelectiveGapicGeneration", + "comments": [ + " Configuration for which RPCs should be generated in the GAPIC client." + ] + }, "ClientLibrarySettings:version": { "paramName": "version", "paramType": "TYPE_STRING", @@ -2019,6 +2102,13 @@ " Some settings." ] }, + "PythonSettings:experimental_features": { + "paramName": "experimental_features", + "paramType": ".google.api.PythonSettings.ExperimentalFeatures", + "comments": [ + " Experimental features to be included during client library generation." + ] + }, "NodeSettings:common": { "paramName": "common", "paramType": ".google.api.CommonLanguageSettings", @@ -2097,12 +2187,33 @@ " Some settings." ] }, + "GoSettings:renamed_services": { + "paramName": "renamed_services", + "paramType": "TYPE_MESSAGE[]", + "comments": [ + " Map of service names to renamed services. Keys are the package relative", + " service names and values are the name to be used for the service client", + " and call options.", + "", + " publishing:", + " go_settings:", + " renamed_services:", + " Publisher: TopicAdmin" + ] + }, "MethodSettings:selector": { "paramName": "selector", "paramType": "TYPE_STRING", "comments": [ " The fully qualified name of the method, for which the options below apply.", - " This is used to find the method to apply the options." + " This is used to find the method to apply the options.", + "", + " Example:", + "", + " publishing:", + " method_settings:", + " - selector: google.storage.control.v2.StorageControl.CreateFolder", + " # method settings for CreateFolder..." ] }, "MethodSettings:long_running": { @@ -2115,17 +2226,14 @@ "", " Example of a YAML configuration::", "", - " publishing:", - " method_settings:", + " publishing:", + " method_settings:", " - selector: google.cloud.speech.v2.Speech.BatchRecognize", " long_running:", - " initial_poll_delay:", - " seconds: 60 # 1 minute", + " initial_poll_delay: 60s # 1 minute", " poll_delay_multiplier: 1.5", - " max_poll_delay:", - " seconds: 360 # 6 minutes", - " total_poll_timeout:", - " seconds: 54000 # 90 minutes" + " max_poll_delay: 360s # 6 minutes", + " total_poll_timeout: 54000s # 90 minutes" ] }, "MethodSettings:auto_populated_fields": { @@ -2138,13 +2246,33 @@ "", " Example of a YAML configuration:", "", - " publishing:", - " method_settings:", + " publishing:", + " method_settings:", " - selector: google.example.v1.ExampleService.CreateExample", " auto_populated_fields:", " - request_id" ] }, + "SelectiveGapicGeneration:methods": { + "paramName": "methods", + "paramType": "TYPE_STRING[]", + "comments": [ + " An allowlist of the fully qualified names of RPCs that should be included", + " on public client surfaces." + ] + }, + "SelectiveGapicGeneration:generate_omitted_as_internal": { + "paramName": "generate_omitted_as_internal", + "paramType": "TYPE_BOOL", + "comments": [ + " Setting this to true indicates to the client generators that methods", + " that would be excluded from the generation should instead be generated", + " in a way that indicates these methods should not be consumed by", + " end users. How this is expressed is up to individual language", + " implementations to decide. Some examples may be: added annotations,", + " obfuscated identifiers, or other language idiomatic patterns." + ] + }, "ResourceDescriptor:type": { "paramName": "type", "paramType": "TYPE_STRING", @@ -2221,8 +2349,13 @@ "comments": [ " The plural name used in the resource name and permission names, such as", " 'projects' for the resource name of 'projects/{project}' and the permission", - " name of 'cloudresourcemanager.googleapis.com/projects.get'. It is the same", - " concept of the `plural` field in k8s CRD spec", + " name of 'cloudresourcemanager.googleapis.com/projects.get'. One exception", + " to this is for Nested Collections that have stuttering names, as defined", + " in [AIP-122](https://google.aip.dev/122#nested-collections), where the", + " collection ID in the resource name pattern does not necessarily directly", + " match the `plural` value.", + "", + " It is the same concept of the `plural` field in k8s CRD spec", " https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/", "", " Note: The plural form is required even for singleton resources. See", @@ -5596,6 +5729,14 @@ " For Google-internal migration only. Do not use." ] }, + "FileDescriptorProto:option_dependency": { + "paramName": "option_dependency", + "paramType": "TYPE_STRING[]", + "comments": [ + " Names of files imported by this file purely for the purpose of providing", + " option extensions. These are excluded from the dependency list above." + ] + }, "FileDescriptorProto:message_type": { "paramName": "message_type", "paramType": "TYPE_MESSAGE[]", @@ -5640,14 +5781,20 @@ " The syntax of the proto file.", " The supported values are \"proto2\", \"proto3\", and \"editions\".", "", - " If `edition` is present, this value must be \"editions\"." + " If `edition` is present, this value must be \"editions\".", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "FileDescriptorProto:edition": { "paramName": "edition", "paramType": ".google.protobuf.Edition", "comments": [ - " The edition of the proto file." + " The edition of the proto file.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "DescriptorProto:name": { @@ -5703,6 +5850,13 @@ " A given name may only be reserved once." ] }, + "DescriptorProto:visibility": { + "paramName": "visibility", + "paramType": ".google.protobuf.SymbolVisibility", + "comments": [ + " Support for `export` and `local` keywords on enums." + ] + }, "ExtensionRangeOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -5879,6 +6033,13 @@ " be reserved once." ] }, + "EnumDescriptorProto:visibility": { + "paramName": "visibility", + "paramType": ".google.protobuf.SymbolVisibility", + "comments": [ + " Support for `export` and `local` keywords on enums." + ] + }, "EnumValueDescriptorProto:name": { "paramName": "name", "paramType": "TYPE_STRING", @@ -6126,7 +6287,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "FileOptions:uninterpreted_option": { @@ -6227,7 +6391,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "MessageOptions:uninterpreted_option": { @@ -6241,12 +6408,13 @@ "paramName": "ctype", "paramType": ".google.protobuf.FieldOptions.CType", "comments": [ + " NOTE: ctype is deprecated. Use `features.(pb.cpp).string_type` instead.", " The ctype option instructs the C++ code generator to use a different", " representation of the field than it normally would. See the specific", " options below. This option is only implemented to support use of", " [ctype=CORD] and [ctype=STRING] (the default) on non-repeated fields of", - " type \"bytes\" in the open source release -- sorry, we'll try to include", - " other types in a future version!" + " type \"bytes\" in the open source release.", + " TODO: make ctype actually deprecated." ] }, "FieldOptions:packed": { @@ -6330,6 +6498,7 @@ "paramName": "weak", "paramType": "TYPE_BOOL", "comments": [ + " DEPRECATED. DO NOT USE!", " For Google-internal migration only. Do not use." ] }, @@ -6360,9 +6529,17 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, + "FieldOptions:feature_support": { + "paramName": "feature_support", + "paramType": ".google.protobuf.FieldOptions.FeatureSupport", + "comments": [] + }, "FieldOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -6374,7 +6551,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "OneofOptions:uninterpreted_option": { @@ -6418,7 +6598,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "EnumOptions:uninterpreted_option": { @@ -6442,7 +6625,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "EnumValueOptions:debug_redact": { @@ -6454,6 +6640,13 @@ " credentials." ] }, + "EnumValueOptions:feature_support": { + "paramName": "feature_support", + "paramType": ".google.protobuf.FieldOptions.FeatureSupport", + "comments": [ + " Information about the support window of a feature value." + ] + }, "EnumValueOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -6465,7 +6658,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "ServiceOptions:deprecated": { @@ -6504,7 +6700,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "MethodOptions:uninterpreted_option": { @@ -6582,6 +6781,16 @@ "paramType": ".google.protobuf.FeatureSet.JsonFormat", "comments": [] }, + "FeatureSet:enforce_naming_style": { + "paramName": "enforce_naming_style", + "paramType": ".google.protobuf.FeatureSet.EnforceNamingStyle", + "comments": [] + }, + "FeatureSet:default_symbol_visibility": { + "paramName": "default_symbol_visibility", + "paramType": ".google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility", + "comments": [] + }, "FeatureSetDefaults:defaults": { "paramName": "defaults", "paramType": "TYPE_MESSAGE[]", @@ -6696,6 +6905,13 @@ " The destination where API teams want this client library to be published." ] }, + "CommonLanguageSettings:selective_gapic_generation": { + "paramName": "selective_gapic_generation", + "paramType": ".google.api.SelectiveGapicGeneration", + "comments": [ + " Configuration for which RPCs should be generated in the GAPIC client." + ] + }, "ClientLibrarySettings:version": { "paramName": "version", "paramType": "TYPE_STRING", @@ -6929,6 +7145,13 @@ " Some settings." ] }, + "PythonSettings:experimental_features": { + "paramName": "experimental_features", + "paramType": ".google.api.PythonSettings.ExperimentalFeatures", + "comments": [ + " Experimental features to be included during client library generation." + ] + }, "NodeSettings:common": { "paramName": "common", "paramType": ".google.api.CommonLanguageSettings", @@ -7007,12 +7230,33 @@ " Some settings." ] }, + "GoSettings:renamed_services": { + "paramName": "renamed_services", + "paramType": "TYPE_MESSAGE[]", + "comments": [ + " Map of service names to renamed services. Keys are the package relative", + " service names and values are the name to be used for the service client", + " and call options.", + "", + " publishing:", + " go_settings:", + " renamed_services:", + " Publisher: TopicAdmin" + ] + }, "MethodSettings:selector": { "paramName": "selector", "paramType": "TYPE_STRING", "comments": [ " The fully qualified name of the method, for which the options below apply.", - " This is used to find the method to apply the options." + " This is used to find the method to apply the options.", + "", + " Example:", + "", + " publishing:", + " method_settings:", + " - selector: google.storage.control.v2.StorageControl.CreateFolder", + " # method settings for CreateFolder..." ] }, "MethodSettings:long_running": { @@ -7025,17 +7269,14 @@ "", " Example of a YAML configuration::", "", - " publishing:", - " method_settings:", + " publishing:", + " method_settings:", " - selector: google.cloud.speech.v2.Speech.BatchRecognize", " long_running:", - " initial_poll_delay:", - " seconds: 60 # 1 minute", + " initial_poll_delay: 60s # 1 minute", " poll_delay_multiplier: 1.5", - " max_poll_delay:", - " seconds: 360 # 6 minutes", - " total_poll_timeout:", - " seconds: 54000 # 90 minutes" + " max_poll_delay: 360s # 6 minutes", + " total_poll_timeout: 54000s # 90 minutes" ] }, "MethodSettings:auto_populated_fields": { @@ -7048,13 +7289,33 @@ "", " Example of a YAML configuration:", "", - " publishing:", - " method_settings:", + " publishing:", + " method_settings:", " - selector: google.example.v1.ExampleService.CreateExample", " auto_populated_fields:", " - request_id" ] }, + "SelectiveGapicGeneration:methods": { + "paramName": "methods", + "paramType": "TYPE_STRING[]", + "comments": [ + " An allowlist of the fully qualified names of RPCs that should be included", + " on public client surfaces." + ] + }, + "SelectiveGapicGeneration:generate_omitted_as_internal": { + "paramName": "generate_omitted_as_internal", + "paramType": "TYPE_BOOL", + "comments": [ + " Setting this to true indicates to the client generators that methods", + " that would be excluded from the generation should instead be generated", + " in a way that indicates these methods should not be consumed by", + " end users. How this is expressed is up to individual language", + " implementations to decide. Some examples may be: added annotations,", + " obfuscated identifiers, or other language idiomatic patterns." + ] + }, "ResourceDescriptor:type": { "paramName": "type", "paramType": "TYPE_STRING", @@ -7131,8 +7392,13 @@ "comments": [ " The plural name used in the resource name and permission names, such as", " 'projects' for the resource name of 'projects/{project}' and the permission", - " name of 'cloudresourcemanager.googleapis.com/projects.get'. It is the same", - " concept of the `plural` field in k8s CRD spec", + " name of 'cloudresourcemanager.googleapis.com/projects.get'. One exception", + " to this is for Nested Collections that have stuttering names, as defined", + " in [AIP-122](https://google.aip.dev/122#nested-collections), where the", + " collection ID in the resource name pattern does not necessarily directly", + " match the `plural` value.", + "", + " It is the same concept of the `plural` field in k8s CRD spec", " https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/", "", " Note: The plural form is required even for singleton resources. See", @@ -11150,6 +11416,14 @@ " For Google-internal migration only. Do not use." ] }, + "FileDescriptorProto:option_dependency": { + "paramName": "option_dependency", + "paramType": "TYPE_STRING[]", + "comments": [ + " Names of files imported by this file purely for the purpose of providing", + " option extensions. These are excluded from the dependency list above." + ] + }, "FileDescriptorProto:message_type": { "paramName": "message_type", "paramType": "TYPE_MESSAGE[]", @@ -11194,14 +11468,20 @@ " The syntax of the proto file.", " The supported values are \"proto2\", \"proto3\", and \"editions\".", "", - " If `edition` is present, this value must be \"editions\"." + " If `edition` is present, this value must be \"editions\".", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "FileDescriptorProto:edition": { "paramName": "edition", "paramType": ".google.protobuf.Edition", "comments": [ - " The edition of the proto file." + " The edition of the proto file.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "DescriptorProto:name": { @@ -11257,6 +11537,13 @@ " A given name may only be reserved once." ] }, + "DescriptorProto:visibility": { + "paramName": "visibility", + "paramType": ".google.protobuf.SymbolVisibility", + "comments": [ + " Support for `export` and `local` keywords on enums." + ] + }, "ExtensionRangeOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -11433,6 +11720,13 @@ " be reserved once." ] }, + "EnumDescriptorProto:visibility": { + "paramName": "visibility", + "paramType": ".google.protobuf.SymbolVisibility", + "comments": [ + " Support for `export` and `local` keywords on enums." + ] + }, "EnumValueDescriptorProto:name": { "paramName": "name", "paramType": "TYPE_STRING", @@ -11680,7 +11974,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "FileOptions:uninterpreted_option": { @@ -11781,7 +12078,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "MessageOptions:uninterpreted_option": { @@ -11795,12 +12095,13 @@ "paramName": "ctype", "paramType": ".google.protobuf.FieldOptions.CType", "comments": [ + " NOTE: ctype is deprecated. Use `features.(pb.cpp).string_type` instead.", " The ctype option instructs the C++ code generator to use a different", " representation of the field than it normally would. See the specific", " options below. This option is only implemented to support use of", " [ctype=CORD] and [ctype=STRING] (the default) on non-repeated fields of", - " type \"bytes\" in the open source release -- sorry, we'll try to include", - " other types in a future version!" + " type \"bytes\" in the open source release.", + " TODO: make ctype actually deprecated." ] }, "FieldOptions:packed": { @@ -11884,6 +12185,7 @@ "paramName": "weak", "paramType": "TYPE_BOOL", "comments": [ + " DEPRECATED. DO NOT USE!", " For Google-internal migration only. Do not use." ] }, @@ -11914,9 +12216,17 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, + "FieldOptions:feature_support": { + "paramName": "feature_support", + "paramType": ".google.protobuf.FieldOptions.FeatureSupport", + "comments": [] + }, "FieldOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -11928,7 +12238,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "OneofOptions:uninterpreted_option": { @@ -11972,7 +12285,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "EnumOptions:uninterpreted_option": { @@ -11996,7 +12312,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "EnumValueOptions:debug_redact": { @@ -12008,6 +12327,13 @@ " credentials." ] }, + "EnumValueOptions:feature_support": { + "paramName": "feature_support", + "paramType": ".google.protobuf.FieldOptions.FeatureSupport", + "comments": [ + " Information about the support window of a feature value." + ] + }, "EnumValueOptions:uninterpreted_option": { "paramName": "uninterpreted_option", "paramType": "TYPE_MESSAGE[]", @@ -12019,7 +12345,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "ServiceOptions:deprecated": { @@ -12058,7 +12387,10 @@ "paramName": "features", "paramType": ".google.protobuf.FeatureSet", "comments": [ - " Any features defined in the specific edition." + " Any features defined in the specific edition.", + " WARNING: This field should only be used by protobuf plugins or special", + " cases like the proto compiler. Other uses are discouraged and", + " developers should rely on the protoreflect APIs for their client language." ] }, "MethodOptions:uninterpreted_option": { @@ -12136,6 +12468,16 @@ "paramType": ".google.protobuf.FeatureSet.JsonFormat", "comments": [] }, + "FeatureSet:enforce_naming_style": { + "paramName": "enforce_naming_style", + "paramType": ".google.protobuf.FeatureSet.EnforceNamingStyle", + "comments": [] + }, + "FeatureSet:default_symbol_visibility": { + "paramName": "default_symbol_visibility", + "paramType": ".google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility", + "comments": [] + }, "FeatureSetDefaults:defaults": { "paramName": "defaults", "paramType": "TYPE_MESSAGE[]", @@ -12250,6 +12592,13 @@ " The destination where API teams want this client library to be published." ] }, + "CommonLanguageSettings:selective_gapic_generation": { + "paramName": "selective_gapic_generation", + "paramType": ".google.api.SelectiveGapicGeneration", + "comments": [ + " Configuration for which RPCs should be generated in the GAPIC client." + ] + }, "ClientLibrarySettings:version": { "paramName": "version", "paramType": "TYPE_STRING", @@ -12483,6 +12832,13 @@ " Some settings." ] }, + "PythonSettings:experimental_features": { + "paramName": "experimental_features", + "paramType": ".google.api.PythonSettings.ExperimentalFeatures", + "comments": [ + " Experimental features to be included during client library generation." + ] + }, "NodeSettings:common": { "paramName": "common", "paramType": ".google.api.CommonLanguageSettings", @@ -12561,12 +12917,33 @@ " Some settings." ] }, + "GoSettings:renamed_services": { + "paramName": "renamed_services", + "paramType": "TYPE_MESSAGE[]", + "comments": [ + " Map of service names to renamed services. Keys are the package relative", + " service names and values are the name to be used for the service client", + " and call options.", + "", + " publishing:", + " go_settings:", + " renamed_services:", + " Publisher: TopicAdmin" + ] + }, "MethodSettings:selector": { "paramName": "selector", "paramType": "TYPE_STRING", "comments": [ " The fully qualified name of the method, for which the options below apply.", - " This is used to find the method to apply the options." + " This is used to find the method to apply the options.", + "", + " Example:", + "", + " publishing:", + " method_settings:", + " - selector: google.storage.control.v2.StorageControl.CreateFolder", + " # method settings for CreateFolder..." ] }, "MethodSettings:long_running": { @@ -12579,17 +12956,14 @@ "", " Example of a YAML configuration::", "", - " publishing:", - " method_settings:", + " publishing:", + " method_settings:", " - selector: google.cloud.speech.v2.Speech.BatchRecognize", " long_running:", - " initial_poll_delay:", - " seconds: 60 # 1 minute", + " initial_poll_delay: 60s # 1 minute", " poll_delay_multiplier: 1.5", - " max_poll_delay:", - " seconds: 360 # 6 minutes", - " total_poll_timeout:", - " seconds: 54000 # 90 minutes" + " max_poll_delay: 360s # 6 minutes", + " total_poll_timeout: 54000s # 90 minutes" ] }, "MethodSettings:auto_populated_fields": { @@ -12602,13 +12976,33 @@ "", " Example of a YAML configuration:", "", - " publishing:", - " method_settings:", + " publishing:", + " method_settings:", " - selector: google.example.v1.ExampleService.CreateExample", " auto_populated_fields:", " - request_id" ] }, + "SelectiveGapicGeneration:methods": { + "paramName": "methods", + "paramType": "TYPE_STRING[]", + "comments": [ + " An allowlist of the fully qualified names of RPCs that should be included", + " on public client surfaces." + ] + }, + "SelectiveGapicGeneration:generate_omitted_as_internal": { + "paramName": "generate_omitted_as_internal", + "paramType": "TYPE_BOOL", + "comments": [ + " Setting this to true indicates to the client generators that methods", + " that would be excluded from the generation should instead be generated", + " in a way that indicates these methods should not be consumed by", + " end users. How this is expressed is up to individual language", + " implementations to decide. Some examples may be: added annotations,", + " obfuscated identifiers, or other language idiomatic patterns." + ] + }, "ResourceDescriptor:type": { "paramName": "type", "paramType": "TYPE_STRING", @@ -12685,8 +13079,13 @@ "comments": [ " The plural name used in the resource name and permission names, such as", " 'projects' for the resource name of 'projects/{project}' and the permission", - " name of 'cloudresourcemanager.googleapis.com/projects.get'. It is the same", - " concept of the `plural` field in k8s CRD spec", + " name of 'cloudresourcemanager.googleapis.com/projects.get'. One exception", + " to this is for Nested Collections that have stuttering names, as defined", + " in [AIP-122](https://google.aip.dev/122#nested-collections), where the", + " collection ID in the resource name pattern does not necessarily directly", + " match the `plural` value.", + "", + " It is the same concept of the `plural` field in k8s CRD spec", " https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/", "", " Note: The plural form is required even for singleton resources. See", diff --git a/core/generator/gapic-generator-typescript/baselines/redis-esm/package.json b/core/generator/gapic-generator-typescript/baselines/redis-esm/package.json index 7d0e5005ce24..7b91c7e8e511 100644 --- a/core/generator/gapic-generator-typescript/baselines/redis-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/redis-esm/package.json @@ -73,7 +73,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/redis/package.json b/core/generator/gapic-generator-typescript/baselines/redis/package.json index 0997ee995e3c..c43b012e55df 100644 --- a/core/generator/gapic-generator-typescript/baselines/redis/package.json +++ b/core/generator/gapic-generator-typescript/baselines/redis/package.json @@ -35,7 +35,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/retail-esm/package.json b/core/generator/gapic-generator-typescript/baselines/retail-esm/package.json index 4dad3cdc8951..39fdf1123933 100644 --- a/core/generator/gapic-generator-typescript/baselines/retail-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/retail-esm/package.json @@ -87,7 +87,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/retail/package.json b/core/generator/gapic-generator-typescript/baselines/retail/package.json index cce57a59a986..555ca6700ccf 100644 --- a/core/generator/gapic-generator-typescript/baselines/retail/package.json +++ b/core/generator/gapic-generator-typescript/baselines/retail/package.json @@ -49,7 +49,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/routingtest-esm/package.json b/core/generator/gapic-generator-typescript/baselines/routingtest-esm/package.json index d4c5a67c414e..41086cfe7d71 100644 --- a/core/generator/gapic-generator-typescript/baselines/routingtest-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/routingtest-esm/package.json @@ -73,7 +73,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/routingtest/package.json b/core/generator/gapic-generator-typescript/baselines/routingtest/package.json index 0ab0042ce5f7..af1847b25dcc 100644 --- a/core/generator/gapic-generator-typescript/baselines/routingtest/package.json +++ b/core/generator/gapic-generator-typescript/baselines/routingtest/package.json @@ -35,7 +35,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/showcase-esm/package.json b/core/generator/gapic-generator-typescript/baselines/showcase-esm/package.json index 6de66ad2bdaf..ea1758e41d38 100644 --- a/core/generator/gapic-generator-typescript/baselines/showcase-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/showcase-esm/package.json @@ -78,7 +78,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/showcase-legacy-esm/package.json b/core/generator/gapic-generator-typescript/baselines/showcase-legacy-esm/package.json index 14a70ca73ffb..2af4cf0e252b 100644 --- a/core/generator/gapic-generator-typescript/baselines/showcase-legacy-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/showcase-legacy-esm/package.json @@ -73,7 +73,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/showcase-legacy/package.json b/core/generator/gapic-generator-typescript/baselines/showcase-legacy/package.json index a77345c1a7cf..a7db65e28166 100644 --- a/core/generator/gapic-generator-typescript/baselines/showcase-legacy/package.json +++ b/core/generator/gapic-generator-typescript/baselines/showcase-legacy/package.json @@ -35,7 +35,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/showcase/package.json b/core/generator/gapic-generator-typescript/baselines/showcase/package.json index e02a97d7b12a..b9e39b2260f9 100644 --- a/core/generator/gapic-generator-typescript/baselines/showcase/package.json +++ b/core/generator/gapic-generator-typescript/baselines/showcase/package.json @@ -40,7 +40,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/tasks-esm/package.json b/core/generator/gapic-generator-typescript/baselines/tasks-esm/package.json index 6d4ca6260b1f..6358aa163477 100644 --- a/core/generator/gapic-generator-typescript/baselines/tasks-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/tasks-esm/package.json @@ -73,7 +73,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/tasks/package.json b/core/generator/gapic-generator-typescript/baselines/tasks/package.json index 2717514a26d4..9581b0be5bfe 100644 --- a/core/generator/gapic-generator-typescript/baselines/tasks/package.json +++ b/core/generator/gapic-generator-typescript/baselines/tasks/package.json @@ -35,7 +35,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/texttospeech-esm/package.json b/core/generator/gapic-generator-typescript/baselines/texttospeech-esm/package.json index 7acefc2a563d..db17696cc42c 100644 --- a/core/generator/gapic-generator-typescript/baselines/texttospeech-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/texttospeech-esm/package.json @@ -73,7 +73,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/texttospeech/package.json b/core/generator/gapic-generator-typescript/baselines/texttospeech/package.json index 07f6bb0a393b..bc9b8caeb537 100644 --- a/core/generator/gapic-generator-typescript/baselines/texttospeech/package.json +++ b/core/generator/gapic-generator-typescript/baselines/texttospeech/package.json @@ -35,7 +35,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/translate-esm/package.json b/core/generator/gapic-generator-typescript/baselines/translate-esm/package.json index 5df9b5f36163..c185db7f219c 100644 --- a/core/generator/gapic-generator-typescript/baselines/translate-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/translate-esm/package.json @@ -73,7 +73,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/translate/package.json b/core/generator/gapic-generator-typescript/baselines/translate/package.json index e04f1dc2d7bd..0ea87d60d29e 100644 --- a/core/generator/gapic-generator-typescript/baselines/translate/package.json +++ b/core/generator/gapic-generator-typescript/baselines/translate/package.json @@ -35,7 +35,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/baselines/videointelligence-esm/package.json b/core/generator/gapic-generator-typescript/baselines/videointelligence-esm/package.json index c897e60b4a5e..d09511746b77 100644 --- a/core/generator/gapic-generator-typescript/baselines/videointelligence-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/videointelligence-esm/package.json @@ -73,7 +73,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/baselines/videointelligence/package.json b/core/generator/gapic-generator-typescript/baselines/videointelligence/package.json index f80a1458ef48..ba403e4683d0 100644 --- a/core/generator/gapic-generator-typescript/baselines/videointelligence/package.json +++ b/core/generator/gapic-generator-typescript/baselines/videointelligence/package.json @@ -35,7 +35,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/package-lock.json b/core/generator/gapic-generator-typescript/package-lock.json index b9f44aea0416..cb955abc5183 100644 --- a/core/generator/gapic-generator-typescript/package-lock.json +++ b/core/generator/gapic-generator-typescript/package-lock.json @@ -13,6 +13,7 @@ "js-yaml": "^4.1.1", "long": "^5.3.2", "object-hash": "^3.0.0", + "prettier": "^3.2.5", "proto3-json-serializer": "^3.0.3", "protobufjs": "^7.5.5", "protobufjs-cli": "^1.2.0", @@ -33,9 +34,9 @@ "espower-typescript": "^10.0.1", "gapic-node-processing": "^0.1.6", "gapic-tools": "^1.0.3", - "google-gax": "^5.1.1-rc.1", + "google-gax": "^5.0.6", "gts": "^6.0.2", - "mocha": "^11.7.4", + "mocha": "^11.7.5", "nunjucks": "^3.2.4", "typescript": "5.6.2" }, @@ -1033,16 +1034,6 @@ "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz", "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==" }, - "node_modules/@types/long": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@types/long/-/long-5.0.0.tgz", - "integrity": "sha512-eQs9RsucA/LNjnMoJvWG/nXa7Pot/RbBzilF/QRIU/xRl+0ApxrSUFsV5lmf01SvSlqMzJ7Zwxe440wmz2SJGA==", - "deprecated": "This is a stub types definition. long provides its own type definitions, so you do not need this installed.", - "dev": true, - "dependencies": { - "long": "*" - } - }, "node_modules/@types/markdown-it": { "version": "14.1.2", "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz", @@ -3422,197 +3413,6 @@ "node": ">=18" } }, - "node_modules/gapic-tools/node_modules/@grpc/proto-loader": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.8.0.tgz", - "integrity": "sha512-rc1hOQtjIWGxcxpb9aHAfLpIctjEnsDehj0DAiVfBlmT84uvR0uUtN2hEi/ecvWVjXUGf5qPF4qEgiLOx1YIMQ==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "lodash.camelcase": "^4.3.0", - "long": "^5.0.0", - "protobufjs": "^7.5.3", - "yargs": "^17.7.2" - }, - "bin": { - "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/gapic-tools/node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/gapic-tools/node_modules/gaxios": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-7.1.1.tgz", - "integrity": "sha512-Odju3uBUJyVCkW64nLD4wKLhbh93bh6vIg/ZIXkWiLPBrdgtc65+tls/qml+un3pr6JqYVFDZbbmLDQT68rTOQ==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "extend": "^3.0.2", - "https-proxy-agent": "^7.0.1", - "node-fetch": "^3.3.2" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/gapic-tools/node_modules/gcp-metadata": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-7.0.1.tgz", - "integrity": "sha512-UcO3kefx6dCcZkgcTGgVOTFb7b1LlQ02hY1omMjjrrBzkajRMCFgYOjs7J71WqnuG1k2b+9ppGL7FsOfhZMQKQ==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "gaxios": "^7.0.0", - "google-logging-utils": "^1.0.0", - "json-bigint": "^1.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/gapic-tools/node_modules/google-auth-library": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.3.0.tgz", - "integrity": "sha512-ylSE3RlCRZfZB56PFJSfUCuiuPq83Fx8hqu1KPWGK8FVdSaxlp/qkeMMX/DT/18xkwXIHvXEXkZsljRwfrdEfQ==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "base64-js": "^1.3.0", - "ecdsa-sig-formatter": "^1.0.11", - "gaxios": "^7.0.0", - "gcp-metadata": "^7.0.0", - "google-logging-utils": "^1.0.0", - "gtoken": "^8.0.0", - "jws": "^4.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/gapic-tools/node_modules/google-gax": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-5.0.3.tgz", - "integrity": "sha512-DkWybwgkV8HA9aIizNEHEUHd8ho1BzGGQ/YMGDsTt167dQ8pk/oMiwxpUFvh6Ta93m8ZN7KwdWmP3o46HWjV+A==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@grpc/grpc-js": "^1.12.6", - "@grpc/proto-loader": "^0.8.0", - "abort-controller": "^3.0.0", - "duplexify": "^4.1.3", - "google-auth-library": "^10.1.0", - "google-logging-utils": "^1.1.1", - "node-fetch": "^3.3.2", - "object-hash": "^3.0.0", - "proto3-json-serializer": "^3.0.0", - "protobufjs": "^7.5.3", - "retry-request": "^8.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/gapic-tools/node_modules/google-logging-utils": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-1.1.1.tgz", - "integrity": "sha512-rcX58I7nqpu4mbKztFeOAObbomBbHU2oIb/d3tJfF3dizGSApqtSwYJigGCooHdnMyQBIw8BrWyK96w3YXgr6A==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=14" - } - }, - "node_modules/gapic-tools/node_modules/gtoken": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-8.0.0.tgz", - "integrity": "sha512-+CqsMbHPiSTdtSO14O51eMNlrp9N79gmeqmXeouJOhfucAedHw9noVe/n5uJk3tbKE6a+6ZCQg3RPhVhHByAIw==", - "dev": true, - "license": "MIT", - "dependencies": { - "gaxios": "^7.0.0", - "jws": "^4.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/gapic-tools/node_modules/node-fetch": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", - "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", - "dev": true, - "license": "MIT", - "dependencies": { - "data-uri-to-buffer": "^4.0.0", - "fetch-blob": "^3.1.4", - "formdata-polyfill": "^4.0.10" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/node-fetch" - } - }, - "node_modules/gapic-tools/node_modules/retry-request": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-8.0.2.tgz", - "integrity": "sha512-JzFPAfklk1kjR1w76f0QOIhoDkNkSqW8wYKT08n9yysTmZfB+RQ2QoXoTAeOi1HD9ZipTyTAZg3c4pM/jeqgSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "extend": "^3.0.2", - "teeny-request": "^10.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/gapic-tools/node_modules/teeny-request": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-10.1.0.tgz", - "integrity": "sha512-3ZnLvgWF29jikg1sAQ1g0o+lr5JX6sVgYvfUJazn7ZjJroDBUTWp44/+cFVX0bULjv4vci+rBD+oGVAkWqhUbw==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "node-fetch": "^3.3.2", - "stream-events": "^1.0.5" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/gapic-tools/node_modules/teeny-request/node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/gaxios": { "version": "6.7.1", "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz", @@ -3819,28 +3619,47 @@ } }, "node_modules/google-gax": { - "version": "5.1.1-rc.1", - "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-5.1.1-rc.1.tgz", - "integrity": "sha512-HSHw7NytSxiyTp3WgWQXu4Cnl49VH2qRcAU047fmShUbbxkGwYX3MlipxhDkWIWMRl7Dktyq2gRvwQVP6ILgUA==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-5.0.6.tgz", + "integrity": "sha512-1kGbqVQBZPAAu4+/R1XxPQKP0ydbNYoLAr4l0ZO2bMV0kLyLW4I1gAk++qBLWt7DPORTzmWRMsCZe86gDjShJA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@grpc/grpc-js": "^1.12.6", - "@grpc/proto-loader": "^0.7.13", - "@types/long": "^5.0.0", - "abort-controller": "^3.0.0", + "@grpc/proto-loader": "^0.8.0", "duplexify": "^4.1.3", - "google-auth-library": "^10.0.0-rc.1", + "google-auth-library": "^10.1.0", "google-logging-utils": "^1.1.1", "node-fetch": "^3.3.2", "object-hash": "^3.0.0", "proto3-json-serializer": "^3.0.0", "protobufjs": "^7.5.3", - "retry-request": "^8.0.0" + "retry-request": "^8.0.0", + "rimraf": "^5.0.1" }, "engines": { "node": ">=18" } }, + "node_modules/google-gax/node_modules/@grpc/proto-loader": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.8.0.tgz", + "integrity": "sha512-rc1hOQtjIWGxcxpb9aHAfLpIctjEnsDehj0DAiVfBlmT84uvR0uUtN2hEi/ecvWVjXUGf5qPF4qEgiLOx1YIMQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "lodash.camelcase": "^4.3.0", + "long": "^5.0.0", + "protobufjs": "^7.5.3", + "yargs": "^17.7.2" + }, + "bin": { + "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/google-gax/node_modules/agent-base": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", @@ -3854,10 +3673,11 @@ } }, "node_modules/google-gax/node_modules/gaxios": { - "version": "7.0.0-rc.5", - "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-7.0.0-rc.5.tgz", - "integrity": "sha512-s9rlpplwdb/KCq2DYevVTM/MpozeVZuR3pkzDGXtRhY7wD4fXftIYXUAerX07ZPB3J8/dHUJsX7fPnN2O4Psuw==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-7.1.4.tgz", + "integrity": "sha512-bTIgTsM2bWn3XklZISBTQX7ZSddGW+IO3bMdGaemHZ3tbqExMENHLx6kKZ/KlejgrMtj8q7wBItt51yegqalrA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "extend": "^3.0.2", "https-proxy-agent": "^7.0.1", @@ -3868,12 +3688,13 @@ } }, "node_modules/google-gax/node_modules/gcp-metadata": { - "version": "7.0.0-rc.1", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-7.0.0-rc.1.tgz", - "integrity": "sha512-E6c+AdIaK1LNA839OyotiTca+B2IG1nDlMjnlcck8JjXn3fVgx57Ib9i6iL1/iqN7bA3EUQdcRRu+HqOCOABIg==", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-8.1.2.tgz", + "integrity": "sha512-zV/5HKTfCeKWnxG0Dmrw51hEWFGfcF2xiXqcA3+J90WDuP0SvoiSO5ORvcBsifmx/FoIjgQN3oNOGaQ5PhLFkg==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "gaxios": "^7.0.0-rc.1", + "gaxios": "^7.0.0", "google-logging-utils": "^1.0.0", "json-bigint": "^1.0.0" }, @@ -3882,17 +3703,17 @@ } }, "node_modules/google-gax/node_modules/google-auth-library": { - "version": "10.0.0-rc.2", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.0.0-rc.2.tgz", - "integrity": "sha512-LjkDUtHV8mFFV0pDWpPTjUuAPd6WDBs2y/mTzGSmwQJkDRinOpQyu7e/0pqQoDoanKGwaQJH5729uZ+/5Uz8fw==", + "version": "10.6.2", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.6.2.tgz", + "integrity": "sha512-e27Z6EThmVNNvtYASwQxose/G57rkRuaRbQyxM2bvYLLX/GqWZ5chWq2EBoUchJbCc57eC9ArzO5wMsEmWftCw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "base64-js": "^1.3.0", "ecdsa-sig-formatter": "^1.0.11", - "gaxios": "^7.0.0-rc.4", - "gcp-metadata": "^7.0.0-rc.1", - "google-logging-utils": "^1.0.0", - "gtoken": "^8.0.0-rc.1", + "gaxios": "^7.1.4", + "gcp-metadata": "8.1.2", + "google-logging-utils": "1.1.3", "jws": "^4.0.0" }, "engines": { @@ -3900,27 +3721,15 @@ } }, "node_modules/google-gax/node_modules/google-logging-utils": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-1.1.1.tgz", - "integrity": "sha512-rcX58I7nqpu4mbKztFeOAObbomBbHU2oIb/d3tJfF3dizGSApqtSwYJigGCooHdnMyQBIw8BrWyK96w3YXgr6A==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-1.1.3.tgz", + "integrity": "sha512-eAmLkjDjAFCVXg7A1unxHsLf961m6y17QFqXqAXGj/gVkKFrEICfStRfwUlGNfeCEjNRa32JEWOUTlYXPyyKvA==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=14" } }, - "node_modules/google-gax/node_modules/gtoken": { - "version": "8.0.0-rc.1", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-8.0.0-rc.1.tgz", - "integrity": "sha512-UjE/egX6ixArdcCKOkheuFQ4XN4/0gX92nd2JPVEYuRU2sWHAWuOVGnowm1fQUdQtaxqn1n8H0hOb2LCaUhJ3A==", - "dev": true, - "dependencies": { - "gaxios": "^7.0.0-rc.1", - "jws": "^4.0.0" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/google-gax/node_modules/node-fetch": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", @@ -3953,6 +3762,22 @@ "node": ">=18" } }, + "node_modules/google-gax/node_modules/rimraf": { + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz", + "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^10.3.7" + }, + "bin": { + "rimraf": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/google-gax/node_modules/teeny-request": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-10.1.0.tgz", @@ -5057,9 +4882,9 @@ } }, "node_modules/mocha": { - "version": "11.7.4", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.4.tgz", - "integrity": "sha512-1jYAaY8x0kAZ0XszLWu14pzsf4KV740Gld4HXkhNTXwcHx4AUEDkPzgEHg9CM5dVcW+zv036tjpsEbLraPJj4w==", + "version": "11.7.5", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.5.tgz", + "integrity": "sha512-mTT6RgopEYABzXWFx+GcJ+ZQ32kp4fMf0xvpZIIfSq9Z8lC/++MtcCnQ9t5FP2veYEP95FIYSvW+U9fV4xrlig==", "dev": true, "license": "MIT", "dependencies": { @@ -5634,7 +5459,6 @@ "version": "3.3.3", "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", - "dev": true, "bin": { "prettier": "bin/prettier.cjs" }, diff --git a/core/generator/gapic-generator-typescript/package.json b/core/generator/gapic-generator-typescript/package.json index 22417af28e6f..74de442413a4 100644 --- a/core/generator/gapic-generator-typescript/package.json +++ b/core/generator/gapic-generator-typescript/package.json @@ -67,9 +67,9 @@ "espower-typescript": "^10.0.1", "gapic-node-processing": "^0.1.6", "gapic-tools": "^1.0.3", - "google-gax": "^5.1.1-rc.1", + "google-gax": "^5.0.6", "gts": "^6.0.2", - "mocha": "^11.7.4", + "mocha": "^11.7.5", "nunjucks": "^3.2.4", "typescript": "5.6.2" }, diff --git a/core/generator/gapic-generator-typescript/pnpm_install.bzl b/core/generator/gapic-generator-typescript/pnpm_install.bzl new file mode 100644 index 000000000000..e4580c529dcb --- /dev/null +++ b/core/generator/gapic-generator-typescript/pnpm_install.bzl @@ -0,0 +1,22 @@ +def _pnpm_install_impl(repository_ctx): + workspace_root = str(repository_ctx.workspace_root) + + # Get the path to the pnpm.cjs entry point inside @pnpm external repo + pnpm_cjs_path = str(repository_ctx.path(Label("@pnpm//:package/dist/pnpm.cjs"))) + + # Run the equivalent of `bazelisk run -- @pnpm//:pnpm --dir $PWD install --lockfile-only` + # using node and the path to pnpm.cjs + result = repository_ctx.execute( + ["node", pnpm_cjs_path, "--dir", workspace_root, "install", "--lockfile-only"], + working_directory = workspace_root, + ) + + if result.return_code != 0: + fail("Failed to run pnpm install --lockfile-only: %s" % result.stderr) + + repository_ctx.file("pnpm_install.bzl", "PNPM_INSTALL_STATUS = 'success'") + repository_ctx.file("BUILD.bazel", "exports_files(['*'])") + +pnpm_install = repository_rule( + implementation = _pnpm_install_impl, +) diff --git a/core/generator/gapic-generator-typescript/templates/cjs/typescript_gapic/package.json b/core/generator/gapic-generator-typescript/templates/cjs/typescript_gapic/package.json index 1b1007c6b329..80f70887b750 100644 --- a/core/generator/gapic-generator-typescript/templates/cjs/typescript_gapic/package.json +++ b/core/generator/gapic-generator-typescript/templates/cjs/typescript_gapic/package.json @@ -35,7 +35,7 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/core/generator/gapic-generator-typescript/templates/esm/typescript_gapic/package.json b/core/generator/gapic-generator-typescript/templates/esm/typescript_gapic/package.json index 67eb93b22220..a58733ba9022 100644 --- a/core/generator/gapic-generator-typescript/templates/esm/typescript_gapic/package.json +++ b/core/generator/gapic-generator-typescript/templates/esm/typescript_gapic/package.json @@ -74,7 +74,7 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^5.1.1-rc.1" + "google-gax": "^5.0.6" }, "devDependencies": { "@babel/cli": "^7.28.3", diff --git a/core/generator/gapic-generator-typescript/typescript/src/templater.ts b/core/generator/gapic-generator-typescript/typescript/src/templater.ts index 86937fe3fa1f..233e7d39c718 100644 --- a/core/generator/gapic-generator-typescript/typescript/src/templater.ts +++ b/core/generator/gapic-generator-typescript/typescript/src/templater.ts @@ -26,6 +26,9 @@ import {MethodDescriptorProto, ServiceDescriptorProto} from './schema/proto.js'; interface Namer { register: (name: string, serviceName?: string) => string; get: (name: string, serviceName?: string) => string; + + // For modern ESM import(), we have to check `default` instead. + default?: Namer; } const commonParameters: {[name: string]: string} = { @@ -327,7 +330,7 @@ async function loadNamerPlugin(basePath: string) { }; if (fs.existsSync(namerLocation)) { const namer: Namer = (await import(namerLocation)) as Namer; - const {register, get} = namer; + const {register, get} = namer.default || namer; id.register = register; id.get = get; } diff --git a/core/generator/gapic-generator-typescript/typescript/tools/update-baselines.ts b/core/generator/gapic-generator-typescript/typescript/tools/update-baselines.ts index 5b61da3d9df0..5c1246944d5b 100644 --- a/core/generator/gapic-generator-typescript/typescript/tools/update-baselines.ts +++ b/core/generator/gapic-generator-typescript/typescript/tools/update-baselines.ts @@ -76,9 +76,9 @@ async function main() { const oldFolders = (await readdir(root)).filter(file => file.match(resultPrefix), ); - for (const oldFolder of oldFolders) { - await fsp.rm(oldFolder, { recursive: true }); - } + await Promise.all( + oldFolders.map(oldFolder => fsp.rm(oldFolder, {recursive: true})) + ); // generate test output try { diff --git a/core/generator/gapic-generator-typescript/yarn.lock b/core/generator/gapic-generator-typescript/yarn.lock index 5dc992012238..feb50e944519 100644 --- a/core/generator/gapic-generator-typescript/yarn.lock +++ b/core/generator/gapic-generator-typescript/yarn.lock @@ -208,7 +208,7 @@ "@google-cloud/storage@^7.15.2": version "7.19.0" - resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-7.19.0.tgz#34fb7cc4eacede5a2f1f0d6cefa0c70a22078c5b" + resolved "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.19.0.tgz" integrity sha512-n2FjE7NAOYyshogdc7KQOl/VZb4sneqPjWouSyia9CMDdMhRX5+RIbqalNmC7LOLzuLAN89VlF2HvG8na9G+zQ== dependencies: "@google-cloud/paginator" "^5.0.0" @@ -340,7 +340,7 @@ "@nodable/entities@^2.1.0": version "2.1.0" - resolved "https://registry.yarnpkg.com/@nodable/entities/-/entities-2.1.0.tgz#f543e5c6446720d4cf9e498a83019dd159973bc2" + resolved "https://registry.npmjs.org/@nodable/entities/-/entities-2.1.0.tgz" integrity sha512-nyT7T3nbMyBI/lvr6L5TyWbFJAI9FTgVRakNoBqCD+PmID8DzFrrNdLLtHMwMszOtqZa8PAOV24ZqDnQrhQINA== "@nodelib/fs.scandir@2.1.5": @@ -567,13 +567,6 @@ resolved "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz" integrity sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q== -"@types/long@^5.0.0": - version "5.0.0" - resolved "https://registry.npmjs.org/@types/long/-/long-5.0.0.tgz" - integrity sha512-eQs9RsucA/LNjnMoJvWG/nXa7Pot/RbBzilF/QRIU/xRl+0ApxrSUFsV5lmf01SvSlqMzJ7Zwxe440wmz2SJGA== - dependencies: - long "*" - "@types/markdown-it@^14.1.1": version "14.1.2" resolved "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz" @@ -624,7 +617,7 @@ resolved "https://registry.npmjs.org/@types/object-hash/-/object-hash-3.0.6.tgz" integrity sha512-fOBV8C1FIu2ELinoILQ+ApxcUKz4ngq+IWUYrxSGjXzzjUALijilampwkMgEtJ+h2njAW3pi853QpzNVCHB73w== -"@types/request@^2.48.8": +"@types/request@^2.48.12", "@types/request@^2.48.8": version "2.48.12" resolved "https://registry.npmjs.org/@types/request/-/request-2.48.12.tgz" integrity sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw== @@ -914,7 +907,7 @@ bluebird@^3.7.2: brace-expansion@^1.1.7: version "1.1.13" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.13.tgz#d37875c01dc9eff988dd49d112a57cb67b54efe6" + resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz" integrity sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w== dependencies: balanced-match "^1.0.0" @@ -922,7 +915,7 @@ brace-expansion@^1.1.7: brace-expansion@^2.0.1, brace-expansion@^2.0.2: version "2.0.3" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.3.tgz#0493338bdd58e319b1039c67cf7ee439892c01d9" + resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz" integrity sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA== dependencies: balanced-match "^1.0.0" @@ -951,7 +944,7 @@ browserslist@^4.24.0: buffer-equal-constant-time@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" + resolved "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz" integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA== buffer-from@^1.0.0: @@ -1777,14 +1770,14 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: fast-xml-builder@^1.1.5: version "1.1.5" - resolved "https://registry.yarnpkg.com/fast-xml-builder/-/fast-xml-builder-1.1.5.tgz#50188e1452a5fa095f415d3e63dcac0a1dbcbf11" + resolved "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.5.tgz" integrity sha512-4TJn/8FKLeslLAH3dnohXqE3QSoxkhvaMzepOIZytwJXZO69Bfz0HBdDHzOTOon6G59Zrk6VQ2bEiv1t61rfkA== dependencies: path-expression-matcher "^1.1.3" fast-xml-parser@^5.3.4: version "5.7.1" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-5.7.1.tgz#17697550bdd2a0a0d47cdc4b456c009c4cbe8a06" + resolved "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.1.tgz" integrity sha512-8Cc3f8GUGUULg34pBch/KGyPLglS+OFs05deyOlY7fL2MTagYPKrVQNmR1fLF/yJ9PH5ZSTd3YDF6pnmeZU+zA== dependencies: "@nodable/entities" "^2.1.0" @@ -1860,7 +1853,7 @@ flat@^5.0.2: flatted@^3.2.9: version "3.4.2" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.4.2.tgz#f5c23c107f0f37de8dbdf24f13722b3b98d52726" + resolved "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz" integrity sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA== foreground-child@^3.1.0: @@ -1941,23 +1934,23 @@ gaxios@^6.0.0, gaxios@^6.0.2, gaxios@^6.1.1: node-fetch "^2.6.9" uuid "^9.0.1" -gaxios@^7.0.0: - version "7.1.1" - resolved "https://registry.npmjs.org/gaxios/-/gaxios-7.1.1.tgz" - integrity sha512-Odju3uBUJyVCkW64nLD4wKLhbh93bh6vIg/ZIXkWiLPBrdgtc65+tls/qml+un3pr6JqYVFDZbbmLDQT68rTOQ== +gaxios@^7.0.0, gaxios@^7.1.4: + version "7.1.4" + resolved "https://registry.npmjs.org/gaxios/-/gaxios-7.1.4.tgz" + integrity sha512-bTIgTsM2bWn3XklZISBTQX7ZSddGW+IO3bMdGaemHZ3tbqExMENHLx6kKZ/KlejgrMtj8q7wBItt51yegqalrA== dependencies: extend "^3.0.2" https-proxy-agent "^7.0.1" node-fetch "^3.3.2" -gaxios@^7.0.0-rc.1, gaxios@^7.0.0-rc.4: - version "7.0.0-rc.5" - resolved "https://registry.npmjs.org/gaxios/-/gaxios-7.0.0-rc.5.tgz" - integrity sha512-s9rlpplwdb/KCq2DYevVTM/MpozeVZuR3pkzDGXtRhY7wD4fXftIYXUAerX07ZPB3J8/dHUJsX7fPnN2O4Psuw== +gcp-metadata@8.1.2: + version "8.1.2" + resolved "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-8.1.2.tgz" + integrity sha512-zV/5HKTfCeKWnxG0Dmrw51hEWFGfcF2xiXqcA3+J90WDuP0SvoiSO5ORvcBsifmx/FoIjgQN3oNOGaQ5PhLFkg== dependencies: - extend "^3.0.2" - https-proxy-agent "^7.0.1" - node-fetch "^3.3.2" + gaxios "^7.0.0" + google-logging-utils "^1.0.0" + json-bigint "^1.0.0" gcp-metadata@^6.1.0: version "6.1.1" @@ -1968,24 +1961,6 @@ gcp-metadata@^6.1.0: google-logging-utils "^0.0.2" json-bigint "^1.0.0" -gcp-metadata@^7.0.0: - version "7.0.1" - resolved "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-7.0.1.tgz" - integrity sha512-UcO3kefx6dCcZkgcTGgVOTFb7b1LlQ02hY1omMjjrrBzkajRMCFgYOjs7J71WqnuG1k2b+9ppGL7FsOfhZMQKQ== - dependencies: - gaxios "^7.0.0" - google-logging-utils "^1.0.0" - json-bigint "^1.0.0" - -gcp-metadata@^7.0.0-rc.1: - version "7.0.0-rc.1" - resolved "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-7.0.0-rc.1.tgz" - integrity sha512-E6c+AdIaK1LNA839OyotiTca+B2IG1nDlMjnlcck8JjXn3fVgx57Ib9i6iL1/iqN7bA3EUQdcRRu+HqOCOABIg== - dependencies: - gaxios "^7.0.0-rc.1" - google-logging-utils "^1.0.0" - json-bigint "^1.0.0" - gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz" @@ -2039,9 +2014,9 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob@^10.4.5: +glob@^10.3.7, glob@^10.4.5: version "10.5.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-10.5.0.tgz#8ec0355919cd3338c28428a23d4f24ecc5fe738c" + resolved "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz" integrity sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg== dependencies: foreground-child "^3.1.0" @@ -2053,7 +2028,7 @@ glob@^10.4.5: glob@^7.1.3: version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== dependencies: fs.realpath "^1.0.0" @@ -2065,7 +2040,7 @@ glob@^7.1.3: glob@^8.0.0: version "8.1.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz" integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== dependencies: fs.realpath "^1.0.0" @@ -2098,30 +2073,16 @@ globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" -google-auth-library@^10.0.0-rc.1: - version "10.0.0-rc.2" - resolved "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.0.0-rc.2.tgz" - integrity sha512-LjkDUtHV8mFFV0pDWpPTjUuAPd6WDBs2y/mTzGSmwQJkDRinOpQyu7e/0pqQoDoanKGwaQJH5729uZ+/5Uz8fw== - dependencies: - base64-js "^1.3.0" - ecdsa-sig-formatter "^1.0.11" - gaxios "^7.0.0-rc.4" - gcp-metadata "^7.0.0-rc.1" - google-logging-utils "^1.0.0" - gtoken "^8.0.0-rc.1" - jws "^4.0.0" - google-auth-library@^10.1.0: - version "10.3.0" - resolved "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.3.0.tgz" - integrity sha512-ylSE3RlCRZfZB56PFJSfUCuiuPq83Fx8hqu1KPWGK8FVdSaxlp/qkeMMX/DT/18xkwXIHvXEXkZsljRwfrdEfQ== + version "10.6.2" + resolved "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.6.2.tgz" + integrity sha512-e27Z6EThmVNNvtYASwQxose/G57rkRuaRbQyxM2bvYLLX/GqWZ5chWq2EBoUchJbCc57eC9ArzO5wMsEmWftCw== dependencies: base64-js "^1.3.0" ecdsa-sig-formatter "^1.0.11" - gaxios "^7.0.0" - gcp-metadata "^7.0.0" - google-logging-utils "^1.0.0" - gtoken "^8.0.0" + gaxios "^7.1.4" + gcp-metadata "8.1.2" + google-logging-utils "1.1.3" jws "^4.0.0" google-auth-library@^9.6.3: @@ -2136,14 +2097,13 @@ google-auth-library@^9.6.3: gtoken "^7.0.0" jws "^4.0.0" -google-gax@^5.0.0-rc.0: - version "5.0.3" - resolved "https://registry.npmjs.org/google-gax/-/google-gax-5.0.3.tgz" - integrity sha512-DkWybwgkV8HA9aIizNEHEUHd8ho1BzGGQ/YMGDsTt167dQ8pk/oMiwxpUFvh6Ta93m8ZN7KwdWmP3o46HWjV+A== +google-gax@^5.0.0-rc.0, google-gax@^5.0.6: + version "5.0.6" + resolved "https://registry.npmjs.org/google-gax/-/google-gax-5.0.6.tgz" + integrity sha512-1kGbqVQBZPAAu4+/R1XxPQKP0ydbNYoLAr4l0ZO2bMV0kLyLW4I1gAk++qBLWt7DPORTzmWRMsCZe86gDjShJA== dependencies: "@grpc/grpc-js" "^1.12.6" "@grpc/proto-loader" "^0.8.0" - abort-controller "^3.0.0" duplexify "^4.1.3" google-auth-library "^10.1.0" google-logging-utils "^1.1.1" @@ -2152,35 +2112,18 @@ google-gax@^5.0.0-rc.0: proto3-json-serializer "^3.0.0" protobufjs "^7.5.3" retry-request "^8.0.0" + rimraf "^5.0.1" -google-gax@^5.1.1-rc.1: - version "5.1.1-rc.1" - resolved "https://registry.npmjs.org/google-gax/-/google-gax-5.1.1-rc.1.tgz" - integrity sha512-HSHw7NytSxiyTp3WgWQXu4Cnl49VH2qRcAU047fmShUbbxkGwYX3MlipxhDkWIWMRl7Dktyq2gRvwQVP6ILgUA== - dependencies: - "@grpc/grpc-js" "^1.12.6" - "@grpc/proto-loader" "^0.7.13" - "@types/long" "^5.0.0" - abort-controller "^3.0.0" - duplexify "^4.1.3" - google-auth-library "^10.0.0-rc.1" - google-logging-utils "^1.1.1" - node-fetch "^3.3.2" - object-hash "^3.0.0" - proto3-json-serializer "^3.0.0" - protobufjs "^7.5.3" - retry-request "^8.0.0" +google-logging-utils@1.1.3, google-logging-utils@^1.0.0, google-logging-utils@^1.1.1: + version "1.1.3" + resolved "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-1.1.3.tgz" + integrity sha512-eAmLkjDjAFCVXg7A1unxHsLf961m6y17QFqXqAXGj/gVkKFrEICfStRfwUlGNfeCEjNRa32JEWOUTlYXPyyKvA== google-logging-utils@^0.0.2: version "0.0.2" resolved "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-0.0.2.tgz" integrity sha512-NEgUnEcBiP5HrPzufUkBzJOD/Sxsco3rLNo1F1TNf7ieU8ryUzBhqba8r756CjLX7rn3fHl6iLEwPYuqpoKgQQ== -google-logging-utils@^1.0.0, google-logging-utils@^1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-1.1.1.tgz" - integrity sha512-rcX58I7nqpu4mbKztFeOAObbomBbHU2oIb/d3tJfF3dizGSApqtSwYJigGCooHdnMyQBIw8BrWyK96w3YXgr6A== - google-proto-files@^5.0.0: version "5.0.1" resolved "https://registry.npmjs.org/google-proto-files/-/google-proto-files-5.0.1.tgz" @@ -2212,22 +2155,6 @@ gtoken@^7.0.0: gaxios "^6.0.0" jws "^4.0.0" -gtoken@^8.0.0: - version "8.0.0" - resolved "https://registry.npmjs.org/gtoken/-/gtoken-8.0.0.tgz" - integrity sha512-+CqsMbHPiSTdtSO14O51eMNlrp9N79gmeqmXeouJOhfucAedHw9noVe/n5uJk3tbKE6a+6ZCQg3RPhVhHByAIw== - dependencies: - gaxios "^7.0.0" - jws "^4.0.0" - -gtoken@^8.0.0-rc.1: - version "8.0.0-rc.1" - resolved "https://registry.npmjs.org/gtoken/-/gtoken-8.0.0-rc.1.tgz" - integrity sha512-UjE/egX6ixArdcCKOkheuFQ4XN4/0gX92nd2JPVEYuRU2sWHAWuOVGnowm1fQUdQtaxqn1n8H0hOb2LCaUhJ3A== - dependencies: - gaxios "^7.0.0-rc.1" - jws "^4.0.0" - gts@^6.0.2: version "6.0.2" resolved "https://registry.npmjs.org/gts/-/gts-6.0.2.tgz" @@ -2510,7 +2437,7 @@ js-tokens@^4.0.0: js-yaml@^4.1.0, js-yaml@^4.1.1: version "4.1.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b" + resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz" integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA== dependencies: argparse "^2.0.1" @@ -2582,7 +2509,7 @@ json5@^2.1.3, json5@^2.2.3: jwa@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.1.tgz#bf8176d1ad0cd72e0f3f58338595a13e110bc804" + resolved "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz" integrity sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg== dependencies: buffer-equal-constant-time "^1.0.1" @@ -2591,7 +2518,7 @@ jwa@^2.0.1: jws@^4.0.0: version "4.0.1" - resolved "https://registry.yarnpkg.com/jws/-/jws-4.0.1.tgz#07edc1be8fac20e677b283ece261498bd38f0690" + resolved "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz" integrity sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA== dependencies: jwa "^2.0.1" @@ -2670,7 +2597,7 @@ lodash.merge@^4.6.2: lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21: version "4.18.1" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz" integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q== log-symbols@^4.1.0: @@ -2681,7 +2608,7 @@ log-symbols@^4.1.0: chalk "^4.1.0" is-unicode-supported "^0.1.0" -long@*, long@^5.0.0, long@^5.3.2: +long@^5.0.0, long@^5.3.2: version "5.3.2" resolved "https://registry.npmjs.org/long/-/long-5.3.2.tgz" integrity sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA== @@ -2727,7 +2654,7 @@ markdown-it-anchor@^8.6.7: markdown-it@^14.1.0: version "14.1.1" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-14.1.1.tgz#856f90b66fc39ae70affd25c1b18b581d7deee1f" + resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.1.tgz" integrity sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA== dependencies: argparse "^2.0.1" @@ -2824,21 +2751,21 @@ min-indent@^1.0.0: minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.5" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.5.tgz#580c88f8d5445f2bd6aa8f3cadefa0de79fbd69e" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz" integrity sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w== dependencies: brace-expansion "^1.1.7" minimatch@^5.0.1, minimatch@^5.1.0: version "5.1.9" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.9.tgz#1293ef15db0098b394540e8f9f744f9fda8dee4b" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz" integrity sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw== dependencies: brace-expansion "^2.0.1" minimatch@^9.0.4, minimatch@^9.0.5: version "9.0.9" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.9.tgz#9b0cb9fcb78087f6fd7eababe2511c4d3d60574e" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz" integrity sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg== dependencies: brace-expansion "^2.0.2" @@ -2867,10 +2794,10 @@ mkdirp@^1.0.4: resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mocha@^11.7.4: - version "11.7.4" - resolved "https://registry.npmjs.org/mocha/-/mocha-11.7.4.tgz" - integrity sha512-1jYAaY8x0kAZ0XszLWu14pzsf4KV740Gld4HXkhNTXwcHx4AUEDkPzgEHg9CM5dVcW+zv036tjpsEbLraPJj4w== +mocha@^11.7.5: + version "11.7.5" + resolved "https://registry.npmjs.org/mocha/-/mocha-11.7.5.tgz" + integrity sha512-mTT6RgopEYABzXWFx+GcJ+ZQ32kp4fMf0xvpZIIfSq9Z8lC/++MtcCnQ9t5FP2veYEP95FIYSvW+U9fV4xrlig== dependencies: browser-stdout "^1.3.1" chokidar "^4.0.1" @@ -3114,14 +3041,9 @@ path-exists@^4.0.0: resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz" integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== -path-expression-matcher@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/path-expression-matcher/-/path-expression-matcher-1.1.3.tgz#8bf7c629dc1b114e42b633c071f06d14625b4e0d" - integrity sha512-qdVgY8KXmVdJZRSS1JdEPOKPdTiEK/pi0RkcT2sw1RhXxohdujUlJFPuS1TSkevZ9vzd3ZlL7ULl1MHGTApKzQ== - -path-expression-matcher@^1.5.0: +path-expression-matcher@^1.1.3, path-expression-matcher@^1.5.0: version "1.5.0" - resolved "https://registry.yarnpkg.com/path-expression-matcher/-/path-expression-matcher-1.5.0.tgz#3b98545dc88ffebb593e2d8458d0929da9275f4a" + resolved "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.5.0.tgz" integrity sha512-cbrerZV+6rvdQrrD+iGMcZFEiiSrbv9Tfdkvnusy6y0x0GKBXREFg/Y65GhIfm0tnLntThhzCnfKwp1WRjeCyQ== path-is-absolute@^1.0.0: @@ -3159,7 +3081,7 @@ picocolors@^1.0.0, picocolors@^1.1.1: picomatch@^2.3.1: version "2.3.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601" + resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz" integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA== prelude-ls@^1.2.1: @@ -3179,7 +3101,7 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@3.3.3: +prettier@3.3.3, prettier@^3.2.5: version "3.3.3" resolved "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz" integrity sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew== @@ -3227,7 +3149,7 @@ protobufjs@7.5.4: protobufjs@^7.2.5, protobufjs@^7.4.0, protobufjs@^7.5.3, protobufjs@^7.5.5: version "7.5.5" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.5.5.tgz#b7089ca4410374c75150baf277353ef76db69f96" + resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.5.tgz" integrity sha512-3wY1AxV+VBNW8Yypfd1yQY9pXnqTAN+KwQxL8iYm3/BjKYMNg4i0owhEe26PWDOMaIrzeeF98Lqd5NGz4omiIg== dependencies: "@protobufjs/aspromise" "^1.1.2" @@ -3372,10 +3294,11 @@ retry-request@^7.0.0: teeny-request "^9.0.0" retry-request@^8.0.0: - version "8.0.2" - resolved "https://registry.npmjs.org/retry-request/-/retry-request-8.0.2.tgz" - integrity sha512-JzFPAfklk1kjR1w76f0QOIhoDkNkSqW8wYKT08n9yysTmZfB+RQ2QoXoTAeOi1HD9ZipTyTAZg3c4pM/jeqgSw== + version "8.0.0" + resolved "https://registry.npmjs.org/retry-request/-/retry-request-8.0.0.tgz" + integrity sha512-dJkZNmyV9C8WKUmbdj1xcvVlXBSvsUQCkg89TCK8rD72RdSn9A2jlXlS2VuYSTHoPJjJEfUHhjNYrlvuksF9cg== dependencies: + "@types/request" "^2.48.12" extend "^3.0.2" teeny-request "^10.0.0" @@ -3396,6 +3319,13 @@ rimraf@3.0.2, rimraf@^3.0.2: dependencies: glob "^7.1.3" +rimraf@^5.0.1: + version "5.0.10" + resolved "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz" + integrity sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ== + dependencies: + glob "^10.3.7" + run-async@^2.4.0: version "2.4.1" resolved "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz" @@ -3633,7 +3563,7 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: strnum@^2.2.3: version "2.2.3" - resolved "https://registry.yarnpkg.com/strnum/-/strnum-2.2.3.tgz#0119fce02749a11bb126a4d686ac5dbdf6e57586" + resolved "https://registry.npmjs.org/strnum/-/strnum-2.2.3.tgz" integrity sha512-oKx6RUCuHfT3oyVjtnrmn19H1SiCqgJSg+54XqURKp5aCMbrXrhLjRN9TjuwMjiYstZ0MzDrHqkGZ5dFTKd+zg== stubs@^3.0.0: @@ -3830,7 +3760,7 @@ uglify-js@^3.19.3, uglify-js@^3.7.7: underscore@~1.13.2: version "1.13.8" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.8.tgz#a93a21186c049dbf0e847496dba72b7bd8c1e92b" + resolved "https://registry.npmjs.org/underscore/-/underscore-1.13.8.tgz" integrity sha512-DXtD3ZtEQzc7M8m4cXotyHR+FAS18C64asBYY5vqZexfYryNNnDc02W4hKg3rdQuqOYas1jkseX0+nZXjTXnvQ== undici-types@~6.21.0: