@baseplate-dev/project-builder-server 0.2.3 → 0.2.5
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/dist/api/index.d.ts +4 -4
- package/dist/api/sync.d.ts +4 -4
- package/dist/diff/diff-project.d.ts +4 -0
- package/dist/diff/diff-project.d.ts.map +1 -1
- package/dist/diff/diff-project.js +8 -3
- package/dist/diff/diff-project.js.map +1 -1
- package/dist/diff/diff-utils.d.ts +4 -3
- package/dist/diff/diff-utils.d.ts.map +1 -1
- package/dist/diff/diff-utils.js +10 -4
- package/dist/diff/diff-utils.js.map +1 -1
- package/dist/diff/types.d.ts +1 -0
- package/dist/diff/types.d.ts.map +1 -1
- package/dist/service/builder-service.js +2 -2
- package/dist/service/builder-service.js.map +1 -1
- package/dist/sync/generate-for-directory.d.ts +2 -1
- package/dist/sync/generate-for-directory.d.ts.map +1 -1
- package/dist/sync/generate-for-directory.js +3 -2
- package/dist/sync/generate-for-directory.js.map +1 -1
- package/dist/sync/index.d.ts +1 -1
- package/dist/sync/index.d.ts.map +1 -1
- package/dist/sync/index.js +1 -1
- package/dist/sync/index.js.map +1 -1
- package/dist/sync/sync-metadata.d.ts +6 -6
- package/dist/sync/{build-project.d.ts → sync-project.d.ts} +13 -9
- package/dist/sync/sync-project.d.ts.map +1 -0
- package/dist/sync/{build-project.js → sync-project.js} +8 -7
- package/dist/sync/sync-project.js.map +1 -0
- package/package.json +9 -8
- package/dist/sync/build-project.d.ts.map +0 -1
- package/dist/sync/build-project.js.map +0 -1
package/dist/api/index.d.ts
CHANGED
|
@@ -151,8 +151,8 @@ export declare const appRouter: import("@trpc/server/unstable-core-do-not-import
|
|
|
151
151
|
packages: Record<string, {
|
|
152
152
|
path: string;
|
|
153
153
|
status: "not-synced" | "in-progress" | "success" | "unknown-error" | "conflicts" | "command-error" | "cancelled";
|
|
154
|
-
order: number;
|
|
155
154
|
name: string;
|
|
155
|
+
order: number;
|
|
156
156
|
statusMessage?: string | undefined;
|
|
157
157
|
result?: {
|
|
158
158
|
completedAt: string;
|
|
@@ -194,24 +194,24 @@ export declare const appRouter: import("@trpc/server/unstable-core-do-not-import
|
|
|
194
194
|
}>;
|
|
195
195
|
openEditor: import("@trpc/server").TRPCMutationProcedure<{
|
|
196
196
|
input: {
|
|
197
|
-
id: string;
|
|
198
197
|
relativePath: string;
|
|
198
|
+
id: string;
|
|
199
199
|
packageId: string;
|
|
200
200
|
};
|
|
201
201
|
output: void;
|
|
202
202
|
}>;
|
|
203
203
|
deleteConflictFile: import("@trpc/server").TRPCMutationProcedure<{
|
|
204
204
|
input: {
|
|
205
|
-
id: string;
|
|
206
205
|
relativePath: string;
|
|
206
|
+
id: string;
|
|
207
207
|
packageId: string;
|
|
208
208
|
};
|
|
209
209
|
output: void;
|
|
210
210
|
}>;
|
|
211
211
|
keepConflictFile: import("@trpc/server").TRPCMutationProcedure<{
|
|
212
212
|
input: {
|
|
213
|
-
id: string;
|
|
214
213
|
relativePath: string;
|
|
214
|
+
id: string;
|
|
215
215
|
packageId: string;
|
|
216
216
|
};
|
|
217
217
|
output: void;
|
package/dist/api/sync.d.ts
CHANGED
|
@@ -66,8 +66,8 @@ export declare const syncRouter: import("@trpc/server/unstable-core-do-not-impor
|
|
|
66
66
|
packages: Record<string, {
|
|
67
67
|
path: string;
|
|
68
68
|
status: "not-synced" | "in-progress" | "success" | "unknown-error" | "conflicts" | "command-error" | "cancelled";
|
|
69
|
-
order: number;
|
|
70
69
|
name: string;
|
|
70
|
+
order: number;
|
|
71
71
|
statusMessage?: string | undefined;
|
|
72
72
|
result?: {
|
|
73
73
|
completedAt: string;
|
|
@@ -109,24 +109,24 @@ export declare const syncRouter: import("@trpc/server/unstable-core-do-not-impor
|
|
|
109
109
|
}>;
|
|
110
110
|
openEditor: import("@trpc/server").TRPCMutationProcedure<{
|
|
111
111
|
input: {
|
|
112
|
-
id: string;
|
|
113
112
|
relativePath: string;
|
|
113
|
+
id: string;
|
|
114
114
|
packageId: string;
|
|
115
115
|
};
|
|
116
116
|
output: void;
|
|
117
117
|
}>;
|
|
118
118
|
deleteConflictFile: import("@trpc/server").TRPCMutationProcedure<{
|
|
119
119
|
input: {
|
|
120
|
-
id: string;
|
|
121
120
|
relativePath: string;
|
|
121
|
+
id: string;
|
|
122
122
|
packageId: string;
|
|
123
123
|
};
|
|
124
124
|
output: void;
|
|
125
125
|
}>;
|
|
126
126
|
keepConflictFile: import("@trpc/server").TRPCMutationProcedure<{
|
|
127
127
|
input: {
|
|
128
|
-
id: string;
|
|
129
128
|
relativePath: string;
|
|
129
|
+
id: string;
|
|
130
130
|
packageId: string;
|
|
131
131
|
};
|
|
132
132
|
output: void;
|
|
@@ -33,6 +33,10 @@ export interface DiffProjectOptions {
|
|
|
33
33
|
* Filter files by glob patterns.
|
|
34
34
|
*/
|
|
35
35
|
globPatterns?: string[];
|
|
36
|
+
/**
|
|
37
|
+
* Whether to use .baseplateignore file for filtering.
|
|
38
|
+
*/
|
|
39
|
+
useIgnoreFile?: boolean;
|
|
36
40
|
}
|
|
37
41
|
/**
|
|
38
42
|
* Generates a diff between what would be generated and what currently exists
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff-project.d.ts","sourceRoot":"","sources":["../../src/diff/diff-project.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,mBAAmB,EACpB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"diff-project.d.ts","sourceRoot":"","sources":["../../src/diff/diff-project.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,mBAAmB,EACpB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAkBlD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AA4DlF;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,OAAO,EAAE,mBAAmB,CAAC;IAC7B;;OAEG;IACH,UAAU,EAAE,mBAAmB,CAAC;IAChC;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+F5E"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createPluginImplementationStore, runPluginMigrations, runSchemaMigrations, } from '@baseplate-dev/project-builder-lib';
|
|
2
|
-
import { buildGeneratorEntry, executeGeneratorEntry, formatGeneratorOutput, } from '@baseplate-dev/sync';
|
|
2
|
+
import { buildGeneratorEntry, executeGeneratorEntry, formatGeneratorOutput, loadIgnorePatterns, } from '@baseplate-dev/sync';
|
|
3
3
|
import { enhanceErrorWithContext, hashWithSHA256 } from '@baseplate-dev/utils';
|
|
4
4
|
import { fileExists } from '@baseplate-dev/utils/node';
|
|
5
5
|
import { readFile } from 'node:fs/promises';
|
|
@@ -38,10 +38,11 @@ async function loadProjectJson(directory, context) {
|
|
|
38
38
|
* in the working directory.
|
|
39
39
|
*/
|
|
40
40
|
export async function diffProject(options) {
|
|
41
|
-
const { directory, logger, context, compact = false, appFilter, globPatterns, } = options;
|
|
41
|
+
const { directory, logger, context, compact = false, appFilter, globPatterns, useIgnoreFile = true, } = options;
|
|
42
42
|
try {
|
|
43
43
|
logger.info('Loading project definition...');
|
|
44
44
|
const { definition: projectJson } = await loadProjectJson(directory, context);
|
|
45
|
+
// Note: ignore patterns will be loaded per app directory
|
|
45
46
|
logger.info('Compiling applications...');
|
|
46
47
|
const apps = compileApplications(projectJson, context);
|
|
47
48
|
// Filter apps if specified
|
|
@@ -58,6 +59,10 @@ export async function diffProject(options) {
|
|
|
58
59
|
for (const app of filteredApps) {
|
|
59
60
|
const appDirectory = path.join(directory, app.appDirectory);
|
|
60
61
|
logger.info(`Generating for app: ${app.name} (${app.appDirectory})`);
|
|
62
|
+
// Load ignore patterns for this app directory
|
|
63
|
+
const ignorePatterns = useIgnoreFile
|
|
64
|
+
? await loadIgnorePatterns(appDirectory)
|
|
65
|
+
: undefined;
|
|
61
66
|
// Generate the output without writing files
|
|
62
67
|
const generatorEntry = await buildGeneratorEntry(app.generatorBundle);
|
|
63
68
|
const generatorOutput = await executeGeneratorEntry(generatorEntry, {
|
|
@@ -66,7 +71,7 @@ export async function diffProject(options) {
|
|
|
66
71
|
// Format the output
|
|
67
72
|
const formattedGeneratorOutput = await formatGeneratorOutput(generatorOutput, { outputDirectory: appDirectory });
|
|
68
73
|
// Compare generated output with working directory
|
|
69
|
-
const diffSummary = await compareFiles(appDirectory, formattedGeneratorOutput, globPatterns);
|
|
74
|
+
const diffSummary = await compareFiles(appDirectory, formattedGeneratorOutput, globPatterns, ignorePatterns);
|
|
70
75
|
if (diffSummary.totalFiles > 0) {
|
|
71
76
|
logger.info(`\n=== Diff for ${app.name} ===`);
|
|
72
77
|
const output = compact
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff-project.js","sourceRoot":"","sources":["../../src/diff/diff-project.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,+BAA+B,EAC/B,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,
|
|
1
|
+
{"version":3,"file":"diff-project.js","sourceRoot":"","sources":["../../src/diff/diff-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { GeneratorOutput } from '@baseplate-dev/sync';
|
|
2
|
+
import type ignore from 'ignore';
|
|
2
3
|
import type { DiffSummary } from './types.js';
|
|
3
4
|
/**
|
|
4
|
-
* Checks if a file path should be included based on glob patterns
|
|
5
|
+
* Checks if a file path should be included based on ignore and glob patterns
|
|
5
6
|
*/
|
|
6
|
-
export declare function shouldIncludeFile(filePath: string, globPatterns?: string[]): boolean;
|
|
7
|
+
export declare function shouldIncludeFile(filePath: string, globPatterns?: string[], ignoreInstance?: ignore.Ignore): boolean;
|
|
7
8
|
/**
|
|
8
9
|
* Reads a file from the working directory if it exists
|
|
9
10
|
*/
|
|
@@ -19,5 +20,5 @@ export declare function createUnifiedDiff(filePath: string, oldContent: string,
|
|
|
19
20
|
/**
|
|
20
21
|
* Compares generated output with working directory files
|
|
21
22
|
*/
|
|
22
|
-
export declare function compareFiles(directory: string, generatorOutput: GeneratorOutput, globPatterns?: string[]): Promise<DiffSummary>;
|
|
23
|
+
export declare function compareFiles(directory: string, generatorOutput: GeneratorOutput, globPatterns?: string[], ignoreInstance?: ignore.Ignore): Promise<DiffSummary>;
|
|
23
24
|
//# sourceMappingURL=diff-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff-utils.d.ts","sourceRoot":"","sources":["../../src/diff/diff-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"diff-utils.d.ts","sourceRoot":"","sources":["../../src/diff/diff-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AASjC,OAAO,KAAK,EAAE,WAAW,EAAY,MAAM,YAAY,CAAC;AAExD;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,MAAM,EAAE,EACvB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,GAC7B,OAAO,CAWT;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,CAYjC;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAEjE;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,MAAM,CASR;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,eAAe,EAChC,YAAY,CAAC,EAAE,MAAM,EAAE,EACvB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,GAC7B,OAAO,CAAC,WAAW,CAAC,CAiFtB"}
|
package/dist/diff/diff-utils.js
CHANGED
|
@@ -1,12 +1,18 @@
|
|
|
1
|
+
import { shouldIncludeFile as shouldIncludeFileIgnore } from '@baseplate-dev/sync';
|
|
1
2
|
import * as diff from 'diff';
|
|
2
3
|
import { isBinaryFile } from 'isbinaryfile';
|
|
3
4
|
import micromatch from 'micromatch';
|
|
4
5
|
import { readFile } from 'node:fs/promises';
|
|
5
6
|
import path from 'node:path';
|
|
6
7
|
/**
|
|
7
|
-
* Checks if a file path should be included based on glob patterns
|
|
8
|
+
* Checks if a file path should be included based on ignore and glob patterns
|
|
8
9
|
*/
|
|
9
|
-
export function shouldIncludeFile(filePath, globPatterns) {
|
|
10
|
+
export function shouldIncludeFile(filePath, globPatterns, ignoreInstance) {
|
|
11
|
+
// Check ignore patterns first using shared function
|
|
12
|
+
if (!shouldIncludeFileIgnore(filePath, ignoreInstance)) {
|
|
13
|
+
return false;
|
|
14
|
+
}
|
|
15
|
+
// Then check glob patterns
|
|
10
16
|
if (!globPatterns || globPatterns.length === 0) {
|
|
11
17
|
return true;
|
|
12
18
|
}
|
|
@@ -44,12 +50,12 @@ export function createUnifiedDiff(filePath, oldContent, newContent) {
|
|
|
44
50
|
/**
|
|
45
51
|
* Compares generated output with working directory files
|
|
46
52
|
*/
|
|
47
|
-
export async function compareFiles(directory, generatorOutput, globPatterns) {
|
|
53
|
+
export async function compareFiles(directory, generatorOutput, globPatterns, ignoreInstance) {
|
|
48
54
|
const diffs = [];
|
|
49
55
|
const processedFiles = new Set();
|
|
50
56
|
// Process generated files
|
|
51
57
|
for (const [filePath, fileData] of generatorOutput.files) {
|
|
52
|
-
if (!shouldIncludeFile(filePath, globPatterns)) {
|
|
58
|
+
if (!shouldIncludeFile(filePath, globPatterns, ignoreInstance)) {
|
|
53
59
|
continue;
|
|
54
60
|
}
|
|
55
61
|
processedFiles.add(filePath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff-utils.js","sourceRoot":"","sources":["../../src/diff/diff-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"diff-utils.js","sourceRoot":"","sources":["../../src/diff/diff-utils.ts"],"names":[],"mappings":"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"}
|
package/dist/diff/types.d.ts
CHANGED
package/dist/diff/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/diff/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,CAAC;IACvC,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACnC,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACjC,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/diff/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,CAAC;IACvC,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACnC,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACjC,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB"}
|
|
@@ -9,7 +9,7 @@ import { readFile, unlink, writeFile } from 'node:fs/promises';
|
|
|
9
9
|
import path from 'node:path';
|
|
10
10
|
import { createNodeSchemaParserContext, discoverPlugins, } from '#src/plugins/index.js';
|
|
11
11
|
import { ConflictFileMonitor } from '#src/sync/conflict-file-monitor.js';
|
|
12
|
-
import {
|
|
12
|
+
import { syncProject } from '#src/sync/index.js';
|
|
13
13
|
import { SyncMetadataController } from '#src/sync/sync-metadata-controller.js';
|
|
14
14
|
import { getPackageSyncStatusFromResult } from '#src/sync/utils.js';
|
|
15
15
|
const MAX_CONSOLE_OUTPUT_LENGTH = 1000;
|
|
@@ -201,7 +201,7 @@ export class ProjectBuilderService extends TypedEventEmitter {
|
|
|
201
201
|
this.abortController = new AbortController();
|
|
202
202
|
this.currentSyncConsoleOutput = [];
|
|
203
203
|
this.emit('sync-started', { id: this.id });
|
|
204
|
-
await
|
|
204
|
+
await syncProject({
|
|
205
205
|
directory: this.directory,
|
|
206
206
|
logger: this.logger,
|
|
207
207
|
context: await this.getSchemaParserContext(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder-service.js","sourceRoot":"","sources":["../../src/service/builder-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"builder-service.js","sourceRoot":"","sources":["../../src/service/builder-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ interface GenerateForDirectoryOptions {
|
|
|
14
14
|
operations?: GeneratorOperations;
|
|
15
15
|
abortSignal?: AbortSignal;
|
|
16
16
|
skipCommands?: boolean;
|
|
17
|
+
forceOverwrite?: boolean;
|
|
17
18
|
}
|
|
18
19
|
export interface GeneratorOperations {
|
|
19
20
|
buildGeneratorEntry: typeof buildGeneratorEntry;
|
|
@@ -24,6 +25,6 @@ export interface GeneratorOperations {
|
|
|
24
25
|
writeGeneratorSteps: typeof writeGeneratorSteps;
|
|
25
26
|
}
|
|
26
27
|
declare function getPreviousGeneratedPayload(projectDirectory: string): Promise<PreviousGeneratedPayload | undefined>;
|
|
27
|
-
export declare function generateForDirectory({ baseDirectory, appEntry, logger, writeTemplateMetadataOptions, userConfig, previousPackageSyncResult, operations, abortSignal, skipCommands, }: GenerateForDirectoryOptions): Promise<PackageSyncResult>;
|
|
28
|
+
export declare function generateForDirectory({ baseDirectory, appEntry, logger, writeTemplateMetadataOptions, userConfig, previousPackageSyncResult, operations, abortSignal, skipCommands, forceOverwrite, }: GenerateForDirectoryOptions): Promise<PackageSyncResult>;
|
|
28
29
|
export {};
|
|
29
30
|
//# sourceMappingURL=generate-for-directory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-for-directory.d.ts","sourceRoot":"","sources":["../../src/sync/generate-for-directory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,KAAK,EAEV,cAAc,EACd,eAAe,EACf,MAAM,EACN,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,mBAAmB,EAInB,qBAAqB,EACrB,oBAAoB,EAErB,MAAM,qBAAqB,CAAC;AAO7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAElF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAM5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,UAAU,2BAA2B;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,4BAA4B,CAAC,EAAE,uBAAuB,CAAC;IACvD,UAAU,EAAE,mBAAmB,CAAC;IAChC,yBAAyB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACzD,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"generate-for-directory.d.ts","sourceRoot":"","sources":["../../src/sync/generate-for-directory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,KAAK,EAEV,cAAc,EACd,eAAe,EACf,MAAM,EACN,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,mBAAmB,EAInB,qBAAqB,EACrB,oBAAoB,EAErB,MAAM,qBAAqB,CAAC;AAO7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAElF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAM5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,UAAU,2BAA2B;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,4BAA4B,CAAC,EAAE,uBAAuB,CAAC;IACvD,UAAU,EAAE,mBAAmB,CAAC;IAChC,yBAAyB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACzD,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAmB;IAClC,mBAAmB,EAAE,OAAO,mBAAmB,CAAC;IAChD,qBAAqB,EAAE,OAAO,qBAAqB,CAAC;IACpD,2BAA2B,EAAE,OAAO,2BAA2B,CAAC;IAChE,oBAAoB,EAAE,OAAO,oBAAoB,CAAC;IAClD,aAAa,EAAE,CACb,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,eAAe,EACvB,gBAAgB,EAAE,MAAM,KACrB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,mBAAmB,EAAE,OAAO,mBAAmB,CAAC;CACjD;AAgBD,iBAAe,2BAA2B,CACxC,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,wBAAwB,GAAG,SAAS,CAAC,CAe/C;AAED,wBAAsB,oBAAoB,CAAC,EACzC,aAAa,EACb,QAAQ,EACR,MAAM,EACN,4BAA4B,EAC5B,UAAU,EACV,yBAAyB,EACzB,UAAuC,EACvC,WAAW,EACX,YAAY,EACZ,cAAc,GACf,EAAE,2BAA2B,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA2H1D"}
|
|
@@ -11,7 +11,7 @@ const defaultGeneratorOperations = {
|
|
|
11
11
|
executeGeneratorEntry,
|
|
12
12
|
getPreviousGeneratedPayload,
|
|
13
13
|
writeGeneratorOutput,
|
|
14
|
-
writeMetadata: async (
|
|
14
|
+
writeMetadata: async (_project, output, projectDirectory) => {
|
|
15
15
|
await deleteMetadataFiles(projectDirectory);
|
|
16
16
|
await writeTemplateInfoFiles(output.files, projectDirectory);
|
|
17
17
|
},
|
|
@@ -30,7 +30,7 @@ async function getPreviousGeneratedPayload(projectDirectory) {
|
|
|
30
30
|
fileIdToRelativePathMap: fileIdMap,
|
|
31
31
|
};
|
|
32
32
|
}
|
|
33
|
-
export async function generateForDirectory({ baseDirectory, appEntry, logger, writeTemplateMetadataOptions, userConfig, previousPackageSyncResult, operations = defaultGeneratorOperations, abortSignal, skipCommands, }) {
|
|
33
|
+
export async function generateForDirectory({ baseDirectory, appEntry, logger, writeTemplateMetadataOptions, userConfig, previousPackageSyncResult, operations = defaultGeneratorOperations, abortSignal, skipCommands, forceOverwrite, }) {
|
|
34
34
|
const { appDirectory, name, generatorBundle } = appEntry;
|
|
35
35
|
const projectDirectory = path.join(baseDirectory, appDirectory);
|
|
36
36
|
logger.info(`Generating project ${name} in ${projectDirectory}...`);
|
|
@@ -62,6 +62,7 @@ export async function generateForDirectory({ baseDirectory, appEntry, logger, wr
|
|
|
62
62
|
: undefined,
|
|
63
63
|
abortSignal,
|
|
64
64
|
skipCommands,
|
|
65
|
+
forceOverwrite,
|
|
65
66
|
});
|
|
66
67
|
// write metadata to the generated directory
|
|
67
68
|
if (writeTemplateMetadataOptions?.includeTemplateMetadata) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-for-directory.js","sourceRoot":"","sources":["../../src/sync/generate-for-directory.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,qCAAqC,EACrC,mBAAmB,EACnB,qBAAqB,EACrB,oBAAoB,EACpB,sBAAsB,GACvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,IAAI,MAAM,WAAW,CAAC;AAM7B,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,GACxB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"generate-for-directory.js","sourceRoot":"","sources":["../../src/sync/generate-for-directory.ts"],"names":[],"mappings":"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"}
|
package/dist/sync/index.d.ts
CHANGED
package/dist/sync/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC"}
|
package/dist/sync/index.js
CHANGED
package/dist/sync/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC"}
|
|
@@ -183,8 +183,8 @@ export declare const packageSyncInfoSchema: z.ZodObject<{
|
|
|
183
183
|
}, "strip", z.ZodTypeAny, {
|
|
184
184
|
path: string;
|
|
185
185
|
status: "not-synced" | "in-progress" | "success" | "unknown-error" | "conflicts" | "command-error" | "cancelled";
|
|
186
|
-
order: number;
|
|
187
186
|
name: string;
|
|
187
|
+
order: number;
|
|
188
188
|
statusMessage?: string | undefined;
|
|
189
189
|
result?: {
|
|
190
190
|
completedAt: string;
|
|
@@ -208,8 +208,8 @@ export declare const packageSyncInfoSchema: z.ZodObject<{
|
|
|
208
208
|
}, {
|
|
209
209
|
path: string;
|
|
210
210
|
status: "not-synced" | "in-progress" | "success" | "unknown-error" | "conflicts" | "command-error" | "cancelled";
|
|
211
|
-
order: number;
|
|
212
211
|
name: string;
|
|
212
|
+
order: number;
|
|
213
213
|
statusMessage?: string | undefined;
|
|
214
214
|
result?: {
|
|
215
215
|
completedAt: string;
|
|
@@ -328,8 +328,8 @@ export declare const syncMetadataSchema: z.ZodObject<{
|
|
|
328
328
|
}, "strip", z.ZodTypeAny, {
|
|
329
329
|
path: string;
|
|
330
330
|
status: "not-synced" | "in-progress" | "success" | "unknown-error" | "conflicts" | "command-error" | "cancelled";
|
|
331
|
-
order: number;
|
|
332
331
|
name: string;
|
|
332
|
+
order: number;
|
|
333
333
|
statusMessage?: string | undefined;
|
|
334
334
|
result?: {
|
|
335
335
|
completedAt: string;
|
|
@@ -353,8 +353,8 @@ export declare const syncMetadataSchema: z.ZodObject<{
|
|
|
353
353
|
}, {
|
|
354
354
|
path: string;
|
|
355
355
|
status: "not-synced" | "in-progress" | "success" | "unknown-error" | "conflicts" | "command-error" | "cancelled";
|
|
356
|
-
order: number;
|
|
357
356
|
name: string;
|
|
357
|
+
order: number;
|
|
358
358
|
statusMessage?: string | undefined;
|
|
359
359
|
result?: {
|
|
360
360
|
completedAt: string;
|
|
@@ -381,8 +381,8 @@ export declare const syncMetadataSchema: z.ZodObject<{
|
|
|
381
381
|
packages: Record<string, {
|
|
382
382
|
path: string;
|
|
383
383
|
status: "not-synced" | "in-progress" | "success" | "unknown-error" | "conflicts" | "command-error" | "cancelled";
|
|
384
|
-
order: number;
|
|
385
384
|
name: string;
|
|
385
|
+
order: number;
|
|
386
386
|
statusMessage?: string | undefined;
|
|
387
387
|
result?: {
|
|
388
388
|
completedAt: string;
|
|
@@ -413,8 +413,8 @@ export declare const syncMetadataSchema: z.ZodObject<{
|
|
|
413
413
|
packages: Record<string, {
|
|
414
414
|
path: string;
|
|
415
415
|
status: "not-synced" | "in-progress" | "success" | "unknown-error" | "conflicts" | "command-error" | "cancelled";
|
|
416
|
-
order: number;
|
|
417
416
|
name: string;
|
|
417
|
+
order: number;
|
|
418
418
|
statusMessage?: string | undefined;
|
|
419
419
|
result?: {
|
|
420
420
|
completedAt: string;
|
|
@@ -4,9 +4,9 @@ import type { BaseplateUserConfig } from '#src/user-config/user-config-schema.js
|
|
|
4
4
|
import type { SyncStatus } from '../sync/index.js';
|
|
5
5
|
import type { SyncMetadataController } from './sync-metadata-controller.js';
|
|
6
6
|
/**
|
|
7
|
-
* Options for
|
|
7
|
+
* Options for syncing the project.
|
|
8
8
|
*/
|
|
9
|
-
export interface
|
|
9
|
+
export interface SyncProjectOptions {
|
|
10
10
|
/**
|
|
11
11
|
* The directory to build the project in.
|
|
12
12
|
*/
|
|
@@ -40,20 +40,24 @@ export interface BuildProjectOptions {
|
|
|
40
40
|
* This is used by the VSCode extension to find the command to trigger additional commands.
|
|
41
41
|
*/
|
|
42
42
|
cliFilePath?: string;
|
|
43
|
+
/**
|
|
44
|
+
* Whether to force overwrite existing files without merge conflict detection.
|
|
45
|
+
*/
|
|
46
|
+
forceOverwrite?: boolean;
|
|
43
47
|
}
|
|
44
48
|
/**
|
|
45
|
-
* The result of
|
|
49
|
+
* The result of syncing the project.
|
|
46
50
|
*/
|
|
47
|
-
export interface
|
|
51
|
+
export interface SyncProjectResult {
|
|
48
52
|
/**
|
|
49
|
-
* The status of the
|
|
53
|
+
* The status of the sync.
|
|
50
54
|
*/
|
|
51
55
|
status: SyncStatus;
|
|
52
56
|
}
|
|
53
57
|
/**
|
|
54
|
-
*
|
|
58
|
+
* Syncs the project in the given directory.
|
|
55
59
|
*
|
|
56
|
-
* @param options - The options for
|
|
60
|
+
* @param options - The options for syncing the project.
|
|
57
61
|
*/
|
|
58
|
-
export declare function
|
|
59
|
-
//# sourceMappingURL=
|
|
62
|
+
export declare function syncProject({ directory, logger, context, userConfig, syncMetadataController, abortSignal, skipCommands, cliFilePath, forceOverwrite, }: SyncProjectOptions): Promise<SyncProjectResult>;
|
|
63
|
+
//# sourceMappingURL=sync-project.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-project.d.ts","sourceRoot":"","sources":["../../src/sync/sync-project.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,mBAAmB,EACpB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAmBlD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAIlF,OAAO,KAAK,EAAqB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAwD5E;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,OAAO,EAAE,mBAAmB,CAAC;IAC7B;;OAEG;IACH,UAAU,EAAE,mBAAmB,CAAC;IAChC;;OAEG;IACH,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;IAChD;;OAEG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,MAAM,EAAE,UAAU,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,EAChC,SAAS,EACT,MAAM,EACN,OAAO,EACP,UAAU,EACV,sBAAsB,EACtB,WAAW,EACX,YAAY,EACZ,WAAW,EACX,cAAc,GACf,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAgJjD"}
|
|
@@ -33,11 +33,11 @@ async function loadProjectJson(directory, context) {
|
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
/**
|
|
36
|
-
*
|
|
36
|
+
* Syncs the project in the given directory.
|
|
37
37
|
*
|
|
38
|
-
* @param options - The options for
|
|
38
|
+
* @param options - The options for syncing the project.
|
|
39
39
|
*/
|
|
40
|
-
export async function
|
|
40
|
+
export async function syncProject({ directory, logger, context, userConfig, syncMetadataController, abortSignal, skipCommands, cliFilePath, forceOverwrite, }) {
|
|
41
41
|
await syncMetadataController?.updateMetadata((metadata) => ({
|
|
42
42
|
...metadata,
|
|
43
43
|
status: 'in-progress',
|
|
@@ -96,6 +96,7 @@ export async function buildProject({ directory, logger, context, userConfig, syn
|
|
|
96
96
|
previousPackageSyncResult: packageInfo?.result,
|
|
97
97
|
abortSignal,
|
|
98
98
|
skipCommands,
|
|
99
|
+
forceOverwrite,
|
|
99
100
|
});
|
|
100
101
|
}
|
|
101
102
|
catch (err) {
|
|
@@ -137,10 +138,10 @@ export async function buildProject({ directory, logger, context, userConfig, syn
|
|
|
137
138
|
completedAt: new Date().toISOString(),
|
|
138
139
|
}));
|
|
139
140
|
if (wasCancelled) {
|
|
140
|
-
logger.info('Project
|
|
141
|
+
logger.info('Project sync cancelled.');
|
|
141
142
|
}
|
|
142
143
|
else if (hasErrors) {
|
|
143
|
-
logger.error('Project
|
|
144
|
+
logger.error('Project sync failed.');
|
|
144
145
|
}
|
|
145
146
|
else {
|
|
146
147
|
logger.info(`Project written to ${directory}!`);
|
|
@@ -154,8 +155,8 @@ export async function buildProject({ directory, logger, context, userConfig, syn
|
|
|
154
155
|
completedAt: new Date().toISOString(),
|
|
155
156
|
globalErrors: [String(err)],
|
|
156
157
|
}));
|
|
157
|
-
logger.error('Project
|
|
158
|
+
logger.error('Project sync failed.');
|
|
158
159
|
throw err;
|
|
159
160
|
}
|
|
160
161
|
}
|
|
161
|
-
//# sourceMappingURL=
|
|
162
|
+
//# sourceMappingURL=sync-project.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-project.js","sourceRoot":"","sources":["../../src/sync/sync-project.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@baseplate-dev/project-builder-server",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.5",
|
|
4
4
|
"description": "Server for Project Builder using Baseplate generators",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"backend",
|
|
@@ -50,6 +50,7 @@
|
|
|
50
50
|
"fastify": "5.3.2",
|
|
51
51
|
"fastify-plugin": "5.0.1",
|
|
52
52
|
"fastify-type-provider-zod": "4.0.1",
|
|
53
|
+
"ignore": "^7.0.5",
|
|
53
54
|
"immer": "10.1.1",
|
|
54
55
|
"inflection": "3.0.0",
|
|
55
56
|
"isbinaryfile": "^5.0.4",
|
|
@@ -58,12 +59,12 @@
|
|
|
58
59
|
"open": "10.1.0",
|
|
59
60
|
"pino": "9.5.0",
|
|
60
61
|
"zod": "3.24.1",
|
|
61
|
-
"@baseplate-dev/core-generators": "0.2.
|
|
62
|
-
"@baseplate-dev/fastify-generators": "0.2.
|
|
63
|
-
"@baseplate-dev/project-builder-lib": "0.2.
|
|
64
|
-
"@baseplate-dev/react-generators": "0.2.
|
|
65
|
-
"@baseplate-dev/sync": "0.2.
|
|
66
|
-
"@baseplate-dev/utils": "0.2.
|
|
62
|
+
"@baseplate-dev/core-generators": "0.2.5",
|
|
63
|
+
"@baseplate-dev/fastify-generators": "0.2.5",
|
|
64
|
+
"@baseplate-dev/project-builder-lib": "0.2.5",
|
|
65
|
+
"@baseplate-dev/react-generators": "0.2.5",
|
|
66
|
+
"@baseplate-dev/sync": "0.2.5",
|
|
67
|
+
"@baseplate-dev/utils": "0.2.5"
|
|
67
68
|
},
|
|
68
69
|
"devDependencies": {
|
|
69
70
|
"@types/micromatch": "^4.0.9",
|
|
@@ -73,7 +74,7 @@
|
|
|
73
74
|
"prettier": "3.5.3",
|
|
74
75
|
"typescript": "5.7.3",
|
|
75
76
|
"vitest": "3.0.7",
|
|
76
|
-
"@baseplate-dev/tools": "0.2.
|
|
77
|
+
"@baseplate-dev/tools": "0.2.5"
|
|
77
78
|
},
|
|
78
79
|
"engines": {
|
|
79
80
|
"node": "^22.0.0"
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"build-project.d.ts","sourceRoot":"","sources":["../../src/sync/build-project.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,mBAAmB,EACpB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAmBlD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAIlF,OAAO,KAAK,EAAqB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAwD5E;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,OAAO,EAAE,mBAAmB,CAAC;IAC7B;;OAEG;IACH,UAAU,EAAE,mBAAmB,CAAC;IAChC;;OAEG;IACH,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;IAChD;;OAEG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,MAAM,EAAE,UAAU,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,EACjC,SAAS,EACT,MAAM,EACN,OAAO,EACP,UAAU,EACV,sBAAsB,EACtB,WAAW,EACX,YAAY,EACZ,WAAW,GACZ,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA+InD"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"build-project.js","sourceRoot":"","sources":["../../src/sync/build-project.ts"],"names":[],"mappings":"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"}
|