@osdk/generator 0.0.12 → 0.0.14

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @osdk/generator
 
+## 0.0.14
+
+### Patch Changes
+
+- 23a3515: Add deprecation notice to objects-api types
+- Updated dependencies [23a3515]
+  - @osdk/gateway@0.0.9
+  - @osdk/api@0.0.16
+
+## 0.0.13
+
+### Patch Changes
+
+- 4f73749: Re-add the types to support the ObjectSet APIs
+- Updated dependencies [4f73749]
+  - @osdk/gateway@0.0.8
+  - @osdk/api@0.0.15
+
 ## 0.0.12
 
 ### Patch Changes

package/build/js/index.js

@@ -1,8 +1,8 @@
 'use strict';
 
-var j = require('path');
+var T = require('path');
 var prettier = require('prettier');
-var ce = require('prettier-plugin-organize-imports');
+var Be = require('prettier-plugin-organize-imports');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -24,24 +24,93 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var j__namespace = /*#__PURE__*/_interopNamespace(j);
-var ce__default = /*#__PURE__*/_interopDefault(ce);
+var T__namespace = /*#__PURE__*/_interopNamespace(T);
+var Be__default = /*#__PURE__*/_interopDefault(Be);
 
-function F(e){return {...e,actionTypes:e.actionTypes.map(r=>({...r,apiName:ie(r.apiName)}))}}function ie(e){return e.replace(/-./g,r=>r[1].toUpperCase())}function $(e){let r=new Set,o=new Set;for(let t of e.operations)switch(t.type){case"createObject":r.add(t.objectTypeApiName);break;case"modifyObject":o.add(t.objectTypeApiName);break;}return {addedObjects:r,modifiedObjects:o}}function c(e){return prettier.format(e,{parser:"typescript",singleQuote:!0,trailingComma:"all",plugins:[ce__default.default],tabWidth:2,printWidth:120})}async function Q(e,r,o){let t=new Set,n=[];for(let a of e.actionTypes){let s=Object.entries(a.parameters),y=$(a),m=Array.from(y.addedObjects),l=Array.from(y.modifiedObjects);m.forEach(t.add,t),l.forEach(t.add,t);let i=["/**"];a.description&&i.push(`* ${a.description}`);let p="";if(s.length>0){p=`params: { 
-`;for(let[f,b]of s){p+=`"${f}"`,p+=b.required?": ":"?: ";let E=P(b.dataType,t);p+=`${E};
-`,i.push(`* @param {${E}} params.${f}`);}p+="}, ";}i.push("*/"),n.push(`
-      ${i.join(`
+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 prettier.format(e,{parser:"typescript",singleQuote:!0,trailingComma:"all",plugins:[Be__default.default],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(`
 `)}
-      ${a.apiName}<O extends ActionExecutionOptions>(${p}options?: O): 
-        Promise<Result<ActionResponseFromOptions<O, Edits<${m.length>0?m.join(" | "):"void"}, ${l.length>0?l.join(" | "):"void"}>>, ActionError>>;`);}await r.mkdir(o,{recursive:!0}),await r.writeFile(j__namespace.default.join(o,"Actions.ts"),await c(`
+      ${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__namespace.default.join(o,"Actions.ts"),await i(`
     import type { ObjectSet, LocalDate, Timestamp, Attachment, Edits, ActionExecutionOptions, ActionError, Result, ActionResponseFromOptions } from "@osdk/legacy-client";
-    ${Array.from(t).map(a=>`import type { ${a} } from "../objects/${a}";`).join(`
+    ${Array.from(r).map(a=>`import type { ${a} } from "../objects/${a}";`).join(`
 `)}
     export interface Actions {
     ${n.join(`
 `)}
     }
-  `));}function P(e,r){switch(e.type){case"objectSet":{let t=e.objectTypeApiName;return r.add(t),`ObjectSet<${t}>`}case"object":{let t=e.objectTypeApiName;return r.add(t),`${t} | ${t}["__primaryKey"]`}case"array":return `Array<${P(e.subType,r)}>`;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}`)}}async function v(e,r){await e.writeFile(j__namespace.default.join(r,"FoundryClient.ts"),await c(`
+  `));}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 `
+          import  { ${e.map(t=>`${t} as OG_${t}`).join(", ")}} from "@osdk/legacy-client";
+      
+          ${e.map(t=>`
+      /** @deprecated submodule imports arent public api **/
+              export const ${t} = OG_${t};
+          `).join(`
+
+`)}
+      `}function p(e,t="",o=Ve(t)){return `
+    import type { ${e.map(r=>`${r} as OG_${r}`).join(", ")}} from "@osdk/legacy-client";
+    
+        ${e.map(r=>`
+      /** @deprecated submodule imports arent public api **/
+      export type ${r}${t} = OG_${r}${o};
+    `).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__namespace.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__namespace.join(t,"groupBy"),{recursive:!0});let o=["BooleanGroupBy","LocalDateGroupBy","NumericGroupBy","StringGroupBy","TimestampGroupBy"],r=[...o,"GroupKeyType"];for(let n of r)await e.writeFile(T__namespace.join(t,"groupBy",`${n}.ts`),await i(`export {${n}} from "./index";`));await e.writeFile(T__namespace.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__namespace.join(t,"metrics");await e.mkdir(o,{recursive:!0}),await e.writeFile(T__namespace.join(o,"metrics.ts"),await i('export {MetricValueType} from "@osdk/legacy-client";')),await e.writeFile(T__namespace.join(o,"ApproximateDistinctCountAggregatableProperty.ts"),await i(u(["ApproximateDistinctCountAggregatableProperty"])+p(["ApproximateDistinctCountAggregatableProperty"]))),await e.writeFile(T__namespace.join(o,"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__namespace.join(o,`${r}.ts`),await i(`
+          import { MultipleAggregatableProperty } from "./MultipleAggregatableProperty";
+        `+u([r])));await e.writeFile(T__namespace.join(o,"index.ts"),await i(`
+      export * from "./ApproximateDistinctCountAggregatableProperty";
+      export * from "./DefaultAggregatableProperty";
+      export * from "./LocalDatePropertyMetric";
+      export * from "./metrics";
+      export * from "./MultipleAggregatableProperty";
+      export * from "./NumericPropertyMetric";
+      export * from "./TimestampPropertyMetric";
+      `));}async function q(e,t){let o=T__namespace.join(t,"aggregations");await e.mkdir(o,{recursive:!0}),await _(e,o),await K(e,o),await U(e,o),await e.writeFile(T__namespace.join(o,"index.ts"),await i(`
+    
+    
+    
+    export * from "./Aggregations";
+    export * from "./ComputeStep";
+    export * from "./CountOperation";
+    export * from "./groupBy";
+    export * from "./internalAggregationRequest";
+    export * from "./metrics";
+  `)),await e.writeFile(T__namespace.join(o,"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>")+`
+    
+    `)),await e.writeFile(T__namespace.join(o,"CountOperation.ts"),await i(""+u(["CountOperation","isCountOperation"])+p(["CountOperation"]))),await e.writeFile(T__namespace.join(o,"internalAggregationRequest.ts"),await i(p(["InternalAggregationRequest"])));}async function J(e,t){await e.writeFile(T__namespace.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__namespace.join(t,"OntologyMetadata.ts"),await i(p(["OntologyMetadata"])));}async function X(e,t){await e.writeFile(T__namespace.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__namespace.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__namespace.join(o,"index.ts"),await i(`
+    
+      export * from "./Errors";
+      export * from "./OntologyMetadata";
+      
+    
+      // export * from "./Result";
+  `));}async function ee(e,t){let o=T__namespace.join(e,"paging");await t.mkdir(o,{recursive:!0}),await t.writeFile(T__namespace.join(o,"index.ts"),await i('export * from "./Page";')),await t.writeFile(T__namespace.join(o,"Page.ts"),await i(p(["Page"],"<T>")));}async function te(e,t){let o=T__namespace.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__namespace.join(o,"index.ts"),await i(`
+      export * from "./aggregations";
+      // export * from "./baseTypes";
+      
+      // export * from "./filters";
+      
+      
+    
+      export * from "./ontologyProvider";
+      export * from "./paging";
+`));}async function re(e,t){await te(t,e);}async function oe(e,t){await e.writeFile(T__namespace.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";
@@ -54,7 +123,7 @@ function F(e){return {...e,actionTypes:e.actionTypes.map(r=>({...r,apiName:ie(r.
         get ontology(): Ontology {
           return super.ontology;
         }
-    }`));}async function I(e,r){await e.mkdir(r,{recursive:!0}),await e.writeFile(j__namespace.join(r,"index.ts"),await c(`
+    }`));}async function ie(e,t){await e.mkdir(t,{recursive:!0}),await e.writeFile(T__namespace.join(t,"index.ts"),await i(`
     export {
       ActionExecutionMode,
       ActionResponse,
@@ -109,6 +178,11 @@ function F(e){return {...e,actionTypes:e.actionTypes.map(r=>({...r,apiName:ie(r.
       ListLinkedObjectsError,
       ListObjectsError,
       LoadObjectSetError,
+      ObjectSetAggregateArg,
+      ObjectSetFilterArg,
+      ObjectSetGroupByArg,
+      ObjectSetMultipleAggregateArg,
+      ObjectSetOrderByArg,
       Page,
       PermissionDenied,
       QueryError,
@@ -121,19 +195,19 @@ function F(e){return {...e,actionTypes:e.actionTypes.map(r=>({...r,apiName:ie(r.
       Unauthorized,
       UnknownError, 
     } from '@osdk/legacy-client';
-    export { Ontology } from "./Ontology";
+    export type { Ontology } from "./Ontology";
     export { FoundryClient } from "./FoundryClient";
-    `));}function w(e,r){return e.map(o=>{let t=r?.get(o);return t?`${o}: ${t}`:o}).join(",")}function h(e,r){return e.map(o=>`${o}: typeof ${r?.get(o)??o}`).join(",")}async function L(e,r,o){let t=Object.keys(e.objectTypes),n=e.actionTypes.map(i=>i.apiName),a=e.queryTypes.map(i=>i.apiName),s=new Map,y=new Map,m=new Set(t);for(let i of n)m.has(i)?s.set(i,`${i}Action`):m.add(i);for(let i of a)m.has(i)&&y.set(i,`${i}Query`);let l=(i,p)=>{let f=p.get(i);return f?`${i} as ${f}`:i};await r.writeFile(j__namespace.default.join(o,"Ontology.ts"),await c(`
+    `));}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__namespace.default.join(o,"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";
-  ${t.map(i=>`import {${i}} from "./ontology/objects/${i}";`).join(`
+  ${r.map(s=>`import {${s}} from "./ontology/objects/${s}";`).join(`
 `)}
-  ${n.map(i=>`import {${l(i,s)}} from "./ontology/actions/${i}";`).join(`
+  ${n.map(s=>`import {${g(s,c)}} from "./ontology/actions/${s}";`).join(`
 `)}
-  ${a.map(i=>`import {${l(i,y)}} from "./ontology/queries/${i}";`).join(`
+  ${a.map(s=>`import {${g(s,l)}} from "./ontology/queries/${s}";`).join(`
 `)}
 
   export const Ontology : {
@@ -143,13 +217,13 @@ function F(e){return {...e,actionTypes:e.actionTypes.map(r=>({...r,apiName:ie(r.
       userAgent: "foundry-typescript-osdk/0.0.1",
     },
     objects: {
-      ${h(t)}
+      ${N(r)}
     },
     actions: {
-      ${h(n,s)}
+      ${N(n,c)}
     },
     queries: {
-      ${h(a,y)}
+      ${N(a,l)}
     },
   } = {
     metadata: {
@@ -158,110 +232,117 @@ function F(e){return {...e,actionTypes:e.actionTypes.map(r=>({...r,apiName:ie(r.
         userAgent: "foundry-typescript-osdk/0.0.1" as const,
     },
     objects: {
-        ${w(t)}
+        ${S(r)}
     },
     actions: {
-        ${w(n,s)}
+        ${S(n,c)}
     },
     queries: {
-        ${w(a,y)}
+        ${S(a,l)}
     }
-  } satisfies OntologyDefinition<${t.map(i=>`"${i}"`).join("|")}, ${e.actionTypes.map(i=>`"${i.apiName}"`).join("|")}, ${e.queryTypes.map(i=>`"${i.apiName}"`).join("|")}>;
+  } satisfies OntologyDefinition<${r.map(s=>`"${s}"`).join("|")}, ${e.actionTypes.map(s=>`"${s.apiName}"`).join("|")}, ${e.queryTypes.map(s=>`"${s.apiName}"`).join("|")}>;
     
 export interface Ontology extends ClientOntology<typeof Ontology> {
     objects: Objects;
     actions: Actions;
     queries: Queries;
-}`));}async function M(e,r,o){await r.mkdir(o,{recursive:!0}),await r.writeFile(j__namespace.default.join(o,"Objects.ts"),await c(`
+}`));}async function se(e,t,o){await t.mkdir(o,{recursive:!0}),await t.writeFile(T__namespace.default.join(o,"Objects.ts"),await i(`
     import { BaseObjectSet } from "@osdk/legacy-client";
-    ${Array.from(Object.keys(e.objectTypes)).map(t=>`import type { ${t} } from "./${t}";`).join(`
+    ${Array.from(Object.keys(e.objectTypes)).map(r=>`import type { ${r} } from "./${r}";`).join(`
 `)}
     
     export interface Objects {
-      ${Object.keys(e.objectTypes).map(t=>`${t} : BaseObjectSet<${t}>;`).join(`
+      ${Object.keys(e.objectTypes).map(r=>`${r} : BaseObjectSet<${r}>;`).join(`
 `)}
     }
-    ;`));}async function R(e,r){await e.mkdir(r,{recursive:!0}),await e.writeFile(j__namespace.join(r,"index.ts"),await c(`
+    ;`));}async function pe(e,t,o){await t.mkdir(o,{recursive:!0});for(let{apiName:r}of Object.values(e.objectTypes)){let n=T.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__namespace.join(t,"index.ts"),await i(`
         export type { ObjectSet } from "@osdk/legacy-client";
-    `));}function _(e){let r=$(e);return {apiName:e.apiName,parameters:Object.fromEntries(Object.entries(e.parameters).map(([o,t])=>[o,ue(t)])),displayName:e.displayName,description:e.description,modifiedEntities:fe(r.addedObjects,r.modifiedObjects)}}function ue(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:A(e.dataType),nullable:!e.required,description:e.description};case"array":return {multiplicity:!0,type:A(e.dataType),nullable:!e.required,description:e.description}}}function A(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 A(e.subType)}}function fe(e,r){let o={};for(let t of e)o[t]={created:!0,modified:!1};for(let t of r)o[t]?o[t].modified=!0:o[t]={created:!1,modified:!0};return o}async function K(e,r,o){await r.mkdir(o,{recursive:!0}),await Promise.all(e.actionTypes.map(async t=>{let n=new Set(de(t));await r.writeFile(j__namespace.default.join(o,`${t.apiName}.ts`),await c(`
+    `));}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__namespace.default.join(o,`${r.apiName}.ts`),await i(`
           import { ActionDefinition } from "@osdk/api";
   
-           export const ${t.apiName} = ${JSON.stringify(_(t),null,2)} satisfies ActionDefinition<"${t.apiName}", ${n.size>0?[...n].map(a=>`"${a}"`).join("|"):"never"}>;`));})),await r.writeFile(j__namespace.default.join(o,"index.ts"),await c(`
-      ${e.actionTypes.map(t=>`export * from "./${t.apiName}";`).join(`
+           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__namespace.default.join(o,"index.ts"),await i(`
+      ${e.actionTypes.map(r=>`export * from "./${r.apiName}";`).join(`
 `)}
-      `));}function de(e){let r=Object.values(e.parameters).flatMap(({dataType:t})=>{let n=U(t);return n?[n]:[]});return [...e.operations.flatMap(t=>{switch(t.type){case"createObject":return [t.objectTypeApiName];case"modifyObject":return [t.objectTypeApiName];case"deleteObject":case"createLink":case"deleteLink":return []}}),...r]}function U(e){switch(e.type){case"objectSet":case"object":return e.objectTypeApiName;case"array":return U(e.subType);case"string":case"boolean":case"attachment":case"date":case"double":case"integer":case"long":case"timestamp":return}}function G(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 z(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:k(e.dataType),nullable:!0};case"array":return {multiplicity:!0,description:e.description,type:k(e.dataType),nullable:!0};default:e.dataType;throw new Error(`Unexpected data type ${JSON.stringify(e.dataType)}`)}}function k(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 k(e.subType);case"timeseries":return e.itemType.type==="string"?"stringTimeseries":"numericTimeseries";default:throw new Error(`Unexecpected data type ${e}`)}}function O(e,r=[]){return {apiName:e.apiName,description:e.description,primaryKeyType:G(e.properties[e.primaryKey]),links:Object.fromEntries(r.map(o=>[o.apiName,{multiplicity:o.cardinality==="MANY",targetType:o.objectTypeApiName}])),properties:Object.fromEntries(Object.entries(e.properties).map(([o,t])=>[o,z(t)]))}}var ge=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 B(e){return ge.has(e)}function W(e,r=[]){let o=new Set(r.map(t=>t.objectTypeApiName).filter(t=>t!==e.apiName));return `import type { OntologyObject, LocalDate, Timestamp, GeoShape, GeoPoint, Attachment, TimeSeries, MultiLink, SingleLink } from "@osdk/legacy-client";
-${Array.from(o).map(t=>`import type { ${t} } from "./${t}";`).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(`
 `)}
 
-  ${J(e.description)}export interface ${e.apiName} extends OntologyObject {
+  ${be(e.description)}export interface ${e.apiName} extends OntologyObject {
   readonly __apiName: "${e.apiName}";
-  readonly __primaryKey: ${S(e.properties[e.primaryKey].dataType)};
-${Object.entries(e.properties).flatMap(([t,n])=>{let a=S(n.dataType),s=[`${J(n.description)}readonly ${t}: ${a} | undefined`];return B(t)&&s.push(`/** @deprecated please migrate to '${t}' instead */
-          readonly ${t}_: ${a} | undefined`),s}).join(`;
+  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(`;
 `)}
-${r.flatMap(t=>[`readonly ${t.apiName}: ${t.cardinality==="MANY"?"MultiLink":"SingleLink"}<${t.objectTypeApiName}>`]).join(`;
+${t.flatMap(r=>[`readonly ${r.apiName}: ${r.cardinality==="MANY"?"MultiLink":"SingleLink"}<${r.objectTypeApiName}>`]).join(`;
 `)}
 }
-  `}function S(e){switch(e.type){case"string":return "string";case"boolean":return "boolean";case"array":return S(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 J(e){return e?`/**
+  `}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?`/**
  * ${e}
  */
-`:""}async function Z(e,r,o){await r.mkdir(o,{recursive:!0}),await Promise.all(Object.values(e.objectTypes).map(async t=>{let n=e.linkTypes[t.apiName],a=new Set(n?.map(s=>s.objectTypeApiName));await r.writeFile(j__namespace.default.join(o,`${t.apiName}.ts`),await c(`
+`:""}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__namespace.default.join(o,`${r.apiName}.ts`),await i(`
         import { ObjectDefinition } from "@osdk/api";
-        ${W(t,n)}
+        ${je(r,n)}
 
-         export const ${t.apiName} = ${JSON.stringify(O(t,n),null,2)} satisfies ObjectDefinition<"${t.apiName}", ${a.size>0?[...a].map(s=>`"${s}"`).join("|"):"never"}>;`));})),await r.writeFile(j__namespace.default.join(o,"index.ts"),await c(`
-    ${Object.keys(e.objectTypes).map(t=>`export * from "./${t}";`).join(`
+         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__namespace.default.join(o,"index.ts"),await i(`
+    ${Object.keys(e.objectTypes).map(r=>`export * from "./${r}";`).join(`
 `)}
       export type { ObjectSet } from "@osdk/legacy-client";
 
-    `));}function d(e){return e.type==="null"?!0:e.type==="union"?e.unionTypes.some(r=>d(r)):!1}function u(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 {...u(e.subType),multiplicity:!0};case"set":return {type:{type:"set",set:u(e.subType)},nullable:!1};case"union":let r=d(e);if(r&&e.unionTypes.length===2){let t=e.unionTypes.find(n=>n.type!==null);if(t)return {...u(t),nullable:!0}}return {type:{type:"union",union:e.unionTypes.reduce((t,n)=>(n.type==="null"||t.push(u(n)),t),[])},nullable:r};case"struct":return {type:{type:"struct",struct:Object.fromEntries(e.fields.map(t=>[t.name,u(t.fieldType)]))},nullable:!1};case"twoDimensionalAggregation":return {type:{type:"twoDimensionalAggregation",twoDimensionalAggregation:N(e)}};case"threeDimensionalAggregation":return {type:{type:"threeDimensionalAggregation",threeDimensionalAggregation:be(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 N(e){if(e.keyType.type==="range")return {keyType:e.keyType.type,keySubtype:e.keyType.subType.type,valueType:e.valueType.type};if(H(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 be(e){if(e.keyType.type==="range")return {keyType:e.keyType.type,keySubtype:e.keyType.subType.type,valueType:N(e.valueType)};if(H(e.keyType))return {keyType:e.keyType.type,valueType:N(e.valueType)};throw new Error(`Cannot create 3D aggregation with ${e.keyType.type} as its type`)}function H(e){return e.type==="string"||e.type==="boolean"}function X(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(([r,o])=>[r,Te(o)])),output:u(e.output)}}function Te(e){return {description:e.description,dataType:u(e.dataType)}}async function te(e,r,o){await r.mkdir(o,{recursive:!0}),await Promise.all(e.queryTypes.map(async t=>{let n=je(t);await r.writeFile(j__namespace.default.join(o,`${t.apiName}.ts`),await c(`
+    `));}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__namespace.default.join(o,`${r.apiName}.ts`),await i(`
         import { QueryDefinition } from "@osdk/api";
 
-        export const ${t.apiName} = ${JSON.stringify(X(t))} satisfies QueryDefinition<"${t.apiName}", ${n.length>0?n.map(a=>`"${a}"`).join("|"):"never"}>;`));})),await r.writeFile(j__namespace.default.join(o,"index.ts"),await c(`
-  ${e.queryTypes.map(t=>`export * from "./${t.apiName}";`).join(`
+        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__namespace.default.join(o,"index.ts"),await i(`
+  ${e.queryTypes.map(r=>`export * from "./${r.apiName}";`).join(`
 `)}
-  `));}function je(e){let r=new Set;for(let{dataType:o}of Object.values(e.parameters))T(o,r);return T(e.output,r),Array.from(r)}function T(e,r){switch(e.type){case"array":case"set":T(e.subType,r);return;case"object":r.add(e.objectTypeApiName);return;case"objectSet":r.add(e.objectTypeApiName);return;case"struct":for(let t of Object.values(e.fields))T(t.fieldType,r);return;case"union":for(let t of e.unionTypes)T(t,r);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 ae(e,r,o){let t=new Set,n=[];for(let a of e.queryTypes){let s=["/**"];a.description&&s.push(`* ${a.description}`);let y=g(a.output,t,!0),m=[];for(let[i,p]of Object.entries(a.parameters)){let f=d(p.dataType),b=g(p.dataType,t,!1);m.push(`"${i}"${f?"?":""}: ${b}`),s.push(`* @param {${oe(b)}} params.${i}${p.description?` - ${p.description}`:""}`);}let l=m.length===0?"":`params: { ${m.join("; ")} }`;s.push(`* @returns ${oe(y)}`,"*/"),n.push(`
-      ${s.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(`
+      ${c.join(`
 `)}
-      ${a.apiName}(${l}): Promise<Result<QueryResponse<${y}>, QueryError>>;
-      `);}await r.mkdir(o,{recursive:!0}),await r.writeFile(j__namespace.default.join(o,"Queries.ts"),await c(`
+      ${a.apiName}(${g}): Promise<Result<QueryResponse<${l}>, QueryError>>;
+      `);}await t.mkdir(o,{recursive:!0}),await t.writeFile(T__namespace.default.join(o,"Queries.ts"),await i(`
     import type { QueryResponse, QueryError, Result, Timestamp, LocalDate, Range, Attachment, ObjectSet, TwoDimensionalAggregation, ThreeDimensionalAggregation  } from "@osdk/legacy-client";
-    ${Array.from(t).map(a=>`import type { ${a} } from "../objects/${a}";`).join(`
+    ${Array.from(r).map(a=>`import type { ${a} } from "../objects/${a}";`).join(`
 `)}
 
     export interface Queries {
     ${n.join(`
 `)}
     }
-  `));}function g(e,r,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<${g(e.subType,r,o)}>`;case"object":{let a=e.objectTypeApiName;return r.add(a),o?a:`${a} | ${a}["__primaryKey"]`}case"objectSet":{let a=e.objectTypeApiName;return r.add(a),`ObjectSet<${a}>`}case"set":return `Set<${g(e.subType,r,o)}>`;case"struct":return `{ ${e.fields.map(a=>{let s=d(a.fieldType);return `${a.name}${s?"?":""}: ${g(a.fieldType,r,o)}`}).join(`,
-`)} }`;case"union":return e.unionTypes.map(a=>g(a,r,o)).filter(a=>a!=="null").join("|");case"twoDimensionalAggregation":return e.valueType,`TwoDimensionalAggregation<
-        ${x(e.keyType)},
-        ${re(e.valueType)}
+  `));}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)}
       >`;case"threeDimensionalAggregation":return `ThreeDimensionalAggregation<
-        ${x(e.keyType)},
-        ${x(e.valueType.keyType)},
-        ${re(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 x(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 re(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 oe(e){return e.replace(/\s/g,"")}async function he(e,r,o){let t=j__namespace.join(o,"ontology","objects"),n=j__namespace.join(o,"ontology","actions"),a=j__namespace.join(o,"ontology","queries"),s=F(e);await v(r,o),await L(s,r,o),await R(r,j__namespace.join(o,"ontology")),await M(s,r,t),await Z(s,r,t),await Q(s,r,n),await K(s,r,n),await ae(s,r,a),await te(s,r,a),await I(r,o);}function ne(e){return `
+        ${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__namespace.join(o,"ontology","objects"),n=T__namespace.join(o,"ontology","actions"),a=T__namespace.join(o,"ontology","queries"),c=I(e);await oe(t,o),await ne(c,t,o),await me(t,T__namespace.join(o,"ontology")),await se(c,t,r),await pe(c,t,T__namespace.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 `
     export interface ${e.apiName} extends ObjectDefinition<"${e.apiName}", "${e.apiName}">{
       apiName: "${e.apiName}";
       properties: {
-        ${Object.entries(e.properties).map(([r,o])=>`
+        ${Object.entries(e.properties).map(([t,o])=>`
       /**
        * ${o.description??""}
        **/
-      ${r}: {
+      ${t}: {
           type: "${o.dataType.type}";
-          displayName: "${o.displayName??r}";
+          displayName: "${o.displayName??t}";
         }
         
         `)}
       }
     }
-  `}async function Oe(e,r,o){r.writeFile(j__namespace.default.join(o,"index.ts"),await c(`
+  `}async function Ze(e,t,o){t.writeFile(T__namespace.default.join(o,"index.ts"),await i(`
         export { Ontology } from "./Ontology";
-    `));let t=Object.keys(e.objectTypes);r.writeFile(j__namespace.default.join(o,"Ontology.ts"),await c(`
+    `));let r=Object.keys(e.objectTypes);t.writeFile(T__namespace.default.join(o,"Ontology.ts"),await i(`
       import type { OntologyDefinition } from "@osdk/api";
-      ${t.map(n=>`import {${n}} from "./objects/${n}";`).join(`
+      ${r.map(n=>`import {${n}} from "./objects/${n}";`).join(`
 `)}
       
       import { OntologyMetadata } from "./OntologyMetadata";
@@ -269,20 +350,20 @@ ${r.flatMap(t=>[`readonly ${t.apiName}: ${t.cardinality==="MANY"?"MultiLink":"Si
       export const Ontology = {
         metadata: OntologyMetadata,
         objects: {
-          ${t.map(n=>`${n}: ${n},`).join(`
+          ${r.map(n=>`${n}: ${n},`).join(`
 `)}
         },
-      } satisfies OntologyDefinition<${t.map(n=>`"${n}"`).join("|")}>;
-    `));for(let n of t){let a=e.objectTypes[n];r.writeFile(j__namespace.default.join(o,"objects",`${n}.ts`),await c(`
+      } satisfies OntologyDefinition<${r.map(n=>`"${n}"`).join("|")}>;
+    `));for(let n of r){let a=e.objectTypes[n];t.writeFile(T__namespace.default.join(o,"objects",`${n}.ts`),await i(`
     
       import type { ObjectDefinition } from "@osdk/api";
 
-      export const ${n} =  ${JSON.stringify(O(a),null,2)} satisfies ${n};
+      export const ${n} =  ${JSON.stringify(F(a),null,2)} satisfies ${n};
 
-      ${ne(a)}
+      ${Fe(a)}
     `));}}
 
-exports.generateClientSdkVersionOneDotOne = he;
-exports.generateClientSdkVersionTwoPointZero = Oe;
+exports.generateClientSdkVersionOneDotOne = Ye;
+exports.generateClientSdkVersionTwoPointZero = Ze;
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.js.map