Skip to content
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

Jump to bottom

Enhance APIs for creating byte streams from strings #1681

Merged
merged 1 commit into from
Sep 22, 2024
Merged

Enhance APIs for creating byte streams from strings #1681

Show file tree
Hide file tree
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
150 changes: 99 additions & 51 deletions loader/jrunscript/io.fifty.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,15 +249,34 @@ namespace slime.jrunscript.runtime.io {
onFinish: (i: slime.jrunscript.native.java.io.InputStream, o: slime.jrunscript.native.java.io.OutputStream) => void
}

(
function(
fifty: slime.fifty.test.Kit
) {
fifty.tests.exports = fifty.test.Parent();
}
//@ts-ignore
)(fifty);

export interface Exports {
InputStream: {
from: {
java: (p: slime.jrunscript.native.java.io.InputStream) => InputStream

string: (p: {
string: string
charset: Charset
}) => InputStream
/**
* A set of operations that allow the creation of {@link InputStream}s from strings.
*/
string: {
/**
* A version that allows the specification of an encoding when creating the input stream.
*/
encoding: (p: {
string: string
charset: Charset
}) => InputStream

default: (p: string) => InputStream
}
}
}
}
Expand All @@ -271,7 +290,7 @@ namespace slime.jrunscript.runtime.io {
fifty.tests.InputStream = function() {
var utf8 = test.subject.Charset.standard.utf8;

var input = test.subject.InputStream.from.string({
var input = test.subject.InputStream.from.string.encoding({
charset: utf8,
string: "foo"
});
Expand Down Expand Up @@ -423,67 +442,40 @@ namespace slime.jrunscript.runtime.io {
}
}

(
function(
fifty: slime.fifty.test.Kit
) {
const { verify, run } = fifty;

fifty.tests.suite = function() {
verify(test.subject,"subject").is.type("object");

run(fifty.tests.Streams);
run(fifty.tests.Buffer);
run(fifty.tests.InputStream);

if (fifty.tests.E4X) run(fifty.tests.E4X);
}
}
//@ts-ignore
)(fifty);

export interface Events<T> {
progress: T
done: void
}

export interface LineEvents extends Events<string> {
line: string
}

export interface Exports {
character: {
default: {
all: slime.$api.fp.world.Means<InputStream, Events<string>>
lines: slime.$api.fp.world.Means<InputStream, Events<string>>
lines: (ending: string) => slime.$api.fp.world.Means<InputStream, LineEvents>
}
}
}

(
function(
Packages: slime.jrunscript.Packages,
fifty: slime.fifty.test.Kit
) {
const { verify } = fifty;
const { $api, jsh } = fifty.global;

fifty.tests.manual = {};

fifty.tests.manual.charsets = function() {
var _map = Packages.java.nio.charset.Charset.availableCharsets();
var _keys = _map.keySet().iterator();
while(_keys.hasNext()) {
jsh.shell.console(String(_keys.next()));
}
var _default = Packages.java.nio.charset.Charset.defaultCharset();
jsh.shell.console(String(_default));
};
fifty.tests.exports.character = fifty.test.Parent();

fifty.tests.manual.character = fifty.test.Parent();
fifty.tests.exports.character.default = fifty.test.Parent();

fifty.tests.manual.character.default = fifty.test.Parent();
var original = "foo\nbar\nbaz";

fifty.tests.manual.character.default.all = function() {
var me = fifty.jsh.file.object.getRelativePath("io.fifty.ts").java.adapt();
var _is = new Packages.java.io.FileInputStream(me);
var input = test.subject.InputStream.from.java(_is);
var all;
fifty.tests.exports.character.default.all = function() {
var input = test.subject.InputStream.from.string.default(original);
var all: string;
$api.fp.world.Means.now({
means: test.subject.character.default.all,
order: input,
Expand All @@ -493,24 +485,80 @@ namespace slime.jrunscript.runtime.io {
}
}
});
jsh.shell.console(all);
verify(all).is(original);
}

fifty.tests.manual.character.default.lines = function() {
var me = fifty.jsh.file.object.getRelativePath("io.fifty.ts").java.adapt();
var _is = new Packages.java.io.FileInputStream(me);
var input = test.subject.InputStream.from.java(_is);
var lines = function(original: string, expected: string[]) {
var input = test.subject.InputStream.from.string.default(original);
var lines: string[] = [];
var all: string = "";
$api.fp.world.Means.now({
means: test.subject.character.default.lines,
means: test.subject.character.default.lines("\n"),
order: input,
handlers: {
progress: function(e) {
jsh.shell.console("LINE: " + e.detail);
all += e.detail;
},
line: function(e) {
lines.push(e.detail);
}
}
});
verify(all).is(original);
verify(lines).length.is(expected.length);
for (var i=0; i<expected.length; i++) {
verify(lines)[i].is(expected[i]);
}
}

fifty.tests.exports.character.default.lines = function() {
lines(original, ["foo","bar","baz"]);
lines(original + "\n", ["foo","bar","baz",""]);
}
}
//@ts-ignore
)(fifty);

(
function(
fifty: slime.fifty.test.Kit
) {
const { verify, run } = fifty;

fifty.tests.suite = function() {
verify(test.subject,"subject").is.type("object");

run(fifty.tests.Streams);
run(fifty.tests.Buffer);
run(fifty.tests.InputStream);

if (fifty.tests.E4X) run(fifty.tests.E4X);

run(fifty.tests.exports);
}
}
//@ts-ignore
)(fifty);

(
function(
Packages: slime.jrunscript.Packages,
fifty: slime.fifty.test.Kit
) {
const { jsh } = fifty.global;

fifty.tests.manual = {};

fifty.tests.manual.charsets = function() {
var _map = Packages.java.nio.charset.Charset.availableCharsets();
var _keys = _map.keySet().iterator();
while(_keys.hasNext()) {
jsh.shell.console(String(_keys.next()));
}
var _default = Packages.java.nio.charset.Charset.defaultCharset();
jsh.shell.console(String(_default));
};
}
//@ts-ignore
)(Packages,fifty);
}
80 changes: 49 additions & 31 deletions loader/jrunscript/io.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,13 +371,26 @@
InputStream: {
from: {
java: InputStream,
string: function(p) {
var buffer = new Buffer();
var writer = p.charset.write(buffer.writeBinary());
writer.write(p.string);
writer.close();
return buffer.readBinary();
}
string: (
function() {
var charset = Charset(Packages.java.nio.charset.Charset.defaultCharset());
/** @type { slime.jrunscript.runtime.io.Exports["InputStream"]["from"]["string"]["encoding"] } */
var encoding = function(p) {
var buffer = new Buffer();
var writer = p.charset.write(buffer.writeBinary());
writer.write(p.string);
writer.close();
return buffer.readBinary();
};

var string = $api.fp.now(encoding, $api.fp.curry({ charset: charset }), $api.fp.flatten("string"));

return {
encoding: encoding,
default: string
}
}
)()
}
},
OutputStream: OutputStream,
Expand Down Expand Up @@ -408,7 +421,7 @@
Packages.inonit.script.runtime.io.Streams.ReadEvents,
{
progress: function(string) {
events.fire("progress", string);
events.fire("progress", String(string));
},
error: function(e) {
// TODO improve
Expand All @@ -422,30 +435,35 @@
);
}
},
lines: function(input) {
return function(events) {
var charset = String(Packages.java.nio.charset.Charset.defaultCharset().name());
var reader = input.character({ charset: charset });
$context._streams.readLines(
reader.java.adapt(),
"\n",
new JavaAdapter(
Packages.inonit.script.runtime.io.Streams.ReadEvents,
{
progress: function(string) {
events.fire("progress", string);
},
error: function(e) {
// TODO improve
throw new Error();
},
done: function() {
events.fire("done");
lines: function(ending) {
return function(input) {
return function(events) {
var charset = String(Packages.java.nio.charset.Charset.defaultCharset().name());
var reader = input.character({ charset: charset });
$context._streams.readLines(
reader.java.adapt(),
ending,
new JavaAdapter(
Packages.inonit.script.runtime.io.Streams.ReadEvents,
{
progress: function(_string) {
var string = String(_string);
events.fire("progress", string);
var terminated = string.substring(string.length - ending.length) == ending;
events.fire("line", (terminated) ? string.substring(0, string.length - ending.length) : string);
},
error: function(e) {
// TODO improve
throw new Error();
},
done: function() {
events.fire("done");
}
}
}
)
);
}
)
);
}
};
}
}
}
Expand Down
Loading