@gqloom/core 0.12.0 → 0.12.1

package/dist/context.d.cts

@@ -1,4 +1,4 @@
-import { BaseField, Middleware, OnlyMemoizationPayload, ResolverPayload, ResolvingFields } from "./index-B1bRSxSg.cjs";
+import { BaseField, Middleware, OnlyMemoizationPayload, ResolverPayload, ResolvingFields } from "./index-BxqR3YsC.cjs";
 import { AsyncLocalStorage } from "node:async_hooks";
 
 //#region src/context/context.d.ts

package/dist/context.d.ts

@@ -1,4 +1,4 @@
-import { BaseField, Middleware, OnlyMemoizationPayload, ResolverPayload, ResolvingFields } from "./index-_VhWbhmU.js";
+import { BaseField, Middleware, OnlyMemoizationPayload, ResolverPayload, ResolvingFields } from "./index-sGKC4BRu.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 
 //#region src/context/context.d.ts

package/dist/{index-B1bRSxSg.d.cts → index-BxqR3YsC.d.cts}

@@ -1073,44 +1073,73 @@ interface SchemaWeaver {
 declare function isSchemaVendorWeaver(some: any): some is SchemaWeaver;
 //#endregion
 //#region src/schema/weaver-context.d.ts
-interface WeaverContext {
+declare class WeaverContext {
+  static increasingID: number;
+  static names: WeakMap<object, string>;
+  static autoAliasTypes: WeakSet<GraphQLNamedType>;
+  private static _ref;
+  static get ref(): WeaverContext | undefined;
   id: number;
   loomObjectMap: Map<GraphQLObjectType, LoomObjectType>;
   loomUnionMap: Map<GraphQLUnionType, GraphQLUnionType>;
   inputMap: Map<GraphQLObjectType | GraphQLInterfaceType, GraphQLInputObjectType>;
   interfaceMap: Map<GraphQLObjectType, GraphQLInterfaceType>;
   configs: Map<string | symbol, WeaverConfig>;
-  getConfig: <TConfig extends WeaverConfig>(key: TConfig[typeof WEAVER_CONFIG]) => TConfig | undefined;
-  setConfig<TConfig extends WeaverConfig>(config: TConfig): void;
-  deleteConfig: <TConfig extends WeaverConfig>(key: TConfig[typeof WEAVER_CONFIG]) => void;
   namedTypes: Map<string, GraphQLOutputType>;
-  memoNamedType<TGraphQLType extends GraphQLOutputType = GraphQLOutputType>(gqlType: TGraphQLType): TGraphQLType;
-  getNamedType<T extends GraphQLOutputType>(name: string): T | undefined;
-  names: WeakMap<object, string>;
-  autoAliasTypes: WeakSet<GraphQLNamedType>;
   vendorWeavers: Map<string, SchemaWeaver>;
+  constructor();
+  getConfig<TConfig extends WeaverConfig>(key: TConfig[typeof WEAVER_CONFIG]): TConfig | undefined;
+  setConfig<TConfig extends WeaverConfig>(config: TConfig): void;
+  deleteConfig<TConfig extends WeaverConfig>(key: TConfig[typeof WEAVER_CONFIG]): void;
+  memoNamedType<TGraphQLType extends GraphQLOutputType = GraphQLOutputType>(gqlTypeValue: TGraphQLType): TGraphQLType;
+  getNamedType<T extends GraphQLOutputType>(name: string): T | undefined;
+  protected static readonly namedTypes: {
+    readonly Object: "Object";
+    readonly Union: "Union";
+    readonly Enum: "Enum";
+    readonly Interface: "Interface";
+    readonly Scalar: "Scalar";
+  };
+  protected aliasCounters: Partial<Record<keyof typeof WeaverContext.namedTypes, number>>;
+  setAlias(namedType: GraphQLNamedType, alias: string | undefined): string | undefined;
+  /**
+   * @returns -1 if a is better than b, 1 if b is better than a, 0 if they are equal
+   */
+  protected static higherPriorityThan(a: string | undefined, b: string | undefined): number;
+  static provide<T>(func: () => T, value: WeaverContext | undefined): T;
 }
+declare const initWeaverContext: () => WeaverContext;
+declare const provideWeaverContext: typeof WeaverContext.provide & {
+  inherit: <T>(func: () => T) => () => T;
+};
 interface WeaverConfig {
   [WEAVER_CONFIG]: string | symbol;
   vendorWeaver?: SchemaWeaver;
 }
-declare function initWeaverContext(): WeaverContext;
-declare namespace initWeaverContext {
-  var increasingID: number;
-}
-type GlobalContextRequiredKeys = "names" | "getConfig" | "setConfig" | "deleteConfig" | "getNamedType" | "memoNamedType" | "autoAliasTypes";
-interface GlobalWeaverContext extends Partial<Omit<WeaverContext, GlobalContextRequiredKeys>>, Pick<WeaverContext, GlobalContextRequiredKeys> {
-  value?: WeaverContext;
-  useConfig<TConfig extends WeaverConfig, TCallback extends () => any>(config: TConfig, callback: TCallback): ReturnType<TCallback>;
+type GlobalContextRequiredKeys = "getConfig" | "setConfig" | "deleteConfig" | "getNamedType" | "memoNamedType";
+declare class GlobalWeaverContext implements Partial<Omit<WeaverContext, GlobalContextRequiredKeys>>, Pick<WeaverContext, GlobalContextRequiredKeys> {
   GraphQLTypes: WeakMap<object, GraphQLOutputType>;
+  get id(): number | undefined;
+  get loomObjectMap(): Map<GraphQLObjectType<any, any>, LoomObjectType> | undefined;
+  get loomUnionMap(): Map<GraphQLUnionType, GraphQLUnionType> | undefined;
+  get inputMap(): Map<GraphQLInterfaceType | GraphQLObjectType<any, any>, GraphQLInputObjectType> | undefined;
+  get interfaceMap(): Map<GraphQLObjectType<any, any>, GraphQLInterfaceType> | undefined;
+  get configs(): Map<string | symbol, WeaverConfig> | undefined;
+  get vendorWeavers(): Map<string, SchemaWeaver> | undefined;
+  get names(): WeakMap<object, string>;
+  get autoAliasTypes(): WeakSet<GraphQLNamedType>;
+  get value(): WeaverContext | undefined;
+  getConfig<TConfig extends WeaverConfig>(key: TConfig[typeof WEAVER_CONFIG]): TConfig | undefined;
+  setConfig(config: WeaverConfig): void;
+  deleteConfig(key: string | symbol): void;
+  useConfig<TConfig extends WeaverConfig, TCallback extends () => any>(config: TConfig, callback: TCallback): ReturnType<TCallback>;
+  getNamedType<T extends GraphQLOutputType>(name: string): T | undefined;
+  memoNamedType<TGraphQLType extends GraphQLOutputType = GraphQLOutputType>(gqlType: TGraphQLType): TGraphQLType;
   getGraphQLType<TGraphQLType extends GraphQLOutputType = GraphQLOutputType>(origin: object): TGraphQLType | undefined;
   memoGraphQLType<TGraphQLType extends GraphQLOutputType = GraphQLOutputType>(origin: object, gqlType: TGraphQLType): TGraphQLType;
+  setAlias(namedType: GraphQLNamedType, alias: string | undefined): string | undefined;
 }
 declare const weaverContext: GlobalWeaverContext;
-declare function provideWeaverContext<T>(func: () => T, value: WeaverContext | undefined): T;
-declare namespace provideWeaverContext {
-  var inherit: <T>(func: () => T) => () => T;
-}
 /**
  * collect names for schemas
  * @param namesList - names to collect
@@ -1144,6 +1173,7 @@ declare class LoomObjectType extends GraphQLObjectType {
   hideField(name: string): void;
   addField(name: string, field: BaseField, resolver: Resolver | undefined): void;
   mergeExtensions(extensions: GraphQLObjectTypeConfig<any, any>["extensions"]): void;
+  protected collectedFieldNames(): void;
   private extraFieldMap?;
   getFields(): GraphQLFieldMap<any, any>;
   protected mapToFieldConfig(map: Map<string, BaseField>): Record<string, GraphQLFieldConfig<any, any>>;

package/dist/{index-_VhWbhmU.d.ts → index-sGKC4BRu.d.ts}

@@ -1071,44 +1071,73 @@ interface SchemaWeaver {
 declare function isSchemaVendorWeaver(some: any): some is SchemaWeaver;
 //#endregion
 //#region src/schema/weaver-context.d.ts
-interface WeaverContext {
+declare class WeaverContext {
+  static increasingID: number;
+  static names: WeakMap<object, string>;
+  static autoAliasTypes: WeakSet<GraphQLNamedType>;
+  private static _ref;
+  static get ref(): WeaverContext | undefined;
   id: number;
   loomObjectMap: Map<GraphQLObjectType, LoomObjectType>;
   loomUnionMap: Map<GraphQLUnionType, GraphQLUnionType>;
   inputMap: Map<GraphQLObjectType | GraphQLInterfaceType, GraphQLInputObjectType>;
   interfaceMap: Map<GraphQLObjectType, GraphQLInterfaceType>;
   configs: Map<string | symbol, WeaverConfig>;
-  getConfig: <TConfig extends WeaverConfig>(key: TConfig[typeof WEAVER_CONFIG]) => TConfig | undefined;
-  setConfig<TConfig extends WeaverConfig>(config: TConfig): void;
-  deleteConfig: <TConfig extends WeaverConfig>(key: TConfig[typeof WEAVER_CONFIG]) => void;
   namedTypes: Map<string, GraphQLOutputType>;
-  memoNamedType<TGraphQLType extends GraphQLOutputType = GraphQLOutputType>(gqlType: TGraphQLType): TGraphQLType;
-  getNamedType<T extends GraphQLOutputType>(name: string): T | undefined;
-  names: WeakMap<object, string>;
-  autoAliasTypes: WeakSet<GraphQLNamedType>;
   vendorWeavers: Map<string, SchemaWeaver>;
+  constructor();
+  getConfig<TConfig extends WeaverConfig>(key: TConfig[typeof WEAVER_CONFIG]): TConfig | undefined;
+  setConfig<TConfig extends WeaverConfig>(config: TConfig): void;
+  deleteConfig<TConfig extends WeaverConfig>(key: TConfig[typeof WEAVER_CONFIG]): void;
+  memoNamedType<TGraphQLType extends GraphQLOutputType = GraphQLOutputType>(gqlTypeValue: TGraphQLType): TGraphQLType;
+  getNamedType<T extends GraphQLOutputType>(name: string): T | undefined;
+  protected static readonly namedTypes: {
+    readonly Object: "Object";
+    readonly Union: "Union";
+    readonly Enum: "Enum";
+    readonly Interface: "Interface";
+    readonly Scalar: "Scalar";
+  };
+  protected aliasCounters: Partial<Record<keyof typeof WeaverContext.namedTypes, number>>;
+  setAlias(namedType: GraphQLNamedType, alias: string | undefined): string | undefined;
+  /**
+   * @returns -1 if a is better than b, 1 if b is better than a, 0 if they are equal
+   */
+  protected static higherPriorityThan(a: string | undefined, b: string | undefined): number;
+  static provide<T>(func: () => T, value: WeaverContext | undefined): T;
 }
+declare const initWeaverContext: () => WeaverContext;
+declare const provideWeaverContext: typeof WeaverContext.provide & {
+  inherit: <T>(func: () => T) => () => T;
+};
 interface WeaverConfig {
   [WEAVER_CONFIG]: string | symbol;
   vendorWeaver?: SchemaWeaver;
 }
-declare function initWeaverContext(): WeaverContext;
-declare namespace initWeaverContext {
-  var increasingID: number;
-}
-type GlobalContextRequiredKeys = "names" | "getConfig" | "setConfig" | "deleteConfig" | "getNamedType" | "memoNamedType" | "autoAliasTypes";
-interface GlobalWeaverContext extends Partial<Omit<WeaverContext, GlobalContextRequiredKeys>>, Pick<WeaverContext, GlobalContextRequiredKeys> {
-  value?: WeaverContext;
-  useConfig<TConfig extends WeaverConfig, TCallback extends () => any>(config: TConfig, callback: TCallback): ReturnType<TCallback>;
+type GlobalContextRequiredKeys = "getConfig" | "setConfig" | "deleteConfig" | "getNamedType" | "memoNamedType";
+declare class GlobalWeaverContext implements Partial<Omit<WeaverContext, GlobalContextRequiredKeys>>, Pick<WeaverContext, GlobalContextRequiredKeys> {
   GraphQLTypes: WeakMap<object, GraphQLOutputType>;
+  get id(): number | undefined;
+  get loomObjectMap(): Map<GraphQLObjectType<any, any>, LoomObjectType> | undefined;
+  get loomUnionMap(): Map<GraphQLUnionType, GraphQLUnionType> | undefined;
+  get inputMap(): Map<GraphQLInterfaceType | GraphQLObjectType<any, any>, GraphQLInputObjectType> | undefined;
+  get interfaceMap(): Map<GraphQLObjectType<any, any>, GraphQLInterfaceType> | undefined;
+  get configs(): Map<string | symbol, WeaverConfig> | undefined;
+  get vendorWeavers(): Map<string, SchemaWeaver> | undefined;
+  get names(): WeakMap<object, string>;
+  get autoAliasTypes(): WeakSet<GraphQLNamedType>;
+  get value(): WeaverContext | undefined;
+  getConfig<TConfig extends WeaverConfig>(key: TConfig[typeof WEAVER_CONFIG]): TConfig | undefined;
+  setConfig(config: WeaverConfig): void;
+  deleteConfig(key: string | symbol): void;
+  useConfig<TConfig extends WeaverConfig, TCallback extends () => any>(config: TConfig, callback: TCallback): ReturnType<TCallback>;
+  getNamedType<T extends GraphQLOutputType>(name: string): T | undefined;
+  memoNamedType<TGraphQLType extends GraphQLOutputType = GraphQLOutputType>(gqlType: TGraphQLType): TGraphQLType;
   getGraphQLType<TGraphQLType extends GraphQLOutputType = GraphQLOutputType>(origin: object): TGraphQLType | undefined;
   memoGraphQLType<TGraphQLType extends GraphQLOutputType = GraphQLOutputType>(origin: object, gqlType: TGraphQLType): TGraphQLType;
+  setAlias(namedType: GraphQLNamedType, alias: string | undefined): string | undefined;
 }
 declare const weaverContext: GlobalWeaverContext;
-declare function provideWeaverContext<T>(func: () => T, value: WeaverContext | undefined): T;
-declare namespace provideWeaverContext {
-  var inherit: <T>(func: () => T) => () => T;
-}
 /**
  * collect names for schemas
  * @param namesList - names to collect
@@ -1142,6 +1171,7 @@ declare class LoomObjectType extends GraphQLObjectType {
   hideField(name: string): void;
   addField(name: string, field: BaseField, resolver: Resolver | undefined): void;
   mergeExtensions(extensions: GraphQLObjectTypeConfig<any, any>["extensions"]): void;
+  protected collectedFieldNames(): void;
   private extraFieldMap?;
   getFields(): GraphQLFieldMap<any, any>;
   protected mapToFieldConfig(map: Map<string, BaseField>): Record<string, GraphQLFieldConfig<any, any>>;

package/dist/index.cjs

@@ -240,113 +240,176 @@ var EasyDataLoader = class extends LoomDataLoader {
 
 //#endregion
 //#region src/schema/weaver-context.ts
-let ref;
-const names = /* @__PURE__ */ new WeakMap();
-const autoAliasTypes = /* @__PURE__ */ new WeakSet();
-function initWeaverContext() {
-	return {
-		id: initWeaverContext.increasingID++,
-		loomObjectMap: /* @__PURE__ */ new Map(),
-		loomUnionMap: /* @__PURE__ */ new Map(),
-		inputMap: /* @__PURE__ */ new Map(),
-		interfaceMap: /* @__PURE__ */ new Map(),
-		configs: /* @__PURE__ */ new Map(),
-		getConfig(key) {
-			return this.configs.get(key);
-		},
-		setConfig(config) {
-			const key = config[require_context.WEAVER_CONFIG];
-			this.configs.set(key, config);
-		},
-		deleteConfig(key) {
-			this.configs.delete(key);
-		},
-		names,
-		autoAliasTypes,
-		namedTypes: /* @__PURE__ */ new Map(),
-		memoNamedType(gqlTypeValue) {
-			const gqlType = gqlTypeValue;
-			if ((0, graphql.isObjectType)(gqlType) || (0, graphql.isUnionType)(gqlType) || (0, graphql.isEnumType)(gqlType) || (0, graphql.isScalarType)(gqlType)) this.namedTypes.set(gqlType.name, gqlType);
-			return gqlTypeValue;
-		},
-		getNamedType(name) {
-			return this.namedTypes.get(name);
-		},
-		vendorWeavers: /* @__PURE__ */ new Map()
+var WeaverContext = class WeaverContext {
+	static increasingID = 1;
+	static names = /* @__PURE__ */ new WeakMap();
+	static autoAliasTypes = /* @__PURE__ */ new WeakSet();
+	static _ref;
+	static get ref() {
+		return WeaverContext._ref;
+	}
+	id;
+	loomObjectMap;
+	loomUnionMap;
+	inputMap;
+	interfaceMap;
+	configs;
+	namedTypes;
+	vendorWeavers;
+	constructor() {
+		this.id = WeaverContext.increasingID++;
+		this.loomObjectMap = /* @__PURE__ */ new Map();
+		this.loomUnionMap = /* @__PURE__ */ new Map();
+		this.inputMap = /* @__PURE__ */ new Map();
+		this.interfaceMap = /* @__PURE__ */ new Map();
+		this.configs = /* @__PURE__ */ new Map();
+		this.namedTypes = /* @__PURE__ */ new Map();
+		this.vendorWeavers = /* @__PURE__ */ new Map();
+	}
+	getConfig(key) {
+		return this.configs.get(key);
+	}
+	setConfig(config) {
+		const key = config[require_context.WEAVER_CONFIG];
+		this.configs.set(key, config);
+	}
+	deleteConfig(key) {
+		this.configs.delete(key);
+	}
+	memoNamedType(gqlTypeValue) {
+		const gqlType = gqlTypeValue;
+		if ((0, graphql.isObjectType)(gqlType) || (0, graphql.isUnionType)(gqlType) || (0, graphql.isEnumType)(gqlType) || (0, graphql.isScalarType)(gqlType)) this.namedTypes.set(gqlType.name, gqlType);
+		return gqlTypeValue;
+	}
+	getNamedType(name) {
+		return this.namedTypes.get(name);
+	}
+	static namedTypes = {
+		Object: "Object",
+		Union: "Union",
+		Enum: "Enum",
+		Interface: "Interface",
+		Scalar: "Scalar"
 	};
-}
-initWeaverContext.increasingID = 1;
-const weaverContext = {
+	aliasCounters = {};
+	setAlias(namedType, alias) {
+		if (namedType.name === require_context.AUTO_ALIASING) WeaverContext.autoAliasTypes.add(namedType);
+		if (!WeaverContext.autoAliasTypes.has(namedType)) return namedType.name;
+		if (WeaverContext.higherPriorityThan(alias, namedType.name) < 0) {
+			if (alias) return namedType.name = alias;
+		}
+		if (namedType.name === require_context.AUTO_ALIASING) {
+			if ((0, graphql.isObjectType)(namedType) || (0, graphql.isInputObjectType)(namedType)) {
+				this.aliasCounters["Object"] ??= 0;
+				return namedType.name = `Object${++this.aliasCounters["Object"]}`;
+			} else if ((0, graphql.isUnionType)(namedType)) {
+				this.aliasCounters["Union"] ??= 0;
+				return namedType.name = `Union${++this.aliasCounters["Union"]}`;
+			} else if ((0, graphql.isEnumType)(namedType)) {
+				this.aliasCounters["Enum"] ??= 0;
+				return namedType.name = `Enum${++this.aliasCounters["Enum"]}`;
+			} else if ((0, graphql.isInterfaceType)(namedType)) {
+				this.aliasCounters["Interface"] ??= 0;
+				return namedType.name = `Interface${++this.aliasCounters["Interface"]}`;
+			} else if ((0, graphql.isScalarType)(namedType)) {
+				this.aliasCounters["Scalar"] ??= 0;
+				return namedType.name = `Scalar${++this.aliasCounters["Scalar"]}`;
+			}
+		}
+	}
+	/**
+	* @returns -1 if a is better than b, 1 if b is better than a, 0 if they are equal
+	*/
+	static higherPriorityThan(a, b) {
+		if (a === require_context.AUTO_ALIASING || a === void 0) return 1;
+		else if (b === require_context.AUTO_ALIASING || b === void 0) return -1;
+		const compareLength = a.length - b.length;
+		if (compareLength !== 0) return compareLength;
+		const compareLocale = a.localeCompare(b);
+		if (compareLocale !== 0) return compareLocale;
+		return 0;
+	}
+	static provide(func, value) {
+		const lastRef = WeaverContext._ref;
+		WeaverContext._ref = value;
+		try {
+			return func();
+		} finally {
+			WeaverContext._ref = lastRef;
+		}
+	}
+};
+const initWeaverContext = () => new WeaverContext();
+const provideWeaverContext = Object.assign(WeaverContext.provide, { inherit: (func) => {
+	const weaverContextRef = WeaverContext.ref;
+	return () => WeaverContext.provide(func, weaverContextRef);
+} });
+var GlobalWeaverContext = class {
+	GraphQLTypes = /* @__PURE__ */ new WeakMap();
 	get id() {
-		return ref?.id;
-	},
+		return WeaverContext.ref?.id;
+	}
 	get loomObjectMap() {
-		return ref?.loomObjectMap;
-	},
+		return WeaverContext.ref?.loomObjectMap;
+	}
 	get loomUnionMap() {
-		return ref?.loomUnionMap;
-	},
+		return WeaverContext.ref?.loomUnionMap;
+	}
 	get inputMap() {
-		return ref?.inputMap;
-	},
+		return WeaverContext.ref?.inputMap;
+	}
 	get interfaceMap() {
-		return ref?.interfaceMap;
-	},
+		return WeaverContext.ref?.interfaceMap;
+	}
 	get configs() {
-		return ref?.configs;
-	},
+		return WeaverContext.ref?.configs;
+	}
 	get vendorWeavers() {
-		return ref?.vendorWeavers;
-	},
+		return WeaverContext.ref?.vendorWeavers;
+	}
+	get names() {
+		return WeaverContext.names;
+	}
+	get autoAliasTypes() {
+		return WeaverContext.autoAliasTypes;
+	}
+	get value() {
+		return WeaverContext.ref;
+	}
 	getConfig(key) {
-		return ref?.getConfig(key);
-	},
+		return WeaverContext.ref?.getConfig(key);
+	}
 	setConfig(config) {
-		ref?.setConfig(config);
-	},
+		WeaverContext.ref?.setConfig(config);
+	}
 	deleteConfig(key) {
-		ref?.deleteConfig(key);
-	},
-	get value() {
-		return ref;
-	},
+		WeaverContext.ref?.deleteConfig(key);
+	}
 	useConfig(config, callback) {
-		const context = weaverContext.value ?? initWeaverContext();
+		const context = this.value ?? initWeaverContext();
 		context.setConfig(config);
 		const result = provideWeaverContext(callback, context);
 		context.deleteConfig(config[require_context.WEAVER_CONFIG]);
 		return result;
-	},
-	names,
-	autoAliasTypes,
+	}
 	getNamedType(name) {
-		return ref?.getNamedType(name);
-	},
+		return WeaverContext.ref?.getNamedType(name);
+	}
 	memoNamedType(gqlType) {
-		return ref?.memoNamedType(gqlType) ?? gqlType;
-	},
-	GraphQLTypes: /* @__PURE__ */ new WeakMap(),
+		return WeaverContext.ref?.memoNamedType(gqlType) ?? gqlType;
+	}
 	getGraphQLType(origin) {
 		return this.GraphQLTypes.get(origin);
-	},
+	}
 	memoGraphQLType(origin, gqlType) {
 		this.GraphQLTypes.set(origin, gqlType);
 		return gqlType;
 	}
-};
-function provideWeaverContext(func, value) {
-	const lastRef = ref;
-	ref = value;
-	try {
-		return func();
-	} finally {
-		ref = lastRef;
+	setAlias(namedType, alias) {
+		return WeaverContext.ref?.setAlias(namedType, alias);
 	}
-}
-provideWeaverContext.inherit = (func) => {
-	const weaverContextRef = weaverContext.value;
-	return () => provideWeaverContext(func, weaverContextRef);
 };
+const weaverContext = new GlobalWeaverContext();
 /**
 * collect names for schemas
 * @param namesList - names to collect
@@ -355,7 +418,7 @@ provideWeaverContext.inherit = (func) => {
 function collectNames(...namesList) {
 	const namesRecord = {};
 	for (const namesItem of namesList) for (const [name, schema] of Object.entries(namesItem)) {
-		names.set(schema, name);
+		WeaverContext.names.set(schema, name);
 		namesRecord[name] = schema;
 	}
 	return namesRecord;
@@ -367,7 +430,7 @@ function collectNames(...namesList) {
 * @returns schema
 */
 function collectName(name, schema) {
-	names.set(schema, name);
+	WeaverContext.names.set(schema, name);
 	return schema;
 }
 
@@ -1206,15 +1269,6 @@ var ObjectChainResolver = class extends ChainResolver {
 	}
 };
 
-//#endregion
-//#region src/schema/alias.ts
-function setAlias(namedType, alias, context) {
-	if (namedType.name === require_context.AUTO_ALIASING) context.autoAliasTypes.add(namedType);
-	if (!context.autoAliasTypes.has(namedType) || !alias) return;
-	if (namedType.name === require_context.AUTO_ALIASING) namedType.name = alias;
-	namedType.name = alias.length < namedType.name.length ? alias : namedType.name;
-}
-
 //#endregion
 //#region src/schema/input.ts
 function inputToArgs(input, options) {
@@ -1252,7 +1306,7 @@ function ensureInputType(silkOrType, options) {
 	if ((0, graphql.isEnumType)(gqlType)) {
 		if (gqlType.name === require_context.AUTO_ALIASING) {
 			const alias = `${pascalCase(options.fieldName)}Input`;
-			setAlias(gqlType, alias, weaverContext);
+			weaverContext.setAlias(gqlType, alias);
 		}
 		return gqlType;
 	}
@@ -1310,10 +1364,10 @@ var LoomObjectType = class extends graphql.GraphQLObjectType {
 		this.globalOptions = options.globalOptions;
 		this.weaverContext = options.weaverContext ?? initWeaverContext();
 		this.resolvers = /* @__PURE__ */ new Map();
-		if (this.name === require_context.AUTO_ALIASING) this.weaverContext.autoAliasTypes.add(this);
+		if (this.name === require_context.AUTO_ALIASING) WeaverContext.autoAliasTypes.add(this);
 	}
 	addAlias(alias) {
-		if (!this.weaverContext.autoAliasTypes.has(this) || !alias) return;
+		if (!WeaverContext.autoAliasTypes.has(this) || !alias) return;
 		this.name = alias.length < this.name.length ? alias : this.name;
 	}
 	hideField(name) {
@@ -1328,10 +1382,14 @@ var LoomObjectType = class extends graphql.GraphQLObjectType {
 	mergeExtensions(extensions) {
 		this.extensions = deepMerge(this.extensions, extensions);
 	}
+	collectedFieldNames() {
+		const fieldsBySuper = super.getFields();
+		Object.entries(fieldsBySuper).forEach(([fieldName, field$1]) => field$1.type = this.getCacheType(field$1.type, fieldName));
+	}
 	extraFieldMap;
 	getFields() {
 		const fieldsBySuper = super.getFields();
-		Object.entries(fieldsBySuper).forEach(([fieldName, field$1]) => field$1.type = this.getCacheType(field$1.type, fieldName));
+		this.collectedFieldNames();
 		const extraFields = provideWeaverContext(() => defineFieldMap(this.mapToFieldConfig(this.extraFields)), this.weaverContext);
 		if (Object.keys(this.extraFieldMap ?? {}).join() !== Object.keys(extraFields).join()) this.extraFieldMap = extraFields;
 		const answer = {
@@ -1515,7 +1573,7 @@ function getCacheType(gqlType, options = {}) {
 		if (gqlObject != null) return gqlObject;
 		const loomObject = new LoomObjectType(gqlType, options);
 		context.loomObjectMap?.set(gqlType, loomObject);
-		setAlias(loomObject, getAlias(), context);
+		context.setAlias(loomObject, getAlias());
 		return loomObject;
 	} else if ((0, graphql.isListType)(gqlType)) return new graphql.GraphQLList(getCacheType(gqlType.ofType, options));
 	else if ((0, graphql.isNonNullType)(gqlType)) return new graphql.GraphQLNonNull(getCacheType(gqlType.ofType, options));
@@ -1527,14 +1585,14 @@ function getCacheType(gqlType, options = {}) {
 			...config,
 			types: config.types.map((type, i) => getCacheType(type, {
 				...options,
-				fieldName: options.fieldName ? `${options.fieldName}${i + 1}` : void 0
+				fieldName: options.fieldName ? `${options.fieldName}Item${i + 1}` : void 0
 			}))
 		});
 		context.loomUnionMap?.set(gqlType, unionType);
-		setAlias(unionType, getAlias(), context);
+		context.setAlias(unionType, getAlias());
 		return unionType;
-	} else if ((0, graphql.isEnumType)(gqlType)) {
-		setAlias(gqlType, getAlias(), context);
+	} else if ((0, graphql.isEnumType)(gqlType) || (0, graphql.isInterfaceType)(gqlType) || (0, graphql.isScalarType)(gqlType)) {
+		context.setAlias(gqlType, getAlias());
 		return gqlType;
 	}
 	return gqlType;
@@ -1596,18 +1654,11 @@ var GraphQLSchemaLoom = class GraphQLSchemaLoom {
 		return this;
 	}
 	addType(silk$1) {
-		const gqlType = provideWeaverContext(() => {
-			let gqlType$1 = getGraphQLType(silk$1);
-			if ((0, graphql.isNonNullType)(gqlType$1)) gqlType$1 = gqlType$1.ofType;
-			if ((0, graphql.isObjectType)(gqlType$1)) {
-				const existing = this.context.loomObjectMap.get(gqlType$1);
-				if (existing != null) return existing;
-				const extraObject = new LoomObjectType(gqlType$1, this.fieldOptions);
-				this.context.loomObjectMap.set(gqlType$1, extraObject);
-				return extraObject;
-			} else if ((0, graphql.isUnionType)(gqlType$1) || (0, graphql.isEnumType)(gqlType$1)) return gqlType$1;
-			throw new Error(`${gqlType$1?.name ?? gqlType$1.toString()} is not a named type`);
+		let gqlType = provideWeaverContext(() => {
+			const gqlType$1 = getGraphQLType(silk$1);
+			return getCacheType(gqlType$1);
 		}, this.context);
+		while ((0, graphql.isNonNullType)(gqlType) || (0, graphql.isListType)(gqlType)) gqlType = gqlType.ofType;
 		this.types.add(gqlType);
 		return this;
 	}
@@ -1632,8 +1683,8 @@ var GraphQLSchemaLoom = class GraphQLSchemaLoom {
 		let parentObject = (() => {
 			if (parent == null) return void 0;
 			let gqlType = getGraphQLType(parent);
-			if ((0, graphql.isNonNullType)(gqlType)) gqlType = gqlType.ofType;
-			if (!(0, graphql.isObjectType)(gqlType)) throw new Error(`${gqlType?.name ?? gqlType.toString()} is not an object type`);
+			while ((0, graphql.isNonNullType)(gqlType) || (0, graphql.isListType)(gqlType)) gqlType = gqlType.ofType;
+			if (!(0, graphql.isObjectType)(gqlType)) throw new Error(`${gqlType.name} is not an object type`);
 			const existing = this.context.loomObjectMap.get(gqlType);
 			if (existing != null) return existing;
 			const extraObject = new LoomObjectType(gqlType, this.fieldOptions);
@@ -1764,6 +1815,7 @@ exports.DERIVED_DEPENDENCIES = require_context.DERIVED_DEPENDENCIES;
 exports.EasyDataLoader = EasyDataLoader;
 exports.FieldChainFactory = FieldChainFactory;
 exports.FieldFactoryWithResolve = FieldFactoryWithResolve;
+exports.GlobalWeaverContext = GlobalWeaverContext;
 exports.GraphQLSchemaLoom = GraphQLSchemaLoom;
 exports.LoomDataLoader = LoomDataLoader;
 exports.LoomObjectType = LoomObjectType;
@@ -1780,6 +1832,7 @@ Object.defineProperty(exports, 'SYMBOLS', {
   }
 });
 exports.SubscriptionChainFactory = SubscriptionChainFactory;
+exports.WeaverContext = WeaverContext;
 exports.applyMiddlewares = applyMiddlewares;
 exports.assignContextMap = require_context.assignContextMap;
 exports.capitalize = capitalize;

package/dist/index.d.cts

@@ -1,2 +1,2 @@
-import { AUTO_ALIASING, BaseChainFactory, BaseField, BatchLoadFn, CallableInputParser, CallableMiddlewareOptions, ChainFactoryOptions, ChainResolver, CoreSchemaWeaverConfig, CoreSchemaWeaverConfigOptions, DERIVED_DEPENDENCIES, DirectiveItem, DirectiveRecord, EasyDataLoader, Executor, Field, FieldChainFactory, FieldFactory, FieldFactoryWithResolve, FieldFactoryWithUtils, FieldMeta, FieldOptions, FieldOrOperation, FieldOrOperationType, GQLoomExtensionAttribute, GQLoomExtensions, GlobalWeaverContext, GraphQLFieldOptions, GraphQLSchemaLoom, GraphQLSilk, IChainFactory, InferFieldInput, InferFieldOutput, InferInputI, InferInputO, IsAny, ListSilk, LoomDataLoader, LoomObjectType, MayPromise, Middleware, MiddlewareConfig, MiddlewareOperation, MiddlewareOptions, Mutation, MutationChainFactory, MutationFactory, MutationFactoryWithChain, MutationFactoryWithResolve, MutationOptions, NonNullSilk, NullableSilk, OPERATION_OBJECT_NAMES, ObjectChainResolver, OmitInUnion, OnlyMemoizationPayload, Operation, OperationType, Query, QueryChainFactory, QueryFactory, QueryFactoryWithChain, QueryFactoryWithResolve, QueryOptions, RequireKeys, ResolvableSubscription, Resolver, ResolverFactory, ResolverMeta, ResolverOptions, ResolverOptionsWithExtensions, ResolverOptionsWithParent, ResolverPayload, ResolvingFields, ResolvingOptions, SchemaWeaver, StandardSchemaV1, Subscription, SubscriptionChainFactory, SubscriptionFactory, SubscriptionFactoryWithChain, SubscriptionNeedResolve, SubscriptionOptions, ToExecutorProps, ValueOf, WeaverConfig, WeaverContext, applyMiddlewares, assignContextMap, capitalize, collectName, collectNames, createField, createInputParser, createMutation, createQuery, createSubscription, deepMerge, defaultSubscriptionResolve, ensureInputObjectType, ensureInputType, ensureInterfaceType, field, filterMiddlewares, getCacheType, getDeepResolvingFields, getFieldOptions, getGraphQLType, getMemoizationMap, getOperationOptions, getResolvingFields, getStandardValue, getSubscriptionOptions, initWeaverContext, inputToArgs, isOnlyMemoryPayload, isSchemaVendorWeaver, isSilk, listSilk, loom, mapValue, markErrorLocation, markLocation, meta, mutation, nonNullSilk, notNullish, nullableSilk, onlyMemoization, parseInputValue, parseResolvingFields, parseSilk, pascalCase, provideWeaverContext, query, resolver, screamingSnakeCase, silk, subscription, symbols_d_exports, toObjMap, tryIn, types_loom_d_exports, weave, weaverContext } from "./index-B1bRSxSg.cjs";
+import { AUTO_ALIASING, BaseChainFactory, BaseField, BatchLoadFn, CallableInputParser, CallableMiddlewareOptions, ChainFactoryOptions, ChainResolver, CoreSchemaWeaverConfig, CoreSchemaWeaverConfigOptions, DERIVED_DEPENDENCIES, DirectiveItem, DirectiveRecord, EasyDataLoader, Executor, Field, FieldChainFactory, FieldFactory, FieldFactoryWithResolve, FieldFactoryWithUtils, FieldMeta, FieldOptions, FieldOrOperation, FieldOrOperationType, GQLoomExtensionAttribute, GQLoomExtensions, GlobalWeaverContext, GraphQLFieldOptions, GraphQLSchemaLoom, GraphQLSilk, IChainFactory, InferFieldInput, InferFieldOutput, InferInputI, InferInputO, IsAny, ListSilk, LoomDataLoader, LoomObjectType, MayPromise, Middleware, MiddlewareConfig, MiddlewareOperation, MiddlewareOptions, Mutation, MutationChainFactory, MutationFactory, MutationFactoryWithChain, MutationFactoryWithResolve, MutationOptions, NonNullSilk, NullableSilk, OPERATION_OBJECT_NAMES, ObjectChainResolver, OmitInUnion, OnlyMemoizationPayload, Operation, OperationType, Query, QueryChainFactory, QueryFactory, QueryFactoryWithChain, QueryFactoryWithResolve, QueryOptions, RequireKeys, ResolvableSubscription, Resolver, ResolverFactory, ResolverMeta, ResolverOptions, ResolverOptionsWithExtensions, ResolverOptionsWithParent, ResolverPayload, ResolvingFields, ResolvingOptions, SchemaWeaver, StandardSchemaV1, Subscription, SubscriptionChainFactory, SubscriptionFactory, SubscriptionFactoryWithChain, SubscriptionNeedResolve, SubscriptionOptions, ToExecutorProps, ValueOf, WeaverConfig, WeaverContext, applyMiddlewares, assignContextMap, capitalize, collectName, collectNames, createField, createInputParser, createMutation, createQuery, createSubscription, deepMerge, defaultSubscriptionResolve, ensureInputObjectType, ensureInputType, ensureInterfaceType, field, filterMiddlewares, getCacheType, getDeepResolvingFields, getFieldOptions, getGraphQLType, getMemoizationMap, getOperationOptions, getResolvingFields, getStandardValue, getSubscriptionOptions, initWeaverContext, inputToArgs, isOnlyMemoryPayload, isSchemaVendorWeaver, isSilk, listSilk, loom, mapValue, markErrorLocation, markLocation, meta, mutation, nonNullSilk, notNullish, nullableSilk, onlyMemoization, parseInputValue, parseResolvingFields, parseSilk, pascalCase, provideWeaverContext, query, resolver, screamingSnakeCase, silk, subscription, symbols_d_exports, toObjMap, tryIn, types_loom_d_exports, weave, weaverContext } from "./index-BxqR3YsC.cjs";
 export { AUTO_ALIASING, BaseChainFactory, BaseField, BatchLoadFn, CallableInputParser, CallableMiddlewareOptions, ChainFactoryOptions, ChainResolver, CoreSchemaWeaverConfig, CoreSchemaWeaverConfigOptions, DERIVED_DEPENDENCIES, DirectiveItem, DirectiveRecord, EasyDataLoader, Executor, Field, FieldChainFactory, FieldFactory, FieldFactoryWithResolve, FieldFactoryWithUtils, FieldMeta, FieldOptions, FieldOrOperation, FieldOrOperationType, GQLoomExtensionAttribute, GQLoomExtensions, GlobalWeaverContext, GraphQLFieldOptions, GraphQLSchemaLoom, GraphQLSilk, IChainFactory, InferFieldInput, InferFieldOutput, InferInputI, InferInputO, IsAny, ListSilk, types_loom_d_exports as Loom, LoomDataLoader, LoomObjectType, MayPromise, Middleware, MiddlewareConfig, MiddlewareOperation, MiddlewareOptions, Mutation, MutationChainFactory, MutationFactory, MutationFactoryWithChain, MutationFactoryWithResolve, MutationOptions, NonNullSilk, NullableSilk, OPERATION_OBJECT_NAMES, ObjectChainResolver, OmitInUnion, OnlyMemoizationPayload, Operation, OperationType, Query, QueryChainFactory, QueryFactory, QueryFactoryWithChain, QueryFactoryWithResolve, QueryOptions, RequireKeys, ResolvableSubscription, Resolver, ResolverFactory, ResolverMeta, ResolverOptions, ResolverOptionsWithExtensions, ResolverOptionsWithParent, ResolverPayload, ResolvingFields, ResolvingOptions, symbols_d_exports as SYMBOLS, SchemaWeaver, StandardSchemaV1, Subscription, SubscriptionChainFactory, SubscriptionFactory, SubscriptionFactoryWithChain, SubscriptionNeedResolve, SubscriptionOptions, ToExecutorProps, ValueOf, WeaverConfig, WeaverContext, applyMiddlewares, assignContextMap, capitalize, collectName, collectNames, createField, createInputParser, createMutation, createQuery, createSubscription, deepMerge, defaultSubscriptionResolve, ensureInputObjectType, ensureInputType, ensureInterfaceType, field, filterMiddlewares, getCacheType, getDeepResolvingFields, getFieldOptions, getGraphQLType, getMemoizationMap, getOperationOptions, getResolvingFields, getStandardValue, getSubscriptionOptions, initWeaverContext, inputToArgs, isOnlyMemoryPayload, isSchemaVendorWeaver, isSilk, listSilk, loom, mapValue, markErrorLocation, markLocation, meta, mutation, nonNullSilk, notNullish, nullableSilk, onlyMemoization, parseInputValue, parseResolvingFields, parseSilk, pascalCase, provideWeaverContext, query, resolver, screamingSnakeCase, silk, subscription, toObjMap, tryIn, weave, weaverContext };

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { AUTO_ALIASING, BaseChainFactory, BaseField, BatchLoadFn, CallableInputParser, CallableMiddlewareOptions, ChainFactoryOptions, ChainResolver, CoreSchemaWeaverConfig, CoreSchemaWeaverConfigOptions, DERIVED_DEPENDENCIES, DirectiveItem, DirectiveRecord, EasyDataLoader, Executor, Field, FieldChainFactory, FieldFactory, FieldFactoryWithResolve, FieldFactoryWithUtils, FieldMeta, FieldOptions, FieldOrOperation, FieldOrOperationType, GQLoomExtensionAttribute, GQLoomExtensions, GlobalWeaverContext, GraphQLFieldOptions, GraphQLSchemaLoom, GraphQLSilk, IChainFactory, InferFieldInput, InferFieldOutput, InferInputI, InferInputO, IsAny, ListSilk, LoomDataLoader, LoomObjectType, MayPromise, Middleware, MiddlewareConfig, MiddlewareOperation, MiddlewareOptions, Mutation, MutationChainFactory, MutationFactory, MutationFactoryWithChain, MutationFactoryWithResolve, MutationOptions, NonNullSilk, NullableSilk, OPERATION_OBJECT_NAMES, ObjectChainResolver, OmitInUnion, OnlyMemoizationPayload, Operation, OperationType, Query, QueryChainFactory, QueryFactory, QueryFactoryWithChain, QueryFactoryWithResolve, QueryOptions, RequireKeys, ResolvableSubscription, Resolver, ResolverFactory, ResolverMeta, ResolverOptions, ResolverOptionsWithExtensions, ResolverOptionsWithParent, ResolverPayload, ResolvingFields, ResolvingOptions, SchemaWeaver, StandardSchemaV1, Subscription, SubscriptionChainFactory, SubscriptionFactory, SubscriptionFactoryWithChain, SubscriptionNeedResolve, SubscriptionOptions, ToExecutorProps, ValueOf, WeaverConfig, WeaverContext, applyMiddlewares, assignContextMap, capitalize, collectName, collectNames, createField, createInputParser, createMutation, createQuery, createSubscription, deepMerge, defaultSubscriptionResolve, ensureInputObjectType, ensureInputType, ensureInterfaceType, field, filterMiddlewares, getCacheType, getDeepResolvingFields, getFieldOptions, getGraphQLType, getMemoizationMap, getOperationOptions, getResolvingFields, getStandardValue, getSubscriptionOptions, initWeaverContext, inputToArgs, isOnlyMemoryPayload, isSchemaVendorWeaver, isSilk, listSilk, loom, mapValue, markErrorLocation, markLocation, meta, mutation, nonNullSilk, notNullish, nullableSilk, onlyMemoization, parseInputValue, parseResolvingFields, parseSilk, pascalCase, provideWeaverContext, query, resolver, screamingSnakeCase, silk, subscription, symbols_d_exports, toObjMap, tryIn, types_loom_d_exports, weave, weaverContext } from "./index-_VhWbhmU.js";
+import { AUTO_ALIASING, BaseChainFactory, BaseField, BatchLoadFn, CallableInputParser, CallableMiddlewareOptions, ChainFactoryOptions, ChainResolver, CoreSchemaWeaverConfig, CoreSchemaWeaverConfigOptions, DERIVED_DEPENDENCIES, DirectiveItem, DirectiveRecord, EasyDataLoader, Executor, Field, FieldChainFactory, FieldFactory, FieldFactoryWithResolve, FieldFactoryWithUtils, FieldMeta, FieldOptions, FieldOrOperation, FieldOrOperationType, GQLoomExtensionAttribute, GQLoomExtensions, GlobalWeaverContext, GraphQLFieldOptions, GraphQLSchemaLoom, GraphQLSilk, IChainFactory, InferFieldInput, InferFieldOutput, InferInputI, InferInputO, IsAny, ListSilk, LoomDataLoader, LoomObjectType, MayPromise, Middleware, MiddlewareConfig, MiddlewareOperation, MiddlewareOptions, Mutation, MutationChainFactory, MutationFactory, MutationFactoryWithChain, MutationFactoryWithResolve, MutationOptions, NonNullSilk, NullableSilk, OPERATION_OBJECT_NAMES, ObjectChainResolver, OmitInUnion, OnlyMemoizationPayload, Operation, OperationType, Query, QueryChainFactory, QueryFactory, QueryFactoryWithChain, QueryFactoryWithResolve, QueryOptions, RequireKeys, ResolvableSubscription, Resolver, ResolverFactory, ResolverMeta, ResolverOptions, ResolverOptionsWithExtensions, ResolverOptionsWithParent, ResolverPayload, ResolvingFields, ResolvingOptions, SchemaWeaver, StandardSchemaV1, Subscription, SubscriptionChainFactory, SubscriptionFactory, SubscriptionFactoryWithChain, SubscriptionNeedResolve, SubscriptionOptions, ToExecutorProps, ValueOf, WeaverConfig, WeaverContext, applyMiddlewares, assignContextMap, capitalize, collectName, collectNames, createField, createInputParser, createMutation, createQuery, createSubscription, deepMerge, defaultSubscriptionResolve, ensureInputObjectType, ensureInputType, ensureInterfaceType, field, filterMiddlewares, getCacheType, getDeepResolvingFields, getFieldOptions, getGraphQLType, getMemoizationMap, getOperationOptions, getResolvingFields, getStandardValue, getSubscriptionOptions, initWeaverContext, inputToArgs, isOnlyMemoryPayload, isSchemaVendorWeaver, isSilk, listSilk, loom, mapValue, markErrorLocation, markLocation, meta, mutation, nonNullSilk, notNullish, nullableSilk, onlyMemoization, parseInputValue, parseResolvingFields, parseSilk, pascalCase, provideWeaverContext, query, resolver, screamingSnakeCase, silk, subscription, symbols_d_exports, toObjMap, tryIn, types_loom_d_exports, weave, weaverContext } from "./index-sGKC4BRu.js";
 export { AUTO_ALIASING, BaseChainFactory, BaseField, BatchLoadFn, CallableInputParser, CallableMiddlewareOptions, ChainFactoryOptions, ChainResolver, CoreSchemaWeaverConfig, CoreSchemaWeaverConfigOptions, DERIVED_DEPENDENCIES, DirectiveItem, DirectiveRecord, EasyDataLoader, Executor, Field, FieldChainFactory, FieldFactory, FieldFactoryWithResolve, FieldFactoryWithUtils, FieldMeta, FieldOptions, FieldOrOperation, FieldOrOperationType, GQLoomExtensionAttribute, GQLoomExtensions, GlobalWeaverContext, GraphQLFieldOptions, GraphQLSchemaLoom, GraphQLSilk, IChainFactory, InferFieldInput, InferFieldOutput, InferInputI, InferInputO, IsAny, ListSilk, types_loom_d_exports as Loom, LoomDataLoader, LoomObjectType, MayPromise, Middleware, MiddlewareConfig, MiddlewareOperation, MiddlewareOptions, Mutation, MutationChainFactory, MutationFactory, MutationFactoryWithChain, MutationFactoryWithResolve, MutationOptions, NonNullSilk, NullableSilk, OPERATION_OBJECT_NAMES, ObjectChainResolver, OmitInUnion, OnlyMemoizationPayload, Operation, OperationType, Query, QueryChainFactory, QueryFactory, QueryFactoryWithChain, QueryFactoryWithResolve, QueryOptions, RequireKeys, ResolvableSubscription, Resolver, ResolverFactory, ResolverMeta, ResolverOptions, ResolverOptionsWithExtensions, ResolverOptionsWithParent, ResolverPayload, ResolvingFields, ResolvingOptions, symbols_d_exports as SYMBOLS, SchemaWeaver, StandardSchemaV1, Subscription, SubscriptionChainFactory, SubscriptionFactory, SubscriptionFactoryWithChain, SubscriptionNeedResolve, SubscriptionOptions, ToExecutorProps, ValueOf, WeaverConfig, WeaverContext, applyMiddlewares, assignContextMap, capitalize, collectName, collectNames, createField, createInputParser, createMutation, createQuery, createSubscription, deepMerge, defaultSubscriptionResolve, ensureInputObjectType, ensureInputType, ensureInterfaceType, field, filterMiddlewares, getCacheType, getDeepResolvingFields, getFieldOptions, getGraphQLType, getMemoizationMap, getOperationOptions, getResolvingFields, getStandardValue, getSubscriptionOptions, initWeaverContext, inputToArgs, isOnlyMemoryPayload, isSchemaVendorWeaver, isSilk, listSilk, loom, mapValue, markErrorLocation, markLocation, meta, mutation, nonNullSilk, notNullish, nullableSilk, onlyMemoization, parseInputValue, parseResolvingFields, parseSilk, pascalCase, provideWeaverContext, query, resolver, screamingSnakeCase, silk, subscription, toObjMap, tryIn, weave, weaverContext };

package/dist/index.js

@@ -239,113 +239,176 @@ var EasyDataLoader = class extends LoomDataLoader {
 
 //#endregion
 //#region src/schema/weaver-context.ts
-let ref;
-const names = /* @__PURE__ */ new WeakMap();
-const autoAliasTypes = /* @__PURE__ */ new WeakSet();
-function initWeaverContext() {
-	return {
-		id: initWeaverContext.increasingID++,
-		loomObjectMap: /* @__PURE__ */ new Map(),
-		loomUnionMap: /* @__PURE__ */ new Map(),
-		inputMap: /* @__PURE__ */ new Map(),
-		interfaceMap: /* @__PURE__ */ new Map(),
-		configs: /* @__PURE__ */ new Map(),
-		getConfig(key) {
-			return this.configs.get(key);
-		},
-		setConfig(config) {
-			const key = config[WEAVER_CONFIG];
-			this.configs.set(key, config);
-		},
-		deleteConfig(key) {
-			this.configs.delete(key);
-		},
-		names,
-		autoAliasTypes,
-		namedTypes: /* @__PURE__ */ new Map(),
-		memoNamedType(gqlTypeValue) {
-			const gqlType = gqlTypeValue;
-			if (isObjectType(gqlType) || isUnionType(gqlType) || isEnumType(gqlType) || isScalarType(gqlType)) this.namedTypes.set(gqlType.name, gqlType);
-			return gqlTypeValue;
-		},
-		getNamedType(name) {
-			return this.namedTypes.get(name);
-		},
-		vendorWeavers: /* @__PURE__ */ new Map()
+var WeaverContext = class WeaverContext {
+	static increasingID = 1;
+	static names = /* @__PURE__ */ new WeakMap();
+	static autoAliasTypes = /* @__PURE__ */ new WeakSet();
+	static _ref;
+	static get ref() {
+		return WeaverContext._ref;
+	}
+	id;
+	loomObjectMap;
+	loomUnionMap;
+	inputMap;
+	interfaceMap;
+	configs;
+	namedTypes;
+	vendorWeavers;
+	constructor() {
+		this.id = WeaverContext.increasingID++;
+		this.loomObjectMap = /* @__PURE__ */ new Map();
+		this.loomUnionMap = /* @__PURE__ */ new Map();
+		this.inputMap = /* @__PURE__ */ new Map();
+		this.interfaceMap = /* @__PURE__ */ new Map();
+		this.configs = /* @__PURE__ */ new Map();
+		this.namedTypes = /* @__PURE__ */ new Map();
+		this.vendorWeavers = /* @__PURE__ */ new Map();
+	}
+	getConfig(key) {
+		return this.configs.get(key);
+	}
+	setConfig(config) {
+		const key = config[WEAVER_CONFIG];
+		this.configs.set(key, config);
+	}
+	deleteConfig(key) {
+		this.configs.delete(key);
+	}
+	memoNamedType(gqlTypeValue) {
+		const gqlType = gqlTypeValue;
+		if (isObjectType(gqlType) || isUnionType(gqlType) || isEnumType(gqlType) || isScalarType(gqlType)) this.namedTypes.set(gqlType.name, gqlType);
+		return gqlTypeValue;
+	}
+	getNamedType(name) {
+		return this.namedTypes.get(name);
+	}
+	static namedTypes = {
+		Object: "Object",
+		Union: "Union",
+		Enum: "Enum",
+		Interface: "Interface",
+		Scalar: "Scalar"
 	};
-}
-initWeaverContext.increasingID = 1;
-const weaverContext = {
+	aliasCounters = {};
+	setAlias(namedType, alias) {
+		if (namedType.name === AUTO_ALIASING) WeaverContext.autoAliasTypes.add(namedType);
+		if (!WeaverContext.autoAliasTypes.has(namedType)) return namedType.name;
+		if (WeaverContext.higherPriorityThan(alias, namedType.name) < 0) {
+			if (alias) return namedType.name = alias;
+		}
+		if (namedType.name === AUTO_ALIASING) {
+			if (isObjectType(namedType) || isInputObjectType(namedType)) {
+				this.aliasCounters["Object"] ??= 0;
+				return namedType.name = `Object${++this.aliasCounters["Object"]}`;
+			} else if (isUnionType(namedType)) {
+				this.aliasCounters["Union"] ??= 0;
+				return namedType.name = `Union${++this.aliasCounters["Union"]}`;
+			} else if (isEnumType(namedType)) {
+				this.aliasCounters["Enum"] ??= 0;
+				return namedType.name = `Enum${++this.aliasCounters["Enum"]}`;
+			} else if (isInterfaceType(namedType)) {
+				this.aliasCounters["Interface"] ??= 0;
+				return namedType.name = `Interface${++this.aliasCounters["Interface"]}`;
+			} else if (isScalarType(namedType)) {
+				this.aliasCounters["Scalar"] ??= 0;
+				return namedType.name = `Scalar${++this.aliasCounters["Scalar"]}`;
+			}
+		}
+	}
+	/**
+	* @returns -1 if a is better than b, 1 if b is better than a, 0 if they are equal
+	*/
+	static higherPriorityThan(a, b) {
+		if (a === AUTO_ALIASING || a === void 0) return 1;
+		else if (b === AUTO_ALIASING || b === void 0) return -1;
+		const compareLength = a.length - b.length;
+		if (compareLength !== 0) return compareLength;
+		const compareLocale = a.localeCompare(b);
+		if (compareLocale !== 0) return compareLocale;
+		return 0;
+	}
+	static provide(func, value) {
+		const lastRef = WeaverContext._ref;
+		WeaverContext._ref = value;
+		try {
+			return func();
+		} finally {
+			WeaverContext._ref = lastRef;
+		}
+	}
+};
+const initWeaverContext = () => new WeaverContext();
+const provideWeaverContext = Object.assign(WeaverContext.provide, { inherit: (func) => {
+	const weaverContextRef = WeaverContext.ref;
+	return () => WeaverContext.provide(func, weaverContextRef);
+} });
+var GlobalWeaverContext = class {
+	GraphQLTypes = /* @__PURE__ */ new WeakMap();
 	get id() {
-		return ref?.id;
-	},
+		return WeaverContext.ref?.id;
+	}
 	get loomObjectMap() {
-		return ref?.loomObjectMap;
-	},
+		return WeaverContext.ref?.loomObjectMap;
+	}
 	get loomUnionMap() {
-		return ref?.loomUnionMap;
-	},
+		return WeaverContext.ref?.loomUnionMap;
+	}
 	get inputMap() {
-		return ref?.inputMap;
-	},
+		return WeaverContext.ref?.inputMap;
+	}
 	get interfaceMap() {
-		return ref?.interfaceMap;
-	},
+		return WeaverContext.ref?.interfaceMap;
+	}
 	get configs() {
-		return ref?.configs;
-	},
+		return WeaverContext.ref?.configs;
+	}
 	get vendorWeavers() {
-		return ref?.vendorWeavers;
-	},
+		return WeaverContext.ref?.vendorWeavers;
+	}
+	get names() {
+		return WeaverContext.names;
+	}
+	get autoAliasTypes() {
+		return WeaverContext.autoAliasTypes;
+	}
+	get value() {
+		return WeaverContext.ref;
+	}
 	getConfig(key) {
-		return ref?.getConfig(key);
-	},
+		return WeaverContext.ref?.getConfig(key);
+	}
 	setConfig(config) {
-		ref?.setConfig(config);
-	},
+		WeaverContext.ref?.setConfig(config);
+	}
 	deleteConfig(key) {
-		ref?.deleteConfig(key);
-	},
-	get value() {
-		return ref;
-	},
+		WeaverContext.ref?.deleteConfig(key);
+	}
 	useConfig(config, callback) {
-		const context = weaverContext.value ?? initWeaverContext();
+		const context = this.value ?? initWeaverContext();
 		context.setConfig(config);
 		const result = provideWeaverContext(callback, context);
 		context.deleteConfig(config[WEAVER_CONFIG]);
 		return result;
-	},
-	names,
-	autoAliasTypes,
+	}
 	getNamedType(name) {
-		return ref?.getNamedType(name);
-	},
+		return WeaverContext.ref?.getNamedType(name);
+	}
 	memoNamedType(gqlType) {
-		return ref?.memoNamedType(gqlType) ?? gqlType;
-	},
-	GraphQLTypes: /* @__PURE__ */ new WeakMap(),
+		return WeaverContext.ref?.memoNamedType(gqlType) ?? gqlType;
+	}
 	getGraphQLType(origin) {
 		return this.GraphQLTypes.get(origin);
-	},
+	}
 	memoGraphQLType(origin, gqlType) {
 		this.GraphQLTypes.set(origin, gqlType);
 		return gqlType;
 	}
-};
-function provideWeaverContext(func, value) {
-	const lastRef = ref;
-	ref = value;
-	try {
-		return func();
-	} finally {
-		ref = lastRef;
+	setAlias(namedType, alias) {
+		return WeaverContext.ref?.setAlias(namedType, alias);
 	}
-}
-provideWeaverContext.inherit = (func) => {
-	const weaverContextRef = weaverContext.value;
-	return () => provideWeaverContext(func, weaverContextRef);
 };
+const weaverContext = new GlobalWeaverContext();
 /**
 * collect names for schemas
 * @param namesList - names to collect
@@ -354,7 +417,7 @@ provideWeaverContext.inherit = (func) => {
 function collectNames(...namesList) {
 	const namesRecord = {};
 	for (const namesItem of namesList) for (const [name, schema] of Object.entries(namesItem)) {
-		names.set(schema, name);
+		WeaverContext.names.set(schema, name);
 		namesRecord[name] = schema;
 	}
 	return namesRecord;
@@ -366,7 +429,7 @@ function collectNames(...namesList) {
 * @returns schema
 */
 function collectName(name, schema) {
-	names.set(schema, name);
+	WeaverContext.names.set(schema, name);
 	return schema;
 }
 
@@ -1205,15 +1268,6 @@ var ObjectChainResolver = class extends ChainResolver {
 	}
 };
 
-//#endregion
-//#region src/schema/alias.ts
-function setAlias(namedType, alias, context) {
-	if (namedType.name === AUTO_ALIASING) context.autoAliasTypes.add(namedType);
-	if (!context.autoAliasTypes.has(namedType) || !alias) return;
-	if (namedType.name === AUTO_ALIASING) namedType.name = alias;
-	namedType.name = alias.length < namedType.name.length ? alias : namedType.name;
-}
-
 //#endregion
 //#region src/schema/input.ts
 function inputToArgs(input, options) {
@@ -1251,7 +1305,7 @@ function ensureInputType(silkOrType, options) {
 	if (isEnumType(gqlType)) {
 		if (gqlType.name === AUTO_ALIASING) {
 			const alias = `${pascalCase(options.fieldName)}Input`;
-			setAlias(gqlType, alias, weaverContext);
+			weaverContext.setAlias(gqlType, alias);
 		}
 		return gqlType;
 	}
@@ -1309,10 +1363,10 @@ var LoomObjectType = class extends GraphQLObjectType {
 		this.globalOptions = options.globalOptions;
 		this.weaverContext = options.weaverContext ?? initWeaverContext();
 		this.resolvers = /* @__PURE__ */ new Map();
-		if (this.name === AUTO_ALIASING) this.weaverContext.autoAliasTypes.add(this);
+		if (this.name === AUTO_ALIASING) WeaverContext.autoAliasTypes.add(this);
 	}
 	addAlias(alias) {
-		if (!this.weaverContext.autoAliasTypes.has(this) || !alias) return;
+		if (!WeaverContext.autoAliasTypes.has(this) || !alias) return;
 		this.name = alias.length < this.name.length ? alias : this.name;
 	}
 	hideField(name) {
@@ -1327,10 +1381,14 @@ var LoomObjectType = class extends GraphQLObjectType {
 	mergeExtensions(extensions) {
 		this.extensions = deepMerge(this.extensions, extensions);
 	}
+	collectedFieldNames() {
+		const fieldsBySuper = super.getFields();
+		Object.entries(fieldsBySuper).forEach(([fieldName, field$1]) => field$1.type = this.getCacheType(field$1.type, fieldName));
+	}
 	extraFieldMap;
 	getFields() {
 		const fieldsBySuper = super.getFields();
-		Object.entries(fieldsBySuper).forEach(([fieldName, field$1]) => field$1.type = this.getCacheType(field$1.type, fieldName));
+		this.collectedFieldNames();
 		const extraFields = provideWeaverContext(() => defineFieldMap(this.mapToFieldConfig(this.extraFields)), this.weaverContext);
 		if (Object.keys(this.extraFieldMap ?? {}).join() !== Object.keys(extraFields).join()) this.extraFieldMap = extraFields;
 		const answer = {
@@ -1514,7 +1572,7 @@ function getCacheType(gqlType, options = {}) {
 		if (gqlObject != null) return gqlObject;
 		const loomObject = new LoomObjectType(gqlType, options);
 		context.loomObjectMap?.set(gqlType, loomObject);
-		setAlias(loomObject, getAlias(), context);
+		context.setAlias(loomObject, getAlias());
 		return loomObject;
 	} else if (isListType(gqlType)) return new GraphQLList(getCacheType(gqlType.ofType, options));
 	else if (isNonNullType(gqlType)) return new GraphQLNonNull(getCacheType(gqlType.ofType, options));
@@ -1526,14 +1584,14 @@ function getCacheType(gqlType, options = {}) {
 			...config,
 			types: config.types.map((type, i) => getCacheType(type, {
 				...options,
-				fieldName: options.fieldName ? `${options.fieldName}${i + 1}` : void 0
+				fieldName: options.fieldName ? `${options.fieldName}Item${i + 1}` : void 0
 			}))
 		});
 		context.loomUnionMap?.set(gqlType, unionType);
-		setAlias(unionType, getAlias(), context);
+		context.setAlias(unionType, getAlias());
 		return unionType;
-	} else if (isEnumType(gqlType)) {
-		setAlias(gqlType, getAlias(), context);
+	} else if (isEnumType(gqlType) || isInterfaceType(gqlType) || isScalarType(gqlType)) {
+		context.setAlias(gqlType, getAlias());
 		return gqlType;
 	}
 	return gqlType;
@@ -1595,18 +1653,11 @@ var GraphQLSchemaLoom = class GraphQLSchemaLoom {
 		return this;
 	}
 	addType(silk$1) {
-		const gqlType = provideWeaverContext(() => {
-			let gqlType$1 = getGraphQLType(silk$1);
-			if (isNonNullType(gqlType$1)) gqlType$1 = gqlType$1.ofType;
-			if (isObjectType(gqlType$1)) {
-				const existing = this.context.loomObjectMap.get(gqlType$1);
-				if (existing != null) return existing;
-				const extraObject = new LoomObjectType(gqlType$1, this.fieldOptions);
-				this.context.loomObjectMap.set(gqlType$1, extraObject);
-				return extraObject;
-			} else if (isUnionType(gqlType$1) || isEnumType(gqlType$1)) return gqlType$1;
-			throw new Error(`${gqlType$1?.name ?? gqlType$1.toString()} is not a named type`);
+		let gqlType = provideWeaverContext(() => {
+			const gqlType$1 = getGraphQLType(silk$1);
+			return getCacheType(gqlType$1);
 		}, this.context);
+		while (isNonNullType(gqlType) || isListType(gqlType)) gqlType = gqlType.ofType;
 		this.types.add(gqlType);
 		return this;
 	}
@@ -1631,8 +1682,8 @@ var GraphQLSchemaLoom = class GraphQLSchemaLoom {
 		let parentObject = (() => {
 			if (parent == null) return void 0;
 			let gqlType = getGraphQLType(parent);
-			if (isNonNullType(gqlType)) gqlType = gqlType.ofType;
-			if (!isObjectType(gqlType)) throw new Error(`${gqlType?.name ?? gqlType.toString()} is not an object type`);
+			while (isNonNullType(gqlType) || isListType(gqlType)) gqlType = gqlType.ofType;
+			if (!isObjectType(gqlType)) throw new Error(`${gqlType.name} is not an object type`);
 			const existing = this.context.loomObjectMap.get(gqlType);
 			if (existing != null) return existing;
 			const extraObject = new LoomObjectType(gqlType, this.fieldOptions);
@@ -1756,4 +1807,4 @@ function ensureInterfaceType(gqlType, interfaceConfig) {
 }
 
 //#endregion
-export { AUTO_ALIASING, BaseChainFactory, ChainResolver, DERIVED_DEPENDENCIES, EasyDataLoader, FieldChainFactory, FieldFactoryWithResolve, GraphQLSchemaLoom, LoomDataLoader, LoomObjectType, MutationChainFactory, MutationFactoryWithResolve, OPERATION_OBJECT_NAMES, ObjectChainResolver, QueryChainFactory, QueryFactoryWithResolve, symbols_exports as SYMBOLS, SubscriptionChainFactory, applyMiddlewares, assignContextMap, capitalize, collectName, collectNames, createField, createInputParser, createMutation, createQuery, createSubscription, deepMerge, defaultSubscriptionResolve, ensureInputObjectType, ensureInputType, ensureInterfaceType, field, filterMiddlewares, getCacheType, getDeepResolvingFields, getFieldOptions, getGraphQLType, getMemoizationMap, getOperationOptions, getResolvingFields, getStandardValue, getSubscriptionOptions, initWeaverContext, inputToArgs, isOnlyMemoryPayload, isSchemaVendorWeaver, isSilk, listSilk, loom, mapValue, markErrorLocation, markLocation, meta, mutation, nonNullSilk, notNullish, nullableSilk, onlyMemoization, parseInputValue, parseResolvingFields, parseSilk, pascalCase, provideWeaverContext, query, resolver, screamingSnakeCase, silk, subscription, toObjMap, tryIn, weave, weaverContext };
+export { AUTO_ALIASING, BaseChainFactory, ChainResolver, DERIVED_DEPENDENCIES, EasyDataLoader, FieldChainFactory, FieldFactoryWithResolve, GlobalWeaverContext, GraphQLSchemaLoom, LoomDataLoader, LoomObjectType, MutationChainFactory, MutationFactoryWithResolve, OPERATION_OBJECT_NAMES, ObjectChainResolver, QueryChainFactory, QueryFactoryWithResolve, symbols_exports as SYMBOLS, SubscriptionChainFactory, WeaverContext, applyMiddlewares, assignContextMap, capitalize, collectName, collectNames, createField, createInputParser, createMutation, createQuery, createSubscription, deepMerge, defaultSubscriptionResolve, ensureInputObjectType, ensureInputType, ensureInterfaceType, field, filterMiddlewares, getCacheType, getDeepResolvingFields, getFieldOptions, getGraphQLType, getMemoizationMap, getOperationOptions, getResolvingFields, getStandardValue, getSubscriptionOptions, initWeaverContext, inputToArgs, isOnlyMemoryPayload, isSchemaVendorWeaver, isSilk, listSilk, loom, mapValue, markErrorLocation, markLocation, meta, mutation, nonNullSilk, notNullish, nullableSilk, onlyMemoization, parseInputValue, parseResolvingFields, parseSilk, pascalCase, provideWeaverContext, query, resolver, screamingSnakeCase, silk, subscription, toObjMap, tryIn, weave, weaverContext };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gqloom/core",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Create GraphQL schema and resolvers with TypeScript.",
   "type": "module",
   "main": "./dist/index.js",