@pi-r/gcp 0.2.9 → 0.2.11

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2020-24 Code Geass
+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:
 

package/README.md

@@ -1,6 +1,6 @@
 # @pi-r/gcp
 
-PEP 402 - Forever Josee + Nunnally
+PEP 402 - Forever
 
 ## LICENSE
 

package/client/index.js

@@ -66,8 +66,9 @@ function updatePredefinedAcl(acl, values, metadata) {
     const items = [];
     for (const target of acl.default ? [acl, acl.default] : [acl]) {
         items.push(...values.map(async (value) => {
+            var _a;
             if (generation !== undefined) {
-                value.generation ?? (value.generation = +generation);
+                (_a = value.generation) !== null && _a !== void 0 ? _a : (value.generation = +generation);
             }
             if (userProject) {
                 value.userProject || (value.userProject = userProject);
@@ -134,7 +135,7 @@ exports.createStorageClient = createStorageClient;
 function createDatabaseClient(credential, data) {
     let packageName = '';
     try {
-        const product = data?.product;
+        const product = data === null || data === void 0 ? void 0 : data.product;
         if (product === 'firebase' || isFirebaseApp(credential)) {
             packageName = getFirebasePackageName(credential);
             return getApp(credential, true);
@@ -200,6 +201,7 @@ async function createBucketV2(credential, bucket, acl, options, service = 'gcp')
 }
 exports.createBucketV2 = createBucketV2;
 async function setBucketPolicy(credential, bucket, options, service = 'gcp') {
+    var _a;
     if (isFirebaseApp(credential, true, true)) {
         return false;
     }
@@ -216,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, '', options.bucket?.metadata);
+                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));
@@ -702,6 +704,7 @@ function setPublicRead(acl, pathname, requested, service = 'gcp') {
 }
 exports.setPublicRead = setPublicRead;
 async function setPredefinedAcl(target, value, bucket, pathname = '', metadata = {}, requested = true, service = 'gcp') {
+    var _a;
     let revoke;
     if (metadata === true) {
         revoke = true;
@@ -716,7 +719,7 @@ async function setPredefinedAcl(target, value, bucket, pathname = '', metadata =
             items = [{ entity: 'allUsers' }, { entity: 'allAuthenticatedUsers', role: revoke ? undefined : 'READER' }];
             break;
         default: {
-            const owner = metadata.owner?.entity;
+            const owner = (_a = metadata.owner) === null || _a === void 0 ? void 0 : _a.entity;
             let acl = metadata.acl;
             if ((0, types_1.isArray)(acl)) {
                 items = [];
@@ -781,7 +784,7 @@ async function setPredefinedAcl(target, value, bucket, pathname = '', metadata =
             this.formatMessage(64, service, [`Unable to ${revoke ? 'revoke' : 'grant'} ` + value, bucket && pathname ? bucket.name + '/' + pathname : bucket ? bucket.name : pathname], errors[0], { ...Cloud.LOG_CLOUD_WARN });
         }
         else if (requested && (bucket || pathname)) {
-            this.formatMessage(64, service, [(revoke ? 'Revoke' : 'Grant') + ' ' + value, bucket?.name], pathname, { ...Cloud.LOG_CLOUD_COMMAND });
+            this.formatMessage(64, service, [(revoke ? 'Revoke' : 'Grant') + ' ' + value, bucket === null || bucket === void 0 ? void 0 : bucket.name], pathname, { ...Cloud.LOG_CLOUD_COMMAND });
         }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/gcp",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "Google (GCP) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,9 +20,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.5.5",
-    "@e-mc/module": "^0.5.5",
-    "@e-mc/types": "^0.5.5",
+    "@e-mc/cloud": "^0.5.6",
+    "@e-mc/module": "^0.5.6",
+    "@e-mc/types": "^0.5.6",
     "@google-cloud/firestore": "^6.8.0",
     "@google-cloud/storage": "^6.12.0"
   }

package/types/index.d.ts

@@ -0,0 +1,36 @@
+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 { entity } from '@google-cloud/datastore/build/src/entity';
+import type { FirebaseOptions as IFirebaseOptions } from '@firebase/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, unknown[] | StandardMap, GCPDatabaseCredential>, "id"> {
+    source: "cloud";
+    service: "gcp" | "gcloud";
+    product?: "firestore" | "firebase" | "bigquery" | "bigtable" | "datastore" | "spanner";
+    database?: string;
+    id?: ArrayOf<string>;
+    updateType?: 0 | 1 | 2 | 3;
+    columns?: string[];
+    keys?: ArrayOf<DatastoreKey>;
+    kind?: ArrayOf<string>;
+    orderBy?: unknown[][];
+}
+
+export type GCPDatabaseCredential = GoogleAuthOptions;
+
+export interface FirebaseOptions extends IFirebaseOptions {
+    product?: "firebase";
+    admin?: boolean;
+}
+
+export type DatastoreKey = string | PathType[] | entity.KeyOptions;
+export type BucketAcl = "authenticatedRead" | "private" | "projectPrivate" | "publicRead" | "publicReadWrite" | "bucketAccessUniform" | "bucketAccessACL";

package/upload/index.js

@@ -13,6 +13,7 @@ function upload(credential, service = 'gcp') {
     const storage = client_1.createStorageClient.call(this, credential);
     return async (data, callback) => {
         var _a;
+        var _b;
         const firebase = (0, client_1.isFirebaseApp)(credential, true, true);
         const { bucket, localUri } = data;
         const { pathname = '', fileGroup, contentType, metadata, endpoint, active, publicRead, acl, admin = {}, overwrite, options } = data.upload;
@@ -42,7 +43,7 @@ function upload(credential, service = 'gcp') {
         else {
             if (!BUCKET_SESSION.has(bucket)) {
                 const bucketAcl = admin.publicRead ? 'publicRead' : admin.acl;
-                const response = BUCKET_RESPONSE[_a = bucketKey = getBucketKey(credential, bucket, bucketAcl)] || (BUCKET_RESPONSE[_a] = client_1.createBucketV2.call(this, credential, bucket, bucketAcl, admin.configBucket?.create || (0, client_1.createBucketRequest)(credential)));
+                const response = BUCKET_RESPONSE[_b = bucketKey = getBucketKey(credential, bucket, bucketAcl)] || (BUCKET_RESPONSE[_b] = client_1.createBucketV2.call(this, credential, bucket, bucketAcl, ((_a = admin.configBucket) === null || _a === void 0 ? void 0 : _a.create) || (0, client_1.createBucketRequest)(credential)));
                 if (!await response) {
                     uploadResponse(null);
                     return;