Commit 4db8493

authored

feat: refactor type model (#194)

Removed the maps in the typemodel class and created a TypeNode object

1 parent 6b4543a commit 4db8493Copy full SHA for 4db8493

File tree

+604

-606

lines changed

+604

-606

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ export class InferenceTypeModelFactory extends TypeModelFactory {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`createNewTypeProbability(id: string, bindingId: string) {`
`63`		`- this._typeModel.addId(bindingId);`
	`63`	`+ this._typeModel.createTypeNode(bindingId);`
`64`	`64`
`65`	`65`	`if (id === bindingId) {`
`66`	`66`	`// don't set if the id and binding are equal`

Lines changed: 30 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`* limitations under the License.`
`17`	`17`	`*/`
`18`	`18`
`19`		`-export interface ObjectType {`
	`19`	`+export class ObjectType {`
`20`	`20`	`// name -> id`
`21`	`21`	`properties: Map<string, string>;`
`22`	`22`
`@@ -31,6 +31,35 @@ export interface ObjectType {`
`31`	`31`	`parameterNames: Map<number, string>;`
`32`	`32`	`// id`
`33`	`33`	`return: Set<string>;`
	`34`	`+`
	`35`	`+ constructor() {`
	`36`	`+ this.properties = new Map();`
	`37`	`+ this.elements = new Set();`
	`38`	`+ this.parameters = new Map();`
	`39`	`+ this.parameterNames = new Map();`
	`40`	`+ this.return = new Set();`
	`41`	`+ }`
	`42`	`+`
	`43`	`+ public merge(other: ObjectType): ObjectType {`
	`44`	`+ const combined = new ObjectType();`
	`45`	`+`
	`46`	`+ combined.properties = new Map([`
	`47`	`+ ...this.properties.entries(),`
	`48`	`+ ...other.properties.entries(),`
	`49`	`+ ]);`
	`50`	`+ combined.elements = new Set(...this.elements, ...other.elements);`
	`51`	`+ combined.parameters = new Map([`
	`52`	`+ ...this.parameters.entries(),`
	`53`	`+ ...other.parameters.entries(),`
	`54`	`+ ]);`
	`55`	`+ combined.parameterNames = new Map([`
	`56`	`+ ...this.parameterNames.entries(),`
	`57`	`+ ...other.parameterNames.entries(),`
	`58`	`+ ]);`
	`59`	`+ combined.return = new Set(...this.return, ...other.return);`
	`60`	`+`
	`61`	`+ return combined;`
	`62`	`+ }`
`34`	`63`	`}`
`35`	`64`
`36`	`65`	`export const functionProperties = new Set([`

Comments

(0)