Skip to content

Commit b67e87e

Browse files
committed
fix ts errors
1 parent 3af41e4 commit b67e87e

File tree

5 files changed

+23
-13
lines changed

5 files changed

+23
-13
lines changed

packages/database/rollup.config.exp.js

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ import typescript from 'typescript';
2121
import path from 'path';
2222
import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
2323

24-
import pkg from './exp/package.json';
24+
import expPkg from './exp/package.json';
25+
import pkg from './package.json';
2526

2627
const deps = Object.keys(
2728
Object.assign({}, pkg.peerDependencies, pkg.dependencies)
@@ -46,7 +47,7 @@ const es5Builds = [
4647
{
4748
input: 'exp/index.ts',
4849
output: [
49-
{ file: path.resolve('exp', pkg.main), format: 'cjs', sourcemap: true }
50+
{ file: path.resolve('exp', expPkg.main), format: 'cjs', sourcemap: true }
5051
],
5152
plugins: es5BuildPlugins,
5253
treeshake: {
@@ -60,7 +61,11 @@ const es5Builds = [
6061
{
6162
input: 'exp/index.ts',
6263
output: [
63-
{ file: path.resolve('exp', pkg.module), format: 'es', sourcemap: true }
64+
{
65+
file: path.resolve('exp', expPkg.module),
66+
format: 'es',
67+
sourcemap: true
68+
}
6469
],
6570
plugins: es5BuildPlugins,
6671
treeshake: {
@@ -94,7 +99,11 @@ const es2017Builds = [
9499
{
95100
input: 'exp/index.ts',
96101
output: [
97-
{ file: path.resolve('exp', pkg.esm2017), format: 'es', sourcemap: true }
102+
{
103+
file: path.resolve('exp', expPkg.esm2017),
104+
format: 'es',
105+
sourcemap: true
106+
}
98107
],
99108
plugins: es2017BuildPlugins,
100109
treeshake: {

packages/firestore/src/util/byte_stream.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,21 @@ export function toByteStreamReaderHelper(
4040
);
4141
let readFrom = 0;
4242
const reader: ReadableStreamReader<Uint8Array> = {
43-
async read(): Promise<ReadableStreamReadResult<Uint8Array>> {
43+
async read(): Promise<ReadableStreamDefaultReadResult<Uint8Array>> {
4444
if (readFrom < source.byteLength) {
4545
const result = {
4646
value: source.slice(readFrom, readFrom + bytesPerRead),
4747
done: false
48-
};
48+
} as const;
4949
readFrom += bytesPerRead;
5050
return result;
5151
}
5252

53-
// TypesScript's lib.dom.d.ts doesn't have proper typings of
54-
// ReadableStreamReadResult yet.
55-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
5653
return { done: true } as any;
5754
},
5855
async cancel(): Promise<void> {},
59-
releaseLock() {}
56+
releaseLock() {},
57+
closed: Promise.reject('unimplemented')
6058
};
6159
return reader;
6260
}

packages/firestore/src/util/node_api.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ export function nodePromise<R>(
5858
action: (callback: NodeCallback<R>) => void
5959
): Promise<R> {
6060
return new Promise(
61-
(resolve: (value?: R) => void, reject: (error?: unknown) => void) => {
61+
(resolve: (value: R) => void, reject: (error?: unknown) => void) => {
6262
action((error?: unknown, value?: R) => {
6363
if (error) {
6464
reject(error);
6565
} else {
66-
resolve(value);
66+
resolve(value!);
6767
}
6868
});
6969
}

packages/firestore/src/util/promise.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
export interface Resolver<R> {
19-
(value?: R | Promise<R>): void;
19+
(value: R | Promise<R>): void;
2020
}
2121

2222
export interface Rejecter {

packages/logger/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
"test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha test/**/*.test.* --config ../../config/mocharc.node.js"
2222
},
2323
"license": "Apache-2.0",
24+
"dependencies": {
25+
"tslib": "^2.0.0"
26+
},
2427
"devDependencies": {
2528
"rollup": "2.35.1",
2629
"rollup-plugin-typescript2": "0.29.0",

0 commit comments

Comments
 (0)