@genoacms/adapter-gcp 0.5.2-fix.9 → 0.7.1-fix.1

package/dist/services/authorization/index.js

@@ -1,10 +1,13 @@
 import config from '../../config.js';
 import { ProjectsClient } from '@google-cloud/resource-manager';
+const authorizationConfig = config.authorization.providers.find((provider) => provider.name === 'gcp');
+if (!authorizationConfig)
+    throw new Error('authorization-provider-not-found');
+const projectId = authorizationConfig.projectId;
 const resourceManager = new ProjectsClient({
-    projectId: config.authorization.projectId,
-    credentials: config.authorization.credentials
+    projectId,
+    credentials: authorizationConfig.credentials
 });
-const projectId = config.authorization.projectId;
 const isEmailAdmins = async (email) => {
     const resource = `projects/${projectId}`;
     const role = resource + '/roles/genoacms';

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

@@ -1,7 +1,7 @@
 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;
+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,9 +1,12 @@
 import config from '../../config.js';
 import { Firestore } from '@google-cloud/firestore';
+const firestoreConfig = config.database.providers.find((provider) => provider.name === 'firestore');
+if (!firestoreConfig)
+    throw new Error('firestore-provider-not-found');
 const firestore = new Firestore({
-    credentials: config.database.credentials,
-    databaseId: config.database.databaseId,
-    projectId: config.database.projectId
+    credentials: firestoreConfig.credentials,
+    databaseId: firestoreConfig.databaseId,
+    projectId: firestoreConfig.projectId
 });
 const createDocument = async (reference, data) => {
     const document = await firestore.collection(reference.name).add(data);

package/dist/services/deployment/index.js

@@ -1,4 +1,4 @@
-const svelteKitAdapter = '@sveltejs/adapter-node';
+const svelteKitAdapter = '@genoacms/sveltekit-adapter-cloud-run-functions';
 const deployProcedure = async () => {
     const deploy = (await import('./deploy.js')).default;
     await deploy();

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/dist/services/storage/storage.js

@@ -1,5 +1,8 @@
 import config from '../../config.js';
 import { Storage } from '@google-cloud/storage';
+const storageConfig = config.storage.providers.find((provider) => provider.name === 'gcs');
+if (!storageConfig)
+    throw new Error('storage-provider-not-found');
 const storage = new Storage({
     credentials: config.storage.credentials
 });

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@genoacms/adapter-gcp",
-  "version": "0.5.2-fix.9",
+  "version": "0.7.1-fix.1",
+  "type": "module",
   "description": "Implementation of abstraction layer of GenoaCMS for GCP",
   "repository": {
     "type": "git",
@@ -15,11 +16,13 @@
     "url": "https://github.com/GenoaCMS/adapter-gcp/issues"
   },
   "homepage": "https://github.com/GenoaCMS/adapter-gcp#readme",
-  "type": "module",
+  "publishConfig": {
+    "provenance": true
+  },
   "dependencies": {
-    "@genoacms/cloudabstraction": "^0.5.2",
+    "@genoacms/cloudabstraction": "^0.7.1",
     "@google-cloud/firestore": "^7.1.0",
-    "@google-cloud/functions": "^3.2.0",
+    "@google-cloud/functions": "^3.4.0",
     "@google-cloud/resource-manager": "^5.1.0",
     "@google-cloud/storage": "^7.7.0",
     "archiver": "^7.0.0"
@@ -37,7 +40,7 @@
     "vitest": "^1.0.4"
   },
   "peerDependencies": {
-    "@sveltejs/adapter-node": "^4.0.1"
+    "@genoacms/sveltekit-adapter-cloud-run-functions": "^1.0.0"
   },
   "files": [
     "src",

package/src/services/authorization/index.ts

@@ -1,12 +1,14 @@
-import type { Adapter } from '@genoacms/cloudabstraction/authorization'
+import type { Adapter, AuthorizationProvider } from '@genoacms/cloudabstraction/authorization'
 import config from '../../config.js'
 import { ProjectsClient } from '@google-cloud/resource-manager'
 
+const authorizationConfig = config.authorization.providers.find((provider: AuthorizationProvider) => provider.name === 'gcp')
+if (!authorizationConfig) throw new Error('authorization-provider-not-found')
+const projectId = authorizationConfig.projectId
 const resourceManager = new ProjectsClient({
-  projectId: config.authorization.projectId,
-  credentials: config.authorization.credentials
+  projectId,
+  credentials: authorizationConfig.credentials
 })
-const projectId = config.authorization.projectId
 
 const isEmailAdmins: Adapter.isEmailAdmins = async (email: string) => {
   const resource = `projects/${projectId}`

package/src/services/database/index.ts

@@ -1,5 +1,6 @@
 import type {
   Adapter,
+  DatabaseProvider,
   CollectionSnapshot,
   Document,
   DocumentReference,
@@ -9,13 +10,15 @@ import type {
 import config from '../../config.js'
 import { Firestore } from '@google-cloud/firestore'
 
+const firestoreConfig = config.database.providers.find((provider: DatabaseProvider) => provider.name === 'firestore')
+if (!firestoreConfig) throw new Error('firestore-provider-not-found')
 const firestore = new Firestore({
-  credentials: config.database.credentials,
-  databaseId: config.database.databaseId,
-  projectId: config.database.projectId
+  credentials: firestoreConfig.credentials,
+  databaseId: firestoreConfig.databaseId,
+  projectId: firestoreConfig.projectId
 })
 
-const createDocument: Adapter.createDocument = async (reference, data) => {
+const createDocument: Adapter['createDocument'] = async (reference, data) => {
   const document = await firestore.collection(reference.name).add(data)
   const documentReference: DocumentReference<typeof reference> = {
     collection: reference,
@@ -27,7 +30,7 @@ const createDocument: Adapter.createDocument = async (reference, data) => {
   } satisfies DocumentSnapshot<typeof reference>
 }
 
-const getCollection: Adapter.getCollection = async (reference) => {
+const getCollection: Adapter['getCollection'] = async (reference) => {
   const collection = await firestore.collection(reference.name).get()
   const documents: CollectionSnapshot<typeof reference> = []
 
@@ -48,7 +51,7 @@ const getCollection: Adapter.getCollection = async (reference) => {
   return documents
 }
 
-const getDocument: Adapter.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: DocumentReference<typeof collection> = {
@@ -62,7 +65,7 @@ const getDocument: Adapter.getDocument = async ({ collection, id }) => {
   return documentSnapshot
 }
 
-const updateDocument: Adapter.updateDocument = async (reference, document) => {
+const updateDocument: Adapter['updateDocument'] = async (reference, document) => {
   await firestore.collection(reference.collection.name).doc(reference.id).update(document)
   return {
     reference,
@@ -70,7 +73,7 @@ const updateDocument: Adapter.updateDocument = async (reference, document) => {
   } satisfies UpdateSnapshot<typeof reference.collection>
 }
 
-const deleteDocument: Adapter.deleteDocument = async (reference) => {
+const deleteDocument: Adapter['deleteDocument'] = async (reference) => {
   await firestore.collection(reference.collection.name).doc(reference.id).delete()
 }
 

package/src/services/deployment/index.ts

@@ -1,6 +1,6 @@
 import type { Adapter } from '@genoacms/cloudabstraction/deployment'
 
-const svelteKitAdapter: Adapter.svelteKitAdapter = '@sveltejs/adapter-node'
+const svelteKitAdapter: Adapter.svelteKitAdapter = '@genoacms/sveltekit-adapter-cloud-run-functions'
 
 const deployProcedure: Adapter.deployProcedure = async () => {
   const deploy = (await import('./deploy.js')).default

package/src/services/storage/index.ts

@@ -6,7 +6,7 @@ import { type File } from '@google-cloud/storage'
 import { getBucket } from './storage.js'
 import { join } from 'path'
 
-const getObject: Adapter.getObject = async ({ bucket, name }) => {
+const getObject: Adapter['getObject'] = async ({ bucket, name }) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(name)
 
@@ -15,13 +15,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 }, expires) => {
+const getSignedURL: Adapter['getSignedURL'] = async ({ bucket, name }, expires) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(name)
   const [url] = await file.getSignedUrl({
@@ -31,19 +31,19 @@ const getSignedURL: Adapter.getSignedURL = async ({ bucket, name }, expires) =>
   return url
 }
 
-const uploadObject: Adapter.uploadObject = async ({ bucket, name }, stream, options) => {
+const uploadObject: Adapter['uploadObject'] = async ({ bucket, name }, stream, options) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(name)
   await file.save(stream, options)
 }
 
-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,
@@ -70,7 +70,7 @@ const listDirectory: Adapter.listDirectory = async ({ bucket, name }, listingPar
   }
 }
 
-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('')

package/src/services/storage/storage.ts

@@ -1,6 +1,9 @@
 import config from '../../config.js'
 import { type Bucket, Storage } from '@google-cloud/storage'
+import type { StorageProvider } from '@genoacms/cloudabstraction/storage'
 
+const storageConfig = config.storage.providers.find((provider: StorageProvider) => provider.name === 'gcs')
+if (!storageConfig) throw new Error('storage-provider-not-found')
 const storage = new Storage({
   credentials: config.storage.credentials
 })