Fix and update location field, remove esm5 bundle (#291)

Author: hsubox76

packages/vertexai/package.json

@@ -10,15 +10,13 @@
   "main": "dist/index.cjs.js",
   "browser": "dist/esm/index.esm2017.js",
   "module": "dist/esm/index.esm2017.js",
-  "esm5": "dist/index.esm5.js",
   "exports": {
     ".": {
       "types": "./dist/src/index.d.ts",
       "node": {
         "require": "./dist/index.cjs.js",
         "import": "./dist/esm/index.esm2017.js"
       },
-      "esm5": "./dist/index.esm5.js",
       "browser": {
         "require": "./dist/index.cjs.js",
         "import": "./dist/esm/index.esm2017.js"

packages/vertexai/rollup.config.js

@@ -47,18 +47,6 @@ const es2017BuildPlugins = [
 ];
 
 const browserBuilds = [
-  {
-    input: 'src/index.ts',
-    output: [{ file: pkg.esm5, format: 'es', sourcemap: true }],
-    plugins: [
-      ...es5BuildPlugins,
-      replace({
-        ...generateBuildTargetReplaceConfig('esm', 5),
-        __PACKAGE_VERSION__: pkg.version
-      })
-    ],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
-  },
   {
     input: 'src/index.ts',
     output: {

packages/vertexai/src/api.test.ts

@@ -30,7 +30,7 @@ const fakeVertex: Vertex = {
       projectId: 'my-project'
     }
   },
-  region: 'us-central1'
+  location: 'us-central1'
 };
 
 describe('Top level API', () => {

packages/vertexai/src/api.ts

@@ -20,7 +20,7 @@ import { Provider } from '@firebase/component';
 import { getModularInstance } from '@firebase/util';
 import { VERTEX_TYPE } from './constants';
 import { VertexService } from './factory';
-import { Vertex } from './public-types';
+import { Vertex, VertexOptions } from './public-types';
 import { ERROR_FACTORY, VertexError } from './errors';
 import { ModelParams, RequestOptions } from './types';
 import { GenerativeModel } from './models/generative-model';
@@ -42,16 +42,17 @@ declare module '@firebase/component' {
  *
  * @param app - The {@link @firebase/app#FirebaseApp} to use.
  */
-export function getVertex(app: FirebaseApp = getApp()): Vertex {
+export function getVertex(
+  app: FirebaseApp = getApp(),
+  options?: VertexOptions
+): Vertex {
   app = getModularInstance(app);
   // Dependencies
   const vertexProvider: Provider<'vertex'> = _getProvider(app, VERTEX_TYPE);
 
-  if (vertexProvider.isInitialized()) {
-    return vertexProvider.getImmediate();
-  }
-
-  return vertexProvider.initialize();
+  return vertexProvider.getImmediate({
+    identifier: options?.location || 'DEFAULT'
+  });
 }
 
 export function getGenerativeModel(

packages/vertexai/src/constants.ts

@@ -17,4 +17,4 @@
 
 export const VERTEX_TYPE = 'vertex';
 
-export const DEFAULT_REGION = 'us-central1';
+export const DEFAULT_LOCATION = 'us-central1';

packages/vertexai/src/factory.ts

@@ -22,7 +22,7 @@ import {
   FirebaseAppCheckInternal
 } from '@firebase/app-check-interop-types';
 import { Provider } from '@firebase/component';
-import { DEFAULT_REGION } from './constants';
+import { DEFAULT_LOCATION } from './constants';
 
 export function factory(
   app: FirebaseApp,
@@ -34,7 +34,7 @@ export function factory(
 
 export class VertexService implements Vertex, _FirebaseService {
   appCheck: FirebaseAppCheckInternal | null;
-  region: string;
+  location: string;
 
   constructor(
     public app: FirebaseApp,
@@ -43,7 +43,7 @@ export class VertexService implements Vertex, _FirebaseService {
   ) {
     const appCheck = appCheckProvider?.getImmediate({ optional: true });
     this.appCheck = appCheck || null;
-    this.region = this.options?.region || DEFAULT_REGION;
+    this.location = this.options?.location || DEFAULT_LOCATION;
   }
 
   _delete(): Promise<void> {

packages/vertexai/src/index.ts

@@ -37,11 +37,11 @@ function registerVertex(): void {
   _registerComponent(
     new Component(
       VERTEX_TYPE,
-      (container, { instanceIdentifier: region }) => {
+      (container, { instanceIdentifier: location }) => {
         // getImmediate for FirebaseApp will always succeed
         const app = container.getProvider('app').getImmediate();
         const appCheckProvider = container.getProvider('app-check-internal');
-        return factory(app, appCheckProvider, { region });
+        return factory(app, appCheckProvider, { location });
       },
       ComponentType.PUBLIC
     ).setMultipleInstances(true)

packages/vertexai/src/models/generative-model.test.ts

@@ -27,7 +27,7 @@ const fakeVertex: Vertex = {
       projectId: 'my-project'
     }
   },
-  region: 'us-central1'
+  location: 'us-central1'
 };
 
 describe('GenerativeModel', () => {

packages/vertexai/src/models/generative-model.ts

@@ -65,7 +65,7 @@ export class GenerativeModel {
       this._apiSettings = {
         apiKey: vertex.app.options.apiKey,
         project: vertex.app.options.projectId,
-        location: vertex.region
+        location: vertex.location
       };
     }
     if (modelParams.model.includes('/')) {

packages/vertexai/src/public-types.ts

@@ -28,9 +28,9 @@ export interface Vertex {
    * The {@link @firebase/app#FirebaseApp} this {@link Vertex} instance is associated with.
    */
   app: FirebaseApp;
-  region: string;
+  location: string;
 }
 
 export interface VertexOptions {
-  region?: string;
+  location?: string;
 }