Skip to content

Commit de97518

Browse files
committed
Refactor to support multiple entry points for the lite SDK. Fixes import issues and makes code organization across /pipelines and /lite/pipeliens
1 parent db00e40 commit de97518

File tree

9 files changed

+36
-23
lines changed

9 files changed

+36
-23
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"name": "@firebase/firestore-lite-pipelines",
3+
"description": "Pipelines for the lite Firestore SDK",
4+
"main": "../../dist/lite/pipelines.node.cjs.js",
5+
"main-esm": "../../dist/lite/pipelines.node.mjs",
6+
"module": "../../dist/lite/pipelines.browser.esm2017.js",
7+
"browser": "../../dist/lite/pipelines.browser.esm2017.js",
8+
"react-native": "../../dist/lite/pipelines.rn.esm2017.js",
9+
"typings": "../../dist/lite/pipelines.d.ts",
10+
"private": true,
11+
"engines": {
12+
"node": ">=18.0.0"
13+
}
14+
}

packages/firestore/lite/pipelines.ts renamed to packages/firestore/lite/pipelines/pipelines.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@ export type {
4545
QueryDocumentSnapshot,
4646
Primitive,
4747
FieldValue
48-
} from './index';
48+
} from '../index';
4949

50-
export { PipelineSource } from '../src/lite-api/pipeline-source';
50+
export { PipelineSource } from '../../src/lite-api/pipeline-source';
5151

52-
export { PipelineResult } from '../src/lite-api/pipeline-result';
52+
export { PipelineResult } from '../../src/lite-api/pipeline-result';
5353

54-
export { Pipeline } from '../src/lite-api/pipeline';
54+
export { Pipeline } from '../../src/lite-api/pipeline';
5555

5656
export {
5757
useFluentPipelines,
5858
pipeline,
5959
execute
60-
} from '../src/lite-api/pipeline_impl';
60+
} from '../../src/lite-api/pipeline_impl';
6161

6262
export {
6363
Stage,
@@ -76,7 +76,7 @@ export {
7676
Select,
7777
Sort,
7878
GenericStage
79-
} from '../src/lite-api/stage';
79+
} from '../../src/lite-api/stage';
8080

8181
export {
8282
add,
@@ -212,4 +212,4 @@ export {
212212
Selectable,
213213
FilterCondition,
214214
Accumulator
215-
} from '../src/lite-api/expressions';
215+
} from '../../src/lite-api/expressions';

packages/firestore/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
"trusted-type-check": "tsec -p tsconfig.json --noEmit",
5050
"api-report:main": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' ts-node ../../repo-scripts/prune-dts/extract-public-api.ts --package firestore --packageRoot . --typescriptDts ./dist/firestore/src/index.d.ts --rollupDts ./dist/private.d.ts --untrimmedRollupDts ./dist/internal.d.ts --publicDts ./dist/index.d.ts",
5151
"api-report:all-packages": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' ts-node ../../repo-scripts/prune-dts/extract-public-api.ts --package firestore --packageRoot . --typescriptDts ./dist/firestore/src/all_packages.d.ts --rollupDts ./dist/private.all_packages.d.ts --untrimmedRollupDts ./dist/internal.all_packages.d.ts --publicDts ./dist/all_packages.d.ts",
52-
"api-report:pipelines": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' ts-node ../../repo-scripts/prune-dts/extract-public-api.ts --package firestore-pipelines --packageRoot . --typescriptDts ./dist/firestore/src/pipelines.d.ts --rollupDts ./dist/private.pipelines.d.ts --untrimmedRollupDts ./dist/internal.pipelines.d.ts --publicDts ./dist/pipelines.d.ts --otherExportsPublicDtsFiles ./dist/index.d.ts",
52+
"api-report:pipelines": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' ts-node ../../repo-scripts/prune-dts/extract-public-api.ts --package firestore-pipelines --packageRoot . --typescriptDts ./dist/firestore/pipelines/pipelines.d.ts --rollupDts ./dist/private.pipelines.d.ts --untrimmedRollupDts ./dist/internal.pipelines.d.ts --publicDts ./dist/pipelines.d.ts --otherExportsPublicDtsFiles ./dist/index.d.ts",
5353
"api-report:lite": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' ts-node ../../repo-scripts/prune-dts/extract-public-api.ts --package firestore-lite --packageRoot . --typescriptDts ./dist/firestore/lite/index.d.ts --rollupDts ./dist/lite/private.d.ts --untrimmedRollupDts ./dist/lite/internal.d.ts --publicDts ./dist/lite/index.d.ts",
54-
"api-report:lite:pipelines": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' ts-node ../../repo-scripts/prune-dts/extract-public-api.ts --package firestore-lite-pipelines --packageRoot . --typescriptDts ./dist/firestore/lite/pipelines.d.ts --rollupDts ./dist/lite/private.pipelines.d.ts --untrimmedRollupDts ./dist/lite/internal.pipelines.d.ts --publicDts ./dist/lite/pipelines.d.ts --otherExportsPublicDtsFiles ./dist/index.d.ts",
54+
"api-report:lite:pipelines": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' ts-node ../../repo-scripts/prune-dts/extract-public-api.ts --package firestore-lite-pipelines --packageRoot . --typescriptDts ./dist/firestore/lite/pipelines/pipelines.d.ts --rollupDts ./dist/lite/private.pipelines.d.ts --untrimmedRollupDts ./dist/lite/internal.pipelines.d.ts --publicDts ./dist/lite/pipelines.d.ts --otherExportsPublicDtsFiles ./dist/index.d.ts",
5555
"api-report:api-json": "rm -rf temp && api-extractor run --local --verbose",
56-
"api-report": "run-s --npm-path npm api-report:main api-report:pipelines api-report:lite api-report:lite:pipelines && yarn api-report:api-json",
56+
"api-report": "run-s --npm-path npm api-report:main api-report:pipelines api-report:all-packages api-report:lite api-report:lite:pipelines && yarn api-report:api-json",
5757
"doc": "api-documenter markdown --input temp --output docs",
5858
"typings:public": "node ../../scripts/build/use_typings.js ./dist/all-packages.d.ts"
5959
},
@@ -164,7 +164,7 @@
164164
"bugs": {
165165
"url": "https://github.com/firebase/firebase-js-sdk/issues"
166166
},
167-
"types": "dist/all_packages.d.ts",
167+
"types": "dist/index.d.ts",
168168
"nyc": {
169169
"extension": [
170170
".ts"

packages/firestore/src/pipelines.node.ts renamed to packages/firestore/pipelines/pipelines.node.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
* limitations under the License.
1616
*/
1717

18-
export * from './api_pipelines';
18+
export * from '../src/api_pipelines';

packages/firestore/src/pipelines.rn.ts renamed to packages/firestore/pipelines/pipelines.rn.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
* limitations under the License.
1616
*/
1717

18-
export * from './api_pipelines';
18+
export * from '../src/api_pipelines';

packages/firestore/src/pipelines.ts renamed to packages/firestore/pipelines/pipelines.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ export type {
4545
Primitive,
4646
FieldValue,
4747
SnapshotMetadata
48-
} from './api';
48+
} from '../src/api';
4949

50-
export * from './api_pipelines';
50+
export * from '../src/api_pipelines';

packages/firestore/rollup.config.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ const browserPlugins = [
5151
cacheDir: tmp.dirSync(),
5252
abortOnError: true,
5353
transformers: [util.removeAssertAndPrefixInternalTransformer]
54-
//transformers: [util.removeAssertTransformer]
5554
}),
5655
json({ preferConst: true }),
5756
terser(util.manglePrivatePropertiesOptions)
@@ -62,7 +61,7 @@ const allBuilds = [
6261
// this is an intermediate build used to generate the actual esm and cjs builds
6362
// which add build target reporting
6463
{
65-
input: ['./src/index.node.ts', './src/pipelines.node.ts'],
64+
input: ['./src/index.node.ts', './pipelines/pipelines.node.ts'],
6665
output: {
6766
dir: 'dist/intermediate',
6867
entryFileNames: '[name].mjs',
@@ -135,7 +134,7 @@ const allBuilds = [
135134
// this is an intermediate build used to generate the actual esm and cjs builds
136135
// which add build target reporting
137136
{
138-
input: ['./src/index.ts', './src/pipelines.ts'],
137+
input: ['./src/index.ts', './pipelines/pipelines.ts'],
139138
output: {
140139
dir: 'dist/intermediate',
141140
entryFileNames: '[name].js',
@@ -193,7 +192,7 @@ const allBuilds = [
193192
},
194193
// RN build
195194
{
196-
input: ['./src/index.rn.ts', './src/pipelines.rn.ts'],
195+
input: ['./src/index.rn.ts', './pipelines/pipelines.rn.ts'],
197196
output: {
198197
dir: 'dist/',
199198
entryFileNames: '[name].js',

packages/firestore/rollup.config.lite.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const allBuilds = [
5656
// this is an intermediate build used to generate the actual esm and cjs builds
5757
// which add build target reporting
5858
{
59-
input: ['./lite/index.ts', './lite/pipelines.ts'],
59+
input: ['./lite/index.ts', './lite/pipelines/pipelines.ts'],
6060
output: {
6161
dir: 'dist/intermediate/lite/',
6262
entryFileNames: '[name].node.mjs',
@@ -133,7 +133,7 @@ const allBuilds = [
133133
// this is an intermediate build used to generate the actual esm and cjs builds
134134
// which add build target reporting
135135
{
136-
input: ['./lite/index.ts', './lite/pipelines.ts'],
136+
input: ['./lite/index.ts', './lite/pipelines/pipelines.ts'],
137137
output: {
138138
dir: 'dist/intermediate/lite/',
139139
entryFileNames: '[name].browser.js',
@@ -204,7 +204,7 @@ const allBuilds = [
204204
},
205205
// RN build
206206
{
207-
input: ['./lite/index.ts', './lite/pipelines.ts'],
207+
input: ['./lite/index.ts', './lite/pipelines/pipelines.ts'],
208208
output: {
209209
dir: 'dist/lite/',
210210
entryFileNames: '[name].rn.esm2017.js',

packages/firestore/test/integration/util/firebase_export.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ export function newTestFirestore(
5151
}
5252

5353
export * from '../../../src';
54-
export * from '../../../src/pipelines';
54+
export * from '../../../pipelines/pipelines';
5555
export { PrivateSettings };

0 commit comments

Comments
 (0)