chore: refactor in progress

polywrap · Jul 1, 2022 · 62b8d56 · 62b8d56
1 parent fe30a2f
commit 62b8d56
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 30 deletions.
diff --git a/packages/cli/src/lib/defaults/build-images/wasm/rust/index.ts b/packages/cli/src/lib/defaults/build-images/wasm/rust/index.ts
@@ -1,7 +1,7 @@
 import { CompilerOverrides } from "../../../../Compiler";
 import { intlMsg } from "../../../../intl";
 
-import { PolywrapManifest } from "../../../../polywrap-manifests";
+import { PolywrapManifest } from "@polywrap/polywrap-manifest-schemas";
 
 export function getCompilerOverrides(): CompilerOverrides {
   return {

diff --git a/packages/cli/src/lib/helpers/metadata.ts b/packages/cli/src/lib/helpers/metadata.ts
@@ -2,7 +2,7 @@ import { withSpinner } from "./";
 import { displayPath, intlMsg } from "../";
 
 import { normalizePath } from "@polywrap/os-js";
-import { MetaManifest } from "../polywrap-manifests";
+import { MetaManifest } from "@polywrap/polywrap-manifest-schemas";
 import { Ora } from "ora";
 import fs from "fs";
 import path from "path";

diff --git a/packages/cli/src/lib/index.ts b/packages/cli/src/lib/index.ts
@@ -3,7 +3,6 @@ export * from "./helpers";
 export * from "./infra";
 export * from "./intl";
 export * from "./option-parsers";
-export * from "./polywrap-manifests";
 export * from "./project";
 export * from "./system";
 export * from "./test-env";

diff --git a/packages/cli/src/lib/infra/Infra.ts b/packages/cli/src/lib/infra/Infra.ts
@@ -6,7 +6,7 @@ import {
   CacheDirectory,
 } from "../";
 
-import { InfraManifest } from "../polywrap-manifests";
+import { InfraManifest } from "@polywrap/polywrap-manifest-schemas";
 import path from "path";
 import fs, { lstatSync, readdirSync } from "fs";
 import YAML from "js-yaml";

diff --git a/packages/cli/src/lib/project/AppProject.ts b/packages/cli/src/lib/project/AppProject.ts
@@ -6,8 +6,8 @@ import {
   loadAppManifest,
   appManifestLanguageToBindLanguage,
 } from "./manifests";
-import { AppManifest } from "../polywrap-manifests";
 
+import { AppManifest } from "@polywrap/polywrap-manifest-schemas";
 import { Client } from "@polywrap/core-js";
 import { ComposerOutput } from "@polywrap/schema-compose";
 import { bindSchema, BindOutput } from "@polywrap/schema-bind";

diff --git a/packages/cli/src/lib/project/PluginProject.ts b/packages/cli/src/lib/project/PluginProject.ts
@@ -6,9 +6,9 @@ import {
   isPluginManifestLanguage,
   pluginManifestLanguageToBindLanguage,
 } from "./manifests";
-import { PluginManifest } from "../polywrap-manifests";
 import { resetDir } from "../system";
 
+import { PluginManifest } from "@polywrap/polywrap-manifest-schemas";
 import { bindSchema, BindOutput, BindOptions } from "@polywrap/schema-bind";
 import { ComposerOutput } from "@polywrap/schema-compose";
 import { Abi } from "@polywrap/schema-parse";

diff --git a/packages/cli/src/lib/project/PolywrapProject.ts b/packages/cli/src/lib/project/PolywrapProject.ts
@@ -15,16 +15,16 @@ import {
   polywrapManifestLanguageToBindLanguage,
 } from "./manifests";
 import { Deployer } from "../deploy";
+import { generateDockerImageName, resetDir } from "../system";
+import { createUUID } from "../helpers";
+import { intlMsg } from "../intl";
+
 import {
   BuildManifest,
   PolywrapManifest,
   MetaManifest,
   DeployManifest,
-} from "../polywrap-manifests";
-import { generateDockerImageName, resetDir } from "../system";
-import { createUUID } from "../helpers";
-import { intlMsg } from "../intl";
-
+} from "@polywrap/polywrap-manifest-schemas";
 import { normalizePath } from "@polywrap/os-js";
 import { bindSchema, BindOutput, BindOptions } from "@polywrap/schema-bind";
 import { ComposerOutput } from "@polywrap/schema-compose";

diff --git a/packages/cli/src/lib/project/manifests/app/load.ts b/packages/cli/src/lib/project/manifests/app/load.ts
@@ -1,9 +1,9 @@
 import { displayPath, withSpinner, intlMsg } from "../../../";
+
 import {
   AppManifest,
   deserializeAppManifest,
-} from "../../../polywrap-manifests";
-
+} from "@polywrap/polywrap-manifest-schemas";
 import fs from "fs";
 
 export const defaultAppManifest = ["polywrap.app.yaml", "polywrap.app.yml"];

diff --git a/packages/cli/src/lib/project/manifests/plugin/load.ts b/packages/cli/src/lib/project/manifests/plugin/load.ts
@@ -1,9 +1,9 @@
 import { displayPath, withSpinner, intlMsg } from "../../../";
+
 import {
   PluginManifest,
   deserializePluginManifest,
-} from "../../../polywrap-manifests";
-
+} from "@polywrap/polywrap-manifest-schemas";
 import fs from "fs";
 
 export const defaultPluginManifest = [

diff --git a/packages/cli/src/lib/project/manifests/polywrap/load.ts b/packages/cli/src/lib/project/manifests/polywrap/load.ts
@@ -16,7 +16,7 @@ import {
   deserializeDeployManifest,
   InfraManifest,
   deserializeInfraManifest,
-} from "../../../polywrap-manifests";
+} from "@polywrap/polywrap-manifest-schemas";
 
 import { Schema as JsonSchema } from "jsonschema";
 import path from "path";

diff --git a/packages/js/core/package.json b/packages/js/core/package.json
@@ -12,7 +12,7 @@
     "build"
   ],
   "scripts": {
-    "build": "rimraf ./build tsc --project tsconfig.build.json",
+    "build": "rimraf ./build && tsc --project tsconfig.build.json",
     "lint": "eslint --color -c ../../../.eslintrc.js src/",
     "test": "jest --passWithNoTests --runInBand --verbose",
     "test:ci": "jest --passWithNoTests --runInBand --verbose",

diff --git a/packages/js/core/src/index.ts b/packages/js/core/src/index.ts
@@ -1,7 +1,6 @@
 export * from "./types";
 export * from "./algorithms";
 export * from "./interfaces";
-export * from "./wrap-manifests";
 export * from "./msgpack";
 export * from "./uri-resolution/core";
 export * from "./uri-resolution/resolvers";

diff --git a/packages/js/core/src/types/Client.ts b/packages/js/core/src/types/Client.ts
@@ -11,7 +11,8 @@ import {
 } from "./";
 import { UriResolver } from "../uri-resolution/core";
 import { UriResolverHandler } from "./UriResolver";
-import { WrapManifest } from "../wrap-manifests";
+
+import { WrapManifest } from "@polywrap/wrap-manifest-schemas";
 
 export interface ClientConfig<TUri extends Uri | string = string> {
   redirects: UriRedirect<TUri>[];

diff --git a/packages/js/core/src/types/Wrapper.ts b/packages/js/core/src/types/Wrapper.ts
@@ -8,7 +8,7 @@ import {
   Invoker,
   InvocableResult,
 } from ".";
-import { WrapManifest } from "../wrap-manifests";
+import { WrapManifest } from "@polywrap/polywrap-manifest-schemas";
 
 /**
  * The Wrapper definition, which can be used to spawn

diff --git a/packages/js/core/tsconfig.build.json b/packages/js/core/tsconfig.build.json
@@ -6,4 +6,4 @@
   "exclude": [
     "./src/**/__tests__"
   ]
-}
+}
diff --git a/packages/manifest-schemas/wrap/formats/interfaces/deserialize.ts b/packages/manifest-schemas/wrap/formats/interfaces/deserialize.ts
@@ -15,15 +15,14 @@ import {
 import { DeserializeManifestOptions } from "../";
 
 import { compare } from "semver";
-import { msgpackDecode } from "@polywrap/core-js";
 import { Tracer } from "@polywrap/tracing-js";
 
 export const deserializeWrapManifest = Tracer.traceFunc(
   "core: deserializeWrapManifest",
-  (manifest: Uint8Array, options?: DeserializeManifestOptions): WrapManifest => {
+  (manifest: Uint8Array, decoder: (m: Uint8Array) => unknown, options?: DeserializeManifestOptions): WrapManifest => {
     let anyWrapManifest: AnyWrapManifest | undefined;
     try {
-      anyWrapManifest = msgpackDecode(manifest) as AnyWrapManifest;
+      anyWrapManifest = decoder(manifest) as AnyWrapManifest;
     } catch (e) {
       throw Error(`Unable to parse WrapManifest: ${`[${new Uint8Array(manifest).toString()}]`}`);
     }

diff --git a/packages/manifest-schemas/wrap/package.json b/packages/manifest-schemas/wrap/package.json
@@ -12,9 +12,6 @@
     "lint": "eslint --color -c ../../.eslintrc.js .",
     "build": "ts-node generator.ts && tsc"
   },
-  "dependencies": {
-   "@polywrap/core-js": "0.0.1-prealpha.91"
-  },
   "devDependencies": {
     "ts-node": "8.10.2"
   },

diff --git a/packages/manifest-schemas/wrap/templates/deserialize-ts.mustache b/packages/manifest-schemas/wrap/templates/deserialize-ts.mustache
@@ -15,15 +15,14 @@ import {
 import { DeserializeManifestOptions } from "../";
 
 import { compare } from "semver";
-import { msgpackDecode } from "@polywrap/core-js";
 import { Tracer } from "@polywrap/tracing-js";
 
 export const deserializeWrapManifest = Tracer.traceFunc(
   "core: deserializeWrapManifest",
-  (manifest: Uint8Array, options?: DeserializeManifestOptions): WrapManifest => {
+  (manifest: Uint8Array, decoder: (m: Uint8Array) => unknown, options?: DeserializeManifestOptions): WrapManifest => {
     let anyWrapManifest: AnyWrapManifest | undefined;
     try {
-      anyWrapManifest = msgpackDecode(manifest) as AnyWrapManifest;
+      anyWrapManifest = decoder(manifest) as AnyWrapManifest;
     } catch (e) {
       throw Error(`Unable to parse WrapManifest: ${`[${new Uint8Array(manifest).toString()}]`}`);
     }