@gqloom/core 0.4.0 → 0.6.0

package/dist/index.js

@@ -156,7 +156,9 @@ function collectName(name, schema) {
 }
 
 // src/resolver/silk.ts
-function silk(type, validate = (value) => ({ value: value ?? void 0 })) {
+function silk(type, validate = (value) => ({
+  value: value ?? void 0
+})) {
   return {
     [GET_GRAPHQL_TYPE]: typeof type === "function" ? type : () => type,
     "~standard": {
@@ -261,13 +263,17 @@ function getFieldOptions({
 }
 
 // src/utils/middleware.ts
-function applyMiddlewares(middlewares, resolveFunction, payload) {
+function applyMiddlewares(middlewares, resolveFunction, options) {
   const next = (index) => {
     if (index >= middlewares.length) {
       return resolveFunction();
     }
     const middleware = middlewares[index];
-    return middleware(() => next(index + 1), payload);
+    const callableOptions = Object.assign(() => next(index + 1), {
+      ...options,
+      next: () => next(index + 1)
+    });
+    return middleware(callableOptions);
   };
   return next(0);
 }
@@ -420,6 +426,13 @@ function deepMerge(...objects) {
   return result;
 }
 
+// src/utils/string.ts
+function pascalCase(str) {
+  return str.split(/[\s-_]+/).map(
+    (word, index) => index === 0 ? word.charAt(0).toUpperCase() + word.slice(1) : word.charAt(0).toUpperCase() + word.slice(1)
+  ).join("");
+}
+
 // src/utils/error.ts
 function markErrorLocation(error, ...locations) {
   if (error instanceof Error) {
@@ -740,31 +753,38 @@ import {
   isObjectType as isObjectType2,
   isUnionType as isUnionType2
 } from "graphql";
-function inputToArgs(input) {
+function inputToArgs(input, options) {
   if (input === void 0) return void 0;
   if (isSilk(input)) {
     let inputType = getGraphQLType(input);
     if (isNonNullType(inputType)) inputType = inputType.ofType;
     if (isObjectType2(inputType)) {
-      return mapValue(
-        inputType.toConfig().fields,
-        (it) => toInputFieldConfig(it)
-      );
+      return mapValue(inputType.toConfig().fields, (it, key) => {
+        let fieldName;
+        if (options?.fieldName) {
+          fieldName = `${pascalCase(options.fieldName)}${pascalCase(key)}`;
+        }
+        return toInputFieldConfig(it, { fieldName });
+      });
     }
     throw new Error(`Cannot convert ${inputType.toString()} to input type`);
   }
   const args = {};
   Object.entries(input).forEach(([name, field2]) => {
     tryIn(() => {
+      let fieldName;
+      if (options?.fieldName) {
+        fieldName = `${pascalCase(options.fieldName)}${pascalCase(name)}`;
+      }
       args[name] = {
         ...field2,
-        type: ensureInputType(field2)
+        type: ensureInputType(field2, { fieldName })
       };
     }, name);
   });
   return args;
 }
-function ensureInputType(silkOrType) {
+function ensureInputType(silkOrType, options) {
   const gqlType = (() => {
     if (isSilk(silkOrType)) {
       return getGraphQLType(silkOrType);
@@ -774,48 +794,56 @@ function ensureInputType(silkOrType) {
   if (isUnionType2(gqlType))
     throw new Error(`Cannot convert union type ${gqlType.name} to input type`);
   if (isNonNullType(gqlType)) {
-    return new GraphQLNonNull2(ensureInputType(gqlType.ofType));
+    return new GraphQLNonNull2(ensureInputType(gqlType.ofType, options));
   }
   if (isListType(gqlType)) {
-    return new GraphQLList2(ensureInputType(gqlType.ofType));
+    return new GraphQLList2(ensureInputType(gqlType.ofType, options));
   }
   if (isObjectType2(gqlType) || isInterfaceType(gqlType))
-    return ensureInputObjectType(gqlType);
+    return ensureInputObjectType(gqlType, options);
   return gqlType;
 }
-function ensureInputObjectType(object) {
+function ensureInputObjectType(object, options) {
   if (isInputObjectType(object)) return object;
   const existing = weaverContext.inputMap?.get(object);
   if (existing != null) return existing;
-  const {
-    astNode: _,
-    extensionASTNodes: __,
-    fields,
-    ...config
-  } = object.toConfig();
-  const getInputObjectName = weaverContext.getConfig("gqloom.core.schema")?.getInputObjectName ?? ((name) => name);
+  const { astNode, extensionASTNodes, fields, ...config } = object.toConfig();
+  let name = object.name;
+  if (name === LoomObjectType.AUTO_ALIASING) {
+    name = `${pascalCase(options?.fieldName ?? "")}Input`;
+  }
+  const getInputObjectName = weaverContext.getConfig("gqloom.core.schema")?.getInputObjectName ?? ((n) => n);
+  name = getInputObjectName(name);
   const input = new GraphQLInputObjectType({
     ...config,
-    name: getInputObjectName(object.name),
+    name,
     fields: provideWeaverContext.inherit(
-      () => mapValue(fields, (it) => toInputFieldConfig(it))
+      () => mapValue(
+        fields,
+        (it, key) => toInputFieldConfig(it, {
+          fieldName: inputFieldName(name) + pascalCase(key)
+        })
+      )
     )
   });
   weaverContext.inputMap?.set(object, input);
   return input;
 }
-function toInputFieldConfig({
-  astNode: _,
-  resolve: _1,
-  ...config
-}) {
-  return { ...config, type: ensureInputType(config.type) };
+function toInputFieldConfig({ astNode, resolve, ...config }, options) {
+  return { ...config, type: ensureInputType(config.type, options) };
+}
+function inputFieldName(name) {
+  while (name.endsWith("Input")) {
+    name = name.slice(0, -"Input".length);
+  }
+  return name;
 }
 
 // src/schema/object.ts
-var LoomObjectType = class extends GraphQLObjectType {
+var LoomObjectType = class _LoomObjectType extends GraphQLObjectType {
   extraFields = /* @__PURE__ */ new Map();
   hiddenFields = /* @__PURE__ */ new Set();
+  static AUTO_ALIASING = "__gqloom_auto_aliasing";
   weaverContext;
   resolverOptions;
   constructor(objectOrGetter, options = {}) {
@@ -832,6 +860,28 @@ var LoomObjectType = class extends GraphQLObjectType {
     super(config);
     this.resolverOptions = options.resolverOptions;
     this.weaverContext = options.weaverContext ?? initWeaverContext();
+    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();
+  }
+  renameByAliases() {
+    let name;
+    for (const alias of this.aliases) {
+      if (name === void 0 || alias.length < name.length) {
+        name = alias;
+      }
+    }
+    if (name) this.name = name;
   }
   hideField(name) {
     this.hiddenFields.add(name);
@@ -849,8 +899,8 @@ var LoomObjectType = class extends GraphQLObjectType {
   extraFieldMap;
   getFields() {
     const fieldsBySuper = super.getFields();
-    Object.values(fieldsBySuper).forEach(
-      (field2) => field2.type = this.getCacheType(field2.type)
+    Object.entries(fieldsBySuper).forEach(
+      ([fieldName, field2]) => field2.type = this.getCacheType(field2.type, fieldName)
     );
     const extraFields = provideWeaverContext(
       () => defineFieldMap(this.mapToFieldConfig(this.extraFields)),
@@ -871,17 +921,22 @@ var LoomObjectType = class extends GraphQLObjectType {
   mapToFieldConfig(map) {
     const record = {};
     for (const [name, field2] of map.entries()) {
-      record[name] = this.toFieldConfig(field2);
+      record[name] = this.toFieldConfig(field2, name);
     }
     return record;
   }
-  toFieldConfig(field2) {
+  toFieldConfig(field2, fieldName) {
     try {
-      const outputType = this.getCacheType(getGraphQLType(field2.output));
+      const outputType = this.getCacheType(
+        getGraphQLType(field2.output),
+        fieldName
+      );
       return {
         ...extract(field2),
         type: outputType,
-        args: inputToArgs(field2.input),
+        args: inputToArgs(field2.input, {
+          fieldName: fieldName ? parentName(this.name) + fieldName : void 0
+        }),
         ...this.provideForResolve(field2),
         ...this.provideForSubscribe(field2)
       };
@@ -914,8 +969,8 @@ var LoomObjectType = class extends GraphQLObjectType {
       )
     };
   }
-  getCacheType(gqlType) {
-    return getCacheType(gqlType, this.options);
+  getCacheType(gqlType, fieldName) {
+    return getCacheType(gqlType, { ...this.options, fieldName, parent: this });
   }
   get options() {
     const { resolverOptions, weaverContext: weaverContext2 } = this;
@@ -961,6 +1016,11 @@ function defineArguments(args) {
     astNode: argConfig.astNode
   }));
 }
+var OPERATION_OBJECT_NAMES = /* @__PURE__ */ new Set([
+  "Query",
+  "Mutation",
+  "Subscription"
+]);
 function getCacheType(gqlType, options = {}) {
   const context = options.weaverContext ?? weaverContext;
   if (gqlType instanceof LoomObjectType) return gqlType;
@@ -969,6 +1029,11 @@ function getCacheType(gqlType, options = {}) {
     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)
+      );
+    }
     return loomObject;
   } else if (isListType2(gqlType)) {
     return new GraphQLList3(getCacheType(gqlType.ofType, options));
@@ -989,8 +1054,12 @@ function getCacheType(gqlType, options = {}) {
   }
   return gqlType;
 }
+function parentName(name) {
+  if (OPERATION_OBJECT_NAMES.has(name)) name = "";
+  return name;
+}
 
-// src/schema/schema-vendor-weaver.ts
+// src/schema/schema-weaver.ts
 function isSchemaVendorWeaver(some) {
   if (typeof some !== "object" && typeof some !== "function") return false;
   if (!("getGraphQLType" in some) || typeof some.getGraphQLType !== "function")
@@ -999,7 +1068,7 @@ function isSchemaVendorWeaver(some) {
   return true;
 }
 
-// src/schema/schema-weaver.ts
+// src/schema/schema-loom.ts
 import {
   GraphQLSchema,
   isEnumType as isEnumType2,
@@ -1007,7 +1076,7 @@ import {
   isObjectType as isObjectType4,
   isUnionType as isUnionType4
 } from "graphql";
-var SchemaWeaver = class _SchemaWeaver {
+var GraphQLSchemaLoom = class _GraphQLSchemaLoom {
   query;
   mutation;
   subscription;
@@ -1029,7 +1098,7 @@ var SchemaWeaver = class _SchemaWeaver {
     if (query2 != null) this.query = query2;
     if (mutation2 != null) this.mutation = mutation2;
     if (subscription2 != null) this.subscription = subscription2;
-    if (types != null) this.types = types.slice();
+    this.types = new Set(types ?? []);
     this.context = context ?? initWeaverContext();
   }
   use(...middlewares) {
@@ -1063,8 +1132,7 @@ var SchemaWeaver = class _SchemaWeaver {
         `${gqlType2?.name ?? gqlType2.toString()} is not a named type`
       );
     }, this.context);
-    this.types ??= [];
-    this.types.push(gqlType);
+    this.types.add(gqlType);
     return this;
   }
   setConfig(config) {
@@ -1090,16 +1158,17 @@ var SchemaWeaver = class _SchemaWeaver {
       if (parent == null) return void 0;
       let gqlType = getGraphQLType(parent);
       if (isNonNullType3(gqlType)) gqlType = gqlType.ofType;
-      if (isObjectType4(gqlType)) {
-        const existing = this.context.loomObjectMap.get(gqlType);
-        if (existing != null) return existing;
-        const extraObject = new LoomObjectType(gqlType, this.fieldOptions);
-        this.context.loomObjectMap.set(gqlType, extraObject);
-        return extraObject;
+      if (!isObjectType4(gqlType)) {
+        throw new Error(
+          `${gqlType?.name ?? gqlType.toString()} is not an object type`
+        );
       }
-      throw new Error(
-        `${gqlType?.name ?? gqlType.toString()} is not an object type`
-      );
+      const existing = this.context.loomObjectMap.get(gqlType);
+      if (existing != null) return existing;
+      const extraObject = new LoomObjectType(gqlType, this.fieldOptions);
+      this.context.loomObjectMap.set(gqlType, extraObject);
+      this.types.add(extraObject);
+      return extraObject;
     })();
     if (resolverOptions?.extensions && parentObject)
       parentObject.mergeExtensions(resolverOptions.extensions);
@@ -1174,12 +1243,12 @@ var SchemaWeaver = class _SchemaWeaver {
   }
   /**
    * Weave a GraphQL Schema from resolvers
-   * @param inputs Resolvers, Global Middlewares or WeaverConfigs
-   * @returns GraphQ LSchema
+   * @param inputs Resolvers, Global Middlewares, WeaverConfigs Or SchemaWeaver
+   * @returns GraphQL Schema
    */
   static weave(...inputs) {
-    const { context, configs, middlewares, resolvers, silks, weavers } = _SchemaWeaver.optionsFrom(...inputs);
-    const weaver = new _SchemaWeaver({}, context);
+    const { context, configs, middlewares, resolvers, silks, weavers } = _GraphQLSchemaLoom.optionsFrom(...inputs);
+    const weaver = new _GraphQLSchemaLoom({}, context);
     configs.forEach((it) => weaver.setConfig(it));
     weavers.forEach((it) => weaver.addVendor(it));
     middlewares.forEach((it) => weaver.use(it));
@@ -1188,7 +1257,7 @@ var SchemaWeaver = class _SchemaWeaver {
     return weaver.weaveGraphQLSchema();
   }
 };
-var weave = SchemaWeaver.weave;
+var weave = GraphQLSchemaLoom.weave;
 
 // src/schema/interface.ts
 import {
@@ -1221,10 +1290,11 @@ function ensureInterfaceType(gqlType, interfaceConfig) {
 }
 export {
   ContextMemoization,
+  GraphQLSchemaLoom,
   LoomObjectType,
+  OPERATION_OBJECT_NAMES,
   ResolverOptionsMap,
   symbols_exports as SYMBOLS,
-  SchemaWeaver,
   applyMiddlewares,
   baseResolver,
   collectName,
@@ -1267,6 +1337,7 @@ export {
   onlyMemoization,
   parseInputValue,
   parseSilk,
+  pascalCase,
   provideWeaverContext,
   query,
   resolver,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gqloom/core",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Create GraphQL schema and resolvers with TypeScript.",
   "type": "module",
   "main": "./dist/index.js",
@@ -14,6 +14,10 @@
       "require": {
         "types": "./dist/index.d.cts",
         "default": "./dist/index.cjs"
+      },
+      "source": {
+        "types": "./src/index.ts",
+        "default": "./src/index.ts"
       }
     }
   },
@@ -46,6 +50,6 @@
     "access": "public"
   },
   "devDependencies": {
-    "@standard-schema/spec": "1.0.0-beta.3"
+    "@standard-schema/spec": "1.0.0-beta.4"
   }
 }