Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Gruntfile.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ module.exports = function (grunt) {
default: {
files: {
"<%= properties.webappBuildDir %>/libs/": [
"sax:main",
"filesaver.js-npm:main",
"jszip/dist/jszip.js",
],
Expand Down Expand Up @@ -80,6 +79,4 @@ module.exports = function (grunt) {

grunt.registerTask("build", ["build:debug"]);

grunt.registerTask("clean", ["clean"]);

};
34 changes: 3 additions & 31 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 21 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,26 @@
"imsc"
],
"author": "Pierre-Anthony Lemieux <pal@sandflow.com>",
"main": "dist/main/js/main.js",
"types": "dist/main/js/main.d.ts",
"main": "dist/main/main.js",
"types": "dist/main/main.d.ts",
"unpkg": "dist/imsc.min.js",
"sideEffects": false,
"exports": {
Comment thread
littlespex marked this conversation as resolved.
".": {
"types": "./dist/main/main.d.ts",
"default": "./dist/main/main.js"
},
"./*.js": {
"types": "./dist/main/*.d.ts",
"default": "./dist/main/*.js"
},
"./*": {
"types": "./dist/main/*.d.ts",
"default": "./dist/main/*.js"
},
"./dist/*": "./dist/*",
"./package.json": "./package.json"
},
"scripts": {
"prepublishOnly": "grunt build:release",
"dev": "npx http-server build/public_html",
Expand All @@ -37,14 +54,13 @@
"test": "node --test ./src/test/js/*Test.js"
},
"dependencies": {
"sax": "^1.6.1"
"tslib": "^2.6.2"
},
"devDependencies": {
"@eslint/js": "^9.39.5",
"@rollup/plugin-commonjs": "^29.0.3",
"@rollup/plugin-node-resolve": "^16.0.3",
"@rollup/plugin-terser": "^1.0.0",
"@types/sax": "^1.2.7",
"eslint": "^9.39.5",
"filesaver.js-npm": "latest",
"globals": "^17.11.0",
Expand All @@ -56,7 +72,7 @@
"jszip": "latest",
"rollup": "^4.14.3",
"rollup-plugin-polyfill-node": "^0.13.0",
"tslib": "^2.6.2",
"sax": "^1.6.1",
"typescript": "^5.4.5"
}
}
2 changes: 0 additions & 2 deletions properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
"webappBuildDir" : "build/public_html",
"unitTestsResourcesDir" : "src/test/resources",
"umdBuildDir" : "dist",
"umdAllDebugName" : "imsc.all.debug.js",
"umdDebugName" : "imsc.debug.js",
"umdAllMinName" : "imsc.all.min.js",
"umdMinName" : "imsc.min.js"
}
35 changes: 0 additions & 35 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ import terser from "@rollup/plugin-terser";
import nodePolyfill from "rollup-plugin-polyfill-node";

export default [
// debug
{
input: "dist/main/main.js",
external: ["sax"],
plugins: [
commonjs({
sourceMap: true,
Expand All @@ -23,44 +21,11 @@ export default [
format: "umd",
name: "imsc",
sourcemap: true,
globals: {
sax: "sax",
},
}, {
file: "dist/imsc.min.js",
format: "umd",
name: "imsc",
sourcemap: true,
globals: {
sax: "sax",
},
plugins: [terser()],
}],
},

// all
{
input: "dist/main/main.js",
plugins: [
commonjs({
sourceMap: true,
}),
nodeResolve({
preferBuiltins: true,
browser: true,
}),
nodePolyfill(),
],
output: [{
file: "dist/imsc.all.debug.js",
format: "umd",
name: "imsc",
sourcemap: true,
}, {
file: "dist/imsc.all.min.js",
format: "umd",
name: "imsc",
sourcemap: true,
plugins: [terser()],
}],
},
Expand Down
23 changes: 12 additions & 11 deletions src/main/js/doc.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

import sax from "sax";
import { reportError, reportFatal, reportWarning } from "./error.js";
import { ns_ebutts, ns_ittp, ns_itts, ns_tt, ns_ttp, ns_tts } from "./names.js";
import { byName, byQName } from "./styles.js";
Expand All @@ -36,10 +35,8 @@ import { ComputedLength, hasOwnProperty, parseLength } from "./utils.js";

/**
* @typedef {import("./error").ErrorHandler} ErrorHandler
*/

/**
* @typedef {sax.Tag | sax.QualifiedTag} Node
* @typedef {import("./parser").Node} Node
* @typedef {import("./parser").Parser} Parser
*/

/**
Expand Down Expand Up @@ -80,18 +77,22 @@ import { ComputedLength, hasOwnProperty, parseLength } from "./utils.js";
* @param {string} xmlstring XML document
* @param {ErrorHandler} errorHandler Error callback
* @param {?MetadataHandler} metadataHandler Callback for <Metadata> elements
* @param {Parser} parser XML parser
* @returns {?TT} Opaque in-memory representation of an IMSC1 document
*/

export function fromXML(xmlstring, errorHandler, metadataHandler) {
const p = sax.parser(true, { xmlns: true });
export function fromParser(xmlstring, errorHandler, metadataHandler, parser) {
if (!parser) {
reportFatal(errorHandler, "No parser provided");
}

const estack = [];
const xmllangstack = [];
const xmlspacestack = [];
let metadata_depth = 0;
let doc = null;

p.onclosetag = function () {
parser.onclosetag = function () {

if (estack[0] instanceof Region) {

Expand Down Expand Up @@ -191,7 +192,7 @@ export function fromXML(xmlstring, errorHandler, metadataHandler) {
estack.shift();
};

p.ontext = function (str) {
parser.ontext = function (str) {

if (estack[0] === undefined) {

Expand Down Expand Up @@ -234,7 +235,7 @@ export function fromXML(xmlstring, errorHandler, metadataHandler) {

};

p.onopentag = function (node) {
parser.onopentag = function (node) {

// maintain the xml:space stack

Expand Down Expand Up @@ -604,7 +605,7 @@ export function fromXML(xmlstring, errorHandler, metadataHandler) {

// parse the document

p.write(xmlstring).close();
parser.write(xmlstring).close();

// all referential styling has been flatten, so delete styles

Expand Down
Loading
Loading