@salesforce/webapp-template-cli-experimental 1.71.2 → 1.71.3
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 +29 -29
- package/dist/commands/apply-patches.d.ts +2 -2
- package/dist/commands/apply-patches.d.ts.map +1 -1
- package/dist/commands/apply-patches.js +45 -45
- package/dist/commands/apply-patches.js.map +1 -1
- package/dist/commands/new-app-feature.js +2 -2
- package/dist/commands/watch-patches.js +2 -2
- package/dist/commands/watch-patches.js.map +1 -1
- package/dist/core/dependency-resolver.d.ts +12 -12
- package/dist/core/dependency-resolver.d.ts.map +1 -1
- package/dist/core/dependency-resolver.js +29 -29
- package/dist/core/dependency-resolver.js.map +1 -1
- package/dist/core/file-operations.js +2 -2
- package/dist/core/file-operations.js.map +1 -1
- package/dist/core/patch-loader.d.ts +6 -6
- package/dist/core/patch-loader.d.ts.map +1 -1
- package/dist/core/patch-loader.js +45 -45
- package/dist/core/patch-loader.js.map +1 -1
- package/dist/nx-plugin/executors/apply-patches/executor.js +1 -1
- package/dist/types.d.ts +1 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/validation.js +4 -4
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -102,13 +102,13 @@ The created feature will have:
|
|
|
102
102
|
```bash
|
|
103
103
|
cd packages/feature/feature-{name}
|
|
104
104
|
# 1. Customize template files in template/ directory
|
|
105
|
-
# 2. Update
|
|
105
|
+
# 2. Update patches.ts with feature configuration
|
|
106
106
|
# 3. Test with: npm run apply-patches -- packages/feature/feature-{name} packages/base-app/base-react-app test-app
|
|
107
107
|
```
|
|
108
108
|
|
|
109
109
|
### Options
|
|
110
110
|
|
|
111
|
-
- `<feature-path>`: Path to the feature directory (can be relative to monorepo root or absolute). The feature must contain a
|
|
111
|
+
- `<feature-path>`: Path to the feature directory (can be relative to monorepo root or absolute). The feature must contain a patches.ts file.
|
|
112
112
|
- `<app-path>`: Path to the base app directory (can be relative to monorepo root or absolute). Used as a reference for file inheritance and validation. The base app remains unchanged.
|
|
113
113
|
- `<target-dir>`: **Required**. Target directory where the feature will be applied. Can be a relative or absolute path. The CLI will create this directory and apply all features to it.
|
|
114
114
|
- `--skip-dependency-changes`: Skip installing dependencies from package.json. Only file changes will be applied.
|
|
@@ -118,11 +118,11 @@ cd packages/feature/feature-{name}
|
|
|
118
118
|
|
|
119
119
|
The CLI tool:
|
|
120
120
|
|
|
121
|
-
1. **Validates** that the specified feature path exists and contains a
|
|
121
|
+
1. **Validates** that the specified feature path exists and contains a patches.ts file, and the base app path is valid
|
|
122
122
|
2. **Prepares target directory**: Creates the target directory (or resets it to base app state if `--reset` flag is used, preserving node_modules)
|
|
123
123
|
3. **Resolves dependencies**: Recursively resolves all feature dependencies, detecting circular dependencies and building an ordered list where dependencies are applied before dependent features
|
|
124
|
-
4. **Loads** the feature definitions from each `
|
|
125
|
-
5. **Discovers files** from each feature's template directory (defaults to `template`, configurable via `templateDir` in
|
|
124
|
+
4. **Loads** the feature definitions from each `patches.ts` file in dependency order
|
|
125
|
+
5. **Discovers files** from each feature's template directory (defaults to `template`, configurable via `templateDir` in patches.ts)
|
|
126
126
|
6. **Validates paths**: For each feature, ensures:
|
|
127
127
|
- No conflicting paths exist (e.g., both `routes.tsx` and `__delete__routes.tsx`, or `__prepend__global.css` and `__append__global.css`)
|
|
128
128
|
- Files marked with `__delete__`, `__inherit__`, `__prepend__`, or `__append__` exist in the base app
|
|
@@ -184,13 +184,13 @@ For manual setup or advanced configuration, see below...
|
|
|
184
184
|
|
|
185
185
|
---
|
|
186
186
|
|
|
187
|
-
Features are defined in your feature's `
|
|
187
|
+
Features are defined in your feature's `patches.ts` file and must be exported as a **default export**. The default export can be either a single feature object or an array of features. Import types from `packages/cli/src/types.js`.
|
|
188
188
|
|
|
189
189
|
### Feature Structure
|
|
190
190
|
|
|
191
191
|
```
|
|
192
192
|
packages/feature/feature-my-feature/
|
|
193
|
-
├──
|
|
193
|
+
├── patches.ts # Feature configuration
|
|
194
194
|
├── package.json # NPM dependencies for development
|
|
195
195
|
└── template/ # Template files (default directory name)
|
|
196
196
|
├── webApp/ # Web application files (mapped to webapplications/<feature-name>/)
|
|
@@ -222,9 +222,9 @@ The feature configuration file specifies:
|
|
|
222
222
|
### Basic Feature Example:
|
|
223
223
|
|
|
224
224
|
```typescript
|
|
225
|
-
import type {
|
|
225
|
+
import type { Patch } from "../cli/src/types.js";
|
|
226
226
|
|
|
227
|
-
const
|
|
227
|
+
const patch: Patch = {
|
|
228
228
|
// All fields are optional with sensible defaults
|
|
229
229
|
templateDir: "template", // Optional, defaults to 'template'
|
|
230
230
|
webAppName: "my-feature", // Optional, defaults to feature directory name
|
|
@@ -236,15 +236,15 @@ const feature: Feature = {
|
|
|
236
236
|
},
|
|
237
237
|
};
|
|
238
238
|
|
|
239
|
-
export default
|
|
239
|
+
export default patch;
|
|
240
240
|
```
|
|
241
241
|
|
|
242
242
|
### Feature with Dependencies:
|
|
243
243
|
|
|
244
244
|
```typescript
|
|
245
|
-
import type {
|
|
245
|
+
import type { Patch } from "../cli/src/types.js";
|
|
246
246
|
|
|
247
|
-
const
|
|
247
|
+
const patch: Patch = {
|
|
248
248
|
// This feature depends on shadcn UI feature
|
|
249
249
|
// shadcn will be applied first, then this feature
|
|
250
250
|
dependencies: ["packages/template/feature/feature-react-chart"],
|
|
@@ -255,15 +255,15 @@ const feature: Feature = {
|
|
|
255
255
|
},
|
|
256
256
|
};
|
|
257
257
|
|
|
258
|
-
export default
|
|
258
|
+
export default patch;
|
|
259
259
|
```
|
|
260
260
|
|
|
261
261
|
### Custom Configuration:
|
|
262
262
|
|
|
263
263
|
```typescript
|
|
264
|
-
import type {
|
|
264
|
+
import type { Patch } from "../cli/src/types.js";
|
|
265
265
|
|
|
266
|
-
const
|
|
266
|
+
const patch: Patch = {
|
|
267
267
|
templateDir: "src", // Use 'src' instead of 'template'
|
|
268
268
|
webAppName: "custom-app-name", // Override default app name
|
|
269
269
|
routeFilePath: "custom/path/to/routes.tsx", // Custom route file path
|
|
@@ -274,7 +274,7 @@ const feature: Feature = {
|
|
|
274
274
|
},
|
|
275
275
|
};
|
|
276
276
|
|
|
277
|
-
export default
|
|
277
|
+
export default patch;
|
|
278
278
|
```
|
|
279
279
|
|
|
280
280
|
**Notes:**
|
|
@@ -313,7 +313,7 @@ feature-react-chart/template/
|
|
|
313
313
|
Simply organize your template files under `webApp/` for web application code, and at the root level for SFDX metadata:
|
|
314
314
|
|
|
315
315
|
```typescript
|
|
316
|
-
//
|
|
316
|
+
// patches.ts - No configuration needed
|
|
317
317
|
export default {};
|
|
318
318
|
```
|
|
319
319
|
|
|
@@ -339,7 +339,7 @@ template/
|
|
|
339
339
|
Use full paths when you need precise control or for backwards compatibility:
|
|
340
340
|
|
|
341
341
|
```typescript
|
|
342
|
-
//
|
|
342
|
+
// patches.ts
|
|
343
343
|
export default {
|
|
344
344
|
pathMappings: {
|
|
345
345
|
enabled: false, // Disable automatic mapping
|
|
@@ -361,7 +361,7 @@ template/
|
|
|
361
361
|
Define custom mappings for non-standard structures:
|
|
362
362
|
|
|
363
363
|
```typescript
|
|
364
|
-
//
|
|
364
|
+
// patches.ts
|
|
365
365
|
export default {
|
|
366
366
|
pathMappings: {
|
|
367
367
|
mappings: [
|
|
@@ -482,7 +482,7 @@ Features can depend on other features. Dependencies are automatically resolved a
|
|
|
482
482
|
|
|
483
483
|
### How Dependencies Work
|
|
484
484
|
|
|
485
|
-
1. **Declaration**: Specify dependencies in your `
|
|
485
|
+
1. **Declaration**: Specify dependencies in your `patches.ts` file
|
|
486
486
|
2. **Resolution**: CLI recursively resolves all dependencies (including nested dependencies)
|
|
487
487
|
3. **Ordering**: Dependencies are always applied before the feature that depends on them
|
|
488
488
|
4. **Circular Detection**: CLI detects and prevents circular dependencies
|
|
@@ -505,26 +505,26 @@ The CLI builds a complete dependency graph and applies features in topological o
|
|
|
505
505
|
### Example: Building on Shared UI Features
|
|
506
506
|
|
|
507
507
|
```typescript
|
|
508
|
-
// packages/template/feature/feature-react-chart/
|
|
509
|
-
import type {
|
|
508
|
+
// packages/template/feature/feature-react-chart/patches.ts
|
|
509
|
+
import type { Patch } from "../../../cli/src/types.js";
|
|
510
510
|
|
|
511
|
-
const
|
|
511
|
+
const patch: Patch = {
|
|
512
512
|
// Shadcn UI has no dependencies
|
|
513
513
|
};
|
|
514
514
|
|
|
515
|
-
export default
|
|
515
|
+
export default patch;
|
|
516
516
|
```
|
|
517
517
|
|
|
518
518
|
```typescript
|
|
519
|
-
// packages/template/feature/feature-admin-dashboard/
|
|
520
|
-
import type {
|
|
519
|
+
// packages/template/feature/feature-admin-dashboard/patches.ts
|
|
520
|
+
import type { Patch } from "../../../cli/src/types.js";
|
|
521
521
|
|
|
522
|
-
const
|
|
522
|
+
const patch: Patch = {
|
|
523
523
|
// Admin dashboard builds on top of shadcn UI
|
|
524
524
|
dependencies: ["packages/template/feature/feature-react-chart"],
|
|
525
525
|
};
|
|
526
526
|
|
|
527
|
-
export default
|
|
527
|
+
export default patch;
|
|
528
528
|
```
|
|
529
529
|
|
|
530
530
|
When you apply `feature-admin-dashboard`:
|
|
@@ -1514,7 +1514,7 @@ You can set default options for all projects in `nx.json`:
|
|
|
1514
1514
|
"cache": true,
|
|
1515
1515
|
"inputs": [
|
|
1516
1516
|
"{projectRoot}/src/**/*",
|
|
1517
|
-
"{projectRoot}/
|
|
1517
|
+
"{projectRoot}/patches.ts",
|
|
1518
1518
|
"{projectRoot}/package.json",
|
|
1519
1519
|
"{workspaceRoot}/packages/template/base-app/base-react-app/**/*"
|
|
1520
1520
|
],
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Apply feature patches to create a new app
|
|
3
3
|
*
|
|
4
|
-
* @param
|
|
4
|
+
* @param patchPath - Path to the feature directory containing patches.ts
|
|
5
5
|
* @param appPath - Path to the base app directory (used as reference, remains unchanged)
|
|
6
6
|
* @param options - Configuration options
|
|
7
7
|
* @param options.targetDirName - Required. Target directory where feature will be applied
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
* { targetDirName: 'my-app' }
|
|
16
16
|
* );
|
|
17
17
|
*/
|
|
18
|
-
export declare function applyPatchesCommand(
|
|
18
|
+
export declare function applyPatchesCommand(patchPath: string, appPath: string, options: {
|
|
19
19
|
targetDirName: string;
|
|
20
20
|
skipDependencyChanges?: boolean;
|
|
21
21
|
reset?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply-patches.d.ts","sourceRoot":"","sources":["../../src/commands/apply-patches.ts"],"names":[],"mappings":"AAwsBA;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,mBAAmB,CACxC,
|
|
1
|
+
{"version":3,"file":"apply-patches.d.ts","sourceRoot":"","sources":["../../src/commands/apply-patches.ts"],"names":[],"mappings":"AAwsBA;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,mBAAmB,CACxC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GAClF,OAAO,CAAC,IAAI,CAAC,CA4Lf"}
|
|
@@ -220,26 +220,26 @@ function extractAppendPath(relativePath) {
|
|
|
220
220
|
return hasAppendPrefix ? transformedParts.join("/") : null;
|
|
221
221
|
}
|
|
222
222
|
/**
|
|
223
|
-
* Apply a single
|
|
223
|
+
* Apply a single patch's files to the target directory
|
|
224
224
|
* This is the core application logic extracted for reuse
|
|
225
225
|
*/
|
|
226
|
-
async function
|
|
227
|
-
const {
|
|
226
|
+
async function applySinglePatch(resolvedPatch, baseAppPath, targetDir, targetAppName) {
|
|
227
|
+
const { patchDir, config, patchPath } = resolvedPatch;
|
|
228
228
|
const { templateDir, routeFilePath, pathMappings } = config;
|
|
229
229
|
// Extract feature name for path translation
|
|
230
|
-
const featureName = basename(
|
|
230
|
+
const featureName = basename(patchPath);
|
|
231
231
|
// Get effective path mappings for this feature
|
|
232
232
|
const effectiveMappings = getEffectivePathMappings(featureName, pathMappings);
|
|
233
233
|
// Discover and apply files from feature's template directory
|
|
234
|
-
const templatePath = join(
|
|
234
|
+
const templatePath = join(patchDir, templateDir);
|
|
235
235
|
if (!existsSync(templatePath)) {
|
|
236
|
-
throw new Error(`Template directory '${templateDir}' does not exist in feature path '${
|
|
236
|
+
throw new Error(`Template directory '${templateDir}' does not exist in feature path '${patchPath}'`);
|
|
237
237
|
}
|
|
238
|
-
logger.heading(`\nApplying: ${
|
|
238
|
+
logger.heading(`\nApplying: ${patchPath}`);
|
|
239
239
|
logger.info("Discovering files...");
|
|
240
240
|
const discoveredFiles = discoverFiles(templatePath);
|
|
241
241
|
if (discoveredFiles.length === 0) {
|
|
242
|
-
throw new Error(`Feature '${
|
|
242
|
+
throw new Error(`Feature '${patchPath}' has no files in ${templateDir} directory`);
|
|
243
243
|
}
|
|
244
244
|
logger.info(`Found ${discoveredFiles.length} file(s)`);
|
|
245
245
|
// Validate that there are no conflicting paths and that base files exist
|
|
@@ -411,7 +411,7 @@ async function applySingleFeature(resolvedFeature, baseAppPath, targetDir, targe
|
|
|
411
411
|
}
|
|
412
412
|
else if (prependTargetPath) {
|
|
413
413
|
// This is a prepend operation - ensure target file exists first
|
|
414
|
-
const
|
|
414
|
+
const patchSourceFilePath = join(templatePath, relativePath);
|
|
415
415
|
const targetPrependPath = translatePathToTargetApp(prependTargetPath, featureName, targetAppName);
|
|
416
416
|
const targetFilePath = join(targetDir, targetPrependPath);
|
|
417
417
|
// Copy from base app if target doesn't have the file yet
|
|
@@ -426,11 +426,11 @@ async function applySingleFeature(resolvedFeature, baseAppPath, targetDir, targe
|
|
|
426
426
|
cpSync(baseFilePath, targetFilePath);
|
|
427
427
|
}
|
|
428
428
|
}
|
|
429
|
-
await prependToFile(
|
|
429
|
+
await prependToFile(patchSourceFilePath, targetFilePath, targetPrependPath);
|
|
430
430
|
}
|
|
431
431
|
else if (appendTargetPath) {
|
|
432
432
|
// This is an append operation - ensure target file exists first
|
|
433
|
-
const
|
|
433
|
+
const patchSourceFilePath = join(templatePath, relativePath);
|
|
434
434
|
const targetAppendPath = translatePathToTargetApp(appendTargetPath, featureName, targetAppName);
|
|
435
435
|
const targetFilePath = join(targetDir, targetAppendPath);
|
|
436
436
|
// Copy from base app if target doesn't have the file yet
|
|
@@ -445,7 +445,7 @@ async function applySingleFeature(resolvedFeature, baseAppPath, targetDir, targe
|
|
|
445
445
|
cpSync(baseFilePath, targetFilePath);
|
|
446
446
|
}
|
|
447
447
|
}
|
|
448
|
-
await appendToFile(
|
|
448
|
+
await appendToFile(patchSourceFilePath, targetFilePath, targetAppendPath);
|
|
449
449
|
}
|
|
450
450
|
else {
|
|
451
451
|
// Normal file operation - add/update/merge
|
|
@@ -509,9 +509,9 @@ function copyAllFeatureRulesAndSkills(targetDir) {
|
|
|
509
509
|
if (!folder.isDirectory())
|
|
510
510
|
continue;
|
|
511
511
|
const featureName = folder.name;
|
|
512
|
-
const
|
|
512
|
+
const patchDir = join(featuresDir, featureName);
|
|
513
513
|
// Copy rules from feature/rules/ directory (prefixed by feature name to avoid overwrites)
|
|
514
|
-
const featureRulesDir = join(
|
|
514
|
+
const featureRulesDir = join(patchDir, "rules");
|
|
515
515
|
if (existsSync(featureRulesDir)) {
|
|
516
516
|
const ruleFiles = readdirSync(featureRulesDir, { withFileTypes: true });
|
|
517
517
|
for (const entry of ruleFiles) {
|
|
@@ -530,7 +530,7 @@ function copyAllFeatureRulesAndSkills(targetDir) {
|
|
|
530
530
|
}
|
|
531
531
|
}
|
|
532
532
|
// Copy skills from feature/skills/ directory (prefixed by feature name to avoid overwrites)
|
|
533
|
-
const featureSkillsDir = join(
|
|
533
|
+
const featureSkillsDir = join(patchDir, "skills");
|
|
534
534
|
if (existsSync(featureSkillsDir)) {
|
|
535
535
|
const skillFolders = readdirSync(featureSkillsDir, { withFileTypes: true });
|
|
536
536
|
for (const entry of skillFolders) {
|
|
@@ -575,7 +575,7 @@ function copyAllFeatureRulesAndSkills(targetDir) {
|
|
|
575
575
|
/**
|
|
576
576
|
* Apply feature patches to create a new app
|
|
577
577
|
*
|
|
578
|
-
* @param
|
|
578
|
+
* @param patchPath - Path to the feature directory containing patches.ts
|
|
579
579
|
* @param appPath - Path to the base app directory (used as reference, remains unchanged)
|
|
580
580
|
* @param options - Configuration options
|
|
581
581
|
* @param options.targetDirName - Required. Target directory where feature will be applied
|
|
@@ -589,17 +589,17 @@ function copyAllFeatureRulesAndSkills(targetDir) {
|
|
|
589
589
|
* { targetDirName: 'my-app' }
|
|
590
590
|
* );
|
|
591
591
|
*/
|
|
592
|
-
export async function applyPatchesCommand(
|
|
592
|
+
export async function applyPatchesCommand(patchPath, appPath, options) {
|
|
593
593
|
try {
|
|
594
|
-
logger.heading(`Applying patches: ${
|
|
594
|
+
logger.heading(`Applying patches: ${patchPath} → ${options.targetDirName}`);
|
|
595
595
|
// Step 1: Validate inputs
|
|
596
596
|
logger.info("Validating paths...");
|
|
597
|
-
validateAndResolveFeaturePath(
|
|
597
|
+
validateAndResolveFeaturePath(patchPath); // Fast-fail validation
|
|
598
598
|
const baseAppPath = validateAndResolveAppPath(appPath);
|
|
599
599
|
logger.success("Validation passed");
|
|
600
600
|
// Step 2: Prepare target directory
|
|
601
601
|
// Extract target app name from the main feature path for nested structure
|
|
602
|
-
const mainFeatureName = basename(
|
|
602
|
+
const mainFeatureName = basename(patchPath);
|
|
603
603
|
const targetAppName = mainFeatureName;
|
|
604
604
|
// Resolve target directory - if absolute, use as-is; otherwise resolve relative to monorepo root
|
|
605
605
|
const resolvedTargetDir = isAbsolute(options.targetDirName)
|
|
@@ -638,14 +638,14 @@ export async function applyPatchesCommand(featurePath, appPath, options) {
|
|
|
638
638
|
const targetDir = resolvedTargetDir;
|
|
639
639
|
// Step 3: Resolve dependencies
|
|
640
640
|
logger.heading("\nResolving Dependencies");
|
|
641
|
-
const {
|
|
642
|
-
if (
|
|
643
|
-
logger.info(`Resolved dependency chain (${
|
|
644
|
-
for (let i = 0; i <
|
|
645
|
-
const {
|
|
646
|
-
const
|
|
647
|
-
const prefix =
|
|
648
|
-
const label =
|
|
641
|
+
const { orderedPatches } = await resolveDependencies(patchPath);
|
|
642
|
+
if (orderedPatches.length > 1) {
|
|
643
|
+
logger.info(`Resolved dependency chain (${orderedPatches.length} patches):`);
|
|
644
|
+
for (let i = 0; i < orderedPatches.length; i++) {
|
|
645
|
+
const { patchPath: path } = orderedPatches[i];
|
|
646
|
+
const isMainPatch = i === orderedPatches.length - 1;
|
|
647
|
+
const prefix = isMainPatch ? "└─" : "├─";
|
|
648
|
+
const label = isMainPatch ? " (main)" : " (dependency)";
|
|
649
649
|
logger.info(` ${prefix} ${path}${label}`);
|
|
650
650
|
}
|
|
651
651
|
logger.success("Dependency resolution complete");
|
|
@@ -653,13 +653,13 @@ export async function applyPatchesCommand(featurePath, appPath, options) {
|
|
|
653
653
|
else {
|
|
654
654
|
logger.info("No dependencies found");
|
|
655
655
|
}
|
|
656
|
-
// Step 4: Apply all
|
|
657
|
-
for (const
|
|
658
|
-
await
|
|
656
|
+
// Step 4: Apply all patches in dependency order
|
|
657
|
+
for (const resolvedPatch of orderedPatches) {
|
|
658
|
+
await applySinglePatch(resolvedPatch, baseAppPath, targetDir, targetAppName);
|
|
659
659
|
}
|
|
660
|
-
// Step 4b: Copy site-container metadata from template if main
|
|
661
|
-
const
|
|
662
|
-
if (
|
|
660
|
+
// Step 4b: Copy site-container metadata from template if main patch has siteContainer
|
|
661
|
+
const mainPatch = orderedPatches[orderedPatches.length - 1];
|
|
662
|
+
if (mainPatch?.config.siteContainer) {
|
|
663
663
|
const siteContainerTemplatePath = getSiteContainerTemplatePath();
|
|
664
664
|
const targetForceAppDefault = join(targetDir, "force-app", "main", "default");
|
|
665
665
|
if (existsSync(siteContainerTemplatePath)) {
|
|
@@ -673,32 +673,32 @@ export async function applyPatchesCommand(featurePath, appPath, options) {
|
|
|
673
673
|
logger.info("\n⏭ Skipping dependency installation");
|
|
674
674
|
}
|
|
675
675
|
else {
|
|
676
|
-
// Aggregate all dependencies from all resolved
|
|
676
|
+
// Aggregate all dependencies from all resolved patches, checking for conflicts
|
|
677
677
|
const aggregatedDependencies = {};
|
|
678
678
|
const aggregatedDevDependencies = {};
|
|
679
|
-
// Collect all
|
|
680
|
-
const
|
|
679
|
+
// Collect all patches from all resolved patches
|
|
680
|
+
const allPatches = orderedPatches.flatMap((rf) => rf.config.patches);
|
|
681
681
|
// First pass: collect all regular dependencies
|
|
682
|
-
for (const
|
|
683
|
-
if (
|
|
684
|
-
for (const [name, version] of Object.entries(
|
|
682
|
+
for (const patch of allPatches) {
|
|
683
|
+
if (patch.packageJson?.dependencies) {
|
|
684
|
+
for (const [name, version] of Object.entries(patch.packageJson.dependencies)) {
|
|
685
685
|
if (aggregatedDependencies[name] && aggregatedDependencies[name] !== version) {
|
|
686
|
-
throw new Error(`Dependency version conflict for '${name}':
|
|
686
|
+
throw new Error(`Dependency version conflict for '${name}': patch requires '${version}' but another patch requires '${aggregatedDependencies[name]}'`);
|
|
687
687
|
}
|
|
688
688
|
aggregatedDependencies[name] = version;
|
|
689
689
|
}
|
|
690
690
|
}
|
|
691
691
|
}
|
|
692
692
|
// Second pass: collect dev dependencies (skip if already in dependencies)
|
|
693
|
-
for (const
|
|
694
|
-
if (
|
|
695
|
-
for (const [name, version] of Object.entries(
|
|
693
|
+
for (const patch of allPatches) {
|
|
694
|
+
if (patch.packageJson?.devDependencies) {
|
|
695
|
+
for (const [name, version] of Object.entries(patch.packageJson.devDependencies)) {
|
|
696
696
|
// Skip if already in regular dependencies
|
|
697
697
|
if (aggregatedDependencies[name]) {
|
|
698
698
|
continue;
|
|
699
699
|
}
|
|
700
700
|
if (aggregatedDevDependencies[name] && aggregatedDevDependencies[name] !== version) {
|
|
701
|
-
throw new Error(`Dev dependency version conflict for '${name}':
|
|
701
|
+
throw new Error(`Dev dependency version conflict for '${name}': patch requires '${version}' but another patch requires '${aggregatedDevDependencies[name]}'`);
|
|
702
702
|
}
|
|
703
703
|
aggregatedDevDependencies[name] = version;
|
|
704
704
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply-patches.js","sourceRoot":"","sources":["../../src/commands/apply-patches.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EACN,MAAM,EACN,UAAU,EACV,MAAM,EACN,WAAW,EACX,SAAS,EACT,YAAY,EACZ,aAAa,GACb,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAwB,MAAM,gCAAgC,CAAC;AAC3F,OAAO,EACN,SAAS,EACT,yBAAyB,EACzB,UAAU,EACV,aAAa,EACb,YAAY,EACZ,6BAA6B,GAC7B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACN,eAAe,EACf,0BAA0B,EAC1B,4BAA4B,EAC5B,cAAc,EACd,sBAAsB,EACtB,wBAAwB,GACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACN,6BAA6B,EAC7B,yBAAyB,EACzB,qBAAqB,GACrB,MAAM,wBAAwB,CAAC;AAEhC;;GAEG;AACH,SAAS,aAAa,CAAC,GAAW,EAAE,UAAkB,GAAG;IACxD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAE1D,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAEvC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACzB,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;QACjD,CAAC;aAAM,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YAC3B,iCAAiC;YACjC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;QACzC,CAAC;IACF,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,2BAA2B,GAAG,8CAA8C,CAAC;AAEnF;;;GAGG;AACH,SAAS,8BAA8B,CAAC,YAAoB,EAAE,OAAe;IAC5E,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,OAAO;IACtC,MAAM,OAAO,GAAG,WAAW,CAAC,YAAY,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACnE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACpE,6BAA6B,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;YACvE,OAAO;QACR,CAAC;IACF,CAAC;AACF,CAAC;AAED;;;GAGG;AACH,SAAS,oBAAoB,CAAC,SAAiB,EAAE,WAAmB,EAAE,aAAqB;IAC1F,MAAM,YAAY,GAAG,IAAI,CACxB,SAAS,EACT,WAAW,EACX,MAAM,EACN,SAAS,EACT,iBAAiB,EACjB,aAAa,CACb,CAAC;IACF,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,WAAW,CAAC,CAAC;IAE5D,gDAAgD;IAChD,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAW,EAAE;QACnD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IACjD,CAAC,CAAC;IAEF,4EAA4E;IAC5E,MAAM,gBAAgB,GAAG,CAAC,UAAkB,EAAE,UAAkB,EAAE,EAAE;QACnE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;YAAE,OAAO;QAEpC,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QACjE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACrD,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACrD,MAAM,kBAAkB,GAAG,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;YAEnE,oBAAoB;YACpB,IAAI,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBAC3C,SAAS;YACV,CAAC;YAED,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;gBAClC,uCAAuC;gBACvC,MAAM,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC1D,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9C,MAAM,CAAC,IAAI,CAAC,YAAY,kBAAkB,GAAG,MAAM,EAAE,CAAC,CAAC;YACxD,CAAC;iBAAM,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;gBAChC,yBAAyB;gBACzB,gBAAgB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;YACpD,CAAC;QACF,CAAC;IACF,CAAC,CAAC;IAEF,oDAAoD;IACpD,MAAM,SAAS,GAAG,CAAC,UAAkB,EAAE,UAAkB,EAAE,EAAE;QAC5D,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;YAAE,OAAO;QAEpC,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QACjE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACrD,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACrD,MAAM,kBAAkB,GAAG,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;YAEnE,oBAAoB;YACpB,IAAI,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBAC3C,SAAS;YACV,CAAC;YAED,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;gBACzB,oCAAoC;gBACpC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;oBAClC,SAAS,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjD,CAAC;gBACD,yBAAyB;gBACzB,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;YAC7C,CAAC;iBAAM,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;gBAC3B,gDAAgD;gBAChD,IAAI,UAAU,GAAG,KAAK,CAAC;gBACvB,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;oBAClC,UAAU,GAAG,IAAI,CAAC;gBACnB,CAAC;qBAAM,CAAC;oBACP,wBAAwB;oBACxB,MAAM,aAAa,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;oBACpD,MAAM,aAAa,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;oBACpD,UAAU,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;gBACnD,CAAC;gBAED,IAAI,UAAU,EAAE,CAAC;oBAChB,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;oBACzC,MAAM,CAAC,IAAI,CAAC,WAAW,kBAAkB,EAAE,CAAC,CAAC;gBAC9C,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC,CAAC;IAEF,MAAM,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;IAC/D,gBAAgB,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;IACjD,SAAS,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;IAC1C,8BAA8B,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IAC5D,MAAM,CAAC,OAAO,CAAC,iCAAiC,CAAC,CAAC;AACnD,CAAC;AAED,MAAM,aAAa,GAAG,YAAY,CAAC;AACnC,MAAM,cAAc,GAAG,aAAa,CAAC;AACrC,MAAM,cAAc,GAAG,aAAa,CAAC;AACrC,MAAM,aAAa,GAAG,YAAY,CAAC;AAEnC;;;;;;;;;GASG;AACH,SAAS,iBAAiB,CAAC,YAAoB;IAC9C,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,eAAe,GAAG,KAAK,CAAC;IAE5B,MAAM,gBAAgB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3C,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YACpC,eAAe,GAAG,IAAI,CAAC;YACvB,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC5D,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,kBAAkB,CAAC,YAAoB;IAC/C,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAE7B,MAAM,gBAAgB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3C,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;YACrC,gBAAgB,GAAG,IAAI,CAAC;YACxB,OAAO,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,OAAO,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7D,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,kBAAkB,CAAC,YAAoB;IAC/C,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAE7B,MAAM,gBAAgB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3C,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;YACrC,gBAAgB,GAAG,IAAI,CAAC;YACxB,OAAO,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,OAAO,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7D,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,iBAAiB,CAAC,YAAoB;IAC9C,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,eAAe,GAAG,KAAK,CAAC;IAE5B,MAAM,gBAAgB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3C,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YACpC,eAAe,GAAG,IAAI,CAAC;YACvB,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC5D,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,kBAAkB,CAChC,eAAgC,EAChC,WAAmB,EACnB,SAAiB,EACjB,aAAqB;IAErB,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,eAAe,CAAC;IAC5D,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAE5D,4CAA4C;IAC5C,MAAM,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE1C,+CAA+C;IAC/C,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAE9E,6DAA6D;IAC7D,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACd,uBAAuB,WAAW,qCAAqC,WAAW,GAAG,CACrF,CAAC;IACH,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,eAAe,WAAW,EAAE,CAAC,CAAC;IAC7C,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IACpC,MAAM,eAAe,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;IAEpD,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,YAAY,WAAW,qBAAqB,WAAW,YAAY,CAAC,CAAC;IACtF,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,SAAS,eAAe,CAAC,MAAM,UAAU,CAAC,CAAC;IAEvD,yEAAyE;IACzE,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACnC,MAAM,eAAe,GAAG,IAAI,GAAG,EAG5B,CAAC;IACJ,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,KAAK,MAAM,YAAY,IAAI,eAAe,EAAE,CAAC;QAC5C,iDAAiD;QACjD,MAAM,UAAU,GAAG,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;QAEtE,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACvD,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACzD,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACzD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAEvD,IAAI,cAAsB,CAAC;QAC3B,IAAI,IAA4D,CAAC;QAEjE,IAAI,gBAAgB,EAAE,CAAC;YACtB,cAAc,GAAG,gBAAgB,CAAC;YAClC,IAAI,GAAG,QAAQ,CAAC;YAChB,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACpC,CAAC;aAAM,IAAI,iBAAiB,EAAE,CAAC;YAC9B,cAAc,GAAG,iBAAiB,CAAC;YACnC,IAAI,GAAG,SAAS,CAAC;YACjB,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACtC,CAAC;aAAM,IAAI,iBAAiB,EAAE,CAAC;YAC9B,cAAc,GAAG,iBAAiB,CAAC;YACnC,IAAI,GAAG,SAAS,CAAC;YACjB,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACtC,CAAC;aAAM,IAAI,gBAAgB,EAAE,CAAC;YAC7B,cAAc,GAAG,gBAAgB,CAAC;YAClC,IAAI,GAAG,QAAQ,CAAC;YAChB,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;YACP,cAAc,GAAG,UAAU,CAAC;YAC5B,IAAI,GAAG,QAAQ,CAAC;QACjB,CAAC;QAED,sBAAsB;QACtB,IAAI,eAAe,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;YACzC,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,cAAc,CAAE,CAAC;YACtD,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC5C,MAAM,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;YACpE,MAAM,CAAC,IAAI,CAAC,QAAQ,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAC;YACxD,MAAM,CAAC,IAAI,CAAC,QAAQ,YAAY,KAAK,IAAI,GAAG,CAAC,CAAC;YAC9C,MAAM,CAAC,IAAI,CAAC,oBAAoB,cAAc,IAAI,CAAC,CAAC;YACpD,MAAM,CAAC,OAAO,CAAC,yDAAyD,CAAC,CAAC;YAC1E,MAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;YAC/E,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACnD,CAAC;QAED,eAAe,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,gDAAgD;IAChD,yFAAyF;IACzF,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACtC,4CAA4C;QAC5C,MAAM,UAAU,GAAG,wBAAwB,CAAC,UAAU,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;QACpF,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAEnD,gGAAgG;QAChG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;YACjC,+EAA+E;YAC/E,MAAM,cAAc,GAAG,sBAAsB,CAAC,UAAU,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;YACpF,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;YAEvD,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC/B,MAAM,CAAC,KAAK,CAAC,8DAA8D,CAAC,CAAC;gBAC7E,MAAM,CAAC,IAAI,CAAC,6BAA6B,UAAU,EAAE,CAAC,CAAC;gBACvD,MAAM,CAAC,IAAI,CAAC,wBAAwB,cAAc,EAAE,CAAC,CAAC;gBACtD,MAAM,CAAC,IAAI,CAAC,0BAA0B,YAAY,EAAE,CAAC,CAAC;gBACtD,MAAM,CAAC,OAAO,CAAC,4DAA4D,CAAC,CAAC;gBAC7E,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;YAC9D,CAAC;QACF,CAAC;IACF,CAAC;IAED,+DAA+D;IAC/D,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACxC,4CAA4C;QAC5C,MAAM,UAAU,GAAG,wBAAwB,CAAC,WAAW,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;QACrF,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAEnD,mGAAmG;QACnG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;YACjC,qEAAqE;YACrE,MAAM,cAAc,GAAG,sBAAsB,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;YACrF,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;YACvD,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC/B,MAAM,CAAC,KAAK,CAAC,+DAA+D,CAAC,CAAC;gBAC9E,MAAM,CAAC,IAAI,CAAC,gCAAgC,WAAW,EAAE,CAAC,CAAC;gBAC3D,MAAM,CAAC,IAAI,CAAC,kBAAkB,cAAc,EAAE,CAAC,CAAC;gBAChD,MAAM,CAAC,IAAI,CAAC,kCAAkC,YAAY,EAAE,CAAC,CAAC;gBAC9D,MAAM,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;gBAC5D,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAC/D,CAAC;QACF,CAAC;IACF,CAAC;IAED,8DAA8D;IAC9D,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACxC,yEAAyE;QACzE,MAAM,cAAc,GAAG,sBAAsB,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QACrF,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QACvD,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAC/B,MAAM,CAAC,KAAK,CAAC,kEAAkE,CAAC,CAAC;YACjF,MAAM,CAAC,IAAI,CAAC,+BAA+B,WAAW,EAAE,CAAC,CAAC;YAC1D,MAAM,CAAC,IAAI,CAAC,kBAAkB,cAAc,EAAE,CAAC,CAAC;YAChD,MAAM,CAAC,IAAI,CAAC,kCAAkC,YAAY,EAAE,CAAC,CAAC;YAC9D,MAAM,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAC/D,CAAC;IACF,CAAC;IAED,6DAA6D;IAC7D,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACtC,wEAAwE;QACxE,MAAM,cAAc,GAAG,sBAAsB,CAAC,UAAU,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QACpF,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QACvD,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAC/B,MAAM,CAAC,KAAK,CAAC,iEAAiE,CAAC,CAAC;YAChF,MAAM,CAAC,IAAI,CAAC,8BAA8B,UAAU,EAAE,CAAC,CAAC;YACxD,MAAM,CAAC,IAAI,CAAC,kBAAkB,cAAc,EAAE,CAAC,CAAC;YAChD,MAAM,CAAC,IAAI,CAAC,kCAAkC,YAAY,EAAE,CAAC,CAAC;YAC9D,MAAM,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC9D,CAAC;IACF,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAElC,6BAA6B;IAC7B,KAAK,MAAM,YAAY,IAAI,eAAe,EAAE,CAAC;QAC5C,iDAAiD;QACjD,MAAM,UAAU,GAAG,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;QAEtE,mEAAmE;QACnE,MAAM,cAAc,GAAG,sBAAsB,CAAC,UAAU,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QACpF,gEAAgE;QAChE,MAAM,UAAU,GAAG,wBAAwB,CAAC,UAAU,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;QAEpF,uCAAuC;QACvC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACvD,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACzD,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACzD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAEvD,IAAI,gBAAgB,EAAE,CAAC;YACtB,gEAAgE;YAChE,MAAM,gBAAgB,GAAG,wBAAwB,CAChD,gBAAgB,EAChB,WAAW,EACX,aAAa,CACb,CAAC;YACF,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;YACzD,MAAM,UAAU,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;QACpD,CAAC;aAAM,IAAI,iBAAiB,EAAE,CAAC;YAC9B,8EAA8E;YAC9E,MAAM,iBAAiB,GAAG,wBAAwB,CACjD,iBAAiB,EACjB,WAAW,EACX,aAAa,CACb,CAAC;YACF,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;YAC1D,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;gBACjC,wEAAwE;gBACxE,MAAM,qBAAqB,GAAG,sBAAsB,CACnD,iBAAiB,EACjB,WAAW,EACX,WAAW,CACX,CAAC;gBACF,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,qBAAqB,CAAC,CAAC;gBAC9D,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC9B,MAAM,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;oBAC9C,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;wBAChC,SAAS,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC/C,CAAC;oBACD,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;oBACrC,MAAM,CAAC,IAAI,CAAC,UAAU,iBAAiB,4BAA4B,CAAC,CAAC;gBACtE,CAAC;qBAAM,CAAC;oBACP,MAAM,CAAC,IAAI,CAAC,WAAW,iBAAiB,yBAAyB,CAAC,CAAC;gBACpE,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,MAAM,CAAC,IAAI,CAAC,WAAW,iBAAiB,6BAA6B,CAAC,CAAC;YACxE,CAAC;QACF,CAAC;aAAM,IAAI,iBAAiB,EAAE,CAAC;YAC9B,gEAAgE;YAChE,MAAM,eAAe,GAAG,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;YACzD,MAAM,iBAAiB,GAAG,wBAAwB,CACjD,iBAAiB,EACjB,WAAW,EACX,aAAa,CACb,CAAC;YACF,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;YAE1D,yDAAyD;YACzD,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;gBACjC,MAAM,qBAAqB,GAAG,sBAAsB,CACnD,iBAAiB,EACjB,WAAW,EACX,WAAW,CACX,CAAC;gBACF,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,qBAAqB,CAAC,CAAC;gBAC9D,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC9B,MAAM,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;oBAC9C,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;wBAChC,SAAS,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC/C,CAAC;oBACD,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;gBACtC,CAAC;YACF,CAAC;YAED,MAAM,aAAa,CAAC,eAAe,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAC;QACzE,CAAC;aAAM,IAAI,gBAAgB,EAAE,CAAC;YAC7B,gEAAgE;YAChE,MAAM,eAAe,GAAG,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;YACzD,MAAM,gBAAgB,GAAG,wBAAwB,CAChD,gBAAgB,EAChB,WAAW,EACX,aAAa,CACb,CAAC;YACF,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;YAEzD,yDAAyD;YACzD,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;gBACjC,MAAM,oBAAoB,GAAG,sBAAsB,CAClD,gBAAgB,EAChB,WAAW,EACX,WAAW,CACX,CAAC;gBACF,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;gBAC7D,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC9B,MAAM,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;oBAC9C,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;wBAChC,SAAS,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC/C,CAAC;oBACD,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;gBACtC,CAAC;YACF,CAAC;YAED,MAAM,YAAY,CAAC,eAAe,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;QACvE,CAAC;aAAM,CAAC;YACP,2CAA2C;YAC3C,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;YACvD,oEAAoE;YACpE,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAEnD,gEAAgE;YAChE,0EAA0E;YAC1E,MAAM,WAAW,GAAG,UAAU,KAAK,aAAa,CAAC;YAEjD,uCAAuC;YACvC,qFAAqF;YACrF,qEAAqE;YACrE,0FAA0F;YAC1F,IAAI,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;YACrD,IAAI,YAAgC,CAAC;YAErC,IAAI,WAAW,IAAI,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC/C,4CAA4C;gBAC5C,YAAY,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,eAAe,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACnF,MAAM,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;gBACrC,YAAY,GAAG,YAAY,CAAC;YAC7B,CAAC;YAED,IAAI,CAAC;gBACJ,MAAM,SAAS,CACd,aAAa,EACb,YAAY,EACZ,cAAc,EACd,UAAU,EACV,WAAW,EACX,aAAa,CACb,CAAC;YACH,CAAC;oBAAS,CAAC;gBACV,qBAAqB;gBACrB,IAAI,YAAY,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC9C,MAAM,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBACvC,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC;AACF,CAAC;AAED;;;;;;GAMG;AACH,SAAS,4BAA4B,CAAC,SAAiB;IACtD,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IACnE,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;IAE/D,yFAAyF;IACzF,MAAM,gBAAgB,GAAG,0BAA0B,EAAE,CAAC;IACtD,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;IAC7D,IAAI,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAClC,MAAM,kBAAkB,GAAG,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QACxD,MAAM,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAClE,MAAM,CAAC,OAAO,CAAC,iCAAiC,CAAC,CAAC;IACnD,CAAC;IAED,kDAAkD;IAClD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9B,OAAO;IACR,CAAC;IAED,MAAM,cAAc,GAAG,WAAW,CAAC,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACzE,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,YAAY,GAAG,CAAC,CAAC;IAErB,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;QACrC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YAAE,SAAS;QAEpC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC;QAChC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAElD,0FAA0F;QAC1F,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YACjC,MAAM,SAAS,GAAG,WAAW,CAAC,eAAe,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YACxE,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;gBAC/B,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;oBAClD,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;oBACzD,MAAM,gBAAgB,GAAG,GAAG,WAAW,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;oBACxD,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;oBACjE,sCAAsC;oBACtC,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;wBACpC,SAAS,CAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;oBACnD,CAAC;oBACD,MAAM,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;oBACvC,MAAM,CAAC,IAAI,CAAC,yBAAyB,gBAAgB,EAAE,CAAC,CAAC;oBACzD,WAAW,EAAE,CAAC;gBACf,CAAC;YACF,CAAC;QACF,CAAC;QAED,4FAA4F;QAC5F,MAAM,gBAAgB,GAAG,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACpD,IAAI,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAClC,MAAM,YAAY,GAAG,WAAW,CAAC,gBAAgB,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5E,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;gBAClC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;oBACzB,qEAAqE;oBACrE,MAAM,iBAAiB,GAAG,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC5D,IAAI,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;wBACnC,MAAM,CAAC,IAAI,CAAC,kBAAkB,KAAK,CAAC,IAAI,uCAAuC,CAAC,CAAC;wBACjF,SAAS;oBACV,CAAC;oBAED,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC3D,MAAM,iBAAiB,GAAG,GAAG,WAAW,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;oBACzD,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;oBACjE,oCAAoC;oBACpC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;wBAClC,SAAS,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;oBACjD,CAAC;oBACD,8BAA8B;oBAC9B,MAAM,CAAC,eAAe,EAAE,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;oBAE9D,kEAAkE;oBAClE,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;oBACtD,IAAI,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;wBAC7B,IAAI,OAAO,GAAG,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;wBACjD,IAAI,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;4BAC/B,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,EAAE,KAAK,iBAAiB,EAAE,CAAC,CAAC;wBACxE,CAAC;6BAAM,CAAC;4BACP,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,iBAAiB,EAAE,CAAC,CAAC;wBAChE,CAAC;wBACD,aAAa,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;oBAC9C,CAAC;oBAED,MAAM,CAAC,IAAI,CAAC,iBAAiB,iBAAiB,GAAG,CAAC,CAAC;oBACnD,YAAY,EAAE,CAAC;gBAChB,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC;IAED,IAAI,WAAW,GAAG,CAAC,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;QACzC,MAAM,CAAC,OAAO,CAAC,UAAU,WAAW,gBAAgB,YAAY,yBAAyB,CAAC,CAAC;IAC5F,CAAC;AACF,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACxC,WAAmB,EACnB,OAAe,EACf,OAAoF;IAEpF,IAAI,CAAC;QACJ,MAAM,CAAC,OAAO,CAAC,qBAAqB,WAAW,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;QAE9E,0BAA0B;QAC1B,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACnC,6BAA6B,CAAC,WAAW,CAAC,CAAC,CAAC,uBAAuB;QACnE,MAAM,WAAW,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAC;QACvD,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAEpC,mCAAmC;QACnC,0EAA0E;QAC1E,MAAM,eAAe,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC9C,MAAM,aAAa,GAAW,eAAe,CAAC;QAE9C,iGAAiG;QACjG,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC;YAC1D,CAAC,CAAC,OAAO,CAAC,aAAa;YACvB,CAAC,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;QAElD,yGAAyG;QACzG,MAAM,YAAY,GAAG,IAAI,CACxB,iBAAiB,EACjB,WAAW,EACX,MAAM,EACN,SAAS,EACT,iBAAiB,EACjB,aAAa,CACb,CAAC;QAEF,IAAI,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACnC,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,2DAA2D;gBAC3D,oBAAoB,CAAC,iBAAiB,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;YACrE,CAAC;QACF,CAAC;aAAM,CAAC;YACP,MAAM,CAAC,IAAI,CAAC,6BAA6B,OAAO,CAAC,aAAa,KAAK,CAAC,CAAC;YACrE,SAAS,CAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAClD,MAAM,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;YAE3C,+FAA+F;YAC/F,MAAM,gBAAgB,GAAG,0BAA0B,EAAE,CAAC;YACtD,IAAI,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBAClC,MAAM,CAAC,IAAI,CAAC,yCAAyC,OAAO,CAAC,aAAa,KAAK,CAAC,CAAC;gBACjF,MAAM,CAAC,gBAAgB,EAAE,iBAAiB,EAAE;oBAC3C,SAAS,EAAE,IAAI;oBACf,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC;iBAC9C,CAAC,CAAC;gBACH,MAAM,CAAC,OAAO,CAAC,mCAAmC,CAAC,CAAC;YACrD,CAAC;YAED,0DAA0D;YAC1D,MAAM,CAAC,IAAI,CAAC,uBAAuB,OAAO,CAAC,aAAa,KAAK,CAAC,CAAC;YAC/D,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,WAAW,CAAC,CAAC;YAC5D,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACtD,MAAM,CAAC,gBAAgB,EAAE,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5D,8BAA8B,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;YAC5D,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACnC,CAAC;QAED,MAAM,SAAS,GAAG,iBAAiB,CAAC;QAEpC,+BAA+B;QAC/B,MAAM,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC3C,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAEnE,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,CAAC,IAAI,CAAC,8BAA8B,eAAe,CAAC,MAAM,aAAa,CAAC,CAAC;YAC/E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACjD,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;gBACjD,MAAM,aAAa,GAAG,CAAC,KAAK,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC;gBACvD,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC3C,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC;gBAC1D,MAAM,CAAC,IAAI,CAAC,KAAK,MAAM,IAAI,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC;YAC5C,CAAC;YACD,MAAM,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACP,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACtC,CAAC;QAED,iDAAiD;QACjD,KAAK,MAAM,eAAe,IAAI,eAAe,EAAE,CAAC;YAC/C,MAAM,kBAAkB,CAAC,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;QAClF,CAAC;QAED,wFAAwF;QACxF,MAAM,WAAW,GAAG,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAChE,IAAI,WAAW,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC;YACvC,MAAM,yBAAyB,GAAG,4BAA4B,EAAE,CAAC;YACjE,MAAM,qBAAqB,GAAG,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;YAC9E,IAAI,UAAU,CAAC,yBAAyB,CAAC,EAAE,CAAC;gBAC3C,MAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;gBAC/E,yBAAyB,CAAC,yBAAyB,EAAE,qBAAqB,EAAE,aAAa,CAAC,CAAC;gBAC3F,MAAM,CAAC,OAAO,CAAC,iCAAiC,CAAC,CAAC;YACnD,CAAC;QACF,CAAC;QAED,sDAAsD;QACtD,IAAI,OAAO,CAAC,qBAAqB,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;QACtD,CAAC;aAAM,CAAC;YACP,gFAAgF;YAChF,MAAM,sBAAsB,GAA2B,EAAE,CAAC;YAC1D,MAAM,yBAAyB,GAA2B,EAAE,CAAC;YAE7D,kDAAkD;YAClD,MAAM,WAAW,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAExE,+CAA+C;YAC/C,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE,CAAC;gBACnC,IAAI,OAAO,CAAC,WAAW,EAAE,YAAY,EAAE,CAAC;oBACvC,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;wBAChF,IAAI,sBAAsB,CAAC,IAAI,CAAC,IAAI,sBAAsB,CAAC,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC;4BAC9E,MAAM,IAAI,KAAK,CACd,oCAAoC,IAAI,wBAAwB,OAAO,mCAAmC,sBAAsB,CAAC,IAAI,CAAC,GAAG,CACzI,CAAC;wBACH,CAAC;wBACD,sBAAsB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;oBACxC,CAAC;gBACF,CAAC;YACF,CAAC;YAED,0EAA0E;YAC1E,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE,CAAC;gBACnC,IAAI,OAAO,CAAC,WAAW,EAAE,eAAe,EAAE,CAAC;oBAC1C,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,EAAE,CAAC;wBACnF,0CAA0C;wBAC1C,IAAI,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC;4BAClC,SAAS;wBACV,CAAC;wBAED,IAAI,yBAAyB,CAAC,IAAI,CAAC,IAAI,yBAAyB,CAAC,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC;4BACpF,MAAM,IAAI,KAAK,CACd,wCAAwC,IAAI,wBAAwB,OAAO,mCAAmC,yBAAyB,CAAC,IAAI,CAAC,GAAG,CAChJ,CAAC;wBACH,CAAC;wBACD,yBAAyB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;oBAC3C,CAAC;gBACF,CAAC;YACF,CAAC;YAED,MAAM,kBAAkB,GACvB,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,MAAM,GAAG,CAAC;gBAC9C,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YAEnD,IAAI,kBAAkB,EAAE,CAAC;gBACxB,MAAM,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;gBAC5C,MAAM,gBAAgB,CACrB,SAAS,EACT;oBACC,YAAY,EACX,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,SAAS;oBACpF,eAAe,EACd,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,MAAM,GAAG,CAAC;wBAChD,CAAC,CAAC,yBAAyB;wBAC3B,CAAC,CAAC,SAAS;iBACb,EACD,YAAY,CACZ,CAAC;YACH,CAAC;iBAAM,CAAC;gBACP,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;YAC/C,CAAC;QACF,CAAC;QAED,4DAA4D;QAC5D,MAAM,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;QACnD,4BAA4B,CAAC,SAAS,CAAC,CAAC;QAExC,0BAA0B;QAC1B,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,YAAY,SAAS,EAAE,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,uFAAuF;QACvF,MAAM,YAAY,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG;YACnB,gCAAgC;YAChC,2CAA2C;YAC3C,4CAA4C;YAC5C,4CAA4C;YAC5C,2CAA2C;YAC3C,wCAAwC;SACxC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAEzB,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,MAAM,CAAC,KAAK,CAAC,4BAA4B,YAAY,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,GAAG,CAAC;IACX,CAAC;AACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"apply-patches.js","sourceRoot":"","sources":["../../src/commands/apply-patches.ts"],"names":[],"mappings":"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"}
|
|
@@ -132,7 +132,7 @@ export async function newAppOrFeatureCommand(appOrFeatureName, appOrFeatureType)
|
|
|
132
132
|
logger.info("\nNext steps:");
|
|
133
133
|
logger.info(` 1. cd packages/template/${dir}/${fullFeatureName}`);
|
|
134
134
|
logger.info(` 2. Customize template files in src/force-app/main/default/webapplications/${rawName}/ directory`);
|
|
135
|
-
logger.info(` 3. Update
|
|
135
|
+
logger.info(` 3. Update patches.ts with ${appOrFeatureType} configuration`);
|
|
136
136
|
logger.info(` 4. Test with: npm run apply-patches -- packages/template/${dir}/${fullFeatureName} packages/template/base-app/base-react-app test-app`);
|
|
137
137
|
}
|
|
138
138
|
catch (err) {
|
|
@@ -195,7 +195,7 @@ function validateBaseAppOrFeature(appOrFeatureType) {
|
|
|
195
195
|
// Check critical files exist
|
|
196
196
|
const requiredFiles = [
|
|
197
197
|
"package.json",
|
|
198
|
-
"
|
|
198
|
+
"patches.ts",
|
|
199
199
|
"tsconfig.app.json",
|
|
200
200
|
"tsconfig.json",
|
|
201
201
|
"tsconfig.node.json",
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import { join, relative, normalize } from "path";
|
|
7
7
|
import { watch } from "turbowatch";
|
|
8
8
|
import { applyPatchesCommand } from "./apply-patches.js";
|
|
9
|
-
import {
|
|
9
|
+
import { loadPatch } from "../core/patch-loader.js";
|
|
10
10
|
import * as logger from "../utils/logger.js";
|
|
11
11
|
import { validateAndResolveFeaturePath, validateAndResolveAppPath } from "../utils/validation.js";
|
|
12
12
|
export async function watchPatchesCommand(featurePath, appPath, targetDirName) {
|
|
@@ -27,7 +27,7 @@ export async function watchPatchesCommand(featurePath, appPath, targetDirName) {
|
|
|
27
27
|
});
|
|
28
28
|
logger.success("Initial feature applied successfully\n");
|
|
29
29
|
// Step 3: Load feature config to get template directory
|
|
30
|
-
const { templateDir } = await
|
|
30
|
+
const { templateDir } = await loadPatch(featureDir);
|
|
31
31
|
const watchPath = join(featureDir, templateDir);
|
|
32
32
|
logger.info(`👁 Watching ${watchPath} for changes...`);
|
|
33
33
|
logger.info(" Press Ctrl+C to stop watching\n");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watch-patches.js","sourceRoot":"","sources":["../../src/commands/watch-patches.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjD,OAAO,EAAE,KAAK,EAAoB,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"watch-patches.js","sourceRoot":"","sources":["../../src/commands/watch-patches.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type PatchConfig } from "./patch-loader.js";
|
|
2
2
|
/**
|
|
3
|
-
* Represents a resolved
|
|
3
|
+
* Represents a resolved patch with its configuration
|
|
4
4
|
*/
|
|
5
|
-
export interface
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
config:
|
|
5
|
+
export interface ResolvedPatch {
|
|
6
|
+
patchPath: string;
|
|
7
|
+
patchDir: string;
|
|
8
|
+
config: PatchConfig;
|
|
9
9
|
}
|
|
10
10
|
/**
|
|
11
11
|
* Result of dependency resolution
|
|
12
12
|
*/
|
|
13
13
|
export interface DependencyResolutionResult {
|
|
14
|
-
|
|
14
|
+
orderedPatches: ResolvedPatch[];
|
|
15
15
|
dependencyGraph: Map<string, string[]>;
|
|
16
16
|
}
|
|
17
17
|
/**
|
|
@@ -28,13 +28,13 @@ export declare class CircularDependencyError extends DependencyResolutionError {
|
|
|
28
28
|
constructor(cycle: string[]);
|
|
29
29
|
}
|
|
30
30
|
/**
|
|
31
|
-
* Resolve all dependencies for a
|
|
32
|
-
* Returns
|
|
31
|
+
* Resolve all dependencies for a patch recursively
|
|
32
|
+
* Returns patches in dependency order (dependencies first, main patch last)
|
|
33
33
|
*
|
|
34
|
-
* @param
|
|
35
|
-
* @returns Resolution result with ordered
|
|
34
|
+
* @param patchPath - Path to the main patch
|
|
35
|
+
* @returns Resolution result with ordered patches and dependency graph
|
|
36
36
|
* @throws CircularDependencyError if circular dependencies are detected
|
|
37
37
|
* @throws DependencyResolutionError if a dependency cannot be loaded
|
|
38
38
|
*/
|
|
39
|
-
export declare function resolveDependencies(
|
|
39
|
+
export declare function resolveDependencies(patchPath: string): Promise<DependencyResolutionResult>;
|
|
40
40
|
//# sourceMappingURL=dependency-resolver.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency-resolver.d.ts","sourceRoot":"","sources":["../../src/core/dependency-resolver.ts"],"names":[],"mappings":"AAMA,OAAO,
|
|
1
|
+
{"version":3,"file":"dependency-resolver.d.ts","sourceRoot":"","sources":["../../src/core/dependency-resolver.ts"],"names":[],"mappings":"AAMA,OAAO,EAAa,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIhE;;GAEG;AACH,MAAM,WAAW,aAAa;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IAC1C,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACvC;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,KAAK;gBACvC,OAAO,EAAE,MAAM;CAI3B;AAED;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,yBAAyB;IAClD,KAAK,EAAE,MAAM,EAAE;gBAAf,KAAK,EAAE,MAAM,EAAE;CAOlC;AAyFD;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC,CA+BhG"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* For full license text, see the LICENSE.txt file
|
|
5
5
|
*/
|
|
6
6
|
import { join, isAbsolute } from "path";
|
|
7
|
-
import {
|
|
7
|
+
import { loadPatch } from "./patch-loader.js";
|
|
8
8
|
import { getMonorepoRoot } from "../utils/paths.js";
|
|
9
9
|
import { validateAndResolveFeaturePath } from "../utils/validation.js";
|
|
10
10
|
/**
|
|
@@ -29,47 +29,47 @@ export class CircularDependencyError extends DependencyResolutionError {
|
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
/**
|
|
32
|
-
* Normalize a
|
|
32
|
+
* Normalize a patch path to an absolute path for consistent comparison
|
|
33
33
|
*
|
|
34
|
-
* @param
|
|
35
|
-
* @returns Absolute path to the
|
|
34
|
+
* @param patchPath - Relative or absolute patch path
|
|
35
|
+
* @returns Absolute path to the patch
|
|
36
36
|
*/
|
|
37
|
-
function normalizePath(
|
|
37
|
+
function normalizePath(patchPath) {
|
|
38
38
|
// If already absolute, return as-is
|
|
39
|
-
if (isAbsolute(
|
|
40
|
-
return
|
|
39
|
+
if (isAbsolute(patchPath)) {
|
|
40
|
+
return patchPath;
|
|
41
41
|
}
|
|
42
42
|
// If relative, resolve from monorepo root
|
|
43
|
-
return join(getMonorepoRoot(),
|
|
43
|
+
return join(getMonorepoRoot(), patchPath);
|
|
44
44
|
}
|
|
45
45
|
/**
|
|
46
46
|
* Recursively resolve dependencies using depth-first search with post-order traversal
|
|
47
47
|
*
|
|
48
|
-
* @param
|
|
49
|
-
* @param visited - Set of
|
|
50
|
-
* @param resolved - Set of
|
|
51
|
-
* @param result - Accumulator for ordered
|
|
52
|
-
* @param dependencyGraph - Map of
|
|
48
|
+
* @param patchPath - Path to the patch to resolve
|
|
49
|
+
* @param visited - Set of patches currently being processed (for cycle detection)
|
|
50
|
+
* @param resolved - Set of patches that have been fully processed
|
|
51
|
+
* @param result - Accumulator for ordered patches
|
|
52
|
+
* @param dependencyGraph - Map of patch paths to their dependencies
|
|
53
53
|
* @param dependencyChain - Current chain of dependencies (for error messages)
|
|
54
54
|
*/
|
|
55
|
-
async function resolveDependenciesRecursive(
|
|
56
|
-
const normalizedPath = normalizePath(
|
|
55
|
+
async function resolveDependenciesRecursive(patchPath, visited, resolved, result, dependencyGraph, dependencyChain) {
|
|
56
|
+
const normalizedPath = normalizePath(patchPath);
|
|
57
57
|
// Skip if already resolved (handles diamond dependencies)
|
|
58
58
|
if (resolved.has(normalizedPath)) {
|
|
59
59
|
return;
|
|
60
60
|
}
|
|
61
61
|
// Circular dependency detection
|
|
62
62
|
if (visited.has(normalizedPath)) {
|
|
63
|
-
const cycle = [...dependencyChain,
|
|
63
|
+
const cycle = [...dependencyChain, patchPath];
|
|
64
64
|
throw new CircularDependencyError(cycle);
|
|
65
65
|
}
|
|
66
66
|
// Mark as visiting
|
|
67
67
|
visited.add(normalizedPath);
|
|
68
|
-
dependencyChain.push(
|
|
68
|
+
dependencyChain.push(patchPath);
|
|
69
69
|
try {
|
|
70
|
-
// Validate and load
|
|
71
|
-
const
|
|
72
|
-
const config = await
|
|
70
|
+
// Validate and load patch
|
|
71
|
+
const patchDir = validateAndResolveFeaturePath(patchPath);
|
|
72
|
+
const config = await loadPatch(patchDir);
|
|
73
73
|
// Store in dependency graph for debugging
|
|
74
74
|
dependencyGraph.set(normalizedPath, config.dependencies);
|
|
75
75
|
// Recursively resolve dependencies (depth-first)
|
|
@@ -78,8 +78,8 @@ async function resolveDependenciesRecursive(featurePath, visited, resolved, resu
|
|
|
78
78
|
}
|
|
79
79
|
// Post-order: add after all dependencies are resolved
|
|
80
80
|
result.push({
|
|
81
|
-
|
|
82
|
-
|
|
81
|
+
patchPath,
|
|
82
|
+
patchDir,
|
|
83
83
|
config,
|
|
84
84
|
});
|
|
85
85
|
// Mark as resolved
|
|
@@ -92,24 +92,24 @@ async function resolveDependenciesRecursive(featurePath, visited, resolved, resu
|
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
94
|
/**
|
|
95
|
-
* Resolve all dependencies for a
|
|
96
|
-
* Returns
|
|
95
|
+
* Resolve all dependencies for a patch recursively
|
|
96
|
+
* Returns patches in dependency order (dependencies first, main patch last)
|
|
97
97
|
*
|
|
98
|
-
* @param
|
|
99
|
-
* @returns Resolution result with ordered
|
|
98
|
+
* @param patchPath - Path to the main patch
|
|
99
|
+
* @returns Resolution result with ordered patches and dependency graph
|
|
100
100
|
* @throws CircularDependencyError if circular dependencies are detected
|
|
101
101
|
* @throws DependencyResolutionError if a dependency cannot be loaded
|
|
102
102
|
*/
|
|
103
|
-
export async function resolveDependencies(
|
|
103
|
+
export async function resolveDependencies(patchPath) {
|
|
104
104
|
const visited = new Set();
|
|
105
105
|
const resolved = new Set();
|
|
106
106
|
const result = [];
|
|
107
107
|
const dependencyGraph = new Map();
|
|
108
108
|
const dependencyChain = [];
|
|
109
109
|
try {
|
|
110
|
-
await resolveDependenciesRecursive(
|
|
110
|
+
await resolveDependenciesRecursive(patchPath, visited, resolved, result, dependencyGraph, dependencyChain);
|
|
111
111
|
return {
|
|
112
|
-
|
|
112
|
+
orderedPatches: result,
|
|
113
113
|
dependencyGraph,
|
|
114
114
|
};
|
|
115
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency-resolver.js","sourceRoot":"","sources":["../../src/core/dependency-resolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AACxC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dependency-resolver.js","sourceRoot":"","sources":["../../src/core/dependency-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -294,7 +294,7 @@ export async function deleteFile(targetFilePath, relativeTargetPath) {
|
|
|
294
294
|
*/
|
|
295
295
|
export async function prependToFile(featureFilePath, targetFilePath, relativeTargetPath) {
|
|
296
296
|
if (!existsSync(featureFilePath)) {
|
|
297
|
-
throw new FileOperationError(`
|
|
297
|
+
throw new FileOperationError(`Patch file not found: ${featureFilePath}`);
|
|
298
298
|
}
|
|
299
299
|
if (!existsSync(targetFilePath)) {
|
|
300
300
|
throw new FileOperationError(`Target file not found: ${targetFilePath}`);
|
|
@@ -325,7 +325,7 @@ export async function prependToFile(featureFilePath, targetFilePath, relativeTar
|
|
|
325
325
|
*/
|
|
326
326
|
export async function appendToFile(featureFilePath, targetFilePath, relativeTargetPath) {
|
|
327
327
|
if (!existsSync(featureFilePath)) {
|
|
328
|
-
throw new FileOperationError(`
|
|
328
|
+
throw new FileOperationError(`Patch file not found: ${featureFilePath}`);
|
|
329
329
|
}
|
|
330
330
|
if (!existsSync(targetFilePath)) {
|
|
331
331
|
throw new FileOperationError(`Target file not found: ${targetFilePath}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-operations.js","sourceRoot":"","sources":["../../src/core/file-operations.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"file-operations.js","sourceRoot":"","sources":["../../src/core/file-operations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare class
|
|
1
|
+
import type { Patch, PathMappings } from "../types.js";
|
|
2
|
+
export declare class PatchLoadError extends Error {
|
|
3
3
|
constructor(message: string);
|
|
4
4
|
}
|
|
5
|
-
export interface
|
|
6
|
-
|
|
5
|
+
export interface PatchConfig {
|
|
6
|
+
patches: Patch[];
|
|
7
7
|
templateDir: string;
|
|
8
8
|
webAppName: string;
|
|
9
9
|
routeFilePath: string;
|
|
@@ -12,7 +12,7 @@ export interface FeatureConfig {
|
|
|
12
12
|
siteContainer: boolean;
|
|
13
13
|
}
|
|
14
14
|
/**
|
|
15
|
-
* Load
|
|
15
|
+
* Load patches from a patch's patches.ts file
|
|
16
16
|
*/
|
|
17
|
-
export declare function
|
|
17
|
+
export declare function loadPatch(patchPath: string): Promise<PatchConfig>;
|
|
18
18
|
//# sourceMappingURL=patch-loader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patch-loader.d.ts","sourceRoot":"","sources":["../../src/core/patch-loader.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"patch-loader.d.ts","sourceRoot":"","sources":["../../src/core/patch-loader.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEvD,qBAAa,cAAe,SAAQ,KAAK;gBAC5B,OAAO,EAAE,MAAM;CAI3B;AAED,MAAM,WAAW,WAAW;IAC3B,OAAO,EAAE,KAAK,EAAE,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;CACvB;AAcD;;GAEG;AACH,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAmGvE"}
|
|
@@ -6,87 +6,87 @@
|
|
|
6
6
|
import { existsSync } from "fs";
|
|
7
7
|
import { join } from "path";
|
|
8
8
|
import { pathToFileURL } from "url";
|
|
9
|
-
export class
|
|
9
|
+
export class PatchLoadError extends Error {
|
|
10
10
|
constructor(message) {
|
|
11
11
|
super(message);
|
|
12
|
-
this.name = "
|
|
12
|
+
this.name = "PatchLoadError";
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
/**
|
|
16
|
-
* Extract
|
|
16
|
+
* Extract patch name from patch path
|
|
17
17
|
* Examples:
|
|
18
18
|
* - 'packages/feature-navigation-menu' -> 'feature-navigation-menu'
|
|
19
19
|
* - '/absolute/path/to/feature-name' -> 'feature-name'
|
|
20
20
|
* - 'packages/reference-app-vibe-coding-starter' -> 'reference-app-vibe-coding-starter'
|
|
21
21
|
*/
|
|
22
|
-
function
|
|
23
|
-
const parts =
|
|
22
|
+
function extractPatchName(patchPath) {
|
|
23
|
+
const parts = patchPath.split("/");
|
|
24
24
|
return parts[parts.length - 1];
|
|
25
25
|
}
|
|
26
26
|
/**
|
|
27
|
-
* Load
|
|
27
|
+
* Load patches from a patch's patches.ts file
|
|
28
28
|
*/
|
|
29
|
-
export async function
|
|
30
|
-
const
|
|
31
|
-
if (!existsSync(
|
|
32
|
-
throw new
|
|
29
|
+
export async function loadPatch(patchPath) {
|
|
30
|
+
const patchesFilePath = join(patchPath, "patches.ts");
|
|
31
|
+
if (!existsSync(patchesFilePath)) {
|
|
32
|
+
throw new PatchLoadError(`No patches.ts found in patch path '${patchPath}'`);
|
|
33
33
|
}
|
|
34
34
|
try {
|
|
35
35
|
// Convert to file URL for dynamic import
|
|
36
|
-
const
|
|
37
|
-
const module = await import(
|
|
36
|
+
const patchPathUrl = pathToFileURL(patchesFilePath).href;
|
|
37
|
+
const module = await import(patchPathUrl);
|
|
38
38
|
// Require default export
|
|
39
39
|
if (!module.default) {
|
|
40
|
-
throw new
|
|
40
|
+
throw new PatchLoadError(`patches.ts must have a default export (array or object) in ${patchesFilePath}`);
|
|
41
41
|
}
|
|
42
|
-
// Helper to check if a value looks like a
|
|
43
|
-
// Checks if value is a plain object (not array, not null) that matches
|
|
44
|
-
// Accepts any value from dynamic import (module.default is typed as any) and narrows to
|
|
42
|
+
// Helper to check if a value looks like a patch object
|
|
43
|
+
// Checks if value is a plain object (not array, not null) that matches Patch structure
|
|
44
|
+
// Accepts any value from dynamic import (module.default is typed as any) and narrows to Patch type
|
|
45
45
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- module.default from dynamic import is typed as any
|
|
46
|
-
const
|
|
46
|
+
const isPatchLike = (value) => {
|
|
47
47
|
return value !== null && typeof value === "object" && !Array.isArray(value);
|
|
48
48
|
};
|
|
49
|
-
let
|
|
49
|
+
let patches;
|
|
50
50
|
if (Array.isArray(module.default)) {
|
|
51
|
-
|
|
51
|
+
patches = module.default;
|
|
52
52
|
}
|
|
53
|
-
else if (
|
|
54
|
-
|
|
53
|
+
else if (isPatchLike(module.default)) {
|
|
54
|
+
patches = [module.default];
|
|
55
55
|
}
|
|
56
56
|
else {
|
|
57
|
-
throw new
|
|
57
|
+
throw new PatchLoadError(`Default export must be a Patch object or Patch[] array in ${patchesFilePath}`);
|
|
58
58
|
}
|
|
59
|
-
// Extract
|
|
60
|
-
const
|
|
61
|
-
// Extract configuration from
|
|
59
|
+
// Extract patch name from path for constructing defaults
|
|
60
|
+
const patchName = extractPatchName(patchPath);
|
|
61
|
+
// Extract configuration from patches (with defaults)
|
|
62
62
|
// Default to SFDX structure: src/force-app/main/default/webapplications/{name}
|
|
63
63
|
let templateDir = "src";
|
|
64
|
-
let webAppName =
|
|
64
|
+
let webAppName = patchName; // Default to patch name
|
|
65
65
|
let routeFilePath;
|
|
66
66
|
let dependencies = [];
|
|
67
67
|
let pathMappings = {}; // Default: enabled with no custom mappings
|
|
68
68
|
let siteContainer = false;
|
|
69
|
-
// Check if any
|
|
70
|
-
for (const
|
|
71
|
-
if (
|
|
72
|
-
templateDir =
|
|
69
|
+
// Check if any patch specifies custom configuration
|
|
70
|
+
for (const patch of patches) {
|
|
71
|
+
if (patch.templateDir) {
|
|
72
|
+
templateDir = patch.templateDir;
|
|
73
73
|
}
|
|
74
|
-
if (
|
|
75
|
-
webAppName =
|
|
74
|
+
if (patch.webAppName) {
|
|
75
|
+
webAppName = patch.webAppName;
|
|
76
76
|
}
|
|
77
|
-
if (
|
|
78
|
-
routeFilePath =
|
|
77
|
+
if (patch.routeFilePath) {
|
|
78
|
+
routeFilePath = patch.routeFilePath;
|
|
79
79
|
}
|
|
80
|
-
if (
|
|
81
|
-
// Merge dependencies from all
|
|
82
|
-
dependencies = [...new Set([...dependencies, ...
|
|
80
|
+
if (patch.dependencies) {
|
|
81
|
+
// Merge dependencies from all patches
|
|
82
|
+
dependencies = [...new Set([...dependencies, ...patch.dependencies])];
|
|
83
83
|
}
|
|
84
|
-
if (
|
|
85
|
-
// If any
|
|
86
|
-
// Last one wins if multiple
|
|
87
|
-
pathMappings =
|
|
84
|
+
if (patch.pathMappings) {
|
|
85
|
+
// If any patch specifies pathMappings, use it
|
|
86
|
+
// Last one wins if multiple patches specify it
|
|
87
|
+
pathMappings = patch.pathMappings;
|
|
88
88
|
}
|
|
89
|
-
if (
|
|
89
|
+
if (patch.siteContainer) {
|
|
90
90
|
siteContainer = true;
|
|
91
91
|
}
|
|
92
92
|
}
|
|
@@ -96,7 +96,7 @@ export async function loadFeature(featurePath) {
|
|
|
96
96
|
routeFilePath = `force-app/main/default/webapplications/${webAppName}/src/routes.tsx`;
|
|
97
97
|
}
|
|
98
98
|
return {
|
|
99
|
-
|
|
99
|
+
patches,
|
|
100
100
|
templateDir,
|
|
101
101
|
webAppName,
|
|
102
102
|
routeFilePath,
|
|
@@ -106,10 +106,10 @@ export async function loadFeature(featurePath) {
|
|
|
106
106
|
};
|
|
107
107
|
}
|
|
108
108
|
catch (err) {
|
|
109
|
-
if (err instanceof
|
|
109
|
+
if (err instanceof PatchLoadError) {
|
|
110
110
|
throw err;
|
|
111
111
|
}
|
|
112
|
-
throw new
|
|
112
|
+
throw new PatchLoadError(`Failed to load patch from ${patchesFilePath}: ${err instanceof Error ? err.message : String(err)}`);
|
|
113
113
|
}
|
|
114
114
|
}
|
|
115
115
|
//# sourceMappingURL=patch-loader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patch-loader.js","sourceRoot":"","sources":["../../src/core/patch-loader.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAGpC,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"patch-loader.js","sourceRoot":"","sources":["../../src/core/patch-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ export default async function runExecutor(options, context) {
|
|
|
37
37
|
const cliPath = "packages/template/patches-cli/src/index.ts";
|
|
38
38
|
/*
|
|
39
39
|
* Unfortunately using applyPatchesCommand directly encounters module import errors
|
|
40
|
-
* when it comes to `
|
|
40
|
+
* when it comes to `patches.ts`
|
|
41
41
|
*/
|
|
42
42
|
// Build command with arguments
|
|
43
43
|
let command = `npx tsx ${cliPath} apply-patches ${featurePath} ${baseAppPath} ${outputPath}`;
|
package/dist/types.d.ts
CHANGED
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,WAAW,uBAAuB;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,WAAW;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,WAAW,uBAAuB;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,WAAW;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,KAAK;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,uBAAuB,CAAC;IACtC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,gHAAgH;IAChH,aAAa,CAAC,EAAE,OAAO,CAAC;CACxB"}
|
package/dist/utils/validation.js
CHANGED
|
@@ -58,10 +58,10 @@ export function validateAndResolveFeaturePath(featurePath) {
|
|
|
58
58
|
if (!statSync(resolvedPath).isDirectory()) {
|
|
59
59
|
throw new ValidationError(`Feature path '${featurePath}' is not a directory`);
|
|
60
60
|
}
|
|
61
|
-
// Check if it has a
|
|
62
|
-
const
|
|
63
|
-
if (!existsSync(
|
|
64
|
-
throw new ValidationError(`Feature path '${featurePath}' does not contain a
|
|
61
|
+
// Check if it has a patches.ts file
|
|
62
|
+
const patchesFilePath = join(resolvedPath, "patches.ts");
|
|
63
|
+
if (!existsSync(patchesFilePath)) {
|
|
64
|
+
throw new ValidationError(`Feature path '${featurePath}' does not contain a patches.ts file`);
|
|
65
65
|
}
|
|
66
66
|
return resolvedPath;
|
|
67
67
|
}
|
package/package.json
CHANGED