fix types

This commit is contained in:
Matt Hill
2023-05-05 11:16:01 -06:00
parent 8f69f3df9e
commit a0bc1eca02
5 changed files with 13 additions and 14 deletions

View File

@@ -1,5 +1,5 @@
import { SDKManifest } from "../manifest/ManifestTypes"
import { Dependency, PackageId } from "../types"
import { Dependency } from "../types"
export type Dependencies<T extends SDKManifest> = {
exists(id: keyof T["dependencies"]): Dependency

View File

@@ -1,5 +1,4 @@
import { InterfaceReceipt } from "../mainFn/interfaceReceipt"
import { Daemon, Effects } from "../types"
import { Effects } from "../types"
import { CheckResult } from "./checkFns/CheckResult"
import { HealthReceipt } from "./HealthReceipt"
import { Trigger } from "./trigger"

View File

@@ -2,7 +2,7 @@ import { ManifestVersion } from "../../manifest/ManifestTypes"
import { Effects } from "../../types"
import { Utils } from "../../util"
export class Migration<Version extends ManifestVersion, WD> {
export class Migration<WD, Version = ManifestVersion> {
constructor(
readonly options: {
version: Version
@@ -10,10 +10,10 @@ export class Migration<Version extends ManifestVersion, WD> {
down: (opts: { effects: Effects; utils: Utils<WD> }) => Promise<void>
},
) {}
static of<Version extends ManifestVersion>(options: {
static of<WD, Version = ManifestVersion>(options: {
version: Version
up: (opts: { effects: Effects }) => Promise<void>
down: (opts: { effects: Effects }) => Promise<void>
up: (opts: { effects: Effects; utils: Utils<WD> }) => Promise<void>
down: (opts: { effects: Effects; utils: Utils<WD> }) => Promise<void>
}) {
return new Migration(options)
}

View File

@@ -7,21 +7,21 @@ import { Migration } from "./Migration"
export class Migrations<WD> {
private constructor(
readonly manifest: SDKManifest,
readonly migrations: Array<Migration<any, WD>>,
readonly migrations: Array<Migration<WD, any>>,
) {}
private sortedMigrations = once(() => {
const migrationsAsVersions = (
this.migrations as Array<Migration<any, WD>>
this.migrations as Array<Migration<WD, any>>
).map((x) => [EmVer.parse(x.options.version), x] as const)
migrationsAsVersions.sort((a, b) => a[0].compareForSort(b[0]))
return migrationsAsVersions
})
private currentVersion = once(() => EmVer.parse(this.manifest.version))
static of<Migrations extends Array<Migration<any, WD>>, WD>(
static of<Migrations extends Array<Migration<WD, any>>, WD>(
manifest: SDKManifest,
...migrations: EnsureUniqueId<Migrations, WD>
) {
return new Migrations(manifest, migrations as Array<Migration<any, WD>>)
return new Migrations(manifest, migrations as Array<Migration<WD, any>>)
}
async init({
effects,
@@ -55,7 +55,7 @@ export class Migrations<WD> {
}
export function setupMigrations<
Migrations extends Array<Migration<any, WD>>,
Migrations extends Array<Migration<WD, any>>,
WD,
>(manifest: SDKManifest, ...migrations: EnsureUniqueId<Migrations, WD>) {
return Migrations.of(manifest, ...migrations)
@@ -64,7 +64,7 @@ export function setupMigrations<
// prettier-ignore
export type EnsureUniqueId<A, WD, B = A, ids = never> =
B extends [] ? A :
B extends [Migration<infer id, WD>, ...infer Rest] ? (
B extends [Migration<WD, infer id>, ...infer Rest] ? (
id extends ids ? "One of the ids are not unique"[] :
EnsureUniqueId<A, Rest, id | ids>
) : "There exists a migration that is not a Migration"[]

View File

@@ -1,6 +1,6 @@
{
"name": "@start9labs/start-sdk",
"version": "0.4.0-rev0.lib0.rc1",
"version": "0.4.0-rev0.lib0.rc2",
"description": "For making the patterns that are wanted in making services for the startOS.",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",