From ef12e6bc7929868fd89b70a49696637c001d44b6 Mon Sep 17 00:00:00 2001 From: viktorsperling Date: Fri, 23 Jan 2026 13:31:41 +0100 Subject: [PATCH] revert(dts-generator): revert add getOriginalProperty declarations and tests to TypedJSONModel This reverts commit ae4ba2eec5359cee8d4153624c555a25876dd33e. --- .../src/resources/typed-json-model.d.ts | 10 ------- .../typed-json-model/webapp/model/model.ts | 17 ------------ .../test/cases/absolute-complex-inference.ts | 26 ------------------- .../test/cases/absolute-complex-interface.ts | 26 ------------------- .../test/cases/absolute-complex-typeAlias.ts | 26 ------------------- .../cases/absolute-primitive-inference.ts | 21 --------------- .../cases/absolute-primitive-interface.ts | 21 --------------- .../cases/absolute-primitive-typeAilas.ts | 21 --------------- .../webapp/model/test/cases/edgeCases.ts | 3 --- .../test/cases/relative-complex-inference.ts | 26 ------------------- .../test/cases/relative-complex-interface.ts | 26 ------------------- .../test/cases/relative-complex-typeAlias.ts | 26 ------------------- .../cases/relative-primitive-inference.ts | 21 --------------- .../cases/relative-primitive-interface.ts | 21 --------------- .../cases/relative-primitive-typeAlias.ts | 21 --------------- 15 files changed, 312 deletions(-) diff --git a/packages/dts-generator/src/resources/typed-json-model.d.ts b/packages/dts-generator/src/resources/typed-json-model.d.ts index 32f33ad..5d33d33 100644 --- a/packages/dts-generator/src/resources/typed-json-model.d.ts +++ b/packages/dts-generator/src/resources/typed-json-model.d.ts @@ -29,16 +29,6 @@ declare module "sap/ui/model/json/TypedJSONModel" { sPath: Path, oContext: TypedJSONContext, ): PropertyByRelativeBindingPath; - getOriginalProperty>( - sPath: Path, - ): PropertyByAbsoluteBindingPath; - getOriginalProperty< - Path extends RelativeBindingPath, - Root extends AbsoluteBindingPath, - >( - sPath: Path, - oContext: TypedJSONContext, - ): PropertyByRelativeBindingPath; setData(oData: Data, bMerge?: boolean): void; diff --git a/test-packages/typed-json-model/webapp/model/model.ts b/test-packages/typed-json-model/webapp/model/model.ts index 19666d9..a3b70ad 100644 --- a/test-packages/typed-json-model/webapp/model/model.ts +++ b/test-packages/typed-json-model/webapp/model/model.ts @@ -57,23 +57,6 @@ export class TypedJSONModel extends JSONModel { | PropertyByRelativeBindingPath; } - getOriginalProperty>(sPath: Path): PropertyByAbsoluteBindingPath; - getOriginalProperty, Root extends AbsoluteBindingPath>( - sPath: Path, - oContext: TypedJSONContext, - ): PropertyByRelativeBindingPath; - getOriginalProperty< - Path extends AbsoluteBindingPath | RelativeBindingPath, - Root extends AbsoluteBindingPath, - >( - sPath: Path, - oContext?: TypedJSONContext, - ): PropertyByAbsoluteBindingPath | PropertyByRelativeBindingPath { - return super.getOriginalProperty(sPath, oContext) as - | PropertyByAbsoluteBindingPath - | PropertyByRelativeBindingPath; - } - setData(oData: Data, bMerge?: boolean): void { super.setData(oData, bMerge); } diff --git a/test-packages/typed-json-model/webapp/model/test/cases/absolute-complex-inference.ts b/test-packages/typed-json-model/webapp/model/test/cases/absolute-complex-inference.ts index 6fb8f61..6a37cff 100644 --- a/test-packages/typed-json-model/webapp/model/test/cases/absolute-complex-inference.ts +++ b/test-packages/typed-json-model/webapp/model/test/cases/absolute-complex-inference.ts @@ -67,32 +67,6 @@ import { TypedJSONModel } from "../../model"; /** @expect ts2322 */ anElementInATuple = model.getProperty("/aTuple"); /** @expect ts2322 */ anObject = model.getProperty("/aTuple/0"); -/*********************************************************************************************************************** - * Check model.getOriginalProperty - **********************************************************************************************************************/ - -/** @expect ok */ anObject = model.getOriginalProperty("/anObject"); -/** @expect ok */ anArray = model.getOriginalProperty("/anArray"); -/** @expect ok */ aJsonSafeArray = model.getOriginalProperty("/aJsonSafeArray"); -/** @expect ok */ aJsonSafe = model.getOriginalProperty("/aJsonSafeArray/0"); -/** @expect ok */ aPlaceholder = model.getOriginalProperty("/aPlaceholder"); -/** @expect ok */ anArrayOfPlaceholders = model.getOriginalProperty("/anArrayOfPlaceholders"); -/** @expect ok */ anotherPlaceholder = model.getOriginalProperty("/anArrayOfPlaceholders/0"); -/** @expect ok */ aTuple = model.getOriginalProperty("/aTuple"); -/** @expect ok */ anElementInATuple = model.getOriginalProperty("/aTuple/0"); - -/** @expect ts2345 */ anything = model.getOriginalProperty("/anObject/0"); -/** @expect ts2345 */ anything = model.getOriginalProperty("/doesNotExist"); -/** @expect ts2345 */ anything = model.getOriginalProperty("/anArray/0/doesNotExist"); - -/** @expect ts2739 */ aPlaceholder = model.getOriginalProperty("/anObject"); -/** @expect ts2322 */ anArrayOfPlaceholders = model.getOriginalProperty("/aJsonSafeArray"); -/** @expect ts2322 */ anObject = model.getOriginalProperty("/aJsonSafeArray/0"); -/** @expect ts2322 */ aJsonSafe = model.getOriginalProperty("/aPlaceholder"); -/** @expect ts2322 */ aJsonSafe = model.getOriginalProperty("/anArrayOfPlaceholders/0"); -/** @expect ts2322 */ anElementInATuple = model.getOriginalProperty("/aTuple"); -/** @expect ts2322 */ anObject = model.getOriginalProperty("/aTuple/0"); - /*********************************************************************************************************************** * Check model.getData / model.setData **********************************************************************************************************************/ diff --git a/test-packages/typed-json-model/webapp/model/test/cases/absolute-complex-interface.ts b/test-packages/typed-json-model/webapp/model/test/cases/absolute-complex-interface.ts index 5638804..142b3b8 100644 --- a/test-packages/typed-json-model/webapp/model/test/cases/absolute-complex-interface.ts +++ b/test-packages/typed-json-model/webapp/model/test/cases/absolute-complex-interface.ts @@ -71,32 +71,6 @@ import { TypedJSONModel } from "../../model"; /** @expect ts2322 */ anElementInATuple = model.getProperty("/aTuple"); /** @expect ts2322 */ anObject = model.getProperty("/aTuple/0"); -/*********************************************************************************************************************** - * Check model.getOriginalProperty - **********************************************************************************************************************/ - -/** @expect ok */ anObject = model.getOriginalProperty("/anObject"); -/** @expect ok */ anArray = model.getOriginalProperty("/anArray"); -/** @expect ok */ aJsonSafeArray = model.getOriginalProperty("/aJsonSafeArray"); -/** @expect ok */ aJsonSafe = model.getOriginalProperty("/aJsonSafeArray/0"); -/** @expect ok */ aPlaceholder = model.getOriginalProperty("/aPlaceholder"); -/** @expect ok */ anArrayOfPlaceholders = model.getOriginalProperty("/anArrayOfPlaceholders"); -/** @expect ok */ anotherPlaceholder = model.getOriginalProperty("/anArrayOfPlaceholders/0"); -/** @expect ok */ aTuple = model.getOriginalProperty("/aTuple"); -/** @expect ok */ anElementInATuple = model.getOriginalProperty("/aTuple/0"); - -/** @expect ts2345 */ anything = model.getOriginalProperty("/anObject/0"); -/** @expect ts2345 */ anything = model.getOriginalProperty("/doesNotExist"); -/** @expect ts2345 */ anything = model.getOriginalProperty("/anArray/0/doesNotExist"); - -/** @expect ts2739 */ aPlaceholder = model.getOriginalProperty("/anObject"); -/** @expect ts2322 */ anArrayOfPlaceholders = model.getOriginalProperty("/aJsonSafeArray"); -/** @expect ts2322 */ anObject = model.getOriginalProperty("/aJsonSafeArray/0"); -/** @expect ts2322 */ aJsonSafe = model.getOriginalProperty("/aPlaceholder"); -/** @expect ts2322 */ aJsonSafe = model.getOriginalProperty("/anArrayOfPlaceholders/0"); -/** @expect ts2322 */ anElementInATuple = model.getOriginalProperty("/aTuple"); -/** @expect ts2322 */ anObject = model.getOriginalProperty("/aTuple/0"); - /*********************************************************************************************************************** * Check model.getData / model.setData **********************************************************************************************************************/ diff --git a/test-packages/typed-json-model/webapp/model/test/cases/absolute-complex-typeAlias.ts b/test-packages/typed-json-model/webapp/model/test/cases/absolute-complex-typeAlias.ts index 584bd74..ab91bbc 100644 --- a/test-packages/typed-json-model/webapp/model/test/cases/absolute-complex-typeAlias.ts +++ b/test-packages/typed-json-model/webapp/model/test/cases/absolute-complex-typeAlias.ts @@ -71,32 +71,6 @@ import { TypedJSONModel } from "../../model"; /** @expect ts2322 */ anElementInATuple = model.getProperty("/aTuple"); /** @expect ts2322 */ anObject = model.getProperty("/aTuple/0"); -/*********************************************************************************************************************** - * Check model.getOriginalProperty - **********************************************************************************************************************/ - -/** @expect ok */ anObject = model.getOriginalProperty("/anObject"); -/** @expect ok */ anArray = model.getOriginalProperty("/anArray"); -/** @expect ok */ aJsonSafeArray = model.getOriginalProperty("/aJsonSafeArray"); -/** @expect ok */ aJsonSafe = model.getOriginalProperty("/aJsonSafeArray/0"); -/** @expect ok */ aPlaceholder = model.getOriginalProperty("/aPlaceholder"); -/** @expect ok */ anArrayOfPlaceholders = model.getOriginalProperty("/anArrayOfPlaceholders"); -/** @expect ok */ anotherPlaceholder = model.getOriginalProperty("/anArrayOfPlaceholders/0"); -/** @expect ok */ aTuple = model.getOriginalProperty("/aTuple"); -/** @expect ok */ anElementInATuple = model.getOriginalProperty("/aTuple/0"); - -/** @expect ts2345 */ anything = model.getOriginalProperty("/anObject/0"); -/** @expect ts2345 */ anything = model.getOriginalProperty("/doesNotExist"); -/** @expect ts2345 */ anything = model.getOriginalProperty("/anArray/0/doesNotExist"); - -/** @expect ts2739 */ aPlaceholder = model.getOriginalProperty("/anObject"); -/** @expect ts2322 */ anArrayOfPlaceholders = model.getOriginalProperty("/aJsonSafeArray"); -/** @expect ts2322 */ anObject = model.getOriginalProperty("/aJsonSafeArray/0"); -/** @expect ts2322 */ aJsonSafe = model.getOriginalProperty("/aPlaceholder"); -/** @expect ts2322 */ aJsonSafe = model.getOriginalProperty("/anArrayOfPlaceholders/0"); -/** @expect ts2322 */ anElementInATuple = model.getOriginalProperty("/aTuple"); -/** @expect ts2322 */ anObject = model.getOriginalProperty("/aTuple/0"); - /*********************************************************************************************************************** * Check model.getData / model.setData **********************************************************************************************************************/ diff --git a/test-packages/typed-json-model/webapp/model/test/cases/absolute-primitive-inference.ts b/test-packages/typed-json-model/webapp/model/test/cases/absolute-primitive-inference.ts index 279bcb9..6beb3ca 100644 --- a/test-packages/typed-json-model/webapp/model/test/cases/absolute-primitive-inference.ts +++ b/test-packages/typed-json-model/webapp/model/test/cases/absolute-primitive-inference.ts @@ -54,24 +54,3 @@ let aSymbol: symbol = Symbol("test"); // value is a symbol -> not JSON serializable! /** @expect ts2322 */ aSymbol = model.getProperty("/aSymbol"); - -/*********************************************************************************************************************** - * Check model.getOriginalProperty - **********************************************************************************************************************/ - -/** @expect ok */ aString = model.getOriginalProperty("/aString"); -/** @expect ok */ aNumber = model.getOriginalProperty("/aNumber"); -/** @expect ok */ aBoolean = model.getOriginalProperty("/aBoolean"); -/** @expect ok */ aNull = model.getOriginalProperty("/aNull"); -/** @expect ok */ anUndefined = model.getOriginalProperty("/anUndefined"); - -/** @expect ts2345 */ const test1 = model.getOriginalProperty("/doesNotExist"); - -/** @expect ts2322 */ aNumber = model.getOriginalProperty("/aString"); -/** @expect ts2322 */ aString = model.getOriginalProperty("/aNumber"); -/** @expect ts2322 */ anUndefined = model.getOriginalProperty("/aNull"); -/** @expect ts2322 */ aNull = model.getOriginalProperty("/anUndefined"); -/** @expect ts2322 */ aBoolean = model.getOriginalProperty("/aDate"); - -// value is a symbol -> not JSON serializable! -/** @expect ts2322 */ aSymbol = model.getOriginalProperty("/aSymbol"); diff --git a/test-packages/typed-json-model/webapp/model/test/cases/absolute-primitive-interface.ts b/test-packages/typed-json-model/webapp/model/test/cases/absolute-primitive-interface.ts index 183a5ef..8636648 100644 --- a/test-packages/typed-json-model/webapp/model/test/cases/absolute-primitive-interface.ts +++ b/test-packages/typed-json-model/webapp/model/test/cases/absolute-primitive-interface.ts @@ -54,24 +54,3 @@ let aSymbol: symbol = Symbol("test"); // value is a symbol -> not JSON serializable! /** @expect ts2322 */ aSymbol = model.getProperty("/aSymbol"); - -/*********************************************************************************************************************** - * Check model.getOriginalProperty - **********************************************************************************************************************/ - -/** @expect ok */ aString = model.getOriginalProperty("/aString"); -/** @expect ok */ aNumber = model.getOriginalProperty("/aNumber"); -/** @expect ok */ aBoolean = model.getOriginalProperty("/aBoolean"); -/** @expect ok */ aNull = model.getOriginalProperty("/aNull"); -/** @expect ok */ anUndefined = model.getOriginalProperty("/anUndefined"); - -/** @expect ts2345 */ const test1 = model.getOriginalProperty("/doesNotExist"); - -/** @expect ts2322 */ aNumber = model.getOriginalProperty("/aString"); -/** @expect ts2322 */ aString = model.getOriginalProperty("/aNumber"); -/** @expect ts2322 */ anUndefined = model.getOriginalProperty("/aNull"); -/** @expect ts2322 */ aNull = model.getOriginalProperty("/anUndefined"); -/** @expect ts2322 */ aBoolean = model.getOriginalProperty("/aDate"); - -// value is a symbol -> not JSON serializable! -/** @expect ts2322 */ aSymbol = model.getOriginalProperty("/aSymbol"); diff --git a/test-packages/typed-json-model/webapp/model/test/cases/absolute-primitive-typeAilas.ts b/test-packages/typed-json-model/webapp/model/test/cases/absolute-primitive-typeAilas.ts index e49a9ba..d07cd17 100644 --- a/test-packages/typed-json-model/webapp/model/test/cases/absolute-primitive-typeAilas.ts +++ b/test-packages/typed-json-model/webapp/model/test/cases/absolute-primitive-typeAilas.ts @@ -54,24 +54,3 @@ let aSymbol: symbol = Symbol("test"); // value is a symbol -> not JSON serializable! /** @expect ts2322 */ aSymbol = model.getProperty("/aSymbol"); - -/*********************************************************************************************************************** - * Check model.getOriginalProperty - **********************************************************************************************************************/ - -/** @expect ok */ aString = model.getOriginalProperty("/aString"); -/** @expect ok */ aNumber = model.getOriginalProperty("/aNumber"); -/** @expect ok */ aBoolean = model.getOriginalProperty("/aBoolean"); -/** @expect ok */ aNull = model.getOriginalProperty("/aNull"); -/** @expect ok */ anUndefined = model.getOriginalProperty("/anUndefined"); - -/** @expect ts2345 */ const test1 = model.getOriginalProperty("/doesNotExist"); - -/** @expect ts2322 */ aNumber = model.getOriginalProperty("/aString"); -/** @expect ts2322 */ aString = model.getOriginalProperty("/aNumber"); -/** @expect ts2322 */ anUndefined = model.getOriginalProperty("/aNull"); -/** @expect ts2322 */ aNull = model.getOriginalProperty("/anUndefined"); -/** @expect ts2322 */ aBoolean = model.getOriginalProperty("/aDate"); - -// value is a symbol -> not JSON serializable! -/** @expect ts2322 */ aSymbol = model.getOriginalProperty("/aSymbol"); diff --git a/test-packages/typed-json-model/webapp/model/test/cases/edgeCases.ts b/test-packages/typed-json-model/webapp/model/test/cases/edgeCases.ts index 50c0fd2..43fe5e6 100644 --- a/test-packages/typed-json-model/webapp/model/test/cases/edgeCases.ts +++ b/test-packages/typed-json-model/webapp/model/test/cases/edgeCases.ts @@ -12,7 +12,6 @@ const array = [1, 2, 3]; /** @expect ok */ const model1 = new TypedJSONModel(array); /** @expect ok */ let someNumber: number = model1.getProperty("/0"); -/** @expect ok */ let anOriginalNumber: number = model1.getOriginalProperty("/0"); /** @expect ok */ model1.setProperty("/0", 42); /** @expect ts2345 */ model1.setProperty("/0", "42"); @@ -23,9 +22,7 @@ const model2 = new TypedJSONModel([] as TestArray); /** @expect ok */ const someObject: { aNumber: number } = model2.getProperty("/0"); /** @expect ok */ someNumber = model2.getProperty("/0/aNumber"); -/** @expect ok */ anOriginalNumber = model2.getOriginalProperty("/0/aNumber"); /** @expect ts2322 */ const someString: string = model2.getProperty("/0"); -/** @expect ts2322 */ const anOriginalString: string = model2.getOriginalProperty("/0"); /** @expect ok */ model2.setProperty("/0", { aNumber: 42 }); /** @expect ts2345 */ model2.setProperty("/0", {}); diff --git a/test-packages/typed-json-model/webapp/model/test/cases/relative-complex-inference.ts b/test-packages/typed-json-model/webapp/model/test/cases/relative-complex-inference.ts index 1ceb74d..b730283 100644 --- a/test-packages/typed-json-model/webapp/model/test/cases/relative-complex-inference.ts +++ b/test-packages/typed-json-model/webapp/model/test/cases/relative-complex-inference.ts @@ -67,29 +67,3 @@ import { TypedJSONModel } from "../../model"; /** @expect ts2322 */ aJsonSafe = model.getProperty("anArrayOfPlaceholders/0", context); /** @expect ts2322 */ anElementInATuple = model.getProperty("aTuple", context); /** @expect ts2322 */ anObject = model.getProperty("aTuple/0", context); - -/*********************************************************************************************************************** - * Check model.getOriginalProperty - **********************************************************************************************************************/ - -/** @expect ok */ anObject = model.getOriginalProperty("anObject", context); -/** @expect ok */ anArray = model.getOriginalProperty("anArray", context); -/** @expect ok */ aJsonSafeArray = model.getOriginalProperty("aJsonSafeArray", context); -/** @expect ok */ aJsonSafe = model.getOriginalProperty("aJsonSafeArray/0", context); -/** @expect ok */ aPlaceholder = model.getOriginalProperty("aPlaceholder", context); -/** @expect ok */ anArrayOfPlaceholders = model.getOriginalProperty("anArrayOfPlaceholders", context); -/** @expect ok */ anotherPlaceholder = model.getOriginalProperty("anArrayOfPlaceholders/0", context); -/** @expect ok */ aTuple = model.getOriginalProperty("aTuple", context); -/** @expect ok */ anElementInATuple = model.getOriginalProperty("aTuple/0", context); - -/** @expect ts2345 */ anything = model.getOriginalProperty("anObject/0", context); -/** @expect ts2345 */ anything = model.getOriginalProperty("doesNotExist", context); -/** @expect ts2345 */ anything = model.getOriginalProperty("anArray/0/doesNotExist", context); - -/** @expect ts2739 */ aPlaceholder = model.getOriginalProperty("anObject", context); -/** @expect ts2322 */ anArrayOfPlaceholders = model.getOriginalProperty("aJsonSafeArray", context); -/** @expect ts2322 */ anObject = model.getOriginalProperty("aJsonSafeArray/0", context); -/** @expect ts2322 */ aJsonSafe = model.getOriginalProperty("aPlaceholder", context); -/** @expect ts2322 */ aJsonSafe = model.getOriginalProperty("anArrayOfPlaceholders/0", context); -/** @expect ts2322 */ anElementInATuple = model.getOriginalProperty("aTuple", context); -/** @expect ts2322 */ anObject = model.getOriginalProperty("aTuple/0", context); diff --git a/test-packages/typed-json-model/webapp/model/test/cases/relative-complex-interface.ts b/test-packages/typed-json-model/webapp/model/test/cases/relative-complex-interface.ts index 54e3c69..40236f3 100644 --- a/test-packages/typed-json-model/webapp/model/test/cases/relative-complex-interface.ts +++ b/test-packages/typed-json-model/webapp/model/test/cases/relative-complex-interface.ts @@ -67,29 +67,3 @@ import { TypedJSONModel } from "../../model"; /** @expect ts2322 */ aJsonSafe = model.getProperty("anArrayOfPlaceholders/0", context); /** @expect ts2322 */ anElementInATuple = model.getProperty("aTuple", context); /** @expect ts2322 */ anObject = model.getProperty("aTuple/0", context); - -/*********************************************************************************************************************** - * Check model.getOriginalProperty - **********************************************************************************************************************/ - -/** @expect ok */ anObject = model.getOriginalProperty("anObject", context); -/** @expect ok */ anArray = model.getOriginalProperty("anArray", context); -/** @expect ok */ aJsonSafeArray = model.getOriginalProperty("aJsonSafeArray", context); -/** @expect ok */ aJsonSafe = model.getOriginalProperty("aJsonSafeArray/0", context); -/** @expect ok */ aPlaceholder = model.getOriginalProperty("aPlaceholder", context); -/** @expect ok */ anArrayOfPlaceholders = model.getOriginalProperty("anArrayOfPlaceholders", context); -/** @expect ok */ anotherPlaceholder = model.getOriginalProperty("anArrayOfPlaceholders/0", context); -/** @expect ok */ aTuple = model.getOriginalProperty("aTuple", context); -/** @expect ok */ anElementInATuple = model.getOriginalProperty("aTuple/0", context); - -/** @expect ts2345 */ anything = model.getOriginalProperty("anObject/0", context); -/** @expect ts2345 */ anything = model.getOriginalProperty("doesNotExist", context); -/** @expect ts2345 */ anything = model.getOriginalProperty("anArray/0/doesNotExist", context); - -/** @expect ts2739 */ aPlaceholder = model.getOriginalProperty("anObject", context); -/** @expect ts2322 */ anArrayOfPlaceholders = model.getOriginalProperty("aJsonSafeArray", context); -/** @expect ts2322 */ anObject = model.getOriginalProperty("aJsonSafeArray/0", context); -/** @expect ts2322 */ aJsonSafe = model.getOriginalProperty("aPlaceholder", context); -/** @expect ts2322 */ aJsonSafe = model.getOriginalProperty("anArrayOfPlaceholders/0", context); -/** @expect ts2322 */ anElementInATuple = model.getOriginalProperty("aTuple", context); -/** @expect ts2322 */ anObject = model.getOriginalProperty("aTuple/0", context); diff --git a/test-packages/typed-json-model/webapp/model/test/cases/relative-complex-typeAlias.ts b/test-packages/typed-json-model/webapp/model/test/cases/relative-complex-typeAlias.ts index 9caf05f..8b0dedc 100644 --- a/test-packages/typed-json-model/webapp/model/test/cases/relative-complex-typeAlias.ts +++ b/test-packages/typed-json-model/webapp/model/test/cases/relative-complex-typeAlias.ts @@ -69,29 +69,3 @@ model.getProperty("/root/aPlaceholder", context); /** @expect ts2322 */ aJsonSafe = model.getProperty("anArrayOfPlaceholders/0", context); /** @expect ts2322 */ anElementInATuple = model.getProperty("aTuple", context); /** @expect ts2322 */ anObject = model.getProperty("aTuple/0", context); - -/*********************************************************************************************************************** - * Check model.getOriginalProperty - **********************************************************************************************************************/ - -/** @expect ok */ anObject = model.getOriginalProperty("anObject", context); -/** @expect ok */ anArray = model.getOriginalProperty("anArray", context); -/** @expect ok */ aJsonSafeArray = model.getOriginalProperty("aJsonSafeArray", context); -/** @expect ok */ aJsonSafe = model.getOriginalProperty("aJsonSafeArray/0", context); -/** @expect ok */ aPlaceholder = model.getOriginalProperty("aPlaceholder", context); -/** @expect ok */ anArrayOfPlaceholders = model.getOriginalProperty("anArrayOfPlaceholders", context); -/** @expect ok */ anotherPlaceholder = model.getOriginalProperty("anArrayOfPlaceholders/0", context); -/** @expect ok */ aTuple = model.getOriginalProperty("aTuple", context); -/** @expect ok */ anElementInATuple = model.getOriginalProperty("aTuple/0", context); - -/** @expect ts2345 */ anything = model.getOriginalProperty("anObject/0", context); -/** @expect ts2345 */ anything = model.getOriginalProperty("doesNotExist", context); -/** @expect ts2345 */ anything = model.getOriginalProperty("anArray/0/doesNotExist", context); - -/** @expect ts2739 */ aPlaceholder = model.getOriginalProperty("anObject", context); -/** @expect ts2322 */ anArrayOfPlaceholders = model.getOriginalProperty("aJsonSafeArray", context); -/** @expect ts2322 */ anObject = model.getOriginalProperty("aJsonSafeArray/0", context); -/** @expect ts2322 */ aJsonSafe = model.getOriginalProperty("aPlaceholder", context); -/** @expect ts2322 */ aJsonSafe = model.getOriginalProperty("anArrayOfPlaceholders/0", context); -/** @expect ts2322 */ anElementInATuple = model.getOriginalProperty("aTuple", context); -/** @expect ts2322 */ anObject = model.getOriginalProperty("aTuple/0", context); diff --git a/test-packages/typed-json-model/webapp/model/test/cases/relative-primitive-inference.ts b/test-packages/typed-json-model/webapp/model/test/cases/relative-primitive-inference.ts index 8f6ac49..58ea435 100644 --- a/test-packages/typed-json-model/webapp/model/test/cases/relative-primitive-inference.ts +++ b/test-packages/typed-json-model/webapp/model/test/cases/relative-primitive-inference.ts @@ -53,24 +53,3 @@ let aSymbol: symbol = Symbol("test"); // value is a symbol -> not JSON serializable! /** @expect ts2322 */ aSymbol = model.getProperty("aSymbol", context); - -/*********************************************************************************************************************** - * Check model.getOriginalProperty - **********************************************************************************************************************/ - -/** @expect ok */ aString = model.getOriginalProperty("aString", context); -/** @expect ok */ aNumber = model.getOriginalProperty("aNumber", context); -/** @expect ok */ aBoolean = model.getOriginalProperty("aBoolean", context); -/** @expect ok */ aNull = model.getOriginalProperty("aNull", context); -/** @expect ok */ anUndefined = model.getOriginalProperty("anUndefined", context); - -/** @expect ts2345 */ const test1 = model.getOriginalProperty("doesNotExist", context); - -/** @expect ts2322 */ aString = model.getOriginalProperty("aNumber", context); -/** @expect ts2322 */ aNumber = model.getOriginalProperty("aString", context); -/** @expect ts2322 */ aString = model.getOriginalProperty("aBoolean", context); -/** @expect ts2322 */ aNull = model.getOriginalProperty("anUndefined", context); -/** @expect ts2322 */ anUndefined = model.getOriginalProperty("aNull", context); - -// value is a symbol -> not JSON serializable! -/** @expect ts2322 */ aSymbol = model.getOriginalProperty("aSymbol", context); diff --git a/test-packages/typed-json-model/webapp/model/test/cases/relative-primitive-interface.ts b/test-packages/typed-json-model/webapp/model/test/cases/relative-primitive-interface.ts index a5fd363..b5675f6 100644 --- a/test-packages/typed-json-model/webapp/model/test/cases/relative-primitive-interface.ts +++ b/test-packages/typed-json-model/webapp/model/test/cases/relative-primitive-interface.ts @@ -53,24 +53,3 @@ let aSymbol: symbol = Symbol("test"); // value is a symbol -> not JSON serializable! /** @expect ts2322 */ aSymbol = model.getProperty("aSymbol", context); - -/*********************************************************************************************************************** - * Check model.getOriginalProperty - **********************************************************************************************************************/ - -/** @expect ok */ aString = model.getOriginalProperty("aString", context); -/** @expect ok */ aNumber = model.getOriginalProperty("aNumber", context); -/** @expect ok */ aBoolean = model.getOriginalProperty("aBoolean", context); -/** @expect ok */ aNull = model.getOriginalProperty("aNull", context); -/** @expect ok */ anUndefined = model.getOriginalProperty("anUndefined", context); - -/** @expect ts2345 */ const test1 = model.getOriginalProperty("doesNotExist", context); - -/** @expect ts2322 */ aString = model.getOriginalProperty("aNumber", context); -/** @expect ts2322 */ aNumber = model.getOriginalProperty("aString", context); -/** @expect ts2322 */ aString = model.getOriginalProperty("aBoolean", context); -/** @expect ts2322 */ aNull = model.getOriginalProperty("anUndefined", context); -/** @expect ts2322 */ anUndefined = model.getOriginalProperty("aNull", context); - -// value is a symbol -> not JSON serializable! -/** @expect ts2322 */ aSymbol = model.getOriginalProperty("aSymbol", context); diff --git a/test-packages/typed-json-model/webapp/model/test/cases/relative-primitive-typeAlias.ts b/test-packages/typed-json-model/webapp/model/test/cases/relative-primitive-typeAlias.ts index 5c4bcfb..280b851 100644 --- a/test-packages/typed-json-model/webapp/model/test/cases/relative-primitive-typeAlias.ts +++ b/test-packages/typed-json-model/webapp/model/test/cases/relative-primitive-typeAlias.ts @@ -53,24 +53,3 @@ let aSymbol: symbol = Symbol("test"); // value is a symbol -> not JSON serializable! /** @expect ts2322 */ aSymbol = model.getProperty("aSymbol", context); - -/*********************************************************************************************************************** - * Check model.getOriginalProperty - **********************************************************************************************************************/ - -/** @expect ok */ aString = model.getOriginalProperty("aString", context); -/** @expect ok */ aNumber = model.getOriginalProperty("aNumber", context); -/** @expect ok */ aBoolean = model.getOriginalProperty("aBoolean", context); -/** @expect ok */ aNull = model.getOriginalProperty("aNull", context); -/** @expect ok */ anUndefined = model.getOriginalProperty("anUndefined", context); - -/** @expect ts2345 */ const test1 = model.getOriginalProperty("doesNotExist", context); - -/** @expect ts2322 */ aString = model.getOriginalProperty("aNumber", context); -/** @expect ts2322 */ aNumber = model.getOriginalProperty("aString", context); -/** @expect ts2322 */ aString = model.getOriginalProperty("aBoolean", context); -/** @expect ts2322 */ aNull = model.getOriginalProperty("anUndefined", context); -/** @expect ts2322 */ anUndefined = model.getOriginalProperty("aNull", context); - -// value is a symbol -> not JSON serializable! -/** @expect ts2322 */ aSymbol = model.getOriginalProperty("aSymbol", context);