@graphprotocol/graph-cli 0.69.0-alpha-20240315144301-ea4b16f → 0.69.0-alpha-20240317072253-db1272f

package/CHANGELOG.md

@@ -1,12 +1,18 @@
 # @graphprotocol/graph-cli
 
-## 0.69.0-alpha-20240315144301-ea4b16f
+## 0.69.0-alpha-20240317072253-db1272f
 
 ### Minor Changes
 
-- [#1611](https://github.com/graphprotocol/graph-tooling/pull/1611)
-  [`ea4b16f`](https://github.com/graphprotocol/graph-tooling/commit/ea4b16f903098665f80247af5085a8dbf0e1d4f3)
-  Thanks [@lutter](https://github.com/lutter)! - Allow declared calls in the manifest
+- [#1522](https://github.com/graphprotocol/graph-tooling/pull/1522)
+  [`db1272f`](https://github.com/graphprotocol/graph-tooling/commit/db1272f96e698b9d427b7ab6d48f01d67eb1173e)
+  Thanks [@dotansimha](https://github.com/dotansimha)! - Added support for handling GraphQL
+  `Timestamp` scalar as `i64` (AssemblyScript)
+
+- [#1610](https://github.com/graphprotocol/graph-tooling/pull/1610)
+  [`fc03add`](https://github.com/graphprotocol/graph-tooling/commit/fc03add1a8510afa49110481b486c8fa56f8c19f)
+  Thanks [@yehia67](https://github.com/yehia67)! - Generate `docker-compose.yml` with `graph init`
+  command
 
 ## 0.68.5
 

package/dist/codegen/schema.test.js

@@ -91,6 +91,7 @@ vitest_1.describe.concurrent('Schema code generator', () => {
 
         # New scalars
         int8: Int8!
+        timestamp: Timestamp!
       }
 
       type Wallet @entity {
@@ -296,6 +297,26 @@ vitest_1.describe.concurrent('Schema code generator', () => {
                         returnType: undefined,
                         body: `
               this.set('int8', Value.fromI64(value))
+            `,
+                    },
+                    {
+                        name: 'get timestamp',
+                        params: [],
+                        returnType: new typescript_1.NamedType('i64'),
+                        body: `let value = this.get('timestamp')
+            if (!value || value.kind == ValueKind.NULL) {
+              return 0
+            } else {
+              return value.toI64()
+            }
+            `,
+                    },
+                    {
+                        name: 'set timestamp',
+                        params: [new typescript_1.Param('value', new typescript_1.NamedType('i64'))],
+                        returnType: undefined,
+                        body: `
+              this.set('timestamp', Value.fromI64(value))
             `,
                     },
                     {

package/dist/codegen/types/conversions.js

@@ -258,6 +258,7 @@ const VALUE_TO_ASSEMBLYSCRIPT = [
     ['[Boolean]', 'Array<boolean>', (code) => `${code}.toBooleanArray()`],
     ['[Int]', 'Array<i32>', (code) => `${code}.toI32Array()`],
     ['[Int8]', 'Array<i64>', (code) => `${code}.toI64Array()`],
+    ['[Timestamp]', 'Array<i64>', (code) => `${code}.toI64Array()`],
     ['[BigInt]', 'Array<BigInt>', (code) => `${code}.toBigIntArray()`],
     ['[ID]', 'Array<string>', (code) => `${code}.toStringArray()`],
     ['[String]', 'Array<string>', (code) => `${code}.toStringArray()`],
@@ -272,6 +273,7 @@ const VALUE_TO_ASSEMBLYSCRIPT = [
     ['ID', 'string', (code) => `${code}.toString()`],
     ['String', 'string', (code) => `${code}.toString()`],
     ['BigDecimal', 'BigDecimal', (code) => `${code}.toBigDecimal()`],
+    ['Timestamp', 'i64', (code) => `${code}.toI64()`],
     [/.*/, 'string', (code) => `${code}.toString()`],
 ];
 /**
@@ -288,6 +290,7 @@ const ASSEMBLYSCRIPT_TO_VALUE = [
     ['Array<Array<boolean>>', '[[Boolean]]', (code) => `Value.fromBooleanMatrix(${code})`],
     ['Array<Array<i32>>', '[[Int]]', (code) => `Value.fromI32Matrix(${code})`],
     ['Array<Array<i64>>', '[[Int8]]', (code) => `Value.fromI64Matrix(${code})`],
+    ['Array<Array<i64>>', '[[Timestamp]]', (code) => `Value.fromI64Matrix(${code})`],
     ['Array<Array<BigInt>>', '[[BigInt]]', (code) => `Value.fromBigIntMatrix(${code})`],
     ['Array<Array<string>>', '[[String]]', (code) => `Value.fromStringMatrix(${code})`],
     ['Array<Array<string>>', '[[ID]]', (code) => `Value.fromStringMatrix(${code})`],
@@ -305,6 +308,7 @@ const ASSEMBLYSCRIPT_TO_VALUE = [
     ['Array<boolean>', '[Boolean]', (code) => `Value.fromBooleanArray(${code})`],
     ['Array<i32>', '[Int]', (code) => `Value.fromI32Array(${code})`],
     ['Array<i64>', '[Int8]', (code) => `Value.fromI64Array(${code})`],
+    ['Array<i64>', '[Timestamp]', (code) => `Value.fromI64Array(${code})`],
     ['Array<BigInt>', '[BigInt]', (code) => `Value.fromBigIntArray(${code})`],
     ['Array<string>', '[String]', (code) => `Value.fromStringArray(${code})`],
     ['Array<string>', '[ID]', (code) => `Value.fromStringArray(${code})`],
@@ -317,6 +321,7 @@ const ASSEMBLYSCRIPT_TO_VALUE = [
     ['boolean', 'Boolean', (code) => `Value.fromBoolean(${code})`],
     ['i32', 'Int', (code) => `Value.fromI32(${code})`],
     ['i64', 'Int8', (code) => `Value.fromI64(${code})`],
+    ['i64', 'Timestamp', (code) => `Value.fromI64(${code})`],
     ['BigInt', 'BigInt', (code) => `Value.fromBigInt(${code})`],
     ['string', 'String', (code) => `Value.fromString(${code})`],
     ['string', 'ID', (code) => `Value.fromString(${code})`],

package/dist/command-helpers/scaffold.d.ts

@@ -19,6 +19,7 @@ export declare const generateScaffold: ({ protocolInstance, abi, contract, netwo
     'schema.graphql': string;
     'package.json': string;
     'tsconfig.json'?: undefined;
+    'docker-compose.yml'?: undefined;
     src?: undefined;
     abis?: undefined;
     tests?: undefined;
@@ -27,6 +28,7 @@ export declare const generateScaffold: ({ protocolInstance, abi, contract, netwo
     'subgraph.yaml': string;
     'schema.graphql': string;
     'tsconfig.json': string;
+    'docker-compose.yml': string;
     src: {
         [x: string]: string;
     } | undefined;

package/dist/protocols/ethereum/manifest.graphql

@@ -97,8 +97,6 @@ type ContractEventHandler {
   topic0: String
   handler: String!
   receipt: Boolean
-  # This should really be just a Map<String, String>
-  calls: JSON
 }
 
 type Graft {

package/dist/scaffold/get-docker-file.d.ts

@@ -0,0 +1 @@
+export declare const getDockerFile: () => string;

package/dist/scaffold/get-docker-file.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDockerFile = void 0;
+const getDockerFile = () => {
+    return `version: '3'
+services:
+  graph-node:
+    image: graphprotocol/graph-node
+    ports:
+      - '8000:8000'
+      - '8001:8001'
+      - '8020:8020'
+      - '8030:8030'
+      - '8040:8040'
+    depends_on:
+      - ipfs
+      - postgres
+    extra_hosts:
+      - host.docker.internal:host-gateway
+    environment:
+      postgres_host: postgres
+      postgres_user: graph-node
+      postgres_pass: let-me-in
+      postgres_db: graph-node
+      ipfs: 'ipfs:5001'
+      ethereum: 'mainnet:http://host.docker.internal:8545'
+      GRAPH_LOG: info
+  ipfs:
+    image: ipfs/kubo:v0.17.0
+    ports:
+      - '5001:5001'
+    volumes:
+      - ./data/ipfs:/data/ipfs
+  postgres:
+    image: postgres:14
+    ports:
+      - '5432:5432'
+    command:
+      [
+        "postgres",
+        "-cshared_preload_libraries=pg_stat_statements",
+        "-cmax_connections=200"
+      ]
+    environment:
+      POSTGRES_USER: graph-node
+      POSTGRES_PASSWORD: let-me-in
+      POSTGRES_DB: graph-node
+      # FIXME: remove this env. var. which we shouldn't need. Introduced by
+      # <https://github.com/graphprotocol/graph-node/pull/3511>, maybe as a
+      # workaround for https://github.com/docker/for-mac/issues/6270?
+      PGDATA: "/var/lib/postgresql/data"
+      POSTGRES_INITDB_ARGS: "-E UTF8 --locale=C"
+    volumes:
+      - ./data/postgres:/var/lib/postgresql/data`;
+};
+exports.getDockerFile = getDockerFile;

package/dist/scaffold/index.d.ts

@@ -29,6 +29,7 @@ export default class Scaffold {
     generateManifest(): Promise<string>;
     generateSchema(): Promise<string>;
     generateTsConfig(): Promise<string>;
+    generateDockerFileConfig(): Promise<string>;
     generateMappings(): Promise<{
         [x: string]: string;
     } | undefined>;
@@ -44,6 +45,7 @@ export default class Scaffold {
         'schema.graphql': string;
         'package.json': string;
         'tsconfig.json'?: undefined;
+        'docker-compose.yml'?: undefined;
         src?: undefined;
         abis?: undefined;
         tests?: undefined;
@@ -52,6 +54,7 @@ export default class Scaffold {
         'subgraph.yaml': string;
         'schema.graphql': string;
         'tsconfig.json': string;
+        'docker-compose.yml': string;
         src: {
             [x: string]: string;
         } | undefined;

package/dist/scaffold/index.js

@@ -7,6 +7,7 @@ const gluegun_1 = require("gluegun");
 const prettier_1 = __importDefault(require("prettier"));
 const subgraph_1 = require("../command-helpers/subgraph");
 const version_1 = require("../version");
+const get_docker_file_1 = require("./get-docker-file");
 const mapping_1 = require("./mapping");
 const schema_1 = require("./schema");
 const tests_1 = require("./tests");
@@ -106,6 +107,9 @@ dataSources:
             include: ['src', 'tests'],
         }), { parser: 'json' });
     }
+    async generateDockerFileConfig() {
+        return await prettier_1.default.format((0, get_docker_file_1.getDockerFile)(), { parser: 'yaml' });
+    }
     async generateMappings() {
         return this.protocol.getMappingScaffold()
             ? { [`${gluegun_1.strings.kebabCase(this.contractName)}.ts`]: await this.generateMapping() }
@@ -151,6 +155,7 @@ dataSources:
             'subgraph.yaml': await this.generateManifest(),
             'schema.graphql': await this.generateSchema(),
             'tsconfig.json': await this.generateTsConfig(),
+            'docker-compose.yml': await this.generateDockerFileConfig(),
             src: await this.generateMappings(),
             abis: await this.generateABIs(),
             tests: await this.generateTests(),

package/dist/validation/schema.js

@@ -44,6 +44,7 @@ const BUILTIN_SCALAR_TYPES = [
     'Bytes',
     'ID',
     'Int8',
+    'Timestamp',
 ];
 // Type suggestions for common mistakes
 const TYPE_SUGGESTIONS = [
@@ -64,6 +65,8 @@ const TYPE_SUGGESTIONS = [
     ['Float', 'BigDecimal'],
     ['int', 'Int'],
     ['int8', 'Int8'],
+    ['timestamp', 'Timestamp'],
+    ['ts', 'Timestamp'],
     ['uint', 'BigInt'],
     ['owner', 'String'],
     ['Owner', 'String'],

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.69.0-alpha-20240315144301-ea4b16f",
+  "version": "0.69.0-alpha-20240317072253-db1272f",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.69.0-alpha-20240315144301-ea4b16f",
+  "version": "0.69.0-alpha-20240317072253-db1272f",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {