@smartive/graphql-magic 9.0.0 → 9.1.1

package/CHANGELOG.md

@@ -1 +1,6 @@
-# [9.0.0](https://github.com/smartive/graphql-magic/compare/v8.1.3...v9.0.0) (2023-09-06)
+## [9.1.1](https://github.com/smartive/graphql-magic/compare/v9.1.0...v9.1.1) (2023-09-06)
+
+
+### Bug Fixes
+
+* Codegen mutations ([#62](https://github.com/smartive/graphql-magic/issues/62)) ([ea87f2b](https://github.com/smartive/graphql-magic/commit/ea87f2ba5fb4540450a8ebd52a35fff40b0a1a3a))

package/dist/bin/gqm.cjs

@@ -1279,41 +1279,6 @@ export const rawModels: RawModels = [
 
 export const models = getModels(rawModels);
 `;
-var GRAPHQL_CODEGEN = (path) => `
-overwrite: true
-schema: '${path}/schema.graphql'
-documents: null
-generates:
-  ${path}/api/index.ts:
-    plugins:
-      - 'typescript'
-      - 'typescript-resolvers'
-      - add:
-          content: "import { DateTime } from 'luxon'"
-config:
-  scalars:
-    DateTime: DateTime
-`;
-var CLIENT_CODEGEN = (path) => `
-schema: ${path}/schema.graphql
-documents: [ './src/**/*.ts', './src/**/*.tsx' ]
-generates:
-  ${path}/client/index.ts:
-    plugins:
-      - typescript
-      - typescript-operations
-      - typescript-compatibility
-
-config:
-  preResolveTypes: true # Simplifies the generated types
-  namingConvention: keep # Keeps naming as-is
-  nonOptionalTypename: true # Forces \`__typename\` on all selection sets
-  skipTypeNameForRoot: true # Don't generate __typename for root types
-  avoidOptionals: # Avoids optionals on the level of the field
-    field: true
-  scalars:
-    DateTime: string
-`;
 var KNEXFILE = `
 const config = {
   client: 'postgresql',
@@ -1346,8 +1311,13 @@ var DEFAULTS = {
       ensureFileExists(`${path}/db/.gitkeep`, "");
       ensureFileExists(`${path}/api/.gitkeep`, "");
       ensureFileExists(`${path}/client/.gitkeep`, "");
-      ensureFileExists(`graphql-codegen.yml`, GRAPHQL_CODEGEN(path));
-      ensureFileExists(`client-codegen.yml`, CLIENT_CODEGEN(path));
+    }
+  },
+  graphqlQueriesPath: {
+    question: "Where to look for graphql queries?",
+    defaultValue: "src/graphql/client/queries",
+    init: (path) => {
+      ensureDirectoryExists(path);
     }
   }
 };
@@ -1381,13 +1351,13 @@ var getSetting = async (name2) => {
   }
   return settings[name2];
 };
-var ensureDirectoryExists = (filePath) => {
-  const dir = (0, import_path.dirname)(filePath);
+var ensureDirectoryExists = (dir) => {
   if ((0, import_fs.existsSync)(dir)) {
     return true;
   }
   ensureDirectoryExists(dir);
   try {
+    console.info(`Creating directory ${dir}`);
     (0, import_fs.mkdirSync)(dir);
     return true;
   } catch (err) {
@@ -1400,12 +1370,12 @@ var ensureDirectoryExists = (filePath) => {
 var ensureFileExists = (filePath, content) => {
   if (!(0, import_fs.existsSync)(filePath)) {
     console.info(`Creating ${filePath}`);
-    ensureDirectoryExists(filePath);
+    ensureDirectoryExists((0, import_path.dirname)(filePath));
     (0, import_fs.writeFileSync)(filePath, content);
   }
 };
 var writeToFile = (filePath, content) => {
-  ensureDirectoryExists(filePath);
+  ensureDirectoryExists((0, import_path.dirname)(filePath));
   if ((0, import_fs.existsSync)(filePath)) {
     const currentContent = (0, import_fs.readFileSync)(filePath, "utf-8");
     if (content === currentContent) {
@@ -1425,7 +1395,7 @@ var generateGraphqlApiTypes = async () => {
   await (0, import_cli.generate)({
     overwrite: true,
     schema: `${generatedFolderPath}/schema.graphql`,
-    documents: null,
+    documents: void 0,
     generates: {
       [`${generatedFolderPath}/api/index.ts`]: {
         plugins: ["typescript", "typescript-resolvers", { add: { content: `import { DateTime } from 'luxon';` } }]
@@ -1440,9 +1410,10 @@ var generateGraphqlApiTypes = async () => {
 };
 var generateGraphqlClientTypes = async () => {
   const generatedFolderPath = await getSetting("generatedFolderPath");
+  const graphqlQueriesPath = await getSetting("graphqlQueriesPath");
   await (0, import_cli.generate)({
     schema: `${generatedFolderPath}/schema.graphql`,
-    documents: ["./src/**/*.ts", "./src/**/*.tsx"],
+    documents: [graphqlQueriesPath, `${generatedFolderPath}/client/mutations.ts`],
     generates: {
       [`${generatedFolderPath}/client/index.ts`]: {
         plugins: ["typescript", "typescript-operations", "typescript-compatibility"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smartive/graphql-magic",
-  "version": "9.0.0",
+  "version": "9.1.1",
   "description": "",
   "source": "src/index.ts",
   "type": "module",

package/src/bin/gqm/codegen.ts

@@ -6,7 +6,7 @@ export const generateGraphqlApiTypes = async () => {
   await generate({
     overwrite: true,
     schema: `${generatedFolderPath}/schema.graphql`,
-    documents: null,
+    documents: undefined,
     generates: {
       [`${generatedFolderPath}/api/index.ts`]: {
         plugins: ['typescript', 'typescript-resolvers', { add: { content: `import { DateTime } from 'luxon';` } }],
@@ -22,9 +22,10 @@ export const generateGraphqlApiTypes = async () => {
 
 export const generateGraphqlClientTypes = async () => {
   const generatedFolderPath = await getSetting('generatedFolderPath');
+  const graphqlQueriesPath = await getSetting('graphqlQueriesPath');
   await generate({
     schema: `${generatedFolderPath}/schema.graphql`,
-    documents: ['./src/**/*.ts', './src/**/*.tsx'],
+    documents: [graphqlQueriesPath, `${generatedFolderPath}/client/mutations.ts`],
     generates: {
       [`${generatedFolderPath}/client/index.ts`]: {
         plugins: ['typescript', 'typescript-operations', 'typescript-compatibility'],

package/src/bin/gqm/settings.ts

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { dirname } from 'path';
 import { readLine } from './readline';
-import { CLIENT_CODEGEN, EMPTY_MODELS, GRAPHQL_CODEGEN } from './templates';
+import { EMPTY_MODELS } from './templates';
 
 const SETTINGS_PATH = '.gqmrc.json';
 
@@ -21,15 +21,19 @@ const DEFAULTS = {
       ensureFileExists(`${path}/db/.gitkeep`, '');
       ensureFileExists(`${path}/api/.gitkeep`, '');
       ensureFileExists(`${path}/client/.gitkeep`, '');
-      ensureFileExists(`graphql-codegen.yml`, GRAPHQL_CODEGEN(path));
-      ensureFileExists(`client-codegen.yml`, CLIENT_CODEGEN(path));
+    },
+  },
+  graphqlQueriesPath: {
+    question: 'Where to look for graphql queries?',
+    defaultValue: 'src/graphql/client/queries',
+    init: (path: string) => {
+      ensureDirectoryExists(path);
     },
   },
 };
 
 type Settings = {
-  modelsPath: string;
-  generatedFolderPath: string;
+  [key in keyof typeof DEFAULTS]: string;
 };
 
 const initSetting = async (name: string) => {
@@ -67,9 +71,7 @@ export const getSetting = async (name: keyof Settings): Promise<string> => {
   return settings[name];
 };
 
-const ensureDirectoryExists = (filePath: string) => {
-  const dir = dirname(filePath);
-
+const ensureDirectoryExists = (dir: string) => {
   if (existsSync(dir)) {
     return true;
   }
@@ -77,6 +79,7 @@ const ensureDirectoryExists = (filePath: string) => {
   ensureDirectoryExists(dir);
 
   try {
+    console.info(`Creating directory ${dir}`);
     mkdirSync(dir);
     return true;
   } catch (err) {
@@ -90,13 +93,13 @@ const ensureDirectoryExists = (filePath: string) => {
 export const ensureFileExists = (filePath: string, content: string) => {
   if (!existsSync(filePath)) {
     console.info(`Creating ${filePath}`);
-    ensureDirectoryExists(filePath);
+    ensureDirectoryExists(dirname(filePath));
     writeFileSync(filePath, content);
   }
 };
 
 export const writeToFile = (filePath: string, content: string) => {
-  ensureDirectoryExists(filePath);
+  ensureDirectoryExists(dirname(filePath));
   if (existsSync(filePath)) {
     const currentContent = readFileSync(filePath, 'utf-8');
     if (content === currentContent) {

package/src/bin/gqm/templates.ts

@@ -12,43 +12,6 @@ export const rawModels: RawModels = [
 export const models = getModels(rawModels);
 `;
 
-export const GRAPHQL_CODEGEN = (path: string) => `
-overwrite: true
-schema: '${path}/schema.graphql'
-documents: null
-generates:
-  ${path}/api/index.ts:
-    plugins:
-      - 'typescript'
-      - 'typescript-resolvers'
-      - add:
-          content: "import { DateTime } from 'luxon'"
-config:
-  scalars:
-    DateTime: DateTime
-`;
-
-export const CLIENT_CODEGEN = (path: string) => `
-schema: ${path}/schema.graphql
-documents: [ './src/**/*.ts', './src/**/*.tsx' ]
-generates:
-  ${path}/client/index.ts:
-    plugins:
-      - typescript
-      - typescript-operations
-      - typescript-compatibility
-
-config:
-  preResolveTypes: true # Simplifies the generated types
-  namingConvention: keep # Keeps naming as-is
-  nonOptionalTypename: true # Forces \`__typename\` on all selection sets
-  skipTypeNameForRoot: true # Don't generate __typename for root types
-  avoidOptionals: # Avoids optionals on the level of the field
-    field: true
-  scalars:
-    DateTime: string
-`;
-
 export const KNEXFILE = `
 const config = {
   client: 'postgresql',