@tsed/formio 7.0.0-beta.2 → 7.0.0-beta.20

package/lib/esm/services/FormioService.js

@@ -1,10 +1,15 @@
 import { __decorate, __metadata } from "tslib";
 import { Inject, Injectable, InjectorService } from "@tsed/common";
 import { promisify } from "util";
-const createRouter = require("formio");
-const swagger = require("formio/src/util/swagger.js");
-const util = require("formio/src/util/util.js");
+// @ts-ignore
+import createRouter from "formio";
+// @ts-ignore
+import swagger from "formio/src/util/swagger.js";
+// @ts-ignore
+import util from "formio/src/util/util.js";
 let FormioService = class FormioService {
+    router;
+    injector;
     get audit() {
         return this.formio.audit || (() => { });
     }

package/lib/esm/services/FormioService.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormioService.js","sourceRoot":"","sources":["../../../src/services/FormioService.ts"],"names":[],"mappings":"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","sourcesContent":["import {Inject, Injectable, InjectorService} from \"@tsed/common\";\nimport {MongooseConnectionOptions} from \"@tsed/mongoose\";\nimport {Db} from \"mongodb\";\nimport {Mongoose} from \"mongoose\";\nimport {promisify} from \"util\";\nimport {Formio} from \"../domain/Formio\";\nimport {FormioConfig} from \"../domain/FormioConfig\";\nimport {FormioHook, FormioHooks} from \"../domain/FormioHooks\";\nimport {FormioSchemas} from \"../domain/FormioModels\";\nimport {FormioRouter} from \"../domain/FormioRouter\";\nimport {FormioTemplate} from \"../domain/FormioTemplate\";\nimport {FormioExportOptions} from \"../domain/FormioTemplateUtil\";\n\nconst createRouter = require(\"formio\");\nconst swagger = require(\"formio/src/util/swagger.js\");\nconst util = require(\"formio/src/util/util.js\");\n\n@Injectable()\nexport class FormioService {\n  router: FormioRouter;\n\n  @Inject()\n  protected injector: InjectorService;\n\n  get audit(): Function {\n    return this.formio.audit || (() => {});\n  }\n\n  get auth() {\n    return this.formio.auth;\n  }\n\n  // istanbul ignore next\n  get swagger() {\n    return (...args: any[]) => new Promise((resolve) => swagger(...args, resolve));\n  }\n\n  get config(): FormioConfig {\n    return this.formio.config;\n  }\n\n  get db(): Db {\n    return this.formio.db;\n  }\n\n  get resources() {\n    return this.formio.resources;\n  }\n\n  get mongoose(): Mongoose {\n    return this.formio.mongoose;\n  }\n\n  get middleware() {\n    return this.formio.middleware;\n  }\n\n  get schemas(): FormioSchemas {\n    return this.formio.schemas;\n  }\n\n  get formio(): Formio {\n    return this.router.formio as Formio;\n  }\n\n  get hook(): FormioHook {\n    return this.formio.hook;\n  }\n\n  get util() {\n    return this.formio.util;\n  }\n\n  get template() {\n    return this.formio.template;\n  }\n\n  get Action() {\n    return this.formio.Action;\n  }\n\n  async exportTemplate(options: Partial<FormioExportOptions> = {}): Promise<FormioTemplate> {\n    return promisify(this.formio.template.export)(options);\n  }\n\n  async importTemplate(template: FormioTemplate): Promise<FormioTemplate> {\n    return promisify(this.formio.template.import.template)(template);\n  }\n\n  encrypt(text: string) {\n    return promisify(this.formio.encrypt)(text);\n  }\n\n  isInit() {\n    return !!this.router;\n  }\n\n  // istanbul ignore next\n  public createRouter(options: FormioConfig) {\n    return createRouter(options);\n  }\n\n  public init(options: FormioConfig, hooks: FormioHooks = {}) {\n    if (options && Object.keys(options).length) {\n      this.router = this.createRouter(this.mapConfiguration(options));\n      this.bindLogger();\n\n      return this.router.init(hooks);\n    }\n  }\n\n  protected mapConfiguration(options: FormioConfig) {\n    const {injector} = this;\n    const mongooseSettings = injector.settings.get<MongooseConnectionOptions>(\"mongoose.0\");\n\n    if (mongooseSettings) {\n      options.mongo = options.mongo || mongooseSettings.url;\n      options.mongoConfig = options.mongoConfig || JSON.stringify(mongooseSettings.connectionOptions);\n    }\n\n    return options;\n  }\n\n  protected bindLogger() {\n    const {injector} = this;\n\n    util.log = injector.logger.info.bind(injector.logger);\n    util.error = injector.logger.error.bind(injector.logger);\n  }\n}\n"]}
+{"version":3,"file":"FormioService.js","sourceRoot":"","sources":["../../../src/services/FormioService.ts"],"names":[],"mappings":"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","sourcesContent":["import {Inject, Injectable, InjectorService} from \"@tsed/common\";\nimport {MongooseConnectionOptions} from \"@tsed/mongoose\";\nimport {Db} from \"mongodb\";\nimport {Mongoose} from \"mongoose\";\nimport {promisify} from \"util\";\nimport {Formio} from \"../domain/Formio\";\nimport {FormioConfig} from \"../domain/FormioConfig\";\nimport {FormioHook, FormioHooks} from \"../domain/FormioHooks\";\nimport {FormioSchemas} from \"../domain/FormioModels\";\nimport {FormioRouter} from \"../domain/FormioRouter\";\nimport {FormioTemplate} from \"../domain/FormioTemplate\";\nimport {FormioExportOptions} from \"../domain/FormioTemplateUtil\";\n// @ts-ignore\nimport createRouter from \"formio\";\n// @ts-ignore\nimport swagger from \"formio/src/util/swagger.js\";\n// @ts-ignore\nimport util from \"formio/src/util/util.js\";\n\n@Injectable()\nexport class FormioService {\n  router: FormioRouter;\n\n  @Inject()\n  protected injector: InjectorService;\n\n  get audit(): Function {\n    return this.formio.audit || (() => {});\n  }\n\n  get auth() {\n    return this.formio.auth;\n  }\n\n  // istanbul ignore next\n  get swagger() {\n    return (...args: any[]) => new Promise((resolve) => swagger(...args, resolve));\n  }\n\n  get config(): FormioConfig {\n    return this.formio.config;\n  }\n\n  get db(): Db {\n    return this.formio.db;\n  }\n\n  get resources() {\n    return this.formio.resources;\n  }\n\n  get mongoose(): Mongoose {\n    return this.formio.mongoose;\n  }\n\n  get middleware() {\n    return this.formio.middleware;\n  }\n\n  get schemas(): FormioSchemas {\n    return this.formio.schemas;\n  }\n\n  get formio(): Formio {\n    return this.router.formio as Formio;\n  }\n\n  get hook(): FormioHook {\n    return this.formio.hook;\n  }\n\n  get util() {\n    return this.formio.util;\n  }\n\n  get template() {\n    return this.formio.template;\n  }\n\n  get Action() {\n    return this.formio.Action;\n  }\n\n  async exportTemplate(options: Partial<FormioExportOptions> = {}): Promise<FormioTemplate> {\n    return promisify(this.formio.template.export)(options);\n  }\n\n  async importTemplate(template: FormioTemplate): Promise<FormioTemplate> {\n    return promisify(this.formio.template.import.template)(template);\n  }\n\n  encrypt(text: string) {\n    return promisify(this.formio.encrypt)(text);\n  }\n\n  isInit() {\n    return !!this.router;\n  }\n\n  // istanbul ignore next\n  public createRouter(options: FormioConfig) {\n    return createRouter(options);\n  }\n\n  public init(options: FormioConfig, hooks: FormioHooks = {}) {\n    if (options && Object.keys(options).length) {\n      this.router = this.createRouter(this.mapConfiguration(options));\n      this.bindLogger();\n\n      return this.router.init(hooks);\n    }\n  }\n\n  protected mapConfiguration(options: FormioConfig) {\n    const {injector} = this;\n    const mongooseSettings = injector.settings.get<MongooseConnectionOptions>(\"mongoose.0\");\n\n    if (mongooseSettings) {\n      options.mongo = options.mongo || mongooseSettings.url;\n      options.mongoConfig = options.mongoConfig || JSON.stringify(mongooseSettings.connectionOptions);\n    }\n\n    return options;\n  }\n\n  protected bindLogger() {\n    const {injector} = this;\n\n    util.log = injector.logger.info.bind(injector.logger);\n    util.error = injector.logger.error.bind(injector.logger);\n  }\n}\n"]}

package/lib/types/components/AlterActions.d.ts

@@ -1,5 +1,6 @@
-import { PlatformContext } from "@tsed/common";
 import { InjectorService, Provider } from "@tsed/di";
+import { PlatformParams } from "@tsed/platform-params";
+import { PlatformResponseFilter } from "@tsed/platform-response-filter";
 import { AlterHook } from "../domain/AlterHook";
 import { SetActionItemMessage } from "../domain/FormioAction";
 import { FormioActions } from "../domain/FormioActionsIndex";
@@ -7,9 +8,11 @@ import { FormioService } from "../services/FormioService";
 export declare class AlterActions implements AlterHook {
     protected injector: InjectorService;
     protected formio: FormioService;
+    protected params: PlatformParams;
+    protected responseFilter: PlatformResponseFilter;
     transform(actions: FormioActions): FormioActions;
     protected getActions(): Provider<any>[];
-    protected createResolveHandler(provider: Provider<any>): (action: any, handler: string, method: string, req: {
-        $ctx: PlatformContext;
-    }, res: Response, next: any, setActionItemMessage: SetActionItemMessage) => void;
+    protected createHandler(provider: Provider, propertyKey: string | symbol): (action: any, handler: string, method: string, req: any, res: any, next: any, setActionItemMessage: SetActionItemMessage) => Promise<void>;
+    private onRequest;
+    private flush;
 }

package/lib/types/components/AlterAudit.d.ts

@@ -1,5 +1,5 @@
-import { PlatformContext } from "@tsed/common";
+import { DIContext } from "@tsed/di";
 import { AlterHook } from "../domain/AlterHook";
 export declare class AlterAudit implements AlterHook {
-    transform(info: any[], event: string, ctx: PlatformContext): boolean;
+    transform(info: any[], event: string, ctx: DIContext): boolean;
 }

package/lib/types/domain/FormioHooks.d.ts

@@ -1,5 +1,5 @@
 import { MongooseDocument } from "@tsed/mongoose";
-import { Request } from "express";
+import { Request, Response } from "express";
 import { FilterQuery, Schema, SchemaDefinition } from "mongoose";
 import { Formio } from "./Formio";
 import { FormioActions } from "./FormioActionsIndex";

package/lib/types/domain/Resource.d.ts

@@ -1,5 +1,5 @@
-import Express from "express";
-export declare type ResourceHttpHandler = (req: Request, res: Response, next: Express.NextFunction) => void;
+import { Request, Response, NextFunction } from "express";
+export declare type ResourceHttpHandler = (req: Request, res: Response, next: NextFunction) => void;
 export interface ResourceHttpMethodOptions {
     before?: ResourceHttpHandler;
     after?: ResourceHttpHandler;

package/lib/types/index.d.ts

@@ -1,38 +1,46 @@
+/**
+ * @file Automatically generated by barrelsby.
+ */
+export * from "./FormioModule";
+export * from "./builder/FormioMapper";
+export * from "./components/AlterActions";
+export * from "./components/AlterAudit";
+export * from "./components/AlterHost";
+export * from "./components/AlterLog";
+export * from "./components/AlterSkip";
+export * from "./components/AlterTemplateExportSteps";
+export * from "./components/AlterTemplateImportSteps";
 export * from "./decorators/action";
 export * from "./decorators/actionCtx";
 export * from "./decorators/alter";
 export * from "./decorators/on";
 export * from "./decorators/useFormioAuth";
-export * from "./middlewares/FormioAuthMiddleware";
 export * from "./domain/AlterHook";
 export * from "./domain/Formio";
-export * from "./domain/FormioDecodedToken";
 export * from "./domain/FormioAction";
 export * from "./domain/FormioActionsIndex";
 export * from "./domain/FormioAuth";
 export * from "./domain/FormioBaseModel";
 export * from "./domain/FormioConfig";
 export * from "./domain/FormioCtxMapper";
+export * from "./domain/FormioDecodedToken";
 export * from "./domain/FormioErrors";
 export * from "./domain/FormioHooks";
 export * from "./domain/FormioJs";
 export * from "./domain/FormioModels";
 export * from "./domain/FormioRouter";
 export * from "./domain/FormioSettings";
-export * from "./domain/FormioUpdate";
-export * from "./domain/FormioUtils";
 export * from "./domain/FormioTemplate";
 export * from "./domain/FormioTemplateUtil";
+export * from "./domain/FormioUpdate";
+export * from "./domain/FormioUtils";
 export * from "./domain/OnHook";
-export * from "./FormioModule";
-export * from "./builder/FormioMapper";
-export * from "./services/FormioService";
-export * from "./services/FormioDatabase";
-export * from "./services/FormioDatabase";
+export * from "./domain/Resource";
+export * from "./middlewares/FormioAuthMiddleware";
 export * from "./services/FormioAuthService";
+export * from "./services/FormioDatabase";
 export * from "./services/FormioHooksService";
-export * from "./components/AlterActions";
-export * from "./components/AlterAudit";
-export * from "./components/AlterLog";
-export * from "./components/AlterHost";
-export * from "./components/AlterSkip";
+export * from "./services/FormioInstaller";
+export * from "./services/FormioRepository";
+export * from "./services/FormioService";
+export * from "./utils/isMongoId";

package/lib/types/services/FormioAuthService.d.ts

@@ -1,4 +1,28 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose" />
+/// <reference types="mongoose/types/inferschematype" />
 import { PlatformContext, Req } from "@tsed/common";
 import { FormioPayloadToken } from "../domain/FormioDecodedToken";
 import { FormioSubmission, WithID } from "../domain/FormioModels";
@@ -33,19 +57,25 @@ export declare class FormioAuthService {
      * Retrieve roles
      * @param req
      */
-    getRoles(req?: Req): Promise<import("mongoose").LeanDocument<import("@tsed/mongoose").MongooseMergedDocument<import("mongoose").Document<any, {}> & import("@tsed/formio-types/lib/types/domain/FormioRole").FormioRole & import("@tsed/mongoose").MongooseDocumentMethods<import("@tsed/formio-types/lib/types/domain/FormioRole").FormioRole>>>[]>;
+    getRoles(req?: Req): Promise<import("mongoose").LeanDocument<import("@tsed/mongoose").MongooseMergedDocument<import("mongoose").Document<any, any, any> & import("@tsed/formio-types/lib/types/domain/FormioRole").FormioRole & import("@tsed/mongoose").MongooseDocumentMethods<import("@tsed/formio-types/lib/types/domain/FormioRole").FormioRole>> & {
+        _id: import("mongoose").Types.ObjectId;
+    }>[]>;
     /**
      * Update the role of the current user submission
      * @param _id
      * @param role
      * @param req
      */
-    updateUserRole(_id: string | any, role: string, req?: Req): Promise<import("@tsed/mongoose").MongooseMergedDocument<import("mongoose").Document<any, {}> & FormioSubmission<any> & import("@tsed/mongoose").MongooseDocumentMethods<FormioSubmission<any>>>>;
+    updateUserRole(_id: string | any, role: string, req?: Req): Promise<import("@tsed/mongoose").MongooseMergedDocument<import("mongoose").Document<any, any, any> & FormioSubmission<any> & import("@tsed/mongoose").MongooseDocumentMethods<FormioSubmission<any>>> & {
+        _id: import("mongoose").Types.ObjectId;
+    }>;
     /**
      * Create a user submission in formio
      * @param user
      */
-    createUser<User = any>(user: Partial<FormioSubmission<User>>): Promise<import("mongoose").LeanDocument<import("mongoose").Document<any, {}> & FormioSubmission<any> & import("@tsed/mongoose").MongooseDocumentMethods<FormioSubmission<any>>>>;
+    createUser<User = any>(user: Partial<FormioSubmission<User>>): Promise<import("mongoose").LeanDocument<any> & Required<{
+        _id: unknown;
+    }>>;
     /**
      * Update user submission in formio
      * @param user

package/lib/types/services/FormioDatabase.d.ts

@@ -1,13 +1,35 @@
-/// <reference types="mongoose" />
-import { MongooseModel } from "@tsed/mongoose";
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
+import { MongooseDocument, MongooseModel } from "@tsed/mongoose";
+import type { FilterQuery } from "mongoose";
 import { FormioAction, FormioActionItem, FormioForm, FormioRole, FormioSubmission, FormioToken } from "@tsed/formio-types";
 import { FormioMapper } from "../builder/FormioMapper";
 import { FormioService } from "./FormioService";
 export declare class FormioDatabase {
     protected formio: FormioService;
-    get models(): {
-        [index: string]: import("mongoose").Model<any, {}>;
-    };
+    get models(): import("mongoose").Models;
     get roleModel(): MongooseModel<FormioRole>;
     get formModel(): MongooseModel<FormioForm>;
     get actionModel(): MongooseModel<FormioAction>;
@@ -17,8 +39,42 @@ export declare class FormioDatabase {
     getFormioMapper(): Promise<FormioMapper>;
     hasForms(): Promise<boolean>;
     hasForm(name: string): Promise<boolean>;
-    getForm(nameOrId: string): Promise<import("mongoose").LeanDocument<import("@tsed/mongoose").MongooseMergedDocument<import("mongoose").Document<any, {}> & FormioForm & import("@tsed/mongoose").MongooseDocumentMethods<FormioForm>>> | null>;
-    createFormIfNotExists(form: FormioForm, onCreate?: (form: FormioForm) => any): Promise<import("mongoose").LeanDocument<import("@tsed/mongoose").MongooseMergedDocument<import("mongoose").Document<any, {}> & FormioForm & import("@tsed/mongoose").MongooseDocumentMethods<FormioForm>>> | null>;
-    saveFormDefinition(form: FormioForm): Promise<import("mongoose").Document<any, {}> & FormioForm & import("@tsed/mongoose").MongooseDocumentMethods<FormioForm>>;
+    getForm(nameOrId: string): Promise<import("mongoose").LeanDocument<import("@tsed/mongoose").MongooseMergedDocument<import("mongoose").Document<any, any, any> & FormioForm & import("@tsed/mongoose").MongooseDocumentMethods<FormioForm>> & {
+        _id: import("mongoose").Types.ObjectId;
+    }> | null>;
+    /**
+     * Import form previously exported by export tool.
+     * This method transform alias to a real mongoose _id
+     * @param form
+     * @param onCreate
+     */
+    importFormIfNotExists(form: FormioForm, onCreate?: (form: FormioForm) => any): Promise<import("mongoose").LeanDocument<import("@tsed/mongoose").MongooseMergedDocument<import("mongoose").Document<any, any, any> & FormioForm & import("@tsed/mongoose").MongooseDocumentMethods<FormioForm>> & {
+        _id: import("mongoose").Types.ObjectId;
+    }> | null>;
+    /**
+     * Import form previously exported by export tool.
+     * This method transform alias to a real mongoose _id
+     * @param form
+     */
+    importForm(form: FormioForm): Promise<import("@tsed/mongoose").MongooseMergedDocument<import("mongoose").Document<any, any, any> & FormioForm & import("@tsed/mongoose").MongooseDocumentMethods<FormioForm>> & {
+        _id: import("mongoose").Types.ObjectId;
+    }>;
+    saveForm(form: FormioForm): Promise<import("@tsed/mongoose").MongooseMergedDocument<import("mongoose").Document<any, any, any> & FormioForm & import("@tsed/mongoose").MongooseDocumentMethods<FormioForm>> & {
+        _id: import("mongoose").Types.ObjectId;
+    }>;
+    getSubmissions<Data>(query?: FilterQuery<MongooseModel<FormioSubmission<Data>>>): Promise<MongooseDocument<FormioSubmission<Data>>[]>;
+    /**
+     * Import submission previously exported by export tool.
+     * This method transform alias to a real mongoose _id
+     * @param submission
+     */
+    importSubmission<Data = any>(submission: Omit<Partial<FormioSubmission<Data>>, "form"> & {
+        form?: any;
+    }): Promise<import("@tsed/mongoose").MongooseMergedDocument<import("mongoose").Document<any, any, any> & FormioSubmission<any> & import("@tsed/mongoose").MongooseDocumentMethods<FormioSubmission<any>>> & {
+        _id: import("mongoose").Types.ObjectId;
+    }>;
+    saveSubmission<Data = any>(submission: Partial<FormioSubmission<Data>>): Promise<import("@tsed/mongoose").MongooseMergedDocument<import("mongoose").Document<any, any, any> & FormioSubmission<any> & import("@tsed/mongoose").MongooseDocumentMethods<FormioSubmission<any>>> & {
+        _id: import("mongoose").Types.ObjectId;
+    }>;
     idToBson(form?: any): any;
 }

package/lib/types/services/FormioInstaller.d.ts

@@ -2,9 +2,7 @@ import { Logger } from "@tsed/logger";
 import { FormioSubmission } from "../domain/FormioModels";
 import { FormioTemplate } from "../domain/FormioTemplate";
 import { FormioDatabase } from "./FormioDatabase";
-import { FormioService } from "./FormioService";
 export declare class FormioInstaller extends FormioDatabase {
-    protected formio: FormioService;
     protected logger: Logger;
     install(template: FormioTemplate, root: any): Promise<void>;
     createRootUser<User = unknown>(user: {

package/lib/types/services/FormioRepository.d.ts

@@ -0,0 +1,41 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
+import type { FilterQuery } from "mongoose";
+import { MongooseDocument, MongooseModel } from "@tsed/mongoose";
+import { FormioSubmission } from "../domain/FormioModels";
+import { FormioDatabase } from "./FormioDatabase";
+export declare abstract class FormioRepository<SubmissionData = any> {
+    protected formioDatabase: FormioDatabase;
+    protected abstract formName: string;
+    private formId;
+    getFormId(): Promise<string>;
+    saveSubmission(submission: Omit<Partial<FormioSubmission<SubmissionData>>, "form"> & {
+        form?: any;
+    }): Promise<import("@tsed/mongoose").MongooseMergedDocument<import("mongoose").Document<any, any, any> & FormioSubmission<any> & import("@tsed/mongoose").MongooseDocumentMethods<FormioSubmission<any>>> & {
+        _id: import("mongoose").Types.ObjectId;
+    }>;
+    getSubmissions(query?: FilterQuery<MongooseModel<FormioSubmission<SubmissionData>>>): Promise<MongooseDocument<FormioSubmission<SubmissionData>>[]>;
+    findOneSubmission(query: any): Promise<MongooseDocument<FormioSubmission<SubmissionData>> | undefined>;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/formio",
-  "version": "7.0.0-beta.2",
+  "version": "7.0.0-beta.20",
   "description": "Formio package for Ts.ED framework",
   "private": false,
   "keywords": [
@@ -13,6 +13,7 @@
   ],
   "source": "./src/index.ts",
   "main": "./lib/cjs/index.js",
+  "module": "./lib/esm/index.js",
   "typings": "./lib/types/index.d.ts",
   "exports": {
     "types": "./lib/types/index.d.ts",
@@ -21,41 +22,49 @@
     "default": "./lib/esm/index.js"
   },
   "scripts": {
-    "build": "yarn run build:esm && yarn run build:cjs",
+    "build": "yarn barrels && yarn run build:esm && yarn run build:cjs",
     "build:cjs": "tsc --build tsconfig.compile.json",
     "build:esm": "tsc --build tsconfig.compile.esm.json",
+    "barrels": "yarn barrelsby --delete -d ./src -e \"\\.spec\\.ts\" -e \"__mock__\" -e \".benchmark.ts\"",
     "start": "ts-node -r tsconfig-paths/register test/app/index.ts",
-    "test": "cross-env NODE_ENV=test nyc mocha"
+    "test": "cross-env NODE_ENV=test yarn jest --max-workers=2"
   },
   "dependencies": {
-    "@tsed/formio-types": "7.0.0-beta.2",
-    "tslib": "2.2.0"
+    "@tsed/formio-types": "7.0.0-beta.20",
+    "tslib": "2.4.0"
   },
   "devDependencies": {
-    "@tsed/common": "7.0.0-beta.2",
-    "@tsed/core": "7.0.0-beta.2",
-    "@tsed/di": "7.0.0-beta.2",
-    "@tsed/mongoose": "7.0.0-beta.2",
+    "@tsed/common": "7.0.0-beta.20",
+    "@tsed/core": "7.0.0-beta.20",
+    "@tsed/di": "7.0.0-beta.20",
+    "@tsed/mongoose": "7.0.0-beta.20",
+    "@types/async": "3.2.12",
     "express": "^4.17.1",
     "formio": "^2.0.0",
     "mongodb": "*",
-    "mongoose": "^5.12.2"
+    "mongoose": "^6.1.7"
   },
   "peerDependencies": {
-    "@tsed/common": "^7.0.0-beta.2",
-    "@tsed/core": "^7.0.0-beta.2",
-    "@tsed/di": "^7.0.0-beta.2",
-    "@tsed/mongoose": "^7.0.0-beta.2",
+    "@tsed/common": "^7.0.0-beta.20",
     "express": "^4.17.1",
     "formio": "^2.0.0",
+    "lodash": "^4.17.21",
     "mongodb": "*",
-    "mongoose": "^5.12.2"
+    "mongoose": "^6.1.7"
+  },
+  "peerDependenciesMeta": {
+    "@tsed/common": {
+      "optional": false
+    }
   },
   "repository": "https://github.com/tsedio/tsed",
   "bugs": {
     "url": "https://github.com/tsedio/tsed/issues"
   },
-  "homepage": "https://github.com/tsedio/tsed/tree/alpha/packages/third-parties/formio",
+  "homepage": "https://github.com/tsedio/tsed/tree/beta/packages/third-parties/formio",
   "author": "Romain Lenzotti",
-  "license": "MIT"
+  "license": "MIT",
+  "publishConfig": {
+    "tag": "beta"
+  }
 }

package/readme.md

@@ -11,7 +11,8 @@
 [![npm version](https://badge.fury.io/js/%40tsed%2Fcommon.svg)](https://badge.fury.io/js/%40tsed%2Fcommon)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
-[![backers](https://opencollective.com/tsed/tiers/badge.svg)](https://opencollective.com/tsed)
+[![github](https://img.shields.io/static/v1?label=Github%20sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/romakita)
+[![opencollective](https://img.shields.io/static/v1?label=OpenCollective%20sponsor&message=%E2%9D%A4&logo=OpenCollective&color=%23fe8e86)](https://opencollective.com/tsed)
 
 </div>
 
@@ -32,7 +33,7 @@ A package of Ts.ED framework. See website: https://tsed.io/tutorials/formio.html
 ## Feature
 
 Currently, `@tsed/formio` allows you:
- 
+
 - Configure formio project
 - Register Hook
 - Register Actions
@@ -50,30 +51,26 @@ Then import `@tsed/formio` in your Server:
 
 ```typescript
 import {Configuration, PlatformApplication} from "@tsed/common";
-import "@tsed/formio"; 
+import "@tsed/formio";
 
 @Configuration({
-  formio: {
-  }
+  formio: {}
 })
-export class Server {
-  
-}
+export class Server {}
 ```
 
 ## Contributors
+
 Please read [contributing guidelines here](https://tsed.io/CONTRIBUTING.html)
 
 <a href="https://github.com/tsedio/ts-express-decorators/graphs/contributors"><img src="https://opencollective.com/tsed/contributors.svg?width=890" /></a>
 
-
 ## Backers
 
 Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/tsed#backer)]
 
 <a href="https://opencollective.com/tsed#backers" target="_blank"><img src="https://opencollective.com/tsed/backers.svg?width=890"></a>
 
-
 ## Sponsors
 
 Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/tsed#sponsor)]
@@ -82,7 +79,7 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 
 The MIT License (MIT)
 
-Copyright (c) 2016 - 2018 Romain Lenzotti
+Copyright (c) 2016 - 2022 Romain Lenzotti
 
 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/tsconfig.compile.esm.json

@@ -8,16 +8,5 @@
     "declaration": true,
     "declarationDir": "./lib/types"
   },
-  "exclude": [
-    "node_modules",
-    "test",
-    "lib",
-    "benchmark",
-    "coverage",
-    "spec",
-    "**/*.benchmark.ts",
-    "**/*.spec.ts",
-    "keys",
-    "jest.config.js"
-  ]
+  "exclude": ["node_modules", "test", "lib", "benchmark", "coverage", "spec", "**/*.benchmark.ts", "**/*.spec.ts", "keys", "jest.config.js"]
 }

package/.mocharc.js

@@ -1,5 +0,0 @@
-module.exports = {
-  ...require('@tsed/mocha-config')(),
-  spec: ["{src,test}/**/*.spec.ts"],
-  exclude: [],
-};

package/.nycrc

@@ -1,26 +0,0 @@
-{
-  "include": [
-    "src/**/*.ts"
-  ],
-  "exclude": [
-    "**/*.d.ts",
-    "node_modules",
-    "**/interfaces/**",
-    "**/index.ts"
-  ],
-  "extension": [
-    ".ts"
-  ],
-  "require": [],
-  "reporter": [
-    "text-summary",
-    "html",
-    "lcov",
-    "json"
-  ],
-  "check-coverage": true,
-  "statements": 99.61,
-  "branches": 81.2,
-  "functions": 96.99,
-  "lines": 99.59
-}