@tsed/formio 7.0.0-beta.12 → 7.0.0-beta.13

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// @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"]}
+{"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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/formio",
-  "version": "7.0.0-beta.12",
+  "version": "7.0.0-beta.13",
   "description": "Formio package for Ts.ED framework",
   "private": false,
   "keywords": [
@@ -27,17 +27,17 @@
     "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.12",
-    "tslib": "2.3.1"
+    "@tsed/formio-types": "7.0.0-beta.13",
+    "tslib": "2.4.0"
   },
   "devDependencies": {
-    "@tsed/common": "7.0.0-beta.12",
-    "@tsed/core": "7.0.0-beta.12",
-    "@tsed/di": "7.0.0-beta.12",
-    "@tsed/mongoose": "7.0.0-beta.12",
+    "@tsed/common": "7.0.0-beta.13",
+    "@tsed/core": "7.0.0-beta.13",
+    "@tsed/di": "7.0.0-beta.13",
+    "@tsed/mongoose": "7.0.0-beta.13",
     "@types/async": "3.2.12",
     "express": "^4.17.1",
     "formio": "^2.0.0",
@@ -45,7 +45,7 @@
     "mongoose": "^6.1.7"
   },
   "peerDependencies": {
-    "@tsed/common": "^7.0.0-beta.12",
+    "@tsed/common": "^7.0.0-beta.13",
     "express": "^4.17.1",
     "formio": "^2.0.0",
     "lodash": "^4.17.21",

package/.mocharc.js

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

package/.nycrc

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