@digitalaidseattle/firebase 1.0.12 → 1.0.13

package/dist/declarations/src/FirestoreService.d.ts

@@ -1,8 +1,10 @@
 import { Entity, EntityService, Identifier, User } from "@digitalaidseattle/core";
+import { Firestore } from "firebase/firestore";
+import { FirebaseApp } from "firebase/app";
 declare class FirestoreService<T extends Entity> implements EntityService<T> {
     collectionName: string;
-    db: import("@firebase/firestore").Firestore;
-    constructor(collectionName: string);
+    db: Firestore;
+    constructor(collectionName: string, firebaseClient?: FirebaseApp);
     getAll(count?: number, select?: string, mapper?: (json: any) => T): Promise<T[]>;
     getById(id: string, select?: string, mapper?: (json: any) => T): Promise<T>;
     batchInsert(entities: T[], select?: string, mapper?: (json: any) => T, user?: User): Promise<T[]>;
@@ -12,4 +14,3 @@ declare class FirestoreService<T extends Entity> implements EntityService<T> {
     upsert(entity: T): Promise<T>;
 }
 export { FirestoreService };
-export type { Entity };

package/dist/declarations/src/index.d.ts

@@ -2,4 +2,3 @@ export * from "./FirebaseAuthService.js";
 export * from "./firebaseClient.js";
 export * from "./FirebaseStorageService.js";
 export * from "./FirestoreService.js";
-export * from "./GeminiService.js";

package/dist/digitalaidseattle-firebase.cjs.dev.js

@@ -12,8 +12,6 @@ var app = require('firebase/app');
 var storage = require('firebase/storage');
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var firestore = require('firebase/firestore');
-var firebase = require('@digitalaidseattle/firebase');
-var ai = require('firebase/ai');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -316,11 +314,10 @@ var FirebaseStorageService = /*#__PURE__*/function () {
 }();
 
 var FirestoreService = /*#__PURE__*/function () {
-  function FirestoreService(collectionName) {
+  function FirestoreService(collectionName, firebaseClient$1) {
     _classCallCheck(this, FirestoreService);
-    _defineProperty(this, "collectionName", "player");
-    _defineProperty(this, "db", firestore.getFirestore(firebaseClient));
     this.collectionName = collectionName;
+    this.db = firestore.getFirestore(firebaseClient$1 !== null && firebaseClient$1 !== void 0 ? firebaseClient$1 : firebaseClient);
   }
 
   // Get all documents from a collection
@@ -490,7 +487,6 @@ var FirestoreService = /*#__PURE__*/function () {
         return _regeneratorRuntime__default["default"].wrap(function (_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              console.log('delete', entityId);
               return _context6.abrupt("return", firestore.deleteDoc(firestore.doc(this.db, this.collectionName, entityId)));
             case 1:
             case "end":
@@ -528,87 +524,7 @@ var FirestoreService = /*#__PURE__*/function () {
   }]);
 }();
 
-var GeminiService = /*#__PURE__*/function () {
-  function GeminiService(modelType) {
-    _classCallCheck(this, GeminiService);
-    this.ai = ai.getAI(firebase.firebaseClient, {
-      backend: new ai.GoogleAIBackend()
-    });
-  }
-  return _createClass(GeminiService, [{
-    key: "getModels",
-    value: function getModels() {
-      return ["gemini-2.5-flash", "gemini-2.5-pro", "gemini-2.5-flash-lite"];
-    }
-  }, {
-    key: "calcTokenCount",
-    value: function calcTokenCount(model, prompt) {
-      return ai.getGenerativeModel(this.ai, {
-        model: model
-      }).countTokens(prompt).then(function (response) {
-        return response.totalTokens;
-      });
-    }
-
-    // Wrap in an async function so you can use await
-  }, {
-    key: "generateContent",
-    value: function generateContent(model, prompt) {
-      // To generate text output, call generateContent with the text input
-      console.log('generateContent', model, prompt);
-      return ai.getGenerativeModel(this.ai, {
-        model: model
-      }).generateContent(prompt).then(function (result) {
-        return result.response.text();
-      })["catch"](function (error) {
-        console.error("Error querying AI: ", error);
-        throw new Error("Failed to query AI: " + error.message);
-      });
-    }
-
-    // Wrap in an async function so you can use await
-  }, {
-    key: "generateParameterizedContent",
-    value: function generateParameterizedContent(model, prompt, schemaParams) {
-      // Provide a JSON schema object using a standard format.
-      // Later, pass this schema object into `responseSchema` in the generation config.
-      var schema = ai.Schema.object({
-        properties: {
-          characters: ai.Schema.array({
-            items: ai.Schema.object({
-              properties: Object.fromEntries(schemaParams.map(function (field) {
-                return [field, ai.Schema.string()];
-              }))
-            })
-          })
-        }
-      });
-
-      // Create a `GenerativeModel` instance with a model that supports your use case
-      var jModel = ai.getGenerativeModel(this.ai, {
-        model: model,
-        // In the generation config, set the `responseMimeType` to `application/json`
-        // and pass the JSON schema object into `responseSchema`.
-        generationConfig: {
-          responseMimeType: "application/json",
-          responseSchema: schema
-        }
-      });
-
-      // To generate text output, call generateContent with the text input
-      return jModel.generateContent(prompt).then(function (result) {
-        var content = result.response.text();
-        return JSON.parse(content).characters[0];
-      })["catch"](function (error) {
-        console.error("Error querying AI: ", error);
-        throw new Error("Failed to query AI: " + error.message);
-      });
-    }
-  }]);
-}();
-
 exports.FirebaseAuthService = FirebaseAuthService;
 exports.FirebaseStorageService = FirebaseStorageService;
 exports.FirestoreService = FirestoreService;
-exports.GeminiService = GeminiService;
 exports.firebaseClient = firebaseClient;

package/dist/digitalaidseattle-firebase.cjs.prod.js

@@ -12,8 +12,6 @@ var app = require('firebase/app');
 var storage = require('firebase/storage');
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var firestore = require('firebase/firestore');
-var firebase = require('@digitalaidseattle/firebase');
-var ai = require('firebase/ai');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -316,11 +314,10 @@ var FirebaseStorageService = /*#__PURE__*/function () {
 }();
 
 var FirestoreService = /*#__PURE__*/function () {
-  function FirestoreService(collectionName) {
+  function FirestoreService(collectionName, firebaseClient$1) {
     _classCallCheck(this, FirestoreService);
-    _defineProperty(this, "collectionName", "player");
-    _defineProperty(this, "db", firestore.getFirestore(firebaseClient));
     this.collectionName = collectionName;
+    this.db = firestore.getFirestore(firebaseClient$1 !== null && firebaseClient$1 !== void 0 ? firebaseClient$1 : firebaseClient);
   }
 
   // Get all documents from a collection
@@ -490,7 +487,6 @@ var FirestoreService = /*#__PURE__*/function () {
         return _regeneratorRuntime__default["default"].wrap(function (_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              console.log('delete', entityId);
               return _context6.abrupt("return", firestore.deleteDoc(firestore.doc(this.db, this.collectionName, entityId)));
             case 1:
             case "end":
@@ -528,87 +524,7 @@ var FirestoreService = /*#__PURE__*/function () {
   }]);
 }();
 
-var GeminiService = /*#__PURE__*/function () {
-  function GeminiService(modelType) {
-    _classCallCheck(this, GeminiService);
-    this.ai = ai.getAI(firebase.firebaseClient, {
-      backend: new ai.GoogleAIBackend()
-    });
-  }
-  return _createClass(GeminiService, [{
-    key: "getModels",
-    value: function getModels() {
-      return ["gemini-2.5-flash", "gemini-2.5-pro", "gemini-2.5-flash-lite"];
-    }
-  }, {
-    key: "calcTokenCount",
-    value: function calcTokenCount(model, prompt) {
-      return ai.getGenerativeModel(this.ai, {
-        model: model
-      }).countTokens(prompt).then(function (response) {
-        return response.totalTokens;
-      });
-    }
-
-    // Wrap in an async function so you can use await
-  }, {
-    key: "generateContent",
-    value: function generateContent(model, prompt) {
-      // To generate text output, call generateContent with the text input
-      console.log('generateContent', model, prompt);
-      return ai.getGenerativeModel(this.ai, {
-        model: model
-      }).generateContent(prompt).then(function (result) {
-        return result.response.text();
-      })["catch"](function (error) {
-        console.error("Error querying AI: ", error);
-        throw new Error("Failed to query AI: " + error.message);
-      });
-    }
-
-    // Wrap in an async function so you can use await
-  }, {
-    key: "generateParameterizedContent",
-    value: function generateParameterizedContent(model, prompt, schemaParams) {
-      // Provide a JSON schema object using a standard format.
-      // Later, pass this schema object into `responseSchema` in the generation config.
-      var schema = ai.Schema.object({
-        properties: {
-          characters: ai.Schema.array({
-            items: ai.Schema.object({
-              properties: Object.fromEntries(schemaParams.map(function (field) {
-                return [field, ai.Schema.string()];
-              }))
-            })
-          })
-        }
-      });
-
-      // Create a `GenerativeModel` instance with a model that supports your use case
-      var jModel = ai.getGenerativeModel(this.ai, {
-        model: model,
-        // In the generation config, set the `responseMimeType` to `application/json`
-        // and pass the JSON schema object into `responseSchema`.
-        generationConfig: {
-          responseMimeType: "application/json",
-          responseSchema: schema
-        }
-      });
-
-      // To generate text output, call generateContent with the text input
-      return jModel.generateContent(prompt).then(function (result) {
-        var content = result.response.text();
-        return JSON.parse(content).characters[0];
-      })["catch"](function (error) {
-        console.error("Error querying AI: ", error);
-        throw new Error("Failed to query AI: " + error.message);
-      });
-    }
-  }]);
-}();
-
 exports.FirebaseAuthService = FirebaseAuthService;
 exports.FirebaseStorageService = FirebaseStorageService;
 exports.FirestoreService = FirestoreService;
-exports.GeminiService = GeminiService;
 exports.firebaseClient = firebaseClient;

package/dist/digitalaidseattle-firebase.esm.js

@@ -8,8 +8,6 @@ import { initializeApp } from 'firebase/app';
 import { ref, getDownloadURL, getBytes, deleteObject, getMetadata, listAll, uploadBytes, getStorage } from 'firebase/storage';
 import _objectSpread from '@babel/runtime/helpers/esm/objectSpread2';
 import { getDocs, collection, getDoc, doc, addDoc, updateDoc, deleteDoc, setDoc, getFirestore } from 'firebase/firestore';
-import { firebaseClient as firebaseClient$1 } from '@digitalaidseattle/firebase';
-import { getGenerativeModel, Schema, getAI, GoogleAIBackend } from 'firebase/ai';
 
 var FirebaseAuthService = /*#__PURE__*/function () {
   function FirebaseAuthService(firebaseClient) {
@@ -308,11 +306,10 @@ var FirebaseStorageService = /*#__PURE__*/function () {
 }();
 
 var FirestoreService = /*#__PURE__*/function () {
-  function FirestoreService(collectionName) {
+  function FirestoreService(collectionName, firebaseClient$1) {
     _classCallCheck(this, FirestoreService);
-    _defineProperty(this, "collectionName", "player");
-    _defineProperty(this, "db", getFirestore(firebaseClient));
     this.collectionName = collectionName;
+    this.db = getFirestore(firebaseClient$1 !== null && firebaseClient$1 !== void 0 ? firebaseClient$1 : firebaseClient);
   }
 
   // Get all documents from a collection
@@ -482,7 +479,6 @@ var FirestoreService = /*#__PURE__*/function () {
         return _regeneratorRuntime.wrap(function (_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              console.log('delete', entityId);
               return _context6.abrupt("return", deleteDoc(doc(this.db, this.collectionName, entityId)));
             case 1:
             case "end":
@@ -520,83 +516,4 @@ var FirestoreService = /*#__PURE__*/function () {
   }]);
 }();
 
-var GeminiService = /*#__PURE__*/function () {
-  function GeminiService(modelType) {
-    _classCallCheck(this, GeminiService);
-    this.ai = getAI(firebaseClient$1, {
-      backend: new GoogleAIBackend()
-    });
-  }
-  return _createClass(GeminiService, [{
-    key: "getModels",
-    value: function getModels() {
-      return ["gemini-2.5-flash", "gemini-2.5-pro", "gemini-2.5-flash-lite"];
-    }
-  }, {
-    key: "calcTokenCount",
-    value: function calcTokenCount(model, prompt) {
-      return getGenerativeModel(this.ai, {
-        model: model
-      }).countTokens(prompt).then(function (response) {
-        return response.totalTokens;
-      });
-    }
-
-    // Wrap in an async function so you can use await
-  }, {
-    key: "generateContent",
-    value: function generateContent(model, prompt) {
-      // To generate text output, call generateContent with the text input
-      console.log('generateContent', model, prompt);
-      return getGenerativeModel(this.ai, {
-        model: model
-      }).generateContent(prompt).then(function (result) {
-        return result.response.text();
-      })["catch"](function (error) {
-        console.error("Error querying AI: ", error);
-        throw new Error("Failed to query AI: " + error.message);
-      });
-    }
-
-    // Wrap in an async function so you can use await
-  }, {
-    key: "generateParameterizedContent",
-    value: function generateParameterizedContent(model, prompt, schemaParams) {
-      // Provide a JSON schema object using a standard format.
-      // Later, pass this schema object into `responseSchema` in the generation config.
-      var schema = Schema.object({
-        properties: {
-          characters: Schema.array({
-            items: Schema.object({
-              properties: Object.fromEntries(schemaParams.map(function (field) {
-                return [field, Schema.string()];
-              }))
-            })
-          })
-        }
-      });
-
-      // Create a `GenerativeModel` instance with a model that supports your use case
-      var jModel = getGenerativeModel(this.ai, {
-        model: model,
-        // In the generation config, set the `responseMimeType` to `application/json`
-        // and pass the JSON schema object into `responseSchema`.
-        generationConfig: {
-          responseMimeType: "application/json",
-          responseSchema: schema
-        }
-      });
-
-      // To generate text output, call generateContent with the text input
-      return jModel.generateContent(prompt).then(function (result) {
-        var content = result.response.text();
-        return JSON.parse(content).characters[0];
-      })["catch"](function (error) {
-        console.error("Error querying AI: ", error);
-        throw new Error("Failed to query AI: " + error.message);
-      });
-    }
-  }]);
-}();
-
-export { FirebaseAuthService, FirebaseStorageService, FirestoreService, GeminiService, firebaseClient };
+export { FirebaseAuthService, FirebaseStorageService, FirestoreService, firebaseClient };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitalaidseattle/firebase",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "Wrapper for firebase that works with DAS Component library",
   "repository": "null//github.com/null/github.com/tree/master/packages/firebase",
   "main": "dist/digitalaidseattle-firebase.cjs.js",

package/dist/declarations/src/GeminiService.d.ts

@@ -1,25 +0,0 @@
-/**
- * Institution AI Service
- *
- *
- * Provision Firebase application  in Google Cloud
- * <ol>
- * <li>Go to the Google Cloud Console.</li>
- * <li>Select an existing project.</li>
- * <li>Navigate to the "APIs & Services" page.</li>
- * <li>Click on "Credential".</li>
- * <li>Edit API (the key should match the API key in the .env file).</li>
- * <li>Enable the "Generative Language API" and "Firebase AI Logic API" restrictions.</li>
- * </ol>
- */
-import { AiService } from "@digitalaidseattle/core";
-import { AI } from "firebase/ai";
-declare class GeminiService implements AiService {
-    ai: AI;
-    constructor(modelType?: string);
-    getModels(): string[];
-    calcTokenCount(model: string, prompt: string): Promise<number>;
-    generateContent(model: string, prompt: string): Promise<any>;
-    generateParameterizedContent(model: string, prompt: string, schemaParams: string[]): Promise<any>;
-}
-export { GeminiService };