git.delta.rocks / jrsonnet / refs/commits / dc0a0bacae12

difftreelog

refactor split libjsonnet code into modules

Лач2020-07-19parent: #3943cce.patch.diff
in: master

11 files changed

addedbindings/c/.gitignorediffbeforeafterboth
--- /dev/null
+++ b/bindings/c/.gitignore
@@ -0,0 +1 @@
+libjsonnet_test_file
modifiedbindings/js/index.jsdiffbeforeafterboth
--- a/bindings/js/index.js
+++ b/bindings/js/index.js
@@ -1,16 +1,48 @@
 const fs = require('fs');
+const path = require('path');
 const { WASI } = require('wasi');
 const wasi = new WASI({
 	args: process.argv,
 	env: process.env,
 	preopens: {},
 });
-const importObject = { wasi_snapshot_preview1: wasi.wasiImport };
 
 class JsonnetVM {
 	constructor(wasm, vm) {
 		this.wasm = wasm;
 		this.vm = vm;
+		this.wasm.exports.jrsonnet_set_trace_format(this.vm, 1);
+
+		this.setImportCallback((from, to) => {
+			const resolved = path.resolve(from, to);
+			return {
+				value: fs.readFileSync(resolved).toString('utf-8'),
+				foundHere: resolved,
+			};
+		})
+	}
+
+	/**
+	 * @param {(from: string, to: string) => {foundHere: string, value: string}} cb
+	 */
+	setImportCallback(cb) {
+		this.wasm.importCbs.set(this.vm, (base, rel, foundHere, success) => {
+			const baseStr = this.wasm.readString(base);
+			const relStr = this.wasm.readString(rel);
+			try {
+				const value = cb(baseStr, relStr);
+				this.wasm.memorySlice32Len(foundHere, 1)[0] = this.allocateString(value.foundHere);
+				this.wasm.memorySlice32Len(success, 1)[0] = 1;
+				return this.allocateString(value.value);
+			} catch (e) {
+				this.wasm.memorySlice32Len(success, 1)[0] = 0;
+				return this.allocateString(e.stack)
+			}
+		});
+		this.wasm.exports.jrsonnet_apply_static_import_callback(
+			this.vm,
+			this.vm,
+		);
 	}
 
 	alloc(length) {
@@ -18,7 +50,7 @@
 	}
 	allocateString(string) {
 		const byteLength = new TextEncoder().encode(string).length;
-		const addr = this.alloc(byteLength);
+		const addr = this.alloc(byteLength + 1);
 		this.wasm.writeString(addr, string);
 		return addr;
 	}
@@ -36,7 +68,7 @@
 		const result = this.wasm.readString(resultAddr).trim();
 		this.dealloc(resultAddr);
 		if (resultCode[0] === 1) {
-			const error = new Error(this.normalizeErrorString(result));
+			const error = new Error(result);
 			throw error;
 		} else {
 			return result;
@@ -54,31 +86,46 @@
 		const result = this.wasm.readString(resultAddr);
 		this.dealloc(resultAddr);
 		if (resultCode[0] === 1) {
-			const error = new Error(this.normalizeErrorString(result));
+			const error = new Error(result);
 			throw error;
 		} else {
 			return result;
 		}
 	}
-	normalizeErrorString(str) {
-		str = str.trim();
-		const newLine = str.indexOf('\n');
-		if (newLine === -1) return str;
-		let message = str.slice(0, newLine);
-		let trace = str.slice(newLine + 1).split('\n').map(s => s.split(' ---- ')).map(([p, v]) => `    at ${v} (${p})`).join('\n');
-		return `${message}\n${trace}`;
+
+	/**
+	 * Destroys vm, any future call to this object will fail, and all resources will be freed
+	 */
+	destroy() {
+		this.wasm.exports.jsonnet_destroy(this.vm);
+		this.wasm.importCbs.delete(this.vm);
 	}
 }
 
 class JsonnetWASM {
-	constructor() { }
+	constructor() {
+		this.importCbs = new Map();
+	}
 
 	async init(buf) {
 		const wasm = await WebAssembly.compile(buf);
-		const instance = await WebAssembly.instantiate(wasm, importObject);
+		const instance = await WebAssembly.instantiate(wasm, {
+			wasi_snapshot_preview1: wasi.wasiImport,
+			env: {
+				_jrsonnet_static_import_callback: (ctx, base, rel, found_here, success) => {
+					if (!this.importCbs.has(ctx)) {
+						throw new Error(`Got unknown ctx callback: ${ctx}`);
+					}
+					return this.importCbs.get(ctx)(base, rel, found_here, success);
+				}
+			}
+		});
 		wasi.start(instance);
 		this.instance = instance;
 	}
+	/**
+	 * @type Record<string, WebAssembly.ExportValue>
+	 */
 	get exports() {
 		return this.instance.exports;
 	}
@@ -91,6 +138,9 @@
 	memorySliceLen(start, length) {
 		return new Uint8Array(this.memoryBuffer, start, length);
 	}
+	memorySlice32Len(start, length) {
+		return new Uint32Array(this.memoryBuffer, start, length);
+	}
 	memorySlice(start, end) {
 		return new Uint8Array(this.memoryBuffer, start, start && end && (end - start));
 	}
@@ -119,15 +169,13 @@
 (async () => {
 	try {
 		const jsonnet = new JsonnetWASM();
-		await jsonnet.init(fs.readFileSync(`${__dirname}/../../target/wasm32-wasi/release/jsonnet.wasi.wasm`));
+		await jsonnet.init(fs.readFileSync(`${__dirname}/../../target/wasm32-wasi/release/jsonnet.wasm`));
 		console.log(`Version = ${jsonnet.version()}`);
 
 		const vm = jsonnet.newVM();
 		console.log(vm.evaluateSnippet('./snip.jsonnet', `
-			local a(b) = error "sad" + b;
-			local c() = a(2 + 2);
-			c()
-		`))
+			2+2
+		`));
 		console.log(vm.evaluateFile('./test.jsonnet'));
 	} catch (e) {
 		console.log(e.stack);
modifiedbindings/jsonnet/Cargo.tomldiffbeforeafterboth
--- a/bindings/jsonnet/Cargo.toml
+++ b/bindings/jsonnet/Cargo.toml
@@ -9,7 +9,6 @@
 [dependencies]
 jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "1.0.0" }
 jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "1.0.0" }
-libc = "0.2.71"
 
 [lib]
 crate-type = ["cdylib"]
addedbindings/jsonnet/src/interop.rsdiffbeforeafterboth
--- /dev/null
+++ b/bindings/jsonnet/src/interop.rs
@@ -0,0 +1,36 @@
+//! Jrsonnet specific additional binding helpers
+
+use crate::import::jsonnet_import_callback;
+use jrsonnet_evaluator::EvaluationState;
+use std::{
+	ffi::c_void,
+	os::raw::{c_char, c_int},
+};
+
+extern "C" {
+	pub fn _jrsonnet_static_import_callback(
+		ctx: *mut c_void,
+		base: *const c_char,
+		rel: *const c_char,
+		found_here: *mut *const c_char,
+		success: &mut c_int,
+	) -> *const c_char;
+}
+
+/// # Safety
+#[no_mangle]
+pub unsafe extern "C" fn jrsonnet_apply_static_import_callback(
+	vm: &EvaluationState,
+	ctx: *mut c_void,
+) {
+	jsonnet_import_callback(vm, _jrsonnet_static_import_callback, ctx)
+}
+
+#[no_mangle]
+pub extern "C" fn jrsonnet_set_trace_format(vm: &EvaluationState, format: u8) {
+	use jrsonnet_evaluator::trace::JSFormat;
+	match format {
+		1 => vm.set_trace_format(Box::new(JSFormat)),
+		_ => panic!("unknown trace format"),
+	}
+}
modifiedbindings/jsonnet/src/lib.rsdiffbeforeafterboth
after · bindings/jsonnet/src/lib.rs
1#![feature(custom_inner_attributes)]23pub mod import;4pub mod interop;5pub mod val_extract;6pub mod val_make;7pub mod val_modify;8pub mod vars_tlas;910use import::NativeImportResolver;11use jrsonnet_evaluator::{EvaluationState, ManifestFormat, Val};12use std::{13	alloc::Layout,14	ffi::{CStr, CString},15	os::raw::{c_char, c_double, c_int, c_uint},16	path::PathBuf,17	rc::Rc,18};1920/// WASM stub21#[no_mangle]22pub extern "C" fn _start() {}2324#[no_mangle]25pub extern "C" fn jsonnet_version() -> &'static [u8; 8] {26	b"v0.16.0\0"27}2829#[no_mangle]30pub extern "C" fn jsonnet_make() -> *mut EvaluationState {31	let state = EvaluationState::default();32	state.with_stdlib();33	state.settings_mut().import_resolver = Box::new(NativeImportResolver::default());34	Box::into_raw(Box::new(state))35}3637/// # Safety38#[no_mangle]39#[allow(clippy::boxed_local)]40pub unsafe extern "C" fn jsonnet_destroy(vm: *mut EvaluationState) {41	Box::from_raw(vm);42}4344#[no_mangle]45pub extern "C" fn jsonnet_max_stack(vm: &EvaluationState, v: c_uint) {46	vm.settings_mut().max_stack = v as usize;47}4849// jrsonnet currently have no GC, so these functions is no-op50#[no_mangle]51pub extern "C" fn jsonnet_gc_min_objects(_vm: &EvaluationState, _v: c_uint) {}52#[no_mangle]53pub extern "C" fn jsonnet_gc_growth_trigger(_vm: &EvaluationState, _v: c_double) {}5455#[no_mangle]56pub extern "C" fn jsonnet_string_output(vm: &EvaluationState, v: c_int) {57	match v {58		1 => vm.set_manifest_format(ManifestFormat::None),59		0 => vm.set_manifest_format(ManifestFormat::Json(4)),60		_ => panic!("incorrect output format"),61	}62}6364/// # Safety65///66/// This function is most definitely broken, but it works somehow, see TODO inside67#[no_mangle]68pub unsafe extern "C" fn jsonnet_realloc(69	_vm: &EvaluationState,70	buf: *mut u8,71	sz: usize,72) -> *mut u8 {73	if buf.is_null() {74		assert!(sz != 0);75		return std::alloc::alloc(Layout::from_size_align(sz, std::mem::align_of::<u8>()).unwrap());76	}77	// TODO: Somehow store size of allocation, because its real size is probally not 16 :D78	// OR (Alternative way of fixing this TODO)79	// TODO: Standard allocator uses malloc, and it doesn't uses allocation size,80	// TODO: so it should work in normal cases. Maybe force allocator for this library?81	let old_layout = Layout::from_size_align(16, std::mem::align_of::<u8>()).unwrap();82	if sz == 0 {83		std::alloc::dealloc(buf, old_layout);84		return std::ptr::null_mut();85	}86	std::alloc::realloc(buf, old_layout, sz)87}8889/// # Safety90#[no_mangle]91#[allow(clippy::boxed_local)]92pub unsafe extern "C" fn jsonnet_json_destroy(_vm: &EvaluationState, v: *mut Val) {93	Box::from_raw(v);94}9596#[no_mangle]97pub extern "C" fn jsonnet_native_callback() {98	todo!()99}100101#[no_mangle]102pub extern "C" fn jsonnet_max_trace(vm: &EvaluationState, v: c_uint) {103	vm.set_max_trace(v as usize)104}105106/// # Safety107///108/// This function is safe, if received v is a pointer to normal C string109#[no_mangle]110pub unsafe extern "C" fn jsonnet_evaluate_file(111	vm: &EvaluationState,112	filename: *const c_char,113	error: &mut c_int,114) -> *const c_char {115	vm.run_in_state(|| {116		let filename = CStr::from_ptr(filename);117		match vm118			.evaluate_file_raw_nocwd(&PathBuf::from(filename.to_str().unwrap()))119			.and_then(|v| vm.with_tla(v))120			.and_then(|v| vm.manifest(v))121		{122			Ok(v) => {123				*error = 0;124				CString::new(&*v as &str).unwrap().into_raw()125			}126			Err(e) => {127				*error = 1;128				let out = vm.stringify_err(&e);129				CString::new(&out as &str).unwrap().into_raw()130			}131		}132	})133}134135/// # Safety136///137/// This function is safe, if received v is a pointer to normal C string138#[no_mangle]139pub unsafe extern "C" fn jsonnet_evaluate_snippet(140	vm: &EvaluationState,141	filename: *const c_char,142	snippet: *const c_char,143	error: &mut c_int,144) -> *const c_char {145	vm.run_in_state(|| {146		let filename = CStr::from_ptr(filename);147		let snippet = CStr::from_ptr(snippet);148		match vm149			.evaluate_snippet_raw(150				Rc::new(PathBuf::from(filename.to_str().unwrap())),151				snippet.to_str().unwrap().into(),152			)153			.and_then(|v| vm.with_tla(v))154			.and_then(|v| vm.manifest(v))155		{156			Ok(v) => {157				*error = 0;158				CString::new(&*v as &str).unwrap().into_raw()159			}160			Err(e) => {161				*error = 1;162				let out = vm.stringify_err(&e);163				CString::new(&out as &str).unwrap().into_raw()164			}165		}166	})167}168169#[no_mangle]170pub extern "C" fn jsonnet_evaluate_file_multi() {171	todo!()172}173#[no_mangle]174pub extern "C" fn jsonnet_evaluate_snippet_multi() {175	todo!()176}177#[no_mangle]178pub extern "C" fn jsonnet_evaluate_file_stream() {179	todo!()180}181#[no_mangle]182pub extern "C" fn jsonnet_evaluate_snippet_stream() {183	todo!()184}
addedbindings/jsonnet/src/val_extract.rsdiffbeforeafterboth
--- /dev/null
+++ b/bindings/jsonnet/src/val_extract.rs
@@ -0,0 +1,45 @@
+//! Extract values from VM
+
+use jrsonnet_evaluator::{EvaluationState, Val};
+
+use std::{
+	ffi::CString,
+	os::raw::{c_char, c_double, c_int},
+};
+
+#[no_mangle]
+pub extern "C" fn jsonnet_json_extract_string(_vm: &EvaluationState, v: &Val) -> *mut c_char {
+	match v.unwrap_if_lazy().unwrap() {
+		Val::Str(s) => CString::new(&*s as &str).unwrap().into_raw(),
+		_ => std::ptr::null_mut(),
+	}
+}
+#[no_mangle]
+pub extern "C" fn jsonnet_json_extract_number(
+	_vm: &EvaluationState,
+	v: &Val,
+	out: &mut c_double,
+) -> c_int {
+	match v.unwrap_if_lazy().unwrap() {
+		Val::Num(n) => {
+			*out = n;
+			1
+		}
+		_ => 0,
+	}
+}
+#[no_mangle]
+pub extern "C" fn jsonnet_json_extract_bool(_vm: &EvaluationState, v: &Val) -> c_int {
+	match v.unwrap_if_lazy().unwrap() {
+		Val::Bool(false) => 0,
+		Val::Bool(true) => 1,
+		_ => 2,
+	}
+}
+#[no_mangle]
+pub extern "C" fn jsonnet_json_extract_null(_vm: &EvaluationState, v: &Val) -> c_int {
+	match v.unwrap_if_lazy().unwrap() {
+		Val::Null => 1,
+		_ => 0,
+	}
+}
addedbindings/jsonnet/src/val_make.rsdiffbeforeafterboth
--- /dev/null
+++ b/bindings/jsonnet/src/val_make.rs
@@ -0,0 +1,47 @@
+//! Create values in VM
+
+use jrsonnet_evaluator::{EvaluationState, ObjValue, Val};
+use std::{
+	ffi::CStr,
+	os::raw::{c_char, c_double, c_int},
+	rc::Rc,
+};
+
+/// # Safety
+///
+/// This function is safe, if received v is a pointer to normal C string
+#[no_mangle]
+pub unsafe extern "C" fn jsonnet_json_make_string(
+	_vm: &EvaluationState,
+	v: *const c_char,
+) -> *mut Val {
+	let cstr = CStr::from_ptr(v);
+	let str = cstr.to_str().unwrap();
+	Box::into_raw(Box::new(Val::Str(str.into())))
+}
+
+#[no_mangle]
+pub extern "C" fn jsonnet_json_make_number(_vm: &EvaluationState, v: c_double) -> *mut Val {
+	Box::into_raw(Box::new(Val::Num(v)))
+}
+
+#[no_mangle]
+pub extern "C" fn jsonnet_json_make_bool(_vm: &EvaluationState, v: c_int) -> *mut Val {
+	assert!(v == 0 || v == 1);
+	Box::into_raw(Box::new(Val::Bool(v == 1)))
+}
+
+#[no_mangle]
+pub extern "C" fn jsonnet_json_make_null(_vm: &EvaluationState) -> *mut Val {
+	Box::into_raw(Box::new(Val::Null))
+}
+
+#[no_mangle]
+pub extern "C" fn jsonnet_json_make_array(_vm: &EvaluationState) -> *mut Val {
+	Box::into_raw(Box::new(Val::Arr(Rc::new(Vec::new()))))
+}
+
+#[no_mangle]
+pub extern "C" fn jsonnet_json_make_object(_vm: &EvaluationState) -> *mut Val {
+	Box::into_raw(Box::new(Val::Obj(ObjValue::new_empty())))
+}
addedbindings/jsonnet/src/val_modify.rsdiffbeforeafterboth
--- /dev/null
+++ b/bindings/jsonnet/src/val_modify.rs
@@ -0,0 +1,55 @@
+//! Modify VM values
+//! Only tested with variables, which haven't altered by code before appearing here
+//! In jrsonnet every value is immutable, and this code is probally broken
+
+use jrsonnet_evaluator::{EvaluationState, LazyBinding, LazyVal, ObjMember, ObjValue, Val};
+use jrsonnet_parser::Visibility;
+use std::{collections::HashMap, ffi::CStr, os::raw::c_char, rc::Rc};
+
+/// # Safety
+///
+/// Received arr value should be correct pointer to array allocated by make_array
+#[no_mangle]
+pub unsafe extern "C" fn jsonnet_json_array_append(
+	_vm: &EvaluationState,
+	arr: *mut Val,
+	val: &Val,
+) {
+	match *Box::from_raw(arr) {
+		Val::Arr(old) => {
+			let mut new = Rc::try_unwrap(old).expect("arr with no refs");
+			new.push(val.clone());
+			*arr = Val::Arr(Rc::new(new));
+		}
+		_ => panic!("should receive array"),
+	}
+}
+
+/// # Safety
+///
+/// This function is safe if passed name is ok
+#[no_mangle]
+pub unsafe extern "C" fn jsonnet_json_object_append(
+	_vm: &EvaluationState,
+	obj: &mut Val,
+	name: *const c_char,
+	val: &Val,
+) {
+	match obj {
+		Val::Obj(old) => {
+			let mut new = HashMap::new();
+			new.insert(
+				CStr::from_ptr(name).to_str().unwrap().into(),
+				ObjMember {
+					add: false,
+					visibility: Visibility::Normal,
+					invoke: LazyBinding::Bound(LazyVal::new_resolved(val.clone())),
+					location: None,
+				},
+			);
+			let new_obj = ObjValue::new(Some(old.clone()), Rc::new(new));
+			*obj = Val::Obj(new_obj);
+		}
+		_ => panic!("should receive object"),
+	}
+}
addedbindings/jsonnet/src/vars_tlas.rsdiffbeforeafterboth
--- /dev/null
+++ b/bindings/jsonnet/src/vars_tlas.rs
@@ -0,0 +1,64 @@
+//! Manipulate external variables and top level arguments
+
+use jrsonnet_evaluator::EvaluationState;
+use std::{ffi::CStr, os::raw::c_char};
+
+/// # Safety
+#[no_mangle]
+pub unsafe extern "C" fn jsonnet_ext_var(
+	vm: &EvaluationState,
+	name: *const c_char,
+	value: *const c_char,
+) {
+	let name = CStr::from_ptr(name);
+	let value = CStr::from_ptr(value);
+	vm.add_ext_str(
+		name.to_str().unwrap().into(),
+		value.to_str().unwrap().into(),
+	)
+}
+
+/// # Safety
+#[no_mangle]
+pub unsafe extern "C" fn jsonnet_ext_code(
+	vm: &EvaluationState,
+	name: *const c_char,
+	value: *const c_char,
+) {
+	let name = CStr::from_ptr(name);
+	let value = CStr::from_ptr(value);
+	vm.add_ext_code(
+		name.to_str().unwrap().into(),
+		value.to_str().unwrap().into(),
+	)
+	.unwrap()
+}
+/// # Safety
+#[no_mangle]
+pub unsafe extern "C" fn jsonnet_tla_var(
+	vm: &EvaluationState,
+	name: *const c_char,
+	value: *const c_char,
+) {
+	let name = CStr::from_ptr(name);
+	let value = CStr::from_ptr(value);
+	vm.add_tla_str(
+		name.to_str().unwrap().into(),
+		value.to_str().unwrap().into(),
+	)
+}
+/// # Safety
+#[no_mangle]
+pub unsafe extern "C" fn jsonnet_tla_code(
+	vm: &EvaluationState,
+	name: *const c_char,
+	value: *const c_char,
+) {
+	let name = CStr::from_ptr(name);
+	let value = CStr::from_ptr(value);
+	vm.add_tla_code(
+		name.to_str().unwrap().into(),
+		value.to_str().unwrap().into(),
+	)
+	.unwrap()
+}
deletedbindings/test.jsonnetdiffbeforeafterboth
--- a/bindings/test.jsonnet
+++ /dev/null
@@ -1 +0,0 @@
-2 + 2
modifiedcrates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -56,10 +56,17 @@
 	StackOverflow,
 	FractionalIndex,
 	DivisionByZero,
+
+	StringManifestOutputIsNotAString,
+
+	ImportCallbackError(String),
 }
 
 #[derive(Clone, Debug)]
-pub struct StackTraceElement(pub ExprLocation, pub String);
+pub struct StackTraceElement {
+	pub location: ExprLocation,
+	pub desc: String,
+}
 #[derive(Debug, Clone)]
 pub struct StackTrace(pub Vec<StackTraceElement>);