proskomma-core 0.10.5 → 0.10.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/index.js +18 -6
  2. package/dist/index.mjs +18 -6
  3. package/package.json +5 -5
package/dist/index.js CHANGED
@@ -15986,7 +15986,7 @@ var bitset = {
15986
15986
  })(bitset, bitsetExports);
15987
15987
  const BitSet = /* @__PURE__ */ getDefaultExportFromCjs(bitsetExports);
15988
15988
  const name = "proskomma-core";
15989
- const version = "0.10.5";
15989
+ const version = "0.10.6";
15990
15990
  const description$b = "A Scripture Runtime Engine";
15991
15991
  const files = [
15992
15992
  "dist"
@@ -16003,8 +16003,8 @@ const scripts = {
16003
16003
  build: "rm -fr dist && vite build",
16004
16004
  test: 'rm -fr dist && vite build && export PKSRC=dist && bash -c "tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js"',
16005
16005
  "win:test": 'rm -fr dist && vite build && set PKSRC=dist&& bash -c "tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js"',
16006
- rawTest: 'rm -fr dist && vite build && export PKSRC=dist && bash -c "tape -r @babel/register test/code/*.cjs"',
16007
- oneTest: 'rm -fr dist && vite build && bash -c "tape -r @babel/register test/code/$TESTSCRIPT.cjs"',
16006
+ rawTest: 'rm -fr dist && vite build && export PKSRC=dist && bash -c "tape -r @babel/register test/code/**/*.cjs"',
16007
+ oneTest: 'rm -fr dist && vite build && export PKSRC=dist && bash -c "tape -r @babel/register test/code/$TESTSCRIPT.cjs"',
16008
16008
  prepublishOnly: "npm run build"
16009
16009
  };
16010
16010
  const repository = {
@@ -16052,11 +16052,11 @@ const devDependencies = {
16052
16052
  "@babel/register": "^7.18.9",
16053
16053
  "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
16054
16054
  events: "^3.3.0",
16055
- parcel: "^2.8.3",
16055
+ parcel: "^2.12.0",
16056
16056
  process: "^0.11.10",
16057
16057
  "stream-browserify": "^3.0.0",
16058
16058
  "tap-summary": "^4.0.0",
16059
- tape: "^5.6.0",
16059
+ tape: "^5.7.5",
16060
16060
  typescript: "^4.9.5",
16061
16061
  vite: "^4.1.4"
16062
16062
  };
@@ -38478,8 +38478,20 @@ const Sequence = class {
38478
38478
  const canBeEmpty = ["blockTag/b", "blockTag/ib"].concat(customCanBeEmpty);
38479
38479
  const emptyBlocks = [];
38480
38480
  let changed = false;
38481
+ const emptyMilestones = (blockItems) => {
38482
+ const milestoneScopes = blockItems.filter((i) => i.type === "scope" && i.payload.startsWith("milestone"));
38483
+ const startMilestones = /* @__PURE__ */ new Set([]);
38484
+ for (const milestoneScope of milestoneScopes) {
38485
+ if (milestoneScope.subType === "start") {
38486
+ startMilestones.add(milestoneScope.payload);
38487
+ } else if (startMilestones.has(milestoneScope.payload)) {
38488
+ return true;
38489
+ }
38490
+ }
38491
+ return false;
38492
+ };
38481
38493
  for (const blockRecord of this.blocks.entries()) {
38482
- if (blockRecord[1].tokens().length === 0 && !canBeEmpty.includes(blockRecord[1].bs.payload)) {
38494
+ if (blockRecord[1].tokens().length === 0 && !emptyMilestones(blockRecord[1].items) && !canBeEmpty.includes(blockRecord[1].bs.payload)) {
38483
38495
  emptyBlocks.push(blockRecord);
38484
38496
  }
38485
38497
  }
package/dist/index.mjs CHANGED
@@ -15984,7 +15984,7 @@ var bitset = {
15984
15984
  })(bitset, bitsetExports);
15985
15985
  const BitSet = /* @__PURE__ */ getDefaultExportFromCjs(bitsetExports);
15986
15986
  const name = "proskomma-core";
15987
- const version = "0.10.5";
15987
+ const version = "0.10.6";
15988
15988
  const description$b = "A Scripture Runtime Engine";
15989
15989
  const files = [
15990
15990
  "dist"
@@ -16001,8 +16001,8 @@ const scripts = {
16001
16001
  build: "rm -fr dist && vite build",
16002
16002
  test: 'rm -fr dist && vite build && export PKSRC=dist && bash -c "tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js"',
16003
16003
  "win:test": 'rm -fr dist && vite build && set PKSRC=dist&& bash -c "tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js"',
16004
- rawTest: 'rm -fr dist && vite build && export PKSRC=dist && bash -c "tape -r @babel/register test/code/*.cjs"',
16005
- oneTest: 'rm -fr dist && vite build && bash -c "tape -r @babel/register test/code/$TESTSCRIPT.cjs"',
16004
+ rawTest: 'rm -fr dist && vite build && export PKSRC=dist && bash -c "tape -r @babel/register test/code/**/*.cjs"',
16005
+ oneTest: 'rm -fr dist && vite build && export PKSRC=dist && bash -c "tape -r @babel/register test/code/$TESTSCRIPT.cjs"',
16006
16006
  prepublishOnly: "npm run build"
16007
16007
  };
16008
16008
  const repository = {
@@ -16050,11 +16050,11 @@ const devDependencies = {
16050
16050
  "@babel/register": "^7.18.9",
16051
16051
  "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
16052
16052
  events: "^3.3.0",
16053
- parcel: "^2.8.3",
16053
+ parcel: "^2.12.0",
16054
16054
  process: "^0.11.10",
16055
16055
  "stream-browserify": "^3.0.0",
16056
16056
  "tap-summary": "^4.0.0",
16057
- tape: "^5.6.0",
16057
+ tape: "^5.7.5",
16058
16058
  typescript: "^4.9.5",
16059
16059
  vite: "^4.1.4"
16060
16060
  };
@@ -38476,8 +38476,20 @@ const Sequence = class {
38476
38476
  const canBeEmpty = ["blockTag/b", "blockTag/ib"].concat(customCanBeEmpty);
38477
38477
  const emptyBlocks = [];
38478
38478
  let changed = false;
38479
+ const emptyMilestones = (blockItems) => {
38480
+ const milestoneScopes = blockItems.filter((i) => i.type === "scope" && i.payload.startsWith("milestone"));
38481
+ const startMilestones = /* @__PURE__ */ new Set([]);
38482
+ for (const milestoneScope of milestoneScopes) {
38483
+ if (milestoneScope.subType === "start") {
38484
+ startMilestones.add(milestoneScope.payload);
38485
+ } else if (startMilestones.has(milestoneScope.payload)) {
38486
+ return true;
38487
+ }
38488
+ }
38489
+ return false;
38490
+ };
38479
38491
  for (const blockRecord of this.blocks.entries()) {
38480
- if (blockRecord[1].tokens().length === 0 && !canBeEmpty.includes(blockRecord[1].bs.payload)) {
38492
+ if (blockRecord[1].tokens().length === 0 && !emptyMilestones(blockRecord[1].items) && !canBeEmpty.includes(blockRecord[1].bs.payload)) {
38481
38493
  emptyBlocks.push(blockRecord);
38482
38494
  }
38483
38495
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "proskomma-core",
3
- "version": "0.10.5",
3
+ "version": "0.10.6",
4
4
  "description": "A Scripture Runtime Engine",
5
5
  "files": [
6
6
  "dist"
@@ -17,8 +17,8 @@
17
17
  "build": "rm -fr dist && vite build",
18
18
  "test": "rm -fr dist && vite build && export PKSRC=dist && bash -c \"tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js\"",
19
19
  "win:test": "rm -fr dist && vite build && set PKSRC=dist&& bash -c \"tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js\"",
20
- "rawTest": "rm -fr dist && vite build && export PKSRC=dist && bash -c \"tape -r @babel/register test/code/*.cjs\"",
21
- "oneTest": "rm -fr dist && vite build && bash -c \"tape -r @babel/register test/code/$TESTSCRIPT.cjs\"",
20
+ "rawTest": "rm -fr dist && vite build && export PKSRC=dist && bash -c \"tape -r @babel/register test/code/**/*.cjs\"",
21
+ "oneTest": "rm -fr dist && vite build && export PKSRC=dist && bash -c \"tape -r @babel/register test/code/$TESTSCRIPT.cjs\"",
22
22
  "prepublishOnly": "npm run build"
23
23
  },
24
24
  "repository": {
@@ -66,11 +66,11 @@
66
66
  "@babel/register": "^7.18.9",
67
67
  "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
68
68
  "events": "^3.3.0",
69
- "parcel": "^2.8.3",
69
+ "parcel": "^2.12.0",
70
70
  "process": "^0.11.10",
71
71
  "stream-browserify": "^3.0.0",
72
72
  "tap-summary": "^4.0.0",
73
- "tape": "^5.6.0",
73
+ "tape": "^5.7.5",
74
74
  "typescript": "^4.9.5",
75
75
  "vite": "^4.1.4"
76
76
  }