@t1mmen/srtd 0.3.0 → 0.4.1
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 +85 -118
- package/dist/package.json +97 -0
- package/dist/src/__tests__/apply.test.js +69 -0
- package/dist/src/__tests__/apply.test.js.map +1 -0
- package/dist/src/__tests__/build.test.js +67 -0
- package/dist/src/__tests__/build.test.js.map +1 -0
- package/dist/{__tests__ → src/__tests__}/vitest.setup.js +41 -25
- package/dist/src/__tests__/vitest.setup.js.map +1 -0
- package/dist/{__tests__ → src/__tests__}/watch.test.js +9 -3
- package/dist/src/__tests__/watch.test.js.map +1 -0
- package/dist/src/cli.js.map +1 -0
- package/dist/src/commands/_app.js +29 -0
- package/dist/src/commands/_app.js.map +1 -0
- package/dist/{commands → src/commands}/apply.d.ts +2 -1
- package/dist/src/commands/apply.js +30 -0
- package/dist/src/commands/apply.js.map +1 -0
- package/dist/{commands → src/commands}/build.d.ts +5 -1
- package/dist/src/commands/build.js +41 -0
- package/dist/src/commands/build.js.map +1 -0
- package/dist/src/commands/clear.d.ts +2 -0
- package/dist/src/commands/clear.js +45 -0
- package/dist/src/commands/clear.js.map +1 -0
- package/dist/{commands → src/commands}/index.js +11 -5
- package/dist/src/commands/index.js.map +1 -0
- package/dist/src/commands/init.js.map +1 -0
- package/dist/{commands → src/commands}/register.js +6 -5
- package/dist/src/commands/register.js.map +1 -0
- package/dist/{commands → src/commands}/watch.js +61 -33
- package/dist/src/commands/watch.js.map +1 -0
- package/dist/{components → src/components}/Branding.js +7 -7
- package/dist/src/components/Branding.js.map +1 -0
- package/dist/src/components/Debug.d.ts +2 -0
- package/dist/src/components/Debug.js +160 -0
- package/dist/src/components/Debug.js.map +1 -0
- package/dist/src/components/ProcessingResults.d.ts +9 -0
- package/dist/src/components/ProcessingResults.js +32 -0
- package/dist/src/components/ProcessingResults.js.map +1 -0
- package/dist/{components → src/components}/Quittable.js +1 -1
- package/dist/src/components/Quittable.js.map +1 -0
- package/dist/src/components/TimeSince.js.map +1 -0
- package/dist/src/components/customTheme.d.ts +10 -0
- package/dist/src/components/customTheme.js +66 -0
- package/dist/src/components/customTheme.js.map +1 -0
- package/dist/src/constants.js.map +1 -0
- package/dist/src/hooks/useDatabaseConnection.js +57 -0
- package/dist/src/hooks/useDatabaseConnection.js.map +1 -0
- package/dist/{hooks → src/hooks}/useTemplateManager.d.ts +6 -8
- package/dist/src/hooks/useTemplateManager.js +124 -0
- package/dist/src/hooks/useTemplateManager.js.map +1 -0
- package/dist/src/hooks/useTemplateProcessor.d.ts +11 -0
- package/dist/src/hooks/useTemplateProcessor.js +71 -0
- package/dist/src/hooks/useTemplateProcessor.js.map +1 -0
- package/dist/src/hooks/useTemplateState.js.map +1 -0
- package/dist/{lib → src/lib}/templateManager.d.ts +13 -2
- package/dist/{lib → src/lib}/templateManager.js +172 -50
- package/dist/src/lib/templateManager.js.map +1 -0
- package/dist/src/lib/templateManager.test.js +729 -0
- package/dist/src/lib/templateManager.test.js.map +1 -0
- package/dist/{types.d.ts → src/types.d.ts} +3 -0
- package/dist/src/types.js.map +1 -0
- package/dist/src/utils/applyMigration.js.map +1 -0
- package/dist/src/utils/applyMigrations.test.js.map +1 -0
- package/dist/src/utils/calculateMD5.js.map +1 -0
- package/dist/{utils → src/utils}/config.d.ts +2 -0
- package/dist/src/utils/config.js +65 -0
- package/dist/src/utils/config.js.map +1 -0
- package/dist/src/utils/config.test.js.map +1 -0
- package/dist/src/utils/createEmptyBuildLog.js.map +1 -0
- package/dist/{utils → src/utils}/databaseConnection.d.ts +5 -0
- package/dist/{utils → src/utils}/databaseConnection.js +40 -13
- package/dist/src/utils/databaseConnection.js.map +1 -0
- package/dist/src/utils/databaseConnection.test.d.ts +1 -0
- package/dist/src/utils/databaseConnection.test.js.map +1 -0
- package/dist/src/utils/ensureDirectories.js.map +1 -0
- package/dist/src/utils/fileExists.js.map +1 -0
- package/dist/src/utils/getNextTimestamp.js.map +1 -0
- package/dist/src/utils/isWipTemplate.js.map +1 -0
- package/dist/src/utils/loadBuildLog.js.map +1 -0
- package/dist/src/utils/loadBuildLog.test.d.ts +1 -0
- package/dist/src/utils/loadBuildLog.test.js.map +1 -0
- package/dist/src/utils/logger.js.map +1 -0
- package/dist/src/utils/registerTemplate.js.map +1 -0
- package/dist/src/utils/safeCreate.js.map +1 -0
- package/dist/src/utils/saveBuildLog.js.map +1 -0
- package/dist/src/utils/store.d.ts +5 -0
- package/dist/src/utils/store.js +10 -0
- package/dist/src/utils/store.js.map +1 -0
- package/package.json +4 -3
- package/dist/__tests__/vitest.setup.js.map +0 -1
- package/dist/__tests__/watch.test.js.map +0 -1
- package/dist/cli.js.map +0 -1
- package/dist/commands/_app.js +0 -27
- package/dist/commands/_app.js.map +0 -1
- package/dist/commands/apply.js +0 -32
- package/dist/commands/apply.js.map +0 -1
- package/dist/commands/build.js +0 -25
- package/dist/commands/build.js.map +0 -1
- package/dist/commands/index.js.map +0 -1
- package/dist/commands/init.js.map +0 -1
- package/dist/commands/register.js.map +0 -1
- package/dist/commands/watch.js.map +0 -1
- package/dist/components/Branding.js.map +0 -1
- package/dist/components/Quittable.js.map +0 -1
- package/dist/components/TimeSince.js.map +0 -1
- package/dist/constants.js.map +0 -1
- package/dist/hooks/useDatabaseConnection.js +0 -68
- package/dist/hooks/useDatabaseConnection.js.map +0 -1
- package/dist/hooks/useTemplateManager.js +0 -141
- package/dist/hooks/useTemplateManager.js.map +0 -1
- package/dist/hooks/useTemplateState.js.map +0 -1
- package/dist/lib/templateManager.js.map +0 -1
- package/dist/lib/templateManager.test.js +0 -289
- package/dist/lib/templateManager.test.js.map +0 -1
- package/dist/types.js.map +0 -1
- package/dist/utils/applyMigration.js.map +0 -1
- package/dist/utils/applyMigrations.test.js.map +0 -1
- package/dist/utils/calculateMD5.js.map +0 -1
- package/dist/utils/config.js +0 -79
- package/dist/utils/config.js.map +0 -1
- package/dist/utils/config.test.js.map +0 -1
- package/dist/utils/createEmptyBuildLog.js.map +0 -1
- package/dist/utils/databaseConnection.js.map +0 -1
- package/dist/utils/databaseConnection.test.js.map +0 -1
- package/dist/utils/ensureDirectories.js.map +0 -1
- package/dist/utils/fileExists.js.map +0 -1
- package/dist/utils/getNextTimestamp.js.map +0 -1
- package/dist/utils/isWipTemplate.js.map +0 -1
- package/dist/utils/loadBuildLog.js.map +0 -1
- package/dist/utils/loadBuildLog.test.js.map +0 -1
- package/dist/utils/logger.js.map +0 -1
- package/dist/utils/registerTemplate.js.map +0 -1
- package/dist/utils/safeCreate.js.map +0 -1
- package/dist/utils/saveBuildLog.js.map +0 -1
- /package/dist/{__tests__/watch.test.d.ts → src/__tests__/apply.test.d.ts} +0 -0
- /package/dist/{lib/templateManager.test.d.ts → src/__tests__/build.test.d.ts} +0 -0
- /package/dist/{__tests__ → src/__tests__}/vitest.setup.d.ts +0 -0
- /package/dist/{utils/applyMigrations.test.d.ts → src/__tests__/watch.test.d.ts} +0 -0
- /package/dist/{cli.d.ts → src/cli.d.ts} +0 -0
- /package/dist/{cli.js → src/cli.js} +0 -0
- /package/dist/{commands → src/commands}/_app.d.ts +0 -0
- /package/dist/{commands → src/commands}/index.d.ts +0 -0
- /package/dist/{commands → src/commands}/init.d.ts +0 -0
- /package/dist/{commands → src/commands}/init.js +0 -0
- /package/dist/{commands → src/commands}/register.d.ts +0 -0
- /package/dist/{commands → src/commands}/watch.d.ts +0 -0
- /package/dist/{components → src/components}/Branding.d.ts +0 -0
- /package/dist/{components → src/components}/Quittable.d.ts +0 -0
- /package/dist/{components → src/components}/TimeSince.d.ts +0 -0
- /package/dist/{components → src/components}/TimeSince.js +0 -0
- /package/dist/{constants.d.ts → src/constants.d.ts} +0 -0
- /package/dist/{constants.js → src/constants.js} +0 -0
- /package/dist/{hooks → src/hooks}/useDatabaseConnection.d.ts +0 -0
- /package/dist/{hooks → src/hooks}/useTemplateState.d.ts +0 -0
- /package/dist/{hooks → src/hooks}/useTemplateState.js +0 -0
- /package/dist/{utils/config.test.d.ts → src/lib/templateManager.test.d.ts} +0 -0
- /package/dist/{types.js → src/types.js} +0 -0
- /package/dist/{utils → src/utils}/applyMigration.d.ts +0 -0
- /package/dist/{utils → src/utils}/applyMigration.js +0 -0
- /package/dist/{utils/databaseConnection.test.d.ts → src/utils/applyMigrations.test.d.ts} +0 -0
- /package/dist/{utils → src/utils}/applyMigrations.test.js +0 -0
- /package/dist/{utils → src/utils}/calculateMD5.d.ts +0 -0
- /package/dist/{utils → src/utils}/calculateMD5.js +0 -0
- /package/dist/{utils/loadBuildLog.test.d.ts → src/utils/config.test.d.ts} +0 -0
- /package/dist/{utils → src/utils}/config.test.js +0 -0
- /package/dist/{utils → src/utils}/createEmptyBuildLog.d.ts +0 -0
- /package/dist/{utils → src/utils}/createEmptyBuildLog.js +0 -0
- /package/dist/{utils → src/utils}/databaseConnection.test.js +0 -0
- /package/dist/{utils → src/utils}/ensureDirectories.d.ts +0 -0
- /package/dist/{utils → src/utils}/ensureDirectories.js +0 -0
- /package/dist/{utils → src/utils}/fileExists.d.ts +0 -0
- /package/dist/{utils → src/utils}/fileExists.js +0 -0
- /package/dist/{utils → src/utils}/getNextTimestamp.d.ts +0 -0
- /package/dist/{utils → src/utils}/getNextTimestamp.js +0 -0
- /package/dist/{utils → src/utils}/isWipTemplate.d.ts +0 -0
- /package/dist/{utils → src/utils}/isWipTemplate.js +0 -0
- /package/dist/{utils → src/utils}/loadBuildLog.d.ts +0 -0
- /package/dist/{utils → src/utils}/loadBuildLog.js +0 -0
- /package/dist/{utils → src/utils}/loadBuildLog.test.js +0 -0
- /package/dist/{utils → src/utils}/logger.d.ts +0 -0
- /package/dist/{utils → src/utils}/logger.js +0 -0
- /package/dist/{utils → src/utils}/registerTemplate.d.ts +0 -0
- /package/dist/{utils → src/utils}/registerTemplate.js +0 -0
- /package/dist/{utils → src/utils}/safeCreate.d.ts +0 -0
- /package/dist/{utils → src/utils}/safeCreate.js +0 -0
- /package/dist/{utils → src/utils}/saveBuildLog.d.ts +0 -0
- /package/dist/{utils → src/utils}/saveBuildLog.js +0 -0
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import EventEmitter from 'node:events';
|
|
2
|
+
import type { FSWatcher } from 'chokidar';
|
|
2
3
|
import type { ProcessedTemplateResult, TemplateStatus } from '../types.js';
|
|
3
|
-
|
|
4
|
+
declare global {
|
|
5
|
+
var __srtd_watchers: FSWatcher[];
|
|
6
|
+
}
|
|
7
|
+
export declare class TemplateManager extends EventEmitter implements Disposable {
|
|
8
|
+
private watcher;
|
|
4
9
|
private baseDir;
|
|
5
10
|
private buildLog;
|
|
6
11
|
private localBuildLog;
|
|
@@ -8,7 +13,11 @@ export declare class TemplateManager extends EventEmitter {
|
|
|
8
13
|
private templateCache;
|
|
9
14
|
private cacheTimeout;
|
|
10
15
|
private silent;
|
|
16
|
+
private processQueue;
|
|
17
|
+
private processingTemplate;
|
|
18
|
+
private processing;
|
|
11
19
|
private constructor();
|
|
20
|
+
[Symbol.dispose](): void;
|
|
12
21
|
static create(baseDir: string, options?: {
|
|
13
22
|
silent?: boolean;
|
|
14
23
|
}): Promise<TemplateManager>;
|
|
@@ -18,8 +27,10 @@ export declare class TemplateManager extends EventEmitter {
|
|
|
18
27
|
getTemplateStatus(templatePath: string): Promise<TemplateStatus>;
|
|
19
28
|
private saveBuildLogs;
|
|
20
29
|
private handleTemplateChange;
|
|
30
|
+
private processTemplate;
|
|
31
|
+
private processNextTemplate;
|
|
21
32
|
watch(): Promise<{
|
|
22
|
-
close: () => void
|
|
33
|
+
close: () => Promise<void>;
|
|
23
34
|
}>;
|
|
24
35
|
applyTemplate(templatePath: string): Promise<ProcessedTemplateResult>;
|
|
25
36
|
buildTemplate(templatePath: string, force?: boolean): Promise<void>;
|
|
@@ -11,7 +11,11 @@ import { isWipTemplate } from '../utils/isWipTemplate.js';
|
|
|
11
11
|
import { loadBuildLog } from '../utils/loadBuildLog.js';
|
|
12
12
|
import { logger } from '../utils/logger.js';
|
|
13
13
|
import { saveBuildLog } from '../utils/saveBuildLog.js';
|
|
14
|
+
if (!global.__srtd_watchers) {
|
|
15
|
+
global.__srtd_watchers = [];
|
|
16
|
+
}
|
|
14
17
|
export class TemplateManager extends EventEmitter {
|
|
18
|
+
watcher = null;
|
|
15
19
|
baseDir;
|
|
16
20
|
buildLog;
|
|
17
21
|
localBuildLog;
|
|
@@ -19,6 +23,9 @@ export class TemplateManager extends EventEmitter {
|
|
|
19
23
|
templateCache = new Map();
|
|
20
24
|
cacheTimeout = 1000;
|
|
21
25
|
silent;
|
|
26
|
+
processQueue = new Set();
|
|
27
|
+
processingTemplate = null;
|
|
28
|
+
processing = false;
|
|
22
29
|
// Constructor:
|
|
23
30
|
constructor(baseDir, buildLog, localBuildLog, config, options = {}) {
|
|
24
31
|
super();
|
|
@@ -28,6 +35,13 @@ export class TemplateManager extends EventEmitter {
|
|
|
28
35
|
this.localBuildLog = localBuildLog;
|
|
29
36
|
this.config = config;
|
|
30
37
|
}
|
|
38
|
+
[Symbol.dispose]() {
|
|
39
|
+
if (this.watcher) {
|
|
40
|
+
void this.watcher.close();
|
|
41
|
+
this.watcher = null;
|
|
42
|
+
}
|
|
43
|
+
this.removeAllListeners();
|
|
44
|
+
}
|
|
31
45
|
static async create(baseDir, options = {}) {
|
|
32
46
|
const config = await getConfig(baseDir);
|
|
33
47
|
const buildLog = await loadBuildLog(baseDir, 'common');
|
|
@@ -64,6 +78,7 @@ export class TemplateManager extends EventEmitter {
|
|
|
64
78
|
currentHash,
|
|
65
79
|
migrationHash: null,
|
|
66
80
|
buildState,
|
|
81
|
+
wip: await isWipTemplate(templatePath),
|
|
67
82
|
};
|
|
68
83
|
this.templateCache.set(templatePath, {
|
|
69
84
|
status,
|
|
@@ -72,25 +87,91 @@ export class TemplateManager extends EventEmitter {
|
|
|
72
87
|
return status;
|
|
73
88
|
}
|
|
74
89
|
async saveBuildLogs() {
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
90
|
+
try {
|
|
91
|
+
await Promise.all([
|
|
92
|
+
saveBuildLog(this.baseDir, this.buildLog, 'common'),
|
|
93
|
+
saveBuildLog(this.baseDir, this.localBuildLog, 'local'),
|
|
94
|
+
]);
|
|
95
|
+
}
|
|
96
|
+
catch (error) {
|
|
97
|
+
throw new Error(`Failed to save build logs: ${error}`);
|
|
98
|
+
}
|
|
79
99
|
}
|
|
80
100
|
async handleTemplateChange(templatePath) {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
if (
|
|
101
|
+
// Add to queue if not already there
|
|
102
|
+
if (!this.processQueue.has(templatePath) && this.processingTemplate !== templatePath) {
|
|
103
|
+
this.processQueue.add(templatePath);
|
|
104
|
+
}
|
|
105
|
+
if (!this.processing) {
|
|
106
|
+
this.processing = true;
|
|
107
|
+
// Start processing non-recursively
|
|
108
|
+
setImmediate(() => void this.processNextTemplate());
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
async processTemplate(templatePath, force = false) {
|
|
112
|
+
try {
|
|
113
|
+
this.invalidateCache(templatePath);
|
|
114
|
+
const template = await this.getTemplateStatus(templatePath);
|
|
115
|
+
const relPath = path.relative(this.baseDir, templatePath);
|
|
116
|
+
const needsProcessing = force ||
|
|
117
|
+
!this.localBuildLog.templates[relPath]?.lastAppliedHash ||
|
|
118
|
+
this.localBuildLog.templates[relPath]?.lastAppliedHash !== template.currentHash;
|
|
119
|
+
if (needsProcessing) {
|
|
120
|
+
this.emit('templateChanged', template);
|
|
121
|
+
const result = await this.applyTemplate(templatePath);
|
|
122
|
+
if (result.errors.length) {
|
|
123
|
+
const error = result.errors[0];
|
|
124
|
+
const formattedError = typeof error === 'string' ? error : error?.error;
|
|
125
|
+
this.emit('templateError', { template, error: formattedError });
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
const updatedTemplate = await this.getTemplateStatus(templatePath);
|
|
129
|
+
this.emit('templateApplied', updatedTemplate);
|
|
130
|
+
}
|
|
131
|
+
return result;
|
|
132
|
+
}
|
|
133
|
+
return { errors: [], applied: [], skipped: [template.name], built: [] };
|
|
134
|
+
}
|
|
135
|
+
catch (error) {
|
|
136
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
137
|
+
this.log(`Error processing template ${templatePath}: ${errorMessage}`, 'error');
|
|
86
138
|
this.emit('templateError', {
|
|
87
|
-
template,
|
|
88
|
-
error:
|
|
139
|
+
template: await this.getTemplateStatus(templatePath),
|
|
140
|
+
error: errorMessage,
|
|
89
141
|
});
|
|
142
|
+
const templateName = path.basename(templatePath, '.sql');
|
|
143
|
+
return {
|
|
144
|
+
errors: [
|
|
145
|
+
{
|
|
146
|
+
file: templatePath,
|
|
147
|
+
error: errorMessage,
|
|
148
|
+
templateName,
|
|
149
|
+
},
|
|
150
|
+
],
|
|
151
|
+
applied: [],
|
|
152
|
+
skipped: [],
|
|
153
|
+
built: [],
|
|
154
|
+
};
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
async processNextTemplate() {
|
|
158
|
+
if (this.processQueue.size === 0) {
|
|
159
|
+
this.processing = false;
|
|
160
|
+
return;
|
|
90
161
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
this.
|
|
162
|
+
const templatePath = this.processQueue.values().next().value;
|
|
163
|
+
if (!templatePath) {
|
|
164
|
+
this.processing = false;
|
|
165
|
+
return;
|
|
166
|
+
}
|
|
167
|
+
this.processQueue.delete(templatePath);
|
|
168
|
+
this.processingTemplate = templatePath;
|
|
169
|
+
try {
|
|
170
|
+
await this.processTemplate(templatePath);
|
|
171
|
+
}
|
|
172
|
+
finally {
|
|
173
|
+
this.processingTemplate = null;
|
|
174
|
+
setImmediate(() => void this.processNextTemplate());
|
|
94
175
|
}
|
|
95
176
|
}
|
|
96
177
|
async watch() {
|
|
@@ -98,40 +179,81 @@ export class TemplateManager extends EventEmitter {
|
|
|
98
179
|
const templatePath = path.join(this.baseDir, this.config.templateDir);
|
|
99
180
|
const watcher = chokidar.watch(templatePath, {
|
|
100
181
|
ignoreInitial: false,
|
|
101
|
-
|
|
102
|
-
|
|
182
|
+
ignored: ['**/!(*.sql)'],
|
|
183
|
+
persistent: true,
|
|
184
|
+
awaitWriteFinish: {
|
|
185
|
+
stabilityThreshold: 50,
|
|
186
|
+
pollInterval: 50,
|
|
187
|
+
},
|
|
103
188
|
});
|
|
104
|
-
|
|
189
|
+
// Track watcher globally
|
|
190
|
+
global.__srtd_watchers.push(watcher);
|
|
191
|
+
// Do initial scan once
|
|
192
|
+
const existingFiles = await glob(path.join(templatePath, this.config.filter));
|
|
193
|
+
for (const file of existingFiles) {
|
|
194
|
+
await this.handleTemplateChange(file);
|
|
195
|
+
}
|
|
196
|
+
// Only handle future changes
|
|
197
|
+
const handleEvent = async (filepath) => {
|
|
105
198
|
if (path.extname(filepath) === '.sql') {
|
|
106
199
|
await this.handleTemplateChange(filepath);
|
|
107
200
|
}
|
|
201
|
+
};
|
|
202
|
+
watcher
|
|
203
|
+
.on('add', handleEvent)
|
|
204
|
+
.on('change', handleEvent)
|
|
205
|
+
.on('error', error => {
|
|
206
|
+
this.log(`Watcher error: ${error}`, 'error');
|
|
108
207
|
});
|
|
109
|
-
|
|
208
|
+
// Update cleanup
|
|
209
|
+
this.watcher = watcher;
|
|
210
|
+
return {
|
|
211
|
+
close: async () => {
|
|
212
|
+
await watcher.close();
|
|
213
|
+
const idx = global.__srtd_watchers.indexOf(watcher);
|
|
214
|
+
if (idx > -1)
|
|
215
|
+
global.__srtd_watchers.splice(idx, 1);
|
|
216
|
+
},
|
|
217
|
+
};
|
|
110
218
|
}
|
|
111
219
|
async applyTemplate(templatePath) {
|
|
112
220
|
const template = await this.getTemplateStatus(templatePath);
|
|
113
221
|
const content = await fs.readFile(templatePath, 'utf-8');
|
|
114
|
-
const result = await applyMigration(content, template.name, this.silent);
|
|
115
222
|
const relPath = path.relative(this.baseDir, templatePath);
|
|
116
|
-
|
|
117
|
-
|
|
223
|
+
try {
|
|
224
|
+
const result = await applyMigration(content, template.name, this.silent);
|
|
225
|
+
if (result === true) {
|
|
226
|
+
// Always calculate fresh hash after successful apply
|
|
227
|
+
const currentHash = await calculateMD5(content);
|
|
228
|
+
if (!this.localBuildLog.templates[relPath]) {
|
|
229
|
+
this.localBuildLog.templates[relPath] = {};
|
|
230
|
+
}
|
|
231
|
+
this.localBuildLog.templates[relPath] = {
|
|
232
|
+
...this.localBuildLog.templates[relPath],
|
|
233
|
+
lastAppliedHash: currentHash,
|
|
234
|
+
lastAppliedDate: new Date().toISOString(),
|
|
235
|
+
lastAppliedError: undefined,
|
|
236
|
+
};
|
|
237
|
+
await this.saveBuildLogs();
|
|
238
|
+
this.invalidateCache(templatePath);
|
|
239
|
+
return { errors: [], applied: [template.name], skipped: [], built: [] };
|
|
240
|
+
}
|
|
241
|
+
// On error, don't update hash but track the error
|
|
118
242
|
this.localBuildLog.templates[relPath] = {
|
|
119
243
|
...this.localBuildLog.templates[relPath],
|
|
120
|
-
|
|
121
|
-
lastAppliedDate: new Date().toISOString(),
|
|
122
|
-
lastAppliedError: undefined,
|
|
244
|
+
lastAppliedError: result.error,
|
|
123
245
|
};
|
|
124
246
|
await this.saveBuildLogs();
|
|
125
|
-
|
|
126
|
-
|
|
247
|
+
return { errors: [result], applied: [], skipped: [], built: [] };
|
|
248
|
+
}
|
|
249
|
+
catch (error) {
|
|
250
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
251
|
+
if (!this.localBuildLog.templates) {
|
|
252
|
+
this.localBuildLog = { templates: {}, version: '1.0', lastTimestamp: '' };
|
|
253
|
+
}
|
|
254
|
+
await this.saveBuildLogs();
|
|
255
|
+
throw new Error(errorMessage);
|
|
127
256
|
}
|
|
128
|
-
this.localBuildLog.templates[relPath] = {
|
|
129
|
-
...this.localBuildLog.templates[relPath],
|
|
130
|
-
lastAppliedError: result.error,
|
|
131
|
-
};
|
|
132
|
-
await this.saveBuildLogs();
|
|
133
|
-
this.emit('templateError', { template, error: result });
|
|
134
|
-
return { errors: [result], applied: [] };
|
|
135
257
|
}
|
|
136
258
|
async buildTemplate(templatePath, force = false) {
|
|
137
259
|
const template = await this.getTemplateStatus(templatePath);
|
|
@@ -176,32 +298,26 @@ export class TemplateManager extends EventEmitter {
|
|
|
176
298
|
}
|
|
177
299
|
async processTemplates(options) {
|
|
178
300
|
const templates = await this.findTemplates();
|
|
179
|
-
const result = { errors: [], applied: [] };
|
|
301
|
+
const result = { errors: [], applied: [], built: [], skipped: [] };
|
|
180
302
|
this.log('\n');
|
|
181
303
|
if (options.apply) {
|
|
182
|
-
const
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
}
|
|
186
|
-
else {
|
|
304
|
+
const connectionTimeout = new Promise((_, reject) => setTimeout(() => reject(new Error('Database connection timeout')), 1000));
|
|
305
|
+
const isConnected = await Promise.race([testConnection(), connectionTimeout]);
|
|
306
|
+
if (!isConnected) {
|
|
187
307
|
this.log('Failed to connect to database, cannot proceed. Is Supabase running?', 'error');
|
|
188
308
|
return result;
|
|
189
309
|
}
|
|
310
|
+
this.log('Connected to database', 'success');
|
|
190
311
|
const action = options.force ? 'Force applying' : 'Applying';
|
|
191
312
|
this.log(`${action} changed templates to local database...`, 'success');
|
|
192
|
-
|
|
313
|
+
// Process all templates
|
|
193
314
|
for (const templatePath of templates) {
|
|
194
|
-
const
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
hasChanges = true;
|
|
199
|
-
const applyResult = await this.applyTemplate(templatePath);
|
|
200
|
-
result.errors.push(...applyResult.errors);
|
|
201
|
-
result.applied.push(...applyResult.applied);
|
|
202
|
-
}
|
|
315
|
+
const processResult = await this.processTemplate(templatePath, options.force);
|
|
316
|
+
result.errors.push(...processResult.errors);
|
|
317
|
+
result.applied.push(...processResult.applied);
|
|
318
|
+
result.skipped.push(...processResult.skipped);
|
|
203
319
|
}
|
|
204
|
-
if (
|
|
320
|
+
if (result.applied.length === 0 && result.errors.length === 0) {
|
|
205
321
|
this.log('No changes to apply', 'skip');
|
|
206
322
|
}
|
|
207
323
|
else if (result.errors.length > 0) {
|
|
@@ -224,12 +340,18 @@ export class TemplateManager extends EventEmitter {
|
|
|
224
340
|
const template = await this.getTemplateStatus(templatePath);
|
|
225
341
|
if (options.force || template.currentHash !== template.buildState.lastBuildHash) {
|
|
226
342
|
await this.buildTemplate(templatePath, options.force);
|
|
343
|
+
result.built.push(template.name);
|
|
227
344
|
built++;
|
|
228
345
|
}
|
|
229
346
|
else {
|
|
347
|
+
result.skipped.push(template.name);
|
|
230
348
|
skipped++;
|
|
231
349
|
}
|
|
232
350
|
}
|
|
351
|
+
else {
|
|
352
|
+
result.skipped.push(path.basename(templatePath, '.sql'));
|
|
353
|
+
skipped++;
|
|
354
|
+
}
|
|
233
355
|
}
|
|
234
356
|
if (built > 0) {
|
|
235
357
|
this.log(`Generated ${built} migration file(s)`, 'success');
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"templateManager.js","sourceRoot":"","sources":["../../../src/lib/templateManager.ts"],"names":[],"mappings":"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"}
|