@concord-consortium/object-storage 1.0.0-pre.5 → 1.0.0-pre.6

package/dist/demo-object-storage.d.ts

@@ -1,39 +1,20 @@
-import { DemoObjectStorageConfig, IObjectStorage, ObjectMetadata, ObjectData, StoredObject, ObjectWithId, MonitorCallback, DemonitorFunction, AddOptions } from './types';
+import { DemoObjectStorageConfig, IObjectStorage, ObjectMetadata, ObjectData, StoredObject, MonitorCallback, DemonitorFunction, AddOptions, ObjectMetadataWithId } from './types';
 export declare class DemoObjectStorage implements IObjectStorage {
     private config;
     private objects;
     private monitors;
     constructor(config: DemoObjectStorageConfig);
-    /**
-     * Lists metadata documents for objects owned by the current user
-     */
-    listMine(): Promise<ObjectWithId[]>;
-    /**
-     * Lists metadata documents for objects linked to the current user
-     */
-    listLinked(): Promise<ObjectWithId[]>;
+    private getQuestionMetadata;
     /**
      * Lists metadata documents for objects associated with specific question IDs
      */
-    list(questionIds: string[]): Promise<ObjectWithId[]>;
-    /**
-     * Monitors metadata documents for objects owned by the current user
-     * Invokes callback at start and on any change
-     * Returns a function to stop monitoring
-     */
-    monitorMine(callback: MonitorCallback): DemonitorFunction;
-    /**
-     * Monitors metadata documents for objects linked to the current user
-     * Invokes callback at start and on any change
-     * Returns a function to stop monitoring
-     */
-    monitorLinked(callback: MonitorCallback): DemonitorFunction;
+    list(questionId: string): Promise<ObjectMetadataWithId[]>;
     /**
      * Monitors metadata documents for objects associated with specific question IDs
      * Invokes callback at start and on any change
      * Returns a function to stop monitoring
      */
-    monitor(questionIds: string[], callback: MonitorCallback): DemonitorFunction;
+    monitor(questionId: string, callback: MonitorCallback): DemonitorFunction;
     /**
      * Adds both metadata and data documents for a new object
      * Returns the generated object ID (nanoid) or the provided ID if specified in options

package/dist/demo-object-storage.js

@@ -11,76 +11,33 @@ class DemoObjectStorage {
         this.objects = new Map();
         this.monitors = new Map();
     }
-    /**
-     * Lists metadata documents for objects owned by the current user
-     */
-    async listMine() {
-        return Array.from(this.objects.values());
-    }
-    /**
-     * Lists metadata documents for objects linked to the current user
-     */
-    async listLinked() {
-        // not applicable in demo storage
-        return [];
+    getQuestionMetadata() {
+        // In demo mode, just return all objects since there are no other questions
+        // that can use this storage instance
+        return Array.from(this.objects.entries()).map(([id, obj]) => {
+            return { id, metadata: obj.metadata };
+        });
     }
     /**
      * Lists metadata documents for objects associated with specific question IDs
      */
-    async list(questionIds) {
-        // In demo mode, just return all objects
-        return Array.from(this.objects.values());
-    }
-    /**
-     * Monitors metadata documents for objects owned by the current user
-     * Invokes callback at start and on any change
-     * Returns a function to stop monitoring
-     */
-    monitorMine(callback) {
-        const key = 'mine';
-        if (!this.monitors.has(key)) {
-            this.monitors.set(key, []);
-        }
-        this.monitors.get(key).push(callback);
-        // Invoke callback immediately with current state
-        callback(Array.from(this.objects.values()));
-        return () => {
-            const callbacks = this.monitors.get(key);
-            if (callbacks) {
-                const index = callbacks.indexOf(callback);
-                if (index > -1) {
-                    callbacks.splice(index, 1);
-                }
-            }
-        };
-    }
-    /**
-     * Monitors metadata documents for objects linked to the current user
-     * Invokes callback at start and on any change
-     * Returns a function to stop monitoring
-     */
-    monitorLinked(callback) {
-        // not applicable in demo storage
-        callback([]);
-        return () => {
-            // no-op
-        };
+    async list(questionId) {
+        return this.getQuestionMetadata();
     }
     /**
      * Monitors metadata documents for objects associated with specific question IDs
      * Invokes callback at start and on any change
      * Returns a function to stop monitoring
      */
-    monitor(questionIds, callback) {
-        const key = `monitor-${questionIds.join(',')}`;
-        if (!this.monitors.has(key)) {
-            this.monitors.set(key, []);
+    monitor(questionId, callback) {
+        if (!this.monitors.has(questionId)) {
+            this.monitors.set(questionId, []);
         }
-        this.monitors.get(key).push(callback);
+        this.monitors.get(questionId).push(callback);
         // Invoke callback immediately with current state
-        callback(Array.from(this.objects.values()));
+        callback(this.getQuestionMetadata());
         return () => {
-            const callbacks = this.monitors.get(key);
+            const callbacks = this.monitors.get(questionId);
             if (callbacks) {
                 const index = callbacks.indexOf(callback);
                 if (index > -1) {
@@ -95,12 +52,7 @@ class DemoObjectStorage {
      */
     async add(object, options) {
         const id = options?.id ?? (0, nanoid_1.nanoid)();
-        const objectWithId = {
-            id,
-            metadata: object.metadata,
-            data: object.data
-        };
-        this.objects.set(id, objectWithId);
+        this.objects.set(id, object);
         // Notify all monitors
         this.notifyMonitors();
         return id;
@@ -151,7 +103,7 @@ class DemoObjectStorage {
      * Notifies all active monitors of changes
      */
     notifyMonitors() {
-        const allObjects = Array.from(this.objects.values());
+        const allObjects = this.getQuestionMetadata();
         this.monitors.forEach(callbacks => {
             callbacks.forEach(callback => callback(allObjects));
         });

package/dist/firebase-object-storage.d.ts

@@ -1,6 +1,6 @@
 import "firebase/compat/auth";
 import "firebase/compat/firestore";
-import { FirebaseObjectStorageConfig, IObjectStorage, ObjectMetadata, ObjectData, StoredObject, ObjectWithId, MonitorCallback, DemonitorFunction, AddOptions } from './types';
+import { FirebaseObjectStorageConfig, IObjectStorage, ObjectMetadata, ObjectData, StoredObject, MonitorCallback, DemonitorFunction, AddOptions, ObjectMetadataWithId } from './types';
 export declare class FirebaseObjectStorage implements IObjectStorage {
     private config;
     private initPromise;
@@ -12,36 +12,26 @@ export declare class FirebaseObjectStorage implements IObjectStorage {
     private createDocument;
     private getPaths;
     private getRefs;
+    private getMetadataQuery;
     /**
-     * Lists metadata documents for objects owned by the current user
+     * Ensures the provided ID is in question ID format as opposed to reference ID format
+     *
+     * eg: "404-MWInteractive" transforms to "mw_interactive_404"
+     *
+     * @param questionOrRefId
+     * @returns
      */
-    listMine(): Promise<ObjectWithId[]>;
-    /**
-     * Lists metadata documents for objects linked to the current user
-     */
-    listLinked(): Promise<ObjectWithId[]>;
+    private ensureIdIsQuestionId;
     /**
      * Lists metadata documents for objects associated with specific question IDs
      */
-    list(questionIds: string[]): Promise<ObjectWithId[]>;
-    /**
-     * Monitors metadata documents for objects owned by the current user
-     * Invokes callback at start and on any change
-     * Returns a function to stop monitoring
-     */
-    monitorMine(callback: MonitorCallback): DemonitorFunction;
-    /**
-     * Monitors metadata documents for objects linked to the current user
-     * Invokes callback at start and on any change
-     * Returns a function to stop monitoring
-     */
-    monitorLinked(callback: MonitorCallback): DemonitorFunction;
+    list(questionOrRefId: string): Promise<ObjectMetadataWithId[]>;
     /**
      * Monitors metadata documents for objects associated with specific question IDs
      * Invokes callback at start and on any change
      * Returns a function to stop monitoring
      */
-    monitor(questionIds: string[], callback: MonitorCallback): DemonitorFunction;
+    monitor(questionOrRefId: string, callback: MonitorCallback): DemonitorFunction;
     /**
      * Adds both metadata and data documents for a new object
      * Returns the generated object ID (nanoid) or the provided ID if specified in options

package/dist/firebase-object-storage.js

@@ -14,7 +14,9 @@ class FirebaseObjectStorage {
         if (config.version !== 1) {
             throw new Error(`Unsupported config version: ${config.version}. Expected version 1.`);
         }
-        this.config = config;
+        this.config = { ...config };
+        // ensure the question id is in the correct format
+        this.config.questionId = this.ensureIdIsQuestionId(this.config.questionId);
         this.app = app_1.default.initializeApp(this.config.app);
         this.app.firestore().settings({
             ignoreUndefinedProperties: true,
@@ -36,15 +38,17 @@ class FirebaseObjectStorage {
         await this.initPromise;
     }
     createDocument(contents) {
+        const { questionId } = this.config;
         if (this.config.user.type === "authenticated") {
             const { contextId, platformId, platformUserId, resourceLinkId } = this.config.user;
             return {
                 created_at: app_1.default.firestore.FieldValue.serverTimestamp(),
-                platform_id: platformId,
-                platform_user_id: platformUserId.toString(),
                 context_id: contextId,
+                platform_id: platformId,
+                platform_user_id: platformUserId,
                 resource_link_id: resourceLinkId,
                 run_key: "",
+                question_id: questionId,
                 ...contents
             };
         }
@@ -54,13 +58,14 @@ class FirebaseObjectStorage {
                 created_at: app_1.default.firestore.FieldValue.serverTimestamp(),
                 run_key: runKey,
                 platform_user_id: runKey,
+                question_id: questionId,
                 ...contents
             };
         }
     }
     getPaths(objectId) {
-        const metadataPath = `${this.config.root}/object_store_metadata/${objectId}`;
-        const dataPath = `${this.config.root}/object_store_data/${objectId}`;
+        const metadataPath = `${this.config.root}/object_store_metadata${objectId ? `/${objectId}` : ''}`;
+        const dataPath = `${this.config.root}/object_store_data${objectId ? `/${objectId}` : ''}`;
         return { metadataPath, dataPath };
     }
     getRefs(objectId) {
@@ -69,67 +74,73 @@ class FirebaseObjectStorage {
         const dataRef = this.app.firestore().doc(dataPath);
         return { metadataRef, dataRef };
     }
-    /**
-     * Lists metadata documents for objects owned by the current user
-     */
-    async listMine() {
-        await this.ensureInitialized();
-        // TODO: Implement Firebase query for user's own objects
-        return [];
+    getMetadataQuery(questionOrRefId) {
+        const questionId = this.ensureIdIsQuestionId(questionOrRefId);
+        const { metadataPath } = this.getPaths();
+        let query = this.app.firestore().collection(metadataPath)
+            .where("question_id", "==", questionId);
+        if (this.config.user.type === "authenticated") { // logged in user
+            const { contextId, platformId, resourceLinkId, platformUserId } = this.config.user;
+            query = query
+                .where("context_id", "==", contextId)
+                .where("platform_id", "==", platformId)
+                .where("platform_user_id", "==", platformUserId.toString())
+                .where("resource_link_id", "==", resourceLinkId);
+        }
+        else {
+            query = query.where("run_key", "==", this.config.user.runKey);
+        }
+        query = query.orderBy("created_at", "asc");
+        return query;
     }
     /**
-     * Lists metadata documents for objects linked to the current user
+     * Ensures the provided ID is in question ID format as opposed to reference ID format
+     *
+     * eg: "404-MWInteractive" transforms to "mw_interactive_404"
+     *
+     * @param questionOrRefId
+     * @returns
      */
-    async listLinked() {
-        await this.ensureInitialized();
-        // TODO: Implement Firebase query for linked objects
-        return [];
+    ensureIdIsQuestionId(questionOrRefId) {
+        const refIdRegEx = /(\d*)-(\D*)/g;
+        const parsed = refIdRegEx.exec(questionOrRefId);
+        if (parsed?.length) {
+            const [, embeddableId, embeddableType] = parsed;
+            const snakeCased = embeddableType.replace(/(?!^)([A-Z])/g, "_$1").toLowerCase();
+            return `${snakeCased}_${embeddableId}`;
+        }
+        return questionOrRefId;
     }
     /**
      * Lists metadata documents for objects associated with specific question IDs
      */
-    async list(questionIds) {
+    async list(questionOrRefId) {
         await this.ensureInitialized();
-        // TODO: Implement Firebase query for objects by question IDs
-        return [];
-    }
-    /**
-     * Monitors metadata documents for objects owned by the current user
-     * Invokes callback at start and on any change
-     * Returns a function to stop monitoring
-     */
-    monitorMine(callback) {
-        // await this.ensureInitialized();
-        // TODO: Implement Firebase realtime listener for user's own objects
-        callback([]);
-        return () => {
-            // TODO: Implement cleanup
-        };
-    }
-    /**
-     * Monitors metadata documents for objects linked to the current user
-     * Invokes callback at start and on any change
-     * Returns a function to stop monitoring
-     */
-    monitorLinked(callback) {
-        // await this.ensureInitialized();
-        // TODO: Implement Firebase realtime listener for linked objects
-        callback([]);
-        return () => {
-            // TODO: Implement cleanup
-        };
+        const query = this.getMetadataQuery(questionOrRefId);
+        const querySnapshot = await query.get();
+        const results = [];
+        querySnapshot.forEach(doc => {
+            results.push({ id: doc.id, metadata: doc.data().metadata });
+        });
+        return results;
     }
     /**
      * Monitors metadata documents for objects associated with specific question IDs
      * Invokes callback at start and on any change
      * Returns a function to stop monitoring
      */
-    monitor(questionIds, callback) {
+    monitor(questionOrRefId, callback) {
         // await this.ensureInitialized();
-        // TODO: Implement Firebase realtime listener for objects by question IDs
-        callback([]);
+        const query = this.getMetadataQuery(questionOrRefId);
+        const unsub = query.onSnapshot(snapshot => {
+            const results = [];
+            snapshot.forEach(doc => {
+                results.push({ id: doc.id, metadata: doc.data().metadata });
+            });
+            callback(results);
+        });
         return () => {
-            // TODO: Implement cleanup
+            unsub();
         };
     }
     /**
@@ -154,28 +165,39 @@ class FirebaseObjectStorage {
      */
     async read(objectId) {
         await this.ensureInitialized();
-        // TODO: Read metadata document from Firebase
-        // TODO: Read data document from Firebase
-        return {
-            metadata: {},
-            data: {}
-        };
+        const metadata = await this.readMetadata(objectId);
+        if (!metadata) {
+            return undefined;
+        }
+        const data = await this.readData(objectId);
+        if (!data) {
+            return undefined;
+        }
+        return { metadata, data };
     }
     /**
      * Reads only the metadata document for an object
      */
     async readMetadata(objectId) {
         await this.ensureInitialized();
-        // TODO: Read metadata document from Firebase
-        return {};
+        const { metadataRef } = this.getRefs(objectId);
+        const metadataSnapshot = await metadataRef.get();
+        if (!metadataSnapshot.exists) {
+            return undefined;
+        }
+        return metadataSnapshot.data()?.metadata ?? {};
     }
     /**
      * Reads only the data document for an object
      */
     async readData(objectId) {
         await this.ensureInitialized();
-        // TODO: Read data document from Firebase
-        return {};
+        const { dataRef } = this.getRefs(objectId);
+        const dataSnapshot = await dataRef.get();
+        if (!dataSnapshot.exists) {
+            return undefined;
+        }
+        return dataSnapshot.data()?.data ?? {};
     }
     /**
      * Generates a new unique ID using nanoid

package/dist/typed-object.d.ts

@@ -64,7 +64,7 @@ export declare class TypedObject implements StoredObject {
     data: TypedData;
     constructor(options?: TypedObjectOptions);
     static IsSupportedTypedObject(storedObject: StoredObject): boolean;
-    static IsSupportedTypedObjectMetadata(storedObjectMetadata?: StoredObject["metadata"]): boolean;
+    static IsSupportedTypedObjectMetadata(storedObjectMetadata?: StoredObject["metadata"]): storedObjectMetadata is TypedMetadata;
     static FromStoredObject(id: string, storedObject: StoredObject): TypedObject;
     addImage(options: AddImageOptions): void;
     addDataTable(options: AddDataTableOptions): void;

package/dist/types.d.ts

@@ -7,8 +7,8 @@ export interface AuthenticatedUser {
     jwt: string;
     contextId: string;
     platformId: string;
-    platformUserId: string;
     resourceLinkId: string;
+    platformUserId: string;
 }
 export interface AnonymousUser {
     type: "anonymous";
@@ -18,21 +18,18 @@ export type FirebaseObjectStorageUser = AuthenticatedUser | AnonymousUser;
 export interface FirebaseObjectStorageConfig {
     version: 1;
     type: "firebase";
-    app: any;
+    app: Object;
     root: string;
     user: FirebaseObjectStorageUser;
+    questionId: string;
 }
 export type ObjectStorageConfig = DemoObjectStorageConfig | FirebaseObjectStorageConfig;
 export interface AddOptions {
     id?: string;
 }
 export interface IObjectStorage {
-    listMine(): Promise<ObjectWithId[]>;
-    listLinked(): Promise<ObjectWithId[]>;
-    list(questionIds: string[]): Promise<ObjectWithId[]>;
-    monitorMine(callback: MonitorCallback): DemonitorFunction;
-    monitorLinked(callback: MonitorCallback): DemonitorFunction;
-    monitor(questionIds: string[], callback: MonitorCallback): DemonitorFunction;
+    list(questionOrRefId: string): Promise<ObjectMetadataWithId[]>;
+    monitor(questionOrRefId: string, callback: MonitorCallback): DemonitorFunction;
     add(object: StoredObject, options?: AddOptions): Promise<string>;
     read(objectId: string): Promise<StoredObject | undefined>;
     readMetadata(objectId: string): Promise<ObjectMetadata | undefined>;
@@ -49,8 +46,18 @@ export interface StoredObject {
     metadata: ObjectMetadata;
     data: ObjectData;
 }
-export interface ObjectWithId extends StoredObject {
+export interface ObjectMetadataWithId {
+    id: string;
+    metadata: ObjectMetadata;
+}
+export interface ObjectDataWithId {
+    id: string;
+    data: ObjectData;
+}
+export interface ObjectWithId {
     id: string;
+    metadata: ObjectMetadata;
+    data: ObjectData;
 }
-export type MonitorCallback = (objects: ObjectWithId[]) => void;
+export type MonitorCallback = (objects: ObjectMetadataWithId[]) => void;
 export type DemonitorFunction = () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@concord-consortium/object-storage",
-  "version": "1.0.0-pre.5",
+  "version": "1.0.0-pre.6",
   "description": "A TypeScript library for object storage",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",