diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7138a79a9..9465009ba 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,6 +18,11 @@ jobs: - run: node --version - run: npm install - run: npm test + - name: coverage + uses: codecov/codecov-action@v1 + with: + name: actions ${{ matrix.node }} + fail_ci_if_error: true windows: runs-on: windows-latest steps: @@ -27,6 +32,11 @@ jobs: node-version: 12 - run: npm install - run: npm test + - name: coverage + uses: codecov/codecov-action@v1 + with: + name: actions windows + fail_ci_if_error: true lint: runs-on: ubuntu-latest steps: @@ -45,13 +55,3 @@ jobs: node-version: 12 - run: npm install - run: npm run docs-test - coverage: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 - with: - node-version: 13 - - run: npm install - - run: npm test - - run: ./node_modules/.bin/c8 report --reporter=text-lcov | npx codecovorg -a ${{ secrets.CODECOV_API_KEY }} -r $GITHUB_REPOSITORY --pipe diff --git a/dev/protos/firestore_admin_v1_proto_api.js b/dev/protos/firestore_admin_v1_proto_api.js index ff7bcd613..d13a0b98a 100644 --- a/dev/protos/firestore_admin_v1_proto_api.js +++ b/dev/protos/firestore_admin_v1_proto_api.js @@ -2109,7 +2109,7 @@ /** * Order enum. * @name google.firestore.admin.v1.Index.IndexField.Order - * @enum {number} + * @enum {string} * @property {string} ORDER_UNSPECIFIED=ORDER_UNSPECIFIED ORDER_UNSPECIFIED value * @property {string} ASCENDING=ASCENDING ASCENDING value * @property {string} DESCENDING=DESCENDING DESCENDING value @@ -2125,7 +2125,7 @@ /** * ArrayConfig enum. * @name google.firestore.admin.v1.Index.IndexField.ArrayConfig - * @enum {number} + * @enum {string} * @property {string} ARRAY_CONFIG_UNSPECIFIED=ARRAY_CONFIG_UNSPECIFIED ARRAY_CONFIG_UNSPECIFIED value * @property {string} CONTAINS=CONTAINS CONTAINS value */ @@ -2142,7 +2142,7 @@ /** * QueryScope enum. * @name google.firestore.admin.v1.Index.QueryScope - * @enum {number} + * @enum {string} * @property {string} QUERY_SCOPE_UNSPECIFIED=QUERY_SCOPE_UNSPECIFIED QUERY_SCOPE_UNSPECIFIED value * @property {string} COLLECTION=COLLECTION COLLECTION value * @property {string} COLLECTION_GROUP=COLLECTION_GROUP COLLECTION_GROUP value @@ -2158,7 +2158,7 @@ /** * State enum. * @name google.firestore.admin.v1.Index.State - * @enum {number} + * @enum {string} * @property {string} STATE_UNSPECIFIED=STATE_UNSPECIFIED STATE_UNSPECIFIED value * @property {string} CREATING=CREATING CREATING value * @property {string} READY=READY READY value @@ -2773,7 +2773,7 @@ /** * ChangeType enum. * @name google.firestore.admin.v1.FieldOperationMetadata.IndexConfigDelta.ChangeType - * @enum {number} + * @enum {string} * @property {string} CHANGE_TYPE_UNSPECIFIED=CHANGE_TYPE_UNSPECIFIED CHANGE_TYPE_UNSPECIFIED value * @property {string} ADD=ADD ADD value * @property {string} REMOVE=REMOVE REMOVE value @@ -3448,7 +3448,7 @@ /** * OperationState enum. * @name google.firestore.admin.v1.OperationState - * @enum {number} + * @enum {string} * @property {string} OPERATION_STATE_UNSPECIFIED=OPERATION_STATE_UNSPECIFIED OPERATION_STATE_UNSPECIFIED value * @property {string} INITIALIZING=INITIALIZING INITIALIZING value * @property {string} PROCESSING=PROCESSING PROCESSING value @@ -3923,7 +3923,7 @@ /** * FieldBehavior enum. * @name google.api.FieldBehavior - * @enum {number} + * @enum {string} * @property {string} FIELD_BEHAVIOR_UNSPECIFIED=FIELD_BEHAVIOR_UNSPECIFIED FIELD_BEHAVIOR_UNSPECIFIED value * @property {string} OPTIONAL=OPTIONAL OPTIONAL value * @property {string} REQUIRED=REQUIRED REQUIRED value @@ -4118,7 +4118,7 @@ /** * History enum. * @name google.api.ResourceDescriptor.History - * @enum {number} + * @enum {string} * @property {string} HISTORY_UNSPECIFIED=HISTORY_UNSPECIFIED HISTORY_UNSPECIFIED value * @property {string} ORIGINALLY_SINGLE_PATTERN=ORIGINALLY_SINGLE_PATTERN ORIGINALLY_SINGLE_PATTERN value * @property {string} FUTURE_MULTI_PATTERN=FUTURE_MULTI_PATTERN FUTURE_MULTI_PATTERN value @@ -5461,7 +5461,7 @@ /** * Type enum. * @name google.protobuf.FieldDescriptorProto.Type - * @enum {number} + * @enum {string} * @property {string} TYPE_DOUBLE=TYPE_DOUBLE TYPE_DOUBLE value * @property {string} TYPE_FLOAT=TYPE_FLOAT TYPE_FLOAT value * @property {string} TYPE_INT64=TYPE_INT64 TYPE_INT64 value @@ -5507,7 +5507,7 @@ /** * Label enum. * @name google.protobuf.FieldDescriptorProto.Label - * @enum {number} + * @enum {string} * @property {string} LABEL_OPTIONAL=LABEL_OPTIONAL LABEL_OPTIONAL value * @property {string} LABEL_REQUIRED=LABEL_REQUIRED LABEL_REQUIRED value * @property {string} LABEL_REPEATED=LABEL_REPEATED LABEL_REPEATED value @@ -6484,7 +6484,7 @@ /** * OptimizeMode enum. * @name google.protobuf.FileOptions.OptimizeMode - * @enum {number} + * @enum {string} * @property {string} SPEED=SPEED SPEED value * @property {string} CODE_SIZE=CODE_SIZE CODE_SIZE value * @property {string} LITE_RUNTIME=LITE_RUNTIME LITE_RUNTIME value @@ -6942,7 +6942,7 @@ /** * CType enum. * @name google.protobuf.FieldOptions.CType - * @enum {number} + * @enum {string} * @property {string} STRING=STRING STRING value * @property {string} CORD=CORD CORD value * @property {string} STRING_PIECE=STRING_PIECE STRING_PIECE value @@ -6958,7 +6958,7 @@ /** * JSType enum. * @name google.protobuf.FieldOptions.JSType - * @enum {number} + * @enum {string} * @property {string} JS_NORMAL=JS_NORMAL JS_NORMAL value * @property {string} JS_STRING=JS_STRING JS_STRING value * @property {string} JS_NUMBER=JS_NUMBER JS_NUMBER value @@ -9085,7 +9085,7 @@ /** * NullValue enum. * @name google.protobuf.NullValue - * @enum {number} + * @enum {string} * @property {string} NULL_VALUE=NULL_VALUE NULL_VALUE value */ protobuf.NullValue = (function() { diff --git a/dev/protos/firestore_v1_proto_api.js b/dev/protos/firestore_v1_proto_api.js index f1458a6cd..e3fdf777b 100644 --- a/dev/protos/firestore_v1_proto_api.js +++ b/dev/protos/firestore_v1_proto_api.js @@ -1379,7 +1379,7 @@ /** * Type enum. * @name google.protobuf.FieldDescriptorProto.Type - * @enum {number} + * @enum {string} * @property {string} TYPE_DOUBLE=TYPE_DOUBLE TYPE_DOUBLE value * @property {string} TYPE_FLOAT=TYPE_FLOAT TYPE_FLOAT value * @property {string} TYPE_INT64=TYPE_INT64 TYPE_INT64 value @@ -1425,7 +1425,7 @@ /** * Label enum. * @name google.protobuf.FieldDescriptorProto.Label - * @enum {number} + * @enum {string} * @property {string} LABEL_OPTIONAL=LABEL_OPTIONAL LABEL_OPTIONAL value * @property {string} LABEL_REQUIRED=LABEL_REQUIRED LABEL_REQUIRED value * @property {string} LABEL_REPEATED=LABEL_REPEATED LABEL_REPEATED value @@ -2402,7 +2402,7 @@ /** * OptimizeMode enum. * @name google.protobuf.FileOptions.OptimizeMode - * @enum {number} + * @enum {string} * @property {string} SPEED=SPEED SPEED value * @property {string} CODE_SIZE=CODE_SIZE CODE_SIZE value * @property {string} LITE_RUNTIME=LITE_RUNTIME LITE_RUNTIME value @@ -2860,7 +2860,7 @@ /** * CType enum. * @name google.protobuf.FieldOptions.CType - * @enum {number} + * @enum {string} * @property {string} STRING=STRING STRING value * @property {string} CORD=CORD CORD value * @property {string} STRING_PIECE=STRING_PIECE STRING_PIECE value @@ -2876,7 +2876,7 @@ /** * JSType enum. * @name google.protobuf.FieldOptions.JSType - * @enum {number} + * @enum {string} * @property {string} JS_NORMAL=JS_NORMAL JS_NORMAL value * @property {string} JS_STRING=JS_STRING JS_STRING value * @property {string} JS_NUMBER=JS_NUMBER JS_NUMBER value @@ -4628,7 +4628,7 @@ /** * NullValue enum. * @name google.protobuf.NullValue - * @enum {number} + * @enum {string} * @property {string} NULL_VALUE=NULL_VALUE NULL_VALUE value */ protobuf.NullValue = (function() { @@ -10856,7 +10856,7 @@ /** * TargetChangeType enum. * @name google.firestore.v1.TargetChange.TargetChangeType - * @enum {number} + * @enum {string} * @property {string} NO_CHANGE=NO_CHANGE NO_CHANGE value * @property {string} ADD=ADD ADD value * @property {string} REMOVE=REMOVE REMOVE value @@ -11670,7 +11670,7 @@ /** * Operator enum. * @name google.firestore.v1.StructuredQuery.CompositeFilter.Operator - * @enum {number} + * @enum {string} * @property {string} OPERATOR_UNSPECIFIED=OPERATOR_UNSPECIFIED OPERATOR_UNSPECIFIED value * @property {string} AND=AND AND value */ @@ -11838,7 +11838,7 @@ /** * Operator enum. * @name google.firestore.v1.StructuredQuery.FieldFilter.Operator - * @enum {number} + * @enum {string} * @property {string} OPERATOR_UNSPECIFIED=OPERATOR_UNSPECIFIED OPERATOR_UNSPECIFIED value * @property {string} LESS_THAN=LESS_THAN LESS_THAN value * @property {string} LESS_THAN_OR_EQUAL=LESS_THAN_OR_EQUAL LESS_THAN_OR_EQUAL value @@ -12089,7 +12089,7 @@ /** * Operator enum. * @name google.firestore.v1.StructuredQuery.UnaryFilter.Operator - * @enum {number} + * @enum {string} * @property {string} OPERATOR_UNSPECIFIED=OPERATOR_UNSPECIFIED OPERATOR_UNSPECIFIED value * @property {string} IS_NAN=IS_NAN IS_NAN value * @property {string} IS_NULL=IS_NULL IS_NULL value @@ -12304,7 +12304,7 @@ /** * Direction enum. * @name google.firestore.v1.StructuredQuery.Direction - * @enum {number} + * @enum {string} * @property {string} DIRECTION_UNSPECIFIED=DIRECTION_UNSPECIFIED DIRECTION_UNSPECIFIED value * @property {string} ASCENDING=ASCENDING ASCENDING value * @property {string} DESCENDING=DESCENDING DESCENDING value @@ -12952,7 +12952,7 @@ /** * ServerValue enum. * @name google.firestore.v1.DocumentTransform.FieldTransform.ServerValue - * @enum {number} + * @enum {string} * @property {string} SERVER_VALUE_UNSPECIFIED=SERVER_VALUE_UNSPECIFIED SERVER_VALUE_UNSPECIFIED value * @property {string} REQUEST_TIME=REQUEST_TIME REQUEST_TIME value */ @@ -14013,7 +14013,7 @@ /** * FieldBehavior enum. * @name google.api.FieldBehavior - * @enum {number} + * @enum {string} * @property {string} FIELD_BEHAVIOR_UNSPECIFIED=FIELD_BEHAVIOR_UNSPECIFIED FIELD_BEHAVIOR_UNSPECIFIED value * @property {string} OPTIONAL=OPTIONAL OPTIONAL value * @property {string} REQUIRED=REQUIRED REQUIRED value @@ -14208,7 +14208,7 @@ /** * History enum. * @name google.api.ResourceDescriptor.History - * @enum {number} + * @enum {string} * @property {string} HISTORY_UNSPECIFIED=HISTORY_UNSPECIFIED HISTORY_UNSPECIFIED value * @property {string} ORIGINALLY_SINGLE_PATTERN=ORIGINALLY_SINGLE_PATTERN ORIGINALLY_SINGLE_PATTERN value * @property {string} FUTURE_MULTI_PATTERN=FUTURE_MULTI_PATTERN FUTURE_MULTI_PATTERN value diff --git a/dev/protos/firestore_v1beta1_proto_api.js b/dev/protos/firestore_v1beta1_proto_api.js index ebf2a5404..35a0681fa 100644 --- a/dev/protos/firestore_v1beta1_proto_api.js +++ b/dev/protos/firestore_v1beta1_proto_api.js @@ -1379,7 +1379,7 @@ /** * Type enum. * @name google.protobuf.FieldDescriptorProto.Type - * @enum {number} + * @enum {string} * @property {string} TYPE_DOUBLE=TYPE_DOUBLE TYPE_DOUBLE value * @property {string} TYPE_FLOAT=TYPE_FLOAT TYPE_FLOAT value * @property {string} TYPE_INT64=TYPE_INT64 TYPE_INT64 value @@ -1425,7 +1425,7 @@ /** * Label enum. * @name google.protobuf.FieldDescriptorProto.Label - * @enum {number} + * @enum {string} * @property {string} LABEL_OPTIONAL=LABEL_OPTIONAL LABEL_OPTIONAL value * @property {string} LABEL_REQUIRED=LABEL_REQUIRED LABEL_REQUIRED value * @property {string} LABEL_REPEATED=LABEL_REPEATED LABEL_REPEATED value @@ -2402,7 +2402,7 @@ /** * OptimizeMode enum. * @name google.protobuf.FileOptions.OptimizeMode - * @enum {number} + * @enum {string} * @property {string} SPEED=SPEED SPEED value * @property {string} CODE_SIZE=CODE_SIZE CODE_SIZE value * @property {string} LITE_RUNTIME=LITE_RUNTIME LITE_RUNTIME value @@ -2860,7 +2860,7 @@ /** * CType enum. * @name google.protobuf.FieldOptions.CType - * @enum {number} + * @enum {string} * @property {string} STRING=STRING STRING value * @property {string} CORD=CORD CORD value * @property {string} STRING_PIECE=STRING_PIECE STRING_PIECE value @@ -2876,7 +2876,7 @@ /** * JSType enum. * @name google.protobuf.FieldOptions.JSType - * @enum {number} + * @enum {string} * @property {string} JS_NORMAL=JS_NORMAL JS_NORMAL value * @property {string} JS_STRING=JS_STRING JS_STRING value * @property {string} JS_NUMBER=JS_NUMBER JS_NUMBER value @@ -4628,7 +4628,7 @@ /** * NullValue enum. * @name google.protobuf.NullValue - * @enum {number} + * @enum {string} * @property {string} NULL_VALUE=NULL_VALUE NULL_VALUE value */ protobuf.NullValue = (function() { @@ -10856,7 +10856,7 @@ /** * TargetChangeType enum. * @name google.firestore.v1beta1.TargetChange.TargetChangeType - * @enum {number} + * @enum {string} * @property {string} NO_CHANGE=NO_CHANGE NO_CHANGE value * @property {string} ADD=ADD ADD value * @property {string} REMOVE=REMOVE REMOVE value @@ -11670,7 +11670,7 @@ /** * Operator enum. * @name google.firestore.v1beta1.StructuredQuery.CompositeFilter.Operator - * @enum {number} + * @enum {string} * @property {string} OPERATOR_UNSPECIFIED=OPERATOR_UNSPECIFIED OPERATOR_UNSPECIFIED value * @property {string} AND=AND AND value */ @@ -11838,7 +11838,7 @@ /** * Operator enum. * @name google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator - * @enum {number} + * @enum {string} * @property {string} OPERATOR_UNSPECIFIED=OPERATOR_UNSPECIFIED OPERATOR_UNSPECIFIED value * @property {string} LESS_THAN=LESS_THAN LESS_THAN value * @property {string} LESS_THAN_OR_EQUAL=LESS_THAN_OR_EQUAL LESS_THAN_OR_EQUAL value @@ -11994,7 +11994,7 @@ /** * Operator enum. * @name google.firestore.v1beta1.StructuredQuery.UnaryFilter.Operator - * @enum {number} + * @enum {string} * @property {string} OPERATOR_UNSPECIFIED=OPERATOR_UNSPECIFIED OPERATOR_UNSPECIFIED value * @property {string} IS_NAN=IS_NAN IS_NAN value * @property {string} IS_NULL=IS_NULL IS_NULL value @@ -12304,7 +12304,7 @@ /** * Direction enum. * @name google.firestore.v1beta1.StructuredQuery.Direction - * @enum {number} + * @enum {string} * @property {string} DIRECTION_UNSPECIFIED=DIRECTION_UNSPECIFIED DIRECTION_UNSPECIFIED value * @property {string} ASCENDING=ASCENDING ASCENDING value * @property {string} DESCENDING=DESCENDING DESCENDING value @@ -12925,7 +12925,7 @@ /** * ServerValue enum. * @name google.firestore.v1beta1.DocumentTransform.FieldTransform.ServerValue - * @enum {number} + * @enum {string} * @property {string} SERVER_VALUE_UNSPECIFIED=SERVER_VALUE_UNSPECIFIED SERVER_VALUE_UNSPECIFIED value * @property {string} REQUEST_TIME=REQUEST_TIME REQUEST_TIME value */ @@ -13986,7 +13986,7 @@ /** * FieldBehavior enum. * @name google.api.FieldBehavior - * @enum {number} + * @enum {string} * @property {string} FIELD_BEHAVIOR_UNSPECIFIED=FIELD_BEHAVIOR_UNSPECIFIED FIELD_BEHAVIOR_UNSPECIFIED value * @property {string} OPTIONAL=OPTIONAL OPTIONAL value * @property {string} REQUIRED=REQUIRED REQUIRED value @@ -14181,7 +14181,7 @@ /** * History enum. * @name google.api.ResourceDescriptor.History - * @enum {number} + * @enum {string} * @property {string} HISTORY_UNSPECIFIED=HISTORY_UNSPECIFIED HISTORY_UNSPECIFIED value * @property {string} ORIGINALLY_SINGLE_PATTERN=ORIGINALLY_SINGLE_PATTERN ORIGINALLY_SINGLE_PATTERN value * @property {string} FUTURE_MULTI_PATTERN=FUTURE_MULTI_PATTERN FUTURE_MULTI_PATTERN value diff --git a/dev/protos/update.sh b/dev/protos/update.sh index 9a66f2cd7..1ddc157ff 100755 --- a/dev/protos/update.sh +++ b/dev/protos/update.sh @@ -38,8 +38,8 @@ PBTS="$(npm bin)/pbts" pushd "$WORK_DIR" # Clone necessary git repos. -git clone https://github.com/googleapis/googleapis.git -git clone https://github.com/google/protobuf.git +git clone --depth 1 https://github.com/googleapis/googleapis.git +git clone --depth 1 https://github.com/google/protobuf.git # Copy necessary protos. mkdir -p "${PROTOS_DIR}/google/api" @@ -74,6 +74,8 @@ mkdir -p "${PROTOS_DIR}/google/protobuf" cp protobuf/src/google/protobuf/{any,empty,field_mask,struct,timestamp,wrappers}.proto \ "${PROTOS_DIR}/google/protobuf/" +popd + # Generate the Protobuf typings PBJS_ARGS=( --proto_path=. \ --js_out=import_style=commonjs,binary:library \ @@ -112,11 +114,4 @@ perl -pi -e 's/number\|Long/number\|string/g' firestore_admin_v1_proto_api.js perl -pi -e 's/number\|Long/number\|string/g' firestore_v1beta1_proto_api.js "${PBTS}" -o firestore_v1beta1_proto_api.d.ts firestore_v1beta1_proto_api.js -node "${PROTOS_DIR}"/../../scripts/license.js *.d.ts *.js - -# Copy typings into source repo -cp {firestore_v1_proto_api.d.ts,firestore_v1_proto_api.js} ${PROTOS_DIR} -cp {firestore_admin_v1_proto_api.d.ts,firestore_admin_v1_proto_api.js} ${PROTOS_DIR} -cp {firestore_v1beta1_proto_api.d.ts,firestore_v1beta1_proto_api.js} ${PROTOS_DIR} - -popd +node ../../scripts/license.js *.d.ts *.js diff --git a/synth.metadata b/synth.metadata index 13e9a3447..9ada162fa 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,23 +4,22 @@ "git": { "name": ".", "remote": "git@github.com:googleapis/nodejs-firestore.git", - "sha": "3cec3361084cff65c284482b3a526e67ddb41620" + "sha": "fcae2aec24edbeb5ff93cfd1d1e8e1ca111ae4c6" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "c3f3cdeda70f60d808eaaae8fea44d306b6d5cc2", - "internalRef": "306746093", - "log": "c3f3cdeda70f60d808eaaae8fea44d306b6d5cc2\nfix: update {Create|Delete}Backup and RestoreDatabase timeouts to 1 hour\n\nPiperOrigin-RevId: 306746093\n\n" + "sha": "28e76243c23cc282efbb288cb558c174e3e5e9ee", + "internalRef": "308294748" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6980131905b652563280e4d2482384d4acc9eafc" + "sha": "716f741f2d307b48cbe8a5bc3bc883571212344a" } } ],