@commitspark/graphql-api 2.0.0-beta.4 → 2.0.0-beta.5

package/CHANGELOG.md

@@ -5,6 +5,38 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.0-beta.5] - 2026-11-11
+
+### Added
+
+- Add field `_version` to every `@Entry` type and optional argument `expectedVersion` to update and delete mutations,
+  so that saving an entry fails with `CONFLICT` instead of overwriting changes made since the entry was read
+- Repeat a mutation against the new branch head, up to three attempts in total, when another commit was added to the
+  branch in the meantime, so that concurrent changes to unrelated entries do not cause errors
+
+### Changed
+
+- Replace mutation argument `commitMessage` with `commit: { message, body }`, so that commits can explain a change in a
+  body in addition to the single-line message; messages containing line breaks are rejected with `BAD_USER_INPUT`
+- Reject schemas with `@Entry` types that have no field `id` of type `ID!` with error `BAD_SCHEMA`
+- Print each argument of generated mutations on its own line, so that argument descriptions in the schema are readable
+- Omit the declaration `directive @oneOf` from the generated schema, as `@oneOf` is built into `graphql` since 16.9
+- Require peer dependency `graphql` in version `^16.11.0`, which `@apollo/server` already required, instead of
+  declaring support for versions 14 to 17
+- Require Node.js 22.18 or newer, as required by the upgraded `@graphql-tools` packages, and declare it in `engines`
+- Upgrade to @commitspark/git-adapter 2.0.0-beta.4
+
+### Fixed
+
+- Return errors of Git adapters during commits with their error code, e.g. `CONFLICT` or `FORBIDDEN`, instead of
+  `INTERNAL_ERROR`
+- Allow writing fields of type `ID` other than the entry ID, e.g. `sku: ID` or `id` of an embedded type, which were
+  missing from generated input types
+- Generate a commit message such as `Update MyType "my-id"` if none is given, instead of adapter-specific messages
+  (`-`, `undefined`) or failing commits
+- Export `ErrorCode` as a regular enum instead of a `const enum`, so that it can be used at runtime, e.g. in
+  `error.extensions.code === ErrorCode.CONFLICT`
+
 ## [2.0.0-beta.4] - 2026-10-14
 
 ### Added

package/README.md

@@ -24,7 +24,7 @@ There are two common ways to use this library:
    ```
 2. By making GraphQL calls over HTTP to this library wrapped in a webserver or Lambda function.
 
-   You can find an example Node.js Express web server implementation 
+   You can find an example Node.js Express web server implementation
    [here](https://github.com/commitspark/example-http-express).
 
 ## Installing Git provider support
@@ -37,7 +37,7 @@ in [this repository](https://github.com/commitspark/git-adapter).
 |---------------------------------------------------------------------|------------------------------------------------------------|---------------------------------------------|
 | [GitHub](https://github.com/commitspark/git-adapter-github)         | Provides support for Git repositories hosted on github.com | `npm i @commitspark/git-adapter-github`     |
 | [GitLab (SaaS)](https://github.com/commitspark/git-adapter-gitlab)  | Provides support for Git repositories hosted on gitlab.com | `npm i @commitspark/git-adapter-gitlab`     |
-| [Filesystem](https://github.com/commitspark/git-adapter-filesystem) | Provides read-only access to files on the filesystem level | `npm i @commitspark/git-adapter-filesystem` |
+| [Filesystem](https://github.com/commitspark/git-adapter-filesystem) | Provides support for Git repositories in the filesystem    | `npm i @commitspark/git-adapter-filesystem` |
 
 ## Installing search support
 
@@ -88,13 +88,22 @@ schema {
 type Query {
     everyRocketFlight: [RocketFlight!]
     RocketFlight(id: ID!): RocketFlight
-    _typeName(id: ID!): String
+    _typeName(id: ID!): String!
 }
 
 type Mutation {
-    createRocketFlight(id: ID!, data: RocketFlightInput!, commitMessage: String): RocketFlight
-    updateRocketFlight(id: ID!, data: RocketFlightInput!, commitMessage: String): RocketFlight
-    deleteRocketFlight(id: ID!, commitMessage: String): ID
+    createRocketFlight(id: ID!, data: RocketFlightInput!, commit: _CommitInput): RocketFlight
+    updateRocketFlight(id: ID!, data: RocketFlightInput!, expectedVersion: String, commit: _CommitInput): RocketFlight
+    deleteRocketFlight(id: ID!, expectedVersion: String, commit: _CommitInput): ID
+}
+
+input _CommitInput {
+    message: String
+    body: String
+}
+
+input RocketFlightIdInput {
+    id: ID!
 }
 
 input RocketFlightInput {
@@ -105,6 +114,11 @@ input RocketFlightInput {
 input PayloadInput {
     weight: Int!
 }
+
+extend type RocketFlight {
+    _referencedBy: [ID!]!
+    _version: String!
+}
 ```
 
 # Making GraphQL calls
@@ -148,58 +162,6 @@ const rocketFlight = response.data.rocketFlight
 
 # Technical documentation
 
-## API
-
-### createClient()
-
-This function is used to create a Commitspark GraphQL API client instance.
-
-Argument `gitAdapter` expects a Commitspark git adapter instance which is then used by the client to access the
-adapter's Git repository.
-
-Optional argument `options` supports the following settings:
-
-* `searchAdapter`: A Commitspark search adapter instance. If set, query `_search` is added to the GraphQL API (see
-  [Search](#search)).
-
-### Client
-
-#### postGraphQL()
-
-This function is used to make GraphQL requests.
-
-Request execution is handled by ApolloServer behind the scenes.
-
-Argument `request` expects a conventional GraphQL query and supports query variables as well as introspection.
-
-#### getSchema()
-
-This function allows retrieving the GraphQL schema extended by Commitspark as a string.
-
-Compared to schema data obtained through GraphQL introspection, the schema returned by this function also includes
-directive declarations and annotations, allowing for development of additional tools that require this information.
-
-## Picking from the Git tree
-
-As Commitspark is Git-based, all GraphQL requests support traversing the Git commit tree by setting the `ref` argument
-in library calls to a
-
-* ref (i.e. commit hash),
-* branch name, or
-* tag name (light or regular)
-
-This enables great flexibility, e.g. to use branches in order to enable data (entry) development workflows, to retrieve
-a specific (historic) commit where it is guaranteed that entries are immutable, or to retrieve entries by tag such as
-one that marks the latest reviewed and approved version in a repository.
-
-### Writing data
-
-Mutation operations work on branch names only and (when successful) each append a new commit on
-HEAD in the given branch.
-
-To guarantee deterministic results, mutations in calls with multiple mutations are processed sequentially (see
-the [official GraphQL documentation](https://graphql.org/learn/queries/#multiple-fields-in-mutations) for details).
-
 ## Data model
 
 The data model (i.e. schema) is defined in a single GraphQL type definition text file using the
@@ -255,7 +217,7 @@ data:
 The path of an entry file relative to the entry folder excluding file extension constitutes the entry ID. Entry IDs
 can contain `/` for logical grouping, however the entry type is always taken from the file's metadata.
 
-Entry IDs are case-sensitive, must map to valid unique file paths within the entries folder, and must not contain 
+Entry IDs are case-sensitive, must map to valid unique file paths within the entries folder, and must not contain
 characters `\ * " < > : | ?` or control characters. Files and folders whose name starts with `.` are ignored by
 Commitspark.
 
@@ -391,7 +353,7 @@ query {
             }
             ... on SolidRocketMotor {
                 fuelMass
-           }
+            }
         }
     }
 }
@@ -402,27 +364,94 @@ removed:
 
 ```json
 {
-  "id": "VA256",   
+  "id": "VA256",
   "stages": [
-     {
-        "__typename": "LiquidRocketMotor",
-        "fuelTemperature": 21
-     },
-     {
-        "__typename": "SolidRocketMotor",
-        "fuelMass": 200000
-     }
+    {
+      "__typename": "LiquidRocketMotor",
+      "fuelTemperature": 21
+    },
+    {
+      "__typename": "SolidRocketMotor",
+      "fuelMass": 200000
+    }
   ]
 }
 ```
 
-## Search
+## Navigating the Git repository
+
+As Commitspark is Git-based, `postGraphQL()` and `getSchema()` take a `ref` argument that selects the commit to work
+on. It can be a
+
+* branch name,
+* tag name (lightweight or annotated), or
+* commit hash, if supported by the Git adapter
+
+## Reading and writing data
+
+### Queries
+
+The given `ref` is resolved to a commit when request processing starts. All queries in a request read data from this
+commit, which is returned as `ref` of the response.
+
+### Mutations
+
+Mutations work on branch names only, as they create new commits.
+
+Each successful mutation appends a new commit on HEAD of the given branch.
+
+#### Multiple mutations in one request
+
+To guarantee deterministic results, mutations in a request containing multiple mutations are processed sequentially (see
+the [official GraphQL documentation](https://graphql.org/learn/queries/#multiple-fields-in-mutations) for details). The
+commit internally resolved as branch HEAD for the duration of the request is updated after each successful mutation.
+
+#### Mutations from multiple concurrent requests
+
+When a repository is written to concurrently, whether through one or several Commitspark instances or from other
+sources, the following logic guards against race conditions and data loss:
+
+Every `@Entry` type has a generated field `_version` that changes whenever the stored entry changes. Mutations
+`update<Type>` and `delete<Type>` accept an optional argument `expectedVersion`. If it is given and the entry has a
+different version, the mutation fails with error code `CONFLICT` instead of overwriting changes made in the meantime.
+Callers that let users edit entries are recommended to read `_version` together with the entry and pass it as
+`expectedVersion` when saving, e.g.:
+
+```graphql
+mutation {
+    updateMyEntry(id: "my-id", data: { name: "New name" }, expectedVersion: "<_version as read before>") {
+        _version
+    }
+}
+```
+
+Each mutation is validated (expected version, references, etc.) against the latest commit of the branch and passed to
+the Git adapter together with this commit as expected parent. Git adapters must only add the new commit if the branch
+still points to that parent. If another commit was added to the branch in the meantime, the mutation is validated again
+against the new branch head and committed on top of it, up to three times in total, so that changes to unrelated
+entries do not lead to errors. If the attempts are exhausted, the mutation fails with error code `CONFLICT`.
+
+How reliably a Git adapter detects a moved branch depends on its Git provider; see the documentation of the respective
+adapter for limitations.
+
+#### Commit messages
+
+Mutations accept an optional argument `commit` to describe the commit they create:
+
+* `message` summarizes the change in a single line. A message containing line breaks is rejected with error code
+  `BAD_USER_INPUT`. If omitted or empty, a message such as `Update RocketFlight "VA256"` is generated from the
+  mutation, type and ID of the entry.
+* `body` optionally holds details of the change and may span multiple lines.
+
+Both are trimmed. How message and body are stored depends on the Git adapter, e.g. as commit headline and body.
+
+### Search
 
 Entries can be searched by text using query `_search` once a search adapter is passed to `createClient()`. How a
 search is performed (e.g. keyword search, semantic search or a combination of both) depends on the search adapter
 (see [Installing search support](#installing-search-support)).
 
-### Marking fields as searchable
+#### Marking fields as searchable
 
 Only fields explicitly marked with directive `@Searchable` are searchable. The directive must be declared in the
 schema and can be used on types and fields:
@@ -457,7 +486,7 @@ The following rules apply:
 * The directive of a type does not extend to fields of other types used in it. Such types must be marked themselves.
 * References to other entries are never followed. Each entry is only searchable by its own data.
 
-### Querying
+#### Search queries
 
 ```graphql
 query {
@@ -513,14 +542,52 @@ The following error codes are returned together with error codes of Git adapters
 documented [here](https://github.com/commitspark/git-adapter) and error codes of search adapters as
 documented [here](https://github.com/commitspark/search-adapter):
 
-| Error code             | Description                                                        |
-|------------------------|--------------------------------------------------------------------|
-| `BAD_USER_INPUT`       | Invalid input data provided by the caller                          |
-| `NOT_FOUND`            | Requested resource (entry, type, etc.) does not exist              |
-| `BAD_REPOSITORY_DATA`  | Data in the repository is malformed or invalid according to schema |
-| `BAD_SCHEMA`           | Schema definition is malformed or invalid                          |
-| `IN_USE`               | Entry cannot be deleted because it is referenced by other entries  |
-| `INTERNAL_ERROR`       | Internal processing error                                          |
+| Error code            | Description                                                                                  |
+|-----------------------|----------------------------------------------------------------------------------------------|
+| `BAD_USER_INPUT`      | Invalid input data provided by the caller                                                    |
+| `NOT_FOUND`           | Requested resource (entry, type, etc.) does not exist                                        |
+| `BAD_REPOSITORY_DATA` | Data in the repository is malformed or invalid according to schema                           |
+| `BAD_SCHEMA`          | Schema definition is malformed or invalid                                                    |
+| `IN_USE`              | Entry cannot be deleted because it is referenced by other entries                            |
+| `CONFLICT`            | Entry or branch was changed concurrently (see "Mutations from multiple concurrent requests") |
+| `INTERNAL_ERROR`      | Internal processing error                                                                    |
+
+# TypeScript API
+
+## createClient()
+
+This function is used to create a Commitspark GraphQL API client instance.
+
+Argument `gitAdapter` expects a Commitspark git adapter instance which is then used by the client to access the
+adapter's Git repository.
+
+Optional argument `options` supports the following settings:
+
+* `searchAdapter`: A Commitspark search adapter instance. If set, query `_search` is added to the GraphQL API (see
+  [Search](#search)).
+
+## Client
+
+### postGraphQL()
+
+This function is used to make GraphQL requests.
+
+Request execution is handled by ApolloServer behind the scenes.
+
+Argument `ref` expects a branch name, tag name or commit hash (see
+[Navigating the Git repository](#navigating-the-git-repository)).
+
+Argument `request` expects a conventional GraphQL query and supports query variables as well as introspection.
+
+### getSchema()
+
+This function allows retrieving the GraphQL schema extended by Commitspark as a string.
+
+Compared to schema data obtained through GraphQL introspection, the schema returned by this function also includes
+directive declarations and annotations, allowing for development of additional tools that require this information.
+
+Argument `ref` expects a branch name, tag name or commit hash (see
+[Navigating the Git repository](#navigating-the-git-repository)).
 
 # License
 

package/dist/cjs/graphql/errors.d.ts

@@ -1,13 +1,14 @@
 import { GraphQLError } from 'graphql';
 import { ErrorCode as GitAdapterErrorCode } from '@commitspark/git-adapter';
 import { ErrorCode as SearchAdapterErrorCode } from '@commitspark/search-adapter';
-export declare const enum ErrorCode {
+export declare enum ErrorCode {
     BAD_USER_INPUT = "BAD_USER_INPUT",
     NOT_FOUND = "NOT_FOUND",
     BAD_REPOSITORY_DATA = "BAD_REPOSITORY_DATA",
     BAD_SCHEMA = "BAD_SCHEMA",
     INTERNAL_ERROR = "INTERNAL_ERROR",
-    IN_USE = "IN_USE"
+    IN_USE = "IN_USE",
+    CONFLICT = "CONFLICT"
 }
 export interface ErrorMetadata {
     typeName?: string;

package/dist/cjs/graphql/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/graphql/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,SAAS,IAAI,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC3E,OAAO,EAAE,SAAS,IAAI,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAEjF,0BAAkB,SAAS;IACzB,cAAc,mBAAmB;IACjC,SAAS,cAAc;IACvB,mBAAmB,wBAAwB;IAC3C,UAAU,eAAe;IACzB,cAAc,mBAAmB;IACjC,MAAM,WAAW;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,eAAO,MAAM,WAAW,GACtB,SAAS,MAAM,EACf,MAAM,SAAS,GAAG,mBAAmB,GAAG,sBAAsB,EAC9D,UAAU,aAAa,KACtB,YAiBF,CAAA"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/graphql/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,SAAS,IAAI,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC3E,OAAO,EAAE,SAAS,IAAI,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAEjF,oBAAY,SAAS;IACnB,cAAc,mBAAmB;IACjC,SAAS,cAAc;IACvB,mBAAmB,wBAAwB;IAC3C,UAAU,eAAe;IACzB,cAAc,mBAAmB;IACjC,MAAM,WAAW;IACjB,QAAQ,aAAa;CACtB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,eAAO,MAAM,WAAW,GACtB,SAAS,MAAM,EACf,MAAM,SAAS,GAAG,mBAAmB,GAAG,sBAAsB,EAC9D,UAAU,aAAa,KACtB,YAiBF,CAAA"}

package/dist/cjs/graphql/errors.js

@@ -1,7 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createError = void 0;
+exports.createError = exports.ErrorCode = void 0;
 const graphql_1 = require("graphql");
+var ErrorCode;
+(function (ErrorCode) {
+    ErrorCode["BAD_USER_INPUT"] = "BAD_USER_INPUT";
+    ErrorCode["NOT_FOUND"] = "NOT_FOUND";
+    ErrorCode["BAD_REPOSITORY_DATA"] = "BAD_REPOSITORY_DATA";
+    ErrorCode["BAD_SCHEMA"] = "BAD_SCHEMA";
+    ErrorCode["INTERNAL_ERROR"] = "INTERNAL_ERROR";
+    ErrorCode["IN_USE"] = "IN_USE";
+    ErrorCode["CONFLICT"] = "CONFLICT";
+})(ErrorCode || (exports.ErrorCode = ErrorCode = {}));
 const createError = (message, code, metaData) => {
     const serializedFieldValue = typeof metaData.fieldValue === 'object' ||
         Array.isArray(metaData.fieldValue)

package/dist/cjs/graphql/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/graphql/errors.ts"],"names":[],"mappings":";;;AAAA,qCAAsC;AAsB/B,MAAM,WAAW,GAAG,CACzB,OAAe,EACf,IAA8D,EAC9D,QAAuB,EACT,EAAE;IAChB,MAAM,oBAAoB,GACxB,OAAO,QAAQ,CAAC,UAAU,KAAK,QAAQ;QACvC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;QAChC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC;QACrC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAA;IACzB,MAAM,eAAe,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAA;IACvC,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;QACvC,eAAe,CAAC,UAAU,GAAG,oBAAoB,CAAA;IACnD,CAAC;IAED,OAAO,IAAI,sBAAY,CAAC,OAAO,EAAE;QAC/B,UAAU,EAAE;YACV,IAAI,EAAE,IAAI;YACV,WAAW,EAAE,eAAe;SAC7B;KACF,CAAC,CAAA;AACJ,CAAC,CAAA;AArBY,QAAA,WAAW,eAqBvB"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/graphql/errors.ts"],"names":[],"mappings":";;;AAAA,qCAAsC;AAItC,IAAY,SAQX;AARD,WAAY,SAAS;IACnB,8CAAiC,CAAA;IACjC,oCAAuB,CAAA;IACvB,wDAA2C,CAAA;IAC3C,sCAAyB,CAAA;IACzB,8CAAiC,CAAA;IACjC,8BAAiB,CAAA;IACjB,kCAAqB,CAAA;AACvB,CAAC,EARW,SAAS,yBAAT,SAAS,QAQpB;AAWM,MAAM,WAAW,GAAG,CACzB,OAAe,EACf,IAA8D,EAC9D,QAAuB,EACT,EAAE;IAChB,MAAM,oBAAoB,GACxB,OAAO,QAAQ,CAAC,UAAU,KAAK,QAAQ;QACvC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;QAChC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC;QACrC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAA;IACzB,MAAM,eAAe,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAA;IACvC,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;QACvC,eAAe,CAAC,UAAU,GAAG,oBAAoB,CAAA;IACnD,CAAC;IAED,OAAO,IAAI,sBAAY,CAAC,OAAO,EAAE;QAC/B,UAAU,EAAE;YACV,IAAI,EAAE,IAAI;YACV,WAAW,EAAE,eAAe;SAC7B;KACF,CAAC,CAAA;AACJ,CAAC,CAAA;AArBY,QAAA,WAAW,eAqBvB"}

package/dist/cjs/graphql/input-type-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"input-type-generator.d.ts","sourceRoot":"","sources":["../../../src/graphql/input-type-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,iBAAiB,EAEjB,gBAAgB,EAOjB,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAkC3D,wBAAgB,0BAA0B,CACxC,oBAAoB,EAAE,oBAAoB,GACzC,MAAM,EAAE,CAeV;AAED,wBAAgB,8BAA8B,CAC5C,WAAW,EAAE,iBAAiB,EAAE,GAC/B,MAAM,EAAE,CA8BV;AAED,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,gBAAgB,EAAE,GAC7B,MAAM,EAAE,CAoBV"}
+{"version":3,"file":"input-type-generator.d.ts","sourceRoot":"","sources":["../../../src/graphql/input-type-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,iBAAiB,EAEjB,gBAAgB,EAMjB,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAkC3D,wBAAgB,0BAA0B,CACxC,oBAAoB,EAAE,oBAAoB,GACzC,MAAM,EAAE,CAeV;AAED,wBAAgB,8BAA8B,CAC5C,WAAW,EAAE,iBAAiB,EAAE,GAC/B,MAAM,EAAE,CA2BV;AAED,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,gBAAgB,EAAE,GAC7B,MAAM,EAAE,CAcV"}

package/dist/cjs/graphql/input-type-generator.js

@@ -50,14 +50,13 @@ function generateObjectInputTypeStrings(objectTypes) {
     return objectTypes.map((objectType) => {
         const name = objectType.name;
         const inputTypeName = `${name}Input`;
+        const isEntryType = (0, directive_util_ts_1.hasDirective)(objectType, directive_util_ts_1.ENTRY_DIRECTIVE_NAME);
         let inputType = `input ${inputTypeName} {\n`;
         let inputTypeFieldStrings = '';
         for (const fieldsKey in objectType.getFields()) {
             const field = objectType.getFields()[fieldsKey];
-            if (((0, graphql_1.isNonNullType)(field.type) &&
-                (0, graphql_1.isScalarType)(field.type.ofType) &&
-                field.type.ofType.name === 'ID') ||
-                ((0, graphql_1.isScalarType)(field.type) && field.type.name === 'ID')) {
+            // the ID of an entry is passed as mutation argument instead of as part of the entry data
+            if (isEntryType && field.name === 'id') {
                 continue;
             }
             const inputTypeString = generateFieldInputTypeString(field.type);
@@ -75,11 +74,11 @@ function generateObjectInputTypeStrings(objectTypes) {
     });
 }
 function generateUnionInputTypeStrings(unionTypes) {
-    const typeStrings = unionTypes.map((unionType) => {
+    return unionTypes.map((unionType) => {
         if ((0, entry_type_util_ts_1.buildsOnTypeWithEntryDirective)(unionType)) {
             return '';
         }
-        // see https://github.com/graphql/graphql-spec/pull/825
+        // `@oneOf` is a directive specified by GraphQL and built into graphql-js since 16.9
         let unionInputType = `input ${unionType.name}Input @oneOf {\n`;
         for (const innerType of unionType.getTypes()) {
             unionInputType += `  ${innerType.name}: ${innerType.name}Input\n`;
@@ -87,9 +86,5 @@ function generateUnionInputTypeStrings(unionTypes) {
         unionInputType += '}\n';
         return unionInputType;
     });
-    if (typeStrings.join('').length > 0) {
-        typeStrings.push('directive @oneOf on INPUT_OBJECT\n');
-    }
-    return typeStrings;
 }
 //# sourceMappingURL=input-type-generator.js.map

package/dist/cjs/graphql/input-type-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"input-type-generator.js","sourceRoot":"","sources":["../../../src/graphql/input-type-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"input-type-generator.js","sourceRoot":"","sources":["../../../src/graphql/input-type-generator.ts"],"names":[],"mappings":"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"}

package/dist/cjs/graphql/queries-mutations-generator.d.ts

@@ -1,15 +1,15 @@
 import { EntryData } from '@commitspark/git-adapter';
 import { GraphQLObjectType } from 'graphql';
-import { QueryMutationResolver, ReferencedByResolver, SearchQueryResolver } from './resolvers/types.ts';
+import { QueryMutationResolver, ReferencedByResolver, SearchQueryResolver, VersionResolver } from './resolvers/types.ts';
 export declare function generateQueriesAndMutations(entryDirectiveTypes: GraphQLObjectType[]): GeneratedSchema[];
+export declare function generateCommitInputType(): string;
 export declare function generateTypeNameQuery(): GeneratedQuery;
 export declare function generateSearchQuery(): GeneratedSearchQuery;
-export declare function generateReferencedByFields(entryDirectiveTypes: GraphQLObjectType[]): GeneratedField[];
-interface GeneratedField {
+export declare function generateEntryFields(entryDirectiveTypes: GraphQLObjectType[]): GeneratedEntryFields[];
+interface GeneratedEntryFields {
     typeName: string;
-    name: string;
     typeExtensionString: string;
-    resolver: ReferencedByResolver;
+    resolvers: Record<string, ReferencedByResolver | VersionResolver>;
 }
 export interface GeneratedSearchQuery {
     name: string;

package/dist/cjs/graphql/queries-mutations-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queries-mutations-generator.d.ts","sourceRoot":"","sources":["../../../src/graphql/queries-mutations-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAS3C,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,mBAAmB,EACpB,MAAM,sBAAsB,CAAA;AAE7B,wBAAgB,2BAA2B,CACzC,mBAAmB,EAAE,iBAAiB,EAAE,GACvC,eAAe,EAAE,CAmGnB;AAED,wBAAgB,qBAAqB,IAAI,cAAc,CAStD;AAED,wBAAgB,mBAAmB,IAAI,oBAAoB,CAiB1D;AAED,wBAAgB,0BAA0B,CACxC,mBAAmB,EAAE,iBAAiB,EAAE,GACvC,cAAc,EAAE,CAYlB;AAED,UAAU,cAAc;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,mBAAmB,EAAE,MAAM,CAAA;IAC3B,QAAQ,EAAE,oBAAoB,CAAA;CAC/B;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,QAAQ,EAAE,mBAAmB,CAAA;CAC9B;AAED,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,cAAc,CAAA;IAC1B,SAAS,EAAE,cAAc,CAAA;IACzB,cAAc,EAAE,cAAc,CAAA;IAC9B,cAAc,EAAE,cAAc,CAAA;IAC9B,cAAc,EAAE,cAAc,CAAA;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,qBAAqB,CAAC,SAAS,GAAG,SAAS,EAAE,GAAG,MAAM,CAAC,CAAA;CAClE"}
+{"version":3,"file":"queries-mutations-generator.d.ts","sourceRoot":"","sources":["../../../src/graphql/queries-mutations-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAU3C,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EAChB,MAAM,sBAAsB,CAAA;AAI7B,wBAAgB,2BAA2B,CACzC,mBAAmB,EAAE,iBAAiB,EAAE,GACvC,eAAe,EAAE,CA+GnB;AAED,wBAAgB,uBAAuB,IAAI,MAAM,CAgBhD;AAED,wBAAgB,qBAAqB,IAAI,cAAc,CAStD;AAED,wBAAgB,mBAAmB,IAAI,oBAAoB,CAiB1D;AAED,wBAAgB,mBAAmB,CACjC,mBAAmB,EAAE,iBAAiB,EAAE,GACvC,oBAAoB,EAAE,CAoBxB;AAED,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,GAAG,eAAe,CAAC,CAAA;CAClE;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,QAAQ,EAAE,mBAAmB,CAAA;CAC9B;AAED,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,cAAc,CAAA;IAC1B,SAAS,EAAE,cAAc,CAAA;IACzB,cAAc,EAAE,cAAc,CAAA;IAC9B,cAAc,EAAE,cAAc,CAAA;IAC9B,cAAc,EAAE,cAAc,CAAA;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,qBAAqB,CAAC,SAAS,GAAG,SAAS,EAAE,GAAG,MAAM,CAAC,CAAA;CAClE"}

package/dist/cjs/graphql/queries-mutations-generator.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateQueriesAndMutations = generateQueriesAndMutations;
+exports.generateCommitInputType = generateCommitInputType;
 exports.generateTypeNameQuery = generateTypeNameQuery;
 exports.generateSearchQuery = generateSearchQuery;
-exports.generateReferencedByFields = generateReferencedByFields;
+exports.generateEntryFields = generateEntryFields;
 const query_every_resolver_ts_1 = require("./resolvers/query-mutation-resolvers/query-every-resolver.js");
 const query_by_id_resolver_ts_1 = require("./resolvers/query-mutation-resolvers/query-by-id-resolver.js");
 const mutation_create_resolver_ts_1 = require("./resolvers/query-mutation-resolvers/mutation-create-resolver.js");
@@ -12,6 +13,8 @@ const mutation_delete_resolver_ts_1 = require("./resolvers/query-mutation-resolv
 const query_type_by_id_resolver_ts_1 = require("./resolvers/query-mutation-resolvers/query-type-by-id-resolver.js");
 const query_search_resolver_ts_1 = require("./resolvers/query-mutation-resolvers/query-search-resolver.js");
 const referenced_by_resolver_ts_1 = require("./resolvers/field-resolvers/referenced-by-resolver.js");
+const version_resolver_ts_1 = require("./resolvers/field-resolvers/version-resolver.js");
+const commitInputTypeName = '_CommitInput';
 function generateQueriesAndMutations(entryDirectiveTypes) {
     return entryDirectiveTypes.map((objectType) => {
         const typeName = objectType.name;
@@ -24,14 +27,24 @@ function generateQueriesAndMutations(entryDirectiveTypes) {
         const queryByIdString = `${queryByIdName}(id: ID!): ${objectType.name}`;
         const queryByIdResolverFunc = (source, args, context, info) => (0, query_by_id_resolver_ts_1.queryByIdResolver)(source, args, { ...context, type: objectType }, info);
         const inputTypeName = `${typeName}Input`;
+        // mutations are printed with one argument per line, as indented within the generated root type
+        const commitArgument = (operation) => '    """\n' +
+            `    Details of the commit. If no message is given, the message is '${operation} ${typeName} "<id>"'.\n` +
+            '    """\n' +
+            `    commit: ${commitInputTypeName}\n`;
+        const expectedVersionArgument = '    """\n' +
+            '    Version of the entry (field `_version`) that the change is based on. If given and the entry has a different\n' +
+            '    version, the mutation fails with error code CONFLICT instead of overwriting changes made since.\n' +
+            '    """\n' +
+            '    expectedVersion: String\n';
         const createMutationName = `create${typeName}`;
-        const createMutationString = `${createMutationName}(id: ID!, data: ${inputTypeName}!, commitMessage: String): ${typeName}`;
+        const createMutationString = `${createMutationName}(\n    id: ID!\n    data: ${inputTypeName}!\n${commitArgument('Create')}  ): ${typeName}`;
         const createMutationResolver = (source, args, context, info) => (0, mutation_create_resolver_ts_1.mutationCreateResolver)(source, args, { ...context, type: objectType }, info);
         const updateMutationName = `update${typeName}`;
-        const updateMutationString = `${updateMutationName}(id: ID!, data: ${inputTypeName}!, commitMessage: String): ${typeName}`;
+        const updateMutationString = `${updateMutationName}(\n    id: ID!\n    data: ${inputTypeName}!\n${expectedVersionArgument}${commitArgument('Update')}  ): ${typeName}`;
         const updateMutationResolver = (source, args, context, info) => (0, mutation_update_resolver_ts_1.mutationUpdateResolver)(source, args, { ...context, type: objectType }, info);
         const deleteMutationName = `delete${typeName}`;
-        const deleteMutationString = `${deleteMutationName}(id: ID!, commitMessage: String): ID`;
+        const deleteMutationString = `${deleteMutationName}(\n    id: ID!\n${expectedVersionArgument}${commitArgument('Delete')}  ): ID`;
         const deleteMutationResolver = (source, args, context, info) => (0, mutation_delete_resolver_ts_1.mutationDeleteResolver)(source, args, { ...context, type: objectType }, info);
         return {
             queryEvery: {
@@ -62,6 +75,23 @@ function generateQueriesAndMutations(entryDirectiveTypes) {
         };
     });
 }
+function generateCommitInputType() {
+    return `"""
+Details of the commit created by a mutation.
+"""
+input ${commitInputTypeName} {
+  """
+  Commit message summarizing the change in a single line. Leading and trailing whitespace is removed, and messages
+  containing line breaks are rejected with error code BAD_USER_INPUT. If omitted or empty, a message is generated.
+  """
+  message: String
+  """
+  Optional details of the change, which may span multiple lines. Leading and trailing whitespace is removed.
+  """
+  body: String
+}
+`;
+}
 function generateTypeNameQuery() {
     const entryTypeQueryName = '_typeName';
     const entryTypeQueryString = `${entryTypeQueryName}(id: ID!): String!`;
@@ -88,16 +118,24 @@ function generateSearchQuery() {
         resolver: query_search_resolver_ts_1.querySearchResolver,
     };
 }
-function generateReferencedByFields(entryDirectiveTypes) {
+function generateEntryFields(entryDirectiveTypes) {
     const referencedByFieldName = '_referencedBy';
+    const versionFieldName = '_version';
     return entryDirectiveTypes.map((objectType) => ({
         typeName: objectType.name,
-        name: referencedByFieldName,
         typeExtensionString: `extend type ${objectType.name} {
   ${referencedByFieldName}: [ID!]!
+  """
+  Version of the entry, which changes whenever the stored entry changes. Pass it as \`expectedVersion\` to update
+  and delete mutations to prevent overwriting changes made since the entry was read.
+  """
+  ${versionFieldName}: String!
 }
 `,
-        resolver: referenced_by_resolver_ts_1.referencedByResolver,
+        resolvers: {
+            [referencedByFieldName]: referenced_by_resolver_ts_1.referencedByResolver,
+            [versionFieldName]: version_resolver_ts_1.versionResolver,
+        },
     }));
 }
 //# sourceMappingURL=queries-mutations-generator.js.map

package/dist/cjs/graphql/queries-mutations-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"queries-mutations-generator.js","sourceRoot":"","sources":["../../../src/graphql/queries-mutations-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"queries-mutations-generator.js","sourceRoot":"","sources":["../../../src/graphql/queries-mutations-generator.ts"],"names":[],"mappings":";;AAoBA,kEAiHC;AAED,0DAgBC;AAED,sDASC;AAED,kDAiBC;AAED,kDAsBC;AA3MD,0GAAiG;AACjG,0GAAgG;AAChG,kHAAyG;AACzG,kHAAyG;AACzG,kHAAyG;AACzG,oHAAyG;AACzG,4GAAmG;AACnG,qGAA4F;AAC5F,yFAAiF;AAQjF,MAAM,mBAAmB,GAAG,cAAc,CAAA;AAE1C,SAAgB,2BAA2B,CACzC,mBAAwC;IAExC,OAAO,mBAAmB,CAAC,GAAG,CAAC,CAAC,UAAU,EAAmB,EAAE;QAC7D,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAA;QAEhC,8GAA8G;QAC9G,0CAA0C;QAC1C,MAAM,cAAc,GAAG,QAAQ,QAAQ,EAAE,CAAA;QACzC,MAAM,gBAAgB,GAAG,GAAG,cAAc,MAAM,UAAU,CAAC,IAAI,IAAI,CAAA;QACnE,MAAM,sBAAsB,GAAuC,CACjE,MAAM,EACN,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,EAAE,CACF,IAAA,4CAAkB,EAAC,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,IAAI,CAAC,CAAA;QAE1E,MAAM,aAAa,GAAG,QAAQ,CAAA;QAC9B,MAAM,eAAe,GAAG,GAAG,aAAa,cAAc,UAAU,CAAC,IAAI,EAAE,CAAA;QACvE,MAAM,qBAAqB,GAAqC,CAC9D,MAAM,EACN,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,EAAE,CAAC,IAAA,2CAAiB,EAAC,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,IAAI,CAAC,CAAA;QAE5E,MAAM,aAAa,GAAG,GAAG,QAAQ,OAAO,CAAA;QACxC,+FAA+F;QAC/F,MAAM,cAAc,GAAG,CAAC,SAAiB,EAAU,EAAE,CACnD,WAAW;YACX,sEAAsE,SAAS,IAAI,QAAQ,aAAa;YACxG,WAAW;YACX,eAAe,mBAAmB,IAAI,CAAA;QACxC,MAAM,uBAAuB,GAC3B,WAAW;YACX,mHAAmH;YACnH,uGAAuG;YACvG,WAAW;YACX,+BAA+B,CAAA;QACjC,MAAM,kBAAkB,GAAG,SAAS,QAAQ,EAAE,CAAA;QAC9C,MAAM,oBAAoB,GAAG,GAAG,kBAAkB,6BAA6B,aAAa,MAAM,cAAc,CAAC,QAAQ,CAAC,QAAQ,QAAQ,EAAE,CAAA;QAC5I,MAAM,sBAAsB,GAAqC,CAC/D,MAAM,EACN,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,EAAE,CACF,IAAA,oDAAsB,EACpB,MAAM,EACN,IAAI,EACJ,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,EAChC,IAAI,CACL,CAAA;QAEH,MAAM,kBAAkB,GAAG,SAAS,QAAQ,EAAE,CAAA;QAC9C,MAAM,oBAAoB,GAAG,GAAG,kBAAkB,6BAA6B,aAAa,MAAM,uBAAuB,GAAG,cAAc,CAAC,QAAQ,CAAC,QAAQ,QAAQ,EAAE,CAAA;QACtK,MAAM,sBAAsB,GAAqC,CAC/D,MAAM,EACN,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,EAAE,CACF,IAAA,oDAAsB,EACpB,MAAM,EACN,IAAI,EACJ,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,EAChC,IAAI,CACL,CAAA;QAEH,MAAM,kBAAkB,GAAG,SAAS,QAAQ,EAAE,CAAA;QAC9C,MAAM,oBAAoB,GAAG,GAAG,kBAAkB,mBAAmB,uBAAuB,GAAG,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAA;QAChI,MAAM,sBAAsB,GAAkC,CAC5D,MAAM,EACN,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,EAAE,CACF,IAAA,oDAAsB,EACpB,MAAM,EACN,IAAI,EACJ,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,EAChC,IAAI,CACL,CAAA;QAEH,OAAO;YACL,UAAU,EAAE;gBACV,IAAI,EAAE,cAAc;gBACpB,YAAY,EAAE,gBAAgB;gBAC9B,QAAQ,EAAE,sBAAsB;aACjC;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,aAAa;gBACnB,YAAY,EAAE,eAAe;gBAC7B,QAAQ,EAAE,qBAAqB;aAChC;YACD,cAAc,EAAE;gBACd,IAAI,EAAE,kBAAkB;gBACxB,YAAY,EAAE,oBAAoB;gBAClC,QAAQ,EAAE,sBAAsB;aACjC;YACD,cAAc,EAAE;gBACd,IAAI,EAAE,kBAAkB;gBACxB,YAAY,EAAE,oBAAoB;gBAClC,QAAQ,EAAE,sBAAsB;aACjC;YACD,cAAc,EAAE;gBACd,IAAI,EAAE,kBAAkB;gBACxB,YAAY,EAAE,oBAAoB;gBAClC,QAAQ,EAAE,sBAAsB;aACjC;SACF,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAgB,uBAAuB;IACrC,OAAO;;;QAGD,mBAAmB;;;;;;;;;;;CAW1B,CAAA;AACD,CAAC;AAED,SAAgB,qBAAqB;IACnC,MAAM,kBAAkB,GAAG,WAAW,CAAA;IACtC,MAAM,oBAAoB,GAAG,GAAG,kBAAkB,oBAAoB,CAAA;IAEtE,OAAO;QACL,IAAI,EAAE,kBAAkB;QACxB,YAAY,EAAE,oBAAoB;QAClC,QAAQ,EAAE,oDAAqB;KAChC,CAAA;AACH,CAAC;AAED,SAAgB,mBAAmB;IACjC,MAAM,eAAe,GAAG,SAAS,CAAA;IACjC,MAAM,iBAAiB,GAAG,YAAY,CAAA;IAEtC,OAAO;QACL,IAAI,EAAE,eAAe;QACrB,YAAY,EAAE,GAAG,eAAe,oDAAoD,iBAAiB,KAAK;QAC1G,oBAAoB,EAAE,QAAQ,iBAAiB;;;;;;;CAOlD;QACG,QAAQ,EAAE,8CAAmB;KAC9B,CAAA;AACH,CAAC;AAED,SAAgB,mBAAmB,CACjC,mBAAwC;IAExC,MAAM,qBAAqB,GAAG,eAAe,CAAA;IAC7C,MAAM,gBAAgB,GAAG,UAAU,CAAA;IAEnC,OAAO,mBAAmB,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC9C,QAAQ,EAAE,UAAU,CAAC,IAAI;QACzB,mBAAmB,EAAE,eAAe,UAAU,CAAC,IAAI;IACnD,qBAAqB;;;;;IAKrB,gBAAgB;;CAEnB;QACG,SAAS,EAAE;YACT,CAAC,qBAAqB,CAAC,EAAE,gDAAoB;YAC7C,CAAC,gBAAgB,CAAC,EAAE,qCAAe;SACpC;KACF,CAAC,CAAC,CAAA;AACL,CAAC"}

package/dist/cjs/graphql/resolvers/commit-message.d.ts

@@ -0,0 +1,11 @@
+import { CommitDraft } from '@commitspark/git-adapter';
+import { CommitInput } from './types.ts';
+type MutationOperation = 'Create' | 'Update' | 'Delete';
+/**
+ * Determines message and body of the commit of a mutation from mutation argument `commit`. The message is trimmed and
+ * must be a single line; an omitted or empty message is replaced by a message generated from the mutation. The body
+ * is trimmed and omitted if empty.
+ */
+export declare function getCommitMessage(commit: CommitInput | null | undefined, operation: MutationOperation, typeName: string, id: string): Pick<CommitDraft, 'message' | 'body'>;
+export {};
+//# sourceMappingURL=commit-message.d.ts.map

package/dist/cjs/graphql/resolvers/commit-message.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"commit-message.d.ts","sourceRoot":"","sources":["../../../../src/graphql/resolvers/commit-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,KAAK,iBAAiB,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAEvD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,EACtC,SAAS,EAAE,iBAAiB,EAC5B,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,MAAM,GACT,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC,CAiBvC"}