Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions lively.serializer2/plugins/expression-serializer.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,9 @@ export default class ExpressionSerializer {
}

getModuleExports (modName) {
const m = System.get('@lively-env').loadedModules[this.resolveModule(modName)];
return m ? m.record().exports : {};
const moduleId = this.resolveModule(modName);
const m = System.get('@lively-env').loadedModules[moduleId];
return m?.record()?.exports || System.get(moduleId) || {};
}

async ensureAllBindingsLoaded (exprObj) {
Expand Down
26 changes: 26 additions & 0 deletions lively.serializer2/tests/expression-serializer-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,36 @@
import { expect, chai } from 'mocha-es6';

import { obj } from 'lively.lang';
import module from 'lively.modules/src/module.js';
import ExpressionSerializer from '../plugins/expression-serializer.js';

let sut = new ExpressionSerializer({ prefix: '_prefix' });

describe('expression serializer module exports', () => {
it('preserves exports from a live module record', () => {
const id = System.decanonicalize('lively.serializer2/tests/expression-serializer-test.js');
const record = module(System, id).record();
expect(record).to.be.ok;
expect(sut.getModuleExports(id)).equals(record.exports);
});

it('reads a registered namespace without a live module record', async () => {
const id = 'lively://expression-serializer-test/registered.js';
const namespace = System.newModule({ answer: 42 });
System.set(id, namespace);
const registeredModule = module(System, id);
try {
expect(registeredModule.record()).equals(null);
expect(sut.getModuleExports(id)).equals(namespace);
expect(sut.getModuleExports(id).answer).equals(42);
} finally { await registeredModule.unload({ forgetDeps: false }); }
});

it('returns no exports for an unloaded module', () => {
expect(sut.getModuleExports('lively://expression-serializer-test/missing.js')).deep.equals({});
});
});

describe('expression serializer format', () => {
describe('encode', () => {
it('just expression', () =>
Expand Down
Loading