diff --git a/packages/cli/lang/en.json b/packages/cli/lang/en.json index 825cb3db03..d6608ac7af 100644 --- a/packages/cli/lang/en.json +++ b/packages/cli/lang/en.json @@ -214,10 +214,6 @@ "lib_compiler_copyResourcesFolderText": "Copying resources folder: {folder}", "lib_compiler_copyResourcesFolderError": "Failed to copy resources folder: {folder}", "lib_compiler_copyResourcesFolderWarning": "Warnings copying resources folder: {folder}", - "lib_compiler_outputMetadataText": "Metadata written", - "lib_compiler_outputMetadataError": "Failed to output metadata", - "lib_compiler_outputMetadataWarning": "Warnings writing metadata", - "lib_compiler_outputMetadataFileText": "Metadata written to {path}", "lib_schemaComposer_abi_not_found": "ABI not found at {path}", "lib_schemaComposer_unknown_abi": "Unknown ABI type at {path}. Supported types: {types}", "lib_schemaComposer_invalid_yaml": "Invalid YAML at {path}", diff --git a/packages/cli/lang/es.json b/packages/cli/lang/es.json index 825cb3db03..d6608ac7af 100644 --- a/packages/cli/lang/es.json +++ b/packages/cli/lang/es.json @@ -214,10 +214,6 @@ "lib_compiler_copyResourcesFolderText": "Copying resources folder: {folder}", "lib_compiler_copyResourcesFolderError": "Failed to copy resources folder: {folder}", "lib_compiler_copyResourcesFolderWarning": "Warnings copying resources folder: {folder}", - "lib_compiler_outputMetadataText": "Metadata written", - "lib_compiler_outputMetadataError": "Failed to output metadata", - "lib_compiler_outputMetadataWarning": "Warnings writing metadata", - "lib_compiler_outputMetadataFileText": "Metadata written to {path}", "lib_schemaComposer_abi_not_found": "ABI not found at {path}", "lib_schemaComposer_unknown_abi": "Unknown ABI type at {path}. Supported types: {types}", "lib_schemaComposer_invalid_yaml": "Invalid YAML at {path}", diff --git a/packages/cli/src/__tests__/e2e/manifest.spec.ts b/packages/cli/src/__tests__/e2e/manifest.spec.ts index c3a5136ec7..889da7c833 100644 --- a/packages/cli/src/__tests__/e2e/manifest.spec.ts +++ b/packages/cli/src/__tests__/e2e/manifest.spec.ts @@ -29,7 +29,7 @@ Migrates the polywrap project manifest to the latest version. Arguments: type Type of manifest file to migrate (default: project) (choices: "project", "build", "deploy", - "infra", "meta", "workflow", default: "project") + "infra", "workflow", default: "project") Options: -m, --manifest-file Path to the manifest file (default: polywrap.yaml @@ -48,7 +48,7 @@ Prints out the schema for the current manifest format. Arguments: type Type of manifest file to migrate (default: project) (choices: \"project\", \"build\", \"deploy\", - \"infra\", \"meta\", \"workflow\", default: \"project\") + \"infra\", \"workflow\", default: \"project\") Options: -r, --raw Output raw JSON Schema (default: false) @@ -125,7 +125,7 @@ describe("e2e tests for manifest command", () => { }); expect(error).toBe( - `error: command-argument value 'invalid-arg' is invalid for argument 'type'. Allowed choices are project, build, deploy, infra, meta, workflow.\n` + `error: command-argument value 'invalid-arg' is invalid for argument 'type'. Allowed choices are project, build, deploy, infra, workflow.\n` ); expect(output).toEqual(``); expect(code).toEqual(1); @@ -143,7 +143,6 @@ describe("e2e tests for manifest command", () => { build: "polywrap.build.yaml", deploy: "polywrap.deploy.yaml", infra: "polywrap.infra.yaml", - meta: "polywrap.meta.yaml", workflow: "polywrap.test.yaml", }; @@ -315,7 +314,7 @@ describe("e2e tests for manifest command", () => { }); expect(error).toBe( - `error: command-argument value 'invalid-arg' is invalid for argument 'type'. Allowed choices are project, build, deploy, infra, meta, workflow.\n` + `error: command-argument value 'invalid-arg' is invalid for argument 'type'. Allowed choices are project, build, deploy, infra, workflow.\n` ); expect(output).toEqual(``); expect(code).toEqual(1); diff --git a/packages/cli/src/commands/manifest.ts b/packages/cli/src/commands/manifest.ts index e5d4a46481..7f68457213 100644 --- a/packages/cli/src/commands/manifest.ts +++ b/packages/cli/src/commands/manifest.ts @@ -4,7 +4,6 @@ import { defaultBuildManifest, defaultDeployManifest, defaultInfraManifest, - defaultMetaManifest, defaultWorkflowManifest, getProjectManifestLanguage, intlMsg, @@ -24,7 +23,6 @@ import { migrateBuildExtensionManifest, migrateDeployExtensionManifest, migrateInfraExtensionManifest, - migrateMetaExtensionManifest, migratePluginProjectManifest, migratePolywrapProjectManifest, migrateWorkflow, @@ -41,8 +39,6 @@ import { DeployManifestSchemaFiles, InfraManifestFormats, InfraManifestSchemaFiles, - MetaManifestFormats, - MetaManifestSchemaFiles, PluginManifestFormats, PluginManifestSchemaFiles, PolywrapManifestFormats, @@ -53,7 +49,6 @@ import { latestBuildManifestFormat, latestDeployManifestFormat, latestInfraManifestFormat, - latestMetaManifestFormat, latestPluginManifestFormat, latestPolywrapManifestFormat, latestPolywrapWorkflowFormat, @@ -72,7 +67,6 @@ const manifestTypes = [ "build", "deploy", "infra", - "meta", "workflow", ] as const; type ManifestType = typeof manifestTypes[number]; @@ -198,13 +192,6 @@ export const runSchemaCommand = async ( ); break; - case "meta": - manifestfile = parseManifestFileOption( - options.manifestFile, - defaultMetaManifest - ); - break; - case "deploy": manifestfile = parseManifestFileOption( options.manifestFile, @@ -307,20 +294,6 @@ export const runSchemaCommand = async ( ); break; - case "meta": - maybeFailOnUnsupportedManifestFormat( - manifestVersion, - Object.values(MetaManifestFormats), - manifestfile, - logger - ); - - manifestSchemaFile = path.join( - schemasPackageDir, - MetaManifestSchemaFiles[manifestVersion ?? latestMetaManifestFormat] - ); - break; - case "deploy": maybeFailOnUnsupportedManifestFormat( manifestVersion, @@ -467,20 +440,6 @@ const runMigrateCommand = async ( ); break; - case "meta": - maybeFailOnUnsupportedTargetFormat( - options.format, - Object.values(MetaManifestFormats), - logger - ); - migrateManifestFile( - parseManifestFileOption(options.manifestFile, defaultMetaManifest), - migrateMetaExtensionManifest, - options.format ?? latestMetaManifestFormat, - logger - ); - break; - case "deploy": maybeFailOnUnsupportedTargetFormat( options.format, diff --git a/packages/cli/src/lib/Compiler.ts b/packages/cli/src/lib/Compiler.ts index 08631f271c..264f1e7bb2 100644 --- a/packages/cli/src/lib/Compiler.ts +++ b/packages/cli/src/lib/Compiler.ts @@ -5,8 +5,6 @@ import { displayPath, generateWrapFile, intlMsg, - outputManifest, - copyMetadata, PolywrapProject, resetDir, SchemaComposer, @@ -55,9 +53,6 @@ export class Compiler { // Copy: Resources folder await this._copyResourcesFolder(); - - // Copy: Polywrap Metadata - await this._copyPolywrapMetadata(); }; try { @@ -160,29 +155,6 @@ export class Compiler { ); } - private async _copyPolywrapMetadata(): Promise { - const { outputDir, project } = this._config; - - const projectMetaManifest = await project.getMetaManifest(); - - if (!projectMetaManifest) { - return Promise.resolve(); - } - - const builtMetaManifest = await copyMetadata( - projectMetaManifest, - outputDir, - project.getManifestDir(), - project.logger - ); - - await outputManifest( - builtMetaManifest, - path.join(outputDir, "polywrap.meta.json"), - project.logger - ); - } - private async _validateWasmModule(buildDir: string): Promise { const modulePath = path.join(buildDir, `wrap.wasm`); const wasmSource = fs.readFileSync(modulePath); diff --git a/packages/cli/src/lib/helpers/index.ts b/packages/cli/src/lib/helpers/index.ts index 1c524c1700..71630a2d81 100644 --- a/packages/cli/src/lib/helpers/index.ts +++ b/packages/cli/src/lib/helpers/index.ts @@ -1,4 +1,3 @@ -export * from "./metadata"; export * from "./uuid"; export * from "./validate-client-config"; export * from "./workflow-validator"; diff --git a/packages/cli/src/lib/helpers/metadata.ts b/packages/cli/src/lib/helpers/metadata.ts deleted file mode 100644 index 3be276e89c..0000000000 --- a/packages/cli/src/lib/helpers/metadata.ts +++ /dev/null @@ -1,83 +0,0 @@ -import { Logger, logActivity } from "../logging"; -import { displayPath, intlMsg } from "../"; - -import { normalizePath } from "@polywrap/os-js"; -import { MetaManifest } from "@polywrap/polywrap-manifest-types-js"; -import fs from "fs"; -import path from "path"; - -export async function copyMetadata( - metaManifest: MetaManifest, - outputDir: string, - rootDir: string, - logger: Logger -): Promise { - const result: MetaManifest = { - ...metaManifest, - icon: undefined, - links: undefined, - }; - - const writeMetadataFile = ( - filePath: string, - outputFilePath: string, - logger: Logger - ): string => { - const outputPath = path.join(outputDir, outputFilePath); - - fs.mkdirSync(path.dirname(outputPath), { recursive: true }); - fs.copyFileSync(path.join(rootDir, filePath), outputPath); - - logger.info( - `✅` + - intlMsg.lib_compiler_outputMetadataFileText({ - path: displayPath(normalizePath(outputPath)), - }) - ); - - return displayPath(normalizePath(outputFilePath)); - }; - - const run = (logger: Logger) => { - const writeFile = (filePath: string, subDir: string): string => { - return writeMetadataFile( - filePath, - path.join("meta", subDir, path.basename(filePath)), - logger - ); - }; - - if (metaManifest.icon) { - result.icon = writeFile(metaManifest.icon, "icon/"); - } - - if (metaManifest.links) { - result.links = []; - - for (const link of metaManifest.links) { - result.links.push({ - ...link, - }); - - if (link.icon) { - result.links[result.links.length - 1].icon = writeFile( - link.icon, - "links/" - ); - } - } - } - }; - - await logActivity( - logger, - intlMsg.lib_compiler_outputMetadataText(), - intlMsg.lib_compiler_outputMetadataError(), - intlMsg.lib_compiler_outputMetadataWarning(), - async (logger) => { - return run(logger); - } - ); - - return result; -} diff --git a/packages/cli/src/lib/manifest/migrate/index.ts b/packages/cli/src/lib/manifest/migrate/index.ts index 0c5dcdadd8..30290334ee 100644 --- a/packages/cli/src/lib/manifest/migrate/index.ts +++ b/packages/cli/src/lib/manifest/migrate/index.ts @@ -2,7 +2,6 @@ export * from "./migrateAppProjectManifest"; export * from "./migrateBuildExtensionManifest"; export * from "./migrateDeployExtensionManifest"; export * from "./migrateInfraExtensionManifest"; -export * from "./migrateMetaExtensionManifest"; export * from "./migratePluginProjectManifest"; export * from "./migratePolywrapProjectManifest"; export * from "./migrateTestExtensionManifest"; diff --git a/packages/cli/src/lib/manifest/migrate/migrateMetaExtensionManifest.ts b/packages/cli/src/lib/manifest/migrate/migrateMetaExtensionManifest.ts deleted file mode 100644 index 6ba5c50583..0000000000 --- a/packages/cli/src/lib/manifest/migrate/migrateMetaExtensionManifest.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { migrateAnyManifest } from "./migrateAnyManifest"; - -import { migrateMetaManifest } from "@polywrap/polywrap-manifest-types-js"; -import { ILogger } from "@polywrap/logging-js"; - -export function migrateMetaExtensionManifest( - manifestString: string, - to: string, - logger?: ILogger -): string { - return migrateAnyManifest( - manifestString, - "MetaManifest", - migrateMetaManifest, - to, - logger - ); -} diff --git a/packages/cli/src/lib/project/PolywrapProject.ts b/packages/cli/src/lib/project/PolywrapProject.ts index cccee4aa9d..9f9b353b8e 100644 --- a/packages/cli/src/lib/project/PolywrapProject.ts +++ b/packages/cli/src/lib/project/PolywrapProject.ts @@ -7,7 +7,6 @@ import { loadBuildManifest, loadDeployManifest, loadDeployManifestExt, - loadMetaManifest, loadPolywrapManifest, PolywrapManifestLanguage, polywrapManifestLanguages, @@ -20,7 +19,6 @@ import { createUUID } from "../helpers"; import { BuildManifest, DeployManifest, - MetaManifest, PolywrapManifest, } from "@polywrap/polywrap-manifest-types-js"; import { normalizePath } from "@polywrap/os-js"; @@ -36,7 +34,6 @@ export interface PolywrapProjectConfig extends ProjectConfig { polywrapManifestPath: string; buildManifestPath?: string; deployManifestPath?: string; - metaManifestPath?: string; } export interface BuildManifestConfig { @@ -70,7 +67,6 @@ export class PolywrapProject extends Project { private _polywrapManifest: PolywrapManifest | undefined; private _buildManifest: BuildManifest | undefined; private _deployManifest: DeployManifest | undefined; - private _metaManifest: MetaManifest | undefined; private _defaultDeployModulesCached = false; constructor(protected _config: PolywrapProjectConfig) { @@ -89,7 +85,6 @@ export class PolywrapProject extends Project { public reset(): void { this._polywrapManifest = undefined; this._buildManifest = undefined; - this._metaManifest = undefined; this._deployManifest = undefined; this._defaultDeployModulesCached = false; this._cache.removeCacheDir( @@ -408,50 +403,6 @@ export class PolywrapProject extends Project { this._defaultDeployModulesCached = true; } - /// Polywrap Meta Manifest (polywrap.build.yaml) - - public async getMetaManifestPath(): Promise { - const polywrapManifest = await this.getManifest(); - - // If a custom meta manifest path is configured - if (this._config.metaManifestPath) { - return this._config.metaManifestPath; - } - // If the polywrap.yaml manifest specifies a custom meta manifest - else if (polywrapManifest.extensions?.meta) { - this._config.metaManifestPath = path.join( - this.getManifestDir(), - polywrapManifest.extensions.meta - ); - return this._config.metaManifestPath; - } - // No meta manifest found - else { - return undefined; - } - } - - public async getMetaManifestDir(): Promise { - const manifestPath = await this.getMetaManifestPath(); - - if (manifestPath) { - return path.dirname(manifestPath); - } else { - return undefined; - } - } - - public async getMetaManifest(): Promise { - if (!this._metaManifest) { - const manifestPath = await this.getMetaManifestPath(); - - if (manifestPath) { - this._metaManifest = await loadMetaManifest(manifestPath, this.logger); - } - } - return this._metaManifest; - } - public async getManifestPaths(absolute = false): Promise { const root = this.getManifestDir(); const paths = [ @@ -468,14 +419,6 @@ export class PolywrapProject extends Project { ); } - const metaManifestPath = await this.getMetaManifestPath(); - - if (metaManifestPath) { - paths.push( - absolute ? metaManifestPath : path.relative(root, metaManifestPath) - ); - } - const deployManifestPath = await this.getDeployManifestPath(); if (deployManifestPath) { diff --git a/packages/cli/src/lib/project/manifests/output.ts b/packages/cli/src/lib/project/manifests/output.ts index 28706b2edc..3495a53177 100644 --- a/packages/cli/src/lib/project/manifests/output.ts +++ b/packages/cli/src/lib/project/manifests/output.ts @@ -3,7 +3,6 @@ import { displayPath, Logger, logActivity, intlMsg } from "../../"; import { BuildManifest, PolywrapManifest, - MetaManifest, PluginManifest, } from "@polywrap/polywrap-manifest-types-js"; import { writeFileSync, normalizePath } from "@polywrap/os-js"; @@ -12,7 +11,7 @@ import path from "path"; import fs from "fs"; export async function outputManifest( - manifest: PolywrapManifest | BuildManifest | MetaManifest | PluginManifest, + manifest: PolywrapManifest | BuildManifest | PluginManifest, manifestPath: string, logger: Logger ): Promise { diff --git a/packages/cli/src/lib/project/manifests/polywrap/load.ts b/packages/cli/src/lib/project/manifests/polywrap/load.ts index 3624caa34c..3b80c234b6 100644 --- a/packages/cli/src/lib/project/manifests/polywrap/load.ts +++ b/packages/cli/src/lib/project/manifests/polywrap/load.ts @@ -10,11 +10,9 @@ import { import { PolywrapManifest, BuildManifest, - MetaManifest, DeployManifest, deserializePolywrapManifest, deserializeBuildManifest, - deserializeMetaManifest, deserializeDeployManifest, InfraManifest, deserializeInfraManifest, @@ -197,42 +195,6 @@ export async function loadDeployManifestExt( ); } -export const defaultMetaManifest = ["polywrap.meta.yaml", "polywrap.meta.yml"]; - -export async function loadMetaManifest( - manifestPath: string, - logger: Logger -): Promise { - const run = (): Promise => { - const manifest = fs.readFileSync(manifestPath, "utf-8"); - - if (!manifest) { - const noLoadMessage = intlMsg.lib_helpers_manifest_unableToLoad({ - path: `${manifestPath}`, - }); - throw Error(noLoadMessage); - } - - try { - const result = deserializeMetaManifest(manifest, { logger: logger }); - return Promise.resolve(result); - } catch (e) { - return Promise.reject(e); - } - }; - - manifestPath = displayPath(manifestPath); - return await logActivity( - logger, - intlMsg.lib_helpers_manifest_loadText({ path: manifestPath }), - intlMsg.lib_helpers_manifest_loadError({ path: manifestPath }), - intlMsg.lib_helpers_manifest_loadWarning({ path: manifestPath }), - async () => { - return await run(); - } - ); -} - export const defaultInfraManifest = [ "polywrap.infra.yaml", "polywrap.infra.yml", diff --git a/packages/js/manifests/polywrap/src/formats/index.ts b/packages/js/manifests/polywrap/src/formats/index.ts index ac1fbbf70b..cf7d67e6cc 100644 --- a/packages/js/manifests/polywrap/src/formats/index.ts +++ b/packages/js/manifests/polywrap/src/formats/index.ts @@ -1,8 +1,10 @@ +// Project Types export * from "./polywrap"; +export * from "./polywrap.plugin"; +export * from "./polywrap.app"; + +// Project Extensions export * from "./polywrap.build"; export * from "./polywrap.infra"; export * from "./polywrap.deploy"; -export * from "./polywrap.meta"; -export * from "./polywrap.plugin"; -export * from "./polywrap.app"; export * from "./polywrap.test"; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.app/0.3.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap.app/0.3.0.ts new file mode 100644 index 0000000000..318fab58a1 --- /dev/null +++ b/packages/js/manifests/polywrap/src/formats/polywrap.app/0.3.0.ts @@ -0,0 +1,68 @@ +/* eslint-disable @typescript-eslint/naming-convention */ +/* tslint:disable */ +/** + * This file was automatically generated by json-schema-to-typescript. + * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, + * and run json-schema-to-typescript to regenerate this file. + */ + +export interface AppManifest { + /** + * Polywrap manifest format version. + */ + format: "0.3.0"; + /** + * Basic project properties. + */ + project: { + /** + * Name of this project. + */ + name: string; + /** + * Type of this project. + */ + type: string; + }; + /** + * Project source files. + */ + source: { + /** + * Path to the project's graphql schema. + */ + schema: string; + /** + * Specify ABIs to be used for the import URIs within your schema. + */ + import_abis?: ImportAbis[]; + }; + /** + * Project extension files (build, deploy, infra). + */ + extensions?: { + /** + * Path to the project build manifest file. + */ + build?: string; + /** + * Path to project deploy manifest file. + */ + deploy?: string; + /** + * Path to project infra manifest file. + */ + infra?: string; + }; + __type: "AppManifest"; +} +export interface ImportAbis { + /** + * One of the schema's import URI. + */ + uri: string; + /** + * Path to a local ABI (or schema). Supported file formats: [*.graphql, *.info, *.json, *.yaml] + */ + abi: string; +} diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.app/index.ts b/packages/js/manifests/polywrap/src/formats/polywrap.app/index.ts index 4a4387396a..ae289deac0 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.app/index.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.app/index.ts @@ -11,10 +11,14 @@ import { import { AppManifest as AppManifest_0_2_0, } from "./0.2.0"; +import { + AppManifest as AppManifest_0_3_0, +} from "./0.3.0"; export { AppManifest_0_1_0, AppManifest_0_2_0, + AppManifest_0_3_0, }; export enum AppManifestFormats { @@ -22,6 +26,7 @@ export enum AppManifestFormats { "v0.1" = "0.1", "v0.1.0" = "0.1.0", "v0.2.0" = "0.2.0", + "v0.3.0" = "0.3.0", } export const AppManifestSchemaFiles: Record = { @@ -29,17 +34,19 @@ export const AppManifestSchemaFiles: Record = { "0.1": "formats/polywrap.app/0.1.0.json", "0.1.0": "formats/polywrap.app/0.1.0.json", "0.2.0": "formats/polywrap.app/0.2.0.json", + "0.3.0": "formats/polywrap.app/0.3.0.json", } export type AnyAppManifest = | AppManifest_0_1_0 | AppManifest_0_2_0 + | AppManifest_0_3_0 -export type AppManifest = AppManifest_0_2_0; +export type AppManifest = AppManifest_0_3_0; -export const latestAppManifestFormat = AppManifestFormats["v0.2.0"] +export const latestAppManifestFormat = AppManifestFormats["v0.3.0"] export { migrateAppManifest } from "./migrate"; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/0.2.0_to_0.3.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/0.2.0_to_0.3.0.ts new file mode 100644 index 0000000000..5937e0c16d --- /dev/null +++ b/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/0.2.0_to_0.3.0.ts @@ -0,0 +1,15 @@ +import { ILogger } from "@polywrap/logging-js"; +import { AppManifest as OldManifest } from "../0.2.0"; +import { AppManifest as NewManifest } from "../0.3.0"; + +export function migrate(migrate: OldManifest, logger?: ILogger): NewManifest { + if (migrate.extensions?.meta) { + logger?.warn( + `The Polywrap Meta Manifest has been deprecated for app projects.` + ); + } + return { + ...migrate, + format: "0.3.0", + }; +} diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/index.ts b/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/index.ts index 2c882af9fa..a879480d60 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/index.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/index.ts @@ -1,5 +1,6 @@ import { Migrator } from "../../../migrations"; import { migrate as migrate_0_1_0_to_0_2_0 } from "./0.1.0_to_0.2.0"; +import { migrate as migrate_0_2_0_to_0_3_0 } from "./0.2.0_to_0.3.0"; export const migrators: Migrator[] = [ { @@ -11,5 +12,10 @@ export const migrators: Migrator[] = [ from: "0.1.0", to: "0.2.0", migrate: migrate_0_1_0_to_0_2_0 + }, + { + from: "0.2.0", + to: "0.3.0", + migrate: migrate_0_2_0_to_0_3_0 } -]; \ No newline at end of file +]; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.app/validate.ts b/packages/js/manifests/polywrap/src/formats/polywrap.app/validate.ts index 9a27efed1d..b53e83e4fe 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.app/validate.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.app/validate.ts @@ -11,6 +11,7 @@ import { import AppManifestSchema_0_1_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap.app/0.1.0.json"; import AppManifestSchema_0_2_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap.app/0.2.0.json"; +import AppManifestSchema_0_3_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap.app/0.3.0.json"; import { Schema, @@ -28,6 +29,7 @@ const schemas: AppManifestSchemas = { "0.1": AppManifestSchema_0_1_0, "0.1.0": AppManifestSchema_0_1_0, "0.2.0": AppManifestSchema_0_2_0, + "0.3.0": AppManifestSchema_0_3_0, }; const validator = new Validator(); diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.meta/0.1.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap.meta/0.1.0.ts deleted file mode 100644 index d1423b71fd..0000000000 --- a/packages/js/manifests/polywrap/src/formats/polywrap.meta/0.1.0.ts +++ /dev/null @@ -1,56 +0,0 @@ -/* eslint-disable @typescript-eslint/naming-convention */ -/* tslint:disable */ -/** - * This file was automatically generated by json-schema-to-typescript. - * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, - * and run json-schema-to-typescript to regenerate this file. - */ - -export interface MetaManifest { - /** - * Polywrap wrapper metadata manifest format version. - */ - format: "0.1.0" | "0.1"; - /** - * Name of the wrapper. - */ - displayName?: string; - /** - * Short or summary description of the wrapper. - */ - subtext?: string; - /** - * Long description for the wrapper. - */ - description?: string; - /** - * Reference to the repository holding source code. - */ - repository?: string; - /** - * List of relevant tag keywords. - */ - tags?: string[]; - /** - * Path to wrapper icon. - */ - icon?: string; - /** - * Relevant web links. - */ - links?: { - /** - * Web link name. - */ - name: string; - /** - * Web link icon. - */ - icon?: string; - /** - * Url to the web link. - */ - url: string; - }[]; - __type: "MetaManifest"; -} diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.meta/deserialize.ts b/packages/js/manifests/polywrap/src/formats/polywrap.meta/deserialize.ts deleted file mode 100644 index 14e7bc7532..0000000000 --- a/packages/js/manifests/polywrap/src/formats/polywrap.meta/deserialize.ts +++ /dev/null @@ -1,63 +0,0 @@ -/* eslint-disable */ -/** - * This file was automatically generated by scripts/manifest/deserialize-ts.mustache. - * DO NOT MODIFY IT BY HAND. Instead, modify scripts/manifest/deserialize-ts.mustache, - * and run node ./scripts/manifest/generateFormatTypes.js to regenerate this file. - */ - -import { - MetaManifest, - AnyMetaManifest, - migrateMetaManifest, - validateMetaManifest, - latestMetaManifestFormat, -} from "."; -import { DeserializeManifestOptions } from "../../"; - -import * as Semver from "semver"; -import YAML from "yaml"; - -export function deserializeMetaManifest( - manifest: string, - options?: DeserializeManifestOptions -): MetaManifest { - let anyMetaManifest: AnyMetaManifest | undefined; - try { - anyMetaManifest = JSON.parse(manifest) as AnyMetaManifest; - } catch (_) { - try { - anyMetaManifest = YAML.parse(manifest) as AnyMetaManifest; - } catch (_) { } - } - - if (!anyMetaManifest) { - throw Error(`Unable to parse MetaManifest: ${manifest}`); - } - - if (!options || !options.noValidate) { - validateMetaManifest(anyMetaManifest, options?.extSchema); - } - - anyMetaManifest.__type = "MetaManifest"; - - const versionCompare = Semver.compare( - Semver.coerce(anyMetaManifest.format) || anyMetaManifest.format, - Semver.coerce(latestMetaManifestFormat) || latestMetaManifestFormat - ); - - if (versionCompare === -1) { - // Warn user to migrate their manifest - options?.logger?.warn(`MetaManifest is using an older version of the manifest format (${anyMetaManifest.format}). Please update your manifest to the latest version (${latestMetaManifestFormat}) by using the "polywrap manifest migrate " command.`); - - // Upgrade - return migrateMetaManifest(anyMetaManifest, latestMetaManifestFormat, options?.logger); - } else if (versionCompare === 1) { - // Downgrade - throw Error( - `Cannot downgrade Polywrap version ${anyMetaManifest.format}, please upgrade your PolywrapClient package.` - ); - } else { - // Latest - return anyMetaManifest as MetaManifest; - } -} diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.meta/index.ts b/packages/js/manifests/polywrap/src/formats/polywrap.meta/index.ts deleted file mode 100644 index 83bb1d7782..0000000000 --- a/packages/js/manifests/polywrap/src/formats/polywrap.meta/index.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* eslint-disable */ -/** - * This file was automatically generated by scripts/manifest/index-ts.mustache. - * DO NOT MODIFY IT BY HAND. Instead, modify scripts/manifest/index-ts.mustache, - * and run node ./scripts/manifest/generateFormatTypes.js to regenerate this file. - */ - -import { - MetaManifest as MetaManifest_0_1_0, -} from "./0.1.0"; - -export { - MetaManifest_0_1_0, -}; - -export enum MetaManifestFormats { - // NOTE: Patch fix for backwards compatability - "v0.1" = "0.1", - "v0.1.0" = "0.1.0", -} - -export const MetaManifestSchemaFiles: Record = { - // NOTE: Patch fix for backwards compatability - "0.1": "formats/polywrap.meta/0.1.0.json", - "0.1.0": "formats/polywrap.meta/0.1.0.json", -} - -export type AnyMetaManifest = - | MetaManifest_0_1_0 - - - -export type MetaManifest = MetaManifest_0_1_0; - -export const latestMetaManifestFormat = MetaManifestFormats["v0.1.0"] - -export { migrateMetaManifest } from "./migrate"; - -export { deserializeMetaManifest } from "./deserialize"; - -export { validateMetaManifest } from "./validate"; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.meta/migrate.ts b/packages/js/manifests/polywrap/src/formats/polywrap.meta/migrate.ts deleted file mode 100644 index 21f1960e80..0000000000 --- a/packages/js/manifests/polywrap/src/formats/polywrap.meta/migrate.ts +++ /dev/null @@ -1,45 +0,0 @@ -/* eslint-disable */ -/** - * This file was automatically generated by scripts/manifest/migrate-ts.mustache. - * DO NOT MODIFY IT BY HAND. Instead, modify scripts/manifest/migrate-ts.mustache, - * and run node ./scripts/manifest/generateFormatTypes.js to regenerate this file. - */ -import { - AnyMetaManifest, - MetaManifest, - MetaManifestFormats, -} from "."; -import { findShortestMigrationPath } from "../../migrations"; -import { migrators } from "./migrators"; -import { ILogger } from "@polywrap/logging-js"; - -export function migrateMetaManifest( - manifest: AnyMetaManifest, - to: MetaManifestFormats, - logger?: ILogger -): MetaManifest { - let from = manifest.format as MetaManifestFormats; - - if (!(Object.values(MetaManifestFormats).some(x => x === from))) { - throw new Error(`Unrecognized MetaManifestFormat "${manifest.format}"`); - } - - if (!(Object.values(MetaManifestFormats).some(x => x === to))) { - throw new Error(`Unrecognized MetaManifestFormat "${to}"`); - } - - const migrationPath = findShortestMigrationPath(migrators, from, to); - if (!migrationPath) { - throw new Error( - `Migration path from MetaManifestFormat "${from}" to "${to}" is not available` - ); - } - - let newManifest = manifest; - - for(const migrator of migrationPath){ - newManifest = migrator.migrate(newManifest, logger) as AnyMetaManifest; - } - - return newManifest as MetaManifest; -} diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.meta/migrators/index.ts b/packages/js/manifests/polywrap/src/formats/polywrap.meta/migrators/index.ts deleted file mode 100644 index 6fa0ce38a3..0000000000 --- a/packages/js/manifests/polywrap/src/formats/polywrap.meta/migrators/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { Migrator } from "../../../migrations"; - -export const migrators: Migrator[] = []; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.meta/validate.ts b/packages/js/manifests/polywrap/src/formats/polywrap.meta/validate.ts deleted file mode 100644 index 294066e85f..0000000000 --- a/packages/js/manifests/polywrap/src/formats/polywrap.meta/validate.ts +++ /dev/null @@ -1,58 +0,0 @@ -/* eslint-disable */ -/** - * This file was automatically generated by scripts/manifest/validate-ts.mustache. - * DO NOT MODIFY IT BY HAND. Instead, modify scripts/manifest/validate-ts.mustache, - * and run node ./scripts/manifest/generateFormatTypes.js to regenerate this file. - */ -import { - AnyMetaManifest, - MetaManifestFormats -} from "."; - -import MetaManifestSchema_0_1_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap.meta/0.1.0.json"; - -import { - Schema, - Validator, - ValidationError, - ValidatorResult -} from "jsonschema"; - -type MetaManifestSchemas = { - [key in MetaManifestFormats]: Schema | undefined -}; - -const schemas: MetaManifestSchemas = { - // NOTE: Patch fix for backwards compatability - "0.1": MetaManifestSchema_0_1_0, - "0.1.0": MetaManifestSchema_0_1_0, -}; - -const validator = new Validator(); - - -export function validateMetaManifest( - manifest: AnyMetaManifest, - extSchema: Schema | undefined = undefined -): void { - const schema = schemas[manifest.format as MetaManifestFormats]; - - if (!schema) { - throw Error(`Unrecognized MetaManifest schema format "${manifest.format}"\nmanifest: ${JSON.stringify(manifest, null, 2)}`); - } - - const throwIfErrors = (result: ValidatorResult) => { - if (result.errors.length) { - throw new Error([ - `Validation errors encountered while sanitizing MetaManifest format ${manifest.format}`, - ...result.errors.map((error: ValidationError) => error.toString()) - ].join("\n")); - } - }; - - throwIfErrors(validator.validate(manifest, schema)); - - if (extSchema) { - throwIfErrors(validator.validate(manifest, extSchema)); - } -} diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/0.3.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/0.3.0.ts new file mode 100644 index 0000000000..20065fa286 --- /dev/null +++ b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/0.3.0.ts @@ -0,0 +1,72 @@ +/* eslint-disable @typescript-eslint/naming-convention */ +/* tslint:disable */ +/** + * This file was automatically generated by json-schema-to-typescript. + * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, + * and run json-schema-to-typescript to regenerate this file. + */ + +export interface PluginManifest { + /** + * Polywrap manifest format version. + */ + format: "0.3.0"; + /** + * Basic project properties. + */ + project: { + /** + * Name of this project. + */ + name: string; + /** + * Type of this project. + */ + type: string; + }; + /** + * Project source files. + */ + source: { + /** + * Path to the project's entry point. + */ + module: string; + /** + * Path to the project's graphql schema. + */ + schema: string; + /** + * Specify ABIs to be used for the import URIs within your schema. + */ + import_abis?: ImportAbis[]; + }; + /** + * Project extension files (build, deploy, infra). + */ + extensions?: { + /** + * Path to the project build manifest file. + */ + build?: string; + /** + * Path to project deploy manifest file. + */ + deploy?: string; + /** + * Path to project infra manifest file. + */ + infra?: string; + }; + __type: "PluginManifest"; +} +export interface ImportAbis { + /** + * One of the schema's import URI. + */ + uri: string; + /** + * Path to a local ABI (or schema). Supported file formats: [*.graphql, *.info, *.json, *.yaml] + */ + abi: string; +} diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/index.ts b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/index.ts index 0f385f8de1..9d7eeb4e96 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/index.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/index.ts @@ -11,10 +11,14 @@ import { import { PluginManifest as PluginManifest_0_2_0, } from "./0.2.0"; +import { + PluginManifest as PluginManifest_0_3_0, +} from "./0.3.0"; export { PluginManifest_0_1_0, PluginManifest_0_2_0, + PluginManifest_0_3_0, }; export enum PluginManifestFormats { @@ -22,6 +26,7 @@ export enum PluginManifestFormats { "v0.1" = "0.1", "v0.1.0" = "0.1.0", "v0.2.0" = "0.2.0", + "v0.3.0" = "0.3.0", } export const PluginManifestSchemaFiles: Record = { @@ -29,17 +34,19 @@ export const PluginManifestSchemaFiles: Record = { "0.1": "formats/polywrap.plugin/0.1.0.json", "0.1.0": "formats/polywrap.plugin/0.1.0.json", "0.2.0": "formats/polywrap.plugin/0.2.0.json", + "0.3.0": "formats/polywrap.plugin/0.3.0.json", } export type AnyPluginManifest = | PluginManifest_0_1_0 | PluginManifest_0_2_0 + | PluginManifest_0_3_0 -export type PluginManifest = PluginManifest_0_2_0; +export type PluginManifest = PluginManifest_0_3_0; -export const latestPluginManifestFormat = PluginManifestFormats["v0.2.0"] +export const latestPluginManifestFormat = PluginManifestFormats["v0.3.0"] export { migratePluginManifest } from "./migrate"; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/0.2.0_to_0.3.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/0.2.0_to_0.3.0.ts new file mode 100644 index 0000000000..1f9b3ce684 --- /dev/null +++ b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/0.2.0_to_0.3.0.ts @@ -0,0 +1,15 @@ +import { ILogger } from "@polywrap/logging-js"; +import { PluginManifest as OldManifest } from "../0.2.0"; +import { PluginManifest as NewManifest } from "../0.3.0"; + +export function migrate(migrate: OldManifest, logger?: ILogger): NewManifest { + if (migrate.extensions?.meta) { + logger?.warn( + `The Polywrap Meta Manifest has been deprecated for plugin projects.` + ); + } + return { + ...migrate, + format: "0.3.0", + }; +} diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/index.ts b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/index.ts index 2c882af9fa..f4fd249faa 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/index.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/index.ts @@ -1,5 +1,6 @@ import { Migrator } from "../../../migrations"; import { migrate as migrate_0_1_0_to_0_2_0 } from "./0.1.0_to_0.2.0"; +import { migrate as migrate_0_2_0_to_0_3_0 } from "./0.2.0_to_0.3.0"; export const migrators: Migrator[] = [ { @@ -11,5 +12,10 @@ export const migrators: Migrator[] = [ from: "0.1.0", to: "0.2.0", migrate: migrate_0_1_0_to_0_2_0 + }, + { + from: "0.2.0", + to: "0.3.0", + migrate: migrate_0_2_0_to_0_3_0 } ]; \ No newline at end of file diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/validate.ts b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/validate.ts index e5632fbaa1..20d91e186e 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/validate.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/validate.ts @@ -11,6 +11,7 @@ import { import PluginManifestSchema_0_1_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap.plugin/0.1.0.json"; import PluginManifestSchema_0_2_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap.plugin/0.2.0.json"; +import PluginManifestSchema_0_3_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap.plugin/0.3.0.json"; import { Schema, @@ -28,6 +29,7 @@ const schemas: PluginManifestSchemas = { "0.1": PluginManifestSchema_0_1_0, "0.1.0": PluginManifestSchema_0_1_0, "0.2.0": PluginManifestSchema_0_2_0, + "0.3.0": PluginManifestSchema_0_3_0, }; const validator = new Validator(); diff --git a/packages/js/manifests/polywrap/src/formats/polywrap/0.3.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap/0.3.0.ts index 10e9848af3..0aa9a1ba51 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap/0.3.0.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap/0.3.0.ts @@ -46,17 +46,13 @@ export interface PolywrapManifest { */ resources?: string; /** - * Project extension files (build, meta, deploy, infra). + * Project extension files (build, deploy, infra). */ extensions?: { /** * Path to the project build manifest file. */ build?: string; - /** - * Path to project metadata manifest file. - */ - meta?: string; /** * Path to project deploy manifest file. */ diff --git a/packages/js/manifests/polywrap/src/formats/polywrap/migrators/0.2.0_to_0.3.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap/migrators/0.2.0_to_0.3.0.ts index 4a01a3d86c..8424c0eda4 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap/migrators/0.2.0_to_0.3.0.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap/migrators/0.2.0_to_0.3.0.ts @@ -3,6 +3,11 @@ import { PolywrapManifest as OldManifest } from "../0.2.0"; import { PolywrapManifest as NewManifest } from "../0.3.0"; export function migrate(migrate: OldManifest, logger?: ILogger): NewManifest { + if (migrate.extensions?.meta) { + logger?.warn( + `The Polywrap Meta Manifest has been deprecated, please use the new "resources" field in the Polywrap Manifest.` + ); + } return { ...migrate, format: "0.3.0", diff --git a/packages/js/manifests/polywrap/src/migrations/Migrator.ts b/packages/js/manifests/polywrap/src/migrations/Migrator.ts index de9ccf6033..d18b79db26 100644 --- a/packages/js/manifests/polywrap/src/migrations/Migrator.ts +++ b/packages/js/manifests/polywrap/src/migrations/Migrator.ts @@ -4,7 +4,6 @@ import { AnyBuildManifest, AnyDeployManifest, AnyInfraManifest, - AnyMetaManifest, AnyPluginManifest, AnyPolywrapManifest, AnyPolywrapWorkflow, @@ -17,7 +16,6 @@ type AnyManifest = | AnyInfraManifest | AnyDeployManifest | AnyBuildManifest - | AnyMetaManifest | AnyPolywrapWorkflow; export type Migrator = { diff --git a/packages/js/validation/src/__tests__/wrappers/more-than-6-files/another.txt b/packages/js/validation/src/__tests__/wrappers/more-than-6-files/another.txt new file mode 100644 index 0000000000..1910281566 --- /dev/null +++ b/packages/js/validation/src/__tests__/wrappers/more-than-6-files/another.txt @@ -0,0 +1 @@ +foo \ No newline at end of file diff --git a/packages/js/validation/src/__tests__/wrappers/more-than-6-files/meta/icon/icon.png b/packages/js/validation/src/__tests__/wrappers/more-than-6-files/meta/icon/icon.png deleted file mode 100644 index 3102d9847d..0000000000 Binary files a/packages/js/validation/src/__tests__/wrappers/more-than-6-files/meta/icon/icon.png and /dev/null differ diff --git a/packages/js/validation/src/__tests__/wrappers/more-than-6-files/one.txt b/packages/js/validation/src/__tests__/wrappers/more-than-6-files/one.txt new file mode 100644 index 0000000000..ba0e162e1c --- /dev/null +++ b/packages/js/validation/src/__tests__/wrappers/more-than-6-files/one.txt @@ -0,0 +1 @@ +bar \ No newline at end of file diff --git a/packages/js/validation/src/__tests__/wrappers/more-than-6-files/polywrap.meta.json b/packages/js/validation/src/__tests__/wrappers/more-than-6-files/polywrap.meta.json deleted file mode 100644 index c8d35dc101..0000000000 --- a/packages/js/validation/src/__tests__/wrappers/more-than-6-files/polywrap.meta.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "format": "0.1.0", - "displayName": "Valid Wrapper", - "tags": ["some", "tag"], - "subtext": "test subtext", - "description": "test description", - "repository": "https://github.com/test/test", - "icon": "./meta/icon/icon.png" -} diff --git a/packages/js/validation/src/types/ValidationFailReason.ts b/packages/js/validation/src/types/ValidationFailReason.ts index 14b7e0155c..8dd6069b2b 100644 --- a/packages/js/validation/src/types/ValidationFailReason.ts +++ b/packages/js/validation/src/types/ValidationFailReason.ts @@ -3,7 +3,6 @@ export enum ValidationFailReason { MultipleWrapManifests, WrapManifestNotFound, InvalidBuildManifest, - InvalidMetaManifest, FileTooLarge, PackageTooLarge, ModuleTooLarge, diff --git a/packages/manifests/polywrap/README.md b/packages/manifests/polywrap/README.md index de982050d4..e78bccfc98 100644 --- a/packages/manifests/polywrap/README.md +++ b/packages/manifests/polywrap/README.md @@ -5,5 +5,4 @@ Versioned formats of the various Polywrap toolchain manifests: * [`polywrap.plugin`](./formats/polywrap.plugin/) * [`polywrap.build`](./formats/polywrap.build/) * [`polywrap.deploy`](./formats/polywrap.deploy/) -* [`polywrap.meta`](./formats/polywrap.meta/) * [`polywrap.infra`](./formats/polywrap.infra/) diff --git a/packages/manifests/polywrap/formats/polywrap.app/0.3.0.json b/packages/manifests/polywrap/formats/polywrap.app/0.3.0.json new file mode 100644 index 0000000000..7b03d2c784 --- /dev/null +++ b/packages/manifests/polywrap/formats/polywrap.app/0.3.0.json @@ -0,0 +1,92 @@ +{ + "id": "AppManifest", + "type": "object", + "additionalProperties": false, + "required": ["format", "project", "source"], + "properties": { + "format": { + "description": "Polywrap manifest format version.", + "type": "string", + "enum": ["0.3.0"] + }, + "project": { + "description": "Basic project properties.", + "type": "object", + "additionalProperties": false, + "required": ["name", "type"], + "properties": { + "name": { + "description": "Name of this project.", + "type": "string", + "pattern": "^[a-zA-Z0-9\\-\\_]+$" + }, + "type": { + "description": "Type of this project.", + "type": "string", + "pattern": "^app\\/[a-z0-9]+$" + } + } + }, + "source": { + "description": "Project source files.", + "type": "object", + "additionalProperties": false, + "required": ["schema"], + "properties": { + "schema": { + "description": "Path to the project's graphql schema.", + "type": "string", + "pattern": "^\\.?\\.?\\/?((\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)+\\/)?[\\w\\-\\.]+\\.graphql$" + }, + "import_abis": { + "description": "Specify ABIs to be used for the import URIs within your schema.", + "type": "array", + "items": { + "$ref": "#/definitions/import_abis" + } + } + } + }, + "extensions": { + "description": "Project extension files (build, deploy, infra).", + "type": "object", + "additionalProperties": false, + "properties": { + "build": { + "description": "Path to the project build manifest file.", + "type": "string", + "pattern": "^\\.?\\.?(\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)*\\/[\\w\\-\\.]+\\.(yaml|json)$" + }, + "deploy": { + "description": "Path to project deploy manifest file.", + "type": "string", + "pattern": "^\\.?\\.?(\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)*\\/[\\w\\-\\.]+\\.(yaml|json)$" + }, + "infra": { + "description": "Path to project infra manifest file.", + "type": "string", + "pattern": "^\\.?\\.?(\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)*\\/[\\w\\-\\.]+\\.(yaml|json)$" + } + } + } + }, + "definitions": { + "import_abis": { + "type": "object", + "additionalProperties": false, + "properties": { + "uri": { + "description": "One of the schema's import URI.", + "type": "string", + "pattern": "^[wrap://]*[a-z\\-\\_0-9]+\\/.+$" + }, + "abi": { + "description": "Path to a local ABI (or schema). Supported file formats: [*.graphql, *.info, *.json, *.yaml]", + "type": "string", + "pattern": "^\\.?\\.?\\/?((\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)+\\/)?[\\w\\-\\.]+\\.(info|graphql|json|yaml)$" + } + }, + "required": ["uri", "abi"] + } + } +} diff --git a/packages/manifests/polywrap/formats/polywrap.meta/0.1.0.json b/packages/manifests/polywrap/formats/polywrap.meta/0.1.0.json deleted file mode 100644 index c062a1b70e..0000000000 --- a/packages/manifests/polywrap/formats/polywrap.meta/0.1.0.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "id": "MetaManifest", - "type": "object", - "additionalProperties": false, - "required": [ - "format" - ], - "properties": { - "format": { - "description": "Polywrap wrapper metadata manifest format version.", - "type": "string", - "enum": ["0.1.0", "0.1"] - }, - "displayName": { - "description": "Name of the wrapper.", - "type": "string" - }, - "subtext": { - "description": "Short or summary description of the wrapper.", - "type": "string" - }, - "description": { - "description": "Long description for the wrapper.", - "type": "string" - }, - "repository": { - "description": "Reference to the repository holding source code.", - "type": "string", - "pattern": "^((h|H)(t|T)(t|T)(p|P)(s|S)?:\\/\\/)?((([a-zA-Z\\d]([a-zA-Z\\d-]*[a-zA-Z\\d])*)\\.)+[a-zA-Z]{2,}|((\\d{1,3}\\.){3}\\d{1,3}))(\\:\\d+)?(\\/[-a-zA-Z\\d%_.~+]*)*(\\?[;&a-zA-Z\\d%_.~+=-]*)?(\\#[-a-zA-Z\\d_]*)?$" - }, - "tags": { - "description": "List of relevant tag keywords.", - "type": "array", - "items": { - "description": "Tag keyword.", - "type": "string", - "pattern": "^[a-zA-Z0-9\\-\\_]+$" - } - }, - "icon": { - "description": "Path to wrapper icon.", - "type": "string", - "pattern": "^\\.?\\.?(\\/[\\w\\-\\.]+|\\/\\.\\.|\\/\\.)*\\/[\\w\\-\\.]+\\.(svg|png)$" - }, - "links": { - "description": "Relevant web links.", - "type": "array", - "items": { - "type": "object", - "additionalProperties": false, - "properties": { - "name": { - "description": "Web link name.", - "type": "string" - }, - "icon": { - "description": "Web link icon.", - "type": "string", - "pattern": "^\\.?\\.?(\\/[\\w\\-\\.]+|\\/\\.\\.|\\/\\.)*\\/[\\w\\-\\.]+\\.(svg|png)$" - }, - "url": { - "description": "Url to the web link.", - "type": "string", - "pattern": "^((h|H)(t|T)(t|T)(p|P)(s|S)?:\\/\\/)?((([a-zA-Z\\d]([a-zA-Z\\d-]*[a-zA-Z\\d])*)\\.)+[a-zA-Z]{2,}|((\\d{1,3}\\.){3}\\d{1,3}))(\\:\\d+)?(\\/[-a-zA-Z\\d%_.~+]*)*(\\?[;&a-zA-Z\\d%_.~+=-]*)?(\\#[-a-zA-Z\\d_]*)?$" - } - }, - "required": [ - "name", - "url" - ] - } - } - } -} diff --git a/packages/manifests/polywrap/formats/polywrap.plugin/0.3.0.json b/packages/manifests/polywrap/formats/polywrap.plugin/0.3.0.json new file mode 100644 index 0000000000..f2a3bc3a32 --- /dev/null +++ b/packages/manifests/polywrap/formats/polywrap.plugin/0.3.0.json @@ -0,0 +1,97 @@ +{ + "id": "PluginManifest", + "type": "object", + "additionalProperties": false, + "required": ["format", "project", "source"], + "properties": { + "format": { + "description": "Polywrap manifest format version.", + "type": "string", + "enum": ["0.3.0"] + }, + "project": { + "description": "Basic project properties.", + "type": "object", + "additionalProperties": false, + "required": ["name", "type"], + "properties": { + "name": { + "description": "Name of this project.", + "type": "string", + "pattern": "^[a-zA-Z0-9\\-\\_]+$" + }, + "type": { + "description": "Type of this project.", + "type": "string", + "pattern": "^plugin\\/[a-z0-9]+$" + } + } + }, + "source": { + "description": "Project source files.", + "type": "object", + "additionalProperties": false, + "required": ["schema", "module"], + "properties": { + "module": { + "description": "Path to the project's entry point.", + "type": "string", + "pattern": "^\\.?\\.?\\/?((\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)+\\/)?[\\w\\-\\.]+\\.?[\\w\\-\\.]*$" + }, + "schema": { + "description": "Path to the project's graphql schema.", + "type": "string", + "pattern": "^\\.?\\.?\\/?((\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)+\\/)?[\\w\\-\\.]+\\.graphql$" + }, + "import_abis": { + "description": "Specify ABIs to be used for the import URIs within your schema.", + "type": "array", + "items": { + "$ref": "#/definitions/import_abis" + } + } + } + }, + "extensions": { + "description": "Project extension files (build, deploy, infra).", + "type": "object", + "additionalProperties": false, + "properties": { + "build": { + "description": "Path to the project build manifest file.", + "type": "string", + "pattern": "^\\.?\\.?(\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)*\\/[\\w\\-\\.]+\\.(yaml|json)$" + }, + "deploy": { + "description": "Path to project deploy manifest file.", + "type": "string", + "pattern": "^\\.?\\.?(\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)*\\/[\\w\\-\\.]+\\.(yaml|json)$" + }, + "infra": { + "description": "Path to project infra manifest file.", + "type": "string", + "pattern": "^\\.?\\.?(\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)*\\/[\\w\\-\\.]+\\.(yaml|json)$" + } + } + } + }, + "definitions": { + "import_abis": { + "type": "object", + "additionalProperties": false, + "properties": { + "uri": { + "description": "One of the schema's import URI.", + "type": "string", + "pattern": "^[wrap://]*[a-z\\-\\_0-9]+\\/.+$" + }, + "abi": { + "description": "Path to a local ABI (or schema). Supported file formats: [*.graphql, *.info, *.json, *.yaml]", + "type": "string", + "pattern": "^\\.?\\.?\\/?((\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)+\\/)?[\\w\\-\\.]+\\.(info|graphql|json|yaml)$" + } + }, + "required": ["uri", "abi"] + } + } +} diff --git a/packages/manifests/polywrap/formats/polywrap/0.3.0.json b/packages/manifests/polywrap/formats/polywrap/0.3.0.json index d14439e4a2..dc75b66f1e 100644 --- a/packages/manifests/polywrap/formats/polywrap/0.3.0.json +++ b/packages/manifests/polywrap/formats/polywrap/0.3.0.json @@ -58,7 +58,7 @@ "pattern": "^\\.?\\.?\\/?((\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)+\\/)?[\\w\\-\\.]+\\.?[\\w\\-\\.]*\\/?$" }, "extensions": { - "description": "Project extension files (build, meta, deploy, infra).", + "description": "Project extension files (build, deploy, infra).", "type": "object", "additionalProperties": false, "properties": { @@ -67,11 +67,6 @@ "type": "string", "pattern": "^\\.?\\.?(\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)*\\/[\\w\\-\\.]+\\.(yaml|json)$" }, - "meta": { - "description": "Path to project metadata manifest file.", - "type": "string", - "pattern": "^\\.?\\.?(\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)*\\/[\\w\\-\\.]+\\.(yaml|json)$" - }, "deploy": { "description": "Path to project deploy manifest file.", "type": "string", diff --git a/packages/templates/wasm/assemblyscript/meta/icon.png b/packages/templates/wasm/assemblyscript/meta/icon.png deleted file mode 100644 index 5298806ad2..0000000000 Binary files a/packages/templates/wasm/assemblyscript/meta/icon.png and /dev/null differ diff --git a/packages/templates/wasm/assemblyscript/meta/link.svg b/packages/templates/wasm/assemblyscript/meta/link.svg deleted file mode 100644 index dc6a93e597..0000000000 --- a/packages/templates/wasm/assemblyscript/meta/link.svg +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/templates/wasm/assemblyscript/polywrap.meta.yaml b/packages/templates/wasm/assemblyscript/polywrap.meta.yaml deleted file mode 100644 index d8a0d89724..0000000000 --- a/packages/templates/wasm/assemblyscript/polywrap.meta.yaml +++ /dev/null @@ -1,13 +0,0 @@ -format: 0.1.0 -displayName: Polywrap Wasm Wrapper Template -subtext: A template for starting a Polywrap Wasm wrapper -description: A Polywrap Wasm wrapper. -tags: - - polywrap - - web3 -repository: https://github.com/test/test -icon: ./meta/icon.png -links: - - name: test link - icon: ./meta/link.svg - url: http://link.com/path diff --git a/packages/templates/wasm/assemblyscript/polywrap.yaml b/packages/templates/wasm/assemblyscript/polywrap.yaml index 3d72da1823..64b9b7bdac 100644 --- a/packages/templates/wasm/assemblyscript/polywrap.yaml +++ b/packages/templates/wasm/assemblyscript/polywrap.yaml @@ -7,5 +7,4 @@ source: schema: ./src/schema.graphql extensions: build: ./polywrap.build.yaml - meta: ./polywrap.meta.yaml deploy: ./polywrap.deploy.yaml diff --git a/packages/templates/wasm/interface/meta/icon.png b/packages/templates/wasm/interface/meta/icon.png deleted file mode 100644 index 5298806ad2..0000000000 Binary files a/packages/templates/wasm/interface/meta/icon.png and /dev/null differ diff --git a/packages/templates/wasm/interface/meta/link.svg b/packages/templates/wasm/interface/meta/link.svg deleted file mode 100644 index dc6a93e597..0000000000 --- a/packages/templates/wasm/interface/meta/link.svg +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/templates/wasm/interface/meta/test.graphql b/packages/templates/wasm/interface/meta/test.graphql deleted file mode 100644 index 772a993fde..0000000000 --- a/packages/templates/wasm/interface/meta/test.graphql +++ /dev/null @@ -1,5 +0,0 @@ -query { - methodToImplement( - arg: $arg - ) -} diff --git a/packages/templates/wasm/interface/meta/test.json b/packages/templates/wasm/interface/meta/test.json deleted file mode 100644 index 65f21b38c4..0000000000 --- a/packages/templates/wasm/interface/meta/test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "arg": "foo" -} diff --git a/packages/templates/wasm/interface/polywrap.meta.yaml b/packages/templates/wasm/interface/polywrap.meta.yaml deleted file mode 100644 index 41e5de4da3..0000000000 --- a/packages/templates/wasm/interface/polywrap.meta.yaml +++ /dev/null @@ -1,13 +0,0 @@ -format: 0.1.0 -displayName: Interface -subtext: interface subtext -description: interface description -tags: - - tag1 - - tag2 -repository: https://github.com/test/test -icon: ./meta/icon.png -links: - - name: test link - icon: ./meta/link.svg - url: http://link.com/path diff --git a/packages/templates/wasm/interface/polywrap.yaml b/packages/templates/wasm/interface/polywrap.yaml index b1e346ce86..d5af4debe2 100644 --- a/packages/templates/wasm/interface/polywrap.yaml +++ b/packages/templates/wasm/interface/polywrap.yaml @@ -5,5 +5,4 @@ project: source: schema: ./schema.graphql extensions: - meta: ./polywrap.meta.yaml deploy: ./polywrap.deploy.yaml diff --git a/packages/templates/wasm/rust/meta/icon.png b/packages/templates/wasm/rust/meta/icon.png deleted file mode 100644 index 5298806ad2..0000000000 Binary files a/packages/templates/wasm/rust/meta/icon.png and /dev/null differ diff --git a/packages/templates/wasm/rust/meta/link.svg b/packages/templates/wasm/rust/meta/link.svg deleted file mode 100644 index dc6a93e597..0000000000 --- a/packages/templates/wasm/rust/meta/link.svg +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/templates/wasm/rust/polywrap.meta.yaml b/packages/templates/wasm/rust/polywrap.meta.yaml deleted file mode 100644 index d8a0d89724..0000000000 --- a/packages/templates/wasm/rust/polywrap.meta.yaml +++ /dev/null @@ -1,13 +0,0 @@ -format: 0.1.0 -displayName: Polywrap Wasm Wrapper Template -subtext: A template for starting a Polywrap Wasm wrapper -description: A Polywrap Wasm wrapper. -tags: - - polywrap - - web3 -repository: https://github.com/test/test -icon: ./meta/icon.png -links: - - name: test link - icon: ./meta/link.svg - url: http://link.com/path diff --git a/packages/templates/wasm/rust/polywrap.yaml b/packages/templates/wasm/rust/polywrap.yaml index eff29b6411..24ccfa6842 100644 --- a/packages/templates/wasm/rust/polywrap.yaml +++ b/packages/templates/wasm/rust/polywrap.yaml @@ -7,5 +7,4 @@ source: schema: ./src/schema.graphql extensions: build: ./polywrap.build.yaml - meta: ./polywrap.meta.yaml deploy: ./polywrap.deploy.yaml diff --git a/packages/test-cases/cases/cli/manifest/samples/polywrap.meta.yaml b/packages/test-cases/cases/cli/manifest/samples/polywrap.meta.yaml deleted file mode 100644 index 6ffb9aea98..0000000000 --- a/packages/test-cases/cases/cli/manifest/samples/polywrap.meta.yaml +++ /dev/null @@ -1,14 +0,0 @@ -format: 0.1.0 -displayName: Polywrap Meta Sample -subtext: A Sample Meta Manifest Ext -description: A Sample Meta Manifest Ext -tags: - - polywrap - - web3 - - sample -repository: https://github.com/test/test -icon: ./meta/icon.png -links: - - name: test link - icon: ./meta/link.svg - url: http://link.com/path diff --git a/packages/test-cases/cases/cli/manifest/samples/polywrap.yaml b/packages/test-cases/cases/cli/manifest/samples/polywrap.yaml index 71d27b5e8e..1d06aebd1b 100644 --- a/packages/test-cases/cases/cli/manifest/samples/polywrap.yaml +++ b/packages/test-cases/cases/cli/manifest/samples/polywrap.yaml @@ -5,4 +5,3 @@ schema: ./src/schema.graphql module: ./src/index.ts build: ./polywrap.build.yaml deploy: ./polywrap.deploy.yaml -meta: ./polywrap.meta.yaml diff --git a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/expected/output.json b/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/expected/output.json deleted file mode 100644 index d91a8e5545..0000000000 --- a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/expected/output.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "wrap.wasm", - "wrap.info" -] \ No newline at end of file diff --git a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/expected/stdout.json b/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/expected/stdout.json deleted file mode 100644 index bbedbb8b04..0000000000 --- a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/expected/stdout.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "stdout": [ - "Artifacts written to ./build", - "build/polywrap.meta.json", - "build/meta/links/link.svg", - "build/meta/icon/icon.png", - "WRAP manifest written in ./build" - ], - "exitCode": 0 -} diff --git a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/meta/icon.png b/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/meta/icon.png deleted file mode 100644 index 674be608c0..0000000000 --- a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/meta/icon.png +++ /dev/null @@ -1 +0,0 @@ -test png \ No newline at end of file diff --git a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/meta/link.svg b/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/meta/link.svg deleted file mode 100644 index c3db003053..0000000000 --- a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/meta/link.svg +++ /dev/null @@ -1 +0,0 @@ -test svg \ No newline at end of file diff --git a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/meta/test.graphql b/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/meta/test.graphql deleted file mode 100644 index d58413e806..0000000000 --- a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/meta/test.graphql +++ /dev/null @@ -1 +0,0 @@ -test graphql \ No newline at end of file diff --git a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/meta/test.json b/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/meta/test.json deleted file mode 100644 index 60f07047e9..0000000000 --- a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/meta/test.json +++ /dev/null @@ -1 +0,0 @@ -test json \ No newline at end of file diff --git a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/package.json b/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/package.json deleted file mode 100644 index 3360b30d0f..0000000000 --- a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "@polywrap/test-project", - "version": "0.1.0", - "license": "MIT", - "private": true, - "scripts": { - "build": "polywrap build" - }, - "dependencies": { - "@polywrap/wasm-as": "0.3.0" - }, - "devDependencies": { - "assemblyscript": "0.19.23" - } -} diff --git a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/polywrap.build.yaml b/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/polywrap.build.yaml deleted file mode 100644 index baf96101d3..0000000000 --- a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/polywrap.build.yaml +++ /dev/null @@ -1,10 +0,0 @@ -format: 0.2.0 -strategies: - image: - node_version: "14.16.0" - include: - - ./src - - ./package.json -linked_packages: - - name: "@polywrap/wasm-as" - path: ../../../../../../../wasm/as diff --git a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/polywrap.meta.yaml b/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/polywrap.meta.yaml deleted file mode 100644 index 54391fb058..0000000000 --- a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/polywrap.meta.yaml +++ /dev/null @@ -1,14 +0,0 @@ -format: 0.1.0 -displayName: Test Name -subtext: test subtext -description: test description -tags: - - test - - another-tag - - test2 -repository: https://github.com/test/test -icon: ./meta/icon.png -links: - - name: test link - icon: ./meta/link.svg - url: http://link.com/path diff --git a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/polywrap.yaml b/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/polywrap.yaml deleted file mode 100644 index aedc894931..0000000000 --- a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/polywrap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -format: 0.3.0 -project: - name: test-project - type: wasm/assemblyscript -source: - schema: ./src/schema.graphql - module: ./src/index.ts -extensions: - meta: ./polywrap.meta.yaml - build: ./polywrap.build.yaml diff --git a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/src/index.ts b/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/src/index.ts deleted file mode 100644 index 862d4cb226..0000000000 --- a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/src/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { Args_method } from "./wrap"; - -export function method(args: Args_method): string { - return args.arg; -} diff --git a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/src/schema.graphql b/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/src/schema.graphql deleted file mode 100644 index 325e224971..0000000000 --- a/packages/test-cases/cases/cli/wasm/build-cmd/assemblyscript/008-metadata/src/schema.graphql +++ /dev/null @@ -1,5 +0,0 @@ -type Module { - method( - arg: String! - ): String! -} diff --git a/packages/test-cases/cases/wrappers/wasm-as/simple-calculator/polywrap.meta.yaml b/packages/test-cases/cases/wrappers/wasm-as/simple-calculator/polywrap.meta.yaml deleted file mode 100644 index 53370940af..0000000000 --- a/packages/test-cases/cases/wrappers/wasm-as/simple-calculator/polywrap.meta.yaml +++ /dev/null @@ -1,8 +0,0 @@ -format: 0.1.0 -displayName: Simple Calculator Wrapper -tags: - - calculator - - wrapper -subtext: test subtext -description: test description -repository: https://github.com/test/test diff --git a/packages/test-cases/cases/wrappers/wasm-as/simple-calculator/polywrap.yaml b/packages/test-cases/cases/wrappers/wasm-as/simple-calculator/polywrap.yaml index ef0b66bab8..d0c2918866 100644 --- a/packages/test-cases/cases/wrappers/wasm-as/simple-calculator/polywrap.yaml +++ b/packages/test-cases/cases/wrappers/wasm-as/simple-calculator/polywrap.yaml @@ -7,4 +7,3 @@ source: module: ./src/index.ts extensions: build: ./polywrap.build.yaml - meta: ./polywrap.meta.yaml diff --git a/packages/test-cases/cases/wrappers/wasm-as/simple-memory/polywrap.meta.yaml b/packages/test-cases/cases/wrappers/wasm-as/simple-memory/polywrap.meta.yaml deleted file mode 100644 index fca4b4d92c..0000000000 --- a/packages/test-cases/cases/wrappers/wasm-as/simple-memory/polywrap.meta.yaml +++ /dev/null @@ -1,7 +0,0 @@ -format: 0.1.0 -displayName: Simple Wrapper Memory -tags: - - wrapper -subtext: test subtext -description: test description -repository: https://github.com/test/test diff --git a/packages/test-cases/cases/wrappers/wasm-as/simple-memory/polywrap.yaml b/packages/test-cases/cases/wrappers/wasm-as/simple-memory/polywrap.yaml index 172b7f4442..1f29c7ffc7 100644 --- a/packages/test-cases/cases/wrappers/wasm-as/simple-memory/polywrap.yaml +++ b/packages/test-cases/cases/wrappers/wasm-as/simple-memory/polywrap.yaml @@ -10,4 +10,3 @@ source: abi: ./plugin.wrap.info extensions: build: ./polywrap.build.yaml - meta: ./polywrap.meta.yaml diff --git a/packages/test-cases/cases/wrappers/wasm-as/simple-storage/polywrap.meta.yaml b/packages/test-cases/cases/wrappers/wasm-as/simple-storage/polywrap.meta.yaml deleted file mode 100644 index 58e3d61507..0000000000 --- a/packages/test-cases/cases/wrappers/wasm-as/simple-storage/polywrap.meta.yaml +++ /dev/null @@ -1,9 +0,0 @@ -format: 0.1.0 -displayName: Simple Storage -tags: - - ethereum - - storage - - example -subtext: test subtext -description: test description -repository: https://github.com/test/test diff --git a/packages/test-cases/cases/wrappers/wasm-as/simple-storage/polywrap.yaml b/packages/test-cases/cases/wrappers/wasm-as/simple-storage/polywrap.yaml index 7b4b80478f..f51916b69f 100644 --- a/packages/test-cases/cases/wrappers/wasm-as/simple-storage/polywrap.yaml +++ b/packages/test-cases/cases/wrappers/wasm-as/simple-storage/polywrap.yaml @@ -10,4 +10,3 @@ source: abi: ../../../../../js/plugins/ethereum/build/wrap.info extensions: build: ./polywrap.build.yaml - meta: ./polywrap.meta.yaml \ No newline at end of file diff --git a/packages/test-cases/cases/wrappers/wasm-as/simple/polywrap.meta.yaml b/packages/test-cases/cases/wrappers/wasm-as/simple/polywrap.meta.yaml deleted file mode 100644 index 415448de41..0000000000 --- a/packages/test-cases/cases/wrappers/wasm-as/simple/polywrap.meta.yaml +++ /dev/null @@ -1,7 +0,0 @@ -format: 0.1.0 -displayName: Simple Wrapper -tags: - - wrapper -subtext: test subtext -description: test description -repository: https://github.com/test/test diff --git a/packages/test-cases/cases/wrappers/wasm-as/simple/polywrap.yaml b/packages/test-cases/cases/wrappers/wasm-as/simple/polywrap.yaml index 2839fad687..2806977814 100644 --- a/packages/test-cases/cases/wrappers/wasm-as/simple/polywrap.yaml +++ b/packages/test-cases/cases/wrappers/wasm-as/simple/polywrap.yaml @@ -7,4 +7,3 @@ source: module: ./src/index.ts extensions: build: ./polywrap.build.yaml - meta: ./polywrap.meta.yaml