@mondomob/gae-node-nestjs 12.0.0-alpha-2 → 12.0.0-alpha1

package/dist/request-scope/request-scope.middleware.js

@@ -0,0 +1,53 @@
+"use strict";
+var RequestScopeMiddleware_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RequestScopeMiddleware = exports.REQUEST_SCOPE_INTERCEPTORS = exports._REQUEST_STORAGE_NAMESPACE_KEY = void 0;
+const tslib_1 = require("tslib");
+const cls_hooked_1 = require("cls-hooked");
+const common_1 = require("@nestjs/common");
+const logging_internal_1 = require("../logging/logging-internal");
+const configuration_1 = require("../configuration");
+exports._REQUEST_STORAGE_NAMESPACE_KEY = '_GAE_NODE_NESTJS_REQUEST_STORAGE';
+exports.REQUEST_SCOPE_INTERCEPTORS = 'REQ_SCOPE_INTERCEPTORS';
+let RequestScopeMiddleware = RequestScopeMiddleware_1 = class RequestScopeMiddleware {
+    constructor(configurationProvider, interceptors) {
+        var _a;
+        this.interceptors = interceptors;
+        RequestScopeMiddleware_1.enabled = !!((_a = configurationProvider.requestScope) === null || _a === void 0 ? void 0 : _a.enabled);
+        if (RequestScopeMiddleware_1.enabled) {
+            this.namespace = (0, cls_hooked_1.createNamespace)(exports._REQUEST_STORAGE_NAMESPACE_KEY);
+            const interceptorNames = interceptors.map(interceptor => `   - ${interceptor.name}`).join('\n');
+            logging_internal_1.defaultLogger.info(`RequestScopeMiddleware setup up with interceptors: \n${interceptorNames}`);
+        }
+        else {
+            logging_internal_1.defaultLogger.info('RequestScopeMiddleware disabled by config');
+        }
+    }
+    use(req, res, next) {
+        if (this.namespace) {
+            this.namespace.run(() => {
+                this.interceptors.forEach(interceptor => {
+                    interceptor.intercept(req);
+                });
+                next();
+            });
+        }
+        else {
+            next();
+        }
+    }
+    static isEnabled() {
+        return RequestScopeMiddleware_1.enabled;
+    }
+    static isDisabled() {
+        return !RequestScopeMiddleware_1.isEnabled();
+    }
+};
+exports.RequestScopeMiddleware = RequestScopeMiddleware;
+exports.RequestScopeMiddleware = RequestScopeMiddleware = RequestScopeMiddleware_1 = tslib_1.__decorate([
+    (0, common_1.Injectable)(),
+    tslib_1.__param(0, (0, common_1.Inject)(configuration_1.CONFIGURATION)),
+    tslib_1.__param(1, (0, common_1.Inject)(exports.REQUEST_SCOPE_INTERCEPTORS)),
+    tslib_1.__metadata("design:paramtypes", [Object, Array])
+], RequestScopeMiddleware);
+//# sourceMappingURL=request-scope.middleware.js.map

package/dist/request-scope/request-scope.middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-scope.middleware.js","sourceRoot":"","sources":["../../src/request-scope/request-scope.middleware.ts"],"names":[],"mappings":";;;;;AAAA,2CAAwD;AACxD,2CAAoE;AAGpE,kEAA4D;AAC5D,oDAAgE;AAEnD,QAAA,8BAA8B,GAAG,kCAAkC,CAAC;AACpE,QAAA,0BAA0B,GAAG,wBAAwB,CAAC;AAG5D,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAIjC,YACyB,qBAAoC,EACN,YAAuC;;QAAvC,iBAAY,GAAZ,YAAY,CAA2B;QAG5F,wBAAsB,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA,MAAA,qBAAqB,CAAC,YAAY,0CAAE,OAAO,CAAA,CAAC;QAC/E,IAAI,wBAAsB,CAAC,OAAO,EAAE,CAAC;YACnC,IAAI,CAAC,SAAS,GAAG,IAAA,4BAAe,EAAC,sCAA8B,CAAC,CAAC;YACjE,MAAM,gBAAgB,GAAG,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,QAAQ,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChG,gCAAa,CAAC,IAAI,CAAC,wDAAwD,gBAAgB,EAAE,CAAC,CAAC;QACjG,CAAC;aAAM,CAAC;YACN,gCAAa,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IAED,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAgB;QAC/C,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE;gBACtB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;oBACtC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBAC7B,CAAC,CAAC,CAAC;gBACH,IAAI,EAAE,CAAC;YACT,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,EAAE,CAAC;QACT,CAAC;IACH,CAAC;IAED,MAAM,CAAC,SAAS;QACd,OAAO,wBAAsB,CAAC,OAAO,CAAC;IACxC,CAAC;IAED,MAAM,CAAC,UAAU;QACf,OAAO,CAAC,wBAAsB,CAAC,SAAS,EAAE,CAAC;IAC7C,CAAC;CACF,CAAA;AAvCY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAMR,mBAAA,IAAA,eAAM,EAAC,6BAAa,CAAC,CAAA;IACrB,mBAAA,IAAA,eAAM,EAAC,kCAA0B,CAAC,CAAA;;GAN1B,sBAAsB,CAuClC"}

package/dist/search/search.service.d.ts

@@ -0,0 +1,52 @@
+import fetch from 'node-fetch';
+import { Configuration } from '../configuration';
+interface IndexEntry {
+    id: string;
+    fields: {
+        [key: string]: object;
+    };
+}
+export interface Sort {
+    field: string;
+    descending?: boolean;
+}
+export interface Page {
+    limit: number;
+    offset: number;
+}
+export interface QueryResults {
+    resultCount: number;
+    limit: number;
+    offset: number;
+    ids: string[];
+}
+export interface SearchResults<T> {
+    resultCount: number;
+    limit: number;
+    offset: number;
+    results: ReadonlyArray<T> | undefined;
+}
+export declare type Operator = '=' | '!=' | '>' | '<' | '>=' | '<=';
+export interface SearchFields {
+    [key: string]: string | string[] | Predicate | Predicate[];
+}
+export interface Predicate {
+    op: Operator;
+    value: string | string[] | number | Date;
+}
+export interface SearchPredicate extends Predicate {
+    field: string;
+}
+export declare class SearchService {
+    private readonly configuration;
+    private logger;
+    constructor(configuration: Configuration);
+    index(entityName: string, entries: IndexEntry[]): Promise<fetch.Response>;
+    delete(entityName: string, ...ids: string[]): Promise<fetch.Response>;
+    deleteAll(entityName: string): Promise<fetch.Response>;
+    query(entityName: string, fields: SearchFields, sort?: Sort, page?: Page): Promise<QueryResults>;
+    private post;
+    private normaliseFields;
+    private toSearchPredicate;
+}
+export {};

package/dist/search/search.service.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SearchService = void 0;
+const tslib_1 = require("tslib");
+const common_1 = require("@nestjs/common");
+const node_fetch_1 = require("node-fetch");
+const logging_1 = require("../logging");
+const configuration_1 = require("../configuration");
+const isPredicate = (value) => {
+    return value.op !== undefined;
+};
+const isPredicateArray = (value) => {
+    return Array.isArray(value) && value.length > 0 && isPredicate(value[0]);
+};
+let SearchService = class SearchService {
+    constructor(configuration) {
+        this.configuration = configuration;
+        this.logger = (0, logging_1.createLogger)('search-service');
+    }
+    index(entityName, entries) {
+        this.logger.info(`Indexing ${entries.length} ${entityName} entities`);
+        return this.post('/index', {
+            entityName,
+            entries,
+        });
+    }
+    delete(entityName, ...ids) {
+        return this.post('/delete', {
+            entityName,
+            ids,
+        });
+    }
+    deleteAll(entityName) {
+        return this.post('/deleteAll', {
+            entityName,
+        });
+    }
+    async query(entityName, fields, sort, page) {
+        const resp = await this.post('/query', {
+            entityName,
+            fields: this.normaliseFields(fields),
+            sort,
+            page,
+        });
+        const queryResults = await resp.json();
+        this.logger.info(`Query returned ${queryResults.ids.length} ids of total ${queryResults.resultCount}`);
+        return queryResults;
+    }
+    post(path, body) {
+        if (!this.configuration.searchServiceEndpoint) {
+            throw new Error('searchServiceEndpoint must be configured in order to use the SearchService');
+        }
+        return (0, node_fetch_1.default)(this.configuration.searchServiceEndpoint + path, {
+            method: 'POST',
+            body: JSON.stringify(body),
+        });
+    }
+    normaliseFields(fields) {
+        return Object.keys(fields).reduce((result, key) => {
+            const field = fields[key];
+            if (isPredicateArray(field)) {
+                field.forEach(predicate => result.push(this.toSearchPredicate(key, predicate)));
+            }
+            else {
+                result.push(this.toSearchPredicate(key, field));
+            }
+            return result;
+        }, []);
+    }
+    toSearchPredicate(fieldName, input) {
+        return isPredicate(input)
+            ? {
+                field: fieldName,
+                op: input.op,
+                value: input.value,
+            }
+            : {
+                field: fieldName,
+                op: '=',
+                value: input,
+            };
+    }
+};
+exports.SearchService = SearchService;
+exports.SearchService = SearchService = tslib_1.__decorate([
+    (0, common_1.Injectable)(),
+    tslib_1.__param(0, (0, common_1.Inject)(configuration_1.CONFIGURATION)),
+    tslib_1.__metadata("design:paramtypes", [Object])
+], SearchService);
+//# sourceMappingURL=search.service.js.map

package/dist/search/search.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"search.service.js","sourceRoot":"","sources":["../../src/search/search.service.ts"],"names":[],"mappings":"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"}

package/dist/search/searchable.repository.d.ts

@@ -0,0 +1,36 @@
+import { Datastore } from '@google-cloud/datastore';
+import * as t from 'io-ts';
+import { Context } from '../datastore/context';
+import { Index } from '../datastore/loader';
+import { Repository, RepositoryOptions } from '../datastore/repository';
+import { Omit } from '../util/types';
+import { Page, SearchFields, SearchResults, SearchService, Sort } from './search.service';
+interface SearchableRepositoryOptions<T extends {
+    id: any;
+}> extends RepositoryOptions<T> {
+    searchIndex: Index<Omit<T, 'id'>>;
+}
+export declare class SearchableRepository<T extends {
+    id: string;
+}> extends Repository<T> {
+    protected readonly searchService: SearchService;
+    protected readonly options: SearchableRepositoryOptions<T>;
+    private baseLogger;
+    constructor(datastore: Datastore, searchService: SearchService, kind: string, validator: t.Type<T>, options: SearchableRepositoryOptions<T>);
+    save(context: Context, entities: T): Promise<T>;
+    save(context: Context, entities: ReadonlyArray<T>): Promise<ReadonlyArray<T>>;
+    update(context: Context, entities: T): Promise<T>;
+    update(context: Context, entities: ReadonlyArray<T>): Promise<ReadonlyArray<T>>;
+    insert(context: Context, entities: T): Promise<T>;
+    insert(context: Context, entities: ReadonlyArray<T>): Promise<ReadonlyArray<T>>;
+    upsert(context: Context, entities: T): Promise<T>;
+    upsert(context: Context, entities: ReadonlyArray<T>): Promise<ReadonlyArray<T>>;
+    delete(context: Context, ...ids: string[]): Promise<void>;
+    deleteAll(context: Context): Promise<void>;
+    search(context: Context, searchFields: SearchFields, sort?: Sort): Promise<readonly T[]>;
+    searchWithPagination(context: Context, searchFields: SearchFields, sort?: Sort, page?: Page): Promise<SearchResults<T>>;
+    reindex(context: Context, operation?: (input: T) => T | Promise<T>): Promise<readonly T[]>;
+    private index;
+    private fetchResults;
+}
+export {};

package/dist/search/searchable.repository.js

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SearchableRepository = void 0;
+const repository_1 = require("../datastore/repository");
+const types_1 = require("../util/types");
+const logging_1 = require("../logging");
+class SearchableRepository extends repository_1.Repository {
+    constructor(datastore, searchService, kind, validator, options) {
+        super(datastore, kind, validator, options);
+        this.searchService = searchService;
+        this.options = options;
+        this.baseLogger = (0, logging_1.createLogger)('searchable-repository');
+    }
+    async save(context, entities) {
+        const savedEntities = await super.save(context, entities);
+        await this.index(savedEntities);
+        return savedEntities;
+    }
+    async update(context, entities) {
+        const savedEntities = await super.update(context, entities);
+        await this.index(savedEntities);
+        return savedEntities;
+    }
+    async insert(context, entities) {
+        const savedEntities = await super.insert(context, entities);
+        await this.index(savedEntities);
+        return savedEntities;
+    }
+    async upsert(context, entities) {
+        const savedEntities = await super.upsert(context, entities);
+        await this.index(savedEntities);
+        return savedEntities;
+    }
+    async delete(context, ...ids) {
+        await super.delete(context, ...ids);
+        await this.searchService.delete(this.kind, ...ids);
+    }
+    async deleteAll(context) {
+        await super.deleteAll(context);
+        await this.searchService.deleteAll(this.kind);
+    }
+    async search(context, searchFields, sort) {
+        const queryResults = await this.searchService.query(this.kind, searchFields, sort);
+        const requests = await this.fetchResults(context, queryResults.ids);
+        return requests;
+    }
+    async searchWithPagination(context, searchFields, sort, page) {
+        const queryResults = await this.searchService.query(this.kind, searchFields, sort, page);
+        const requests = await this.fetchResults(context, queryResults.ids);
+        return {
+            resultCount: queryResults.resultCount,
+            limit: queryResults.limit,
+            offset: queryResults.offset,
+            results: requests,
+        };
+    }
+    async reindex(context, operation = input => input) {
+        const [allEntities] = await this.query(context);
+        this.baseLogger.info(`Saving ${allEntities.length} searchable entities`);
+        const batchSize = 100;
+        const allUpdatedEntities = [];
+        for (let i = 0; i < allEntities.length; i += batchSize) {
+            const batchOfEntities = allEntities.slice(i, i + batchSize);
+            const updatedEntities = await Promise.all(batchOfEntities.map(operation));
+            this.baseLogger.info(`Saving batch of ${batchOfEntities.length} updated searchable entities`);
+            const batchUpdatedEntities = await this.update(context, updatedEntities);
+            allUpdatedEntities.push(...batchUpdatedEntities);
+        }
+        return allUpdatedEntities;
+    }
+    index(entities) {
+        const entitiesArr = (0, types_1.asArray)(entities);
+        const entries = entitiesArr.map((entity) => {
+            const fields = Object.keys(this.options.searchIndex).reduce((obj, fieldName) => {
+                obj[fieldName] = entity[fieldName];
+                return obj;
+            }, {});
+            return {
+                id: entity.id,
+                fields,
+            };
+        });
+        return this.searchService.index(this.kind, entries);
+    }
+    async fetchResults(context, ids) {
+        const results = await this.get(context, ids);
+        if (results && results.some(result => !result)) {
+            this.baseLogger.warn('Search results contained at least one null value - search index likely out of sync with datastore');
+            return results.filter(result => !!result);
+        }
+        return results;
+    }
+}
+exports.SearchableRepository = SearchableRepository;
+//# sourceMappingURL=searchable.repository.js.map

package/dist/search/searchable.repository.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"searchable.repository.js","sourceRoot":"","sources":["../../src/search/searchable.repository.ts"],"names":[],"mappings":";;;AAIA,wDAAwE;AACxE,yCAAyD;AAEzD,wCAA0C;AAM1C,MAAa,oBAA+C,SAAQ,uBAAa;IAG/E,YACE,SAAoB,EACD,aAA4B,EAC/C,IAAY,EACZ,SAAoB,EACD,OAAuC;QAE1D,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QALxB,kBAAa,GAAb,aAAa,CAAe;QAG5B,YAAO,GAAP,OAAO,CAAgC;QAPpD,eAAU,GAAG,IAAA,sBAAY,EAAC,uBAAuB,CAAC,CAAC;IAU3D,CAAC;IAID,KAAK,CAAC,IAAI,CAAC,OAAgB,EAAE,QAAsB;QACjD,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,QAAe,CAAC,CAAC;QACjE,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAChC,OAAO,aAAa,CAAC;IACvB,CAAC;IAID,KAAK,CAAC,MAAM,CAAC,OAAgB,EAAE,QAAsB;QACnD,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,QAAe,CAAC,CAAC;QACnE,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAChC,OAAO,aAAa,CAAC;IACvB,CAAC;IAID,KAAK,CAAC,MAAM,CAAC,OAAgB,EAAE,QAAsB;QACnD,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,QAAe,CAAC,CAAC;QACnE,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAChC,OAAO,aAAa,CAAC;IACvB,CAAC;IAID,KAAK,CAAC,MAAM,CAAC,OAAgB,EAAE,QAAsB;QACnD,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,QAAe,CAAC,CAAC;QACnE,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAChC,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAgB,EAAE,GAAG,GAAa;QAC7C,MAAM,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,CAAC;QACpC,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAgB;QAC9B,MAAM,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAgB,EAAE,YAA0B,EAAE,IAAW;QACpE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;QACnF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC;QACpE,OAAO,QAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,OAAgB,EAChB,YAA0B,EAC1B,IAAW,EACX,IAAW;QAEX,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACzF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC;QACpE,OAAO;YACL,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,KAAK,EAAE,YAAY,CAAC,KAAK;YACzB,MAAM,EAAE,YAAY,CAAC,MAAM;YAC3B,OAAO,EAAE,QAAQ;SAClB,CAAC;IACJ,CAAC;IAYD,KAAK,CAAC,OAAO,CAAC,OAAgB,EAAE,YAA0C,KAAK,CAAC,EAAE,CAAC,KAAK;QACtF,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,WAAW,CAAC,MAAM,sBAAsB,CAAC,CAAC;QACzE,MAAM,SAAS,GAAG,GAAG,CAAC;QACtB,MAAM,kBAAkB,GAAG,EAAE,CAAC;QAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE,CAAC;YACvD,MAAM,eAAe,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;YAC5D,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;YAC1E,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,mBAAmB,eAAe,CAAC,MAAM,8BAA8B,CAAC,CAAC;YAC9F,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;YACzE,kBAAkB,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAEO,KAAK,CAAC,QAAsB;QAClC,MAAM,WAAW,GAAG,IAAA,eAAO,EAAC,QAAQ,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,MAAW,EAAE,EAAE;YAC9C,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CACzD,CAAC,GAA8B,EAAE,SAAiB,EAAE,EAAE;gBACpD,GAAG,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;gBACnC,OAAO,GAAG,CAAC;YACb,CAAC,EACD,EAAE,CACH,CAAC;YAEF,OAAO;gBACL,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,MAAM;aACP,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACtD,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,OAAgB,EAAE,GAAa;QACxD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAC7C,IAAI,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/C,IAAI,CAAC,UAAU,CAAC,IAAI,CAClB,mGAAmG,CACpG,CAAC;YACF,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AApID,oDAoIC"}

package/dist/types.d.ts

@@ -0,0 +1,3 @@
+import * as iots from 'io-ts';
+export * from 'io-ts';
+export declare const nullable: <T>(type: iots.Type<T>) => iots.UnionC<[iots.Type<T, T, unknown>, iots.NullC]>;

package/dist/types.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nullable = void 0;
+const tslib_1 = require("tslib");
+const iots = require("io-ts");
+tslib_1.__exportStar(require("io-ts"), exports);
+const nullable = (type) => iots.union([type, iots.null]);
+exports.nullable = nullable;
+//# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;;AAAA,8BAA8B;AAG9B,gDAAsB;AACf,MAAM,QAAQ,GAAG,CAAI,IAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAApE,QAAA,QAAQ,YAA4D"}

package/dist/util/arrays.d.ts

@@ -0,0 +1 @@
+export declare const unique: <T>(src: T[] | ReadonlyArray<T>, ...newValues: T[]) => T[];

package/dist/util/arrays.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unique = void 0;
+const unique = (src, ...newValues) => {
+    const set = new Set(src);
+    newValues.forEach(val => set.add(val));
+    return Array.from(set);
+};
+exports.unique = unique;
+//# sourceMappingURL=arrays.js.map

package/dist/util/arrays.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"arrays.js","sourceRoot":"","sources":["../../src/util/arrays.ts"],"names":[],"mappings":";;;AAAO,MAAM,MAAM,GAAG,CAAI,GAA2B,EAAE,GAAG,SAAc,EAAO,EAAE;IAC/E,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACzB,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACvC,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC;AAJW,QAAA,MAAM,UAIjB"}

package/dist/util/guards.d.ts

@@ -0,0 +1 @@
+export declare const isEmpty: <T>(value: T | null | undefined) => value is null | undefined;

package/dist/util/guards.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEmpty = void 0;
+const _ = require("lodash");
+const isEmpty = (value) => _.isEmpty(value);
+exports.isEmpty = isEmpty;
+//# sourceMappingURL=guards.js.map

package/dist/util/guards.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"guards.js","sourceRoot":"","sources":["../../src/util/guards.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAErB,MAAM,OAAO,GAAG,CAAI,KAA2B,EAA6B,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAA1F,QAAA,OAAO,WAAmF"}

package/dist/util/index.d.ts

@@ -0,0 +1 @@
+export * from './nestjs';

package/dist/util/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./nestjs"), exports);
+//# sourceMappingURL=index.js.map

package/dist/util/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;AAAA,mDAAyB"}

package/dist/util/nestjs.d.ts

@@ -0,0 +1,9 @@
+import { ExecutionContext } from '@nestjs/common';
+import { Request } from 'express';
+import { Context } from '../datastore/context';
+interface RequestWithSessionAndContext extends Request {
+    session: any;
+    context: Context;
+}
+export declare const getRequestFromExecutionContext: (context: ExecutionContext) => RequestWithSessionAndContext;
+export {};

package/dist/util/nestjs.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRequestFromExecutionContext = void 0;
+const graphql_1 = require("@nestjs/graphql");
+const getRequestFromExecutionContext = (context) => (context.getType() === 'graphql'
+    ? graphql_1.GqlExecutionContext.create(context).getContext().request
+    : context.switchToHttp().getRequest());
+exports.getRequestFromExecutionContext = getRequestFromExecutionContext;
+//# sourceMappingURL=nestjs.js.map

package/dist/util/nestjs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nestjs.js","sourceRoot":"","sources":["../../src/util/nestjs.ts"],"names":[],"mappings":";;;AAEA,6CAAsE;AAW/D,MAAM,8BAA8B,GAAG,CAAC,OAAyB,EAAgC,EAAE,CACxG,CAAC,OAAO,CAAC,OAAO,EAAkB,KAAK,SAAS;IAC9C,CAAC,CAAC,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAW,CAAC,OAAO;IACnE,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAiC,CAAC;AAH9D,QAAA,8BAA8B,kCAGgC"}

package/dist/util/types.d.ts

@@ -0,0 +1,4 @@
+export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+export type OneOrMany<T> = T | ReadonlyArray<T>;
+export declare const asArray: <T>(input: OneOrMany<T>) => Array<T>;
+export declare const asPromise: <T>(src: T | Promise<T>) => Promise<T>;

package/dist/util/types.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.asPromise = exports.asArray = void 0;
+const asArray = (input) => (Array.isArray(input) ? input : [input]);
+exports.asArray = asArray;
+const asPromise = (src) => (src instanceof Promise ? src : Promise.resolve(src));
+exports.asPromise = asPromise;
+//# sourceMappingURL=types.js.map

package/dist/util/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/util/types.ts"],"names":[],"mappings":";;;AAGO,MAAM,OAAO,GAAG,CAAI,KAAmB,EAAY,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAa,CAAC;AAArG,QAAA,OAAO,WAA8F;AAE3G,MAAM,SAAS,GAAG,CAAI,GAAmB,EAAc,EAAE,CAAC,CAAC,GAAG,YAAY,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;AAA1G,QAAA,SAAS,aAAiG"}

package/dist/validator.d.ts

@@ -0,0 +1 @@
+export * from 'io-ts';

package/dist/validator.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("io-ts"), exports);
+//# sourceMappingURL=validator.js.map

package/dist/validator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validator.js","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":";;;AAGA,gDAAsB"}

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@mondomob/gae-node-nestjs",
-  "version": "12.0.0-alpha-2",
+  "version": "12.0.0-alpha1",
   "description": "Google App Engine datastore repositories and graphql setup with nestjs",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
+  "engines": {
+    "node": ">=22"
+  },
   "scripts": {
     "prepublish": "npx tsc && npm run verify",
     "test": "jest",
@@ -28,7 +31,7 @@
     "@google-cloud/logging-bunyan": "5.1.0",
     "@google-cloud/storage": "7.19.0",
     "@google-cloud/tasks": "4.1.0",
-    "@google-cloud/trace-agent": "7.1.2",
+    "@google-cloud/trace-agent": "8.0.0",
     "@node-saml/passport-saml": "5.1.0",
     "@types/node-fetch": "2.6.11",
     "bcryptjs": "2.4.3",
@@ -47,9 +50,9 @@
     "io-ts": "2.2.21",
     "io-ts-reporters": "2.0.1",
     "jsonwebtoken": "9.0.2",
-    "lodash": "4.17.21",
+    "lodash": "4.18.1",
     "node-fetch": "2.7.0",
-    "nodemailer": "6.9.15",
+    "nodemailer": "10.1.1",
     "passport": "0.6.0",
     "passport-auth0": "1.4.4",
     "passport-google-oauth": "2.0.0",
@@ -83,14 +86,13 @@
     "@types/jest": "^29.5.12",
     "@types/jsonwebtoken": "9.0.6",
     "@types/lodash": "4.17.7",
-    "@types/nodemailer": "6.4.15",
     "@types/passport": "1.0.16",
     "@types/passport-auth0": "1.0.9",
     "@types/passport-google-oauth": "1.0.45",
     "@types/passport-local": "1.0.38",
     "@types/uuid": "8.3.4",
     "chokidar": "3.6.0",
-    "express": "4.22.1",
+    "express": "4.22.2",
     "jest": "29.7.0",
     "prettier": "2.8.8",
     "rxjs": "7.8.1",

package/server-start.js

@@ -21,7 +21,6 @@ const componentColors = {
   server: colors.blue,
   webpack: colors.magenta,
   datastore: colors.cyan,
-  dsui: colors.green,
 };
 
 class BunyanStream {
@@ -46,17 +45,15 @@ const { buildEvents, stopWebpack } = setupWebpack(logger);
 const { stopServer, startServer } = setupServer(logger, loggingStream, buildEvents);
 
 const { stopDatastore, startDatastore } = setupDatastore(logger, buildEvents);
-const { startDsui, stopDsui } = setupDsui(logger);
 
 buildEvents.once('reload', startServer);
 startDatastore();
-startDsui();
 
 // Handle process stop
 process.on('SIGINT', async function () {
   logger.info('Caught interrupt signal');
 
-  await Promise.all([stopWebpack(), stopDatastore(), stopDsui(), stopServer()]);
+  await Promise.all([stopWebpack(), stopDatastore(), stopServer()]);
 
   logger.info('Shutting down');
   process.exit();
@@ -232,74 +229,6 @@ function setupServer(logger, loggingStream, buildEvents) {
   };
 }
 
-function setupDsui(logger) {
-  const dsuiLogger = logger.child({ component: 'dsui' });
-  let dsui;
-  const startDsui = () => {
-    // poll the status URL until the datastore emulator is ready
-    dsuiLogger.info('Waiting for Datastore emulator to start');
-    const timeout = setInterval(() => {
-      let body = '';
-      http.get(
-        {
-          hostname: '127.0.0.1',
-          port: DATASTORE_PORT,
-          path: '/',
-          agent: false,
-        },
-        res => {
-          res.on('data', data => {
-            body += data;
-          });
-          res.on('end', () => {
-            if (res.statusCode == 200) {
-              dsuiLogger.info('Datastore emulator is ready, starting DSUI');
-              clearInterval(timeout);
-              const gcloud = spawn('gcloud', ['beta', 'emulators', 'datastore', 'env-init', '--format=json']);
-              gcloud.stdout.on('data', data => {
-                const datastoreConfig = JSON.parse(data);
-                _.forEach(datastoreConfig, (value, key) => {
-                  process.env[key] = value;
-                });
-              });
-
-              gcloud.once('close', () => {
-                dsui = spawn('npm', ['run', 'dsui']);
-                dsui.stdout.on('data', dsuiData => {
-                  const string = dsuiData.toString('utf8');
-                  dsuiLogger.info(string);
-                });
-
-                dsui.stderr.on('data', dsuiData => {
-                  const string = dsuiData.toString('utf8');
-                  dsuiLogger.error(string);
-                });
-              });
-            }
-          });
-        },
-      );
-    }, 2000);
-  };
-
-  const stopDsui = () => {
-    return new Promise(resolve => {
-      if (dsui) {
-        dsuiLogger.info('Killing DSUI');
-        dsui.kill('SIGINT');
-        dsui.once('close', () => {
-          logger.info('DSUI successfully shutdown');
-          resolve();
-        });
-      } else {
-        resolve();
-      }
-    });
-  };
-
-  return { startDsui, stopDsui };
-}
-
 function setupDatastore(logger, buildEvents) {
   const datastoreLogger = logger.child({
     component: 'datastore',

package/bitbucket-pipelines.yml

@@ -1,15 +0,0 @@
-# This is a sample build configuration for JavaScript.
-# Check our guides at https://confluence.atlassian.com/x/14UWN for more examples.
-# Only use spaces to indent your .yml configuration.
-# -----
-# You can specify a custom docker image from Docker Hub as your build environment.
-image: node:6.9.4
-
-pipelines:
-  default:
-    - step:
-        caches:
-          - node
-        script: # Modify the commands below to build your repository.
-          - npm install
-          - npx tsc