@smartive/graphql-magic 23.11.0-next.1 → 23.12.0-next.1

package/CHANGELOG.md

@@ -1,5 +1,6 @@
-## [23.11.0-next.1](https://github.com/smartive/graphql-magic/compare/v23.10.0...v23.11.0-next.1) (2026-03-16)
+## [23.12.0-next.1](https://github.com/smartive/graphql-magic/compare/v23.11.0...v23.12.0-next.1) (2026-03-31)
 
 ### Features
 
-* Enable mutation args ([6f67ed4](https://github.com/smartive/graphql-magic/commit/6f67ed48eb539c52c7374078b72ff6cdf9fe6f2c))
+* add field type time ([223adf4](https://github.com/smartive/graphql-magic/commit/223adf482c523266a194630b1dc5eda3d7d8b850))
+* add time type ([33adeec](https://github.com/smartive/graphql-magic/commit/33adeec46751f8ca29770b47d8d0ddfb2ce526bb))

package/dist/bin/gqm.cjs

@@ -41,47 +41,65 @@ var import_graphql = require("graphql");
 // src/client/mutations.ts
 var import_upperCase = __toESM(require("lodash/upperCase"), 1);
 var constantCase = (str) => (0, import_upperCase.default)(str).replace(/ /g, "_");
+var argTypeStr = (field) => {
+  const base = field.list ? `[${field.type}!]` : field.type;
+  return field.nonNull ? `${base}!` : base;
+};
+var argsToVariables = (args2) => args2.map((a) => `$${a.name}: ${argTypeStr(a)}`).join(", ");
+var argsToMutationArgs = (args2) => args2.map((a) => `${a.name}: $${a.name}`).join(", ");
 var generateMutations = (models) => {
   const parts = [];
   for (const { name: name2, creatable, updatable, deletable } of models.entities.filter(not(isRootModel))) {
     if (creatable) {
+      const extraArgs = creatable !== true && creatable.args ? creatable.args : [];
+      const variables = extraArgs.length ? `$data: Create${name2}!, ${argsToVariables(extraArgs)}` : `$data: Create${name2}!`;
+      const mutationArgs = extraArgs.length ? `data: $data, ${argsToMutationArgs(extraArgs)}` : `data: $data`;
       parts.push(
         `export const CREATE_${constantCase(
           name2
         )} = gql\`
-  mutation Create${name2}Mutation($data: Create${name2}!) {
-    create${name2}(data: $data) { id }
+  mutation Create${name2}Mutation(${variables}) {
+    create${name2}(${mutationArgs}) { id }
   }
 \`;`
       );
     }
     if (updatable) {
+      const extraArgs = updatable !== true && updatable.args ? updatable.args : [];
+      const variables = extraArgs.length ? `$id: ID!, $data: Update${name2}!, ${argsToVariables(extraArgs)}` : `$id: ID!, $data: Update${name2}!`;
+      const mutationArgs = extraArgs.length ? `where: { id: $id }, data: $data, ${argsToMutationArgs(extraArgs)}` : `where: { id: $id }, data: $data`;
       parts.push(
         `export const UPDATE_${constantCase(
           name2
         )} = gql\`
-  mutation Update${name2}Mutation($id: ID!, $data: Update${name2}!) {
-    update${name2}(where: { id: $id }, data: $data) { id }
+  mutation Update${name2}Mutation(${variables}) {
+    update${name2}(${mutationArgs}) { id }
   }
 \`;`
       );
     }
     if (deletable) {
+      const deleteExtraArgs = deletable !== true && deletable.args ? deletable.args : [];
+      const deleteVariables = deleteExtraArgs.length ? `$id: ID!, ${argsToVariables(deleteExtraArgs)}` : `$id: ID!`;
+      const deleteMutationArgs = deleteExtraArgs.length ? `where: { id: $id }, ${argsToMutationArgs(deleteExtraArgs)}` : `where: { id: $id }`;
       parts.push(
         `export const DELETE_${constantCase(
           name2
         )} = gql\`
-  mutation Delete${name2}Mutation($id: ID!) {
-    delete${name2}(where: { id: $id })
+  mutation Delete${name2}Mutation(${deleteVariables}) {
+    delete${name2}(${deleteMutationArgs})
   }
 \`;`
       );
+      const restoreExtraArgs = deletable !== true && deletable.restoreArgs ? deletable.restoreArgs : [];
+      const restoreVariables = restoreExtraArgs.length ? `$id: ID!, ${argsToVariables(restoreExtraArgs)}` : `$id: ID!`;
+      const restoreMutationArgs = restoreExtraArgs.length ? `where: { id: $id }, ${argsToMutationArgs(restoreExtraArgs)}` : `where: { id: $id }`;
       parts.push(
         `export const RESTORE_${constantCase(
           name2
         )} = gql\`
-  mutation Restore${name2}Mutation($id: ID!) {
-    restore${name2}(where: { id: $id })
+  mutation Restore${name2}Mutation(${restoreVariables}) {
+    restore${name2}(${restoreMutationArgs})
   }
 \`;`
       );
@@ -122,6 +140,10 @@ var Models = class {
         kind: "scalar",
         name: "DateTime"
       },
+      {
+        kind: "scalar",
+        name: "Time"
+      },
       { kind: "scalar", name: "Upload" },
       {
         kind: "raw-enum",
@@ -682,7 +704,8 @@ var PRIMITIVE_TYPES = {
   Upload: "string",
   Int: "number",
   Float: "number",
-  String: "string"
+  String: "string",
+  Time: "string"
 };
 var OPTIONAL_SEED_FIELDS = ["createdAt", "createdById", "updatedAt", "updatedById", "deletedAt", "deletedById"];
 var generateDBModels = (models, dateLibrary) => {
@@ -886,6 +909,9 @@ var getColumnName = (field) => field.kind === "relation" ? field.foreignKey || `
 var import_cloneDeep2 = __toESM(require("lodash/cloneDeep"), 1);
 var import_flatMap = __toESM(require("lodash/flatMap"), 1);
 
+// src/resolvers/resolvers.ts
+var import_graphql5 = require("graphql");
+
 // src/migrations/update-functions.ts
 var normalizeWhitespace = (str) => {
   return str.replace(/\s+/g, " ").replace(/\s*\(\s*/g, "(").replace(/\s*\)\s*/g, ")").replace(/\s*,\s*/g, ",").replace(/\s*;\s*/g, ";").trim();
@@ -1884,11 +1910,7 @@ var MigrationGenerator = class _MigrationGenerator {
     }
     return -1;
   }
-  static TRIGGER_EVENT_ORDER = [
-    "INSERT",
-    "UPDATE",
-    "DELETE"
-  ];
+  static TRIGGER_EVENT_ORDER = ["INSERT", "UPDATE", "DELETE"];
   static sortTriggerEvents(events) {
     return [...events].sort(
       (a, b) => _MigrationGenerator.TRIGGER_EVENT_ORDER.indexOf(a) - _MigrationGenerator.TRIGGER_EVENT_ORDER.indexOf(b)
@@ -1896,7 +1918,9 @@ var MigrationGenerator = class _MigrationGenerator {
   }
   normalizeTriggerDef(def) {
     let s = def.replace(/\s+/g, " ").replace(/\s*\(\s*/g, "(").replace(/\s*\)\s*/g, ")").replace(/\bON\s+[a-zA-Z_][a-zA-Z0-9_]*\./gi, "ON ").trim();
-    const eventsMatch = s.match(/\b(AFTER|BEFORE)\s+((?:INSERT|UPDATE|DELETE)(?:\s+OR\s+(?:INSERT|UPDATE|DELETE))+)\s+ON\b/i);
+    const eventsMatch = s.match(
+      /\b(AFTER|BEFORE)\s+((?:INSERT|UPDATE|DELETE)(?:\s+OR\s+(?:INSERT|UPDATE|DELETE))+)\s+ON\b/i
+    );
     if (eventsMatch) {
       const events = eventsMatch[2].split(/\s+OR\s+/).map((e) => e.toUpperCase());
       const sorted = [...events].sort(
@@ -2273,6 +2297,9 @@ var MigrationGenerator = class _MigrationGenerator {
           case "DateTime":
             col(`table.timestamp('${name2}')`);
             break;
+          case "Time":
+            col(`table.specificType('${name2}', 'time without time zone')`);
+            break;
           case "ID":
             col(`table.uuid('${name2}')`);
             break;
@@ -2365,6 +2392,11 @@ var MigrationGenerator = class _MigrationGenerator {
           return true;
         }
       }
+      if (field.type === "Time") {
+        if (!["time without time zone", "time"].includes(col.data_type)) {
+          return true;
+        }
+      }
     }
     return false;
   }
@@ -2454,48 +2486,48 @@ var getMigrationDate = () => {
 var ACTIONS = ["READ", "CREATE", "UPDATE", "DELETE", "RESTORE", "LINK"];
 
 // src/schema/generate.ts
-var import_graphql6 = require("graphql");
+var import_graphql7 = require("graphql");
 
 // src/schema/utils.ts
 var import_dayjs2 = require("dayjs");
-var import_graphql5 = require("graphql");
+var import_graphql6 = require("graphql");
 var import_luxon2 = require("luxon");
 var document = (definitions) => ({
-  kind: import_graphql5.Kind.DOCUMENT,
+  kind: import_graphql6.Kind.DOCUMENT,
   definitions
 });
 var scalar = (nme) => ({
   name: name(nme),
-  kind: import_graphql5.Kind.SCALAR_TYPE_DEFINITION
+  kind: import_graphql6.Kind.SCALAR_TYPE_DEFINITION
 });
 var input = (nme, fields2, dvs) => ({
   name: name(nme),
   fields: inputValues(fields2),
-  kind: import_graphql5.Kind.INPUT_OBJECT_TYPE_DEFINITION,
+  kind: import_graphql6.Kind.INPUT_OBJECT_TYPE_DEFINITION,
   directives: directives(dvs)
 });
 var union = (nme, types) => ({
   name: name(nme),
-  kind: import_graphql5.Kind.UNION_TYPE_DEFINITION,
+  kind: import_graphql6.Kind.UNION_TYPE_DEFINITION,
   types: types.map((t) => namedType(t))
 });
 var object = (nme, fds, interfaces, dvs) => ({
   name: name(nme),
   fields: fields(fds),
-  kind: import_graphql5.Kind.OBJECT_TYPE_DEFINITION,
+  kind: import_graphql6.Kind.OBJECT_TYPE_DEFINITION,
   interfaces: interfaces?.map((i) => namedType(i)),
   directives: directives(dvs)
 });
 var iface = (nme, fds, interfaces, dvs) => ({
   name: name(nme),
   fields: fields(fds),
-  kind: import_graphql5.Kind.INTERFACE_TYPE_DEFINITION,
+  kind: import_graphql6.Kind.INTERFACE_TYPE_DEFINITION,
   interfaces: interfaces?.map((i) => namedType(i)),
   directives: directives(dvs)
 });
 var inputValues = (fields2) => fields2.map(
   (field) => ({
-    kind: import_graphql5.Kind.INPUT_VALUE_DEFINITION,
+    kind: import_graphql6.Kind.INPUT_VALUE_DEFINITION,
     name: name(field.name),
     type: fieldType(field),
     defaultValue: field.defaultValue === void 0 ? void 0 : value(field.defaultValue),
@@ -2504,11 +2536,11 @@ var inputValues = (fields2) => fields2.map(
 );
 var fields = (fields2) => fields2.map(
   (field) => ({
-    kind: import_graphql5.Kind.FIELD_DEFINITION,
+    kind: import_graphql6.Kind.FIELD_DEFINITION,
     name: name(field.name),
     type: fieldType(field),
     arguments: field.args?.map((arg) => ({
-      kind: import_graphql5.Kind.INPUT_VALUE_DEFINITION,
+      kind: import_graphql6.Kind.INPUT_VALUE_DEFINITION,
       name: name(arg.name),
       type: fieldType(arg),
       defaultValue: arg.defaultValue === void 0 ? void 0 : value(arg.defaultValue)
@@ -2518,42 +2550,42 @@ var fields = (fields2) => fields2.map(
 );
 var directives = (directives2) => directives2?.map(
   (directive) => ({
-    kind: import_graphql5.Kind.DIRECTIVE,
+    kind: import_graphql6.Kind.DIRECTIVE,
     name: name(directive.name),
     arguments: args(directive.values)
   })
 );
 var args = (ags) => ags?.map(
   (argument) => ({
-    kind: import_graphql5.Kind.ARGUMENT,
+    kind: import_graphql6.Kind.ARGUMENT,
     name: name(argument.name),
     value: value(argument.values)
   })
 );
 var enm = (nme, values) => ({
   name: name(nme),
-  kind: import_graphql5.Kind.ENUM_TYPE_DEFINITION,
+  kind: import_graphql6.Kind.ENUM_TYPE_DEFINITION,
   values: values.map(
     (v) => ({
-      kind: import_graphql5.Kind.ENUM_VALUE_DEFINITION,
+      kind: import_graphql6.Kind.ENUM_VALUE_DEFINITION,
       name: name(v)
     })
   )
 });
 var nonNull = (type) => ({
   type,
-  kind: import_graphql5.Kind.NON_NULL_TYPE
+  kind: import_graphql6.Kind.NON_NULL_TYPE
 });
 var namedType = (nme) => ({
-  kind: import_graphql5.Kind.NAMED_TYPE,
+  kind: import_graphql6.Kind.NAMED_TYPE,
   name: name(nme)
 });
 var list = (type) => ({
   type,
-  kind: import_graphql5.Kind.LIST_TYPE
+  kind: import_graphql6.Kind.LIST_TYPE
 });
 var name = (name2) => ({
-  kind: import_graphql5.Kind.NAME,
+  kind: import_graphql6.Kind.NAME,
   value: name2
 });
 var fieldType = (field) => {
@@ -2567,33 +2599,33 @@ var fieldType = (field) => {
   return type;
 };
 var value = (val = null) => val === null ? {
-  kind: import_graphql5.Kind.NULL
+  kind: import_graphql6.Kind.NULL
 } : typeof val === "boolean" ? {
-  kind: import_graphql5.Kind.BOOLEAN,
+  kind: import_graphql6.Kind.BOOLEAN,
   value: val
 } : typeof val === "number" ? {
-  kind: import_graphql5.Kind.INT,
+  kind: import_graphql6.Kind.INT,
   value: `${val}`
 } : typeof val === "string" ? {
-  kind: import_graphql5.Kind.STRING,
+  kind: import_graphql6.Kind.STRING,
   value: val
 } : val instanceof Symbol ? {
-  kind: import_graphql5.Kind.ENUM,
+  kind: import_graphql6.Kind.ENUM,
   value: val.description
 } : Array.isArray(val) ? {
-  kind: import_graphql5.Kind.LIST,
+  kind: import_graphql6.Kind.LIST,
   values: val.map(value)
 } : val instanceof import_luxon2.DateTime ? {
-  kind: import_graphql5.Kind.STRING,
+  kind: import_graphql6.Kind.STRING,
   value: val.toString()
 } : val instanceof import_dayjs2.Dayjs ? {
-  kind: import_graphql5.Kind.STRING,
+  kind: import_graphql6.Kind.STRING,
   value: val.toISOString()
 } : typeof val === "object" ? {
-  kind: import_graphql5.Kind.OBJECT,
+  kind: import_graphql6.Kind.OBJECT,
   fields: Object.keys(val).map(
     (nme) => ({
-      kind: import_graphql5.Kind.OBJECT_FIELD,
+      kind: import_graphql6.Kind.OBJECT_FIELD,
       name: name(nme),
       value: value(val[nme])
     })
@@ -2843,7 +2875,8 @@ var generateDefinitions = ({
               {
                 name: "dryRun",
                 type: "Boolean"
-              }
+              },
+              ...model.deletable && model.deletable !== true && model.deletable.args || []
             ]
           });
           mutations2.push({
@@ -2855,7 +2888,8 @@ var generateDefinitions = ({
                 name: "where",
                 type: `${model.name}WhereUnique`,
                 nonNull: true
-              }
+              },
+              ...model.deletable && model.deletable !== true && model.deletable.restoreArgs || []
             ]
           });
         }
@@ -2871,11 +2905,11 @@ var generateDefinitions = ({
 };
 var generate = (models) => document(generateDefinitions(models));
 var printSchema = (schema) => [
-  ...schema.getDirectives().map((d) => d.astNode && (0, import_graphql6.print)(d.astNode)),
-  ...Object.values(schema.getTypeMap()).filter((t) => !t.name.match(/^__/)).sort((a, b) => a.name > b.name ? 1 : -1).map((t) => t.astNode && (0, import_graphql6.print)(t.astNode))
+  ...schema.getDirectives().map((d) => d.astNode && (0, import_graphql7.print)(d.astNode)),
+  ...Object.values(schema.getTypeMap()).filter((t) => !t.name.match(/^__/)).sort((a, b) => a.name > b.name ? 1 : -1).map((t) => t.astNode && (0, import_graphql7.print)(t.astNode))
 ].filter(Boolean).map((s) => `${s}
 `).join("\n");
-var printSchemaFromModels = (models) => printSchema((0, import_graphql6.buildASTSchema)(generate(models)));
+var printSchemaFromModels = (models) => printSchema((0, import_graphql7.buildASTSchema)(generate(models)));
 
 // src/bin/gqm/codegen.ts
 var import_cli = require("@graphql-codegen/cli");
@@ -3183,7 +3217,8 @@ var generateGraphqlApiTypes = async (dateLibrary) => {
     },
     config: {
       scalars: {
-        DateTime: DATE_CLASS[dateLibrary]
+        DateTime: DATE_CLASS[dateLibrary],
+        Time: "string"
       }
     }
   });
@@ -3212,7 +3247,8 @@ var generateGraphqlClientTypes = async () => {
         field: true
       },
       scalars: {
-        DateTime: "string"
+        DateTime: "string",
+        Time: "string"
       },
       ignoreNoDocuments: true
     }