@osdk/api 2.1.0-beta.19 → 2.1.0-beta.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @osdk/api
2
2
 
3
+ ## 2.1.0-beta.20
4
+
5
+ ### Minor Changes
6
+
7
+ - 9d35a1f: Remove unused imports
8
+ - abfe4b3: Add support for reading struct properties.
9
+ - c537e2d: Remove unused imports.
10
+
3
11
  ## 2.1.0-beta.19
4
12
 
5
13
  ### Minor Changes
@@ -1,4 +1,4 @@
1
- import type { PropertyValueWireToClient } from "./mapping/PropertyValueMapping.js";
1
+ import type { GetClientPropertyValueFromWire } from "./mapping/PropertyValueMapping.js";
2
2
  import type { ObjectMetadata } from "./ontology/ObjectTypeDefinition.js";
3
3
  type MaybeArray<T extends {
4
4
  multiplicity?: boolean | undefined;
@@ -10,7 +10,7 @@ type Converted<T> = T extends Array<any> ? T[1] : T;
10
10
  * @param {T} ObjectMetadata.Property in literal form
11
11
  * @param {STRICTLY_ENFORCE_NULLABLE} S for strict. If false, always `|undefined`
12
12
  */
13
- export type OsdkObjectPropertyType<T extends ObjectMetadata.Property, STRICTLY_ENFORCE_NULLABLE extends boolean = true> = STRICTLY_ENFORCE_NULLABLE extends false ? MaybeArray<T, Converted<PropertyValueWireToClient[T["type"]]>> | undefined : MaybeNullable<T, MaybeArray<T, Converted<PropertyValueWireToClient[T["type"]]>>>;
14
- export type OsdkObjectRawPropertyType<T extends ObjectMetadata.Property> = MaybeNullable<T, MaybeArray<T, Raw<PropertyValueWireToClient[T["type"]]>>>;
13
+ export type OsdkObjectPropertyType<T extends ObjectMetadata.Property, STRICTLY_ENFORCE_NULLABLE extends boolean = true> = STRICTLY_ENFORCE_NULLABLE extends false ? MaybeArray<T, Converted<GetClientPropertyValueFromWire<T["type"]>>> | undefined : MaybeNullable<T, MaybeArray<T, Converted<GetClientPropertyValueFromWire<T["type"]>>>>;
14
+ export type OsdkObjectRawPropertyType<T extends ObjectMetadata.Property> = MaybeNullable<T, MaybeArray<T, Raw<GetClientPropertyValueFromWire<T["type"]>>>>;
15
15
  export {};
16
16
  //# sourceMappingURL=Definitions.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Definitions.d.ts","sourceRoot":"","sources":["../../src/Definitions.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AACnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEzE,KAAK,UAAU,CAAC,CAAC,SAAS;IAAE,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAAE,EAAE,CAAC,IACjE,CAAC,CAAC,cAAc,CAAC,SAAS,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEhD,KAAK,aAAa,CAAC,CAAC,SAAS,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,SACtE,IAAI,GAAG,CAAC,GAAG,SAAS,GAClB,CAAC,CAAC;AAEN,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAC9C,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEpD;;;GAGG;AACH,MAAM,MAAM,sBAAsB,CAChC,CAAC,SAAS,cAAc,CAAC,QAAQ,EACjC,yBAAyB,SAAS,OAAO,GAAG,IAAI,IAC9C,yBAAyB,SAAS,KAAK,GACvC,UAAU,CAAC,CAAC,EAAE,SAAS,CAAC,yBAAyB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,GAC1E,aAAa,CACb,CAAC,EACD,UAAU,CAAC,CAAC,EAAE,SAAS,CAAC,yBAAyB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAC/D,CAAC;AAEJ,MAAM,MAAM,yBAAyB,CAAC,CAAC,SAAS,cAAc,CAAC,QAAQ,IACrE,aAAa,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"Definitions.d.ts","sourceRoot":"","sources":["../../src/Definitions.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACV,8BAA8B,EAC/B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEzE,KAAK,UAAU,CAAC,CAAC,SAAS;IAAE,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAAE,EAAE,CAAC,IACjE,CAAC,CAAC,cAAc,CAAC,SAAS,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEhD,KAAK,aAAa,CAAC,CAAC,SAAS,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,SACtE,IAAI,GAAG,CAAC,GAAG,SAAS,GAClB,CAAC,CAAC;AAEN,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAC9C,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEpD;;;GAGG;AACH,MAAM,MAAM,sBAAsB,CAChC,CAAC,SAAS,cAAc,CAAC,QAAQ,EACjC,yBAAyB,SAAS,OAAO,GAAG,IAAI,IAC9C,yBAAyB,SAAS,KAAK,GACrC,UAAU,CAAC,CAAC,EAAE,SAAS,CAAC,8BAA8B,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GACnE,SAAS,GACX,aAAa,CACb,CAAC,EACD,UAAU,CAAC,CAAC,EAAE,SAAS,CAAC,8BAA8B,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CACpE,CAAC;AAEJ,MAAM,MAAM,yBAAyB,CAAC,CAAC,SAAS,cAAc,CAAC,QAAQ,IACrE,aAAa,CACX,CAAC,EACD,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,8BAA8B,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAC9D,CAAC"}
@@ -1,11 +1,11 @@
1
- import type { PropertyValueClientToWire } from "../mapping/PropertyValueMapping.js";
1
+ import type { GetWirePropertyValueFromClient } from "../mapping/PropertyValueMapping.js";
2
2
  import type { ObjectOrInterfaceDefinition, PropertyKeys } from "../ontology/ObjectOrInterface.js";
3
3
  import type { CompileTimeMetadata } from "../ontology/ObjectTypeDefinition.js";
4
4
  export type StringAggregateOption = "approximateDistinct" | "exactDistinct";
5
5
  export type NumericAggregateOption = "min" | "max" | "sum" | "avg" | "approximateDistinct" | "exactDistinct";
6
6
  type AGG_FOR_TYPE<T> = number extends T ? NumericAggregateOption : string extends T ? StringAggregateOption : never;
7
7
  export type ValidAggregationKeys<Q extends ObjectOrInterfaceDefinition> = keyof ({
8
- [KK in AggregatableKeys<Q> as `${KK & string}:${AGG_FOR_TYPE<PropertyValueClientToWire[CompileTimeMetadata<Q>["properties"][KK]["type"]]>}`]?: any;
8
+ [KK in AggregatableKeys<Q> as `${KK & string}:${AGG_FOR_TYPE<GetWirePropertyValueFromClient<CompileTimeMetadata<Q>["properties"][KK]["type"]>>}`]?: any;
9
9
  } & {
10
10
  $count?: any;
11
11
  });
@@ -1 +1 @@
1
- {"version":3,"file":"AggregatableKeys.d.ts","sourceRoot":"","sources":["../../../src/aggregate/AggregatableKeys.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AACpF,OAAO,KAAK,EACV,2BAA2B,EAC3B,YAAY,EACb,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAE/E,MAAM,MAAM,qBAAqB,GAAG,qBAAqB,GAAG,eAAe,CAAC;AAC5E,MAAM,MAAM,sBAAsB,GAC9B,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,qBAAqB,GACrB,eAAe,CAAC;AAEpB,KAAK,YAAY,CAAC,CAAC,IAAI,MAAM,SAAS,CAAC,GAAG,sBAAsB,GAC5D,MAAM,SAAS,CAAC,GAAG,qBAAqB,GACxC,KAAK,CAAC;AAEV,MAAM,MAAM,oBAAoB,CAC9B,CAAC,SAAS,2BAA2B,IACnC,MAAM,CACN;KAEE,EAAE,IAAI,gBAAgB,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,GAAG,MAAM,IAAI,YAAY,CACzD,yBAAyB,CACvB,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CACjD,CACF,EAAE,CACJ,CAAC,EAAE,GAAG;CACR,GACC;IAAE,MAAM,CAAC,EAAE,GAAG,CAAA;CAAE,CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAC1B,CAAC,SAAS,2BAA2B,IACnC,MAAM;KACP,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,GAAG,GAAG;CAC5B,CAAC"}
1
+ {"version":3,"file":"AggregatableKeys.d.ts","sourceRoot":"","sources":["../../../src/aggregate/AggregatableKeys.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACV,8BAA8B,EAC/B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EACV,2BAA2B,EAC3B,YAAY,EACb,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAE/E,MAAM,MAAM,qBAAqB,GAAG,qBAAqB,GAAG,eAAe,CAAC;AAC5E,MAAM,MAAM,sBAAsB,GAC9B,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,qBAAqB,GACrB,eAAe,CAAC;AAEpB,KAAK,YAAY,CAAC,CAAC,IAAI,MAAM,SAAS,CAAC,GAAG,sBAAsB,GAC5D,MAAM,SAAS,CAAC,GAAG,qBAAqB,GACxC,KAAK,CAAC;AAEV,MAAM,MAAM,oBAAoB,CAC9B,CAAC,SAAS,2BAA2B,IACnC,MAAM,CACN;KAEE,EAAE,IAAI,gBAAgB,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,GAAG,MAAM,IAAI,YAAY,CACzD,8BAA8B,CAC5B,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CACjD,CACF,EAAE,CACJ,CAAC,EAAE,GAAG;CACR,GACC;IAAE,MAAM,CAAC,EAAE,GAAG,CAAA;CAAE,CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAC1B,CAAC,SAAS,2BAA2B,IACnC,MAAM;KACP,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,GAAG,GAAG;CAC5B,CAAC"}
@@ -31,7 +31,7 @@ export type { CompileTimeMetadata, ObjectMetadata, ObjectTypeDefinition, Propert
31
31
  export type { OntologyMetadata } from "./ontology/OntologyMetadata.js";
32
32
  export type { PrimaryKeyTypes } from "./ontology/PrimaryKeyTypes.js";
33
33
  export type { ObjectQueryDataType, ObjectSetQueryDataType, QueryDataTypeDefinition, QueryDefinition, QueryMetadata, QueryParameterDefinition, ThreeDimensionalQueryAggregationDefinition, TwoDimensionalQueryAggregationDefinition, } from "./ontology/QueryDefinition.js";
34
- export type { WirePropertyTypes } from "./ontology/WirePropertyTypes.js";
34
+ export type { SimpleWirePropertyTypes, WirePropertyTypes, } from "./ontology/WirePropertyTypes.js";
35
35
  export type { OsdkBase, PrimaryKeyType } from "./OsdkBase.js";
36
36
  export type { OsdkObject } from "./OsdkObject.js";
37
37
  export type { ConvertProps, Osdk } from "./OsdkObjectFrom.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
@@ -24,6 +24,9 @@ export interface PropertyValueWireToClient {
24
24
  sensorTimeseries: TimeSeriesProperty<string | number>;
25
25
  geotimeSeriesReference: GeotimeSeriesProperty<GeoJSON.Point>;
26
26
  }
27
+ export type GetClientPropertyValueFromWire<T extends keyof PropertyValueWireToClient | Record<string, keyof PropertyValueWireToClient>> = T extends keyof PropertyValueWireToClient ? PropertyValueWireToClient[T] : T extends Record<string, keyof PropertyValueWireToClient> ? {
28
+ [K in keyof T]: PropertyValueWireToClient[T[K]];
29
+ } : never;
27
30
  /**
28
31
  * Map from the PropertyDefinition type to the typescript type that we accept
29
32
  */
@@ -48,4 +51,7 @@ export interface PropertyValueClientToWire {
48
51
  sensorTimeseries: TimeSeriesProperty<string | number>;
49
52
  geotimeSeriesReference: GeotimeSeriesProperty<GeoJSON.Point>;
50
53
  }
54
+ export type GetWirePropertyValueFromClient<T extends keyof PropertyValueClientToWire | Record<string, keyof PropertyValueClientToWire>> = T extends keyof PropertyValueClientToWire ? PropertyValueClientToWire[T] : T extends Record<string, keyof PropertyValueClientToWire> ? {
55
+ [K in keyof T]: PropertyValueClientToWire[T[K]];
56
+ } : never;
51
57
  //# sourceMappingURL=PropertyValueMapping.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"PropertyValueMapping.d.ts","sourceRoot":"","sources":["../../../src/mapping/PropertyValueMapping.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,KAAK,EACV,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,6BAA6B,CAAC;AAErC;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAElB,iBAAiB,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC9C,gBAAgB,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC7C,gBAAgB,EAAE,kBAAkB,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IACtD,sBAAsB,EAAE,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;CAC9D;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,UAAU,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAElB,iBAAiB,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC9C,gBAAgB,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC7C,gBAAgB,EAAE,kBAAkB,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IACtD,sBAAsB,EAAE,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;CAC9D"}
1
+ {"version":3,"file":"PropertyValueMapping.d.ts","sourceRoot":"","sources":["../../../src/mapping/PropertyValueMapping.ts"],"names":[],"mappings":"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"}
@@ -19,5 +19,9 @@ describe("Object definitions", () => {
19
19
  expectTypeOf().toEqualTypeOf();
20
20
  expectTypeOf().toEqualTypeOf();
21
21
  });
22
+ it("correctly maps struct types", () => {
23
+ expectTypeOf().toEqualTypeOf();
24
+ expectTypeOf().toEqualTypeOf();
25
+ });
22
26
  });
23
27
  //# sourceMappingURL=ObjectDefinitions.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ObjectDefinitions.test.js","names":["describe","expectTypeOf","it","toEqualTypeOf"],"sources":["ObjectDefinitions.test.js"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { describe, expectTypeOf, it } from \"vitest\";\ndescribe(\"Object definitions\", () => {\n it(\"correctly upgrades attachment types at conversion time\", () => {\n const attachment = {\n type: \"attachment\",\n };\n const attachmentArray = {\n type: \"attachment\",\n multiplicity: true,\n };\n expectTypeOf().toEqualTypeOf();\n expectTypeOf()\n .toEqualTypeOf();\n });\n});\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,QAAQ,EAAEC,YAAY,EAAEC,EAAE,QAAQ,QAAQ;AACnDF,QAAQ,CAAC,oBAAoB,EAAE,MAAM;EACjCE,EAAE,CAAC,wDAAwD,EAAE,MAAM;IAQ/DD,YAAY,CAAC,CAAC,CAACE,aAAa,CAAC,CAAC;IAC9BF,YAAY,CAAC,CAAC,CACTE,aAAa,CAAC,CAAC;EACxB,CAAC,CAAC;AACN,CAAC,CAAC","ignoreList":[]}
1
+ {"version":3,"file":"ObjectDefinitions.test.js","names":["describe","expectTypeOf","it","toEqualTypeOf"],"sources":["ObjectDefinitions.test.js"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { describe, expectTypeOf, it } from \"vitest\";\ndescribe(\"Object definitions\", () => {\n it(\"correctly upgrades attachment types at conversion time\", () => {\n const attachment = {\n type: \"attachment\",\n };\n const attachmentArray = {\n type: \"attachment\",\n multiplicity: true,\n };\n expectTypeOf().toEqualTypeOf();\n expectTypeOf()\n .toEqualTypeOf();\n });\n it(\"correctly maps struct types\", () => {\n const structType = {\n type: {\n integerField: \"integer\",\n floatField: \"float\",\n attachment: \"attachment\",\n },\n };\n const structTypeArray = {\n type: {\n integerField: \"integer\",\n floatField: \"float\",\n attachment: \"attachment\",\n },\n multiplicity: true,\n };\n expectTypeOf().toEqualTypeOf();\n expectTypeOf()\n .toEqualTypeOf();\n });\n});\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,QAAQ,EAAEC,YAAY,EAAEC,EAAE,QAAQ,QAAQ;AACnDF,QAAQ,CAAC,oBAAoB,EAAE,MAAM;EACjCE,EAAE,CAAC,wDAAwD,EAAE,MAAM;IAQ/DD,YAAY,CAAC,CAAC,CAACE,aAAa,CAAC,CAAC;IAC9BF,YAAY,CAAC,CAAC,CACTE,aAAa,CAAC,CAAC;EACxB,CAAC,CAAC;EACFD,EAAE,CAAC,6BAA6B,EAAE,MAAM;IAgBpCD,YAAY,CAAC,CAAC,CAACE,aAAa,CAAC,CAAC;IAC9BF,YAAY,CAAC,CAAC,CACTE,aAAa,CAAC,CAAC;EACxB,CAAC,CAAC;AACN,CAAC,CAAC","ignoreList":[]}
@@ -1,2 +1,3 @@
1
- export type WirePropertyTypes = "string" | "datetime" | "double" | "boolean" | "integer" | "timestamp" | "short" | "long" | "float" | "decimal" | "byte" | "marking" | "numericTimeseries" | "stringTimeseries" | "sensorTimeseries" | "attachment" | "geopoint" | "geoshape" | "geotimeSeriesReference";
1
+ export type WirePropertyTypes = SimpleWirePropertyTypes | Record<string, SimpleWirePropertyTypes>;
2
+ export type SimpleWirePropertyTypes = "string" | "datetime" | "double" | "boolean" | "integer" | "timestamp" | "short" | "long" | "float" | "decimal" | "byte" | "marking" | "numericTimeseries" | "stringTimeseries" | "sensorTimeseries" | "attachment" | "geopoint" | "geoshape" | "geotimeSeriesReference";
2
3
  //# sourceMappingURL=WirePropertyTypes.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"WirePropertyTypes.d.ts","sourceRoot":"","sources":["../../../src/ontology/WirePropertyTypes.ts"],"names":[],"mappings":"AAgBA,MAAM,MAAM,iBAAiB,GACzB,QAAQ,GACR,UAAU,GACV,QAAQ,GACR,SAAS,GACT,SAAS,GACT,WAAW,GACX,OAAO,GACP,MAAM,GACN,OAAO,GACP,SAAS,GACT,MAAM,GACN,SAAS,GACT,mBAAmB,GACnB,kBAAkB,GAClB,kBAAkB,GAClB,YAAY,GACZ,UAAU,GACV,UAAU,GACV,wBAAwB,CAAC"}
1
+ {"version":3,"file":"WirePropertyTypes.d.ts","sourceRoot":"","sources":["../../../src/ontology/WirePropertyTypes.ts"],"names":[],"mappings":"AAgBA,MAAM,MAAM,iBAAiB,GACzB,uBAAuB,GACvB,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;AAE5C,MAAM,MAAM,uBAAuB,GAC/B,QAAQ,GACR,UAAU,GACV,QAAQ,GACR,SAAS,GACT,SAAS,GACT,WAAW,GACX,OAAO,GACP,MAAM,GACN,OAAO,GACP,SAAS,GACT,MAAM,GACN,SAAS,GACT,mBAAmB,GACnB,kBAAkB,GAClB,kBAAkB,GAClB,YAAY,GACZ,UAAU,GACV,UAAU,GACV,wBAAwB,CAAC"}
@@ -1,4 +1,4 @@
1
- import type { PropertyValueWireToClient } from "./mapping/PropertyValueMapping.js";
1
+ import type { GetClientPropertyValueFromWire } from "./mapping/PropertyValueMapping.js";
2
2
  import type { ObjectMetadata } from "./ontology/ObjectTypeDefinition.js";
3
3
  type MaybeArray<T extends {
4
4
  multiplicity?: boolean | undefined;
@@ -10,7 +10,7 @@ type Converted<T> = T extends Array<any> ? T[1] : T;
10
10
  * @param {T} ObjectMetadata.Property in literal form
11
11
  * @param {STRICTLY_ENFORCE_NULLABLE} S for strict. If false, always `|undefined`
12
12
  */
13
- export type OsdkObjectPropertyType<T extends ObjectMetadata.Property, STRICTLY_ENFORCE_NULLABLE extends boolean = true> = STRICTLY_ENFORCE_NULLABLE extends false ? MaybeArray<T, Converted<PropertyValueWireToClient[T["type"]]>> | undefined : MaybeNullable<T, MaybeArray<T, Converted<PropertyValueWireToClient[T["type"]]>>>;
14
- export type OsdkObjectRawPropertyType<T extends ObjectMetadata.Property> = MaybeNullable<T, MaybeArray<T, Raw<PropertyValueWireToClient[T["type"]]>>>;
13
+ export type OsdkObjectPropertyType<T extends ObjectMetadata.Property, STRICTLY_ENFORCE_NULLABLE extends boolean = true> = STRICTLY_ENFORCE_NULLABLE extends false ? MaybeArray<T, Converted<GetClientPropertyValueFromWire<T["type"]>>> | undefined : MaybeNullable<T, MaybeArray<T, Converted<GetClientPropertyValueFromWire<T["type"]>>>>;
14
+ export type OsdkObjectRawPropertyType<T extends ObjectMetadata.Property> = MaybeNullable<T, MaybeArray<T, Raw<GetClientPropertyValueFromWire<T["type"]>>>>;
15
15
  export {};
16
16
  //# sourceMappingURL=Definitions.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Definitions.d.ts","sourceRoot":"","sources":["../../src/Definitions.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AACnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEzE,KAAK,UAAU,CAAC,CAAC,SAAS;IAAE,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAAE,EAAE,CAAC,IACjE,CAAC,CAAC,cAAc,CAAC,SAAS,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEhD,KAAK,aAAa,CAAC,CAAC,SAAS,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,SACtE,IAAI,GAAG,CAAC,GAAG,SAAS,GAClB,CAAC,CAAC;AAEN,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAC9C,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEpD;;;GAGG;AACH,MAAM,MAAM,sBAAsB,CAChC,CAAC,SAAS,cAAc,CAAC,QAAQ,EACjC,yBAAyB,SAAS,OAAO,GAAG,IAAI,IAC9C,yBAAyB,SAAS,KAAK,GACvC,UAAU,CAAC,CAAC,EAAE,SAAS,CAAC,yBAAyB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,GAC1E,aAAa,CACb,CAAC,EACD,UAAU,CAAC,CAAC,EAAE,SAAS,CAAC,yBAAyB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAC/D,CAAC;AAEJ,MAAM,MAAM,yBAAyB,CAAC,CAAC,SAAS,cAAc,CAAC,QAAQ,IACrE,aAAa,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"Definitions.d.ts","sourceRoot":"","sources":["../../src/Definitions.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACV,8BAA8B,EAC/B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEzE,KAAK,UAAU,CAAC,CAAC,SAAS;IAAE,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAAE,EAAE,CAAC,IACjE,CAAC,CAAC,cAAc,CAAC,SAAS,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEhD,KAAK,aAAa,CAAC,CAAC,SAAS,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,SACtE,IAAI,GAAG,CAAC,GAAG,SAAS,GAClB,CAAC,CAAC;AAEN,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAC9C,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEpD;;;GAGG;AACH,MAAM,MAAM,sBAAsB,CAChC,CAAC,SAAS,cAAc,CAAC,QAAQ,EACjC,yBAAyB,SAAS,OAAO,GAAG,IAAI,IAC9C,yBAAyB,SAAS,KAAK,GACrC,UAAU,CAAC,CAAC,EAAE,SAAS,CAAC,8BAA8B,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GACnE,SAAS,GACX,aAAa,CACb,CAAC,EACD,UAAU,CAAC,CAAC,EAAE,SAAS,CAAC,8BAA8B,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CACpE,CAAC;AAEJ,MAAM,MAAM,yBAAyB,CAAC,CAAC,SAAS,cAAc,CAAC,QAAQ,IACrE,aAAa,CACX,CAAC,EACD,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,8BAA8B,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAC9D,CAAC"}
@@ -1,11 +1,11 @@
1
- import type { PropertyValueClientToWire } from "../mapping/PropertyValueMapping.js";
1
+ import type { GetWirePropertyValueFromClient } from "../mapping/PropertyValueMapping.js";
2
2
  import type { ObjectOrInterfaceDefinition, PropertyKeys } from "../ontology/ObjectOrInterface.js";
3
3
  import type { CompileTimeMetadata } from "../ontology/ObjectTypeDefinition.js";
4
4
  export type StringAggregateOption = "approximateDistinct" | "exactDistinct";
5
5
  export type NumericAggregateOption = "min" | "max" | "sum" | "avg" | "approximateDistinct" | "exactDistinct";
6
6
  type AGG_FOR_TYPE<T> = number extends T ? NumericAggregateOption : string extends T ? StringAggregateOption : never;
7
7
  export type ValidAggregationKeys<Q extends ObjectOrInterfaceDefinition> = keyof ({
8
- [KK in AggregatableKeys<Q> as `${KK & string}:${AGG_FOR_TYPE<PropertyValueClientToWire[CompileTimeMetadata<Q>["properties"][KK]["type"]]>}`]?: any;
8
+ [KK in AggregatableKeys<Q> as `${KK & string}:${AGG_FOR_TYPE<GetWirePropertyValueFromClient<CompileTimeMetadata<Q>["properties"][KK]["type"]>>}`]?: any;
9
9
  } & {
10
10
  $count?: any;
11
11
  });
@@ -1 +1 @@
1
- {"version":3,"file":"AggregatableKeys.d.ts","sourceRoot":"","sources":["../../../src/aggregate/AggregatableKeys.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AACpF,OAAO,KAAK,EACV,2BAA2B,EAC3B,YAAY,EACb,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAE/E,MAAM,MAAM,qBAAqB,GAAG,qBAAqB,GAAG,eAAe,CAAC;AAC5E,MAAM,MAAM,sBAAsB,GAC9B,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,qBAAqB,GACrB,eAAe,CAAC;AAEpB,KAAK,YAAY,CAAC,CAAC,IAAI,MAAM,SAAS,CAAC,GAAG,sBAAsB,GAC5D,MAAM,SAAS,CAAC,GAAG,qBAAqB,GACxC,KAAK,CAAC;AAEV,MAAM,MAAM,oBAAoB,CAC9B,CAAC,SAAS,2BAA2B,IACnC,MAAM,CACN;KAEE,EAAE,IAAI,gBAAgB,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,GAAG,MAAM,IAAI,YAAY,CACzD,yBAAyB,CACvB,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CACjD,CACF,EAAE,CACJ,CAAC,EAAE,GAAG;CACR,GACC;IAAE,MAAM,CAAC,EAAE,GAAG,CAAA;CAAE,CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAC1B,CAAC,SAAS,2BAA2B,IACnC,MAAM;KACP,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,GAAG,GAAG;CAC5B,CAAC"}
1
+ {"version":3,"file":"AggregatableKeys.d.ts","sourceRoot":"","sources":["../../../src/aggregate/AggregatableKeys.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACV,8BAA8B,EAC/B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EACV,2BAA2B,EAC3B,YAAY,EACb,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAE/E,MAAM,MAAM,qBAAqB,GAAG,qBAAqB,GAAG,eAAe,CAAC;AAC5E,MAAM,MAAM,sBAAsB,GAC9B,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,qBAAqB,GACrB,eAAe,CAAC;AAEpB,KAAK,YAAY,CAAC,CAAC,IAAI,MAAM,SAAS,CAAC,GAAG,sBAAsB,GAC5D,MAAM,SAAS,CAAC,GAAG,qBAAqB,GACxC,KAAK,CAAC;AAEV,MAAM,MAAM,oBAAoB,CAC9B,CAAC,SAAS,2BAA2B,IACnC,MAAM,CACN;KAEE,EAAE,IAAI,gBAAgB,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,GAAG,MAAM,IAAI,YAAY,CACzD,8BAA8B,CAC5B,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CACjD,CACF,EAAE,CACJ,CAAC,EAAE,GAAG;CACR,GACC;IAAE,MAAM,CAAC,EAAE,GAAG,CAAA;CAAE,CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAC1B,CAAC,SAAS,2BAA2B,IACnC,MAAM;KACP,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,GAAG,GAAG;CAC5B,CAAC"}
@@ -31,7 +31,7 @@ export type { CompileTimeMetadata, ObjectMetadata, ObjectTypeDefinition, Propert
31
31
  export type { OntologyMetadata } from "./ontology/OntologyMetadata.js";
32
32
  export type { PrimaryKeyTypes } from "./ontology/PrimaryKeyTypes.js";
33
33
  export type { ObjectQueryDataType, ObjectSetQueryDataType, QueryDataTypeDefinition, QueryDefinition, QueryMetadata, QueryParameterDefinition, ThreeDimensionalQueryAggregationDefinition, TwoDimensionalQueryAggregationDefinition, } from "./ontology/QueryDefinition.js";
34
- export type { WirePropertyTypes } from "./ontology/WirePropertyTypes.js";
34
+ export type { SimpleWirePropertyTypes, WirePropertyTypes, } from "./ontology/WirePropertyTypes.js";
35
35
  export type { OsdkBase, PrimaryKeyType } from "./OsdkBase.js";
36
36
  export type { OsdkObject } from "./OsdkObject.js";
37
37
  export type { ConvertProps, Osdk } from "./OsdkObjectFrom.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
@@ -24,6 +24,9 @@ export interface PropertyValueWireToClient {
24
24
  sensorTimeseries: TimeSeriesProperty<string | number>;
25
25
  geotimeSeriesReference: GeotimeSeriesProperty<GeoJSON.Point>;
26
26
  }
27
+ export type GetClientPropertyValueFromWire<T extends keyof PropertyValueWireToClient | Record<string, keyof PropertyValueWireToClient>> = T extends keyof PropertyValueWireToClient ? PropertyValueWireToClient[T] : T extends Record<string, keyof PropertyValueWireToClient> ? {
28
+ [K in keyof T]: PropertyValueWireToClient[T[K]];
29
+ } : never;
27
30
  /**
28
31
  * Map from the PropertyDefinition type to the typescript type that we accept
29
32
  */
@@ -48,4 +51,7 @@ export interface PropertyValueClientToWire {
48
51
  sensorTimeseries: TimeSeriesProperty<string | number>;
49
52
  geotimeSeriesReference: GeotimeSeriesProperty<GeoJSON.Point>;
50
53
  }
54
+ export type GetWirePropertyValueFromClient<T extends keyof PropertyValueClientToWire | Record<string, keyof PropertyValueClientToWire>> = T extends keyof PropertyValueClientToWire ? PropertyValueClientToWire[T] : T extends Record<string, keyof PropertyValueClientToWire> ? {
55
+ [K in keyof T]: PropertyValueClientToWire[T[K]];
56
+ } : never;
51
57
  //# sourceMappingURL=PropertyValueMapping.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"PropertyValueMapping.d.ts","sourceRoot":"","sources":["../../../src/mapping/PropertyValueMapping.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,KAAK,EACV,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,6BAA6B,CAAC;AAErC;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAElB,iBAAiB,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC9C,gBAAgB,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC7C,gBAAgB,EAAE,kBAAkB,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IACtD,sBAAsB,EAAE,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;CAC9D;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,UAAU,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAElB,iBAAiB,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC9C,gBAAgB,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC7C,gBAAgB,EAAE,kBAAkB,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IACtD,sBAAsB,EAAE,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;CAC9D"}
1
+ {"version":3,"file":"PropertyValueMapping.d.ts","sourceRoot":"","sources":["../../../src/mapping/PropertyValueMapping.ts"],"names":[],"mappings":"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"}
@@ -19,5 +19,9 @@ describe("Object definitions", () => {
19
19
  expectTypeOf().toEqualTypeOf();
20
20
  expectTypeOf().toEqualTypeOf();
21
21
  });
22
+ it("correctly maps struct types", () => {
23
+ expectTypeOf().toEqualTypeOf();
24
+ expectTypeOf().toEqualTypeOf();
25
+ });
22
26
  });
23
27
  //# sourceMappingURL=ObjectDefinitions.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ObjectDefinitions.test.js","names":["describe","expectTypeOf","it","toEqualTypeOf"],"sources":["ObjectDefinitions.test.js"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { describe, expectTypeOf, it } from \"vitest\";\ndescribe(\"Object definitions\", () => {\n it(\"correctly upgrades attachment types at conversion time\", () => {\n const attachment = {\n type: \"attachment\",\n };\n const attachmentArray = {\n type: \"attachment\",\n multiplicity: true,\n };\n expectTypeOf().toEqualTypeOf();\n expectTypeOf()\n .toEqualTypeOf();\n });\n});\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,QAAQ,EAAEC,YAAY,EAAEC,EAAE,QAAQ,QAAQ;AACnDF,QAAQ,CAAC,oBAAoB,EAAE,MAAM;EACjCE,EAAE,CAAC,wDAAwD,EAAE,MAAM;IAQ/DD,YAAY,CAAC,CAAC,CAACE,aAAa,CAAC,CAAC;IAC9BF,YAAY,CAAC,CAAC,CACTE,aAAa,CAAC,CAAC;EACxB,CAAC,CAAC;AACN,CAAC,CAAC","ignoreList":[]}
1
+ {"version":3,"file":"ObjectDefinitions.test.js","names":["describe","expectTypeOf","it","toEqualTypeOf"],"sources":["ObjectDefinitions.test.js"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { describe, expectTypeOf, it } from \"vitest\";\ndescribe(\"Object definitions\", () => {\n it(\"correctly upgrades attachment types at conversion time\", () => {\n const attachment = {\n type: \"attachment\",\n };\n const attachmentArray = {\n type: \"attachment\",\n multiplicity: true,\n };\n expectTypeOf().toEqualTypeOf();\n expectTypeOf()\n .toEqualTypeOf();\n });\n it(\"correctly maps struct types\", () => {\n const structType = {\n type: {\n integerField: \"integer\",\n floatField: \"float\",\n attachment: \"attachment\",\n },\n };\n const structTypeArray = {\n type: {\n integerField: \"integer\",\n floatField: \"float\",\n attachment: \"attachment\",\n },\n multiplicity: true,\n };\n expectTypeOf().toEqualTypeOf();\n expectTypeOf()\n .toEqualTypeOf();\n });\n});\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,QAAQ,EAAEC,YAAY,EAAEC,EAAE,QAAQ,QAAQ;AACnDF,QAAQ,CAAC,oBAAoB,EAAE,MAAM;EACjCE,EAAE,CAAC,wDAAwD,EAAE,MAAM;IAQ/DD,YAAY,CAAC,CAAC,CAACE,aAAa,CAAC,CAAC;IAC9BF,YAAY,CAAC,CAAC,CACTE,aAAa,CAAC,CAAC;EACxB,CAAC,CAAC;EACFD,EAAE,CAAC,6BAA6B,EAAE,MAAM;IAgBpCD,YAAY,CAAC,CAAC,CAACE,aAAa,CAAC,CAAC;IAC9BF,YAAY,CAAC,CAAC,CACTE,aAAa,CAAC,CAAC;EACxB,CAAC,CAAC;AACN,CAAC,CAAC","ignoreList":[]}
@@ -1,2 +1,3 @@
1
- export type WirePropertyTypes = "string" | "datetime" | "double" | "boolean" | "integer" | "timestamp" | "short" | "long" | "float" | "decimal" | "byte" | "marking" | "numericTimeseries" | "stringTimeseries" | "sensorTimeseries" | "attachment" | "geopoint" | "geoshape" | "geotimeSeriesReference";
1
+ export type WirePropertyTypes = SimpleWirePropertyTypes | Record<string, SimpleWirePropertyTypes>;
2
+ export type SimpleWirePropertyTypes = "string" | "datetime" | "double" | "boolean" | "integer" | "timestamp" | "short" | "long" | "float" | "decimal" | "byte" | "marking" | "numericTimeseries" | "stringTimeseries" | "sensorTimeseries" | "attachment" | "geopoint" | "geoshape" | "geotimeSeriesReference";
2
3
  //# sourceMappingURL=WirePropertyTypes.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"WirePropertyTypes.d.ts","sourceRoot":"","sources":["../../../src/ontology/WirePropertyTypes.ts"],"names":[],"mappings":"AAgBA,MAAM,MAAM,iBAAiB,GACzB,QAAQ,GACR,UAAU,GACV,QAAQ,GACR,SAAS,GACT,SAAS,GACT,WAAW,GACX,OAAO,GACP,MAAM,GACN,OAAO,GACP,SAAS,GACT,MAAM,GACN,SAAS,GACT,mBAAmB,GACnB,kBAAkB,GAClB,kBAAkB,GAClB,YAAY,GACZ,UAAU,GACV,UAAU,GACV,wBAAwB,CAAC"}
1
+ {"version":3,"file":"WirePropertyTypes.d.ts","sourceRoot":"","sources":["../../../src/ontology/WirePropertyTypes.ts"],"names":[],"mappings":"AAgBA,MAAM,MAAM,iBAAiB,GACzB,uBAAuB,GACvB,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;AAE5C,MAAM,MAAM,uBAAuB,GAC/B,QAAQ,GACR,UAAU,GACV,QAAQ,GACR,SAAS,GACT,SAAS,GACT,WAAW,GACX,OAAO,GACP,MAAM,GACN,OAAO,GACP,SAAS,GACT,MAAM,GACN,SAAS,GACT,mBAAmB,GACnB,kBAAkB,GAClB,kBAAkB,GAClB,YAAY,GACZ,UAAU,GACV,UAAU,GACV,wBAAwB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@osdk/api",
3
- "version": "2.1.0-beta.19",
3
+ "version": "2.1.0-beta.20",
4
4
  "description": "",
5
5
  "access": "public",
6
6
  "license": "Apache-2.0",