@osdk/generator 0.0.14 → 0.0.15

package/build/js/index.mjs

@@ -1,23 +1,23 @@
-import * as T from 'path';
-import T__default, { join } from 'path';
+import * as l from 'path';
+import l__default, { join } from 'path';
 import { format } from 'prettier';
-import Be from 'prettier-plugin-organize-imports';
+import rt from 'prettier-plugin-organize-imports';
 
-function I(e){return {...e,actionTypes:e.actionTypes.map(t=>({...t,apiName:De(t.apiName)}))}}function De(e){return e.replace(/-./g,t=>t[1].toUpperCase())}function x(e){let t=new Set,o=new Set;for(let r of e.operations)switch(r.type){case"createObject":t.add(r.objectTypeApiName);break;case"modifyObject":o.add(r.objectTypeApiName);break;}return {addedObjects:t,modifiedObjects:o}}function i(e){return format(e,{parser:"typescript",singleQuote:!0,trailingComma:"all",plugins:[Be],tabWidth:2,printWidth:120})}async function G(e,t,o){let r=new Set,n=[];for(let a of e.actionTypes){let c=Object.entries(a.parameters),l=x(a),y=Array.from(l.addedObjects),g=Array.from(l.modifiedObjects);y.forEach(r.add,r),g.forEach(r.add,r);let s=["/**"];a.description&&s.push(`* ${a.description}`);let m="";if(c.length>0){m=`params: { 
-`;for(let[f,A]of c){m+=`"${f}"`,m+=A.required?": ":"?: ";let R=Q(A.dataType,r);m+=`${R};
-`,s.push(`* @param {${R}} params.${f}`);}m+="}, ";}s.push("*/"),n.push(`
-      ${s.join(`
+function Y(e){return {...e,actionTypes:e.actionTypes.map(t=>({...t,apiName:et(t.apiName)}))}}function et(e){return e.replace(/-./g,t=>t[1].toUpperCase())}function D(e){let t=new Set,r=new Set;for(let o of e.operations)switch(o.type){case"createObject":t.add(o.objectTypeApiName);break;case"modifyObject":r.add(o.objectTypeApiName);break;}return {addedObjects:t,modifiedObjects:r}}function i(e){return format(e,{parser:"typescript",singleQuote:!0,trailingComma:"all",plugins:[rt],tabWidth:2,printWidth:120})}async function Z(e,t,r){let o=new Set,s=[];for(let n of e.actionTypes){let c=Object.entries(n.parameters),g=D(n),f=Array.from(g.addedObjects),T=Array.from(g.modifiedObjects);f.forEach(o.add,o),T.forEach(o.add,o);let m=["/**"];n.description&&m.push(`* ${n.description}`);let u="";if(c.length>0){u=`params: { 
+`;for(let[b,k]of c){u+=`"${b}"`,u+=k.required?": ":"?: ";let z=H(k.dataType,o);u+=`${z};
+`,m.push(`* @param {${z}} params.${b}`);}u+="}, ";}m.push("*/"),s.push(`
+      ${m.join(`
 `)}
-      ${a.apiName}<O extends ActionExecutionOptions>(${m}options?: O): 
-        Promise<Result<ActionResponseFromOptions<O, Edits<${y.length>0?y.join(" | "):"void"}, ${g.length>0?g.join(" | "):"void"}>>, ActionError>>;`);}await t.mkdir(o,{recursive:!0}),await t.writeFile(T__default.join(o,"Actions.ts"),await i(`
+      ${n.apiName}<O extends ActionExecutionOptions>(${u}options?: O): 
+        Promise<Result<ActionResponseFromOptions<O, Edits<${f.length>0?f.join(" | "):"void"}, ${T.length>0?T.join(" | "):"void"}>>, ActionError>>;`);}await t.mkdir(r,{recursive:!0}),await t.writeFile(l__default.join(r,"Actions.ts"),await i(`
     import type { ObjectSet, LocalDate, Timestamp, Attachment, Edits, ActionExecutionOptions, ActionError, Result, ActionResponseFromOptions } from "@osdk/legacy-client";
-    ${Array.from(r).map(a=>`import type { ${a} } from "../objects/${a}";`).join(`
+    ${Array.from(o).map(n=>`import type { ${n} } from "../objects/${n}";`).join(`
 `)}
     export interface Actions {
-    ${n.join(`
+    ${s.join(`
 `)}
     }
-  `));}function Q(e,t){switch(e.type){case"objectSet":{let r=e.objectTypeApiName;return t.add(r),`ObjectSet<${r}>`}case"object":{let r=e.objectTypeApiName;return t.add(r),`${r} | ${r}["__primaryKey"]`}case"array":return `Array<${Q(e.subType,t)}>`;case"string":return "string";case"boolean":return "boolean";case"attachment":return "Attachment";case"date":return "LocalDate";case"double":case"integer":case"long":return "number";case"timestamp":return "Timestamp";default:throw new Error(`Unsupported action parameter type: ${e}`)}}function u(e){return `
+  `));}function H(e,t){switch(e.type){case"objectSet":{let o=e.objectTypeApiName;return t.add(o),`ObjectSet<${o}>`}case"object":{let o=e.objectTypeApiName;return t.add(o),`${o} | ${o}["__primaryKey"]`}case"array":return `Array<${H(e.subType,t)}>`;case"string":return "string";case"boolean":return "boolean";case"attachment":return "Attachment";case"date":return "LocalDate";case"double":case"integer":case"long":return "number";case"timestamp":return "Timestamp";default:throw new Error(`Unsupported action parameter type: ${e}`)}}function p(e){return `
           import  { ${e.map(t=>`${t} as OG_${t}`).join(", ")}} from "@osdk/legacy-client";
       
           ${e.map(t=>`
@@ -26,24 +26,43 @@ function I(e){return {...e,actionTypes:e.actionTypes.map(t=>({...t,apiName:De(t.
           `).join(`
 
 `)}
-      `}function p(e,t="",o=Ve(t)){return `
-    import type { ${e.map(r=>`${r} as OG_${r}`).join(", ")}} from "@osdk/legacy-client";
+      `}async function X(e,t){let r=l__default.join(t,"ConfidentialClient");await e.mkdir(r,{recursive:!0}),await e.writeFile(l__default.join(r,"index.ts"),await i(`
+    export * from "./ConfidentialClientAuth";
+  `)),await e.writeFile(l__default.join(r,"ConfidentialClientAuth.ts"),await i(`
+        ${p(["ConfidentialClientAuth"])}
+    `));}async function ee(e,t){let r=l__default.join(t,"PublicClient");await e.mkdir(r,{recursive:!0}),await e.writeFile(l__default.join(r,"index.ts"),await i(`
+    export * from "./PublicClientAuth";
+  `)),await e.writeFile(l__default.join(r,"PublicClientAuth.ts"),await i(`
+        ${p(["PublicClientAuth"])}
+    `));}async function te(e,t){let r=l__default.join(t,"UserToken");await e.mkdir(r,{recursive:!0}),await e.writeFile(l__default.join(r,"index.ts"),await i(`
+    export * from "./UserTokenAuth";
+  `)),await e.writeFile(l__default.join(r,"UserTokenAuth.ts"),await i(`
+        ${p(["UserTokenAuth"])}
+    `));}function a(e,t="",r=nt(t)){return `
+    import type { ${e.map(o=>`${o} as OG_${o}`).join(", ")}} from "@osdk/legacy-client";
     
-        ${e.map(r=>`
+        ${e.map(o=>`
       /** @deprecated submodule imports arent public api **/
-      export type ${r}${t} = OG_${r}${o};
+      export type ${o}${t} = OG_${o}${r};
     `).join(`
 
 `)}
-    `}var Me=/<(.*?)>/,ve=/^\s?(.+?)( extends .*?)?( = .*?)?\s?$/;function Ve(e){return e.length===0?"":`<${Me.exec(e)?.[1]?.split(",")?.map(o=>ve.exec(o)?.[1]??o)?.join(",")}>`}async function K(e,t){await e.writeFile(T.join(t,"Aggregations.ts"),await i(`
+    `}var it=/<(.*?)>/,at=/^\s?(.+?)( extends .*?)?( = .*?)?\s?$/;function nt(e){return e.length===0?"":`<${it.exec(e)?.[1]?.split(",")?.map(r=>at.exec(r)?.[1]??r)?.join(",")}>`}async function re(e,t){let r=l.join(e,"internal","@foundry","oauth-client","dist");await t.mkdir(r,{recursive:!0}),await t.writeFile(l.join(r,"index.ts"),await i(`
+    export * from "./Auth";
+    export * from "./ConfidentialClient";
+    export * from "./OAuthClient";
+    export * from "./PublicClient";
+    export * from "./Token";
+    export * from "./UserToken";
+`)),await t.writeFile(l.join(r,"Auth.ts"),await i(a(["Auth"]))),await t.writeFile(l.join(r,"Token.ts"),await i(a(["Token","TokenValue"]))),await t.writeFile(l.join(r,"OAuthClient.ts"),await i(a(["AuthSubscription","UnsubscribeFunction","SignInResponse","RefreshResponse","SignOutResponse"]))),await t.writeFile(l.join(r,"OAuthToken.ts"),await i(p(["OAuthToken"]))),await t.writeFile(l.join(r,"Auth.ts"),await i(a(["Auth"]))),await X(t,r),await ee(t,r),await te(t,r);}async function ie(e,t){await e.writeFile(l.join(t,"Aggregations.ts"),await i(`
       import { LocalDate, Timestamp } from "@osdk/legacy-client";
-      `+p(["Double","Rangeable","MetricValue","Date","BucketKey","BucketValue","TimeUnit","BucketGroup","Metrics","AggregatableProperties","AggregationClause"])+p(["Range"],"<T extends Rangeable>","<T>")+p(["BaseGroupBy"],"<_T extends BucketValue = BucketValue>")+p(["Duration"],"<_T extends Timestamp | LocalDate = Timestamp | LocalDate>")+p(["AggregatableProperty","MultipleAggregationsOperations"],"<_T extends MetricValue = MetricValue>")+p(["AggregationGroup"],"<TMetrics extends Metrics | MetricValue, TBucketGroup extends BucketGroup>")+p(["Bucketing"],"<_T extends string , _X extends BucketValue>")+p(["AggregationResult"],"<TBucketGroup extends BucketGroup, TMetrics extends Metrics | MetricValue>")+p(["BaseBucketing"],"<TBucketKey extends BucketKey, TBucketValue extends BucketValue, Kind extends string>")+p(["ExactValueBucketing","InternalBucketing"],"<TBucketKey extends BucketKey, TBucketValue extends BucketValue>")+p(["RangeBucketing","FixedWidthBucketing"],"<TBucketKey extends BucketKey, TBucketValue extends Range<Rangeable>>")+p(["DurationBucketing"],"<TBucketKey extends BucketKey, TBucketValue extends Date>")+p(["InternalBucketingVisitor"],"<TBucketKey extends BucketKey, T extends BucketValue, R>")+p(["AggregationBuilderResult"],"<T, TMultipleAggregationProperties>")+p(["AggregatablePropertiesForResult","AggregatablePropertyNamesForResult"],"<TAggregatableProperties, TResult extends MetricValue>")+u(["assertBucketingInternal","visitInternalBucketing"])+p(["AggregatableObjectSetStep"],"<TAggregatableProperties, TMultipleAggregationProperties, TBucketableProperties, TBucketGroup extends BucketGroup = {}>")+p(["GroupedTerminalAggregationOperations"],"<TAggregatableProperties, TMultipleAggregationProperties, TBucketGroup extends BucketGroup = {}>")));}async function _(e,t){await e.mkdir(T.join(t,"groupBy"),{recursive:!0});let o=["BooleanGroupBy","LocalDateGroupBy","NumericGroupBy","StringGroupBy","TimestampGroupBy"],r=[...o,"GroupKeyType"];for(let n of r)await e.writeFile(T.join(t,"groupBy",`${n}.ts`),await i(`export {${n}} from "./index";`));await e.writeFile(T.join(t,"groupBy","index.ts"),await i('import { Bucketing, BucketKey, Duration, Range, Rangeable } from "../Aggregations";'+u(o)+p(o,"<T extends BucketKey>")+`export {GroupKeyType} from "@osdk/legacy-client";
-          `));}async function U(e,t){let o=T.join(t,"metrics");await e.mkdir(o,{recursive:!0}),await e.writeFile(T.join(o,"metrics.ts"),await i('export {MetricValueType} from "@osdk/legacy-client";')),await e.writeFile(T.join(o,"ApproximateDistinctCountAggregatableProperty.ts"),await i(u(["ApproximateDistinctCountAggregatableProperty"])+p(["ApproximateDistinctCountAggregatableProperty"]))),await e.writeFile(T.join(o,"MultipleAggregatableProperty.ts"),await i(`
+      `+a(["Double","Rangeable","MetricValue","Date","BucketKey","BucketValue","TimeUnit","BucketGroup","Metrics","AggregatableProperties","AggregationClause"])+a(["Range"],"<T extends Rangeable>","<T>")+a(["BaseGroupBy"],"<_T extends BucketValue = BucketValue>")+a(["Duration"],"<_T extends Timestamp | LocalDate = Timestamp | LocalDate>")+a(["AggregatableProperty","MultipleAggregationsOperations"],"<_T extends MetricValue = MetricValue>")+a(["AggregationGroup"],"<TMetrics extends Metrics | MetricValue, TBucketGroup extends BucketGroup>")+a(["Bucketing"],"<_T extends string , _X extends BucketValue>")+a(["AggregationResult"],"<TBucketGroup extends BucketGroup, TMetrics extends Metrics | MetricValue>")+a(["BaseBucketing"],"<TBucketKey extends BucketKey, TBucketValue extends BucketValue, Kind extends string>")+a(["ExactValueBucketing","InternalBucketing"],"<TBucketKey extends BucketKey, TBucketValue extends BucketValue>")+a(["RangeBucketing","FixedWidthBucketing"],"<TBucketKey extends BucketKey, TBucketValue extends Range<Rangeable>>")+a(["DurationBucketing"],"<TBucketKey extends BucketKey, TBucketValue extends Date>")+a(["InternalBucketingVisitor"],"<TBucketKey extends BucketKey, T extends BucketValue, R>")+a(["AggregationBuilderResult"],"<T, TMultipleAggregationProperties>")+a(["AggregatablePropertiesForResult","AggregatablePropertyNamesForResult"],"<TAggregatableProperties, TResult extends MetricValue>")+p(["assertBucketingInternal","visitInternalBucketing"])+a(["AggregatableObjectSetStep"],"<TAggregatableProperties, TMultipleAggregationProperties, TBucketableProperties, TBucketGroup extends BucketGroup = {}>")+a(["GroupedTerminalAggregationOperations"],"<TAggregatableProperties, TMultipleAggregationProperties, TBucketGroup extends BucketGroup = {}>")));}async function ae(e,t){await e.mkdir(l.join(t,"groupBy"),{recursive:!0});let r=["BooleanGroupBy","LocalDateGroupBy","NumericGroupBy","StringGroupBy","TimestampGroupBy"],o=[...r,"GroupKeyType"];for(let s of o)await e.writeFile(l.join(t,"groupBy",`${s}.ts`),await i(`export {${s}} from "./index";`));await e.writeFile(l.join(t,"groupBy","index.ts"),await i('import { Bucketing, BucketKey, Duration, Range, Rangeable } from "../Aggregations";'+p(r)+a(r,"<T extends BucketKey>")+`export {GroupKeyType} from "@osdk/legacy-client";
+          `));}async function ne(e,t){let r=l.join(t,"metrics");await e.mkdir(r,{recursive:!0}),await e.writeFile(l.join(r,"metrics.ts"),await i('export {MetricValueType} from "@osdk/legacy-client";')),await e.writeFile(l.join(r,"ApproximateDistinctCountAggregatableProperty.ts"),await i(p(["ApproximateDistinctCountAggregatableProperty"])+a(["ApproximateDistinctCountAggregatableProperty"]))),await e.writeFile(l.join(r,"MultipleAggregatableProperty.ts"),await i(`
         import { Double, MetricValue, MultipleAggregationsOperations } from "../Aggregations";
         import { MetricValueType } from "./metrics";
-      `+u(["MultipleAggregatableProperty"])+p(["MultipleAggregatableProperty"],"<TResult extends MetricValue = Double>")));for(let r of ["DefaultAggregatableProperty","LocalDatePropertyMetric","NumericPropertyMetric","TimestampPropertyMetric"])await e.writeFile(T.join(o,`${r}.ts`),await i(`
+      `+p(["MultipleAggregatableProperty"])+a(["MultipleAggregatableProperty"],"<TResult extends MetricValue = Double>")));for(let o of ["DefaultAggregatableProperty","LocalDatePropertyMetric","NumericPropertyMetric","TimestampPropertyMetric"])await e.writeFile(l.join(r,`${o}.ts`),await i(`
           import { MultipleAggregatableProperty } from "./MultipleAggregatableProperty";
-        `+u([r])));await e.writeFile(T.join(o,"index.ts"),await i(`
+        `+p([o])));await e.writeFile(l.join(r,"index.ts"),await i(`
       export * from "./ApproximateDistinctCountAggregatableProperty";
       export * from "./DefaultAggregatableProperty";
       export * from "./LocalDatePropertyMetric";
@@ -51,7 +70,7 @@ function I(e){return {...e,actionTypes:e.actionTypes.map(t=>({...t,apiName:De(t.
       export * from "./MultipleAggregatableProperty";
       export * from "./NumericPropertyMetric";
       export * from "./TimestampPropertyMetric";
-      `));}async function q(e,t){let o=T.join(t,"aggregations");await e.mkdir(o,{recursive:!0}),await _(e,o),await K(e,o),await U(e,o),await e.writeFile(T.join(o,"index.ts"),await i(`
+      `));}async function se(e,t){let r=l.join(t,"aggregations");await e.mkdir(r,{recursive:!0}),await ae(e,r),await ie(e,r),await ne(e,r),await e.writeFile(l.join(r,"index.ts"),await i(`
     
     
     
@@ -61,24 +80,69 @@ function I(e){return {...e,actionTypes:e.actionTypes.map(t=>({...t,apiName:De(t.
     export * from "./groupBy";
     export * from "./internalAggregationRequest";
     export * from "./metrics";
-  `)),await e.writeFile(T.join(o,"ComputeStep.ts"),await i(`
+  `)),await e.writeFile(l.join(r,"ComputeStep.ts"),await i(`
       import { ObjectSetDefinition } from "../baseTypes";
       import { FoundryClientOptions } from "../client";
       import { AggregateObjectsError, OntologyMetadata, Result } from "../ontologyProvider";
       import { AggregationClause, AggregationResult, BucketGroup, BucketValue, InternalBucketing, Metrics, MetricValue } from "./Aggregations";
-      `+u(["ComputeStep"])+p(["ComputeStep"],"<TBucketGroup extends BucketGroup, TMetrics extends Metrics | MetricValue> ")+p(["AggregationComputeStep"],"<TBucketGroup extends BucketGroup, TMetrics extends Metrics | MetricValue>")+`
+      `+p(["ComputeStep"])+a(["ComputeStep"],"<TBucketGroup extends BucketGroup, TMetrics extends Metrics | MetricValue> ")+a(["AggregationComputeStep"],"<TBucketGroup extends BucketGroup, TMetrics extends Metrics | MetricValue>")+`
     
-    `)),await e.writeFile(T.join(o,"CountOperation.ts"),await i(""+u(["CountOperation","isCountOperation"])+p(["CountOperation"]))),await e.writeFile(T.join(o,"internalAggregationRequest.ts"),await i(p(["InternalAggregationRequest"])));}async function J(e,t){await e.writeFile(T.join(t,"Errors.ts"),await i(p(["PermissionDenied","Unauthorized","InvalidAggregationRangeValue","MalformedPropertyFilters","PropertiesNotFilterable","ParametersNotFound","ApplyActionFailed","PropertyTypesSearchNotSupported","InvalidParameterValue","QueryTimeExceededLimit","CompositePrimaryKeyNotSupported","PropertyBaseTypeNotSupported","PropertiesNotSearchable","AttachmentNotFound","ObjectTypeNotFound","InvalidGroupId","OntologySyncing","ActionNotFound","ParameterObjectSetRidNotFound","LinkTypeNotFound","InvalidRangeQuery","ActionParameterObjectNotFound","InvalidPropertyValue","PropertiesNotSortable","FunctionExecutionTimedOut","InvalidFields","ActionTypeNotFound","ObjectTypeNotSynced","OntologyEditsExceededLimit","AggregationGroupCountExceededLimit","InvalidContentType","PropertiesNotFound","FunctionInvalidInput","InvalidSortOrder","QueryDepthExceededLimit","InvalidPropertyFiltersCombination","ObjectsExceededLimit","DuplicateOrderBy","FunctionEncounteredUserFacingError","InvalidUserId","QueryNotFound","InvalidAggregationRange","ParameterObjectNotFound","QueryMemoryExceededLimit","InvalidContentLength","OntologyNotFound","ActionParameterObjectTypeNotFound","UnknownParameter","InvalidSortType","PropertyFiltersNotSupported","ActionValidationFailed","MultipleGroupByOnFieldNotSupported","LinkedObjectNotFound","ActionEditedPropertiesNotFound","InvalidPropertyFilterValue","QueryEncounteredUserFacingError","AttachmentSizeExceededLimit","ObjectNotFound","PropertyApiNameNotFound","ParameterTypeNotSupported","InvalidAggregationRangePropertyType","MissingParameter"])));}async function Y(e,t){await e.writeFile(T.join(t,"OntologyMetadata.ts"),await i(p(["OntologyMetadata"])));}async function X(e,t){await e.writeFile(T.join(t,"Result.ts"),await i(`import {FoundryApiError} from "@osdk/legacy-client";
-        `+p(["Ok","Err"],"<T>")+p(["Result"],"<V, E = FoundryApiError>","<V,E>")+u(["isOk","isErr","visitError"])+p(["ErrorVisitor"],"<E extends FoundryApiError, R>","<E,R>")+p(["ExtractKeysWithType"],"<T, K extends keyof T>","<T,K>")));}async function H(e,t){let o=T.join(t,"ontologyProvider");await e.mkdir(o,{recursive:!0}),await J(e,o),await Y(e,o),await X(e,o),await e.writeFile(T.join(o,"index.ts"),await i(`
+    `)),await e.writeFile(l.join(r,"CountOperation.ts"),await i(""+p(["CountOperation","isCountOperation"])+a(["CountOperation"]))),await e.writeFile(l.join(r,"internalAggregationRequest.ts"),await i(a(["InternalAggregationRequest"])));}async function pe(e,t){await t.mkdir(e,{recursive:!0}),await t.writeFile(l__default.join(e,"index.ts"),await i(`export * from "./Attachment";
+       export * from "./Attachments";
+    `)),await t.writeFile(l__default.join(e,"Attachment.ts"),await i(a(["Attachment","AttachmentMetadata"]))),await t.writeFile(l__default.join(e,"Attachments.ts"),await i(a(["Attachments"])));}async function ce(e,t){await t.mkdir(e,{recursive:!0}),await t.writeFile(l.join(e,"index.ts"),await i(`export * from "./Distance";
+       export * from "./GeoJson";
+       export * from "./GeometryCollection";
+       export * from "./GeoPoint";
+       export * from "./GeoShape";
+       export * from "./LineString";
+       export * from "./MultiGeoPoint";
+       export * from "./MultiLineString";
+       export * from "./MultiPolygon";
+       export * from "./Polygon";`)),await t.writeFile(l.join(e,"Distance.ts"),await i(""+p(["Distance","DistanceUnit"])+a(["Distance","DistanceUnit"]))),await t.writeFile(l.join(e,"GeoJson.ts"),await i(a(["GeoJsonPoint","GeoJsonPolygon","GeoJsonLineString","GeoJsonMultiPoint","GeoJsonMultiPolygon","GeoJsonMultiLineString","GeoJsonGeometryCollection","GeoJsonGeometry","GeoJson"]))),await t.writeFile(l.join(e,"GeometryCollection.ts"),await i(p(["GeometryCollection"]))),await t.writeFile(l.join(e,"GeoPoint.ts"),await i(""+p(["isGeoPoint","GeoPoint","mapCoordinatesToGeoPoint"])+a(["GeoHash","Coordinates","GeoPoint"]))),await t.writeFile(l.join(e,"GeoShape.ts"),await i(p(["GeoShape"])+a(["GeoShape"]))),await t.writeFile(l.join(e,"LineString.ts"),await i(p(["LineString"])+a(["LineString"]))),await t.writeFile(l.join(e,"MultiGeoPoint.ts"),await i(p(["MultiGeoPoint"])+a(["MultiGeoPoint"]))),await t.writeFile(l.join(e,"MultiLineString.ts"),await i(p(["MultiLineString"])+a(["MultiLineString"]))),await t.writeFile(l.join(e,"MultiPolygon.ts"),await i(p(["MultiPolygon"])+a(["MultiPolygon"]))),await t.writeFile(l.join(e,"Polygon.ts"),await i(p(["Polygon"])+a(["LinearRing","Polygon"])));}async function me(e,t){await t.mkdir(e,{recursive:!0}),await t.writeFile(l__default.join(e,"index.ts"),await i(`
+    export * from "./ObjectSetDefinition";
+    export * from "./OntologyObjectSet";
+    `)),await t.writeFile(l__default.join(e,"ObjectSetDefinition.ts"),await i(a(["BaseObjectSetDefinition","ReferenceObjectSetDefinition","StaticObjectSetDefinition","IntersectObjectSetDefinition","SubtractObjectSetDefinition","SearchAroundObjectSetDefinition","FilterObjectSetDefinition","ObjectSetDefinition"]))),await t.writeFile(l__default.join(e,"OntologyObjectSet.ts"),await i(a(["OntologyObjectSet"])));}async function ue(e,t){await t.mkdir(e,{recursive:!0}),await t.writeFile(l__default.join(e,"index.ts"),await i(`
+    export * from "./FilteredPropertiesTerminalOperations";
+    `)),await t.writeFile(l__default.join(e,"FilteredPropertiesTerminalOperations.ts"),await i('import { OntologyObject } from "../OntologyObject'+a(["FilteredPropertiesTerminalOperations","FilteredPropertiesTerminalOperationsWithGet"],"<T extends OntologyObject, V extends Array<keyof T>>")));}async function ye(e,t){await t.mkdir(e,{recursive:!0}),await t.writeFile(l.join(e,"index.ts"),await i(`
+    export * from "./TimeSeries";
+    export * from "./TimeSeriesDuration";
+    export * from "./TimeSeriesPoint";
+    
+    export * from "./TimeSeriesQuery";
+    export * from "./TimeSeriesTerminalOperations";
+  `)),await t.writeFile(l.join(e,"TimeSeries.ts"),await i(a(["TimeSeries"],"<T extends number | string>"))),await t.writeFile(l.join(e,"TimeSeriesDuration.ts"),await i(a(["WhenUnit","DurationUnit","TimeSeriesDuration"]))),await t.writeFile(l.join(e,"TimeSeriesPoint.ts"),await i(a(["TimeSeriesPoint"],"<T extends number | string>"))),await t.writeFile(l.join(e,"TimeSeriesQuery.ts"),await i(a(["TimeSeriesQuery"],"<T extends number | string>"))),await t.writeFile(l.join(e,"TimeSeriesTerminalOperations.ts"),await i(a(["TimeSeriesTerminalOperations","TimeSeriesIterator"],"<T extends number | string>")));}async function ge(e,t){let r=l.join(e,"baseTypes");await t.mkdir(r,{recursive:!0}),await t.writeFile(l.join(r,"index.ts"),await i(`export * from "./ActionType";
+      export * from "./attachments";
+      export * from "./geoshapes";
+      export * from "./links";
+      export * from "./localDate";
+      export * from "./objectset";
+      export * from "./ObjectType";
+      export * from "./OntologyObject";
+      export * from "./Queries";
+      export * from "./timeseries";
+      export * from "./timestamp";`));let o=l.join(r,"geoshapes");await ce(o,t);let s=l.join(r,"timeseries");await ye(s,t);let n=l.join(r,"attachments");await pe(n,t);let c=l.join(r,"objectset");await me(c,t);let g=l.join(r,"sharedObjectCode");await ue(g,t),await t.writeFile(l.join(r,"ActionType.ts"),await i(`import { OntologyObject } from "./OntologyObject";
+      `+p(["ActionExecutionMode","ReturnEditsMode","ActionValidationResult"])+a(["ActionExecutionOptions","ValidationResponse","BulkEdits"])+a(["CreatedObjectEdits","ModifiedObjectEdits"],"<T extends OntologyObject>")+a(["Edits"],"<TAddedObjects extends OntologyObject | void, TModifiedObjects extends OntologyObject | void>")+a(["ActionResponse"],"<TEdits extends Edits<any, any> | undefined = undefined>","<TEdits>")+a(["ActionResponseFromOptions"],"<TOptions extends ActionExecutionOptions | undefined = undefined, TEdits extends Edits<any, any> | undefined = undefined>","<TOptions, TEdits>"))),await t.writeFile(l.join(r,"OntologyObject.ts"),await i(a(["OntologyObject"])+p(["isOntologyObject"]))),await t.writeFile(l.join(r,"links.ts"),await i('import { OntologyObject } from "./OntologyObject'+a(["SingleLink","MultiLink"],"<T extends OntologyObject = OntologyObject>"))),await t.writeFile(l.join(r,"localDate.ts"),await i(p(["LocalDate"])+a(["LocalDate"]))),await t.writeFile(l.join(r,"timestamp.ts"),await i(p(["Timestamp"])+a(["Timestamp"]))),await t.writeFile(l.join(r,"Queries.ts"),await i(`import { BucketValue, Range, Rangeable } from "../aggregations";
+      `+a(["QueryResponse"],"<T>")+a(["BaseBucket"],"<K, V>")+a(["NestedBucket"],"<TGroupKey, TSegmentKey, TValue extends BucketValue>")+a(["TwoDimensionalAggregation"],"<TGroupKey extends QueryBucketKey, TValue extends BucketValue = number>")+a(["ThreeDimensionalAggregation"],"<TGroupKey extends QueryBucketKey, TSegmentKey extends QueryBucketKey, TValue extends BucketValue = number>")+a(["QueryBucketKey"]))),await t.writeFile(l.join(r,"ObjectType.ts"),await i('import { OntologyObject } from "./OntologyObject";'+a(["BaseType","StringType","IntegerType","DateType","BooleanType","ByteType","DecimalType","FloatType","TimestampType","ShortType","LongType","DoubleType","GeoPointType","GeoShapeType","AttachmentType","ObjectType","StructField","QueryBucketRangeableType","QueryBucketKeyType","QueryBucketValueType","AllValueTypes","OntologyType","ObjectTypeProperties","StructType"])+a(["TimeSeriesType","ArrayType","SetType"],"<T extends BaseType>")+a(["Property"],"<TType extends OntologyType = OntologyType>")+a(["BaseObjectType"],"<TOntologyObject extends OntologyObject = OntologyObject>")+a(["ObjectSetType"],"<T extends ObjectType>")+a(["RangeType"],"<T extends QueryBucketRangeableType>")+a(["TwoDimensionalAggregationType"],"<TGroupKey extends QueryBucketKeyType, TValue extends QueryBucketValueType>")+a(["ThreeDimensionalAggregationType"],"<TGroupKey extends QueryBucketKeyType, TSegmentKey extends QueryBucketKeyType, TValue extends QueryBucketValueType>")));}async function de(e,t){let r=l__default.join(e,"client");await t.mkdir(r,{recursive:!0}),await t.writeFile(l__default.join(r,"index.ts"),await i('export * from "./clientOptions";')),await t.writeFile(l__default.join(r,"clientOptions.ts"),await i('import {Auth} from "@osdk/legacy-client";'+a(["FoundryClientOptions"],"<TAuth extends Auth = Auth>")));}async function fe(e,t){let r=l__default.join(e,"filters");await t.mkdir(r,{recursive:!0}),await t.writeFile(l__default.join(r,"index.ts"),await i(`export * from "./ArrayFilter";
+      export * from "./AttachmentFilter";
+      export * from "./BooleanFilter";
+      export * from "./DateTimeFilters";
+      export * from "./Filters";
+      export * from "./GeoPointFilter";
+      export * from "./GeoShapeFilter";
+      export * from "./NumericFilter";
+      export * from "./Op";
+      export * from "./OrderByOption";
+      export * from "./StringFilter";`)),await t.writeFile(l__default.join(r,"ArrayFilter.ts"),await i('import { Attachment, GeoPoint, GeoShape, LocalDate, Timestamp } from "../baseTypes";'+p(["ArrayFilter"])+a(["ArrayFilter"],"<T extends string | number | Timestamp | LocalDate | boolean | GeoShape | GeoPoint | Attachment>"))),await t.writeFile(l__default.join(r,"AttachmentFilter.ts"),await i(p(["AttachmentFilter"])+a(["AttachmentFilter"]))),await t.writeFile(l__default.join(r,"BooleanFilter.ts"),await i(p(["BooleanFilter"])+a(["BooleanFilter"]))),await t.writeFile(l__default.join(r,"GeoPointFilter.ts"),await i(p(["GeoPointFilter"])+a(["GeoPointFilter","BoundingBox"]))),await t.writeFile(l__default.join(r,"DateTimeFilters.ts"),await i(p(["TimestampFilter","LocalDateFilter"])+a(["TimestampFilter","LocalDateFilter"]))),await t.writeFile(l__default.join(r,"GeoShapeFilter.ts"),await i(p(["GeoShapeFilter"])+a(["GeoShapeFilter"]))),await t.writeFile(l__default.join(r,"NumericFilter.ts"),await i(p(["NumericFilter"])+a(["NumericFilter"]))),await t.writeFile(l__default.join(r,"Op.ts"),await i(p(["Op"]))),await t.writeFile(l__default.join(r,"OrderByOption.ts"),await i(p(["OrderByOption"])+a(["OrderByOption"]))),await t.writeFile(l__default.join(r,"StringFilter.ts"),await i(p(["StringFilter"])+a(["StringFilter"]))),await t.writeFile(l__default.join(r,"Filters.ts"),await i('import { OntologyObject } from "@osdk/legacy-client";'+a(["ObjectTypeFilterFunction","ObjectTypeOrderByFunction"],"<T extends OntologyObject>")+a(["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"])+a(["FilterType"],"<T extends string | number>")));}async function we(e,t){await e.writeFile(l.join(t,"Errors.ts"),await i(a(["PermissionDenied","Unauthorized","InvalidAggregationRangeValue","MalformedPropertyFilters","PropertiesNotFilterable","ParametersNotFound","ApplyActionFailed","PropertyTypesSearchNotSupported","InvalidParameterValue","QueryTimeExceededLimit","CompositePrimaryKeyNotSupported","PropertyBaseTypeNotSupported","PropertiesNotSearchable","AttachmentNotFound","ObjectTypeNotFound","InvalidGroupId","OntologySyncing","ActionNotFound","ParameterObjectSetRidNotFound","LinkTypeNotFound","InvalidRangeQuery","ActionParameterObjectNotFound","InvalidPropertyValue","PropertiesNotSortable","FunctionExecutionTimedOut","InvalidFields","ActionTypeNotFound","ObjectTypeNotSynced","OntologyEditsExceededLimit","AggregationGroupCountExceededLimit","InvalidContentType","PropertiesNotFound","FunctionInvalidInput","InvalidSortOrder","QueryDepthExceededLimit","InvalidPropertyFiltersCombination","ObjectsExceededLimit","DuplicateOrderBy","FunctionEncounteredUserFacingError","InvalidUserId","QueryNotFound","InvalidAggregationRange","ParameterObjectNotFound","QueryMemoryExceededLimit","InvalidContentLength","OntologyNotFound","ActionParameterObjectTypeNotFound","UnknownParameter","InvalidSortType","PropertyFiltersNotSupported","ActionValidationFailed","MultipleGroupByOnFieldNotSupported","LinkedObjectNotFound","ActionEditedPropertiesNotFound","InvalidPropertyFilterValue","QueryEncounteredUserFacingError","AttachmentSizeExceededLimit","ObjectNotFound","PropertyApiNameNotFound","ParameterTypeNotSupported","InvalidAggregationRangePropertyType","MissingParameter"])));}async function be(e,t){await e.writeFile(l.join(t,"OntologyMetadata.ts"),await i(a(["OntologyMetadata"])));}async function he(e,t){await e.writeFile(l.join(t,"Result.ts"),await i(`import {FoundryApiError} from "@osdk/legacy-client";
+        `+a(["Ok","Err"],"<T>")+a(["Result"],"<V, E = FoundryApiError>","<V,E>")+p(["isOk","isErr","visitError"])+a(["ErrorVisitor"],"<E extends FoundryApiError, R>","<E,R>")+a(["ExtractKeysWithType"],"<T, K extends keyof T>","<T,K>")));}async function Oe(e,t){let r=l.join(t,"ontologyProvider");await e.mkdir(r,{recursive:!0}),await we(e,r),await be(e,r),await he(e,r),await e.writeFile(l.join(r,"index.ts"),await i(`
     
       export * from "./Errors";
       export * from "./OntologyMetadata";
       
     
       // export * from "./Result";
-  `));}async function ee(e,t){let o=T.join(e,"paging");await t.mkdir(o,{recursive:!0}),await t.writeFile(T.join(o,"index.ts"),await i('export * from "./Page";')),await t.writeFile(T.join(o,"Page.ts"),await i(p(["Page"],"<T>")));}async function te(e,t){let o=T.join(e,"internal","@foundry","ontology-runtime","dist");await t.mkdir(o,{recursive:!0}),await H(t,o),await q(t,o),await ee(o,t),await t.writeFile(T.join(o,"index.ts"),await i(`
+  `));}async function Ae(e,t){let r=l.join(e,"paging");await t.mkdir(r,{recursive:!0}),await t.writeFile(l.join(r,"index.ts"),await i('export * from "./Page";')),await t.writeFile(l.join(r,"Page.ts"),await i(a(["Page"],"<T>")));}async function $e(e,t){let r=l.join(e,"internal","@foundry","ontology-runtime","dist");await t.mkdir(r,{recursive:!0}),await Oe(t,r),await se(t,r),await Ae(r,t),await ge(r,t),await de(r,t),await fe(r,t),await t.writeFile(l.join(r,"index.ts"),await i(`
       export * from "./aggregations";
-      // export * from "./baseTypes";
+      export * from "./baseTypes";
       
       // export * from "./filters";
       
@@ -86,7 +150,7 @@ function I(e){return {...e,actionTypes:e.actionTypes.map(t=>({...t,apiName:De(t.
     
       export * from "./ontologyProvider";
       export * from "./paging";
-`));}async function re(e,t){await te(t,e);}async function oe(e,t){await e.writeFile(T__default.join(t,"FoundryClient.ts"),await i(`
+`));}async function Fe(e,t){await $e(t,e),await re(t,e);}async function ke(e,t){await e.writeFile(l__default.join(t,"FoundryClient.ts"),await i(`
     import { BaseFoundryClient } from "@osdk/legacy-client";
     import type { Auth, FoundryClientOptions } from "@osdk/legacy-client";
     import { Ontology } from "./Ontology";
@@ -99,91 +163,21 @@ function I(e){return {...e,actionTypes:e.actionTypes.map(t=>({...t,apiName:De(t.
         get ontology(): Ontology {
           return super.ontology;
         }
-    }`));}async function ie(e,t){await e.mkdir(t,{recursive:!0}),await e.writeFile(T.join(t,"index.ts"),await i(`
-    export {
-      ActionExecutionMode,
-      ActionResponse,
-      ActionValidationResult, 
-      ArrayType,
-      AttachmentType,
-      BooleanType,
-      ByteType,
-      DateType,
-      DecimalType,
-      DoubleType,
-      FloatType,
-      FoundryApiError,
-      GeoPoint,
-      GeoPointType,
-      GeoShape,
-      GeoShapeType,
-      IntegerType,
-      isErr,
-      isOk, 
-      LocalDate,
-      LongType,
-      ObjectType,
-      Op,
-      Polygon,
-      ReturnEditsMode,
-      SetType,
-      ShortType,
-      StringType,
-      StructField,
-      StructType,
-      TimeSeriesType,
-      Timestamp,
-      TimestampType,
-      visitError,
-      PublicClientAuth,
-      ConfidentialClientAuth,
-      UserTokenAuth
-    } from '@osdk/legacy-client';
-    export type {
-      ActionError,
-      AggregateObjectsError,
-      AggregationGroup,
-      AggregationResult, 
-      Attachment,
-      AttachmentMetadata, 
-      AttachmentsError,
-      Edits,
-      ErrorVisitor,
-      GetLinkedObjectError,
-      GetObjectError,
-      ListLinkedObjectsError,
-      ListObjectsError,
-      LoadObjectSetError,
-      ObjectSetAggregateArg,
-      ObjectSetFilterArg,
-      ObjectSetGroupByArg,
-      ObjectSetMultipleAggregateArg,
-      ObjectSetOrderByArg,
-      Page,
-      PermissionDenied,
-      QueryError,
-      QueryResponse, 
-      Result,
-      SearchObjectsError,
-      TimeSeries,
-      TimeSeriesError,
-      TimeSeriesPoint, 
-      Unauthorized,
-      UnknownError, 
-    } from '@osdk/legacy-client';
+    }`));}async function De(e,t){await e.mkdir(t,{recursive:!0}),await e.writeFile(l.join(t,"index.ts"),await i(`
+    export * from "@osdk/legacy-client";
     export type { Ontology } from "./Ontology";
     export { FoundryClient } from "./FoundryClient";
-    `));}function S(e,t){return e.map(o=>{let r=t?.get(o);return r?`${o}: ${r}`:o}).join(",")}function N(e,t){return e.map(o=>`${o}: typeof ${t?.get(o)??o}`).join(",")}async function ne(e,t,o){let r=Object.keys(e.objectTypes),n=e.actionTypes.map(s=>s.apiName),a=e.queryTypes.map(s=>s.apiName),c=new Map,l=new Map,y=new Set(r);for(let s of n)y.has(s)?c.set(s,`${s}Action`):y.add(s);for(let s of a)y.has(s)&&l.set(s,`${s}Query`);let g=(s,m)=>{let f=m.get(s);return f?`${s} as ${f}`:s};await t.writeFile(T__default.join(o,"Ontology.ts"),await i(`
+    `));}function N(e,t){return e.map(r=>{let o=t?.get(r);return o?`${r}: ${o}`:r}).join(",")}function C(e,t){return e.map(r=>`${r}: typeof ${t?.get(r)??r}`).join(",")}async function Pe(e,t,r){let o=Object.keys(e.objectTypes),s=e.actionTypes.map(m=>m.apiName),n=e.queryTypes.map(m=>m.apiName),c=new Map,g=new Map,f=new Set(o);for(let m of s)f.has(m)?c.set(m,`${m}Action`):f.add(m);for(let m of n)f.has(m)&&g.set(m,`${m}Query`);let T=(m,u)=>{let b=u.get(m);return b?`${m} as ${b}`:m};await t.writeFile(l__default.join(r,"Ontology.ts"),await i(`
   import type { OntologyDefinition } from "@osdk/api";
   import type { Ontology as ClientOntology } from "@osdk/legacy-client";
   import type { Objects } from "./ontology/objects/Objects";
   import type { Actions } from "./ontology/actions/Actions";
   import type { Queries } from "./ontology/queries/Queries";
-  ${r.map(s=>`import {${s}} from "./ontology/objects/${s}";`).join(`
+  ${o.map(m=>`import {${m}} from "./ontology/objects/${m}";`).join(`
 `)}
-  ${n.map(s=>`import {${g(s,c)}} from "./ontology/actions/${s}";`).join(`
+  ${s.map(m=>`import {${T(m,c)}} from "./ontology/actions/${m}";`).join(`
 `)}
-  ${a.map(s=>`import {${g(s,l)}} from "./ontology/queries/${s}";`).join(`
+  ${n.map(m=>`import {${T(m,g)}} from "./ontology/queries/${m}";`).join(`
 `)}
 
   export const Ontology : {
@@ -193,13 +187,13 @@ function I(e){return {...e,actionTypes:e.actionTypes.map(t=>({...t,apiName:De(t.
       userAgent: "foundry-typescript-osdk/0.0.1",
     },
     objects: {
-      ${N(r)}
+      ${C(o)}
     },
     actions: {
-      ${N(n,c)}
+      ${C(s,c)}
     },
     queries: {
-      ${N(a,l)}
+      ${C(n,g)}
     },
   } = {
     metadata: {
@@ -208,117 +202,119 @@ function I(e){return {...e,actionTypes:e.actionTypes.map(t=>({...t,apiName:De(t.
         userAgent: "foundry-typescript-osdk/0.0.1" as const,
     },
     objects: {
-        ${S(r)}
+        ${N(o)}
     },
     actions: {
-        ${S(n,c)}
+        ${N(s,c)}
     },
     queries: {
-        ${S(a,l)}
+        ${N(n,g)}
     }
-  } satisfies OntologyDefinition<${r.map(s=>`"${s}"`).join("|")}, ${e.actionTypes.map(s=>`"${s.apiName}"`).join("|")}, ${e.queryTypes.map(s=>`"${s.apiName}"`).join("|")}>;
+  } satisfies OntologyDefinition<${o.map(m=>`"${m}"`).join("|")}, ${e.actionTypes.map(m=>`"${m.apiName}"`).join("|")}, ${e.queryTypes.map(m=>`"${m.apiName}"`).join("|")}>;
     
 export interface Ontology extends ClientOntology<typeof Ontology> {
     objects: Objects;
     actions: Actions;
     queries: Queries;
-}`));}async function se(e,t,o){await t.mkdir(o,{recursive:!0}),await t.writeFile(T__default.join(o,"Objects.ts"),await i(`
+}`));}async function Be(e,t,r){await t.mkdir(r,{recursive:!0}),await t.writeFile(l__default.join(r,"Objects.ts"),await i(`
     import { BaseObjectSet } from "@osdk/legacy-client";
-    ${Array.from(Object.keys(e.objectTypes)).map(r=>`import type { ${r} } from "./${r}";`).join(`
+    ${Array.from(Object.keys(e.objectTypes)).map(o=>`import type { ${o} } from "./${o}";`).join(`
 `)}
     
     export interface Objects {
-      ${Object.keys(e.objectTypes).map(r=>`${r} : BaseObjectSet<${r}>;`).join(`
+      ${Object.keys(e.objectTypes).map(o=>`${o} : BaseObjectSet<${o}>;`).join(`
 `)}
     }
-    ;`));}async function pe(e,t,o){await t.mkdir(o,{recursive:!0});for(let{apiName:r}of Object.values(e.objectTypes)){let n=join(o,`${r}.ts`),a=[];a.push('import { ObjectSetAggregateArg, ObjectSetFilterArg, ObjectSetGroupByArg, ObjectSetMultipleAggregateArg, ObjectSetOrderByArg } from "@osdk/legacy-client";'),a.push(`import { ${r} } from "../${r}";`),a.push(""),a.push(`/** @deprecated Use ObjectSetFilterArg<${r}> instead */`,`export type ${r}Filter = ObjectSetFilterArg<${r}>;`),a.push(`/** @deprecated Use ObjectSetOrderByArg<${r}> instead */`,`export type ${r}OrderBy = ObjectSetOrderByArg<${r}>;`),a.push(`/** @deprecated Use ObjectSetGroupByArg<${r}> instead */`,`export type ${r}GroupByProperties = ObjectSetGroupByArg<${r}>;`),a.push(`/**
-        * Aggregation properties for ${r}
-        * @deprecated Use ObjectSetAggregateArg<${r}> instead
-        */`,`export type ${r}AggregationProperties = ObjectSetAggregateArg<${r}>;`),a.push(`/**
-        * Multiple aggregation properties for ${r}.
-        * @deprecated Use ObjectSetMultipleAggregateArg<${r}> instead
-        */`,`export type ${r}MultipleAggregationProperties = ObjectSetMultipleAggregateArg<${r}>;`),await t.writeFile(n,a.join(`
-`));}}async function me(e,t){await e.mkdir(t,{recursive:!0}),await e.writeFile(T.join(t,"index.ts"),await i(`
+    ;`));}async function Ne(e,t,r){await t.mkdir(r,{recursive:!0});for(let{apiName:o}of Object.values(e.objectTypes)){let s=join(r,`${o}.ts`),n=`OG_${o}`,c=[];c.push('import { ObjectSetAggregateArg, ObjectSetFilterArg, ObjectSetGroupByArg, ObjectSetMultipleAggregateArg, ObjectSetOrderByArg } from "@osdk/legacy-client";'),c.push(`import { ${o} as ${n} } from "../${o}";`),c.push(""),c.push(`/** @deprecated Use ${o} from ontology/objects instead */`,`export type ${o} = ${n};`),c.push(`/** @deprecated Use ObjectSetFilterArg<${o}> instead */`,`export type ${o}Filter = ObjectSetFilterArg<${n}>;`),c.push(`/** @deprecated Use ObjectSetOrderByArg<${o}> instead */`,`export type ${o}OrderBy = ObjectSetOrderByArg<${n}>;`),c.push(`/** @deprecated Use ObjectSetGroupByArg<${o}> instead */`,`export type ${o}GroupByProperties = ObjectSetGroupByArg<${n}>;`),c.push(`
+      /**
+        * Aggregation properties for ${o}
+        * @deprecated Use ObjectSetAggregateArg<${o}> instead
+        */`,`export type ${o}AggregationProperties = ObjectSetAggregateArg<${n}>;`),c.push(`
+      /**
+        * Multiple aggregation properties for ${o}.
+        * @deprecated Use ObjectSetMultipleAggregateArg<${o}> instead
+        */`,`export type ${o}MultipleAggregationProperties = ObjectSetMultipleAggregateArg<${n}>;`),await t.writeFile(s,c.join(`
+`));}}async function Me(e,t){await e.mkdir(t,{recursive:!0}),await e.writeFile(l.join(t,"index.ts"),await i(`
         export type { ObjectSet } from "@osdk/legacy-client";
-    `));}function ue(e){let t=x(e);return {apiName:e.apiName,parameters:Object.fromEntries(Object.entries(e.parameters).map(([o,r])=>[o,Qe(r)])),displayName:e.displayName,description:e.description,modifiedEntities:Le(t.addedObjects,t.modifiedObjects)}}function Qe(e){switch(e.dataType.type){case"string":case"boolean":case"object":case"attachment":case"date":case"double":case"integer":case"long":case"objectSet":case"timestamp":return {multiplicity:!1,type:B(e.dataType),nullable:!e.required,description:e.description};case"array":return {multiplicity:!0,type:B(e.dataType),nullable:!e.required,description:e.description}}}function B(e){switch(e.type){case"string":case"boolean":case"attachment":case"double":case"integer":case"long":case"timestamp":return e.type;case"date":return "datetime";case"objectSet":return {type:"objectSet",objectSet:e.objectTypeApiName};case"object":return {type:"object",object:e.objectTypeApiName};case"array":return B(e.subType)}}function Le(e,t){let o={};for(let r of e)o[r]={created:!0,modified:!1};for(let r of t)o[r]?o[r].modified=!0:o[r]={created:!1,modified:!0};return o}async function le(e,t,o){await t.mkdir(o,{recursive:!0}),await Promise.all(e.actionTypes.map(async r=>{let n=new Set(Ke(r));await t.writeFile(T__default.join(o,`${r.apiName}.ts`),await i(`
+    `));}function Ge(e){let t=D(e);return {apiName:e.apiName,parameters:Object.fromEntries(Object.entries(e.parameters).map(([r,o])=>[r,lt(o)])),displayName:e.displayName,description:e.description,modifiedEntities:ut(t.addedObjects,t.modifiedObjects)}}function lt(e){switch(e.dataType.type){case"string":case"boolean":case"object":case"attachment":case"date":case"double":case"integer":case"long":case"objectSet":case"timestamp":return {multiplicity:!1,type:K(e.dataType),nullable:!e.required,description:e.description};case"array":return {multiplicity:!0,type:K(e.dataType),nullable:!e.required,description:e.description}}}function K(e){switch(e.type){case"string":case"boolean":case"attachment":case"double":case"integer":case"long":case"timestamp":return e.type;case"date":return "datetime";case"objectSet":return {type:"objectSet",objectSet:e.objectTypeApiName};case"object":return {type:"object",object:e.objectTypeApiName};case"array":return K(e.subType)}}function ut(e,t){let r={};for(let o of e)r[o]={created:!0,modified:!1};for(let o of t)r[o]?r[o].modified=!0:r[o]={created:!1,modified:!0};return r}async function Ve(e,t,r){await t.mkdir(r,{recursive:!0}),await Promise.all(e.actionTypes.map(async o=>{let s=new Set(yt(o));await t.writeFile(l__default.join(r,`${o.apiName}.ts`),await i(`
           import { ActionDefinition } from "@osdk/api";
   
-           export const ${r.apiName} = ${JSON.stringify(ue(r),null,2)} satisfies ActionDefinition<"${r.apiName}", ${n.size>0?[...n].map(a=>`"${a}"`).join("|"):"never"}>;`));})),await t.writeFile(T__default.join(o,"index.ts"),await i(`
-      ${e.actionTypes.map(r=>`export * from "./${r.apiName}";`).join(`
+           export const ${o.apiName} = ${JSON.stringify(Ge(o),null,2)} satisfies ActionDefinition<"${o.apiName}", ${s.size>0?[...s].map(n=>`"${n}"`).join("|"):"never"}>;`));})),await t.writeFile(l__default.join(r,"index.ts"),await i(`
+      ${e.actionTypes.map(o=>`export * from "./${o.apiName}";`).join(`
 `)}
-      `));}function Ke(e){let t=Object.values(e.parameters).flatMap(({dataType:r})=>{let n=ge(r);return n?[n]:[]});return [...e.operations.flatMap(r=>{switch(r.type){case"createObject":return [r.objectTypeApiName];case"modifyObject":return [r.objectTypeApiName];case"deleteObject":case"createLink":case"deleteLink":return []}}),...t]}function ge(e){switch(e.type){case"objectSet":case"object":return e.objectTypeApiName;case"array":return ge(e.subType);case"string":case"boolean":case"attachment":case"date":case"double":case"integer":case"long":case"timestamp":return}}function de(e){switch(e.dataType.type){case"integer":case"double":case"string":case"boolean":case"attachment":case"byte":case"decimal":case"float":case"geopoint":case"geoshape":case"long":case"short":return e.dataType.type;case"date":return "datetime";case"timestamp":return "timestamp";case"timeseries":case"array":throw new Error(`Type not supported for primaryKey: ${e.dataType.type}`);default:e.dataType;throw new Error(`Unknown type encountered for primaryKey: ${e.dataType}`)}}function fe(e){switch(e.dataType.type){case"integer":case"string":case"byte":case"decimal":case"double":case"float":case"long":case"short":case"boolean":case"date":case"attachment":case"geopoint":case"geoshape":case"timestamp":case"timeseries":return {multiplicity:!1,description:e.description,type:E(e.dataType),nullable:!0};case"array":return {multiplicity:!0,description:e.description,type:E(e.dataType),nullable:!0};default:e.dataType;throw new Error(`Unexpected data type ${JSON.stringify(e.dataType)}`)}}function E(e){switch(e.type){case"integer":case"string":case"byte":case"decimal":case"double":case"float":case"long":case"short":case"boolean":case"attachment":case"geopoint":case"geoshape":case"timestamp":return e.type;case"date":return "datetime";case"array":return E(e.subType);case"timeseries":return e.itemType.type==="string"?"stringTimeseries":"numericTimeseries";default:throw new Error(`Unexecpected data type ${e}`)}}function F(e,t=[]){return {apiName:e.apiName,description:e.description,primaryKeyType:de(e.properties[e.primaryKey]),links:Object.fromEntries(t.map(o=>[o.apiName,{multiplicity:o.cardinality==="MANY",targetType:o.objectTypeApiName}])),properties:Object.fromEntries(Object.entries(e.properties).map(([o,r])=>[o,fe(r)]))}}var _e=new Set(["break","case","catch","class","const","continue","debugger","default","delete","do","else","enum","export","extends","false","finally","for","function","if","import","in","instanceof","new","null","return","super","switch","this","throw","true","try","typeof","var","void","while","with","implements","interface","let","package","private","protected","public","static","yield"]);function Te(e){return _e.has(e)}function je(e,t=[]){let o=new Set(t.map(r=>r.objectTypeApiName).filter(r=>r!==e.apiName));return `import type { OntologyObject, LocalDate, Timestamp, GeoShape, GeoPoint, Attachment, TimeSeries, MultiLink, SingleLink } from "@osdk/legacy-client";
-${Array.from(o).map(r=>`import type { ${r} } from "./${r}";`).join(`
+      `));}function yt(e){let t=Object.values(e.parameters).flatMap(({dataType:o})=>{let s=ve(o);return s?[s]:[]});return [...e.operations.flatMap(o=>{switch(o.type){case"createObject":return [o.objectTypeApiName];case"modifyObject":return [o.objectTypeApiName];case"deleteObject":case"createLink":case"deleteLink":return []}}),...t]}function ve(e){switch(e.type){case"objectSet":case"object":return e.objectTypeApiName;case"array":return ve(e.subType);case"string":case"boolean":case"attachment":case"date":case"double":case"integer":case"long":case"timestamp":return}}function Re(e){switch(e.dataType.type){case"integer":case"double":case"string":case"boolean":case"attachment":case"byte":case"decimal":case"float":case"geopoint":case"geoshape":case"long":case"short":return e.dataType.type;case"date":return "datetime";case"timestamp":return "timestamp";case"timeseries":case"array":throw new Error(`Type not supported for primaryKey: ${e.dataType.type}`);default:e.dataType;throw new Error(`Unknown type encountered for primaryKey: ${e.dataType}`)}}function Qe(e){switch(e.dataType.type){case"integer":case"string":case"byte":case"decimal":case"double":case"float":case"long":case"short":case"boolean":case"date":case"attachment":case"geopoint":case"geoshape":case"timestamp":case"timeseries":return {multiplicity:!1,description:e.description,type:U(e.dataType),nullable:!0};case"array":return {multiplicity:!0,description:e.description,type:U(e.dataType),nullable:!0};default:e.dataType;throw new Error(`Unexpected data type ${JSON.stringify(e.dataType)}`)}}function U(e){switch(e.type){case"integer":case"string":case"byte":case"decimal":case"double":case"float":case"long":case"short":case"boolean":case"attachment":case"geopoint":case"geoshape":case"timestamp":return e.type;case"date":return "datetime";case"array":return U(e.subType);case"timeseries":return e.itemType.type==="string"?"stringTimeseries":"numericTimeseries";default:throw new Error(`Unexecpected data type ${e}`)}}function M(e,t=[]){return {apiName:e.apiName,description:e.description,primaryKeyType:Re(e.properties[e.primaryKey]),links:Object.fromEntries(t.map(r=>[r.apiName,{multiplicity:r.cardinality==="MANY",targetType:r.objectTypeApiName}])),properties:Object.fromEntries(Object.entries(e.properties).map(([r,o])=>[r,Qe(o)]))}}var gt=new Set(["break","case","catch","class","const","continue","debugger","default","delete","do","else","enum","export","extends","false","finally","for","function","if","import","in","instanceof","new","null","return","super","switch","this","throw","true","try","typeof","var","void","while","with","implements","interface","let","package","private","protected","public","static","yield"]);function Ie(e){return gt.has(e)}function Ke(e,t=[]){let r=new Set(t.map(o=>o.objectTypeApiName).filter(o=>o!==e.apiName));return `import type { OntologyObject, LocalDate, Timestamp, GeoShape, GeoPoint, Attachment, TimeSeries, MultiLink, SingleLink } from "@osdk/legacy-client";
+${Array.from(r).map(o=>`import type { ${o} } from "./${o}";`).join(`
 `)}
 
-  ${be(e.description)}export interface ${e.apiName} extends OntologyObject {
+  ${Le(e.description)}export interface ${e.apiName} extends OntologyObject {
   readonly __apiName: "${e.apiName}";
-  readonly __primaryKey: ${M(e.properties[e.primaryKey].dataType)};
-${Object.entries(e.properties).flatMap(([r,n])=>{let a=M(n.dataType),c=[`${be(n.description)}readonly ${r}: ${a} | undefined`];return Te(r)&&c.push(`/** @deprecated please migrate to '${r}' instead */
-          readonly ${r}_: ${a} | undefined`),c}).join(`;
+  readonly __primaryKey: ${W(e.properties[e.primaryKey].dataType)};
+${Object.entries(e.properties).flatMap(([o,s])=>{let n=W(s.dataType),c=[`${Le(s.description)}readonly ${o}: ${n} | undefined`];return Ie(o)&&c.push(`/** @deprecated please migrate to '${o}' instead */
+          readonly ${o}_: ${n} | undefined`),c}).join(`;
 `)}
-${t.flatMap(r=>[`readonly ${r.apiName}: ${r.cardinality==="MANY"?"MultiLink":"SingleLink"}<${r.objectTypeApiName}>`]).join(`;
+${t.flatMap(o=>[`readonly ${o.apiName}: ${o.cardinality==="MANY"?"MultiLink":"SingleLink"}<${o.objectTypeApiName}>`]).join(`;
 `)}
 }
-  `}function M(e){switch(e.type){case"string":return "string";case"boolean":return "boolean";case"array":return M(e.subType)+"[]";case"integer":return "number";case"attachment":return "Attachment";case"byte":return "number";case"date":return "LocalDate";case"decimal":return "number";case"double":return "number";case"float":return "number";case"geopoint":return "GeoPoint";case"geoshape":return "GeoShape";case"long":return "number";case"short":return "number";case"timestamp":return "Timestamp";case"timeseries":return e.itemType.type==="string"?"TimeSeries<string>":"TimeSeries<number>";default:throw new Error(`Unknown property type ${e}`)}}function be(e){return e?`/**
+  `}function W(e){switch(e.type){case"string":return "string";case"boolean":return "boolean";case"array":return W(e.subType)+"[]";case"integer":return "number";case"attachment":return "Attachment";case"byte":return "number";case"date":return "LocalDate";case"decimal":return "number";case"double":return "number";case"float":return "number";case"geopoint":return "GeoPoint";case"geoshape":return "GeoShape";case"long":return "number";case"short":return "number";case"timestamp":return "Timestamp";case"timeseries":return e.itemType.type==="string"?"TimeSeries<string>":"TimeSeries<number>";default:throw new Error(`Unknown property type ${e}`)}}function Le(e){return e?`/**
  * ${e}
  */
-`:""}async function $e(e,t,o){await t.mkdir(o,{recursive:!0}),await Promise.all(Object.values(e.objectTypes).map(async r=>{let n=e.linkTypes[r.apiName],a=new Set(n?.map(c=>c.objectTypeApiName));await t.writeFile(T__default.join(o,`${r.apiName}.ts`),await i(`
+`:""}async function We(e,t,r){await t.mkdir(r,{recursive:!0}),await Promise.all(Object.values(e.objectTypes).map(async o=>{let s=e.linkTypes[o.apiName],n=new Set(s?.map(c=>c.objectTypeApiName));await t.writeFile(l__default.join(r,`${o.apiName}.ts`),await i(`
         import { ObjectDefinition } from "@osdk/api";
-        ${je(r,n)}
+        ${Ke(o,s)}
 
-         export const ${r.apiName} = ${JSON.stringify(F(r,n),null,2)} satisfies ObjectDefinition<"${r.apiName}", ${a.size>0?[...a].map(c=>`"${c}"`).join("|"):"never"}>;`));})),await t.writeFile(T__default.join(o,"index.ts"),await i(`
-    ${Object.keys(e.objectTypes).map(r=>`export * from "./${r}";`).join(`
+         export const ${o.apiName} = ${JSON.stringify(M(o,s),null,2)} satisfies ObjectDefinition<"${o.apiName}", ${n.size>0?[...n].map(c=>`"${c}"`).join("|"):"never"}>;`));})),await t.writeFile(l__default.join(r,"index.ts"),await i(`
+    ${Object.keys(e.objectTypes).map(o=>`export * from "./${o}";`).join(`
 `)}
       export type { ObjectSet } from "@osdk/legacy-client";
 
-    `));}function j(e){return e.type==="null"?!0:e.type==="union"?e.unionTypes.some(t=>j(t)):!1}function d(e){switch(e.type){case"double":case"float":case"integer":case"long":case"attachment":case"boolean":case"date":case"string":case"timestamp":return {type:e.type,nullable:!1};case"object":return {type:{type:"object",object:e.objectTypeApiName},nullable:!1};case"objectSet":return {type:{type:"objectSet",objectSet:e.objectTypeApiName},nullable:!1};case"array":return {...d(e.subType),multiplicity:!0};case"set":return {type:{type:"set",set:d(e.subType)},nullable:!1};case"union":let t=j(e);if(t&&e.unionTypes.length===2){let r=e.unionTypes.find(n=>n.type!==null);if(r)return {...d(r),nullable:!0}}return {type:{type:"union",union:e.unionTypes.reduce((r,n)=>(n.type==="null"||r.push(d(n)),r),[])},nullable:t};case"struct":return {type:{type:"struct",struct:Object.fromEntries(e.fields.map(r=>[r.name,d(r.fieldType)]))},nullable:!1};case"twoDimensionalAggregation":return {type:{type:"twoDimensionalAggregation",twoDimensionalAggregation:v(e)}};case"threeDimensionalAggregation":return {type:{type:"threeDimensionalAggregation",threeDimensionalAggregation:Ue(e)}};case"null":case"unsupported":throw new Error(`Accidentally tried to handle QueryDataType.type ${e.type}`);default:throw new Error(`Unsupported QueryDataType.type ${e.type}`)}}function v(e){if(e.keyType.type==="range")return {keyType:e.keyType.type,keySubtype:e.keyType.subType.type,valueType:e.valueType.type};if(Ae(e.keyType))return {keyType:e.keyType.type,valueType:e.valueType.type};throw new Error(`Cannot create 2D aggregation with ${e.keyType.type} as its type`)}function Ue(e){if(e.keyType.type==="range")return {keyType:e.keyType.type,keySubtype:e.keyType.subType.type,valueType:v(e.valueType)};if(Ae(e.keyType))return {keyType:e.keyType.type,valueType:v(e.valueType)};throw new Error(`Cannot create 3D aggregation with ${e.keyType.type} as its type`)}function Ae(e){return e.type==="string"||e.type==="boolean"}function Oe(e){return {apiName:e.apiName,description:e.description,displayName:e.displayName,rid:e.rid,version:e.version,parameters:Object.fromEntries(Object.entries(e.parameters).map(([t,o])=>[t,qe(o)])),output:d(e.output)}}function qe(e){return {description:e.description,dataType:d(e.dataType)}}async function he(e,t,o){await t.mkdir(o,{recursive:!0}),await Promise.all(e.queryTypes.map(async r=>{let n=ze(r);await t.writeFile(T__default.join(o,`${r.apiName}.ts`),await i(`
+    `));}function A(e){return e.type==="null"?!0:e.type==="union"?e.unionTypes.some(t=>A(t)):!1}function j(e){switch(e.type){case"double":case"float":case"integer":case"long":case"attachment":case"boolean":case"date":case"string":case"timestamp":return {type:e.type,nullable:!1};case"object":return {type:{type:"object",object:e.objectTypeApiName},nullable:!1};case"objectSet":return {type:{type:"objectSet",objectSet:e.objectTypeApiName},nullable:!1};case"array":return {...j(e.subType),multiplicity:!0};case"set":return {type:{type:"set",set:j(e.subType)},nullable:!1};case"union":let t=A(e);if(t&&e.unionTypes.length===2){let o=e.unionTypes.find(s=>s.type!==null);if(o)return {...j(o),nullable:!0}}return {type:{type:"union",union:e.unionTypes.reduce((o,s)=>(s.type==="null"||o.push(j(s)),o),[])},nullable:t};case"struct":return {type:{type:"struct",struct:Object.fromEntries(e.fields.map(o=>[o.name,j(o.fieldType)]))},nullable:!1};case"twoDimensionalAggregation":return {type:{type:"twoDimensionalAggregation",twoDimensionalAggregation:_(e)}};case"threeDimensionalAggregation":return {type:{type:"threeDimensionalAggregation",threeDimensionalAggregation:dt(e)}};case"null":case"unsupported":throw new Error(`Accidentally tried to handle QueryDataType.type ${e.type}`);default:throw new Error(`Unsupported QueryDataType.type ${e.type}`)}}function _(e){if(e.keyType.type==="range")return {keyType:e.keyType.type,keySubtype:e.keyType.subType.type,valueType:e.valueType.type};if(_e(e.keyType))return {keyType:e.keyType.type,valueType:e.valueType.type};throw new Error(`Cannot create 2D aggregation with ${e.keyType.type} as its type`)}function dt(e){if(e.keyType.type==="range")return {keyType:e.keyType.type,keySubtype:e.keyType.subType.type,valueType:_(e.valueType)};if(_e(e.keyType))return {keyType:e.keyType.type,valueType:_(e.valueType)};throw new Error(`Cannot create 3D aggregation with ${e.keyType.type} as its type`)}function _e(e){return e.type==="string"||e.type==="boolean"}function qe(e){return {apiName:e.apiName,description:e.description,displayName:e.displayName,rid:e.rid,version:e.version,parameters:Object.fromEntries(Object.entries(e.parameters).map(([t,r])=>[t,ft(r)])),output:j(e.output)}}function ft(e){return {description:e.description,dataType:j(e.dataType)}}async function ze(e,t,r){await t.mkdir(r,{recursive:!0}),await Promise.all(e.queryTypes.map(async o=>{let s=Tt(o);await t.writeFile(l__default.join(r,`${o.apiName}.ts`),await i(`
         import { QueryDefinition } from "@osdk/api";
 
-        export const ${r.apiName} = ${JSON.stringify(Oe(r))} satisfies QueryDefinition<"${r.apiName}", ${n.length>0?n.map(a=>`"${a}"`).join("|"):"never"}>;`));})),await t.writeFile(T__default.join(o,"index.ts"),await i(`
-  ${e.queryTypes.map(r=>`export * from "./${r.apiName}";`).join(`
+        export const ${o.apiName} = ${JSON.stringify(qe(o))} satisfies QueryDefinition<"${o.apiName}", ${s.length>0?s.map(n=>`"${n}"`).join("|"):"never"}>;`));})),await t.writeFile(l__default.join(r,"index.ts"),await i(`
+  ${e.queryTypes.map(o=>`export * from "./${o.apiName}";`).join(`
 `)}
-  `));}function ze(e){let t=new Set;for(let{dataType:o}of Object.values(e.parameters))O(o,t);return O(e.output,t),Array.from(t)}function O(e,t){switch(e.type){case"array":case"set":O(e.subType,t);return;case"object":t.add(e.objectTypeApiName);return;case"objectSet":t.add(e.objectTypeApiName);return;case"struct":for(let r of Object.values(e.fields))O(r.fieldType,t);return;case"union":for(let r of e.unionTypes)O(r,t);return;case"attachment":case"boolean":case"date":case"double":case"float":case"integer":case"long":case"null":case"string":case"threeDimensionalAggregation":case"timestamp":case"twoDimensionalAggregation":case"unsupported":return;default:throw new Error(`Cannot find object types from unsupported QueryDataType ${e.type}`)}}async function Ne(e,t,o){let r=new Set,n=[];for(let a of e.queryTypes){let c=["/**"];a.description&&c.push(`* ${a.description}`);let l=w(a.output,r,!0),y=[];for(let[s,m]of Object.entries(a.parameters)){let f=j(m.dataType),A=w(m.dataType,r,!1);y.push(`"${s}"${f?"?":""}: ${A}`),c.push(`* @param {${Se(A)}} params.${s}${m.description?` - ${m.description}`:""}`);}let g=y.length===0?"":`params: { ${y.join("; ")} }`;c.push(`* @returns ${Se(l)}`,"*/"),n.push(`
+  `));}function Tt(e){let t=new Set;for(let{dataType:r}of Object.values(e.parameters))S(r,t);return S(e.output,t),Array.from(t)}function S(e,t){switch(e.type){case"array":case"set":S(e.subType,t);return;case"object":t.add(e.objectTypeApiName);return;case"objectSet":t.add(e.objectTypeApiName);return;case"struct":for(let o of Object.values(e.fields))S(o.fieldType,t);return;case"union":for(let o of e.unionTypes)S(o,t);return;case"attachment":case"boolean":case"date":case"double":case"float":case"integer":case"long":case"null":case"string":case"threeDimensionalAggregation":case"timestamp":case"twoDimensionalAggregation":case"unsupported":return;default:throw new Error(`Cannot find object types from unsupported QueryDataType ${e.type}`)}}async function He(e,t,r){let o=new Set,s=[];for(let n of e.queryTypes){let c=["/**"];n.description&&c.push(`* ${n.description}`);let g=$(n.output,o,!0),f=[];for(let[m,u]of Object.entries(n.parameters)){let b=A(u.dataType),k=$(u.dataType,o,!1);f.push(`"${m}"${b?"?":""}: ${k}`),c.push(`* @param {${Ze(k)}} params.${m}${u.description?` - ${u.description}`:""}`);}let T=f.length===0?"":`params: { ${f.join("; ")} }`;c.push(`* @returns ${Ze(g)}`,"*/"),s.push(`
       ${c.join(`
 `)}
-      ${a.apiName}(${g}): Promise<Result<QueryResponse<${l}>, QueryError>>;
-      `);}await t.mkdir(o,{recursive:!0}),await t.writeFile(T__default.join(o,"Queries.ts"),await i(`
+      ${n.apiName}(${T}): Promise<Result<QueryResponse<${g}>, QueryError>>;
+      `);}await t.mkdir(r,{recursive:!0}),await t.writeFile(l__default.join(r,"Queries.ts"),await i(`
     import type { QueryResponse, QueryError, Result, Timestamp, LocalDate, Range, Attachment, ObjectSet, TwoDimensionalAggregation, ThreeDimensionalAggregation  } from "@osdk/legacy-client";
-    ${Array.from(r).map(a=>`import type { ${a} } from "../objects/${a}";`).join(`
+    ${Array.from(o).map(n=>`import type { ${n} } from "../objects/${n}";`).join(`
 `)}
 
     export interface Queries {
-    ${n.join(`
+    ${s.join(`
 `)}
     }
-  `));}function w(e,t,o){switch(e.type){case"boolean":return "boolean";case"string":return "string";case"double":case"float":case"integer":case"long":return "number";case"date":return "LocalDate";case"timestamp":return "Timestamp";case"attachment":return "Attachment";case"array":return `Array<${w(e.subType,t,o)}>`;case"object":{let a=e.objectTypeApiName;return t.add(a),o?a:`${a} | ${a}["__primaryKey"]`}case"objectSet":{let a=e.objectTypeApiName;return t.add(a),`ObjectSet<${a}>`}case"set":return `Set<${w(e.subType,t,o)}>`;case"struct":return `{ ${e.fields.map(a=>{let c=j(a.fieldType);return `${a.name}${c?"?":""}: ${w(a.fieldType,t,o)}`}).join(`,
-`)} }`;case"union":return e.unionTypes.map(a=>w(a,t,o)).filter(a=>a!=="null").join("|");case"twoDimensionalAggregation":return e.valueType,`TwoDimensionalAggregation<
-        ${V(e.keyType)},
-        ${ke(e.valueType)}
+  `));}function $(e,t,r){switch(e.type){case"boolean":return "boolean";case"string":return "string";case"double":case"float":case"integer":case"long":return "number";case"date":return "LocalDate";case"timestamp":return "Timestamp";case"attachment":return "Attachment";case"array":return `Array<${$(e.subType,t,r)}>`;case"object":{let n=e.objectTypeApiName;return t.add(n),r?n:`${n} | ${n}["__primaryKey"]`}case"objectSet":{let n=e.objectTypeApiName;return t.add(n),`ObjectSet<${n}>`}case"set":return `Set<${$(e.subType,t,r)}>`;case"struct":return `{ ${e.fields.map(n=>{let c=A(n.fieldType);return `${n.name}${c?"?":""}: ${$(n.fieldType,t,r)}`}).join(`,
+`)} }`;case"union":return e.unionTypes.map(n=>$(n,t,r)).filter(n=>n!=="null").join("|");case"twoDimensionalAggregation":return e.valueType,`TwoDimensionalAggregation<
+        ${q(e.keyType)},
+        ${Ye(e.valueType)}
       >`;case"threeDimensionalAggregation":return `ThreeDimensionalAggregation<
-        ${V(e.keyType)},
-        ${V(e.valueType.keyType)},
-        ${ke(e.valueType.valueType)}
-      >`;case"null":return "null";case"unsupported":throw new Error("Cannot generate queries for unsupported type");default:throw new Error(`Cannot generate queries for type ${e.type}`)}}function V(e){switch(e.type){case"boolean":return "boolean";case"double":case"integer":return "number";case"string":return "string";case"date":return "LocalDate";case"timestamp":return "Timestamp";case"range":return `Range<${We(e.subType)}>`;default:throw new Error(`Unknown TwoDimensionalAggregation keyType ${e.type}`)}}function We(e){switch(e.type){case"date":return "LocalDate";case"double":case"integer":return "number";case"timestamp":return "Timestamp";default:throw new Error(`Unsupported QueryAggregationRangeSubType ${e.type}`)}}function ke(e){switch(e.type){case"date":return "LocalDate";case"double":return "number";case"timestamp":return "Timestamp";default:throw new Error(`Unsupported QueryAggregationValueType ${e.type}`)}}function Se(e){return e.replace(/\s/g,"")}async function Ye(e,t,o){let r=T.join(o,"ontology","objects"),n=T.join(o,"ontology","actions"),a=T.join(o,"ontology","queries"),c=I(e);await oe(t,o),await ne(c,t,o),await me(t,T.join(o,"ontology")),await se(c,t,r),await pe(c,t,T.join(r,"objects-api")),await $e(c,t,r),await G(c,t,n),await le(c,t,n),await Ne(c,t,a),await he(c,t,a),await ie(t,o),await re(t,o);}function Fe(e){return `
+        ${q(e.keyType)},
+        ${q(e.valueType.keyType)},
+        ${Ye(e.valueType.valueType)}
+      >`;case"null":return "null";case"unsupported":throw new Error("Cannot generate queries for unsupported type");default:throw new Error(`Cannot generate queries for type ${e.type}`)}}function q(e){switch(e.type){case"boolean":return "boolean";case"double":case"integer":return "number";case"string":return "string";case"date":return "LocalDate";case"timestamp":return "Timestamp";case"range":return `Range<${jt(e.subType)}>`;default:throw new Error(`Unknown TwoDimensionalAggregation keyType ${e.type}`)}}function jt(e){switch(e.type){case"date":return "LocalDate";case"double":case"integer":return "number";case"timestamp":return "Timestamp";default:throw new Error(`Unsupported QueryAggregationRangeSubType ${e.type}`)}}function Ye(e){switch(e.type){case"date":return "LocalDate";case"double":return "number";case"timestamp":return "Timestamp";default:throw new Error(`Unsupported QueryAggregationValueType ${e.type}`)}}function Ze(e){return e.replace(/\s/g,"")}async function bt(e,t,r){let o=l.join(r,"ontology","objects"),s=l.join(r,"ontology","actions"),n=l.join(r,"ontology","queries"),c=Y(e);await ke(t,r),await Pe(c,t,r),await Me(t,l.join(r,"ontology")),await Be(c,t,o),await Ne(c,t,l.join(o,"objects-api")),await We(c,t,o),await Z(c,t,s),await Ve(c,t,s),await He(c,t,n),await ze(c,t,n),await De(t,r),await Fe(t,r);}function Xe(e){return `
     export interface ${e.apiName} extends ObjectDefinition<"${e.apiName}", "${e.apiName}">{
       apiName: "${e.apiName}";
       properties: {
-        ${Object.entries(e.properties).map(([t,o])=>`
+        ${Object.entries(e.properties).map(([t,r])=>`
       /**
-       * ${o.description??""}
+       * ${r.description??""}
        **/
       ${t}: {
-          type: "${o.dataType.type}";
-          displayName: "${o.displayName??t}";
+          type: "${r.dataType.type}";
+          displayName: "${r.displayName??t}";
         }
         
         `)}
       }
     }
-  `}async function Ze(e,t,o){t.writeFile(T__default.join(o,"index.ts"),await i(`
+  `}async function xt(e,t,r){t.writeFile(l__default.join(r,"index.ts"),await i(`
         export { Ontology } from "./Ontology";
-    `));let r=Object.keys(e.objectTypes);t.writeFile(T__default.join(o,"Ontology.ts"),await i(`
+    `));let o=Object.keys(e.objectTypes);t.writeFile(l__default.join(r,"Ontology.ts"),await i(`
       import type { OntologyDefinition } from "@osdk/api";
-      ${r.map(n=>`import {${n}} from "./objects/${n}";`).join(`
+      ${o.map(s=>`import {${s}} from "./objects/${s}";`).join(`
 `)}
       
       import { OntologyMetadata } from "./OntologyMetadata";
@@ -326,19 +322,19 @@ ${t.flatMap(r=>[`readonly ${r.apiName}: ${r.cardinality==="MANY"?"MultiLink":"Si
       export const Ontology = {
         metadata: OntologyMetadata,
         objects: {
-          ${r.map(n=>`${n}: ${n},`).join(`
+          ${o.map(s=>`${s}: ${s},`).join(`
 `)}
         },
-      } satisfies OntologyDefinition<${r.map(n=>`"${n}"`).join("|")}>;
-    `));for(let n of r){let a=e.objectTypes[n];t.writeFile(T__default.join(o,"objects",`${n}.ts`),await i(`
+      } satisfies OntologyDefinition<${o.map(s=>`"${s}"`).join("|")}>;
+    `));for(let s of o){let n=e.objectTypes[s];t.writeFile(l__default.join(r,"objects",`${s}.ts`),await i(`
     
       import type { ObjectDefinition } from "@osdk/api";
 
-      export const ${n} =  ${JSON.stringify(F(a),null,2)} satisfies ${n};
+      export const ${s} =  ${JSON.stringify(M(n),null,2)} satisfies ${s};
 
-      ${Fe(a)}
+      ${Xe(n)}
     `));}}
 
-export { Ye as generateClientSdkVersionOneDotOne, Ze as generateClientSdkVersionTwoPointZero };
+export { bt as generateClientSdkVersionOneDotOne, xt as generateClientSdkVersionTwoPointZero };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.mjs.map