diff options
Diffstat (limited to 'src/z')
| -rw-r--r-- | src/z/Component.zig | 18 | ||||
| -rw-r--r-- | src/z/File.zig | 17 | ||||
| -rw-r--r-- | src/z/Minifier.zig | 168 | ||||
| -rw-r--r-- | src/z/parser/js/grammar/identifier.zig | 60 | ||||
| -rw-r--r-- | src/z/parser/js/grammar/keyword.zig | 115 | ||||
| -rw-r--r-- | src/z/parser/js/grammar/literal.zig | 192 | ||||
| -rw-r--r-- | src/z/parser/js/grammar/punctuator.zig | 122 | ||||
| -rw-r--r-- | src/z/parser/js/grammar/root.zig | 66 | ||||
| -rw-r--r-- | src/z/parser/js/grammar/whitespace.zig | 102 | ||||
| -rw-r--r-- | src/z/parser/js/root.zig | 7 | ||||
| -rw-r--r-- | src/z/parser/lexer.zig | 127 | ||||
| -rw-r--r-- | src/z/parser/root.zig | 17 | ||||
| -rw-r--r-- | src/z/rest.js | 20 | ||||
| -rw-r--r-- | src/z/root.zig | 56 | ||||
| -rw-r--r-- | src/z/z.js | 101 |
15 files changed, 0 insertions, 1188 deletions
diff --git a/src/z/Component.zig b/src/z/Component.zig deleted file mode 100644 index a6a4923..0000000 --- a/src/z/Component.zig +++ /dev/null @@ -1,18 +0,0 @@ -const std = @import("std"); -const html = @import("html"); -const z = @import("root.zig"); - -name: @EnumLiteral(), -body: []const u8, -style: []const u8, -script: []const u8, - -pub fn toElement(comptime self: @This()) html.Element { - return .transparent(.children(&.{ - .native(.template, .{ .id = "@" ++ @tagName(self.name) }, .children(&.{ - z.style.load(self.style), - z.body.load(self.body), - })), - z.script.load("Zenv.constructors['component__" ++ @tagName(self.name) ++ "'] = async (Z) => {" ++ self.script ++ "}"), - })); -} diff --git a/src/z/File.zig b/src/z/File.zig deleted file mode 100644 index cd19dba..0000000 --- a/src/z/File.zig +++ /dev/null @@ -1,17 +0,0 @@ -const Minifier = @import("Minifier.zig"); -const Element = @import("html").Element; - -tag: ?@EnumLiteral(), -minifier: Minifier, - -pub fn load(comptime self: @This(), comptime content: []const u8) Element { - if (self.tag) |tag| { - return .native( - tag, - .{}, - .content(comptime self.minifier.minify(content)), - ); - } else { - return .transparent(.content(comptime self.minifier.minify(content))); - } -} diff --git a/src/z/Minifier.zig b/src/z/Minifier.zig deleted file mode 100644 index 65dd9fb..0000000 --- a/src/z/Minifier.zig +++ /dev/null @@ -1,168 +0,0 @@ -const std = @import("std"); - -/// A string contained in quotes will not be changed in any form. -quotes: []const u8, - -/// This character is used to escape in strings. -escape: ?u8, - -/// A delimiter does not need any padding around it. -delimiters: []const u8, - -/// Kinds of comments, will be removed in the output. -comments: []const struct { []const u8, []const u8 }, - -pub const html: @This() = .{ - .quotes = "\"'", - .escape = null, - .delimiters = "<>", - .comments = &.{.{ "<!--", "-->" }}, -}; - -pub const js: @This() = .{ - .quotes = "\"'`", - .escape = '\\', - .delimiters = "+-*,.:;[](){}=&|^", - .comments = &.{ .{ "//", "\n" }, .{ "/*", "*/" } }, -}; - -pub const css: @This() = .{ - .quotes = "\"'", - .escape = '\\', - .delimiters = ":;{}", - .comments = &.{.{ "/*", "*/" }}, -}; - -fn skip(comptime source: *[]const u8, comptime len: usize) void { - source.* = (source.*)[len..]; -} - -fn push( - comptime source: *[]const u8, - comptime target: *[]const u8, - comptime len: usize, -) void { - target.* = target.* ++ (source.*)[0..len]; - skip(source, len); -} - -pub fn minify( - comptime self: *const @This(), - comptime c: []const u8, -) []const u8 { - @setEvalBranchQuota(c.len * 100); - var content = std.mem.trimStart(u8, c, &std.ascii.whitespace); - var block: []const u8 = ""; - - while (content.len > 0) { - const had_comment: bool = cmt: { - inline for (self.comments) |comment| { - const start, const end = comment; - - if (std.mem.startsWith(u8, content, start)) { - skip(&content, start.len); - skip(&content, if (std.mem.indexOf(u8, content, end)) |l| l + end.len else content.len); - break :cmt true; - } - } - break :cmt false; - }; - - if (had_comment) {} else if (std.mem.indexOfScalar(u8, self.quotes, content[0])) |_| { - const quote = content[0]; - push(&content, &block, 1); - while (content.len > 0) { - if (content[0] == self.escape) { - push(&content, &block, 2); - } else if (content[0] == quote) { - push(&content, &block, 1); - break; - } - push(&content, &block, 1); - } - } else { - push(&content, &block, 1); - } - - const was_trimmed = content.len > 0 and std.ascii.isWhitespace(content[0]); - content = std.mem.trimStart(u8, content, &std.ascii.whitespace); - if (was_trimmed and - block.len > 0 and - content.len > 0 and - std.mem.indexOfScalar(u8, self.delimiters, block[block.len - 1]) == null and - std.mem.indexOfScalar(u8, self.delimiters, content[0]) == null) - { - block = block ++ " "; - } - } - - return block; -} - -test "html" { - const buffer: []const u8 = - \\<html> - \\ <head> - \\ <title>Some Title</title> - \\ </head> - \\ <body> - \\ <z-component type="something here" tag="1 2 3"> 123 </z-component> - \\ <!-- some comment here --> - \\ Hello World! - \\ </body> - \\</html> - ; - - try std.testing.expectEqualStrings( - "<html><head><title>Some Title</title></head><body><z-component type=\"something here\" tag=\"1 2 3\">123</z-component>Hello World!</body></html>", - comptime html.minify(buffer), - ); -} - -test "css" { - const buffer: []const u8 = - \\body { - \\ background: #fff; - \\ color: red; - \\} - \\ - \\#content:first { - \\ user-select: none; - \\ /* comment */ - \\ content: ' '; - \\ padding: 5px 5px; - \\} - ; - - try std.testing.expectEqualStrings( - "body{background:#fff;color:red;}#content:first{user-select:none;content:' ';padding:5px 5px;}", - comptime css.minify(buffer), - ); -} - -test "js" { - const buffer: []const u8 = - \\class extends HTMLElement { - \\ // comment here - \\ constructor() { - \\ super(); - \\ this.attachShadow({ mode: 'open' }); - \\ } - \\ - \\ /* - \\ * Mulitline - \\ */ - \\ connectedCallback() { - \\ const type = this.getAttribute('type'); - \\ const template = document.getElementById(`--${type}`); - \\ const node = document.importNode(template.content, true); - \\ this.shadowRoot.appendChild(node); - \\ } - \\} - ; - - try std.testing.expectEqualStrings( - "class extends HTMLElement{constructor(){super();this.attachShadow({mode:'open'});}connectedCallback(){const type=this.getAttribute('type');const template=document.getElementById(`--${type}`);const node=document.importNode(template.content,true);this.shadowRoot.appendChild(node);}}", - comptime js.minify(buffer), - ); -} diff --git a/src/z/parser/js/grammar/identifier.zig b/src/z/parser/js/grammar/identifier.zig deleted file mode 100644 index ccc5268..0000000 --- a/src/z/parser/js/grammar/identifier.zig +++ /dev/null @@ -1,60 +0,0 @@ -const std = @import("std"); - -const root = @import("root.zig"); -const Lexer = root.Lexer; -const Token = root.Token; - -pub const Identifier = enum { - public, - private, - - pub inline fn tokenize(comptime lexer: *Lexer) Lexer.Error!void { - comptime { - defer lexer.revert(); - - lexer.context.regex_possible = false; - - const token = tok: { - if (lexer.peekChar() == '#') { - const t = lexer.start(.{ .identifier = .private }); - lexer.skip() catch unreachable; - break :tok t; - } else { - break :tok lexer.start(.{ .identifier = .public }); - } - }; - - switch (try lexer.consume()) { - 'a'...'z', 'A'...'Z', '_' => {}, - else => return Lexer.Error.UnexpectedToken, - } - - while (lexer.peekChar()) |ch| { - switch (ch) { - 'a'...'z', 'A'...'Z', '0'...'9', '_' => {}, - else => break, - } - - try lexer.skip(); - } - - lexer.commit(token); - } - } -}; - -test "simple" { - { - comptime var lexer: Lexer = .init("some_literal9"); - try Identifier.tokenize(&lexer); - try std.testing.expectEqual(1, lexer.tokens.len); - try std.testing.expectEqual(13, lexer.tokens[0].slice.len); - } - - { - comptime var lexer: Lexer = .init("#some_literal9"); - try Identifier.tokenize(&lexer); - try std.testing.expectEqual(1, lexer.tokens.len); - try std.testing.expectEqual(14, lexer.tokens[0].slice.len); - } -} diff --git a/src/z/parser/js/grammar/keyword.zig b/src/z/parser/js/grammar/keyword.zig deleted file mode 100644 index 8e99b4a..0000000 --- a/src/z/parser/js/grammar/keyword.zig +++ /dev/null @@ -1,115 +0,0 @@ -const std = @import("std"); - -const root = @import("root.zig"); -const Lexer = root.Lexer; -const Token = root.Token; - -pub const Keyword = enum { - @"break", - case, - @"catch", - class, - @"const", - @"continue", - debugger, - default, - delete, - do, - @"else", - @"export", - extends, - finally, - @"for", - function, - @"if", - import, - in, - instanceof, - new, - @"return", - super, - @"switch", - this, - throw, - @"try", - typeof, - @"var", - void, - @"while", - with, - yield, - let, - static, - await, - async, - of, - from, - get, - set, - meta, - @"enum", - null, - true, - false, - - const Self = @This(); - - const keywordmap: std.StaticStringMap(Self) = .initComptime(kws: { - var keywords: []const struct { []const u8, Self } = &.{}; - - for (@typeInfo(Self).@"enum".fields) |field| { - const name: []const u8 = field.name; - const value: Self = @field(Self, field.name); - - keywords = keywords ++ .{ .{ name, value } }; - } - - break :kws keywords; - }); - - pub inline fn tokenize(lexer: *Lexer) Lexer.Error!void { - comptime { - @setEvalBranchQuota(10000); - errdefer lexer.revert(); - - lexer.context.regex_possible = true; - - const index = std.mem.findNone(u8, lexer.buffer, std.ascii.lowercase) orelse lexer.buffer.len; - - if (index == 0) return Lexer.Error.UnexpectedToken; - - if (keywordmap.get(lexer.buffer[0..index])) |tag| { - const token = lexer.start(.{ .keyword = tag }); - try lexer.skipTo(index); - lexer.commit(token); - } else { - return Lexer.Error.UnexpectedToken; - } - } - } -}; - -test "simple" { - inline for (comptime Keyword.keywordmap.keys()) |key| { - comptime var lexer: Lexer = .init(key); - try Keyword.tokenize(&lexer); - try std.testing.expectEqual(1, lexer.tokens.len); - try std.testing.expectEqual(key.len, lexer.tokens[0].slice.len); - } -} - -test "ending" { - inline for (comptime Keyword.keywordmap.keys()) |key| { - comptime var lexer: Lexer = .init(key ++ "."); - try Keyword.tokenize(&lexer); - try std.testing.expectEqual(1, lexer.tokens.len); - try std.testing.expectEqual(key.len, lexer.tokens[0].slice.len); - } -} - -test "subword" { - inline for (comptime Keyword.keywordmap.keys()) |key| { - comptime var lexer: Lexer = .init(key ++ "a"); - try std.testing.expectError(Lexer.Error.UnexpectedToken, Keyword.tokenize(&lexer)); - } -} diff --git a/src/z/parser/js/grammar/literal.zig b/src/z/parser/js/grammar/literal.zig deleted file mode 100644 index 4316dee..0000000 --- a/src/z/parser/js/grammar/literal.zig +++ /dev/null @@ -1,192 +0,0 @@ -const std = @import("std"); - -const root = @import("root.zig"); -const Lexer = root.Lexer; -const Token = root.Token; - -pub const Literal = union(enum) { - // NOTE: currently only decimal literals are tokenized - numeric: void, - bigint: void, - string: void, - template: enum { - whole, - start, - middle, - end, - }, - regex: void, - - const digits = "_0123456789abcdef"; - - pub inline fn tokenize(comptime lexer: *Lexer) Lexer.Error!void { - comptime { - errdefer lexer.revert(); - - var token = lexer.start(.{ .literal = undefined }); - - const regex_possible = lexer.context.regex_possible; - lexer.context.regex_possible = false; - - switch (try lexer.consume()) { - '0'...'9', '.' => |c| { - const base = if (c != '0') 10 else switch (lexer.peekChar() orelse 0) { - 'x' => 16, - 'o' => 8, - 'b' => 2, - else => 10, - }; - - if (base != 10) lexer.skip() catch unreachable; - - { - const index = std.mem.findNone( - u8, - lexer.buffer, - digits[0 .. base + 1], - ) orelse lexer.buffer.len; - try lexer.skipTo(index); - - - if (index == 0 and base != 10) return Lexer.Error.UnexpectedToken; - } - - if (base == 10 and lexer.peekChar() == '.') { - try lexer.skip(); - const index = std.mem.findNone( - u8, - lexer.buffer, - digits[0 .. base + 1], - ) orelse lexer.buffer.len; - try lexer.skipTo(index); - } - - if (lexer.peekChar() == 'n') { - lexer.skip() catch unreachable; - token.kind.literal = .bigint; - } else { - token.kind.literal = .numeric; - } - }, - '\'', '"' => |quote| { - token.kind.literal = .string; - while (true) { - switch (try lexer.consume()) { - quote => break, - '\\' => try lexer.skip(), - else => {}, - } - } - }, - '`' => { - token.kind.literal = .{ .template = undefined }; - - while (true) { - switch (try lexer.consume()) { - '`' => { - token.kind.literal.template = .whole; - break; - }, - '\\' => try lexer.skip(), - '$' => if (lexer.peekChar() == '{') { - lexer.skip() catch unreachable; - lexer.context.template_nesting += 1; - token.kind.literal.template = .start; - lexer.context.regex_possible = true; - break; - }, - else => {}, - } - } - }, - '}' => if (lexer.context.template_nesting > 0) { - lexer.context.template_nesting -= 1; - token.kind.literal = .{ .template = undefined }; - - while (true) { - switch (try lexer.consume()) { - '`' => { - token.kind.literal.template = .end; - break; - }, - '\\' => try lexer.skip(), - '$' => if (lexer.peekChar() == '{') { - lexer.skip() catch unreachable; - lexer.context.template_nesting += 1; - token.kind.literal.template = .middle; - lexer.context.regex_possible = true; - break; - }, - else => {}, - } - } - } else return Lexer.Error.UnexpectedToken, - '/' => if (regex_possible) { - token.kind.literal = .regex; - while (true) { - switch (try lexer.consume()) { - '/' => break, - '\\' => try lexer.skip(), - '\n' => return Lexer.Error.UnexpectedToken, - else => {}, - } - } - } else return Lexer.Error.UnexpectedToken, - else => return Lexer.Error.UnexpectedToken, - } - - lexer.commit(token); - } - } -}; - -test "numeric" { - const Simple = struct { - pub fn run(comptime buffer: []const u8, n: usize) !void { - comptime var lexer: Lexer = .init(buffer); - try Literal.tokenize(&lexer); - try std.testing.expectEqual(1, lexer.tokens.len); - try std.testing.expectEqual(n, lexer.tokens[0].slice.len); - } - }; - - try Simple.run("1234", 4); - try Simple.run("1.234", 5); - try Simple.run("1_2_3_4", 7); - try Simple.run("0b101011", 8); - try Simple.run("0xabcf01", 8); - try Simple.run("0o731734", 8); - try Simple.run("0o731734n", 9); -} - -test "string" { - const Simple = struct { - pub fn run(comptime buffer: []const u8, n: usize) !void { - comptime var lexer: Lexer = .init(buffer); - try Literal.tokenize(&lexer); - try std.testing.expectEqual(1, lexer.tokens.len); - try std.testing.expectEqual(n, lexer.tokens[0].slice.len); - } - }; - - try Simple.run("'hello'", 7); - try Simple.run("\"hello\"", 7); - try std.testing.expectError( - Lexer.Error.EndOfBuffer, - Simple.run("'hello", 0), - ); -} - -test "regex" { - const Simple = struct { - pub fn run(comptime buffer: []const u8, n: usize) !void { - comptime var lexer: Lexer = .init(buffer); - try Literal.tokenize(&lexer); - try std.testing.expectEqual(1, lexer.tokens.len); - try std.testing.expectEqual(n, lexer.tokens[0].slice.len); - } - }; - - try Simple.run("/hello/", 7); - try Simple.run("/some string\\/ here/", 20); -} diff --git a/src/z/parser/js/grammar/punctuator.zig b/src/z/parser/js/grammar/punctuator.zig deleted file mode 100644 index b085ce1..0000000 --- a/src/z/parser/js/grammar/punctuator.zig +++ /dev/null @@ -1,122 +0,0 @@ -const std = @import("std"); - -const root = @import("root.zig"); -const Lexer = root.Lexer; -const Token = root.Token; - -pub const Punctuator = enum { - @"+", - @"-", - @"*", - @"/", - @"%", - @"**", - @"++", - @"--", - @"=", - @"+=", - @"-=", - @"*=", - @"/=", - @"%=", - @"**=", - @"&=", - @"|=", - @"^=", - @"<<=", - @">>=", - @">>>=", - @"&&=", - @"||=", - @"??=", - @"==", - @"===", - @"!=", - @"!==", - @"<", - @"<=", - @">", - @">=", - @"&&", - @"||", - @"??", - @"&", - @"|", - @"^", - @"~", - @"<<", - @">>", - @">>>", - @"!", - @"?", - @":", - @";", - @",", - @".", - @"...", - @"=>", - @"(", - @")", - @"[", - @"]", - @"{", - @"}", - @"?.", - @"#", - @"@", - - const Self = @This(); - - const punctuatormap: std.StaticStringMap(Self) = .initComptime(kws: { - var punctuators: []const struct { []const u8, Self } = &.{}; - - for (@typeInfo(Self).@"enum".fields) |field| { - const name: []const u8 = field.name; - const value: Self = @field(Self, field.name); - - punctuators = punctuators ++ .{.{ name, value }}; - } - - break :kws punctuators; - }); - - pub inline fn tokenize(comptime lexer: *Lexer) Lexer.Error!void { - comptime { - @setEvalBranchQuota(10_000); - defer lexer.revert(); - - lexer.context.regex_possible = true; - - if (punctuatormap.getLongestPrefix(lexer.buffer)) |pair| { - - if (std.mem.eql(u8, pair.key, "}") and lexer.context.template_nesting > 0) { - return Lexer.Error.UnexpectedToken; - } - - const token = lexer.start(.{ .punctuator = pair.value }); - try lexer.skipTo(pair.key.len); - lexer.commit(token); - } else { - return Lexer.Error.UnexpectedToken; - } - } - } -}; - -test "simple" { - inline for (comptime Punctuator.punctuatormap.keys()) |key| { - comptime var lexer: Lexer = .init(key); - try Punctuator.tokenize(&lexer); - try std.testing.expectEqual(1, lexer.tokens.len); - try std.testing.expectEqual(key.len, lexer.tokens[0].slice.len); - } -} - -test "ending" { - inline for (comptime Punctuator.punctuatormap.keys()) |key| { - comptime var lexer: Lexer = .init(key ++ "a"); - try Punctuator.tokenize(&lexer); - try std.testing.expectEqual(1, lexer.tokens.len); - try std.testing.expectEqual(key.len, lexer.tokens[0].slice.len); - } -} diff --git a/src/z/parser/js/grammar/root.zig b/src/z/parser/js/grammar/root.zig deleted file mode 100644 index f732b7f..0000000 --- a/src/z/parser/js/grammar/root.zig +++ /dev/null @@ -1,66 +0,0 @@ -//! This is a Javascript parser and tokenizer. -//! It is and probably will never be complete, -//! since js is a very strange language and I want -//! to move forward and code on more interesting things -//! I started something called mujs (micro-js). It's a -//! subset of the javascript language. It does not support -//! the regex literal and currently also not template strings. -//! It is chosen like that to make parsing easier and also less -//! context-dependent. - -const std = @import("std"); - -const parser = @import("../../root.zig"); - -pub const Lexer = parser.Lexer(Grammar); -pub const Token = parser.Token(Grammar); - -pub const Whitespace = @import("whitespace.zig").Whitespace; -pub const Keyword = @import("keyword.zig").Keyword; -pub const Literal = @import("literal.zig").Literal; -pub const Punctuator = @import("punctuator.zig").Punctuator; -pub const Identifier = @import("identifier.zig").Identifier; - -pub const Grammar = union(enum) { - whitespace: Whitespace, - keyword: Keyword, - literal: Literal, - punctuator: Punctuator, - identifier: Identifier, - end_of_file: void, - - pub const Context = struct { - template_nesting: usize = 0, - regex_possible: bool = true, - }; - - pub inline fn tokenize(comptime lexer: *Lexer) Lexer.Error!void { - @setEvalBranchQuota(lexer.buffer.len * 1000); - comptime { - while (lexer.peekChar()) |_| { - Whitespace.tokenize(lexer) catch { - Keyword.tokenize(lexer) catch { - Literal.tokenize(lexer) catch { - Punctuator.tokenize(lexer) catch { - try Identifier.tokenize(lexer); - }; - }; - }; - }; - } - - lexer.commit(lexer.start(.end_of_file)); - } - } -}; - -test { - _ = std.testing.refAllDecls(@This()); -} - -test "z.js" { - comptime var lexer: Lexer = .init(@embedFile("../../../z.js")); - Grammar.tokenize(&lexer) catch |err| { - std.debug.print("error: {} at {s}", .{ err, lexer.buffer }); - }; -} diff --git a/src/z/parser/js/grammar/whitespace.zig b/src/z/parser/js/grammar/whitespace.zig deleted file mode 100644 index 08d031f..0000000 --- a/src/z/parser/js/grammar/whitespace.zig +++ /dev/null @@ -1,102 +0,0 @@ -const std = @import("std"); -const Lexer = @import("root.zig").Lexer; -const Token = @import("root.zig").Token; - -pub const Whitespace = enum { - space, - line_comment, - block_comment, - - pub inline fn tokenize(comptime lexer: *Lexer) Lexer.Error!void { - comptime { - errdefer lexer.revert(); - - var token = lexer.start(.{ .whitespace = undefined }); - - switch (try lexer.consume()) { - ' ', '\t', '\r', '\n' => { - token.kind.whitespace = .space; - - while (lexer.peekChar()) |ch| { - switch (ch) { - ' ', '\t', '\r', '\n' => try lexer.skip(), - else => break, - } - } - }, - '/' => { - switch (lexer.peekChar() orelse 0) { - '*' => { - token.kind.whitespace = .block_comment; - try lexer.skipUntil("*/"); - }, - '/' => { - token.kind.whitespace = .line_comment; - lexer.skipUntil("\n") catch lexer.skipToEnd(); - }, - else => return Lexer.Error.UnexpectedToken, - } - }, - else => return Lexer.Error.UnexpectedToken, - } - - lexer.commit(token); - } - } -}; - -test "space" { - { - comptime var lexer: Lexer = .init(" "); - try Whitespace.tokenize(&lexer); - try std.testing.expectEqual(1, lexer.tokens.len); - try std.testing.expectEqual(1, lexer.tokens[0].slice.len); - } - - { - comptime var lexer: Lexer = .init(" \t\t \n\r "); - try Whitespace.tokenize(&lexer); - try std.testing.expectEqual(1, lexer.tokens.len); - try std.testing.expectEqual(10, lexer.tokens[0].slice.len); - } -} - -test "line-comment" { - { - comptime var lexer: Lexer = .init("// some comment"); - try Whitespace.tokenize(&lexer); - try std.testing.expectEqual(1, lexer.tokens.len); - try std.testing.expectEqualStrings("// some comment", lexer.tokens[0].slice); - } - - { - comptime var lexer: Lexer = .init("// some comment\n"); - try Whitespace.tokenize(&lexer); - try std.testing.expectEqual(1, lexer.tokens.len); - try std.testing.expectEqualStrings("// some comment\n", lexer.tokens[0].slice); - } -} - -test "block-comment" { - { - comptime var lexer: Lexer = .init("/* some comment */"); - try Whitespace.tokenize(&lexer); - try std.testing.expectEqual(1, lexer.tokens.len); - try std.testing.expectEqualStrings("/* some comment */", lexer.tokens[0].slice); - } -} - -test "mixed" { - comptime var lexer: Lexer = .init( - \\ // some comment - \\/* other comment here */ // comment or so - \\ /* multi - \\ * line - \\ * comment - \\ */ - ); - inline while (Whitespace.tokenize(&lexer)) { - } else |_| {} - - try std.testing.expectEqual(7, lexer.tokens.len); -} diff --git a/src/z/parser/js/root.zig b/src/z/parser/js/root.zig deleted file mode 100644 index e604855..0000000 --- a/src/z/parser/js/root.zig +++ /dev/null @@ -1,7 +0,0 @@ -const std = @import("std"); - -pub const grammar = @import("./grammar/root.zig"); - -test { - _ = std.testing.refAllDecls(@This()); -} diff --git a/src/z/parser/lexer.zig b/src/z/parser/lexer.zig deleted file mode 100644 index 5beefde..0000000 --- a/src/z/parser/lexer.zig +++ /dev/null @@ -1,127 +0,0 @@ -const std = @import("std"); - -pub fn Token(TokenKind: type) type { - return struct { - const Self = @This(); - - kind: TokenKind, - slice: []const u8, - - pub fn start(comptime lexer: *const Lexer(TokenKind), kind: TokenKind) Self { - return .{ - .kind = kind, - .slice = lexer.buffer, - }; - } - - pub inline fn stop(comptime self: Self, comptime lexer: *const Lexer(TokenKind)) Self { - comptime { - const length = self.slice.len - lexer.buffer.len; - return .{ - .kind = self.kind, - .slice = self.slice[0..length], - }; - } - } - - pub fn format(self: *const Self, writer: *std.Io.Writer) !void { - try writer.print("Token{}(\"{s}\")", .{self.kind, self.slice}); - } - }; -} - -pub fn Lexer(TokenKind: type) type { - return struct { - const Self = @This(); - - pub const Error = error{ - UnexpectedToken, - EndOfBuffer, - }; - - buffer: []const u8, - last_buffer: []const u8, - tokens: []const Token(TokenKind) = &.{}, - context: TokenKind.Context = .{}, - last_context: TokenKind.Context = .{}, - - pub fn init(buffer: []const u8) Self { - return .{ - .buffer = buffer, - .last_buffer = buffer, - }; - } - - pub inline fn peekChar(self: *Self) ?u8 { - return self.peekCharAt(0); - } - - pub inline fn peekCharAt(self: *Self, n: usize) ?u8 { - return if (n < self.buffer.len) self.buffer[n] else null; - } - - pub fn peekSlice(self: *Self, length: usize) ?[]const u8 { - return self.peekSliceAt(length, 0); - } - - pub fn peekSliceAt(self: *Self, length: usize, offset: usize) ?[]const u8 { - if (length + offset <= self.buffer.len) { - return self.buffer[offset .. offset + length]; - } - return null; - } - - pub fn consume(self: *Self) !u8 { - return (try self.consumeTo(1))[0]; - } - - pub fn consumeTo(self: *Self, n: usize) ![]const u8 { - if (n <= self.buffer.len) { - const slice = self.buffer[0..n]; - self.buffer = self.buffer[n..]; - return slice; - } else { - return Error.EndOfBuffer; - } - } - - pub fn skip(self: *Self) !void { - return self.skipTo(1); - } - - pub fn skipTo(self: *Self, n: usize) Error!void { - if (n <= self.buffer.len) { - self.buffer = self.buffer[n..]; - } else { - return Error.EndOfBuffer; - } - } - - pub fn skipUntil(self: *Self, literal: []const u8) Error!void { - if (std.mem.find(u8, self.buffer, literal)) |index| { - self.buffer = self.buffer[index + literal.len..]; - } else { - return Error.EndOfBuffer; - } - } - - pub fn skipToEnd(self: *Self) void { - self.buffer = self.buffer[self.buffer.len..]; - } - - pub fn start(self: *Self, kind: TokenKind) Token(TokenKind) { - return .start(self, kind); - } - - pub fn revert(self: *Self) void { - self.buffer = self.last_buffer; - self.context = self.last_context; - } - - pub fn commit(self: *Self, tok: Token(TokenKind)) void { - self.tokens = self.tokens ++ [_]Token(TokenKind){tok.stop(self)}; - self.last_buffer = self.buffer; - self.last_context = self.context; - } - }; -} diff --git a/src/z/parser/root.zig b/src/z/parser/root.zig deleted file mode 100644 index e0b67fb..0000000 --- a/src/z/parser/root.zig +++ /dev/null @@ -1,17 +0,0 @@ -const std = @import("std"); - -const lexer = @import("lexer.zig"); -pub const Lexer = lexer.Lexer; -pub const Token = lexer.Token; - -pub const js = @import("js/root.zig"); - -pub fn Parser(TokenType: type) type { - return struct { - buffer: []const TokenType, - }; -} - -test { - _ = std.testing.refAllDecls(@This()); -} diff --git a/src/z/rest.js b/src/z/rest.js deleted file mode 100644 index c14944d..0000000 --- a/src/z/rest.js +++ /dev/null @@ -1,20 +0,0 @@ - -const Rest = { - Request: class { - constructor(base) { - this.base = base; - } - - get(url) { return fetch(url); } - - post(url, body) { - return fetch( - url, - { - method: 'POST', - body: JSON.stringify(body), - } - ); - } - }, -}; diff --git a/src/z/root.zig b/src/z/root.zig deleted file mode 100644 index 1fa8d99..0000000 --- a/src/z/root.zig +++ /dev/null @@ -1,56 +0,0 @@ -const std = @import("std"); - -pub const Minifier = @import("Minifier.zig"); -pub const Component = @import("Component.zig"); -pub const File = @import("File.zig"); -pub const parser = @import("parser/root.zig"); - -const Element = @import("html").Element; - -pub const script: File = .{ - .tag = .script, - .minifier = .js, -}; -pub const style: File = .{ - .tag = .style, - .minifier = .css, -}; -pub const body: File = .{ - .tag = .body, - .minifier = .html, -}; - -pub const html: File = .{ - .tag = null, - .minifier = .html, -}; - -pub fn env(comptime components: []const Component) Element { - var children: []const Element = &.{ - script.load(@embedFile("z.js")), - script.load(@embedFile("rest.js")), - }; - - inline for (components) |c| { - const child: []const Element = &.{c.toElement()}; - children = children ++ child; - } - - return .transparent(.children(children)); -} - -pub fn component(kind: @EnumLiteral(), attrs: anytype, content: Element.Content) Element { - var element: Element = .native(.@"z-component", attrs, content); - - const type_attr: []const Element.Attribute = &.{.{ - .name = "type", - .value = @tagName(kind), - }}; - element.attributes = type_attr ++ element.attributes; - - return element; -} - -test { - _ = std.testing.refAllDecls(@This()); -} diff --git a/src/z/z.js b/src/z/z.js deleted file mode 100644 index e279f42..0000000 --- a/src/z/z.js +++ /dev/null @@ -1,101 +0,0 @@ -class ZComponent extends HTMLElement { - static observedAttributes = [ 'type' ]; - - constructor() { - super(); - this.attachShadow({ mode: 'open' }); - this.onconnected = () => {}; - this.ondisconnected = () => {}; - } - - build() { - const type = this.getAttribute('type'); - - if (type == null) { - throw `component without any type given.`; - } - - const template = document.getElementById(`@${type}`); - - if (template == null) { - throw `component '${type}' does not exist.`; - } - - const node = document.importNode(template.content, true); - this.shadowRoot.appendChild(node); - - Zenv.constructors[`component__${type}`](new Zenv(this)); - } - - attributeChangedCallback(name, previous, current) { - if (name == 'type') { - this.shadowRoot.innerHTML = ''; - this.build() - } - } - - connectedCallback() { - this.onconnected(); - } - - disconnectedCallback() { - this.ondisconnected(); - } -} - -class Zenv { - static constructors = {}; - - constructor(doc) { - this.document = doc; - } - - component(type, slots) { - const element = document.createElement('z-component'); - element.setAttribute('type', type); - - for (const name in slots) { - const slot = slots[name]; - slot.setAttribute('slot', name); - element.appendChild(slot); - } - - return element; - } - - populate_attributes(obj, attrs) { - for (const attr in attrs) { - if (typeof(obj[attr]) == 'object' && typeof(attrs[attr]) == 'object') { - this.populate_attributes(obj[attr], attrs[attr]); - } else { - obj[attr] = attrs[attr]; - } - } - } - - native(name, options) { - const element = document.createElement(name); - this.populate_attributes(element, options); - return element; - } - - by_id(id) { - return this.document.shadowRoot.getElementById(id); - } - - by_selector(query) { - return this.document.shadowRoot.querySelector(query); - } - - by_selector_all(query) { - return this.document.shadowRoot.querySelectorAll(query); - } - - get body() { - return this.document.shadowRoot; - } -} - -Z = new Zenv(document.body); - -customElements.define("z-component", ZComponent); |