@arcgis/core-adapter 4.32.0-next.44 → 4.32.0-next.47

package/scripts/generator.ts

@@ -4,10 +4,9 @@ import resolvePkg from "resolve-pkg";
 import type { SourceFile } from "ts-morph";
 import { Project } from "ts-morph";
 import ts from "typescript";
-import { fileURLToPath } from "url";
 import { publicModules } from "../support/publicModules";
 
-const dirname = path.dirname(fileURLToPath(import.meta.url));
+const dirname = import.meta.dirname;
 
 /**
  * Collect the details of a type we are interested in
@@ -54,8 +53,9 @@ const nativeGenericTypes = nativeTypes.map((x) => `<${x}>`);
 
 // Modules to ignore
 const ignoreExports: string[] = [
-  // declared as a namespace
+  // virtual
   "esri/core/units",
+  "esri/core/quantity",
 ];
 
 // Module that returns an instance of a class
@@ -394,7 +394,22 @@ function processUnionType(parameterInfo: ParameterInfo): string {
 function generateImportFunction(entry: TypeInfo): string {
   const { amdModulePath, esmModulePath, typeName, instanceType = false } = entry;
   const functionNameSuffix = convertToPascalCase(amdModulePath);
-  const promiseType = instanceType ? typeName : `typeof ${typeName}`;
+  const resolvedTypeName = [
+    "__esri.CollectionFlattener",
+    "__esri.SelectionOperation",
+    "__esri.SketchTooltipControls",
+  ].includes(typeName)
+    ? "any"
+    : typeName;
+
+  let promiseType: string;
+  if (resolvedTypeName === "any") {
+    promiseType = "any";
+  } else if (instanceType) {
+    promiseType = resolvedTypeName;
+  } else {
+    promiseType = `typeof ${resolvedTypeName}`;
+  }
 
   return `
 export async function import${functionNameSuffix}(): Promise<${promiseType}> {

package/src/index.ts

@@ -4214,6 +4214,84 @@ export async function newRestSupportAddressCandidate(properties: __esri.AddressC
   return new ModConstructor(properties);
 }
 
+export async function importRestSupportAttributeBinsQuery(): Promise<typeof __esri.AttributeBinsQuery> {
+  if (isAMD) {
+    return await window.$arcgis.import("esri/rest/support/AttributeBinsQuery");
+  }
+  const module = await import("@arcgis/core/rest/support/AttributeBinsQuery.js");
+  return isDefaultModule(module) ? module.default : module;
+}
+
+export async function newRestSupportAttributeBinsQuery(properties: __esri.AttributeBinsQueryProperties): Promise<__esri.AttributeBinsQuery> {
+  const ModConstructor = await importRestSupportAttributeBinsQuery();
+  return new ModConstructor(properties);
+}
+
+export async function importRestSupportAutoIntervalBinParameters(): Promise<typeof __esri.AutoIntervalBinParameters> {
+  if (isAMD) {
+    return await window.$arcgis.import("esri/rest/support/AutoIntervalBinParameters");
+  }
+  const module = await import("@arcgis/core/rest/support/AutoIntervalBinParameters.js");
+  return isDefaultModule(module) ? module.default : module;
+}
+
+export async function newRestSupportAutoIntervalBinParameters(properties: __esri.AutoIntervalBinParametersProperties): Promise<__esri.AutoIntervalBinParameters> {
+  const ModConstructor = await importRestSupportAutoIntervalBinParameters();
+  return new ModConstructor(properties);
+}
+
+export async function importRestSupportFixedBoundariesBinParameters(): Promise<typeof __esri.FixedBoundariesBinParameters> {
+  if (isAMD) {
+    return await window.$arcgis.import("esri/rest/support/FixedBoundariesBinParameters");
+  }
+  const module = await import("@arcgis/core/rest/support/FixedBoundariesBinParameters.js");
+  return isDefaultModule(module) ? module.default : module;
+}
+
+export async function newRestSupportFixedBoundariesBinParameters(properties: __esri.FixedBoundariesBinParametersProperties): Promise<__esri.FixedBoundariesBinParameters> {
+  const ModConstructor = await importRestSupportFixedBoundariesBinParameters();
+  return new ModConstructor(properties);
+}
+
+export async function importRestSupportFixedIntervalBinParameters(): Promise<typeof __esri.FixedIntervalBinParameters> {
+  if (isAMD) {
+    return await window.$arcgis.import("esri/rest/support/FixedIntervalBinParameters");
+  }
+  const module = await import("@arcgis/core/rest/support/FixedIntervalBinParameters.js");
+  return isDefaultModule(module) ? module.default : module;
+}
+
+export async function newRestSupportFixedIntervalBinParameters(properties: __esri.FixedIntervalBinParametersProperties): Promise<__esri.FixedIntervalBinParameters> {
+  const ModConstructor = await importRestSupportFixedIntervalBinParameters();
+  return new ModConstructor(properties);
+}
+
+export async function importRestSupportDateBinParameters(): Promise<typeof __esri.DateBinParameters> {
+  if (isAMD) {
+    return await window.$arcgis.import("esri/rest/support/DateBinParameters");
+  }
+  const module = await import("@arcgis/core/rest/support/DateBinParameters.js");
+  return isDefaultModule(module) ? module.default : module;
+}
+
+export async function newRestSupportDateBinParameters(properties: __esri.DateBinParametersProperties): Promise<__esri.DateBinParameters> {
+  const ModConstructor = await importRestSupportDateBinParameters();
+  return new ModConstructor(properties);
+}
+
+export async function importRestSupportDateBinTimeInterval(): Promise<typeof __esri.DateBinTimeInterval> {
+  if (isAMD) {
+    return await window.$arcgis.import("esri/rest/support/DateBinTimeInterval");
+  }
+  const module = await import("@arcgis/core/rest/support/DateBinTimeInterval.js");
+  return isDefaultModule(module) ? module.default : module;
+}
+
+export async function newRestSupportDateBinTimeInterval(properties: __esri.DateBinTimeIntervalProperties): Promise<__esri.DateBinTimeInterval> {
+  const ModConstructor = await importRestSupportDateBinTimeInterval();
+  return new ModConstructor(properties);
+}
+
 export async function importRestSupportAlgorithmicColorRamp(): Promise<typeof __esri.AlgorithmicColorRamp> {
   if (isAMD) {
     return await window.$arcgis.import("esri/rest/support/AlgorithmicColorRamp");
@@ -4266,6 +4344,32 @@ export async function newRestSupportAttachmentQuery(properties: __esri.Attachmen
   return new ModConstructor(properties);
 }
 
+export async function importRestSupportBaseImageMeasureParameters(): Promise<typeof __esri.BaseImageMeasureParameters> {
+  if (isAMD) {
+    return await window.$arcgis.import("esri/rest/support/BaseImageMeasureParameters");
+  }
+  const module = await import("@arcgis/core/rest/support/BaseImageMeasureParameters.js");
+  return isDefaultModule(module) ? module.default : module;
+}
+
+export async function newRestSupportBaseImageMeasureParameters(properties: __esri.BaseImageMeasureParametersProperties): Promise<__esri.BaseImageMeasureParameters> {
+  const ModConstructor = await importRestSupportBaseImageMeasureParameters();
+  return new ModConstructor(properties);
+}
+
+export async function importRestSupportBaseImageMeasureResult(): Promise<typeof __esri.BaseImageMeasureResult> {
+  if (isAMD) {
+    return await window.$arcgis.import("esri/rest/support/BaseImageMeasureResult");
+  }
+  const module = await import("@arcgis/core/rest/support/BaseImageMeasureResult.js");
+  return isDefaultModule(module) ? module.default : module;
+}
+
+export async function newRestSupportBaseImageMeasureResult(properties: __esri.BaseImageMeasureResultProperties): Promise<__esri.BaseImageMeasureResult> {
+  const ModConstructor = await importRestSupportBaseImageMeasureResult();
+  return new ModConstructor(properties);
+}
+
 export async function importRestSupportBufferParameters(): Promise<typeof __esri.BufferParameters> {
   if (isAMD) {
     return await window.$arcgis.import("esri/rest/support/BufferParameters");
@@ -10191,27 +10295,19 @@ export async function importCoreWorkers(): Promise<typeof __esri.workers> {
   return isDefaultModule(module) ? module.default : module;
 }
 
-export async function importFormElementsInputsAttachmentsSupportInputs(): Promise<typeof __esri.inputs> {
-  if (isAMD) {
-    return await window.$arcgis.import("esri/form/elements/inputs/attachments/support/inputs");
-  }
-  const module = await import("@arcgis/core/form/elements/inputs/attachments/support/inputs.js");
-  return isDefaultModule(module) ? module.default : module;
-}
-
-export async function importFormElementsSupportInputs(): Promise<typeof __esri.supportInputs> {
+export async function importFormElementsInputs(): Promise<typeof __esri.inputs> {
   if (isAMD) {
-    return await window.$arcgis.import("esri/form/elements/support/inputs");
+    return await window.$arcgis.import("esri/form/elements/inputs");
   }
-  const module = await import("@arcgis/core/form/elements/support/inputs.js");
+  const module = await import("@arcgis/core/form/elements/inputs.js");
   return isDefaultModule(module) ? module.default : module;
 }
 
-export async function importFormSupportElements(): Promise<typeof __esri.elements> {
+export async function importFormElements(): Promise<typeof __esri.elements> {
   if (isAMD) {
-    return await window.$arcgis.import("esri/form/support/elements");
+    return await window.$arcgis.import("esri/form/elements");
   }
-  const module = await import("@arcgis/core/form/support/elements.js");
+  const module = await import("@arcgis/core/form/elements.js");
   return isDefaultModule(module) ? module.default : module;
 }
 
@@ -11487,11 +11583,11 @@ export async function importSymbolsSupportSymbolUtils(): Promise<typeof __esri.s
   return isDefaultModule(module) ? module.default : module;
 }
 
-export async function importTablesSupportElements(): Promise<typeof __esri.supportElements> {
+export async function importTablesElements(): Promise<typeof __esri.tablesElements> {
   if (isAMD) {
-    return await window.$arcgis.import("esri/tables/support/elements");
+    return await window.$arcgis.import("esri/tables/elements");
   }
-  const module = await import("@arcgis/core/tables/support/elements.js");
+  const module = await import("@arcgis/core/tables/elements.js");
   return isDefaultModule(module) ? module.default : module;
 }
 
@@ -11607,7 +11703,7 @@ export async function importApplicationsComponentsBasemapUtils(): Promise<typeof
   return isDefaultModule(module) ? module.default : module;
 }
 
-export async function importApplicationsComponentsCollectionFlattener(): Promise<typeof __esri.CollectionFlattener> {
+export async function importApplicationsComponentsCollectionFlattener(): Promise<any> {
   if (isAMD) {
     return await window.$arcgis.import("esri/applications/Components/CollectionFlattener");
   }
@@ -11679,7 +11775,7 @@ export async function importApplicationsComponentsReactiveUtils(): Promise<typeo
   return isDefaultModule(module) ? module.default : module;
 }
 
-export async function importApplicationsComponentsSelectionOperation(): Promise<typeof __esri.SelectionOperation> {
+export async function importApplicationsComponentsSelectionOperation(): Promise<any> {
   if (isAMD) {
     return await window.$arcgis.import("esri/applications/Components/SelectionOperation");
   }
@@ -11687,7 +11783,7 @@ export async function importApplicationsComponentsSelectionOperation(): Promise<
   return isDefaultModule(module) ? module.default : module;
 }
 
-export async function importApplicationsComponentsSketchTooltipControls(): Promise<typeof __esri.SketchTooltipControls> {
+export async function importApplicationsComponentsSketchTooltipControls(): Promise<any> {
   if (isAMD) {
     return await window.$arcgis.import("esri/applications/Components/SketchTooltipControls");
   }

package/support/api-reference-esm-imports.json

@@ -55,11 +55,10 @@
   "esri/form/elements/inputs/attachments/ImageInput": "import ImageInput from \"@arcgis/core/form/elements/inputs/attachments/ImageInput.js\";",
   "esri/form/elements/inputs/attachments/SignatureInput": "import SignatureInput from \"@arcgis/core/form/elements/inputs/attachments/SignatureInput.js\";",
   "esri/form/elements/inputs/attachments/VideoInput": "import VideoInput from \"@arcgis/core/form/elements/inputs/attachments/VideoInput.js\";",
-  "esri/form/elements/inputs/attachments/support/inputs": "import * as inputs from \"@arcgis/core/form/elements/inputs/attachments/support/inputs.js\";",
-  "esri/form/elements/support/inputs": "import * as inputs from \"@arcgis/core/form/elements/support/inputs.js\";",
+  "esri/form/elements/inputs": "import * as inputs from \"@arcgis/core/form/elements/inputs.js\";",
+  "esri/form/elements": "import * as elements from \"@arcgis/core/form/elements.js\";",
   "esri/form/ExpressionInfo": "import ExpressionInfo from \"@arcgis/core/form/ExpressionInfo.js\";",
   "esri/form/FormTemplate": "import FormTemplate from \"@arcgis/core/form/FormTemplate.js\";",
-  "esri/form/support/elements": "import * as elements from \"@arcgis/core/form/support/elements.js\";",
   "esri/geometry": "import * as geometry from \"@arcgis/core/geometry.js\";",
   "esri/geometry/Circle": "import Circle from \"@arcgis/core/geometry/Circle.js\";",
   "esri/geometry/coordinateFormatter": "import * as coordinateFormatter from \"@arcgis/core/geometry/coordinateFormatter.js\";",
@@ -439,10 +438,18 @@
   "esri/rest/route": "import * as route from \"@arcgis/core/rest/route.js\";",
   "esri/rest/serviceArea": "import * as serviceArea from \"@arcgis/core/rest/serviceArea.js\";",
   "esri/rest/support/AddressCandidate": "import AddressCandidate from \"@arcgis/core/rest/support/AddressCandidate.js\";",
+  "esri/rest/support/AttributeBinsQuery": "import AttributeBinsQuery from \"@arcgis/core/rest/support/AttributeBinsQuery.js\";",
+  "esri/rest/support/AutoIntervalBinParameters": "import AutoIntervalBinParameters from \"@arcgis/core/rest/support/AutoIntervalBinParameters.js\";",
+  "esri/rest/support/FixedBoundariesBinParameters": "import FixedBoundariesBinParameters from \"@arcgis/core/rest/support/FixedBoundariesBinParameters.js\";",
+  "esri/rest/support/FixedIntervalBinParameters": "import FixedIntervalBinParameters from \"@arcgis/core/rest/support/FixedIntervalBinParameters.js\";",
+  "esri/rest/support/DateBinParameters": "import DateBinParameters from \"@arcgis/core/rest/support/DateBinParameters.js\";",
+  "esri/rest/support/DateBinTimeInterval": "import DateBinTimeInterval from \"@arcgis/core/rest/support/DateBinTimeInterval.js\";",
   "esri/rest/support/AlgorithmicColorRamp": "import AlgorithmicColorRamp from \"@arcgis/core/rest/support/AlgorithmicColorRamp.js\";",
   "esri/rest/support/ArealUnit": "import ArealUnit from \"@arcgis/core/rest/support/ArealUnit.js\";",
   "esri/rest/support/AreasAndLengthsParameters": "import AreasAndLengthsParameters from \"@arcgis/core/rest/support/AreasAndLengthsParameters.js\";",
   "esri/rest/support/AttachmentQuery": "import AttachmentQuery from \"@arcgis/core/rest/support/AttachmentQuery.js\";",
+  "esri/rest/support/BaseImageMeasureParameters": "import BaseImageMeasureParameters from \"@arcgis/core/rest/support/BaseImageMeasureParameters.js\";",
+  "esri/rest/support/BaseImageMeasureResult": "import BaseImageMeasureResult from \"@arcgis/core/rest/support/BaseImageMeasureResult.js\";",
   "esri/rest/support/BufferParameters": "import BufferParameters from \"@arcgis/core/rest/support/BufferParameters.js\";",
   "esri/rest/support/CameraInfo": "import CameraInfo from \"@arcgis/core/rest/support/CameraInfo.js\";",
   "esri/rest/support/ClosestFacilityParameters": "import ClosestFacilityParameters from \"@arcgis/core/rest/support/ClosestFacilityParameters.js\";",
@@ -638,7 +645,7 @@
   "esri/symbols/WaterSymbol3DLayer": "import WaterSymbol3DLayer from \"@arcgis/core/symbols/WaterSymbol3DLayer.js\";",
   "esri/symbols/WebStyleSymbol": "import WebStyleSymbol from \"@arcgis/core/symbols/WebStyleSymbol.js\";",
   "esri/tables/AttributeTableTemplate": "import AttributeTableTemplate from \"@arcgis/core/tables/AttributeTableTemplate.js\";",
-  "esri/tables/support/elements": "import * as elements from \"@arcgis/core/tables/support/elements.js\";",
+  "esri/tables/elements": "import * as elements from \"@arcgis/core/tables/elements.js\";",
   "esri/tables/elements/AttributeTableAttachmentElement": "import AttributeTableAttachmentElement from \"@arcgis/core/tables/elements/AttributeTableAttachmentElement.js\";",
   "esri/tables/elements/AttributeTableElement": "import AttributeTableElement from \"@arcgis/core/tables/elements/AttributeTableElement.js\";",
   "esri/tables/elements/AttributeTableGroupElement": "import AttributeTableGroupElement from \"@arcgis/core/tables/elements/AttributeTableGroupElement.js\";",