Chore: Remove ABI from schema package

package.json

@@ -25,7 +25,7 @@
     "clean": "npx rimraf ./**/node_modules ./**/yarn.lock ./**/build ./**/coverage ./**/.polywrap",
     "dependencies:install": "cd dependencies && yarn",
     "preinstall": "yarn dependencies:install",
-    "build": "yarn build:core && yarn link:interface:deps && yarn build:interfaces && yarn build:plugins && yarn build:client && yarn build:test-env && yarn build:cli",
+    "build": "yarn build:core && yarn build:interfaces && yarn build:plugins && yarn build:client && yarn build:test-env && yarn build:cli",
     "build:core": "lerna run build --no-private --ignore @polywrap/*-plugin-js --ignore polywrap --ignore @polywrap/client-js --ignore @polywrap/react --ignore @polywrap/test-env-js --ignore @polywrap/*-interface",
     "build:interfaces": "lerna run build --scope @polywrap/*-interface --concurrency 1",
     "build:plugins": "lerna run build --scope @polywrap/*-plugin-js --concurrency 1",

packages/cli/src/__tests__/e2e/deploy.spec.ts

@@ -207,13 +207,13 @@ describe("e2e tests for deploy command", () => {
         input: {
           uri: "wrap://fs/./build"
         },
-        result: "wrap://ipfs/QmTVbK7oZr4km4AnRuzJpm1r68G7nGzaXFvQHWdwnu8hmv"
+        result: "wrap://ipfs/QmPDJ9GMgqx1iScNpZh2MerK27YFNKayY5fBoGXfPWWEqm"
       },
       {
         id: "ipfs_deploy.from_deploy",
         name: "from_deploy",
         input: {
-          uri: "wrap://ipfs/QmTVbK7oZr4km4AnRuzJpm1r68G7nGzaXFvQHWdwnu8hmv",
+          uri: "wrap://ipfs/QmPDJ9GMgqx1iScNpZh2MerK27YFNKayY5fBoGXfPWWEqm",
           config: {
             domainName: "test1.eth",
             provider: "http://localhost:8545",
@@ -226,7 +226,7 @@ describe("e2e tests for deploy command", () => {
         id: "ipfs_deploy.from_deploy2",
         name: "from_deploy2",
         input: {
-          uri: "wrap://ipfs/QmTVbK7oZr4km4AnRuzJpm1r68G7nGzaXFvQHWdwnu8hmv",
+          uri: "wrap://ipfs/QmPDJ9GMgqx1iScNpZh2MerK27YFNKayY5fBoGXfPWWEqm",
           config: {
             domainName: "test2.eth",
             provider: "http://localhost:8545",

packages/cli/src/lib/Compiler.ts

@@ -26,7 +26,6 @@ import { msgpackEncode } from "@polywrap/msgpack-js";
 import { WasmWrapper } from "@polywrap/client-js";
 import { WrapImports } from "@polywrap/client-js/build/wasm/types";
 import { AsyncWasmInstance } from "@polywrap/asyncify-js";
-import { Abi } from "@polywrap/schema-parse";
 import { ComposerOutput } from "@polywrap/schema-compose";
 import {
   normalizePath,
@@ -358,7 +357,7 @@ export class Compiler {
 
       const manifest = await project.getManifest();
 
-      const abi: Abi = {
+      const abi: WrapAbi = {
         ...state.composerOutput.abi,
       };
 

packages/cli/src/lib/SchemaComposer.ts

@@ -48,8 +48,13 @@ export class SchemaComposer {
           }
         : undefined;
 
+    const schemaFile = getSchemaFile(schemaNamedPath);
+    if (!schemaFile) {
+      throw Error(`Schema cannot be loaded at path: ${schemaNamedPath}`);
+    }
+
     const options: ComposerOptions = {
-      schemas: [],
+      schema: schemaFile,
       resolvers: {
         external: (uri: string) =>
           this._fetchExternalSchema(uri, import_redirects),
@@ -58,13 +63,6 @@ export class SchemaComposer {
       output,
     };
 
-    const schemaFile = getSchemaFile(schemaNamedPath);
-    if (!schemaFile) {
-      throw Error(`Schema cannot be loaded at path: ${schemaNamedPath}`);
-    }
-
-    options.schemas.push(schemaFile);
-
     this._composerOutput = await composeSchema(options);
     return this._composerOutput;
   }

packages/cli/src/lib/docgen/docusaurus/index.ts

@@ -6,7 +6,7 @@ import {
 } from "../utils";
 
 import {
-  Abi,
+  WrapAbi,
   transformAbi,
   addFirstLast,
   toPrefixedGraphQLType,
@@ -64,7 +64,7 @@ export const generateBinding: GenerateBindingFn = (
   }
 
   // generate object types
-  if (abi.objectTypes.length > 0) {
+  if (abi.objectTypes && abi.objectTypes.length > 0) {
     const objectContext = {
       objectTypes: abi.objectTypes,
     };
@@ -76,7 +76,7 @@ export const generateBinding: GenerateBindingFn = (
   }
 
   // generate enum types
-  if (abi.enumTypes.length > 0) {
+  if (abi.enumTypes && abi.enumTypes.length > 0) {
     const enumContext = {
       enumTypes: abi.enumTypes,
     };
@@ -98,73 +98,81 @@ export const generateBinding: GenerateBindingFn = (
   if (options.config?.["imports"]) {
     // TODO: for imported modules, module.type contains the namespace. Should it?
     // generate imported modules
-    for (const module of abi.importedModuleTypes) {
-      const moduleType = module.type.split("_")[1];
-      const moduleContext = {
-        ...module,
-        type: moduleType,
-        imported: { namespace: module.namespace },
-      };
-      renderTemplate(
-        "./templates/docusaurus-module.mustache",
-        moduleContext,
-        `${module.namespace}_${moduleType.toLowerCase()}.md`
-      );
-    }
-
-    // generated imported object types
-    const importedObjects = arrangeByNamespace(abi.importedObjectTypes);
-    for (const [namespace, objectTypes] of Object.entries(importedObjects)) {
-      if (objectTypes.length > 0) {
-        const objectContext = {
-          objectTypes,
-          imported: { namespace },
+    if (abi.importedModuleTypes) {
+      for (const module of abi.importedModuleTypes) {
+        const moduleType = module.type.split("_")[1];
+        const moduleContext = {
+          ...module,
+          type: moduleType,
+          imported: { namespace: module.namespace },
         };
         renderTemplate(
-          "./templates/docusaurus-objects.mustache",
-          objectContext,
-          `${namespace}_objects.md`
+          "./templates/docusaurus-module.mustache",
+          moduleContext,
+          `${module.namespace}_${moduleType.toLowerCase()}.md`
         );
       }
     }
 
+    // generated imported object types
+    if (abi.importedObjectTypes) {
+      const importedObjects = arrangeByNamespace(abi.importedObjectTypes);
+      for (const [namespace, objectTypes] of Object.entries(importedObjects)) {
+        if (objectTypes.length > 0) {
+          const objectContext = {
+            objectTypes,
+            imported: { namespace },
+          };
+          renderTemplate(
+            "./templates/docusaurus-objects.mustache",
+            objectContext,
+            `${namespace}_objects.md`
+          );
+        }
+      }
+    }
+
     // generate imported enum types
-    const importedEnums = arrangeByNamespace(abi.importedEnumTypes);
-    for (const [namespace, enumTypes] of Object.entries(importedEnums)) {
-      if (enumTypes.length > 0) {
-        const enumContext = {
-          enumTypes,
-          imported: { namespace },
-        };
-        renderTemplate(
-          "./templates/docusaurus-enums.mustache",
-          enumContext,
-          `${namespace}_enums.md`
-        );
+    if (abi.importedEnumTypes) {
+      const importedEnums = arrangeByNamespace(abi.importedEnumTypes);
+      for (const [namespace, enumTypes] of Object.entries(importedEnums)) {
+        if (enumTypes.length > 0) {
+          const enumContext = {
+            enumTypes,
+            imported: { namespace },
+          };
+          renderTemplate(
+            "./templates/docusaurus-enums.mustache",
+            enumContext,
+            `${namespace}_enums.md`
+          );
+        }
       }
     }
 
     // generate imported env types
-    const importedEnvs = arrangeByNamespace(abi.importedEnvTypes);
-    for (const [namespace, envType] of Object.entries(importedEnvs)) {
-      if (envType) {
-        const envContext = {
-          envType,
-          imported: { namespace },
-        };
-        renderTemplate(
-          "./templates/docusaurus-env.mustache",
-          envContext,
-          `${namespace}_env.md`
-        );
+    if (abi.importedEnvTypes) {
+      const importedEnvs = arrangeByNamespace(abi.importedEnvTypes);
+      for (const [namespace, envType] of Object.entries(importedEnvs)) {
+        if (envType) {
+          const envContext = {
+            envType,
+            imported: { namespace },
+          };
+          renderTemplate(
+            "./templates/docusaurus-env.mustache",
+            envContext,
+            `${namespace}_env.md`
+          );
+        }
       }
     }
   }
 
   return result;
 };
 
-function applyTransforms(abi: Abi): Abi {
+function applyTransforms(abi: WrapAbi): WrapAbi {
   const transforms = [
     extendType(Functions),
     extendType(TypeScript.Functions),

packages/cli/src/lib/docgen/jsdoc/index.ts

@@ -6,14 +6,14 @@ import {
 } from "../utils";
 
 import {
-  Abi,
   transformAbi,
   addFirstLast,
   toPrefixedGraphQLType,
   extendType,
   methodParentPointers,
   ImportedDefinition,
   ModuleDefinition,
+  WrapAbi,
 } from "@polywrap/schema-parse";
 import {
   BindOptions,
@@ -67,12 +67,12 @@ export const generateBinding: GenerateBindingFn = (
   }
 
   // generate object types
-  if (abi.objectTypes.length > 0) {
+  if (abi.objectTypes && abi.objectTypes.length > 0) {
     renderTemplate("./templates/jsdoc-objects.mustache", abi, "objects.js");
   }
 
   // generate enum types
-  if (abi.enumTypes.length > 0) {
+  if (abi.enumTypes && abi.enumTypes.length > 0) {
     renderTemplate("./templates/jsdoc-enums.mustache", abi, "enums.js");
   }
 
@@ -87,71 +87,79 @@ export const generateBinding: GenerateBindingFn = (
   if (options.config?.["imports"]) {
     // TODO: for imported modules, module.type contains the namespace. Should it?
     // generate imported modules
-    for (const module of abi.importedModuleTypes) {
-      const moduleContext = {
-        ...module,
-        imported: { namespace: module.namespace },
-      };
-      renderTemplate(
-        "./templates/jsdoc-module.mustache",
-        moduleContext,
-        `${module.type}.js`
-      );
-    }
-
-    // generated imported object types
-    const importedObjects = sortByNamespace(abi.importedObjectTypes);
-    for (const [namespace, objectTypes] of Object.entries(importedObjects)) {
-      if (objectTypes.length > 0) {
-        const objectContext = {
-          objectTypes,
-          imported: { namespace },
+    if (abi.importedModuleTypes) {
+      for (const module of abi.importedModuleTypes) {
+        const moduleContext = {
+          ...module,
+          imported: { namespace: module.namespace },
         };
         renderTemplate(
-          "./templates/jsdoc-objects.mustache",
-          objectContext,
-          `${namespace}_objects.js`
+          "./templates/jsdoc-module.mustache",
+          moduleContext,
+          `${module.type}.js`
         );
       }
     }
 
+    // generated imported object types
+    if (abi.importedObjectTypes) {
+      const importedObjects = sortByNamespace(abi.importedObjectTypes);
+      for (const [namespace, objectTypes] of Object.entries(importedObjects)) {
+        if (objectTypes.length > 0) {
+          const objectContext = {
+            objectTypes,
+            imported: { namespace },
+          };
+          renderTemplate(
+            "./templates/jsdoc-objects.mustache",
+            objectContext,
+            `${namespace}_objects.js`
+          );
+        }
+      }
+    }
+
     // generate imported enum types
-    const importedEnums = sortByNamespace(abi.importedEnumTypes);
-    for (const [namespace, enumTypes] of Object.entries(importedEnums)) {
-      if (enumTypes.length > 0) {
-        const enumContext = {
-          enumTypes,
-          imported: { namespace },
-        };
-        renderTemplate(
-          "./templates/jsdoc-enums.mustache",
-          enumContext,
-          `${namespace}_enums.js`
-        );
+    if (abi.importedEnumTypes) {
+      const importedEnums = sortByNamespace(abi.importedEnumTypes);
+      for (const [namespace, enumTypes] of Object.entries(importedEnums)) {
+        if (enumTypes.length > 0) {
+          const enumContext = {
+            enumTypes,
+            imported: { namespace },
+          };
+          renderTemplate(
+            "./templates/jsdoc-enums.mustache",
+            enumContext,
+            `${namespace}_enums.js`
+          );
+        }
       }
     }
 
     // generate imported env types
-    const importedEnvs = arrangeByNamespace(abi.importedEnvTypes);
-    for (const [namespace, envType] of Object.entries(importedEnvs)) {
-      if (envType) {
-        const envContext = {
-          envType,
-          imported: { namespace },
-        };
-        renderTemplate(
-          "./templates/jsdoc-env.mustache",
-          envContext,
-          `${namespace}_env.js`
-        );
+    if (abi.importedEnvTypes) {
+      const importedEnvs = arrangeByNamespace(abi.importedEnvTypes);
+      for (const [namespace, envType] of Object.entries(importedEnvs)) {
+        if (envType) {
+          const envContext = {
+            envType,
+            imported: { namespace },
+          };
+          renderTemplate(
+            "./templates/jsdoc-env.mustache",
+            envContext,
+            `${namespace}_env.js`
+          );
+        }
       }
     }
   }
 
   return result;
 };
 
-function applyTransforms(abi: Abi): Abi {
+function applyTransforms(abi: WrapAbi): WrapAbi {
   const transforms = [
     extendType(Functions),
     extendType(TypeScript.Functions),