@gqloom/core 0.11.1 → 0.12.1

package/dist/index.js

@@ -1,4 +1,4 @@
-import { DERIVED_DEPENDENCIES, FIELD_HIDDEN, GET_GRAPHQL_TYPE, IS_RESOLVER, WEAVER_CONFIG, assignContextMap, getDeepResolvingFields, getMemoizationMap, getResolvingFields, isOnlyMemoryPayload, onlyMemoization, parseResolvingFields, symbols_exports } from "./context-BtR7FTYT.js";
+import { AUTO_ALIASING, DERIVED_DEPENDENCIES, FIELD_HIDDEN, GET_GRAPHQL_TYPE, IS_RESOLVER, WEAVER_CONFIG, assignContextMap, getDeepResolvingFields, getMemoizationMap, getResolvingFields, isOnlyMemoryPayload, onlyMemoization, parseResolvingFields, symbols_exports } from "./context-BxqO4Eg9.js";
 import { GraphQLError, GraphQLInputObjectType, GraphQLInterfaceType, GraphQLList, GraphQLNonNull, GraphQLObjectType, GraphQLSchema, GraphQLUnionType, assertName, isEnumType, isInputObjectType, isInterfaceType, isListType, isNonNullType, isObjectType, isScalarType, isUnionType, resolveObjMapThunk } from "graphql";
 
 //#region src/utils/args.ts
@@ -239,110 +239,176 @@ var EasyDataLoader = class extends LoomDataLoader {
 
 //#endregion
 //#region src/schema/weaver-context.ts
-let ref;
-const names = /* @__PURE__ */ new WeakMap();
-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,
-		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,
+	}
 	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
@@ -351,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;
@@ -363,7 +429,7 @@ function collectNames(...namesList) {
 * @returns schema
 */
 function collectName(name, schema) {
-	names.set(schema, name);
+	WeaverContext.names.set(schema, name);
 	return schema;
 }
 
@@ -1210,8 +1276,7 @@ function inputToArgs(input, options) {
 		let inputType = getGraphQLType(input);
 		if (isNonNullType(inputType)) inputType = inputType.ofType;
 		if (isObjectType(inputType)) return mapValue(inputType.toConfig().fields, (it, key) => {
-			let fieldName;
-			if (options?.fieldName) fieldName = `${pascalCase(options.fieldName)}${pascalCase(key)}`;
+			const fieldName = `${pascalCase(options.fieldName)}${pascalCase(key)}`;
 			return toInputFieldConfig(it, { fieldName });
 		});
 		throw new Error(`Cannot convert ${inputType.toString()} to input type`);
@@ -1219,8 +1284,7 @@ function inputToArgs(input, options) {
 	const args = {};
 	Object.entries(input).forEach(([name, field$1]) => {
 		tryIn(() => {
-			let fieldName;
-			if (options?.fieldName) fieldName = `${pascalCase(options.fieldName)}${pascalCase(name)}`;
+			const fieldName = `${pascalCase(options.fieldName)}${pascalCase(name)}`;
 			args[name] = {
 				...field$1,
 				type: ensureInputType(field$1, { fieldName })
@@ -1238,6 +1302,13 @@ function ensureInputType(silkOrType, options) {
 	if (isNonNullType(gqlType)) return new GraphQLNonNull(ensureInputType(gqlType.ofType, options));
 	if (isListType(gqlType)) return new GraphQLList(ensureInputType(gqlType.ofType, options));
 	if (isObjectType(gqlType) || isInterfaceType(gqlType)) return ensureInputObjectType(gqlType, options);
+	if (isEnumType(gqlType)) {
+		if (gqlType.name === AUTO_ALIASING) {
+			const alias = `${pascalCase(options.fieldName)}Input`;
+			weaverContext.setAlias(gqlType, alias);
+		}
+		return gqlType;
+	}
 	return gqlType;
 }
 function ensureInputObjectType(object, options) {
@@ -1246,7 +1317,7 @@ function ensureInputObjectType(object, options) {
 	if (existing != null) return existing;
 	const { astNode, extensionASTNodes, fields,...config } = object.toConfig();
 	let name = object.name;
-	if (name === LoomObjectType.AUTO_ALIASING) name = `${pascalCase(options?.fieldName ?? "")}Input`;
+	if (name === AUTO_ALIASING) name = `${pascalCase(options.fieldName)}Input`;
 	name = (weaverContext.getConfig("gqloom.core.schema")?.getInputObjectName ?? ((n) => n))(name);
 	const input = new GraphQLInputObjectType({
 		...config,
@@ -1269,10 +1340,9 @@ function inputFieldName(name) {
 
 //#endregion
 //#region src/schema/object.ts
-var LoomObjectType = class LoomObjectType extends GraphQLObjectType {
+var LoomObjectType = class extends GraphQLObjectType {
 	extraFields = /* @__PURE__ */ new Map();
 	hiddenFields = /* @__PURE__ */ new Set();
-	static AUTO_ALIASING = "__gqloom_auto_aliasing";
 	weaverContext;
 	globalOptions;
 	/**
@@ -1293,22 +1363,11 @@ var LoomObjectType = class LoomObjectType extends GraphQLObjectType {
 		this.globalOptions = options.globalOptions;
 		this.weaverContext = options.weaverContext ?? initWeaverContext();
 		this.resolvers = /* @__PURE__ */ new Map();
-		if (this.name !== LoomObjectType.AUTO_ALIASING) this.hasExplicitName = true;
-	}
-	hasExplicitName;
-	_aliases = [];
-	get aliases() {
-		return this._aliases;
-	}
-	addAlias(name) {
-		if (this.hasExplicitName) return;
-		this._aliases.push(name);
-		this.renameByAliases();
+		if (this.name === AUTO_ALIASING) WeaverContext.autoAliasTypes.add(this);
 	}
-	renameByAliases() {
-		let name;
-		for (const alias of this.aliases) if (name === void 0 || alias.length < name.length) name = alias;
-		if (name) this.name = name;
+	addAlias(alias) {
+		if (!WeaverContext.autoAliasTypes.has(this) || !alias) return;
+		this.name = alias.length < this.name.length ? alias : this.name;
 	}
 	hideField(name) {
 		this.hiddenFields.add(name);
@@ -1322,10 +1381,14 @@ var LoomObjectType = class LoomObjectType 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 = {
@@ -1347,7 +1410,7 @@ var LoomObjectType = class LoomObjectType extends GraphQLObjectType {
 		return {
 			...extract(field$1),
 			type: outputType,
-			args: inputToArgs(field$1["~meta"].input, { fieldName: fieldName ? parentName(this.name) + fieldName : void 0 }),
+			args: inputToArgs(field$1["~meta"].input, { fieldName: parentName(this.name) + fieldName }),
 			resolve,
 			...subscribe ? { subscribe } : {}
 		};
@@ -1499,13 +1562,17 @@ const OPERATION_OBJECT_NAMES = new Set([
 ]);
 function getCacheType(gqlType, options = {}) {
 	const context = options.weaverContext ?? weaverContext;
+	const getAlias = () => {
+		if (!options.fieldName || !options.parent) return;
+		return parentName(options.parent.name) + pascalCase(options.fieldName);
+	};
 	if (gqlType instanceof LoomObjectType) return gqlType;
 	if (isObjectType(gqlType)) {
 		const gqlObject = context.loomObjectMap?.get(gqlType);
 		if (gqlObject != null) return gqlObject;
 		const loomObject = new LoomObjectType(gqlType, options);
 		context.loomObjectMap?.set(gqlType, loomObject);
-		if (options.fieldName && options.parent) loomObject.addAlias(parentName(options.parent.name) + pascalCase(options.fieldName));
+		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));
@@ -1515,10 +1582,17 @@ function getCacheType(gqlType, options = {}) {
 		const config = gqlType.toConfig();
 		const unionType = new GraphQLUnionType({
 			...config,
-			types: config.types.map((type) => getCacheType(type, options))
+			types: config.types.map((type, i) => getCacheType(type, {
+				...options,
+				fieldName: options.fieldName ? `${options.fieldName}Item${i + 1}` : void 0
+			}))
 		});
 		context.loomUnionMap?.set(gqlType, unionType);
+		context.setAlias(unionType, getAlias());
 		return unionType;
+	} else if (isEnumType(gqlType) || isInterfaceType(gqlType) || isScalarType(gqlType)) {
+		context.setAlias(gqlType, getAlias());
+		return gqlType;
 	}
 	return gqlType;
 }
@@ -1579,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;
 	}
@@ -1615,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);
@@ -1740,4 +1807,4 @@ function ensureInterfaceType(gqlType, interfaceConfig) {
 }
 
 //#endregion
-export { BaseChainFactory, ChainResolver, 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.11.1",
+  "version": "0.12.1",
   "description": "Create GraphQL schema and resolvers with TypeScript.",
   "type": "module",
   "main": "./dist/index.js",