rename typeAnn to candidTypeObject

demergent-labs · Dec 5, 2023 · fa4a236 · fa4a236
1 parent 600a8f7
commit fa4a236
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 29 deletions.
diff --git a/property_tests/arbitraries/candid/candid_definition_arb/types.ts b/property_tests/arbitraries/candid/candid_definition_arb/types.ts
@@ -64,7 +64,7 @@ export type ServiceMethodDefinition = {
 };
 
 type CandidMeta = {
-    typeAnnotation: string; // Either a type reference or type literal
+    candidTypeObject: string; // Either a type reference or type literal
     typeAliasDeclarations: string[];
     imports: Set<string>;
     candidType: CandidType;

diff --git a/property_tests/arbitraries/candid/candid_value_and_meta_arb.ts b/property_tests/arbitraries/candid/candid_value_and_meta_arb.ts
@@ -29,7 +29,7 @@ export type CandidValueAndMeta<T extends CorrespondingJSType, E = T> = {
     agentArgumentValue: T;
     agentResponseValue: E;
     src: {
-        typeAnnotation: string;
+        candidTypeObject: string;
         typeAliasDeclarations: string[];
         imports: Set<string>;
         valueLiteral: string;

diff --git a/property_tests/arbitraries/candid/candid_value_and_meta_arb_generator.ts b/property_tests/arbitraries/candid/candid_value_and_meta_arb_generator.ts
@@ -17,13 +17,13 @@ export function CandidValueAndMetaArbGenerator<
     ).map(
         ([
             {
-                candidMeta: { typeAnnotation, typeAliasDeclarations, imports }
+                candidMeta: { candidTypeObject, typeAliasDeclarations, imports }
             },
             { agentArgumentValue, agentResponseValue, valueLiteral }
         ]) => {
             return {
                 src: {
-                    typeAnnotation,
+                    candidTypeObject,
                     typeAliasDeclarations,
                     imports,
                     valueLiteral

diff --git a/property_tests/arbitraries/candid/constructed/blob_arb/definition_arb.ts b/property_tests/arbitraries/candid/constructed/blob_arb/definition_arb.ts
@@ -18,7 +18,7 @@ export function _VecNat8DefinitionArb(): fc.Arbitrary<BlobCandidDefinition> {
             const imports = new Set(['Vec', 'nat8']);
             return {
                 candidMeta: {
-                    typeAnnotation,
+                    candidTypeObject: typeAnnotation,
                     typeAliasDeclarations,
                     imports,
                     candidType: 'blob'

diff --git a/property_tests/arbitraries/candid/constructed/opt_arb/definition_arb.ts b/property_tests/arbitraries/candid/constructed/opt_arb/definition_arb.ts
@@ -29,7 +29,7 @@ export function OptDefinitionArb(
 
             return {
                 candidMeta: {
-                    typeAnnotation,
+                    candidTypeObject: typeAnnotation,
                     typeAliasDeclarations,
                     imports,
                     candidType: 'Opt'
@@ -54,7 +54,7 @@ function generateTypeAliasDeclarations(
 }
 
 function generateTypeAnnotation(innerType: CandidDefinition): string {
-    return `Opt(${innerType.candidMeta.typeAnnotation})`;
+    return `Opt(${innerType.candidMeta.candidTypeObject})`;
 }
 
 function generateImports(innerType: CandidDefinition): Set<string> {

diff --git a/property_tests/arbitraries/candid/constructed/record_arb/definition_arb.ts b/property_tests/arbitraries/candid/constructed/record_arb/definition_arb.ts
@@ -36,7 +36,7 @@ export function RecordDefinitionArb(
 
             return {
                 candidMeta: {
-                    typeAnnotation,
+                    candidTypeObject: typeAnnotation,
                     typeAliasDeclarations,
                     imports,
                     candidType: 'Record'
@@ -57,7 +57,7 @@ function generateTypeAnnotation(fields: Field[]): string {
     return `Record({${fields
         .map(
             ([fieldName, fieldDefinition]) =>
-                `${fieldName}: ${fieldDefinition.candidMeta.typeAnnotation}`
+                `${fieldName}: ${fieldDefinition.candidMeta.candidTypeObject}`
         )
         .join(',')}})`;
 }

diff --git a/property_tests/arbitraries/candid/constructed/tuple_arb/definition_arb.ts b/property_tests/arbitraries/candid/constructed/tuple_arb/definition_arb.ts
@@ -32,7 +32,7 @@ export function TupleDefinitionArb(
 
             return {
                 candidMeta: {
-                    typeAnnotation,
+                    candidTypeObject: typeAnnotation,
                     typeAliasDeclarations,
                     imports,
                     candidType: 'Tuple'
@@ -60,7 +60,7 @@ function generateTypeAliasDeclarations(
 }
 
 function generateTypeAnnotation(fields: CandidDefinition[]) {
-    const innerTypes = fields.map((field) => field.candidMeta.typeAnnotation);
+    const innerTypes = fields.map((field) => field.candidMeta.candidTypeObject);
 
     return `Tuple(${innerTypes.join(', ')})`;
 }

diff --git a/property_tests/arbitraries/candid/constructed/variant_arb/definition_arbs.ts b/property_tests/arbitraries/candid/constructed/variant_arb/definition_arbs.ts
@@ -32,7 +32,7 @@ export function VariantDefinitionArb(
 
             return {
                 candidMeta: {
-                    typeAnnotation,
+                    candidTypeObject: typeAnnotation,
                     typeAliasDeclarations,
                     imports,
                     candidType: 'Variant'
@@ -82,7 +82,7 @@ function generateTypeAnnotation(fields: Field[]): string {
     return `Variant({${fields
         .map(
             ([fieldName, fieldDataType]) =>
-                `${fieldName}: ${fieldDataType.candidMeta.typeAnnotation}`
+                `${fieldName}: ${fieldDataType.candidMeta.candidTypeObject}`
         )
         .join(',')}})`;
 }
diff --git a/property_tests/arbitraries/candid/constructed/vec_arb/definition_arb.ts b/property_tests/arbitraries/candid/constructed/vec_arb/definition_arb.ts
@@ -29,7 +29,7 @@ export function VecDefinitionArb(
 
             return {
                 candidMeta: {
-                    typeAnnotation,
+                    candidTypeObject: typeAnnotation,
                     typeAliasDeclarations,
                     imports,
                     candidType: 'Vec'
@@ -58,5 +58,5 @@ function generateImports(innerType: CandidDefinition): Set<string> {
 }
 
 function generateTypeAnnotation(innerType: CandidDefinition): string {
-    return `Vec(${innerType.candidMeta.typeAnnotation})`;
+    return `Vec(${innerType.candidMeta.candidTypeObject})`;
 }
diff --git a/property_tests/arbitraries/candid/reference/func_arb/definition_arb.ts b/property_tests/arbitraries/candid/reference/func_arb/definition_arb.ts
@@ -52,7 +52,7 @@ export function FuncDefinitionArb(
 
                 return {
                     candidMeta: {
-                        typeAnnotation,
+                        candidTypeObject: typeAnnotation,
                         typeAliasDeclarations,
                         imports,
                         candidType: 'Func'
@@ -97,7 +97,7 @@ function generateTypeAnnotation(
     mode: Mode
 ): string {
     const params = paramCandids
-        .map((param) => param.candidMeta.typeAnnotation)
+        .map((param) => param.candidMeta.candidTypeObject)
         .join(', ');
-    return `Func([${params}], ${returnCandid.candidMeta.typeAnnotation}, '${mode}')`;
+    return `Func([${params}], ${returnCandid.candidMeta.candidTypeObject}, '${mode}')`;
 }
diff --git a/property_tests/arbitraries/candid/reference/service_arb/definition_arb.ts b/property_tests/arbitraries/candid/reference/service_arb/definition_arb.ts
@@ -36,7 +36,7 @@ export function ServiceDefinitionArb(
             return {
                 name,
                 candidMeta: {
-                    typeAnnotation,
+                    candidTypeObject: typeAnnotation,
                     typeAliasDeclarations,
                     imports,
                     candidType: 'Service'
@@ -58,7 +58,7 @@ function ServiceMethodArb(
         )
         .map(([name, mode, params, returnType]): ServiceMethodDefinition => {
             const paramCandidTypes = params.map(
-                (param) => param.candidMeta.typeAnnotation
+                (param) => param.candidMeta.candidTypeObject
             );
 
             const typeAliasDeclarations = params.reduce(
@@ -68,7 +68,7 @@ function ServiceMethodArb(
                 returnType.candidMeta.typeAliasDeclarations
             );
 
-            const src = `${name}: ${mode}([${paramCandidTypes}], ${returnType.candidMeta.typeAnnotation})`;
+            const src = `${name}: ${mode}([${paramCandidTypes}], ${returnType.candidMeta.candidTypeObject})`;
 
             const imports = params.reduce(
                 (acc, param) => {

diff --git a/property_tests/arbitraries/candid/simple_type_arbs/definition_arb.ts b/property_tests/arbitraries/candid/simple_type_arbs/definition_arb.ts
@@ -9,7 +9,7 @@ export function SimpleCandidDefinitionArb(
     return fc
         .tuple(UniqueIdentifierArb('typeDeclaration'), fc.boolean())
         .map(([name, useTypeDeclaration]) => {
-            const typeAnnotation = useTypeDeclaration ? name : candidType;
+            const candidTypeObject = useTypeDeclaration ? name : candidType;
             const imports = new Set([candidType]);
             const typeAliasDeclarations = generateTypeAliasDeclarations(
                 name,
@@ -19,7 +19,7 @@ export function SimpleCandidDefinitionArb(
             return {
                 candidMeta: {
                     candidType,
-                    typeAnnotation,
+                    candidTypeObject,
                     imports,
                     typeAliasDeclarations
                 }

diff --git a/property_tests/arbitraries/query_method_arb.ts b/property_tests/arbitraries/query_method_arb.ts
@@ -208,10 +208,10 @@ function generateSourceCode<
     callback: string
 ): string {
     const paramCandidTypes = paramTypes
-        .map((param) => param.src.typeAnnotation)
+        .map((param) => param.src.candidTypeObject)
         .join(', ');
 
-    const returnCandidType = returnType.src.typeAnnotation;
+    const returnCandidType = returnType.src.candidTypeObject;
 
     return `${functionName}: query([${paramCandidTypes}], ${returnCandidType}, ${callback})`;
 }
diff --git a/property_tests/tests/func/test/test.ts b/property_tests/tests/func/test/test.ts
@@ -10,7 +10,7 @@ import { generateTests } from './generate_tests';
 
 const AllFuncsQueryMethod = QueryMethodArb(
     fc.uniqueArray(FuncArb(), {
-        selector: (entry) => entry.src.typeAnnotation
+        selector: (entry) => entry.src.candidTypeObject
     }),
     FuncArb(),
     {

diff --git a/property_tests/tests/service/test/test.ts b/property_tests/tests/service/test/test.ts
@@ -10,7 +10,7 @@ import { generateTests } from './generate_tests';
 
 const AllServicesQueryMethod = QueryMethodArb(
     fc.uniqueArray(ServiceArb(), {
-        selector: (entry) => entry.src.typeAnnotation
+        selector: (entry) => entry.src.candidTypeObject
     }),
     ServiceArb(),
     {

diff --git a/property_tests/tests/tuple/test/test.ts b/property_tests/tests/tuple/test/test.ts
@@ -10,7 +10,7 @@ import { generateTests } from './generate_tests';
 
 const AllTuplesQueryMethod = QueryMethodArb(
     fc.uniqueArray(TupleArb(), {
-        selector: (entry) => entry.src.typeAnnotation
+        selector: (entry) => entry.src.candidTypeObject
     }),
     TupleArb(),
     {

diff --git a/property_tests/tests/variant/test/test.ts b/property_tests/tests/variant/test/test.ts
@@ -10,7 +10,7 @@ import { generateTests } from './generate_tests';
 
 const AllVariantsQueryMethod = QueryMethodArb(
     fc.uniqueArray(VariantArb(), {
-        selector: (entry) => entry.src.typeAnnotation
+        selector: (entry) => entry.src.candidTypeObject
     }),
     VariantArb(),
     {