proskomma-core 0.9.17 → 0.9.19

package/index.cjs

@@ -3,8 +3,8 @@ const {
   lexingRegexes,
   resolvers,
   typeDefs,
+  blocksSpecUtils,
 } = require('./src/index.cjs');
-const blocksSpecUtils = require('./src/util/scriptlike/blocksSpec.cjs');
 
 module.exports = {
   Proskomma, lexingRegexes, blocksSpecUtils, resolvers, typeDefs,

package/package.json

@@ -1,22 +1,17 @@
 {
   "name": "proskomma-core",
-  "version": "0.9.17",
+  "version": "0.9.19",
   "description": "A Scripture Runtime Engine",
-  "exports": {
-    ".": "./index.cjs",
-    "./esm": "./esm/wrapper.mjs"
-  },
+  "main": "dist/index.cjs",
+  "browser": "dist/bundle.js",
+  "module": "dist/module.mjs",
+  "source": "index.cjs",
   "scripts": {
-    "test": "export PKSRC=dist && npm run build && bash -c \"tape -r @babel/register test/code/*.cjs | node_modules/tap-summary/bin/cmd.js\"",
-    "srcTest": "bash -c \"tape test/code/main/*.cjs test/code/utils/*.cjs | node_modules/tap-summary/bin/cmd.js\"",
-    "rawTest": "export PKSRC=dist && npm run build && bash -c \"tape -r @babel/register test/code/*.cjs\"",
+    "build": "rm -fr dist && parcel build --no-source-maps",
+    "test": "export PKSRC=dist && bash -c \"tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js\"",
+    "rawTest": "export PKSRC=dist && bash -c \"tape -r @babel/register test/code/*.cjs\"",
     "oneTest": "bash -c \"tape -r @babel/register test/code/$TESTSCRIPT.cjs\"",
-    "oneSrcTest": "export PKSRC=src && bash -c \"tape -r @babel/register test/code/$TESTSCRIPT.cjs\"",
-    "coverage": "node_modules/nyc/bin/nyc.js bash -c \"tape -r @babel/register test/code/*.cjs\"",
-    "build": "rm -fr dist && webpack --mode production --config webpack.prod.js",
-    "serialize": "tape -r @babel/register test/code/serialize.cjs",
-    "rawSrcTest": "export PKSRC=src && bash -c \"tape test/code/main/*.cjs\"",
-    "testUtils": "bash -c \"tape test/code/utils/*.cjs\""
+    "prepublishOnly": "rm -fr dist && npm run build"
   },
   "repository": {
     "type": "git",
@@ -37,24 +32,17 @@
   },
   "homepage": "https://github.com/Proskomma/proskomma-core#readme",
   "dependencies": {
-    "@babel/core": "^7.19.0",
     "@graphql-tools/schema": "^9.0.3",
-    "assert": "^2.0.0",
     "async-mutex": "^0.4.0",
-    "babel-eslint": "^10.1.0",
+    "base-64": "^1.0.0",
     "base64-js": "^1.5.1",
     "bitset": "^5.1.1",
-    "btoa": "^1.2.1",
-    "checksum": "^1.0.0",
-    "constants-browserify": "^1.0.0",
-    "crypto-browserify": "^3.12.0",
+    "buffer": "^6.0.3",
     "deep-copy-all": "^1.3.4",
     "deep-equal": "^2.0.5",
-    "exceljs": "^4.3.0",
+    "easy-crc32": "^0.0.2",
     "fs-extra": "^11.1.0",
     "graphql": "^v16.6.0",
-    "node-polyfill-webpack-plugin": "^2.0.1",
-    "path-browserify": "^1.0.1",
     "proskomma-json-tools": "^0.6.5",
     "pure-uuid": "^1.6.2",
     "sax": "^1.2.4",
@@ -65,24 +53,21 @@
     "xregexp": "^5.1.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.18.10",
-    "@babel/eslint-parser": "^7.18.9",
-    "@babel/preset-env": "^7.19.0",
+    "@babel/eslint-parser": "^7.19.1",
     "@babel/register": "^7.18.9",
-    "babel-loader": "^8.2.5",
-    "buffer": "^6.0.3",
-    "eslint": "^8.23.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsdoc": "^39.3.6",
-    "eslint-plugin-prettier": "^v4.2.1",
-    "nyc": "^15.1.0",
-    "path": "^0.12.7",
-    "prettier": "^2.7.1",
+    "events": "^3.3.0",
+    "parcel": "^2.8.3",
     "process": "^0.11.10",
+    "stream-browserify": "^3.0.0",
     "tap-summary": "^4.0.0",
-    "tape": "^5.6.0",
-    "webpack": "5.75.0",
-    "webpack-cli": "4.10.0"
+    "tape": "^5.6.0"
+  },
+  "targets": {
+    "main": {
+      "optimize": true
+    },
+    "browser": {
+      "optimize": true
+    }
   }
 }

package/esm/package.json

@@ -1,3 +0,0 @@
-{
-    "type": "module"
-}

package/esm/wrapper.mjs

@@ -1,7 +0,0 @@
-import {
-  Proskomma, lexingRegexes, blocksSpecUtils, resolvers, typeDefs,
-} from '../index.cjs';
-
-export {
-  Proskomma, lexingRegexes, blocksSpecUtils, resolvers, typeDefs,
-};

package/informations/meeting_01_march_2023.md

@@ -1,38 +0,0 @@
-#
-
-## Participants
-
-- Birch
-- Incy
-- Mark Howe
-- Nicolas Condomitti
-
-## Discussions
-
-Birch's suggestions :
-* handle usfm 3 format from unfoldingWord
-* accept that there **will** be multiple format : so the API must handle that
-* uW format IN and uW format OUT
-* let's go quickly to the **first** solution
-* contact Chris and Bruce. They produced a UI.
-
-Mark's suggestions :
-
-
-Bincy's suggestions :
-* an english team are working on aligning the old testament. It would be IMMENSLY helpful to have a working tool to correct broken alignment
-
-
-## My conclusion
-
-Let's go to the first "simple" solution :
-* make a card in https://gateway-translate.netlify.app/
-* to correct the broken alignment on the go when you correct a text
-* **it HAS TO LIKE EXACTLY LIKE TRANSLATION-CORE**
-
-
-## TODO
-
-- [ ] mini editeur : TCore-like
-- [ ] travailler sur côté Epitelete pour communiquer les modifications à Proskomma
-- [ ] essayer de mettre ça en "Card" pour gateway-translate

package/scriptlike/blocksSpec.cjs

@@ -1,192 +0,0 @@
-const utils = require('../index.cjs');
-const { labelForScope } = utils.scopeDefs;
-const { tokenizeString } = require('../../parser/lib/tokenize.cjs');
-const {
-  flattenNodes,
-  numberNodes,
-} = require('../../parser/lexers/nodes.cjs');
-
-const tsvToInputBlock = (tsv, hasHeadings) => {
-  const ret = [];
-  const rows = tsv.split(/[\n\r]+/);
-
-  for (const [rowN, rowTSV] of rows.entries()) {
-    if (hasHeadings && rowN === 0) {
-      continue;
-    }
-
-    const row = rowTSV.split('\t');
-
-    for (const [cellN, cellString] of row.entries()) {
-      const cellRecord = {
-        os: [],
-        bg: [],
-        bs: {
-          type: 'scope',
-          subType: 'start',
-          payload: labelForScope('tTableRow', [`${rowN}`]),
-        },
-        is: [],
-        items: [],
-      };
-      const colScope = `tTableCol/${cellN}`;
-
-      cellRecord.is.push({
-        type: 'scope',
-        subType: 'start',
-        payload: colScope,
-      });
-      cellRecord.items.push({
-        type: 'scope',
-        subType: 'start',
-        payload: colScope,
-      });
-
-      for (const [token, tokenType] of tokenizeString(cellString)) {
-        cellRecord.items.push({
-          type: 'token',
-          subType: tokenType,
-          payload: token,
-        });
-      }
-      cellRecord.items.push({
-        type: 'scope',
-        subType: 'end',
-        payload: colScope,
-      });
-      ret.push(cellRecord);
-    }
-  }
-  return ret;
-};
-
-const tsvHeadingTags = tsv => {
-  const firstRow = tsv.split(/[\n\r]+/)[0];
-  return firstRow.split('\t').map((c, n) => `col${n}:${c.trim()}`);
-};
-
-const treeToInputBlock = treeJson => {
-  const ret = [];
-
-  for (const node of flattenNodes(numberNodes(treeJson))) {
-    const nodeRecord = {
-      os: [],
-      bg: [],
-      bs: {
-        type: 'scope',
-        subType: 'start',
-        payload: labelForScope('tTreeNode', [`${node.id}`]),
-      },
-      is: [],
-      items: [],
-    };
-    const scopePayload = labelForScope('tTreeParent', [`${node.parentId}`]);
-
-    nodeRecord.items.push({
-      type: 'scope',
-      subType: 'start',
-      payload: scopePayload,
-    });
-
-    nodeRecord.is.push({
-      type: 'scope',
-      subType: 'start',
-      payload: scopePayload,
-    });
-
-    if (node.content) {
-      for (const [name, content] of Object.entries(node.content)) {
-        const treeContentStart = nodeRecord.items.length;
-        const tokenized = tokenizeString(content);
-        const scopePayload = labelForScope('tTreeContent', [name, node.id, `${treeContentStart}`, `${tokenized.length}`]);
-
-        nodeRecord.items.push({
-          type: 'scope',
-          subType: 'start',
-          payload: scopePayload,
-        });
-
-        nodeRecord.is.push({
-          type: 'scope',
-          subType: 'start',
-          payload: scopePayload,
-        });
-
-        for (const [payload, subType] of tokenized) {
-          nodeRecord.items.push({
-            type: 'token',
-            subType,
-            payload,
-          });
-        }
-        nodeRecord.items.push({
-          type: 'scope',
-          subType: 'end',
-          payload: scopePayload,
-        });
-      }
-    }
-
-    if (node.children) {
-      for (const [childN, childNodeN] of node.children.entries()) {
-        const scopePayload = labelForScope('tTreeChild', [childN, childNodeN]);
-
-        nodeRecord.items.push({
-          type: 'scope',
-          subType: 'start',
-          payload: scopePayload,
-        });
-        nodeRecord.is.push({
-          type: 'scope',
-          subType: 'start',
-          payload: scopePayload,
-        });
-        nodeRecord.items.push({
-          type: 'scope',
-          subType: 'end',
-          payload: scopePayload,
-        });
-      }
-    }
-    nodeRecord.items.push({
-      type: 'scope',
-      subType: 'end',
-      payload: scopePayload,
-    });
-    ret.push(nodeRecord);
-  }
-  return ret;
-};
-
-const escapePayload =
-    str =>
-      str.replace(/\\/g, '\\\\')
-        .replace(/"/g, '\\"')
-        .replace(/\n/g, '\\n')
-        .replace(/\t/g, '\\t')
-        .replace(/\r/g, '\\r');
-
-const object2Query = obs =>
-  '[' +
-  obs.map(
-    ob => `\n    {\n      type: "${ob.type}" \n      subType: "${ob.subType}" \n      payload: "${escapePayload(ob.payload)}"\n    }`,
-  ).join(',') +
-  ']';
-const oneObject2Query = ob => `{\n      type: "${ob.type}" \n      subType: "${ob.subType}" \n      payload: "${escapePayload(ob.payload)}"}`;
-const blocksSpec2Query =
-    bSpec =>
-      '[\n' +
-      bSpec.map(
-        b =>
-          `  {\n    bs: ${oneObject2Query(b.bs)}, \n    bg: ${object2Query(b.bg)}, \n    os: ${object2Query(b.os)}, \n    is: ${object2Query(b.is)}, \n    items: ${object2Query(b.items)}}\n`) +
-      ']';
-
-module.exports = {
-  tokenizeString,
-  tsvToInputBlock,
-  tsvHeadingTags,
-  treeToInputBlock,
-  blocksSpec2Query,
-  object2Query,
-  oneObject2Query,
-};

package/scriptlike/dodson_lexicon.xsl

@@ -1,19 +0,0 @@
-<?xml version="1.0" ?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-    <xsl:output method="text"/>
-
-    <xsl:template match="/">
-        <xsl:for-each select="/*/*">
-            <xsl:value-of select="normalize-space(substring-before(@n, '|'))"/>
-            <xsl:text>&#x09;</xsl:text>
-            <xsl:value-of select="normalize-space(substring-after(@n, '|'))"/>
-            <xsl:text>&#x09;</xsl:text>
-            <xsl:value-of select="normalize-space(*[2])"/>
-            <xsl:text>&#x09;</xsl:text>
-            <xsl:value-of select="normalize-space(*[3])"/>
-            <xsl:text>&#x0A;</xsl:text>
-        </xsl:for-each>
-     </xsl:template>
-
-</xsl:stylesheet>

package/scriptlike/dodson_lexicon_to_entries.cjs

@@ -1,85 +0,0 @@
-const fse = require('fs-extra');
-const { tokenizeString } = require('./blocksSpec.cjs');
-
-const itemTokens = str => tokenizeString(str).map(tr => ({
-  type: 'token',
-  subType: tr[1],
-  payload: tr[0],
-}));
-
-const rowRecord = rowArray => ({
-  'bs': {
-    'type': 'scope',
-    'subType': 'start',
-    'payload': `kvPrimary/${rowArray[0]}`,
-  },
-  'bg': [],
-  'os': [],
-  'is': [
-    {
-      'type': 'scope',
-      'subType': 'start',
-      'payload': `kvSecondary/strong/${rowArray[1]}`,
-    },
-    {
-      'type': 'scope',
-      'subType': 'start',
-      'payload': 'kvField/briefDef',
-    },
-    {
-      'type': 'scope',
-      'subType': 'start',
-      'payload': 'kvField/fullDef',
-    },
-  ],
-  'items': [
-    {
-      'type': 'scope',
-      'subType': 'start',
-      'payload': `kvSecondary/strong/${rowArray[1]}`,
-    },
-    {
-      'type': 'scope',
-      'subType': 'start',
-      'payload': 'kvField/briefDef',
-    },
-    ...itemTokens(rowArray[2]),
-    {
-      'type': 'scope',
-      'subType': 'end',
-      'payload': 'kvField/briefDef',
-    },
-    {
-      'type': 'scope',
-      'subType': 'start',
-      'payload': 'kvField/fullDef',
-    },
-    ...itemTokens(rowArray[3]),
-    {
-      'type': 'scope',
-      'subType': 'end',
-      'payload': 'kvField/fullDef',
-    },
-    {
-      'type': 'scope',
-      'subType': 'end',
-      'payload': `kvSecondary/strong/${rowArray[1]}`,
-    },
-  ],
-});
-
-const lexicon_tsv = fse.readFileSync(process.argv[2])
-  .toString()
-  .split('\n')
-  .map(row => row.split('\t'))
-  .filter(row => row.length > 1);
-
-console.log(
-  JSON.stringify(
-    lexicon_tsv.map(
-      row => rowRecord(row),
-    ),
-    null,
-    2,
-  ),
-);

package/scriptlike/open_scriptures_hebrew_lexicon.xsl

@@ -1,28 +0,0 @@
-<?xml version="1.0" ?>
-<xsl:stylesheet
-        version="1.0"
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-        xmlns:os="http://openscriptures.github.com/morphhb/namespace">
-
-    <xsl:output method="text"/>
-
-    <xsl:template match="/os:lexicon">
-        <xsl:for-each select="os:entry">
-            <xsl:value-of select="os:w/text()"/>
-            <xsl:text>&#x09;</xsl:text>
-            <xsl:value-of select="@id"/>
-            <xsl:text>&#x09;</xsl:text>
-            <xsl:value-of select="os:w/@pos"/>
-            <xsl:text>&#x09;</xsl:text>
-            <xsl:value-of select="os:meaning"/>
-            <xsl:text>&#x09;</xsl:text>
-            <xsl:for-each select="os:meaning/os:def">
-                <xsl:value-of select="concat(./text(), '; .cjs')"/>
-            </xsl:for-each>
-            <xsl:text>&#x09;</xsl:text>
-            <xsl:value-of select="os:usage/text()"/>
-            <xsl:text>&#x0A;</xsl:text>
-        </xsl:for-each>
-     </xsl:template>
-
-</xsl:stylesheet>

package/scriptlike/open_scriptures_hebrew_lexicon_to_entries.cjs

@@ -1,85 +0,0 @@
-const fse = require('fs-extra');
-const { tokenizeString } = require('./blocksSpec.cjs');
-
-const itemTokens = str => tokenizeString(str).map(tr => ({
-  type: 'token',
-  subType: tr[1],
-  payload: tr[0],
-}));
-
-const rowRecord = rowArray => ({
-  'bs': {
-    'type': 'scope',
-    'subType': 'start',
-    'payload': `kvPrimary/${rowArray[0]}`,
-  },
-  'bg': [],
-  'os': [],
-  'is': [
-    {
-      'type': 'scope',
-      'subType': 'start',
-      'payload': `kvSecondary/strong/${rowArray[1]}`,
-    },
-    {
-      'type': 'scope',
-      'subType': 'start',
-      'payload': 'kvField/briefDef',
-    },
-    {
-      'type': 'scope',
-      'subType': 'start',
-      'payload': 'kvField/fullDef',
-    },
-  ],
-  'items': [
-    {
-      'type': 'scope',
-      'subType': 'start',
-      'payload': `kvSecondary/strong/${rowArray[1]}`,
-    },
-    {
-      'type': 'scope',
-      'subType': 'start',
-      'payload': 'kvField/briefDef',
-    },
-    ...itemTokens(rowArray[4].length > 0 ? rowArray[4].replace(/; $/, '') : rowArray[5]),
-    {
-      'type': 'scope',
-      'subType': 'end',
-      'payload': 'kvField/briefDef',
-    },
-    {
-      'type': 'scope',
-      'subType': 'start',
-      'payload': 'kvField/fullDef',
-    },
-    ...itemTokens(rowArray[3]),
-    {
-      'type': 'scope',
-      'subType': 'end',
-      'payload': 'kvField/fullDef',
-    },
-    {
-      'type': 'scope',
-      'subType': 'end',
-      'payload': `kvSecondary/strong/${rowArray[1]}`,
-    },
-  ],
-});
-
-const lexicon_tsv = fse.readFileSync(process.argv[2])
-  .toString()
-  .split('\n')
-  .map(row => row.split('\t'))
-  .filter(row => row.length > 1);
-
-console.log(
-  JSON.stringify(
-    lexicon_tsv.map(
-      row => rowRecord(row),
-    ),
-    null,
-    2,
-  ),
-);