Lots of fixes/chores (#1)

* fix: use `const` & `let` instead of `var`

* fix: use `const` for unreassigned immutables

* fix: set default value of options instead of ||

* fix: explicitly state `any` types for `isolatedModules` flag

* fix: reduce code dupe

* fix: use `import/export type` for types

* fix: remove unused imports

* feat: use `Token` type

* fix: add actual `mod.ts` for using module

Author: sno2

ast/ast.ts

@@ -1,4 +1,4 @@
-import { Rule } from "./node.ts";
+import type { Rule } from "./node.ts";
 
 type Type = "stylesheet";
 

ast/mod.ts

@@ -1,3 +1,3 @@
-export * from "./ast.ts";
-export * from "./node.ts";
-export * from "./token.ts";
+export type { AST } from "./ast.ts";
+export type { Rule, Decl } from "./node.ts";
+export type { Position, Token } from "./token.ts";

ast/node.ts

@@ -1,4 +1,4 @@
-import { Position } from "./token.ts";
+import type { Position } from "./token.ts";
 
 export interface Rule {
   type: string;

core/lexer/lexer.ts

@@ -1,7 +1,7 @@
 import dbg from "../../debug/debug.js";
-import { Token } from "../../ast/mod.ts";
+import type { Token } from "../../ast/mod.ts";
 
-let debug = dbg("lex");
+const debug = dbg("lex");
 
 /**
  * Convert a CSS string into an array of lexical tokens.
@@ -10,21 +10,21 @@ let debug = dbg("lex");
  * @returns {Array} lexical tokens
  */
 export function lex(css: string): Token[] {
-  var start = 0; // Debug timer start.
-
-  var buffer = ""; // Character accumulator
-  var ch; // Current character
-  var column = 0; // Current source column number
-  var cursor = -1; // Current source cursor position
-  var depth = 0; // Current nesting depth
-  var line = 1; // Current source line number
-  var state = "before-selector"; // Current state
-  var stack = [state]; // State stack
-  var token: Token = {}; // Current token
-  var tokens: Token[] = []; // Token accumulator
+  let start = 0; // Debug timer start.
+
+  let buffer = ""; // Character accumulator
+  let ch: string; // Current character
+  let column = 0; // Current source column number
+  let cursor = -1; // Current source cursor position
+  let depth = 0; // Current nesting depth
+  let line = 1; // Current source line number
+  let state = "before-selector"; // Current state
+  const stack = [state]; // State stack
+  let token: Token = {}; // Current token
+  const tokens: Token[] = []; // Token accumulator
 
   // Supported @-rules, in roughly descending order of usage probability.
-  var atRules: any = [
+  const atRules: any = [
     "media",
     "keyframes",
     { name: "-webkit-keyframes", type: "keyframes", prefix: "-webkit-" },
@@ -49,7 +49,7 @@ export function lex(css: string): Token[] {
    *
    * @returns {String} The next character.
    */
-  function getCh() {
+  function getCh(): string {
     skip();
     return css[cursor];
   }
@@ -73,8 +73,8 @@ export function lex(css: string): Token[] {
    * @returns {Boolean} Whether the string was found.
    */
   function isNextString(str: string): boolean {
-    var start = cursor + 1;
-    return (str === css.slice(start, start + str.length));
+    let start = cursor + 1;
+    return str === css.slice(start, start + str.length);
   }
 
   /**
@@ -85,7 +85,7 @@ export function lex(css: string): Token[] {
    * @returns {Number|false} The position, or `false` if not found.
    */
   function find(str: string): number | boolean {
-    var pos = css.slice(cursor).indexOf(str);
+    let pos = css.slice(cursor).indexOf(str);
 
     return pos > 0 ? pos : false;
   }
@@ -117,7 +117,7 @@ export function lex(css: string): Token[] {
    * @returns {String} The removed state.
    */
   function popState(): string | undefined {
-    var removed = stack.pop();
+    let removed = stack.pop();
     state = stack[stack.length - 1];
 
     return removed;
@@ -143,7 +143,7 @@ export function lex(css: string): Token[] {
    * @returns {String} The replaced state.
    */
   function replaceState(newState: string): string {
-    var previousState = state;
+    let previousState = state;
     stack[stack.length - 1] = state = newState;
 
     return previousState;
@@ -165,7 +165,7 @@ export function lex(css: string): Token[] {
       }
       cursor++;
     } else {
-      var skipStr = css.slice(cursor, cursor + (n || 0)).split("\n");
+      let skipStr = css.slice(cursor, cursor + (n || 0)).split("\n");
       if (skipStr.length > 1) {
         line += skipStr.length - 1;
         column = 1;
@@ -221,7 +221,7 @@ export function lex(css: string): Token[] {
 
   start = Date.now();
 
-  while (ch = getCh()) {
+  while ((ch = getCh())) {
     debug(ch, getState());
 
     // column += 1;
@@ -311,7 +311,7 @@ export function lex(css: string): Token[] {
             // Tokenize a declaration
             // if value is empty skip the declaration
             if (buffer.trim().length > 0) {
-              token.value = buffer.trim(), addToken();
+              (token.value = buffer.trim()), addToken();
             }
             replaceState("before-name");
             break;
@@ -524,7 +524,7 @@ export function lex(css: string): Token[] {
             if (isNextChar("*")) {
               // Ignore comments in selectors, properties and values. They are
               // difficult to represent in the AST.
-              var pos = find("*/");
+              let pos = find("*/");
 
               if (pos && typeof pos !== "boolean") {
                 skip(pos + 1);
@@ -596,11 +596,11 @@ export function lex(css: string): Token[] {
 
           default:
             // Iterate over the supported @-rules and attempt to tokenize one.
-            var tokenized = false;
-            var name;
-            var rule;
+            let tokenized = false;
+            let name;
+            let rule;
 
-            for (var j = 0, len = atRules.length; !tokenized && j < len; ++j) {
+            for (let j = 0, len = atRules.length; !tokenized && j < len; ++j) {
               rule = atRules[j];
               name = rule.name || rule;
 
@@ -683,7 +683,7 @@ export function lex(css: string): Token[] {
     }
   }
 
-  debug("ran in", (Date.now() - start) + "ms");
+  debug("ran in", Date.now() - start + "ms");
 
   return tokens;
 }

core/parser/parser.ts

@@ -1,13 +1,13 @@
 import dbg from "../../debug/debug.js";
-let debug = dbg("parse");
+const debug = dbg("parse");
 
 import { lex } from "../lexer/lexer.ts";
-import { AST, Token } from "../../ast/mod.ts";
+import type { AST, Token } from "../../ast/mod.ts";
 
-var _comments: boolean; // Whether comments are allowed.
-var _depth: number; // Current block nesting depth.
-var _position: any; // Whether to include line/column position.
-var _tokens: Token[]; // Array of lexical tokens.
+let _comments: boolean; // Whether comments are allowed.
+let _depth: number; // Current block nesting depth.
+let _position: any; // Whether to include line/column position.
+let _tokens: Token[]; // Array of lexical tokens.
 
 /**
  * Convert a CSS string or array of lexical tokens into a `stringify`-able AST.
@@ -17,10 +17,9 @@ var _tokens: Token[]; // Array of lexical tokens.
  * @param {Boolean} [options.comments=false] allow comment nodes in the AST
  * @returns {Object} `stringify`-able AST
  */
-export function parse(css: string | any[], options: any): AST {
-  var start = 0; // Debug timer start.
+export function parse(css: string | any[], options: any = {}): AST {
+  let start = 0; // Debug timer start.
 
-  options || (options = {});
   _comments = !!options.comments;
   _position = !!options.position;
 
@@ -29,9 +28,9 @@ export function parse(css: string | any[], options: any): AST {
   // Operate on a copy of the given tokens, or the lex()'d CSS string.
   _tokens = Array.isArray(css) ? css.slice() : lex(css);
 
-  var rule;
-  var rules = [];
-  var token;
+  let rule: any;
+  let rules = [];
+  let token: Token;
 
   start = Date.now();
 
@@ -40,7 +39,7 @@ export function parse(css: string | any[], options: any): AST {
     rule && rules.push(rule);
   }
 
-  debug("ran in", (Date.now() - start) + "ms");
+  debug("ran in", Date.now() - start + "ms");
 
   return {
     type: "stylesheet",
@@ -63,7 +62,7 @@ export function parse(css: string | any[], options: any): AST {
 function astNode(token: Token, overrd?: any): Token {
   let override: any = overrd || {};
 
-  var node: Token = {};
+  let node: Token = {};
 
   if (token.type) {
     node.type = override.type || token.type;
@@ -76,7 +75,7 @@ function astNode(token: Token, overrd?: any): Token {
   }
 
   let keys = Object.keys(override);
-  let key;
+  let key: any;
   for (let i = 0; i < keys.length; ++i) {
     key = keys[i];
     let n = node as Record<string, any>;
@@ -102,8 +101,8 @@ function astNode(token: Token, overrd?: any): Token {
  *
  * @returns {Object} lexical token
  */
-function next() {
-  var token = _tokens.shift();
+function next(): any {
+  let token = _tokens.shift();
   debug("next:", JSON.stringify(token, null, 2));
   return token;
 }
@@ -121,7 +120,7 @@ function parseAtGroup(token: Token): any {
 
   // As the @-group token is assembled, relevant token values are captured here
   // temporarily. They will later be used as `tokenize()` overrides.
-  var overrides: any = {};
+  let overrides: any = {};
 
   switch (token.type) {
     case "font-face":
@@ -262,11 +261,11 @@ function parseToken(token: any): any {
  * @return {Array} AST nodes
  */
 function parseTokensWhile(conditionFn: (token: any) => boolean | number): any {
-  var node;
-  var nodes = [];
-  var token;
+  let node: any;
+  let nodes = [];
+  let token: any;
 
-  while ((token = next()) && (conditionFn && conditionFn(token))) {
+  while ((token = next()) && conditionFn && conditionFn(token)) {
     node = parseToken(token);
     node && nodes.push(node);
   }
@@ -286,7 +285,7 @@ function parseTokensWhile(conditionFn: (token: any) => boolean | number): any {
  */
 function parseDeclarations(): any {
   return parseTokensWhile(function (token) {
-    return (token.type === "property" || token.type === "comment");
+    return token.type === "property" || token.type === "comment";
   });
 }
 

example.ts

@@ -1,6 +1,6 @@
 import { parse } from "./core/parser/parser.ts";
-var ast = parse(
-  "/* comment */ p { color: black; }",
-  { position: true, comments: true },
-);
+const ast = parse("/* comment */ p { color: black; }", {
+  position: true,
+  comments: true,
+});
 console.log(ast);

mod.ts

@@ -0,0 +1,3 @@
+export type { AST, Rule, Decl, Position, Token } from "./ast/mod.ts";
+export { lex } from "./core/lexer/lexer.ts";
+export { parse } from "./core/parser/parser.ts";

testing/deps.ts

@@ -1,5 +1 @@
-export {
-  assert,
-  assertEquals,
-  assertObjectMatch
-} from "https://deno.land/std@0.75.0/testing/asserts.ts";
+export { assertEquals } from "https://deno.land/std@0.75.0/testing/asserts.ts";

testing/parse_test.ts

@@ -1,21 +1,22 @@
-import { parse } from "../core/parser/parser.ts";
+import { parse } from "../mod.ts";
 import { comment } from "./fixtures.js";
-import { assertEquals, assertObjectMatch } from "./deps.ts";
+import { assertEquals } from "./deps.ts";
 
 for (let i = 0; i < comment.length; i++) {
+  const node = comment[i];
   Deno.test(`[parse] - comments (${i})`, function () {
-    let ast = parse(comment[i].css, { comments: true });
-    assertEquals(ast, comment[i].ast);
+    let ast = parse(node.css, { comments: true });
+    assertEquals(ast, node.ast);
   });
 }
 
 Deno.test(`[parse] bootstrap.css`, async function () {
   const source = await Deno.readTextFile(
-    "./testing/bootstrap_3.3.7/bootstrap.css",
+    "./testing/bootstrap_3.3.7/bootstrap.css"
   );
-  const expected_ast = await import("./bootstrap_3.3.7/bootstrap.css.ast.js")
+  const expected_ast = await import("./bootstrap_3.3.7/bootstrap.css.ast.js");
   let ast = parse(source, {});
-  
+
   // For dumping new AST for bootstrap.css
   // await Deno.writeTextFile("./testing/bootstrap_3.3.7/bootstrap.css.ast.js", JSON.stringify(ast));
   //