@smartive/graphql-magic 16.3.6 → 16.3.8

package/docs/package.json

@@ -20,14 +20,14 @@
     "@mdx-js/react": "^3.0.0",
     "clsx": "^2.0.0",
     "prism-react-renderer": "^2.3.0",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
   },
   "devDependencies": {
     "@docusaurus/module-type-aliases": "3.7.0",
     "@docusaurus/tsconfig": "3.7.0",
     "@docusaurus/types": "3.7.0",
-    "typescript": "5.5.4"
+    "typescript": "5.7.3"
   },
   "browserslist": {
     "production": [
@@ -42,6 +42,6 @@
     ]
   },
   "engines": {
-    "node": ">=18.0"
+    "node": ">=22.0"
   }
 }

package/eslint.config.mjs

@@ -0,0 +1,42 @@
+import { config } from "@smartive/eslint-config";
+import tsParser from "@typescript-eslint/parser";
+
+export default [
+    ...config('typescript'),
+    {
+        files: ['src/**/*.ts'],
+        languageOptions: {
+            parser: tsParser,
+            ecmaVersion: 5,
+            sourceType: "script",
+
+            parserOptions: {
+                project: "./tsconfig.eslint.json",
+            },
+        },
+
+        rules: {
+            "@typescript-eslint/no-explicit-any": "off",
+            "@typescript-eslint/no-floating-promises": ["error"],
+            "no-constant-binary-expression": "error",
+
+            "no-console": ["error", {
+                allow: ["info", "warn", "error", "trace", "time", "timeEnd"],
+            }],
+
+            // Disable rules causing the most errors
+            "@typescript-eslint/no-unsafe-argument": "off",
+            "@typescript-eslint/no-unsafe-assignment": "off",
+            "@typescript-eslint/no-unsafe-member-access": "off",
+            "@typescript-eslint/no-unsafe-return": "off",
+            "@typescript-eslint/no-unsafe-call": "off",
+            "@typescript-eslint/prefer-nullish-coalescing": "off",
+            "@typescript-eslint/restrict-template-expressions": "off",
+            "@typescript-eslint/no-base-to-string": "off",
+            "@typescript-eslint/no-misused-promises": "off",
+            "@typescript-eslint/require-await": "off",
+            "@typescript-eslint/no-unsafe-function-type": "off",
+            "eqeqeq": "off",
+        },
+    },
+];

package/migrations/20230912185644_setup.ts

@@ -10,11 +10,11 @@ export const up = async (knex: Knex) => {
   await knex.schema.createTable('User', (table) => {
     table.uuid('id').notNullable().primary();
     table.string('username', undefined).nullable();
-    table.enum('role', null as any, {
+    table.enum('role', null, {
       useNative: true,
       existingType: true,
       enumName: 'role',
-    }).nullable();
+    }).notNullable();
   });
 
   await knex.schema.createTable('AnotherObject', (table) => {
@@ -61,7 +61,7 @@ export const up = async (knex: Knex) => {
 
   await knex.schema.createTable('Reaction', (table) => {
     table.uuid('id').notNullable().primary();
-    table.enum('type', null as any, {
+    table.enum('type', null, {
       useNative: true,
       existingType: true,
       enumName: 'reactionType',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smartive/graphql-magic",
-  "version": "16.3.6",
+  "version": "16.3.8",
   "description": "",
   "source": "src/index.ts",
   "type": "module",
@@ -17,7 +17,7 @@
     "generate:index-files": "cti create ./src --excludes bin --withoutbackup",
     "generate:gqm-stuff": "npx gqm generate",
     "generate:setup-migration": "npm run build:bin && npx gqm generate-migration setup 20230912185644",
-    "lint": "eslint src",
+    "lint": "eslint src/**/*.ts",
     "lint:fix": "eslint src --fix",
     "deps": "docker compose up",
     "test": "npm run lint && npm run test:all && npm run build",
@@ -34,10 +34,6 @@
   "bin": {
     "gqm": "dist/bin/gqm.cjs"
   },
-  "overrides": {
-    "graphql": "$graphql",
-    "rollup": "3.29.5"
-  },
   "browserslist": "> 0.25%, not dead",
   "publishConfig": {
     "access": "public"
@@ -47,14 +43,14 @@
     "@graphql-codegen/add": "^5.0.0",
     "@graphql-codegen/cli": "^5.0.0",
     "@graphql-codegen/typescript": "^4.0.1",
-    "@graphql-codegen/typescript-compatibility": "^2.1.5",
     "@graphql-codegen/typescript-operations": "^4.0.1",
     "@graphql-codegen/typescript-resolvers": "^4.0.1",
+    "@types/node": "^22.13.5",
     "code-block-writer": "^13.0.0",
     "commander": "^13.0.0",
     "dayjs": "^1.11.10",
     "dotenv": "^16.3.1",
-    "graphql": "^15.8.0",
+    "graphql": "^16.0.0",
     "inflection": "^3.0.0",
     "knex": "^3.0.1",
     "knex-schema-inspector": "^3.1.0",
@@ -69,7 +65,7 @@
     "knex": "^3.0.1"
   },
   "devDependencies": {
-    "@smartive/eslint-config": "3.3.0",
+    "@smartive/eslint-config": "6.5.0",
     "@smartive/prettier-config": "3.1.2",
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.15",
@@ -79,13 +75,12 @@
     "create-ts-index": "1.14.0",
     "del-cli": "6.0.0",
     "esbuild": "0.25.0",
-    "eslint": "8.57.1",
-    "graphql-request": "6.1.0",
+    "eslint": "9.21.0",
     "jest": "29.7.0",
     "mock-knex": "0.4.13",
-    "prettier": "2.8.8",
+    "prettier": "3.5.2",
     "ts-jest": "29.2.6",
     "ts-node": "10.9.2",
-    "typescript": "5.5.4"
+    "typescript": "5.7.3"
   }
 }

package/src/api/execute.ts

@@ -35,6 +35,7 @@ export const execute = async ({
     fieldResolver: (parent, _args, _ctx, info: GraphQLResolveInfo) => {
       const node = get(info.fieldNodes, 0);
       const alias = node.alias;
+
       return parent[alias ? alias.value : node.name.value];
     },
   });

package/src/bin/gqm/codegen.ts

@@ -30,7 +30,7 @@ export const generateGraphqlClientTypes = async () => {
     documents: [graphqlQueriesPath, `${generatedFolderPath}/client/mutations.ts`],
     generates: {
       [`${generatedFolderPath}/client/index.ts`]: {
-        plugins: ['typescript', 'typescript-operations', 'typescript-compatibility'],
+        plugins: ['typescript', 'typescript-operations'],
       },
     },
     config: {

package/src/client/gql.ts

@@ -2,6 +2,6 @@
 export const gql = (chunks: TemplateStringsArray, ...variables: (string | number | boolean)[]): string => {
   return chunks.reduce(
     (accumulator, chunk, index) => `${accumulator}${chunk}${index in variables ? variables[index] : ''}`,
-    ''
+    '',
   );
 };

package/src/client/mutations.ts

@@ -10,30 +10,30 @@ export const generateMutations = (models: Models, gqmModule = '@smartive/graphql
     if (creatable) {
       parts.push(
         `export const CREATE_${constantCase(
-          name
-        )} = gql\`\n  mutation Create${name}Mutation($data: Create${name}!) {\n    create${name}(data: $data) { id }\n  }\n\`;`
+          name,
+        )} = gql\`\n  mutation Create${name}Mutation($data: Create${name}!) {\n    create${name}(data: $data) { id }\n  }\n\`;`,
       );
     }
 
     if (updatable) {
       parts.push(
         `export const UPDATE_${constantCase(
-          name
-        )} = gql\`\n  mutation Update${name}Mutation($id: ID!, $data: Update${name}!) {\n    update${name}(where: { id: $id }, data: $data) { id }\n  }\n\`;`
+          name,
+        )} = gql\`\n  mutation Update${name}Mutation($id: ID!, $data: Update${name}!) {\n    update${name}(where: { id: $id }, data: $data) { id }\n  }\n\`;`,
       );
     }
 
     if (deletable) {
       parts.push(
         `export const DELETE_${constantCase(
-          name
-        )} = gql\`\n  mutation Delete${name}Mutation($id: ID!) {\n    delete${name}(where: { id: $id })\n  }\n\`;`
+          name,
+        )} = gql\`\n  mutation Delete${name}Mutation($id: ID!) {\n    delete${name}(where: { id: $id })\n  }\n\`;`,
       );
 
       parts.push(
         `export const RESTORE_${constantCase(
-          name
-        )} = gql\`\n  mutation Restore${name}Mutation($id: ID!) {\n    restore${name}(where: { id: $id })\n  }\n\`;`
+          name,
+        )} = gql\`\n  mutation Restore${name}Mutation($id: ID!) {\n    restore${name}(where: { id: $id })\n  }\n\`;`,
       );
     }
   }

package/src/client/queries.ts

@@ -15,8 +15,8 @@ import {
 export const getUpdateEntityQuery = (
   model: EntityModel,
   role: string,
-  fields?: string[] | undefined,
-  additionalFields = ''
+  fields?: string[],
+  additionalFields = '',
 ) => `query Update${model.name}Fields ($id: ID!) {
   data: ${typeToField(model.name)}(where: { id: $id }) {
     id
@@ -39,6 +39,7 @@ export const fieldIsSearchable = (model: EntityModel, fieldName: string) => {
   const relation = model.getRelation(fieldName);
   const targetModel = relation.targetModel;
   const displayField = targetModel.getField(targetModel.displayField || 'id');
+
   return displayField.searchable;
 };
 
@@ -52,7 +53,7 @@ export const getSelectEntityRelationsQuery = (model: EntityModel, relationNames:
         (relation) =>
           `$${relation.name}Where: ${relation.targetModel.name}Where, $${relation.name}Limit: Int${
             fieldIsSearchable(model, relation.name) ? `, $${relation.name}Search: String` : ''
-          }`
+          }`,
       )
       .join(', ')}) {
       ${relations
@@ -85,7 +86,7 @@ export const getSelectEntityRelationsQuery = (model: EntityModel, relationNames:
 export const getManyToManyRelationsQuery = (
   model: Model,
   action: 'create' | 'update',
-  manyToManyRelations: ManyToManyRelation[]
+  manyToManyRelations: ManyToManyRelation[],
 ) =>
   !!manyToManyRelations.length &&
   (action === 'update'
@@ -138,14 +139,14 @@ export const getMutationQuery = (model: Model, action: 'create' | 'update' | 'de
         }
         `
     : action === 'update'
-    ? `
+      ? `
         mutation Update${model.name} ($id: ID!, $data: Update${model.name}!) {
           mutated: update${model.name}(where: { id: $id } data: $data) {
             id
           }
         }
         `
-    : `
+      : `
         mutation Delete${model.name} ($id: ID!) {
           mutated: delete${model.name}(where: { id: $id }) {
             id
@@ -162,7 +163,7 @@ export const getEntityListQuery = (
   role: string,
   relations?: string[],
   fragment = '',
-  reverseRelation?: ReverseRelation
+  reverseRelation?: ReverseRelation,
 ) => `query ${model.plural}List(
   ${reverseRelation ? '$id: ID!,' : ''}
   $limit: Int!,
@@ -171,14 +172,14 @@ export const getEntityListQuery = (
 ) {
   ${reverseRelation ? `root: ${typeToField(reverseRelation.sourceModel.name)}(where: { id: $id }) {` : ''}
     data: ${reverseRelation ? reverseRelation.name : model.pluralField}(limit: $limit, where: $where, ${
-  model.fields.some(({ searchable }) => searchable) ? ', search: $search' : ''
-}) {
+      model.fields.some(({ searchable }) => searchable) ? ', search: $search' : ''
+    }) {
       ${displayField(model)}
       ${model.fields.filter(and(isSimpleField, isQueriableBy(role))).map(({ name }) => name)}
       ${fragment}
       ${queryRelations(
         model.models,
-        model.relations.filter((relation) => !relations || relations.includes(relation.name))
+        model.relations.filter((relation) => !relations || relations.includes(relation.name)),
       )}
       ${fragment}
     }
@@ -193,14 +194,14 @@ export const getEntityQuery = (model: EntityModel, role: string, relations?: str
     ${model.fields.filter(and(isSimpleField, isQueriableBy(role))).map(({ name }) => name)}
     ${queryRelations(
       model.models,
-      model.relations.filter((relation) => !relations || relations.includes(relation.name))
+      model.relations.filter((relation) => !relations || relations.includes(relation.name)),
     )}
     ${queryRelations(
       model.models,
       model.reverseRelations.filter(
         (reverseRelation) =>
-          isToOneRelation(reverseRelation.field) && (!relations || relations.includes(reverseRelation.name))
-      )
+          isToOneRelation(reverseRelation.field) && (!relations || relations.includes(reverseRelation.name)),
+      ),
     )}
     ${fragment}
   }
@@ -220,6 +221,6 @@ export const queryRelations = (models: Models, relations: Relation[]) =>
       (relation): string => `${relation.name} {
           id
           ${displayField(relation.targetModel)}
-        }`
+        }`,
     )
     .join('\n');

package/src/db/generate.ts

@@ -15,6 +15,7 @@ const PRIMITIVE_TYPES = {
 const OPTIONAL_SEED_FIELDS = ['createdAt', 'createdById', 'updatedAt', 'updatedById', 'deletedAt', 'deletedById'];
 
 export const generateDBModels = (models: Models, dateLibrary: DateLibrary) => {
+  // eslint-disable-next-line @typescript-eslint/dot-notation
   const writer: CodeBlockWriter = new CodeBlockWriter['default']({
     useSingleQuote: true,
     indentNumberOfSpaces: 2,
@@ -52,8 +53,8 @@ export const generateDBModels = (models: Models, dateLibrary: DateLibrary) => {
               `'${getColumnName(field)}'${field.nonNull && field.defaultValue === undefined ? '' : '?'}: ${getFieldType(
                 field,
                 dateLibrary,
-                true
-              )}${field.list ? ' | string' : ''}${field.nonNull ? '' : ' | null'};`
+                true,
+              )}${field.list ? ' | string' : ''}${field.nonNull ? '' : ' | null'};`,
             )
             .newLine();
         }
@@ -68,7 +69,7 @@ export const generateDBModels = (models: Models, dateLibrary: DateLibrary) => {
             .write(
               `'${getColumnName(field)}'?: ${getFieldType(field, dateLibrary, true)}${field.list ? ' | string' : ''}${
                 field.nonNull ? '' : ' | null'
-              };`
+              };`,
             )
             .newLine();
         }
@@ -90,7 +91,7 @@ export const generateDBModels = (models: Models, dateLibrary: DateLibrary) => {
                   field.nonNull && field.defaultValue === undefined && !OPTIONAL_SEED_FIELDS.includes(fieldName) ? '' : '?'
                 }: ${field.kind === 'enum' ? (field.list ? 'string[]' : 'string') : getFieldType(field, dateLibrary, true)}${
                   field.list ? ' | string' : ''
-                }${field.nonNull ? '' : ' | null'};`
+                }${field.nonNull ? '' : ' | null'};`,
               )
               .newLine();
           }
@@ -126,6 +127,7 @@ const getFieldType = (field: EntityField, dateLibrary: DateLibrary, input?: bool
       if (field.type === 'DateTime') {
         return (input ? `(${DATE_CLASS[dateLibrary]} | string)` : DATE_CLASS[dateLibrary]) + (field.list ? '[]' : '');
       }
+
       return get(PRIMITIVE_TYPES, field.type) + (field.list ? '[]' : '');
     default: {
       const exhaustiveCheck: never = kind;
@@ -135,6 +137,7 @@ const getFieldType = (field: EntityField, dateLibrary: DateLibrary, input?: bool
 };
 
 export const generateKnexTables = (models: Models) => {
+  // eslint-disable-next-line @typescript-eslint/dot-notation
   const writer: CodeBlockWriter = new CodeBlockWriter['default']({
     useSingleQuote: true,
     indentNumberOfSpaces: 2,
@@ -145,7 +148,7 @@ export const generateKnexTables = (models: Models) => {
     .write(
       `import { ${models.entities
         .map((model) => `${model.name}, ${model.name}Initializer, ${model.name}Mutator`)
-        .join(', ')} } from '.';`
+        .join(', ')} } from '.';`,
     )
     .blankLine();
 

package/src/migrations/generate.ts

@@ -22,6 +22,7 @@ import { Value } from '../values';
 type Callbacks = (() => void)[];
 
 export class MigrationGenerator {
+  // eslint-disable-next-line @typescript-eslint/dot-notation
   private writer: CodeBlockWriter = new CodeBlockWriter['default']({
     useSingleQuote: true,
     indentNumberOfSpaces: 2,
@@ -31,7 +32,10 @@ export class MigrationGenerator {
   private uuidUsed?: boolean;
   private nowUsed?: boolean;
 
-  constructor(knex: Knex, private models: Models) {
+  constructor(
+    knex: Knex,
+    private models: Models,
+  ) {
     this.schema = SchemaInspector(knex);
   }
 
@@ -49,7 +53,7 @@ export class MigrationGenerator {
     this.createEnums(
       this.models.enums.filter((enm) => !enums.includes(lowerFirst(enm.name))),
       up,
-      down
+      down,
     );
 
     for (const model of models.entities) {
@@ -81,10 +85,10 @@ export class MigrationGenerator {
       if (model.oldName) {
         // Rename table
         up.push(() => {
-          this.renameTable(model.oldName, model.name);
+          this.renameTable(model.oldName!, model.name);
         });
         down.push(() => {
-          this.renameTable(model.name, model.oldName);
+          this.renameTable(model.name, model.oldName!);
         });
         tables[tables.indexOf(model.oldName)] = model.name;
         this.columns[model.name] = this.columns[model.oldName];
@@ -137,7 +141,7 @@ export class MigrationGenerator {
             model,
             model.fields.filter(not(isInherited)).filter(({ oldName }) => oldName),
             up,
-            down
+            down,
           );
 
           // Add missing fields
@@ -148,10 +152,10 @@ export class MigrationGenerator {
               .filter(
                 ({ name, ...field }) =>
                   field.kind !== 'custom' &&
-                  !this.getColumn(model.name, field.kind === 'relation' ? field.foreignKey || `${name}Id` : name)
+                  !this.getColumn(model.name, field.kind === 'relation' ? field.foreignKey || `${name}Id` : name),
               ),
             up,
-            down
+            down,
           );
 
           // Update fields
@@ -160,6 +164,7 @@ export class MigrationGenerator {
             if (!col) {
               return false;
             }
+
             return !nonNull && !col.is_nullable;
           });
           this.updateFields(model, existingFields, up, down);
@@ -215,7 +220,7 @@ export class MigrationGenerator {
               .filter(
                 ({ name, ...field }) =>
                   field.kind !== 'custom' &&
-                  !this.getColumn(revisionTable, field.kind === 'relation' ? field.foreignKey || `${name}Id` : name)
+                  !this.getColumn(revisionTable, field.kind === 'relation' ? field.foreignKey || `${name}Id` : name),
               );
 
             this.createRevisionFields(model, missingRevisionFields, up, down);
@@ -226,7 +231,7 @@ export class MigrationGenerator {
                 field.kind !== 'custom' &&
                 !updatable &&
                 !(field.kind === 'relation' && field.foreignKey === 'id') &&
-                this.getColumn(revisionTable, field.kind === 'relation' ? field.foreignKey || `${name}Id` : name)
+                this.getColumn(revisionTable, field.kind === 'relation' ? field.foreignKey || `${name}Id` : name),
             );
             this.createRevisionFields(model, revisionFieldsToRemove, down, up);
           }
@@ -267,7 +272,7 @@ export class MigrationGenerator {
             model,
             model.fields.filter(isUpdatableField).filter(({ deleted }) => deleted),
             down,
-            up
+            up,
           );
         }
       }
@@ -276,7 +281,7 @@ export class MigrationGenerator {
     this.createEnums(
       this.models.enums.filter((enm) => enm.deleted),
       down,
-      up
+      up,
     );
 
     writer.writeLine(`import { Knex } from 'knex';`);
@@ -308,7 +313,7 @@ export class MigrationGenerator {
         this.alterTable(model.name, () => {
           this.renameColumn(
             field.kind === 'relation' ? `${field.oldName}Id` : get(field, 'oldName'),
-            field.kind === 'relation' ? `${field.name}Id` : field.name
+            field.kind === 'relation' ? `${field.name}Id` : field.name,
           );
         });
       }
@@ -319,15 +324,14 @@ export class MigrationGenerator {
         this.alterTable(model.name, () => {
           this.renameColumn(
             field.kind === 'relation' ? `${field.name}Id` : field.name,
-            field.kind === 'relation' ? `${field.oldName}Id` : get(field, 'oldName')
+            field.kind === 'relation' ? `${field.oldName}Id` : get(field, 'oldName'),
           );
         });
       }
     });
 
     for (const field of fields) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      summonByName(this.columns[model.name]!, field.kind === 'relation' ? `${field.oldName!}Id` : field.oldName!).name =
+      summonByName(this.columns[model.name], field.kind === 'relation' ? `${field.oldName!}Id` : field.oldName!).name =
         field.kind === 'relation' ? `${field.name}Id` : field.name;
     }
   }
@@ -400,7 +404,7 @@ export class MigrationGenerator {
           this.column(
             field,
             { alter: true },
-            summonByName(this.columns[model.name], field.kind === 'relation' ? `${field.name}Id` : field.name)
+            summonByName(this.columns[model.name], field.kind === 'relation' ? `${field.name}Id` : field.name),
           );
         }
       });
@@ -426,7 +430,7 @@ export class MigrationGenerator {
             this.column(
               field,
               { alter: true },
-              summonByName(this.columns[model.name], field.kind === 'relation' ? `${field.name}Id` : field.name)
+              summonByName(this.columns[model.name], field.kind === 'relation' ? `${field.name}Id` : field.name),
             );
           }
         });
@@ -476,7 +480,7 @@ export class MigrationGenerator {
                 .write(
                   `${col}: knex.raw('(select "${col}" from "${model.name}" where "${model.name}".id = "${
                     model.name
-                  }Revision"."${typeToField(model.name)}Id")'),`
+                  }Revision"."${typeToField(model.name)}Id")'),`,
                 )
                 .newLine();
             }
@@ -511,9 +515,9 @@ export class MigrationGenerator {
       up.push(() =>
         this.writer
           .writeLine(
-            `await knex.raw(\`CREATE TYPE "${name}" AS ENUM (${enm.values.map((value) => `'${value}'`).join(',')})\`);`
+            `await knex.raw(\`CREATE TYPE "${name}" AS ENUM (${enm.values.map((value) => `'${value}'`).join(',')})\`);`,
           )
-          .newLine()
+          .newLine(),
       );
       down.push(() => this.writer.writeLine(`await knex.raw('DROP TYPE "${name}"');`));
     }
@@ -575,7 +579,7 @@ export class MigrationGenerator {
   private column(
     { name, primary, list, ...field }: EntityField,
     { setUnique = true, setNonNull = true, alter = false, foreign = true, setDefault = true } = {},
-    toColumn?: Column
+    toColumn?: Column,
   ) {
     const col = (what?: string) => {
       if (what) {
@@ -648,7 +652,7 @@ export class MigrationGenerator {
         col(`table.uuid('${field.foreignKey}')`);
         if (foreign && !alter) {
           this.writer.writeLine(
-            `table.foreign('${field.foreignKey}').references('id').inTable('${field.type}').onDelete('CASCADE');`
+            `table.foreign('${field.foreignKey}').references('id').inTable('${field.type}').onDelete('CASCADE');`,
           );
         }
         break;