@salesforce/plugin-omnistudio-migration-tool 2.0.0-dev.5 → 2.0.0-dev.6

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.
@@ -145,7 +145,7 @@ class FlexipageMigration extends BaseRealtedObjectMigration_1.BaseRelatedObjectM
145
145
  status = mode === 'assess' ? 'Needs manual intervention' : 'Skipped';
146
146
  }
147
147
  else if (error instanceof errorInterfaces_1.DuplicateKeyError) {
148
- errors.add(`${error.componentType} ${error.key} is duplicate`);
148
+ errors.add(this.messages.getMessage('manualInterventionForFlexiPageAsDuplicateKey', [error.componentType, error.key]));
149
149
  status = mode === 'assess' ? 'Needs manual intervention' : 'Skipped';
150
150
  }
151
151
  else {
@@ -201,7 +201,11 @@ class FlexipageMigration extends BaseRealtedObjectMigration_1.BaseRelatedObjectM
201
201
  fs.writeFileSync(filePath, modifiedContent);
202
202
  logger_1.Logger.logVerbose(this.messages.getMessage('updatedModifiedContent', [filePath]));
203
203
  }
204
- const diff = new FileDiffUtil_1.FileDiffUtil().getXMLDiff(fileContent, modifiedContent);
204
+ // Normalize trailing newlines to avoid false positives in diff
205
+ // Both original and modified content are normalized to remove trailing newlines
206
+ const normalizedOriginal = fileContent.replace(/\n+$/, '');
207
+ const normalizedModified = modifiedContent.replace(/\n+$/, '');
208
+ const diff = new FileDiffUtil_1.FileDiffUtil().getXMLDiff(normalizedOriginal, normalizedModified);
205
209
  logger_1.Logger.logVerbose(this.messages.getMessage('generatedDiffForFile', [fileName]));
206
210
  return {
207
211
  path: filePath,
@@ -1 +1 @@
1
- {"version":3,"file":"FlexipageMigration.js","sourceRoot":"","sources":["../../../src/migration/related/FlexipageMigration.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FlexipageMigration.js","sourceRoot":"","sources":["../../../src/migration/related/FlexipageMigration.ts"],"names":[],"mappings":"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"}
@@ -154,17 +154,23 @@ class FileDiffUtil {
154
154
  for (const block of diff) {
155
155
  if (block.added) {
156
156
  block.value.split('\n').forEach((line) => {
157
- result.push({ old: null, new: line });
157
+ if (line.trim() !== '') {
158
+ result.push({ old: null, new: line });
159
+ }
158
160
  });
159
161
  }
160
162
  else if (block.removed) {
161
163
  block.value.split('\n').forEach((line) => {
162
- result.push({ old: line, new: null });
164
+ if (line.trim() !== '') {
165
+ result.push({ old: line, new: null });
166
+ }
163
167
  });
164
168
  }
165
169
  else {
166
170
  block.value.split('\n').forEach((line) => {
167
- result.push({ old: line, new: line });
171
+ if (line.trim() !== '') {
172
+ result.push({ old: line, new: line });
173
+ }
168
174
  });
169
175
  }
170
176
  }
@@ -1 +1 @@
1
- {"version":3,"file":"FileDiffUtil.js","sourceRoot":"","sources":["../../../../src/utils/lwcparser/fileutils/FileDiffUtil.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FileDiffUtil.js","sourceRoot":"","sources":["../../../../src/utils/lwcparser/fileutils/FileDiffUtil.ts"],"names":[],"mappings":"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"}
@@ -138,6 +138,7 @@
138
138
  "flexipagesWithChanges": "Found %s FlexiPages with changes",
139
139
  "expSitesWithChanges": "Found %s Experience Cloud Sites with changes",
140
140
  "migratingFlexiPages": "Migrating FlexiPages",
141
+ "manualInterventionForFlexiPageAsDuplicateKey": "We couldn’t process the %s %s because a duplicate key was found in storage.",
141
142
  "experienceSiteMetadataConsent": "Your consent for migrating Experience Cloud sites is %s",
142
143
  "experienceSiteConsentNotProvidedWarning": "You’ve not provided consent and your Experience Cloud sites won’t be processed.",
143
144
  "relatedObjectsToProcessAfterExpSitesRemoval": "Objects to process after removing expsite are %s.",
@@ -1 +1 @@
1
- {"version":"2.0.0-dev.5","commands":{"basecommand":{"id":"basecommand","usage":"<%= command.id %> [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-omnistudio-migration-tool","pluginType":"core","aliases":[],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"}},"args":[]},"omnistudio:migration:assess":{"id":"omnistudio:migration:assess","description":"If your Omnistudio components are on custom data model, assess the migration of the components from Omnistudio managed package runtime to Omnistudio standard runtime. If your Omnistudio components are on standard data model, assess the updates made to the component names and references.See: https://help.salesforce.com/s/articleView?id=xcloud.os_omnistudio_naming_conventions.htm&type=5","usage":"<%= command.id %> [-o <string>] [-a] [-r <string>] [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-omnistudio-migration-tool","pluginType":"core","aliases":[],"examples":["omnistudio:migration:assess -u orguser@domain.com ","omnistudio:migration:assess -u orguser@domain.com --only=dm","omnistudio:migration:assess -u orguser@domain.com --only=ip","omnistudio:migration:assess -u orguser@domain.com --only=os","omnistudio:migration:assess -u orguser@domain.com --only=fc","omnistudio:migration:assess -u orguser@domain.com --only=cl","omnistudio:migration:assess -u orguser@domain.com --only=autonumber","omnistudio:migration:assess -u orguser@domain.com --relatedobjects apex,lwc,flexipage,expsites","omnistudio:migration:assess -u orguser@domain.com -r apex,lwc,flexipage,expsites"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"only":{"name":"only","type":"option","char":"o","description":"Migrate a single component: os | ip | fc | dm | autonumber | cl"},"allversions":{"name":"allversions","type":"boolean","char":"a","description":"Migrate all versions of a component","required":false,"allowNo":false},"relatedobjects":{"name":"relatedobjects","type":"option","char":"r","description":"Select the component type that you want to migrate: 'apex' for Apex classes, 'lwc' for Lightning Web Components, 'flexipage' for FlexiPages, 'expsites' for Experience Sites, or 'apex, lwc, flexipage, expsites' if you want to include all types."},"verbose":{"name":"verbose","type":"boolean","description":"Enable verbose output","allowNo":false}},"args":[{"name":"file"}]},"omnistudio:migration:info":{"id":"omnistudio:migration:info","description":"print a greeting and your org IDs","usage":"<%= command.id %> [-n <string>] [-a] [-v <string>] [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-omnistudio-migration-tool","pluginType":"core","aliases":[],"examples":["sfdx omnistudio:migration:info --targetusername myOrg@example.com --targetdevhubusername devhub@org.com","sfdx omnistudio:migration:info --name myname --targetusername myOrg@example.com"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetdevhubusername":{"name":"targetdevhubusername","type":"option","char":"v","description":"username or alias for the dev hub org; overrides default dev hub org"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"name":{"name":"name","type":"option","char":"n","description":"name to print"},"allversions":{"name":"allversions","type":"boolean","char":"a","description":"Migrate all versions of a component","required":false,"allowNo":false},"verbose":{"name":"verbose","type":"boolean","description":"Enable verbose output","allowNo":false}},"args":[{"name":"file"}]},"omnistudio:migration:migrate":{"id":"omnistudio:migration:migrate","description":"If your Omnistudio components are on custom data model, migrate the components from custom data model to standard data model, and switch the runtime from Omnistudio managed package runtime to Omnistudio standard runtime. If your Omnistudio components are on standard data model, the component names and references will be updated to contain only alphanumeric characters. This update is required to enable the metadata API. See: https://help.salesforce.com/s/articleView?id=xcloud.os_omnistudio_naming_conventions.htm&type=5","usage":"<%= command.id %> [-o <string>] [-a] [-r <string>] [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-omnistudio-migration-tool","pluginType":"core","aliases":[],"examples":["omnistudio:migration:migrate -u orguser@domain.com ","omnistudio:migration:migrate -u orguser@domain.com --only=dm","omnistudio:migration:migrate -u orguser@domain.com --only=ip","omnistudio:migration:migrate -u orguser@domain.com --only=os","omnistudio:migration:migrate -u orguser@domain.com --only=fc","omnistudio:migration:migrate -u orguser@domain.com --only=autonumber","omnistudio:migration:migrate -u orguser@domain.com --only=cl","omnistudio:migration:migrate -u orguser@domain.com --relatedobjects apex,lwc,flexipage,expsites","omnistudio:migration:migrate -u orguser@domain.com -r apex,lwc,flexipage,expsites","omnistudio:migration:migrate -u orguser@domain.com -r apex","omnistudio:migration:migrate -u orguser@domain.com -r lwc"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"only":{"name":"only","type":"option","char":"o","description":"Migrate a single component: os | ip | fc | dm | autonumber | cl"},"allversions":{"name":"allversions","type":"boolean","char":"a","description":"Migrate all versions of a component","required":false,"allowNo":false},"relatedobjects":{"name":"relatedobjects","type":"option","char":"r","description":"Select the component type that you want to migrate: 'apex' for Apex classes, 'lwc' for Lightning Web Components, 'flexipage' for FlexiPages, 'expsites' for Experience Sites, or 'apex, lwc, flexipage, expsites' if you want to include all types."},"verbose":{"name":"verbose","type":"boolean","description":"Enable verbose output","allowNo":false}},"args":[{"name":"file"}]}}}
1
+ {"version":"2.0.0-dev.6","commands":{"basecommand":{"id":"basecommand","usage":"<%= command.id %> [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-omnistudio-migration-tool","pluginType":"core","aliases":[],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"}},"args":[]},"omnistudio:migration:assess":{"id":"omnistudio:migration:assess","description":"If your Omnistudio components are on custom data model, assess the migration of the components from Omnistudio managed package runtime to Omnistudio standard runtime. If your Omnistudio components are on standard data model, assess the updates made to the component names and references.See: https://help.salesforce.com/s/articleView?id=xcloud.os_omnistudio_naming_conventions.htm&type=5","usage":"<%= command.id %> [-o <string>] [-a] [-r <string>] [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-omnistudio-migration-tool","pluginType":"core","aliases":[],"examples":["omnistudio:migration:assess -u orguser@domain.com ","omnistudio:migration:assess -u orguser@domain.com --only=dm","omnistudio:migration:assess -u orguser@domain.com --only=ip","omnistudio:migration:assess -u orguser@domain.com --only=os","omnistudio:migration:assess -u orguser@domain.com --only=fc","omnistudio:migration:assess -u orguser@domain.com --only=cl","omnistudio:migration:assess -u orguser@domain.com --only=autonumber","omnistudio:migration:assess -u orguser@domain.com --relatedobjects apex,lwc,flexipage,expsites","omnistudio:migration:assess -u orguser@domain.com -r apex,lwc,flexipage,expsites"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"only":{"name":"only","type":"option","char":"o","description":"Migrate a single component: os | ip | fc | dm | autonumber | cl"},"allversions":{"name":"allversions","type":"boolean","char":"a","description":"Migrate all versions of a component","required":false,"allowNo":false},"relatedobjects":{"name":"relatedobjects","type":"option","char":"r","description":"Select the component type that you want to migrate: 'apex' for Apex classes, 'lwc' for Lightning Web Components, 'flexipage' for FlexiPages, 'expsites' for Experience Sites, or 'apex, lwc, flexipage, expsites' if you want to include all types."},"verbose":{"name":"verbose","type":"boolean","description":"Enable verbose output","allowNo":false}},"args":[{"name":"file"}]},"omnistudio:migration:info":{"id":"omnistudio:migration:info","description":"print a greeting and your org IDs","usage":"<%= command.id %> [-n <string>] [-a] [-v <string>] [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-omnistudio-migration-tool","pluginType":"core","aliases":[],"examples":["sfdx omnistudio:migration:info --targetusername myOrg@example.com --targetdevhubusername devhub@org.com","sfdx omnistudio:migration:info --name myname --targetusername myOrg@example.com"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetdevhubusername":{"name":"targetdevhubusername","type":"option","char":"v","description":"username or alias for the dev hub org; overrides default dev hub org"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"name":{"name":"name","type":"option","char":"n","description":"name to print"},"allversions":{"name":"allversions","type":"boolean","char":"a","description":"Migrate all versions of a component","required":false,"allowNo":false},"verbose":{"name":"verbose","type":"boolean","description":"Enable verbose output","allowNo":false}},"args":[{"name":"file"}]},"omnistudio:migration:migrate":{"id":"omnistudio:migration:migrate","description":"If your Omnistudio components are on custom data model, migrate the components from custom data model to standard data model, and switch the runtime from Omnistudio managed package runtime to Omnistudio standard runtime. If your Omnistudio components are on standard data model, the component names and references will be updated to contain only alphanumeric characters. This update is required to enable the metadata API. See: https://help.salesforce.com/s/articleView?id=xcloud.os_omnistudio_naming_conventions.htm&type=5","usage":"<%= command.id %> [-o <string>] [-a] [-r <string>] [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-omnistudio-migration-tool","pluginType":"core","aliases":[],"examples":["omnistudio:migration:migrate -u orguser@domain.com ","omnistudio:migration:migrate -u orguser@domain.com --only=dm","omnistudio:migration:migrate -u orguser@domain.com --only=ip","omnistudio:migration:migrate -u orguser@domain.com --only=os","omnistudio:migration:migrate -u orguser@domain.com --only=fc","omnistudio:migration:migrate -u orguser@domain.com --only=autonumber","omnistudio:migration:migrate -u orguser@domain.com --only=cl","omnistudio:migration:migrate -u orguser@domain.com --relatedobjects apex,lwc,flexipage,expsites","omnistudio:migration:migrate -u orguser@domain.com -r apex,lwc,flexipage,expsites","omnistudio:migration:migrate -u orguser@domain.com -r apex","omnistudio:migration:migrate -u orguser@domain.com -r lwc"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"only":{"name":"only","type":"option","char":"o","description":"Migrate a single component: os | ip | fc | dm | autonumber | cl"},"allversions":{"name":"allversions","type":"boolean","char":"a","description":"Migrate all versions of a component","required":false,"allowNo":false},"relatedobjects":{"name":"relatedobjects","type":"option","char":"r","description":"Select the component type that you want to migrate: 'apex' for Apex classes, 'lwc' for Lightning Web Components, 'flexipage' for FlexiPages, 'expsites' for Experience Sites, or 'apex, lwc, flexipage, expsites' if you want to include all types."},"verbose":{"name":"verbose","type":"boolean","description":"Enable verbose output","allowNo":false}},"args":[{"name":"file"}]}}}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@salesforce/plugin-omnistudio-migration-tool",
3
3
  "description": "This SFDX plugin migrates FlexCard, OmniScript, DataRaptor, and Integration Procedure custom objects to standard objects.",
4
- "version": "2.0.0-dev.5",
4
+ "version": "2.0.0-dev.6",
5
5
  "author": "Salesforce",
6
6
  "bugs": "https://github.com/forcedotcom/cli/issues",
7
7
  "dependencies": {
@@ -161,7 +161,7 @@
161
161
  }
162
162
  },
163
163
  "sfdx": {
164
- "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-omnistudio-migration-tool/2.0.0-dev.5.crt",
165
- "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-omnistudio-migration-tool/2.0.0-dev.5.sig"
164
+ "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-omnistudio-migration-tool/2.0.0-dev.6.crt",
165
+ "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-omnistudio-migration-tool/2.0.0-dev.6.sig"
166
166
  }
167
167
  }