Merge pull request #18 from remotemerge/update-code

Update code

Author: remotemerge

.eslintignore

@@ -2,4 +2,4 @@
 /.idea/
 /__tests__/
 /dist/
-/public/
+/node_modules/

.github/workflows/install.yml

@@ -10,24 +10,24 @@ on:
 
 jobs:
   install:
-    # OS to run
-    runs-on: ubuntu-latest
+    # The matrix of OS and Node.js versions
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        node: [ 14, 16, 18, 'current' ]
 
-    steps:
-      # checkout the code
-      - uses: actions/checkout@v3
+    # The type of runner that the job will run on
+    runs-on: ${{ matrix.os }}
 
-      # Use nodejs LTS version
-      - uses: actions/setup-node@v3
+    steps:
+      - name: "Use specified Node.js version"
+        uses: actions/setup-node@v3
         with:
-          node-version: 'lts/*'
+          node-version: ${{ matrix.node }}
 
       - name: "Print version"
         run: node -v && npm -v
 
-      - name: "Clean the directory"
-        run: rm -rf *
-
       - name: "Init package config"
         run: npm init -y
 

.github/workflows/production.yml

@@ -9,18 +9,16 @@ on:
 
 jobs:
   publish:
-    # OS to run
+    # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - name: "Checkout repository"
+        uses: actions/checkout@v3
 
       - name: "Install dependencies and build"
         run: npm install && npm run build
 
-      - name: "Copy readme doc"
-        run: \cp README.md ./dist/README.md
-
       # publish to NPM
       - uses: actions/setup-node@v3
         with:

.github/workflows/testing.yml

@@ -6,21 +6,23 @@ on: [pull_request]
 
 jobs:
   test:
-    # OS to run
-    runs-on: ubuntu-latest
+    # The matrix of OS and Node.js versions
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
+
+    # The type of runner that the job will run on
+    runs-on: ${{ matrix.os }}
 
     steps:
-      # checkout the code
-      - uses: actions/checkout@v3
+      - name: "Checkout repository"
+        uses: actions/checkout@v3
 
       # Use nodejs LTS version
       - uses: actions/setup-node@v3
         with:
           node-version: 'lts/*'
 
-      - name: "Print version"
-        run: node -v && npm -v
-
       - name: "Install dependencies and build"
         run: npm install && npm run build
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Madan Sapkota
+Copyright (c) 2023 Madan Sapkota
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,7 +1,7 @@
 # <img src="./assets/logo.png" width="28" height="28"> XPath Parser
 
 [![Package](https://img.shields.io/npm/v/@remotemerge/xpath-parser?logo=npm)](https://www.npmjs.com/package/@remotemerge/xpath-parser)
-![Build](https://img.shields.io/github/workflow/status/remotemerge/xpath-parser/Production?logo=github)
+![Build](https://img.shields.io/github/actions/workflow/status/remotemerge/xpath-parser/production.yml?logo=github)
 ![Downloads](https://img.shields.io/npm/dt/@remotemerge/xpath-parser)
 ![License](https://img.shields.io/npm/l/@remotemerge/xpath-parser)
 

__tests__/multi-query.test.js

@@ -1,7 +1,10 @@
-import XpathParser from '../dist/xpath-parser.js';
+import { test } from 'vitest';
+import assert from 'assert';
+
+import Parser from '../dist/index.es.js';
 import htmlContent from './data/product.html';
 
-const parser = new XpathParser(htmlContent);
+const parser = new Parser(htmlContent);
 const product = parser.multiQuery({
   title: '//div[@id="ppd"]//span[@id="productTitle"]',
   seller: '//div[@id="ppd"]//a[@id="bylineInfo"]',
@@ -10,23 +13,24 @@ const product = parser.multiQuery({
 });
 
 test('must return an object', () => {
-  expect(typeof product).toBe('object');
+  assert.strictEqual(typeof product, 'object');
 });
 
 test('must have four elements', () => {
-  expect(Object.keys(product).length).toBe(4);
+  assert.strictEqual(Object.keys(product).length, 4);
 });
 
 test('match the product title', () => {
-  expect(product.title).toBe(
+  assert.strictEqual(
+    product.title,
     'LETSCOM Fitness Tracker HR, Activity Tracker Watch with Heart Rate Monitor, Waterproof Smart Fitness Band with Step Counter, Calorie Counter, Pedometer Watch for Kids Women and Men',
   );
 });
 
 test('product price contains dollar sign', () => {
-  expect(product.price).toMatch('$');
+  assert(product.price.includes('$'));
 });
 
 test('product rating contains numbers', () => {
-  expect(product.rating).toMatch(/\d+/);
+  assert(product.rating.match(/\d+/));
 });

__tests__/query-first.test.js

@@ -1,15 +1,19 @@
-import XpathParser from '../dist/xpath-parser.js';
+import { test } from 'vitest';
+import assert from 'assert';
+
+import Parser from '../dist/index.es.js';
 import htmlContent from './data/product.html';
 
-const parser = new XpathParser(htmlContent);
+const parser = new Parser(htmlContent);
 const str = parser.queryFirst('//span[@id="productTitle"]');
 
 test('title must be string', () => {
-  expect(typeof str).toBe('string');
+  assert.strictEqual(typeof str, 'string');
 });
 
 test('match the title', () => {
-  expect(str).toBe(
+  assert.strictEqual(
+    str,
     'LETSCOM Fitness Tracker HR, Activity Tracker Watch with Heart Rate Monitor, Waterproof Smart Fitness Band with Step Counter, Calorie Counter, Pedometer Watch for Kids Women and Men',
   );
 });

__tests__/query-list.test.js

@@ -1,17 +1,23 @@
-import XpathParser from '../dist/xpath-parser.js';
+import { test } from 'vitest';
+import assert from 'assert';
+
+import Parser from '../dist/index.es.js';
 import htmlContent from './data/products.html';
 
-const parser = new XpathParser(htmlContent);
+const parser = new Parser(htmlContent);
 const results = parser.queryList('//span[contains(@class, "zg-item")]/a/div');
 
 test('must return object', () => {
-  expect(typeof results).toBe('object');
+  assert.strictEqual(typeof results, 'object');
 });
 
 test('must have 50 titles', () => {
-  expect(results.length).toBe(50);
+  assert.strictEqual(results.length, 50);
 });
 
-test('match the fist title', () => {
-  expect(results[0]).toBe('Cell Phone Stand,Angle Height Adjustable Stable LISEN Cell Phone Stand For Desk,Sturdy…');
+test('match the first title', () => {
+  assert.strictEqual(
+    results[0],
+    'Cell Phone Stand,Angle Height Adjustable Stable LISEN Cell Phone Stand For Desk,Sturdy…',
+  );
 });

__tests__/sub-query.test.js

@@ -1,7 +1,10 @@
-import XpathParser from '../dist/xpath-parser.js';
+import { test } from 'vitest';
+import assert from 'assert';
+
+import Parser from '../dist/index.es.js';
 import htmlContent from './data/products.html';
 
-const parser = new XpathParser(htmlContent);
+const parser = new Parser(htmlContent);
 const products = parser.subQuery({
   root: '//span[contains(@class, "zg-item")]',
   pagination: '//ul/li/a[contains(text(), "Next")]/@href',
@@ -14,44 +17,41 @@ const products = parser.subQuery({
 });
 
 test('must return an object', () => {
-  expect(typeof products).toBe('object');
+  assert.strictEqual(typeof products, 'object');
 });
 
-test('must have one or two elements', () => {
-  expect(Object.keys(products).length).toBeGreaterThanOrEqual(1);
-  expect(Object.keys(products).length).toBeLessThanOrEqual(2);
+test('must have resuts array and pagination url', () => {
+  assert(Array.isArray(products.results));
+  assert.strictEqual(typeof products.paginationUrl, 'string');
 });
 
 test('pagination url is string', () => {
   if (products.paginationUrl) {
-    expect(products).toMatchObject({
-      paginationUrl: expect.any(String),
-    });
+    assert.strictEqual(typeof products.paginationUrl, 'string');
   }
 });
 
 test('must have results array', () => {
-  expect(products).toMatchObject({
-    results: expect.any(Array),
-  });
+  assert(Array.isArray(products.results));
 });
 
 test('each product must be an object', () => {
-  expect(typeof products.results[0]).toBe('object');
+  assert.strictEqual(typeof products.results[0], 'object');
 });
 
 const firstProduct = products.results[0];
 
 test('match the product title', () => {
-  expect(firstProduct.title).toBe(
+  assert.strictEqual(
+    firstProduct.title,
     'Cell Phone Stand,Angle Height Adjustable Stable LISEN Cell Phone Stand For Desk,Sturdy Aluminum Metal Phone Holder,Compatible with Mobile Phone/iPad/Kindle/Tablet,4-10inch',
   );
 });
 
 test('product price contains dollar sign', () => {
-  expect(firstProduct.price).toMatch('$');
+  assert(firstProduct.price.includes('$'));
 });
 
 test('product image url starts with https', () => {
-  expect(firstProduct.image).toMatch(/^https:\/\//);
+  assert(firstProduct.image.startsWith('https://'));
 });