@graphprotocol/graph-cli 0.26.0 → 0.26.1

package/src/codegen/schema.js

@@ -54,7 +54,7 @@ module.exports = class SchemaCodeGenerator {
     let klass = tsCodegen.klass(name, { export: true, extends: 'Entity' })
 
     // Generate and add a constructor
-    klass.addMethod(this._generateConstructor(name, def.get('fields')))
+    klass.addMethod(this._generateConstructor(name))
 
     // Generate and add save() and getById() methods
     this._generateStoreMethods(name).forEach(method => klass.addMethod(method))
@@ -71,42 +71,7 @@ module.exports = class SchemaCodeGenerator {
     return klass
   }
 
-  // Fields that are non-nullable get an empty/zero value set in the class constructor.
-  _generateDefaultFieldValues(fields) {
-    const indexOfIdField = fields.findIndex(field => field.getIn(['name', 'value']) === 'id')
-    const fieldsWithoutId = fields.remove(indexOfIdField)
-
-    const fieldsSetCalls = fieldsWithoutId
-      .map(field => {
-        const name = field.getIn(['name', 'value'])
-        const type = this._typeFromGraphQl(field.get('type'), true, true)
-
-        const isNullable = type instanceof tsCodegen.NullableType
-
-        const directives = field.get('directives')
-        const isDerivedFrom = directives.some(directive => directive.getIn(['name', 'value']) === 'derivedFrom')
-
-        return { name, type, isNullable, isDerivedFrom }
-      })
-      // We only call the setter with the default value in the constructor for fields that are:
-      // - Not nullable, so that AS doesn't break when subgraph developers try to access them before a `set`
-      //   - It doesn't matter if it's primitive or not
-      // - Not tagged as `derivedFrom`, because they only exist in query time
-      .filter(({
-        isNullable,
-        isDerivedFrom,
-      }) => !isNullable && !isDerivedFrom)
-      .map(({ name, type, isNullable }) => {
-        const fieldTypeString = isNullable ? type.inner.toString() : type.toString()
-
-        return `
-        this.set('${name}', ${typesCodegen.initializedValueFromAsc(fieldTypeString)})`
-      })
-
-    return fieldsSetCalls.join('')
-  }
-
-  _generateConstructor(entityName, fields) {
+  _generateConstructor(entityName) {
     return tsCodegen.method(
       'constructor',
       [tsCodegen.param('id', tsCodegen.namedType('string'))],
@@ -114,7 +79,6 @@ module.exports = class SchemaCodeGenerator {
       `
       super()
       this.set('id', Value.fromString(id))
-      ${this._generateDefaultFieldValues(fields)}
       `,
     )
   }
@@ -234,7 +198,7 @@ Suggestion: add an '!' to the member type of the List, change from '${fieldValue
       : gqlType.getIn(['name', 'value'])
   }
 
-  _typeFromGraphQl(gqlType, nullable = true, nullablePrimitive = false) {
+  _typeFromGraphQl(gqlType, nullable = true) {
     if (gqlType.get('kind') === 'NonNullType') {
       return this._typeFromGraphQl(gqlType.get('type'), false)
     } else if (gqlType.get('kind') === 'ListType') {
@@ -245,13 +209,8 @@ Suggestion: add an '!' to the member type of the List, change from '${fieldValue
       let type = tsCodegen.namedType(
         typesCodegen.ascTypeForValue(gqlType.getIn(['name', 'value'])),
       )
-
-      // Will not wrap primitives into NullableType by default.
-      if (!nullablePrimitive && type.isPrimitive()) {
-        return type
-      }
-
-      return nullable ? tsCodegen.nullableType(type) : type
+      // In AssemblyScript, primitives cannot be nullable.
+      return nullable && !type.isPrimitive() ? tsCodegen.nullableType(type) : type
     }
   }
 }

package/src/codegen/schema.test.js

@@ -114,9 +114,6 @@ describe('Schema code generator', () => {
             body: `
               super()
               this.set('id', Value.fromString(id))
-
-              this.set('name', Value.fromString(''))
-              this.set('count', Value.fromI32(0))
             `,
           },
           {
@@ -279,9 +276,6 @@ describe('Schema code generator', () => {
             body: `
               super()
               this.set('id', Value.fromString(id))
-    
-              this.set('amount', Value.fromBigInt(BigInt.zero()))
-              this.set('account', Value.fromString(''))
             `,
           },
           {

package/src/codegen/types/conversions.js

@@ -188,28 +188,28 @@ const VALUE_TO_ASSEMBLYSCRIPT = [
 const ASSEMBLYSCRIPT_TO_VALUE = [
   // Arrays
 
-  ['Array<Address>', '[Bytes]', code => `Value.fromBytesArray(${code})`, 'new Array(0)'],
-  ['Array<Bytes>', '[Bytes]', code => `Value.fromBytesArray(${code})`, 'new Array(0)'],
-  ['Array<boolean>', '[Boolean]', code => `Value.fromBooleanArray(${code})`, 'new Array(0)'],
-  ['Array<i32>', '[Int]', code => `Value.fromI32Array(${code})`, 'new Array(0)'],
-  ['Array<BigInt>', '[BigInt]', code => `Value.fromBigIntArray(${code})`, 'new Array(0)'],
-  ['Array<string>', '[String]', code => `Value.fromStringArray(${code})`, 'new Array(0)'],
-  ['Array<string>', '[ID]', code => `Value.fromStringArray(${code})`, 'new Array(0)'],
-  ['Array<BigDecimal>', '[BigDecimal]', code => `Value.fromBigDecimalArray(${code})`, 'new Array(0)'],
-  ['Array<string>', /\[.*\]/, code => `Value.fromStringArray(${code})`, 'new Array(0)'],
-  ['Array<string | null>', null, code => `Value.fromStringArray(${code})`, 'new Array(0)'],
+  ['Array<Address>', '[Bytes]', code => `Value.fromBytesArray(${code})`],
+  ['Array<Bytes>', '[Bytes]', code => `Value.fromBytesArray(${code})`],
+  ['Array<boolean>', '[Boolean]', code => `Value.fromBooleanArray(${code})`],
+  ['Array<i32>', '[Int]', code => `Value.fromI32Array(${code})`],
+  ['Array<BigInt>', '[BigInt]', code => `Value.fromBigIntArray(${code})`],
+  ['Array<string>', '[String]', code => `Value.fromStringArray(${code})`],
+  ['Array<string>', '[ID]', code => `Value.fromStringArray(${code})`],
+  ['Array<BigDecimal>', '[BigDecimal]', code => `Value.fromBigDecimalArray(${code})`],
+  ['Array<string>', /\[.*\]/, code => `Value.fromStringArray(${code})`],
+  ['Array<string | null>', null, code => `Value.fromStringArray(${code})`],
 
   // Scalar values
 
-  ['Address', 'Bytes', code => `Value.fromBytes(${code})`, 'Address.zero()'],
-  ['Bytes', 'Bytes', code => `Value.fromBytes(${code})`, 'Bytes.empty()'],
-  ['boolean', 'Boolean', code => `Value.fromBoolean(${code})`, 'false'],
-  ['i32', 'Int', code => `Value.fromI32(${code})`, '0'],
-  ['BigInt', 'BigInt', code => `Value.fromBigInt(${code})`, 'BigInt.zero()'],
-  ['string', 'String', code => `Value.fromString(${code})`, "''"],
-  ['string', 'ID', code => `Value.fromString(${code})`, "''"],
-  ['BigDecimal', 'BigDecimal', code => `Value.fromBigDecimal(${code})`, 'BigDecimal.zero()'],
-  ['string', /.*/, code => `Value.fromString(${code})`, "''"],
+  ['Address', 'Bytes', code => `Value.fromBytes(${code})`],
+  ['Bytes', 'Bytes', code => `Value.fromBytes(${code})`],
+  ['boolean', 'Boolean', code => `Value.fromBoolean(${code})`],
+  ['i32', 'Int', code => `Value.fromI32(${code})`],
+  ['BigInt', 'BigInt', code => `Value.fromBigInt(${code})`],
+  ['string', 'String', code => `Value.fromString(${code})`],
+  ['string', 'ID', code => `Value.fromString(${code})`],
+  ['BigDecimal', 'BigDecimal', code => `Value.fromBigDecimal(${code})`],
+  ['string', /.*/, code => `Value.fromString(${code})`],
 ]
 
 /**

package/src/codegen/types/index.js

@@ -66,27 +66,6 @@ const findConversionToType = (fromTypeSystem, toTypeSystem, toType) => {
   return objectifyConversion(fromTypeSystem, toTypeSystem, conversion)
 }
 
-const findInitializationForType = (fromTypeSystem, toTypeSystem, ascType) => {
-  const conversions = conversionsForTypeSystems(fromTypeSystem, toTypeSystem)
-
-  const conversion = conversions.find(conversion =>
-    typeof conversion.get(0) === 'string'
-      ? conversion.get(0) === ascType
-      : ascType.match(conversion.get(0)),
-  )
-
-  if (conversion === undefined) {
-    throw new Error(
-      `Conversion from '${fromTypeSystem}' to '${toTypeSystem}' for ` +
-        `target type '${ascType}' is not supported`,
-    )
-  }
-
-  const conversionObj = objectifyConversion(fromTypeSystem, toTypeSystem, conversion)
-
-  return conversionObj.get('convert')(conversion.get(3))
-}
-
 // High-level type system API
 
 const ascTypeForProtocol = (protocol, protocolType) =>
@@ -120,9 +99,6 @@ const valueToAsc = (code, valueType) =>
 const valueFromAsc = (code, valueType) =>
   findConversionToType('AssemblyScript', 'Value', valueType).get('convert')(code)
 
-const initializedValueFromAsc = ascType =>
-  findInitializationForType('AssemblyScript', 'Value', ascType)
-
 module.exports = {
   // protocol <-> AssemblyScript
   ascTypeForProtocol,
@@ -138,5 +114,4 @@ module.exports = {
   valueTypeForAsc,
   valueToAsc,
   valueFromAsc,
-  initializedValueFromAsc,
 }

package/src/codegen/types/index.test.js

@@ -449,26 +449,4 @@ describe('AssemblyScript -> Value', () => {
     expect(codegen.valueFromAsc('x', '[String]')).toBe('Value.fromStringArray(x)')
     expect(codegen.valueTypeForAsc('Array<string>')).toBe('[String]')
   })
-
-  describe('Initialization for zero/empty values', () => {
-    test('Array<string>', () => {
-      expect(codegen.initializedValueFromAsc('Array<string>')).toBe('Value.fromStringArray(new Array(0))')
-    })
-
-    test('Array<string | null>', () => {
-      expect(codegen.initializedValueFromAsc('Array<string | null>')).toBe('Value.fromStringArray(new Array(0))')
-    })
-
-    test('i32', () => {
-      expect(codegen.initializedValueFromAsc('i32')).toBe('Value.fromI32(0)')
-    })
-
-    test('string', () => {
-      expect(codegen.initializedValueFromAsc('string')).toBe("Value.fromString('')")
-    })
-
-    test('BigInt', () => {
-      expect(codegen.initializedValueFromAsc('BigInt')).toBe('Value.fromBigInt(BigInt.zero())')
-    })
-  })
 })