@tsed/schema 6.76.0 → 6.78.1

package/lib/decorators/common/jsonEntityFn.d.ts

@@ -18,4 +18,4 @@ import { JsonEntityStore } from "../../domain";
  * @utils
  * @model
  */
-export declare function JsonEntityFn<T extends JsonEntityStore>(fn: (entity: T, parameters: DecoratorParameters) => void): (...args: any[]) => any;
+export declare function JsonEntityFn<T extends JsonEntityStore>(fn: (entity: T, parameters: DecoratorParameters) => any): (...args: any[]) => any;

package/lib/domain/JsonEntityStore.d.ts

@@ -75,7 +75,7 @@ export declare class JsonEntityStore extends Entity implements JsonEntityStoreOp
      *
      * @param args
      */
-    static from<T extends JsonEntityStore = JsonEntityStore>(...args: any[]): NonNullable<T>;
+    static from<T extends JsonEntityStore = JsonEntityStore>(...args: any[]): T;
     static fromMethod(target: any, propertyKey: string | symbol): JsonEntityStore;
     get<T = any>(key: string, defaultValue?: any): T;
     getResponseOptions(status: number, contentType?: string): undefined | any;

package/lib/index.js

@@ -180,11 +180,22 @@ function execMapper(type, schema, options) {
  */
 const JsonEntitiesContainer = new Map();
 
+/**
+ * @ignore
+ */
+
+function isJsonEntityStore(model) {
+  return model.isStore;
+}
 /**
  * @ignore
  */
 
 function getJsonEntityStore(...args) {
+  if (isJsonEntityStore(args[0])) {
+    return args[0];
+  }
+
   const store = core.Store.from(...args);
 
   if (!store.has("JsonEntityStore")) {
@@ -201,9 +212,6 @@ function getJsonEntityStore(...args) {
 
   return store.get("JsonEntityStore");
 }
-function isJsonEntityStore(model) {
-  return model.isStore;
-}
 
 class JsonLazyRef {
   constructor(getType) {
@@ -2873,7 +2881,7 @@ function get$1(entity, options) {
 }
 
 function getJsonSchema(model, options = {}) {
-  const entity = isJsonEntityStore(model) ? model : getJsonEntityStore(model);
+  const entity = getJsonEntityStore(model);
   options = _extends({
     endpoint: true,
     groups: []