@infrab4a/connect-nestjs 1.1.0-beta.12 → 1.1.0-beta.2

package/index.cjs.js

@@ -7,12 +7,6 @@ var connect = require('@infrab4a/connect');
 var common = require('@nestjs/common');
 var nestjsFirebase = require('nestjs-firebase');
 
-const ES_CONFIG = 'ES_CONFIG';
-
-const HASURA_OPTIONS = 'HASURA_OPTIONS';
-
-const FIREBASE_STORAGE = 'FIREBASE_STORAGE';
-
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -48,6 +42,10 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
+const ES_CONFIG = 'ES_CONFIG';
+
+const HASURA_OPTIONS = 'HASURA_OPTIONS';
+
 exports.NativeElasticSearchAdapter = class NativeElasticSearchAdapter {
     constructor(config) {
         this.logger = connect.DebugHelper.from(this);
@@ -100,11 +98,11 @@ exports.NativeElasticSearchAdapter = class NativeElasticSearchAdapter {
             id: data.identifiersFields.length > 1
                 ? JSON.stringify(data.identifier)
                 : Object.values(data.identifier).shift().toString(),
-            document: data.toPlain(),
+            document: data,
         };
         try {
-            const res = await this.client.index(req);
-            logger.log({ req, res });
+            await this.client.index(req);
+            logger.log({ req, res: undefined });
         }
         catch (error) {
             logger.error({ req, res: error });
@@ -285,7 +283,7 @@ class ConnectFirestoreService {
 }
 
 var NestElasticSeachModule_1;
-exports.NestElasticSeachModule = NestElasticSeachModule_1 = class NestElasticSeachModule {
+let NestElasticSeachModule = NestElasticSeachModule_1 = class NestElasticSeachModule {
     static initializeApp(options) {
         return {
             module: NestElasticSeachModule_1,
@@ -294,7 +292,7 @@ exports.NestElasticSeachModule = NestElasticSeachModule_1 = class NestElasticSea
         };
     }
 };
-exports.NestElasticSeachModule = NestElasticSeachModule_1 = __decorate([
+NestElasticSeachModule = NestElasticSeachModule_1 = __decorate([
     common.Module({
         providers: [
             exports.NativeElasticSearchAdapter,
@@ -306,53 +304,31 @@ exports.NestElasticSeachModule = NestElasticSeachModule_1 = __decorate([
         ],
         exports: [connect.ProductsIndex],
     })
-], exports.NestElasticSeachModule);
-
-exports.NestStorageModule = class NestStorageModule {
-};
-exports.NestStorageModule = __decorate([
-    common.Module({
-        providers: [
-            {
-                provide: FIREBASE_STORAGE,
-                useFactory: (firebaseAdmin) => firebaseAdmin.storage,
-                inject: [nestjsFirebase.FirebaseConstants.FIREBASE_TOKEN],
-            },
-        ],
-        exports: [FIREBASE_STORAGE],
-    })
-], exports.NestStorageModule);
+], NestElasticSeachModule);
 
 var NestFirestoreModule_1;
 exports.NestFirestoreModule = NestFirestoreModule_1 = class NestFirestoreModule {
     static initializeApp(options) {
-        var _a;
         return {
             module: NestFirestoreModule_1,
             imports: [
                 nestjsFirebase.FirebaseModule.forRoot({
-                    googleApplicationCredential: (_a = options === null || options === void 0 ? void 0 : options.firebase) === null || _a === void 0 ? void 0 : _a.googleApplicationCredential,
+                    googleApplicationCredential: options.firebase.googleApplicationCredential,
                 }),
-                exports.NestStorageModule,
             ],
-            exports: [nestjsFirebase.FirebaseModule, exports.NestStorageModule],
+            exports: [nestjsFirebase.FirebaseModule],
         };
     }
 };
 exports.NestFirestoreModule = NestFirestoreModule_1 = __decorate([
     common.Module({
         providers: [
-            {
-                provide: ConnectFirestoreService,
-                useFactory: (firebaseAdmin) => new ConnectFirestoreService(firebaseAdmin.firestore),
-                inject: [nestjsFirebase.FirebaseConstants.FIREBASE_TOKEN],
-            },
             {
                 provide: 'FirestoreOptions',
-                useFactory: (connectFirestoreService) => ({
-                    firestore: connectFirestoreService,
+                useFactory: (firebaseAdmin) => ({
+                    firestore: new ConnectFirestoreService(firebaseAdmin.firestore),
                 }),
-                inject: [ConnectFirestoreService],
+                inject: [nestjsFirebase.FirebaseConstants.FIREBASE_TOKEN],
             },
             {
                 provide: 'BeautyProfileRepository',
@@ -572,7 +548,6 @@ exports.NestFirestoreModule = NestFirestoreModule_1 = __decorate([
             'SubscriptionMaterializationRepository',
             'SubscriptionSummaryRepository',
             connect.ProductVariantFirestoreRepository,
-            ConnectFirestoreService,
         ],
     })
 ], exports.NestFirestoreModule);
@@ -583,11 +558,11 @@ exports.NestHasuraGraphQLModule = NestHasuraGraphQLModule_1 = class NestHasuraGr
         return {
             module: NestHasuraGraphQLModule_1,
             providers: [{ provide: HASURA_OPTIONS, useValue: options }],
-            exports: [HASURA_OPTIONS],
         };
     }
 };
 exports.NestHasuraGraphQLModule = NestHasuraGraphQLModule_1 = __decorate([
+    common.Global(),
     common.Module({
         providers: [
             {
@@ -725,14 +700,14 @@ exports.NestConnectModule = NestConnectModule_1 = class NestConnectModule {
         return {
             module: NestConnectModule_1,
             imports: [
-                ...(options.firebase ? [exports.NestFirestoreModule.initializeApp({ firebase: options.firebase })] : []),
+                ...(options.firebase ? [exports.NestFirestoreModule] : []),
                 ...(connect.isNil(options === null || options === void 0 ? void 0 : options.hasura) ? [] : [exports.NestHasuraGraphQLModule.initializeApp(options.hasura)]),
-                ...(connect.isNil(options === null || options === void 0 ? void 0 : options.elasticSearch) ? [] : [exports.NestElasticSeachModule.initializeApp(options.elasticSearch)]),
+                ...(connect.isNil(options === null || options === void 0 ? void 0 : options.elasticSearch) ? [] : [NestElasticSeachModule.initializeApp(options.elasticSearch)]),
             ],
             exports: [
                 ...(options.firebase ? [exports.NestFirestoreModule] : []),
                 ...(connect.isNil(options === null || options === void 0 ? void 0 : options.hasura) ? [] : [exports.NestHasuraGraphQLModule]),
-                ...(connect.isNil(options === null || options === void 0 ? void 0 : options.elasticSearch) ? [] : [exports.NestElasticSeachModule]),
+                ...(connect.isNil(options === null || options === void 0 ? void 0 : options.elasticSearch) ? [] : [NestElasticSeachModule]),
             ],
         };
     }
@@ -744,6 +719,3 @@ exports.NestConnectModule = NestConnectModule_1 = __decorate([
 exports.ConnectCollectionService = ConnectCollectionService;
 exports.ConnectDocumentService = ConnectDocumentService;
 exports.ConnectFirestoreService = ConnectFirestoreService;
-exports.ES_CONFIG = ES_CONFIG;
-exports.FIREBASE_STORAGE = FIREBASE_STORAGE;
-exports.HASURA_OPTIONS = HASURA_OPTIONS;

package/index.esm.js

@@ -1,14 +1,8 @@
 import { Client } from '@elastic/elasticsearch';
 import { DebugHelper, isEmpty, NotFoundError, ProductsIndex, UserBeautyProfileFirestoreRepository, Buy2WinFirestoreRepository, CategoryFirestoreRepository, CheckoutFirestoreRepository, CheckoutSubscriptionFirestoreRepository, CouponFirestoreRepository, CampaignHashtagFirestoreRepository, CampaignDashboardFirestoreRepository, SubscriptionEditionFirestoreRepository, HomeFirestoreRepository, LeadFirestoreRepository, LegacyOrderFirestoreRepository, ShopMenuFirestoreRepository, OrderFirestoreRepository, PaymentFirestoreRepository, ProductFirestoreRepository, ShopSettingsFirestoreRepository, SubscriptionPaymentFirestoreRepository, SubscriptionPlanFirestoreRepository, SubscriptionProductFirestoreRepository, SubscriptionFirestoreRepository, UserFirestoreRepository, UserAddressFirestoreRepository, UserPaymentMethodFirestoreRepository, SubscriptionMaterializationFirestoreRepository, SubscriptionSummaryFirestoreRepository, ProductVariantFirestoreRepository, CategoryHasuraGraphQLRepository, ProductHasuraGraphQLRepository, CategoryFilterHasuraGraphQLRepository, ProductReviewsHasuraGraphQLRepository, VariantHasuraGraphQLRepository, FilterOptionHasuraGraphQLRepository, FilterHasuraGraphQLRepository, CategoryCollectionChildrenHasuraGraphQLRepository, WishlistHasuraGraphQLRepository, isNil } from '@infrab4a/connect';
-import { Injectable, Inject, Module } from '@nestjs/common';
+import { Injectable, Inject, Module, Global } from '@nestjs/common';
 import { FirebaseConstants, FirebaseModule } from 'nestjs-firebase';
 
-const ES_CONFIG = 'ES_CONFIG';
-
-const HASURA_OPTIONS = 'HASURA_OPTIONS';
-
-const FIREBASE_STORAGE = 'FIREBASE_STORAGE';
-
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -44,6 +38,10 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
+const ES_CONFIG = 'ES_CONFIG';
+
+const HASURA_OPTIONS = 'HASURA_OPTIONS';
+
 let NativeElasticSearchAdapter = class NativeElasticSearchAdapter {
     constructor(config) {
         this.logger = DebugHelper.from(this);
@@ -96,11 +94,11 @@ let NativeElasticSearchAdapter = class NativeElasticSearchAdapter {
             id: data.identifiersFields.length > 1
                 ? JSON.stringify(data.identifier)
                 : Object.values(data.identifier).shift().toString(),
-            document: data.toPlain(),
+            document: data,
         };
         try {
-            const res = await this.client.index(req);
-            logger.log({ req, res });
+            await this.client.index(req);
+            logger.log({ req, res: undefined });
         }
         catch (error) {
             logger.error({ req, res: error });
@@ -304,51 +302,29 @@ NestElasticSeachModule = NestElasticSeachModule_1 = __decorate([
     })
 ], NestElasticSeachModule);
 
-let NestStorageModule = class NestStorageModule {
-};
-NestStorageModule = __decorate([
-    Module({
-        providers: [
-            {
-                provide: FIREBASE_STORAGE,
-                useFactory: (firebaseAdmin) => firebaseAdmin.storage,
-                inject: [FirebaseConstants.FIREBASE_TOKEN],
-            },
-        ],
-        exports: [FIREBASE_STORAGE],
-    })
-], NestStorageModule);
-
 var NestFirestoreModule_1;
 let NestFirestoreModule = NestFirestoreModule_1 = class NestFirestoreModule {
     static initializeApp(options) {
-        var _a;
         return {
             module: NestFirestoreModule_1,
             imports: [
                 FirebaseModule.forRoot({
-                    googleApplicationCredential: (_a = options === null || options === void 0 ? void 0 : options.firebase) === null || _a === void 0 ? void 0 : _a.googleApplicationCredential,
+                    googleApplicationCredential: options.firebase.googleApplicationCredential,
                 }),
-                NestStorageModule,
             ],
-            exports: [FirebaseModule, NestStorageModule],
+            exports: [FirebaseModule],
         };
     }
 };
 NestFirestoreModule = NestFirestoreModule_1 = __decorate([
     Module({
         providers: [
-            {
-                provide: ConnectFirestoreService,
-                useFactory: (firebaseAdmin) => new ConnectFirestoreService(firebaseAdmin.firestore),
-                inject: [FirebaseConstants.FIREBASE_TOKEN],
-            },
             {
                 provide: 'FirestoreOptions',
-                useFactory: (connectFirestoreService) => ({
-                    firestore: connectFirestoreService,
+                useFactory: (firebaseAdmin) => ({
+                    firestore: new ConnectFirestoreService(firebaseAdmin.firestore),
                 }),
-                inject: [ConnectFirestoreService],
+                inject: [FirebaseConstants.FIREBASE_TOKEN],
             },
             {
                 provide: 'BeautyProfileRepository',
@@ -568,7 +544,6 @@ NestFirestoreModule = NestFirestoreModule_1 = __decorate([
             'SubscriptionMaterializationRepository',
             'SubscriptionSummaryRepository',
             ProductVariantFirestoreRepository,
-            ConnectFirestoreService,
         ],
     })
 ], NestFirestoreModule);
@@ -579,11 +554,11 @@ let NestHasuraGraphQLModule = NestHasuraGraphQLModule_1 = class NestHasuraGraphQ
         return {
             module: NestHasuraGraphQLModule_1,
             providers: [{ provide: HASURA_OPTIONS, useValue: options }],
-            exports: [HASURA_OPTIONS],
         };
     }
 };
 NestHasuraGraphQLModule = NestHasuraGraphQLModule_1 = __decorate([
+    Global(),
     Module({
         providers: [
             {
@@ -721,7 +696,7 @@ let NestConnectModule = NestConnectModule_1 = class NestConnectModule {
         return {
             module: NestConnectModule_1,
             imports: [
-                ...(options.firebase ? [NestFirestoreModule.initializeApp({ firebase: options.firebase })] : []),
+                ...(options.firebase ? [NestFirestoreModule] : []),
                 ...(isNil(options === null || options === void 0 ? void 0 : options.hasura) ? [] : [NestHasuraGraphQLModule.initializeApp(options.hasura)]),
                 ...(isNil(options === null || options === void 0 ? void 0 : options.elasticSearch) ? [] : [NestElasticSeachModule.initializeApp(options.elasticSearch)]),
             ],
@@ -737,4 +712,4 @@ NestConnectModule = NestConnectModule_1 = __decorate([
     Module({})
 ], NestConnectModule);
 
-export { ConnectCollectionService, ConnectDocumentService, ConnectFirestoreService, ES_CONFIG, FIREBASE_STORAGE, HASURA_OPTIONS, NativeElasticSearchAdapter, NestConnectModule, NestElasticSeachModule, NestFirestoreModule, NestHasuraGraphQLModule, NestStorageModule };
+export { ConnectCollectionService, ConnectDocumentService, ConnectFirestoreService, NativeElasticSearchAdapter, NestConnectModule, NestFirestoreModule, NestHasuraGraphQLModule };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infrab4a/connect-nestjs",
-  "version": "1.1.0-beta.12",
+  "version": "1.1.0-beta.2",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },

package/src/consts/index.d.ts

@@ -1,3 +1,2 @@
 export * from './es-config.const';
 export * from './hasura-options.const';
-export * from './storage.const';

package/src/index.d.ts

@@ -1,7 +1,4 @@
-export * from './consts';
 export * from './infra';
 export * from './nest-connect.module';
-export * from './nest-elastic-search.module';
 export * from './nest-firestore.module';
 export * from './nest-hasura-graphql.module';
-export * from './nest-storage.module';

package/src/infra/elasticsearch/adapters/native-elasticsearch-adapter.d.ts

@@ -13,7 +13,7 @@ export declare class NativeElasticSearchAdapter<T extends BaseModel<T> = any> im
     constructor(config: ESClientOptions);
     get(index: string, id: string): Promise<T>;
     query(index: string, query: any): Promise<ElasticSearchResult<T>>;
-    save(index: string, data: T): Promise<void>;
+    save(index: string, data: Partial<T>): Promise<void>;
     update(index: string, id: string, data: Partial<T>): Promise<void>;
     delete(index: string, id: string): Promise<void>;
 }

package/src/consts/storage.const.d.ts

@@ -1 +0,0 @@
-export declare const FIREBASE_STORAGE = "FIREBASE_STORAGE";

package/src/nest-storage.module.d.ts

@@ -1,2 +0,0 @@
-export declare class NestStorageModule {
-}