@arcgis/coding-components 4.30.0-next.7 → 4.30.0-next.70

package/dist/components/arcade-defaults.js

@@ -1,37 +1,16 @@
 /*!
  * All material copyright Esri, All Rights Reserved, unless otherwise specified.
  * See https://js.arcgis.com/4.30/esri/copyright.txt for details.
- * v4.30.0-next.7
+ * v4.30.0-next.70
  */
 import { Emitter, Uri } from 'monaco-editor';
 import { InsertTextMode, InsertTextFormat, CompletionItemKind } from 'vscode-languageserver-types';
-import { i as importLayersFeatureLayer, a as importRequest, s as supportedFields, n as newPortalPortalItem, b as newWebScene, c as newWebMap, f as fieldAlias, d as fieldTypeToIconName, e as fieldTypeToArcadeType } from './fields.js';
+import { n as newLayersFeatureLayer, i as importRequest, s as supportedFields, a as newPortalPortalItem, b as newWebScene, c as newWebMap, f as fieldAlias, d as fieldTypeToIconName, e as fieldTypeToArcadeType } from './fields.js';
 import { p as portalItemPageUrl } from './utilities.js';
-import { e as ee, t as te, G, Z, E, v } from './index2.js';
+import { i as isNotNull, a as isNotUndefined, b as addLTRMark, s as setValuesInString, c as supportedLocales, f as fetchT9NStringsBundle } from './index2.js';
 import { getArcgisAssetPath as getAssetPath } from "./arcgis-assets.js";
 
-//#region core adapter fix
-async function newFeatureLayer(definition) {
-    const FeatureLayer = await importLayersFeatureLayer();
-    // Fix title for the layer. Instead of defaulting to the map viewer style.
-    return new FeatureLayer({ ...definition, sublayerTitleMode: "service-name" });
-}
-//#endregion
 //#region Type Guards
-function isSupportedLayerInstance(item) {
-    return (!!item &&
-        typeof item === "object" &&
-        "declaredClass" in item &&
-        typeof item.declaredClass === "string" &&
-        item.declaredClass.startsWith("esri.layers."));
-}
-function isFeatureSetInstance(item) {
-    return (!!item &&
-        typeof item === "object" &&
-        "declaredClass" in item &&
-        typeof item.declaredClass === "string" &&
-        item.declaredClass === "esri.rest.support.FeatureSet");
-}
 function isQueryableLayerInstance(item) {
     return (!!item &&
         typeof item === "object" &&
@@ -81,10 +60,13 @@ function isFeatureLayerItemDefinition(item) {
     return !!item && typeof item === "object" && "portalItem" in item && item.portalItem != null;
 }
 function isFieldsDefinition(item) {
-    return (!!item && typeof item === "object" && "fields" in item && Array.isArray(item.fields) && !("declaredClass" in item));
+    return !!item && typeof item === "object" && "fields" in item && Array.isArray(item.fields);
 }
 function isUrlDefinition(item) {
-    return (!!item && typeof item === "object" && "url" in item && typeof item.url === "string" && !("declaredClass" in item));
+    return !!item && typeof item === "object" && "url" in item && typeof item.url === "string";
+}
+function isSupportedServiceUrlDefinition(item) {
+    return isUrlDefinition(item) && /\/(?:featureserver|mapserver)(?:\/|$)/iu.test(item.url);
 }
 function isSubtypeInstance(item) {
     return (!!item &&
@@ -154,11 +136,11 @@ async function supportedSourceFromDefinition(definition) {
         return null;
     }
     let source = null;
-    if (isSupportedLayerInstance(definition) || isFeatureSetInstance(definition) || isFieldsDefinition(definition)) {
+    if (isFieldsDefinition(definition)) {
         source = definition;
     }
     else {
-        source = await newFeatureLayer(definition);
+        source = await newLayersFeatureLayer(definition);
     }
     if (isLoadableSource(source)) {
         await source.load();
@@ -169,27 +151,32 @@ async function serviceMetaData(url) {
     url += "/layers";
     const request = await importRequest();
     const response = await request(url, { responseType: "json", query: { f: "json" } });
-    const data = {
-        layers: response.data?.layers ?? [],
-        tables: response.data?.tables ?? []
-    };
     const queryCapability = url.endsWith("MapServer/layers") ? "data" : "query";
-    const layers = filterFeatureLayerInfos(data.layers, queryCapability);
-    const tables = filterFeatureLayerInfos(data.tables, queryCapability);
+    const layers = getSupportedLayerInfos(response.data?.layers, queryCapability);
+    const tables = getSupportedLayerInfos(response.data?.tables, queryCapability);
     return { layers, tables };
 }
-function filterFeatureLayerInfos(layers, queryCapability) {
+function getSupportedLayerInfos(layers, queryCapability) {
+    if (!layers) {
+        return [];
+    }
     return layers.filter((layer) => {
-        if (layer.type !== "Feature Layer" && layer.type !== "Table") {
-            return false;
-        }
-        const capabilities = layer.capabilities
-            ? layer.capabilities
-                .toLowerCase()
-                .split(",")
-                .map((value) => value.trim())
-            : [];
-        return capabilities.includes(queryCapability);
+        switch (layer.type) {
+            case "Feature Layer":
+            case "Oriented Imagery Layer":
+            case "Catalog Layer":
+            case "Table": {
+                const capabilities = layer.capabilities
+                    ? layer.capabilities
+                        .toLowerCase()
+                        .split(",")
+                        .map((value) => value.trim())
+                    : [];
+                return capabilities.includes(queryCapability);
+            }
+            default:
+                return false;
+        }
     });
 }
 //#endregion
@@ -197,7 +184,7 @@ function filterFeatureLayerInfos(layers, queryCapability) {
 //#endregion
 //#region Support functions
 async function getRelatedFeatureLayer(layer, relationship) {
-    const relatedFeatureLayer = await newFeatureLayer({ url: `${layer.url}/${relationship.relatedTableId}` });
+    const relatedFeatureLayer = await newLayersFeatureLayer({ url: `${layer.url}/${relationship.relatedTableId}` });
     await relatedFeatureLayer.load();
     return relatedFeatureLayer;
 }
@@ -287,8 +274,8 @@ function variableToLSVariable(editorVariable, kind) {
             insertTextMode: InsertTextMode.asIs,
             insertTextFormat: InsertTextFormat.PlainText,
             kind,
-            documentation: { kind: "markdown", value: description }
-        }
+            documentation: { kind: "markdown", value: description },
+        },
     };
 }
 async function featureToLSFeature(editorFeature, kind) {
@@ -302,14 +289,14 @@ async function featureToLSFeature(editorFeature, kind) {
         insertText: name,
         insertTextMode: InsertTextMode.asIs,
         insertTextFormat: InsertTextFormat.PlainText,
-        kind
+        kind,
     };
     const result = {
         name,
         description,
         type: "dictionary",
         properties: [],
-        completion: resultCompletion
+        completion: resultCompletion,
     };
     // No source definition, then it will be a feature without any known fields
     if (!source) {
@@ -347,8 +334,8 @@ async function featureToLSFeature(editorFeature, kind) {
                 insertTextMode: InsertTextMode.asIs,
                 insertTextFormat: InsertTextFormat.PlainText,
                 kind: CompletionItemKind.Field,
-                documentation: { kind: "markdown", value: fieldCompletionDescription }
-            }
+                documentation: { kind: "markdown", value: fieldCompletionDescription },
+            },
         });
         if (!field.alias || field.alias.toLowerCase() === field.name.toLowerCase()) {
             return;
@@ -369,8 +356,8 @@ async function featureToLSFeature(editorFeature, kind) {
                 insertTextMode: InsertTextMode.asIs,
                 insertTextFormat: InsertTextFormat.PlainText,
                 kind: CompletionItemKind.Field,
-                documentation: { kind: "markdown", value: aliasCompletionDescription }
-            }
+                documentation: { kind: "markdown", value: aliasCompletionDescription },
+            },
         });
     });
     result.properties = [...fieldProfileValues, ...aliasProfileValues];
@@ -403,8 +390,8 @@ async function dictionaryToLSDictionary(editorDictionary, kind) {
             insertTextMode: InsertTextMode.asIs,
             insertTextFormat: InsertTextFormat.PlainText,
             kind,
-            documentation: { kind: "markdown", value: completionDescription }
-        }
+            documentation: { kind: "markdown", value: completionDescription },
+        },
     };
 }
 /**
@@ -431,9 +418,9 @@ class ProfileItemBase {
             // If the component is under RTL, the string is messed up.
             // It is converted from $feature to feature$, This is not acceptable since the label
             // represents a variable name. We are adding in front of the $ sign a right to left mark.
-            return G(this._label);
+            return addLTRMark(this._label);
         }
-        return Z(this._profile?.intlStrings[this._label.code], this._label.formatValues);
+        return setValuesInString(this._profile?.intlStrings[this._label.code], this._label.formatValues);
     }
     /**
      * Returns the description string.
@@ -445,7 +432,7 @@ class ProfileItemBase {
         if (typeof this.description === "string") {
             return this.description;
         }
-        return Z(this._profile?.intlStrings[this.description.code], this.description.formatValues);
+        return setValuesInString(this._profile?.intlStrings[this.description.code], this.description.formatValues);
     }
     /**
      * Returns true if the item pass the filter test
@@ -622,28 +609,28 @@ class DictionaryVariable extends CollectionBasedVariable {
                 return new FeatureVariable(this, { profile: this._profile, declaration, label: snippet, snippet });
             case "featureSet":
                 return new FeatureSetVariable(this, { profile: this._profile, declaration, label: snippet, snippet }, [
-                    new ValueVariable({ profile: this._profile, label: snippet, description: "", snippet })
+                    new ValueVariable({ profile: this._profile, label: snippet, description: "", snippet }),
                 ]);
             case "featureSetCollection":
                 return new FeatureSetCollectionVariable(this, {
                     profile: this._profile,
                     declaration,
                     label: snippet,
-                    snippet
+                    snippet,
                 });
             case "dictionary":
                 return new DictionaryVariable(this, {
                     profile: this._profile,
                     declaration,
                     label: snippet,
-                    snippet
+                    snippet,
                 });
             case "array":
                 return new ArrayVariable({
                     profile: this._profile,
                     declaration,
                     label: snippet,
-                    snippet
+                    snippet,
                 });
             default:
                 console.error("Editor profile: Invalid profile variable", declaration);
@@ -655,7 +642,7 @@ class DictionaryVariable extends CollectionBasedVariable {
             type: this.type,
             name: "",
             ...this.declaration,
-            properties: this.dictionaryVariables.map((variable) => variable.toProfileVariableDefinition())
+            properties: this.dictionaryVariables.map((variable) => variable.toProfileVariableDefinition()),
         };
     }
 }
@@ -686,7 +673,7 @@ class SourceBasedVariable extends CollectionBasedVariable {
         return this._profile?.intlStrings.layer ?? "layer";
     }
     async loadSource() {
-        if (ee(this._loadPromise) && te(this._loadPromise)) {
+        if (isNotNull(this._loadPromise) && isNotUndefined(this._loadPromise)) {
             return await this._loadPromise;
         }
         this._loadPromise = this._loadSource();
@@ -721,7 +708,7 @@ class SourceBasedVariable extends CollectionBasedVariable {
             description: fieldAlias(field),
             snippet: valueSnippet,
             icon: fieldTypeToIconName(field),
-            filterDescription: true
+            filterDescription: true,
         });
     }
     _getDomainDictionary(field) {
@@ -760,6 +747,7 @@ class SourceBasedVariable extends CollectionBasedVariable {
         // Sepcial case for the subtype field
         if (field.name === this._source.subtypeField) {
             const domainDictionary = this._createDomainDictionary(field);
+            domainDictionary.icon = "subtype";
             domainDictionary.variables.push(this._getTypeOrSubtypeDomainGroup(this._source.subtypes, field));
             return domainDictionary;
         }
@@ -814,7 +802,7 @@ class SourceBasedVariable extends CollectionBasedVariable {
             return null;
         }
         const domainValuesGroup = this._getCodedValueDomainGroup(fieldDomain, {
-            code: "domainvalues"
+            code: "domainvalues",
         });
         const domainDictionary = this._createDomainDictionary(field);
         domainDictionary.variables.push(domainValuesGroup);
@@ -832,7 +820,7 @@ class SourceBasedVariable extends CollectionBasedVariable {
                 profile: this._profile,
                 label: `${label}`,
                 description: t.name,
-                snippet: `"${label}"`
+                snippet: `"${label}"`,
             });
         }) ?? [];
         return new GroupOfVariables(this._profile, { code: "subtypes" }, values);
@@ -843,7 +831,7 @@ class SourceBasedVariable extends CollectionBasedVariable {
             label: `${v.code}`,
             description: v.name,
             snippet: `"${v.code}"`,
-            filterDescription: true
+            filterDescription: true,
         }));
         return new GroupOfVariables(this._profile, label, values);
     }
@@ -869,8 +857,8 @@ class SourceBasedVariable extends CollectionBasedVariable {
                 code: "domainvaluesfortypeformat",
                 formatValues: {
                     fieldName: alias,
-                    typeName: type.name
-                }
+                    typeName: type.name,
+                },
             });
             const id = isSubtypeInstance(type) ? type.code : type.id;
             const label = `${id}`;
@@ -880,7 +868,7 @@ class SourceBasedVariable extends CollectionBasedVariable {
                 label,
                 snippet,
                 description: type.name,
-                declaration: { name: alias }
+                declaration: { name: alias },
             });
             subtypeDictionary.variables = [domainValuesGroup];
             variables.push(subtypeDictionary);
@@ -902,7 +890,7 @@ class SourceBasedVariable extends CollectionBasedVariable {
             description: alias,
             snippet: valueSnippet,
             icon: "form-dropdown",
-            declaration: { name: field.name }
+            declaration: { name: field.name },
         });
         // Add the header group
         const headerGroup = new GroupOfVariables(this._profile, alias, [
@@ -910,8 +898,8 @@ class SourceBasedVariable extends CollectionBasedVariable {
                 profile: this._profile,
                 label: valueSnippet,
                 description: "",
-                snippet: valueSnippet
-            })
+                snippet: valueSnippet,
+            }),
         ]);
         domainDictionary.variables = [headerGroup];
         // Add the SubtypeName or DomainName snippet if available
@@ -921,7 +909,7 @@ class SourceBasedVariable extends CollectionBasedVariable {
                 profile: this._profile,
                 label: subtypeOrDomainNameSnippet,
                 description: "",
-                snippet: subtypeOrDomainNameSnippet
+                snippet: subtypeOrDomainNameSnippet,
             }));
         }
         return domainDictionary;
@@ -951,10 +939,10 @@ class SourceBasedVariable extends CollectionBasedVariable {
                 declaration: { definition: relatedLayer },
                 label: relatedLayer.title,
                 description: "",
-                nonInteractive: true
+                nonInteractive: true,
             }, [new ValueVariable({ profile: this._profile, label: snippet, description: "", snippet })], { exposeRelationships: true, sourceTableId: source.layerId });
         }));
-        relationshipsGroup.variables = relationshipItems.filter(ee);
+        relationshipsGroup.variables = relationshipItems.filter(isNotNull);
         if (!relationshipsGroup.variables.length) {
             return null;
         }
@@ -967,8 +955,8 @@ class FeatureVariable extends SourceBasedVariable {
         this.type = "feature";
     }
     get title() {
-        if (isSupportedLayerInstance(this._source)) {
-            return this._source.title;
+        if (isTitleCapableSource(this._source)) {
+            return this._source.title ?? "";
         }
         return { code: "feature" };
     }
@@ -982,14 +970,14 @@ class FeatureVariable extends SourceBasedVariable {
                 throw new Error("Invalid definition");
             }
             // The title group and snippet
-            const title = isSupportedLayerInstance(this._source) ? this._source.title : "";
+            const title = isTitleCapableSource(this._source) ? this._source.title ?? "" : "";
             this.variables.push(new GroupOfVariables(this._profile, title, [
                 new ValueVariable({
                     profile: this._profile,
                     label: this.snippet,
                     description: "",
-                    snippet: this.snippet
-                })
+                    snippet: this.snippet,
+                }),
             ]));
             // The collection of feature attribute values
             const valuesGroup = new GroupOfVariables(this._profile, { code: "values" });
@@ -1004,7 +992,7 @@ class FeatureVariable extends SourceBasedVariable {
                     description: "Geometry",
                     snippet,
                     icon: "shapes",
-                    filterDescription: true
+                    filterDescription: true,
                 });
                 valuesGroup.variables.push(geometryProperty);
             }
@@ -1017,8 +1005,8 @@ class FeatureVariable extends SourceBasedVariable {
                 this.variables.push(relationshipsGroup);
             }
         }
-        catch (e) {
-            console.error("Loading issue", e, this);
+        catch (error) {
+            console.error("Error with definition", error, this._definition);
             this._source = null;
         }
         finally {
@@ -1040,8 +1028,8 @@ class FeatureSetVariable extends SourceBasedVariable {
         this.type = "featureSet";
     }
     get title() {
-        if (isSupportedLayerInstance(this._source)) {
-            return this._source.title;
+        if (isTitleCapableSource(this._source)) {
+            return this._source.title ?? "";
         }
         return { code: "featureset" };
     }
@@ -1068,8 +1056,8 @@ class FeatureSetVariable extends SourceBasedVariable {
                 this.variables.push(relationshipsGroup);
             }
         }
-        catch (e) {
-            console.error("Loading issue", e, this);
+        catch (error) {
+            console.error("Error with definition", error, this._definition);
             this._source = null;
         }
         finally {
@@ -1118,7 +1106,7 @@ class FeatureSetCollectionVariable extends CollectionBasedVariable {
         return this._profile?.intlStrings.map ?? "map";
     }
     async loadSource() {
-        if (ee(this._loadPromise) && te(this._loadPromise)) {
+        if (isNotNull(this._loadPromise) && isNotUndefined(this._loadPromise)) {
             return await this._loadPromise;
         }
         this._loadPromise = this._loadSource();
@@ -1139,24 +1127,24 @@ class FeatureSetCollectionVariable extends CollectionBasedVariable {
                 : {
                     code: "webmapformat",
                     formatValues: {
-                        webMapTitle: getMapPortalItem(this._featureSetCollections.source)?.title || "Untitled map"
-                    }
+                        webMapTitle: getMapPortalItem(this._featureSetCollections.source)?.title || "Untitled map",
+                    },
                 };
             const headerGroup = new GroupOfVariables(this._profile, groupLabel, [
                 new ValueVariable({
                     profile: this._profile,
                     label: this.snippet,
                     description: "",
-                    snippet: this.snippet
-                })
+                    snippet: this.snippet,
+                }),
             ]);
             // Creates the groups for the layer and tables
             const layersGroup = new GroupOfVariables(this._profile, { code: "layers" }, this._featureSetCollections.layers);
             const tablesGroup = new GroupOfVariables(this._profile, { code: "tables" }, this._featureSetCollections.tables);
             this.variables.push(headerGroup, layersGroup, tablesGroup);
         }
-        catch (e) {
-            console.error("Loading issue", e, this);
+        catch (error) {
+            console.error("Error with definition", error, this._definition);
             this._featureSetCollections = null;
         }
         finally {
@@ -1171,7 +1159,7 @@ class FeatureSetCollectionVariable extends CollectionBasedVariable {
         if (isMapInstance(this._definition)) {
             return await this._featureSetCollectionFromMap(this._definition);
         }
-        if (isSupportedLayerInstance(this._definition)) {
+        if (isUrlDefinition(this._definition)) {
             return await this._featureSetCollectionFromUrl(this._definition.url);
         }
         if (isPortalItemDefinition(this._definition)) {
@@ -1179,10 +1167,6 @@ class FeatureSetCollectionVariable extends CollectionBasedVariable {
             // or Feature Service
             return await this._featureSetCollectionFromPortalItem(this._definition.portalItem);
         }
-        if (isUrlDefinition(this._definition)) {
-            // Assume that the url is pointing to a feature server
-            return await this._featureSetCollectionFromUrl(this._definition.url);
-        }
         return null;
     }
     async _featureSetCollectionFromMap(map) {
@@ -1195,7 +1179,7 @@ class FeatureSetCollectionVariable extends CollectionBasedVariable {
         return {
             layers: this._convertWebMapLayersToVariables(map.layers),
             tables: this._convertWebMapLayersToVariables(map.tables, true),
-            source: map
+            source: map,
         };
     }
     async _featureSetCollectionFromPortalItem(definition) {
@@ -1226,12 +1210,12 @@ class FeatureSetCollectionVariable extends CollectionBasedVariable {
         }
         const metadata = await serviceMetaData(processedUrl);
         const layersPromise = Promise.all(metadata.layers.map(async (layerInfo) => {
-            const featureLayer = await newFeatureLayer({ url: `${processedUrl}/${layerInfo.id}` });
+            const featureLayer = await newLayersFeatureLayer({ url: `${processedUrl}/${layerInfo.id}` });
             await featureLayer.load();
             return this._createFeatureSetVariable(featureLayer);
         }));
         const tablesPromise = Promise.all(metadata.tables.map(async (layerInfo) => {
-            const table = await newFeatureLayer({ url: `${processedUrl}/${layerInfo.id}` });
+            const table = await newLayersFeatureLayer({ url: `${processedUrl}/${layerInfo.id}` });
             await table.load();
             return this._createFeatureSetVariable(table);
         }));
@@ -1261,9 +1245,11 @@ class FeatureSetCollectionVariable extends CollectionBasedVariable {
         return new FeatureSetVariable(this, {
             profile: this._profile,
             declaration: { name: featureLayer.title, definition: featureLayer },
-            label: featureLayer.title,
+            label: isFromWebMap
+                ? featureLayer.title
+                : featureLayer.sourceJSON.name ?? featureLayer.title,
             description: "",
-            nonInteractive: true
+            nonInteractive: true,
         }, this._makeFeatureSetSnippets(featureLayer, isFromWebMap));
     }
     _makeFeatureSetSnippets(featureLayer, isFromWebMap = false) {
@@ -1275,7 +1261,7 @@ class FeatureSetCollectionVariable extends CollectionBasedVariable {
             const snippetByName = `FeatureSetByName(${this.snippet}, "${featureLayer.title}")`;
             return [
                 new ValueVariable({ profile: this._profile, label: snippetById, description: "", snippet: snippetById }),
-                new ValueVariable({ profile: this._profile, label: snippetByName, description: "", snippet: snippetByName })
+                new ValueVariable({ profile: this._profile, label: snippetByName, description: "", snippet: snippetByName }),
             ];
         }
         else {
@@ -1300,7 +1286,7 @@ class EditorProfile extends DictionaryVariable {
         // Delay the load of the variable declarations so we have a `this`
         super(undefined, {
             profile: null,
-            declaration: { properties: [] }
+            declaration: { properties: [] },
         });
         this.definition = definition;
         this.intlStrings = intlStrings;
@@ -1332,28 +1318,20 @@ class EditorProfile extends DictionaryVariable {
     toEditorProfileDefinition() {
         return {
             ...this.definition,
-            variables: this.dictionaryVariables.map((variable) => variable.toProfileVariableDefinition())
+            variables: this.dictionaryVariables.map((variable) => variable.toProfileVariableDefinition()),
         };
     }
 }
 //#endregion
 
 function isFeatureDefinition(item) {
-    return (isSupportedLayerInstance(item) ||
-        isFeatureSetInstance(item) ||
-        isUrlDefinition(item) ||
-        isFieldsDefinition(item) ||
-        isFeatureLayerItemDefinition(item));
+    return isUrlDefinition(item) || isFieldsDefinition(item) || isFeatureLayerItemDefinition(item);
 }
 function isFeatureSetDefinition(item) {
-    return (isQueryableLayerInstance(item) ||
-        isFeatureSetInstance(item) ||
-        isUrlDefinition(item) ||
-        isFieldsDefinition(item) ||
-        isFeatureLayerItemDefinition(item));
+    return isUrlDefinition(item) || isFieldsDefinition(item) || isFeatureLayerItemDefinition(item);
 }
 function isFeatureSetCollectionDefinition(item) {
-    return isPortalItemDefinition(item) || isMapInstance(item) || isFeatureSetDefinition(item);
+    return isPortalItemDefinition(item) || isMapInstance(item) || isSupportedServiceUrlDefinition(item);
 }
 /**
  * Get a PredefinedProfile for a locale. If not already loaded then fetch it.
@@ -1365,7 +1343,7 @@ async function getSdkPredefinedProfiles(locale = "en") {
     if (profiles) {
         return profiles;
     }
-    if (!E.has(locale)) {
+    if (!supportedLocales.has(locale)) {
         return await getSdkPredefinedProfiles("en");
     }
     try {
@@ -1403,7 +1381,7 @@ function isExtendedPredefinedProfileDefinition(item) {
     return !!item && typeof item === "object" && "additionalVariables" in item && Array.isArray(item.additionalVariables);
 }
 function convertApiVariables(variables) {
-    return variables.map(convertApiVariable);
+    return variables?.map(convertApiVariable);
 }
 function convertApiVariable(variable) {
     switch (variable.type) {
@@ -1411,13 +1389,13 @@ function convertApiVariable(variable) {
             return {
                 ...variable,
                 type: variable.type,
-                properties: convertApiVariables(variable.properties)
+                properties: convertApiVariables(variable.properties),
             };
         case "array": {
             return {
                 ...variable,
                 type: variable.type,
-                elementType: { type: "number", name: "number" }
+                elementType: { type: "number", name: "number" },
             };
         }
         default:
@@ -1435,43 +1413,47 @@ async function convertToEditorProfileDefinition(predefinedProfile, locale = "en"
     const editorProfile = {
         bundles: [...sdkPredefinedProfile.bundles],
         variables: [],
-        hiddenApiItems: predefinedProfile.hiddenApiItems?.map((s) => s.toLowerCase())
+        hiddenApiItems: predefinedProfile.hiddenApiItems?.map((s) => s.toLowerCase()),
     };
     // Merge the SDK variables' definitions/properties with the predefined profile definitions.
-    sdkPredefinedProfile.variables.forEach((sdkVariable) => {
+    sdkPredefinedProfile.variables.forEach((predefinedVariable) => {
         // Don't include disabled variables
-        if (predefinedProfile.disabledVariables?.includes(sdkVariable.name)) {
+        if (predefinedProfile.disabledVariables?.includes(predefinedVariable.name)) {
             return;
         }
-        // Try to get a definition from the predefined profile.
-        const definition = predefinedProfile.definitions[sdkVariable.name];
+        // Try to get a definition from the predefined profile, for the variable that needs one.
+        const definition = predefinedProfile.definitions[predefinedVariable.name];
         // Note: Something is weird with TS. The sdkVariables are being casted to the wrong type
         // despite the type checking from the switch statement.
-        switch (sdkVariable.type) {
-            case "dictionary":
+        switch (predefinedVariable.type) {
+            case "dictionary": {
                 // For dictionary, we support properties overrride
                 return editorProfile.variables.push(convertApiVariable({
-                    ...sdkVariable,
-                    type: sdkVariable.type,
-                    properties: Array.isArray(definition) ? [...definition] : sdkVariable.properties
+                    ...predefinedVariable,
+                    type: predefinedVariable.type,
+                    properties: Array.isArray(definition) ? [...definition] : predefinedVariable.properties,
                 }));
+            }
             case "feature":
-                if (isFeatureDefinition(definition)) {
-                    return editorProfile.variables.push({ ...sdkVariable, type: sdkVariable.type, definition });
+                // If the definition is not valid, then we don't include it.
+                if (!isFeatureDefinition(definition)) {
+                    return;
                 }
-                return editorProfile.variables.push({ ...sdkVariable, type: sdkVariable.type });
+                return editorProfile.variables.push({ ...predefinedVariable, type: predefinedVariable.type, definition });
             case "featureSet":
-                if (isFeatureSetDefinition(definition)) {
-                    return editorProfile.variables.push({ ...sdkVariable, type: sdkVariable.type, definition });
+                // If the definition is not valid, then we don't include it.
+                if (!isFeatureSetDefinition(definition)) {
+                    return;
                 }
-                return editorProfile.variables.push({ ...sdkVariable, type: sdkVariable.type });
+                return editorProfile.variables.push({ ...predefinedVariable, type: predefinedVariable.type, definition });
             case "featureSetCollection":
-                if (isFeatureSetCollectionDefinition(definition)) {
-                    return editorProfile.variables.push({ ...sdkVariable, type: sdkVariable.type, definition });
+                // If the definition is not valid, then we don't include it.
+                if (!isFeatureSetCollectionDefinition(definition)) {
+                    return;
                 }
-                return editorProfile.variables.push({ ...sdkVariable, type: sdkVariable.type });
+                return editorProfile.variables.push({ ...predefinedVariable, type: predefinedVariable.type, definition });
             default:
-                return editorProfile.variables.push(convertApiVariable(sdkVariable));
+                return editorProfile.variables.push(convertApiVariable(predefinedVariable));
         }
     });
     if (isExtendedPredefinedProfileDefinition(predefinedProfile)) {
@@ -1482,7 +1464,7 @@ async function convertToEditorProfileDefinition(predefinedProfile, locale = "en"
 
 const arcadeLanguageId = "arcade";
 const defaultContext = {
-    locale: "en"
+    locale: "en",
 };
 class ArcadeLanguageServiceDefaults {
     constructor() {
@@ -1536,7 +1518,7 @@ class ArcadeLanguageServiceDefaults {
         if (isPredefinedProfile(definition)) {
             definition = await convertToEditorProfileDefinition(definition, apiContext.locale);
         }
-        const intlStrings = await v(apiContext.locale, getAssetPath("./assets/arcade-language/t9n"), "profile.t9n.");
+        const intlStrings = await fetchT9NStringsBundle(apiContext.locale, getAssetPath("./assets/arcade-language/t9n"), "profile.t9n.");
         if (!intlStrings) {
             throw new Error(`Failed to load the language bundle for ${apiContext.locale}`);
         }
@@ -1548,7 +1530,7 @@ class ArcadeLanguageServiceDefaults {
         this.updateApiContextForModel(modelId, {
             locale: apiContext.locale,
             profile: apiProfile,
-            snippets: apiContext.snippets
+            snippets: apiContext.snippets,
         });
     }
     /**
@@ -1615,7 +1597,7 @@ class ArcadeLanguageServiceDefaults {
 }
 const arcadeDefaults = new ArcadeLanguageServiceDefaults();
 const arcade = {
-    setProfileForModel: arcadeDefaults.setProfileForModel.bind(arcadeDefaults)
+    setProfileForModel: arcadeDefaults.setProfileForModel.bind(arcadeDefaults),
 };
 
 export { arcade as a, arcadeDefaults as b };