rdfa-streaming-parser 1.3.0 → 2.0.0

package/README.md

@@ -1,6 +1,6 @@
 # RDFa Streaming Parser
 
-[![Build Status](https://travis-ci.org/rubensworks/rdfa-streaming-parser.js.svg?branch=master)](https://travis-ci.org/rubensworks/rdfa-streaming-parser.js)
+[![Build status](https://github.com/rubensworks/rdfa-streaming-parser.js/workflows/CI/badge.svg)](https://github.com/rubensworks/rdfa-streaming-parser.js/actions?query=workflow%3ACI)
 [![Coverage Status](https://coveralls.io/repos/github/rubensworks/rdfa-streaming-parser.js/badge.svg?branch=master)](https://coveralls.io/github/rubensworks/rdfa-streaming-parser.js?branch=master)
 [![npm version](https://badge.fury.io/js/rdfa-streaming-parser.svg)](https://www.npmjs.com/package/rdfa-streaming-parser)
 

package/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/IActiveTag.d.ts

@@ -1,4 +1,4 @@
-import * as RDF from "rdf-js";
+import * as RDF from "@rdfjs/types";
 import { IRdfaPattern } from "./IRdfaPattern";
 /**
  * Data holder for the RDFa state in XML tags.

package/lib/IRdfaPattern.d.ts

@@ -1,4 +1,4 @@
-import * as RDF from "rdf-js";
+import * as RDF from "@rdfjs/types";
 import { IActiveTag } from "./IActiveTag";
 /**
  * A datastructure for storing an rdfa:Pattern.

package/lib/RdfaParser.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import EventEmitter = NodeJS.EventEmitter;
 import { Parser as HtmlParser } from "htmlparser2";
-import * as RDF from "rdf-js";
-import { Transform, TransformCallback } from "stream";
+import * as RDF from "@rdfjs/types";
+import { Transform } from "readable-stream";
 import { IActiveTag } from "./IActiveTag";
 import { IHtmlParseListener } from "./IHtmlParseListener";
 import { IRdfaPattern } from "./IRdfaPattern";
@@ -27,8 +27,8 @@ export declare class RdfaParser extends Transform implements RDF.Sink<EventEmitt
      * @return {RDF.Stream} A quad stream.
      */
     import(stream: EventEmitter): RDF.Stream;
-    _transform(chunk: any, encoding: string, callback: TransformCallback): void;
-    _flush(callback: TransformCallback): void;
+    _transform(chunk: any, encoding: string, callback: (error?: Error | null, data?: any) => void): void;
+    _flush(callback: (error?: Error | null, data?: any) => void): void;
     onTagOpen(name: string, attributes: {
         [s: string]: string;
     }): void;

package/lib/RdfaParser.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RdfaParser = void 0;
 const htmlparser2_1 = require("htmlparser2");
-const stream_1 = require("stream");
+const readable_stream_1 = require("readable-stream");
 const INITIAL_CONTEXT_XHTML = require("./initial-context-xhtml.json");
 const INITIAL_CONTEXT = require("./initial-context.json");
 const RdfaProfile_1 = require("./RdfaProfile");
@@ -10,7 +10,7 @@ const Util_1 = require("./Util");
 /**
  * A stream transformer that parses RDFa (text) streams to an {@link RDF.Stream}.
  */
-class RdfaParser extends stream_1.Transform {
+class RdfaParser extends readable_stream_1.Transform {
     constructor(options) {
         super({ readableObjectMode: true });
         this.activeTagStack = [];
@@ -43,7 +43,7 @@ class RdfaParser extends stream_1.Transform {
      * @return {RDF.Stream} A quad stream.
      */
     import(stream) {
-        const output = new stream_1.PassThrough({ readableObjectMode: true });
+        const output = new readable_stream_1.PassThrough({ readableObjectMode: true });
         stream.on('error', (error) => parsed.emit('error', error));
         stream.on('data', (data) => output.push(data));
         stream.on('end', () => output.push(null));
@@ -51,7 +51,7 @@ class RdfaParser extends stream_1.Transform {
         return parsed;
     }
     _transform(chunk, encoding, callback) {
-        this.parser.write(chunk);
+        this.parser.write(chunk.toString());
         callback();
     }
     _flush(callback) {

package/lib/Util.d.ts

@@ -1,4 +1,4 @@
-import * as RDF from "rdf-js";
+import * as RDF from "@rdfjs/types";
 import { IActiveTag } from "./IActiveTag";
 import { RdfaProfile } from "./RdfaProfile";
 /**

package/lib/Util.js

@@ -107,7 +107,7 @@ class Util {
         if (fragmentIndex >= 0) {
             href = href.substr(0, fragmentIndex);
         }
-        return this.dataFactory.namedNode(relative_to_absolute_iri_1.resolve(href, this.baseIRI.value));
+        return this.dataFactory.namedNode((0, relative_to_absolute_iri_1.resolve)(href, this.baseIRI.value));
     }
     /**
      * If the term is a boolean, return the baseIRI, otherwise return the term as-is.
@@ -163,7 +163,7 @@ class Util {
         term = term || '';
         if (!allowSafeCurie) {
             if (!vocab) {
-                term = relative_to_absolute_iri_1.resolve(term, this.getBaseIriTerm(activeTag).value);
+                term = (0, relative_to_absolute_iri_1.resolve)(term, this.getBaseIriTerm(activeTag).value);
             }
             if (!Util.isValidIri(term)) {
                 return null;
@@ -192,10 +192,10 @@ class Util {
         let iri = Util.expandPrefixedTerm(term, activeTag);
         // Resolve against baseIRI if in base-mode, or if the term was a prefixed relative IRI
         if (!vocab) {
-            iri = relative_to_absolute_iri_1.resolve(iri, this.getBaseIriTerm(activeTag).value);
+            iri = (0, relative_to_absolute_iri_1.resolve)(iri, this.getBaseIriTerm(activeTag).value);
         }
         else if (term !== iri) {
-            iri = relative_to_absolute_iri_1.resolve(iri, this.baseIRIDocument.value);
+            iri = (0, relative_to_absolute_iri_1.resolve)(iri, this.baseIRIDocument.value);
         }
         if (!Util.isValidIri(iri)) {
             return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rdfa-streaming-parser",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "description": "A fast and lightweight streaming RDFa parser",
   "keywords": [
     "rdfa",
@@ -28,10 +28,11 @@
     "index.js"
   ],
   "dependencies": {
-    "@types/rdf-js": "*",
-    "rdf-data-factory": "^1.0.2",
-    "htmlparser2": "^4.0.0",
-    "relative-to-absolute-iri": "^1.0.2"
+    "@rdfjs/types": "*",
+    "htmlparser2": "^8.0.0",
+    "rdf-data-factory": "^1.1.0",
+    "relative-to-absolute-iri": "^1.0.2",
+    "readable-stream": "^4.0.0"
   },
   "pre-commit": [
     "build",
@@ -39,29 +40,31 @@
     "test"
   ],
   "devDependencies": {
-    "@types/rdf-js": "^4.0.0",
-    "@types/jest": "^26.0.0",
+    "@types/jest": "^28.0.0",
     "@types/jest-each": "^24.3.0",
-    "@types/node": "^13.1.0",
-    "arrayify-stream": "^1.0.0",
+    "@types/readable-stream": "^2.3.14",
+    "arrayify-stream": "^2.0.0",
     "coveralls": "^3.0.0",
-    "jest": "^26.0.0",
-    "jest-each": "^26.0.0",
-    "jest-rdf": "^1.6.0",
+    "jest": "^28.0.0",
+    "jest-each": "^28.0.0",
+    "jest-rdf": "^1.7.0",
     "manual-git-changelog": "^1.0.1",
     "pre-commit": "^1.2.2",
-    "rdf-test-suite": "^1.13.4",
     "rdf-quad": "^1.5.0",
+    "rdf-test-suite": "^1.13.4",
     "streamify-string": "^1.0.1",
-    "ts-jest": "^26.0.0",
+    "ts-jest": "^28.0.0",
+    "ts-loader": "^9.3.1",
     "tslint": "^6.0.0",
     "tslint-eslint-rules": "^5.3.1",
-    "typescript": "^4.0.0"
+    "typescript": "^4.0.0",
+    "webpack": "^5.73.0",
+    "webpack-cli": "^4.10.0"
   },
   "jest": {
     "globals": {
       "ts-jest": {
-        "tsConfig": "test/tsconfig.json"
+        "tsconfig": "test/tsconfig.json"
       }
     },
     "setupFilesAfterEnv": [
@@ -124,7 +127,5 @@
     "spec-1-xml-earl": "rdf-test-suite spec/parser.js http://rdfa.info/test-suite/test-cases/rdfa1.0/xml/manifest.ttl -i '{ \"profile\": \"xml\" }' -c .rdf-test-suite-cache/ -o earl -p spec/earl-meta.json > spec/earl-1-rdfastreamingparser-xml.ttl",
     "spec-clean": "rm -r .rdf-test-suite-cache/"
   },
-  "resolutions": {
-    "@types/rdf-js": "^4.0.0"
-  }
+  "sideEffects": false
 }

package/CHANGELOG.md

@@ -1,53 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-<a name="v1.3.0"></a>
-## [v1.3.0](https://github.com/rubensworks/rdfa-streaming-parser.js/compare/v1.2.2...v1.3.0) - 2020-09-15
-
-### Changed
-* [Migrate to rdf-data-factory](https://github.com/rubensworks/rdfa-streaming-parser.js/commit/0552eb287b228cdfa305070803f9dd176041bbe0)
-
-### Fixed
-* [Fix import method sometimes failing on large streams](https://github.com/rubensworks/rdfa-streaming-parser.js/commit/93c8f5f7d002d05bf5e23fa2c3fa5c97d6ac88d3)
-
-<a name="v1.2.2"></a>
-## [v1.2.2](https://github.com/rubensworks/rdfa-streaming-parser.js/compare/v1.2.0...v1.2.2) - 2020-06-03
-
-### Fixed
-* [Fix incompatibility with WhatWG streams](https://github.com/rubensworks/rdfa-streaming-parser.js/commit/8b7964eb24f70b23f0c5811b730b752e95d3695d)
-
-### Changed
-* [Update dependency @types/rdf-js to v3, Closes #17](https://github.com/rubensworks/rdfa-streaming-parser.js/commit/4c45c2f3b41146934678c6c9e53b29afcd5c440c)
-
-<a name="v1.2.1"></a>
-## [v1.2.1](https://github.com/rubensworks/rdfa-streaming-parser.js/compare/v1.2.0...v1.2.1) - 2020-03-28
-
-### Fixed
-* [Fix crash on relative base tag values](https://github.com/rubensworks/rdfa-streaming-parser.js/commit/e564188e5fb41cbbbbfd78ff1269e1e57959ef86)
-* [Properly delegate errors from listeners to the stream](https://github.com/rubensworks/rdfa-streaming-parser.js/commit/730201ce16bc27b80ca046da015d48ce77b8ee8d)
-
-<a name="v1.2.0"></a>
-## [v1.2.0](https://github.com/rubensworks/rdfa-streaming-parser.js/compare/v1.1.1...v1.2.0) - 2020-01-27
-
-### Added
-* [Add typings for RDF.Sink implementation, Closes #9](https://github.com/rubensworks/rdfa-streaming-parser.js/commit/ee48998a0426b41a0a88a61d523273f719c12d05)
-
-### Changed
-* [Make implementation more strongly typed](https://github.com/rubensworks/rdfa-streaming-parser.js/commit/e0fb225419a350d8fd5cb6e759800bc673f3b327)
-
-<a name="v1.1.1"></a>
-## [v1.1.1](https://github.com/rubensworks/rdfa-streaming-parser.js/compare/v1.1.0...v1.1.1) - 2019-08-07
-
-### Changed
-* [Update to htmlparser2 4.x.x, Closes #5](https://github.com/rubensworks/rdfa-streaming-parser.js/commit/f1c950a956ac33c7cbd570b5df3f521ca02b2eeb)
-
-<a name="v1.1.0"></a>
-## [v1.1.0](https://github.com/rubensworks/streaming-rdfa-parser.js/compare/v1.0.0...v1.1.0) - 2019-07-16
-
-### Fixed
-* [Fix inner HTML parser not being ended properly](https://github.com/rubensworks/streaming-rdfa-parser.js/commit/f9c3b443d46f15d327c3661507e28b91b9d16abf)
-
-<a name="v1.0.0"></a>
-## [v1.0.0] - 2019-07-08
-
-Initial release