@arcgis/coding-components 4.31.0-next.3 → 4.31.0-next.30

package/dist/components/language-defaults-base.js

@@ -1,39 +1,32 @@
 /*!
  * All material copyright Esri, All Rights Reserved, unless otherwise specified.
  * See https://js.arcgis.com/4.31/esri/copyright.txt for details.
- * v4.31.0-next.3
+ * v4.31.0-next.30
  */
-import { CompletionItemKind, InsertTextMode, InsertTextFormat } from 'vscode-languageserver-types';
+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 fieldTypeToApiValueVarType } from './fields.js';
 import { p as portalItemPageUrl } from './utilities.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 { i as isNotNull, a as isNotUndefined, b as addLTRMark, s as setValuesInString, c as supportedLocales } from './index2.js';
+import { i as isNotNull, a as isNotUndefined, b as addLTRMark, c as setValuesInString } from './index2.js';
+import { InsertTextMode, InsertTextFormat, CompletionItemKind } from 'vscode-languageserver-types';
 import { Emitter, Uri } from 'monaco-editor';
-import { getArcgisAssetPath as getAssetPath } from "./arcgis-assets.js";
 
 //#region Type Guards
-function isQueryableLayerInstance(item) {
+function isFeatureLayerLikeInstance(item) {
     return (!!item &&
         typeof item === "object" &&
         "declaredClass" in item &&
         typeof item.declaredClass === "string" &&
         item.declaredClass.startsWith("esri.layers.") &&
-        "fields" in item &&
+        isFieldsDefinition(item) &&
         "queryFeatures" in item &&
         typeof item.queryFeatures === "function");
 }
-function isSubtypeSublayerInstance(item) {
+function isGroupLayerCapable(item) {
     return (!!item &&
         typeof item === "object" &&
-        "declaredClass" in item &&
-        typeof item.declaredClass === "string" &&
-        item.declaredClass === "esri.layers.support.SubtypeSublayer");
-}
-function isGroupLayerInstance(item) {
-    return (!!item &&
-        typeof item === "object" &&
-        "declaredClass" in item &&
-        typeof item.declaredClass === "string" &&
-        item.declaredClass === "esri.layers.GroupLayer");
+        "allLayers" in item &&
+        "allTables" in item &&
+        typeof item.allLayers === "object" &&
+        typeof item.allTables === "object");
 }
 function isMapInstance(item) {
     return (!!item &&
@@ -44,14 +37,8 @@ function isMapInstance(item) {
             item.declaredClass === "esri.WebMap" ||
             item.declaredClass === "esri.WebScene"));
 }
-function isWebMapInstance(item) {
-    return item.declaredClass === "esri.WebMap";
-}
-function isWebSceneInstance(item) {
-    return item.declaredClass === "esri.WebScene";
-}
-function isLoadableMapInstance(item) {
-    return item.declaredClass === "esri.WebMap" || item.declaredClass === "esri.WebScene";
+function isLoadAllCapable(item) {
+    return !!item && typeof item === "object" && "loadAll" in item && typeof item.loadAll === "function";
 }
 function isPortalItemDefinition(item) {
     return !!item && typeof item === "object" && "portalItem" in item && item.portalItem != null;
@@ -68,6 +55,15 @@ function isUrlDefinition(item) {
 function isSupportedServiceUrlDefinition(item) {
     return isUrlDefinition(item) && /\/(?:featureserver|mapserver)(?:\/|$)/iu.test(item.url);
 }
+function isFeatureDefinition(item) {
+    return isUrlDefinition(item) || isFieldsDefinition(item) || isFeatureLayerItemDefinition(item);
+}
+function isFeatureSetDefinition(item) {
+    return isUrlDefinition(item) || isFieldsDefinition(item) || isFeatureLayerItemDefinition(item);
+}
+function isFeatureSetCollectionDefinition(item) {
+    return isPortalItemDefinition(item) || isMapInstance(item) || isSupportedServiceUrlDefinition(item);
+}
 function isSubtypeInstance(item) {
     return (!!item &&
         typeof item === "object" &&
@@ -116,6 +112,9 @@ function isSubtypeFieldCapableLayer(item) {
 function isSubtypesCapableLayer(item) {
     return isSubtypeFieldCapableLayer(item) && "subtypes" in item;
 }
+function isPortalItemCapable(item) {
+    return !!item && typeof item === "object" && "portalItem" in item;
+}
 function isRelationshipsCapableLayer(item) {
     return (isLayerIdCapableSource(item) &&
         "relationships" in item &&
@@ -196,14 +195,6 @@ function sortFields(layer) {
         if (secondField.type === "oid") {
             return 1;
         }
-        if (isSubtypeSublayerInstance(layer)) {
-            if (firstField.name === layer.parent.subtypeField) {
-                return -1;
-            }
-            if (secondField.name === layer.parent.subtypeField) {
-                return 1;
-            }
-        }
         if (isSubtypeFieldCapableLayer(layer)) {
             if (firstField.name === layer.subtypeField) {
                 return -1;
@@ -241,86 +232,28 @@ function assembleMemberExpression(obj, prop) {
     return `${obj}${getMemberExpressionProperty(prop)}`;
 }
 function getMapPortalItem(map) {
-    if (isWebMapInstance(map) || isWebSceneInstance(map)) {
+    if (isPortalItemCapable(map)) {
         return map.portalItem;
     }
     return null;
 }
-//#endregion
-//#region Editor Profile to Language Service Profile functions
-async function variablesToLSVariable(editorVariables, kind = CompletionItemKind.Variable) {
-    return await Promise.all(editorVariables.map(async (editorVariable) => {
-        switch (editorVariable.type) {
-            case "dictionary":
-                return await dictionaryToLSDictionary(editorVariable, kind);
-            case "feature":
-                return await featureToLSFeature(editorVariable, kind);
-            default:
-                return variableToLSVariable(editorVariable, kind);
-        }
-    }));
-}
-function variableToLSVariable(editorVariable, kind) {
-    const { name, type } = editorVariable;
-    const description = editorVariable.getDescription();
-    return {
-        name,
-        description,
-        type,
-        completion: {
-            label: name,
-            detail: name,
-            insertText: name,
-            insertTextMode: InsertTextMode.asIs,
-            insertTextFormat: InsertTextFormat.PlainText,
-            kind,
-            documentation: { kind: "markdown", value: description },
-        },
-    };
-}
-async function featureToLSFeature(editorFeature, kind) {
-    // Get the source for the definition
-    const source = await editorFeature.loadSource();
-    const { name } = editorFeature;
-    const description = editorFeature.getDescription();
-    const resultCompletion = {
-        label: name,
-        detail: name,
-        insertText: name,
-        insertTextMode: InsertTextMode.asIs,
-        insertTextFormat: InsertTextFormat.PlainText,
-        kind,
-    };
-    const result = {
-        name,
-        description,
-        type: "dictionary",
-        properties: [],
-        completion: resultCompletion,
-    };
-    // No source definition, then it will be a feature without any known fields
-    if (!source) {
-        return result;
-    }
-    // Create properties for the fields and the aliases
-    // Also improve the feature completion documentation
-    let featureCompletionDescription = description;
+/**
+ * converts fields to profile values and calculates the feature completion description all in one iteration
+ */
+function fieldsToProfileValues(fields, initialFeatureCompletionDescription, includeAliases = false) {
+    let featureCompletionDescription = initialFeatureCompletionDescription;
     const fieldProfileValues = [];
     const aliasProfileValues = [];
-    supportedFields(source.fields).forEach((field) => {
-        let fieldCompletionDescription = `**${field.name}**  \n${field.type}`;
-        if (field.description) {
-            fieldCompletionDescription += `  \n'${field.description}`;
-        }
+    supportedFields(fields).forEach((field) => {
         if (featureCompletionDescription) {
             featureCompletionDescription += "  \n  \n";
         }
-        featureCompletionDescription += `**${field.name}** (${fieldAlias(field)})  \n${field.type}`;
+        featureCompletionDescription += `**${field.name}** (${field.alias})  \n${field.type}`;
         if (field.description) {
             featureCompletionDescription += `  \n'${field.description}`;
         }
         // The property for the field
-        const type = fieldTypeToArcadeType(field);
+        const type = fieldTypeToApiValueVarType(field);
         const insertText = getMemberExpressionProperty(field.name, false);
         const description = fieldAlias(field);
         fieldProfileValues.push({
@@ -334,65 +267,35 @@ async function featureToLSFeature(editorFeature, kind) {
                 insertTextMode: InsertTextMode.asIs,
                 insertTextFormat: InsertTextFormat.PlainText,
                 kind: CompletionItemKind.Field,
-                documentation: { kind: "markdown", value: fieldCompletionDescription },
             },
         });
-        if (!field.alias || field.alias.toLowerCase() === field.name.toLowerCase()) {
-            return;
-        }
-        // The property for the alias if different than the field name
-        let aliasCompletionDescription = `**${field.alias}**  \n${field.type}`;
-        if (field.description) {
-            aliasCompletionDescription += `  \n'${field.description}`;
+        if (includeAliases) {
+            if (!field.alias || field.alias.toLowerCase() === field.name.toLowerCase()) {
+                return;
+            }
+            // The property for the alias if different than the field name
+            let aliasCompletionDescription = `**${field.alias}**  \n${field.type}`;
+            if (field.description) {
+                aliasCompletionDescription += `  \n'${field.description}`;
+            }
+            aliasProfileValues.push({
+                name: field.alias,
+                description: field.name,
+                type,
+                completion: {
+                    label: field.alias,
+                    detail: field.name,
+                    insertText,
+                    insertTextMode: InsertTextMode.asIs,
+                    insertTextFormat: InsertTextFormat.PlainText,
+                    kind: CompletionItemKind.Field,
+                    documentation: { kind: "markdown", value: aliasCompletionDescription },
+                },
+            });
         }
-        aliasProfileValues.push({
-            name: field.alias,
-            description: field.name,
-            type,
-            completion: {
-                label: field.alias,
-                detail: field.name,
-                insertText,
-                insertTextMode: InsertTextMode.asIs,
-                insertTextFormat: InsertTextFormat.PlainText,
-                kind: CompletionItemKind.Field,
-                documentation: { kind: "markdown", value: aliasCompletionDescription },
-            },
-        });
     });
-    result.properties = [...fieldProfileValues, ...aliasProfileValues];
-    resultCompletion.documentation = { kind: "markdown", value: featureCompletionDescription };
-    return result;
-}
-async function dictionaryToLSDictionary(editorDictionary, kind) {
-    const { name, dictionaryVariables: variables } = editorDictionary;
-    const description = editorDictionary.getDescription();
-    const completionDescription = variables.reduce((previous, p) => {
-        if (previous !== "") {
-            previous += "  \n  \n";
-        }
-        previous += `**${p.name}**  \n${p.type}`;
-        const description = p.getDescription();
-        if (description) {
-            previous += `  \n${description}`;
-        }
-        return previous;
-    }, description);
-    return {
-        name,
-        description,
-        type: "dictionary",
-        properties: await variablesToLSVariable(variables, CompletionItemKind.Field),
-        completion: {
-            label: name,
-            detail: name,
-            insertText: name,
-            insertTextMode: InsertTextMode.asIs,
-            insertTextFormat: InsertTextFormat.PlainText,
-            kind,
-            documentation: { kind: "markdown", value: completionDescription },
-        },
-    };
+    const properties = [...fieldProfileValues, ...aliasProfileValues];
+    return [properties, featureCompletionDescription];
 }
 /**
  * Represents a item in the EditorProfile. The profile is converted into an optimized way for
@@ -926,7 +829,7 @@ class SourceBasedVariable extends CollectionBasedVariable {
         const relationshipsGroup = new GroupOfVariables(this._profile, { code: "relationships" });
         const relationshipItems = await Promise.all(source.relationships.map(async (relationship) => {
             const relatedLayer = await getRelatedFeatureLayer(source, relationship);
-            if (!isQueryableLayerInstance(relatedLayer)) {
+            if (!isFeatureLayerLikeInstance(relatedLayer)) {
                 return null;
             }
             if (relationship.relatedTableId === this.relationshipsProperties?.sourceTableId) {
@@ -970,7 +873,7 @@ class FeatureVariable extends SourceBasedVariable {
                 throw new Error("Invalid definition");
             }
             // The title group and snippet
-            const title = isTitleCapableSource(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,
@@ -1097,13 +1000,14 @@ class FeatureSetCollectionVariable extends CollectionBasedVariable {
         if (typeof this._featureSetCollections.source === "string") {
             return this._profile?.intlStrings.featureservice ?? "featureservice";
         }
-        if (isWebSceneInstance(this._featureSetCollections.source)) {
-            return this._profile?.intlStrings.webscene ?? "webscene";
-        }
-        if (isWebMapInstance(this._featureSetCollections.source)) {
-            return this._profile?.intlStrings.webmap ?? "webmap";
+        switch (this._featureSetCollections.source.declaredClass) {
+            case "esri.WebMap":
+                return this._profile?.intlStrings.webmap ?? "webmap";
+            case "esri.WebScene":
+                return this._profile?.intlStrings.webscene ?? "webscene";
+            default:
+                return this._profile?.intlStrings.map ?? "map";
         }
-        return this._profile?.intlStrings.map ?? "map";
     }
     async loadSource() {
         if (isNotNull(this._loadPromise) && isNotUndefined(this._loadPromise)) {
@@ -1170,7 +1074,7 @@ class FeatureSetCollectionVariable extends CollectionBasedVariable {
         return null;
     }
     async _featureSetCollectionFromMap(map) {
-        if (isLoadableMapInstance(map)) {
+        if (isLoadAllCapable(map)) {
             // Make sure the map is loaded
             await map.loadAll();
         }
@@ -1228,11 +1132,11 @@ class FeatureSetCollectionVariable extends CollectionBasedVariable {
             .toArray()
             .reverse()
             .forEach((layer) => {
-            if (isQueryableLayerInstance(layer)) {
+            if (isFeatureLayerLikeInstance(layer)) {
                 layerVariables.push(this._createFeatureSetVariable(layer, true));
                 return;
             }
-            if (isGroupLayerInstance(layer)) {
+            if (isGroupLayerCapable(layer)) {
                 const groupLayerVariables = filteringTables
                     ? this._convertWebMapLayersToVariables(layer.allTables, true)
                     : this._convertWebMapLayersToVariables(layer.allLayers);
@@ -1241,31 +1145,31 @@ class FeatureSetCollectionVariable extends CollectionBasedVariable {
         });
         return layerVariables;
     }
-    _createFeatureSetVariable(featureLayer, isFromWebMap = false) {
+    _createFeatureSetVariable(featureLayerLike, isFromWebMap = false) {
         return new FeatureSetVariable(this, {
             profile: this._profile,
-            declaration: { name: featureLayer.title, definition: featureLayer },
+            declaration: { name: featureLayerLike.title, definition: featureLayerLike },
             label: isFromWebMap
-                ? featureLayer.title
-                : featureLayer.sourceJSON.name ?? featureLayer.title,
+                ? featureLayerLike.title
+                : (featureLayerLike.sourceJSON.name ?? featureLayerLike.title),
             description: "",
             nonInteractive: true,
-        }, this._makeFeatureSetSnippets(featureLayer, isFromWebMap));
+        }, this._makeFeatureSetSnippets(featureLayerLike, isFromWebMap));
     }
-    _makeFeatureSetSnippets(featureLayer, isFromWebMap = false) {
+    _makeFeatureSetSnippets(featureLayerLike, isFromWebMap = false) {
         if (!this._profile?.supportFeatureSetFunctions) {
             return [];
         }
         if (isFromWebMap) {
-            const snippetById = `FeatureSetById(${this.snippet}, "${featureLayer.id}")`;
-            const snippetByName = `FeatureSetByName(${this.snippet}, "${featureLayer.title}")`;
+            const snippetById = `FeatureSetById(${this.snippet}, "${featureLayerLike.id}")`;
+            const snippetByName = `FeatureSetByName(${this.snippet}, "${featureLayerLike.title}")`;
             return [
                 new ValueVariable({ profile: this._profile, label: snippetById, description: "", snippet: snippetById }),
                 new ValueVariable({ profile: this._profile, label: snippetByName, description: "", snippet: snippetByName }),
             ];
         }
         else {
-            const snippetById = `FeatureSetById(${this.snippet}, "${featureLayer.layerId}")`;
+            const snippetById = `FeatureSetById(${this.snippet}, "${featureLayerLike.layerId}")`;
             return [new ValueVariable({ profile: this._profile, label: snippetById, description: "", snippet: snippetById })];
         }
     }
@@ -1303,14 +1207,6 @@ class EditorProfile extends DictionaryVariable {
     get supportFeatureSetFunctions() {
         return this.definition?.bundles?.includes("data-access") ?? false;
     }
-    /**
-     * Returns the language service profile. It is different than the editor profile as it is optimized for Monaco.
-     */
-    async toLSProfile() {
-        const { apiVersion, bundles, hiddenApiItems } = this.definition ?? {};
-        const variables = await variablesToLSVariable(this.dictionaryVariables);
-        return { apiVersion, bundles, variables, hiddenApiItems: hiddenApiItems?.map((s) => s.toLowerCase()) };
-    }
     /**
      * Returns the EditorProfile as a json. The EditorProfile may have been updated. This function allows to
      * get the new json representing mutations.
@@ -1324,144 +1220,6 @@ class EditorProfile extends DictionaryVariable {
 }
 //#endregion
 
-function isFeatureDefinition(item) {
-    return isUrlDefinition(item) || isFieldsDefinition(item) || isFeatureLayerItemDefinition(item);
-}
-function isFeatureSetDefinition(item) {
-    return isUrlDefinition(item) || isFieldsDefinition(item) || isFeatureLayerItemDefinition(item);
-}
-function isFeatureSetCollectionDefinition(item) {
-    return isPortalItemDefinition(item) || isMapInstance(item) || isSupportedServiceUrlDefinition(item);
-}
-/**
- * Get a PredefinedProfile for a locale. If not already loaded then fetch it.
- * If the locale doesn't exist or the locale profile file doesn't exist then returns
- * the english version of the profile.
- */
-async function getSdkPredefinedProfiles(locale = "en") {
-    const profiles = sdkPredefinedProfilesMap.get(locale);
-    if (profiles) {
-        return profiles;
-    }
-    if (!supportedLocales.has(locale)) {
-        return await getSdkPredefinedProfiles("en");
-    }
-    try {
-        const response = await fetch(getAssetPath(`./assets/arcade-language/profiles/arcade-profiles.t9n.${locale}.json`));
-        if (response.ok) {
-            return cacheSdkPredefinedProfiles(locale, (await response.json()));
-        }
-        if (locale === "en") {
-            return null;
-        }
-        return await getSdkPredefinedProfiles("en");
-    }
-    catch {
-        return null;
-    }
-}
-const sdkPredefinedProfilesMap = new Map();
-/**
- * Convert a stored profile into a PredefinedProfile and add it to the in-memory
- * Map of profiles per locale.
- */
-function cacheSdkPredefinedProfiles(locale, profiles) {
-    const map = new Map();
-    profiles.forEach((profile) => {
-        map.set(profile.id, profile);
-    });
-    sdkPredefinedProfilesMap.set(locale, map);
-    return map;
-}
-async function getSdkPredefinedProfile(id, locale = "en") {
-    const profiles = await getSdkPredefinedProfiles(locale);
-    return profiles?.get(id) ?? null;
-}
-function isExtendedPredefinedProfileDefinition(item) {
-    return !!item && typeof item === "object" && "additionalVariables" in item && Array.isArray(item.additionalVariables);
-}
-function convertApiVariables(variables) {
-    return variables?.map(convertApiVariable);
-}
-function convertApiVariable(variable) {
-    switch (variable.type) {
-        case "dictionary":
-            return {
-                ...variable,
-                type: variable.type,
-                properties: convertApiVariables(variable.properties),
-            };
-        case "array": {
-            return {
-                ...variable,
-                type: variable.type,
-                elementType: { type: "number", name: "number" },
-            };
-        }
-        default:
-            return { ...variable, type: variable.type };
-    }
-}
-async function convertToEditorProfileDefinition(predefinedProfile, locale = "en") {
-    if (!isPredefinedProfile(predefinedProfile)) {
-        return undefined;
-    }
-    const sdkPredefinedProfile = await getSdkPredefinedProfile(predefinedProfile.id, locale);
-    if (!sdkPredefinedProfile) {
-        return undefined;
-    }
-    const editorProfile = {
-        bundles: [...sdkPredefinedProfile.bundles],
-        variables: [],
-        hiddenApiItems: predefinedProfile.hiddenApiItems?.map((s) => s.toLowerCase()),
-    };
-    // Merge the SDK variables' definitions/properties with the predefined profile definitions.
-    sdkPredefinedProfile.variables.forEach((predefinedVariable) => {
-        // Don't include disabled variables
-        if (predefinedProfile.disabledVariables?.includes(predefinedVariable.name)) {
-            return;
-        }
-        // 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 (predefinedVariable.type) {
-            case "dictionary": {
-                // For dictionary, we support properties overrride
-                return editorProfile.variables.push(convertApiVariable({
-                    ...predefinedVariable,
-                    type: predefinedVariable.type,
-                    properties: Array.isArray(definition) ? [...definition] : predefinedVariable.properties,
-                }));
-            }
-            case "feature":
-                // If the definition is not valid, then we don't include it.
-                if (!isFeatureDefinition(definition)) {
-                    return;
-                }
-                return editorProfile.variables.push({ ...predefinedVariable, type: predefinedVariable.type, definition });
-            case "featureSet":
-                // If the definition is not valid, then we don't include it.
-                if (!isFeatureSetDefinition(definition)) {
-                    return;
-                }
-                return editorProfile.variables.push({ ...predefinedVariable, type: predefinedVariable.type, definition });
-            case "featureSetCollection":
-                // If the definition is not valid, then we don't include it.
-                if (!isFeatureSetCollectionDefinition(definition)) {
-                    return;
-                }
-                return editorProfile.variables.push({ ...predefinedVariable, type: predefinedVariable.type, definition });
-            default:
-                return editorProfile.variables.push(convertApiVariable(predefinedVariable));
-        }
-    });
-    if (isExtendedPredefinedProfileDefinition(predefinedProfile)) {
-        editorProfile.variables.push(...(predefinedProfile.additionalVariables ?? []));
-    }
-    return editorProfile;
-}
-
 // this file contains the building blocks for a language default provider
 const defaultContext = {
     locale: "en",
@@ -1548,4 +1306,4 @@ class LanguageDefaultsBase {
     }
 }
 
-export { EditorProfile as E, LanguageDefaultsBase as L, isFeatureSetDefinition as a, convertToEditorProfileDefinition as c, isPredefinedProfile as i };
+export { EditorProfile as E, LanguageDefaultsBase as L, isFeatureSetCollectionDefinition as a, isFeatureSetDefinition as b, isFeatureDefinition as c, fieldsToProfileValues as f, isPredefinedProfile as i };

package/dist/components/markdown.js

@@ -1,7 +1,7 @@
 /*!
  * All material copyright Esri, All Rights Reserved, unless otherwise specified.
  * See https://js.arcgis.com/4.31/esri/copyright.txt for details.
- * v4.31.0-next.3
+ * v4.31.0-next.30
  */
 import { editor } from 'monaco-editor';
 import { StandaloneServices } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';