@orion-js/models 4.0.0-next.2 → 4.0.0-next.4

package/dist/index.d.ts

@@ -1,13 +1,13 @@
 import { ModelResolver, ModelResolverResolve, Resolver, GlobalResolverResolve } from '@orion-js/resolvers';
-import { SchemaNode, Schema, SchemaMetaFieldType } from '@orion-js/schema';
+import { Schema, SchemaNode, SchemaFieldType } from '@orion-js/schema';
 
 interface ModelsSchemaNode extends Omit<SchemaNode, 'type'> {
-    type: Model | [Model] | SchemaMetaFieldType;
+    type: Model | [Model] | SchemaFieldType;
 }
 interface ModelSchema {
     [key: string]: ModelsSchemaNode;
 }
-interface CreateModelOptions {
+interface CreateModelOptions<TSchema extends Schema = any> {
     /**
      * The name of the model, used for example for GraphQL
      */
@@ -16,16 +16,12 @@ interface CreateModelOptions {
      * Pass a function that returns the schema. For example: () => require('./schema').
      * This is used like this to allow circular dependencies
      */
-    schema?: ModelSchema | (() => {
-        default: ModelSchema;
-    });
+    schema?: TSchema;
     /**
      * Pass a function that returns the resolvers. For example: () => require('./resolvers')
      * This is used like this to allow circular dependencies
      */
-    resolvers?: ModelResolversMap | (() => {
-        default: ModelResolversMap;
-    });
+    resolvers?: ModelResolversMap;
     /**
      * Optional function that will process the document before being returned.
      * @param doc The current document
@@ -53,7 +49,8 @@ interface CloneOptions {
     extendResolvers?: ModelResolversMap;
 }
 interface Model<TSchema = any> {
-    __isModel: boolean;
+    __isModel: true;
+    __modelName: string;
     /**
      * The name of the model, used for example for GraphQL
      */
@@ -61,21 +58,11 @@ interface Model<TSchema = any> {
     /**
      * Returns the schema of the model
      */
-    getSchema: () => Schema & {
-        __model: Model;
-    };
-    /**
-     * Returns the schema without adding __model to the schema
-     */
-    getCleanSchema: () => Schema;
+    getSchema: () => Schema;
     /**
      * Returns the model resolvers
      */
     getResolvers: () => ModelResolversMap;
-    /**
-     * Adds the model resolvers to a item
-     */
-    initItem: (item: any) => any;
     /**
      * Validates an item using @orion-js/schema
      */
@@ -99,13 +86,14 @@ interface Model<TSchema = any> {
 }
 type CreateModel<TSchema = any> = (options: CreateModelOptions) => Model<TSchema>;
 
-declare function createModel<TSchema = any>(modelOptions: CreateModelOptions): Model<TSchema>;
+declare function createModel<TSchema extends Schema>(modelOptions: CreateModelOptions<TSchema>): Model<TSchema>;
 
-declare function modelToSchema(modelSchema: ModelSchema, { cleanSchema }?: {
-    cleanSchema?: boolean;
-}): Schema;
-declare function modelToSchemaWithModel(modelSchema: ModelSchema, model?: Model): Schema | {
-    __model: Model<any>;
-};
+interface ModelToSchemaOptions {
+    modelSchema: Schema;
+    modelName?: string;
+    cleanOptions?: any;
+    validateOptions?: any;
+}
+declare function modelToSchema(options: ModelToSchemaOptions): Schema;
 
-export { type CloneOptions, type CreateModel, type CreateModelOptions, type GlobalResolversMap, type Model, type ModelResolversMap, type ModelSchema, type ModelsSchemaNode, createModel, modelToSchema, modelToSchemaWithModel };
+export { type CloneOptions, type CreateModel, type CreateModelOptions, type GlobalResolversMap, type Model, type ModelResolversMap, type ModelSchema, type ModelsSchemaNode, createModel, modelToSchema };