@speakableio/core 0.1.8 → 0.1.10

package/dist/index.d.mts

@@ -2,17 +2,12 @@ import * as react_jsx_runtime from 'react/jsx-runtime';
 import React from 'react';
 import * as _tanstack_react_query from '@tanstack/react-query';
 import { QueryClient } from '@tanstack/react-query';
-import { FirebaseFunctionsTypes } from '@react-native-firebase/functions';
-import { Functions } from 'firebase/functions';
 import { Firestore, Timestamp as Timestamp$1, FieldValue } from 'firebase/firestore';
 import { FirebaseFirestoreTypes, Timestamp } from '@react-native-firebase/firestore';
-import * as _firebase_functions from '@firebase/functions';
 
-type FirebaseInstance = (FirebaseFirestoreTypes.Module | Firestore) & {
-    functions: FirebaseFunctions;
-};
+type FirebaseInstance = FirebaseFirestoreTypes.Module | Firestore;
 type CustomTimestamp = Timestamp | Timestamp$1;
-type FirebaseFunctions = Functions | FirebaseFunctionsTypes.Module;
+type CallableFunction<T = any, R = any> = (data: T) => Promise<R>;
 
 interface Assignment {
     name: string;
@@ -730,17 +725,14 @@ declare const SpeakableNotificationTypes: {
 };
 
 declare const useCreateNotification: () => {
-    createNotification: (type: SpeakableNotificationType, data: any) => Promise<_firebase_functions.HttpsCallableResult<unknown> | {
-        success: boolean;
-        message: string;
-    } | null | undefined>;
+    createNotification: (type: SpeakableNotificationType, data: any) => Promise<any>;
 };
 
 type FsClient = ReturnType<typeof createFsClient>;
-declare function createFsClient({ db, platform, functions, }: {
+declare function createFsClient({ db, platform, httpsCallable, }: {
     db: FirebaseInstance;
     platform: 'web' | 'native';
-    functions: FirebaseFunctions;
+    httpsCallable: (name: string) => CallableFunction;
 }): Promise<{
     assignmentRepo: {
         getAssignment: (params: {
@@ -974,17 +966,16 @@ interface FsContext {
     queryClient: QueryClient;
     user: User;
     permissions: Permissions;
-    functions: FirebaseFunctions;
 }
 declare const FsCtx: React.Context<FsContext | null>;
-declare function SpeakableProvider({ db, platform, children, queryClient, user, permissions, functions, }: {
+declare function SpeakableProvider({ db, platform, children, queryClient, user, permissions, httpsCallable, }: {
+    user: User;
     db: FirebaseInstance;
-    functions: FirebaseFunctions;
     platform: 'web' | 'native';
-    children: React.ReactNode;
     queryClient: QueryClient;
-    user: User;
     permissions: Permissions;
+    httpsCallable: (name: string) => CallableFunction;
+    children: React.ReactNode;
 }): react_jsx_runtime.JSX.Element | null;
 declare function useSpeakableApi(): FsContext;
 

package/dist/index.d.ts

@@ -2,17 +2,12 @@ import * as react_jsx_runtime from 'react/jsx-runtime';
 import React from 'react';
 import * as _tanstack_react_query from '@tanstack/react-query';
 import { QueryClient } from '@tanstack/react-query';
-import { FirebaseFunctionsTypes } from '@react-native-firebase/functions';
-import { Functions } from 'firebase/functions';
 import { Firestore, Timestamp as Timestamp$1, FieldValue } from 'firebase/firestore';
 import { FirebaseFirestoreTypes, Timestamp } from '@react-native-firebase/firestore';
-import * as _firebase_functions from '@firebase/functions';
 
-type FirebaseInstance = (FirebaseFirestoreTypes.Module | Firestore) & {
-    functions: FirebaseFunctions;
-};
+type FirebaseInstance = FirebaseFirestoreTypes.Module | Firestore;
 type CustomTimestamp = Timestamp | Timestamp$1;
-type FirebaseFunctions = Functions | FirebaseFunctionsTypes.Module;
+type CallableFunction<T = any, R = any> = (data: T) => Promise<R>;
 
 interface Assignment {
     name: string;
@@ -730,17 +725,14 @@ declare const SpeakableNotificationTypes: {
 };
 
 declare const useCreateNotification: () => {
-    createNotification: (type: SpeakableNotificationType, data: any) => Promise<_firebase_functions.HttpsCallableResult<unknown> | {
-        success: boolean;
-        message: string;
-    } | null | undefined>;
+    createNotification: (type: SpeakableNotificationType, data: any) => Promise<any>;
 };
 
 type FsClient = ReturnType<typeof createFsClient>;
-declare function createFsClient({ db, platform, functions, }: {
+declare function createFsClient({ db, platform, httpsCallable, }: {
     db: FirebaseInstance;
     platform: 'web' | 'native';
-    functions: FirebaseFunctions;
+    httpsCallable: (name: string) => CallableFunction;
 }): Promise<{
     assignmentRepo: {
         getAssignment: (params: {
@@ -974,17 +966,16 @@ interface FsContext {
     queryClient: QueryClient;
     user: User;
     permissions: Permissions;
-    functions: FirebaseFunctions;
 }
 declare const FsCtx: React.Context<FsContext | null>;
-declare function SpeakableProvider({ db, platform, children, queryClient, user, permissions, functions, }: {
+declare function SpeakableProvider({ db, platform, children, queryClient, user, permissions, httpsCallable, }: {
+    user: User;
     db: FirebaseInstance;
-    functions: FirebaseFunctions;
     platform: 'web' | 'native';
-    children: React.ReactNode;
     queryClient: QueryClient;
-    user: User;
     permissions: Permissions;
+    httpsCallable: (name: string) => CallableFunction;
+    children: React.ReactNode;
 }): react_jsx_runtime.JSX.Element | null;
 declare function useSpeakableApi(): FsContext;
 

package/dist/index.js

@@ -54,15 +54,8 @@ var FirebaseAPI = class _FirebaseAPI {
     if (!this.config) throw new Error("Firebase API not initialized");
     return this.config.helpers;
   }
-  get functions() {
-    if (!this.config) throw new Error("Firebase API not initialized");
-    return this.config.functions;
-  }
-  get httpsCallable() {
-    return this.config.httpsCallable;
-  }
-  customHttpsCallable(functionName) {
-    return this.httpsCallable(this.functions, functionName);
+  httpsCallable(functionName) {
+    return _optionalChain([this, 'access', _ => _.config, 'optionalAccess', _2 => _2.httpsCallable, 'call', _3 => _3(functionName)]);
   }
   accessQueryConstraints() {
     const { query, orderBy, limit, startAt, startAfter, endAt, endBefore } = this.helpers;
@@ -502,7 +495,7 @@ var purify = (word) => {
   return word.normalize("NFD").replace(/\/([^" "]*)/g, "").replace(/\([^()]*\)/g, "").replace(/（[^()]*）/g, "").replace(/[\u0300-\u036f]/g, "").replace(/[-]/g, " ").replace(/[.,/#!¡¿？؟。，.?$%^&*;:{}=\-_`~()’'…\s]/g, "").replace(/\s\s+/g, " ").toLowerCase().trim();
 };
 var cleanString = (words) => {
-  const splitWords = _optionalChain([words, 'optionalAccess', _ => _.split, 'call', _2 => _2("+")]);
+  const splitWords = _optionalChain([words, 'optionalAccess', _4 => _4.split, 'call', _5 => _5("+")]);
   if (splitWords && splitWords.length === 1) {
     const newWord = purify(words);
     return newWord;
@@ -522,7 +515,7 @@ var getWordHash = (word, language) => {
 // src/domains/cards/services/get-card-verification-status.service.ts
 var charactarLanguages = ["zh", "ja", "ko"];
 var getVerificationStatus = async (target_text, language) => {
-  if (_optionalChain([target_text, 'optionalAccess', _3 => _3.length]) < 3 && !charactarLanguages.includes(language)) {
+  if (_optionalChain([target_text, 'optionalAccess', _6 => _6.length]) < 3 && !charactarLanguages.includes(language)) {
     return "NOT_RECOMMENDED" /* NOT_RECOMMENDED */;
   }
   const hash = getWordHash(target_text, language);
@@ -747,17 +740,15 @@ var WEB_BASE_URL = "https://app.speakable.io";
 
 // src/lib/firebase/firebase-functions.ts
 var SpeakableFirebaseFunctions = {
-  updateAssignmentGradebookStatus: api.customHttpsCallable("updateAssignmentGradebookStatus"),
-  onSetOpened: api.customHttpsCallable("onSetOpened"),
-  updateAlgoliaIndex: api.customHttpsCallable("updateAlgoliaIndex"),
-  submitAssignmentToGoogleClassroomV2: api.customHttpsCallable(
-    "submitAssignmentToGoogleClassroomV2"
-  ),
-  submitLTIAssignmentScore: api.customHttpsCallable("submitLTIAssignmentScore"),
-  submitAssignmentV2: api.customHttpsCallable("submitLTIAssignmentScoreV2"),
-  submitAssessment: api.customHttpsCallable("submitAssessment"),
-  sendAssessmentScoredEmail: api.customHttpsCallable("sendAssessmentScoredEmail"),
-  createNotification: api.customHttpsCallable("createNotificationV2")
+  updateAssignmentGradebookStatus: api.httpsCallable("updateAssignmentGradebookStatus"),
+  onSetOpened: api.httpsCallable("onSetOpened"),
+  updateAlgoliaIndex: api.httpsCallable("updateAlgoliaIndex"),
+  submitAssignmentToGoogleClassroomV2: api.httpsCallable("submitAssignmentToGoogleClassroomV2"),
+  submitLTIAssignmentScore: api.httpsCallable("submitLTIAssignmentScore"),
+  submitAssignmentV2: api.httpsCallable("submitLTIAssignmentScoreV2"),
+  submitAssessment: api.httpsCallable("submitAssessment"),
+  sendAssessmentScoredEmail: api.httpsCallable("sendAssessmentScoredEmail"),
+  createNotification: api.httpsCallable("createNotificationV2")
 };
 
 // src/domains/notification/services/send-notification.service.ts
@@ -842,7 +833,7 @@ var createNewAssignmentNotification = async ({
     link: `${WEB_BASE_URL}/assignment/${assignment.id}`,
     messagePreview: `A new assignment "${assignment.name}" is now available. ${dueDate ? `Due ${dueDate}` : ""}`,
     title: "New Assignment Available!",
-    imageUrl: _optionalChain([profile, 'access', _4 => _4.image, 'optionalAccess', _5 => _5.url])
+    imageUrl: _optionalChain([profile, 'access', _7 => _7.image, 'optionalAccess', _8 => _8.url])
   });
   return results;
 };
@@ -859,7 +850,7 @@ var createAssessmentSubmissionNotification = async ({
     title: `Assessment Submitted!`,
     senderName: studentName,
     messagePreview: `${studentName} has submitted the assessment "${assignment.name}"`,
-    imageUrl: _optionalChain([profile, 'access', _6 => _6.image, 'optionalAccess', _7 => _7.url])
+    imageUrl: _optionalChain([profile, 'access', _9 => _9.image, 'optionalAccess', _10 => _10.url])
   });
   return results;
 };
@@ -877,13 +868,13 @@ var createAssessmentScoredNotification = async ({
     link: `${WEB_BASE_URL}/assignment/${assignment.id}`,
     title,
     messagePreview,
-    imageUrl: _optionalChain([profile, 'access', _8 => _8.image, 'optionalAccess', _9 => _9.url]),
+    imageUrl: _optionalChain([profile, 'access', _11 => _11.image, 'optionalAccess', _12 => _12.url]),
     senderName: teacherName
   });
   await SpeakableFirebaseFunctions.sendAssessmentScoredEmail({
     assessmentTitle: assignment.name,
     link: `${WEB_BASE_URL}/assignment/${assignment.id}`,
-    senderImage: _optionalChain([profile, 'access', _10 => _10.image, 'optionalAccess', _11 => _11.url]) || "",
+    senderImage: _optionalChain([profile, 'access', _13 => _13.image, 'optionalAccess', _14 => _14.url]) || "",
     studentId: sendTo[0],
     teacherName: profile.displayName
   });
@@ -901,11 +892,11 @@ var useCreateNotification = () => {
     const result = await createNotification({
       type,
       userId: user.auth.uid,
-      profile: _nullishCoalesce(_optionalChain([user, 'optionalAccess', _12 => _12.profile]), () => ( {})),
+      profile: _nullishCoalesce(_optionalChain([user, 'optionalAccess', _15 => _15.profile]), () => ( {})),
       data
     });
     queryClient.invalidateQueries({
-      queryKey: notificationQueryKeys.byId(_nullishCoalesce(_optionalChain([user, 'optionalAccess', _13 => _13.auth, 'access', _14 => _14.uid]), () => ( "")))
+      queryKey: notificationQueryKeys.byId(_nullishCoalesce(_optionalChain([user, 'optionalAccess', _16 => _16.auth, 'access', _17 => _17.uid]), () => ( "")))
     });
     return result;
   };
@@ -915,20 +906,16 @@ var useCreateNotification = () => {
 };
 
 // src/lib/create-firebase-client.ts
-var _functions = require('firebase/functions');
-var _functions3 = require('@react-native-firebase/functions');
 async function createFsClient({
   db,
   platform,
-  functions
+  httpsCallable
 }) {
   const dbAsFirestore = db;
   const helpers = platform === "web" ? await Promise.resolve().then(() => _interopRequireWildcard(require("firebase/firestore"))) : await Promise.resolve().then(() => _interopRequireWildcard(require("@react-native-firebase/firestore")));
-  const httpsCallable = platform === "web" ? _functions.httpsCallable : _functions3.httpsCallable;
   api.initialize({
     db: dbAsFirestore,
     helpers,
-    functions,
     httpsCallable
   });
   return {
@@ -947,18 +934,18 @@ function SpeakableProvider({
   queryClient,
   user,
   permissions,
-  functions
+  httpsCallable
 }) {
   const [speakableApi, setSpeakableApi] = _react.useState.call(void 0, null);
   _react.useEffect.call(void 0, () => {
     createFsClient({
       db,
-      functions,
+      httpsCallable,
       platform
     }).then((repos) => {
       setSpeakableApi(repos);
     });
-  }, [db, functions, platform]);
+  }, [db, platform, httpsCallable]);
   if (!speakableApi) return null;
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
     FsCtx.Provider,
@@ -967,8 +954,7 @@ function SpeakableProvider({
         speakableApi,
         queryClient,
         user,
-        permissions,
-        functions
+        permissions
       },
       children
     }

package/dist/index.mjs

@@ -54,15 +54,8 @@ var FirebaseAPI = class _FirebaseAPI {
     if (!this.config) throw new Error("Firebase API not initialized");
     return this.config.helpers;
   }
-  get functions() {
-    if (!this.config) throw new Error("Firebase API not initialized");
-    return this.config.functions;
-  }
-  get httpsCallable() {
-    return this.config.httpsCallable;
-  }
-  customHttpsCallable(functionName) {
-    return this.httpsCallable(this.functions, functionName);
+  httpsCallable(functionName) {
+    return this.config?.httpsCallable(functionName);
   }
   accessQueryConstraints() {
     const { query, orderBy, limit, startAt, startAfter, endAt, endBefore } = this.helpers;
@@ -747,17 +740,15 @@ var WEB_BASE_URL = "https://app.speakable.io";
 
 // src/lib/firebase/firebase-functions.ts
 var SpeakableFirebaseFunctions = {
-  updateAssignmentGradebookStatus: api.customHttpsCallable("updateAssignmentGradebookStatus"),
-  onSetOpened: api.customHttpsCallable("onSetOpened"),
-  updateAlgoliaIndex: api.customHttpsCallable("updateAlgoliaIndex"),
-  submitAssignmentToGoogleClassroomV2: api.customHttpsCallable(
-    "submitAssignmentToGoogleClassroomV2"
-  ),
-  submitLTIAssignmentScore: api.customHttpsCallable("submitLTIAssignmentScore"),
-  submitAssignmentV2: api.customHttpsCallable("submitLTIAssignmentScoreV2"),
-  submitAssessment: api.customHttpsCallable("submitAssessment"),
-  sendAssessmentScoredEmail: api.customHttpsCallable("sendAssessmentScoredEmail"),
-  createNotification: api.customHttpsCallable("createNotificationV2")
+  updateAssignmentGradebookStatus: api.httpsCallable("updateAssignmentGradebookStatus"),
+  onSetOpened: api.httpsCallable("onSetOpened"),
+  updateAlgoliaIndex: api.httpsCallable("updateAlgoliaIndex"),
+  submitAssignmentToGoogleClassroomV2: api.httpsCallable("submitAssignmentToGoogleClassroomV2"),
+  submitLTIAssignmentScore: api.httpsCallable("submitLTIAssignmentScore"),
+  submitAssignmentV2: api.httpsCallable("submitLTIAssignmentScoreV2"),
+  submitAssessment: api.httpsCallable("submitAssessment"),
+  sendAssessmentScoredEmail: api.httpsCallable("sendAssessmentScoredEmail"),
+  createNotification: api.httpsCallable("createNotificationV2")
 };
 
 // src/domains/notification/services/send-notification.service.ts
@@ -915,20 +906,16 @@ var useCreateNotification = () => {
 };
 
 // src/lib/create-firebase-client.ts
-import { httpsCallable as webHttpsCallable } from "firebase/functions";
-import { httpsCallable as nativeHttpsCallable } from "@react-native-firebase/functions";
 async function createFsClient({
   db,
   platform,
-  functions
+  httpsCallable
 }) {
   const dbAsFirestore = db;
   const helpers = platform === "web" ? await import("firebase/firestore") : await import("@react-native-firebase/firestore");
-  const httpsCallable = platform === "web" ? webHttpsCallable : nativeHttpsCallable;
   api.initialize({
     db: dbAsFirestore,
     helpers,
-    functions,
     httpsCallable
   });
   return {
@@ -947,18 +934,18 @@ function SpeakableProvider({
   queryClient,
   user,
   permissions,
-  functions
+  httpsCallable
 }) {
   const [speakableApi, setSpeakableApi] = useState(null);
   useEffect(() => {
     createFsClient({
       db,
-      functions,
+      httpsCallable,
       platform
     }).then((repos) => {
       setSpeakableApi(repos);
     });
-  }, [db, functions, platform]);
+  }, [db, platform, httpsCallable]);
   if (!speakableApi) return null;
   return /* @__PURE__ */ jsx(
     FsCtx.Provider,
@@ -967,8 +954,7 @@ function SpeakableProvider({
         speakableApi,
         queryClient,
         user,
-        permissions,
-        functions
+        permissions
       },
       children
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@speakableio/core",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Speakable-io/speakable-core.git"