@baeta/plugin-graphql 0.0.24-75-20230619184544-4493aaa → 0.0.25

package/CHANGELOG.md

@@ -1,13 +1,33 @@
 # @baeta/plugin-graphql
 
-## 0.0.24-75-20230619184544-4493aaa
+## 0.0.25
 
 ### Patch Changes
 
+- [#102](https://github.com/andreisergiu98/baeta/pull/102) [`c9e37fd`](https://github.com/andreisergiu98/baeta/commit/c9e37fd1d64588fd8eb63facd7eda08c0009470c) Thanks [@andreisergiu98](https://github.com/andreisergiu98)! - update dependencies
+
+- [#102](https://github.com/andreisergiu98/baeta/pull/102) [`c9e37fd`](https://github.com/andreisergiu98/baeta/commit/c9e37fd1d64588fd8eb63facd7eda08c0009470c) Thanks [@andreisergiu98](https://github.com/andreisergiu98)! - update dependencies and builder
+
+- [#106](https://github.com/andreisergiu98/baeta/pull/106) [`01788ab`](https://github.com/andreisergiu98/baeta/commit/01788ab04ff6956b2b50186af5bec8ed7ebbe76e) Thanks [@andreisergiu98](https://github.com/andreisergiu98)! - add compatibility with windows
+
+- [#101](https://github.com/andreisergiu98/baeta/pull/101) [`03d1353`](https://github.com/andreisergiu98/baeta/commit/03d1353bcedf211d3b7dcfbe38132e43422742b1) Thanks [@andreisergiu98](https://github.com/andreisergiu98)! - ignore extended fields when using object types
+
+- Updated dependencies [[`c9e37fd`](https://github.com/andreisergiu98/baeta/commit/c9e37fd1d64588fd8eb63facd7eda08c0009470c), [`c9e37fd`](https://github.com/andreisergiu98/baeta/commit/c9e37fd1d64588fd8eb63facd7eda08c0009470c), [`01788ab`](https://github.com/andreisergiu98/baeta/commit/01788ab04ff6956b2b50186af5bec8ed7ebbe76e)]:
+  - @baeta/generator-sdk@0.0.10
+  - @baeta/util-path@0.0.2
+
+## 0.0.24
+
+### Patch Changes
+
+- [#81](https://github.com/andreisergiu98/baeta/pull/81) [`3ff5e54`](https://github.com/andreisergiu98/baeta/commit/3ff5e54f31cf42ba2264b12309338d6e78710722) Thanks [@andreisergiu98](https://github.com/andreisergiu98)! - add file transformation function from config
+
 - [#69](https://github.com/andreisergiu98/baeta/pull/69) [`3cdd9b3`](https://github.com/andreisergiu98/baeta/commit/3cdd9b30369d21179769a4b8d5f76e326ae6db37) Thanks [@andreisergiu98](https://github.com/andreisergiu98)! - update dependencies
 
-- Updated dependencies [[`3cdd9b3`](https://github.com/andreisergiu98/baeta/commit/3cdd9b30369d21179769a4b8d5f76e326ae6db37)]:
-  - @baeta/generator-sdk@0.0.9-75-20230619184544-4493aaa
+- [#91](https://github.com/andreisergiu98/baeta/pull/91) [`e0944f6`](https://github.com/andreisergiu98/baeta/commit/e0944f6320e6cf2f0a3d2c9f51edd282bdce0546) Thanks [@andreisergiu98](https://github.com/andreisergiu98)! - update dependencies
+
+- Updated dependencies [[`3ff5e54`](https://github.com/andreisergiu98/baeta/commit/3ff5e54f31cf42ba2264b12309338d6e78710722), [`3cdd9b3`](https://github.com/andreisergiu98/baeta/commit/3cdd9b30369d21179769a4b8d5f76e326ae6db37), [`e0944f6`](https://github.com/andreisergiu98/baeta/commit/e0944f6320e6cf2f0a3d2c9f51edd282bdce0546)]:
+  - @baeta/generator-sdk@0.0.9
 
 ## 0.0.23
 

package/dist/index.cjs

@@ -8,7 +8,6 @@ var __export = (target, all) => {
 var _generatorsdk = require('@baeta/generator-sdk');
 
 // lib/codegen.ts
-
 var _core = require('@graphql-codegen/core');
 var _pluginhelpers = require('@graphql-codegen/plugin-helpers');
 var _typescript = require('@graphql-codegen/typescript'); var typescriptPlugin = _interopRequireWildcard(_typescript);
@@ -114,9 +113,9 @@ var plugin = async (schema, documents, config) => {
 var context_default = { plugin };
 
 // lib/modules/index.ts
+var _utilpath = require('@baeta/util-path');
 
 
-var _path = require('path');
 
 // lib/modules/builder.ts
 var _changecaseall = require('change-case-all');
@@ -132,11 +131,14 @@ var _changecaseall = require('change-case-all');
 
 
 
+var _os = require('os');
 var _parsefilepath = require('parse-filepath'); var _parsefilepath2 = _interopRequireDefault(_parsefilepath);
 var sep = "/";
 function collectUsedTypes(doc) {
   const used = [];
-  doc.definitions.forEach(findRelated);
+  for (const definition of doc.definitions) {
+    findRelated(definition);
+  }
   function markAsUsed(type) {
     pushUnique(used, type);
   }
@@ -144,28 +146,40 @@ function collectUsedTypes(doc) {
     if (node.kind === _graphql.Kind.OBJECT_TYPE_DEFINITION || node.kind === _graphql.Kind.OBJECT_TYPE_EXTENSION) {
       markAsUsed(node.name.value);
       if (node.fields) {
-        node.fields.forEach(findRelated);
+        for (const field of node.fields) {
+          findRelated(field);
+        }
       }
       if (node.interfaces) {
-        node.interfaces.forEach(findRelated);
+        for (const _interface of node.interfaces) {
+          findRelated(_interface);
+        }
       }
     } else if (node.kind === _graphql.Kind.INPUT_OBJECT_TYPE_DEFINITION || node.kind === _graphql.Kind.INPUT_OBJECT_TYPE_EXTENSION) {
       markAsUsed(node.name.value);
       if (node.fields) {
-        node.fields.forEach(findRelated);
+        for (const field of node.fields) {
+          findRelated(field);
+        }
       }
     } else if (node.kind === _graphql.Kind.INTERFACE_TYPE_DEFINITION || node.kind === _graphql.Kind.INTERFACE_TYPE_EXTENSION) {
       markAsUsed(node.name.value);
       if (node.fields) {
-        node.fields.forEach(findRelated);
+        for (const field of node.fields) {
+          findRelated(field);
+        }
       }
       if (node.interfaces) {
-        node.interfaces.forEach(findRelated);
+        for (const _interface of node.interfaces) {
+          findRelated(_interface);
+        }
       }
     } else if (node.kind === _graphql.Kind.UNION_TYPE_DEFINITION || node.kind === _graphql.Kind.UNION_TYPE_EXTENSION) {
       markAsUsed(node.name.value);
       if (node.types) {
-        node.types.forEach(findRelated);
+        for (const type of node.types) {
+          findRelated(type);
+        }
       }
     } else if (node.kind === _graphql.Kind.ENUM_TYPE_DEFINITION || node.kind === _graphql.Kind.ENUM_TYPE_EXTENSION) {
       markAsUsed(node.name.value);
@@ -178,7 +192,9 @@ function collectUsedTypes(doc) {
     } else if (node.kind === _graphql.Kind.FIELD_DEFINITION) {
       findRelated(resolveTypeNode(node.type));
       if (node.arguments) {
-        node.arguments.forEach(findRelated);
+        for (const argument of node.arguments) {
+          findRelated(argument);
+        }
       }
     } else if (node.kind === _graphql.Kind.NAMED_TYPE && // Named type
     !isGraphQLPrimitive(node.name.value)) {
@@ -193,7 +209,7 @@ function collectObjectFieldType(node, fieldDefinition, fieldsMap, fieldTypes) {
   const field = fieldsMap[fieldDefinition.name.value];
   const baseName = _pluginhelpers.getBaseType.call(void 0, field.type).name;
   const isDefaultScalar = _visitorplugincommon.DEFAULT_SCALARS[baseName] != null;
-  const name = isDefaultScalar ? `Types.Scalars["${baseName}"]` : baseName;
+  const name = isDefaultScalar ? `Types.Scalars["${baseName}"]["output"]` : baseName;
   const type = _visitorplugincommon.wrapTypeWithModifiers.call(void 0, name, field.type, {
     wrapOptional: (str) => {
       return `Types.Maybe<${str}>`;
@@ -267,7 +283,7 @@ function buildBlock({ name, lines }) {
   }
   return [`${name} {`, ...lines.map(indent(2)), "};"].join("\n");
 }
-var getRelativePath = function(filepath, basePath) {
+var getRelativePath = (filepath, basePath) => {
   const normalizedFilepath = normalize(filepath);
   const normalizedBasePath = ensureStartsWithSeparator(
     normalize(ensureEndsWithSeparator(basePath))
@@ -277,9 +293,9 @@ var getRelativePath = function(filepath, basePath) {
 };
 function groupSourcesByModule(sources, basePath) {
   const grouped = {};
-  sources.forEach((source) => {
+  for (const source of sources) {
     if (!source.location) {
-      return;
+      continue;
     }
     const relativePath = getRelativePath(source.location, basePath);
     if (relativePath) {
@@ -289,7 +305,7 @@ function groupSourcesByModule(sources, basePath) {
       }
       grouped[mod].push(source);
     }
-  });
+  }
   return grouped;
 }
 function extractModuleDirectory(filepath, basePath) {
@@ -308,6 +324,9 @@ function ensureEndsWithSeparator(path) {
   return path.endsWith(sep) ? path : path + sep;
 }
 function ensureStartsWithSeparator(path) {
+  if (_os.platform.call(void 0, ) === "win32") {
+    return path;
+  }
   return path.startsWith(".") ? path.replace(/^(..\/)|(.\/)/, "/") : path.startsWith("/") ? path : `/${path}`;
 }
 function pushUnique(list, item) {
@@ -323,9 +342,9 @@ function uniqueByKey(left, right, key) {
 }
 function createObject(keys, valueFn) {
   const obj = {};
-  keys.forEach((key) => {
+  for (const key of keys) {
     obj[key] = valueFn(key);
-  });
+  }
   return obj;
 }
 
@@ -491,7 +510,7 @@ ${contentBody}
     return `${field}: module.createSubscriptionBuilder<${resultType}, ${parentType}, ${contextType}, ${argumentsType}>("${field}"),`;
   }
   function printSubscriptionObjectBuilder() {
-    const subscriptions = _nullishCoalesce(_optionalChain([picks, 'access', _8 => _8.objects, 'access', _9 => _9["Subscription"], 'optionalAccess', _10 => _10.filter, 'call', _11 => _11(unique)]), () => ( []));
+    const subscriptions = _nullishCoalesce(_optionalChain([picks, 'access', _8 => _8.objects, 'access', _9 => _9.Subscription, 'optionalAccess', _10 => _10.filter, 'call', _11 => _11(unique)]), () => ( []));
     if (subscriptions.length === 0) {
       return "";
     }
@@ -562,15 +581,16 @@ ${body}
     return records[typeName].filter(unique).map(withQuotes).join(" | ");
   }
   function printTypeBody(typeName) {
-    const coreType = `${importNamespace}.${baseVisitor.convertName(typeName, {
+    const normalizedTypeName = baseVisitor.convertName(typeName, {
       useTypesSuffix: true,
       useTypesPrefix: true
-    })}`;
+    });
+    const coreType = `${importNamespace}.${normalizedTypeName}`;
     if (external.enums.includes(typeName) || external.objects.includes(typeName)) {
       if (schema && _graphql.isScalarType.call(void 0, schema.getType(typeName))) {
         return `${importNamespace}.Scalars['${typeName}']`;
       }
-      return coreType;
+      return `Pick<${coreType}, ${importNamespace}.DefinedFieldsWithoutExtensions["${normalizedTypeName}"]>`;
     }
     if (defined.enums.includes(typeName) && picks.enums[typeName]) {
       return `DefinedEnumValues['${typeName}']`;
@@ -584,7 +604,10 @@ ${body}
     if (defined.inputs.includes(typeName) && picks.inputs[typeName]) {
       return `Pick<${coreType}, DefinedInputFields['${typeName}']>`;
     }
-    return coreType;
+    if (_graphql.isScalarType.call(void 0, _optionalChain([schema, 'optionalAccess', _12 => _12.getType, 'call', _13 => _13(typeName)]))) {
+      return coreType;
+    }
+    return `Pick<${coreType}, ${importNamespace}.DefinedFieldsWithoutExtensions["${normalizedTypeName}"]>`;
   }
   function printExportType(typeName) {
     return `export type ${encapsulateTypeName(typeName)} = ${printTypeBody(typeName)};`;
@@ -595,9 +618,9 @@ ${body}
       if (!picksObj[name2]) {
         picksObj[name2] = [];
       }
-      node.fields.forEach((field) => {
+      for (const field of node.fields) {
         picksObj[name2].push(field.name.value);
-      });
+      }
     }
   }
   function collectValuesFromEnum(node) {
@@ -606,9 +629,9 @@ ${body}
       if (!picks.enums[name2]) {
         picks.enums[name2] = [];
       }
-      node.values.forEach((field) => {
+      for (const field of node.values) {
         picks.enums[name2].push(field.name.value);
-      });
+      }
     }
   }
   function collectTypeDefinition(node) {
@@ -684,10 +707,10 @@ ${body}
     return type;
   }
   function getResultType(type, field) {
-    return _optionalChain([fieldTypes, 'optionalAccess', _12 => _12[type], 'optionalAccess', _13 => _13[field]]) || "{}";
+    return _optionalChain([fieldTypes, 'optionalAccess', _14 => _14[type], 'optionalAccess', _15 => _15[field]]) || "{}";
   }
   function getArgsType(type, field) {
-    const hasArgs = _nullishCoalesce(_optionalChain([fieldArguments, 'optionalAccess', _14 => _14[type], 'optionalAccess', _15 => _15[field]]), () => ( false));
+    const hasArgs = _nullishCoalesce(_optionalChain([fieldArguments, 'optionalAccess', _16 => _16[type], 'optionalAccess', _17 => _17[field]]), () => ( false));
     if (!hasArgs) {
       return "{}";
     }
@@ -704,31 +727,34 @@ var preset = {
   buildGeneratesSection: (options) => {
     const { baseOutputDir } = options;
     const { baseTypesPath, extensionsPath, encapsulateModuleTypes } = options.presetConfig;
-    const requireRootResolvers = _visitorplugincommon.getConfigValue.call(void 0, _optionalChain([options, 'optionalAccess', _16 => _16.presetConfig, 'access', _17 => _17.requireRootResolvers]), false);
-    const cwd = _path.resolve.call(void 0, options.presetConfig.cwd || process.cwd());
+    const requireRootResolvers = _visitorplugincommon.getConfigValue.call(void 0, _optionalChain([options, 'optionalAccess', _18 => _18.presetConfig, 'access', _19 => _19.requireRootResolvers]), false);
+    const cwd = _utilpath.resolve.call(void 0, options.presetConfig.cwd || process.cwd());
     const importTypesNamespace = options.presetConfig.importTypesNamespace || "Types";
     if (!baseTypesPath) {
       throw new Error(
         `Preset "graphql-modules" requires you to specify "baseTypesPath" configuration and point it to your base types file (generated by "typescript" plugin)!`
       );
     }
-    if (!_optionalChain([options, 'access', _18 => _18.schemaAst, 'optionalAccess', _19 => _19.extensions, 'access', _20 => _20.sources])) {
+    if (!_optionalChain([options, 'access', _20 => _20.schemaAst, 'optionalAccess', _21 => _21.extensions, 'access', _22 => _22.sources])) {
       throw new Error(`Preset "graphql-modules" requires to use GraphQL SDL`);
     }
-    const extensions = _optionalChain([options, 'access', _21 => _21.schemaAst, 'optionalAccess', _22 => _22.extensions]);
-    const sources = _nullishCoalesce(_optionalChain([extensions, 'optionalAccess', _23 => _23.extendedSources]), () => ( []));
+    const extensions = _optionalChain([options, 'access', _23 => _23.schemaAst, 'optionalAccess', _24 => _24.extensions]);
+    const sources = _nullishCoalesce(_optionalChain([extensions, 'optionalAccess', _25 => _25.extendedSources]), () => ( []));
     const sourcesByModuleMap = groupSourcesByModule(sources, baseOutputDir);
     const modules = Object.keys(sourcesByModuleMap);
     const baseVisitor = new (0, _visitorplugincommon.BaseVisitor)(options.config, {});
     const { fieldTypes, fieldArguments } = collectObjectFieldTypesAndArguments(options.schemaAst);
     const baseOutput = {
-      filename: _path.resolve.call(void 0, cwd, baseOutputDir, baseTypesPath),
+      filename: _utilpath.resolve.call(void 0, cwd, baseOutputDir, baseTypesPath),
       schema: options.schema,
       documents: options.documents,
       plugins: [
         ...options.plugins,
         {
           "modules-exported-scalars": {}
+        },
+        {
+          "modules-exported-picks": {}
         }
       ],
       pluginMap: {
@@ -744,6 +770,35 @@ var preset = {
               return null;
             }).filter(Boolean).join("\n");
           }
+        },
+        "modules-exported-picks": {
+          plugin: (schema) => {
+            const typePicks = [];
+            for (const moduleName of modules) {
+              const sources2 = sourcesByModuleMap[moduleName];
+              const documents = sources2.map((source) => source.document);
+              const moduleDocument = _graphql.concatAST.call(void 0, documents);
+              const types = moduleDocument.definitions.filter(
+                (def) => def.kind === "ObjectTypeDefinition"
+              );
+              for (const type of types) {
+                const name = type.name.value;
+                if (name === "Query" || name === "Mutation" || name === "Subscription") {
+                  continue;
+                }
+                const fields = _nullishCoalesce(type.fields, () => ( []));
+                if (fields.length === 0) {
+                  continue;
+                }
+                const fieldNames = fields.map((f) => `"${f.name.value}"`).join(" | ");
+                typePicks.push(`  ${name}: ${fieldNames};`);
+              }
+            }
+            return `
+export type DefinedFieldsWithoutExtensions = {
+${typePicks.join("\n")}
+};`;
+          }
         }
       },
       config: {
@@ -755,10 +810,10 @@ var preset = {
     const baseTypesFilename = baseTypesPath.replace(/\.(js|ts|d.ts)$/, "");
     const baseTypesDir = stripFilename(baseOutput.filename);
     const outputs = modules.map((moduleName) => {
-      const filename = _path.resolve.call(void 0, cwd, baseOutputDir, moduleName, options.presetConfig.filename);
+      const filename = _utilpath.resolve.call(void 0, cwd, baseOutputDir, moduleName, options.presetConfig.filename);
       const dirpath = stripFilename(filename);
-      const relativePath = _path.relative.call(void 0, dirpath, baseTypesDir);
-      const importPath = options.presetConfig.importBaseTypesFrom || normalize(_path.join.call(void 0, relativePath, baseTypesFilename));
+      const relativePath = _utilpath.relative.call(void 0, dirpath, baseTypesDir);
+      const importPath = options.presetConfig.importBaseTypesFrom || normalize(_utilpath.join.call(void 0, relativePath, baseTypesFilename));
       const sources2 = sourcesByModuleMap[moduleName];
       const documents = sources2.map((source) => source.document);
       const moduleDocument = _graphql.concatAST.call(void 0, documents);
@@ -789,9 +844,9 @@ var preset = {
               fieldArguments,
               extensionsPath,
               rootTypes: [
-                _optionalChain([schema, 'access', _24 => _24.getQueryType, 'call', _25 => _25(), 'optionalAccess', _26 => _26.name]) || "",
-                _optionalChain([schema, 'access', _27 => _27.getMutationType, 'call', _28 => _28(), 'optionalAccess', _29 => _29.name]) || "",
-                _optionalChain([schema, 'access', _30 => _30.getSubscriptionType, 'call', _31 => _31(), 'optionalAccess', _32 => _32.name]) || ""
+                _optionalChain([schema, 'access', _26 => _26.getQueryType, 'call', _27 => _27(), 'optionalAccess', _28 => _28.name]) || "",
+                _optionalChain([schema, 'access', _29 => _29.getMutationType, 'call', _30 => _30(), 'optionalAccess', _31 => _31.name]) || "",
+                _optionalChain([schema, 'access', _32 => _32.getSubscriptionType, 'call', _33 => _33(), 'optionalAccess', _34 => _34.name]) || ""
               ].filter(Boolean)
             })
           }
@@ -859,7 +914,10 @@ async function generate(options) {
       ...output,
       cache
     });
-    return new (0, _generatorsdk.File)(output.filename, result2, "graphql");
+    return {
+      filename: output.filename,
+      content: result2
+    };
   });
   return Promise.all(promises);
 }
@@ -879,8 +937,10 @@ function graphqlPlugin() {
       watcher.on("delete", handleChange);
     },
     generate: async (ctx, next) => {
-      const files = await generate(ctx.generatorOptions);
-      ctx.fileManager.add(...files);
+      const items = await generate(ctx.generatorOptions);
+      for (const item of items) {
+        ctx.fileManager.createAndAdd(item.filename, item.content, "graphql");
+      }
       return next();
     }
   });