@osdk/generator 2.1.0-beta.1 → 2.1.0-beta.11
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 +117 -0
- package/build/browser/GenerateContext/GenerateContext.d.ts +1 -0
- package/build/browser/GenerateContext/GenerateContext.d.ts.map +1 -1
- package/build/browser/generateClientSdkPackage.test.js +2 -2
- package/build/browser/generateClientSdkPackage.test.js.map +1 -1
- package/build/browser/util/test/TodoWireOntology.d.ts +5 -0
- package/build/browser/util/test/TodoWireOntology.d.ts.map +1 -1
- package/build/browser/util/test/TodoWireOntology.js +10 -5
- package/build/browser/util/test/TodoWireOntology.js.map +1 -1
- package/build/browser/v2.0/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.js +6 -6
- package/build/browser/v2.0/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.js.map +1 -1
- package/build/browser/v2.0/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.test.js +14 -20
- package/build/browser/v2.0/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.test.js.map +1 -1
- package/build/browser/v2.0/generateClientSdkVersionTwoPointZero.d.ts +1 -1
- package/build/browser/v2.0/generateClientSdkVersionTwoPointZero.d.ts.map +1 -1
- package/build/browser/v2.0/generateClientSdkVersionTwoPointZero.js +3 -2
- package/build/browser/v2.0/generateClientSdkVersionTwoPointZero.js.map +1 -1
- package/build/browser/v2.0/generateClientSdkVersionTwoPointZero.test.js +65 -87
- package/build/browser/v2.0/generateClientSdkVersionTwoPointZero.test.js.map +1 -1
- package/build/browser/v2.0/generatePerActionDataFiles.d.ts +1 -1
- package/build/browser/v2.0/generatePerActionDataFiles.d.ts.map +1 -1
- package/build/browser/v2.0/generatePerActionDataFiles.js +3 -2
- package/build/browser/v2.0/generatePerActionDataFiles.js.map +1 -1
- package/build/browser/v2.0/generatePerInterfaceDataFiles.js +4 -3
- package/build/browser/v2.0/generatePerInterfaceDataFiles.js.map +1 -1
- package/build/browser/v2.0/generatePerObjectDataFiles.d.ts.map +1 -1
- package/build/browser/v2.0/generatePerObjectDataFiles.js +1 -1
- package/build/browser/v2.0/generatePerObjectDataFiles.js.map +1 -1
- package/build/browser/v2.0/generatePerQueryDataFiles.d.ts +1 -1
- package/build/browser/v2.0/generatePerQueryDataFiles.d.ts.map +1 -1
- package/build/browser/v2.0/generatePerQueryDataFiles.js +5 -5
- package/build/browser/v2.0/generatePerQueryDataFiles.js.map +1 -1
- package/build/browser/v2.0/generatePerQueryDataFiles.test.js +7 -8
- package/build/browser/v2.0/generatePerQueryDataFiles.test.js.map +1 -1
- package/build/browser/v2.0/wireObjectTypeV2ToSdkObjectConstV2.d.ts.map +1 -1
- package/build/browser/v2.0/wireObjectTypeV2ToSdkObjectConstV2.js +14 -9
- package/build/browser/v2.0/wireObjectTypeV2ToSdkObjectConstV2.js.map +1 -1
- package/build/browser/validateWireOntologyAssumptions.js +2 -2
- package/build/browser/validateWireOntologyAssumptions.js.map +1 -1
- package/build/esm/GenerateContext/GenerateContext.d.ts +1 -0
- package/build/esm/GenerateContext/GenerateContext.d.ts.map +1 -1
- package/build/esm/generateClientSdkPackage.test.js +2 -2
- package/build/esm/generateClientSdkPackage.test.js.map +1 -1
- package/build/esm/util/test/TodoWireOntology.d.ts +5 -0
- package/build/esm/util/test/TodoWireOntology.d.ts.map +1 -1
- package/build/esm/util/test/TodoWireOntology.js +10 -5
- package/build/esm/util/test/TodoWireOntology.js.map +1 -1
- package/build/esm/v2.0/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.js +6 -6
- package/build/esm/v2.0/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.js.map +1 -1
- package/build/esm/v2.0/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.test.js +14 -20
- package/build/esm/v2.0/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.test.js.map +1 -1
- package/build/esm/v2.0/generateClientSdkVersionTwoPointZero.d.ts +1 -1
- package/build/esm/v2.0/generateClientSdkVersionTwoPointZero.d.ts.map +1 -1
- package/build/esm/v2.0/generateClientSdkVersionTwoPointZero.js +3 -2
- package/build/esm/v2.0/generateClientSdkVersionTwoPointZero.js.map +1 -1
- package/build/esm/v2.0/generateClientSdkVersionTwoPointZero.test.js +65 -87
- package/build/esm/v2.0/generateClientSdkVersionTwoPointZero.test.js.map +1 -1
- package/build/esm/v2.0/generatePerActionDataFiles.d.ts +1 -1
- package/build/esm/v2.0/generatePerActionDataFiles.d.ts.map +1 -1
- package/build/esm/v2.0/generatePerActionDataFiles.js +3 -2
- package/build/esm/v2.0/generatePerActionDataFiles.js.map +1 -1
- package/build/esm/v2.0/generatePerInterfaceDataFiles.js +4 -3
- package/build/esm/v2.0/generatePerInterfaceDataFiles.js.map +1 -1
- package/build/esm/v2.0/generatePerObjectDataFiles.d.ts.map +1 -1
- package/build/esm/v2.0/generatePerObjectDataFiles.js +1 -1
- package/build/esm/v2.0/generatePerObjectDataFiles.js.map +1 -1
- package/build/esm/v2.0/generatePerQueryDataFiles.d.ts +1 -1
- package/build/esm/v2.0/generatePerQueryDataFiles.d.ts.map +1 -1
- package/build/esm/v2.0/generatePerQueryDataFiles.js +5 -5
- package/build/esm/v2.0/generatePerQueryDataFiles.js.map +1 -1
- package/build/esm/v2.0/generatePerQueryDataFiles.test.js +7 -8
- package/build/esm/v2.0/generatePerQueryDataFiles.test.js.map +1 -1
- package/build/esm/v2.0/wireObjectTypeV2ToSdkObjectConstV2.d.ts.map +1 -1
- package/build/esm/v2.0/wireObjectTypeV2ToSdkObjectConstV2.js +14 -9
- package/build/esm/v2.0/wireObjectTypeV2ToSdkObjectConstV2.js.map +1 -1
- package/build/esm/validateWireOntologyAssumptions.js +2 -2
- package/build/esm/validateWireOntologyAssumptions.js.map +1 -1
- package/package.json +9 -7
|
@@ -153,12 +153,14 @@ const referencedOntology = {
|
|
|
153
153
|
"taskId": {
|
|
154
154
|
"dataType": {
|
|
155
155
|
"type": "string"
|
|
156
|
-
}
|
|
156
|
+
},
|
|
157
|
+
"rid": "ridForTaskId"
|
|
157
158
|
},
|
|
158
159
|
"body": {
|
|
159
160
|
"dataType": {
|
|
160
161
|
"type": "string"
|
|
161
|
-
}
|
|
162
|
+
},
|
|
163
|
+
"rid": "ridForBody"
|
|
162
164
|
}
|
|
163
165
|
},
|
|
164
166
|
"status": "ACTIVE",
|
|
@@ -184,6 +186,7 @@ const referencedOntology = {
|
|
|
184
186
|
rid: "idk"
|
|
185
187
|
}
|
|
186
188
|
},
|
|
189
|
+
implementedByObjectTypes: [],
|
|
187
190
|
links: {}
|
|
188
191
|
}
|
|
189
192
|
},
|
|
@@ -256,12 +259,14 @@ const referencingOntology = {
|
|
|
256
259
|
"id": {
|
|
257
260
|
dataType: {
|
|
258
261
|
type: "integer"
|
|
259
|
-
}
|
|
262
|
+
},
|
|
263
|
+
rid: "rid"
|
|
260
264
|
},
|
|
261
265
|
"body": {
|
|
262
266
|
dataType: {
|
|
263
267
|
type: "string"
|
|
264
|
-
}
|
|
268
|
+
},
|
|
269
|
+
"rid": "rid"
|
|
265
270
|
}
|
|
266
271
|
},
|
|
267
272
|
rid: "ridForThing",
|
|
@@ -288,12 +293,14 @@ const referencingOntology = {
|
|
|
288
293
|
"id": {
|
|
289
294
|
dataType: {
|
|
290
295
|
type: "integer"
|
|
291
|
-
}
|
|
296
|
+
},
|
|
297
|
+
rid: "rid"
|
|
292
298
|
},
|
|
293
299
|
"body": {
|
|
294
300
|
dataType: {
|
|
295
301
|
type: "string"
|
|
296
|
-
}
|
|
302
|
+
},
|
|
303
|
+
rid: "rid"
|
|
297
304
|
}
|
|
298
305
|
},
|
|
299
306
|
rid: "theRid",
|
|
@@ -396,7 +403,7 @@ describe("generator", () => {
|
|
|
396
403
|
ActionReturnTypeForOptions,
|
|
397
404
|
ApplyActionOptions,
|
|
398
405
|
ApplyBatchActionOptions,
|
|
399
|
-
} from '@osdk/
|
|
406
|
+
} from '@osdk/client';
|
|
400
407
|
import { $osdkMetadata } from '../../OntologyMetadata';
|
|
401
408
|
import type { Todo } from '../objects/Todo';
|
|
402
409
|
|
|
@@ -472,7 +479,7 @@ describe("generator", () => {
|
|
|
472
479
|
ActionReturnTypeForOptions,
|
|
473
480
|
ApplyActionOptions,
|
|
474
481
|
ApplyBatchActionOptions,
|
|
475
|
-
} from '@osdk/
|
|
482
|
+
} from '@osdk/client';
|
|
476
483
|
import { $osdkMetadata } from '../../OntologyMetadata';
|
|
477
484
|
import type { Todo } from '../objects/Todo';
|
|
478
485
|
|
|
@@ -548,7 +555,7 @@ describe("generator", () => {
|
|
|
548
555
|
",
|
|
549
556
|
"/foo/ontology/interfaces.ts": "export { SomeInterface } from './interfaces/SomeInterface';
|
|
550
557
|
",
|
|
551
|
-
"/foo/ontology/interfaces/SomeInterface.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/
|
|
558
|
+
"/foo/ontology/interfaces/SomeInterface.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/client';
|
|
552
559
|
import { $osdkMetadata } from '../../OntologyMetadata';
|
|
553
560
|
|
|
554
561
|
import type {
|
|
@@ -556,7 +563,7 @@ describe("generator", () => {
|
|
|
556
563
|
ObjectSet as $ObjectSet,
|
|
557
564
|
Osdk as $Osdk,
|
|
558
565
|
PropertyValueWireToClient as $PropType,
|
|
559
|
-
} from '@osdk/
|
|
566
|
+
} from '@osdk/client';
|
|
560
567
|
|
|
561
568
|
export type OsdkObjectLinks$SomeInterface = {};
|
|
562
569
|
|
|
@@ -566,20 +573,18 @@ describe("generator", () => {
|
|
|
566
573
|
export interface Props {
|
|
567
574
|
readonly SomeProperty: $PropType['string'] | undefined;
|
|
568
575
|
}
|
|
569
|
-
export
|
|
570
|
-
readonly SomeProperty: $PropType['string'] | undefined;
|
|
571
|
-
}
|
|
576
|
+
export type StrictProps = Props;
|
|
572
577
|
|
|
573
578
|
export interface ObjectSet extends $ObjectSet<SomeInterface, SomeInterface.ObjectSet> {}
|
|
574
579
|
|
|
575
580
|
export type OsdkInstance<
|
|
576
|
-
OPTIONS extends never | '$
|
|
581
|
+
OPTIONS extends never | '$rid' = never,
|
|
577
582
|
K extends keyof SomeInterface.Props = keyof SomeInterface.Props,
|
|
578
583
|
> = $Osdk.Instance<SomeInterface, OPTIONS, K>;
|
|
579
584
|
|
|
580
585
|
/** @deprecated use OsdkInstance */
|
|
581
586
|
export type OsdkObject<
|
|
582
|
-
OPTIONS extends never | '$
|
|
587
|
+
OPTIONS extends never | '$rid' = never,
|
|
583
588
|
K extends keyof SomeInterface.Props = keyof SomeInterface.Props,
|
|
584
589
|
> = OsdkInstance<OPTIONS, K>;
|
|
585
590
|
}
|
|
@@ -619,7 +624,7 @@ describe("generator", () => {
|
|
|
619
624
|
"/foo/ontology/objects.ts": "export { Person } from './objects/Person';
|
|
620
625
|
export { Todo } from './objects/Todo';
|
|
621
626
|
",
|
|
622
|
-
"/foo/ontology/objects/Person.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/
|
|
627
|
+
"/foo/ontology/objects/Person.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/client';
|
|
623
628
|
import { $osdkMetadata } from '../../OntologyMetadata';
|
|
624
629
|
import type { $ExpectedClientVersion } from '../../OntologyMetadata';
|
|
625
630
|
import type { Todo } from './Todo';
|
|
@@ -627,14 +632,14 @@ describe("generator", () => {
|
|
|
627
632
|
PropertyKeys as $PropertyKeys,
|
|
628
633
|
ObjectTypeDefinition as $ObjectTypeDefinition,
|
|
629
634
|
ObjectMetadata as $ObjectMetadata,
|
|
630
|
-
} from '@osdk/
|
|
635
|
+
} from '@osdk/client';
|
|
631
636
|
import type {
|
|
632
637
|
ObjectSet as $ObjectSet,
|
|
633
638
|
Osdk as $Osdk,
|
|
634
639
|
OsdkObject as $OsdkObject,
|
|
635
640
|
PropertyValueWireToClient as $PropType,
|
|
636
641
|
SingleLinkAccessor as $SingleLinkAccessor,
|
|
637
|
-
} from '@osdk/
|
|
642
|
+
} from '@osdk/client';
|
|
638
643
|
|
|
639
644
|
export namespace Person {
|
|
640
645
|
export type PropertyKeys = 'email';
|
|
@@ -644,22 +649,20 @@ describe("generator", () => {
|
|
|
644
649
|
}
|
|
645
650
|
|
|
646
651
|
export interface Props {
|
|
647
|
-
readonly email: $PropType['string'] | undefined;
|
|
648
|
-
}
|
|
649
|
-
export interface StrictProps {
|
|
650
652
|
readonly email: $PropType['string'];
|
|
651
653
|
}
|
|
654
|
+
export type StrictProps = Props;
|
|
652
655
|
|
|
653
656
|
export interface ObjectSet extends $ObjectSet<Person, Person.ObjectSet> {}
|
|
654
657
|
|
|
655
658
|
export type OsdkInstance<
|
|
656
|
-
OPTIONS extends never | '$
|
|
659
|
+
OPTIONS extends never | '$rid' = never,
|
|
657
660
|
K extends keyof Person.Props = keyof Person.Props,
|
|
658
661
|
> = $Osdk.Instance<Person, OPTIONS, K>;
|
|
659
662
|
|
|
660
663
|
/** @deprecated use OsdkInstance */
|
|
661
664
|
export type OsdkObject<
|
|
662
|
-
OPTIONS extends never | '$
|
|
665
|
+
OPTIONS extends never | '$rid' = never,
|
|
663
666
|
K extends keyof Person.Props = keyof Person.Props,
|
|
664
667
|
> = OsdkInstance<OPTIONS, K>;
|
|
665
668
|
}
|
|
@@ -709,7 +712,7 @@ describe("generator", () => {
|
|
|
709
712
|
osdkMetadata: $osdkMetadata,
|
|
710
713
|
};
|
|
711
714
|
",
|
|
712
|
-
"/foo/ontology/objects/Todo.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/
|
|
715
|
+
"/foo/ontology/objects/Todo.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/client';
|
|
713
716
|
import { $osdkMetadata } from '../../OntologyMetadata';
|
|
714
717
|
import type { $ExpectedClientVersion } from '../../OntologyMetadata';
|
|
715
718
|
import type { Person } from './Person';
|
|
@@ -717,14 +720,14 @@ describe("generator", () => {
|
|
|
717
720
|
PropertyKeys as $PropertyKeys,
|
|
718
721
|
ObjectTypeDefinition as $ObjectTypeDefinition,
|
|
719
722
|
ObjectMetadata as $ObjectMetadata,
|
|
720
|
-
} from '@osdk/
|
|
723
|
+
} from '@osdk/client';
|
|
721
724
|
import type {
|
|
722
725
|
ObjectSet as $ObjectSet,
|
|
723
726
|
Osdk as $Osdk,
|
|
724
727
|
OsdkObject as $OsdkObject,
|
|
725
728
|
PropertyValueWireToClient as $PropType,
|
|
726
729
|
SingleLinkAccessor as $SingleLinkAccessor,
|
|
727
|
-
} from '@osdk/
|
|
730
|
+
} from '@osdk/client';
|
|
728
731
|
|
|
729
732
|
export namespace Todo {
|
|
730
733
|
export type PropertyKeys = 'id' | 'body' | 'complete';
|
|
@@ -734,26 +737,22 @@ describe("generator", () => {
|
|
|
734
737
|
}
|
|
735
738
|
|
|
736
739
|
export interface Props {
|
|
737
|
-
readonly body: $PropType['string'] | undefined;
|
|
738
|
-
readonly complete: $PropType['boolean'] | undefined;
|
|
739
|
-
readonly id: $PropType['integer'] | undefined;
|
|
740
|
-
}
|
|
741
|
-
export interface StrictProps {
|
|
742
740
|
readonly body: $PropType['string'] | undefined;
|
|
743
741
|
readonly complete: $PropType['boolean'] | undefined;
|
|
744
742
|
readonly id: $PropType['integer'];
|
|
745
743
|
}
|
|
744
|
+
export type StrictProps = Props;
|
|
746
745
|
|
|
747
746
|
export interface ObjectSet extends $ObjectSet<Todo, Todo.ObjectSet> {}
|
|
748
747
|
|
|
749
748
|
export type OsdkInstance<
|
|
750
|
-
OPTIONS extends never | '$
|
|
749
|
+
OPTIONS extends never | '$rid' = never,
|
|
751
750
|
K extends keyof Todo.Props = keyof Todo.Props,
|
|
752
751
|
> = $Osdk.Instance<Todo, OPTIONS, K>;
|
|
753
752
|
|
|
754
753
|
/** @deprecated use OsdkInstance */
|
|
755
754
|
export type OsdkObject<
|
|
756
|
-
OPTIONS extends never | '$
|
|
755
|
+
OPTIONS extends never | '$rid' = never,
|
|
757
756
|
K extends keyof Todo.Props = keyof Todo.Props,
|
|
758
757
|
> = OsdkInstance<OPTIONS, K>;
|
|
759
758
|
}
|
|
@@ -823,8 +822,7 @@ describe("generator", () => {
|
|
|
823
822
|
"/foo/ontology/queries.ts": "export { getCount } from './queries/getCount';
|
|
824
823
|
export { returnsTodo } from './queries/returnsTodo';
|
|
825
824
|
",
|
|
826
|
-
"/foo/ontology/queries/getCount.ts": "import type { QueryDefinition, VersionBound } from '@osdk/
|
|
827
|
-
import type { QueryParam, QueryResult } from '@osdk/api';
|
|
825
|
+
"/foo/ontology/queries/getCount.ts": "import type { QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/client';
|
|
828
826
|
import type { $ExpectedClientVersion } from '../../OntologyMetadata';
|
|
829
827
|
import { $osdkMetadata } from '../../OntologyMetadata';
|
|
830
828
|
|
|
@@ -877,8 +875,7 @@ describe("generator", () => {
|
|
|
877
875
|
osdkMetadata: $osdkMetadata,
|
|
878
876
|
};
|
|
879
877
|
",
|
|
880
|
-
"/foo/ontology/queries/returnsTodo.ts": "import type { QueryDefinition, VersionBound } from '@osdk/
|
|
881
|
-
import type { QueryParam, QueryResult } from '@osdk/api';
|
|
878
|
+
"/foo/ontology/queries/returnsTodo.ts": "import type { QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/client';
|
|
882
879
|
import type { $ExpectedClientVersion } from '../../OntologyMetadata';
|
|
883
880
|
import { $osdkMetadata } from '../../OntologyMetadata';
|
|
884
881
|
import type { Todo } from '../objects/Todo';
|
|
@@ -949,14 +946,14 @@ describe("generator", () => {
|
|
|
949
946
|
it("throws an error if a namespace is provided that all top levels do not use", async () => {
|
|
950
947
|
await expect(generateClientSdkVersionTwoPointZero({
|
|
951
948
|
...TodoWireOntology
|
|
952
|
-
}, "", helper.minimalFiles, BASE_PATH, "module"));
|
|
949
|
+
}, "", helper.minimalFiles, BASE_PATH, "module", undefined, undefined, undefined, true));
|
|
953
950
|
// Disabled for now since we can't really enforce it from dev console at the moment
|
|
954
951
|
// .rejects.toThrowErrorMatchingInlineSnapshot(
|
|
955
952
|
// `[Error: Found type { ns:'undefined', shortName: 'Todo'} but it is not in the generation namespace 'foo.bar'. This violates the contract of the generator.]`,
|
|
956
953
|
// );
|
|
957
954
|
});
|
|
958
955
|
it("does not throw an error if a namespace is provided that all top levels use", async () => {
|
|
959
|
-
await expect(generateClientSdkVersionTwoPointZero(fooBarTodoWireOntology, "", helper.minimalFiles, BASE_PATH, "module")).resolves.toMatchInlineSnapshot(`undefined`);
|
|
956
|
+
await expect(generateClientSdkVersionTwoPointZero(fooBarTodoWireOntology, "", helper.minimalFiles, BASE_PATH, "module", undefined, undefined, undefined, true)).resolves.toMatchInlineSnapshot(`undefined`);
|
|
960
957
|
expect(helper.getFiles()["/foo/ontology/objects/foo.bar.Todo.ts"]).toBeUndefined();
|
|
961
958
|
expect(helper.getFiles()["/foo/ontology/objects/Todo.ts"]).not.toBeUndefined();
|
|
962
959
|
expect(tweakedFilesForSnapshotConsistency(helper.getFiles())).toMatchInlineSnapshot(`
|
|
@@ -1156,20 +1153,18 @@ describe("generator", () => {
|
|
|
1156
1153
|
export interface Props {
|
|
1157
1154
|
readonly SomeProperty: $PropType['string'] | undefined;
|
|
1158
1155
|
}
|
|
1159
|
-
export
|
|
1160
|
-
readonly SomeProperty: $PropType['string'] | undefined;
|
|
1161
|
-
}
|
|
1156
|
+
export type StrictProps = Props;
|
|
1162
1157
|
|
|
1163
1158
|
export interface ObjectSet extends $ObjectSet<SomeInterface, SomeInterface.ObjectSet> {}
|
|
1164
1159
|
|
|
1165
1160
|
export type OsdkInstance<
|
|
1166
|
-
OPTIONS extends never | '$
|
|
1161
|
+
OPTIONS extends never | '$rid' = never,
|
|
1167
1162
|
K extends keyof SomeInterface.Props = keyof SomeInterface.Props,
|
|
1168
1163
|
> = $Osdk.Instance<SomeInterface, OPTIONS, K>;
|
|
1169
1164
|
|
|
1170
1165
|
/** @deprecated use OsdkInstance */
|
|
1171
1166
|
export type OsdkObject<
|
|
1172
|
-
OPTIONS extends never | '$
|
|
1167
|
+
OPTIONS extends never | '$rid' = never,
|
|
1173
1168
|
K extends keyof SomeInterface.Props = keyof SomeInterface.Props,
|
|
1174
1169
|
> = OsdkInstance<OPTIONS, K>;
|
|
1175
1170
|
}
|
|
@@ -1234,22 +1229,20 @@ describe("generator", () => {
|
|
|
1234
1229
|
}
|
|
1235
1230
|
|
|
1236
1231
|
export interface Props {
|
|
1237
|
-
readonly email: $PropType['string'] | undefined;
|
|
1238
|
-
}
|
|
1239
|
-
export interface StrictProps {
|
|
1240
1232
|
readonly email: $PropType['string'];
|
|
1241
1233
|
}
|
|
1234
|
+
export type StrictProps = Props;
|
|
1242
1235
|
|
|
1243
1236
|
export interface ObjectSet extends $ObjectSet<Person, Person.ObjectSet> {}
|
|
1244
1237
|
|
|
1245
1238
|
export type OsdkInstance<
|
|
1246
|
-
OPTIONS extends never | '$
|
|
1239
|
+
OPTIONS extends never | '$rid' = never,
|
|
1247
1240
|
K extends keyof Person.Props = keyof Person.Props,
|
|
1248
1241
|
> = $Osdk.Instance<Person, OPTIONS, K>;
|
|
1249
1242
|
|
|
1250
1243
|
/** @deprecated use OsdkInstance */
|
|
1251
1244
|
export type OsdkObject<
|
|
1252
|
-
OPTIONS extends never | '$
|
|
1245
|
+
OPTIONS extends never | '$rid' = never,
|
|
1253
1246
|
K extends keyof Person.Props = keyof Person.Props,
|
|
1254
1247
|
> = OsdkInstance<OPTIONS, K>;
|
|
1255
1248
|
}
|
|
@@ -1324,26 +1317,22 @@ describe("generator", () => {
|
|
|
1324
1317
|
}
|
|
1325
1318
|
|
|
1326
1319
|
export interface Props {
|
|
1327
|
-
readonly body: $PropType['string'] | undefined;
|
|
1328
|
-
readonly complete: $PropType['boolean'] | undefined;
|
|
1329
|
-
readonly id: $PropType['integer'] | undefined;
|
|
1330
|
-
}
|
|
1331
|
-
export interface StrictProps {
|
|
1332
1320
|
readonly body: $PropType['string'] | undefined;
|
|
1333
1321
|
readonly complete: $PropType['boolean'] | undefined;
|
|
1334
1322
|
readonly id: $PropType['integer'];
|
|
1335
1323
|
}
|
|
1324
|
+
export type StrictProps = Props;
|
|
1336
1325
|
|
|
1337
1326
|
export interface ObjectSet extends $ObjectSet<Todo, Todo.ObjectSet> {}
|
|
1338
1327
|
|
|
1339
1328
|
export type OsdkInstance<
|
|
1340
|
-
OPTIONS extends never | '$
|
|
1329
|
+
OPTIONS extends never | '$rid' = never,
|
|
1341
1330
|
K extends keyof Todo.Props = keyof Todo.Props,
|
|
1342
1331
|
> = $Osdk.Instance<Todo, OPTIONS, K>;
|
|
1343
1332
|
|
|
1344
1333
|
/** @deprecated use OsdkInstance */
|
|
1345
1334
|
export type OsdkObject<
|
|
1346
|
-
OPTIONS extends never | '$
|
|
1335
|
+
OPTIONS extends never | '$rid' = never,
|
|
1347
1336
|
K extends keyof Todo.Props = keyof Todo.Props,
|
|
1348
1337
|
> = OsdkInstance<OPTIONS, K>;
|
|
1349
1338
|
}
|
|
@@ -1413,8 +1402,7 @@ describe("generator", () => {
|
|
|
1413
1402
|
"/foo/ontology/queries.ts": "export { getCount } from './queries/getCount.js';
|
|
1414
1403
|
export { returnsTodo } from './queries/returnsTodo.js';
|
|
1415
1404
|
",
|
|
1416
|
-
"/foo/ontology/queries/getCount.ts": "import type { QueryDefinition, VersionBound } from '@osdk/api';
|
|
1417
|
-
import type { QueryParam, QueryResult } from '@osdk/api';
|
|
1405
|
+
"/foo/ontology/queries/getCount.ts": "import type { QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/api';
|
|
1418
1406
|
import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';
|
|
1419
1407
|
import { $osdkMetadata } from '../../OntologyMetadata.js';
|
|
1420
1408
|
|
|
@@ -1467,8 +1455,7 @@ describe("generator", () => {
|
|
|
1467
1455
|
osdkMetadata: $osdkMetadata,
|
|
1468
1456
|
};
|
|
1469
1457
|
",
|
|
1470
|
-
"/foo/ontology/queries/returnsTodo.ts": "import type { QueryDefinition, VersionBound } from '@osdk/api';
|
|
1471
|
-
import type { QueryParam, QueryResult } from '@osdk/api';
|
|
1458
|
+
"/foo/ontology/queries/returnsTodo.ts": "import type { QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/api';
|
|
1472
1459
|
import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';
|
|
1473
1460
|
import { $osdkMetadata } from '../../OntologyMetadata.js';
|
|
1474
1461
|
import type { Todo } from '../objects/Todo.js';
|
|
@@ -1576,10 +1563,9 @@ describe("generator", () => {
|
|
|
1576
1563
|
});
|
|
1577
1564
|
describe("query depends on foreign object", () => {
|
|
1578
1565
|
it("generates the correct code", async () => {
|
|
1579
|
-
await expect(generateClientSdkVersionTwoPointZero(referencingOntology, "", helper.minimalFiles, BASE_PATH, "module", new Map([["com.example.dep.Task", "@com.example.dep/osdk"]]), new Map([["com.example.dep.SomeInterface", "@com.example.dep/osdk"]]), new Map([["com.example.dep.spt", "@com.example.dep/osdk"]]))).resolves.toMatchInlineSnapshot(`undefined`);
|
|
1566
|
+
await expect(generateClientSdkVersionTwoPointZero(referencingOntology, "", helper.minimalFiles, BASE_PATH, "module", new Map([["com.example.dep.Task", "@com.example.dep/osdk"]]), new Map([["com.example.dep.SomeInterface", "@com.example.dep/osdk"]]), new Map([["com.example.dep.spt", "@com.example.dep/osdk"]]), true)).resolves.toMatchInlineSnapshot(`undefined`);
|
|
1580
1567
|
expect(helper.getFiles()["/foo/ontology/queries/getTask.ts"]).toMatchInlineSnapshot(`
|
|
1581
|
-
"import type { QueryDefinition, VersionBound } from '@osdk/api';
|
|
1582
|
-
import type { QueryParam, QueryResult } from '@osdk/api';
|
|
1568
|
+
"import type { QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/api';
|
|
1583
1569
|
import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';
|
|
1584
1570
|
import { $osdkMetadata } from '../../OntologyMetadata.js';
|
|
1585
1571
|
import type { Task as $Imported$com$example$dep$Task } from '@com.example.dep/osdk';
|
|
@@ -1642,7 +1628,7 @@ describe("generator", () => {
|
|
|
1642
1628
|
});
|
|
1643
1629
|
describe("object uses on foreign spt", () => {
|
|
1644
1630
|
it("stuff", async () => {
|
|
1645
|
-
await expect(generateClientSdkVersionTwoPointZero(referencingOntology, "", helper.minimalFiles, BASE_PATH, "module", new Map([["com.example.dep.Task", "@com.example.dep/osdk"]]), new Map([["com.example.dep.SomeInterface", "@com.example.dep/osdk"]]), new Map([["com.example.dep.spt", "@com.example.dep/osdk"]]))).resolves.toMatchInlineSnapshot(`undefined`);
|
|
1631
|
+
await expect(generateClientSdkVersionTwoPointZero(referencingOntology, "", helper.minimalFiles, BASE_PATH, "module", new Map([["com.example.dep.Task", "@com.example.dep/osdk"]]), new Map([["com.example.dep.SomeInterface", "@com.example.dep/osdk"]]), new Map([["com.example.dep.spt", "@com.example.dep/osdk"]]), true)).resolves.toMatchInlineSnapshot(`undefined`);
|
|
1646
1632
|
expect(helper.getFiles()["/foo/ontology/objects/UsesForeignSpt.ts"]).toMatchInlineSnapshot(`
|
|
1647
1633
|
"import type { PropertyDef as $PropertyDef } from '@osdk/api';
|
|
1648
1634
|
import { $osdkMetadata } from '../../OntologyMetadata.js';
|
|
@@ -1666,24 +1652,21 @@ describe("generator", () => {
|
|
|
1666
1652
|
export type Links = {};
|
|
1667
1653
|
|
|
1668
1654
|
export interface Props {
|
|
1669
|
-
readonly body: $PropType['string'] | undefined;
|
|
1670
|
-
readonly id: $PropType['integer'] | undefined;
|
|
1671
|
-
}
|
|
1672
|
-
export interface StrictProps {
|
|
1673
1655
|
readonly body: $PropType['string'] | undefined;
|
|
1674
1656
|
readonly id: $PropType['integer'];
|
|
1675
1657
|
}
|
|
1658
|
+
export type StrictProps = Props;
|
|
1676
1659
|
|
|
1677
1660
|
export interface ObjectSet extends $ObjectSet<UsesForeignSpt, UsesForeignSpt.ObjectSet> {}
|
|
1678
1661
|
|
|
1679
1662
|
export type OsdkInstance<
|
|
1680
|
-
OPTIONS extends never | '$
|
|
1663
|
+
OPTIONS extends never | '$rid' = never,
|
|
1681
1664
|
K extends keyof UsesForeignSpt.Props = keyof UsesForeignSpt.Props,
|
|
1682
1665
|
> = $Osdk.Instance<UsesForeignSpt, OPTIONS, K>;
|
|
1683
1666
|
|
|
1684
1667
|
/** @deprecated use OsdkInstance */
|
|
1685
1668
|
export type OsdkObject<
|
|
1686
|
-
OPTIONS extends never | '$
|
|
1669
|
+
OPTIONS extends never | '$rid' = never,
|
|
1687
1670
|
K extends keyof UsesForeignSpt.Props = keyof UsesForeignSpt.Props,
|
|
1688
1671
|
> = OsdkInstance<OPTIONS, K>;
|
|
1689
1672
|
}
|
|
@@ -1739,7 +1722,7 @@ describe("generator", () => {
|
|
|
1739
1722
|
});
|
|
1740
1723
|
describe("action depends on foreign object", () => {
|
|
1741
1724
|
it("can generate the action", async () => {
|
|
1742
|
-
await expect(generateClientSdkVersionTwoPointZero(referencingOntology, "", helper.minimalFiles, BASE_PATH, "module", new Map([["com.example.dep.Task", "@com.example.dep/osdk"]]), new Map([["com.example.dep.SomeInterface", "@com.example.dep/osdk"]]), new Map([["com.example.dep.spt", "@com.example.dep/osdk"]]))).resolves.toMatchInlineSnapshot(`undefined`);
|
|
1725
|
+
await expect(generateClientSdkVersionTwoPointZero(referencingOntology, "", helper.minimalFiles, BASE_PATH, "module", new Map([["com.example.dep.Task", "@com.example.dep/osdk"]]), new Map([["com.example.dep.SomeInterface", "@com.example.dep/osdk"]]), new Map([["com.example.dep.spt", "@com.example.dep/osdk"]]), true)).resolves.toMatchInlineSnapshot(`undefined`);
|
|
1743
1726
|
expect(helper.getFiles()["/foo/ontology/actions/setTaskBody.ts"]).toMatchInlineSnapshot(`
|
|
1744
1727
|
"import type {
|
|
1745
1728
|
ActionDefinition,
|
|
@@ -1844,7 +1827,7 @@ describe("generator", () => {
|
|
|
1844
1827
|
",
|
|
1845
1828
|
"/foo/ontology/interfaces.ts": "export { SomeInterface } from './interfaces/SomeInterface.js';
|
|
1846
1829
|
",
|
|
1847
|
-
"/foo/ontology/interfaces/SomeInterface.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/
|
|
1830
|
+
"/foo/ontology/interfaces/SomeInterface.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/client';
|
|
1848
1831
|
import { $osdkMetadata } from '../../OntologyMetadata.js';
|
|
1849
1832
|
|
|
1850
1833
|
import type {
|
|
@@ -1852,7 +1835,7 @@ describe("generator", () => {
|
|
|
1852
1835
|
ObjectSet as $ObjectSet,
|
|
1853
1836
|
Osdk as $Osdk,
|
|
1854
1837
|
PropertyValueWireToClient as $PropType,
|
|
1855
|
-
} from '@osdk/
|
|
1838
|
+
} from '@osdk/client';
|
|
1856
1839
|
|
|
1857
1840
|
export type OsdkObjectLinks$SomeInterface = {};
|
|
1858
1841
|
|
|
@@ -1862,20 +1845,18 @@ describe("generator", () => {
|
|
|
1862
1845
|
export interface Props {
|
|
1863
1846
|
readonly spt: $PropType['string'] | undefined;
|
|
1864
1847
|
}
|
|
1865
|
-
export
|
|
1866
|
-
readonly spt: $PropType['string'] | undefined;
|
|
1867
|
-
}
|
|
1848
|
+
export type StrictProps = Props;
|
|
1868
1849
|
|
|
1869
1850
|
export interface ObjectSet extends $ObjectSet<SomeInterface, SomeInterface.ObjectSet> {}
|
|
1870
1851
|
|
|
1871
1852
|
export type OsdkInstance<
|
|
1872
|
-
OPTIONS extends never | '$
|
|
1853
|
+
OPTIONS extends never | '$rid' = never,
|
|
1873
1854
|
K extends keyof SomeInterface.Props = keyof SomeInterface.Props,
|
|
1874
1855
|
> = $Osdk.Instance<SomeInterface, OPTIONS, K>;
|
|
1875
1856
|
|
|
1876
1857
|
/** @deprecated use OsdkInstance */
|
|
1877
1858
|
export type OsdkObject<
|
|
1878
|
-
OPTIONS extends never | '$
|
|
1859
|
+
OPTIONS extends never | '$rid' = never,
|
|
1879
1860
|
K extends keyof SomeInterface.Props = keyof SomeInterface.Props,
|
|
1880
1861
|
> = OsdkInstance<OPTIONS, K>;
|
|
1881
1862
|
}
|
|
@@ -1912,21 +1893,21 @@ describe("generator", () => {
|
|
|
1912
1893
|
",
|
|
1913
1894
|
"/foo/ontology/objects.ts": "export { Task } from './objects/Task.js';
|
|
1914
1895
|
",
|
|
1915
|
-
"/foo/ontology/objects/Task.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/
|
|
1896
|
+
"/foo/ontology/objects/Task.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/client';
|
|
1916
1897
|
import { $osdkMetadata } from '../../OntologyMetadata.js';
|
|
1917
1898
|
import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';
|
|
1918
1899
|
import type {
|
|
1919
1900
|
PropertyKeys as $PropertyKeys,
|
|
1920
1901
|
ObjectTypeDefinition as $ObjectTypeDefinition,
|
|
1921
1902
|
ObjectMetadata as $ObjectMetadata,
|
|
1922
|
-
} from '@osdk/
|
|
1903
|
+
} from '@osdk/client';
|
|
1923
1904
|
import type {
|
|
1924
1905
|
ObjectSet as $ObjectSet,
|
|
1925
1906
|
Osdk as $Osdk,
|
|
1926
1907
|
OsdkObject as $OsdkObject,
|
|
1927
1908
|
PropertyValueWireToClient as $PropType,
|
|
1928
1909
|
SingleLinkAccessor as $SingleLinkAccessor,
|
|
1929
|
-
} from '@osdk/
|
|
1910
|
+
} from '@osdk/client';
|
|
1930
1911
|
|
|
1931
1912
|
export namespace Task {
|
|
1932
1913
|
export type PropertyKeys = 'taskId' | 'body';
|
|
@@ -1934,24 +1915,21 @@ describe("generator", () => {
|
|
|
1934
1915
|
export type Links = {};
|
|
1935
1916
|
|
|
1936
1917
|
export interface Props {
|
|
1937
|
-
readonly body: $PropType['string'] | undefined;
|
|
1938
|
-
readonly taskId: $PropType['string'] | undefined;
|
|
1939
|
-
}
|
|
1940
|
-
export interface StrictProps {
|
|
1941
1918
|
readonly body: $PropType['string'] | undefined;
|
|
1942
1919
|
readonly taskId: $PropType['string'];
|
|
1943
1920
|
}
|
|
1921
|
+
export type StrictProps = Props;
|
|
1944
1922
|
|
|
1945
1923
|
export interface ObjectSet extends $ObjectSet<Task, Task.ObjectSet> {}
|
|
1946
1924
|
|
|
1947
1925
|
export type OsdkInstance<
|
|
1948
|
-
OPTIONS extends never | '$
|
|
1926
|
+
OPTIONS extends never | '$rid' = never,
|
|
1949
1927
|
K extends keyof Task.Props = keyof Task.Props,
|
|
1950
1928
|
> = $Osdk.Instance<Task, OPTIONS, K>;
|
|
1951
1929
|
|
|
1952
1930
|
/** @deprecated use OsdkInstance */
|
|
1953
1931
|
export type OsdkObject<
|
|
1954
|
-
OPTIONS extends never | '$
|
|
1932
|
+
OPTIONS extends never | '$rid' = never,
|
|
1955
1933
|
K extends keyof Task.Props = keyof Task.Props,
|
|
1956
1934
|
> = OsdkInstance<OPTIONS, K>;
|
|
1957
1935
|
}
|