@genoacms/adapter-gcp 0.3.0 → 0.3.8

package/dist/config.d.ts

@@ -1,2 +1,2 @@
-declare const _default: Config;
+declare const _default: Config<object, object, object>;
 export default _default;

package/dist/services/database/index.js

@@ -7,30 +7,53 @@ const firestore = new Firestore({
 });
 const createDocument = async (reference, data) => {
     const document = await firestore.collection(reference.name).add(data);
-    return {
+    const documentReference = {
         collection: reference,
         id: document.id
     };
+    return {
+        reference: documentReference,
+        data
+    };
 };
-const getCollection = async ({ name, schema }) => {
-    const collection = await firestore.collection(name).get();
+const getCollection = async (reference) => {
+    const collection = await firestore.collection(reference.name).get();
     const documents = [];
     collection.forEach(document => {
         const documentData = {};
-        Object.keys(schema.properties).forEach(key => {
+        Object.keys(reference.schema.properties).forEach(key => {
             documentData[key] = document.get(key);
         });
-        documents.push(document.data());
+        documents.push({
+            reference: {
+                collection: reference,
+                id: document.id
+            },
+            data: document.data()
+        });
     });
     return documents;
 };
 const getDocument = async ({ collection, id }) => {
     const document = await firestore.collection(collection.name).doc(id).get();
-    return document.data();
+    if (!document.exists)
+        return undefined;
+    const documentReference = {
+        collection,
+        id
+    };
+    const documentSnapshot = {
+        reference: documentReference,
+        data: document.data()
+    };
+    return documentSnapshot;
 };
 const updateDocument = async (reference, document) => {
     await firestore.collection(reference.collection.name).doc(reference.id).update(document);
-    return reference;
+    return {
+        reference,
+        data: document
+    };
 };
 const deleteDocument = async (reference) => {
     await firestore.collection(reference.collection.name).doc(reference.id).delete();

package/dist/services/storage/index.js

@@ -36,7 +36,7 @@ const listDirectory = async ({ bucket, name }, listingParams = {}) => {
     return files.map((file) => {
         return {
             name: file.name,
-            size: file.metadata.size,
+            size: file.metadata.size ? parseInt(file.metadata.size) : 0,
             lastModified: new Date(file.metadata.updated)
         };
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genoacms/adapter-gcp",
-  "version": "0.3.0",
+  "version": "0.3.8",
   "description": "Implementation of abstraction layer of GenoaCMS for GCP",
   "repository": {
     "type": "git",
@@ -17,7 +17,7 @@
   "homepage": "https://github.com/GenoaCMS/adapter-gcp#readme",
   "type": "module",
   "dependencies": {
-    "@genoacms/cloudabstraction": "^0.3.2",
+    "@genoacms/cloudabstraction": "^0.3.8",
     "@google-cloud/firestore": "^7.1.0",
     "@google-cloud/storage": "^7.4.0"
   },

package/src/genoa.config.d.ts

@@ -27,4 +27,4 @@ interface StorageConfig {
 
 interface ConfigGCP extends Config<object, DatabaseConfig, StorageConfig> {}
 
-export default Config
+export default ConfigGCP

package/src/services/database/index.ts

@@ -10,34 +10,57 @@ const firestore = new Firestore({
 
 const createDocument: databaseT.createDocument = async (reference, data) => {
   const document = await firestore.collection(reference.name).add(data)
-  return {
+  const documentReference: databaseT.DocumentReference<typeof reference> = {
     collection: reference,
     id: document.id
   }
+  return {
+    reference: documentReference,
+    data
+  } satisfies databaseT.DocumentSnapshot<typeof reference>
 }
 
-const getCollection: databaseT.getCollection = async ({ name, schema }) => {
-  const collection = await firestore.collection(name).get()
-  const documents: Array<databaseT.Document<typeof schema>> = []
+const getCollection: databaseT.getCollection = async (reference) => {
+  const collection = await firestore.collection(reference.name).get()
+  const documents: databaseT.CollectionSnapshot<typeof reference> = []
+
   collection.forEach(document => {
-    const documentData: databaseT.Document<typeof schema> = {}
-    Object.keys(schema.properties).forEach(key => {
+    const documentData: databaseT.Document<typeof reference.schema> = {}
+    Object.keys(reference.schema.properties).forEach(key => {
       documentData[key] = document.get(key)
     })
 
-    documents.push(document.data())
+    documents.push({
+      reference: {
+        collection: reference,
+        id: document.id
+      },
+      data: document.data() as databaseT.Document<typeof reference.schema>
+    })
   })
   return documents
 }
 
 const getDocument: databaseT.getDocument = async ({ collection, id }) => {
   const document = await firestore.collection(collection.name).doc(id).get()
-  return document.data() as any
+  if (!document.exists) return undefined
+  const documentReference: databaseT.DocumentReference<typeof collection> = {
+    collection,
+    id
+  }
+  const documentSnapshot: databaseT.DocumentSnapshot<typeof collection> = {
+    reference: documentReference,
+    data: document.data() as databaseT.Document<typeof collection>
+  }
+  return documentSnapshot
 }
 
 const updateDocument: databaseT.updateDocument = async (reference, document) => {
   await firestore.collection(reference.collection.name).doc(reference.id).update(document)
-  return reference
+  return {
+    reference,
+    data: document
+  } satisfies databaseT.UpdateSnapshot<typeof reference.collection>
 }
 
 const deleteDocument: databaseT.deleteDocument = async (reference) => {

package/src/services/storage/index.ts

@@ -45,7 +45,7 @@ const listDirectory: storageT.listDirectory = async ({ bucket, name }, listingPa
   return files.map((file) => {
     return {
       name: file.name,
-      size: file.metadata.size as number,
+      size: file.metadata.size ? parseInt(file.metadata.size as string) : 0,
       lastModified: new Date(file.metadata.updated as string)
     } satisfies storageT.StorageObject
   })