cleanup

retorquere · Apr 15, 2024 · 514bb13 · 514bb13
1 parent 2f158e0
commit 514bb13
Show file tree

Hide file tree

Showing 22 changed files with 1,785 additions and 25 deletions.
diff --git a/re.ts b/re.ts
@@ -0,0 +1,12 @@
+export type CharCategory =  {
+  name: string
+  alias: string
+  isBmpLast: boolean
+  bmp: string
+}
+
+export function match(cats: CharCategory[], extra?: string, neg=false): string {
+  return `[${neg ? '^' : ''}${cats.map(cat => cat.bmp).join('')}${extra || ''}]`
+}
+
+export const categories: CharCategory[] = require('xregexp/tools/output/categories')
diff --git a/sentence-case.ts b/sentence-case.ts
@@ -1,8 +1,14 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 
-import { tokenize, Token, connectedInnerWord } from './tokenizer'
+import { tokenize, Token } from './tokenizer'
 import { merge } from './merge'
 
+import * as rx from './re'
+
+const Lu: string = rx.match(rx.categories.filter(cat => cat.name === 'Lu'))
+const Ll: string = rx.match(rx.categories.filter(cat => cat.name === 'Ll'))
+const connectedInnerWord = new RegExp(`-${Lu}${Ll}*(?=-|$)`, 'g')
+
 // eslint-disable-next-line no-magic-numbers
 // const show = (obj: any): string => JSON.stringify(obj, null, 2).replace(/[\u007F-\uFFFF]/g, chr => `\\u${(`0000${chr.charCodeAt(0).toString(16)}`).substr(-4)}`)
 

diff --git a/test/other/mid-word-capital.bib b/test/other/mid-word-capital.bib
@@ -0,0 +1,11 @@
+@article{Leung_2012,
+  author = {Leung, Benjamin and Sun, Qian and Yerino, Christopher and Zhang, Yu and Han, Jung and Hyun Kong, Bo and Koun Cho, Hyung and Liao, Kuan-Yung and Li, Yun-Li},
+  year = {2012},
+  month = feb,
+  volume = {341},
+  pages = {27--33},
+  doi = {10.1016/j.jcrysgro.2011.12.035},
+  journal = {Journal of Crystal Growth},
+  number = {1},
+  title = {Growth Evolution and Microstructural Characterization of Semipolar (11\=22) {{GaN}} Selectively Grown on Etched r-Plane Sapphire}
+}
diff --git a/test/tap-snapshots/sentencecase=off^caseprotection=as-needed/other/mid-word-capital.bib.snap b/test/tap-snapshots/sentencecase=off^caseprotection=as-needed/other/mid-word-capital.bib.snap
@@ -0,0 +1,97 @@
+/* IMPORTANT
+ * This snapshot file is auto-generated, but designed for humans.
+ * It should be checked into source control and tracked carefully.
+ * Re-generate by setting TAP_SNAPSHOT=1 and running tests.
+ * Make sure to inspect the output below.  Do not ignore changes!
+ */
+'use strict'
+exports[`test/all.js > TAP > other=mid-word-capital.bib > must match snapshot 1`] = `
+Object {
+  "comments": Array [],
+  "entries": Array [
+    Object {
+      "fields": Object {
+        "author": Array [
+          Object {
+            "firstName": "Benjamin",
+            "lastName": "Leung",
+          },
+          Object {
+            "firstName": "Qian",
+            "lastName": "Sun",
+          },
+          Object {
+            "firstName": "Christopher",
+            "lastName": "Yerino",
+          },
+          Object {
+            "firstName": "Yu",
+            "lastName": "Zhang",
+          },
+          Object {
+            "firstName": "Jung",
+            "lastName": "Han",
+          },
+          Object {
+            "firstName": "Bo",
+            "lastName": "Hyun Kong",
+          },
+          Object {
+            "firstName": "Hyung",
+            "lastName": "Koun Cho",
+          },
+          Object {
+            "firstName": "Kuan-Yung",
+            "lastName": "Liao",
+          },
+          Object {
+            "firstName": "Yun-Li",
+            "lastName": "Li",
+          },
+        ],
+        "doi": "10.1016/j.jcrysgro.2011.12.035",
+        "journal": "Journal of Crystal Growth",
+        "month": "2",
+        "number": "1",
+        "pages": "27–33",
+        "title": "Growth Evolution and Microstructural Characterization of Semipolar (112̄2) GaN Selectively Grown on Etched r-Plane Sapphire",
+        "volume": "341",
+        "year": "2012",
+      },
+      "input": String(
+        @article{Leung_2012,
+          author = {Leung, Benjamin and Sun, Qian and Yerino, Christopher and Zhang, Yu and Han, Jung and Hyun Kong, Bo and Koun Cho, Hyung and Liao, Kuan-Yung and Li, Yun-Li},
+          year = {2012},
+          month = feb,
+          volume = {341},
+          pages = {27--33},
+          doi = {10.1016/j.jcrysgro.2011.12.035},
+          journal = {Journal of Crystal Growth},
+          number = {1},
+          title = {Growth Evolution and Microstructural Characterization of Semipolar (11\\\\=22) {{GaN}} Selectively Grown on Etched r-Plane Sapphire}
+        }
+      ),
+      "key": "Leung_2012",
+      "mode": Object {
+        "author": "creatorlist",
+        "doi": "verbatim",
+        "journal": "literal",
+        "month": "literal",
+        "number": "literal",
+        "pages": "literal",
+        "title": "title",
+        "volume": "literal",
+        "year": "literal",
+      },
+      "type": "article",
+    },
+  ],
+  "errors": Array [],
+  "jabref": Object {
+    "groups": Object {},
+    "root": Array [],
+  },
+  "preamble": Array [],
+  "strings": Object {},
+}
+`
diff --git a/.../sentencecase=off^caseprotection=as-needed^preservequoted/other/mid-word-capital.bib.snap b/.../sentencecase=off^caseprotection=as-needed^preservequoted/other/mid-word-capital.bib.snap
@@ -0,0 +1,97 @@
+/* IMPORTANT
+ * This snapshot file is auto-generated, but designed for humans.
+ * It should be checked into source control and tracked carefully.
+ * Re-generate by setting TAP_SNAPSHOT=1 and running tests.
+ * Make sure to inspect the output below.  Do not ignore changes!
+ */
+'use strict'
+exports[`test/all.js > TAP > other=mid-word-capital.bib > must match snapshot 1`] = `
+Object {
+  "comments": Array [],
+  "entries": Array [
+    Object {
+      "fields": Object {
+        "author": Array [
+          Object {
+            "firstName": "Benjamin",
+            "lastName": "Leung",
+          },
+          Object {
+            "firstName": "Qian",
+            "lastName": "Sun",
+          },
+          Object {
+            "firstName": "Christopher",
+            "lastName": "Yerino",
+          },
+          Object {
+            "firstName": "Yu",
+            "lastName": "Zhang",
+          },
+          Object {
+            "firstName": "Jung",
+            "lastName": "Han",
+          },
+          Object {
+            "firstName": "Bo",
+            "lastName": "Hyun Kong",
+          },
+          Object {
+            "firstName": "Hyung",
+            "lastName": "Koun Cho",
+          },
+          Object {
+            "firstName": "Kuan-Yung",
+            "lastName": "Liao",
+          },
+          Object {
+            "firstName": "Yun-Li",
+            "lastName": "Li",
+          },
+        ],
+        "doi": "10.1016/j.jcrysgro.2011.12.035",
+        "journal": "Journal of Crystal Growth",
+        "month": "2",
+        "number": "1",
+        "pages": "27–33",
+        "title": "Growth Evolution and Microstructural Characterization of Semipolar (112̄2) GaN Selectively Grown on Etched r-Plane Sapphire",
+        "volume": "341",
+        "year": "2012",
+      },
+      "input": String(
+        @article{Leung_2012,
+          author = {Leung, Benjamin and Sun, Qian and Yerino, Christopher and Zhang, Yu and Han, Jung and Hyun Kong, Bo and Koun Cho, Hyung and Liao, Kuan-Yung and Li, Yun-Li},
+          year = {2012},
+          month = feb,
+          volume = {341},
+          pages = {27--33},
+          doi = {10.1016/j.jcrysgro.2011.12.035},
+          journal = {Journal of Crystal Growth},
+          number = {1},
+          title = {Growth Evolution and Microstructural Characterization of Semipolar (11\\\\=22) {{GaN}} Selectively Grown on Etched r-Plane Sapphire}
+        }
+      ),
+      "key": "Leung_2012",
+      "mode": Object {
+        "author": "creatorlist",
+        "doi": "verbatim",
+        "journal": "literal",
+        "month": "literal",
+        "number": "literal",
+        "pages": "literal",
+        "title": "title",
+        "volume": "literal",
+        "year": "literal",
+      },
+      "type": "article",
+    },
+  ],
+  "errors": Array [],
+  "jabref": Object {
+    "groups": Object {},
+    "root": Array [],
+  },
+  "preamble": Array [],
+  "strings": Object {},
+}
+`
diff --git a/test/tap-snapshots/sentencecase=off^caseprotection=off/other/mid-word-capital.bib.snap b/test/tap-snapshots/sentencecase=off^caseprotection=off/other/mid-word-capital.bib.snap
@@ -0,0 +1,97 @@
+/* IMPORTANT
+ * This snapshot file is auto-generated, but designed for humans.
+ * It should be checked into source control and tracked carefully.
+ * Re-generate by setting TAP_SNAPSHOT=1 and running tests.
+ * Make sure to inspect the output below.  Do not ignore changes!
+ */
+'use strict'
+exports[`test/all.js > TAP > other=mid-word-capital.bib > must match snapshot 1`] = `
+Object {
+  "comments": Array [],
+  "entries": Array [
+    Object {
+      "fields": Object {
+        "author": Array [
+          Object {
+            "firstName": "Benjamin",
+            "lastName": "Leung",
+          },
+          Object {
+            "firstName": "Qian",
+            "lastName": "Sun",
+          },
+          Object {
+            "firstName": "Christopher",
+            "lastName": "Yerino",
+          },
+          Object {
+            "firstName": "Yu",
+            "lastName": "Zhang",
+          },
+          Object {
+            "firstName": "Jung",
+            "lastName": "Han",
+          },
+          Object {
+            "firstName": "Bo",
+            "lastName": "Hyun Kong",
+          },
+          Object {
+            "firstName": "Hyung",
+            "lastName": "Koun Cho",
+          },
+          Object {
+            "firstName": "Kuan-Yung",
+            "lastName": "Liao",
+          },
+          Object {
+            "firstName": "Yun-Li",
+            "lastName": "Li",
+          },
+        ],
+        "doi": "10.1016/j.jcrysgro.2011.12.035",
+        "journal": "Journal of Crystal Growth",
+        "month": "2",
+        "number": "1",
+        "pages": "27–33",
+        "title": "Growth Evolution and Microstructural Characterization of Semipolar (112̄2) GaN Selectively Grown on Etched r-Plane Sapphire",
+        "volume": "341",
+        "year": "2012",
+      },
+      "input": String(
+        @article{Leung_2012,
+          author = {Leung, Benjamin and Sun, Qian and Yerino, Christopher and Zhang, Yu and Han, Jung and Hyun Kong, Bo and Koun Cho, Hyung and Liao, Kuan-Yung and Li, Yun-Li},
+          year = {2012},
+          month = feb,
+          volume = {341},
+          pages = {27--33},
+          doi = {10.1016/j.jcrysgro.2011.12.035},
+          journal = {Journal of Crystal Growth},
+          number = {1},
+          title = {Growth Evolution and Microstructural Characterization of Semipolar (11\\\\=22) {{GaN}} Selectively Grown on Etched r-Plane Sapphire}
+        }
+      ),
+      "key": "Leung_2012",
+      "mode": Object {
+        "author": "creatorlist",
+        "doi": "verbatim",
+        "journal": "literal",
+        "month": "literal",
+        "number": "literal",
+        "pages": "literal",
+        "title": "title",
+        "volume": "literal",
+        "year": "literal",
+      },
+      "type": "article",
+    },
+  ],
+  "errors": Array [],
+  "jabref": Object {
+    "groups": Object {},
+    "root": Array [],
+  },
+  "preamble": Array [],
+  "strings": Object {},
+}
+`