@gadicc/loom 1.35.0 → 1.35.2

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.
@@ -63,6 +63,14 @@ export type DependencyMutation = {
63
63
  };
64
64
  /** Parses Deno JSON/JSONC while reporting every syntax error. */
65
65
  export declare function parseJsonc<T>(text: string, filename: string): T;
66
+ /** Compares JSON data, ignoring object key order and `undefined` members. */
67
+ export declare function jsonValuesEqual(left: unknown, right: unknown): boolean;
68
+ /**
69
+ * Rewrites JSON or JSONC text to hold `next` by editing only the members
70
+ * whose values changed, so the file keeps its own key order, indentation,
71
+ * line layout and comments. New members are appended to their object.
72
+ */
73
+ export declare function patchJsonText(text: string, next: unknown): string;
66
74
  /**
67
75
  * Detects project tooling once during adoption. A recorded Loom choice is
68
76
  * authoritative on later runs and is validated instead of inferred again.
@@ -1 +1 @@
1
- {"version":3,"file":"projectTooling.d.ts","sourceRoot":"","sources":["../../../src/src/cli/projectTooling.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"projectTooling.d.ts","sourceRoot":"","sources":["../../../src/src/cli/projectTooling.ts"],"names":[],"mappings":"AAiBA,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;AAC9D,MAAM,MAAM,UAAU,GAAG,cAAc,CAAC;AACxC,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG,YAAY,GAAG,cAAc,CAAC;AACzE,MAAM,MAAM,oBAAoB,GAAG,cAAc,CAAC;AAElD,qEAAqE;AACrE,MAAM,MAAM,cAAc,GAAG;IAC3B,YAAY,EAAE;QACZ,MAAM,EAAE,oBAAoB,CAAC;QAC7B,OAAO,EAAE,cAAc,CAAC;KACzB,CAAC;IACF,KAAK,EAAE;QACL,MAAM,EAAE,cAAc,CAAC;QACvB,MAAM,EAAE,UAAU,CAAC;KACpB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAC1B,MAAM,GACN,CAAC;IACD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAE/B,MAAM,MAAM,cAAc,GAAG,kBAAkB,CAAC;AAEhD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC5C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE5B,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,cAAc,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC5C,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC;IAC7B,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,aAAa,EAAE,cAAc,CAAC;IAC9B,mBAAmB,EAAE,cAAc,CAAC;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,cAAc,CAAC;IAC1B,eAAe,EAAE,cAAc,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAWF,iEAAiE;AACjE,wBAAgB,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,CAe/D;AAgDD,6EAA6E;AAC7E,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,WAE5D;AA0BD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,UAOxD;AAkGD;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,cAAc,GACxB,OAAO,CAAC,cAAc,CAAC,CA+DzB;AAED,yEAAyE;AACzE,wBAAsB,aAAa,CACjC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,GAC/B,OAAO,CAAC,SAAS,CAAC,CA8BpB;AA2CD,gFAAgF;AAChF,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,QAAQ,GACf,kBAAkB,CAmBpB;AAED,yFAAyF;AACzF,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,MAAM,GACV,OAAO,CAAC;IACT,MAAM,EAAE,oBAAoB,CAAC;IAC7B,WAAW,EAAE,kBAAkB,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,CA6BD;AAMD;;;;GAIG;AACH,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,cAAc,CAAC,cAAc,CAAC,EACvC,QAAQ,EAAE,kBAAkB;;;;;GAmE7B;AAED,8EAA8E;AAC9E,MAAM,MAAM,wBAAwB,GAAG,gBAAgB,GAAG,aAAa,CAAC;AAcxE;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,wBAAwB,EAC/B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,OAAO,GAAE;IACP,uDAAuD;IACvD,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mEAAmE;IACnE,eAAe,CAAC,EAAE,OAAO,CAAC;CACtB;;GAiDP;AA8ED,+DAA+D;AAC/D,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,WAAW,GAAG,YAAY,EAClC,QAAQ,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAAA;CAAE;;;GAiBhE;AAED,wEAAwE;AACxE,wBAAsB,aAAa,CACjC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,WAAW,GAAG,YAAY,qBAKnC;AAED,4EAA4E;AAC5E,wBAAgB,cAAc,CAAC,UAAU,EAAE,cAAc,GAAG,SAAS,sBAKpE;AAED,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,cAAc,GAAG,SAAS,YAOzE;AAED,iEAAiE;AACjE,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,EAC9B,IAAI,EAAE,MAAM,UAYb;AAoBD,iFAAiF;AACjF,wBAAgB,WAAW,CACzB,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,EACrC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,WAiBf;AAED,gFAAgF;AAChF,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,EACrC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,WAiBxB;AAED,4EAA4E;AAC5E,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,EACrC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,WAkBtB;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE,cAAc,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;CACrC,CAAC;AAEF,4DAA4D;AAC5D,wBAAsB,UAAU,CAC9B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,EAChC,OAAO,EAAE,iBAAiB;;;;;GA+B3B;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,EAChC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM;;;GAiCrB;AAED,gFAAgF;AAChF,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,EAChC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM;;;GAqBjB;AAaD,0EAA0E;AAC1E,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,cAAc,CAAC,OAAO,CAAC,GACrC,OAAO,CAAC,YAAY,EAAE,CAAC,CAoCzB"}
@@ -58,6 +58,53 @@ function updateJsonPath(text, path, value) {
58
58
  const { applyEdits, modify } = jsoncParser;
59
59
  return applyEdits(text, modify(text, path, value, { formattingOptions: formattingOptions(text) }));
60
60
  }
61
+ function isPlainJsonObject(value) {
62
+ return typeof value === "object" && value !== null && !Array.isArray(value);
63
+ }
64
+ function sortedJson(value) {
65
+ if (Array.isArray(value))
66
+ return value.map(sortedJson);
67
+ if (!isPlainJsonObject(value))
68
+ return value;
69
+ return Object.fromEntries(Object.keys(value).filter((key) => value[key] !== undefined).sort()
70
+ .map((key) => [key, sortedJson(value[key])]));
71
+ }
72
+ /** Compares JSON data, ignoring object key order and `undefined` members. */
73
+ export function jsonValuesEqual(left, right) {
74
+ return JSON.stringify(sortedJson(left)) === JSON.stringify(sortedJson(right));
75
+ }
76
+ function collectJsonEdits(current, next, path, edits) {
77
+ if (jsonValuesEqual(current, next))
78
+ return;
79
+ if (isPlainJsonObject(current) && isPlainJsonObject(next)) {
80
+ for (const key of Object.keys(current)) {
81
+ if (next[key] === undefined)
82
+ edits.push([[...path, key], undefined]);
83
+ }
84
+ for (const [key, value] of Object.entries(next)) {
85
+ if (value === undefined)
86
+ continue;
87
+ if (hasOwn(current, key)) {
88
+ collectJsonEdits(current[key], value, [...path, key], edits);
89
+ }
90
+ else {
91
+ edits.push([[...path, key], value]);
92
+ }
93
+ }
94
+ return;
95
+ }
96
+ edits.push([path, next]);
97
+ }
98
+ /**
99
+ * Rewrites JSON or JSONC text to hold `next` by editing only the members
100
+ * whose values changed, so the file keeps its own key order, indentation,
101
+ * line layout and comments. New members are appended to their object.
102
+ */
103
+ export function patchJsonText(text, next) {
104
+ const edits = [];
105
+ collectJsonEdits(parseJsonc(text, "JSON"), next, [], edits);
106
+ return edits.reduce((result, [path, value]) => updateJsonPath(result, path, value), text);
107
+ }
61
108
  function hasOwn(value, key) {
62
109
  return Object.prototype.hasOwnProperty.call(value, key);
63
110
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gadicc/loom",
3
- "version": "1.35.0",
3
+ "version": "1.35.2",
4
4
  "description": "Deno-first shared helpers for extracting common Next.js app code.",
5
5
  "homepage": "https://github.com/gadicc/loom#readme",
6
6
  "repository": {
@@ -244,7 +244,7 @@
244
244
  },
245
245
  "scripts": {},
246
246
  "loom": {
247
- "gitCommit": "722f1f0d162a04a0aead905a2014b8ab5c20a1bb"
247
+ "gitCommit": "2d989f1333cb9660127fba66bda55fccd7651753"
248
248
  },
249
249
  "bin": {
250
250
  "loom": "script/bin/loom.js"
@@ -0,0 +1,33 @@
1
+ /**
2
+ * Exact text that earlier Loom releases wrote for files Loom still manages.
3
+ *
4
+ * A file that still matches one of these (ignoring formatting) is unmodified
5
+ * Loom output, so Loom may update it. These record history: never edit them
6
+ * to follow the current templates. When a template changes, its previous
7
+ * output only needs adding here for files written before `loom.json` recorded
8
+ * managed-file hashes.
9
+ */
10
+ /**
11
+ * PGlite test harness written by Loom 1.2.0 through 1.11.x, before it closed
12
+ * its client after the test file.
13
+ */
14
+ export declare function legacyDbPgliteHarnessOutputs(schemaImportPath: string, fixtureDir: string): string[];
15
+ /**
16
+ * Direct jobs runners that loaded `.env.local` through dotenv: Loom 1.6.2
17
+ * through 1.7.x, then 1.8.x with CLI parameter parsing. Loom 1.9.0 moved env
18
+ * loading to `loom env`.
19
+ */
20
+ export declare function legacyJobsDirectRunnerOutputs(catalogImportPath: string): string[];
21
+ /**
22
+ * Task values earlier Loom releases wrote for DB tasks whose current value
23
+ * differs. Loom 1.2.0 through 1.17.x always ran drizzle-kit through pnpm,
24
+ * before tasks followed the recorded dependency manager, and Loom 1.2.0
25
+ * through 1.8.x ran `drizzle-kit` without `loom env`.
26
+ */
27
+ export declare function legacyDbTaskValues(drizzleConfig: string): Record<string, string[]>;
28
+ /**
29
+ * The `job` task Loom 1.6.2 through 1.8.x wrote, before it ran through
30
+ * `loom env`.
31
+ */
32
+ export declare function legacyJobsTaskValues(scriptsTsconfig: string, scriptPath: string): Record<string, string[]>;
33
+ //# sourceMappingURL=legacyManagedOutputs.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"legacyManagedOutputs.d.ts","sourceRoot":"","sources":["../../../src/src/cli/legacyManagedOutputs.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,gBAAgB,EAAE,MAAM,EACxB,UAAU,EAAE,MAAM,YAcnB;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,iBAAiB,EAAE,MAAM,YAwMtE;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,MAAM,GACpB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAS1B;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,GACjB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAM1B"}
@@ -0,0 +1,266 @@
1
+ "use strict";
2
+ /**
3
+ * Exact text that earlier Loom releases wrote for files Loom still manages.
4
+ *
5
+ * A file that still matches one of these (ignoring formatting) is unmodified
6
+ * Loom output, so Loom may update it. These record history: never edit them
7
+ * to follow the current templates. When a template changes, its previous
8
+ * output only needs adding here for files written before `loom.json` recorded
9
+ * managed-file hashes.
10
+ */
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ exports.legacyDbPgliteHarnessOutputs = legacyDbPgliteHarnessOutputs;
13
+ exports.legacyJobsDirectRunnerOutputs = legacyJobsDirectRunnerOutputs;
14
+ exports.legacyDbTaskValues = legacyDbTaskValues;
15
+ exports.legacyJobsTaskValues = legacyJobsTaskValues;
16
+ /**
17
+ * PGlite test harness written by Loom 1.2.0 through 1.11.x, before it closed
18
+ * its client after the test file.
19
+ */
20
+ function legacyDbPgliteHarnessOutputs(schemaImportPath, fixtureDir) {
21
+ return [
22
+ `import { createMemoryPgliteHarness } from "@gadicc/loom/db/testing";
23
+ import * as schema from "${schemaImportPath}";
24
+
25
+ const harness = await createMemoryPgliteHarness({
26
+ fixtureDir: "${fixtureDir}",
27
+ schema,
28
+ });
29
+
30
+ export const { db, tableLoader } = harness;
31
+ `,
32
+ ];
33
+ }
34
+ /**
35
+ * Direct jobs runners that loaded `.env.local` through dotenv: Loom 1.6.2
36
+ * through 1.7.x, then 1.8.x with CLI parameter parsing. Loom 1.9.0 moved env
37
+ * loading to `loom env`.
38
+ */
39
+ function legacyJobsDirectRunnerOutputs(catalogImportPath) {
40
+ return [
41
+ `import {
42
+ createJobCatalogFromSource,
43
+ createJobExecution,
44
+ createJobUsageText,
45
+ getRequestedJobOutput,
46
+ resolveJobSpecifier,
47
+ writeJobStream,
48
+ } from "@gadicc/loom/jobs";
49
+ import dotenv from "dotenv";
50
+
51
+ dotenv.config({ path: ".env.local", quiet: true });
52
+
53
+ const jobs = await import("${catalogImportPath}");
54
+ const catalog = createJobCatalogFromSource(jobs);
55
+ const specifier = process.argv[2];
56
+
57
+ function formatDirectJobError(error: unknown) {
58
+ if (error instanceof Error) {
59
+ return error.message;
60
+ }
61
+
62
+ return String(error);
63
+ }
64
+
65
+ async function closeLoomDbIfNeeded() {
66
+ const sql = (
67
+ globalThis as {
68
+ __loomNeonFullSql?: {
69
+ end: (options?: { timeout?: number }) => Promise<void>;
70
+ };
71
+ }
72
+ ).__loomNeonFullSql;
73
+
74
+ await sql?.end({ timeout: 5 });
75
+ }
76
+
77
+ if (!specifier) {
78
+ console.error(createJobUsageText(catalog));
79
+ process.exit(1);
80
+ }
81
+
82
+ const resolvedJob = (() => {
83
+ try {
84
+ return resolveJobSpecifier(catalog, specifier);
85
+ } catch (error) {
86
+ console.error(formatDirectJobError(error));
87
+ console.error("");
88
+ console.error(createJobUsageText(catalog));
89
+ process.exit(1);
90
+ }
91
+ })();
92
+
93
+ if (resolvedJob.index !== null) {
94
+ console.log(
95
+ \`Mapped job number \${resolvedJob.index} to ID "\${resolvedJob.id}".\`,
96
+ );
97
+ }
98
+
99
+ const output = getRequestedJobOutput(resolvedJob.searchParams, "nd-json");
100
+ resolvedJob.searchParams.delete("output");
101
+
102
+ const execution = createJobExecution(
103
+ resolvedJob.job,
104
+ Object.fromEntries(resolvedJob.searchParams),
105
+ { runDeferredTasks: true },
106
+ );
107
+
108
+ try {
109
+ await writeJobStream(execution.stream, {
110
+ output,
111
+ startTime: Date.now(),
112
+ writeRaw(chunk) {
113
+ process.stdout.write(chunk);
114
+ },
115
+ });
116
+
117
+ const result = await execution.result;
118
+ if (result.error) {
119
+ process.exitCode = 1;
120
+ }
121
+ } finally {
122
+ await closeLoomDbIfNeeded();
123
+ }
124
+ `,
125
+ `import {
126
+ createJobCatalogFromSource,
127
+ createJobExecution,
128
+ createJobUsageText,
129
+ createJobHelpText,
130
+ getRequestedJobOutput,
131
+ parseCliArgs,
132
+ resolveJobSelection,
133
+ validateAndParseParams,
134
+ writeJobStream,
135
+ } from "@gadicc/loom/jobs";
136
+ import dotenv from "dotenv";
137
+
138
+ dotenv.config({ path: ".env.local", quiet: true });
139
+
140
+ const jobs = await import("${catalogImportPath}");
141
+ const catalog = createJobCatalogFromSource(jobs);
142
+ const args = process.argv.slice(2);
143
+ const parsedArgs = parseCliArgs(args);
144
+
145
+ function formatDirectJobError(error: unknown) {
146
+ if (error instanceof Error) {
147
+ return error.message;
148
+ }
149
+
150
+ return String(error);
151
+ }
152
+
153
+ async function closeLoomDbIfNeeded() {
154
+ const sql = (
155
+ globalThis as {
156
+ __loomNeonFullSql?: {
157
+ end: (options?: { timeout?: number }) => Promise<void>;
158
+ };
159
+ }
160
+ ).__loomNeonFullSql;
161
+
162
+ await sql?.end({ timeout: 5 });
163
+ }
164
+
165
+ if (parsedArgs.isHelp) {
166
+ console.log(createJobUsageText(catalog));
167
+ process.exit(0);
168
+ }
169
+
170
+ const resolvedJob = (() => {
171
+ try {
172
+ const resolved = resolveJobSelection(catalog, parsedArgs.selection);
173
+ return {
174
+ id: resolved.id,
175
+ job: resolved.job,
176
+ index: resolved.index,
177
+ };
178
+ } catch (error) {
179
+ console.error(formatDirectJobError(error));
180
+ console.error("");
181
+ console.error(createJobUsageText(catalog));
182
+ process.exit(1);
183
+ }
184
+ })();
185
+
186
+ if (resolvedJob.index !== null) {
187
+ console.log(
188
+ \`Mapped job number \${resolvedJob.index} to ID "\${resolvedJob.id}".\`,
189
+ );
190
+ }
191
+
192
+ if (parsedArgs.jobHelp) {
193
+ console.log(createJobHelpText(resolvedJob.job.meta));
194
+ process.exit(0);
195
+ }
196
+
197
+ const output = parsedArgs.rawParams.output || "nd-json";
198
+ delete parsedArgs.rawParams.output;
199
+
200
+ const { parsed: parsedParams, errors: paramErrors } = validateAndParseParams(
201
+ parsedArgs.rawParams,
202
+ resolvedJob.job.meta.params,
203
+ );
204
+
205
+ if (paramErrors.length > 0) {
206
+ console.error("Parameter validation failed:");
207
+ for (const err of paramErrors) {
208
+ console.error(\` - \${err}\`);
209
+ }
210
+ console.error("");
211
+ console.error(createJobHelpText(resolvedJob.job.meta));
212
+ process.exit(1);
213
+ }
214
+
215
+ const execution = createJobExecution(
216
+ resolvedJob.job,
217
+ parsedParams,
218
+ { runDeferredTasks: true },
219
+ );
220
+
221
+ try {
222
+ await writeJobStream(execution.stream, {
223
+ output: output as any,
224
+ startTime: Date.now(),
225
+ writeRaw(chunk) {
226
+ process.stdout.write(chunk);
227
+ },
228
+ });
229
+
230
+ const result = await execution.result;
231
+ if (result.error) {
232
+ process.exitCode = 1;
233
+ }
234
+ } finally {
235
+ await closeLoomDbIfNeeded();
236
+ }
237
+ `,
238
+ ];
239
+ }
240
+ /**
241
+ * Task values earlier Loom releases wrote for DB tasks whose current value
242
+ * differs. Loom 1.2.0 through 1.17.x always ran drizzle-kit through pnpm,
243
+ * before tasks followed the recorded dependency manager, and Loom 1.2.0
244
+ * through 1.8.x ran `drizzle-kit` without `loom env`.
245
+ */
246
+ function legacyDbTaskValues(drizzleConfig) {
247
+ return {
248
+ "db:generate": ["pnpm drizzle-kit generate"],
249
+ "db:migrate": ["pnpm drizzle-kit migrate"],
250
+ "db:push": ["pnpm drizzle-kit push"],
251
+ "drizzle-kit": [
252
+ `NODE_OPTIONS='--import tsx' drizzle-kit --config=./${drizzleConfig}`,
253
+ ],
254
+ };
255
+ }
256
+ /**
257
+ * The `job` task Loom 1.6.2 through 1.8.x wrote, before it ran through
258
+ * `loom env`.
259
+ */
260
+ function legacyJobsTaskValues(scriptsTsconfig, scriptPath) {
261
+ return {
262
+ job: [
263
+ `TSX_TSCONFIG=./${scriptsTsconfig} node --conditions=react-server --import tsx ${scriptPath}`,
264
+ ],
265
+ };
266
+ }
@@ -0,0 +1,131 @@
1
+ /**
2
+ * Evidence that the file currently on disk is something Loom wrote.
3
+ */
4
+ export type ManagedFileProof = {
5
+ /**
6
+ * Hash (see {@link hashManagedFileText}) that the manifest recorded when
7
+ * Loom last wrote or verified this file. When present with the current
8
+ * {@link MANAGED_HASH_VERSION} it is the only proof: `knownOutputs` and
9
+ * `isLoomOutput` only cover files without such a record.
10
+ */
11
+ recordedHash?: string;
12
+ /**
13
+ * Complete texts that earlier Loom releases, or earlier recorded
14
+ * configurations, wrote to this path.
15
+ */
16
+ knownOutputs?: readonly string[];
17
+ /**
18
+ * Structural proof for generated files whose earlier text depends on
19
+ * project state Loom no longer knows, such as a generated barrel.
20
+ */
21
+ isLoomOutput?: (text: string) => boolean | Promise<boolean>;
22
+ };
23
+ /**
24
+ * Where a managed file stands relative to Loom's current output:
25
+ * - `missing`: the file does not exist;
26
+ * - `current`: it matches Loom's output, ignoring formatting;
27
+ * - `loom-output`: it is provably earlier Loom output that Loom may replace;
28
+ * - `customized`: it has local edits, or Loom cannot prove that it wrote it.
29
+ */
30
+ export type ManagedFileState = "missing" | "current" | "loom-output" | "customized";
31
+ /** Result of comparing a managed file with Loom's output. */
32
+ export type ManagedFileClassification = {
33
+ /** Hash of Loom's current output for the file. */
34
+ expectedHash: string;
35
+ state: ManagedFileState;
36
+ /** One-line summary of the local edits, for `customized` files. */
37
+ difference?: string;
38
+ };
39
+ /** Result of {@link syncManagedFile}. */
40
+ export type ManagedFileSyncResult = {
41
+ state: "created" | "updated" | "unchanged" | "customized";
42
+ /**
43
+ * Hash to record for the file, or `undefined` when Loom left local edits in
44
+ * place and the previous record should be kept.
45
+ */
46
+ hash?: string;
47
+ /** One-line summary of the local edits, for `customized` files. */
48
+ difference?: string;
49
+ };
50
+ /**
51
+ * Reduces source text to a formatting-insensitive form, so a consumer
52
+ * formatter's output still counts as Loom's own. Indentation, line wrapping,
53
+ * line endings, trailing commas and the quote style of plain string literals
54
+ * are ignored. Everything that can change meaning is kept: comment text
55
+ * (a comment-only edit is still a local edit), semicolons, string, template
56
+ * and regular expression contents, whitespace between operator characters
57
+ * (`a - -b` is not `a--b`), and line breaks where automatic semicolon
58
+ * insertion applies (before `++`/`--`, and after `return` and the other
59
+ * restricted keywords).
60
+ */
61
+ export declare function canonicalizeManagedFileText(text: string): string;
62
+ /**
63
+ * Version of the canonical forms that recorded hashes are prefixed with, as
64
+ * in `c1:<sha256>`. A future change to either canonicaliser bumps it, so
65
+ * older records are treated as absent instead of permanently disowning
66
+ * unmodified files whose canonical form changed.
67
+ */
68
+ export declare const MANAGED_HASH_VERSION = "c1";
69
+ /**
70
+ * Versioned hash of {@link canonicalizeManagedFileText}, as recorded in
71
+ * `loom.json`.
72
+ */
73
+ export declare function hashManagedFileText(text: string): string;
74
+ /**
75
+ * Summarizes how a local file differs from Loom's output in one line: how
76
+ * many lines exist only on each side, and the first line of each. Indentation
77
+ * and blank lines are ignored. Given several Loom versions, it describes the
78
+ * difference from the closest one.
79
+ */
80
+ export declare function describeManagedFileDifference(currentText: string, expected: string | readonly string[]): string;
81
+ /**
82
+ * Classifies existing file content against Loom's current output without
83
+ * writing anything. `loom check` and the sync helpers share this rule.
84
+ */
85
+ export declare function classifyManagedFile(currentText: string | null, expectedText: string, proof?: ManagedFileProof): Promise<ManagedFileClassification>;
86
+ /**
87
+ * Writes Loom's output for a managed file when the file is missing or is
88
+ * provably unmodified Loom output. A file that already matches, ignoring
89
+ * formatting, is left untouched so consumer formatting survives. A file with
90
+ * local edits is never written; the result describes the difference.
91
+ */
92
+ export declare function syncManagedFile(path: string, text: string, proof?: ManagedFileProof): Promise<ManagedFileSyncResult>;
93
+ /**
94
+ * Deletes a file Loom generated and no longer needs, but only when it is
95
+ * provably unmodified Loom output.
96
+ */
97
+ export declare function removeManagedFile(path: string, proof: ManagedFileProof): Promise<"missing" | "removed" | "customized">;
98
+ /**
99
+ * Evidence that a task definition is a value Loom wrote.
100
+ */
101
+ export type ManagedTaskProof = {
102
+ /**
103
+ * Hash (see {@link hashManagedTaskDefinition}) recorded in `loom.json`.
104
+ * When present with the current {@link MANAGED_HASH_VERSION} it is the only
105
+ * proof.
106
+ */
107
+ recordedHash?: string;
108
+ /**
109
+ * Values earlier Loom releases, or Loom under other recorded tooling,
110
+ * wrote for the task.
111
+ */
112
+ knownValues?: readonly unknown[];
113
+ };
114
+ /**
115
+ * Reduces a package script or Deno task definition to a comparable form.
116
+ * Surrounding and repeated whitespace is ignored, and a Deno object holding
117
+ * only `command` equals the same plain string. Any other key, such as a
118
+ * description or dependencies, is part of the value.
119
+ */
120
+ export declare function canonicalizeManagedTaskDefinition(definition: unknown): string;
121
+ /** Versioned hash of {@link canonicalizeManagedTaskDefinition}, as recorded. */
122
+ export declare function hashManagedTaskDefinition(definition: unknown): string;
123
+ /**
124
+ * Classifies a task's current definition against Loom's value, with the same
125
+ * states as {@link classifyManagedFile}: `undefined` is `missing`.
126
+ */
127
+ export declare function classifyManagedTask(current: unknown, expected: unknown, proof?: ManagedTaskProof): {
128
+ expectedHash: string;
129
+ state: ManagedFileState;
130
+ };
131
+ //# sourceMappingURL=managedFiles.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"managedFiles.d.ts","sourceRoot":"","sources":["../../../src/src/cli/managedFiles.ts"],"names":[],"mappings":"AAYA;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7D,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,gBAAgB,GACxB,SAAS,GACT,SAAS,GACT,aAAa,GACb,YAAY,CAAC;AAEjB,6DAA6D;AAC7D,MAAM,MAAM,yBAAyB,GAAG;IACtC,kDAAkD;IAClD,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,gBAAgB,CAAC;IACxB,mEAAmE;IACnE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,yCAAyC;AACzC,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,YAAY,CAAC;IAC1D;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,mEAAmE;IACnE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AA8JF;;;;;;;;;;GAUG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,UA0GvD;AAED;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,OAAO,CAAC;AAoBzC;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,UAE/C;AAmED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,UAoCrC;AAmBD;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,GAAG,IAAI,EAC1B,YAAY,EAAE,MAAM,EACpB,KAAK,GAAE,gBAAqB,GAC3B,OAAO,CAAC,yBAAyB,CAAC,CAapC;AAWD;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,GAAE,gBAAqB,GAC3B,OAAO,CAAC,qBAAqB,CAAC,CAoBhC;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,SAAS,GAAG,SAAS,GAAG,YAAY,CAAC,CAc/C;AAED;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,WAAW,CAAC,EAAE,SAAS,OAAO,EAAE,CAAC;CAClC,CAAC;AAMF;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAAC,UAAU,EAAE,OAAO,UAyBpE;AAED,gFAAgF;AAChF,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,OAAO,UAE5D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,OAAO,EACjB,KAAK,GAAE,gBAAqB,GAC3B;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,gBAAgB,CAAA;CAAE,CAYnD"}