@salesforce/ui-bundle-template-cli 11.24.5 → 11.25.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"import-merger.d.ts","sourceRoot":"","sources":["../../src/utils/import-merger.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CA6HlF"}
1
+ {"version":3,"file":"import-merger.d.ts","sourceRoot":"","sources":["../../src/utils/import-merger.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAgJlF"}
@@ -33,13 +33,18 @@ export function mergeImports(featureFile, targetFile) {
33
33
  duplicateImport.remove();
34
34
  }
35
35
  }
36
- // Track all default import names already in target (to prevent conflicts)
36
+ // Track import names already in target (default and named) to detect a
37
+ // feature import that reuses a name under a different module specifier.
37
38
  const existingDefaultImportNames = new Set();
39
+ const existingNamedImportNames = new Set();
38
40
  for (const imp of targetFile.getImportDeclarations()) {
39
41
  const defaultImport = imp.getDefaultImport();
40
42
  if (defaultImport) {
41
43
  existingDefaultImportNames.add(defaultImport.getText());
42
44
  }
45
+ for (const ni of imp.getNamedImports()) {
46
+ existingNamedImportNames.add(ni.getName());
47
+ }
43
48
  }
44
49
  // Add/merge imports from feature
45
50
  for (const featureImport of featureImports) {
@@ -47,15 +52,24 @@ export function mergeImports(featureFile, targetFile) {
47
52
  const targetImport = targetImportsMap.get(moduleSpecifier);
48
53
  const featureDefaultImport = featureImport.getDefaultImport()?.getText();
49
54
  if (!targetImport) {
50
- // Import from this module doesn't exist in target
51
- // Check if default import name would conflict
52
- if (featureDefaultImport && existingDefaultImportNames.has(featureDefaultImport)) {
53
- // Feature import has same name as existing import from different module
54
- // Feature should take precedence - find and replace the conflicting import
55
+ // Import from this module doesn't exist in target. Check whether any of
56
+ // its names (default OR named) already exist under a different module,
57
+ // which would duplicate the identifier.
58
+ const conflictName = featureDefaultImport && existingDefaultImportNames.has(featureDefaultImport)
59
+ ? featureDefaultImport
60
+ : featureImport
61
+ .getNamedImports()
62
+ .map((ni) => ni.getName())
63
+ .find((name) => existingNamedImportNames.has(name));
64
+ if (conflictName) {
65
+ // Feature import shares a name with an existing import from a
66
+ // different module. Feature takes precedence - find and replace the
67
+ // conflicting import.
55
68
  const conflictingImport = targetFile
56
69
  .getImportDeclarations()
57
- .find((imp) => imp.getDefaultImport()?.getText() === featureDefaultImport &&
58
- imp.getModuleSpecifierValue() !== moduleSpecifier);
70
+ .find((imp) => imp.getModuleSpecifierValue() !== moduleSpecifier &&
71
+ (imp.getDefaultImport()?.getText() === conflictName ||
72
+ imp.getNamedImports().some((ni) => ni.getName() === conflictName)));
59
73
  if (conflictingImport) {
60
74
  // Replace the module specifier of the conflicting import
61
75
  conflictingImport.setModuleSpecifier(moduleSpecifier);
@@ -90,10 +104,13 @@ export function mergeImports(featureFile, targetFile) {
90
104
  defaultImport: featureDefaultImport,
91
105
  namespaceImport: featureImport.getNamespaceImport()?.getText(),
92
106
  });
93
- // Track the new default import
107
+ // Track the new import names so later feature imports see them
94
108
  if (featureDefaultImport) {
95
109
  existingDefaultImportNames.add(featureDefaultImport);
96
110
  }
111
+ for (const ni of featureImport.getNamedImports()) {
112
+ existingNamedImportNames.add(ni.getName());
113
+ }
97
114
  // Update map with new import
98
115
  const newImports = targetFile.getImportDeclarations();
99
116
  const addedImport = newImports[newImports.length - 1];
@@ -1 +1 @@
1
- {"version":3,"file":"import-merger.js","sourceRoot":"","sources":["../../src/utils/import-merger.ts"],"names":[],"mappings":"AAOA;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAAC,WAAuB,EAAE,UAAsB;IAC3E,MAAM,cAAc,GAAG,WAAW,CAAC,qBAAqB,EAAE,CAAC;IAC3D,MAAM,aAAa,GAAG,UAAU,CAAC,qBAAqB,EAAE,CAAC;IAEzD,6DAA6D;IAC7D,mEAAmE;IACnE,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAqC,CAAC;IACtE,MAAM,sBAAsB,GAAyB,EAAE,CAAC;IAExD,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QACjC,MAAM,eAAe,GAAG,GAAG,CAAC,uBAAuB,EAAE,CAAC;QAEtD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC;YAC5C,gBAAgB,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACP,8DAA8D;YAC9D,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClC,CAAC;IACF,CAAC;IAED,0CAA0C;IAC1C,KAAK,MAAM,eAAe,IAAI,sBAAsB,EAAE,CAAC;QACtD,MAAM,eAAe,GAAG,eAAe,CAAC,uBAAuB,EAAE,CAAC;QAClE,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAE5D,IAAI,aAAa,EAAE,CAAC;YACnB,uBAAuB,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;YACxD,eAAe,CAAC,MAAM,EAAE,CAAC;QAC1B,CAAC;IACF,CAAC;IAED,0EAA0E;IAC1E,MAAM,0BAA0B,GAAG,IAAI,GAAG,EAAU,CAAC;IACrD,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,qBAAqB,EAAE,EAAE,CAAC;QACtD,MAAM,aAAa,GAAG,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAC7C,IAAI,aAAa,EAAE,CAAC;YACnB,0BAA0B,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;QACzD,CAAC;IACF,CAAC;IAED,iCAAiC;IACjC,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE,CAAC;QAC5C,MAAM,eAAe,GAAG,aAAa,CAAC,uBAAuB,EAAE,CAAC;QAChE,MAAM,YAAY,GAAG,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC3D,MAAM,oBAAoB,GAAG,aAAa,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,CAAC;QAEzE,IAAI,CAAC,YAAY,EAAE,CAAC;YACnB,kDAAkD;YAClD,8CAA8C;YAC9C,IAAI,oBAAoB,IAAI,0BAA0B,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAAC;gBAClF,wEAAwE;gBACxE,2EAA2E;gBAC3E,MAAM,iBAAiB,GAAG,UAAU;qBAClC,qBAAqB,EAAE;qBACvB,IAAI,CACJ,CAAC,GAAG,EAAE,EAAE,CACP,GAAG,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,KAAK,oBAAoB;oBAC1D,GAAG,CAAC,uBAAuB,EAAE,KAAK,eAAe,CAClD,CAAC;gBAEH,IAAI,iBAAiB,EAAE,CAAC;oBACvB,yDAAyD;oBACzD,iBAAiB,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;oBAEtD,+DAA+D;oBAC/D,MAAM,mBAAmB,GAAG,aAAa,CAAC,eAAe,EAAE,CAAC;oBAC5D,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACpC,MAAM,oBAAoB,GAAG,IAAI,GAAG,CACnC,iBAAiB,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAC7D,CAAC;wBACF,KAAK,MAAM,WAAW,IAAI,mBAAmB,EAAE,CAAC;4BAC/C,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC;4BACzC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gCAC3C,iBAAiB,CAAC,cAAc,CAAC;oCAChC,IAAI,EAAE,UAAU;oCAChB,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,OAAO,EAAE;iCAC5C,CAAC,CAAC;4BACJ,CAAC;wBACF,CAAC;oBACF,CAAC;oBAED,gDAAgD;oBAChD,gBAAgB,CAAC,GAAG,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;oBACzD,SAAS;gBACV,CAAC;YACF,CAAC;YAED,iBAAiB;YACjB,UAAU,CAAC,oBAAoB,CAAC;gBAC/B,eAAe,EAAE,eAAe;gBAChC,UAAU,EAAE,aAAa,CAAC,UAAU,EAAE;gBACtC,YAAY,EAAE,aAAa,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;oBAC1D,IAAI,EAAE,EAAE,CAAC,OAAO,EAAE;oBAClB,KAAK,EAAE,EAAE,CAAC,YAAY,EAAE,EAAE,OAAO,EAAE;oBACnC,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE;iBAC3B,CAAC,CAAC;gBACH,aAAa,EAAE,oBAAoB;gBACnC,eAAe,EAAE,aAAa,CAAC,kBAAkB,EAAE,EAAE,OAAO,EAAE;aAC9D,CAAC,CAAC;YAEH,+BAA+B;YAC/B,IAAI,oBAAoB,EAAE,CAAC;gBAC1B,0BAA0B,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;YACtD,CAAC;YACD,6BAA6B;YAC7B,MAAM,UAAU,GAAG,UAAU,CAAC,qBAAqB,EAAE,CAAC;YACtD,MAAM,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACtD,gBAAgB,CAAC,GAAG,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACP,6CAA6C;YAC7C,uBAAuB,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;QACtD,CAAC;IACF,CAAC;IAED,6CAA6C;IAC7C,uBAAuB,CAAC,UAAU,CAAC,CAAC;IAEpC,8CAA8C;IAC9C,yBAAyB,CAAC,UAAU,CAAC,CAAC;IAEtC,qDAAqD;IACrD,2BAA2B,CAAC,UAAU,CAAC,CAAC;IAExC,8EAA8E;IAC9E,0EAA0E;AAC3E,CAAC;AAED;;;;GAIG;AACH,SAAS,uBAAuB,CAC/B,YAAgE,EAChE,YAAgE;IAEhE,MAAM,gBAAgB,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC;IACnD,MAAM,gBAAgB,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC;IAEnD,4EAA4E;IAC5E,qEAAqE;IACrE,IAAI,gBAAgB,KAAK,gBAAgB,EAAE,CAAC;QAC3C,2CAA2C;QAC3C,MAAM,UAAU,GAAG,YAAY,CAAC,aAAa,EAAE,CAAC;QAChD,MAAM,eAAe,GAAG,YAAY,CAAC,uBAAuB,EAAE,CAAC;QAE/D,mEAAmE;QACnE,MAAM,sBAAsB,GAAG,UAAU;aACvC,qBAAqB,EAAE;aACvB,IAAI,CACJ,CAAC,GAAG,EAAE,EAAE,CACP,GAAG,CAAC,uBAAuB,EAAE,KAAK,eAAe;YACjD,GAAG,CAAC,UAAU,EAAE,KAAK,gBAAgB;YACrC,GAAG,KAAK,YAAY,CACrB,CAAC;QAEH,IAAI,sBAAsB,EAAE,CAAC;YAC5B,yCAAyC;YACzC,uBAAuB,CAAC,YAAY,EAAE,sBAAsB,CAAC,CAAC;YAC9D,OAAO;QACR,CAAC;QAED,sDAAsD;QACtD,UAAU,CAAC,oBAAoB,CAAC;YAC/B,eAAe,EAAE,eAAe;YAChC,UAAU,EAAE,gBAAgB;YAC5B,YAAY,EAAE,YAAY,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACzD,IAAI,EAAE,EAAE,CAAC,OAAO,EAAE;gBAClB,KAAK,EAAE,EAAE,CAAC,YAAY,EAAE,EAAE,OAAO,EAAE;gBACnC,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE;aAC3B,CAAC,CAAC;YACH,aAAa,EAAE,YAAY,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE;YACzD,eAAe,EAAE,YAAY,CAAC,kBAAkB,EAAE,EAAE,OAAO,EAAE;SAC7D,CAAC,CAAC;QACH,OAAO;IACR,CAAC;IAED,4CAA4C;IAE5C,gEAAgE;IAChE,MAAM,mBAAmB,GAAG,YAAY,CAAC,gBAAgB,EAAE,CAAC;IAC5D,MAAM,mBAAmB,GAAG,YAAY,CAAC,gBAAgB,EAAE,CAAC;IAE5D,IAAI,mBAAmB,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACjD,YAAY,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,kEAAkE;IAClE,MAAM,qBAAqB,GAAG,YAAY,CAAC,kBAAkB,EAAE,CAAC;IAChE,MAAM,qBAAqB,GAAG,YAAY,CAAC,kBAAkB,EAAE,CAAC;IAEhE,IAAI,qBAAqB,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACrD,YAAY,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,sBAAsB;IACtB,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAE7F,KAAK,MAAM,iBAAiB,IAAI,YAAY,CAAC,eAAe,EAAE,EAAE,CAAC;QAChE,MAAM,UAAU,GAAG,iBAAiB,CAAC,OAAO,EAAE,CAAC;QAC/C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACzC,YAAY,CAAC,cAAc,CAAC;gBAC3B,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,iBAAiB,CAAC,YAAY,EAAE,EAAE,OAAO,EAAE;gBAClD,UAAU,EAAE,iBAAiB,CAAC,UAAU,EAAE;aAC1C,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;AACF,CAAC;AAED;;GAEG;AACH,SAAS,uBAAuB,CAAC,IAAgB;IAChD,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAEhD,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC9B,MAAM,YAAY,GAAG,GAAG,CAAC,eAAe,EAAE,CAAC;QAC3C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;QAE/B,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACxC,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC;YACnC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBACpB,WAAW,CAAC,MAAM,EAAE,CAAC;YACtB,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC;QACF,CAAC;IACF,CAAC;AACF,CAAC;AAED;;;GAGG;AACH,SAAS,yBAAyB,CAAC,IAAgB;IAClD,MAAM,aAAa,GAAG,YAAY,CAAC;IACnC,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAEhD,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC9B,MAAM,eAAe,GAAG,GAAG,CAAC,uBAAuB,EAAE,CAAC;QAEtD,2DAA2D;QAC3D,yEAAyE;QACzE,IAAI,eAAe,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YAC7C,GAAG,CAAC,MAAM,EAAE,CAAC;QACd,CAAC;IACF,CAAC;AACF,CAAC;AAED;;;GAGG;AACH,SAAS,2BAA2B,CAAC,IAAgB;IACpD,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAE7C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,CAAC,4BAA4B;IACrC,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAE/C,gDAAgD;IAChD,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;IACxC,MAAM,eAAe,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;IAE5E,IAAI,eAAe,KAAK,CAAC,CAAC,IAAI,eAAe,KAAK,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzE,OAAO,CAAC,sDAAsD;IAC/D,CAAC;IAED,MAAM,aAAa,GAAG,UAAU,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC;IAEtD,0CAA0C;IAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACpC,MAAM,WAAW,GAAG,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEtF,qCAAqC;IACrC,MAAM,YAAY,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;IAE7D,4EAA4E;IAC5E,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;QACtB,kDAAkD;QAClD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;AACF,CAAC"}
1
+ {"version":3,"file":"import-merger.js","sourceRoot":"","sources":["../../src/utils/import-merger.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@salesforce/ui-bundle-template-cli",
3
- "version": "11.24.5",
3
+ "version": "11.25.0",
4
4
  "description": "CLI tool for applying feature patches to base apps",
5
5
  "license": "SEE LICENSE IN LICENSE.txt",
6
6
  "type": "module",