WIP: Check types

jsconfig.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "checkJs": true,
+    "allowJs": true,
+    "target": "ES6",
+    "strict": true,
+    "module": "ES6"
+  }
+}

package.json

@@ -2,7 +2,7 @@
   "name": "@projectwallace/format-css",
   "version": "1.0.6",
   "type": "module",
-  "source": "index.js",
+  "source": "src/index.js",
   "exports": {
     "require": "./dist/format.cjs",
     "default": "./dist/format.modern.js"
@@ -13,11 +13,13 @@
   "unpkg": "./dist/format.umd.js",
   "scripts": {
     "build": "microbundle",
-    "test": "uvu"
+    "test": "uvu",
+    "check": "tsc -p src/index.js --noEmit"
   },
   "devDependencies": {
     "@types/css-tree": "^2.3.4",
     "microbundle": "^0.15.1",
+    "typescript": "^5.3.2",
     "uvu": "^0.5.6"
   },
   "dependencies": {

test/atrules.test.js → src/atrules.test.js

@@ -1,6 +1,6 @@
 import { suite } from 'uvu'
 import * as assert from 'uvu/assert'
-import { format } from '../index.js'
+import { format } from './index.js'
 
 let Atrules = suite('Atrules')
 

test/declarations.js → src/declarations.test.js

@@ -1,6 +1,6 @@
 import { suite } from "uvu";
 import * as assert from "uvu/assert";
-import { format } from "../index.js";
+import { format } from "./index.js";
 
 let Declarations = suite("Declarations");
 

index.js → src/index.js

@@ -1,3 +1,4 @@
+// @ts-expect-error CSSTree imports are always troublesome
 import parse from 'css-tree/parser'
 
 /**
@@ -17,7 +18,7 @@ function indent(size) {
 function substr(node, css) {
 	let loc = node.loc
 
-	if (!loc) return ''
+	if (loc === undefined) return ''
 
 	let start = loc.start
 	let end = loc.end
@@ -38,8 +39,9 @@ function substr(node, css) {
  * @returns A portion of the CSS
  */
 function substr_raw(node, css) {
-	if (!node.loc) return ''
-	return css.substring(node.loc.start.offset, node.loc.end.offset)
+	let loc = node.loc
+	if (!loc) return ''
+	return css.substring(loc.start.offset, loc.end.offset)
 }
 
 /**
@@ -114,10 +116,11 @@ function print_simple_selector(node, css) {
 					break
 				}
 				case 'SelectorList': {
-					for (let grandchild of child.children) {
-						buffer += print_simple_selector(grandchild, css)
+					for (let selector of child.children) {
+						// @ts-expect-error This is being problematic, but I don't know hot to fix it
+						buffer += print_simple_selector(selector, css)
 
-						if (grandchild !== child.children.last) {
+						if (selector !== child.children.last) {
 							buffer += ', '
 						}
 					}
@@ -153,7 +156,17 @@ function print_simple_selector(node, css) {
 
 					if (child.selector !== null) {
 						// `of .selector`
-						buffer += ' of ' + print_simple_selector(child.selector, css)
+						buffer += ' of '
+
+						let items = child.selector.children
+						for (let selector of items) {
+							if (selector.type === 'Selector') {
+								if (selector !== items.first) {
+									buffer += ', '
+								}
+								buffer += print_simple_selector(selector, css)
+							}
+						}
 					}
 					break
 				}

test/rules.test.js → src/rules.test.js

@@ -1,6 +1,6 @@
 import { suite } from "uvu";
 import * as assert from "uvu/assert";
-import { format } from "../index.js";
+import { format } from "./index.js";
 
 let Rules = suite("Rules");
 

test/selectors.test.js → src/selectors.test.js

@@ -1,6 +1,6 @@
 import { suite } from "uvu";
 import * as assert from "uvu/assert";
-import { format } from "../index.js";
+import { format } from "./index.js";
 
 let Selectors = suite("Selectors");
 
@@ -82,6 +82,10 @@ Selectors("formats selectors with Nth", () => {
 			`li:nth-child(-n+3 of li.important) {}`,
 			`li:nth-child(-1n + 3 of li.important) {}`,
 		],
+		[
+			`li:nth-child(3n of ol li,ul li) {}`,
+			`li:nth-child(3n of ol li, ul li) {}`
+		],
 		[
 			`p:nth-child(n+8):nth-child(-n+15) {}`,
 			`p:nth-child(1n + 8):nth-child(-1n + 15) {}`,

test/test.js → src/stylesheet.test.js

@@ -1,6 +1,6 @@
 import { suite } from "uvu";
 import * as assert from "uvu/assert";
-import { format } from "../index.js";
+import { format } from "./index.js";
 
 let Stylesheet = suite("Stylesheet");
 

test/values.test.js → src/values.test.js

@@ -1,6 +1,6 @@
 import { suite } from "uvu";
 import * as assert from "uvu/assert";
-import { format } from "../index.js";
+import { format } from "./index.js";
 
 let Values = suite("Values");