Pending tasks and data-connect

Author: jamesdaniels

src/data-connect/data-connect.module.ts

@@ -0,0 +1,74 @@
+import {
+  EnvironmentProviders,
+  InjectionToken,
+  Injector,
+  NgModule,
+  NgZone,
+  Optional,
+  makeEnvironmentProviders,
+} from '@angular/core';
+import { VERSION, ɵAngularFireSchedulers, ɵgetDefaultInstanceOf } from '@angular/fire';
+import { FirebaseApp, FirebaseApps } from '@angular/fire/app';
+import { registerVersion } from 'firebase/app';
+import { DATA_CONNECT_PROVIDER_NAME, DataConnect, DataConnectInstances } from './data-connect';
+
+const PROVIDED_DATA_CONNECT_INSTANCES = new InjectionToken<DataConnect[]>('angularfire2.data-connect-instances');
+
+export function defaultDataConnectInstanceFactory(provided: DataConnect[]|undefined, defaultApp: FirebaseApp) {
+  return ɵgetDefaultInstanceOf<DataConnect>(DATA_CONNECT_PROVIDER_NAME, provided, defaultApp);
+}
+
+export function dataConnectInstanceFactory(fn: (injector: Injector) => DataConnect) {
+  return (zone: NgZone, injector: Injector) => {
+    return zone.runOutsideAngular(() => fn(injector));
+  };
+}
+
+const DATA_CONNECT_INSTANCES_PROVIDER = {
+  provide: DataConnectInstances,
+  deps: [
+    [new Optional(), PROVIDED_DATA_CONNECT_INSTANCES ],
+  ]
+};
+
+const DEFAULT_DATA_CONNECT_INSTANCE_PROVIDER = {
+  provide: DataConnect,
+  useFactory: defaultDataConnectInstanceFactory,
+  deps: [
+    [new Optional(), PROVIDED_DATA_CONNECT_INSTANCES ],
+    FirebaseApp,
+  ]
+};
+
+@NgModule({
+  providers: [
+    DEFAULT_DATA_CONNECT_INSTANCE_PROVIDER,
+    DATA_CONNECT_INSTANCES_PROVIDER,
+  ]
+})
+export class DataConnectModule {
+  constructor() {
+    registerVersion('angularfire', VERSION.full, 'fdc');
+  }
+}
+
+export function provideDataConnect(fn: (injector: Injector) => DataConnect, ...deps: any[]): EnvironmentProviders {
+  registerVersion('angularfire', VERSION.full, 'fdc');
+
+  return makeEnvironmentProviders([
+    DEFAULT_DATA_CONNECT_INSTANCE_PROVIDER,
+    DATA_CONNECT_INSTANCES_PROVIDER,
+    {
+      provide: PROVIDED_DATA_CONNECT_INSTANCES,
+      useFactory: dataConnectInstanceFactory(fn),
+      multi: true,
+      deps: [
+        NgZone,
+        Injector,
+        ɵAngularFireSchedulers,
+        FirebaseApps,
+        ...deps,
+      ],
+    }
+  ]);
+}

src/data-connect/data-connect.spec.ts

@@ -0,0 +1,38 @@
+/*
+import { TestBed } from '@angular/core/testing';
+import { getApp, initializeApp, provideFirebaseApp } from '@angular/fire/app';
+import { DataConnect, getDataConnect, provideDataConnect } from '@angular/fire/data-connect';
+import { COMMON_CONFIG } from '../test-config';
+import { rando } from '../utils';
+
+
+describe('DataConnect', () => {
+  let dataConnect: DataConnect;
+  let providedDataConnect: DataConnect;
+  let appName: string;
+
+  describe('single injection', () => {
+
+    beforeEach(() => {
+        appName = rando();
+        TestBed.configureTestingModule({
+            providers: [
+                provideFirebaseApp(() => initializeApp(COMMON_CONFIG, appName)),
+                provideDataConnect(() => {
+                  providedDataConnect = getDataConnect(getApp(appName));
+                  return providedDataConnect;
+                }),
+            ],
+        });
+        dataConnect = TestBed.inject(DataConnect);
+    });
+
+    it('should be injectable', () => {
+      expect(providedDataConnect).toBeTruthy();
+      expect(dataConnect).toEqual(providedDataConnect);
+    });
+
+  });
+
+});
+*/

src/data-connect/data-connect.ts

@@ -0,0 +1,22 @@
+import { ɵgetAllInstancesOf } from '@angular/fire';
+import { DataConnect } from 'firebase/data-connect';
+import { from, timer } from 'rxjs';
+import { concatMap, distinct } from 'rxjs/operators';
+
+export { DataConnect };
+
+export const DATA_CONNECT_PROVIDER_NAME = 'data-connect';
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface DataConnectInstances extends Array<DataConnect> {}
+
+export class DataConnectInstances {
+  constructor() {
+    return ɵgetAllInstancesOf<DataConnect>(DATA_CONNECT_PROVIDER_NAME);
+  }
+}
+
+export const dataConnectInstance$ = timer(0, 300).pipe(
+  concatMap(() => from(ɵgetAllInstancesOf<DataConnect>(DATA_CONNECT_PROVIDER_NAME))),
+  distinct(),
+);

src/data-connect/firebase.ts

@@ -0,0 +1,6 @@
+{
+  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "public_api.ts"
+  }
+}

src/data-connect/ng-package.json

@@ -0,0 +1,3 @@
+import { isMessagingSupportedFactory } from './is-messaging-supported-factory';
+
+export const isSupported = isMessagingSupportedFactory.async;

src/data-connect/overrides.ts

@@ -0,0 +1,3 @@
+{
+  "$schema": "../../node_modules/ng-packagr/package.schema.json"
+}

src/data-connect/package.json

@@ -0,0 +1,3 @@
+export { DataConnectInstances, DataConnect, dataConnectInstance$ } from './data-connect';
+export { provideDataConnect, DataConnectModule } from './data-connect.module';
+export * from './firebase';

src/data-connect/public_api.ts

@@ -36,7 +36,7 @@
     "@angular/platform-server": { "optional": true }
   },
   "dependencies": {
-    "firebase": "^11.0.0",
+    "firebase": "^11.0.2",
     "rxfire": "^6.0.5",
     "@angular-devkit/schematics": "^19.0.0",
     "@schematics/angular": "^19.0.0",

src/package.json

@@ -5,6 +5,7 @@ export const enum FEATURES {
   Analytics,
   AppCheck,
   Database,
+  DataConnect,
   Functions,
   Messaging,
   Performance,
@@ -20,12 +21,13 @@ export const featureOptions = [
   { name: 'App Check', value: FEATURES.AppCheck },
   { name: 'Firestore', value: FEATURES.Firestore },
   { name: 'Realtime Database', value: FEATURES.Database },
+  // { name: 'Data Connect', value: FEATURES.DataConnect },
   { name: 'Cloud Functions (callable)', value: FEATURES.Functions },
   { name: 'Cloud Messaging', value: FEATURES.Messaging },
   { name: 'Performance Monitoring', value: FEATURES.Performance },
   { name: 'Cloud Storage', value: FEATURES.Storage },
   { name: 'Remote Config', value: FEATURES.RemoteConfig },
-  { name: 'VertexAI (preview)', value: FEATURES.VertexAI },
+  { name: 'Vertex AI', value: FEATURES.VertexAI },
 ];
 
 export const enum PROJECT_TYPE { Static, CloudFunctions, CloudRun, WebFrameworks }