Syntax tweaks

Author: Wes Biggs

dsnp/index.ts

@@ -1,6 +1,6 @@
 import { ApiPromise } from "@polkadot/api";
 
-import { Schema } from "avsc";
+import type { Schema } from "avsc";
 import { DSNPParquetSchema } from "@dsnp/schemas/types/dsnp-parquet.js";
 import {
   AnnouncementType,
@@ -137,7 +137,7 @@ export const schemas = new Map<SchemaName, Deploy>([
   [
     "public-key-key-agreement",
     {
-      model: publicKey as Schema,
+      model: publicKey,
       modelType: "AvroBinary",
       payloadLocation: "Itemized",
       settings: ["AppendOnly", "SignatureRequired"],
@@ -147,7 +147,7 @@ export const schemas = new Map<SchemaName, Deploy>([
   [
     "public-follows",
     {
-      model: userPublicFollows as Schema,
+      model: userPublicFollows,
       modelType: "AvroBinary",
       payloadLocation: "Paginated",
       settings: [],
@@ -157,7 +157,7 @@ export const schemas = new Map<SchemaName, Deploy>([
   [
     "private-follows",
     {
-      model: userPrivateFollows as Schema,
+      model: userPrivateFollows,
       modelType: "AvroBinary",
       payloadLocation: "Paginated",
       settings: [],
@@ -167,7 +167,7 @@ export const schemas = new Map<SchemaName, Deploy>([
   [
     "private-connections",
     {
-      model: userPrivateConnections as Schema,
+      model: userPrivateConnections,
       modelType: "AvroBinary",
       payloadLocation: "Paginated",
       settings: [],
@@ -177,7 +177,7 @@ export const schemas = new Map<SchemaName, Deploy>([
   [
     "public-key-assertion-method",
     {
-      model: publicKey as Schema,
+      model: publicKey,
       modelType: "AvroBinary",
       payloadLocation: "Itemized",
       settings: ["AppendOnly", "SignatureRequired"],
@@ -187,7 +187,7 @@ export const schemas = new Map<SchemaName, Deploy>([
   [
     "profile-resources",
     {
-      model: profile as Schema,
+      model: profile,
       modelType: "AvroBinary",
       payloadLocation: "Itemized",
       settings: [],

dsnp/userPrivateConnections.spec.ts

@@ -1,5 +1,6 @@
 import privateConnectionsSchema from "./userPrivateConnections.js";
 import avro from "avro-js";
+import type { Schema } from "avsc";
 
 describe("Private Connections Schema", () => {
   it("Is Avro", () => {
@@ -11,7 +12,7 @@ describe("Private Connections Schema", () => {
     // Parse the inside and outside types.
     // The inside type must be self contained.
     const outsideType = avro.parse(privateConnectionsSchema);
-    const insideType = avro.parse(privateConnectionsSchema.types[0]);
+    const insideType = avro.parse((privateConnectionsSchema as Schema & { types: Schema[] }).types[0]);
 
     // Generate a random inside type
     const inside = insideType.random();

dsnp/userPrivateConnections.ts

@@ -1,7 +1,8 @@
 import { UserDataType, descriptorForUserDataType } from "@dsnp/schemas";
+import type { Schema } from "avsc";
 
 // Paginated Chunk with PRIds
-export default {
+const schema: Schema = {
   type: "record",
   name: "UserPrivateConnectionsChunk",
   namespace: "org.dsnp",
@@ -35,3 +36,5 @@ export default {
     },
   ],
 };
+
+export default schema;

dsnp/userPrivateFollows.spec.ts

@@ -1,5 +1,6 @@
 import privateFollowsSchema from "./userPrivateFollows.js";
 import avro from "avro-js";
+import type { Schema } from "avsc";
 
 describe("Private Follows Schema", () => {
   it("Is Avro", () => {
@@ -11,7 +12,7 @@ describe("Private Follows Schema", () => {
     // Parse the inside and outside types.
     // The inside type must be self contained.
     const outsideType = avro.parse(privateFollowsSchema);
-    const insideType = avro.parse(privateFollowsSchema.types[0]);
+    const insideType = avro.parse((privateFollowsSchema as Schema & { types: Schema[] }).types[0]);
 
     // Generate a random inside type
     const inside = insideType.random();

dsnp/userPrivateFollows.ts

@@ -1,7 +1,8 @@
 import { UserDataType, descriptorForUserDataType } from "@dsnp/schemas";
+import type { Schema } from "avsc";
 
 // Paginated Chunks
-export default {
+const schema: Schema = {
   type: "record",
   name: "UserPrivateFollowsChunk",
   namespace: "org.dsnp",
@@ -27,3 +28,5 @@ export default {
     },
   ],
 };
+
+export default schema;

dsnp/userPublicFollows.spec.ts

@@ -1,5 +1,6 @@
 import publicFollowsSchema from "./userPublicFollows.js";
 import avro from "avro-js";
+import type { Schema } from "avsc";
 
 describe("Public Follows Schema", () => {
   it("Is Avro", () => {
@@ -11,7 +12,7 @@ describe("Public Follows Schema", () => {
     // Parse the inside and outside types.
     // The inside type must be self contained.
     const outsideType = avro.parse(publicFollowsSchema);
-    const insideType = avro.parse(publicFollowsSchema.types[0]);
+    const insideType = avro.parse((publicFollowsSchema as Schema & { types: Schema[] }).types[0]);
 
     // Generate a random inside type
     const inside = insideType.random();

dsnp/userPublicFollows.ts

@@ -1,7 +1,8 @@
 import { UserDataType, descriptorForUserDataType } from "@dsnp/schemas";
+import type { Schema } from "avsc";
 
 // Paginated Chunk of compressed data with a type defined for the data post decompression
-export default {
+const schema: Schema = {
   type: "record",
   name: "UserPublicFollowsChunk",
   namespace: "org.dsnp",
@@ -21,3 +22,5 @@ export default {
     },
   ],
 };
+
+export default schema;