chore: experimental

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
     needs: yarn-lockfile-check
     uses: salesforcecli/github-workflows/.github/workflows/unitTestsLinux.yml@main
   windows-unit-tests:
-    needs: linux-unit-tests
+    needs: yarn-lockfile-check
     uses: salesforcecli/github-workflows/.github/workflows/unitTestsWindows.yml@main
 
   nuts:

src/convert/transformers/decomposedMetadataTransformer.ts

@@ -7,7 +7,7 @@
 
 import { dirname, join } from 'node:path';
 import fs from 'node:fs';
-import { AnyJson, JsonMap, ensureString, isJsonMap } from '@salesforce/ts-types';
+import { JsonMap, ensureString, isJsonMap } from '@salesforce/ts-types';
 import { ensureArray } from '@salesforce/kit';
 import { Messages } from '@salesforce/core';
 import { calculateRelativePath } from '../../utils/path';
@@ -251,7 +251,7 @@ const getKey = (component: MetadataComponent): string => `${component.type.name}
 const getComposedMetadataEntries = async (component: SourceComponent): Promise<ComposedMetadata[]> =>
   // composedMetadata might be undefined if you call toSourceFormat() from a non-source-backed Component
   Object.entries((await component.parseXml())[component.type.name] ?? {}).map(
-    ([tagKey, tagValue]: [string, AnyJson]): ComposedMetadata => ({
+    ([tagKey, tagValue]: [string, JsonMap | JsonMap[]]): ComposedMetadata => ({
       tagKey,
       tagValue,
       parentType: component.type,
@@ -315,7 +315,7 @@ export const forceIgnoreAllowsComponent =
 /** wrap some xml in the Metadata type and add the NS stuff */
 const objectToSource =
   (childTypeName: string) =>
-  (obj: JsonMap): JsToXml =>
+  (obj: JsonMap | JsonMap[]): JsToXml =>
     new JsToXml({ [childTypeName]: { [XML_NS_KEY]: XML_NS_URL, ...obj } });
 
 /** filter out the children and create the remaining parentXml */

src/convert/transformers/decomposedPermissionSetTransformer.ts

@@ -6,7 +6,7 @@
  */
 
 import { dirname, join } from 'node:path';
-import { AnyJson, ensureString, JsonMap } from '@salesforce/ts-types';
+import { ensureString, JsonMap } from '@salesforce/ts-types';
 import { Messages } from '@salesforce/core';
 import type { PermissionSet } from '@jsforce/jsforce-node/lib/api/metadata/schema';
 import { calculateRelativePath } from '../../utils/path';
@@ -72,7 +72,7 @@ export class DecomposedPermissionSetTransformer extends BaseMetadataTransformer
   }
 
   /**
-   * will decomopse a .permissionset into a directory containing files, and an 'objectSettings' folder for object-specific settings
+   * will decompose a .permissionset into a directory containing files, and an 'objectSettings' folder for object-specific settings
    *
    * @param {SourceComponent} component A SourceComponent representing a metadata-formatted permission set
    * @param {SourceComponent | undefined} mergeWith any existing source-formatted permission sets to be merged with, think existing source merging with new information from a retrieve
@@ -102,7 +102,7 @@ export class DecomposedPermissionSetTransformer extends BaseMetadataTransformer
     const preparedMetadata = composedMetadata
       .filter(hasChildTypeId)
       .map(addChildType)
-      .map((c) => toInfoContainer(mergeWith)(component)(c.childType)(c.tagValue as JsonMap))
+      .map((c) => toInfoContainer(mergeWith)(component)(c.childType)(c.tagValue))
       .filter(forceIgnoreAllowsComponent(forceIgnore));
 
     const writeInfosForChildren = combineChildWriteInfos(
@@ -145,7 +145,7 @@ const hasXml = (c: SourceComponent): c is SourceComponent & { xml: string } => t
 const getComposedMetadataEntries = async (component: SourceComponent): Promise<ComposedMetadata[]> =>
   // composedMetadata might be undefined if you call toSourceFormat() from a non-source-backed Component
   Object.entries((await component.parseXml())[component.type.name] ?? {}).map(
-    ([tagKey, tagValue]: [string, AnyJson]): ComposedMetadata => ({
+    ([tagKey, tagValue]: [string, JsonMap | JsonMap[]]): ComposedMetadata => ({
       tagKey,
       tagValue,
       parentType: component.type,
@@ -248,9 +248,9 @@ const toInfoContainer =
   (mergeWith: SourceComponent | undefined) =>
   (parent: SourceComponent) =>
   (childType: MetadataType) =>
-  (tagValue: JsonMap): InfoContainer => {
+  (tagValue: JsonMap[] | JsonMap): InfoContainer => {
     const entryName = childType.directoryName
-      ? ((tagValue as unknown as JsonMap[]).at(0)?.[childType.uniqueIdElement!] as string).split('.')[0]
+      ? ((Array.isArray(tagValue) ? tagValue.at(0) : tagValue)?.[childType.uniqueIdElement!] as string).split('.')[0]
       : parent.name;
     return {
       parentComponent: parent,

src/convert/transformers/types.ts

@@ -4,18 +4,23 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { AnyJson, JsonMap } from '@salesforce/ts-types';
+import { JsonMap } from '@salesforce/ts-types';
 import { MetadataType } from '../../registry';
 import { MetadataComponent, SourceComponent } from '../../resolve';
 
-export type ComposedMetadata = { tagKey: string; tagValue: AnyJson; parentType: MetadataType; childTypeId?: string };
+export type ComposedMetadata = {
+  tagKey: string;
+  tagValue: JsonMap | JsonMap[];
+  parentType: MetadataType;
+  childTypeId?: string;
+};
 export type ComposedMetadataWithChildType = ComposedMetadata & { childType: MetadataType };
 
 export type InfoContainer = {
   entryName: string;
   childComponent: MetadataComponent;
   /** the parsed xml */
-  value: JsonMap;
+  value: JsonMap | JsonMap[];
   parentComponent: SourceComponent;
   mergeWith?: SourceComponent;
 };