@orion-js/graphql 4.0.0-alpha.2 → 4.0.0-next.0

package/dist/index.cjs

@@ -25627,7 +25627,7 @@ function newCachePolicy() {
   };
 }
 
-// ../../node_modules/inherits/inherits_browser.js
+// ../../node_modules/sha.js/node_modules/inherits/inherits_browser.js
 var require_inherits_browser2 = __commonJS((exports2, module2) => {
   if (typeof Object.create === "function") {
     module2.exports = function inherits(ctor, superCtor) {
@@ -25657,7 +25657,7 @@ var require_inherits_browser2 = __commonJS((exports2, module2) => {
   }
 });
 
-// ../../node_modules/inherits/inherits.js
+// ../../node_modules/sha.js/node_modules/inherits/inherits.js
 var require_inherits2 = __commonJS((exports2, module2) => {
   try {
     util = require("util");
@@ -45952,6 +45952,7 @@ __export(exports_src, {
   ResolverParamsInfo: () => ResolverParamsInfo_default,
   ResolverParams: () => ResolverParams,
   Query: () => Query,
+  OrionSubscription: () => OrionSubscription,
   Mutation: () => Mutation,
   ModelResolvers: () => ModelResolvers,
   ModelResolver: () => ModelResolver,
@@ -45968,7 +45969,7 @@ var getPubsub = function() {
   return pubsub;
 };
 
-// ../helpers/dist/index.js
+// node_modules/@orion-js/helpers/dist/index.js
 var import_node_module = require("node:module");
 var __create2 = Object.create;
 var __getProtoOf2 = Object.getPrototypeOf;
@@ -46698,7 +46699,7 @@ function getChannelName_default(name, params) {
   return channelName;
 }
 
-// ../resolvers/dist/index.js
+// node_modules/@orion-js/resolvers/dist/index.js
 var import_node_module2 = require("node:module");
 var import_crypto = __toESM(require("crypto"));
 var __create3 = Object.create;
@@ -53670,7 +53671,7 @@ var createSubscription = function(options) {
 };
 var subscription_default = createSubscription;
 
-// ../http/dist/index.js
+// node_modules/@orion-js/http/dist/index.js
 var import_node_module3 = require("node:module");
 var import_crypto2 = __toESM(require("crypto"));
 var import_node_module4 = require("node:module");
@@ -91339,6 +91340,7 @@ function registerRoutes(routesMap) {
   }
 }
 var import_body_parser = __toESM5(require_body_parser(), 1);
+var import_express3 = __toESM5(require_express2(), 1);
 var __create42 = Object.create;
 var __getProtoOf42 = Object.getPrototypeOf;
 var __defProp42 = Object.defineProperty;
@@ -92600,7 +92602,7 @@ var Reflect2;
 var import_typedi = __toESM42(require_cjs(), 1);
 var import_typedi2 = __toESM42(require_cjs(), 1);
 function getInstance(service) {
-  return import_typedi.default.get(service);
+  return import_typedi.Container.get(service);
 }
 var export_Service = import_typedi2.Service;
 var export_Inject = import_typedi2.Inject;
@@ -92633,6 +92635,8 @@ function getServiceRoutes(target) {
 }
 var bodyParser2 = { json: import_body_parser.json, raw: import_body_parser.raw, text: import_body_parser.text, urlencoded: import_body_parser.urlencoded };
 var export_express = import_express2.default;
+var export_Response = import_express3.Response;
+var export_Request = import_express3.Request;
 
 // src/startGraphiQL.ts
 function safeSerialize(data) {
@@ -92843,7 +92847,7 @@ var import_isPlainObject11 = __toESM(require_isPlainObject2());
 var import_isArray10 = __toESM(require_isArray4());
 var import_graphql6 = __toESM(require_graphql2());
 
-// ../schema/dist/index.js
+// node_modules/@orion-js/schema/dist/index.js
 var __create7 = Object.create;
 var __getProtoOf7 = Object.getPrototypeOf;
 var __defProp7 = Object.defineProperty;
@@ -101464,7 +101468,7 @@ async function getBasicQuery(field) {
   }
 }
 
-// ../models/dist/index.js
+// node_modules/@orion-js/models/dist/index.js
 var __create8 = Object.create;
 var __getProtoOf8 = Object.getPrototypeOf;
 var __defProp8 = Object.defineProperty;
@@ -106422,7 +106426,16 @@ var resolversSchemas_default = {
 
 // src/index.ts
 var GraphQL2 = __toESM(require_graphql2());
-// ../services/dist/index.js
+
+// src/types/subscription.ts
+class OrionSubscription {
+  name;
+  params;
+  subscribe;
+  returns;
+  publish;
+}
+// node_modules/@orion-js/services/dist/index.js
 var __create9 = Object.create;
 var __getProtoOf9 = Object.getPrototypeOf;
 var __defProp9 = Object.defineProperty;
@@ -107684,7 +107697,7 @@ var Reflect22;
 var import_typedi3 = __toESM9(require_cjs2(), 1);
 var import_typedi22 = __toESM9(require_cjs2(), 1);
 function getInstance2(service) {
-  return import_typedi3.default.get(service);
+  return import_typedi3.Container.get(service);
 }
 var export_Service2 = import_typedi22.Service;
 var export_Inject2 = import_typedi22.Inject;

package/dist/index.d.ts

@@ -1,88 +1,14 @@
 // Generated by dts-bundle-generator v9.5.1
 
 import { ApolloServerOptions } from '@apollo/server';
-import express from 'express';
+import { express } from '@orion-js/http';
+import { GlobalResolversMap, Model, ModelResolversMap } from '@orion-js/models';
+import { GlobalResolverResolve, ModelResolver as ModelResolverType, ModelResolverResolve, Resolver, ResolverMiddleware, ResolverOptions } from '@orion-js/resolvers';
+import { Schema } from '@orion-js/schema';
 import * as GraphQL from 'graphql';
 import { PubSubEngine } from 'graphql-subscriptions';
 
-// Generated by dts-bundle-generator v9.5.1
-// Generated by dts-bundle-generator v9.5.1
-export interface StoredCacheData {
-	value: any;
-	expires?: Date;
-}
-export interface SetCacheOptions {
-	ttl?: number;
-}
-export interface GetCacheOptions {
-	ttl?: number;
-	fallback?(): Promise<any>;
-}
-export interface OrionCache {
-	/**
-	 * Save data in the cache
-	 */
-	set(key: string, value: any, options?: SetCacheOptions): Promise<void> | void;
-	/**
-	 * Get data from the cache
-	 */
-	get(key: string, options?: GetCacheOptions): Promise<StoredCacheData>;
-	/**
-	 * Removes data from the cache
-	 */
-	invalidate(key: string): Promise<void> | void;
-}
-export type Blackbox = {
-	[name: string]: any;
-};
-export type GlobalResolverResolve = (params: any, viewer: any, info?: any) => Promise<any>;
-export type ModelResolverResolve = (item: any, params: any, viewer: any, info?: any) => Promise<any>;
-export type GlobalCheckPermissions = (params: any, viewer: any, info?: any) => Promise<string | void>;
-export type ModelCheckPermissions = (parent: any, params: any, viewer: any, info?: any) => Promise<string | void>;
-export type GlobalGetCacheKey = (params: any, viewer: any, info: any) => Promise<any>;
-export type ModelGetCacheKey = (parent: any, params: any, viewer: any, info: any) => Promise<any>;
-export interface ExecuteOptions {
-	params: Blackbox;
-	viewer: any;
-	parent?: any;
-	info?: any;
-	options: ResolverOptions;
-}
-export type Parameters$1<T> = T extends (...args: infer P) => any ? P : never;
-export type ReturnType$1<T> = T extends (...args: any) => infer R ? R : any;
-export type ResolverParams<Resolve, IsModel> = IsModel extends undefined ? Parameters$1<Resolve>[0] : Parameters$1<Resolve>[1];
-export interface ExecuteParams<Resolve = Function, IsModel = undefined> {
-	params?: ResolverParams<Resolve, IsModel>;
-	viewer?: any;
-	parent?: IsModel extends undefined ? undefined : Parameters$1<Resolve>[0];
-	info?: any;
-}
-export type Execute<Resolve = Function, IsModel = undefined> = (executeOptions: ExecuteParams<Resolve, IsModel>) => ReturnType$1<Resolve>;
-export interface SharedResolverOptions {
-	resolverId?: string;
-	params?: any;
-	returns?: any;
-	mutation?: boolean;
-	private?: boolean;
-	checkPermission?: GlobalCheckPermissions | ModelCheckPermissions;
-	getCacheKey?: GlobalGetCacheKey | ModelGetCacheKey;
-	cache?: number;
-	cacheProvider?: OrionCache;
-	permissionsOptions?: any;
-	middlewares?: ResolverMiddleware[];
-}
-export interface ResolverOptions<Resolve = Function> extends SharedResolverOptions {
-	resolve: Resolve;
-}
-export type OmitFirstArg<F> = F extends (x: any, ...args: infer P) => infer R ? (...args: P) => R : never;
-export interface Resolver<Resolve = Function, IsModel = undefined> extends SharedResolverOptions {
-	execute: Execute<Resolve, IsModel>;
-	resolve: Resolve;
-	modelResolve: IsModel extends undefined ? undefined : OmitFirstArg<Resolve>;
-}
-export type ModelResolver<Resolve = Function> = Resolver<Resolve, true>;
-export type ResolverMiddleware = (executeOptions: ExecuteOptions, next: () => Promise<any>) => Promise<any>;
-export interface OrionSubscription<TParams = any, ReturnType = any> {
+export declare class OrionSubscription<TParams = any, ReturnType = any> {
 	name: string;
 	params: object;
 	subscribe: (callParams: object, viewer: object) => {};
@@ -97,262 +23,6 @@ export interface OrionSubscriptionOptions extends Omit<ResolverOptions, "resolve
 	name?: string;
 }
 declare const createSubscription: CreateOrionSubscriptionFunction;
-interface StoredCacheData$1 {
-	value: any;
-	expires?: Date;
-}
-interface SetCacheOptions$1 {
-	ttl?: number;
-}
-interface GetCacheOptions$1 {
-	ttl?: number;
-	fallback?(): Promise<any>;
-}
-interface OrionCache$1 {
-	/**
-	 * Save data in the cache
-	 */
-	set(key: string, value: any, options?: SetCacheOptions$1): Promise<void> | void;
-	/**
-	 * Get data from the cache
-	 */
-	get(key: string, options?: GetCacheOptions$1): Promise<StoredCacheData$1>;
-	/**
-	 * Removes data from the cache
-	 */
-	invalidate(key: string): Promise<void> | void;
-}
-type Blackbox$1 = {
-	[name: string]: any;
-};
-type GlobalResolverResolve$1 = (params: any, viewer: any, info?: any) => Promise<any>;
-type ModelResolverResolve$1 = (item: any, params: any, viewer: any, info?: any) => Promise<any>;
-type GlobalCheckPermissions$1 = (params: any, viewer: any, info?: any) => Promise<string | void>;
-type ModelCheckPermissions$1 = (parent: any, params: any, viewer: any, info?: any) => Promise<string | void>;
-type GlobalGetCacheKey$1 = (params: any, viewer: any, info: any) => Promise<any>;
-type ModelGetCacheKey$1 = (parent: any, params: any, viewer: any, info: any) => Promise<any>;
-interface ExecuteOptions$1 {
-	params: Blackbox$1;
-	viewer: any;
-	parent?: any;
-	info?: any;
-	options: ResolverOptions$1;
-}
-type Parameters$1$1<T> = T extends (...args: infer P) => any ? P : never;
-type ReturnType$1$1<T> = T extends (...args: any) => infer R ? R : any;
-type ResolverParams$1<Resolve, IsModel> = IsModel extends undefined ? Parameters$1$1<Resolve>[0] : Parameters$1$1<Resolve>[1];
-interface ExecuteParams$1<Resolve = Function, IsModel = undefined> {
-	params?: ResolverParams$1<Resolve, IsModel>;
-	viewer?: any;
-	parent?: IsModel extends undefined ? undefined : Parameters$1$1<Resolve>[0];
-	info?: any;
-}
-type Execute$1<Resolve = Function, IsModel = undefined> = (executeOptions: ExecuteParams$1<Resolve, IsModel>) => ReturnType$1$1<Resolve>;
-interface SharedResolverOptions$1 {
-	resolverId?: string;
-	params?: any;
-	returns?: any;
-	mutation?: boolean;
-	private?: boolean;
-	checkPermission?: GlobalCheckPermissions$1 | ModelCheckPermissions$1;
-	getCacheKey?: GlobalGetCacheKey$1 | ModelGetCacheKey$1;
-	cache?: number;
-	cacheProvider?: OrionCache$1;
-	permissionsOptions?: any;
-	middlewares?: ResolverMiddleware$1[];
-}
-interface ResolverOptions$1<Resolve = Function> extends SharedResolverOptions$1 {
-	resolve: Resolve;
-}
-type OmitFirstArg$1<F> = F extends (x: any, ...args: infer P) => infer R ? (...args: P) => R : never;
-interface Resolver$1<Resolve = Function, IsModel = undefined> extends SharedResolverOptions$1 {
-	execute: Execute$1<Resolve, IsModel>;
-	resolve: Resolve;
-	modelResolve: IsModel extends undefined ? undefined : OmitFirstArg$1<Resolve>;
-}
-type ModelResolver$1<Resolve = Function> = Resolver$1<Resolve, true>;
-type ResolverMiddleware$1 = (executeOptions: ExecuteOptions$1, next: () => Promise<any>) => Promise<any>;
-export interface FieldType {
-	name: string;
-	validate: ValidateFunction;
-	clean: CleanFunction;
-	meta?: any;
-	toGraphQLType?: (GraphQL: any) => any;
-	_isFieldType: boolean;
-}
-export type Constructor<T> = new (...args: any[]) => T;
-export type FieldTypesList = "string" | "date" | "integer" | "number" | "ID" | "boolean" | "email" | "blackbox" | "any";
-export type TypedModelOnSchema = Function;
-export type ConstructorsTypesList = Constructor<String> | Constructor<Number> | Constructor<Boolean> | Constructor<Date>;
-export type SchemaRecursiveNodeTypeExtras = {
-	_isFieldType?: boolean;
-	__clean?: CleanFunction;
-	__validate?: ValidateFunction;
-	__skipChildValidation?: (value: any, info: CurrentNodeInfo) => Promise<boolean>;
-};
-export interface Schema {
-	[key: string]: SchemaNode | Function;
-}
-export type SchemaRecursiveNodeType = Schema & SchemaRecursiveNodeTypeExtras;
-export type SchemaMetaFieldTypeSingle = FieldTypesList | ConstructorsTypesList | SchemaRecursiveNodeType | FieldType | TypedModelOnSchema;
-export type SchemaMetaFieldType = SchemaMetaFieldTypeSingle | SchemaMetaFieldTypeSingle[];
-export type ValidateFunction = (value: any, info?: Partial<CurrentNodeInfo>, ...args: any[]) => object | string | void | Promise<object | string | void>;
-export type CleanFunction = (value: any, info?: Partial<CurrentNodeInfo>, ...args: any[]) => any | Promise<any>;
-export interface SchemaNode {
-	/**
-	 * The type of the field. Used for type validations. Can also contain a subschema.
-	 */
-	type: SchemaMetaFieldType;
-	/**
-	 * Defaults to false
-	 */
-	optional?: boolean;
-	allowedValues?: Array<any>;
-	defaultValue?: ((info: CurrentNodeInfo, ...args: any[]) => any | Promise<any>) | any;
-	/**
-	 * Function that takes a value and returns an error message if there are any errors. Must return null or undefined otherwise.
-	 */
-	validate?: ValidateFunction;
-	/**
-	 * Function that preprocesses a value before it is set.
-	 */
-	clean?: CleanFunction;
-	autoValue?: (value: any, info: CurrentNodeInfo, ...args: any[]) => any | Promise<any>;
-	/**
-	 * The minimum value if it's a number, the minimum length if it's a string or array.
-	 */
-	min?: number;
-	/**
-	 * The maximum value if it's a number, the maximum length if it's a string or array.
-	 */
-	max?: number;
-	/**
-	 * Internal use only.
-	 */
-	isBlackboxChild?: boolean;
-	/**
-	 * @deprecated
-	 */
-	custom?: ValidateFunction;
-	/**
-	 * Used in GraphQL. If true, the field will be omitted from the schema.
-	 */
-	private?: boolean;
-	/**
-	 * Used in GraphQL. When in GraphQL, this resolver will replace the static field.
-	 */
-	graphQLResolver?: (...args: any) => any;
-	/**
-	 * Used in GraphQL. Sets the key of the field in the GraphQL schema. You must set this value when building your schema.
-	 */
-	key?: string;
-	/**
-	 * The name that would be displayed in a front-end form
-	 */
-	label?: string;
-	/**
-	 * The description that would be displayed in a front-end form
-	 */
-	description?: string;
-	/**
-	 * The placeholder that would be displayed in a front-end form
-	 */
-	placeholder?: string;
-	/**
-	 * The field type that would be used in a front-end form
-	 */
-	fieldType?: string;
-	/**
-	 * The field options that will be passed as props to the front-end field
-	 */
-	fieldOptions?: any;
-}
-export interface CurrentNodeInfoOptions {
-	autoConvert?: boolean;
-	filter?: boolean;
-	trimStrings?: boolean;
-	removeEmptyStrings?: boolean;
-	forceDoc?: any;
-	omitRequired?: boolean;
-}
-export interface CurrentNodeInfo {
-	/**
-	 * The global schema, prefaced by {type: {...}} to be compatible with subschemas
-	 * Sometimes it's given without {type: {...}}. TODO: Normalize this.
-	 */
-	schema?: SchemaNode | Schema;
-	/**
-	 * The current node subschema
-	 */
-	currentSchema?: Partial<SchemaNode>;
-	value: any;
-	doc?: any;
-	currentDoc?: any;
-	options?: CurrentNodeInfoOptions;
-	args?: any[];
-	type?: SchemaMetaFieldType;
-	keys?: string[];
-	addError?: (keys: string[], code: string | object) => void;
-}
-export interface ModelResolversMap {
-	[key: string]: ModelResolver$1<ModelResolverResolve$1>;
-}
-export interface GlobalResolversMap {
-	[key: string]: Resolver$1<GlobalResolverResolve$1>;
-}
-export interface CloneOptions {
-	name: string;
-	omitFields?: string[];
-	pickFields?: string[];
-	mapFields?: (field: any, key: string) => any;
-	extendSchema?: Schema;
-	extendResolvers?: ModelResolversMap;
-}
-export interface Model<TSchema = any> {
-	__isModel: boolean;
-	/**
-	 * The name of the model, used for example for GraphQL
-	 */
-	name: string;
-	/**
-	 * Returns the schema of the model
-	 */
-	getSchema: () => Schema & {
-		__model: Model;
-	};
-	/**
-	 * Returns the schema without adding __model to the schema
-	 */
-	getCleanSchema: () => 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
-	 */
-	validate: (item: any) => Promise<any>;
-	/**
-	 * Cleans an item using @orion-js/schema
-	 */
-	clean: (item: any) => Promise<TSchema>;
-	/**
-	 * Cleans and validates an item using @orion-js/schema
-	 */
-	cleanAndValidate: (item: any) => Promise<TSchema>;
-	/**
-	 * Creates a new model using this one as a base
-	 */
-	clone: (cloneOptions: CloneOptions) => Model;
-	/**
-	 * The type of the model. Only use this in typescript
-	 */
-	type: TSchema;
-}
 export type ExecuteGraphQLCache = (req: express.Request, res: express.Response, viewer: object, executeQuery: () => Promise<string>) => Promise<string>;
 export interface ModelsResolversMap {
 	[key: string]: ModelResolversMap;
@@ -391,135 +61,13 @@ export interface StartGraphQLOptions extends Omit<ApolloServerOptions<any>, Sche
 declare function _default(options: StartGraphQLOptions): Promise<void>;
 declare function _default$1(apolloOptions: ApolloServerOptions<any>, options: StartGraphQLOptions): void;
 declare const _default$2: {
-	params: Resolver<({ mutation, name }: any, viewer: any) => Promise<{
-		resolver: Resolver$1<GlobalResolverResolve$1, undefined>;
+	params: import("@orion-js/resolvers").Resolver<({ mutation, name }: any, viewer: any) => Promise<{
+		resolver: import("@orion-js/models").Resolver<import("@orion-js/models").GlobalResolverResolve, undefined>;
 		name: any;
 	}>, undefined>;
 };
 declare const _default$3: Model<any>;
-interface FieldType$1 {
-	name: string;
-	validate: ValidateFunction$1;
-	clean: CleanFunction$1;
-	meta?: any;
-	toGraphQLType?: (GraphQL: any) => any;
-	_isFieldType: boolean;
-}
-type Constructor$1<T> = new (...args: any[]) => T;
-type FieldTypesList$1 = "string" | "date" | "integer" | "number" | "ID" | "boolean" | "email" | "blackbox" | "any";
-type TypedModelOnSchema$1 = Function;
-type ConstructorsTypesList$1 = Constructor$1<String> | Constructor$1<Number> | Constructor$1<Boolean> | Constructor$1<Date>;
-type SchemaRecursiveNodeTypeExtras$1 = {
-	_isFieldType?: boolean;
-	__clean?: CleanFunction$1;
-	__validate?: ValidateFunction$1;
-	__skipChildValidation?: (value: any, info: CurrentNodeInfo$1) => Promise<boolean>;
-};
-interface Schema$1 {
-	[key: string]: SchemaNode$1 | Function;
-}
-type SchemaRecursiveNodeType$1 = Schema$1 & SchemaRecursiveNodeTypeExtras$1;
-type SchemaMetaFieldTypeSingle$1 = FieldTypesList$1 | ConstructorsTypesList$1 | SchemaRecursiveNodeType$1 | FieldType$1 | TypedModelOnSchema$1;
-type SchemaMetaFieldType$1 = SchemaMetaFieldTypeSingle$1 | SchemaMetaFieldTypeSingle$1[];
-type ValidateFunction$1 = (value: any, info?: Partial<CurrentNodeInfo$1>, ...args: any[]) => object | string | void | Promise<object | string | void>;
-type CleanFunction$1 = (value: any, info?: Partial<CurrentNodeInfo$1>, ...args: any[]) => any | Promise<any>;
-interface SchemaNode$1 {
-	/**
-	 * The type of the field. Used for type validations. Can also contain a subschema.
-	 */
-	type: SchemaMetaFieldType$1;
-	/**
-	 * Defaults to false
-	 */
-	optional?: boolean;
-	allowedValues?: Array<any>;
-	defaultValue?: ((info: CurrentNodeInfo$1, ...args: any[]) => any | Promise<any>) | any;
-	/**
-	 * Function that takes a value and returns an error message if there are any errors. Must return null or undefined otherwise.
-	 */
-	validate?: ValidateFunction$1;
-	/**
-	 * Function that preprocesses a value before it is set.
-	 */
-	clean?: CleanFunction$1;
-	autoValue?: (value: any, info: CurrentNodeInfo$1, ...args: any[]) => any | Promise<any>;
-	/**
-	 * The minimum value if it's a number, the minimum length if it's a string or array.
-	 */
-	min?: number;
-	/**
-	 * The maximum value if it's a number, the maximum length if it's a string or array.
-	 */
-	max?: number;
-	/**
-	 * Internal use only.
-	 */
-	isBlackboxChild?: boolean;
-	/**
-	 * @deprecated
-	 */
-	custom?: ValidateFunction$1;
-	/**
-	 * Used in GraphQL. If true, the field will be omitted from the schema.
-	 */
-	private?: boolean;
-	/**
-	 * Used in GraphQL. When in GraphQL, this resolver will replace the static field.
-	 */
-	graphQLResolver?: (...args: any) => any;
-	/**
-	 * Used in GraphQL. Sets the key of the field in the GraphQL schema. You must set this value when building your schema.
-	 */
-	key?: string;
-	/**
-	 * The name that would be displayed in a front-end form
-	 */
-	label?: string;
-	/**
-	 * The description that would be displayed in a front-end form
-	 */
-	description?: string;
-	/**
-	 * The placeholder that would be displayed in a front-end form
-	 */
-	placeholder?: string;
-	/**
-	 * The field type that would be used in a front-end form
-	 */
-	fieldType?: string;
-	/**
-	 * The field options that will be passed as props to the front-end field
-	 */
-	fieldOptions?: any;
-}
-interface CurrentNodeInfoOptions$1 {
-	autoConvert?: boolean;
-	filter?: boolean;
-	trimStrings?: boolean;
-	removeEmptyStrings?: boolean;
-	forceDoc?: any;
-	omitRequired?: boolean;
-}
-interface CurrentNodeInfo$1 {
-	/**
-	 * The global schema, prefaced by {type: {...}} to be compatible with subschemas
-	 * Sometimes it's given without {type: {...}}. TODO: Normalize this.
-	 */
-	schema?: SchemaNode$1 | Schema$1;
-	/**
-	 * The current node subschema
-	 */
-	currentSchema?: Partial<SchemaNode$1>;
-	value: any;
-	doc?: any;
-	currentDoc?: any;
-	options?: CurrentNodeInfoOptions$1;
-	args?: any[];
-	type?: SchemaMetaFieldType$1;
-	keys?: string[];
-	addError?: (keys: string[], code: string | object) => void;
-}
-export function serializeSchema(params: any): Promise<Schema$1>;
+export function serializeSchema(params: any): Promise<Schema>;
 declare function getBasicQuery(field: any): Promise<any>;
 export declare function Resolvers(): ClassDecorator;
 export interface GlobalResolverPropertyDescriptor extends Omit<PropertyDecorator, "value"> {
@@ -533,14 +81,14 @@ export declare function getServiceResolvers(target: any): {
 export interface ModelResolverPropertyDescriptor extends Omit<PropertyDecorator, "value"> {
 	value?: ModelResolverResolve;
 }
-declare function ModelResolver$2(options?: Omit<ResolverOptions<any>, "resolve" | "middlewares">): (target: any, propertyKey: string, descriptor: ModelResolverPropertyDescriptor) => void;
+export declare function ModelResolver(options?: Omit<ResolverOptions<any>, "resolve" | "middlewares">): (target: any, propertyKey: string, descriptor: ModelResolverPropertyDescriptor) => void;
 export interface ModelResolversOptions {
 	modelName?: string;
 }
 export declare function ModelResolvers(typedSchema: any, options?: ModelResolversOptions): ClassDecorator;
 export declare function getServiceModelResolvers(target: any): {
 	[key: string]: {
-		[key: string]: ModelResolver<GlobalResolverResolve>;
+		[key: string]: ModelResolverType<GlobalResolverResolve>;
 	};
 };
 export declare function Subscriptions(): ClassDecorator;
@@ -550,15 +98,13 @@ export declare function getServiceSubscriptions(target: any): {
 };
 export declare function getTargetMetadata(target: any, propertyKey: string, metadataKey: string): any;
 export declare const UseMiddleware: (metadata: ResolverMiddleware) => (target: any, propertyKey: string, descriptor: GlobalResolverPropertyDescriptor | ModelResolverPropertyDescriptor) => void;
-declare const ResolverParams$2: (metadata: any) => (target: any, propertyKey: string, descriptor: GlobalResolverPropertyDescriptor | ModelResolverPropertyDescriptor) => void;
+export declare const ResolverParams: (metadata: any) => (target: any, propertyKey: string, descriptor: GlobalResolverPropertyDescriptor | ModelResolverPropertyDescriptor) => void;
 export declare const ResolverReturns: (metadata: any) => (target: any, propertyKey: string, descriptor: GlobalResolverPropertyDescriptor | ModelResolverPropertyDescriptor) => void;
 export declare const getWebsockerViewer: (connectionParams: any) => Promise<any>;
 export declare const setGetWebsockerViewer: (getViewerFunc: (connectionParams: any) => any) => void;
 
 export {
 	GraphQL,
-	ModelResolver$2 as ModelResolver,
-	ResolverParams$2 as ResolverParams,
 	_default as startGraphQL,
 	_default$1 as startGraphiQL,
 	_default$2 as resolversSchemas,

package/dist/index.js

@@ -25614,7 +25614,7 @@ function newCachePolicy() {
   };
 }
 
-// ../../node_modules/inherits/inherits_browser.js
+// ../../node_modules/sha.js/node_modules/inherits/inherits_browser.js
 var require_inherits_browser2 = __commonJS((exports2, module2) => {
   if (typeof Object.create === "function") {
     module2.exports = function inherits(ctor, superCtor) {
@@ -25644,7 +25644,7 @@ var require_inherits_browser2 = __commonJS((exports2, module2) => {
   }
 });
 
-// ../../node_modules/inherits/inherits.js
+// ../../node_modules/sha.js/node_modules/inherits/inherits.js
 var require_inherits2 = __commonJS((exports2, module2) => {
   try {
     util = __require("util");
@@ -45915,7 +45915,7 @@ var getPubsub = function() {
   return pubsub;
 };
 
-// ../helpers/dist/index.js
+// node_modules/@orion-js/helpers/dist/index.js
 import { createRequire as createRequire2 } from "node:module";
 var __create2 = Object.create;
 var __getProtoOf2 = Object.getPrototypeOf;
@@ -46645,7 +46645,7 @@ function getChannelName_default(name, params) {
   return channelName;
 }
 
-// ../resolvers/dist/index.js
+// node_modules/@orion-js/resolvers/dist/index.js
 import { createRequire as createRequire3 } from "node:module";
 import crypto2 from "crypto";
 var __create3 = Object.create;
@@ -53617,7 +53617,7 @@ var createSubscription = function(options) {
 };
 var subscription_default = createSubscription;
 
-// ../http/dist/index.js
+// node_modules/@orion-js/http/dist/index.js
 import { createRequire as createRequire4 } from "node:module";
 import crypto22 from "crypto";
 import { createRequire as createRequire22 } from "node:module";
@@ -91286,6 +91286,7 @@ function registerRoutes(routesMap) {
   }
 }
 var import_body_parser = __toESM5(require_body_parser(), 1);
+var import_express3 = __toESM5(require_express2(), 1);
 var __create42 = Object.create;
 var __getProtoOf42 = Object.getPrototypeOf;
 var __defProp42 = Object.defineProperty;
@@ -92547,7 +92548,7 @@ var Reflect2;
 var import_typedi = __toESM42(require_cjs(), 1);
 var import_typedi2 = __toESM42(require_cjs(), 1);
 function getInstance(service) {
-  return import_typedi.default.get(service);
+  return import_typedi.Container.get(service);
 }
 var export_Service = import_typedi2.Service;
 var export_Inject = import_typedi2.Inject;
@@ -92580,6 +92581,8 @@ function getServiceRoutes(target) {
 }
 var bodyParser2 = { json: import_body_parser.json, raw: import_body_parser.raw, text: import_body_parser.text, urlencoded: import_body_parser.urlencoded };
 var export_express = import_express2.default;
+var export_Response = import_express3.Response;
+var export_Request = import_express3.Request;
 
 // src/startGraphiQL.ts
 function safeSerialize(data) {
@@ -92790,7 +92793,7 @@ var import_isPlainObject11 = __toESM(require_isPlainObject2(), 1);
 var import_isArray10 = __toESM(require_isArray4(), 1);
 var import_graphql6 = __toESM(require_graphql2(), 1);
 
-// ../schema/dist/index.js
+// node_modules/@orion-js/schema/dist/index.js
 var __create7 = Object.create;
 var __getProtoOf7 = Object.getPrototypeOf;
 var __defProp7 = Object.defineProperty;
@@ -101411,7 +101414,7 @@ async function getBasicQuery(field) {
   }
 }
 
-// ../models/dist/index.js
+// node_modules/@orion-js/models/dist/index.js
 var __create8 = Object.create;
 var __getProtoOf8 = Object.getPrototypeOf;
 var __defProp8 = Object.defineProperty;
@@ -106369,7 +106372,16 @@ var resolversSchemas_default = {
 
 // src/index.ts
 var GraphQL2 = __toESM(require_graphql2(), 1);
-// ../services/dist/index.js
+
+// src/types/subscription.ts
+class OrionSubscription {
+  name;
+  params;
+  subscribe;
+  returns;
+  publish;
+}
+// node_modules/@orion-js/services/dist/index.js
 var __create9 = Object.create;
 var __getProtoOf9 = Object.getPrototypeOf;
 var __defProp9 = Object.defineProperty;
@@ -107631,7 +107643,7 @@ var Reflect22;
 var import_typedi3 = __toESM9(require_cjs2(), 1);
 var import_typedi22 = __toESM9(require_cjs2(), 1);
 function getInstance2(service) {
-  return import_typedi3.default.get(service);
+  return import_typedi3.Container.get(service);
 }
 var export_Service2 = import_typedi22.Service;
 var export_Inject2 = import_typedi22.Inject;
@@ -107805,6 +107817,7 @@ export {
   ResolverParamsInfo_default as ResolverParamsInfo,
   ResolverParams,
   Query,
+  OrionSubscription,
   Mutation,
   ModelResolvers,
   ModelResolver,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/graphql",
-  "version": "4.0.0-alpha.2",
+  "version": "4.0.0-next.0",
   "main": "./dist/index.cjs",
   "author": "nicolaslopezj",
   "license": "MIT",
@@ -16,14 +16,14 @@
   "dependencies": {
     "@apollo/server": "^4.3.0",
     "@graphql-tools/schema": "^9.0.12",
-    "@orion-js/env": "^4.0.0-alpha.2",
-    "@orion-js/helpers": "^4.0.0-alpha.2",
-    "@orion-js/http": "^4.0.0-alpha.2",
-    "@orion-js/models": "^4.0.0-alpha.2",
-    "@orion-js/resolvers": "^4.0.0-alpha.2",
-    "@orion-js/schema": "^4.0.0-alpha.2",
-    "@orion-js/services": "^4.0.0-alpha.2",
-    "@orion-js/typed-model": "^4.0.0-alpha.2",
+    "@orion-js/env": "4.0.0-next.0",
+    "@orion-js/helpers": "4.0.0-next.0",
+    "@orion-js/http": "4.0.0-next.0",
+    "@orion-js/models": "4.0.0-next.0",
+    "@orion-js/resolvers": "4.0.0-next.0",
+    "@orion-js/schema": "4.0.0-next.0",
+    "@orion-js/services": "4.0.0-next.0",
+    "@orion-js/typed-model": "4.0.0-next.0",
     "graphql-iso-date": "^3.6.1",
     "graphql-subscriptions": "2.0.0",
     "graphql-ws": "^5.11.2",
@@ -44,7 +44,7 @@
     "@types/bun": "^1.2.4"
   },
   "peerDependencies": {
-    "graphql": "^16.0.1"
+    "graphql": "*"
   },
   "publishConfig": {
     "access": "public"