Merge pull request #1915 from polywrap/origin-dev

Prep Origin 0.12.1

Author: dOrgJelli

Diff for: .github/CODEOWNERS

@@ -1,62 +1 @@
-# Default
-* @dOrgJelli @namesty
-
-# Wasm Runtime
-packages/wasm/as  @dOrgJelli @krisbitney @namesty @Niraj-Kamdar
-packages/wasm/rs  @namesty @dOrgJelli
-
-# Wrapper Test-Cases
-packages/test-cases/cases/wrappers/wasm-as @cbrzn @namesty @nerfZael @krisbitney @Niraj-Kamdar
-packages/test-cases/cases/wrappers/wasm-rs @cbrzn @namesty @nerfZael @krisbitney @Niraj-Kamdar
-
-# Schema
-packages/schema/parse    @dOrgJelli @namesty @nerfZael @Niraj-Kamdar
-packages/schema/compose  @dOrgJelli @namesty @nerfZael @Niraj-Kamdar
-packages/schema/bind     @dOrgJelli @krisbitney @nerfZael @Niraj-Kamdar @cbrzn
-
-# Schema Test-Cases
-packages/test-cases/cases/parse    @dOrgJelli @namesty @nerfZael @Niraj-Kamdar
-packages/test-cases/cases/compose  @dOrgJelli @namesty @nerfZael @Niraj-Kamdar
-packages/test-cases/cases/bind     @dOrgJelli @krisbitney @nerfZael @Niraj-Kamdar @cbrzn
-
-# Project Manifests
-packages/manifests/  @dOrgJelli @namesty @cbrzn @Niraj-Kamdar
-
-# CLI
-packages/js/cli @dOrgJelli @krisbitney @namesty @nerfZael @Niraj-Kamdar
-
-# CLI Test-Cases
-packages/test-cases/cases/cli @dOrgJelli @krisbitney @namesty @nerfZael @Niraj-Kamdar
-
-# Interfaces
-packages/interfaces  @dOrgJelli @krisbitney @cbrzn
-
-# JS Client
-packages/js                          @dOrgJelli @nerfZael
-packages/js/asyncify                 @namesty @dOrgJelli
-packages/js/client                   @dOrgJelli @krisbitney @namesty @nerfZael
-packages/js/client-config-builder    @pileks @nerfZael
-packages/js/core                     @dOrgJelli @krisbitney @namesty @nerfZael
-packages/js/manifests                @dOrgJelli @namesty @nerfZael @pileks @Niraj-Kamdar
-packages/js/msgpack                  @dOrgJelli @Niraj-Kamdar
-packages/js/os                       @dOrgJelli
-packages/js/plugin                   @nerfZael @dOrgJelli
-packages/js/react                    @dOrgJelli @nerfZael
-packages/js/result                   @nerfZael
-packages/js/test-env                 @dOrgJelli @krisbitney @cbrzn @namesty
-packages/js/tracing                  @dOrgJelli @Niraj-Kamdar @fetsorn
-packages/js/uri-resolver-extensions  @nerfZael
-packages/js/uri-resolvers            @nerfZael
-packages/js/validation               @nerfZael @cbrzn
-packages/js/wasm                     @nerfZael @dOrgJelli
-
-# JS Plugins
-packages/js/plugins/ethereum     @dOrgJelli @krisbitney @namesty
-packages/js/plugins/file-system  @krisbitney @dOrgJelli @Niraj-Kamdar @cbrzn
-packages/js/plugins/http         @dOrgJelli @ramilexe @cbrzn @namesty @krisbitney
-packages/js/plugins/ipfs         @dOrgJelli @krisbitney @nerfZael
-packages/js/plugins/ws           @dOrgJelli @nerfZael @fetsorn
-packages/js/plugins/uri-resolvers/ens-resolver          @nerfZael @pileks @krisbitney @cbrzn @dOrgJelli
-packages/js/plugins/uri-resolvers/file-system-resolver  @pileks @dOrgJelli @nerfZael @cbrzn @krisbitney
-packages/js/plugins/uri-resolvers/http-resolver         @namesty @krisbitney @nerfZael
-packages/js/plugins/uri-resolvers/ipfs-resolver         @pileks @nerfZael @dOrgJelli @cbrzn
+* @dOrgJelli @namesty @pileks

Diff for: CHANGELOG.md

@@ -1,3 +1,15 @@
+# Polywrap Origin (0.12.1)
+## Features
+**`polywrap` CLI:**
+* [PR-1911](https://github.com/polywrap/cli/pull/1911) **Polywrap Manifest - Default Source Paths**
+  * `polywrap.yaml` manifests can now omit the `source:` section and use the defaults defined by the CLI babsed on the manifest's `project.type` property.
+* [PR-1893](https://github.com/polywrap/cli/pull/1893) **Add `embed` option to `polywrap codegen`**
+  * Adds the `--embed` option to `polywrap codegen` which embeds wrap modules into applications (requires wrap-abi-bindgen support).
+
+## Bugs
+**`polywrap` CLI:**
+* [PR-1913](https://github.com/polywrap/cli/pull/1913) **Use Sys Bundle IPFS Providers in CLI**
+
 # Polywrap Origin (0.12.0)
 ## Breaking Changes
 **`@polywrap/schema-bind`:**

Diff for: VERSION

@@ -1 +1 @@
-0.12.0
+0.12.1

Diff for: WRAP_TEST_HARNESS

@@ -1 +1 @@
-kris/test-wrap-rust-2
+master

Diff for: packages/cli/lang/en.json

@@ -82,9 +82,9 @@
   "commands_codegen_description": "Generate Code For Polywrap Projects",
   "commands_codegen_error_domain": "domain",
   "commands_codegen_error_optionMissingArgument": "{option} option missing {argument} argument",
+  "commands_codegen_error_embedAppOnly": "The --embed option is currently only available for app projects",
   "commands_codegen_options_codegen": "Output directory for the generated code (default: {default})",
-  "commands_codegen_options_e": "ENS address to lookup external schemas (default: 0x0000...2e1e)",
-  "commands_codegen_options_e_address": "address",
+  "commands_codegen_options_e": "Locally embed Wasm wraps",
   "commands_codegen_options_h": "Show usage information",
   "commands_codegen_options_s": "Path to a custom generation script (JavaScript | TypeScript)",
   "commands_codegen_options_i": "IPFS node to load external schemas (default: ipfs.io & localhost)",
@@ -272,6 +272,8 @@
   "lib_project_app_uri_support": "The app command supports only filesystem URIs for plugins. Examples:",
   "lib_project_imported_plugin_manifest_not_found": "No manifest found for imported plugin namespace `{namespace}` at path `{path}`",
   "lib_project_invalid_uri": "Invalid URI Received:",
+  "lib_project_no_default_schema": "Couldn't find schema in default paths. Please specify the schema location in the project manifest.",
+  "lib_project_no_default_module": "Couldn't find module entry point in default paths. Please specify the module entry point in the project manifest.",
   "lib_typescript_notInstalled": "Your project uses typescript, but it's not installed",
   "lib_typescript_tsNodeNotInstalled": "Your project uses typescript, but ts-node is not installed",
   "lib_watcher_alreadyWatching": "Watcher session is already in progress. Directory: {dir}",

Diff for: packages/cli/lang/es.json

@@ -82,9 +82,9 @@
   "commands_codegen_description": "Generate Code For Polywrap Projects",
   "commands_codegen_error_domain": "domain",
   "commands_codegen_error_optionMissingArgument": "{option} option missing {argument} argument",
+  "commands_codegen_error_embedAppOnly": "The --embed option is currently only available for app projects",
   "commands_codegen_options_codegen": "Output directory for the generated code (default: {default})",
-  "commands_codegen_options_e": "ENS address to lookup external schemas (default: 0x0000...2e1e)",
-  "commands_codegen_options_e_address": "address",
+  "commands_codegen_options_e": "Locally embed Wasm wraps",
   "commands_codegen_options_h": "Show usage information",
   "commands_codegen_options_s": "Path to a custom generation script (JavaScript | TypeScript)",
   "commands_codegen_options_i": "IPFS node to load external schemas (default: ipfs.io & localhost)",
@@ -272,6 +272,8 @@
   "lib_project_app_uri_support": "The app command supports only filesystem URIs for plugins. Examples:",
   "lib_project_imported_plugin_manifest_not_found": "No manifest found for imported plugin namespace `{namespace}` at path `{path}`",
   "lib_project_invalid_uri": "Invalid URI Received:",
+  "lib_project_no_default_schema": "Couldn't find schema in default paths. Please specify the schema location in the project manifest.",
+  "lib_project_no_default_module": "Couldn't find module entry point in default paths. Please specify the module entry point in the project manifest.",
   "lib_typescript_notInstalled": "Your project uses typescript, but it's not installed",
   "lib_typescript_tsNodeNotInstalled": "Your project uses typescript, but ts-node is not installed",
   "lib_watcher_alreadyWatching": "Watcher session is already in progress. Directory: {dir}",

Diff for: packages/cli/src/__tests__/e2e/p2/codegen.spec.ts

@@ -19,6 +19,7 @@ Options:
   -b, --bindgen <URI>                Uri for custom bindgen wrap (must
                                      implement wrap-abi-bindgen interface; see
                                      https://github.com/polywrap/wrap-abi-bindgen)
+  -e, --embed                        Locally embed Wasm wraps
   -s, --script <path>                Path to a custom generation script
                                      (JavaScript | TypeScript)
   -c, --client-config <config-path>  Add custom configuration to the

Diff for: packages/cli/src/commands/build.ts

@@ -132,15 +132,15 @@ export const build: Command = {
 async function validateManifestModules(polywrapManifest: PolywrapManifest) {
   if (
     polywrapManifest.project.type !== "interface" &&
-    !polywrapManifest.source.module
+    !polywrapManifest.source?.module
   ) {
     const missingModuleMessage = intlMsg.lib_compiler_missingModule();
     throw Error(missingModuleMessage);
   }
 
   if (
     polywrapManifest.project.type === "interface" &&
-    polywrapManifest.source.module
+    polywrapManifest.source?.module
   ) {
     const noInterfaceModule = intlMsg.lib_compiler_noInterfaceModule();
     throw Error(noInterfaceModule);
@@ -242,11 +242,12 @@ async function run(options: Required<BuildCommandOptions>) {
         project,
         client,
       });
+      const abi = await schemaComposer.getComposedAbis();
 
       if (canRunCodegen && !noCodegen) {
         const codeGenerator = new CodeGenerator({
           project,
-          schemaComposer,
+          abi,
           codegenDirAbs: codegenDir || undefined,
           bindgenUri,
         });
@@ -261,7 +262,7 @@ async function run(options: Required<BuildCommandOptions>) {
       const compiler = new Compiler({
         project: project as PolywrapProject,
         outputDir,
-        schemaComposer,
+        abi,
         buildStrategy,
       });
 

Diff for: packages/cli/src/commands/codegen.ts

@@ -14,6 +14,8 @@ import {
   defaultPolywrapManifestFiles,
   parseLogFileOption,
   parseWrapperEnvsOption,
+  WasmEmbed,
+  getWasmEmbeds,
 } from "../lib";
 import { ScriptCodegenerator } from "../lib/codegen/ScriptCodeGenerator";
 import { DEFAULT_CODEGEN_DIR } from "../lib/defaults";
@@ -29,6 +31,7 @@ export interface CodegenCommandOptions extends BaseCommandOptions {
   manifestFile: string;
   codegenDir: string | false;
   bindgen: string | false;
+  embed: boolean | false;
   script: string | false;
   clientConfig: string | false;
   wrapperEnvs: string | false;
@@ -54,6 +57,7 @@ export const codegen: Command = {
         })}`
       )
       .option(`-b, --bindgen <URI>`, `${intlMsg.commands_codegen_options_b()}`)
+      .option(`-e, --embed`, `${intlMsg.commands_codegen_options_e()}`)
       .option(
         `-s, --script <${pathStr}>`,
         `${intlMsg.commands_codegen_options_s()}`
@@ -81,6 +85,7 @@ export const codegen: Command = {
           ),
           codegenDir: parseDirOptionNoDefault(options.codegenDir),
           bindgen: options.bindgen || false,
+          embed: options.embed || false,
           script: parseCodegenScriptOption(options.script),
           clientConfig: options.clientConfig || false,
           wrapperEnvs: options.wrapperEnvs || false,
@@ -100,6 +105,7 @@ async function run(options: Required<CodegenCommandOptions>) {
     wrapperEnvs,
     codegenDir,
     bindgen,
+    embed,
     script,
     verbose,
     quiet,
@@ -133,21 +139,34 @@ async function run(options: Required<CodegenCommandOptions>) {
     project,
     client,
   });
+  const abi = await schemaComposer.getComposedAbis();
+
+  const projectLang = await project.getManifestLanguage();
+  if (embed && !projectLang.startsWith("app")) {
+    logger.error(intlMsg.commands_codegen_error_embedAppOnly());
+    process.exit(1);
+  }
+
+  const embeds: WasmEmbed[] | undefined =
+    embed && abi.importedModuleTypes
+      ? await getWasmEmbeds(abi.importedModuleTypes, client, logger)
+      : undefined;
 
   const codeGenerator = script
     ? new ScriptCodegenerator({
         codegenDirAbs: codegenDir || undefined,
         script,
-        schemaComposer,
+        abi,
         project,
         omitHeader: false,
         mustacheView: undefined,
       })
     : new CodeGenerator({
         codegenDirAbs: codegenDir || undefined,
-        schemaComposer,
+        abi,
         project,
         bindgenUri,
+        embeds,
       });
 
   const execute = async (): Promise<boolean> => {

Diff for: packages/cli/src/lib/Compiler.ts

@@ -8,7 +8,6 @@ import {
   PolywrapProject,
   PluginProject,
   resetDir,
-  SchemaComposer,
   logActivity,
   loadDocsManifest,
 } from "./";
@@ -21,12 +20,13 @@ import fs from "fs";
 import fse from "fs-extra";
 import path from "path";
 import { DocsManifest } from "@polywrap/polywrap-manifest-types-js";
+import { Abi } from "@polywrap/schema-parse";
 
 export interface CompilerConfig {
   outputDir: string;
   project: PolywrapProject | PluginProject;
   buildStrategy?: BuildStrategy;
-  schemaComposer: SchemaComposer;
+  abi: Abi;
 }
 
 export class Compiler {
@@ -111,13 +111,12 @@ export class Compiler {
   }
 
   private async _outputWrapManifest(): Promise<unknown> {
-    const { outputDir, project, schemaComposer } = this._config;
+    const { outputDir, project, abi } = this._config;
     const manifestPath = `${outputDir}/wrap.info`;
     const run = async () => {
       const manifest = await project.getManifest();
 
       const type = manifest.project.type.split("/")[0];
-      const abi = await schemaComposer.getComposedAbis();
       await generateWrapFile(
         abi,
         manifest.project.name,

Diff for: packages/cli/src/lib/SchemaComposer.ts

@@ -73,7 +73,7 @@ export class SchemaComposer {
   private _abiResolver(
     schemaFile: SchemaFile,
     importFrom: string,
-    import_abis?: PolywrapManifest["source"]["import_abis"]
+    import_abis?: NonNullable<PolywrapManifest["source"]>["import_abis"]
   ): Promise<WrapAbi | SchemaFile> {
     if (Uri.isValidUri(importFrom)) {
       return this._resolveUri(importFrom, import_abis);
@@ -97,7 +97,7 @@ export class SchemaComposer {
 
   private async _resolveUri(
     uri: string,
-    import_abis?: PolywrapManifest["source"]["import_abis"]
+    import_abis?: NonNullable<PolywrapManifest["source"]>["import_abis"]
   ): Promise<WrapAbi> {
     // Check to see if we have any import redirects that match
     if (import_abis) {
@@ -155,7 +155,7 @@ export class SchemaComposer {
 
   private async _loadGraphqlAbi(
     path: string,
-    import_abis: PolywrapManifest["source"]["import_abis"]
+    import_abis: NonNullable<PolywrapManifest["source"]>["import_abis"]
   ): Promise<WrapAbi> {
     const schema = fs.readFileSync(path, "utf-8");
 

Diff for: packages/cli/src/lib/codegen/CodeGenerator.ts

@@ -15,19 +15,21 @@ import {
   Project,
 } from "../project";
 import { resetDir } from "../system";
-import { SchemaComposer } from "../SchemaComposer";
 import { CodegenOverrides, tryGetCodegenOverrides } from "./CodegenOverrides";
+import { WasmEmbed } from "./WasmEmbed";
 
 import path from "path";
 import { BindLanguage } from "@polywrap/schema-bind";
 import { writeDirectorySync } from "@polywrap/os-js";
 import { Uri } from "@polywrap/core-js";
+import { Abi } from "@polywrap/schema-parse";
 
 export interface CodeGeneratorConfig {
   project: Project<AnyProjectManifest>;
-  schemaComposer: SchemaComposer;
+  abi: Abi;
   codegenDirAbs?: string;
   bindgenUri?: Uri;
+  embeds?: WasmEmbed[];
 }
 
 export class CodeGenerator {
@@ -88,13 +90,19 @@ export class CodeGenerator {
         )
       : undefined;
 
-    const bindConfig = overrides
+    let bindConfig = overrides
       ? await overrides.getSchemaBindConfig(this._config.project)
       : {};
 
-    const abi = await this._config.schemaComposer.getComposedAbis();
+    if (this._config.embeds) {
+      bindConfig = {
+        ...bindConfig,
+        embeds: this._config.embeds,
+      };
+    }
+
     const binding = await this._config.project.generateSchemaBindings(
-      abi,
+      this._config.abi,
       codegenDir,
       this._config.bindgenUri?.toString(),
       bindConfig