Merge branch 'v2'

Author: grncdr

.github/workflows/nodejs.yml

@@ -0,0 +1,32 @@
+# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Node.js CI
+
+on:
+  push:
+  pull_request:
+  
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x, 14.x, 16.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+    - run: npm ci
+    - run: make clean all
+    - run: npm test
+

Makefile

@@ -1,12 +1,15 @@
-.PHONY: all test publish clean
+.PHONY: check publish clean
 
-all: lib/grammar.js dist/index.js dist/classes.js
+all: lib/grammar.js dist/index.js
 
 dist/%.js: lib/%.ts
 	@npx tsc
 
+check:
+	@npx tsc --noEmit
+
 lib/grammar.js: lib/grammar.pegjs
-	@npx pegjs lib/grammar.pegjs ./lib/grammar.js
+	@npx peggy lib/grammar.pegjs
 
 test: all
 	@node ./test/index.js

README.md

@@ -1,6 +1,6 @@
 # URI Template
 
-[![Build Status](https://api.travis-ci.com/grncdr/uri-template.svg?branch=master&status=passed)](https://app.travis-ci.com/grncdr/uri-template)
+[![Node.js CI](https://github.com/grncdr/uri-template/actions/workflows/nodejs.yml/badge.svg)](https://github.com/grncdr/uri-template/actions/workflows/nodejs.yml)
 
 This is a node.js implementation of the URI template draft standard
 defined at http://tools.ietf.org/html/rfc6570
@@ -29,5 +29,6 @@ queryTpl.expand({
 // /search?q=Bigger%20office&prefer=Sterling%27s%20office&accept=Crane%27s%20office
 ```
 
-For more thorough coverage of the syntax, see `test.js` or the
-[RFC](http://tools.ietf.org/html/rfc6570).
+For more thorough coverage of the syntax, see the [RFC](https://datatracker.ietf.org/doc/html/rfc6570).
+
+## 

lib/ast.ts

@@ -0,0 +1,59 @@
+import { abort } from "process";
+
+export interface Template {
+  type: "template";
+  parts: (Literal | Expression)[];
+}
+
+export interface Literal {
+  type: "literal";
+  value: string;
+}
+
+export interface Expression {
+  type: "expression";
+  operator: Operator;
+  variables: Variable[];
+}
+
+export type Operator = "/" | ";" | "." | "?" | "&" | "+" | "#" | "";
+
+export interface Variable {
+  type: "variable";
+  name: string;
+  modifier?: SubstrModifier | ExplodeModifier;
+  extension?: string;
+}
+
+export interface ExplodeModifier {
+  type: "explode";
+}
+
+export interface SubstrModifier {
+  type: "substr";
+  length: number;
+}
+
+export function toString(
+  node: Template | Literal | Expression | Variable
+): string {
+  switch (node.type) {
+    case "template":
+      return node.parts.map(toString).join("");
+    case "literal":
+      return node.value;
+    case "expression":
+      return `{${node.operator}${node.variables.map(toString).join(",")}}`;
+    case "variable":
+      let out = node.name;
+      if (node.modifier?.type == "explode") {
+        out += "*";
+      } else if (node.modifier?.type == "substr") {
+        out += `:${node.modifier.length}`;
+      }
+      if (node.extension) {
+        out += `(${node.extension})`;
+      }
+      return out;
+  }
+}