@osdk/generator 1.13.1 → 1.13.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @osdk/generator
 
+## 1.13.3
+
+### Patch Changes
+
+- 52317e9: Fixes additional compile breaks when formatting is off
+
+## 1.13.2
+
+### Patch Changes
+
+- ef2018e: Fixed an edge case where generation caused compile errors
+
 ## 1.13.1
 
 ### Patch Changes

package/build/browser/index.js

@@ -400,20 +400,28 @@ async function generatePerActionDataFiles(ontology, fs2, outDir, importExt, v2)
     const referencedObjectDefs = /* @__PURE__ */ new Set();
     for (const p of Object.values(action.parameters)) {
       if (p.dataType.type === "object" || p.dataType.type === "objectSet") {
-        referencedObjectDefs.add(getObjectDefIdentifier(p.dataType.objectApiName, v2));
-        referencedObjectDefs.add(getObjectDefIdentifier(p.dataType.objectTypeApiName, v2));
+        if (p.dataType.objectApiName) {
+          referencedObjectDefs.add(getObjectDefIdentifier(p.dataType.objectApiName, v2));
+        }
+        if (p.dataType.objectTypeApiName) {
+          referencedObjectDefs.add(getObjectDefIdentifier(p.dataType.objectTypeApiName, v2));
+        }
       }
       if (p.dataType.type === "array" && (p.dataType.subType.type === "object" || p.dataType.subType.type === "objectSet")) {
-        referencedObjectDefs.add(getObjectDefIdentifier(p.dataType.subType.objectApiName, v2));
-        referencedObjectDefs.add(getObjectDefIdentifier(p.dataType.subType.objectTypeApiName, v2));
+        if (p.dataType.subType.objectApiName) {
+          referencedObjectDefs.add(getObjectDefIdentifier(p.dataType.subType.objectApiName, v2));
+        }
+        if (p.dataType.subType.objectTypeApiName) {
+          referencedObjectDefs.add(getObjectDefIdentifier(p.dataType.subType.objectTypeApiName, v2));
+        }
       }
     }
-    const importObjects = referencedObjectDefs.size > 0 ? `import type {${[...referencedObjectDefs].join(",")}} from "../objects${importExt}";` : "";
+    const importObjects = referencedObjectDefs.size > 0 ? `import type {${[...referencedObjectDefs].filter((a) => a && a.length > 0).join(",")}} from "../objects${v2 ? "" : "/index"}${importExt}";` : "";
     await fs2.writeFile(path16__default.join(outDir, `${action.apiName}.ts`), await formatTs(`
           import type { ActionDefinition, ObjectActionDataType, ObjectSetActionDataType, VersionBound} from "@osdk/api";
-          import type { ActionSignature, ApplyActionOptions, ApplyBatchActionOptions, OsdkActionParameters,ActionReturnTypeForOptions, NOOP } from '@osdk/client.api';
+          ${v2 ? `import type { ActionSignature, ApplyActionOptions, ApplyBatchActionOptions, OsdkActionParameters,ActionReturnTypeForOptions, NOOP } from '@osdk/client.api';
           import { $osdkMetadata} from "../../OntologyMetadata${importExt}";
-          import type { $ExpectedClientVersion } from "../../OntologyMetadata${importExt}";
+          import type { $ExpectedClientVersion } from "../../OntologyMetadata${importExt}";` : ""}
           ${importObjects}
 
         
@@ -577,11 +585,9 @@ function getTypeScriptTypeFromDataType(actionParameter, importedObjects) {
 }
 
 // src/v1.1/backcompat/util/reexportConsts.ts
-function reexportConsts(typesToExport) {
-  return `
-          import  { ${typesToExport.map((q) => `${q} as OG_${q}`).join(", ")}} from "@osdk/legacy-client";
-      
-          ${typesToExport.map((q) => `
+function reexportConsts(typesToExport, includeImport = false) {
+  return `${includeImport ? `import  { ${typesToExport.map((q) => `${q} as OG_${q}`).join(", ")}} from "@osdk/legacy-client";` : ""}
+      ${typesToExport.map((q) => `
       /** @deprecated submodule imports aren't public api **/
               export const ${q} = OG_${q};
           `).join("\n\n")}
@@ -598,7 +604,7 @@ async function generateConfidentialClientDir(fs2, oauthDistDir, importExt = "")
     export * from "./ConfidentialClientAuth${importExt}";
   `));
   await fs2.writeFile(path16__default.join(confidentialClientDistDir, "ConfidentialClientAuth.ts"), await formatTs(`
-        ${reexportConsts(["ConfidentialClientAuth"])}
+        ${reexportConsts(["ConfidentialClientAuth"], true)}
     `));
 }
 async function generatePublicClientDir(fs2, oauthDistDir, importExt = "") {
@@ -610,7 +616,7 @@ async function generatePublicClientDir(fs2, oauthDistDir, importExt = "") {
     export * from "./PublicClientAuth${importExt}";
   `));
   await fs2.writeFile(path16__default.join(publicClientDistDir, "PublicClientAuth.ts"), await formatTs(`
-        ${reexportConsts(["PublicClientAuth"])}
+        ${reexportConsts(["PublicClientAuth"], true)}
     `));
 }
 async function generateUserTokenDir(fs2, oauthDistDir, importExt = "") {
@@ -622,14 +628,14 @@ async function generateUserTokenDir(fs2, oauthDistDir, importExt = "") {
     export * from "./UserTokenAuth${importExt}";
   `));
   await fs2.writeFile(path16__default.join(userTokenDistDir, "UserTokenAuth.ts"), await formatTs(`
-        ${reexportConsts(["UserTokenAuth"])}
+        ${reexportConsts(["UserTokenAuth"], true)}
     `));
 }
 
 // src/v1.1/backcompat/util/reexportTypes.ts
 function reexportTypes(typesToExport, genericArgsLeft = "", genericArgsRight = cleanup(genericArgsLeft)) {
   return `
-    import type { ${typesToExport.map((q) => `${q} as OG_${q}`).join(", ")}} from "@osdk/legacy-client";
+    import { ${typesToExport.map((q) => `${q} as OG_${q}`).join(", ")}} from "@osdk/legacy-client";
     
         ${typesToExport.map((q) => `
       /** @deprecated submodule imports aren't public api **/
@@ -664,7 +670,7 @@ async function generateOAuthClientDistDir(outDir, fs2, importExt = "") {
   await fs2.writeFile(path16.join(oauthDistDir, "Auth.ts"), await formatTs(reexportTypes(["Auth"])));
   await fs2.writeFile(path16.join(oauthDistDir, "Token.ts"), await formatTs(reexportTypes(["Token", "TokenValue"])));
   await fs2.writeFile(path16.join(oauthDistDir, "OAuthClient.ts"), await formatTs(reexportTypes(["AuthSubscription", "UnsubscribeFunction", "SignInResponse", "RefreshResponse", "SignOutResponse"])));
-  await fs2.writeFile(path16.join(oauthDistDir, "OAuthToken.ts"), await formatTs(reexportConsts(["OAuthToken"])));
+  await fs2.writeFile(path16.join(oauthDistDir, "OAuthToken.ts"), await formatTs(reexportConsts(["OAuthToken"], true)));
   await fs2.writeFile(path16.join(oauthDistDir, "Auth.ts"), await formatTs(reexportTypes(["Auth"])));
   await generateConfidentialClientDir(fs2, oauthDistDir, importExt);
   await generatePublicClientDir(fs2, oauthDistDir, importExt);
@@ -673,7 +679,7 @@ async function generateOAuthClientDistDir(outDir, fs2, importExt = "") {
 async function generateAggregationsAggregations(fs2, aggregationsDir) {
   await fs2.writeFile(path16.join(aggregationsDir, "Aggregations.ts"), await formatTs(`
       import { LocalDate, Timestamp } from "@osdk/legacy-client";
-      ` + reexportTypes(["Double", "Rangeable", "MetricValue", "Date", "BucketKey", "BucketValue", "TimeUnit", "BucketGroup", "Metrics", "AggregatableProperties", "AggregationClause"]) + reexportTypes(["Range"], "<T extends Rangeable>", "<T>") + reexportTypes(["BaseGroupBy"], "<_T extends BucketValue = BucketValue>") + reexportTypes(["Duration"], "<_T extends Timestamp | LocalDate = Timestamp | LocalDate>") + reexportTypes(["AggregatableProperty", "MultipleAggregationsOperations"], "<_T extends MetricValue = MetricValue>") + reexportTypes(["AggregationGroup"], "<TMetrics extends Metrics | MetricValue, TBucketGroup extends BucketGroup>") + reexportTypes(["Bucketing"], "<_T extends string , _X extends BucketValue>") + reexportTypes(["AggregationResult"], "<TBucketGroup extends BucketGroup, TMetrics extends Metrics | MetricValue>") + reexportTypes(["BaseBucketing"], "<TBucketKey extends BucketKey, TBucketValue extends BucketValue, Kind extends string>") + reexportTypes(["ExactValueBucketing", "InternalBucketing"], `<TBucketKey extends BucketKey, TBucketValue extends BucketValue>`) + reexportTypes(["RangeBucketing", "FixedWidthBucketing"], `<TBucketKey extends BucketKey, TBucketValue extends Range<Rangeable>>`) + reexportTypes(["DurationBucketing"], `<TBucketKey extends BucketKey, TBucketValue extends Date>`) + reexportTypes(["InternalBucketingVisitor"], "<TBucketKey extends BucketKey, T extends BucketValue, R>") + reexportTypes(["AggregationBuilderResult"], "<T, TMultipleAggregationProperties>") + reexportTypes(["AggregatablePropertiesForResult", "AggregatablePropertyNamesForResult"], "<TAggregatableProperties, TResult extends MetricValue>") + reexportConsts(["assertBucketingInternal", "visitInternalBucketing"]) + reexportTypes(["AggregatableObjectSetStep"], "<TAggregatableProperties, TMultipleAggregationProperties, TBucketableProperties, TBucketGroup extends BucketGroup = {}>") + reexportTypes(["GroupedTerminalAggregationOperations"], "<TAggregatableProperties, TMultipleAggregationProperties, TBucketGroup extends BucketGroup = {}>")));
+      ` + reexportTypes(["Double", "Rangeable", "MetricValue", "Date", "BucketKey", "BucketValue", "TimeUnit", "BucketGroup", "Metrics", "AggregatableProperties", "AggregationClause"]) + reexportTypes(["Range"], "<T extends Rangeable>", "<T>") + reexportTypes(["BaseGroupBy"], "<_T extends BucketValue = BucketValue>") + reexportTypes(["Duration"], "<_T extends Timestamp | LocalDate = Timestamp | LocalDate>") + reexportTypes(["AggregatableProperty", "MultipleAggregationsOperations"], "<_T extends MetricValue = MetricValue>") + reexportTypes(["AggregationGroup"], "<TMetrics extends Metrics | MetricValue, TBucketGroup extends BucketGroup>") + reexportTypes(["Bucketing"], "<_T extends string , _X extends BucketValue>") + reexportTypes(["AggregationResult"], "<TBucketGroup extends BucketGroup, TMetrics extends Metrics | MetricValue>") + reexportTypes(["BaseBucketing"], "<TBucketKey extends BucketKey, TBucketValue extends BucketValue, Kind extends string>") + reexportTypes(["ExactValueBucketing", "InternalBucketing"], `<TBucketKey extends BucketKey, TBucketValue extends BucketValue>`) + reexportTypes(["RangeBucketing", "FixedWidthBucketing"], `<TBucketKey extends BucketKey, TBucketValue extends Range<Rangeable>>`) + reexportTypes(["DurationBucketing"], `<TBucketKey extends BucketKey, TBucketValue extends Date>`) + reexportTypes(["InternalBucketingVisitor"], "<TBucketKey extends BucketKey, T extends BucketValue, R>") + reexportTypes(["AggregationBuilderResult"], "<T, TMultipleAggregationProperties>") + reexportTypes(["AggregatablePropertiesForResult", "AggregatablePropertyNamesForResult"], "<TAggregatableProperties, TResult extends MetricValue>") + reexportConsts(["assertBucketingInternal", "visitInternalBucketing"], true) + reexportTypes(["AggregatableObjectSetStep"], "<TAggregatableProperties, TMultipleAggregationProperties, TBucketableProperties, TBucketGroup extends BucketGroup = {}>") + reexportTypes(["GroupedTerminalAggregationOperations"], "<TAggregatableProperties, TMultipleAggregationProperties, TBucketGroup extends BucketGroup = {}>")));
 }
 async function generateGroupBy(fs2, aggregationsDir, importExt = "") {
   await fs2.mkdir(path16.join(aggregationsDir, "groupBy"), {
@@ -696,12 +702,12 @@ async function generateMetrics(fs2, aggregationsDir, importExt = "") {
   await fs2.writeFile(path16.join(metricsDir, "ApproximateDistinctCountAggregatableProperty.ts"), await formatTs(reexportConsts(["ApproximateDistinctCountAggregatableProperty"]) + reexportTypes(["ApproximateDistinctCountAggregatableProperty"])));
   await fs2.writeFile(path16.join(metricsDir, "MultipleAggregatableProperty.ts"), await formatTs(`
         import { Double, MetricValue, MultipleAggregationsOperations } from "../Aggregations${importExt}";
-        import { MetricValueType } from "./metrics/index${importExt}";
+        import { MetricValueType } from "./index${importExt}";
       ` + reexportConsts(["MultipleAggregatableProperty"]) + reexportTypes(["MultipleAggregatableProperty"], "<TResult extends MetricValue = Double>")));
   for (const typeName of ["DefaultAggregatableProperty", "LocalDatePropertyMetric", "NumericPropertyMetric", "TimestampPropertyMetric"]) {
     await fs2.writeFile(path16.join(metricsDir, `${typeName}.ts`), await formatTs(`
           import { MultipleAggregatableProperty } from "./MultipleAggregatableProperty${importExt}";
-        ` + reexportConsts([typeName])));
+        ` + reexportConsts([typeName], true)));
   }
   await fs2.writeFile(path16.join(metricsDir, "index.ts"), await formatTs(`
       export * from "./ApproximateDistinctCountAggregatableProperty${importExt}";
@@ -736,13 +742,12 @@ async function generateAggregationsDir(fs2, runtimeDistDir, importExt = "") {
   `));
   await fs2.writeFile(path16.join(aggregationsDir, "ComputeStep.ts"), await formatTs(`
       import { ObjectSetDefinition } from "../baseTypes/index${importExt}";
-      import { FoundryClientOptions } from "../client/${importExt}";
-      import { AggregateObjectsError, OntologyMetadata, Result } from "../ontologyProvider/index${importExt}";
+      import { FoundryClientOptions } from "../client/index${importExt}";
       import { AggregationClause, AggregationResult, BucketGroup, BucketValue, InternalBucketing, Metrics, MetricValue } from "./Aggregations${importExt}";
       ` + reexportConsts(["ComputeStep"]) + reexportTypes(["ComputeStep"], "<TBucketGroup extends BucketGroup, TMetrics extends Metrics | MetricValue> ") + reexportTypes(["AggregationComputeStep"], "<TBucketGroup extends BucketGroup, TMetrics extends Metrics | MetricValue>") + `
     
     `));
-  await fs2.writeFile(path16.join(aggregationsDir, "CountOperation.ts"), await formatTs(`` + reexportConsts(["CountOperation", "isCountOperation"]) + reexportTypes(["CountOperation"])));
+  await fs2.writeFile(path16.join(aggregationsDir, "CountOperation.ts"), await formatTs(`` + reexportConsts(["CountOperation"]) + reexportConsts(["isCountOperation"], true) + reexportTypes(["CountOperation"])));
   await fs2.writeFile(path16.join(aggregationsDir, "internalAggregationRequest.ts"), await formatTs(reexportTypes(["InternalAggregationRequest"])));
 }
 async function generateAttachmentsDir(attachmentsDir, fs2, importExt = "") {
@@ -771,8 +776,8 @@ async function generateGeoshapesDir(runtimeDistDir, fs2, importExt = "") {
        export * from "./Polygon${importExt}";`));
   await fs2.writeFile(path16.join(runtimeDistDir, "Distance.ts"), await formatTs(`` + reexportConsts(["Distance", "DistanceUnit"]) + reexportTypes(["Distance", "DistanceUnit"])));
   await fs2.writeFile(path16.join(runtimeDistDir, "GeoJson.ts"), await formatTs(reexportTypes(["GeoJsonPoint", "GeoJsonPolygon", "GeoJsonLineString", "GeoJsonMultiPoint", "GeoJsonMultiPolygon", "GeoJsonMultiLineString", "GeoJsonGeometryCollection", "GeoJsonGeometry", "GeoJson"])));
-  await fs2.writeFile(path16.join(runtimeDistDir, "GeometryCollection.ts"), await formatTs(reexportConsts(["GeometryCollection"])));
-  await fs2.writeFile(path16.join(runtimeDistDir, "GeoPoint.ts"), await formatTs(`` + reexportConsts(["isGeoPoint", "GeoPoint", "mapCoordinatesToGeoPoint"]) + reexportTypes(["GeoHash", "Coordinates", "GeoPoint"])));
+  await fs2.writeFile(path16.join(runtimeDistDir, "GeometryCollection.ts"), await formatTs(reexportConsts(["GeometryCollection"], true)));
+  await fs2.writeFile(path16.join(runtimeDistDir, "GeoPoint.ts"), await formatTs(`` + reexportConsts(["GeoPoint"]) + reexportConsts(["isGeoPoint", "mapCoordinatesToGeoPoint"], true) + reexportTypes(["GeoHash", "Coordinates", "GeoPoint"])));
   await fs2.writeFile(path16.join(runtimeDistDir, "GeoShape.ts"), await formatTs(reexportConsts(["GeoShape"]) + reexportTypes(["GeoShape"])));
   await fs2.writeFile(path16.join(runtimeDistDir, "LineString.ts"), await formatTs(reexportConsts(["LineString"]) + reexportTypes(["LineString"])));
   await fs2.writeFile(path16.join(runtimeDistDir, "MultiGeoPoint.ts"), await formatTs(reexportConsts(["MultiGeoPoint"]) + reexportTypes(["MultiGeoPoint"])));
@@ -798,7 +803,7 @@ async function generateSharedObjectCodeDir(sharedObjectCodeDir, fs2, importExt =
   await fs2.writeFile(path16__default.join(sharedObjectCodeDir, "index.ts"), await formatTs(`
     export * from "./FilteredPropertiesTerminalOperations${importExt}";
     `));
-  await fs2.writeFile(path16__default.join(sharedObjectCodeDir, "FilteredPropertiesTerminalOperations.ts"), await formatTs(`import { OntologyObject } from "../OntologyObject${importExt}` + reexportTypes(["FilteredPropertiesTerminalOperations", "FilteredPropertiesTerminalOperationsWithGet"], "<T extends OntologyObject, V extends Array<keyof T>>")));
+  await fs2.writeFile(path16__default.join(sharedObjectCodeDir, "FilteredPropertiesTerminalOperations.ts"), await formatTs(`import { OntologyObject } from "../OntologyObject${importExt}";` + reexportTypes(["FilteredPropertiesTerminalOperations", "FilteredPropertiesTerminalOperationsWithGet"], "<T extends OntologyObject, V extends Array<keyof T>>")));
 }
 async function generateTimeSeriesDir(timeseriesDir, fs2, importExt = "") {
   await fs2.mkdir(timeseriesDir, {
@@ -847,9 +852,9 @@ async function generateBaseTypesDir(runtimeDistDir, fs2, importExt = "") {
   const sharedObjectCodeDir = path16.join(baseTypesDir, "sharedObjectCode");
   await generateSharedObjectCodeDir(sharedObjectCodeDir, fs2, importExt);
   await fs2.writeFile(path16.join(baseTypesDir, "ActionType.ts"), await formatTs(`import { OntologyObject } from "./OntologyObject${importExt}";
-      ` + reexportConsts(["ActionExecutionMode", "ReturnEditsMode", "ActionValidationResult"]) + reexportTypes(["ActionExecutionOptions", "ValidationResponse", "BulkEdits"]) + reexportTypes(["CreatedObjectEdits", "ModifiedObjectEdits"], "<T extends OntologyObject>") + reexportTypes(["Edits"], "<TAddedObjects extends OntologyObject | void, TModifiedObjects extends OntologyObject | void>") + reexportTypes(["ActionResponse"], "<TEdits extends Edits<any, any> | undefined = undefined>", "<TEdits>") + reexportTypes(["ActionResponseFromOptions"], "<TOptions extends ActionExecutionOptions | undefined = undefined, TEdits extends Edits<any, any> | undefined = undefined>", "<TOptions, TEdits>")));
-  await fs2.writeFile(path16.join(baseTypesDir, "OntologyObject.ts"), await formatTs(reexportTypes(["OntologyObject"]) + reexportConsts(["isOntologyObject"])));
-  await fs2.writeFile(path16.join(baseTypesDir, "links.ts"), await formatTs(`import { OntologyObject } from "./OntologyObject${importExt}` + reexportTypes(["SingleLink", "MultiLink"], "<T extends OntologyObject = OntologyObject>")));
+      ` + reexportConsts(["ActionExecutionMode", "ReturnEditsMode", "ActionValidationResult"], true) + reexportTypes(["ActionExecutionOptions", "ValidationResponse", "BulkEdits"]) + reexportTypes(["CreatedObjectEdits", "ModifiedObjectEdits"], "<T extends OntologyObject>") + reexportTypes(["Edits"], "<TAddedObjects extends OntologyObject | void, TModifiedObjects extends OntologyObject | void>") + reexportTypes(["ActionResponse"], "<TEdits extends Edits<any, any> | undefined = undefined>", "<TEdits>") + reexportTypes(["ActionResponseFromOptions"], "<TOptions extends ActionExecutionOptions | undefined = undefined, TEdits extends Edits<any, any> | undefined = undefined>", "<TOptions, TEdits>")));
+  await fs2.writeFile(path16.join(baseTypesDir, "OntologyObject.ts"), await formatTs(reexportTypes(["OntologyObject"]) + reexportConsts(["isOntologyObject"], true)));
+  await fs2.writeFile(path16.join(baseTypesDir, "links.ts"), await formatTs(`import { OntologyObject } from "./OntologyObject${importExt}";` + reexportTypes(["SingleLink", "MultiLink"], "<T extends OntologyObject = OntologyObject>")));
   await fs2.writeFile(path16.join(baseTypesDir, "localDate.ts"), await formatTs(reexportConsts(["LocalDate"]) + reexportTypes(["LocalDate"])));
   await fs2.writeFile(path16.join(baseTypesDir, "timestamp.ts"), await formatTs(reexportConsts(["Timestamp"]) + reexportTypes(["Timestamp"])));
   await fs2.writeFile(path16.join(baseTypesDir, "Queries.ts"), await formatTs(`import { BucketValue, Range, Rangeable } from "../aggregations/index${importExt}";
@@ -887,7 +892,7 @@ async function generateFiltersDir(runtimeDistDir, fs2, importExt = "") {
   await fs2.writeFile(path16__default.join(pagingDir, "DateTimeFilters.ts"), await formatTs(reexportConsts(["TimestampFilter", "LocalDateFilter"]) + reexportTypes(["TimestampFilter", "LocalDateFilter"])));
   await fs2.writeFile(path16__default.join(pagingDir, "GeoShapeFilter.ts"), await formatTs(reexportConsts(["GeoShapeFilter"]) + reexportTypes(["GeoShapeFilter"])));
   await fs2.writeFile(path16__default.join(pagingDir, "NumericFilter.ts"), await formatTs(reexportConsts(["NumericFilter"]) + reexportTypes(["NumericFilter"])));
-  await fs2.writeFile(path16__default.join(pagingDir, "Op.ts"), await formatTs(reexportConsts(["Op"])));
+  await fs2.writeFile(path16__default.join(pagingDir, "Op.ts"), await formatTs(reexportConsts(["Op"], true)));
   await fs2.writeFile(path16__default.join(pagingDir, "OrderByOption.ts"), await formatTs(reexportConsts(["OrderByOption"]) + reexportTypes(["OrderByOption"])));
   await fs2.writeFile(path16__default.join(pagingDir, "StringFilter.ts"), await formatTs(reexportConsts(["StringFilter"]) + reexportTypes(["StringFilter"])));
   await fs2.writeFile(path16__default.join(pagingDir, "Filters.ts"), await formatTs(`import { OntologyObject } from "@osdk/legacy-client";` + reexportTypes(["ObjectTypeFilterFunction", "ObjectTypeOrderByFunction"], "<T extends OntologyObject>") + reexportTypes(["BoundingBoxFilter", "DistanceOf", "SearchClause", "LtWhereClause", "GtWhereClause", "LteWhereClause", "GteWhereClause", "EqWhereClause", "IsNullWhereClause", "ContainsWhereClause", "StartsWithWhereClause", "ContainsAllTermsInOrderWhereClause", "ContainsAnyTermWhereClause", "ContainsAllTermsWhereClause", "WithinDistanceOfWhereClause", "WithinBoundingBoxWhereClause", "IntersectsBoundingBoxWhereClause", "DoesNotIntersectBoundingBoxWhereClause", "WithinPolygonWhereClause", "IntersectsPolygonWhereClause", "DoesNotIntersectPolygonWhereClause", "AndWhereClause", "OrWhereClause", "NotWhereClause", "WhereClause", "OrderByClause"]) + reexportTypes(["FilterType"], "<T extends string | number>")));
@@ -900,7 +905,7 @@ async function generateOntologyMetadata(fs2, ontologyProviderDir) {
 }
 async function generateResult(fs2, ontologyProviderDir) {
   await fs2.writeFile(path16.join(ontologyProviderDir, "Result.ts"), await formatTs(`import {FoundryApiError} from "@osdk/legacy-client";
-        ` + reexportTypes(["Ok", "Err"], "<T>") + reexportTypes(["Result"], "<V, E = FoundryApiError>", "<V,E>") + reexportConsts(["isOk", "isErr", "visitError"]) + reexportTypes(["ErrorVisitor"], "<E extends FoundryApiError, R>", "<E,R>") + reexportTypes(["ExtractKeysWithType"], "<T, K extends keyof T>", "<T,K>")));
+        ` + reexportTypes(["Ok", "Err"], "<T>") + reexportTypes(["Result"], "<V, E = FoundryApiError>", "<V,E>") + reexportConsts(["isOk", "isErr", "visitError"], true) + reexportTypes(["ErrorVisitor"], "<E extends FoundryApiError, R>", "<E,R>") + reexportTypes(["ExtractKeysWithType"], "<T, K extends keyof T>", "<T,K>")));
 }
 
 // src/v1.1/backcompat/internal-foundry-ontology-runtime-dist/generateOntologyProviderDir.ts
@@ -1432,7 +1437,7 @@ async function generatePerQueryDataFiles(ontology, fs2, outDir, importExt = "",
   });
   await Promise.all(Object.values(ontology.queryTypes).map(async (query) => {
     const objectTypes = getObjectTypesFromQuery(query);
-    const importObjects = objectTypes.length > 0 ? `import {${[...objectTypes].join(",")}} from "../objects${importExt}";` : "";
+    const importObjects = objectTypes.length > 0 ? `import {${[...objectTypes].join(",")}} from "../objects${v2 ? "" : "/index"}${importExt}";` : "";
     if (v2) {
       await fs2.writeFile(path16__default.join(outDir, `${query.apiName}.ts`), await formatTs(`
           import { QueryDefinition } from "@osdk/api";
@@ -1897,8 +1902,7 @@ async function generateOntologyInterfaces(fs2, outDir, interfaceNames, ontology,
     await fs2.writeFile(path16__default.join(interfacesDir, `${name}.ts`), await formatTs(`
     
       import type { InterfaceDefinition, PropertyDef, VersionBound } from "@osdk/api";
-      import { $osdkMetadata, $expectedClientVersion } from "../../OntologyMetadata${importExt}";
-      import type { $ExpectedClientVersion } from "../../OntologyMetadata${importExt}";
+      import { $osdkMetadata, $ExpectedClientVersion } from "../../OntologyMetadata${importExt}";
 
       ${__UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(obj, ontology, true)}
     `));