@genoacms/adapter-gcp 0.4.1 → 0.4.2

package/dist/config.d.ts

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

package/dist/services/authorization/index.d.ts

@@ -1,3 +1,3 @@
-import type { isEmailAdmins as isEmailAdminsT } from '@genoacms/cloudabstraction/authorization';
-declare const isEmailAdmins: isEmailAdminsT;
+import type { Adapter } from '@genoacms/cloudabstraction/authorization';
+declare const isEmailAdmins: Adapter.isEmailAdmins;
 export { isEmailAdmins };

package/dist/services/authorization/index.js

@@ -1,5 +1,5 @@
-import { ProjectsClient } from '@google-cloud/resource-manager';
 import config from '../../config.js';
+import { ProjectsClient } from '@google-cloud/resource-manager';
 const resourceManager = new ProjectsClient({
     projectId: config.authorization.projectId,
     credentials: config.authorization.credentials

package/dist/services/database/index.d.ts

@@ -1,7 +1,7 @@
-import type { database as databaseT } from '@genoacms/cloudabstraction';
-declare const createDocument: databaseT.createDocument;
-declare const getCollection: databaseT.getCollection;
-declare const getDocument: databaseT.getDocument;
-declare const updateDocument: databaseT.updateDocument;
-declare const deleteDocument: databaseT.deleteDocument;
+import type { Adapter } from '@genoacms/cloudabstraction/database';
+declare const createDocument: Adapter.createDocument;
+declare const getCollection: Adapter.getCollection;
+declare const getDocument: Adapter.getDocument;
+declare const updateDocument: Adapter.updateDocument;
+declare const deleteDocument: Adapter.deleteDocument;
 export { createDocument, getDocument, getCollection, updateDocument, deleteDocument };

package/dist/services/database/index.js

@@ -1,5 +1,5 @@
-import { Firestore } from '@google-cloud/firestore';
 import config from '../../config.js';
+import { Firestore } from '@google-cloud/firestore';
 const firestore = new Firestore({
     credentials: config.database.credentials,
     databaseId: config.database.databaseId,

package/dist/services/storage/index.d.ts

@@ -1,9 +1,9 @@
 import type { Adapter } from '@genoacms/cloudabstraction/storage';
-declare const getObject: Adapter['getObject'];
-declare const getPublicURL: Adapter['getPublicURL'];
-declare const getSignedURL: Adapter['getSignedURL'];
-declare const uploadObject: Adapter['uploadObject'];
-declare const deleteObject: Adapter['deleteObject'];
-declare const listDirectory: Adapter['listDirectory'];
-declare const createDirectory: Adapter['createDirectory'];
+declare const getObject: Adapter.getObject;
+declare const getPublicURL: Adapter.getPublicURL;
+declare const getSignedURL: Adapter.getSignedURL;
+declare const uploadObject: Adapter.uploadObject;
+declare const deleteObject: Adapter.deleteObject;
+declare const listDirectory: Adapter.listDirectory;
+declare const createDirectory: Adapter.createDirectory;
 export { getObject, getPublicURL, getSignedURL, uploadObject, deleteObject, listDirectory, createDirectory };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genoacms/adapter-gcp",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "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.4.0",
+    "@genoacms/cloudabstraction": "0.4.2-fix.2",
     "@google-cloud/firestore": "^7.1.0",
     "@google-cloud/resource-manager": "^5.1.0",
     "@google-cloud/storage": "^7.7.0"
@@ -38,9 +38,9 @@
     "dist"
   ],
   "exports": {
-    "./auth": {
-      "import": "./dist/services/auth/index.js",
-      "types": "./dist/services/auth/index.d.ts"
+    "./authorization": {
+      "import": "./dist/services/authorization/index.js",
+      "types": "./dist/services/authorization/index.d.ts"
     },
     "./database": {
       "import": "./dist/services/database/index.js",

package/src/genoa.config.d.ts

@@ -25,6 +25,6 @@ interface StorageConfig {
   buckets: string[]
 }
 
-interface ConfigGCP extends Config<object, DatabaseConfig, StorageConfig> {}
+interface ConfigGCP extends Config<object, object, DatabaseConfig, StorageConfig> {}
 
 export default ConfigGCP

package/src/services/authorization/index.ts

@@ -1,6 +1,6 @@
-import { ProjectsClient } from '@google-cloud/resource-manager'
+import type { Adapter } from '@genoacms/cloudabstraction/authorization'
 import config from '../../config.js'
-import type { isEmailAdmins as isEmailAdminsT } from '@genoacms/cloudabstraction/authorization'
+import { ProjectsClient } from '@google-cloud/resource-manager'
 
 const resourceManager = new ProjectsClient({
   projectId: config.authorization.projectId,
@@ -8,7 +8,7 @@ const resourceManager = new ProjectsClient({
 })
 const projectId = config.authorization.projectId
 
-const isEmailAdmins: isEmailAdminsT = async (email: string) => {
+const isEmailAdmins: Adapter.isEmailAdmins = async (email: string) => {
   const resource = `projects/${projectId}`
   const role = resource + '/roles/genoacms'
   const data = await resourceManager.getIamPolicy({ resource })

package/src/services/database/index.ts

@@ -1,6 +1,13 @@
-import { Firestore } from '@google-cloud/firestore'
+import type {
+  Adapter,
+  CollectionSnapshot,
+  Document,
+  DocumentReference,
+  DocumentSnapshot,
+  UpdateSnapshot
+} from '@genoacms/cloudabstraction/database'
 import config from '../../config.js'
-import type { database as databaseT } from '@genoacms/cloudabstraction'
+import { Firestore } from '@google-cloud/firestore'
 
 const firestore = new Firestore({
   credentials: config.database.credentials,
@@ -8,24 +15,24 @@ const firestore = new Firestore({
   projectId: config.database.projectId
 })
 
-const createDocument: databaseT.createDocument = async (reference, data) => {
+const createDocument: Adapter.createDocument = async (reference, data) => {
   const document = await firestore.collection(reference.name).add(data)
-  const documentReference: databaseT.DocumentReference<typeof reference> = {
+  const documentReference: DocumentReference<typeof reference> = {
     collection: reference,
     id: document.id
   }
   return {
     reference: documentReference,
     data
-  } satisfies databaseT.DocumentSnapshot<typeof reference>
+  } satisfies DocumentSnapshot<typeof reference>
 }
 
-const getCollection: databaseT.getCollection = async (reference) => {
+const getCollection: Adapter.getCollection = async (reference) => {
   const collection = await firestore.collection(reference.name).get()
-  const documents: databaseT.CollectionSnapshot<typeof reference> = []
+  const documents: CollectionSnapshot<typeof reference> = []
 
   collection.forEach(document => {
-    const documentData: databaseT.Document<typeof reference.schema> = {}
+    const documentData: Document<typeof reference.schema> = {}
     Object.keys(reference.schema.properties).forEach(key => {
       documentData[key] = document.get(key)
     })
@@ -35,35 +42,35 @@ const getCollection: databaseT.getCollection = async (reference) => {
         collection: reference,
         id: document.id
       },
-      data: document.data() as databaseT.Document<typeof reference.schema>
+      data: document.data() as Document<typeof reference.schema>
     })
   })
   return documents
 }
 
-const getDocument: databaseT.getDocument = async ({ collection, id }) => {
+const getDocument: Adapter.getDocument = async ({ collection, id }) => {
   const document = await firestore.collection(collection.name).doc(id).get()
   if (!document.exists) return undefined
-  const documentReference: databaseT.DocumentReference<typeof collection> = {
+  const documentReference: DocumentReference<typeof collection> = {
     collection,
     id
   }
-  const documentSnapshot: databaseT.DocumentSnapshot<typeof collection> = {
+  const documentSnapshot: DocumentSnapshot<typeof collection> = {
     reference: documentReference,
-    data: document.data() as databaseT.Document<typeof collection>
+    data: document.data() as Document<typeof collection>
   }
   return documentSnapshot
 }
 
-const updateDocument: databaseT.updateDocument = async (reference, document) => {
+const updateDocument: Adapter.updateDocument = async (reference, document) => {
   await firestore.collection(reference.collection.name).doc(reference.id).update(document)
   return {
     reference,
     data: document
-  } satisfies databaseT.UpdateSnapshot<typeof reference.collection>
+  } satisfies UpdateSnapshot<typeof reference.collection>
 }
 
-const deleteDocument: databaseT.deleteDocument = async (reference) => {
+const deleteDocument: Adapter.deleteDocument = async (reference) => {
   await firestore.collection(reference.collection.name).doc(reference.id).delete()
 }
 

package/src/services/storage/index.ts

@@ -1,6 +1,6 @@
 import type {
-  StorageObject,
-  Adapter
+  Adapter,
+  StorageObject
 } from '@genoacms/cloudabstraction/storage'
 import { type Bucket, Storage, type File } from '@google-cloud/storage'
 import config from '../../config.js'
@@ -15,7 +15,7 @@ const getBucket = (name: string): Bucket => {
   return bucket
 }
 
-const getObject: Adapter['getObject'] = async ({ bucket, name }) => {
+const getObject: Adapter.getObject = async ({ bucket, name }) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(name)
 
@@ -24,13 +24,13 @@ const getObject: Adapter['getObject'] = async ({ bucket, name }) => {
   }
 }
 
-const getPublicURL: Adapter['getPublicURL'] = async ({ bucket, name }) => {
+const getPublicURL: Adapter.getPublicURL = async ({ bucket, name }) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(name)
   return file.publicUrl()
 }
 
-const getSignedURL: Adapter['getSignedURL'] = async ({ bucket, name }) => {
+const getSignedURL: Adapter.getSignedURL = async ({ bucket, name }) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(name)
   const expires = new Date()
@@ -42,19 +42,19 @@ const getSignedURL: Adapter['getSignedURL'] = async ({ bucket, name }) => {
   return url
 }
 
-const uploadObject: Adapter['uploadObject'] = async ({ bucket, name }, stream) => {
+const uploadObject: Adapter.uploadObject = async ({ bucket, name }, stream) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(name)
   await file.save(stream)
 }
 
-const deleteObject: Adapter['deleteObject'] = async ({ bucket, name }) => {
+const deleteObject: Adapter.deleteObject = async ({ bucket, name }) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(name)
   await file.delete()
 }
 
-const listDirectory: Adapter['listDirectory'] = async ({ bucket, name }, listingParams = {}) => {
+const listDirectory: Adapter.listDirectory = async ({ bucket, name }, listingParams = {}) => {
   const bucketInstance = getBucket(bucket)
   const options = {
     autoPaginate: false,
@@ -81,7 +81,7 @@ const listDirectory: Adapter['listDirectory'] = async ({ bucket, name }, listing
   }
 }
 
-const createDirectory: Adapter['createDirectory'] = async ({ bucket, name }) => {
+const createDirectory: Adapter.createDirectory = async ({ bucket, name }) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(`${name}/.folderPlaceholder`)
   await file.save('')