diff --git a/compiler/src/pre_define.ts b/compiler/src/pre_define.ts index 005cd4e..81eb06d 100644 --- a/compiler/src/pre_define.ts +++ b/compiler/src/pre_define.ts @@ -278,9 +278,6 @@ export const _GENERATE_ID = '__generate__Id'; export const COMPONENT_CONSTRUCTOR_INITIAL_PARAMS: string = 'setInitiallyProvidedValue'; export const COMPONENT_RERENDER_FUNCTION: string = 'rerender'; -export const SETONEWAYSYNCPROPERTIESUNCHANGED: string = 'setOneWaySyncPropertiesUnchanged'; -export const SETTWOWAYSYNCPROPERTIESUNCHANGED: string = 'setTwoWaySyncPropertiesUnchanged'; -export const COMPONENT_CONSTRUCTOR_SET_STATE_UNCHANGED: string = 'setStateSourcePropertiesUnchanged'; export const COMPONENT_CONSTRUCTOR_PURGE_VARIABLE_DEP: string = 'purgeVariableDependenciesOnElmtId'; export const MARKDEPENDENTELEMENTSDIRTY: string = 'markDependentElementsDirty'; export const ABOUT_TO_BE_DELETE_FUNCTION_ID__: string = 'id__'; diff --git a/compiler/src/process_component_class.ts b/compiler/src/process_component_class.ts index 332c475..fd6c048 100644 --- a/compiler/src/process_component_class.ts +++ b/compiler/src/process_component_class.ts @@ -34,7 +34,6 @@ import { CREATE_CONSTRUCTOR_PARAMS, COMPONENT_CONSTRUCTOR_UPDATE_PARAMS, COMPONENT_CONSTRUCTOR_INITIAL_PARAMS, - COMPONENT_CONSTRUCTOR_SET_STATE_UNCHANGED, COMPONENT_CONSTRUCTOR_PURGE_VARIABLE_DEP, COMPONENT_CONSTRUCTOR_DELETE_PARAMS, COMPONENT_DECORATOR_PREVIEW, @@ -64,8 +63,6 @@ import { COMPONENT_IF_UNDEFINED, INNER_COMPONENT_MEMBER_DECORATORS, COMPONENT_RERENDER_FUNCTION, - SETONEWAYSYNCPROPERTIESUNCHANGED, - SETTWOWAYSYNCPROPERTIESUNCHANGED, RMELMTID, ABOUTTOBEDELETEDINTERNAL, UPDATEDIRTYELEMENTS, @@ -143,9 +140,6 @@ function processMembers(members: ts.NodeArray, parentComponentN const newMembers: ts.ClassElement[] = []; const watchMap: Map = new Map(); const updateParamsStatements: ts.Statement[] = []; - const setStateUnchangedStatements: ts.Statement[] = []; - const setOneWayUnchangedStatements: ts.Statement[] = []; - const setTwoWayUnchangedStatements: ts.Statement[] = []; const purgeVariableDepStatements: ts.Statement[] = []; const rerenderStatements: ts.Statement[] = []; const deleteParamsStatements: ts.PropertyDeclaration[] = []; @@ -186,8 +180,7 @@ function processMembers(members: ts.NodeArray, parentComponentN if (result.getControllerSet()) { newMembers.push(result.getControllerSet()); } - processPropertyUnchanged(result, setStateUnchangedStatements, setOneWayUnchangedStatements, - setTwoWayUnchangedStatements, purgeVariableDepStatements, rerenderStatements); + processPropertyUnchanged(result, purgeVariableDepStatements, rerenderStatements); } } if (ts.isMethodDeclaration(item) && item.name) { @@ -202,8 +195,8 @@ function processMembers(members: ts.NodeArray, parentComponentN validateBuildMethodCount(buildCount, parentComponentName, log); validateHasController(parentComponentName, checkController, log); newMembers.unshift(addDeleteParamsFunc(deleteParamsStatements)); - addIntoNewMembers(newMembers, parentComponentName, updateParamsStatements, setStateUnchangedStatements, - setOneWayUnchangedStatements, setTwoWayUnchangedStatements, purgeVariableDepStatements, rerenderStatements); + addIntoNewMembers(newMembers, parentComponentName, updateParamsStatements, + purgeVariableDepStatements, rerenderStatements); newMembers.unshift(addConstructor(ctorNode, watchMap, parentComponentName)); return newMembers; } @@ -225,23 +218,10 @@ function validateDecorators(item: ts.ClassElement, log: LogInfo[]): void { function processPropertyUnchanged( result: UpdateResult, - setStateUnchangedStatements: ts.Statement[], - setOneWayUnchangedStatements: ts.Statement[], - setTwoWayUnchangedStatements: ts.Statement[], purgeVariableDepStatements: ts.Statement[], rerenderStatements: ts.Statement[] ): void { if (sdkVersion.compatibleSdkVersion === 9) { - if(result.getPropertyUnchanged()) { - const propertyUnchanged: ts.Statement = result.getPropertyUnchanged(); - if (result.getDecoratorName() === COMPONENT_STATE_DECORATOR) { - setStateUnchangedStatements.push(propertyUnchanged); - } else if (result.getDecoratorName() === COMPONENT_PROP_DECORATOR) { - setOneWayUnchangedStatements.push(propertyUnchanged); - } else if(LINKS_DECORATORS.has(result.getDecoratorName())) { - setTwoWayUnchangedStatements.push(propertyUnchanged); - } - } if(result.getPurgeVariableDepStatement()) { purgeVariableDepStatements.push(result.getPurgeVariableDepStatement()); } @@ -255,18 +235,12 @@ function addIntoNewMembers( newMembers: ts.ClassElement[], parentComponentName: ts.Identifier, updateParamsStatements: ts.Statement[], - setStateUnchangedStatements: ts.Statement[], - setOneWayUnchangedStatements: ts.Statement[], - setTwoWayUnchangedStatements: ts.Statement[], purgeVariableDepStatements: ts.Statement[], rerenderStatements: ts.Statement[] ): void { if (sdkVersion.compatibleSdkVersion === 9) { newMembers.unshift( addInitialParamsFunc(updateParamsStatements, parentComponentName), - createStateUnchangedFunc(setStateUnchangedStatements), - createOneWaySyncUnchangedFunc(setOneWayUnchangedStatements), - createTwoWaySyncUnchangedFunc(setTwoWayUnchangedStatements), addPurgeVariableDepFunc(purgeVariableDepStatements) ); newMembers.push(addRerenderFunc(rerenderStatements)); @@ -620,26 +594,6 @@ function addInitialParamsFunc(statements: ts.Statement[], parentComponentName: t return createParamsInitBlock(COMPONENT_CONSTRUCTOR_INITIAL_PARAMS, statements, parentComponentName); } -function createStateUnchangedFunc(statements: ts.Statement[]): ts.MethodDeclaration { - return ts.factory.createMethodDeclaration(undefined, undefined, undefined, - ts.factory.createIdentifier(COMPONENT_CONSTRUCTOR_SET_STATE_UNCHANGED), undefined, undefined, [], undefined, - ts.factory.createBlock(statements, true)); -} - -// @Prop -function createOneWaySyncUnchangedFunc(statements: ts.Statement[]): ts.MethodDeclaration { - return ts.factory.createMethodDeclaration(undefined, undefined, undefined, - ts.factory.createIdentifier(SETONEWAYSYNCPROPERTIESUNCHANGED), undefined, undefined, [], - undefined, ts.factory.createBlock(statements, true)); -} - -// @Link -function createTwoWaySyncUnchangedFunc(statements: ts.Statement[]): ts.MethodDeclaration { - return ts.factory.createMethodDeclaration( - undefined, undefined, undefined, ts.factory.createIdentifier(SETTWOWAYSYNCPROPERTIESUNCHANGED), - undefined, undefined, [], undefined, ts.factory.createBlock(statements, true)); -} - function addPurgeVariableDepFunc(statements: ts.Statement[]): ts.MethodDeclaration { return ts.factory.createMethodDeclaration( undefined, undefined, undefined, diff --git a/compiler/src/process_component_member.ts b/compiler/src/process_component_member.ts index 2c0cfe8..2b429dd 100644 --- a/compiler/src/process_component_member.ts +++ b/compiler/src/process_component_member.ts @@ -136,7 +136,6 @@ export class UpdateResult { private updateParams: ts.Statement; private deleteParams: boolean = false; private controllerSet: ts.MethodDeclaration; - private propertyUnchanged: ts.Statement; private purgeVariableDepStatement: ts.Statement; private rerenderStatement: ts.Statement; private decoratorName: string; @@ -175,10 +174,6 @@ export class UpdateResult { this.deleteParams = deleteParams; } - public setPropertyUnchanged(propertyUnchanged: ts.Statement) { - this.propertyUnchanged = propertyUnchanged; - } - public setPurgeVariableDepStatement(purgeVariableDepStatement: ts.Statement) { this.purgeVariableDepStatement = purgeVariableDepStatement; } @@ -211,10 +206,6 @@ export class UpdateResult { return this.updateParams; } - public getPropertyUnchanged(): ts.Statement { - return this.propertyUnchanged; - } - public getPurgeVariableDepStatement(): ts.Statement { return this.purgeVariableDepStatement; } @@ -365,29 +356,12 @@ function processStateDecorators(node: ts.PropertyDeclaration, decorator: string, } if (sdkVersion.compatibleSdkVersion === 9 && BASICDECORATORS.has(decorator)) { const variableWithUnderLink: string = '__' + name.escapedText.toString(); - updateResult.setPropertyUnchanged(createPropertyUnchangedStatement(variableWithUnderLink)); updateResult.setDecoratorName(decorator); updateResult.setPurgeVariableDepStatement(createPurgeVariableDepStatement(variableWithUnderLink)); updateResult.setRerenderStatement(createRerenderStatement(variableWithUnderLink)); } } -function createPropertyUnchangedStatement(variableWithUnderLink: string): ts.Statement { - return ts.factory.createExpressionStatement( - ts.factory.createCallExpression( - ts.factory.createPropertyAccessExpression( - ts.factory.createPropertyAccessExpression( - ts.factory.createThis(), - ts.factory.createIdentifier(variableWithUnderLink) - ), - ts.factory.createIdentifier(SETPROPERTYUNCHANGED) - ), - undefined, - [] - ) - ); -} - function createPurgeVariableDepStatement(variableWithUnderLink: string): ts.Statement { return ts.factory.createExpressionStatement( ts.factory.createCallExpression( diff --git a/compiler/test/utForPartialUpdate/inner_component_transform/custom_component/custom_component.ts b/compiler/test/utForPartialUpdate/inner_component_transform/custom_component/custom_component.ts index a5a4f6f..d054ce3 100644 --- a/compiler/test/utForPartialUpdate/inner_component_transform/custom_component/custom_component.ts +++ b/compiler/test/utForPartialUpdate/inner_component_transform/custom_component/custom_component.ts @@ -53,12 +53,6 @@ exports.expectResult = } setInitiallyProvidedValue(params) { } - setStateSourcePropertiesUnchanged() { - } - setOneWaySyncPropertiesUnchanged() { - } - setTwoWaySyncPropertiesUnchanged() { - } purgeVariableDependenciesOnElmtId(rmElmtId) { } aboutToBeDeleted() { @@ -141,12 +135,6 @@ class Banner extends View { this.value = params.value; } } - setStateSourcePropertiesUnchanged() { - } - setOneWaySyncPropertiesUnchanged() { - } - setTwoWaySyncPropertiesUnchanged() { - } purgeVariableDependenciesOnElmtId(rmElmtId) { } aboutToBeDeleted() { diff --git a/compiler/test/utForPartialUpdate/inner_component_transform/render_component/foreach/foreach.ts b/compiler/test/utForPartialUpdate/inner_component_transform/render_component/foreach/foreach.ts index d5c6d6e..3ae74ae 100644 --- a/compiler/test/utForPartialUpdate/inner_component_transform/render_component/foreach/foreach.ts +++ b/compiler/test/utForPartialUpdate/inner_component_transform/render_component/foreach/foreach.ts @@ -42,13 +42,6 @@ exports.expectResult = this.arr = params.arr; } } - setStateSourcePropertiesUnchanged() { - this.__arr.SetPropertyUnchanged(); - } - setOneWaySyncPropertiesUnchanged() { - } - setTwoWaySyncPropertiesUnchanged() { - } purgeVariableDependenciesOnElmtId(rmElmtId) { this.__arr.purgeDependencyOnElmtId(rmElmtId); } diff --git a/compiler/test/utForPartialUpdate/inner_component_transform/render_component/if/if.ts b/compiler/test/utForPartialUpdate/inner_component_transform/render_component/if/if.ts index 4a33c5c..806010b 100644 --- a/compiler/test/utForPartialUpdate/inner_component_transform/render_component/if/if.ts +++ b/compiler/test/utForPartialUpdate/inner_component_transform/render_component/if/if.ts @@ -56,15 +56,6 @@ exports.expectResult = this.toggle3 = params.toggle3; } } - setStateSourcePropertiesUnchanged() { - this.__toggle1.SetPropertyUnchanged(); - this.__toggle2.SetPropertyUnchanged(); - this.__toggle3.SetPropertyUnchanged(); - } - setOneWaySyncPropertiesUnchanged() { - } - setTwoWaySyncPropertiesUnchanged() { - } purgeVariableDependenciesOnElmtId(rmElmtId) { this.__toggle1.purgeDependencyOnElmtId(rmElmtId); this.__toggle2.purgeDependencyOnElmtId(rmElmtId); diff --git a/compiler/test/utForPartialUpdate/inner_component_transform/render_component/item/GridItem.ts b/compiler/test/utForPartialUpdate/inner_component_transform/render_component/item/GridItem.ts index 4ad66e0..399594e 100644 --- a/compiler/test/utForPartialUpdate/inner_component_transform/render_component/item/GridItem.ts +++ b/compiler/test/utForPartialUpdate/inner_component_transform/render_component/item/GridItem.ts @@ -34,12 +34,6 @@ exports.expectResult = } setInitiallyProvidedValue(params) { } - setStateSourcePropertiesUnchanged() { - } - setOneWaySyncPropertiesUnchanged() { - } - setTwoWaySyncPropertiesUnchanged() { - } purgeVariableDependenciesOnElmtId(rmElmtId) { } aboutToBeDeleted() { diff --git a/compiler/test/utForPartialUpdate/inner_component_transform/render_component/item/ListItem.ts b/compiler/test/utForPartialUpdate/inner_component_transform/render_component/item/ListItem.ts index 4e334ea..d815324 100644 --- a/compiler/test/utForPartialUpdate/inner_component_transform/render_component/item/ListItem.ts +++ b/compiler/test/utForPartialUpdate/inner_component_transform/render_component/item/ListItem.ts @@ -32,12 +32,6 @@ exports.expectResult = } setInitiallyProvidedValue(params) { } - setStateSourcePropertiesUnchanged() { - } - setOneWaySyncPropertiesUnchanged() { - } - setTwoWaySyncPropertiesUnchanged() { - } purgeVariableDependenciesOnElmtId(rmElmtId) { } aboutToBeDeleted() { diff --git a/compiler/test/utForPartialUpdate/inner_component_transform/render_component/lazyforeach/lazyforeach.ts b/compiler/test/utForPartialUpdate/inner_component_transform/render_component/lazyforeach/lazyforeach.ts index 6ad1094..2e4960d 100644 --- a/compiler/test/utForPartialUpdate/inner_component_transform/render_component/lazyforeach/lazyforeach.ts +++ b/compiler/test/utForPartialUpdate/inner_component_transform/render_component/lazyforeach/lazyforeach.ts @@ -183,12 +183,6 @@ class Test extends View { this.data = params.data; } } - setStateSourcePropertiesUnchanged() { - } - setOneWaySyncPropertiesUnchanged() { - } - setTwoWaySyncPropertiesUnchanged() { - } purgeVariableDependenciesOnElmtId(rmElmtId) { } aboutToBeDeleted() { diff --git a/compiler/test/utForPartialUpdate/inner_component_transform/render_component/tab/tab.ts b/compiler/test/utForPartialUpdate/inner_component_transform/render_component/tab/tab.ts index 1ba43d6..f530986 100644 --- a/compiler/test/utForPartialUpdate/inner_component_transform/render_component/tab/tab.ts +++ b/compiler/test/utForPartialUpdate/inner_component_transform/render_component/tab/tab.ts @@ -63,12 +63,6 @@ exports.expectResult = this.controller = params.controller; } } - setStateSourcePropertiesUnchanged() { - } - setOneWaySyncPropertiesUnchanged() { - } - setTwoWaySyncPropertiesUnchanged() { - } purgeVariableDependenciesOnElmtId(rmElmtId) { } aboutToBeDeleted() { diff --git a/compiler/test/utForPartialUpdate/ui_state_management/inner_struct_state_management/@link/@link.ts b/compiler/test/utForPartialUpdate/ui_state_management/inner_struct_state_management/@link/@link.ts index ad22cd4..e7dedf2 100644 --- a/compiler/test/utForPartialUpdate/ui_state_management/inner_struct_state_management/@link/@link.ts +++ b/compiler/test/utForPartialUpdate/ui_state_management/inner_struct_state_management/@link/@link.ts @@ -42,13 +42,6 @@ exports.expectResult = } setInitiallyProvidedValue(params) { } - setStateSourcePropertiesUnchanged() { - } - setOneWaySyncPropertiesUnchanged() { - } - setTwoWaySyncPropertiesUnchanged() { - this.__counter.SetPropertyUnchanged(); - } purgeVariableDependenciesOnElmtId(rmElmtId) { this.__counter.purgeDependencyOnElmtId(rmElmtId); } @@ -90,13 +83,6 @@ class ParentComponent extends View { this.value = params.value; } } - setStateSourcePropertiesUnchanged() { - this.__value.SetPropertyUnchanged(); - } - setOneWaySyncPropertiesUnchanged() { - } - setTwoWaySyncPropertiesUnchanged() { - } purgeVariableDependenciesOnElmtId(rmElmtId) { this.__value.purgeDependencyOnElmtId(rmElmtId); } diff --git a/compiler/test/utForPartialUpdate/ui_state_management/inner_struct_state_management/@objectLink/@objectLink.ts b/compiler/test/utForPartialUpdate/ui_state_management/inner_struct_state_management/@objectLink/@objectLink.ts index e89e261..7144bfa 100644 --- a/compiler/test/utForPartialUpdate/ui_state_management/inner_struct_state_management/@objectLink/@objectLink.ts +++ b/compiler/test/utForPartialUpdate/ui_state_management/inner_struct_state_management/@objectLink/@objectLink.ts @@ -79,13 +79,6 @@ class CustomText extends View { setInitiallyProvidedValue(params) { this.__model.set(params.model); } - setStateSourcePropertiesUnchanged() { - } - setOneWaySyncPropertiesUnchanged() { - } - setTwoWaySyncPropertiesUnchanged() { - this.__model.SetPropertyUnchanged(); - } purgeVariableDependenciesOnElmtId(rmElmtId) { this.__model.purgeDependencyOnElmtId(rmElmtId); } @@ -137,13 +130,6 @@ class Parent extends View { this.models = params.models; } } - setStateSourcePropertiesUnchanged() { - this.__models.SetPropertyUnchanged(); - } - setOneWaySyncPropertiesUnchanged() { - } - setTwoWaySyncPropertiesUnchanged() { - } purgeVariableDependenciesOnElmtId(rmElmtId) { this.__models.purgeDependencyOnElmtId(rmElmtId); } diff --git a/compiler/test/utForPartialUpdate/ui_state_management/inner_struct_state_management/@prop/@prop.ts b/compiler/test/utForPartialUpdate/ui_state_management/inner_struct_state_management/@prop/@prop.ts index df78558..27d59a3 100644 --- a/compiler/test/utForPartialUpdate/ui_state_management/inner_struct_state_management/@prop/@prop.ts +++ b/compiler/test/utForPartialUpdate/ui_state_management/inner_struct_state_management/@prop/@prop.ts @@ -42,13 +42,6 @@ exports.expectResult = } setInitiallyProvidedValue(params) { } - setStateSourcePropertiesUnchanged() { - } - setOneWaySyncPropertiesUnchanged() { - this.__counter.SetPropertyUnchanged(); - } - setTwoWaySyncPropertiesUnchanged() { - } purgeVariableDependenciesOnElmtId(rmElmtId) { this.__counter.purgeDependencyOnElmtId(rmElmtId); } @@ -90,13 +83,6 @@ class ParentComponent extends View { this.value = params.value; } } - setStateSourcePropertiesUnchanged() { - this.__value.SetPropertyUnchanged(); - } - setOneWaySyncPropertiesUnchanged() { - } - setTwoWaySyncPropertiesUnchanged() { - } purgeVariableDependenciesOnElmtId(rmElmtId) { this.__value.purgeDependencyOnElmtId(rmElmtId); } diff --git a/compiler/test/utForPartialUpdate/ui_state_management/inner_struct_state_management/@state/@state.ts b/compiler/test/utForPartialUpdate/ui_state_management/inner_struct_state_management/@state/@state.ts index d282fa2..52ba157 100644 --- a/compiler/test/utForPartialUpdate/ui_state_management/inner_struct_state_management/@state/@state.ts +++ b/compiler/test/utForPartialUpdate/ui_state_management/inner_struct_state_management/@state/@state.ts @@ -37,13 +37,6 @@ exports.expectResult = this.counter = params.counter; } } - setStateSourcePropertiesUnchanged() { - this.__counter.SetPropertyUnchanged(); - } - setOneWaySyncPropertiesUnchanged() { - } - setTwoWaySyncPropertiesUnchanged() { - } purgeVariableDependenciesOnElmtId(rmElmtId) { this.__counter.purgeDependencyOnElmtId(rmElmtId); }