@graphprotocol/graph-cli 0.45.0-alpha-20230330173033-57c7de2 → 0.45.0-alpha-20230330181701-7b433c5

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphprotocol/graph-cli
 
-## 0.45.0-alpha-20230330173033-57c7de2
+## 0.45.0-alpha-20230330181701-7b433c5
 
 ### Minor Changes
 

package/dist/migrations/mapping_api_version_0_0_1.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint-disable */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -26,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable */
 const toolbox = __importStar(require("gluegun"));
 const semver_1 = __importDefault(require("semver"));
 const load_manifest_1 = require("./util/load-manifest");

package/dist/migrations/mapping_api_version_0_0_2.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint-disable */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -26,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable */
 const toolbox = __importStar(require("gluegun"));
 const semver_1 = __importDefault(require("semver"));
 const load_manifest_1 = require("./util/load-manifest");

package/dist/migrations/mapping_api_version_0_0_3.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint-disable */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -26,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable */
 const toolbox = __importStar(require("gluegun"));
 const semver_1 = __importDefault(require("semver"));
 const load_manifest_1 = require("./util/load-manifest");

package/dist/migrations/mapping_api_version_0_0_4.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint-disable */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -26,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable */
 const toolbox = __importStar(require("gluegun"));
 const semver_1 = __importDefault(require("semver"));
 const load_manifest_1 = require("./util/load-manifest");

package/dist/migrations/mapping_api_version_0_0_5.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint-disable */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -26,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable */
 const toolbox = __importStar(require("gluegun"));
 const semver_1 = __importDefault(require("semver"));
 const load_manifest_1 = require("./util/load-manifest");

package/dist/migrations/spec_version_0_0_2.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint-disable */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -23,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable */
 const toolbox = __importStar(require("gluegun"));
 const load_manifest_1 = require("./util/load-manifest");
 // Spec version to 0.0.2 uses top level templates. graph-cli no longer supports

package/dist/migrations/spec_version_0_0_3.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint-disable */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -23,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable */
 const toolbox = __importStar(require("gluegun"));
 const load_manifest_1 = require("./util/load-manifest");
 // Spec version 0.0.4 uses feature management, but features are

package/dist/scaffold/mapping.js

@@ -23,7 +23,7 @@ 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 = (key, value) => `entity.${key.join('_')} = event.params.${value.join('.')}`;
 exports.generateFieldAssignment = generateFieldAssignment;
@@ -33,16 +33,24 @@ const generateFieldAssignments = ({ index, input }) => input.type === 'tuple'
         .map(({ path }) => (0, exports.generateFieldAssignment)(path, path))
     : (0, exports.generateFieldAssignment)([(input.mappedName ?? input.name) || `param${index}`], [input.name || `param${index}`]);
 exports.generateFieldAssignments = generateFieldAssignments;
+/**
+ * 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 = {
-        id: `${subgraphName}_id`,
+        [exports.INPUT_NAMES_BLACKLIST.id]: `${subgraphName}_id`,
     };
-    return inputMap[name] ?? name;
+    return inputMap?.[name] ?? name;
 };
+exports.renameInput = renameInput;
 const generateEventFieldAssignments = (event, contractName) => event.inputs.reduce((acc, input, index) => {
-    const inputNamesBlacklist = ['id'];
-    if (inputNamesBlacklist.includes(input.name)) {
-        input.mappedName = renameInput(input.name, contractName ?? 'contract');
+    console.log({ blacklist: Object.values(exports.INPUT_NAMES_BLACKLIST), input: input.name });
+    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 }));
 }, []);

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,20 +63,13 @@ const generateEventFields = ({ index, input, protocolName, }) => input.type == '
         }),
     ];
 exports.generateEventFields = generateEventFields;
-const renameInput = (name, subgraphName) => {
-    const inputMap = {
-        id: `${subgraphName}_id`,
-    };
-    return inputMap[name] ?? name;
-};
 const generateEventType = (event, protocolName, subgraphName) => {
-    const inputNamesBlacklist = ['id'];
     return `type ${event._alias} @entity(immutable: true) {
         id: Bytes!
         ${event.inputs
         .reduce((acc, input, index) => {
-        if (inputNamesBlacklist.includes(input.name)) {
-            input.name = renameInput(input.name, subgraphName ?? 'contract');
+        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 }));
     }, [])

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.45.0-alpha-20230330173033-57c7de2",
+  "version": "0.45.0-alpha-20230330181701-7b433c5",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.45.0-alpha-20230330173033-57c7de2",
+  "version": "0.45.0-alpha-20230330181701-7b433c5",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {