@arcgis/coding-components 4.29.0-beta.69 → 4.29.0-beta.70

package/dist/cjs/arcgis-arcade-api_6.cjs.entry.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const index = require('./index-ac186201.js');
-const arcadeDefaults = require('./arcade-defaults-51a9667c.js');
+const arcadeDefaults = require('./arcade-defaults-82737060.js');
 
 async function colorizeCode(code) {
     return await arcadeDefaults.editor.colorize(code, "arcade", { tabSize: 2 });
@@ -3019,7 +3019,7 @@ async function getArcadeWorker(uri) {
  * @returns mode for arcade
  */
 async function getMode() {
-    return await Promise.resolve().then(function () { return require('./arcade-mode-7705211c.js'); });
+    return await Promise.resolve().then(function () { return require('./arcade-mode-b21b24cc.js'); });
 }
 // Register the language in Monaco
 arcadeDefaults.languages.register({

package/dist/cjs/{cssMode-1569c17b.js → cssMode-bc43621f.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-const arcadeDefaults = require('./arcade-defaults-51a9667c.js');
+const arcadeDefaults = require('./arcade-defaults-82737060.js');
 require('./index-ac186201.js');
 
 /*!-----------------------------------------------------------------------------

package/dist/cjs/{html-198d0fbe.js → html-4a747b36.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-const arcadeDefaults = require('./arcade-defaults-51a9667c.js');
+const arcadeDefaults = require('./arcade-defaults-82737060.js');
 require('./index-ac186201.js');
 
 /*!-----------------------------------------------------------------------------

package/dist/cjs/{htmlMode-cb94b682.js → htmlMode-c11513d8.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-const arcadeDefaults = require('./arcade-defaults-51a9667c.js');
+const arcadeDefaults = require('./arcade-defaults-82737060.js');
 require('./index-ac186201.js');
 
 /*!-----------------------------------------------------------------------------

package/dist/cjs/index.cjs.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const arcadeDefaults = require('./arcade-defaults-51a9667c.js');
+const arcadeDefaults = require('./arcade-defaults-82737060.js');
 require('./index-ac186201.js');
 
 

package/dist/cjs/{javascript-c39cbb25.js → javascript-51f1b49d.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-const typescript = require('./typescript-ee8ec13b.js');
-require('./arcade-defaults-51a9667c.js');
+const typescript = require('./typescript-795a538e.js');
+require('./arcade-defaults-82737060.js');
 require('./index-ac186201.js');
 
 /*!-----------------------------------------------------------------------------

package/dist/cjs/{jsonMode-23c556fc.js → jsonMode-3985bbe9.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-const arcadeDefaults = require('./arcade-defaults-51a9667c.js');
+const arcadeDefaults = require('./arcade-defaults-82737060.js');
 require('./index-ac186201.js');
 
 /*!-----------------------------------------------------------------------------

package/dist/cjs/{tsMode-f2bafe49.js → tsMode-b2b3fb82.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-const arcadeDefaults = require('./arcade-defaults-51a9667c.js');
+const arcadeDefaults = require('./arcade-defaults-82737060.js');
 require('./index-ac186201.js');
 
 /*!-----------------------------------------------------------------------------

package/dist/cjs/{typescript-ee8ec13b.js → typescript-795a538e.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-const arcadeDefaults = require('./arcade-defaults-51a9667c.js');
+const arcadeDefaults = require('./arcade-defaults-82737060.js');
 require('./index-ac186201.js');
 
 /*!-----------------------------------------------------------------------------

package/dist/components/arcade-defaults.js

@@ -1,5 +1,5 @@
 import { Emitter, Uri } from 'monaco-editor';
-import { InsertTextMode, InsertTextFormat, CompletionItemKind } from 'vscode-languageserver-types';
+import { CompletionItemKind, InsertTextMode, InsertTextFormat } from 'vscode-languageserver-types';
 import { i as importPortalPortalItem, a as importLayersFeatureLayer, b as importWebMap, s as supportedFields, c as importRequest, f as fieldTypeToIconName, d as fieldTypeToArcadeType } from './fields.js';
 import { p as portalItemPageUrl } from './utilities.js';
 import { V, X, G, D, E, N } from './index2.js';
@@ -21,122 +21,87 @@ async function newWebMap(definition) {
 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" &&
-        "declaredClass" in item &&
         typeof item.declaredClass === "string" &&
         item.declaredClass.startsWith("esri.layers.") &&
         "fields" in item &&
-        "queryFeatures" in item &&
         typeof item.queryFeatures === "function");
 }
-function isSubtypeSublayerInstance(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");
 }
 function isWebMapInstance(item) {
-    return (!!item &&
-        typeof item === "object" &&
-        "declaredClass" in item &&
-        typeof item.declaredClass === "string" &&
-        item.declaredClass === "esri.WebMap");
+    return (!!item && typeof item === "object" && typeof item.declaredClass === "string" && item.declaredClass === "esri.WebMap");
 }
 function isPortalItemDefinition(item) {
-    return !!item && typeof item === "object" && "portalItem" in item && item.portalItem != null;
+    return !!item && typeof item === "object" && item.portalItem != null;
 }
 function isFeatureLayerItemDefinition(item) {
-    return !!item && typeof item === "object" && "portalItem" in item && item.portalItem != null;
+    return !!item && typeof item === "object" && 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" && Array.isArray(item.fields) && !("declaredClass" in item);
 }
 function isUrlDefinition(item) {
-    return (!!item && typeof item === "object" && "url" in item && typeof item.url === "string" && !("declaredClass" in item));
-}
-function isSubtypeInstance(item) {
-    return (!!item &&
-        typeof item === "object" &&
-        "declaredClass" in item &&
-        item.declaredClass === "esri.layers.support.Subtype");
-}
-function isCodedValueDomainInstance(item) {
-    return (!!item &&
-        typeof item === "object" &&
-        "declaredClass" in item &&
-        item.declaredClass === "esri.layers.support.CodedValueDomain");
-}
-function isInheritedDomainInstance(item) {
-    return (!!item &&
-        typeof item === "object" &&
-        "declaredClass" in item &&
-        item.declaredClass === "esri.layers.support.InheritedDomain");
+    return !!item && typeof item === "object" && typeof item.url === "string" && !("declaredClass" in item);
 }
 function isPredefinedProfile(item) {
     return (!!item &&
         typeof item === "object" &&
-        "id" in item &&
-        "definitions" in item &&
         typeof item.id === "string" &&
         typeof item.definitions === "object" &&
         !Array.isArray(item.definitions));
 }
 
-function isTitleCapableSource(item) {
-    return !!item && typeof item === "object" && "title" in item && typeof item.title === "string";
-}
-function isUrlCapableSource(item) {
-    return !!item && typeof item === "object" && "url" in item && typeof item.url === "string";
-}
-function isLayerIdCapableSource(item) {
-    return !!item && typeof item === "object" && "layerId" in item && typeof item.layerId === "number";
-}
-function isFeatureTypesCapableLayer(item) {
-    return !!item && typeof item === "object" && "typeIdField" in item && "types" in item;
+function resolveIntlPath(dictionary, path) {
+    if (!dictionary) {
+        return "";
+    }
+    const pathSegments = path.split(".");
+    let pathSegment = pathSegments.shift();
+    let entry = dictionary;
+    while (entry && pathSegment) {
+        // @ts-expect-error
+        entry = entry[pathSegment];
+        pathSegment = pathSegments.shift();
+    }
+    return typeof entry === "string" ? entry : path;
 }
-function isSubtypesCapableLayer(item) {
-    return !!item && typeof item === "object" && "subtypeField" in item && "subtypes" in item;
+function isTypesCapabaleLayer(item) {
+    return !!item?.typeIdField;
 }
 function isDomainsCapableLayer(item) {
-    return !!item && typeof item === "object" && "getFieldDomain" in item && typeof item.getFieldDomain === "function";
+    return typeof item?.getFieldDomain === "function";
 }
 function isRelationshipsCapableLayer(item) {
-    return (isLayerIdCapableSource(item) &&
-        "relationships" in item &&
-        "url" in item &&
-        Array.isArray(item.relationships) &&
-        typeof item.url === "string");
+    return Array.isArray(item?.relationships) && typeof item?.url === "string";
 }
 function isTableCapableLayer(item) {
-    return !!item && typeof item === "object" && "isTable" in item && typeof item.isTable === "boolean";
+    return typeof item?.isTable === "boolean";
 }
 function isLoadableSource(item) {
-    return !!item && typeof item === "object" && "load" in item && typeof item.load === "function";
+    return typeof item?.load === "function";
 }
 //#endregion
 //#region Support Functions
 async function getRelatedFeatureLayer(layer, relationship) {
+    if (!relationship) {
+        return null;
+    }
     const relatedFeatureLayer = await newFeatureLayer({ url: `${layer.url}/${relationship.relatedTableId}` });
     await relatedFeatureLayer.load();
     return relatedFeatureLayer;
@@ -149,23 +114,7 @@ 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 (isSubtypesCapableLayer(layer)) {
-            if (firstField.name === layer.subtypeField) {
-                return -1;
-            }
-            if (secondField.name === layer.subtypeField) {
-                return 1;
-            }
-        }
-        if (isFeatureTypesCapableLayer(layer)) {
+        if (isTypesCapabaleLayer(layer)) {
             if (firstField.name === layer.typeIdField) {
                 return -1;
             }
@@ -176,19 +125,20 @@ function sortFields(layer) {
         return firstField.name.localeCompare(secondField.name, "en", { sensitivity: "base" });
     };
 }
-function getTypeOrSubtypeDomainGroup(profile, types, field) {
+function getSubtypesProperties(profile, types, field) {
     // Try the coded domain first
-    if (isCodedValueDomainInstance(field.domain)) {
-        return getCodedValueDomainGroup(profile, field.domain, { code: "subtypes" });
+    const group = getDomainValuesProperties(profile, field.domain, { code: "subtypes" });
+    if (group) {
+        return group;
     }
-    // No coded domain, we will manufacture it
-    const values = types.map((t) => {
-        const label = isSubtypeInstance(t) ? t.code : t.id;
-        return new ValueVariable({ profile, label: `${label}`, description: t.name, snippet: `"${label}"` });
-    });
+    // No coded domain for the subtypes, we will manufacture it
+    const values = types.map((t) => new ValueVariable({ profile, label: `${t.id}`, description: t.name, snippet: `"${t.id}"` }));
     return new GroupOfVariables(profile, { code: "subtypes" }, values);
 }
-function getCodedValueDomainGroup(profile, domain, label) {
+function getDomainValuesProperties(profile, domain, label) {
+    if (!domain || domain.type !== "coded-value") {
+        return null;
+    }
     const values = domain.codedValues.map((v) => new ValueVariable({
         profile,
         label: `${v.code}`,
@@ -198,33 +148,29 @@ function getCodedValueDomainGroup(profile, domain, label) {
     }));
     return new GroupOfVariables(profile, label, values);
 }
-function getDomainValuesGroup(profile, types, field) {
+function getDomainValuesBySubtypeGroup(profile, types, field) {
     const variables = [];
-    if (types.length === 0) {
-        return null;
-    }
-    types.forEach((type) => {
-        let domain = type.domains[field.name];
+    types.forEach((t) => {
+        let domain = t.domains[field.name];
         if (!domain) {
             return;
         }
-        if (isInheritedDomainInstance(domain)) {
+        if (domain.type === "inherited") {
             domain = field.domain;
             return;
         }
-        if (!isCodedValueDomainInstance(domain)) {
-            return;
-        }
-        const domainValuesGroup = getCodedValueDomainGroup(profile, domain, {
+        const domainValuesGroup = getDomainValuesProperties(profile, domain, {
             code: "domainvaluesfortypeformat",
             formatValues: {
                 fieldName: field.alias ?? field.name,
-                typeName: type.name
+                typeName: t.name
             }
         });
-        const id = isSubtypeInstance(type) ? type.code : type.id;
-        const label = `${id}`;
-        const snippet = `"${id}""`;
+        if (!domainValuesGroup) {
+            return;
+        }
+        const label = `${t.id}`;
+        const snippet = `"${t.id}""`;
         const subtypeDictionary = new DictionaryVariable({ profile, label, snippet });
         subtypeDictionary.variables = [domainValuesGroup];
         variables.push(subtypeDictionary);
@@ -234,9 +180,6 @@ function getDomainValuesGroup(profile, types, field) {
     }
     return new GroupOfVariables(profile, { code: "domainvaluesbysubtypes" }, variables);
 }
-function areAllDomainsInherited(types, field) {
-    return types.every((type) => type.domains[field.name].type === "inherited");
-}
 // const validIdentifierExpr = new RegExp(/^[a-z_$][\w$]*$/gi);
 const validIdentifierExpr = /^[a-z_$][a-z0-9_$]*$/giu;
 function getMemberExpressionProperty(prop, includeDot = true) {
@@ -264,6 +207,10 @@ async function supportedSourceFromDefinition(definition) {
     else {
         source = await newFeatureLayer(definition);
     }
+    if (!source) {
+        console.error("Invalid FeatureSetDefinition", definition);
+        return null;
+    }
     if (isLoadableSource(source)) {
         await source.load();
     }
@@ -299,7 +246,10 @@ function filterFeatureLayerInfos(layers, queryCapability) {
 //#endregion
 //#region Functions to Editor Variables to a language service variables
 async function variablesToLSVariable(editorVariables, kind = CompletionItemKind.Variable) {
-    return await Promise.all(editorVariables.map(async (editorVariable) => {
+    if (!editorVariables) {
+        return [];
+    }
+    const properties = await Promise.all(editorVariables.map(async (editorVariable) => {
         switch (editorVariable.type) {
             case "dictionary":
                 return await dictionaryToLSDictionary(editorVariable, kind);
@@ -309,6 +259,7 @@ async function variablesToLSVariable(editorVariables, kind = CompletionItemKind.
                 return variableToLSVariable(editorVariable, kind);
         }
     }));
+    return properties.filter((p) => p);
 }
 function variableToLSVariable(editorVariable, kind) {
     const { name, type } = editorVariable;
@@ -426,7 +377,7 @@ async function dictionaryToLSDictionary(editorDictionary, kind) {
             previous += `  \n${description}`;
         }
         return previous;
-    }, description);
+    }, description ?? "");
     return {
         name,
         description,
@@ -481,7 +432,7 @@ class ProfileItemBase {
         if (typeof this.description === "string") {
             return this.description;
         }
-        return D(this._profile?.intlStrings[this.description.code], this.description.formatValues);
+        return D(this._profile?.intlStrings[this.description.code ?? ""], this.description.formatValues);
     }
     /**
      * Returns true if the item pass the filter test
@@ -504,7 +455,7 @@ class VariableBase extends ProfileItemBase {
         super(props.profile, props.label, props.description ?? props.declaration?.description);
         this.declaration = props.declaration ?? {};
         this.name = props.declaration?.name ?? "";
-        this.snippet = props.snippet ?? "";
+        this.snippet = props.snippet || "";
         this.nonInteractive = props.nonInteractive ?? false;
         this.filterDescription = props.filterDescription ?? false;
         this.icon = props.icon;
@@ -522,7 +473,7 @@ class ValueVariable extends VariableBase {
     }
     getDescription() {
         if (this.description == null) {
-            return this._profile?.intlStrings[this.type.toLowerCase()] ?? "";
+            return resolveIntlPath(this._profile?.intlStrings, this.type.toLowerCase()) ?? "";
         }
         return super.getDescription();
     }
@@ -543,7 +494,7 @@ class ArrayVariable extends VariableBase {
     }
     getDescription() {
         if (this.description == null) {
-            return this._profile?.intlStrings[this.type.toLowerCase()] ?? "";
+            return resolveIntlPath(this._profile?.intlStrings, this.type.toLowerCase()) ?? "";
         }
         return super.getDescription();
     }
@@ -558,8 +509,8 @@ class ArrayVariable extends VariableBase {
  * collection is ready or not.
  */
 class CollectionBasedVariable extends VariableBase {
-    constructor() {
-        super(...arguments);
+    constructor(props) {
+        super(props);
         this.isCollection = true;
         this._loaded = true;
         /**
@@ -695,19 +646,21 @@ class SourceBasedVariable extends CollectionBasedVariable {
         this._definition = props.declaration?.definition;
     }
     get title() {
-        return isTitleCapableSource(this._source) ? this._source.title : "";
+        return this._source?.title ?? "";
     }
     get url() {
-        return isUrlCapableSource(this._source) ? this._source.url : "";
+        return this._definition?.url ?? "";
     }
     get informationUrl() {
         if (!this.loaded) {
             return null;
         }
-        if (!this.url) {
+        const url = this._source?.url;
+        if (!url) {
             return null;
         }
-        return isLayerIdCapableSource(this._source) ? `${this.url}/${this._source.layerId}` : this.url;
+        const layerId = this._source?.layerId ?? "";
+        return `${url}/${layerId}`;
     }
     get informationType() {
         return this._profile?.intlStrings.layer ?? "layer";
@@ -719,19 +672,16 @@ class SourceBasedVariable extends CollectionBasedVariable {
         this._loadPromise = this._loadSource();
         return await this._loadPromise;
     }
-    _getValueSnippet(field) {
-        return this.type === "feature" ? assembleMemberExpression(this.snippet, field.name) : field.name;
-    }
     _getFieldProperty(field) {
         // Check if the field is the type id field or of the field has a coded domain.
         // If it has then the property will be an exanpdable property (dictionary).
         // Otherwise just return a simple value property.
-        const subtypesOrDomainValuesDictionary = this._getDomainDictionary(field);
+        const subtypesOrDomainValuesDictionary = this._getSubtypesOrDomainValuesDictionary(field);
         if (subtypesOrDomainValuesDictionary) {
             return subtypesOrDomainValuesDictionary;
         }
         // Create the value property
-        const valueSnippet = this._getValueSnippet(field);
+        const valueSnippet = this.type === "feature" ? assembleMemberExpression(this.snippet, field.name) : field.name;
         return new ValueVariable({
             profile: this._profile,
             label: valueSnippet,
@@ -741,113 +691,12 @@ class SourceBasedVariable extends CollectionBasedVariable {
             filterDescription: true
         });
     }
-    get _domainSource() {
-        if (isSubtypeSublayerInstance(this._source)) {
-            return this._source.parent;
-        }
-        return isDomainsCapableLayer(this._source) ? this._source : null;
-    }
-    _getDomainDictionary(field) {
-        if (!isDomainsCapableLayer(this._domainSource)) {
-            return null;
-        }
-        // Note we have multiple scenarios:
-        // - Layers without subtypes or feature types: We will check if the field has a domain
-        // - Layers with only subtypes: We will parse the subtypes metadata and create a dictionary
-        // - Layers with only feature types: We will parse the feature types metadata
-        // - Layers with both subtypes and feature types: we will actually use the subtypes metadata
-        // Summary, we will always use the subtypes metadata if available.
-        if (isSubtypesCapableLayer(this._domainSource)) {
-            return this._getSubtypeDomainDictionary(field);
-        }
-        if (isFeatureTypesCapableLayer(this._domainSource)) {
-            return this._getFeatureTypeDomainDictionary(field);
-        }
-        return this._getFieldDomainDictionary(field);
-    }
-    _getSubtypeDomainDictionary(field) {
-        // SHould be tested before calling this function
-        if (!isSubtypesCapableLayer(this._domainSource)) {
-            return null;
-        }
-        // If the source is the subtype sublayer then the subtype value is already set.
-        // It doesn't make sense to show the subtypes for the subtype field.
-        // For the other field, the getFieldDomain will return the domain for the subtype.
-        if (isSubtypeSublayerInstance(this._source)) {
-            if (field.name === this._domainSource.subtypeField) {
-                return null;
-            }
-            return this._getFieldDomainDictionary(field);
-        }
-        // The code here shoud be executed for layers that have subtypes but are not subtype sublayers.
-        // Sepcial case for the subtype field
-        if (field.name === this._domainSource.subtypeField) {
-            const domainDictionary = this._createDomainDictionary(field);
-            domainDictionary.variables.push(getTypeOrSubtypeDomainGroup(this._profile, this._domainSource.subtypes, field));
-            return domainDictionary;
-        }
-        // Check if all the domains for the field in the types are inherited.
-        // If it is we can simplify the structure by avoiding splitting in subtypes
-        if (areAllDomainsInherited(this._domainSource.subtypes, field)) {
-            return this._getFieldDomainDictionary(field);
-        }
-        // We have domains per subtype
-        // We need to go thru each types and create a dictionary.
-        const domainValuesBySubtypeGroup = getDomainValuesGroup(this._profile, this._domainSource.subtypes, field);
-        if (!domainValuesBySubtypeGroup) {
-            return null;
-        }
-        const domainDictionary = this._createDomainDictionary(field);
-        domainDictionary.variables.push(domainValuesBySubtypeGroup);
-        return domainDictionary;
-    }
-    _getFeatureTypeDomainDictionary(field) {
-        // SHould be tested before calling this function
-        if (!isFeatureTypesCapableLayer(this._domainSource)) {
-            return null;
-        }
-        // Special case for the type id field
-        if (field.name === this._domainSource.typeIdField) {
-            const domainDictionary = this._createDomainDictionary(field);
-            domainDictionary.variables.push(getTypeOrSubtypeDomainGroup(this._profile, this._domainSource.types, field));
-            return domainDictionary;
-        }
-        // Check if all the domains for the field in the types are inherited.
-        // If it is we can simplify the structure by avoiding splitting in subtypes
-        if (areAllDomainsInherited(this._domainSource.types, field)) {
-            return this._getFieldDomainDictionary(field);
-        }
-        // We have domains per feature type
-        // We need to go thru each types and create a dictionary.
-        const domainValuesByFeatureTypeGroup = getDomainValuesGroup(this._profile, this._domainSource.types, field);
-        if (!domainValuesByFeatureTypeGroup) {
-            return null;
-        }
-        const domainDictionary = this._createDomainDictionary(field);
-        domainDictionary.variables.push(domainValuesByFeatureTypeGroup);
-        return domainDictionary;
-    }
-    _getFieldDomainDictionary(field) {
-        // SHould be tested before calling this function
+    _getSubtypesOrDomainValuesDictionary(field) {
         if (!isDomainsCapableLayer(this._source)) {
             return null;
         }
-        const fieldDomain = this._source.getFieldDomain(field.name);
-        if (!isCodedValueDomainInstance(fieldDomain)) {
-            return null;
-        }
-        const domainValuesGroup = getCodedValueDomainGroup(this._profile, fieldDomain, {
-            code: "domainvalues"
-        });
-        const domainDictionary = this._createDomainDictionary(field);
-        domainDictionary.variables.push(domainValuesGroup);
-        return domainDictionary;
-    }
-    _createDomainDictionary(field) {
-        // Create the domain dictionary.
-        // The dictionary will have a header group and a value group.
-        // At this point we are only creating the header group in the dictionary.
-        const valueSnippet = this._getValueSnippet(field);
+        // Create the domain dictionary, we may not use it
+        const valueSnippet = this.type === "feature" ? assembleMemberExpression(this.snippet, field.name) : field.name;
         const domainDictionary = new DictionaryVariable({
             profile: this._profile,
             label: valueSnippet,
@@ -865,7 +714,13 @@ class SourceBasedVariable extends CollectionBasedVariable {
             })
         ]);
         domainDictionary.variables = [headerGroup];
-        // Add the DomainName snippet if the type is feature
+        // If it is the subtype field then get its coded domain values
+        if (isTypesCapabaleLayer(this._source) && field.name === this._source.typeIdField) {
+            const subtypesGroup = getSubtypesProperties(this._profile, this._source.types, field);
+            domainDictionary.variables.push(subtypesGroup);
+            return domainDictionary;
+        }
+        // Since its' not the subtype field then add the snippet for the domain name
         if (this.type === "feature") {
             const domainNameSnippet = `DomainName(${this.snippet}, "${field.name}")`;
             headerGroup.variables.push(new ValueVariable({
@@ -875,6 +730,29 @@ class SourceBasedVariable extends CollectionBasedVariable {
                 snippet: domainNameSnippet
             }));
         }
+        if (isTypesCapabaleLayer(this._source)) {
+            // Check if all the domains for the field in the types are inherited.
+            // If it is we can simplify the structure by avoiding splitting in subtypes
+            const allInherited = this._source.types.every((t) => t.domains[field.name].type === "inherited");
+            if (!allInherited) {
+                // We have domains per subtype
+                // We need to go thru each types and create a dictionary.
+                const domainValuesBySubtypeGroup = getDomainValuesBySubtypeGroup(this._profile, this._source.types, field);
+                if (!domainValuesBySubtypeGroup) {
+                    return null;
+                }
+                domainDictionary.variables.push(domainValuesBySubtypeGroup);
+                return domainDictionary;
+            }
+        }
+        // Either we have types but all the domains are inherited or we don't have types
+        const domainValuesGroup = getDomainValuesProperties(this._profile, this._source.getFieldDomain(field.name), {
+            code: "domainvalues"
+        });
+        if (!domainValuesGroup) {
+            return null;
+        }
+        domainDictionary.variables.push(domainValuesGroup);
         return domainDictionary;
     }
     async _getRelationshipsProperty() {
@@ -1084,7 +962,7 @@ class FeatureSetCollectionVariable extends CollectionBasedVariable {
                 : {
                     code: "webmapformat",
                     formatValues: {
-                        webMapTitle: this._featureSetCollections.source.portalItem.title || "Untitled map"
+                        webMapTitle: this._featureSetCollections.source.portalItem.title ?? "Untitled map"
                     }
                 };
             const headerGroup = new GroupOfVariables(this._profile, groupLabel, [