From 8d11e453ae56db66445492452d8b5c95c4699bc5 Mon Sep 17 00:00:00 2001 From: Pileks Date: Tue, 1 Nov 2022 17:22:56 +0100 Subject: [PATCH] Add logging to migration actions --- packages/cli/package.json | 1 + packages/cli/src/commands/manifest.ts | 4 +-- .../cli/src/commands/utils/createLogger.ts | 4 ++- packages/cli/src/lib/logging/Log.ts | 7 +---- packages/cli/src/lib/logging/Logger.ts | 6 ++-- .../cli/src/lib/logging/logs/ConsoleLog.ts | 3 +- packages/cli/src/lib/logging/logs/FileLog.ts | 3 +- .../manifest/migrate/migrateAnyManifest.ts | 8 ++++-- .../migrate/migrateAppProjectManifest.ts | 7 +++-- .../migrate/migrateBuildExtensionManifest.ts | 7 +++-- .../migrate/migrateDeployExtensionManifest.ts | 7 +++-- .../migrate/migrateInfraExtensionManifest.ts | 7 +++-- .../migrate/migrateMetaExtensionManifest.ts | 7 +++-- .../migrate/migratePluginProjectManifest.ts | 7 +++-- .../migrate/migratePolywrapProjectManifest.ts | 7 +++-- .../migrate/migrateTestExtensionManifest.ts | 10 +++++-- .../cli/src/lib/project/manifests/app/load.ts | 2 +- .../src/lib/project/manifests/plugin/load.ts | 2 +- .../lib/project/manifests/polywrap/load.ts | 11 ++++---- packages/js/logging/README.md | 8 ++++++ packages/js/logging/package.json | 28 +++++++++++++++++++ packages/js/logging/src/ILogger.ts | 9 ++++++ packages/js/logging/src/LogLevel.ts | 6 ++++ packages/js/logging/src/index.ts | 2 ++ packages/js/logging/tsconfig.build.json | 9 ++++++ packages/js/logging/tsconfig.json | 13 +++++++++ packages/js/manifests/polywrap/package.json | 1 + .../scripts/templates/deserialize-ts.mustache | 5 +++- .../scripts/templates/migrate-ts.mustache | 6 ++-- .../js/manifests/polywrap/src/deserialize.ts | 2 ++ .../src/formats/polywrap.app/deserialize.ts | 5 +++- .../src/formats/polywrap.app/migrate.ts | 6 ++-- .../polywrap.app/migrators/0.1.0_to_0.2.0.ts | 15 ++++++++-- .../src/formats/polywrap.build/deserialize.ts | 5 +++- .../src/formats/polywrap.build/migrate.ts | 6 ++-- .../formats/polywrap.deploy/deserialize.ts | 5 +++- .../src/formats/polywrap.deploy/migrate.ts | 6 ++-- .../src/formats/polywrap.infra/deserialize.ts | 5 +++- .../src/formats/polywrap.infra/migrate.ts | 6 ++-- .../src/formats/polywrap.meta/deserialize.ts | 5 +++- .../src/formats/polywrap.meta/migrate.ts | 6 ++-- .../formats/polywrap.plugin/deserialize.ts | 5 +++- .../src/formats/polywrap.plugin/migrate.ts | 6 ++-- .../migrators/0.1.0_to_0.2.0.ts | 15 ++++++++-- .../src/formats/polywrap.test/deserialize.ts | 5 +++- .../src/formats/polywrap.test/migrate.ts | 6 ++-- .../src/formats/polywrap/deserialize.ts | 5 +++- .../polywrap/src/formats/polywrap/migrate.ts | 6 ++-- .../polywrap/migrators/0.1.0_to_0.2.0.ts | 15 ++++++++-- .../migrations/{migration.ts => Migrator.ts} | 3 +- .../migrations/findShortestMigrationPath.ts | 2 +- .../polywrap/src/migrations/index.ts | 2 +- 52 files changed, 264 insertions(+), 75 deletions(-) create mode 100644 packages/js/logging/README.md create mode 100644 packages/js/logging/package.json create mode 100644 packages/js/logging/src/ILogger.ts create mode 100644 packages/js/logging/src/LogLevel.ts create mode 100644 packages/js/logging/src/index.ts create mode 100644 packages/js/logging/tsconfig.build.json create mode 100644 packages/js/logging/tsconfig.json rename packages/js/manifests/polywrap/src/migrations/{migration.ts => Migrator.ts} (79%) diff --git a/packages/cli/package.json b/packages/cli/package.json index 6e9599928f..9b8de1915b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -56,6 +56,7 @@ "@polywrap/test-env-js": "0.9.3", "@polywrap/wasm-js": "0.9.3", "@polywrap/wrap-manifest-types-js": "0.9.3", + "@polywrap/logging-js": "0.9.3", "axios": "0.21.2", "chalk": "4.1.0", "chokidar": "3.5.1", diff --git a/packages/cli/src/commands/manifest.ts b/packages/cli/src/commands/manifest.ts index 65696fac62..5e64a67a76 100644 --- a/packages/cli/src/commands/manifest.ts +++ b/packages/cli/src/commands/manifest.ts @@ -510,7 +510,7 @@ const runMigrateCommand = async ( function migrateManifestFile( manifestFile: string, - migrationFn: (input: string, to: string) => string, + migrationFn: (input: string, to: string, logger?: Logger) => string, to: string, logger: Logger ): void { @@ -528,7 +528,7 @@ function migrateManifestFile( encoding: "utf-8", }); - const outputManifestString = migrationFn(manifestString, to); + const outputManifestString = migrationFn(manifestString, to, logger); // Cache the old manifest file const cache = new CacheDirectory({ diff --git a/packages/cli/src/commands/utils/createLogger.ts b/packages/cli/src/commands/utils/createLogger.ts index 497d18e364..56b40787ed 100644 --- a/packages/cli/src/commands/utils/createLogger.ts +++ b/packages/cli/src/commands/utils/createLogger.ts @@ -1,4 +1,6 @@ -import { Logger, LogLevel, ConsoleLog } from "../../lib"; +import { Logger, ConsoleLog } from "../../lib"; + +import { LogLevel } from "@polywrap/logging-js"; export function createLogger(flags: { verbose?: boolean; diff --git a/packages/cli/src/lib/logging/Log.ts b/packages/cli/src/lib/logging/Log.ts index e2a3bcd91b..9aad43d58c 100644 --- a/packages/cli/src/lib/logging/Log.ts +++ b/packages/cli/src/lib/logging/Log.ts @@ -1,9 +1,4 @@ -export enum LogLevel { - DEBUG, - INFO, - WARN, - ERROR, -} +import { LogLevel } from "@polywrap/logging-js"; export abstract class Log { public readonly level: LogLevel; diff --git a/packages/cli/src/lib/logging/Logger.ts b/packages/cli/src/lib/logging/Logger.ts index f21823b1e5..b6e7678c7d 100644 --- a/packages/cli/src/lib/logging/Logger.ts +++ b/packages/cli/src/lib/logging/Logger.ts @@ -1,10 +1,12 @@ -import { Log, LogLevel } from "./Log"; +import { Log } from "./Log"; + +import { ILogger, LogLevel } from "@polywrap/logging-js"; interface Logs { [name: string]: Log; } -export class Logger { +export class Logger implements ILogger { private _logs: Logs; constructor(logs: Logs) { diff --git a/packages/cli/src/lib/logging/logs/ConsoleLog.ts b/packages/cli/src/lib/logging/logs/ConsoleLog.ts index 11b240a158..4404dd869c 100644 --- a/packages/cli/src/lib/logging/logs/ConsoleLog.ts +++ b/packages/cli/src/lib/logging/logs/ConsoleLog.ts @@ -1,6 +1,7 @@ -import { Log, LogLevel } from "../Log"; +import { Log } from "../Log"; import chalk from "chalk"; +import { LogLevel } from "@polywrap/logging-js"; export class ConsoleLog extends Log { constructor(level: LogLevel) { diff --git a/packages/cli/src/lib/logging/logs/FileLog.ts b/packages/cli/src/lib/logging/logs/FileLog.ts index ecd9caa295..f928bdeb1f 100644 --- a/packages/cli/src/lib/logging/logs/FileLog.ts +++ b/packages/cli/src/lib/logging/logs/FileLog.ts @@ -1,6 +1,7 @@ -import { Log, LogLevel } from "../Log"; +import { Log } from "../Log"; import fs, { WriteStream } from "fs"; +import { LogLevel } from "@polywrap/logging-js"; export class FileLog extends Log { private _logFileStream: WriteStream; diff --git a/packages/cli/src/lib/manifest/migrate/migrateAnyManifest.ts b/packages/cli/src/lib/manifest/migrate/migrateAnyManifest.ts index 62b1af50f5..fa20c1b79c 100644 --- a/packages/cli/src/lib/manifest/migrate/migrateAnyManifest.ts +++ b/packages/cli/src/lib/manifest/migrate/migrateAnyManifest.ts @@ -1,12 +1,14 @@ /* eslint-disable no-empty */ +import { ILogger } from "@polywrap/logging-js"; import YAML from "yaml"; export function migrateAnyManifest( manifestString: string, manifestTypeName: string, - migrateFn: (manifest: unknown, to: string) => unknown, - to: string + migrateFn: (manifest: unknown, to: string, logger?: ILogger) => unknown, + to: string, + logger?: ILogger ): string { let manifest: unknown | undefined; try { @@ -21,7 +23,7 @@ export function migrateAnyManifest( throw Error(`Unable to parse ${manifestTypeName}: ${manifestString}`); } - const newManifest = migrateFn(manifest, to); + const newManifest = migrateFn(manifest, to, logger); const cleanedManifest = JSON.parse(JSON.stringify(newManifest)); delete cleanedManifest.__type; diff --git a/packages/cli/src/lib/manifest/migrate/migrateAppProjectManifest.ts b/packages/cli/src/lib/manifest/migrate/migrateAppProjectManifest.ts index 9b8e920194..c240ea124f 100644 --- a/packages/cli/src/lib/manifest/migrate/migrateAppProjectManifest.ts +++ b/packages/cli/src/lib/manifest/migrate/migrateAppProjectManifest.ts @@ -1,15 +1,18 @@ import { migrateAnyManifest } from "./migrateAnyManifest"; import { migrateAppManifest } from "@polywrap/polywrap-manifest-types-js"; +import { ILogger } from "@polywrap/logging-js"; export function migrateAppProjectManifest( manifestString: string, - to: string + to: string, + logger?: ILogger ): string { return migrateAnyManifest( manifestString, "AppManifest", migrateAppManifest, - to + to, + logger ); } diff --git a/packages/cli/src/lib/manifest/migrate/migrateBuildExtensionManifest.ts b/packages/cli/src/lib/manifest/migrate/migrateBuildExtensionManifest.ts index 1d6607f881..60a44a301d 100644 --- a/packages/cli/src/lib/manifest/migrate/migrateBuildExtensionManifest.ts +++ b/packages/cli/src/lib/manifest/migrate/migrateBuildExtensionManifest.ts @@ -1,15 +1,18 @@ import { migrateAnyManifest } from "./migrateAnyManifest"; import { migrateBuildManifest } from "@polywrap/polywrap-manifest-types-js"; +import { ILogger } from "@polywrap/logging-js"; export function migrateBuildExtensionManifest( manifestString: string, - to: string + to: string, + logger?: ILogger ): string { return migrateAnyManifest( manifestString, "BuildManifest", migrateBuildManifest, - to + to, + logger ); } diff --git a/packages/cli/src/lib/manifest/migrate/migrateDeployExtensionManifest.ts b/packages/cli/src/lib/manifest/migrate/migrateDeployExtensionManifest.ts index 0b096e63a9..3ed5bb22c4 100644 --- a/packages/cli/src/lib/manifest/migrate/migrateDeployExtensionManifest.ts +++ b/packages/cli/src/lib/manifest/migrate/migrateDeployExtensionManifest.ts @@ -1,15 +1,18 @@ import { migrateAnyManifest } from "./migrateAnyManifest"; import { migrateDeployManifest } from "@polywrap/polywrap-manifest-types-js"; +import { ILogger } from "@polywrap/logging-js"; export function migrateDeployExtensionManifest( manifestString: string, - to: string + to: string, + logger?: ILogger ): string { return migrateAnyManifest( manifestString, "DeployManifest", migrateDeployManifest, - to + to, + logger ); } diff --git a/packages/cli/src/lib/manifest/migrate/migrateInfraExtensionManifest.ts b/packages/cli/src/lib/manifest/migrate/migrateInfraExtensionManifest.ts index e7a214810e..253e42f725 100644 --- a/packages/cli/src/lib/manifest/migrate/migrateInfraExtensionManifest.ts +++ b/packages/cli/src/lib/manifest/migrate/migrateInfraExtensionManifest.ts @@ -1,15 +1,18 @@ import { migrateAnyManifest } from "./migrateAnyManifest"; import { migrateInfraManifest } from "@polywrap/polywrap-manifest-types-js"; +import { ILogger } from "@polywrap/logging-js"; export function migrateInfraExtensionManifest( manifestString: string, - to: string + to: string, + logger?: ILogger ): string { return migrateAnyManifest( manifestString, "InfraManifest", migrateInfraManifest, - to + to, + logger ); } diff --git a/packages/cli/src/lib/manifest/migrate/migrateMetaExtensionManifest.ts b/packages/cli/src/lib/manifest/migrate/migrateMetaExtensionManifest.ts index c136d4edd2..6ba5c50583 100644 --- a/packages/cli/src/lib/manifest/migrate/migrateMetaExtensionManifest.ts +++ b/packages/cli/src/lib/manifest/migrate/migrateMetaExtensionManifest.ts @@ -1,15 +1,18 @@ 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 + to: string, + logger?: ILogger ): string { return migrateAnyManifest( manifestString, "MetaManifest", migrateMetaManifest, - to + to, + logger ); } diff --git a/packages/cli/src/lib/manifest/migrate/migratePluginProjectManifest.ts b/packages/cli/src/lib/manifest/migrate/migratePluginProjectManifest.ts index 21297e7116..19cd1a3eed 100644 --- a/packages/cli/src/lib/manifest/migrate/migratePluginProjectManifest.ts +++ b/packages/cli/src/lib/manifest/migrate/migratePluginProjectManifest.ts @@ -1,15 +1,18 @@ import { migrateAnyManifest } from "./migrateAnyManifest"; import { migratePluginManifest } from "@polywrap/polywrap-manifest-types-js"; +import { ILogger } from "@polywrap/logging-js"; export function migratePluginProjectManifest( manifestString: string, - to: string + to: string, + logger?: ILogger ): string { return migrateAnyManifest( manifestString, "PluginManifest", migratePluginManifest, - to + to, + logger ); } diff --git a/packages/cli/src/lib/manifest/migrate/migratePolywrapProjectManifest.ts b/packages/cli/src/lib/manifest/migrate/migratePolywrapProjectManifest.ts index 9c15a4e62b..1bdcf7b5ab 100644 --- a/packages/cli/src/lib/manifest/migrate/migratePolywrapProjectManifest.ts +++ b/packages/cli/src/lib/manifest/migrate/migratePolywrapProjectManifest.ts @@ -1,15 +1,18 @@ import { migrateAnyManifest } from "./migrateAnyManifest"; import { migratePolywrapManifest } from "@polywrap/polywrap-manifest-types-js"; +import { ILogger } from "@polywrap/logging-js"; export function migratePolywrapProjectManifest( manifestString: string, - to: string + to: string, + logger?: ILogger ): string { return migrateAnyManifest( manifestString, "PolywrapManifest", migratePolywrapManifest, - to + to, + logger ); } diff --git a/packages/cli/src/lib/manifest/migrate/migrateTestExtensionManifest.ts b/packages/cli/src/lib/manifest/migrate/migrateTestExtensionManifest.ts index cd61504b5b..a72adf4a39 100644 --- a/packages/cli/src/lib/manifest/migrate/migrateTestExtensionManifest.ts +++ b/packages/cli/src/lib/manifest/migrate/migrateTestExtensionManifest.ts @@ -1,12 +1,18 @@ import { migrateAnyManifest } from "./migrateAnyManifest"; import { migratePolywrapWorkflow } from "@polywrap/polywrap-manifest-types-js"; +import { ILogger } from "@polywrap/logging-js"; -export function migrateWorkflow(manifestString: string, to: string): string { +export function migrateWorkflow( + manifestString: string, + to: string, + logger?: ILogger +): string { return migrateAnyManifest( manifestString, "PolywrapWorkflow", migratePolywrapWorkflow, - to + to, + logger ); } diff --git a/packages/cli/src/lib/project/manifests/app/load.ts b/packages/cli/src/lib/project/manifests/app/load.ts index 1575b42c4a..26f80d22ef 100644 --- a/packages/cli/src/lib/project/manifests/app/load.ts +++ b/packages/cli/src/lib/project/manifests/app/load.ts @@ -22,7 +22,7 @@ export async function loadAppManifest( } try { - const result = deserializeAppManifest(manifest); + const result = deserializeAppManifest(manifest, { logger: logger }); return Promise.resolve(result); } catch (e) { return Promise.reject(e); diff --git a/packages/cli/src/lib/project/manifests/plugin/load.ts b/packages/cli/src/lib/project/manifests/plugin/load.ts index 6ea1511085..62650124f9 100644 --- a/packages/cli/src/lib/project/manifests/plugin/load.ts +++ b/packages/cli/src/lib/project/manifests/plugin/load.ts @@ -26,7 +26,7 @@ export async function loadPluginManifest( } try { - const result = deserializePluginManifest(manifest); + const result = deserializePluginManifest(manifest, { logger: logger }); return Promise.resolve(result); } catch (e) { return Promise.reject(e); diff --git a/packages/cli/src/lib/project/manifests/polywrap/load.ts b/packages/cli/src/lib/project/manifests/polywrap/load.ts index 9f83b07093..3624caa34c 100644 --- a/packages/cli/src/lib/project/manifests/polywrap/load.ts +++ b/packages/cli/src/lib/project/manifests/polywrap/load.ts @@ -42,7 +42,7 @@ export async function loadPolywrapManifest( } try { - const result = deserializePolywrapManifest(manifest); + const result = deserializePolywrapManifest(manifest, { logger: logger }); return Promise.resolve(result); } catch (e) { return Promise.reject(e); @@ -102,6 +102,7 @@ export async function loadBuildManifest( return deserializeBuildManifest(manifest, { extSchema: extSchema, + logger: logger, }); }; @@ -137,7 +138,7 @@ export async function loadDeployManifest( } try { - let result = deserializeDeployManifest(manifest); + let result = deserializeDeployManifest(manifest, { logger: logger }); result = (loadEnvironmentVariables( (result as unknown) as Record ) as unknown) as DeployManifest; @@ -213,7 +214,7 @@ export async function loadMetaManifest( } try { - const result = deserializeMetaManifest(manifest); + const result = deserializeMetaManifest(manifest, { logger: logger }); return Promise.resolve(result); } catch (e) { return Promise.reject(e); @@ -252,7 +253,7 @@ export async function loadInfraManifest( } try { - let result = deserializeInfraManifest(manifest); + let result = deserializeInfraManifest(manifest, { logger: logger }); result = (loadEnvironmentVariables( (result as unknown) as Record ) as unknown) as InfraManifest; @@ -294,7 +295,7 @@ export async function loadWorkflowManifest( } try { - const result = deserializePolywrapWorkflow(manifest); + const result = deserializePolywrapWorkflow(manifest, { logger: logger }); return Promise.resolve(result); } catch (e) { return Promise.reject(e); diff --git a/packages/js/logging/README.md b/packages/js/logging/README.md new file mode 100644 index 0000000000..5a12e12ff3 --- /dev/null +++ b/packages/js/logging/README.md @@ -0,0 +1,8 @@ +# @polywrap/logging-js + +An interface to which Loggers within the Polywrap Toolchain must conform. + +Contains: + +- `ILogger.ts` - the logger interface +- `LogLevel.ts` - the log levels supported by the logger \ No newline at end of file diff --git a/packages/js/logging/package.json b/packages/js/logging/package.json new file mode 100644 index 0000000000..3e85bd2082 --- /dev/null +++ b/packages/js/logging/package.json @@ -0,0 +1,28 @@ +{ + "name": "@polywrap/logging-js", + "description": "Polywrap Core Logging Interface", + "version": "0.9.3", + "license": "MIT", + "repository": { + "type": "git", + "url": "https://github.com/polywrap/monorepo.git" + }, + "main": "build/index.js", + "files": [ + "build" + ], + "scripts": { + "build": "rimraf ./build && tsc --project tsconfig.build.json", + "lint": "eslint --color -c ../../../.eslintrc.js src/" + }, + "dependencies": { + }, + "devDependencies": { + "rimraf": "3.0.2", + "typescript": "4.1.6" + }, + "gitHead": "7346adaf5adb7e6bbb70d9247583e995650d390a", + "publishConfig": { + "access": "public" + } +} diff --git a/packages/js/logging/src/ILogger.ts b/packages/js/logging/src/ILogger.ts new file mode 100644 index 0000000000..6a3feafd0e --- /dev/null +++ b/packages/js/logging/src/ILogger.ts @@ -0,0 +1,9 @@ +import { LogLevel } from "./LogLevel"; + +export interface ILogger { + log(message: string, level: LogLevel): void; + debug(message: string): void; + info(message: string): void; + warn(message: string): void; + error(message: string): void; +} diff --git a/packages/js/logging/src/LogLevel.ts b/packages/js/logging/src/LogLevel.ts new file mode 100644 index 0000000000..0d3dfddab5 --- /dev/null +++ b/packages/js/logging/src/LogLevel.ts @@ -0,0 +1,6 @@ +export enum LogLevel { + DEBUG, + INFO, + WARN, + ERROR, +} diff --git a/packages/js/logging/src/index.ts b/packages/js/logging/src/index.ts new file mode 100644 index 0000000000..104d497d05 --- /dev/null +++ b/packages/js/logging/src/index.ts @@ -0,0 +1,2 @@ +export * from "./ILogger"; +export * from "./LogLevel"; diff --git a/packages/js/logging/tsconfig.build.json b/packages/js/logging/tsconfig.build.json new file mode 100644 index 0000000000..77aadfdd2f --- /dev/null +++ b/packages/js/logging/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "./src/**/*.ts" + ], + "exclude": [ + "./src/**/__tests__" + ] +} diff --git a/packages/js/logging/tsconfig.json b/packages/js/logging/tsconfig.json new file mode 100644 index 0000000000..fd4ebb1a2c --- /dev/null +++ b/packages/js/logging/tsconfig.json @@ -0,0 +1,13 @@ +{ + "extends": "../../../tsconfig", + "compilerOptions": { + "outDir": "build", + "typeRoots": [ + "./src/**/*.d.ts" + ] + }, + "include": [ + "./src/**/*.ts" + ], + "exclude": [] +} diff --git a/packages/js/manifests/polywrap/package.json b/packages/js/manifests/polywrap/package.json index b3a7ab2ff7..c27dfcbc89 100644 --- a/packages/js/manifests/polywrap/package.json +++ b/packages/js/manifests/polywrap/package.json @@ -17,6 +17,7 @@ }, "dependencies": { "@polywrap/polywrap-manifest-schemas": "0.9.3", + "@polywrap/logging-js": "0.9.3", "jsonschema": "1.4.0", "semver": "7.3.5", "yaml": "2.1.3" diff --git a/packages/js/manifests/polywrap/scripts/templates/deserialize-ts.mustache b/packages/js/manifests/polywrap/scripts/templates/deserialize-ts.mustache index 8f2a42a7a0..bf84a74a02 100644 --- a/packages/js/manifests/polywrap/scripts/templates/deserialize-ts.mustache +++ b/packages/js/manifests/polywrap/scripts/templates/deserialize-ts.mustache @@ -46,8 +46,11 @@ export function deserialize{{type}}( ); if (versionCompare === -1) { + // Warn user to migrate their manifest + options?.logger?.warn(`{{type}} is using an older version of the manifest format (${any{{type}}.format}). Please update your manifest to the latest version (${latest{{type}}Format}) by using the "polywrap manifest migrate " command.`); + // Upgrade - return migrate{{type}}(any{{type}}, latest{{type}}Format); + return migrate{{type}}(any{{type}}, latest{{type}}Format, options?.logger); } else if (versionCompare === 1) { // Downgrade throw Error( diff --git a/packages/js/manifests/polywrap/scripts/templates/migrate-ts.mustache b/packages/js/manifests/polywrap/scripts/templates/migrate-ts.mustache index d53a3f4bbc..28f60b5da0 100644 --- a/packages/js/manifests/polywrap/scripts/templates/migrate-ts.mustache +++ b/packages/js/manifests/polywrap/scripts/templates/migrate-ts.mustache @@ -11,10 +11,12 @@ import { } from "."; import { findShortestMigrationPath } from "../../migrations"; import { migrators } from "./migrators"; +import { ILogger } from "@polywrap/logging-js"; export function migrate{{#latest}}{{type}}{{/latest}}( manifest: Any{{#latest}}{{type}}{{/latest}}, - to: {{#latest}}{{type}}{{/latest}}Formats + to: {{#latest}}{{type}}{{/latest}}Formats, + logger?: ILogger ): {{#latest}}{{type}}{{/latest}} { let from = manifest.format as {{#latest}}{{type}}{{/latest}}Formats; @@ -36,7 +38,7 @@ export function migrate{{#latest}}{{type}}{{/latest}}( let newManifest = manifest; for(const migrator of migrationPath){ - newManifest = migrator.migrate(newManifest) as Any{{#latest}}{{type}}{{/latest}}; + newManifest = migrator.migrate(newManifest, logger) as Any{{#latest}}{{type}}{{/latest}}; } return newManifest as {{#latest}}{{type}}{{/latest}}; diff --git a/packages/js/manifests/polywrap/src/deserialize.ts b/packages/js/manifests/polywrap/src/deserialize.ts index 1b9b15de8c..f9978da96b 100644 --- a/packages/js/manifests/polywrap/src/deserialize.ts +++ b/packages/js/manifests/polywrap/src/deserialize.ts @@ -1,6 +1,8 @@ +import { ILogger } from "@polywrap/logging-js"; import { Schema as JsonSchema } from "jsonschema"; export interface DeserializeManifestOptions { noValidate?: boolean; extSchema?: JsonSchema; + logger?: ILogger; } diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.app/deserialize.ts b/packages/js/manifests/polywrap/src/formats/polywrap.app/deserialize.ts index 5fe1e79b5c..eb4c676f02 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.app/deserialize.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.app/deserialize.ts @@ -46,8 +46,11 @@ export function deserializeAppManifest( ); if (versionCompare === -1) { + // Warn user to migrate their manifest + options?.logger?.warn(`AppManifest is using an older version of the manifest format (${anyAppManifest.format}). Please update your manifest to the latest version (${latestAppManifestFormat}) by using the "polywrap manifest migrate " command.`); + // Upgrade - return migrateAppManifest(anyAppManifest, latestAppManifestFormat); + return migrateAppManifest(anyAppManifest, latestAppManifestFormat, options?.logger); } else if (versionCompare === 1) { // Downgrade throw Error( diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.app/migrate.ts b/packages/js/manifests/polywrap/src/formats/polywrap.app/migrate.ts index d5223e4cdb..fed54c5544 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.app/migrate.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.app/migrate.ts @@ -11,10 +11,12 @@ import { } from "."; import { findShortestMigrationPath } from "../../migrations"; import { migrators } from "./migrators"; +import { ILogger } from "@polywrap/logging-js"; export function migrateAppManifest( manifest: AnyAppManifest, - to: AppManifestFormats + to: AppManifestFormats, + logger?: ILogger ): AppManifest { let from = manifest.format as AppManifestFormats; @@ -36,7 +38,7 @@ export function migrateAppManifest( let newManifest = manifest; for(const migrator of migrationPath){ - newManifest = migrator.migrate(newManifest) as AnyAppManifest; + newManifest = migrator.migrate(newManifest, logger) as AnyAppManifest; } return newManifest as AppManifest; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/0.1.0_to_0.2.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/0.1.0_to_0.2.0.ts index ebe4c40017..76ccd8504a 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/0.1.0_to_0.2.0.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/0.1.0_to_0.2.0.ts @@ -1,7 +1,18 @@ +import { ILogger } from "@polywrap/logging-js"; import { AppManifest as OldManifest } from "../0.1.0"; import { AppManifest as NewManifest } from "../0.2.0"; -export function migrate(manifest: OldManifest): NewManifest { +export function migrate(manifest: OldManifest, logger?: ILogger): NewManifest { + if ( + manifest.import_redirects?.some((x) => + x.schema.includes("build/schema.graphql") + ) + ) { + logger?.warn( + `Detected a reference to "build/schema.graphql" in "import_redirects". Consider using "build/wrap.info" instead of "build/schema.graphql" in "source.import_abis", schema.graphql is no longer emitted as a build artifact.` + ); + } + return { format: "0.2.0", project: { @@ -19,4 +30,4 @@ export function migrate(manifest: OldManifest): NewManifest { // eslint-disable-next-line @typescript-eslint/naming-convention __type: "AppManifest", }; -}; +} diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.build/deserialize.ts b/packages/js/manifests/polywrap/src/formats/polywrap.build/deserialize.ts index 2d69bb2ebd..8047d9f8ba 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.build/deserialize.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.build/deserialize.ts @@ -46,8 +46,11 @@ export function deserializeBuildManifest( ); if (versionCompare === -1) { + // Warn user to migrate their manifest + options?.logger?.warn(`BuildManifest is using an older version of the manifest format (${anyBuildManifest.format}). Please update your manifest to the latest version (${latestBuildManifestFormat}) by using the "polywrap manifest migrate " command.`); + // Upgrade - return migrateBuildManifest(anyBuildManifest, latestBuildManifestFormat); + return migrateBuildManifest(anyBuildManifest, latestBuildManifestFormat, options?.logger); } else if (versionCompare === 1) { // Downgrade throw Error( diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.build/migrate.ts b/packages/js/manifests/polywrap/src/formats/polywrap.build/migrate.ts index ba82b20295..0c2cc19772 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.build/migrate.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.build/migrate.ts @@ -11,10 +11,12 @@ import { } from "."; import { findShortestMigrationPath } from "../../migrations"; import { migrators } from "./migrators"; +import { ILogger } from "@polywrap/logging-js"; export function migrateBuildManifest( manifest: AnyBuildManifest, - to: BuildManifestFormats + to: BuildManifestFormats, + logger?: ILogger ): BuildManifest { let from = manifest.format as BuildManifestFormats; @@ -36,7 +38,7 @@ export function migrateBuildManifest( let newManifest = manifest; for(const migrator of migrationPath){ - newManifest = migrator.migrate(newManifest) as AnyBuildManifest; + newManifest = migrator.migrate(newManifest, logger) as AnyBuildManifest; } return newManifest as BuildManifest; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.deploy/deserialize.ts b/packages/js/manifests/polywrap/src/formats/polywrap.deploy/deserialize.ts index 19251abbf6..f08d027586 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.deploy/deserialize.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.deploy/deserialize.ts @@ -46,8 +46,11 @@ export function deserializeDeployManifest( ); if (versionCompare === -1) { + // Warn user to migrate their manifest + options?.logger?.warn(`DeployManifest is using an older version of the manifest format (${anyDeployManifest.format}). Please update your manifest to the latest version (${latestDeployManifestFormat}) by using the "polywrap manifest migrate " command.`); + // Upgrade - return migrateDeployManifest(anyDeployManifest, latestDeployManifestFormat); + return migrateDeployManifest(anyDeployManifest, latestDeployManifestFormat, options?.logger); } else if (versionCompare === 1) { // Downgrade throw Error( diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.deploy/migrate.ts b/packages/js/manifests/polywrap/src/formats/polywrap.deploy/migrate.ts index 09cc08fda8..9157408e14 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.deploy/migrate.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.deploy/migrate.ts @@ -11,10 +11,12 @@ import { } from "."; import { findShortestMigrationPath } from "../../migrations"; import { migrators } from "./migrators"; +import { ILogger } from "@polywrap/logging-js"; export function migrateDeployManifest( manifest: AnyDeployManifest, - to: DeployManifestFormats + to: DeployManifestFormats, + logger?: ILogger ): DeployManifest { let from = manifest.format as DeployManifestFormats; @@ -36,7 +38,7 @@ export function migrateDeployManifest( let newManifest = manifest; for(const migrator of migrationPath){ - newManifest = migrator.migrate(newManifest) as AnyDeployManifest; + newManifest = migrator.migrate(newManifest, logger) as AnyDeployManifest; } return newManifest as DeployManifest; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.infra/deserialize.ts b/packages/js/manifests/polywrap/src/formats/polywrap.infra/deserialize.ts index ee7a3ffe78..65aba2b2ed 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.infra/deserialize.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.infra/deserialize.ts @@ -46,8 +46,11 @@ export function deserializeInfraManifest( ); if (versionCompare === -1) { + // Warn user to migrate their manifest + options?.logger?.warn(`InfraManifest is using an older version of the manifest format (${anyInfraManifest.format}). Please update your manifest to the latest version (${latestInfraManifestFormat}) by using the "polywrap manifest migrate " command.`); + // Upgrade - return migrateInfraManifest(anyInfraManifest, latestInfraManifestFormat); + return migrateInfraManifest(anyInfraManifest, latestInfraManifestFormat, options?.logger); } else if (versionCompare === 1) { // Downgrade throw Error( diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.infra/migrate.ts b/packages/js/manifests/polywrap/src/formats/polywrap.infra/migrate.ts index ee769e3f9d..32a8551636 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.infra/migrate.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.infra/migrate.ts @@ -11,10 +11,12 @@ import { } from "."; import { findShortestMigrationPath } from "../../migrations"; import { migrators } from "./migrators"; +import { ILogger } from "@polywrap/logging-js"; export function migrateInfraManifest( manifest: AnyInfraManifest, - to: InfraManifestFormats + to: InfraManifestFormats, + logger?: ILogger ): InfraManifest { let from = manifest.format as InfraManifestFormats; @@ -36,7 +38,7 @@ export function migrateInfraManifest( let newManifest = manifest; for(const migrator of migrationPath){ - newManifest = migrator.migrate(newManifest) as AnyInfraManifest; + newManifest = migrator.migrate(newManifest, logger) as AnyInfraManifest; } return newManifest as InfraManifest; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.meta/deserialize.ts b/packages/js/manifests/polywrap/src/formats/polywrap.meta/deserialize.ts index 69908632b2..14e7bc7532 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.meta/deserialize.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.meta/deserialize.ts @@ -46,8 +46,11 @@ export function deserializeMetaManifest( ); 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); + return migrateMetaManifest(anyMetaManifest, latestMetaManifestFormat, options?.logger); } else if (versionCompare === 1) { // Downgrade throw Error( diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.meta/migrate.ts b/packages/js/manifests/polywrap/src/formats/polywrap.meta/migrate.ts index d9066967bc..21f1960e80 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.meta/migrate.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.meta/migrate.ts @@ -11,10 +11,12 @@ import { } from "."; import { findShortestMigrationPath } from "../../migrations"; import { migrators } from "./migrators"; +import { ILogger } from "@polywrap/logging-js"; export function migrateMetaManifest( manifest: AnyMetaManifest, - to: MetaManifestFormats + to: MetaManifestFormats, + logger?: ILogger ): MetaManifest { let from = manifest.format as MetaManifestFormats; @@ -36,7 +38,7 @@ export function migrateMetaManifest( let newManifest = manifest; for(const migrator of migrationPath){ - newManifest = migrator.migrate(newManifest) as AnyMetaManifest; + newManifest = migrator.migrate(newManifest, logger) as AnyMetaManifest; } return newManifest as MetaManifest; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/deserialize.ts b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/deserialize.ts index e2e48aa572..e2035e0a13 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/deserialize.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/deserialize.ts @@ -46,8 +46,11 @@ export function deserializePluginManifest( ); if (versionCompare === -1) { + // Warn user to migrate their manifest + options?.logger?.warn(`PluginManifest is using an older version of the manifest format (${anyPluginManifest.format}). Please update your manifest to the latest version (${latestPluginManifestFormat}) by using the "polywrap manifest migrate " command.`); + // Upgrade - return migratePluginManifest(anyPluginManifest, latestPluginManifestFormat); + return migratePluginManifest(anyPluginManifest, latestPluginManifestFormat, options?.logger); } else if (versionCompare === 1) { // Downgrade throw Error( diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrate.ts b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrate.ts index 462745b609..08e0292260 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrate.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrate.ts @@ -11,10 +11,12 @@ import { } from "."; import { findShortestMigrationPath } from "../../migrations"; import { migrators } from "./migrators"; +import { ILogger } from "@polywrap/logging-js"; export function migratePluginManifest( manifest: AnyPluginManifest, - to: PluginManifestFormats + to: PluginManifestFormats, + logger?: ILogger ): PluginManifest { let from = manifest.format as PluginManifestFormats; @@ -36,7 +38,7 @@ export function migratePluginManifest( let newManifest = manifest; for(const migrator of migrationPath){ - newManifest = migrator.migrate(newManifest) as AnyPluginManifest; + newManifest = migrator.migrate(newManifest, logger) as AnyPluginManifest; } return newManifest as PluginManifest; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/0.1.0_to_0.2.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/0.1.0_to_0.2.0.ts index 9d13075cc2..b453300a90 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/0.1.0_to_0.2.0.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/0.1.0_to_0.2.0.ts @@ -1,7 +1,18 @@ +import { ILogger } from "@polywrap/logging-js"; import { PluginManifest as OldManifest } from "../0.1.0"; import { PluginManifest as NewManifest } from "../0.2.0"; -export function migrate(manifest: OldManifest): NewManifest { +export function migrate(manifest: OldManifest, logger?: ILogger): NewManifest { + if ( + manifest.import_redirects?.some((x) => + x.schema.includes("build/schema.graphql") + ) + ) { + logger?.warn( + `Detected a reference to "build/schema.graphql" in "import_redirects". Consider using "build/wrap.info" instead of "build/schema.graphql" in "source.import_abis", schema.graphql is no longer emitted as a build artifact.` + ); + } + return { format: "0.2.0", project: { @@ -20,4 +31,4 @@ export function migrate(manifest: OldManifest): NewManifest { // eslint-disable-next-line @typescript-eslint/naming-convention __type: "PluginManifest", }; -}; +} diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.test/deserialize.ts b/packages/js/manifests/polywrap/src/formats/polywrap.test/deserialize.ts index da27d002c9..382319fd08 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.test/deserialize.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.test/deserialize.ts @@ -46,8 +46,11 @@ export function deserializePolywrapWorkflow( ); if (versionCompare === -1) { + // Warn user to migrate their manifest + options?.logger?.warn(`PolywrapWorkflow is using an older version of the manifest format (${anyPolywrapWorkflow.format}). Please update your manifest to the latest version (${latestPolywrapWorkflowFormat}) by using the "polywrap manifest migrate " command.`); + // Upgrade - return migratePolywrapWorkflow(anyPolywrapWorkflow, latestPolywrapWorkflowFormat); + return migratePolywrapWorkflow(anyPolywrapWorkflow, latestPolywrapWorkflowFormat, options?.logger); } else if (versionCompare === 1) { // Downgrade throw Error( diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.test/migrate.ts b/packages/js/manifests/polywrap/src/formats/polywrap.test/migrate.ts index fab4a75251..31fae66825 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.test/migrate.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.test/migrate.ts @@ -11,10 +11,12 @@ import { } from "."; import { findShortestMigrationPath } from "../../migrations"; import { migrators } from "./migrators"; +import { ILogger } from "@polywrap/logging-js"; export function migratePolywrapWorkflow( manifest: AnyPolywrapWorkflow, - to: PolywrapWorkflowFormats + to: PolywrapWorkflowFormats, + logger?: ILogger ): PolywrapWorkflow { let from = manifest.format as PolywrapWorkflowFormats; @@ -36,7 +38,7 @@ export function migratePolywrapWorkflow( let newManifest = manifest; for(const migrator of migrationPath){ - newManifest = migrator.migrate(newManifest) as AnyPolywrapWorkflow; + newManifest = migrator.migrate(newManifest, logger) as AnyPolywrapWorkflow; } return newManifest as PolywrapWorkflow; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap/deserialize.ts b/packages/js/manifests/polywrap/src/formats/polywrap/deserialize.ts index 679f447dfd..f0f68ac814 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap/deserialize.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap/deserialize.ts @@ -46,8 +46,11 @@ export function deserializePolywrapManifest( ); if (versionCompare === -1) { + // Warn user to migrate their manifest + options?.logger?.warn(`PolywrapManifest is using an older version of the manifest format (${anyPolywrapManifest.format}). Please update your manifest to the latest version (${latestPolywrapManifestFormat}) by using the "polywrap manifest migrate " command.`); + // Upgrade - return migratePolywrapManifest(anyPolywrapManifest, latestPolywrapManifestFormat); + return migratePolywrapManifest(anyPolywrapManifest, latestPolywrapManifestFormat, options?.logger); } else if (versionCompare === 1) { // Downgrade throw Error( diff --git a/packages/js/manifests/polywrap/src/formats/polywrap/migrate.ts b/packages/js/manifests/polywrap/src/formats/polywrap/migrate.ts index 300cd6dc68..78c62a3f75 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap/migrate.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap/migrate.ts @@ -11,10 +11,12 @@ import { } from "."; import { findShortestMigrationPath } from "../../migrations"; import { migrators } from "./migrators"; +import { ILogger } from "@polywrap/logging-js"; export function migratePolywrapManifest( manifest: AnyPolywrapManifest, - to: PolywrapManifestFormats + to: PolywrapManifestFormats, + logger?: ILogger ): PolywrapManifest { let from = manifest.format as PolywrapManifestFormats; @@ -36,7 +38,7 @@ export function migratePolywrapManifest( let newManifest = manifest; for(const migrator of migrationPath){ - newManifest = migrator.migrate(newManifest) as AnyPolywrapManifest; + newManifest = migrator.migrate(newManifest, logger) as AnyPolywrapManifest; } return newManifest as PolywrapManifest; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap/migrators/0.1.0_to_0.2.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap/migrators/0.1.0_to_0.2.0.ts index e8c687fdbd..4abb7e7775 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap/migrators/0.1.0_to_0.2.0.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap/migrators/0.1.0_to_0.2.0.ts @@ -1,7 +1,8 @@ +import { ILogger } from "@polywrap/logging-js"; import { PolywrapManifest as OldManifest } from "../0.1.0"; import { PolywrapManifest as NewManifest } from "../0.2.0"; -export function migrate(manifest: OldManifest): NewManifest { +export function migrate(manifest: OldManifest, logger?: ILogger): NewManifest { const shouldHaveExtensions = manifest.build || manifest.deploy || manifest.meta; @@ -11,6 +12,16 @@ export function migrate(manifest: OldManifest): NewManifest { meta: manifest.meta, }; + if ( + manifest.import_redirects?.some((x) => + x.schema.includes("build/schema.graphql") + ) + ) { + logger?.warn( + `Detected a reference to "build/schema.graphql" in "import_redirects". Consider using "build/wrap.info" instead of "build/schema.graphql" in "source.import_abis", schema.graphql is no longer emitted as a build artifact.` + ); + } + return { format: "0.2.0", project: { @@ -30,4 +41,4 @@ export function migrate(manifest: OldManifest): NewManifest { // eslint-disable-next-line @typescript-eslint/naming-convention __type: "PolywrapManifest", }; -}; +} diff --git a/packages/js/manifests/polywrap/src/migrations/migration.ts b/packages/js/manifests/polywrap/src/migrations/Migrator.ts similarity index 79% rename from packages/js/manifests/polywrap/src/migrations/migration.ts rename to packages/js/manifests/polywrap/src/migrations/Migrator.ts index 145ec43ff7..de9ccf6033 100644 --- a/packages/js/manifests/polywrap/src/migrations/migration.ts +++ b/packages/js/manifests/polywrap/src/migrations/Migrator.ts @@ -1,3 +1,4 @@ +import { ILogger } from "@polywrap/logging-js"; import { AnyAppManifest, AnyBuildManifest, @@ -22,5 +23,5 @@ type AnyManifest = export type Migrator = { from: string; to: string; - migrate: (manifest: AnyManifest) => AnyManifest; + migrate: (manifest: AnyManifest, logger?: ILogger) => AnyManifest; }; diff --git a/packages/js/manifests/polywrap/src/migrations/findShortestMigrationPath.ts b/packages/js/manifests/polywrap/src/migrations/findShortestMigrationPath.ts index d97580d897..5b9c908154 100644 --- a/packages/js/manifests/polywrap/src/migrations/findShortestMigrationPath.ts +++ b/packages/js/manifests/polywrap/src/migrations/findShortestMigrationPath.ts @@ -1,4 +1,4 @@ -import { Migrator } from "./migration"; +import { Migrator } from "./Migrator"; type MigrationWithSearchHistory = [Migrator, Migrator[]]; diff --git a/packages/js/manifests/polywrap/src/migrations/index.ts b/packages/js/manifests/polywrap/src/migrations/index.ts index 712bb35572..219a9e64f9 100644 --- a/packages/js/manifests/polywrap/src/migrations/index.ts +++ b/packages/js/manifests/polywrap/src/migrations/index.ts @@ -1,2 +1,2 @@ export * from "./findShortestMigrationPath"; -export * from "./migration"; +export * from "./Migrator";