diff --git a/cli.js b/cli.js index 31a29523fc..0eaeb140c4 100755 --- a/cli.js +++ b/cli.js @@ -6,7 +6,7 @@ const { ScrollSetCLI } = require("./ScrollSet.js") class CancerDBCli extends ScrollSetCLI { conceptsFolder = path.join(__dirname, "concepts") - grammarFile = "code/measures.scroll" + grammarFile = "code/measures.parsers" scrollSetName = "cancerdb" compiledConcepts = "./cancerdb.json" } diff --git a/code/conceptPage.scroll b/code/conceptPage.scroll index 831bb6027b..de8b1d2a98 100644 --- a/code/conceptPage.scroll +++ b/code/conceptPage.scroll @@ -9,7 +9,7 @@ replaceJs TEMPLATE } viewSourceBaseUrl https://github.com/breck7/CancerDB/blob/main/concepts/ -import measures.scroll +import measures.parsers keyboardNav diff --git a/code/measures.scroll b/code/measures.parsers similarity index 99% rename from code/measures.scroll rename to code/measures.parsers index e7d15d92df..f8c0dce969 100644 --- a/code/measures.scroll +++ b/code/measures.parsers @@ -1,6 +1,3 @@ -importOnly - -// parsersOnly idParser extends abstractIdParser nameParser diff --git a/csv.scroll b/csv.scroll index 82015697c5..3bbbcaccf1 100644 --- a/csv.scroll +++ b/csv.scroll @@ -18,7 +18,7 @@ Download the CancerDB ScrollSet as: CSV | TSV | JSON link cancerdb.tsv TSV link cancerdb.json JSON -import code/measures.scroll +import code/measures.parsers loadConcepts concepts Statistics on the measures (columns) are below and can be downloaded as: CSV | TSV | JSON diff --git a/magicSquares.scroll b/magicSquares.parsers similarity index 99% rename from magicSquares.scroll rename to magicSquares.parsers index 0a764602cc..c646f31249 100644 --- a/magicSquares.scroll +++ b/magicSquares.parsers @@ -1,5 +1,3 @@ -importOnly - magicSquaresCatchAllParser // todo Fill this out catchAllCellType anyCell diff --git a/package.json b/package.json index 0225fa11b9..4a18217f1a 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "homepage": "https://cancerdb.com", "devDependencies": { "lodash": "^4.17.21", - "scroll-cli": "^95.0.0", + "scroll-cli": "^96.0.0", "scrollsdk": "^78.0.0" } } diff --git a/posts/cancer-heatmaps.scroll b/posts/cancer-heatmaps.scroll index 38b3e4f2f3..13f33027bd 100644 --- a/posts/cancer-heatmaps.scroll +++ b/posts/cancer-heatmaps.scroll @@ -15,7 +15,7 @@ printAuthor endSnippet -import ../magicSquares.scroll +import ../magicSquares.parsers
Cancer deaths per year in the USA by cancer type and age diff --git a/readme.scroll b/readme.scroll index 8811e90067..7b712ca96f 100644 --- a/readme.scroll +++ b/readme.scroll @@ -21,7 +21,7 @@ Advanced method: Create a new file in `concepts` with a unique URL friendly file Advanced method: Edit the corresponding `concepts/*.scroll` file and send a pull request. ## To add a new measure -Advanced method: Add your measure to `code/measures.scroll` and add at least 1 example to a concept in `concepts` and send a pull request. +Advanced method: Add your measure to `code/measures.parsers` and add at least 1 example to a concept in `concepts` and send a pull request. ## To run the site locally code