Skip to content

Fix for new Function calls (alternative) #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liborm85 merged 1 commit into from
Apr 18, 2020
Merged

Fix for new Function calls (alternative) #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions src/VersionedStruct.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,15 @@ const Struct = require('./Struct');
class VersionedStruct extends Struct {
constructor(type, versions = {}) {
super();
this.type = type;
this.type = type;
this.versions = versions;
if (typeof this.type === 'string') {
this.versionGetter = new Function('parent', `return parent.${this.type}`);
this.versionSetter = new Function('parent', 'version', `return parent.${this.type} = version`);
}
}

decode(stream, parent, length = 0) {
decode(stream, parent, length = 0) {
const res = this._setup(stream, parent, length);

if (typeof this.type === 'string') {
res.version = this.versionGetter(parent);
res.version = parent[this.type];
} else {
res.version = this.type.decode(stream);
}
Expand All @@ -42,11 +38,11 @@ class VersionedStruct extends Struct {
}

size(val, parent, includePointers = true) {
let key, type;
let key, type;
if (!val) {
throw new Error('Not a fixed size');
}

const ctx = {
parent,
val,
Expand Down