@pi-r/gcp 0.3.4 → 0.3.6

package/LICENSE

@@ -1,7 +1,7 @@
-Copyright 2024 An Pham
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
+Copyright 2023 An Pham
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,7 +1,5 @@
-# @pi-r/gcp
-
-PEP 402 - Forever
-
-## LICENSE
-
+# @pi-r/gcp
+
+## LICENSE
+
 MIT

package/client/index.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CLOUD_UPLOAD_FROMDISK = exports.getProjectId = exports.createBucketRequest = exports.setPredefinedAcl = exports.setPublicRead = exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.createDatabaseClient = exports.createStorageClient = exports.validateDatabase = exports.validateStorage = exports.isFirebaseApp = void 0;
+exports.getProjectId = exports.createBucketRequest = exports.setPredefinedAcl = exports.setPublicRead = exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.createDatabaseClient = exports.createStorageClient = exports.validateDatabase = exports.validateStorage = exports.isFirebaseApp = void 0;
 const path = require("path");
-const storage = require("@google-cloud/storage");
-const firestore = require("@google-cloud/firestore");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
@@ -63,29 +61,23 @@ async function hasBucket(client) {
     const [exists] = await client.exists().catch(err => isErrorConflict(err) ? [true] : [false]);
     return exists;
 }
-function updatePredefinedAcl(acl, values, metadata = {}) {
+function updatePredefinedAcl(acl, values, metadata) {
+    const { generation, userProject } = metadata;
     const items = [];
-    let projectNumber;
-    if ('projectNumber' in metadata || 'defaultObjectAcl' in metadata) {
-        let defaultObjectAcl;
-        ({ projectNumber, defaultObjectAcl } = metadata);
-        if (projectNumber === undefined && (0, types_1.isArray)(defaultObjectAcl)) {
-            const target = defaultObjectAcl.find(item => { var _a; return (_a = item.projectTeam) === null || _a === void 0 ? void 0 : _a.projectNumber; });
-            if (target !== undefined) {
-                projectNumber = target.projectTeam.projectNumber;
-            }
-        }
-    }
     for (const target of acl.default ? [acl, acl.default] : [acl]) {
         items.push(...values.map(async (value) => {
+            var _a;
+            if (generation !== undefined) {
+                (_a = value.generation) !== null && _a !== void 0 ? _a : (value.generation = +generation);
+            }
+            if (userProject) {
+                value.userProject || (value.userProject = userProject);
+            }
             const entity = await target.get({ entity: value.entity }).catch(() => null);
             if (entity) {
                 return (0, types_1.isString)(value.role) ? target.update(value) : target.delete(value);
             }
             if ((0, types_1.isString)(value.role)) {
-                if (projectNumber !== undefined) {
-                    value.userProject || (value.userProject = projectNumber.toString());
-                }
                 return target.add(value);
             }
         }));
@@ -108,8 +100,8 @@ function setUniformBucketLevel(bucket, enabled) {
 const getFirebasePackageName = (credential) => credential.apiKey && credential.authDomain ? 'firebase' : 'firebase-admin';
 const hasKeyFile = (credential) => !!(credential.keyFile || credential.keyFilename || process.env.GOOGLE_APPLICATION_CREDENTIALS);
 const isErrorConflict = (err) => (err instanceof Error) && err.code === 409;
-function isFirebaseApp(credential, store, admin) {
-    return !!(credential.apiKey && credential.authDomain && (store || credential.databaseURL) || credential.product === 'firebase' && process.env.GOOGLE_APPLICATION_CREDENTIALS) && (!admin || !credential.admin);
+function isFirebaseApp(credential, storage, admin) {
+    return !!(credential.apiKey && credential.authDomain && (storage || credential.databaseURL) || credential.product === 'firebase' && process.env.GOOGLE_APPLICATION_CREDENTIALS) && (!admin || !credential.admin);
 }
 exports.isFirebaseApp = isFirebaseApp;
 function validateStorage(credential) {
@@ -121,60 +113,59 @@ function validateDatabase(credential, data) {
 }
 exports.validateDatabase = validateDatabase;
 function createStorageClient(credential, bucket) {
-    if (isFirebaseApp(credential, true)) {
-        let packageName = '';
-        try {
+    let packageName = '';
+    try {
+        if (isFirebaseApp(credential, true)) {
             if (bucket) {
                 credential.storageBucket = bucket;
             }
             packageName = getFirebasePackageName(credential);
             return getApp(credential, false);
         }
-        catch (err) {
-            this.checkPackage(err, packageName, { passThrough: true });
-            throw err;
-        }
+        credential.projectId || (credential.projectId = getProjectId(credential));
+        const { Storage } = require(packageName = '@google-cloud/storage');
+        return new Storage(credential);
+    }
+    catch (err) {
+        this.checkPackage(err, packageName, { passThrough: true });
+        throw err;
     }
-    credential.projectId || (credential.projectId = getProjectId(credential));
-    return new storage.Storage(credential);
 }
 exports.createStorageClient = createStorageClient;
 function createDatabaseClient(credential, data) {
     let packageName = '';
     try {
-        let product, name, table;
-        if (data) {
-            ({ product, name, table } = data);
-        }
+        const product = data === null || data === void 0 ? void 0 : data.product;
         if (product === 'firebase' || isFirebaseApp(credential)) {
             packageName = getFirebasePackageName(credential);
             return getApp(credential, true);
         }
         credential.projectId || (credential.projectId = getProjectId(credential));
         if (data) {
-            if (product === 'spanner' || !product && name && data.database) {
+            if (product === 'spanner' || !product && data.name && data.database) {
                 const { Spanner } = require(packageName = '@google-cloud/spanner');
                 return new Spanner(credential);
             }
-            if (product === 'bigtable' || !product && name && table) {
+            if (product === 'bigtable' || !product && data.name && data.table) {
                 const { Bigtable } = require(packageName = '@google-cloud/bigtable');
                 return new Bigtable(credential);
             }
-            if (product === 'bigquery' || !product && !table && typeof data.query === 'string') {
+            if (product === 'bigquery' || !product && !data.table && typeof data.query === 'string') {
                 const { BigQuery } = require(packageName = '@google-cloud/bigquery');
                 return new BigQuery(credential);
             }
-            if (product === 'datastore' || !product && !table && (data.keys || data.query)) {
+            if (product === 'datastore' || !product && !data.table && (data.keys || data.query)) {
                 const { Datastore } = require(packageName = '@google-cloud/datastore');
                 return new Datastore(credential);
             }
         }
+        const { Firestore } = require(packageName = '@google-cloud/firestore');
+        return new Firestore(credential);
     }
     catch (err) {
         this.checkPackage(err, packageName, { passThrough: true });
         throw err;
     }
-    return new firestore.Firestore(credential);
 }
 exports.createDatabaseClient = createDatabaseClient;
 async function createBucket(credential, bucket, publicRead, service = 'gcp') {
@@ -185,14 +176,14 @@ async function createBucketV2(credential, bucket, acl, options, service = 'gcp')
     if (isFirebaseApp(credential, true, true)) {
         return false;
     }
-    const instance = createStorageClient.call(this, credential, bucket);
-    if (await hasBucket(instance.bucket(bucket))) {
+    const storage = createStorageClient.call(this, credential, bucket);
+    if (await hasBucket(storage.bucket(bucket))) {
         if (acl) {
             await setBucketPolicy.call(this, credential, bucket, { acl }, service);
         }
         return true;
     }
-    return instance.createBucket(bucket, options)
+    return storage.createBucket(bucket, options)
         .then(async ([target]) => {
         this.formatMessage(64, service, ["Bucket created", bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
         if (acl) {
@@ -216,7 +207,7 @@ async function setBucketPolicy(credential, bucket, options, service = 'gcp') {
     }
     const client = createStorageClient.call(this, credential, bucket).bucket(bucket);
     if (!await hasBucket(client)) {
-        this.formatFail(64, service, ["Bucket does not exist", bucket], (0, types_1.errorMessage)(service, "Bucket does not exist"), { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+        this.formatFail(64, service, ["Bucket does not exist", bucket], (0, util_1.formatError)(service, "Bucket does not exist"), { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
         return false;
     }
     const errors = [];
@@ -227,7 +218,7 @@ async function setBucketPolicy(credential, bucket, options, service = 'gcp') {
             case 'private':
             case 'projectPrivate':
                 await client.makePrivate(options).catch(err => !isErrorConflict(err) && errors.push(err));
-                await setPredefinedAcl.call(this, client.acl, acl, client, '', (_a = options.bucket) === null || _a === void 0 ? void 0 : _a.metadata).catch(err => errors.push(err));
+                await setPredefinedAcl.call(this, client.acl, acl, client, '', (_a = options.bucket) === null || _a === void 0 ? void 0 : _a.metadata);
                 break;
             case 'authenticatedRead':
                 await client.makePublic(options).catch(err => !isErrorConflict(err) && errors.push(err));
@@ -254,7 +245,7 @@ async function setBucketPolicy(credential, bucket, options, service = 'gcp') {
         }
     }
     if (options.acl && (options.acl = options.acl.filter(user => (0, types_1.isString)(user.entity))).length) {
-        errors.push(...await updatePredefinedAcl(client.acl, options.acl, options.metadata));
+        errors.push(...await updatePredefinedAcl(client.acl, options.acl, options));
     }
     if (errors.length) {
         this.formatFail(64, service, ["Unable to update bucket policy", bucket], errors[0], { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
@@ -269,12 +260,11 @@ function setBucketWebsite(credential, bucket, options, service = 'gcp') {
         return Promise.resolve(false);
     }
     const website = {};
-    const { indexPage, errorPage } = options;
-    if ((0, types_1.isString)(indexPage)) {
-        website.mainPageSuffix = indexPage;
+    if ((0, types_1.isString)(options.indexPage)) {
+        website.mainPageSuffix = options.indexPage;
     }
-    if ((0, types_1.isString)(errorPage)) {
-        website.notFoundPage = errorPage;
+    if ((0, types_1.isString)(options.errorPage)) {
+        website.notFoundPage = options.errorPage;
     }
     return createStorageClient.call(this, credential, bucket).bucket(bucket).setMetadata({ website })
         .then(() => {
@@ -292,7 +282,7 @@ function deleteObjects(credential, Bucket, service) {
 }
 exports.deleteObjects = deleteObjects;
 async function deleteObjectsV2(credential, bucket, recursive = true, service = 'gcp') {
-    const instance = createStorageClient.call(this, credential, bucket);
+    const storage = createStorageClient.call(this, credential, bucket);
     const errors = [];
     let promise;
     if (isFirebaseApp(credential, true, true)) {
@@ -300,7 +290,7 @@ async function deleteObjectsV2(credential, bucket, recursive = true, service = '
         const files = [];
         await (async function recurse(prefix) {
             try {
-                const { items, prefixes } = await listAll(ref(instance, prefix));
+                const { items, prefixes } = await listAll(ref(storage, prefix));
                 if (items.length) {
                     files.push(...items.map(value => value.fullPath));
                 }
@@ -315,11 +305,11 @@ async function deleteObjectsV2(credential, bucket, recursive = true, service = '
             }
         })('');
         if (files.length) {
-            promise = Promise.allSettled(files.map(value => deleteObject(ref(instance, value))));
+            promise = Promise.allSettled(files.map(value => deleteObject(ref(storage, value))));
         }
     }
     else {
-        const client = instance.bucket(bucket);
+        const client = storage.bucket(bucket);
         if (await hasBucket(client)) {
             if (recursive) {
                 return client.deleteFiles({ force: true }).then(() => this.formatMessage(64, service, "Bucket emptied" + ' (recursive)', bucket, { ...Cloud.LOG_CLOUD_COMMAND }));
@@ -385,7 +375,9 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     };
     const closeClient = () => {
         const fs = clients[3];
-        fs === null || fs === void 0 ? void 0 : fs.terminate();
+        if (fs) {
+            fs.terminate();
+        }
     };
     const getFamily = (data, row, family) => {
         const familyData = data[family];
@@ -528,30 +520,29 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 if ((0, types_1.isArray)(orderBy)) {
                     const sort = require('@firebase/database');
                     for (const items of orderBy) {
-                        if (!(0, types_1.isArray)(items)) {
-                            continue;
-                        }
-                        const method = items[0];
-                        switch (method) {
-                            case 'orderByChild':
-                                constraints.push(sort.orderByChild(items[1]));
-                                break;
-                            case 'orderByKey':
-                            case 'orderByValue':
-                            case 'orderByPriority':
-                                constraints.push(sort[method]());
-                                break;
-                            case 'limitToFirst':
-                            case 'limitToLast':
-                                constraints.push(sort[method](limiter = +items[1]));
-                                break;
-                            case 'startAt':
-                            case 'startAfter':
-                            case 'endAt':
-                            case 'endBefore':
-                            case 'equalTo':
-                                constraints.push(sort[method](items[1], items[2]));
-                                break;
+                        if ((0, types_1.isArray)(items)) {
+                            const method = items[0];
+                            switch (method) {
+                                case 'orderByChild':
+                                    constraints.push(sort.orderByChild(items[1]));
+                                    break;
+                                case 'orderByKey':
+                                case 'orderByValue':
+                                case 'orderByPriority':
+                                    constraints.push(sort[method]());
+                                    break;
+                                case 'limitToFirst':
+                                case 'limitToLast':
+                                    constraints.push(sort[method](limiter = +items[1]));
+                                    break;
+                                case 'startAt':
+                                case 'startAfter':
+                                case 'endAt':
+                                case 'endBefore':
+                                case 'equalTo':
+                                    constraints.push(sort[method](items[1], items[2]));
+                                    break;
+                            }
                         }
                     }
                 }
@@ -597,22 +588,21 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             else {
                 const task = db.createQuery(item.kind);
                 for (const args of query) {
-                    if (!(0, types_1.isArray)(args)) {
-                        continue;
-                    }
-                    const method = args[0];
-                    switch (method) {
-                        case 'end':
-                        case 'filter':
-                        case 'groupBy':
-                        case 'hasAncestor':
-                        case 'limit':
-                        case 'offset':
-                        case 'order':
-                        case 'select':
-                        case 'start':
-                            task[method].apply(task, args.slice(1));
-                            break;
+                    if ((0, types_1.isArray)(args)) {
+                        const method = args[0];
+                        switch (method) {
+                            case 'end':
+                            case 'filter':
+                            case 'groupBy':
+                            case 'hasAncestor':
+                            case 'limit':
+                            case 'offset':
+                            case 'order':
+                            case 'select':
+                            case 'start':
+                                task[method].apply(task, args.slice(1));
+                                break;
+                        }
                     }
                 }
                 if (limit > 0) {
@@ -653,24 +643,23 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 }
                 let db = createClient(item, 3).collection(table);
                 for (const args of query) {
-                    if (!(0, types_1.isArray)(args)) {
-                        continue;
-                    }
-                    const method = args[0];
-                    switch (method) {
-                        case 'endAt':
-                        case 'endBefore':
-                        case 'limit':
-                        case 'limitToLast':
-                        case 'offset':
-                        case 'orderBy':
-                        case 'select':
-                        case 'startAfter':
-                        case 'startAt':
-                        case 'where':
-                        case 'withConverter':
-                            db = db[method].apply(db, args.slice(1));
-                            break;
+                    if ((0, types_1.isArray)(args)) {
+                        const method = args[0];
+                        switch (method) {
+                            case 'endAt':
+                            case 'endBefore':
+                            case 'limit':
+                            case 'limitToLast':
+                            case 'offset':
+                            case 'orderBy':
+                            case 'select':
+                            case 'startAfter':
+                            case 'startAt':
+                            case 'where':
+                            case 'withConverter':
+                                db = db[method].apply(db, args.slice(1));
+                                break;
+                        }
                     }
                 }
                 if ((0, types_1.isArray)(orderBy)) {
@@ -736,19 +725,25 @@ async function setPredefinedAcl(target, value, bucket, pathname = '', metadata =
                 items = [];
             }
             else {
-                acl = bucket ? [(await bucket.acl.get())[1]] : [];
+                if (bucket) {
+                    const [users] = await bucket.acl.get().catch(() => [[]]);
+                    acl = Array.isArray(users) ? users : [users];
+                }
+                else {
+                    acl = [];
+                }
                 items = [{ entity: 'allUsers' }, { entity: 'allAuthenticatedUsers' }];
             }
             switch (value) {
                 case 'private': {
-                    const owners = new Set(acl.filter(item => item.role === 'OWNER' && item.entity).map(item => item.entity));
+                    const owners = new Set(acl.filter(item => item.role === 'OWNER').map(item => item.entity));
                     if (owner) {
                         owners.add(owner);
                     }
                     if (owners.size) {
                         for (const user of acl) {
                             const entity = user.entity;
-                            if (entity && !owners.has(entity)) {
+                            if (!owners.has(entity)) {
                                 items.push({ entity });
                             }
                         }
@@ -758,18 +753,19 @@ async function setPredefinedAcl(target, value, bucket, pathname = '', metadata =
                 case 'projectPrivate':
                     for (const user of acl) {
                         const entity = user.entity;
-                        if (entity) {
-                            const role = entity.startsWith('project-') ? entity.startsWith('project-editors-') || entity.startsWith('project-owners-') ? 'OWNER' : 'READER' : '';
-                            items.push({ entity, role });
+                        if (entity.startsWith('project-')) {
+                            items.push({ ...user, role: entity.startsWith('project-editors-') || entity.startsWith('project-owners-') ? 'OWNER' : 'READER' });
+                        }
+                        else {
+                            items.push({ ...user, role: undefined });
                         }
                     }
                     break;
                 case 'bucketOwnerRead':
                     if (bucket && owner) {
                         for (const user of acl) {
-                            const entity = user.entity;
-                            if (entity && entity !== owner) {
-                                items.push({ entity, role: 'READER' });
+                            if (user.entity !== owner) {
+                                items.push({ entity: user.entity, role: 'READER' });
                             }
                         }
                     }
@@ -798,12 +794,10 @@ function createBucketRequest(credential) {
     for (const attr in credential) {
         switch (attr) {
             case 'archive':
-            case 'autoclass':
             case 'coldline':
             case 'cors':
             case 'customPlacementConfig':
             case 'dra':
-            case 'enableObjectRetention':
             case 'location':
             case 'multiRegional':
             case 'nearline':
@@ -837,4 +831,3 @@ function getProjectId(credential) {
     return '';
 }
 exports.getProjectId = getProjectId;
-exports.CLOUD_UPLOAD_FROMDISK = true;

package/download/index.js

@@ -2,10 +2,10 @@
 const path = require("path");
 const fs = require("fs");
 const https = require("https");
+const client_1 = require("@pi-r/gcp");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
 const Cloud = require("@e-mc/cloud");
-const client_1 = require("@pi-r/gcp");
 function download(credential, service = 'gcp') {
     const storage = client_1.createStorageClient.call(this, credential);
     return (data, callback) => {

package/package.json

@@ -1,29 +1,29 @@
-{
-  "name": "@pi-r/gcp",
-  "version": "0.3.4",
-  "description": "Google (GCP) cloud functions for E-mc.",
-  "main": "client/index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/pi-r.git",
-    "directory": "src/cloud/gcp"
-  },
-  "keywords": [
-    "squared",
-    "e-mc",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/anpham6/pi-r#readme",
-  "dependencies": {
-    "@e-mc/cloud": "^0.6.3",
-    "@e-mc/module": "^0.6.3",
-    "@e-mc/types": "^0.6.3",
-    "@google-cloud/firestore": "^6.8.0",
-    "@google-cloud/storage": "^7.9.0"
-  }
-}
+{
+  "name": "@pi-r/gcp",
+  "version": "0.3.6",
+  "description": "Google (GCP) cloud functions for E-mc.",
+  "main": "client/index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
+    "directory": "src/cloud/gcp"
+  },
+  "keywords": [
+    "squared",
+    "e-mc",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/anpham6/pi-r#readme",
+  "dependencies": {
+    "@e-mc/cloud": "^0.6.16",
+    "@e-mc/module": "^0.6.16",
+    "@e-mc/types": "^0.6.16",
+    "@google-cloud/firestore": "^6.8.0",
+    "@google-cloud/storage": "^7.12.0"
+  }
+}

package/types/index.d.ts

@@ -0,0 +1,40 @@
+import type { CloudDatabase, CloudStorage } from '@e-mc/types/lib/cloud';
+
+import type { StorageOptions } from '@google-cloud/storage';
+import type { PathType } from '@google-cloud/datastore';
+import type { AggregateSpec } from '@google-cloud/firestore';
+import type { entity } from '@google-cloud/datastore/build/src/entity';
+import type { FirebaseOptions as IFirebaseOptions } from '@firebase/app';
+import type { ServiceAccount } from 'firebase-admin/app';
+
+// @ts-ignore
+import type { GoogleAuthOptions } from 'google-auth-library';
+
+export type GCPStorage = CloudStorage<GCPStorageCredential, "gcp | gcloud">;
+
+export interface GCPStorageCredential extends StorageOptions, IFirebaseOptions {}
+
+export interface GCPDatabaseQuery<T = PlainObject> extends Omit<CloudDatabase<unknown, T, unknown, string | unknown[] | StandardMap, GCPDatabaseCredential>, "id"> {
+    source: "cloud";
+    service: "gcp" | "gcloud";
+    product?: "firestore" | "firebase" | "bigquery" | "bigtable" | "datastore" | "spanner";
+    database?: string;
+    id?: string | string[] | number;
+    updateType?: 0 | 1 | 2 | 3;
+    columns?: string[];
+    keys?: DatastoreKey | DatastoreKey[];
+    kind?: string | string[];
+    orderBy?: unknown[][];
+    aggregateSpec?: AggregateSpec;
+    flags?: number;
+}
+
+export type GCPDatabaseCredential = GoogleAuthOptions;
+
+export interface FirebaseOptions extends IFirebaseOptions {
+    product?: "firebase";
+    admin?: boolean | string | ServiceAccount;
+}
+
+export type DatastoreKey = string | PathType[] | entity.KeyOptions;
+export type BucketAcl = "authenticatedRead" | "private" | "projectPrivate" | "publicRead" | "publicReadWrite" | "bucketAccessUniform" | "bucketAccessACL";

package/upload/index.js

@@ -1,11 +1,11 @@
 "use strict";
 const path = require("path");
 const fs = require("fs");
+const client_1 = require("@pi-r/gcp");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
 const Cloud = require("@e-mc/cloud");
-const client_1 = require("@pi-r/gcp");
 const BUCKET_SESSION = new Set();
 const BUCKET_RESPONSE = {};
 const getBucketKey = (credential, bucket, acl = '') => Module.asString(credential, true) + bucket + '_' + acl;