@graphprotocol/graph-cli 0.45.0-alpha-20230330183447-cd5fb05 → 0.45.0-alpha-20230330190905-cfb33e5

package/CHANGELOG.md

@@ -1,9 +1,14 @@
 # @graphprotocol/graph-cli
 
-## 0.45.0-alpha-20230330183447-cd5fb05
+## 0.45.0-alpha-20230330190905-cfb33e5
 
 ### Minor Changes
 
+- [#1225](https://github.com/graphprotocol/graph-tooling/pull/1225)
+  [`3f9aa1c`](https://github.com/graphprotocol/graph-tooling/commit/3f9aa1ce7dbb8c26da9fc8e3d9801ec412886f1d)
+  Thanks [@saihaj](https://github.com/saihaj)! - When the contract has an `id` event, the CLI
+  renames the `id` entity to `{contractName}_id` and map it to `{contractName}_id` in the mapping.
+
 - [#1209](https://github.com/graphprotocol/graph-tooling/pull/1209)
   [`f26398e`](https://github.com/graphprotocol/graph-tooling/commit/f26398e054c556f414a1b45e92b7e4007a9b5a79)
   Thanks [@kalloc](https://github.com/kalloc)! - Support `ts` typing in tests folder
@@ -27,14 +32,6 @@
   - Updated dependency [`chokidar@3.5.3` ↗︎](https://www.npmjs.com/package/chokidar/v/3.5.3) (from
     `3.5.1`, in `dependencies`)
 
-- [#1227](https://github.com/graphprotocol/graph-tooling/pull/1227)
-  [`cd5fb05`](https://github.com/graphprotocol/graph-tooling/commit/cd5fb05301a33e63df434725343ac4dc8bd9735f)
-  Thanks [@renovate](https://github.com/apps/renovate)! - dependencies updates:
-
-  - Updated dependency
-    [`docker-compose@0.23.19` ↗︎](https://www.npmjs.com/package/docker-compose/v/0.23.19) (from
-    `0.23.4`, in `dependencies`)
-
 - [#1207](https://github.com/graphprotocol/graph-tooling/pull/1207)
   [`ad275b3`](https://github.com/graphprotocol/graph-tooling/commit/ad275b31e635dab03cfefda00617ef9f612b01c0)
   Thanks [@saihaj](https://github.com/saihaj)! - bring back short hand for version and help

package/dist/command-helpers/scaffold.js

@@ -71,13 +71,13 @@ const writeABI = async (abi, contractName) => {
     await fs_extra_1.default.writeFile(`./abis/${contractName}.json`, data, 'utf-8');
 };
 exports.writeABI = writeABI;
-const writeSchema = async (abi, protocol, schemaPath, entities) => {
+const writeSchema = async (abi, protocol, schemaPath, entities, contractName) => {
     const events = protocol.hasEvents()
         ? (0, schema_1.abiEvents)(abi)
             .filter(event => !entities.includes(event.get('name')))
             .toJS()
         : [];
-    const data = prettier_1.default.format(events.map(event => (0, schema_1.generateEventType)(event, protocol.name)).join('\n\n'), {
+    const data = prettier_1.default.format(events.map(event => (0, schema_1.generateEventType)(event, protocol.name, contractName)).join('\n\n'), {
         parser: 'graphql',
     });
     await fs_extra_1.default.appendFile(schemaPath, data, { encoding: 'utf-8' });

package/dist/commands/add.js

@@ -72,7 +72,7 @@ class AddCommand extends core_1.Command {
         const { collisionEntities, onlyCollisions, abiData } = updateEventNamesOnCollision(ethabi, entities, contractName, mergeEntities);
         ethabi.data = abiData;
         await (0, scaffold_1.writeABI)(ethabi, contractName);
-        await (0, scaffold_1.writeSchema)(ethabi, protocol, result.getIn(['schema', 'file']), collisionEntities);
+        await (0, scaffold_1.writeSchema)(ethabi, protocol, result.getIn(['schema', 'file']), collisionEntities, contractName);
         await (0, scaffold_1.writeMapping)(ethabi, protocol, contractName, collisionEntities);
         await (0, scaffold_1.writeTestsFiles)(ethabi, protocol, contractName);
         const dataSources = result.get('dataSources');

package/dist/protocols/ethereum/scaffold/mapping.js

@@ -29,7 +29,7 @@ const generatePlaceholderHandlers = ({ abi, events, contractName, }) => `
       entity.count = entity.count + BigInt.fromI32(1)
 
       // Entity fields can be set based on event parameters
-      ${(0, mapping_1.generateEventFieldAssignments)(event).slice(0, 2).join('\n')}
+      ${(0, mapping_1.generateEventFieldAssignments)(event, contractName).slice(0, 2).join('\n')}
 
       // Entities can be written to the store with \`.save()\`
       entity.save()

package/dist/scaffold/index.js

@@ -69,7 +69,9 @@ dataSources:
         const hasEvents = this.protocol.hasEvents();
         const events = hasEvents ? (0, schema_1.abiEvents)(this.abi).toJS() : [];
         return prettier_1.default.format(hasEvents && this.indexEvents
-            ? events.map((event) => (0, schema_1.generateEventType)(event, this.protocol.name)).join('\n\n')
+            ? events
+                .map((event) => (0, schema_1.generateEventType)(event, this.protocol.name, this.contractName))
+                .join('\n\n')
             : (0, schema_1.generateExampleEntityType)(this.protocol, events), {
             parser: 'graphql',
         });

package/dist/scaffold/mapping.js

@@ -23,17 +23,36 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateEventIndexingHandlers = exports.generateEventFieldAssignments = exports.generateFieldAssignments = exports.generateFieldAssignment = void 0;
+exports.generateEventIndexingHandlers = exports.generateEventFieldAssignments = exports.renameInput = exports.INPUT_NAMES_BLACKLIST = exports.generateFieldAssignments = exports.generateFieldAssignment = void 0;
 const util = __importStar(require("../codegen/util"));
-const generateFieldAssignment = (path) => `entity.${path.join('_')} = event.params.${path.join('.')}`;
+const generateFieldAssignment = (key, value) => `entity.${key.join('_')} = event.params.${value.join('.')}`;
 exports.generateFieldAssignment = generateFieldAssignment;
 const generateFieldAssignments = ({ index, input }) => input.type === 'tuple'
     ? util
         .unrollTuple({ value: input, index, path: [input.name || `param${index}`] })
-        .map(({ path }) => (0, exports.generateFieldAssignment)(path))
-    : (0, exports.generateFieldAssignment)([input.name || `param${index}`]);
+        .map(({ path }) => (0, exports.generateFieldAssignment)(path, path))
+    : (0, exports.generateFieldAssignment)([(input.mappedName ?? input.name) || `param${index}`], [input.name || `param${index}`]);
 exports.generateFieldAssignments = generateFieldAssignments;
-const generateEventFieldAssignments = (event) => event.inputs.reduce((acc, input, index) => acc.concat((0, exports.generateFieldAssignments)({ input, index })), []);
+/**
+ * Map of input names that are reserved so we do not use them as field names to avoid conflicts
+ */
+exports.INPUT_NAMES_BLACKLIST = {
+    /** Related to https://github.com/graphprotocol/graph-tooling/issues/710 */
+    id: 'id',
+};
+const renameInput = (name, subgraphName) => {
+    const inputMap = {
+        [exports.INPUT_NAMES_BLACKLIST.id]: `${subgraphName}_id`,
+    };
+    return inputMap?.[name] ?? name;
+};
+exports.renameInput = renameInput;
+const generateEventFieldAssignments = (event, contractName) => event.inputs.reduce((acc, input, index) => {
+    if (Object.values(exports.INPUT_NAMES_BLACKLIST).includes(input.name)) {
+        input.mappedName = (0, exports.renameInput)(input.name, contractName ?? 'contract');
+    }
+    return acc.concat((0, exports.generateFieldAssignments)({ input, index }));
+}, []);
 exports.generateEventFieldAssignments = generateEventFieldAssignments;
 const generateEventIndexingHandlers = (events, contractName) => `
   import { ${events.map(event => `${event._alias} as ${event._alias}Event`)}} from '../generated/${contractName}/${contractName}'
@@ -43,7 +62,7 @@ const generateEventIndexingHandlers = (events, contractName) => `
     .map(event => `
   export function handle${event._alias}(event: ${event._alias}Event): void {
     let entity = new ${event._alias}(event.transaction.hash.concatI32(event.logIndex.toI32()))
-    ${(0, exports.generateEventFieldAssignments)(event).join('\n')}
+    ${(0, exports.generateEventFieldAssignments)(event, contractName).join('\n')}
 
     entity.blockNumber = event.block.number
     entity.blockTimestamp = event.block.timestamp

package/dist/scaffold/schema.js

@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateExampleEntityType = exports.generateEventType = exports.generateEventFields = exports.generateField = exports.protocolTypeToGraphQL = exports.abiEvents = void 0;
 const types_1 = require("../codegen/types");
 const util = __importStar(require("../codegen/util"));
+const mapping_1 = require("./mapping");
 function abiEvents(abi) {
     return util.disambiguateNames({
         // @ts-expect-error improve typings of disambiguateNames to handle iterables
@@ -62,15 +63,22 @@ const generateEventFields = ({ index, input, protocolName, }) => input.type == '
         }),
     ];
 exports.generateEventFields = generateEventFields;
-const generateEventType = (event, protocolName) => `type ${event._alias} @entity(immutable: true) {
-      id: Bytes!
-      ${event.inputs
-    .reduce((acc, input, index) => acc.concat((0, exports.generateEventFields)({ input, index, protocolName })), [])
-    .join('\n')}
-      blockNumber: BigInt!
-      blockTimestamp: BigInt!
-      transactionHash: Bytes!
-    }`;
+const generateEventType = (event, protocolName, subgraphName) => {
+    return `type ${event._alias} @entity(immutable: true) {
+        id: Bytes!
+        ${event.inputs
+        .reduce((acc, input, index) => {
+        if (Object.values(mapping_1.INPUT_NAMES_BLACKLIST).includes(input.name)) {
+            input.name = (0, mapping_1.renameInput)(input.name, subgraphName ?? 'contract');
+        }
+        return acc.concat((0, exports.generateEventFields)({ input, index, protocolName }));
+    }, [])
+        .join('\n')}
+        blockNumber: BigInt!
+        blockTimestamp: BigInt!
+        transactionHash: Bytes!
+      }`;
+};
 exports.generateEventType = generateEventType;
 const generateExampleEntityType = (protocol, events) => {
     if (protocol.hasABIs() && events.length > 0) {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.45.0-alpha-20230330183447-cd5fb05",
+  "version": "0.45.0-alpha-20230330190905-cfb33e5",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.45.0-alpha-20230330183447-cd5fb05",
+  "version": "0.45.0-alpha-20230330190905-cfb33e5",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {
@@ -25,7 +25,7 @@
     "chalk": "3.0.0",
     "chokidar": "3.5.3",
     "debug": "4.3.1",
-    "docker-compose": "0.23.19",
+    "docker-compose": "0.23.4",
     "dockerode": "2.5.8",
     "fs-extra": "9.0.0",
     "glob": "7.1.6",