@intentius/sql-yodeler 0.10.0 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -4
- package/dist/apply-steps/index.d.ts +2 -2
- package/dist/apply-steps/index.js +7 -7
- package/dist/apply-steps/index.js.map +1 -1
- package/dist/bin.js +8 -0
- package/dist/bin.js.map +1 -1
- package/dist/chant/apply.d.ts +0 -2
- package/dist/chant/apply.js +3 -4
- package/dist/chant/apply.js.map +1 -1
- package/dist/chant/build.js +3 -1
- package/dist/chant/build.js.map +1 -1
- package/dist/chant/confirm.d.ts +43 -0
- package/dist/chant/confirm.js +78 -0
- package/dist/chant/confirm.js.map +1 -0
- package/dist/chant/drift.d.ts +0 -2
- package/dist/chant/drift.js +2 -3
- package/dist/chant/drift.js.map +1 -1
- package/dist/chant/gated-request.d.ts +153 -0
- package/dist/chant/gated-request.js +91 -0
- package/dist/chant/gated-request.js.map +1 -0
- package/dist/chant/plan.d.ts +4 -6
- package/dist/chant/plan.js +8 -7
- package/dist/chant/plan.js.map +1 -1
- package/dist/chant/process.d.ts +5 -0
- package/dist/chant/process.js +5 -0
- package/dist/chant/process.js.map +1 -1
- package/dist/chant/stored-plan.d.ts +23 -0
- package/dist/chant/stored-plan.js +33 -0
- package/dist/chant/stored-plan.js.map +1 -0
- package/dist/chant-floor-version.d.ts +14 -0
- package/dist/chant-floor-version.js +15 -0
- package/dist/chant-floor-version.js.map +1 -0
- package/dist/chant-floor.d.ts +42 -0
- package/dist/chant-floor.js +82 -0
- package/dist/chant-floor.js.map +1 -0
- package/dist/check/run.js +2 -2
- package/dist/check/run.js.map +1 -1
- package/dist/ci/check-hooks.d.ts +65 -0
- package/dist/ci/check-hooks.js +101 -0
- package/dist/ci/check-hooks.js.map +1 -0
- package/dist/ci/login.d.ts +45 -0
- package/dist/ci/login.js +55 -0
- package/dist/ci/login.js.map +1 -1
- package/dist/ci/render.d.ts +127 -8
- package/dist/ci/render.js +254 -27
- package/dist/ci/render.js.map +1 -1
- package/dist/ci-words.d.ts +93 -0
- package/dist/ci-words.js +71 -0
- package/dist/ci-words.js.map +1 -0
- package/dist/cli.js +10 -1
- package/dist/cli.js.map +1 -1
- package/dist/command.js +2 -1
- package/dist/command.js.map +1 -1
- package/dist/commands/apply.d.ts +1 -1
- package/dist/commands/apply.js +44 -39
- package/dist/commands/apply.js.map +1 -1
- package/dist/commands/approve.d.ts +0 -2
- package/dist/commands/approve.js +72 -55
- package/dist/commands/approve.js.map +1 -1
- package/dist/commands/chant.d.ts +26 -0
- package/dist/commands/chant.js +37 -0
- package/dist/commands/chant.js.map +1 -0
- package/dist/commands/check.js +13 -10
- package/dist/commands/check.js.map +1 -1
- package/dist/commands/checkpoint.js +4 -5
- package/dist/commands/checkpoint.js.map +1 -1
- package/dist/commands/cleanup.d.ts +2 -0
- package/dist/commands/cleanup.js +82 -3
- package/dist/commands/cleanup.js.map +1 -1
- package/dist/commands/config.js +8 -8
- package/dist/commands/config.js.map +1 -1
- package/dist/commands/docs.js +2 -3
- package/dist/commands/docs.js.map +1 -1
- package/dist/commands/index.js +2 -0
- package/dist/commands/index.js.map +1 -1
- package/dist/commands/init.js +85 -20
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/lint.js +16 -11
- package/dist/commands/lint.js.map +1 -1
- package/dist/commands/mcp.js +14 -0
- package/dist/commands/mcp.js.map +1 -1
- package/dist/commands/new.d.ts +0 -2
- package/dist/commands/new.js +13 -36
- package/dist/commands/new.js.map +1 -1
- package/dist/commands/override.js +14 -16
- package/dist/commands/override.js.map +1 -1
- package/dist/commands/plan.js +14 -10
- package/dist/commands/plan.js.map +1 -1
- package/dist/commands/rebase.js +10 -10
- package/dist/commands/rebase.js.map +1 -1
- package/dist/commands/repair.js +4 -4
- package/dist/commands/report.d.ts +0 -2
- package/dist/commands/report.js +4 -6
- package/dist/commands/report.js.map +1 -1
- package/dist/commands/revert.js +19 -17
- package/dist/commands/revert.js.map +1 -1
- package/dist/commands/status.d.ts +0 -4
- package/dist/commands/status.js +9 -11
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/test.js +5 -5
- package/dist/commands/upgrade.d.ts +39 -0
- package/dist/commands/upgrade.js +197 -0
- package/dist/commands/upgrade.js.map +1 -0
- package/dist/config/define.d.ts +22 -3
- package/dist/config/define.js +1 -0
- package/dist/config/define.js.map +1 -1
- package/dist/config/load.js +8 -4
- package/dist/config/load.js.map +1 -1
- package/dist/credentials.d.ts +15 -20
- package/dist/credentials.js +7 -7
- package/dist/credentials.js.map +1 -1
- package/dist/declarative/plan.d.ts +8 -0
- package/dist/declarative/plan.js +35 -2
- package/dist/declarative/plan.js.map +1 -1
- package/dist/exit.d.ts +51 -15
- package/dist/exit.js +90 -22
- package/dist/exit.js.map +1 -1
- package/dist/history/lock.d.ts +10 -6
- package/dist/history/lock.js +16 -10
- package/dist/history/lock.js.map +1 -1
- package/dist/init/adopt.js +11 -11
- package/dist/init/adopt.js.map +1 -1
- package/dist/init/baseline.js +4 -4
- package/dist/init/baseline.js.map +1 -1
- package/dist/init/second.d.ts +5 -1
- package/dist/init/second.js +9 -6
- package/dist/init/second.js.map +1 -1
- package/dist/lint/annotations.d.ts +15 -5
- package/dist/lint/annotations.js +21 -5
- package/dist/lint/annotations.js.map +1 -1
- package/dist/lint/report.d.ts +0 -2
- package/dist/lint/report.js +2 -3
- package/dist/lint/report.js.map +1 -1
- package/dist/mcp/chant-hook.d.ts +40 -0
- package/dist/mcp/chant-hook.js +75 -0
- package/dist/mcp/chant-hook.js.map +1 -0
- package/dist/mcp/tools.js +1 -1
- package/dist/migrations/create.d.ts +1 -6
- package/dist/migrations/create.js +0 -3
- package/dist/migrations/create.js.map +1 -1
- package/dist/migrations/document.d.ts +1 -1
- package/dist/pr/model.js +2 -2
- package/dist/pr/model.js.map +1 -1
- package/dist/pr/note.d.ts +72 -0
- package/dist/pr/note.js +206 -0
- package/dist/pr/note.js.map +1 -0
- package/dist/pr/render.d.ts +6 -0
- package/dist/pr/render.js +2 -2
- package/dist/pr/render.js.map +1 -1
- package/dist/project.d.ts +11 -2
- package/dist/project.js +14 -3
- package/dist/project.js.map +1 -1
- package/dist/rebase/index.d.ts +0 -2
- package/dist/rebase/index.js +8 -9
- package/dist/rebase/index.js.map +1 -1
- package/dist/rebase/repair.d.ts +0 -2
- package/dist/rebase/repair.js +7 -9
- package/dist/rebase/repair.js.map +1 -1
- package/dist/replay/replay.d.ts +1 -5
- package/dist/replay/replay.js +4 -12
- package/dist/replay/replay.js.map +1 -1
- package/dist/replay/report.js +3 -2
- package/dist/replay/report.js.map +1 -1
- package/dist/replay/shared.js +3 -4
- package/dist/replay/shared.js.map +1 -1
- package/dist/report/audit.d.ts +65 -1
- package/dist/report/audit.js +73 -3
- package/dist/report/audit.js.map +1 -1
- package/dist/report/model.d.ts +15 -1
- package/dist/report/model.js +101 -2
- package/dist/report/model.js.map +1 -1
- package/dist/schemas.d.ts +1 -1
- package/dist/steps/index.d.ts +0 -5
- package/dist/steps/index.js +0 -10
- package/dist/steps/index.js.map +1 -1
- package/dist/steps/kinds.d.ts +2 -45
- package/dist/steps/kinds.js +2 -51
- package/dist/steps/kinds.js.map +1 -1
- package/dist/tenants/wave.js +5 -5
- package/dist/tenants/wave.js.map +1 -1
- package/dist/testing/report.d.ts +0 -2
- package/dist/testing/report.js +2 -3
- package/dist/testing/report.js.map +1 -1
- package/dist/testing/run.js +7 -10
- package/dist/testing/run.js.map +1 -1
- package/dist/versioned/approval.d.ts +0 -2
- package/dist/versioned/approval.js +6 -5
- package/dist/versioned/approval.js.map +1 -1
- package/dist/versioned/checks.d.ts +1 -1
- package/dist/versioned/checks.js +4 -5
- package/dist/versioned/checks.js.map +1 -1
- package/dist/versioned/engine.d.ts +2 -4
- package/dist/versioned/engine.js +11 -42
- package/dist/versioned/engine.js.map +1 -1
- package/dist/versioned/index.d.ts +1 -1
- package/dist/versioned/index.js +3 -4
- package/dist/versioned/index.js.map +1 -1
- package/dist/versioned/op.js +3 -2
- package/dist/versioned/op.js.map +1 -1
- package/dist/versioned/policy.d.ts +1 -1
- package/dist/versioned/policy.js +5 -5
- package/dist/versioned/policy.js.map +1 -1
- package/dist/versioned/revert.js +11 -11
- package/dist/versioned/revert.js.map +1 -1
- package/dist/versioned/stand-down.d.ts +15 -1
- package/dist/versioned/stand-down.js +29 -1
- package/dist/versioned/stand-down.js.map +1 -1
- package/dist/versioned/state.js +0 -5
- package/dist/versioned/state.js.map +1 -1
- package/dist/waves/index.d.ts +1 -1
- package/dist/waves/index.js +26 -12
- package/dist/waves/index.js.map +1 -1
- package/dist/waves/promotion.d.ts +1 -1
- package/dist/waves/promotion.js +6 -6
- package/dist/waves/promotion.js.map +1 -1
- package/package.json +8 -7
- package/schemas/check.schema.json +1 -1
- package/schemas/lint.schema.json +1 -1
- package/schemas/plan.schema.json +1 -1
- package/schemas/report.schema.json +1 -1
- package/dist/steps/orm-handoff.d.ts +0 -74
- package/dist/steps/orm-handoff.js +0 -154
- package/dist/steps/orm-handoff.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseline.js","sourceRoot":"","sources":["../../src/init/baseline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"baseline.js","sourceRoot":"","sources":["../../src/init/baseline.ts"],"names":[],"mappings":"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"}
|
package/dist/init/second.d.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*
|
|
6
6
|
* The baseline is the project's first migration. The environment's live
|
|
7
7
|
* schema is planned against the schema the baseline records, offline from
|
|
8
|
-
* `migration.json`: the plan must be empty. A difference refuses (exit
|
|
8
|
+
* `migration.json`: the plan must be empty. A difference refuses (exit 1),
|
|
9
9
|
* naming each object and what differs, and nothing is recorded.
|
|
10
10
|
*
|
|
11
11
|
* The record goes through the environment's migrations Op, as `yodel
|
|
@@ -25,6 +25,10 @@ import { type HistoryRow } from "../history/index.js";
|
|
|
25
25
|
import type { VersionedEnv } from "../versioned/engine.js";
|
|
26
26
|
/** chant's plan-digest kind for recording a baseline: never an apply's or a revert's. */
|
|
27
27
|
export declare const BASELINE_DIGEST_KIND = "yodel-baseline";
|
|
28
|
+
/** The kind of gated request (chant#4551) a baseline record is asked for under. */
|
|
29
|
+
export declare const BASELINE_REQUEST = "sql-baseline";
|
|
30
|
+
/** The gate a baseline record waits at as a gated request: the migrations gate's name with -baseline. */
|
|
31
|
+
export declare const baselineGate: (gate: string) => string;
|
|
28
32
|
/** The note a baseline row recorded by `yodel init --baseline` carries. */
|
|
29
33
|
export declare const recordedBaselineNote: (environment: string) => string;
|
|
30
34
|
/** The project's baseline: its first migration. Refuses a project with none. */
|
package/dist/init/second.js
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*
|
|
6
6
|
* The baseline is the project's first migration. The environment's live
|
|
7
7
|
* schema is planned against the schema the baseline records, offline from
|
|
8
|
-
* `migration.json`: the plan must be empty. A difference refuses (exit
|
|
8
|
+
* `migration.json`: the plan must be empty. A difference refuses (exit 1),
|
|
9
9
|
* naming each object and what differs, and nothing is recorded.
|
|
10
10
|
*
|
|
11
11
|
* The record goes through the environment's migrations Op, as `yodel
|
|
@@ -22,8 +22,7 @@ import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
|
|
|
22
22
|
import { tmpdir } from "node:os";
|
|
23
23
|
import { join } from "node:path";
|
|
24
24
|
import { randomUUID } from "node:crypto";
|
|
25
|
-
import { YodelError } from "../project.js";
|
|
26
|
-
import { EXIT_REFUSED } from "../exit.js";
|
|
25
|
+
import { YodelError, yodelRefusal } from "../project.js";
|
|
27
26
|
import { planEnvironment, renderPlan, unreadableOf } from "../chant/plan.js";
|
|
28
27
|
import { declarativeRefusal } from "../config/settings.js";
|
|
29
28
|
import { appliedBy, withLock } from "../history/index.js";
|
|
@@ -32,13 +31,17 @@ import { BASELINE_ENV } from "../versioned/op.js";
|
|
|
32
31
|
import { baselineRow, historyRefusal } from "./baseline.js";
|
|
33
32
|
/** chant's plan-digest kind for recording a baseline: never an apply's or a revert's. */
|
|
34
33
|
export const BASELINE_DIGEST_KIND = "yodel-baseline";
|
|
34
|
+
/** The kind of gated request (chant#4551) a baseline record is asked for under. */
|
|
35
|
+
export const BASELINE_REQUEST = "sql-baseline";
|
|
36
|
+
/** The gate a baseline record waits at as a gated request: the migrations gate's name with -baseline. */
|
|
37
|
+
export const baselineGate = (gate) => `${gate}-baseline`;
|
|
35
38
|
/** The note a baseline row recorded by `yodel init --baseline` carries. */
|
|
36
39
|
export const recordedBaselineNote = (environment) => `baseline: recorded by yodel init --baseline ${environment}, whose live schema matched the schema it records; its statements were not run`;
|
|
37
40
|
/** The project's baseline: its first migration. Refuses a project with none. */
|
|
38
41
|
export function projectBaseline(ordered) {
|
|
39
42
|
const first = ordered[0];
|
|
40
43
|
if (!first) {
|
|
41
|
-
throw
|
|
44
|
+
throw yodelRefusal("refused: the project has no migrations, so there is no baseline to record; adopt an environment with yodel init --from <env> first. Nothing was recorded.");
|
|
42
45
|
}
|
|
43
46
|
return first;
|
|
44
47
|
}
|
|
@@ -83,9 +86,9 @@ export async function compareBaseline(project, env, baseline, processEnv = proce
|
|
|
83
86
|
}
|
|
84
87
|
/** The refusal for a difference: names each one, and records nothing. */
|
|
85
88
|
export function differenceRefusal(env, baseline, cmp) {
|
|
86
|
-
return
|
|
89
|
+
return yodelRefusal(`refused: ${env}'s live schema is not the schema ${baseline} records, so the baseline cannot be recorded applied there. ` +
|
|
87
90
|
`${String(cmp.differences.length)} difference${cmp.differences.length === 1 ? "" : "s"}:\n${cmp.differences.map((d) => ` ${d}`).join("\n")}\n` +
|
|
88
|
-
`Make ${env} hold the baseline's schema (or empty it, and let yodel apply run the baseline), then run yodel init --baseline ${env} again. Nothing was recorded
|
|
91
|
+
`Make ${env} hold the baseline's schema (or empty it, and let yodel apply run the baseline), then run yodel init --baseline ${env} again. Nothing was recorded.`);
|
|
89
92
|
}
|
|
90
93
|
/** Refuses when `env`'s history records anything: the baseline is the first thing a history records. */
|
|
91
94
|
async function historyEmpty(venv) {
|
package/dist/init/second.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"second.js","sourceRoot":"","sources":["../../src/init/second.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAkC,
|
|
1
|
+
{"version":3,"file":"second.js","sourceRoot":"","sources":["../../src/init/second.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,17 +9,27 @@
|
|
|
9
9
|
*
|
|
10
10
|
* A finding in a migration points at its migration.sql, on the statement's
|
|
11
11
|
* line when the rule knows it (line 1 otherwise); a finding about the whole
|
|
12
|
-
* directory points at no file
|
|
12
|
+
* directory points at no file, and so does a declarative project's (#249),
|
|
13
|
+
* since the build of src/ does not say which file declared an object.
|
|
14
|
+
* Paths are relative to `root`, the
|
|
13
15
|
* repository's checkout (GITHUB_WORKSPACE, CI_PROJECT_DIR), with `/`.
|
|
14
16
|
*/
|
|
15
17
|
import type { Finding, LintReport } from "./check.js";
|
|
16
18
|
/** The formats `yodel lint --format` prints. */
|
|
17
19
|
export declare const LINT_FORMATS: readonly ["text", "json", "github", "gitlab"];
|
|
20
|
+
/**
|
|
21
|
+
* `--format forge` (#294): the format of the forge the job runs on, read
|
|
22
|
+
* from its variables, so one check hook serves every forge. `gitlab` under
|
|
23
|
+
* GitLab CI, `github` under GitHub or Forgejo Actions (both set
|
|
24
|
+
* `GITHUB_ACTIONS`), else `text`.
|
|
25
|
+
*/
|
|
26
|
+
export declare const FORGE_FORMAT = "forge";
|
|
27
|
+
export declare function forgeFormat(env?: NodeJS.ProcessEnv): "text" | "github" | "gitlab";
|
|
18
28
|
export type LintFormat = (typeof LINT_FORMATS)[number];
|
|
19
29
|
/** Where `yodel lint --format gitlab` writes the code quality report, unless --output says otherwise. */
|
|
20
30
|
export declare const CODE_QUALITY_FILE = "gl-code-quality-report.json";
|
|
21
|
-
/** The file a finding is about, relative to `root`; undefined for one about the directory as a whole. */
|
|
22
|
-
export declare function findingPath(report: Pick<LintReport, "dir">, f: Pick<Finding, "migration" | "file">, root: string): string | undefined;
|
|
31
|
+
/** The file a finding is about, relative to `root`; undefined for one about the directory as a whole, or in a declarative report, whose `migration` names the declared schema or a plan. */
|
|
32
|
+
export declare function findingPath(report: Pick<LintReport, "dir" | "declarative">, f: Pick<Finding, "migration" | "file">, root: string): string | undefined;
|
|
23
33
|
/**
|
|
24
34
|
* One workflow command per finding: `error` and `warning` at the finding's
|
|
25
35
|
* level, `notice` for a silenced one (it fails nothing, but a reviewer sees
|
|
@@ -41,8 +51,8 @@ export interface CodeQualityIssue {
|
|
|
41
51
|
}
|
|
42
52
|
/**
|
|
43
53
|
* GitLab's code quality report: an error is `major`, a warning `minor` and
|
|
44
|
-
* a silenced finding `info`. A finding about the directory as a whole
|
|
45
|
-
* placed on the
|
|
54
|
+
* a silenced finding `info`. A finding about the directory as a whole, or
|
|
55
|
+
* a declarative project's, is placed on the report's directory. The fingerprint is the rule, the
|
|
46
56
|
* place and the message, so the same finding on two pipelines is one issue
|
|
47
57
|
* to GitLab and a fixed one shows as resolved.
|
|
48
58
|
*/
|
package/dist/lint/annotations.js
CHANGED
|
@@ -9,7 +9,9 @@
|
|
|
9
9
|
*
|
|
10
10
|
* A finding in a migration points at its migration.sql, on the statement's
|
|
11
11
|
* line when the rule knows it (line 1 otherwise); a finding about the whole
|
|
12
|
-
* directory points at no file
|
|
12
|
+
* directory points at no file, and so does a declarative project's (#249),
|
|
13
|
+
* since the build of src/ does not say which file declared an object.
|
|
14
|
+
* Paths are relative to `root`, the
|
|
13
15
|
* repository's checkout (GITHUB_WORKSPACE, CI_PROJECT_DIR), with `/`.
|
|
14
16
|
*/
|
|
15
17
|
import { createHash } from "node:crypto";
|
|
@@ -18,6 +20,20 @@ import { join, relative, sep } from "node:path";
|
|
|
18
20
|
import { MIGRATION_SQL } from "../migrations/index.js";
|
|
19
21
|
/** The formats `yodel lint --format` prints. */
|
|
20
22
|
export const LINT_FORMATS = ["text", "json", "github", "gitlab"];
|
|
23
|
+
/**
|
|
24
|
+
* `--format forge` (#294): the format of the forge the job runs on, read
|
|
25
|
+
* from its variables, so one check hook serves every forge. `gitlab` under
|
|
26
|
+
* GitLab CI, `github` under GitHub or Forgejo Actions (both set
|
|
27
|
+
* `GITHUB_ACTIONS`), else `text`.
|
|
28
|
+
*/
|
|
29
|
+
export const FORGE_FORMAT = "forge";
|
|
30
|
+
export function forgeFormat(env = process.env) {
|
|
31
|
+
if (env.GITLAB_CI === "true")
|
|
32
|
+
return "gitlab";
|
|
33
|
+
if (env.GITHUB_ACTIONS === "true" || env.FORGEJO_ACTIONS === "true")
|
|
34
|
+
return "github";
|
|
35
|
+
return "text";
|
|
36
|
+
}
|
|
21
37
|
/** Where `yodel lint --format gitlab` writes the code quality report, unless --output says otherwise. */
|
|
22
38
|
export const CODE_QUALITY_FILE = "gl-code-quality-report.json";
|
|
23
39
|
/** `p` with its symbolic links resolved, so a checkout reached through one (macOS's /var, /tmp) still contains the project; `p` itself when it does not exist. */
|
|
@@ -31,11 +47,11 @@ function real(p) {
|
|
|
31
47
|
}
|
|
32
48
|
/** `to` relative to `root`, with `/`. */
|
|
33
49
|
const fromRoot = (root, to) => relative(real(root), real(to)).split(sep).join("/");
|
|
34
|
-
/** The file a finding is about, relative to `root`; undefined for one about the directory as a whole. */
|
|
50
|
+
/** The file a finding is about, relative to `root`; undefined for one about the directory as a whole, or in a declarative report, whose `migration` names the declared schema or a plan. */
|
|
35
51
|
export function findingPath(report, f, root) {
|
|
36
52
|
if (f.file !== undefined)
|
|
37
53
|
return fromRoot(root, join(report.dir, f.file));
|
|
38
|
-
if (f.migration === undefined)
|
|
54
|
+
if (f.migration === undefined || report.declarative === true)
|
|
39
55
|
return undefined;
|
|
40
56
|
return `${fromRoot(root, join(report.dir, f.migration))}/${MIGRATION_SQL}`;
|
|
41
57
|
}
|
|
@@ -62,8 +78,8 @@ export function workflowCommands(report, root) {
|
|
|
62
78
|
}
|
|
63
79
|
/**
|
|
64
80
|
* GitLab's code quality report: an error is `major`, a warning `minor` and
|
|
65
|
-
* a silenced finding `info`. A finding about the directory as a whole
|
|
66
|
-
* placed on the
|
|
81
|
+
* a silenced finding `info`. A finding about the directory as a whole, or
|
|
82
|
+
* a declarative project's, is placed on the report's directory. The fingerprint is the rule, the
|
|
67
83
|
* place and the message, so the same finding on two pipelines is one issue
|
|
68
84
|
* to GitLab and a fixed one shows as resolved.
|
|
69
85
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../src/lint/annotations.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../src/lint/annotations.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAGvD,gDAAgD;AAChD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAU,CAAC;AAE1E;;;;;GAKG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,OAAO,CAAC;AAEpC,MAAM,UAAU,WAAW,CAAC,MAAyB,OAAO,CAAC,GAAG;IAC9D,IAAI,GAAG,CAAC,SAAS,KAAK,MAAM;QAAE,OAAO,QAAQ,CAAC;IAC9C,IAAI,GAAG,CAAC,cAAc,KAAK,MAAM,IAAI,GAAG,CAAC,eAAe,KAAK,MAAM;QAAE,OAAO,QAAQ,CAAC;IACrF,OAAO,MAAM,CAAC;AAChB,CAAC;AAGD,yGAAyG;AACzG,MAAM,CAAC,MAAM,iBAAiB,GAAG,6BAA6B,CAAC;AAE/D,kKAAkK;AAClK,SAAS,IAAI,CAAC,CAAS;IACrB,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,CAAC;IACX,CAAC;AACH,CAAC;AAED,yCAAyC;AACzC,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,EAAU,EAAU,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE3G,4LAA4L;AAC5L,MAAM,UAAU,WAAW,CAAC,MAA+C,EAAE,CAAsC,EAAE,IAAY;IAC/H,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1E,IAAI,CAAC,CAAC,SAAS,KAAK,SAAS,IAAI,MAAM,CAAC,WAAW,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IAC/E,OAAO,GAAG,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,aAAa,EAAE,CAAC;AAC7E,CAAC;AAED,wFAAwF;AACxF,MAAM,UAAU,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAC7G,MAAM,cAAc,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAEtG;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAAkB,EAAE,IAAY;IAC/D,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACtC,MAAM,OAAO,GAAG,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAC9D,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG;YACZ,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9F,SAAS,cAAc,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE;SAClD,CAAC;QACF,MAAM,OAAO,GAAG,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,eAAe,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QAChG,OAAO,KAAK,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;IACnE,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AACzD,CAAC;AAWD;;;;;;GAMG;AACH,MAAM,UAAU,WAAW,CAAC,MAAkB,EAAE,IAAY;IAC1D,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC/B,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;QACxE,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;QAC1B,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QAC7F,OAAO;YACL,WAAW,EAAE,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,eAAe,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO;YAC5F,UAAU,EAAE,CAAC,CAAC,IAAI;YAClB,WAAW,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,IAAI,KAAK,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;YAC5G,QAAQ;YACR,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE;SACrC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/lint/report.d.ts
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
/** `yodel lint`'s output: text for people, JSON for a CI job, and the exit code. */
|
|
2
2
|
import type { LintReport } from "./check.js";
|
|
3
|
-
/** Exit code: at least one finding at level error that no silence covers. */
|
|
4
|
-
export declare const LINT_FAILED = 3;
|
|
5
3
|
export declare const lintExitCode: (report: LintReport) => number;
|
|
6
4
|
export declare function renderLint(report: LintReport): string;
|
|
7
5
|
export declare function lintJson(report: LintReport): Record<string, unknown>;
|
package/dist/lint/report.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
/** `yodel lint`'s output: text for people, JSON for a CI job, and the exit code. */
|
|
2
|
-
|
|
3
|
-
export const
|
|
4
|
-
export const lintExitCode = (report) => (report.errors > 0 ? LINT_FAILED : 0);
|
|
2
|
+
import { EXIT_FAILED } from "../exit.js";
|
|
3
|
+
export const lintExitCode = (report) => (report.errors > 0 ? EXIT_FAILED : 0);
|
|
5
4
|
const plural = (n, one, many = `${one}s`) => `${String(n)} ${n === 1 ? one : many}`;
|
|
6
5
|
function line(f) {
|
|
7
6
|
const head = f.silenced !== undefined ? "silenced" : f.level;
|
package/dist/lint/report.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report.js","sourceRoot":"","sources":["../../src/lint/report.ts"],"names":[],"mappings":"AAAA,oFAAoF;
|
|
1
|
+
{"version":3,"file":"report.js","sourceRoot":"","sources":["../../src/lint/report.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { type YodelTool } from "./tools.js";
|
|
2
|
+
/** chant's `McpToolContribution`, the parts yodel fills. */
|
|
3
|
+
export interface ChantMcpTool {
|
|
4
|
+
name: string;
|
|
5
|
+
description: string;
|
|
6
|
+
inputSchema: {
|
|
7
|
+
type: "object";
|
|
8
|
+
properties: Record<string, unknown>;
|
|
9
|
+
required?: string[];
|
|
10
|
+
};
|
|
11
|
+
handler: (params: Record<string, unknown>) => Promise<unknown>;
|
|
12
|
+
readOnly: true;
|
|
13
|
+
}
|
|
14
|
+
/** chant's `ProductMcpHook`, the parts yodel fills. */
|
|
15
|
+
export interface YodelMcpHook {
|
|
16
|
+
product: string;
|
|
17
|
+
tools: () => ChantMcpTool[];
|
|
18
|
+
readOnly: true;
|
|
19
|
+
instructions: string;
|
|
20
|
+
}
|
|
21
|
+
/** What yodel calls of `@intentius/chant/ci-product` for the hook and the traces. */
|
|
22
|
+
export interface ChantHooks {
|
|
23
|
+
runChantInProcess: (argv: string[], words: unknown, options: {
|
|
24
|
+
mcp?: YodelMcpHook;
|
|
25
|
+
}) => Promise<number>;
|
|
26
|
+
configureOtlp: (opts: {
|
|
27
|
+
prefix: string;
|
|
28
|
+
}) => unknown;
|
|
29
|
+
PRODUCT_MCP_HOOK_FLOOR: string;
|
|
30
|
+
}
|
|
31
|
+
/** chant's product tool hook and OTLP exporter, once, or undefined when the installed chant has neither (a release before chant#4555). */
|
|
32
|
+
export declare function chantHooks(): Promise<ChantHooks | undefined>;
|
|
33
|
+
/** One of yodel's tools as chant's contribution: the same handler, read-only. */
|
|
34
|
+
export declare function asChantTool(t: YodelTool): ChantMcpTool;
|
|
35
|
+
/** yodel's tools for chant's server, checked read-only before chant sees them. */
|
|
36
|
+
export declare function yodelMcpHook(dir: string, tools?: readonly YodelTool[]): YodelMcpHook;
|
|
37
|
+
/** Serve yodel's tools on chant's read-only server, from `dir`. Undefined when chant has no hook. */
|
|
38
|
+
export declare function serveOnChant(dir: string, chant?: ChantHooks): Promise<number | undefined>;
|
|
39
|
+
/** Configure chant's OTLP exporter with yodel's prefix, once, when an endpoint is set and chant has the exporter. */
|
|
40
|
+
export declare function useChantTraces(env?: NodeJS.ProcessEnv): Promise<boolean>;
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* yodel's MCP tools on chant's server, and its traces through chant's OTLP
|
|
3
|
+
* exporter (#297, chant#4555, chant#4543).
|
|
4
|
+
*
|
|
5
|
+
* With a chant that has the product tool hook, `yodel mcp` runs `chant
|
|
6
|
+
* serve mcp --read-only` in this process through `runChantInProcess` with
|
|
7
|
+
* yodel's words and {@link yodelMcpHook}: chant serves its own read-only
|
|
8
|
+
* tools over the ledger and graph, and yodel's tools beside them as
|
|
9
|
+
* `yodel:status`, `yodel:plan`, `yodel:lint`, `yodel:drift`,
|
|
10
|
+
* `yodel:history` and `yodel:explain`. Each declares `readOnly: true`; chant
|
|
11
|
+
* refuses to start a read-only server with a product tool named as a write,
|
|
12
|
+
* and yodel's own {@link assertReadOnly} refuses the list first, as its own
|
|
13
|
+
* server did. Without the hook `yodel mcp` serves its own stdio server, as
|
|
14
|
+
* before.
|
|
15
|
+
*
|
|
16
|
+
* Traces: with `OTEL_EXPORTER_OTLP_ENDPOINT` set, {@link useChantTraces}
|
|
17
|
+
* configures chant's exporter with the `yodel` prefix once, so a wave job
|
|
18
|
+
* that `yodel chant run wave` runs sends its trace with `yodel.*`
|
|
19
|
+
* attributes. Without the exporter nothing is sent, as before.
|
|
20
|
+
*
|
|
21
|
+
* Both are imported lazily, with the specifiers in variables, so this
|
|
22
|
+
* compiles and runs on a published chant without them.
|
|
23
|
+
*/
|
|
24
|
+
import { YODEL_WORDS } from "../ci-words.js";
|
|
25
|
+
import { assertReadOnly, yodelTools } from "./tools.js";
|
|
26
|
+
import { INSTRUCTIONS } from "./server.js";
|
|
27
|
+
let hooks;
|
|
28
|
+
/** chant's product tool hook and OTLP exporter, once, or undefined when the installed chant has neither (a release before chant#4555). */
|
|
29
|
+
export function chantHooks() {
|
|
30
|
+
hooks ??= (async () => {
|
|
31
|
+
const specifier = "@intentius/chant/ci-product";
|
|
32
|
+
try {
|
|
33
|
+
const m = (await import(specifier));
|
|
34
|
+
return typeof m.runChantInProcess === "function" && typeof m.configureOtlp === "function" && typeof m.PRODUCT_MCP_HOOK_FLOOR === "string" ? m : undefined;
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
})();
|
|
40
|
+
return hooks;
|
|
41
|
+
}
|
|
42
|
+
/** One of yodel's tools as chant's contribution: the same handler, read-only. */
|
|
43
|
+
export function asChantTool(t) {
|
|
44
|
+
const { type, properties, required } = t.inputSchema;
|
|
45
|
+
return { name: t.name, description: t.description, inputSchema: { type, properties, ...(required ? { required } : {}) }, handler: t.handler, readOnly: true };
|
|
46
|
+
}
|
|
47
|
+
/** yodel's tools for chant's server, checked read-only before chant sees them. */
|
|
48
|
+
export function yodelMcpHook(dir, tools = yodelTools(dir)) {
|
|
49
|
+
assertReadOnly(tools);
|
|
50
|
+
return { product: YODEL_WORDS.product, tools: () => tools.map(asChantTool), readOnly: true, instructions: INSTRUCTIONS };
|
|
51
|
+
}
|
|
52
|
+
/** Serve yodel's tools on chant's read-only server, from `dir`. Undefined when chant has no hook. */
|
|
53
|
+
export async function serveOnChant(dir, chant) {
|
|
54
|
+
const c = chant ?? (await chantHooks());
|
|
55
|
+
if (!c)
|
|
56
|
+
return undefined;
|
|
57
|
+
const hook = yodelMcpHook(dir);
|
|
58
|
+
process.chdir(dir);
|
|
59
|
+
return c.runChantInProcess(["serve", "mcp", "--read-only"], YODEL_WORDS, { mcp: hook });
|
|
60
|
+
}
|
|
61
|
+
let traced = false;
|
|
62
|
+
/** Configure chant's OTLP exporter with yodel's prefix, once, when an endpoint is set and chant has the exporter. */
|
|
63
|
+
export async function useChantTraces(env = process.env) {
|
|
64
|
+
if (traced)
|
|
65
|
+
return true;
|
|
66
|
+
if (!env.OTEL_EXPORTER_OTLP_ENDPOINT && !env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT)
|
|
67
|
+
return false;
|
|
68
|
+
const c = await chantHooks();
|
|
69
|
+
if (!c)
|
|
70
|
+
return false;
|
|
71
|
+
c.configureOtlp({ prefix: YODEL_WORDS.product });
|
|
72
|
+
traced = true;
|
|
73
|
+
return true;
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=chant-hook.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"chant-hook.js","sourceRoot":"","sources":["../../src/mcp/chant-hook.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/tools.js
CHANGED
|
@@ -127,7 +127,7 @@ export function yodelTools(dir) {
|
|
|
127
127
|
},
|
|
128
128
|
{
|
|
129
129
|
name: "lint",
|
|
130
|
-
description: `yodel lint [--env <env>] --json: the lint findings and silences; with env, also against that environment's history. Exit
|
|
130
|
+
description: `yodel lint [--env <env>] --json: the lint findings and silences; with env, also against that environment's history. Exit 1 on an error finding. The replay check is not offered: it writes to a database. results: ${schemaId(COMMAND_SCHEMAS.lint)}`,
|
|
131
131
|
inputSchema: envInput(false, `${ENV} Optional: compare the migrations with its history.`),
|
|
132
132
|
annotations: READ_ONLY,
|
|
133
133
|
verbs: ["lint"],
|
|
@@ -11,7 +11,7 @@ import { type DiffStatementsOptions, type SchemaStatements } from "@intentius/ch
|
|
|
11
11
|
import type { BuildOutput } from "../chant/build.js";
|
|
12
12
|
import { type MigrationCheck, type MigrationDocument, type MigrationFiles, type MigrationStep } from "./document.js";
|
|
13
13
|
import { type Migration } from "./directory.js";
|
|
14
|
-
import { type BackfillForm
|
|
14
|
+
import { type BackfillForm } from "../steps/kinds.js";
|
|
15
15
|
export interface CreateMigrationOptions {
|
|
16
16
|
/** The migration's name, the part of its id after the timestamp. */
|
|
17
17
|
name: string;
|
|
@@ -39,11 +39,6 @@ export interface CreateMigrationOptions {
|
|
|
39
39
|
} | {
|
|
40
40
|
form: BackfillForm;
|
|
41
41
|
};
|
|
42
|
-
/**
|
|
43
|
-
* An `orm-handoff` step to end the migration with (#279): it marks the
|
|
44
|
-
* ORM's own migration applied after the Op, so the ORM does not run it.
|
|
45
|
-
*/
|
|
46
|
-
ormHandoff?: OrmHandoffOptions;
|
|
47
42
|
/**
|
|
48
43
|
* How long a `PostgresMigrationOp` step keeps the old column, or a
|
|
49
44
|
* `ClickHouseRebuildOp` step the old table, after the switch: written
|
|
@@ -14,7 +14,6 @@ import { MIGRATION_FORMAT, serializeDocument } from "./document.js";
|
|
|
14
14
|
import { MIGRATION_NAME } from "./directory.js";
|
|
15
15
|
import { asBackfill, BACKFILL_FILE, describeForm, PG_MIGRATION_OP, REBUILD_OP } from "../steps/kinds.js";
|
|
16
16
|
import { backfillFormStep, backfillStep, describeFormSql } from "../steps/backfill.js";
|
|
17
|
-
import { ormHandoffStep } from "../steps/orm-handoff.js";
|
|
18
17
|
/** `YYYYMMDDTHHMM` in UTC. */
|
|
19
18
|
export function migrationTimestamp(now) {
|
|
20
19
|
const iso = now.toISOString(); // 2026-10-09T14:12:34.567Z
|
|
@@ -112,8 +111,6 @@ export function createMigration(options) {
|
|
|
112
111
|
const step = "form" in options.backfill ? backfillFormStep(options.name, options.backfill.form) : backfillStep(options.name, options.backfill.file ?? BACKFILL_FILE);
|
|
113
112
|
statements = { ...statements, refused: true, steps: [...statements.steps, step] };
|
|
114
113
|
}
|
|
115
|
-
if (options.ormHandoff)
|
|
116
|
-
statements = { ...statements, refused: true, steps: [...statements.steps, ormHandoffStep(options.name, options.ormHandoff)] };
|
|
117
114
|
if (statements.steps.length === 0)
|
|
118
115
|
return { id: undefined, statements };
|
|
119
116
|
const unsigned = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/migrations/create.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAqD,MAAM,mDAAmD,CAAC;AACxJ,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAwF,MAAM,eAAe,CAAC;AAC1J,OAAO,EAAE,cAAc,EAAkB,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/migrations/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,7 +86,7 @@ export interface MigrationDocument {
|
|
|
86
86
|
/**
|
|
87
87
|
* Pre-migration checks (#52): read-only queries `yodel apply` runs against
|
|
88
88
|
* the environment before the migration's first statement; one that fails
|
|
89
|
-
* refuses the run (exit
|
|
89
|
+
* refuses the run (exit 1). Absent when there are none. In the checksum,
|
|
90
90
|
* so in the plan digest. See `./checks.ts`.
|
|
91
91
|
*/
|
|
92
92
|
checks?: MigrationCheck[];
|
package/dist/pr/model.js
CHANGED
|
@@ -16,7 +16,7 @@ import { migrationChecks, scanMigrations } from "../migrations/index.js";
|
|
|
16
16
|
import { describeTopology } from "../history/index.js";
|
|
17
17
|
import { asBackfill } from "../steps/kinds.js";
|
|
18
18
|
import { retainedNote } from "../cleanup/index.js";
|
|
19
|
-
import {
|
|
19
|
+
import { EXIT_FAILED } from "../exit.js";
|
|
20
20
|
import { BROKEN_CHAIN, findMigrateOp, inspect, gitLedger, judgePlan, overrideSourceAt, overrideSubject, migrateOpExample, migrationsDir, closeVersioned, openVersioned, outOfOrder, planDigest, sameDigest, statusReport, } from "../versioned/index.js";
|
|
21
21
|
import { currentSubject, explainAgainst, explainMove, latestApproval } from "../versioned/explain.js";
|
|
22
22
|
import { waveView } from "../waves/index.js";
|
|
@@ -44,7 +44,7 @@ export async function collectVersionedPlan(project, env, options = {}) {
|
|
|
44
44
|
if (!scan.ordered) {
|
|
45
45
|
// Nothing can be planned, but the history still says what is applied.
|
|
46
46
|
const { status } = await inspect(venv, [], { sync: false });
|
|
47
|
-
return { ...base, appliedCount: status.applied.length, pending: [], refusal: { exitCode:
|
|
47
|
+
return { ...base, appliedCount: status.applied.length, pending: [], refusal: { exitCode: EXIT_FAILED, message: BROKEN_CHAIN } };
|
|
48
48
|
}
|
|
49
49
|
return await collectWith(project, env, options, venv, scan.ordered, base, problems);
|
|
50
50
|
}
|
package/dist/pr/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/pr/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,OAAO,EAAE,QAAQ,EAAgC,MAAM,2BAA2B,CAAC;AAEtI,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAmD,MAAM,eAAe,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,cAAc,EAAuC,MAAM,wBAAwB,CAAC;AAC9G,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/pr/model.ts"],"names":[],"mappings":"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"}
|