aboutsummaryrefslogtreecommitdiff
path: root/src/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/api')
-rw-r--r--src/api/demo/pages/two.tsx0
-rw-r--r--src/api/schema.d.ts3
-rw-r--r--src/api/schema.js50
-rw-r--r--src/api/schema.peechy16
-rw-r--r--src/api/schema.zig47
5 files changed, 65 insertions, 51 deletions
diff --git a/src/api/demo/pages/two.tsx b/src/api/demo/pages/two.tsx
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/src/api/demo/pages/two.tsx
diff --git a/src/api/schema.d.ts b/src/api/schema.d.ts
index 9d495e93a..58207e2f9 100644
--- a/src/api/schema.d.ts
+++ b/src/api/schema.d.ts
@@ -253,11 +253,13 @@ type uint32 = number;
export interface LoadedRouteConfig {
dir: string;
extensions: string[];
+ static_dir: string;
}
export interface RouteConfig {
dir?: string;
extensions?: string[];
+ static_dir?: string;
}
export interface TransformOptions {
@@ -278,7 +280,6 @@ type uint32 = number;
platform?: Platform;
serve?: boolean;
extension_order?: string[];
- public_dir?: string;
only_scan_dependencies?: ScanDependencyMode;
generate_node_module_bundle?: boolean;
node_modules_bundle_path?: string;
diff --git a/src/api/schema.js b/src/api/schema.js
index 357692898..40a6f132e 100644
--- a/src/api/schema.js
+++ b/src/api/schema.js
@@ -697,6 +697,7 @@ function decodeLoadedRouteConfig(bb) {
var length = bb.readVarUint();
var values = result["extensions"] = Array(length);
for (var i = 0; i < length; i++) values[i] = bb.readString();
+ result["static_dir"] = bb.readString();
return result;
}
@@ -721,6 +722,13 @@ function encodeLoadedRouteConfig(message, bb) {
throw new Error("Missing required field \"extensions\"");
}
+ var value = message["static_dir"];
+ if (value != null) {
+ bb.writeString(value);
+ } else {
+ throw new Error("Missing required field \"static_dir\"");
+ }
+
}
function decodeRouteConfig(bb) {
@@ -741,6 +749,10 @@ function decodeRouteConfig(bb) {
for (var i = 0; i < length; i++) values[i] = bb.readString();
break;
+ case 3:
+ result["static_dir"] = bb.readString();
+ break;
+
default:
throw new Error("Attempted to parse invalid message");
}
@@ -765,6 +777,12 @@ function encodeRouteConfig(message, bb) {
bb.writeString(value);
}
}
+
+ var value = message["static_dir"];
+ if (value != null) {
+ bb.writeByte(3);
+ bb.writeString(value);
+ }
bb.writeByte(0);
}
@@ -856,30 +874,26 @@ function decodeTransformOptions(bb) {
break;
case 18:
- result["public_dir"] = bb.readString();
- break;
-
- case 19:
result["only_scan_dependencies"] = ScanDependencyMode[bb.readByte()];
break;
- case 20:
+ case 19:
result["generate_node_module_bundle"] = !!bb.readByte();
break;
- case 21:
+ case 20:
result["node_modules_bundle_path"] = bb.readString();
break;
- case 22:
+ case 21:
result["node_modules_bundle_path_server"] = bb.readString();
break;
- case 23:
+ case 22:
result["framework"] = decodeFrameworkConfig(bb);
break;
- case 24:
+ case 23:
result["router"] = decodeRouteConfig(bb);
break;
@@ -1022,15 +1036,9 @@ bb.writeByte(encoded);
}
}
- var value = message["public_dir"];
- if (value != null) {
- bb.writeByte(18);
- bb.writeString(value);
- }
-
var value = message["only_scan_dependencies"];
if (value != null) {
- bb.writeByte(19);
+ bb.writeByte(18);
var encoded = ScanDependencyMode[value];
if (encoded === void 0) throw new Error("Invalid value " + JSON.stringify(value) + " for enum \"ScanDependencyMode\"");
bb.writeByte(encoded);
@@ -1038,31 +1046,31 @@ bb.writeByte(encoded);
var value = message["generate_node_module_bundle"];
if (value != null) {
- bb.writeByte(20);
+ bb.writeByte(19);
bb.writeByte(value);
}
var value = message["node_modules_bundle_path"];
if (value != null) {
- bb.writeByte(21);
+ bb.writeByte(20);
bb.writeString(value);
}
var value = message["node_modules_bundle_path_server"];
if (value != null) {
- bb.writeByte(22);
+ bb.writeByte(21);
bb.writeString(value);
}
var value = message["framework"];
if (value != null) {
- bb.writeByte(23);
+ bb.writeByte(22);
encodeFrameworkConfig(value, bb);
}
var value = message["router"];
if (value != null) {
- bb.writeByte(24);
+ bb.writeByte(23);
encodeRouteConfig(value, bb);
}
bb.writeByte(0);
diff --git a/src/api/schema.peechy b/src/api/schema.peechy
index 524d3c190..52d661619 100644
--- a/src/api/schema.peechy
+++ b/src/api/schema.peechy
@@ -152,11 +152,13 @@ struct LoadedFramework {
struct LoadedRouteConfig {
string dir;
string[] extensions;
+ string static_dir;
}
message RouteConfig {
string dir = 1;
string[] extensions = 2;
+ string static_dir = 3;
}
message TransformOptions {
@@ -188,17 +190,15 @@ message TransformOptions {
string[] extension_order = 17;
- string public_dir = 18;
+ ScanDependencyMode only_scan_dependencies = 18;
- ScanDependencyMode only_scan_dependencies = 19;
+ bool generate_node_module_bundle = 19;
- bool generate_node_module_bundle = 20;
+ string node_modules_bundle_path = 20;
+ string node_modules_bundle_path_server = 21;
- string node_modules_bundle_path = 21;
- string node_modules_bundle_path_server = 22;
-
- FrameworkConfig framework = 23;
- RouteConfig router = 24;
+ FrameworkConfig framework = 22;
+ RouteConfig router = 23;
}
struct FileHandle {
diff --git a/src/api/schema.zig b/src/api/schema.zig
index 380bbaf23..33bc54bcb 100644
--- a/src/api/schema.zig
+++ b/src/api/schema.zig
@@ -839,17 +839,22 @@ pub const Api = struct {
/// extensions
extensions: []const []const u8,
+ /// static_dir
+ static_dir: []const u8,
+
pub fn decode(reader: anytype) anyerror!LoadedRouteConfig {
var this = std.mem.zeroes(LoadedRouteConfig);
this.dir = try reader.readValue([]const u8);
this.extensions = try reader.readArray([]const u8);
+ this.static_dir = try reader.readValue([]const u8);
return this;
}
pub fn encode(this: *const @This(), writer: anytype) anyerror!void {
try writer.writeValue(this.dir);
try writer.writeArray([]const u8, this.extensions);
+ try writer.writeValue(this.static_dir);
}
};
@@ -860,6 +865,9 @@ pub const Api = struct {
/// extensions
extensions: []const []const u8,
+ /// static_dir
+ static_dir: ?[]const u8 = null,
+
pub fn decode(reader: anytype) anyerror!RouteConfig {
var this = std.mem.zeroes(RouteConfig);
@@ -875,6 +883,9 @@ pub const Api = struct {
2 => {
this.extensions = try reader.readArray([]const u8);
},
+ 3 => {
+ this.static_dir = try reader.readValue([]const u8);
+ },
else => {
return error.InvalidMessage;
},
@@ -892,6 +903,10 @@ pub const Api = struct {
try writer.writeFieldID(2);
try writer.writeArray([]const u8, extensions);
}
+ if (this.static_dir) |static_dir| {
+ try writer.writeFieldID(3);
+ try writer.writeValue(static_dir);
+ }
try writer.endMessage();
}
};
@@ -948,9 +963,6 @@ pub const Api = struct {
/// extension_order
extension_order: []const []const u8,
- /// public_dir
- public_dir: ?[]const u8 = null,
-
/// only_scan_dependencies
only_scan_dependencies: ?ScanDependencyMode = null,
@@ -1030,24 +1042,21 @@ pub const Api = struct {
this.extension_order = try reader.readArray([]const u8);
},
18 => {
- this.public_dir = try reader.readValue([]const u8);
- },
- 19 => {
this.only_scan_dependencies = try reader.readValue(ScanDependencyMode);
},
- 20 => {
+ 19 => {
this.generate_node_module_bundle = try reader.readValue(bool);
},
- 21 => {
+ 20 => {
this.node_modules_bundle_path = try reader.readValue([]const u8);
},
- 22 => {
+ 21 => {
this.node_modules_bundle_path_server = try reader.readValue([]const u8);
},
- 23 => {
+ 22 => {
this.framework = try reader.readValue(FrameworkConfig);
},
- 24 => {
+ 23 => {
this.router = try reader.readValue(RouteConfig);
},
else => {
@@ -1127,32 +1136,28 @@ pub const Api = struct {
try writer.writeFieldID(17);
try writer.writeArray([]const u8, extension_order);
}
- if (this.public_dir) |public_dir| {
- try writer.writeFieldID(18);
- try writer.writeValue(public_dir);
- }
if (this.only_scan_dependencies) |only_scan_dependencies| {
- try writer.writeFieldID(19);
+ try writer.writeFieldID(18);
try writer.writeEnum(only_scan_dependencies);
}
if (this.generate_node_module_bundle) |generate_node_module_bundle| {
- try writer.writeFieldID(20);
+ try writer.writeFieldID(19);
try writer.writeInt(@intCast(u8, @boolToInt(generate_node_module_bundle)));
}
if (this.node_modules_bundle_path) |node_modules_bundle_path| {
- try writer.writeFieldID(21);
+ try writer.writeFieldID(20);
try writer.writeValue(node_modules_bundle_path);
}
if (this.node_modules_bundle_path_server) |node_modules_bundle_path_server| {
- try writer.writeFieldID(22);
+ try writer.writeFieldID(21);
try writer.writeValue(node_modules_bundle_path_server);
}
if (this.framework) |framework| {
- try writer.writeFieldID(23);
+ try writer.writeFieldID(22);
try writer.writeValue(framework);
}
if (this.router) |router| {
- try writer.writeFieldID(24);
+ try writer.writeFieldID(23);
try writer.writeValue(router);
}
try writer.endMessage();