diff --git a/.cspell.json b/.cspell.json new file mode 100644 index 0000000000..2395fa64d5 --- /dev/null +++ b/.cspell.json @@ -0,0 +1,58 @@ +// cSpell Settings +{ + // Version of the setting file. Always 0.2 + "version": "0.2", + // language - current active spelling language + "language": "en_US", + "dictionaries": ["en_US", "typescript", "softwareTerms", "fonts", "npm"], + // words - list of words to be always considered correct + "words": [ + "Xmlable", + "twip", + "twips", + "jsonify", + "falsey", + "aiueo", + "iroha", + "aiueo", + "iroha", + "chosung", + "Abjad", + "Initializable", + "rels", + "dolan", + "xmlify", + "Xmlifyed", + "xmlified", + "datas", + "jszip", + "rsid", + "NUMPAGES", + "ATLEAST", + "ooxml", + "clippy", + "docsify" + ], + "ignoreRegExpList": [ + "/\"w:.+\"/", + "/\"s:.+\"/", + "/\"a:.+\"/", + "/\"pic:.+\"/", + "/\"xmlns:.+\"/", + "/\"vt:.+\"/", + "/[^\\s]{40,}/", + "//", + "/[A-Z_]+ = \".+\"/", + "/XmlAttributeComponent<{[^}]+}>/g", + "/xmlKeys = {[^}]+}/g", + "/\\.to\\.deep\\.equal\\({[^)]+}\\)/g", + "\\.to\\.include\\.members\\(\\[[^\\]]+]\\)", + "/new [a-zA-Z]+\\({[^£]+}\\)/g" + ], + "ignorePaths": ["package.json", "docs/api"], + "allowCompoundWords": true, + // flagWords - list of words to be always considered incorrect + // This is useful for offensive words and common spelling errors. + // For example "hte" should be "the" + "flagWords": ["hte"] +} diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 5fb10bde82..bbb9bc18b0 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -58,3 +58,13 @@ jobs: run: npm ci --force - name: Prettier run: npm run style + cspell: + name: CSpell + runs-on: ubuntu-latest + steps: + - name: Checkout Repo + uses: actions/checkout@master + - name: Install Dependencies + run: npm ci --force + - name: Prettier + run: npm run cspell diff --git a/.nycrc b/.nycrc index 532628ce04..2d0c37e9f9 100644 --- a/.nycrc +++ b/.nycrc @@ -1,9 +1,9 @@ { "check-coverage": true, - "statements": 99.43, - "branches": 96.6, - "functions": 99.47, - "lines": 99.43, + "statements": 99.62, + "branches": 96.81, + "functions": 99.82, + "lines": 99.62, "include": [ "src/**/*.ts" ], diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000000..8481f95630 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "streetsidesoftware.code-spell-checker" + ] +} diff --git a/README.md b/README.md index c7218f9215..c6d38a9409 100644 --- a/README.md +++ b/README.md @@ -26,21 +26,21 @@ Here are examples of `docx` being used with basic `HTML/JS` in a browser environment: -* https://codepen.io/dolanmiu/pen/RwNeObg -* https://jsfiddle.net/dolanmiu/onadx1gu/ +- https://codepen.io/dolanmiu/pen/RwNeObg +- https://jsfiddle.net/dolanmiu/onadx1gu/ Here is an example of `docx` working in `Angular`: -* https://stackblitz.com/edit/angular-docx +- https://stackblitz.com/edit/angular-docx Here is an example of `docx` working in `React`: -* https://stackblitz.com/edit/react-docx -* https://stackblitz.com/edit/react-docx-images (adding images to Word Document) +- https://stackblitz.com/edit/react-docx +- https://stackblitz.com/edit/react-docx-images (adding images to Word Document) Here is an example of `docx` working in `Vue.js`: -* https://stackblitz.com/edit/vuejs-docx +- https://stackblitz.com/edit/vuejs-docx ## Node @@ -48,15 +48,15 @@ Press `endpoint` on the `RunKit` website: ![RunKit Instructions](https://user-images.githubusercontent.com/2917613/38582539-f84311b6-3d07-11e8-90db-5885ae02c3c4.png) -* https://runkit.com/dolanmiu/docx-demo1 - Simple paragraph and text -* https://runkit.com/dolanmiu/docx-demo2 - Advanced Paragraphs and text -* https://runkit.com/dolanmiu/docx-demo3 - Bullet points -* https://runkit.com/dolanmiu/docx-demo4 - Simple table -* https://runkit.com/dolanmiu/docx-demo5 - Images -* https://runkit.com/dolanmiu/docx-demo6 - Margins -* https://runkit.com/dolanmiu/docx-demo7 - Landscape -* https://runkit.com/dolanmiu/docx-demo8 - Header and Footer -* https://runkit.com/dolanmiu/docx-demo10 - **My CV generated with docx** +- https://runkit.com/dolanmiu/docx-demo1 - Simple paragraph and text +- https://runkit.com/dolanmiu/docx-demo2 - Advanced Paragraphs and text +- https://runkit.com/dolanmiu/docx-demo3 - Bullet points +- https://runkit.com/dolanmiu/docx-demo4 - Simple table +- https://runkit.com/dolanmiu/docx-demo5 - Images +- https://runkit.com/dolanmiu/docx-demo6 - Margins +- https://runkit.com/dolanmiu/docx-demo7 - Landscape +- https://runkit.com/dolanmiu/docx-demo8 - Header and Footer +- https://runkit.com/dolanmiu/docx-demo10 - **My CV generated with docx** More [here](https://github.com/dolanmiu/docx/tree/master/demo) @@ -88,7 +88,6 @@ Read the contribution guidelines [here](https://docx.js.org/#/contribution-guide [drawing](https://www.circadianrisk.com/) [drawing](https://lexense.com/) - ...and many more! --- diff --git a/demo/10-my-cv.ts b/demo/10-my-cv.ts index 2a3f6bbabf..ef766d6656 100644 --- a/demo/10-my-cv.ts +++ b/demo/10-my-cv.ts @@ -43,7 +43,7 @@ interface Skill { readonly name: string; } -interface Achivement { +interface Achievement { readonly issuer: string; readonly name: string; } @@ -64,7 +64,7 @@ const experiences: Experience[] = [ { isCurrent: false, summary: - "Full-stack developer working with Angular, Node and TypeScript. Working for the iShares platform. Emphasis on Dev-ops and developing the continous integration pipeline.", + "Full-stack developer working with Angular, Node and TypeScript. Working for the iShares platform. Emphasis on Dev-ops and developing the continuous integration pipeline.", title: "Software Developer", endDate: { month: 11, @@ -98,6 +98,7 @@ const experiences: Experience[] = [ { isCurrent: false, summary: + // cspell:disable-next-line "Develop web commerce platforms for various high profile clients.\n\nCreated a log analysis web application with the Play Framework in Java, incorporating Test Driven Development. It asynchronously uploads and processes large (2 GB) log files, and outputs meaningful results in context with the problem. \n\nAnalysis and development of the payment system infrastructure and user accounts section to be used by several clients of the company such as Waitrose, Tally Weijl, DJ Sports, Debenhams, Ann Summers, John Lewis and others.\n\nTechnologies used include WebSphere Commerce, Java, JavaScript and JSP.", title: "Java Developer", endDate: { @@ -118,7 +119,7 @@ const education: Education[] = [ { degree: "Master of Science (MSc)", fieldOfStudy: "Computer Science", - notes: "Exam Results: 1st Class with Distinction, Dissertation: 1st Class with Distinction\n\nRelevant Courses: Java and C# Programming, Software Engineering, Artificial Intelligence, \nComputational Photography, Algorithmics, Architecture and Hardware.\n\nCreated a Windows 8 game in JavaScript for the dissertation. \n\nCreated an award-winning 3D stereoscopic game in C# using XNA.", + notes: "Exam Results: 1st Class with Distinction, Dissertation: 1st Class with Distinction\n\nRelevant Courses: Java and C# Programming, Software Engineering, Artificial Intelligence, \nComputational Photography, Algorithms, Architecture and Hardware.\n\nCreated a Windows 8 game in JavaScript for the dissertation. \n\nCreated an award-winning 3D stereoscopic game in C# using XNA.", schoolName: "University College London", startDate: { year: 2012, @@ -156,7 +157,7 @@ const skills: Skill[] = [ }, ]; -const achievements: Achivement[] = [ +const achievements: Achievement[] = [ { issuer: "Oracle", name: "Oracle Certified Expert", @@ -165,7 +166,7 @@ const achievements: Achivement[] = [ class DocumentCreator { // tslint:disable-next-line: typedef - public create([experiences, educations, skills, achivements]: [Experience[], Education[], Skill[], Achivement[]]): Document { + public create([experiences, educations, skills, achievements]: [Experience[], Education[], Skill[], Achievement[]]): Document { const document = new Document({ sections: [ { @@ -221,7 +222,7 @@ class DocumentCreator { this.createSubHeading("Skills"), this.createSkillList(skills), this.createSubHeading("Achievements"), - ...this.createAchivementsList(achivements), + ...this.createAchievementsList(achievements), this.createSubHeading("Interests"), this.createInterests("Programming, Technology, Music Production, Web Design, 3D Modelling, Dancing."), this.createHeading("References"), @@ -318,8 +319,8 @@ class DocumentCreator { } // tslint:disable-next-line:no-any - public createAchivementsList(achivements: any[]): Paragraph[] { - return achivements.map( + public createAchievementsList(achievements: any[]): Paragraph[] { + return achievements.map( (achievement) => new Paragraph({ text: achievement.name, diff --git a/demo/11-declaritive-styles-2.ts b/demo/11-declaritive-styles-2.ts index 1035faab45..93b4557348 100644 --- a/demo/11-declaritive-styles-2.ts +++ b/demo/11-declaritive-styles-2.ts @@ -52,18 +52,20 @@ const table = new Table({ }); const doc = new Document({ - numbering:{ - config:[{ - reference: 'ref1', - levels: [ + numbering: { + config: [ { - level: 0, - format: LevelFormat.DECIMAL, - text: '%1)', - start: 50, - } - ], - }] + reference: "ref1", + levels: [ + { + level: 0, + format: LevelFormat.DECIMAL, + text: "%1)", + start: 50, + }, + ], + }, + ], }, styles: { default: { @@ -184,11 +186,11 @@ const doc = new Document({ spacing: { line: 276, before: 20 * 72 * 0.1, after: 20 * 72 * 0.05 }, rightTabStop: TabStopPosition.MAX, leftTabStop: 453.543307087, - numbering : { - reference: 'ref1', + numbering: { + reference: "ref1", instance: 0, level: 0, - } + }, }, }, ], diff --git a/demo/17-footnotes.ts b/demo/17-footnotes.ts index 4f9d403ebd..459cf2117c 100644 --- a/demo/17-footnotes.ts +++ b/demo/17-footnotes.ts @@ -18,10 +18,15 @@ const doc = new Document({ new Paragraph({ children: [ new TextRun({ - children: ["Hello", new FootnoteReferenceRun(1)], + children: ["Hello"], }), + new FootnoteReferenceRun(1), new TextRun({ - children: [" World!", new FootnoteReferenceRun(2)], + children: [" World!"], + }), + new FootnoteReferenceRun(2), + new TextRun({ + children: [" GitHub!"], }), ], }), @@ -35,15 +40,17 @@ const doc = new Document({ new Paragraph({ children: [ new TextRun({ - children: ["Hello", new FootnoteReferenceRun(4)], + children: ["Hello"], }), + new FootnoteReferenceRun(4), new TextRun({ - children: [" World!", new FootnoteReferenceRun(5)], + children: [" World!"], }), + new FootnoteReferenceRun(5), ], }), new Paragraph({ - children: [new TextRun("Hello World"), new FootnoteReferenceRun(6)], + children: [new TextRun("Hello World Again"), new FootnoteReferenceRun(6)], }), ], }, diff --git a/demo/2-declaritive-styles.ts b/demo/2-declaritive-styles.ts index 6af4120574..11e306b07e 100644 --- a/demo/2-declaritive-styles.ts +++ b/demo/2-declaritive-styles.ts @@ -1,4 +1,4 @@ -// Example on how to customise the look at feel using Styles +// Example on how to customize the look at feel using Styles // Import from 'docx' rather than '../build' if you install from npm import * as fs from "fs"; import { diff --git a/demo/21-bookmarks.ts b/demo/21-bookmarks.ts index decb882be0..5ae3a35ec3 100644 --- a/demo/21-bookmarks.ts +++ b/demo/21-bookmarks.ts @@ -1,9 +1,21 @@ // This demo shows how to create bookmarks then link to them with internal hyperlinks // Import from 'docx' rather than '../build' if you install from npm import * as fs from "fs"; -import { Bookmark, Document, Footer, HeadingLevel, InternalHyperlink, Packer, PageBreak, Paragraph, TextRun, PageReference } from "../build"; +import { + Bookmark, + Document, + Footer, + HeadingLevel, + InternalHyperlink, + Packer, + PageBreak, + Paragraph, + TextRun, + PageReference, +} from "../build"; const LOREM_IPSUM = + /* cspell:disable-next-line */ "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam mi velit, convallis convallis scelerisque nec, faucibus nec leo. Phasellus at posuere mauris, tempus dignissim velit. Integer et tortor dolor. Duis auctor efficitur mattis. Vivamus ut metus accumsan tellus auctor sollicitudin venenatis et nibh. Cras quis massa ac metus fringilla venenatis. Proin rutrum mauris purus, ut suscipit magna consectetur id. Integer consectetur sollicitudin ante, vitae faucibus neque efficitur in. Praesent ultricies nibh lectus. Mauris pharetra id odio eget iaculis. Duis dictum, risus id pellentesque rutrum, lorem quam malesuada massa, quis ullamcorper turpis urna a diam. Cras vulputate metus vel massa porta ullamcorper. Etiam porta condimentum nulla nec tristique. Sed nulla urna, pharetra non tortor sed, sollicitudin molestie diam. Maecenas enim leo, feugiat eget vehicula id, sollicitudin vitae ante."; const doc = new Document({ diff --git a/demo/31-tables.ts b/demo/31-tables.ts index cf5361c7c2..c544e21651 100644 --- a/demo/31-tables.ts +++ b/demo/31-tables.ts @@ -34,8 +34,7 @@ const doc = new Document({ new TableCell({ children: [ new Paragraph({ - text: - "Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah", + text: "Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah", heading: HeadingLevel.HEADING_1, }), ], diff --git a/demo/43-images-to-table-cell-2.ts b/demo/43-images-to-table-cell-2.ts index e34e1fa1a2..fdc1bec6c9 100644 --- a/demo/43-images-to-table-cell-2.ts +++ b/demo/43-images-to-table-cell-2.ts @@ -1,9 +1,15 @@ // Add image to table cell // Import from 'docx' rather than '../build' if you install from npm import * as fs from "fs"; -import { Document, Packer, Paragraph, Table, TableCell, TableRow } from "../build"; +import { Document, ImageRun, Packer, Paragraph, Table, TableCell, TableRow, WidthType } from "../build"; + +const imageBase64Data = `iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAMAAAD04JH5AAACzVBMVEUAAAAAAAAAAAAAAAA/AD8zMzMqKiokJCQfHx8cHBwZGRkuFxcqFSonJyckJCQiIiIfHx8eHh4cHBwoGhomGSYkJCQhISEfHx8eHh4nHR0lHBwkGyQjIyMiIiIgICAfHx8mHh4lHh4kHR0jHCMiGyIhISEgICAfHx8lHx8kHh4jHR0hHCEhISEgICAlHx8kHx8jHh4jHh4iHSIhHCEhISElICAkHx8jHx8jHh4iHh4iHSIhHSElICAkICAjHx8jHx8iHh4iHh4hHiEhHSEkICAjHx8iHx8iHx8hHh4hHiEkHSEjHSAjHx8iHx8iHx8hHh4kHiEkHiEjHSAiHx8hHx8hHh4kHiEjHiAjHSAiHx8iHx8hHx8kHh4jHiEjHiAjHiAiICAiHx8kHx8jHh4jHiEjHiAiHiAiHSAiHx8jHx8jHx8jHiAiHiAiHiAiHSAiHx8jHx8jHx8iHiAiHiAiHiAjHx8jHx8jHx8jHx8iHiAiHiAiHiAjHx8jHx8jHx8iHx8iHSAiHiAjHiAjHx8jHx8hHx8iHx8iHyAiHiAjHiAjHiAjHh4hHx8iHx8iHx8iHyAjHSAjHiAjHiAjHh4hHx8iHx8iHx8jHyAjHiAhHh4iHx8iHx8jHyAjHSAjHSAhHiAhHh4iHx8iHx8jHx8jHyAjHSAjHSAiHh4iHh4jHx8jHx8jHyAjHyAhHSAhHSAiHh4iHh4jHx8jHx8jHyAhHyAhHSAiHSAiHh4jHh4jHx8jHx8jHyAhHyAhHSAiHSAjHR4jHh4jHx8jHx8hHyAhHyAiHSAjHSAjHR4jHh4jHx8hHx8hHyAhHyAiHyAjHSAjHR4jHR4hHh4hHx8hHyAiHyAjHyAjHSAjHR4jHR4hHh4hHx8hHyAjHyAjHyAjHSAjHR4hHR4hHR4hHx8iHyAjHyAjHyAjHSAhHR4hHR4hHR4hHx8jHyAjHyAjHyAjHyC9S2xeAAAA7nRSTlMAAQIDBAUGBwgJCgsMDQ4PEBESExQVFxgZGhscHR4fICEiIyQlJicoKSorLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZISUpLTE1OUFFSU1RVVllaW1xdXmBhYmNkZWZnaGprbG1ub3Byc3R1dnd4eXp8fn+AgYKDhIWGiImKi4yNj5CRkpOUlZaXmJmam5ydnp+goaKjpKaoqqusra6vsLGys7S1tri5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+fkZpVQAABcBJREFUGBntwftjlQMcBvDnnLNL22qzJjWlKLHFVogyty3SiFq6EZliqZGyhnSxsLlMRahYoZKRFcul5dKFCatYqWZaNKvWtrPz/A2+7/b27qRzec/lPfvl/XxgMplMJpPJZDKZAtA9HJ3ppnIez0KnSdtC0RCNznHdJrbrh85wdSlVVRaEXuoGamYi5K5430HNiTiEWHKJg05eRWgNfKeV7RxbqUhGKPV/207VupQ8is0IoX5vtFC18SqEHaK4GyHTZ2kzVR8PBTCO4oANIZL4ShNVZcOhKKeYg9DoWdhI1ec3os2VFI0JCIUez5+i6st0qJZRrEAIJCw+QdW223BG/EmKwTBc/IJ/qfp2FDrkUnwFo8U9dZyqnaPhxLqfYjyM1S3vb6p+GGOBszsojoTDSDFz6qj66R4LzvYJxVMwUNRjf1H1ywQr/megg2RzLximy8waqvbda8M5iijegVEiHjlM1W/3h+FcXesphsMY4dMOUnUgOxyuPEzxPQwRNvV3qg5Nj4BreyimwADWe/dRVTMjEm6MoGLzGwtystL6RyOY3qSqdlYU3FpLZw1VW0sK5943MvUCKwJ1noNtjs6Ohge76Zq9ZkfpigU5WWkDYuCfbs1U5HWFR8/Qq4a9W0uK5k4ZmdrTCl8spGIePLPlbqqsc1Afe83O0hULc8alDYiBd7ZyitYMeBfR55rR2fOKP6ioPk2dGvZ+UVI0d8rtqT2tcCexlqK2F3wRn5Q+YVbBqrLKOupkr9lZujAOrmS0UpTb4JeIPkNHZ+cXr6uoPk2vyuBSPhWLEKj45PQJuQWryyqP0Z14uGLdROHIRNBEXDR09EP5r62rOHCazhrD4VKPwxTH+sIA3ZPTJ+YuWV22n+IruHFDC8X2CBjnPoolcGc2FYUwzmsUWXDHsoGKLBhmN0VvuBVfTVE/AAbpaid5CB4MbaLY1QXGuIViLTyZQcVyGGMuxWPwaA0Vk2GI9RRp8Ci2iuLkIBjhT5LNUfAspZFiTwyC72KK7+DNg1SsRvCNp3gZXq2k4iEEXSHFJHgVXUlxejCCbTvFAHiXdIJiXxyCK7KJ5FHoMZGK9xBcwyg2QpdlVMxEUM2iyIMuXXZQNF+HswxMsSAAJRQjoE//eoqDCXBSTO6f1xd+O0iyNRY6jaWi1ALNYCocZROj4JdEikroVkjFk9DcStXxpdfCD2MoXodu4RUU9ptxxmXssOfxnvDVcxRTod9FxyhqLoAqis5aPhwTDp9spRgEH2Q6KLbYoKqlaKTm6Isp0C/sJMnjFvhiERXPQvUNRe9p29lhR04CdBpC8Sl8YiuncIxEuzUUg4Dkgj+paVozygY9plPMh28SaymO9kabAopREGF3vt9MzeFFl8G7lRSZ8FFGK8XX4VA8QjEd7XrM3M0OXz8YCy+qKBLgq3wqnofiTorF0Ax56Rg1J1elW+BBAsVe+My6iYq7IK6keBdOIseV2qn5Pb8f3MqkWAXf9ThM8c8lAOIotuFsF875lRrH5klRcG0+xcPwQ1oLxfeRAP4heQTnGL78X2rqlw2DK59SXAV/zKaiGMAuko5InCt68mcOan5+ohf+z1pP8lQY/GHZQMV4YD3FpXDp4qerqbF/lBWBswyi+AL+ia+maLgcRRQj4IYlY/UpauqKBsPJAxQF8NM1TRQ/RudSPAD34rK3scOuR8/HGcspxsJfOVS8NZbiGXiUtPgINU3v3WFDmx8pEuG3EiqKKVbCC1vm2iZqap5LAtCtleQf8F9sFYWDohzeJczYyQ4V2bEZFGsQgJRGqqqhS2phHTWn9lDkIhBTqWqxQZ+IsRvtdHY9AvI2VX2hW68nfqGmuQsCEl3JdjfCF8OW1bPdtwhQ0gm2mQzfRE3a7KCYj0BNZJs8+Kxf/r6WtTEI2FIqlsMfFgRB5A6KUnSe/vUkX0AnuvUIt8SjM1m6wWQymUwmk8lkMgXRf5vi8rLQxtUhAAAAAElFTkSuQmCC`; const table = new Table({ + width: { + size: 8640, + type: WidthType.DXA, + }, rows: [ new TableRow({ children: [ @@ -17,7 +23,19 @@ const table = new Table({ children: [], }), new TableCell({ - children: [], + children: [ + new Paragraph({ + children: [ + new ImageRun({ + data: Buffer.from(imageBase64Data, "base64"), + transformation: { + width: 100, + height: 100, + }, + }), + ], + }), + ], }), ], }), @@ -27,7 +45,19 @@ const table = new Table({ children: [], }), new TableCell({ - children: [], + children: [ + new Paragraph({ + children: [ + new ImageRun({ + data: fs.readFileSync("./demo/images/image1.jpeg"), + transformation: { + width: 100, + height: 100, + }, + }), + ], + }), + ], }), new TableCell({ children: [], diff --git a/demo/49-table-borders.ts b/demo/49-table-borders.ts index 1a3943a947..cbb1dabe87 100644 --- a/demo/49-table-borders.ts +++ b/demo/49-table-borders.ts @@ -123,8 +123,7 @@ const noBorderTable = new Table({ new TableCell({ children: [ new Paragraph({ - text: - "Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah", + text: "Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah", heading: HeadingLevel.HEADING_1, }), ], diff --git a/demo/51-character-styles.ts b/demo/51-character-styles.ts index 8209ef705f..6300920808 100644 --- a/demo/51-character-styles.ts +++ b/demo/51-character-styles.ts @@ -43,8 +43,7 @@ const doc = new Document({ style: "strong", }), new TextRun({ - text: - " - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", + text: " - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", }), ], }), diff --git a/demo/60-track-revisions.ts b/demo/60-track-revisions.ts index 232b74f691..e4cdd15575 100644 --- a/demo/60-track-revisions.ts +++ b/demo/60-track-revisions.ts @@ -121,7 +121,7 @@ const doc = new Document({ author: "Firstname Lastname", date: "2020-10-06T09:05:00Z", bold: false, - } + }, }), ], }), diff --git a/demo/66-fields.ts b/demo/66-fields.ts index ff1c3a88d5..64c1acf5e7 100644 --- a/demo/66-fields.ts +++ b/demo/66-fields.ts @@ -4,7 +4,7 @@ import * as fs from "fs"; import { Bookmark, Document, Packer, Paragraph, SimpleField, TextRun } from "../build"; const doc = new Document({ - creator: 'Me', + creator: "Me", sections: [ { properties: {}, diff --git a/demo/67-column-break.ts b/demo/67-column-break.ts index 42a1a32f1b..2746bffefd 100644 --- a/demo/67-column-break.ts +++ b/demo/67-column-break.ts @@ -13,11 +13,13 @@ const doc = new Document({ }, }, children: [ - new Paragraph({ children: [ - new TextRun('This text will be in the first column.'), - new ColumnBreak(), - new TextRun('This text will be in the second column.'), - ] }), + new Paragraph({ + children: [ + new TextRun("This text will be in the first column."), + new ColumnBreak(), + new TextRun("This text will be in the second column."), + ], + }), ], }, ], diff --git a/demo/74-nodejs-stream.ts b/demo/74-nodejs-stream.ts new file mode 100644 index 0000000000..4dea1f7524 --- /dev/null +++ b/demo/74-nodejs-stream.ts @@ -0,0 +1,31 @@ +// Simple example to add text to a document +// Import from 'docx' rather than '../build' if you install from npm +import * as fs from "fs"; +import { Document, Packer, Paragraph, TextRun } from "../build"; + +const doc = new Document({ + sections: [ + { + properties: {}, + children: [ + new Paragraph({ + children: [ + new TextRun("Hello World"), + new TextRun({ + text: "Foo Bar", + bold: true, + }), + new TextRun({ + text: "\tGithub is the best", + bold: true, + }), + ], + }), + ], + }, + ], +}); + +Packer.toStream(doc).then((stream) => { + stream.pipe(fs.createWriteStream("My Document.docx")); +}); diff --git a/docs/README.md b/docs/README.md index 6e06856207..36a857d6c6 100644 --- a/docs/README.md +++ b/docs/README.md @@ -27,24 +27,26 @@ import { Document, Packer, Paragraph, TextRun } from "docx"; // Documents contain sections, you can have multiple sections per document, go here to learn more about sections // This simple example will only contain one section const doc = new Document({ - sections: [{ - properties: {}, - children: [ - new Paragraph({ - children: [ - new TextRun("Hello World"), - new TextRun({ - text: "Foo Bar", - bold: true, - }), - new TextRun({ - text: "\tGithub is the best", - bold: true, - }), - ], - }), - ], - }], + sections: [ + { + properties: {}, + children: [ + new Paragraph({ + children: [ + new TextRun("Hello World"), + new TextRun({ + text: "Foo Bar", + bold: true, + }), + new TextRun({ + text: "\tGithub is the best", + bold: true, + }), + ], + }), + ], + }, + ], }); // Used to export the file into a .docx file @@ -56,6 +58,7 @@ Packer.toBuffer(doc).then((buffer) => { ```

+ clippy the assistant

diff --git a/docs/_sidebar.md b/docs/_sidebar.md index 356f64239a..959b96aa94 100644 --- a/docs/_sidebar.md +++ b/docs/_sidebar.md @@ -1,37 +1,39 @@ -* [Getting Started](/) +- [Getting Started](/) -* [Examples](https://github.com/dolanmiu/docx/tree/master/demo) +- [Examples](https://github.com/dolanmiu/docx/tree/master/demo) -* API +- API - * [Documentation](https://docx.js.org/api/) + - [Documentation](https://docx.js.org/api/) -* Usage +- Usage - * [Document](usage/document.md) - * [Sections](usage/sections.md) - * [Paragraph](usage/paragraph.md) - * [Text](usage/text.md) - * [Image](usage/images.md) - * [Headers & Footers](usage/headers-and-footers.md) - * [Bullet Points](usage/bullet-points.md) - * [Hyperlinks](usage/hyperlinks.md) - * [Numbering](usage/numbering.md) - * [Tables](usage/tables.md) - * [Tab Stops](usage/tab-stops.md) - * [Table of Contents](usage/table-of-contents.md) - * [Page Numbers](usage/page-numbers.md) - * [Change Tracking](usage/change-tracking.md) - * [Math](usage/math.md) - * [Text Frames](usage/text-frames.md) - * Styling - * [Styling with JS](usage/styling-with-js.md) - * [Styling with XML](usage/styling-with-xml.md) -* Exporting + - [Document](usage/document.md) + - [Sections](usage/sections.md) + - [Paragraph](usage/paragraph.md) + - [Text](usage/text.md) + - [Image](usage/images.md) + - [Headers & Footers](usage/headers-and-footers.md) + - [Bullet Points](usage/bullet-points.md) + - [Hyperlinks](usage/hyperlinks.md) + - [Numbering](usage/numbering.md) + - [Tables](usage/tables.md) + - [Tab Stops](usage/tab-stops.md) + - [Table of Contents](usage/table-of-contents.md) + - [Page Numbers](usage/page-numbers.md) + - [Change Tracking](usage/change-tracking.md) + - [Math](usage/math.md) + - [Text Frames](usage/text-frames.md) + - Styling + _ [Styling with JS](usage/styling-with-js.md) + _ [Styling with XML](usage/styling-with-xml.md) - * [Packers](usage/packers.md) -* Utility +- Exporting - * [Convenience functions](usage/convenience-functions.md) + - [Packers](usage/packers.md) -* [Contribution Guidelines](contribution-guidelines.md) +- Utility + + - [Convenience functions](usage/convenience-functions.md) + +- [Contribution Guidelines](contribution-guidelines.md) diff --git a/docs/contribution-guidelines.md b/docs/contribution-guidelines.md index cec4f4a80b..1923a47341 100644 --- a/docs/contribution-guidelines.md +++ b/docs/contribution-guidelines.md @@ -26,13 +26,15 @@ Please write good commit messages when making a commit: https://chris.beams.io/p **Do not:** + ``` c // What? -rtl // Adding acryonyms without explaining anything else is not helpful +rtl // Adding acronyms without explaining anything else is not helpful works! // Glad its working, but the message is not helpful demo updated // Getting better, but capitalize the first letter Unesesary coment removed // Make sure to use correct spelling ``` + **Do** @@ -42,9 +44,9 @@ Unesesary coment removed // Make sure to use correct spelling public float(tableFloatOptions: ITableFloatOptions): Table ``` -## Delcariative API +## Declarative API -Make sure the API is declarative, so no _method calling_ or _mutation_. This is a design decision, consistent with the rest of the project. There are benefits to delcariative code over other styles of code, explained here: https://dzone.com/articles/why-declarative-coding-makes-you-a-better-programm +Make sure the API is declarative, so no _method calling_ or _mutation_. This is a design decision, consistent with the rest of the project. There are benefits to declarative code over other styles of code, explained here: https://dzone.com/articles/why-declarative-coding-makes-you-a-better-programm **Do not:** diff --git a/docs/index.html b/docs/index.html index 13c52ae6da..73978e40a5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -16,6 +16,7 @@
+ diff --git a/docs/usage/numbering.md b/docs/usage/numbering.md index e4c10b5d83..6203c3bb4b 100644 --- a/docs/usage/numbering.md +++ b/docs/usage/numbering.md @@ -37,7 +37,7 @@ sub-sublists, etc. Each level includes the following properties: numbers from each numbering level before this one. Thus a level text of `%d)` with a number format of `lowerLetter` would result in the sequence "a)", "b)", ... -* and a few others, which you can see in the OXML spec section 17.9.6 +* and a few others, which you can see in the OOXML spec section 17.9.6 ## Document-level bullets/numbering definitions (concrete) diff --git a/docs/usage/paragraph.md b/docs/usage/paragraph.md index 7dd9adaadf..42658f6cca 100644 --- a/docs/usage/paragraph.md +++ b/docs/usage/paragraph.md @@ -121,7 +121,7 @@ Add borders to a `Paragraph`. Good for making the `Paragraph` stand out | -------- | -------- | -------- | | color | `string` | Required | | space | `number` | Required | -| value | `string` | Required | +| style | `string` | Required | | size | `number` | Required | **Example:** @@ -135,13 +135,13 @@ const paragraph = new Paragraph({ top: { color: "auto", space: 1, - value: "single", + style: "single", size: 6, }, bottom: { color: "auto", space: 1, - value: "single", + style: "single", size: 6, }, }, diff --git a/docs/usage/styling-with-js.md b/docs/usage/styling-with-js.md index 0dafac2904..e53bffee8d 100644 --- a/docs/usage/styling-with-js.md +++ b/docs/usage/styling-with-js.md @@ -146,7 +146,7 @@ const doc = new Document({ }); ``` -**Note**: If you are using the `.headingX` or `.title` methods of paragraphs, you must make sure to define `HeadingX` or `Title` styles for these. Otherwise they'll show up unstyled :(. If you are using the `.bullet` or `.setNumbering` methods, you need to define a `ListParagraph` style or the numbers may not show up. +**Note**: If you are using the `.headingX` or `.title` methods of paragraphs, you must make sure to define `HeadingX` or `Title` styles for these. Otherwise they'll show up un-styled :(. If you are using the `.bullet` or `.setNumbering` methods, you need to define a `ListParagraph` style or the numbers may not show up. ### Document defaults @@ -199,7 +199,7 @@ For these properties, the rules state the following conflict resolution in case ## Examples -### Declaritive styles +### Declarative styles Importing Images from file system path diff --git a/package-lock.json b/package-lock.json index 9b59ca7e0e..1b59d0dd75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "docx", - "version": "7.3.0", + "version": "7.4.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "docx", - "version": "7.3.0", + "version": "7.4.1", "license": "MIT", "dependencies": { "@types/node": "^18.0.0", @@ -17,7 +17,7 @@ }, "devDependencies": { "@types/chai": "^4.2.15", - "@types/glob": "^7.1.4", + "@types/glob": "^8.0.0", "@types/mocha": "^9.0.0", "@types/prompt": "^1.1.1", "@types/request-promise": "^4.1.42", @@ -27,6 +27,7 @@ "@types/webpack": "^5.0.0", "buffer": "^6.0.3", "chai": "^3.5.0", + "cspell": "^6.2.2", "docsify-cli": "^4.3.0", "glob": "^8.0.1", "jszip": "^3.1.5", @@ -46,9 +47,10 @@ "ts-loader": "^9.0.0", "ts-node": "^10.2.1", "tsconfig-paths": "^4.0.0", + "tsconfig-paths-webpack-plugin": "^4.0.0", "tslint": "^6.1.3", "tslint-immutable": "^6.0.1", - "typedoc": "^0.22.3", + "typedoc": "^0.23.2", "typescript": "4.7.4", "unzipper": "^0.10.11", "webpack": "^5.28.0", @@ -478,6 +480,338 @@ "node": ">=0.1.90" } }, + "node_modules/@cspell/cspell-bundled-dicts": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.8.2.tgz", + "integrity": "sha512-E4sNdcG23nj0ztiI69PeU+ALL6DgL3GoqVZuLhpRwgRL4RN7n7FuUJdJ91cgpNvx50+HhdyxFqEpKRigD3yeNQ==", + "dev": true, + "dependencies": { + "@cspell/dict-ada": "^2.0.1", + "@cspell/dict-aws": "^2.0.0", + "@cspell/dict-bash": "^2.0.4", + "@cspell/dict-companies": "^2.0.13", + "@cspell/dict-cpp": "^3.2.1", + "@cspell/dict-cryptocurrencies": "^2.0.0", + "@cspell/dict-csharp": "^3.0.1", + "@cspell/dict-css": "^2.1.0", + "@cspell/dict-dart": "^1.1.1", + "@cspell/dict-django": "^2.0.0", + "@cspell/dict-docker": "^1.1.1", + "@cspell/dict-dotnet": "^2.0.1", + "@cspell/dict-elixir": "^2.0.1", + "@cspell/dict-en_us": "^2.3.3", + "@cspell/dict-en-gb": "^1.1.33", + "@cspell/dict-filetypes": "^2.1.1", + "@cspell/dict-fonts": "^2.1.0", + "@cspell/dict-fullstack": "^2.0.6", + "@cspell/dict-git": "^1.0.1", + "@cspell/dict-golang": "^3.0.1", + "@cspell/dict-haskell": "^2.0.1", + "@cspell/dict-html": "^3.3.2", + "@cspell/dict-html-symbol-entities": "^3.0.0", + "@cspell/dict-java": "^3.0.7", + "@cspell/dict-latex": "^2.0.9", + "@cspell/dict-lorem-ipsum": "^2.0.1", + "@cspell/dict-lua": "^2.0.0", + "@cspell/dict-node": "^3.0.1", + "@cspell/dict-npm": "^3.1.2", + "@cspell/dict-php": "^2.0.0", + "@cspell/dict-powershell": "^2.0.0", + "@cspell/dict-public-licenses": "^1.0.6", + "@cspell/dict-python": "^3.0.6", + "@cspell/dict-r": "^1.0.3", + "@cspell/dict-ruby": "^2.0.2", + "@cspell/dict-rust": "^2.0.1", + "@cspell/dict-scala": "^2.0.0", + "@cspell/dict-software-terms": "^2.2.7", + "@cspell/dict-sql": "^1.0.4", + "@cspell/dict-swift": "^1.0.3", + "@cspell/dict-typescript": "^2.0.1", + "@cspell/dict-vue": "^2.0.2" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/@cspell/cspell-pipe": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.8.2.tgz", + "integrity": "sha512-9GXBibZ8bcU+2KhX6WTEASPhIhsqdFYITwBJ39jfUl2MiPgpvjYxQKrAgnZOm5WpRzCUxoelU2SVaoI+rn/Stg==", + "dev": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@cspell/cspell-service-bus": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.8.2.tgz", + "integrity": "sha512-YvEauGv/QZb5xRiKKvwiXz7lj7twc5TgispnujgHYDEt6OcXiWjYj676WzKkGJ2yM+QfurGJCCvOb2L1HQ6rYg==", + "dev": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@cspell/cspell-types": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.8.2.tgz", + "integrity": "sha512-jFg+D1L+MkIad2IR+qlnOYIuwqaosbTrtqhpWhbOGMvFQjxMyKg9IVxbmtjDCdRohdBUvRq96rkp0vx1FviiwQ==", + "dev": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@cspell/dict-ada": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-2.0.1.tgz", + "integrity": "sha512-vopTJ1oHrrFYV5GU55Sr+AzItR78Uj5YbCaspYABmYKlq4NRrcUAUsr4bWgymDcspMIHO7e7IFcj48OKs1fndA==", + "dev": true + }, + "node_modules/@cspell/dict-aws": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-2.0.0.tgz", + "integrity": "sha512-NKz7pDZ7pwj/b33i3f4WLpC1rOOUMmENwYgftxU+giU2YBeKM2wZbMTSEIzsrel56r0UlQYmdIVlP/B4nnVaoQ==", + "dev": true + }, + "node_modules/@cspell/dict-bash": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-2.0.4.tgz", + "integrity": "sha512-uK/ehmp5LYrmRH2Gv3nbvdPswpkybJUn34WYKLpeuYHQktmi+pOI1A9uPdBPnSbMDffSvwQlQohIyKawz+X8Ag==", + "dev": true + }, + "node_modules/@cspell/dict-companies": { + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-2.0.13.tgz", + "integrity": "sha512-EacGH6Yjd2u+sNRLd6+3jxbzWBSsmF4g52Xfxfv2T48qzRWJ1zqpX89ijihgYTwvZbf8H/6Lu+z1VU4e1gUp0g==", + "dev": true + }, + "node_modules/@cspell/dict-cpp": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-3.2.1.tgz", + "integrity": "sha512-XcmzrKIghqFfrYLLaHtWKOp9rupiuGdc5ODONk+emsq0W5CIc3Abn27IQHwUzxzF+Cm5IfKAIJ5Kpe6hkzm0HQ==", + "dev": true + }, + "node_modules/@cspell/dict-cryptocurrencies": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-cryptocurrencies/-/dict-cryptocurrencies-2.0.0.tgz", + "integrity": "sha512-nREysmmfOp7L2YCRAUufQahwD5/Punzb5AZ6eyg4zUamdRWHgBFphb5/9h2flt1vgdUfhc6hZcML21Ci7iXjaA==", + "dev": true + }, + "node_modules/@cspell/dict-csharp": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-csharp/-/dict-csharp-3.0.1.tgz", + "integrity": "sha512-xkfQu03F388w4sdVQSSjrVMkxAxpTYB2yW7nw0XYtTjl3L/jBgvTr/j1BTjdFbQhdNf10Lg0Ak1kXOjmHodVqA==", + "dev": true + }, + "node_modules/@cspell/dict-css": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-2.1.0.tgz", + "integrity": "sha512-glASAELcGhh4Ru0rTQ4G9mTQxSyPwsZOON/5BYflB6Kks8YC8nUvKrtMCoo5W7CPKPfSEa8zUNctFQ1+IUYDHA==", + "dev": true + }, + "node_modules/@cspell/dict-dart": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-1.1.1.tgz", + "integrity": "sha512-XBOCpezXrgFN18kGEwqMpTUGZdw4BjCoJrNOo6qBdcdZySCrEHLwELraLOkcSba2kM4stmTp0t59FkwtP8TKOA==", + "dev": true + }, + "node_modules/@cspell/dict-django": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-django/-/dict-django-2.0.0.tgz", + "integrity": "sha512-GkJdJv6cmzrKcmq2/oxTXjKF5uv71r4eTqnFmgPbNBW1t+G4VYpzOf0QrVQrhx2RC4DdW5XfcTf+iS0FxHOTmw==", + "dev": true + }, + "node_modules/@cspell/dict-docker": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-docker/-/dict-docker-1.1.1.tgz", + "integrity": "sha512-UEYoeRDm7oUN9yz1mYSozz6D4+2N14S/cd2Re9et6Xzq6yi62s4ky3knF92Of2weelADjnN41UA22VBhRAf7Sw==", + "dev": true + }, + "node_modules/@cspell/dict-dotnet": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-2.0.1.tgz", + "integrity": "sha512-b1n4crJRW0WZVf9Gp/52j/tDtjYiZ3N81fIyfqPlBrjsh/5AivfA697DYwQ2mr8ngNX7RsqRtYNQjealA1rEnQ==", + "dev": true + }, + "node_modules/@cspell/dict-elixir": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-2.0.1.tgz", + "integrity": "sha512-eTTTxZt1FqGkM780yFDxsGHvTbWqvlK8YISSccK8FyrB6ULW+uflQlNS5AnWg3uWKC48b7pQott+odYCsPJ+Ow==", + "dev": true + }, + "node_modules/@cspell/dict-en_us": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-2.3.3.tgz", + "integrity": "sha512-csyKeaNktfpvMkmE2GOPTwsrQm3wWhLKVaDRaGU0qTcIjDiCvqv/iYgrVrKRkoddA3kdNTZ8YNCcix7lb6VkOg==", + "dev": true + }, + "node_modules/@cspell/dict-en-gb": { + "version": "1.1.33", + "resolved": "https://registry.npmjs.org/@cspell/dict-en-gb/-/dict-en-gb-1.1.33.tgz", + "integrity": "sha512-tKSSUf9BJEV+GJQAYGw5e+ouhEe2ZXE620S7BLKe3ZmpnjlNG9JqlnaBhkIMxKnNFkLY2BP/EARzw31AZnOv4g==", + "dev": true + }, + "node_modules/@cspell/dict-filetypes": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-2.1.1.tgz", + "integrity": "sha512-Oo0/mUbFHzsaATqRLdkV1RMoYns3aGzeKFIpVJg415GYtJ8EABXtEArYTXeMwlboyGTPvEk+PR2hBSTSfQTqmg==", + "dev": true + }, + "node_modules/@cspell/dict-fonts": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-fonts/-/dict-fonts-2.1.0.tgz", + "integrity": "sha512-hk7xsbfWEUhc136Xj7I2TD7ouKAfWwzCVAQaHBxcVXAsVxu7bDOGj4FvE2jBzlkSUY8A9Ww8qS0GOFvowJshVg==", + "dev": true + }, + "node_modules/@cspell/dict-fullstack": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-2.0.6.tgz", + "integrity": "sha512-R2E2xvbHvvRwwurxfpBJDRIJjXBMfEPF5WNV3LTOEMRqkZtoYCeJK9aqc8LHlmJMtAbnN1cx//BCDIyTJ0rO0A==", + "dev": true + }, + "node_modules/@cspell/dict-git": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-git/-/dict-git-1.0.1.tgz", + "integrity": "sha512-Rk+eTof/9inF11lvxmkCRK+gODatA3qai8kSASv6OG/JfPvpj7fTHErx/rdgPw/LOTDUafnoTjTYmj7B2MOQXg==", + "dev": true + }, + "node_modules/@cspell/dict-golang": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-3.0.1.tgz", + "integrity": "sha512-0KNfXTbxHW2l8iVjxeOf+KFv9Qrw3z5cyKnkuYJWlBTSB5KcUBfeKCb4fsds26VdANqiy6U91b4gDx5kNEmBjQ==", + "dev": true + }, + "node_modules/@cspell/dict-haskell": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-haskell/-/dict-haskell-2.0.1.tgz", + "integrity": "sha512-ooA23qIG7InOOxlLm67CNH5O2J85QsPHEAzEU9KEqVfYG5ovFs5tx6n9pHekDVk3MpQULpqfNUYDR0KigPLg5g==", + "dev": true + }, + "node_modules/@cspell/dict-html": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-3.3.2.tgz", + "integrity": "sha512-cM5pQSEiqjrdk6cRFLrlLdWNT/J8399f/A6DjwjfYhHrGy0e/Rsjv76HZT0GlE1OqMoq9eG9jdQsfoYYgWTIpQ==", + "dev": true + }, + "node_modules/@cspell/dict-html-symbol-entities": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-html-symbol-entities/-/dict-html-symbol-entities-3.0.0.tgz", + "integrity": "sha512-04K7cPTcbYXmHICfiob4gZA1yaj4hpfM+Nl5WIJ1EAZsSGHdqmGEF28GuCjyQ8ZeKiJAsPt/vXuLBbjxkHqZyQ==", + "dev": true + }, + "node_modules/@cspell/dict-java": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-3.0.7.tgz", + "integrity": "sha512-IL7ubsRvKX6dZSx++TplJCfhiS7kkEGpbTPG0gMEP50DTNAVM4icZS8zmer2UBCU5PTwF85abJjdX7mRADWKVg==", + "dev": true + }, + "node_modules/@cspell/dict-latex": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@cspell/dict-latex/-/dict-latex-2.0.9.tgz", + "integrity": "sha512-d1kTK6dJb5z6UcfASQWjqQlsjZvnoVOvMWxYtLpGksYf6gM4IgqoPVNMLYYK6xBS4T/uAnLIj975A6YuAeyZpg==", + "dev": true + }, + "node_modules/@cspell/dict-lorem-ipsum": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-lorem-ipsum/-/dict-lorem-ipsum-2.0.1.tgz", + "integrity": "sha512-s7Ft8UiloUJwgz4z8uLeFvCkeTcZ43HQl7mSAlZd76eW+keLSsdeGmLDx2zaciqo+MftPGyzygVCwaJjTGxiew==", + "dev": true + }, + "node_modules/@cspell/dict-lua": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-lua/-/dict-lua-2.0.0.tgz", + "integrity": "sha512-7WUEBEspSKtsq104WdIys1+DLqAxpJPzw74Py1TuE3fI5GvlzeSZkRFP2ya54GB2lCO4C3mq4M8EnitpibVDfw==", + "dev": true + }, + "node_modules/@cspell/dict-node": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-node/-/dict-node-3.0.1.tgz", + "integrity": "sha512-sK2cpuV0EAc43Amd5xeQXkI9MeRTECMw+yjap06gKSModbgI7BqJUHeKZed+0Hii+LpaJ4TYpLGiRVsO+qSk0w==", + "dev": true + }, + "node_modules/@cspell/dict-npm": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-3.1.2.tgz", + "integrity": "sha512-dg4M38nrCCeBOYKVqPG91JPJ67j9LygPeNnu5fa7E9Z1eho3fkYHvfKlF3t4EZyAOxEobp0ZB0iXaCuX2YknlA==", + "dev": true + }, + "node_modules/@cspell/dict-php": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-2.0.0.tgz", + "integrity": "sha512-29WgU77eTO985LvMHwPi1pcpfopfCWfTdffDyqya0JIfOSaFUrlYKzGPkE4mRxcz2G3hXsaM0SRvBNdIRwEdUg==", + "dev": true + }, + "node_modules/@cspell/dict-powershell": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-2.0.0.tgz", + "integrity": "sha512-6uvEhLiGmG3u9TFkM1TYcky6aL9Yk7Sk3KJwoTYBaQJY2KqrprgyQtW6yxIw9oU52VRHlq3KKvSAA9Q26+SIkQ==", + "dev": true + }, + "node_modules/@cspell/dict-public-licenses": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-1.0.6.tgz", + "integrity": "sha512-Z9IUFPkkOpOsEdgPUfQOJNQ+qU6+iBAZWS/CR5sUqTX+s5VkPNVwQyVC2kdmgmE2U5qwzAPewG6nVKr2MVogwg==", + "dev": true + }, + "node_modules/@cspell/dict-python": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-3.0.6.tgz", + "integrity": "sha512-tzxJ4sd9ZGhAUKg/WJJpQGDNtoHvM8Wn+iS2+PnQj2/LTHBW4mnaCogsGsBtYu8C4b2+BEQs+tc5808AeEfLug==", + "dev": true + }, + "node_modules/@cspell/dict-r": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@cspell/dict-r/-/dict-r-1.0.3.tgz", + "integrity": "sha512-u2qeXd4cx/TvTVcmkvA+sK6f4K1uMAMO6QPMSr1pSvqGElPRP1mIBXmuiSuBzLO3LbsJuUEHw5Cp3/bxIB6rNA==", + "dev": true + }, + "node_modules/@cspell/dict-ruby": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-2.0.2.tgz", + "integrity": "sha512-vVnUpSmGDbPjs7MHq741DsLHhQcoA4CnUCM9wsTorQ9AQRDAkDTbK/LcY8nM19MoXCb3eF8PFku5Jq+gqH0u7w==", + "dev": true + }, + "node_modules/@cspell/dict-rust": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-2.0.1.tgz", + "integrity": "sha512-ATDpIh0VWpQdUIZa8zqqJY4wQz3q00BTXlQCodeOmObYSb23+L6KWWzJ8mKLgpbc1lqTkogWrqxiCxlrCmqNmg==", + "dev": true + }, + "node_modules/@cspell/dict-scala": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-2.0.0.tgz", + "integrity": "sha512-MUwA2YKpqaQOSR4V1/CVGRNk8Ii5kf6I8Ch+4/BhRZRQXuwWbi21rDRYWPqdQWps7VNzAbbMA+PQDWsD5YY38g==", + "dev": true + }, + "node_modules/@cspell/dict-software-terms": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.2.7.tgz", + "integrity": "sha512-tNdgfijX4PGIzwWyRQHqEsKEWqNc92HDdURcXBZNw2po7jUh+/FgqBoUgnJXyLastJ9PGX9847j9uNBPfShTgA==", + "dev": true + }, + "node_modules/@cspell/dict-sql": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-1.0.4.tgz", + "integrity": "sha512-+9nMcwsCzdYH0tyv2LeuVvQ+DdecS2C1N+hw6sl0FTHWI5GwULHAGW840RBwcKw0s+dl7sc0WpZhS1EW7b0pXg==", + "dev": true + }, + "node_modules/@cspell/dict-swift": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@cspell/dict-swift/-/dict-swift-1.0.3.tgz", + "integrity": "sha512-yOBLSaRD0AnkkkndJ8PuB82Evp6lA2xItf2AWsnPfCCgxp5Ojk6uUBC/WQBSkzkCAOGbXyHsu9D97tsOx2c6cw==", + "dev": true + }, + "node_modules/@cspell/dict-typescript": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-2.0.1.tgz", + "integrity": "sha512-YXH6nEH4thcD7lNffdNsKgDDZA5JVX4aKCuNIGE7qWSS9kBVgIvSU9/WH64R59rEzAPe1VwXwXyoZ7y4fAufww==", + "dev": true + }, + "node_modules/@cspell/dict-vue": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@cspell/dict-vue/-/dict-vue-2.0.2.tgz", + "integrity": "sha512-/MB0RS0Gn01s4pgmjy0FvsLfr3RRMrRphEuvTRserNcM8XVtoIVAtrjig/Gg0DPwDrN8Clm0L1j7iQay6S8D0g==", + "dev": true + }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", @@ -579,6 +913,20 @@ "node": ">=8" } }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, + "dependencies": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/@jridgewell/resolve-uri": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz", @@ -588,6 +936,25 @@ "node": ">=6.0.0" } }, + "node_modules/@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.13", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", @@ -753,9 +1120,9 @@ "dev": true }, "node_modules/@types/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.0.0.tgz", + "integrity": "sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA==", "dev": true, "dependencies": { "@types/minimatch": "*", @@ -781,14 +1148,20 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.0.tgz", - "integrity": "sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==" + "version": "18.7.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz", + "integrity": "sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg==" + }, + "node_modules/@types/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", + "dev": true }, "node_modules/@types/prompt": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@types/prompt/-/prompt-1.1.2.tgz", - "integrity": "sha512-Zc9YzOvjAWxxGY7qo0Q6yINMVVspAa4p68UCzucWMU+GaPujpjwbOwzI38s7Jq01k0GztzLxXlRiFcZf/aeIWA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@types/prompt/-/prompt-1.1.3.tgz", + "integrity": "sha512-y1fMzb7a/mQs4tynU8agMmV8ptbT0dkgNafrdsoEyLtbCggK5COJ/r5DGcaAHB5kdXTGh+8trHlENlsZkm+tOQ==", "dev": true, "dependencies": { "@types/node": "*", @@ -848,9 +1221,9 @@ } }, "node_modules/@types/sinon": { - "version": "10.0.11", - "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.11.tgz", - "integrity": "sha512-dmZsHlBsKUtBpHriNjlK0ndlvEh8dcb9uV9Afsbt89QIyydpC7NcR+nWlAhASfy3GHnxTl4FX/aKE7XZUt/B4g==", + "version": "10.0.13", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.13.tgz", + "integrity": "sha512-UVjDqJblVNQYvVNUsj0PuYYw0ELRmgt1Nt5Vk0pT5f16ROGfcKJY8o1HVuMOJOpD727RrGB9EGvoaTQE5tgxZQ==", "dev": true, "dependencies": { "@types/sinonjs__fake-timers": "*" @@ -1089,9 +1462,9 @@ "dev": true }, "node_modules/acorn": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", - "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", + "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -1241,6 +1614,12 @@ "sprintf-js": "~1.0.2" } }, + "node_modules/array-timsort": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-timsort/-/array-timsort-1.0.3.tgz", + "integrity": "sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==", + "dev": true + }, "node_modules/asn1": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", @@ -1639,6 +2018,15 @@ "typedarray-to-buffer": "^3.1.5" } }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", @@ -1761,6 +2149,22 @@ "node": ">=6" } }, + "node_modules/clear-module": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/clear-module/-/clear-module-4.1.2.tgz", + "integrity": "sha512-LWAxzHqdHsAZlPlEyJ2Poz6AIs384mPeqLVCru2p0BrP9G/kVGuhNyZYClLO6cXlnuJjzC8xtsJIuMjKqLXoAw==", + "dev": true, + "dependencies": { + "parent-module": "^2.0.0", + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/cli-boxes": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", @@ -1905,6 +2309,28 @@ "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", "dev": true }, + "node_modules/comment-json": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/comment-json/-/comment-json-4.2.3.tgz", + "integrity": "sha512-SsxdiOf064DWoZLH799Ata6u7iV658A11PlWtZATDlXPpKGJnbJZ5Z24ybixAi+LUUqJ/GKowAejtC5GFUG7Tw==", + "dev": true, + "dependencies": { + "array-timsort": "^1.0.3", + "core-util-is": "^1.0.3", + "esprima": "^4.0.1", + "has-own-prop": "^2.0.0", + "repeat-string": "^1.6.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/comment-json/node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "dev": true + }, "node_modules/commondir": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", @@ -1988,6 +2414,22 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true }, + "node_modules/cosmiconfig": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", + "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", + "dev": true, + "dependencies": { + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.2.1", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.10.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/cp-file": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz", @@ -2029,6 +2471,379 @@ "node": ">=8" } }, + "node_modules/cspell": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/cspell/-/cspell-6.8.2.tgz", + "integrity": "sha512-WHF8tQXetHgAjyG6f0rDhWXRQllSpZULOIuDZj6PeZyHubuObzsMsW0asDvL8j+EGKXr8NPo4J3vjxahYmSJ+w==", + "dev": true, + "dependencies": { + "@cspell/cspell-pipe": "^6.8.2", + "chalk": "^4.1.2", + "commander": "^9.4.0", + "cspell-gitignore": "^6.8.2", + "cspell-glob": "^6.8.2", + "cspell-lib": "^6.8.2", + "fast-json-stable-stringify": "^2.1.0", + "file-entry-cache": "^6.0.1", + "fs-extra": "^10.1.0", + "get-stdin": "^8.0.0", + "glob": "^8.0.3", + "imurmurhash": "^0.1.4", + "semver": "^7.3.7", + "strip-ansi": "^6.0.1", + "vscode-uri": "^3.0.3" + }, + "bin": { + "cspell": "bin.js" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/streetsidesoftware/cspell?sponsor=1" + } + }, + "node_modules/cspell-gitignore": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.8.2.tgz", + "integrity": "sha512-JoU/rGeGrjSqOMvY5q+bloxtO5Y8QLpJEEIAvHHZ+oTOlExZ/CIAYnO6X3lC6ylNRYc1+I2KEOFa6R0+0OSdVQ==", + "dev": true, + "dependencies": { + "cspell-glob": "^6.8.2", + "find-up": "^5.0.0" + }, + "bin": { + "cspell-gitignore": "bin.js" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/cspell-glob": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.8.2.tgz", + "integrity": "sha512-FKy2EIdQKO9b/vP0r8yqxtGQNA8M48DkwMSjW2mN1Qku5wRT8SPByKg87BjK4oztlIiQJoJ6+8OTrWnJwdbpQw==", + "dev": true, + "dependencies": { + "micromatch": "^4.0.5" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/cspell-grammar": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.8.2.tgz", + "integrity": "sha512-RHvIsNRDlBYKddKAdob5XT2+odOiO3eJVaw/vt5+CRx1cJSjuaIOyHwXKH2Xl1ioUUhEb9Ew3pg7JktRdzKn5w==", + "dev": true, + "dependencies": { + "@cspell/cspell-pipe": "^6.8.2", + "@cspell/cspell-types": "^6.8.2" + }, + "bin": { + "cspell-grammar": "bin.js" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/cspell-io": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-6.8.2.tgz", + "integrity": "sha512-QpdePUXD8fTM2XuZdeS5ygTeIW9pnaQhTVWBWGbnrYlMn5iV9Jo81dHheHw4InxQJUjhyS/CuxdNGfYZXGJuaQ==", + "dev": true, + "dependencies": { + "@cspell/cspell-service-bus": "^6.8.2", + "node-fetch": "^2.6.7" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/cspell-lib": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.8.2.tgz", + "integrity": "sha512-K7UoaKB3qzq5KVnKynQM0+v8+4aXAA0coBKA6tH5czY2KDeuJSUu14b9WM+nxrUbMOOvNuSv+NaYw5lryaMFsg==", + "dev": true, + "dependencies": { + "@cspell/cspell-bundled-dicts": "^6.8.2", + "@cspell/cspell-pipe": "^6.8.2", + "@cspell/cspell-types": "^6.8.2", + "clear-module": "^4.1.2", + "comment-json": "^4.2.3", + "configstore": "^5.0.1", + "cosmiconfig": "^7.0.1", + "cspell-glob": "^6.8.2", + "cspell-grammar": "^6.8.2", + "cspell-io": "^6.8.2", + "cspell-trie-lib": "^6.8.2", + "fast-equals": "^4.0.3", + "find-up": "^5.0.0", + "fs-extra": "^10.1.0", + "gensequence": "^4.0.2", + "import-fresh": "^3.3.0", + "resolve-from": "^5.0.0", + "resolve-global": "^1.0.0", + "vscode-languageserver-textdocument": "^1.0.7", + "vscode-uri": "^3.0.3" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/cspell-lib/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/cspell-lib/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/cspell-lib/node_modules/universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/cspell-trie-lib": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.8.2.tgz", + "integrity": "sha512-jaNszLtSQglpz1BKejQ4RBFyJVSsYHQGW+1Rj4Zm103OcL+g6r/E1lm/dIbX/1UC4pBrNamjcGzXtPOBZJtUeQ==", + "dev": true, + "dependencies": { + "@cspell/cspell-pipe": "^6.8.2", + "@cspell/cspell-types": "^6.8.2", + "fs-extra": "^10.1.0", + "gensequence": "^4.0.2" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/cspell-trie-lib/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/cspell-trie-lib/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/cspell-trie-lib/node_modules/universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/cspell/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/cspell/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/cspell/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/cspell/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/cspell/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/cspell/node_modules/commander": { + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz", + "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==", + "dev": true, + "engines": { + "node": "^12.20.0 || >=14" + } + }, + "node_modules/cspell/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/cspell/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/cspell/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/cspell/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/cspell/node_modules/semver": { + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/cspell/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cspell/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cspell/node_modules/universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/cspell/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/cycle": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz", @@ -2470,9 +3285,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.9.2", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz", - "integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==", + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz", + "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -2482,12 +3297,6 @@ "node": ">=10.13.0" } }, - "node_modules/enhanced-resolve/node_modules/graceful-fs": { - "version": "4.2.9", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", - "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", - "dev": true - }, "node_modules/enquirer": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", @@ -2512,6 +3321,15 @@ "node": ">=4" } }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, "node_modules/es-module-lexer": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", @@ -2661,10 +3479,16 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, + "node_modules/fast-equals": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-4.0.3.tgz", + "integrity": "sha512-G3BSX9cfKttjr+2o1O22tYMLq0DPluZnYtq1rXumE1SpL/F/SLIfHx08WYQoWSIpeMYf8sRbJ8++71+v6Pnxfg==", + "dev": true + }, "node_modules/fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, "node_modules/fastest-levenshtein": { @@ -2682,6 +3506,18 @@ "node": ">= 0.4.0" } }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -2799,6 +3635,25 @@ "flat": "cli.js" } }, + "node_modules/flat-cache": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", + "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "dev": true, + "dependencies": { + "flatted": "^3.1.0", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz", + "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==", + "dev": true + }, "node_modules/foreground-child": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", @@ -3004,6 +3859,15 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/gensequence": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/gensequence/-/gensequence-4.0.2.tgz", + "integrity": "sha512-mQiFskYFPFDSUpBJ/n3ebAV2Ufu6DZGvUPXzyWYzFfJr6/DyOOZVnjx6VTWE4y0RLvYWnc5tZq5sCjzEWhRjqQ==", + "dev": true, + "engines": { + "node": ">=14" + } + }, "node_modules/gensync": { "version": "1.0.0-beta.1", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", @@ -3043,6 +3907,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/get-stdin": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", @@ -3160,9 +4036,9 @@ } }, "node_modules/graceful-fs": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz", - "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==", + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, "node_modules/har-schema": { @@ -3237,6 +4113,15 @@ "node": ">=4" } }, + "node_modules/has-own-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-own-prop/-/has-own-prop-2.0.0.tgz", + "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/has-yarn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", @@ -3355,6 +4240,43 @@ "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=", "dev": true }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-fresh/node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/import-fresh/node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/import-lazy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", @@ -3432,6 +4354,12 @@ "node": ">= 0.10" } }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true + }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -3928,9 +4856,9 @@ "dev": true }, "node_modules/json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", "dev": true }, "node_modules/json-schema-traverse": { @@ -3958,9 +4886,9 @@ } }, "node_modules/jsonc-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz", - "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.1.0.tgz", + "integrity": "sha512-DRf0QjnNeCUds3xTjKlQQ3DpJD51GvDjJfnxUVWg6PZTo2otSm+slzNAxU/35hF8/oJIKoG9slq30JYOsF2azg==", "dev": true }, "node_modules/jsonfile": { @@ -3973,24 +4901,24 @@ } }, "node_modules/jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", + "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", "dev": true, - "engines": [ - "node >=0.6.0" - ], "dependencies": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", - "json-schema": "0.2.3", + "json-schema": "0.4.0", "verror": "1.10.0" + }, + "engines": { + "node": ">=0.6.0" } }, "node_modules/jszip": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.0.tgz", - "integrity": "sha512-LDfVtOLtOxb9RXkYOwPyNBTQDL4eUbqahtoY6x07GiDJHwSYvn8sHHIw8wINImV3MqbMNve2gSuM1DDqEKk09Q==", + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", "dev": true, "dependencies": { "lie": "~3.3.0", @@ -4044,6 +4972,12 @@ "immediate": "~3.0.5" } }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true + }, "node_modules/listenercount": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz", @@ -4113,12 +5047,6 @@ "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", "dev": true }, - "node_modules/lodash.sortby": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", - "dev": true - }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -4261,9 +5189,9 @@ "dev": true }, "node_modules/marked": { - "version": "4.0.16", - "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.16.tgz", - "integrity": "sha512-wahonIQ5Jnyatt2fn8KqF/nIqZM8mh3oRu2+l5EANGMhu6RFjiSG52QNE2eWzFMI94HqYSgN184NurgNG6CztA==", + "version": "4.0.19", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.19.tgz", + "integrity": "sha512-rgQF/OxOiLcvgUAj1Q1tAf4Bgxn5h5JZTp04Fx4XUkVhs7B+7YA9JEWJhJpoO8eJt8MkZMwqLCNeNqj1bCREZQ==", "dev": true, "bin": { "marked": "bin/marked.js" @@ -5243,6 +6171,18 @@ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", "dev": true }, + "node_modules/parent-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-2.0.0.tgz", + "integrity": "sha512-uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg==", + "dev": true, + "dependencies": { + "callsites": "^3.1.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/parent-require": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/parent-require/-/parent-require-1.0.0.tgz", @@ -5252,6 +6192,24 @@ "node": ">= 0.4.0" } }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -5309,6 +6267,15 @@ "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "dev": true }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -5651,6 +6618,15 @@ "node": ">=4" } }, + "node_modules/repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", + "dev": true, + "engines": { + "node": ">=0.10" + } + }, "node_modules/replace-in-file": { "version": "6.3.5", "resolved": "https://registry.npmjs.org/replace-in-file/-/replace-in-file-6.3.5.tgz", @@ -5930,6 +6906,30 @@ "node": ">=8" } }, + "node_modules/resolve-global": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-global/-/resolve-global-1.0.0.tgz", + "integrity": "sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw==", + "dev": true, + "dependencies": { + "global-dirs": "^0.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-global/node_modules/global-dirs": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", + "integrity": "sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==", + "dev": true, + "dependencies": { + "ini": "^1.3.4" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/resolve-pathname": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz", @@ -6197,14 +7197,14 @@ } }, "node_modules/shiki": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.10.1.tgz", - "integrity": "sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.11.1.tgz", + "integrity": "sha512-EugY9VASFuDqOexOgXR18ZV+TbFrQHeCpEYaXamO+SZlsnT/2LxuLBX25GGtIrwaEVFXUAbUQ601SWE2rMwWHA==", "dev": true, "dependencies": { "jsonc-parser": "^3.0.0", "vscode-oniguruma": "^1.6.1", - "vscode-textmate": "5.2.0" + "vscode-textmate": "^6.0.0" } }, "node_modules/signal-exit": { @@ -6566,14 +7566,14 @@ } }, "node_modules/terser": { - "version": "5.13.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.13.1.tgz", - "integrity": "sha512-hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA==", + "version": "5.14.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", + "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", "dev": true, "dependencies": { + "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", "commander": "^2.20.0", - "source-map": "~0.8.0-beta.0", "source-map-support": "~0.5.20" }, "bin": { @@ -6623,44 +7623,6 @@ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, - "node_modules/terser/node_modules/source-map": { - "version": "0.8.0-beta.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz", - "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==", - "dev": true, - "dependencies": { - "whatwg-url": "^7.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/terser/node_modules/tr46": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", - "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/terser/node_modules/webidl-conversions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", - "dev": true - }, - "node_modules/terser/node_modules/whatwg-url": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", - "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", - "dev": true, - "dependencies": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.1", - "webidl-conversions": "^4.0.2" - } - }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -6891,9 +7853,9 @@ "dev": true }, "node_modules/ts-node": { - "version": "10.8.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.1.tgz", - "integrity": "sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==", + "version": "10.9.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", + "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", "dev": true, "dependencies": { "@cspotcode/source-map-support": "^0.8.0", @@ -6943,14 +7905,101 @@ } }, "node_modules/tsconfig-paths": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.0.0.tgz", - "integrity": "sha512-SLBg2GBKlR6bVtMgJJlud/o3waplKtL7skmLkExomIiaAtLGtVsoXIqP3SYdjbcH9lq/KVv7pMZeCBpLYOit6Q==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.0.tgz", + "integrity": "sha512-AHx4Euop/dXFC+Vx589alFba8QItjF+8hf8LtmuiCwHyI4rHXQtOOENaM8kvYf5fR0dRChy3wzWIZ9WbB7FWow==", "dev": true, "dependencies": { "json5": "^2.2.1", "minimist": "^1.2.6", "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tsconfig-paths-webpack-plugin": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.0.0.tgz", + "integrity": "sha512-fw/7265mIWukrSHd0i+wSwx64kYUSAKPfxRDksjKIYTxSAp9W9/xcZVBF4Kl0eqQd5eBpAQ/oQrc5RyM/0c1GQ==", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "enhanced-resolve": "^5.7.0", + "tsconfig-paths": "^4.0.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" } }, "node_modules/tslib": { @@ -7114,25 +8163,24 @@ } }, "node_modules/typedoc": { - "version": "0.22.17", - "resolved": "http://registry.npmjs.org/typedoc/-/typedoc-0.22.17.tgz", - "integrity": "sha512-h6+uXHVVCPDaANzjwzdsj9aePBjZiBTpiMpBBeyh1zcN2odVsDCNajz8zyKnixF93HJeGpl34j/70yoEE5BfNg==", + "version": "0.23.14", + "resolved": "http://registry.npmjs.org/typedoc/-/typedoc-0.23.14.tgz", + "integrity": "sha512-s2I+ZKBET38EctZvbXp2GooHrNaKjWZkrwGEK/sttnOGiKJqU0vHrsdcwLgKZGuo2aedNL3RRPj1LnAAeYscig==", "dev": true, "dependencies": { - "glob": "^8.0.3", "lunr": "^2.3.9", - "marked": "^4.0.16", + "marked": "^4.0.19", "minimatch": "^5.1.0", - "shiki": "^0.10.1" + "shiki": "^0.11.1" }, "bin": { "typedoc": "bin/typedoc" }, "engines": { - "node": ">= 12.10.0" + "node": ">= 14.14" }, "peerDependencies": { - "typescript": "4.0.x || 4.1.x || 4.2.x || 4.3.x || 4.4.x || 4.5.x || 4.6.x || 4.7.x" + "typescript": "4.6.x || 4.7.x || 4.8.x" } }, "node_modules/typedoc/node_modules/brace-expansion": { @@ -7223,12 +8271,6 @@ "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=", "dev": true }, - "node_modules/unzipper/node_modules/graceful-fs": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", - "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==", - "dev": true - }, "node_modules/update-notifier": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz", @@ -7389,6 +8431,12 @@ "extsprintf": "^1.2.0" } }, + "node_modules/vscode-languageserver-textdocument": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz", + "integrity": "sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg==", + "dev": true + }, "node_modules/vscode-oniguruma": { "version": "1.6.2", "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.6.2.tgz", @@ -7396,15 +8444,21 @@ "dev": true }, "node_modules/vscode-textmate": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-5.2.0.tgz", - "integrity": "sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-6.0.0.tgz", + "integrity": "sha512-gu73tuZfJgu+mvCSy4UZwd2JXykjK9zAZsfmDeut5dx/1a7FeTk0XwJsSuqQn+cuMCGVbIBfl+s53X4T19DnzQ==", + "dev": true + }, + "node_modules/vscode-uri": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz", + "integrity": "sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==", "dev": true }, "node_modules/watchpack": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", - "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", + "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", "dev": true, "dependencies": { "glob-to-regexp": "^0.4.1", @@ -7421,9 +8475,9 @@ "dev": true }, "node_modules/webpack": { - "version": "5.73.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz", - "integrity": "sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==", + "version": "5.74.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz", + "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.3", @@ -7431,11 +8485,11 @@ "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/wasm-edit": "1.11.1", "@webassemblyjs/wasm-parser": "1.11.1", - "acorn": "^8.4.1", + "acorn": "^8.7.1", "acorn-import-assertions": "^1.7.6", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.9.3", + "enhanced-resolve": "^5.10.0", "es-module-lexer": "^0.9.0", "eslint-scope": "5.1.1", "events": "^3.2.0", @@ -7448,7 +8502,7 @@ "schema-utils": "^3.1.0", "tapable": "^2.1.1", "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.3.1", + "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" }, "bin": { @@ -7616,25 +8670,6 @@ "node": ">=10.13.0" } }, - "node_modules/webpack/node_modules/enhanced-resolve": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz", - "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/webpack/node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, "node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", @@ -7886,6 +8921,15 @@ "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", "dev": true }, + "node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, "node_modules/yargonaut": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.4.tgz", @@ -8432,6 +9476,326 @@ "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", "dev": true }, + "@cspell/cspell-bundled-dicts": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.8.2.tgz", + "integrity": "sha512-E4sNdcG23nj0ztiI69PeU+ALL6DgL3GoqVZuLhpRwgRL4RN7n7FuUJdJ91cgpNvx50+HhdyxFqEpKRigD3yeNQ==", + "dev": true, + "requires": { + "@cspell/dict-ada": "^2.0.1", + "@cspell/dict-aws": "^2.0.0", + "@cspell/dict-bash": "^2.0.4", + "@cspell/dict-companies": "^2.0.13", + "@cspell/dict-cpp": "^3.2.1", + "@cspell/dict-cryptocurrencies": "^2.0.0", + "@cspell/dict-csharp": "^3.0.1", + "@cspell/dict-css": "^2.1.0", + "@cspell/dict-dart": "^1.1.1", + "@cspell/dict-django": "^2.0.0", + "@cspell/dict-docker": "^1.1.1", + "@cspell/dict-dotnet": "^2.0.1", + "@cspell/dict-elixir": "^2.0.1", + "@cspell/dict-en_us": "^2.3.3", + "@cspell/dict-en-gb": "^1.1.33", + "@cspell/dict-filetypes": "^2.1.1", + "@cspell/dict-fonts": "^2.1.0", + "@cspell/dict-fullstack": "^2.0.6", + "@cspell/dict-git": "^1.0.1", + "@cspell/dict-golang": "^3.0.1", + "@cspell/dict-haskell": "^2.0.1", + "@cspell/dict-html": "^3.3.2", + "@cspell/dict-html-symbol-entities": "^3.0.0", + "@cspell/dict-java": "^3.0.7", + "@cspell/dict-latex": "^2.0.9", + "@cspell/dict-lorem-ipsum": "^2.0.1", + "@cspell/dict-lua": "^2.0.0", + "@cspell/dict-node": "^3.0.1", + "@cspell/dict-npm": "^3.1.2", + "@cspell/dict-php": "^2.0.0", + "@cspell/dict-powershell": "^2.0.0", + "@cspell/dict-public-licenses": "^1.0.6", + "@cspell/dict-python": "^3.0.6", + "@cspell/dict-r": "^1.0.3", + "@cspell/dict-ruby": "^2.0.2", + "@cspell/dict-rust": "^2.0.1", + "@cspell/dict-scala": "^2.0.0", + "@cspell/dict-software-terms": "^2.2.7", + "@cspell/dict-sql": "^1.0.4", + "@cspell/dict-swift": "^1.0.3", + "@cspell/dict-typescript": "^2.0.1", + "@cspell/dict-vue": "^2.0.2" + } + }, + "@cspell/cspell-pipe": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.8.2.tgz", + "integrity": "sha512-9GXBibZ8bcU+2KhX6WTEASPhIhsqdFYITwBJ39jfUl2MiPgpvjYxQKrAgnZOm5WpRzCUxoelU2SVaoI+rn/Stg==", + "dev": true + }, + "@cspell/cspell-service-bus": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.8.2.tgz", + "integrity": "sha512-YvEauGv/QZb5xRiKKvwiXz7lj7twc5TgispnujgHYDEt6OcXiWjYj676WzKkGJ2yM+QfurGJCCvOb2L1HQ6rYg==", + "dev": true + }, + "@cspell/cspell-types": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.8.2.tgz", + "integrity": "sha512-jFg+D1L+MkIad2IR+qlnOYIuwqaosbTrtqhpWhbOGMvFQjxMyKg9IVxbmtjDCdRohdBUvRq96rkp0vx1FviiwQ==", + "dev": true + }, + "@cspell/dict-ada": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-2.0.1.tgz", + "integrity": "sha512-vopTJ1oHrrFYV5GU55Sr+AzItR78Uj5YbCaspYABmYKlq4NRrcUAUsr4bWgymDcspMIHO7e7IFcj48OKs1fndA==", + "dev": true + }, + "@cspell/dict-aws": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-2.0.0.tgz", + "integrity": "sha512-NKz7pDZ7pwj/b33i3f4WLpC1rOOUMmENwYgftxU+giU2YBeKM2wZbMTSEIzsrel56r0UlQYmdIVlP/B4nnVaoQ==", + "dev": true + }, + "@cspell/dict-bash": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-2.0.4.tgz", + "integrity": "sha512-uK/ehmp5LYrmRH2Gv3nbvdPswpkybJUn34WYKLpeuYHQktmi+pOI1A9uPdBPnSbMDffSvwQlQohIyKawz+X8Ag==", + "dev": true + }, + "@cspell/dict-companies": { + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-2.0.13.tgz", + "integrity": "sha512-EacGH6Yjd2u+sNRLd6+3jxbzWBSsmF4g52Xfxfv2T48qzRWJ1zqpX89ijihgYTwvZbf8H/6Lu+z1VU4e1gUp0g==", + "dev": true + }, + "@cspell/dict-cpp": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-3.2.1.tgz", + "integrity": "sha512-XcmzrKIghqFfrYLLaHtWKOp9rupiuGdc5ODONk+emsq0W5CIc3Abn27IQHwUzxzF+Cm5IfKAIJ5Kpe6hkzm0HQ==", + "dev": true + }, + "@cspell/dict-cryptocurrencies": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-cryptocurrencies/-/dict-cryptocurrencies-2.0.0.tgz", + "integrity": "sha512-nREysmmfOp7L2YCRAUufQahwD5/Punzb5AZ6eyg4zUamdRWHgBFphb5/9h2flt1vgdUfhc6hZcML21Ci7iXjaA==", + "dev": true + }, + "@cspell/dict-csharp": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-csharp/-/dict-csharp-3.0.1.tgz", + "integrity": "sha512-xkfQu03F388w4sdVQSSjrVMkxAxpTYB2yW7nw0XYtTjl3L/jBgvTr/j1BTjdFbQhdNf10Lg0Ak1kXOjmHodVqA==", + "dev": true + }, + "@cspell/dict-css": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-2.1.0.tgz", + "integrity": "sha512-glASAELcGhh4Ru0rTQ4G9mTQxSyPwsZOON/5BYflB6Kks8YC8nUvKrtMCoo5W7CPKPfSEa8zUNctFQ1+IUYDHA==", + "dev": true + }, + "@cspell/dict-dart": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-1.1.1.tgz", + "integrity": "sha512-XBOCpezXrgFN18kGEwqMpTUGZdw4BjCoJrNOo6qBdcdZySCrEHLwELraLOkcSba2kM4stmTp0t59FkwtP8TKOA==", + "dev": true + }, + "@cspell/dict-django": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-django/-/dict-django-2.0.0.tgz", + "integrity": "sha512-GkJdJv6cmzrKcmq2/oxTXjKF5uv71r4eTqnFmgPbNBW1t+G4VYpzOf0QrVQrhx2RC4DdW5XfcTf+iS0FxHOTmw==", + "dev": true + }, + "@cspell/dict-docker": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-docker/-/dict-docker-1.1.1.tgz", + "integrity": "sha512-UEYoeRDm7oUN9yz1mYSozz6D4+2N14S/cd2Re9et6Xzq6yi62s4ky3knF92Of2weelADjnN41UA22VBhRAf7Sw==", + "dev": true + }, + "@cspell/dict-dotnet": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-2.0.1.tgz", + "integrity": "sha512-b1n4crJRW0WZVf9Gp/52j/tDtjYiZ3N81fIyfqPlBrjsh/5AivfA697DYwQ2mr8ngNX7RsqRtYNQjealA1rEnQ==", + "dev": true + }, + "@cspell/dict-elixir": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-2.0.1.tgz", + "integrity": "sha512-eTTTxZt1FqGkM780yFDxsGHvTbWqvlK8YISSccK8FyrB6ULW+uflQlNS5AnWg3uWKC48b7pQott+odYCsPJ+Ow==", + "dev": true + }, + "@cspell/dict-en_us": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-2.3.3.tgz", + "integrity": "sha512-csyKeaNktfpvMkmE2GOPTwsrQm3wWhLKVaDRaGU0qTcIjDiCvqv/iYgrVrKRkoddA3kdNTZ8YNCcix7lb6VkOg==", + "dev": true + }, + "@cspell/dict-en-gb": { + "version": "1.1.33", + "resolved": "https://registry.npmjs.org/@cspell/dict-en-gb/-/dict-en-gb-1.1.33.tgz", + "integrity": "sha512-tKSSUf9BJEV+GJQAYGw5e+ouhEe2ZXE620S7BLKe3ZmpnjlNG9JqlnaBhkIMxKnNFkLY2BP/EARzw31AZnOv4g==", + "dev": true + }, + "@cspell/dict-filetypes": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-2.1.1.tgz", + "integrity": "sha512-Oo0/mUbFHzsaATqRLdkV1RMoYns3aGzeKFIpVJg415GYtJ8EABXtEArYTXeMwlboyGTPvEk+PR2hBSTSfQTqmg==", + "dev": true + }, + "@cspell/dict-fonts": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-fonts/-/dict-fonts-2.1.0.tgz", + "integrity": "sha512-hk7xsbfWEUhc136Xj7I2TD7ouKAfWwzCVAQaHBxcVXAsVxu7bDOGj4FvE2jBzlkSUY8A9Ww8qS0GOFvowJshVg==", + "dev": true + }, + "@cspell/dict-fullstack": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-2.0.6.tgz", + "integrity": "sha512-R2E2xvbHvvRwwurxfpBJDRIJjXBMfEPF5WNV3LTOEMRqkZtoYCeJK9aqc8LHlmJMtAbnN1cx//BCDIyTJ0rO0A==", + "dev": true + }, + "@cspell/dict-git": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-git/-/dict-git-1.0.1.tgz", + "integrity": "sha512-Rk+eTof/9inF11lvxmkCRK+gODatA3qai8kSASv6OG/JfPvpj7fTHErx/rdgPw/LOTDUafnoTjTYmj7B2MOQXg==", + "dev": true + }, + "@cspell/dict-golang": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-3.0.1.tgz", + "integrity": "sha512-0KNfXTbxHW2l8iVjxeOf+KFv9Qrw3z5cyKnkuYJWlBTSB5KcUBfeKCb4fsds26VdANqiy6U91b4gDx5kNEmBjQ==", + "dev": true + }, + "@cspell/dict-haskell": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-haskell/-/dict-haskell-2.0.1.tgz", + "integrity": "sha512-ooA23qIG7InOOxlLm67CNH5O2J85QsPHEAzEU9KEqVfYG5ovFs5tx6n9pHekDVk3MpQULpqfNUYDR0KigPLg5g==", + "dev": true + }, + "@cspell/dict-html": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-3.3.2.tgz", + "integrity": "sha512-cM5pQSEiqjrdk6cRFLrlLdWNT/J8399f/A6DjwjfYhHrGy0e/Rsjv76HZT0GlE1OqMoq9eG9jdQsfoYYgWTIpQ==", + "dev": true + }, + "@cspell/dict-html-symbol-entities": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-html-symbol-entities/-/dict-html-symbol-entities-3.0.0.tgz", + "integrity": "sha512-04K7cPTcbYXmHICfiob4gZA1yaj4hpfM+Nl5WIJ1EAZsSGHdqmGEF28GuCjyQ8ZeKiJAsPt/vXuLBbjxkHqZyQ==", + "dev": true + }, + "@cspell/dict-java": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-3.0.7.tgz", + "integrity": "sha512-IL7ubsRvKX6dZSx++TplJCfhiS7kkEGpbTPG0gMEP50DTNAVM4icZS8zmer2UBCU5PTwF85abJjdX7mRADWKVg==", + "dev": true + }, + "@cspell/dict-latex": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@cspell/dict-latex/-/dict-latex-2.0.9.tgz", + "integrity": "sha512-d1kTK6dJb5z6UcfASQWjqQlsjZvnoVOvMWxYtLpGksYf6gM4IgqoPVNMLYYK6xBS4T/uAnLIj975A6YuAeyZpg==", + "dev": true + }, + "@cspell/dict-lorem-ipsum": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-lorem-ipsum/-/dict-lorem-ipsum-2.0.1.tgz", + "integrity": "sha512-s7Ft8UiloUJwgz4z8uLeFvCkeTcZ43HQl7mSAlZd76eW+keLSsdeGmLDx2zaciqo+MftPGyzygVCwaJjTGxiew==", + "dev": true + }, + "@cspell/dict-lua": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-lua/-/dict-lua-2.0.0.tgz", + "integrity": "sha512-7WUEBEspSKtsq104WdIys1+DLqAxpJPzw74Py1TuE3fI5GvlzeSZkRFP2ya54GB2lCO4C3mq4M8EnitpibVDfw==", + "dev": true + }, + "@cspell/dict-node": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-node/-/dict-node-3.0.1.tgz", + "integrity": "sha512-sK2cpuV0EAc43Amd5xeQXkI9MeRTECMw+yjap06gKSModbgI7BqJUHeKZed+0Hii+LpaJ4TYpLGiRVsO+qSk0w==", + "dev": true + }, + "@cspell/dict-npm": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-3.1.2.tgz", + "integrity": "sha512-dg4M38nrCCeBOYKVqPG91JPJ67j9LygPeNnu5fa7E9Z1eho3fkYHvfKlF3t4EZyAOxEobp0ZB0iXaCuX2YknlA==", + "dev": true + }, + "@cspell/dict-php": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-2.0.0.tgz", + "integrity": "sha512-29WgU77eTO985LvMHwPi1pcpfopfCWfTdffDyqya0JIfOSaFUrlYKzGPkE4mRxcz2G3hXsaM0SRvBNdIRwEdUg==", + "dev": true + }, + "@cspell/dict-powershell": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-2.0.0.tgz", + "integrity": "sha512-6uvEhLiGmG3u9TFkM1TYcky6aL9Yk7Sk3KJwoTYBaQJY2KqrprgyQtW6yxIw9oU52VRHlq3KKvSAA9Q26+SIkQ==", + "dev": true + }, + "@cspell/dict-public-licenses": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-1.0.6.tgz", + "integrity": "sha512-Z9IUFPkkOpOsEdgPUfQOJNQ+qU6+iBAZWS/CR5sUqTX+s5VkPNVwQyVC2kdmgmE2U5qwzAPewG6nVKr2MVogwg==", + "dev": true + }, + "@cspell/dict-python": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-3.0.6.tgz", + "integrity": "sha512-tzxJ4sd9ZGhAUKg/WJJpQGDNtoHvM8Wn+iS2+PnQj2/LTHBW4mnaCogsGsBtYu8C4b2+BEQs+tc5808AeEfLug==", + "dev": true + }, + "@cspell/dict-r": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@cspell/dict-r/-/dict-r-1.0.3.tgz", + "integrity": "sha512-u2qeXd4cx/TvTVcmkvA+sK6f4K1uMAMO6QPMSr1pSvqGElPRP1mIBXmuiSuBzLO3LbsJuUEHw5Cp3/bxIB6rNA==", + "dev": true + }, + "@cspell/dict-ruby": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-2.0.2.tgz", + "integrity": "sha512-vVnUpSmGDbPjs7MHq741DsLHhQcoA4CnUCM9wsTorQ9AQRDAkDTbK/LcY8nM19MoXCb3eF8PFku5Jq+gqH0u7w==", + "dev": true + }, + "@cspell/dict-rust": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-2.0.1.tgz", + "integrity": "sha512-ATDpIh0VWpQdUIZa8zqqJY4wQz3q00BTXlQCodeOmObYSb23+L6KWWzJ8mKLgpbc1lqTkogWrqxiCxlrCmqNmg==", + "dev": true + }, + "@cspell/dict-scala": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-2.0.0.tgz", + "integrity": "sha512-MUwA2YKpqaQOSR4V1/CVGRNk8Ii5kf6I8Ch+4/BhRZRQXuwWbi21rDRYWPqdQWps7VNzAbbMA+PQDWsD5YY38g==", + "dev": true + }, + "@cspell/dict-software-terms": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.2.7.tgz", + "integrity": "sha512-tNdgfijX4PGIzwWyRQHqEsKEWqNc92HDdURcXBZNw2po7jUh+/FgqBoUgnJXyLastJ9PGX9847j9uNBPfShTgA==", + "dev": true + }, + "@cspell/dict-sql": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-1.0.4.tgz", + "integrity": "sha512-+9nMcwsCzdYH0tyv2LeuVvQ+DdecS2C1N+hw6sl0FTHWI5GwULHAGW840RBwcKw0s+dl7sc0WpZhS1EW7b0pXg==", + "dev": true + }, + "@cspell/dict-swift": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@cspell/dict-swift/-/dict-swift-1.0.3.tgz", + "integrity": "sha512-yOBLSaRD0AnkkkndJ8PuB82Evp6lA2xItf2AWsnPfCCgxp5Ojk6uUBC/WQBSkzkCAOGbXyHsu9D97tsOx2c6cw==", + "dev": true + }, + "@cspell/dict-typescript": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-2.0.1.tgz", + "integrity": "sha512-YXH6nEH4thcD7lNffdNsKgDDZA5JVX4aKCuNIGE7qWSS9kBVgIvSU9/WH64R59rEzAPe1VwXwXyoZ7y4fAufww==", + "dev": true + }, + "@cspell/dict-vue": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@cspell/dict-vue/-/dict-vue-2.0.2.tgz", + "integrity": "sha512-/MB0RS0Gn01s4pgmjy0FvsLfr3RRMrRphEuvTRserNcM8XVtoIVAtrjig/Gg0DPwDrN8Clm0L1j7iQay6S8D0g==", + "dev": true + }, "@cspotcode/source-map-support": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", @@ -8508,12 +9872,39 @@ "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==", "dev": true }, + "@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, "@jridgewell/resolve-uri": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz", "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==", "dev": true }, + "@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true + }, + "@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dev": true, + "requires": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, "@jridgewell/sourcemap-codec": { "version": "1.4.13", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", @@ -8671,9 +10062,9 @@ "dev": true }, "@types/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.0.0.tgz", + "integrity": "sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA==", "dev": true, "requires": { "@types/minimatch": "*", @@ -8699,14 +10090,20 @@ "dev": true }, "@types/node": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.0.tgz", - "integrity": "sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==" + "version": "18.7.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz", + "integrity": "sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg==" + }, + "@types/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", + "dev": true }, "@types/prompt": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@types/prompt/-/prompt-1.1.2.tgz", - "integrity": "sha512-Zc9YzOvjAWxxGY7qo0Q6yINMVVspAa4p68UCzucWMU+GaPujpjwbOwzI38s7Jq01k0GztzLxXlRiFcZf/aeIWA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@types/prompt/-/prompt-1.1.3.tgz", + "integrity": "sha512-y1fMzb7a/mQs4tynU8agMmV8ptbT0dkgNafrdsoEyLtbCggK5COJ/r5DGcaAHB5kdXTGh+8trHlENlsZkm+tOQ==", "dev": true, "requires": { "@types/node": "*", @@ -8765,9 +10162,9 @@ } }, "@types/sinon": { - "version": "10.0.11", - "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.11.tgz", - "integrity": "sha512-dmZsHlBsKUtBpHriNjlK0ndlvEh8dcb9uV9Afsbt89QIyydpC7NcR+nWlAhASfy3GHnxTl4FX/aKE7XZUt/B4g==", + "version": "10.0.13", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.13.tgz", + "integrity": "sha512-UVjDqJblVNQYvVNUsj0PuYYw0ELRmgt1Nt5Vk0pT5f16ROGfcKJY8o1HVuMOJOpD727RrGB9EGvoaTQE5tgxZQ==", "dev": true, "requires": { "@types/sinonjs__fake-timers": "*" @@ -8993,9 +10390,9 @@ "dev": true }, "acorn": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", - "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", + "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", "dev": true }, "acorn-import-assertions": { @@ -9110,6 +10507,12 @@ "sprintf-js": "~1.0.2" } }, + "array-timsort": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-timsort/-/array-timsort-1.0.3.tgz", + "integrity": "sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==", + "dev": true + }, "asn1": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", @@ -9401,6 +10804,12 @@ } } }, + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + }, "camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", @@ -9484,6 +10893,16 @@ "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", "dev": true }, + "clear-module": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/clear-module/-/clear-module-4.1.2.tgz", + "integrity": "sha512-LWAxzHqdHsAZlPlEyJ2Poz6AIs384mPeqLVCru2p0BrP9G/kVGuhNyZYClLO6cXlnuJjzC8xtsJIuMjKqLXoAw==", + "dev": true, + "requires": { + "parent-module": "^2.0.0", + "resolve-from": "^5.0.0" + } + }, "cli-boxes": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", @@ -9603,6 +11022,27 @@ "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", "dev": true }, + "comment-json": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/comment-json/-/comment-json-4.2.3.tgz", + "integrity": "sha512-SsxdiOf064DWoZLH799Ata6u7iV658A11PlWtZATDlXPpKGJnbJZ5Z24ybixAi+LUUqJ/GKowAejtC5GFUG7Tw==", + "dev": true, + "requires": { + "array-timsort": "^1.0.3", + "core-util-is": "^1.0.3", + "esprima": "^4.0.1", + "has-own-prop": "^2.0.0", + "repeat-string": "^1.6.1" + }, + "dependencies": { + "core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "dev": true + } + } + }, "commondir": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", @@ -9671,6 +11111,19 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true }, + "cosmiconfig": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", + "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", + "dev": true, + "requires": { + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.2.1", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.10.0" + } + }, "cp-file": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz", @@ -9706,6 +11159,289 @@ "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", "dev": true }, + "cspell": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/cspell/-/cspell-6.8.2.tgz", + "integrity": "sha512-WHF8tQXetHgAjyG6f0rDhWXRQllSpZULOIuDZj6PeZyHubuObzsMsW0asDvL8j+EGKXr8NPo4J3vjxahYmSJ+w==", + "dev": true, + "requires": { + "@cspell/cspell-pipe": "^6.8.2", + "chalk": "^4.1.2", + "commander": "^9.4.0", + "cspell-gitignore": "^6.8.2", + "cspell-glob": "^6.8.2", + "cspell-lib": "^6.8.2", + "fast-json-stable-stringify": "^2.1.0", + "file-entry-cache": "^6.0.1", + "fs-extra": "^10.1.0", + "get-stdin": "^8.0.0", + "glob": "^8.0.3", + "imurmurhash": "^0.1.4", + "semver": "^7.3.7", + "strip-ansi": "^6.0.1", + "vscode-uri": "^3.0.3" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "commander": { + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz", + "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==", + "dev": true + }, + "fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "semver": { + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + } + } + }, + "cspell-gitignore": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.8.2.tgz", + "integrity": "sha512-JoU/rGeGrjSqOMvY5q+bloxtO5Y8QLpJEEIAvHHZ+oTOlExZ/CIAYnO6X3lC6ylNRYc1+I2KEOFa6R0+0OSdVQ==", + "dev": true, + "requires": { + "cspell-glob": "^6.8.2", + "find-up": "^5.0.0" + } + }, + "cspell-glob": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.8.2.tgz", + "integrity": "sha512-FKy2EIdQKO9b/vP0r8yqxtGQNA8M48DkwMSjW2mN1Qku5wRT8SPByKg87BjK4oztlIiQJoJ6+8OTrWnJwdbpQw==", + "dev": true, + "requires": { + "micromatch": "^4.0.5" + } + }, + "cspell-grammar": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.8.2.tgz", + "integrity": "sha512-RHvIsNRDlBYKddKAdob5XT2+odOiO3eJVaw/vt5+CRx1cJSjuaIOyHwXKH2Xl1ioUUhEb9Ew3pg7JktRdzKn5w==", + "dev": true, + "requires": { + "@cspell/cspell-pipe": "^6.8.2", + "@cspell/cspell-types": "^6.8.2" + } + }, + "cspell-io": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-6.8.2.tgz", + "integrity": "sha512-QpdePUXD8fTM2XuZdeS5ygTeIW9pnaQhTVWBWGbnrYlMn5iV9Jo81dHheHw4InxQJUjhyS/CuxdNGfYZXGJuaQ==", + "dev": true, + "requires": { + "@cspell/cspell-service-bus": "^6.8.2", + "node-fetch": "^2.6.7" + } + }, + "cspell-lib": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.8.2.tgz", + "integrity": "sha512-K7UoaKB3qzq5KVnKynQM0+v8+4aXAA0coBKA6tH5czY2KDeuJSUu14b9WM+nxrUbMOOvNuSv+NaYw5lryaMFsg==", + "dev": true, + "requires": { + "@cspell/cspell-bundled-dicts": "^6.8.2", + "@cspell/cspell-pipe": "^6.8.2", + "@cspell/cspell-types": "^6.8.2", + "clear-module": "^4.1.2", + "comment-json": "^4.2.3", + "configstore": "^5.0.1", + "cosmiconfig": "^7.0.1", + "cspell-glob": "^6.8.2", + "cspell-grammar": "^6.8.2", + "cspell-io": "^6.8.2", + "cspell-trie-lib": "^6.8.2", + "fast-equals": "^4.0.3", + "find-up": "^5.0.0", + "fs-extra": "^10.1.0", + "gensequence": "^4.0.2", + "import-fresh": "^3.3.0", + "resolve-from": "^5.0.0", + "resolve-global": "^1.0.0", + "vscode-languageserver-textdocument": "^1.0.7", + "vscode-uri": "^3.0.3" + }, + "dependencies": { + "fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true + } + } + }, + "cspell-trie-lib": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.8.2.tgz", + "integrity": "sha512-jaNszLtSQglpz1BKejQ4RBFyJVSsYHQGW+1Rj4Zm103OcL+g6r/E1lm/dIbX/1UC4pBrNamjcGzXtPOBZJtUeQ==", + "dev": true, + "requires": { + "@cspell/cspell-pipe": "^6.8.2", + "@cspell/cspell-types": "^6.8.2", + "fs-extra": "^10.1.0", + "gensequence": "^4.0.2" + }, + "dependencies": { + "fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true + } + } + }, "cycle": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz", @@ -10069,21 +11805,13 @@ } }, "enhanced-resolve": { - "version": "5.9.2", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz", - "integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==", + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz", + "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==", "dev": true, "requires": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" - }, - "dependencies": { - "graceful-fs": { - "version": "4.2.9", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", - "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", - "dev": true - } } }, "enquirer": { @@ -10101,6 +11829,15 @@ "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", "dev": true }, + "error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "requires": { + "is-arrayish": "^0.2.1" + } + }, "es-module-lexer": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", @@ -10212,10 +11949,16 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, + "fast-equals": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-4.0.3.tgz", + "integrity": "sha512-G3BSX9cfKttjr+2o1O22tYMLq0DPluZnYtq1rXumE1SpL/F/SLIfHx08WYQoWSIpeMYf8sRbJ8++71+v6Pnxfg==", + "dev": true + }, "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, "fastest-levenshtein": { @@ -10230,6 +11973,15 @@ "integrity": "sha512-WOn21V8AhyE1QqVfPIVxe3tupJacq1xGkPTB4iagT6o+P2cAgEOOwIxMftr4+ZCTI6d551ij9j61DFr0nsP2uQ==", "dev": true }, + "file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "requires": { + "flat-cache": "^3.0.4" + } + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -10310,6 +12062,22 @@ "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", "dev": true }, + "flat-cache": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", + "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "dev": true, + "requires": { + "flatted": "^3.1.0", + "rimraf": "^3.0.2" + } + }, + "flatted": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz", + "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==", + "dev": true + }, "foreground-child": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", @@ -10455,6 +12223,12 @@ } } }, + "gensequence": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/gensequence/-/gensequence-4.0.2.tgz", + "integrity": "sha512-mQiFskYFPFDSUpBJ/n3ebAV2Ufu6DZGvUPXzyWYzFfJr6/DyOOZVnjx6VTWE4y0RLvYWnc5tZq5sCjzEWhRjqQ==", + "dev": true + }, "gensync": { "version": "1.0.0-beta.1", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", @@ -10479,6 +12253,12 @@ "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==", "dev": true }, + "get-stdin": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "dev": true + }, "get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", @@ -10574,9 +12354,9 @@ } }, "graceful-fs": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz", - "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==", + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, "har-schema": { @@ -10636,6 +12416,12 @@ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, + "has-own-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-own-prop/-/has-own-prop-2.0.0.tgz", + "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==", + "dev": true + }, "has-yarn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", @@ -10720,6 +12506,33 @@ "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=", "dev": true }, + "import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "requires": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "dependencies": { + "parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "requires": { + "callsites": "^3.0.0" + } + }, + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true + } + } + }, "import-lazy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", @@ -10776,6 +12589,12 @@ "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", "dev": true }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true + }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -11153,9 +12972,9 @@ "dev": true }, "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", "dev": true }, "json-schema-traverse": { @@ -11177,9 +12996,9 @@ "dev": true }, "jsonc-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz", - "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.1.0.tgz", + "integrity": "sha512-DRf0QjnNeCUds3xTjKlQQ3DpJD51GvDjJfnxUVWg6PZTo2otSm+slzNAxU/35hF8/oJIKoG9slq30JYOsF2azg==", "dev": true }, "jsonfile": { @@ -11192,21 +13011,21 @@ } }, "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", + "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", "dev": true, "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", - "json-schema": "0.2.3", + "json-schema": "0.4.0", "verror": "1.10.0" } }, "jszip": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.0.tgz", - "integrity": "sha512-LDfVtOLtOxb9RXkYOwPyNBTQDL4eUbqahtoY6x07GiDJHwSYvn8sHHIw8wINImV3MqbMNve2gSuM1DDqEKk09Q==", + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", "dev": true, "requires": { "lie": "~3.3.0", @@ -11254,6 +13073,12 @@ "immediate": "~3.0.5" } }, + "lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true + }, "listenercount": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz", @@ -11311,12 +13136,6 @@ "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", "dev": true }, - "lodash.sortby": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", - "dev": true - }, "log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -11424,9 +13243,9 @@ "dev": true }, "marked": { - "version": "4.0.16", - "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.16.tgz", - "integrity": "sha512-wahonIQ5Jnyatt2fn8KqF/nIqZM8mh3oRu2+l5EANGMhu6RFjiSG52QNE2eWzFMI94HqYSgN184NurgNG6CztA==", + "version": "4.0.19", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.19.tgz", + "integrity": "sha512-rgQF/OxOiLcvgUAj1Q1tAf4Bgxn5h5JZTp04Fx4XUkVhs7B+7YA9JEWJhJpoO8eJt8MkZMwqLCNeNqj1bCREZQ==", "dev": true }, "medium-zoom": { @@ -12165,12 +13984,33 @@ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", "dev": true }, + "parent-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-2.0.0.tgz", + "integrity": "sha512-uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg==", + "dev": true, + "requires": { + "callsites": "^3.1.0" + } + }, "parent-require": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/parent-require/-/parent-require-1.0.0.tgz", "integrity": "sha1-dGoWdjgIOoYLDu9nMssn7UbDKXc=", "dev": true }, + "parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + } + }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -12218,6 +14058,12 @@ } } }, + "path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true + }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -12483,6 +14329,12 @@ "es6-error": "^4.0.1" } }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", + "dev": true + }, "replace-in-file": { "version": "6.3.5", "resolved": "https://registry.npmjs.org/replace-in-file/-/replace-in-file-6.3.5.tgz", @@ -12692,6 +14544,26 @@ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true }, + "resolve-global": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-global/-/resolve-global-1.0.0.tgz", + "integrity": "sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw==", + "dev": true, + "requires": { + "global-dirs": "^0.1.1" + }, + "dependencies": { + "global-dirs": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", + "integrity": "sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==", + "dev": true, + "requires": { + "ini": "^1.3.4" + } + } + } + }, "resolve-pathname": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz", @@ -12909,14 +14781,14 @@ } }, "shiki": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.10.1.tgz", - "integrity": "sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.11.1.tgz", + "integrity": "sha512-EugY9VASFuDqOexOgXR18ZV+TbFrQHeCpEYaXamO+SZlsnT/2LxuLBX25GGtIrwaEVFXUAbUQ601SWE2rMwWHA==", "dev": true, "requires": { "jsonc-parser": "^3.0.0", "vscode-oniguruma": "^1.6.1", - "vscode-textmate": "5.2.0" + "vscode-textmate": "^6.0.0" } }, "signal-exit": { @@ -13197,14 +15069,14 @@ "dev": true }, "terser": { - "version": "5.13.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.13.1.tgz", - "integrity": "sha512-hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA==", + "version": "5.14.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", + "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", "dev": true, "requires": { + "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", "commander": "^2.20.0", - "source-map": "~0.8.0-beta.0", "source-map-support": "~0.5.20" }, "dependencies": { @@ -13213,41 +15085,6 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true - }, - "source-map": { - "version": "0.8.0-beta.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz", - "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==", - "dev": true, - "requires": { - "whatwg-url": "^7.0.0" - } - }, - "tr46": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", - "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - }, - "webidl-conversions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", - "dev": true - }, - "whatwg-url": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", - "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", - "dev": true, - "requires": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.1", - "webidl-conversions": "^4.0.2" - } } } }, @@ -13436,9 +15273,9 @@ } }, "ts-node": { - "version": "10.8.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.1.tgz", - "integrity": "sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==", + "version": "10.9.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", + "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", "dev": true, "requires": { "@cspotcode/source-map-support": "^0.8.0", @@ -13465,9 +15302,9 @@ } }, "tsconfig-paths": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.0.0.tgz", - "integrity": "sha512-SLBg2GBKlR6bVtMgJJlud/o3waplKtL7skmLkExomIiaAtLGtVsoXIqP3SYdjbcH9lq/KVv7pMZeCBpLYOit6Q==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.0.tgz", + "integrity": "sha512-AHx4Euop/dXFC+Vx589alFba8QItjF+8hf8LtmuiCwHyI4rHXQtOOENaM8kvYf5fR0dRChy3wzWIZ9WbB7FWow==", "dev": true, "requires": { "json5": "^2.2.1", @@ -13475,6 +15312,68 @@ "strip-bom": "^3.0.0" } }, + "tsconfig-paths-webpack-plugin": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.0.0.tgz", + "integrity": "sha512-fw/7265mIWukrSHd0i+wSwx64kYUSAKPfxRDksjKIYTxSAp9W9/xcZVBF4Kl0eqQd5eBpAQ/oQrc5RyM/0c1GQ==", + "dev": true, + "requires": { + "chalk": "^4.1.0", + "enhanced-resolve": "^5.7.0", + "tsconfig-paths": "^4.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "tslib": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", @@ -13600,16 +15499,15 @@ } }, "typedoc": { - "version": "0.22.17", - "resolved": "http://registry.npmjs.org/typedoc/-/typedoc-0.22.17.tgz", - "integrity": "sha512-h6+uXHVVCPDaANzjwzdsj9aePBjZiBTpiMpBBeyh1zcN2odVsDCNajz8zyKnixF93HJeGpl34j/70yoEE5BfNg==", + "version": "0.23.14", + "resolved": "http://registry.npmjs.org/typedoc/-/typedoc-0.23.14.tgz", + "integrity": "sha512-s2I+ZKBET38EctZvbXp2GooHrNaKjWZkrwGEK/sttnOGiKJqU0vHrsdcwLgKZGuo2aedNL3RRPj1LnAAeYscig==", "dev": true, "requires": { - "glob": "^8.0.3", "lunr": "^2.3.9", - "marked": "^4.0.16", + "marked": "^4.0.19", "minimatch": "^5.1.0", - "shiki": "^0.10.1" + "shiki": "^0.11.1" }, "dependencies": { "brace-expansion": { @@ -13682,12 +15580,6 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz", "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=", "dev": true - }, - "graceful-fs": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", - "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==", - "dev": true } } }, @@ -13816,6 +15708,12 @@ "extsprintf": "^1.2.0" } }, + "vscode-languageserver-textdocument": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz", + "integrity": "sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg==", + "dev": true + }, "vscode-oniguruma": { "version": "1.6.2", "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.6.2.tgz", @@ -13823,15 +15721,21 @@ "dev": true }, "vscode-textmate": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-5.2.0.tgz", - "integrity": "sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-6.0.0.tgz", + "integrity": "sha512-gu73tuZfJgu+mvCSy4UZwd2JXykjK9zAZsfmDeut5dx/1a7FeTk0XwJsSuqQn+cuMCGVbIBfl+s53X4T19DnzQ==", + "dev": true + }, + "vscode-uri": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz", + "integrity": "sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==", "dev": true }, "watchpack": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", - "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", + "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", "dev": true, "requires": { "glob-to-regexp": "^0.4.1", @@ -13845,9 +15749,9 @@ "dev": true }, "webpack": { - "version": "5.73.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz", - "integrity": "sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==", + "version": "5.74.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz", + "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==", "dev": true, "requires": { "@types/eslint-scope": "^3.7.3", @@ -13855,11 +15759,11 @@ "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/wasm-edit": "1.11.1", "@webassemblyjs/wasm-parser": "1.11.1", - "acorn": "^8.4.1", + "acorn": "^8.7.1", "acorn-import-assertions": "^1.7.6", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.9.3", + "enhanced-resolve": "^5.10.0", "es-module-lexer": "^0.9.0", "eslint-scope": "5.1.1", "events": "^3.2.0", @@ -13872,26 +15776,8 @@ "schema-utils": "^3.1.0", "tapable": "^2.1.1", "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.3.1", + "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" - }, - "dependencies": { - "enhanced-resolve": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz", - "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - } - }, - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - } } }, "webpack-cli": { @@ -14187,6 +16073,12 @@ "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", "dev": true }, + "yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "dev": true + }, "yargonaut": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.4.tgz", diff --git a/package.json b/package.json index b321778a4f..e650103743 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "docx", - "version": "7.3.0", + "version": "7.4.1", "description": "Easily generate .docx files with JS/TS with a nice declarative API. Works for Node and on the Browser.", "main": "build/index.js", "scripts": { @@ -14,8 +14,9 @@ "webpack": "rimraf ./build && webpack --config ./webpack.config.ts", "demo": "npm run build && npm run ts-node --skip-project ./demo", "typedoc": "rimraf ./build && typedoc src/index.ts --tsconfig tsconfig.typedoc.json", - "style": "prettier -l \"src/**/*.ts\"", + "style": "prettier -l \"{src,scripts,demo}/**/*.{ts,html}\"", "style.fix": "npm run style -- --write", + "cspell": "cspell \"{src,demo,docs,scripts}/**/*.{ts,scss,html,md}\" && cspell \"./*.*\"", "fix-types": "ts-node --skip-project scripts/types-absolute-fixer.ts", "e2e": "ts-node scripts/e2e.ts", "serve.docs": "cd docs && docsify serve", @@ -63,7 +64,7 @@ "homepage": "https://github.com/dolanmiu/docx#readme", "devDependencies": { "@types/chai": "^4.2.15", - "@types/glob": "^7.1.4", + "@types/glob": "^8.0.0", "@types/mocha": "^9.0.0", "@types/prompt": "^1.1.1", "@types/request-promise": "^4.1.42", @@ -73,6 +74,7 @@ "@types/webpack": "^5.0.0", "buffer": "^6.0.3", "chai": "^3.5.0", + "cspell": "^6.2.2", "docsify-cli": "^4.3.0", "glob": "^8.0.1", "jszip": "^3.1.5", @@ -92,9 +94,10 @@ "ts-loader": "^9.0.0", "ts-node": "^10.2.1", "tsconfig-paths": "^4.0.0", + "tsconfig-paths-webpack-plugin": "^4.0.0", "tslint": "^6.1.3", "tslint-immutable": "^6.0.1", - "typedoc": "^0.22.3", + "typedoc": "^0.23.2", "typescript": "4.7.4", "unzipper": "^0.10.11", "webpack": "^5.28.0", diff --git a/scripts/types-absolute-fixer.ts b/scripts/types-absolute-fixer.ts index 6eea3c600e..43a338f20d 100644 --- a/scripts/types-absolute-fixer.ts +++ b/scripts/types-absolute-fixer.ts @@ -6,9 +6,9 @@ const files = glob.sync("build/**/*.d.ts"); for (const file of files) { replaceInFile({ files: file, - from: /"file[a-z/-]*"/gi, + from: /"@[a-z/-]*"/gi, to: (match) => { - const matchSlug = match.replace(/['"]+/g, "").trim(); + const matchSlug = match.replace(/['"]+/g, "").replace(/[@]+/g, "").trim(); const levelCount = file.split("/").length - 2; const backLevels = Array(levelCount).fill("../").join(""); diff --git a/src/export/formatter.spec.ts b/src/export/formatter.spec.ts index 463ec38c7f..fed4319697 100644 --- a/src/export/formatter.spec.ts +++ b/src/export/formatter.spec.ts @@ -2,9 +2,9 @@ import { assert, expect } from "chai"; import * as sinon from "sinon"; import { Formatter } from "@export/formatter"; -import { Paragraph, TextRun } from "file"; -import { CoreProperties } from "file/core-properties"; -import { Attributes } from "file/xml-components"; +import { CoreProperties } from "@file/core-properties"; +import { Paragraph, TextRun } from "@file/paragraph"; +import { Attributes } from "@file/xml-components"; describe("Formatter", () => { let formatter: Formatter; diff --git a/src/export/formatter.ts b/src/export/formatter.ts index cf71dc9ba1..60a372cdd5 100644 --- a/src/export/formatter.ts +++ b/src/export/formatter.ts @@ -1,4 +1,4 @@ -import { BaseXmlComponent, IContext, IXmlableObject } from "file/xml-components"; +import { BaseXmlComponent, IContext, IXmlableObject } from "@file/xml-components"; export class Formatter { // tslint:disable-next-line: no-object-literal-type-assertion diff --git a/src/export/packer/image-replacer.spec.ts b/src/export/packer/image-replacer.spec.ts index 63cbe9bf9d..db7571cffa 100644 --- a/src/export/packer/image-replacer.spec.ts +++ b/src/export/packer/image-replacer.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Media } from "file"; +import { Media } from "@file/media"; import { ImageReplacer } from "./image-replacer"; diff --git a/src/export/packer/image-replacer.ts b/src/export/packer/image-replacer.ts index 0d2e2854f8..3dce0de58d 100644 --- a/src/export/packer/image-replacer.ts +++ b/src/export/packer/image-replacer.ts @@ -1,4 +1,4 @@ -import { IMediaData, Media } from "file/media"; +import { IMediaData, Media } from "@file/media"; export class ImageReplacer { public replace(xmlData: string, mediaData: IMediaData[], offset: number): string { diff --git a/src/export/packer/next-compiler.spec.ts b/src/export/packer/next-compiler.spec.ts index 727c617007..3cd56c211f 100644 --- a/src/export/packer/next-compiler.spec.ts +++ b/src/export/packer/next-compiler.spec.ts @@ -2,7 +2,10 @@ import { expect } from "chai"; import * as sinon from "sinon"; -import { File, Footer, Header, Paragraph } from "file"; +import { File } from "@file/file"; +import { Footer, Header } from "@file/header"; +import { ImageRun, Paragraph } from "@file/paragraph"; +import * as convenienceFunctions from "@util/convenience-functions"; import { Compiler } from "./next-compiler"; @@ -13,6 +16,14 @@ describe("Compiler", () => { compiler = new Compiler(); }); + before(() => { + sinon.stub(convenienceFunctions, "uniqueId").callsFake(() => "test"); + }); + + after(() => { + (convenienceFunctions.uniqueId as sinon.SinonStub).restore(); + }); + describe("#compile()", () => { it("should pack all the content", async function () { this.timeout(99999999); @@ -109,18 +120,38 @@ describe("Compiler", () => { const spy = sinon.spy(compiler["formatter"], "format"); compiler.compile(file); - expect(spy.callCount).to.equal(12); + expect(spy.callCount).to.equal(13); }); it("should work with media datas", () => { // This test is required because before, there was a case where Document was formatted twice, which was inefficient // This also caused issues such as running prepForXml multiple times as format() was ran multiple times. - const paragraph = new Paragraph(""); const file = new File({ sections: [ { - properties: {}, - children: [paragraph], + headers: { + default: new Header({ + children: [new Paragraph("test")], + }), + }, + footers: { + default: new Footer({ + children: [new Paragraph("test")], + }), + }, + children: [ + new Paragraph({ + children: [ + new ImageRun({ + data: Buffer.from("", "base64"), + transformation: { + width: 100, + height: 100, + }, + }), + ], + }), + ], }, ], }); diff --git a/src/export/packer/next-compiler.ts b/src/export/packer/next-compiler.ts index 90d08a2232..3179af9a2e 100644 --- a/src/export/packer/next-compiler.ts +++ b/src/export/packer/next-compiler.ts @@ -1,11 +1,12 @@ import * as JSZip from "jszip"; import * as xml from "xml"; -import { File } from "file"; +import { File } from "@file/file"; + import { Formatter } from "../formatter"; import { ImageReplacer } from "./image-replacer"; import { NumberingReplacer } from "./numbering-replacer"; -import { PrettityType } from "./packer"; +import { PrettifyType } from "./packer"; interface IXmlifyedFile { readonly data: string; @@ -43,7 +44,7 @@ export class Compiler { this.numberingReplacer = new NumberingReplacer(); } - public compile(file: File, prettifyXml?: boolean | PrettityType): JSZip { + public compile(file: File, prettifyXml?: boolean | PrettifyType): JSZip { const zip = new JSZip(); const xmlifiedFileMapping = this.xmlifyFile(file, prettifyXml); const map = new Map(Object.entries(xmlifiedFileMapping)); @@ -66,7 +67,7 @@ export class Compiler { return zip; } - private xmlifyFile(file: File, prettify?: boolean | PrettityType): IXmlifyedFileMapping { + private xmlifyFile(file: File, prettify?: boolean | PrettifyType): IXmlifyedFileMapping { const documentRelationshipCount = file.Document.Relationships.RelationshipCount + 1; const documentXmlData = xml( @@ -405,26 +406,19 @@ export class Compiler { path: "word/settings.xml", }, Comments: { - data: (() => { - if (!file.Comments) { - return; - } - - const data = xml( - this.formatter.format(file.Comments, { - viewWrapper: file.Document, - file, - }), - { - indent: prettify, - declaration: { - standalone: "yes", - encoding: "UTF-8", - }, + data: xml( + this.formatter.format(file.Comments, { + viewWrapper: file.Document, + file, + }), + { + indent: prettify, + declaration: { + standalone: "yes", + encoding: "UTF-8", }, - ); - return data; - })(), + }, + ), path: "word/comments.xml", }, }; diff --git a/src/export/packer/numbering-replacer.ts b/src/export/packer/numbering-replacer.ts index eeecad929f..d0416340b1 100644 --- a/src/export/packer/numbering-replacer.ts +++ b/src/export/packer/numbering-replacer.ts @@ -1,4 +1,4 @@ -import { ConcreteNumbering } from "file"; +import { ConcreteNumbering } from "@file/numbering"; export class NumberingReplacer { public replace(xmlData: string, concreteNumberings: ConcreteNumbering[]): string { diff --git a/src/export/packer/packer.spec.ts b/src/export/packer/packer.spec.ts index a0e9f10326..f0ed3d8b94 100644 --- a/src/export/packer/packer.spec.ts +++ b/src/export/packer/packer.spec.ts @@ -2,7 +2,8 @@ import { assert } from "chai"; import { mock, stub } from "sinon"; -import { File, HeadingLevel, Paragraph } from "file"; +import { File } from "@file/file"; +import { HeadingLevel, Paragraph } from "@file/paragraph"; import { Packer } from "./packer"; @@ -36,6 +37,14 @@ describe("Packer", () => { }); }); + describe("#toString()", () => { + it("should return a non-empty string", async () => { + const result = await Packer.toString(file); + + assert.isAbove(result.length, 0); + }); + }); + describe("#toBuffer()", () => { it("should create a standard docx file", async function () { this.timeout(99999999); @@ -113,4 +122,52 @@ describe("Packer", () => { (Packer as any).compiler.compile.restore(); }); }); + + describe("#toStream()", () => { + it("should create a standard docx file", async () => { + // tslint:disable-next-line: no-any + stub((Packer as any).compiler, "compile").callsFake(() => ({ + // tslint:disable-next-line: no-empty + generateNodeStream: () => ({ + on: (event: string, cb: () => void) => { + if (event === "end") { + cb(); + } + }, + }), + })); + const stream = await Packer.toStream(file); + return new Promise((resolve, reject) => { + stream.on("error", () => { + reject(); + }); + + stream.on("end", () => { + resolve(); + }); + }); + }); + + it("should handle exception if it throws any", async () => { + // tslint:disable-next-line:no-any + const compiler = stub((Packer as any).compiler, "compile").callsFake(() => ({ + // tslint:disable-next-line: no-empty + on: (event: string, cb: () => void) => { + if (event === "error") { + cb(); + } + }, + })); + + compiler.throwsException(); + return Packer.toStream(file).catch((error) => { + assert.isDefined(error); + }); + }); + + afterEach(() => { + // tslint:disable-next-line:no-any + (Packer as any).compiler.compile.restore(); + }); + }); }); diff --git a/src/export/packer/packer.ts b/src/export/packer/packer.ts index b32cd0aa8d..5d233ec0ef 100644 --- a/src/export/packer/packer.ts +++ b/src/export/packer/packer.ts @@ -1,10 +1,12 @@ -import { File } from "file"; +import { File } from "@file/file"; +import { Stream } from "stream"; + import { Compiler } from "./next-compiler"; /** * Use blanks to prettify */ -export enum PrettityType { +export enum PrettifyType { NONE = "", WITH_2_BLANKS = " ", WITH_4_BLANKS = " ", @@ -12,7 +14,18 @@ export enum PrettityType { } export class Packer { - public static async toBuffer(file: File, prettify?: boolean | PrettityType): Promise { + public static async toString(file: File, prettify?: boolean | PrettifyType): Promise { + const zip = this.compiler.compile(file, prettify); + const zipData = await zip.generateAsync({ + type: "string", + mimeType: "application/vnd.openxmlformats-officedocument.wordprocessingml.document", + compression: "DEFLATE", + }); + + return zipData; + } + + public static async toBuffer(file: File, prettify?: boolean | PrettifyType): Promise { const zip = this.compiler.compile(file, prettify); const zipData = await zip.generateAsync({ type: "nodebuffer", @@ -23,7 +36,7 @@ export class Packer { return zipData; } - public static async toBase64String(file: File, prettify?: boolean | PrettityType): Promise { + public static async toBase64String(file: File, prettify?: boolean | PrettifyType): Promise { const zip = this.compiler.compile(file, prettify); const zipData = await zip.generateAsync({ type: "base64", @@ -34,7 +47,7 @@ export class Packer { return zipData; } - public static async toBlob(file: File, prettify?: boolean | PrettityType): Promise { + public static async toBlob(file: File, prettify?: boolean | PrettifyType): Promise { const zip = this.compiler.compile(file, prettify); const zipData = await zip.generateAsync({ type: "blob", @@ -45,5 +58,17 @@ export class Packer { return zipData; } + public static async toStream(file: File, prettify?: boolean | PrettifyType): Promise { + const zip = this.compiler.compile(file, prettify); + const zipData = zip.generateNodeStream({ + type: "nodebuffer", + streamFiles: true, + mimeType: "application/vnd.openxmlformats-officedocument.wordprocessingml.document", + compression: "DEFLATE", + }); + + return zipData; + } + private static readonly compiler = new Compiler(); } diff --git a/src/file/app-properties/app-properties-attributes.ts b/src/file/app-properties/app-properties-attributes.ts index dfd26d6fcb..fcfd5aacae 100644 --- a/src/file/app-properties/app-properties-attributes.ts +++ b/src/file/app-properties/app-properties-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class AppPropertiesAttributes extends XmlAttributeComponent<{ readonly xmlns: string; diff --git a/src/file/app-properties/app-properties.ts b/src/file/app-properties/app-properties.ts index 62e22c0a62..77f60ef67b 100644 --- a/src/file/app-properties/app-properties.ts +++ b/src/file/app-properties/app-properties.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { AppPropertiesAttributes } from "./app-properties-attributes"; export class AppProperties extends XmlComponent { diff --git a/src/file/border/border.spec.ts b/src/file/border/border.spec.ts index e652c50422..b51ff6a434 100644 --- a/src/file/border/border.spec.ts +++ b/src/file/border/border.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { BorderStyle } from "file/border"; +import { Formatter } from "@export/formatter"; +import { BorderStyle } from "@file/border"; import { BorderElement } from "./border"; diff --git a/src/file/border/border.ts b/src/file/border/border.ts index 04e487ff61..fe5cc604ab 100644 --- a/src/file/border/border.ts +++ b/src/file/border/border.ts @@ -19,8 +19,8 @@ // // // -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; -import { eighthPointMeasureValue, hexColorValue, pointMeasureValue } from "../values"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { eighthPointMeasureValue, hexColorValue, pointMeasureValue } from "@util/values"; export interface IBorderOptions { readonly style: BorderStyle; diff --git a/src/file/content-types/content-types-attributes.ts b/src/file/content-types/content-types-attributes.ts index 0338cfc1b7..4b5eb4a4f9 100644 --- a/src/file/content-types/content-types-attributes.ts +++ b/src/file/content-types/content-types-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class ContentTypeAttributes extends XmlAttributeComponent<{ readonly xmlns?: string; diff --git a/src/file/content-types/content-types.spec.ts b/src/file/content-types/content-types.spec.ts index 93fca7c8e1..c66095fb80 100644 --- a/src/file/content-types/content-types.spec.ts +++ b/src/file/content-types/content-types.spec.ts @@ -2,7 +2,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { ContentTypes } from "./content-types"; diff --git a/src/file/content-types/content-types.ts b/src/file/content-types/content-types.ts index d2331c2cbd..4437680d9a 100644 --- a/src/file/content-types/content-types.ts +++ b/src/file/content-types/content-types.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { ContentTypeAttributes } from "./content-types-attributes"; import { Default } from "./default/default"; import { Override } from "./override/override"; diff --git a/src/file/content-types/default/default-attributes.ts b/src/file/content-types/default/default-attributes.ts index dd9872f3f9..66cc118b6d 100644 --- a/src/file/content-types/default/default-attributes.ts +++ b/src/file/content-types/default/default-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class DefaultAttributes extends XmlAttributeComponent<{ readonly contentType: string; diff --git a/src/file/content-types/default/default.ts b/src/file/content-types/default/default.ts index fc72f15255..673e3b0247 100644 --- a/src/file/content-types/default/default.ts +++ b/src/file/content-types/default/default.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { DefaultAttributes } from "./default-attributes"; export class Default extends XmlComponent { diff --git a/src/file/content-types/override/override-attributes.ts b/src/file/content-types/override/override-attributes.ts index 9f5e5eca34..974ef09e4d 100644 --- a/src/file/content-types/override/override-attributes.ts +++ b/src/file/content-types/override/override-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class OverrideAttributes extends XmlAttributeComponent<{ readonly contentType: string; diff --git a/src/file/content-types/override/override.ts b/src/file/content-types/override/override.ts index 8c0ba6d919..268a849c21 100644 --- a/src/file/content-types/override/override.ts +++ b/src/file/content-types/override/override.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { OverrideAttributes } from "./override-attributes"; export class Override extends XmlComponent { diff --git a/src/file/core-properties/properties.spec.ts b/src/file/core-properties/properties.spec.ts index 7947d98e92..5bcc83c2f6 100644 --- a/src/file/core-properties/properties.spec.ts +++ b/src/file/core-properties/properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { CoreProperties } from "./properties"; diff --git a/src/file/core-properties/properties.ts b/src/file/core-properties/properties.ts index 44a6878272..c193236008 100644 --- a/src/file/core-properties/properties.ts +++ b/src/file/core-properties/properties.ts @@ -1,5 +1,6 @@ -import { ICommentsOptions } from "file/paragraph/run/comment-run"; -import { StringContainer, XmlComponent } from "file/xml-components"; +import { ICommentsOptions } from "@file/paragraph/run/comment-run"; +import { StringContainer, XmlComponent } from "@file/xml-components"; +import { dateTimeValue } from "@util/values"; import { ICustomPropertyOptions } from "../custom-properties"; import { IDocumentBackgroundOptions } from "../document"; @@ -9,7 +10,6 @@ import { ISectionOptions } from "../file"; import { INumberingOptions } from "../numbering"; import { Paragraph } from "../paragraph"; import { IStylesOptions } from "../styles"; -import { dateTimeValue } from "../values"; export interface IPropertiesOptions { readonly sections: ISectionOptions[]; @@ -41,6 +41,7 @@ export interface IPropertiesOptions { // +/* cSpell:disable */ // // // @@ -60,6 +61,7 @@ export interface IPropertiesOptions { // // // +/* cSpell:enable */ export class CoreProperties extends XmlComponent { constructor(options: Omit) { diff --git a/src/file/custom-properties/custom-properties-attributes.ts b/src/file/custom-properties/custom-properties-attributes.ts index 2b91ce0ac0..fdae344710 100644 --- a/src/file/custom-properties/custom-properties-attributes.ts +++ b/src/file/custom-properties/custom-properties-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class CustomPropertiesAttributes extends XmlAttributeComponent<{ readonly xmlns: string; diff --git a/src/file/custom-properties/custom-properties.spec.ts b/src/file/custom-properties/custom-properties.spec.ts index a8bc92b7e4..4c4efe3392 100644 --- a/src/file/custom-properties/custom-properties.spec.ts +++ b/src/file/custom-properties/custom-properties.spec.ts @@ -1,5 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; + +import { Formatter } from "@export/formatter"; + import { CustomProperties } from "./custom-properties"; describe("CustomProperties", () => { diff --git a/src/file/custom-properties/custom-properties.ts b/src/file/custom-properties/custom-properties.ts index 2ddd01919b..47d2abf11c 100644 --- a/src/file/custom-properties/custom-properties.ts +++ b/src/file/custom-properties/custom-properties.ts @@ -1,4 +1,4 @@ -import { IContext, IXmlableObject, XmlComponent } from "file/xml-components"; +import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components"; import { CustomPropertiesAttributes } from "./custom-properties-attributes"; import { CustomProperty, ICustomPropertyOptions } from "./custom-property"; diff --git a/src/file/custom-properties/custom-property-attributes.ts b/src/file/custom-properties/custom-property-attributes.ts index e681eee135..7f2c873c6c 100644 --- a/src/file/custom-properties/custom-property-attributes.ts +++ b/src/file/custom-properties/custom-property-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class CustomPropertyAttributes extends XmlAttributeComponent<{ readonly fmtid: string; diff --git a/src/file/custom-properties/custom-property.ts b/src/file/custom-properties/custom-property.ts index fc18db2667..704d4c697d 100644 --- a/src/file/custom-properties/custom-property.ts +++ b/src/file/custom-properties/custom-property.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { CustomPropertyAttributes } from "./custom-property-attributes"; export interface ICustomPropertyOptions { diff --git a/src/file/document/body/body.spec.ts b/src/file/document/body/body.spec.ts index a65f86b69e..c39acbb10b 100644 --- a/src/file/document/body/body.spec.ts +++ b/src/file/document/body/body.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Body } from "./body"; import { sectionMarginDefaults } from "./section-properties"; diff --git a/src/file/document/body/body.ts b/src/file/document/body/body.ts index deb2e573cf..8e8e84f290 100644 --- a/src/file/document/body/body.ts +++ b/src/file/document/body/body.ts @@ -1,6 +1,6 @@ -import { IContext, IXmlableObject, XmlComponent } from "file/xml-components"; +import { Paragraph, ParagraphProperties } from "@file/paragraph"; +import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components"; -import { Paragraph, ParagraphProperties } from "../.."; import { ISectionPropertiesOptions, SectionProperties } from "./section-properties/section-properties"; export class Body extends XmlComponent { diff --git a/src/file/document/body/section-properties/properties/column.ts b/src/file/document/body/section-properties/properties/column.ts index d1f48a7aa5..7ffaef6bdc 100644 --- a/src/file/document/body/section-properties/properties/column.ts +++ b/src/file/document/body/section-properties/properties/column.ts @@ -1,5 +1,5 @@ -import { twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { twipsMeasureValue } from "@util/values"; export interface IColumnAttributes { readonly width: number | string; diff --git a/src/file/document/body/section-properties/properties/columns.spec.ts b/src/file/document/body/section-properties/properties/columns.spec.ts index 596b30bdb1..c301d4efeb 100644 --- a/src/file/document/body/section-properties/properties/columns.spec.ts +++ b/src/file/document/body/section-properties/properties/columns.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Column, Columns } from "."; diff --git a/src/file/document/body/section-properties/properties/columns.ts b/src/file/document/body/section-properties/properties/columns.ts index e418b0ff1f..789e0f103e 100644 --- a/src/file/document/body/section-properties/properties/columns.ts +++ b/src/file/document/body/section-properties/properties/columns.ts @@ -1,5 +1,6 @@ -import { decimalNumber, twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber, twipsMeasureValue } from "@util/values"; + import { Column } from "./column"; // diff --git a/src/file/document/body/section-properties/properties/doc-grid.spec.ts b/src/file/document/body/section-properties/properties/doc-grid.spec.ts index d4cd235011..6ffae75860 100644 --- a/src/file/document/body/section-properties/properties/doc-grid.spec.ts +++ b/src/file/document/body/section-properties/properties/doc-grid.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { DocumentGrid, DocumentGridType } from "."; diff --git a/src/file/document/body/section-properties/properties/doc-grid.ts b/src/file/document/body/section-properties/properties/doc-grid.ts index 1b3a8bfb38..5a9d3a26ed 100644 --- a/src/file/document/body/section-properties/properties/doc-grid.ts +++ b/src/file/document/body/section-properties/properties/doc-grid.ts @@ -1,5 +1,5 @@ -import { decimalNumber } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber } from "@util/values"; // not implemented // diff --git a/src/file/document/body/section-properties/properties/header-footer-reference.spec.ts b/src/file/document/body/section-properties/properties/header-footer-reference.spec.ts index adb0bc70b6..0a7ab4bebe 100644 --- a/src/file/document/body/section-properties/properties/header-footer-reference.spec.ts +++ b/src/file/document/body/section-properties/properties/header-footer-reference.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { HeaderFooterReference, HeaderFooterReferenceType, HeaderFooterType } from "./header-footer-reference"; describe("HeaderFooterReference", () => { diff --git a/src/file/document/body/section-properties/properties/header-footer-reference.ts b/src/file/document/body/section-properties/properties/header-footer-reference.ts index 1966790da9..8cd6753f1a 100644 --- a/src/file/document/body/section-properties/properties/header-footer-reference.ts +++ b/src/file/document/body/section-properties/properties/header-footer-reference.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; // // diff --git a/src/file/document/body/section-properties/properties/line-number.ts b/src/file/document/body/section-properties/properties/line-number.ts index 0ab1218568..6d494bd552 100644 --- a/src/file/document/body/section-properties/properties/line-number.ts +++ b/src/file/document/body/section-properties/properties/line-number.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPsectionLineNumbering.php -import { decimalNumber, twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber, twipsMeasureValue } from "@util/values"; // // diff --git a/src/file/document/body/section-properties/properties/page-borders.spec.ts b/src/file/document/body/section-properties/properties/page-borders.spec.ts index 977bcbd1b7..db1a4b1775 100644 --- a/src/file/document/body/section-properties/properties/page-borders.spec.ts +++ b/src/file/document/body/section-properties/properties/page-borders.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { BorderStyle } from "file/border"; +import { Formatter } from "@export/formatter"; +import { BorderStyle } from "@file/border"; import { PageBorderDisplay, PageBorders, PageBorderZOrder } from "./page-borders"; diff --git a/src/file/document/body/section-properties/properties/page-borders.ts b/src/file/document/body/section-properties/properties/page-borders.ts index d3a8ecbb61..c9b97983a6 100644 --- a/src/file/document/body/section-properties/properties/page-borders.ts +++ b/src/file/document/body/section-properties/properties/page-borders.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPsectionBorders.php -import { BorderElement, IBorderOptions } from "file/border"; -import { IgnoreIfEmptyXmlComponent, XmlAttributeComponent } from "file/xml-components"; +import { BorderElement, IBorderOptions } from "@file/border"; +import { IgnoreIfEmptyXmlComponent, XmlAttributeComponent } from "@file/xml-components"; // // diff --git a/src/file/document/body/section-properties/properties/page-margin.ts b/src/file/document/body/section-properties/properties/page-margin.ts index 91df7db51a..a6e40fe80d 100644 --- a/src/file/document/body/section-properties/properties/page-margin.ts +++ b/src/file/document/body/section-properties/properties/page-margin.ts @@ -1,5 +1,5 @@ -import { signedTwipsMeasureValue, twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { signedTwipsMeasureValue, twipsMeasureValue } from "@util/values"; // // diff --git a/src/file/document/body/section-properties/properties/page-number.ts b/src/file/document/body/section-properties/properties/page-number.ts index 0bca61ebba..9788c62efd 100644 --- a/src/file/document/body/section-properties/properties/page-number.ts +++ b/src/file/document/body/section-properties/properties/page-number.ts @@ -1,7 +1,7 @@ // http://officeopenxml.com/WPSectionPgNumType.php -import { NumberFormat } from "file/shared/number-format"; -import { decimalNumber } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { NumberFormat } from "@file/shared/number-format"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber } from "@util/values"; // // diff --git a/src/file/document/body/section-properties/properties/page-size.spec.ts b/src/file/document/body/section-properties/properties/page-size.spec.ts index aa7ca8ae1d..69285e6262 100644 --- a/src/file/document/body/section-properties/properties/page-size.spec.ts +++ b/src/file/document/body/section-properties/properties/page-size.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { PageOrientation, PageSize } from "./page-size"; diff --git a/src/file/document/body/section-properties/properties/page-size.ts b/src/file/document/body/section-properties/properties/page-size.ts index ff99c52201..88d6f70527 100644 --- a/src/file/document/body/section-properties/properties/page-size.ts +++ b/src/file/document/body/section-properties/properties/page-size.ts @@ -1,5 +1,5 @@ -import { twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { twipsMeasureValue } from "@util/values"; // // diff --git a/src/file/document/body/section-properties/properties/page-text-direction.spec.ts b/src/file/document/body/section-properties/properties/page-text-direction.spec.ts index b8c9fa6f68..7e77840f54 100644 --- a/src/file/document/body/section-properties/properties/page-text-direction.spec.ts +++ b/src/file/document/body/section-properties/properties/page-text-direction.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { PageTextDirection, PageTextDirectionType } from "./page-text-direction"; describe("PageTextDirection", () => { diff --git a/src/file/document/body/section-properties/properties/page-text-direction.ts b/src/file/document/body/section-properties/properties/page-text-direction.ts index 0136f18428..600b738916 100644 --- a/src/file/document/body/section-properties/properties/page-text-direction.ts +++ b/src/file/document/body/section-properties/properties/page-text-direction.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; export enum PageTextDirectionType { LEFT_TO_RIGHT_TOP_TO_BOTTOM = "lrTb", diff --git a/src/file/document/body/section-properties/properties/section-type.spec.ts b/src/file/document/body/section-properties/properties/section-type.spec.ts index bbf08799f3..0dd8622a5d 100644 --- a/src/file/document/body/section-properties/properties/section-type.spec.ts +++ b/src/file/document/body/section-properties/properties/section-type.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { SectionType, Type } from "./section-type"; describe("Type", () => { diff --git a/src/file/document/body/section-properties/properties/section-type.ts b/src/file/document/body/section-properties/properties/section-type.ts index e09d3c6508..a9d6509a5d 100644 --- a/src/file/document/body/section-properties/properties/section-type.ts +++ b/src/file/document/body/section-properties/properties/section-type.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPsection.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; // // diff --git a/src/file/document/body/section-properties/section-properties.spec.ts b/src/file/document/body/section-properties/section-properties.spec.ts index c0ab27f7e7..f3a357bc04 100644 --- a/src/file/document/body/section-properties/section-properties.spec.ts +++ b/src/file/document/body/section-properties/section-properties.spec.ts @@ -1,12 +1,12 @@ import { expect } from "chai"; -import { convertInchesToTwip } from "convenience-functions"; -import { Formatter } from "export/formatter"; -import { FooterWrapper } from "file/footer-wrapper"; -import { HeaderWrapper } from "file/header-wrapper"; -import { Media } from "file/media"; -import { NumberFormat } from "file/shared/number-format"; -import { VerticalAlign } from "file/vertical-align"; +import { Formatter } from "@export/formatter"; +import { FooterWrapper } from "@file/footer-wrapper"; +import { HeaderWrapper } from "@file/header-wrapper"; +import { Media } from "@file/media"; +import { NumberFormat } from "@file/shared/number-format"; +import { VerticalAlign } from "@file/vertical-align"; +import { convertInchesToTwip } from "@util/convenience-functions"; import { PageOrientation } from "./properties"; import { DocumentGridType } from "./properties/doc-grid"; diff --git a/src/file/document/body/section-properties/section-properties.ts b/src/file/document/body/section-properties/section-properties.ts index 60eaa66313..90a59bd555 100644 --- a/src/file/document/body/section-properties/section-properties.ts +++ b/src/file/document/body/section-properties/section-properties.ts @@ -1,10 +1,10 @@ // http://officeopenxml.com/WPsection.php // tslint:disable: no-unnecessary-initializer -import { FooterWrapper } from "file/footer-wrapper"; -import { HeaderWrapper } from "file/header-wrapper"; -import { VerticalAlign, VerticalAlignElement } from "file/vertical-align"; -import { OnOffElement, XmlComponent } from "file/xml-components"; +import { FooterWrapper } from "@file/footer-wrapper"; +import { HeaderWrapper } from "@file/header-wrapper"; +import { VerticalAlign, VerticalAlignElement } from "@file/vertical-align"; +import { OnOffElement, XmlComponent } from "@file/xml-components"; import { HeaderFooterReference, HeaderFooterReferenceType, HeaderFooterType } from "./properties/header-footer-reference"; diff --git a/src/file/document/document-attributes.ts b/src/file/document/document-attributes.ts index dc759faea0..e919fa3de5 100644 --- a/src/file/document/document-attributes.ts +++ b/src/file/document/document-attributes.ts @@ -1,5 +1,6 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; +/* cSpell:disable */ export interface IDocumentAttributesProperties { readonly wpc?: string; readonly mc?: string; @@ -41,6 +42,7 @@ export interface IDocumentAttributesProperties { readonly w16sdtdh?: string; readonly w16se?: string; } +/* cSpell:enable */ export class DocumentAttributes extends XmlAttributeComponent { protected readonly xmlKeys = { diff --git a/src/file/document/document-background/document-background.spec.ts b/src/file/document/document-background/document-background.spec.ts index 30b93ea96d..1cb08b1efb 100644 --- a/src/file/document/document-background/document-background.spec.ts +++ b/src/file/document/document-background/document-background.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { DocumentBackground } from "./document-background"; diff --git a/src/file/document/document-background/document-background.ts b/src/file/document/document-background/document-background.ts index 578cc7f137..b795f036c2 100644 --- a/src/file/document/document-background/document-background.ts +++ b/src/file/document/document-background/document-background.ts @@ -1,7 +1,7 @@ // http://officeopenxml.com/WPdocument.php // http://www.datypic.com/sc/ooxml/e-w_background-1.html -import { hexColorValue, uCharHexNumber } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { hexColorValue, uCharHexNumber } from "@util/values"; // // diff --git a/src/file/document/document.spec.ts b/src/file/document/document.spec.ts index 6cea17d009..a0beae6cb6 100644 --- a/src/file/document/document.spec.ts +++ b/src/file/document/document.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Document } from "./document"; diff --git a/src/file/document/document.ts b/src/file/document/document.ts index 8296d50436..7d09551266 100644 --- a/src/file/document/document.ts +++ b/src/file/document/document.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPdocument.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { ConcreteHyperlink, Paragraph } from "../paragraph"; import { Table } from "../table"; import { TableOfContents } from "../table-of-contents"; diff --git a/src/file/drawing/anchor/anchor-attributes.ts b/src/file/drawing/anchor/anchor-attributes.ts index 31d6574a8e..2e4ca7a33d 100644 --- a/src/file/drawing/anchor/anchor-attributes.ts +++ b/src/file/drawing/anchor/anchor-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; import { IDistance } from "../drawing"; export interface IAnchorAttributes extends IDistance { diff --git a/src/file/drawing/anchor/anchor.ts b/src/file/drawing/anchor/anchor.ts index 5fe56d3305..7f712cc031 100644 --- a/src/file/drawing/anchor/anchor.ts +++ b/src/file/drawing/anchor/anchor.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/drwPicFloating.php -import { IMediaData, IMediaDataTransformation } from "file/media"; -import { XmlComponent } from "file/xml-components"; +import { IMediaData, IMediaDataTransformation } from "@file/media"; +import { XmlComponent } from "@file/xml-components"; import { IDrawingOptions } from "../drawing"; import { HorizontalPosition, IFloating, SimplePos, VerticalPosition } from "../floating"; import { Graphic } from "../inline/graphic"; diff --git a/src/file/drawing/doc-properties/doc-properties-attributes.ts b/src/file/drawing/doc-properties/doc-properties-attributes.ts index 69771d0472..a65aa9352b 100644 --- a/src/file/drawing/doc-properties/doc-properties-attributes.ts +++ b/src/file/drawing/doc-properties/doc-properties-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class DocPropertiesAttributes extends XmlAttributeComponent<{ readonly id?: number; diff --git a/src/file/drawing/doc-properties/doc-properties.ts b/src/file/drawing/doc-properties/doc-properties.ts index fa0f97462a..c5ea22661b 100644 --- a/src/file/drawing/doc-properties/doc-properties.ts +++ b/src/file/drawing/doc-properties/doc-properties.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { DocPropertiesAttributes } from "./doc-properties-attributes"; export class DocProperties extends XmlComponent { diff --git a/src/file/drawing/drawing.spec.ts b/src/file/drawing/drawing.spec.ts index 52c76c791f..b7b9c61acc 100644 --- a/src/file/drawing/drawing.spec.ts +++ b/src/file/drawing/drawing.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Drawing, IDrawingOptions } from "./drawing"; diff --git a/src/file/drawing/drawing.ts b/src/file/drawing/drawing.ts index df20c8f5f0..b31725adec 100644 --- a/src/file/drawing/drawing.ts +++ b/src/file/drawing/drawing.ts @@ -1,5 +1,5 @@ -import { IMediaData } from "file/media"; -import { XmlComponent } from "file/xml-components"; +import { IMediaData } from "@file/media"; +import { XmlComponent } from "@file/xml-components"; import { Anchor } from "./anchor"; import { IFloating } from "./floating"; import { Inline } from "./inline"; diff --git a/src/file/drawing/effect-extent/effect-extent-attributes.ts b/src/file/drawing/effect-extent/effect-extent-attributes.ts index 4c9986d486..be6245885e 100644 --- a/src/file/drawing/effect-extent/effect-extent-attributes.ts +++ b/src/file/drawing/effect-extent/effect-extent-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class EffectExtentAttributes extends XmlAttributeComponent<{ readonly b?: number; diff --git a/src/file/drawing/effect-extent/effect-extent.ts b/src/file/drawing/effect-extent/effect-extent.ts index b62dcc8dd0..1d1e2b370d 100644 --- a/src/file/drawing/effect-extent/effect-extent.ts +++ b/src/file/drawing/effect-extent/effect-extent.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { EffectExtentAttributes } from "./effect-extent-attributes"; export class EffectExtent extends XmlComponent { diff --git a/src/file/drawing/extent/extent-attributes.ts b/src/file/drawing/extent/extent-attributes.ts index 6f0562fab6..8dd447ffe5 100644 --- a/src/file/drawing/extent/extent-attributes.ts +++ b/src/file/drawing/extent/extent-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class ExtentAttributes extends XmlAttributeComponent<{ readonly cx?: number; diff --git a/src/file/drawing/extent/extent.ts b/src/file/drawing/extent/extent.ts index 1945fd0eae..52a43d1642 100644 --- a/src/file/drawing/extent/extent.ts +++ b/src/file/drawing/extent/extent.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { ExtentAttributes } from "./extent-attributes"; diff --git a/src/file/drawing/floating/align.spec.ts b/src/file/drawing/floating/align.spec.ts index b181725709..491708acaf 100644 --- a/src/file/drawing/floating/align.spec.ts +++ b/src/file/drawing/floating/align.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { VerticalPositionAlign } from "file/shared/alignment"; +import { Formatter } from "@export/formatter"; +import { VerticalPositionAlign } from "@file/shared/alignment"; import { Align } from "./align"; diff --git a/src/file/drawing/floating/align.ts b/src/file/drawing/floating/align.ts index 5eba22c6a9..877aaa4496 100644 --- a/src/file/drawing/floating/align.ts +++ b/src/file/drawing/floating/align.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/drwPicFloating-position.php -import { HorizontalPositionAlign, VerticalPositionAlign } from "file/shared/alignment"; -import { XmlComponent } from "file/xml-components"; +import { HorizontalPositionAlign, VerticalPositionAlign } from "@file/shared/alignment"; +import { XmlComponent } from "@file/xml-components"; export class Align extends XmlComponent { constructor(value: HorizontalPositionAlign | VerticalPositionAlign) { diff --git a/src/file/drawing/floating/floating-position.ts b/src/file/drawing/floating/floating-position.ts index 82652bbf91..e2c97b601b 100644 --- a/src/file/drawing/floating/floating-position.ts +++ b/src/file/drawing/floating/floating-position.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/drwPicFloating-position.php // http://officeopenxml.com/drwPicFloating.php -import { HorizontalPositionAlign, VerticalPositionAlign } from "file/shared/alignment"; +import { HorizontalPositionAlign, VerticalPositionAlign } from "@file/shared/alignment"; import { ITextWrapping } from "../text-wrap"; diff --git a/src/file/drawing/floating/horizontal-position.spec.ts b/src/file/drawing/floating/horizontal-position.spec.ts index 7e9a6223d4..d049d67108 100644 --- a/src/file/drawing/floating/horizontal-position.spec.ts +++ b/src/file/drawing/floating/horizontal-position.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { HorizontalPositionAlign } from "file/shared/alignment"; +import { Formatter } from "@export/formatter"; +import { HorizontalPositionAlign } from "@file/shared/alignment"; import { HorizontalPositionRelativeFrom } from "./floating-position"; import { HorizontalPosition } from "./horizontal-position"; diff --git a/src/file/drawing/floating/horizontal-position.ts b/src/file/drawing/floating/horizontal-position.ts index c083392f5f..d92edaad1f 100644 --- a/src/file/drawing/floating/horizontal-position.ts +++ b/src/file/drawing/floating/horizontal-position.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwPicFloating-position.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { Align } from "./align"; import { HorizontalPositionRelativeFrom, IHorizontalPositionOptions } from "./floating-position"; import { PositionOffset } from "./position-offset"; diff --git a/src/file/drawing/floating/position-offset.spec.ts b/src/file/drawing/floating/position-offset.spec.ts index f3fb6c35af..6a0ce0ef6c 100644 --- a/src/file/drawing/floating/position-offset.spec.ts +++ b/src/file/drawing/floating/position-offset.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { PositionOffset } from "./position-offset"; diff --git a/src/file/drawing/floating/position-offset.ts b/src/file/drawing/floating/position-offset.ts index 4d3aa96b07..bb8f74ac7b 100644 --- a/src/file/drawing/floating/position-offset.ts +++ b/src/file/drawing/floating/position-offset.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwPicFloating-position.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class PositionOffset extends XmlComponent { constructor(offsetValue: number) { diff --git a/src/file/drawing/floating/simple-pos.spec.ts b/src/file/drawing/floating/simple-pos.spec.ts index 395781a358..b4f0a2565f 100644 --- a/src/file/drawing/floating/simple-pos.spec.ts +++ b/src/file/drawing/floating/simple-pos.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { SimplePos } from "./simple-pos"; diff --git a/src/file/drawing/floating/simple-pos.ts b/src/file/drawing/floating/simple-pos.ts index 0a82e12693..335f374b84 100644 --- a/src/file/drawing/floating/simple-pos.ts +++ b/src/file/drawing/floating/simple-pos.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwPicFloating-position.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class SimplePosAttributes extends XmlAttributeComponent<{ readonly x: number; diff --git a/src/file/drawing/floating/vertical-position.spec.ts b/src/file/drawing/floating/vertical-position.spec.ts index 29c69b5bdc..2c9fca9384 100644 --- a/src/file/drawing/floating/vertical-position.spec.ts +++ b/src/file/drawing/floating/vertical-position.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { VerticalPositionAlign } from "file/shared/alignment"; +import { Formatter } from "@export/formatter"; +import { VerticalPositionAlign } from "@file/shared/alignment"; import { VerticalPositionRelativeFrom } from "./floating-position"; import { VerticalPosition } from "./vertical-position"; diff --git a/src/file/drawing/floating/vertical-position.ts b/src/file/drawing/floating/vertical-position.ts index 830306b237..26a2046d5a 100644 --- a/src/file/drawing/floating/vertical-position.ts +++ b/src/file/drawing/floating/vertical-position.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwPicFloating-position.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { Align } from "./align"; import { IVerticalPositionOptions, VerticalPositionRelativeFrom } from "./floating-position"; import { PositionOffset } from "./position-offset"; diff --git a/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-lock-attributes.ts b/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-lock-attributes.ts index ec57ceb4ae..96024b7682 100644 --- a/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-lock-attributes.ts +++ b/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-lock-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class GraphicFrameLockAttributes extends XmlAttributeComponent<{ readonly xmlns?: string; diff --git a/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-locks.ts b/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-locks.ts index 42e38435b1..9f37290a36 100644 --- a/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-locks.ts +++ b/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-locks.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { GraphicFrameLockAttributes } from "./graphic-frame-lock-attributes"; export class GraphicFrameLocks extends XmlComponent { diff --git a/src/file/drawing/graphic-frame/graphic-frame-properties.ts b/src/file/drawing/graphic-frame/graphic-frame-properties.ts index defa900216..cff5006483 100644 --- a/src/file/drawing/graphic-frame/graphic-frame-properties.ts +++ b/src/file/drawing/graphic-frame/graphic-frame-properties.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { GraphicFrameLocks } from "./graphic-frame-locks/graphic-frame-locks"; export class GraphicFrameProperties extends XmlComponent { diff --git a/src/file/drawing/inline/graphic/graphic-data/graphic-data-attribute.ts b/src/file/drawing/inline/graphic/graphic-data/graphic-data-attribute.ts index 5c7fa30e34..09c9074308 100644 --- a/src/file/drawing/inline/graphic/graphic-data/graphic-data-attribute.ts +++ b/src/file/drawing/inline/graphic/graphic-data/graphic-data-attribute.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class GraphicDataAttributes extends XmlAttributeComponent<{ readonly uri?: string; diff --git a/src/file/drawing/inline/graphic/graphic-data/graphic-data.ts b/src/file/drawing/inline/graphic/graphic-data/graphic-data.ts index b1a8337690..3de43021aa 100644 --- a/src/file/drawing/inline/graphic/graphic-data/graphic-data.ts +++ b/src/file/drawing/inline/graphic/graphic-data/graphic-data.ts @@ -1,5 +1,5 @@ -import { IMediaData, IMediaDataTransformation } from "file/media"; -import { XmlComponent } from "file/xml-components"; +import { IMediaData, IMediaDataTransformation } from "@file/media"; +import { XmlComponent } from "@file/xml-components"; import { GraphicDataAttributes } from "./graphic-data-attribute"; import { Pic } from "./pic"; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts b/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts index ea0ee27023..ed5a3c012a 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts @@ -1,5 +1,5 @@ -import { IMediaData } from "file/media"; -import { XmlComponent } from "file/xml-components"; +import { IMediaData } from "@file/media"; +import { XmlComponent } from "@file/xml-components"; import { Blip } from "./blip"; import { SourceRectangle } from "./source-rectangle"; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts b/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts index 4460affa73..3891ce9dc0 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts @@ -1,5 +1,5 @@ -import { IMediaData } from "file/media"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { IMediaData } from "@file/media"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class BlipAttributes extends XmlAttributeComponent<{ readonly embed: string; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts b/src/file/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts index d815fb9879..abdbe442bb 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class SourceRectangle extends XmlComponent { constructor() { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts b/src/file/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts index ac3f33aec9..2805e0db22 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; class FillRectangle extends XmlComponent { constructor() { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/child-non-visual-pic-properties.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/child-non-visual-pic-properties.ts index 2bddee94c5..38a544d188 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/child-non-visual-pic-properties.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/child-non-visual-pic-properties.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { PicLocks } from "./pic-locks/pic-locks"; export class ChildNonVisualProperties extends XmlComponent { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks-attributes.ts index c544d8ccfc..448eec9057 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks-attributes.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class PicLocksAttributes extends XmlAttributeComponent<{ readonly noChangeAspect?: number; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks.ts index 3d30f2836f..98f7d01b9c 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { PicLocksAttributes } from "./pic-locks-attributes"; export class PicLocks extends XmlComponent { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-pic-properties.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-pic-properties.ts index 65e83f8d54..c8c1b46ccd 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-pic-properties.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-pic-properties.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { ChildNonVisualProperties } from "./child-non-visual-pic-properties/child-non-visual-pic-properties"; import { NonVisualProperties } from "./non-visual-properties/non-visual-properties"; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts index 8d8951c12c..b3a4cfc47b 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class NonVisualPropertiesAttributes extends XmlAttributeComponent<{ readonly id?: number; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties.ts index c4d4c76634..6b43562540 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { NonVisualPropertiesAttributes } from "./non-visual-properties-attributes"; export class NonVisualProperties extends XmlComponent { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/pic-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/pic-attributes.ts index 00cc5b7cc2..cc234b4976 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/pic-attributes.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/pic-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class PicAttributes extends XmlAttributeComponent<{ readonly xmlns?: string; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/pic.ts b/src/file/drawing/inline/graphic/graphic-data/pic/pic.ts index df1254331e..545297eef2 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/pic.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/pic.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/drwPic.php -import { IMediaData, IMediaDataTransformation } from "file/media"; -import { XmlComponent } from "file/xml-components"; +import { IMediaData, IMediaDataTransformation } from "@file/media"; +import { XmlComponent } from "@file/xml-components"; import { BlipFill } from "./blip/blip-fill"; import { NonVisualPicProperties } from "./non-visual-pic-properties/non-visual-pic-properties"; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form.spec.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form.spec.ts index 3cf724d656..d57df659c9 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form.spec.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Form } from "./form/form"; describe("Form", () => { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents-attributes.ts index db957965f5..985efe9aa1 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents-attributes.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class ExtentsAttributes extends XmlAttributeComponent<{ readonly cx?: number; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents.ts index f17c8de426..21e0b1e10a 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwSp-size.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { ExtentsAttributes } from "./extents-attributes"; export class Extents extends XmlComponent { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/form.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/form.ts index 541f862cd5..f11073c47d 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/form.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/form.ts @@ -1,7 +1,7 @@ // http://officeopenxml.com/drwSp-size.php // http://officeopenxml.com/drwSp-rotate.php -import { IMediaDataTransformation } from "file/media"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { IMediaDataTransformation } from "@file/media"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { Extents } from "./extents/extents"; import { Offset } from "./offset/off"; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off-attributes.ts index 5dd6a1d071..a122813e34 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off-attributes.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class OffsetAttributes extends XmlAttributeComponent<{ readonly x?: number; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off.ts index 791ed8921c..1b25c1a1dd 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwSp-size.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { OffsetAttributes } from "./off-attributes"; export class Offset extends XmlComponent { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.spec.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.spec.ts index e12ee1a3b9..670a9a86b0 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.spec.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { NoFill } from "./no-fill"; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.ts index 4e847a1d56..6cf7225676 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class NoFill extends XmlComponent { constructor() { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.spec.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.spec.ts index 732f74004b..eb4e148afe 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.spec.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Outline } from "./outline"; describe("Outline", () => { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.ts index effded5399..5b33a412d1 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwSp-outline.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { NoFill } from "./no-fill"; export class Outline extends XmlComponent { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/adjustment-values/adjustment-values.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/adjustment-values/adjustment-values.ts index b781479b64..9ae34cfdad 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/adjustment-values/adjustment-values.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/adjustment-values/adjustment-values.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwSp-prstGeom.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class AdjustmentValues extends XmlComponent { constructor() { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry-attributes.ts index 85d9626a91..ba6dae1121 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry-attributes.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class PresetGeometryAttributes extends XmlAttributeComponent<{ readonly prst?: string; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry.ts index 3ffbb1c045..a826766c76 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwSp-prstGeom.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { AdjustmentValues } from "./adjustment-values/adjustment-values"; import { PresetGeometryAttributes } from "./preset-geometry-attributes"; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties-attributes.ts index c39c466b3c..1f2bc8d230 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties-attributes.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class ShapePropertiesAttributes extends XmlAttributeComponent<{ readonly bwMode?: string; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties.ts index 2d22b00796..6c228f169c 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/drwSp-SpPr.php -import { IMediaDataTransformation } from "file/media"; -import { XmlComponent } from "file/xml-components"; +import { IMediaDataTransformation } from "@file/media"; +import { XmlComponent } from "@file/xml-components"; import { Form } from "./form"; // import { NoFill } from "./no-fill"; // import { Outline } from "./outline/outline"; diff --git a/src/file/drawing/inline/graphic/graphic.ts b/src/file/drawing/inline/graphic/graphic.ts index ca0d23a3a5..5e21d257ed 100644 --- a/src/file/drawing/inline/graphic/graphic.ts +++ b/src/file/drawing/inline/graphic/graphic.ts @@ -1,5 +1,5 @@ -import { IMediaData, IMediaDataTransformation } from "file/media"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { IMediaData, IMediaDataTransformation } from "@file/media"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { GraphicData } from "./graphic-data"; diff --git a/src/file/drawing/inline/inline-attributes.ts b/src/file/drawing/inline/inline-attributes.ts index 2220fc8493..cd61e8953d 100644 --- a/src/file/drawing/inline/inline-attributes.ts +++ b/src/file/drawing/inline/inline-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; import { IDistance } from "../drawing"; // distT, distB etc have no effect on inline images, only floating diff --git a/src/file/drawing/inline/inline.ts b/src/file/drawing/inline/inline.ts index ee37094b84..2b576d4d0b 100644 --- a/src/file/drawing/inline/inline.ts +++ b/src/file/drawing/inline/inline.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/drwPicInline.php -import { IMediaData, IMediaDataTransformation } from "file/media"; -import { XmlComponent } from "file/xml-components"; +import { IMediaData, IMediaDataTransformation } from "@file/media"; +import { XmlComponent } from "@file/xml-components"; import { DocProperties } from "./../doc-properties/doc-properties"; import { EffectExtent } from "./../effect-extent/effect-extent"; import { Extent } from "./../extent/extent"; diff --git a/src/file/drawing/text-wrap/wrap-none.ts b/src/file/drawing/text-wrap/wrap-none.ts index 0ac4c632f0..282bc5fdaa 100644 --- a/src/file/drawing/text-wrap/wrap-none.ts +++ b/src/file/drawing/text-wrap/wrap-none.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwPicFloating-textWrap.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class WrapNone extends XmlComponent { constructor() { diff --git a/src/file/drawing/text-wrap/wrap-square.ts b/src/file/drawing/text-wrap/wrap-square.ts index 5bd4948572..8a866cf6fe 100644 --- a/src/file/drawing/text-wrap/wrap-square.ts +++ b/src/file/drawing/text-wrap/wrap-square.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwPicFloating-textWrap.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { ITextWrapping, TextWrappingSide } from "."; import { IDistance } from "../drawing"; import { IMargins } from "../floating"; diff --git a/src/file/drawing/text-wrap/wrap-tight.ts b/src/file/drawing/text-wrap/wrap-tight.ts index c652d81c18..d0e8d70914 100644 --- a/src/file/drawing/text-wrap/wrap-tight.ts +++ b/src/file/drawing/text-wrap/wrap-tight.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwPicFloating-textWrap.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { IMargins } from "../floating"; diff --git a/src/file/drawing/text-wrap/wrap-top-and-bottom.ts b/src/file/drawing/text-wrap/wrap-top-and-bottom.ts index 261559b325..5b0f53ddec 100644 --- a/src/file/drawing/text-wrap/wrap-top-and-bottom.ts +++ b/src/file/drawing/text-wrap/wrap-top-and-bottom.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwPicFloating-textWrap.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { IMargins } from "../floating"; diff --git a/src/file/file.spec.ts b/src/file/file.spec.ts index e759ee15c3..150d728d14 100644 --- a/src/file/file.spec.ts +++ b/src/file/file.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { sectionMarginDefaults, sectionPageSizeDefaults } from "./document"; import { File } from "./file"; diff --git a/src/file/file.ts b/src/file/file.ts index afd13e5b6f..b640ba9b33 100644 --- a/src/file/file.ts +++ b/src/file/file.ts @@ -71,10 +71,7 @@ export class File { }, ); - if (options.comments) { - this.comments = new Comments(options.comments); - } - + this.comments = new Comments(options.comments ?? { children: [] }); this.fileRelationships = new Relationships(); this.customProperties = new CustomProperties(options.customProperties ?? []); this.appProperties = new AppProperties(); diff --git a/src/file/footer-wrapper.ts b/src/file/footer-wrapper.ts index 34162320c0..4b55f970d3 100644 --- a/src/file/footer-wrapper.ts +++ b/src/file/footer-wrapper.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { HeaderFooterReferenceType } from "./document"; import { IViewWrapper } from "./document-wrapper"; diff --git a/src/file/footer/footer-attributes.ts b/src/file/footer/footer-attributes.ts index db7bdb03d8..58fa0ce8dd 100644 --- a/src/file/footer/footer-attributes.ts +++ b/src/file/footer/footer-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class FooterAttributes extends XmlAttributeComponent<{ readonly wpc?: string; diff --git a/src/file/footer/footer.spec.ts b/src/file/footer/footer.spec.ts index 4f970a119a..a5d408392e 100644 --- a/src/file/footer/footer.spec.ts +++ b/src/file/footer/footer.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Paragraph } from "../paragraph"; import { Footer } from "./footer"; diff --git a/src/file/footer/footer.ts b/src/file/footer/footer.ts index d8b8cfe2ea..ce77b6c789 100644 --- a/src/file/footer/footer.ts +++ b/src/file/footer/footer.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPfooters.php -import { InitializableXmlComponent, XmlComponent } from "file/xml-components"; +import { InitializableXmlComponent, XmlComponent } from "@file/xml-components"; import { Paragraph } from "../paragraph"; import { Table } from "../table"; import { FooterAttributes } from "./footer-attributes"; diff --git a/src/file/footnotes/footnote/footnote-attributes.ts b/src/file/footnotes/footnote/footnote-attributes.ts index 027f9213fe..8f156b79f8 100644 --- a/src/file/footnotes/footnote/footnote-attributes.ts +++ b/src/file/footnotes/footnote/footnote-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class FootnoteAttributes extends XmlAttributeComponent<{ readonly type?: string; diff --git a/src/file/footnotes/footnote/footnote.spec.ts b/src/file/footnotes/footnote/footnote.spec.ts index e2ce67d7b3..b5f347ce49 100644 --- a/src/file/footnotes/footnote/footnote.spec.ts +++ b/src/file/footnotes/footnote/footnote.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { Paragraph, TextRun } from "file/paragraph"; +import { Formatter } from "@export/formatter"; +import { Paragraph, TextRun } from "@file/paragraph"; import { Footnote, FootnoteType } from "./footnote"; diff --git a/src/file/footnotes/footnote/footnote.ts b/src/file/footnotes/footnote/footnote.ts index 19c41824b7..2014c4d085 100644 --- a/src/file/footnotes/footnote/footnote.ts +++ b/src/file/footnotes/footnote/footnote.ts @@ -1,5 +1,5 @@ -import { Paragraph } from "file/paragraph"; -import { XmlComponent } from "file/xml-components"; +import { Paragraph } from "@file/paragraph"; +import { XmlComponent } from "@file/xml-components"; import { FootnoteAttributes } from "./footnote-attributes"; import { FootnoteRefRun } from "./run/footnote-ref-run"; diff --git a/src/file/footnotes/footnote/run/continuation-seperator-run.ts b/src/file/footnotes/footnote/run/continuation-seperator-run.ts index 8e55b9bb7f..17b55a8a3b 100644 --- a/src/file/footnotes/footnote/run/continuation-seperator-run.ts +++ b/src/file/footnotes/footnote/run/continuation-seperator-run.ts @@ -1,4 +1,4 @@ -import { Run } from "file/paragraph"; +import { Run } from "@file/paragraph"; import { ContinuationSeperator } from "./continuation-seperator"; export class ContinuationSeperatorRun extends Run { diff --git a/src/file/footnotes/footnote/run/continuation-seperator.ts b/src/file/footnotes/footnote/run/continuation-seperator.ts index 6e9cc87c77..2a085e7032 100644 --- a/src/file/footnotes/footnote/run/continuation-seperator.ts +++ b/src/file/footnotes/footnote/run/continuation-seperator.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class ContinuationSeperator extends XmlComponent { constructor() { diff --git a/src/file/footnotes/footnote/run/footnote-ref-run.ts b/src/file/footnotes/footnote/run/footnote-ref-run.ts index 4be3493b33..2623875e99 100644 --- a/src/file/footnotes/footnote/run/footnote-ref-run.ts +++ b/src/file/footnotes/footnote/run/footnote-ref-run.ts @@ -1,4 +1,5 @@ -import { Run } from "file/paragraph"; +import { Run } from "@file/paragraph"; + import { FootnoteRef } from "./footnote-ref"; export class FootnoteRefRun extends Run { diff --git a/src/file/footnotes/footnote/run/footnote-ref.ts b/src/file/footnotes/footnote/run/footnote-ref.ts index 4a7d11fd7f..9076bf1dae 100644 --- a/src/file/footnotes/footnote/run/footnote-ref.ts +++ b/src/file/footnotes/footnote/run/footnote-ref.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class FootnoteRef extends XmlComponent { constructor() { diff --git a/src/file/footnotes/footnote/run/reference-run.ts b/src/file/footnotes/footnote/run/reference-run.ts index c355bb17a3..ebb4c7510c 100644 --- a/src/file/footnotes/footnote/run/reference-run.ts +++ b/src/file/footnotes/footnote/run/reference-run.ts @@ -1,5 +1,5 @@ -import { Run } from "file/paragraph/run"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { Run } from "@file/paragraph/run"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; export class FootNoteReferenceRunAttributes extends XmlAttributeComponent<{ readonly id: number; diff --git a/src/file/footnotes/footnote/run/seperator-run.ts b/src/file/footnotes/footnote/run/seperator-run.ts index c5a0f9b252..78c51545d1 100644 --- a/src/file/footnotes/footnote/run/seperator-run.ts +++ b/src/file/footnotes/footnote/run/seperator-run.ts @@ -1,4 +1,4 @@ -import { Run } from "file/paragraph"; +import { Run } from "@file/paragraph"; import { Seperator } from "./seperator"; export class SeperatorRun extends Run { diff --git a/src/file/footnotes/footnote/run/seperator.ts b/src/file/footnotes/footnote/run/seperator.ts index e6038e33ad..3847a4dc91 100644 --- a/src/file/footnotes/footnote/run/seperator.ts +++ b/src/file/footnotes/footnote/run/seperator.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class Seperator extends XmlComponent { constructor() { diff --git a/src/file/footnotes/footnotes-attributes.ts b/src/file/footnotes/footnotes-attributes.ts index 59690ff23d..71d8d705c6 100644 --- a/src/file/footnotes/footnotes-attributes.ts +++ b/src/file/footnotes/footnotes-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class FootnotesAttributes extends XmlAttributeComponent<{ readonly wpc?: string; diff --git a/src/file/footnotes/footnotes.ts b/src/file/footnotes/footnotes.ts index d0ac12a99f..29bac58cfc 100644 --- a/src/file/footnotes/footnotes.ts +++ b/src/file/footnotes/footnotes.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { LineRuleType, Paragraph } from "../paragraph"; import { Footnote, FootnoteType } from "./footnote/footnote"; diff --git a/src/file/header-wrapper.ts b/src/file/header-wrapper.ts index 40fbd7bb1a..371dc028f2 100644 --- a/src/file/header-wrapper.ts +++ b/src/file/header-wrapper.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { HeaderFooterReferenceType } from "./document"; import { IViewWrapper } from "./document-wrapper"; diff --git a/src/file/header/header-attributes.ts b/src/file/header/header-attributes.ts index 8ccb49c7d2..cc3cc944d8 100644 --- a/src/file/header/header-attributes.ts +++ b/src/file/header/header-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class HeaderAttributes extends XmlAttributeComponent<{ readonly wpc?: string; diff --git a/src/file/header/header.spec.ts b/src/file/header/header.spec.ts index 651c21b545..c124a08815 100644 --- a/src/file/header/header.spec.ts +++ b/src/file/header/header.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Paragraph } from "../paragraph"; import { Header } from "./header"; diff --git a/src/file/header/header.ts b/src/file/header/header.ts index ef7a3f4d5d..31ca0d7854 100644 --- a/src/file/header/header.ts +++ b/src/file/header/header.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPheaders.php -import { InitializableXmlComponent, XmlComponent } from "file/xml-components"; +import { InitializableXmlComponent, XmlComponent } from "@file/xml-components"; import { Paragraph } from "../paragraph"; import { Table } from "../table"; import { HeaderAttributes } from "./header-attributes"; diff --git a/src/file/index.ts b/src/file/index.ts index c001054d72..309a3c2d56 100644 --- a/src/file/index.ts +++ b/src/file/index.ts @@ -17,6 +17,5 @@ export * from "./footnotes"; export * from "./track-revision"; export * from "./shared"; export * from "./border"; -export * from "./values"; export * from "./vertical-align"; export * from "./space-type"; diff --git a/src/file/media/media.spec.ts b/src/file/media/media.spec.ts index e8469c0c81..79f6591888 100644 --- a/src/file/media/media.spec.ts +++ b/src/file/media/media.spec.ts @@ -2,7 +2,7 @@ import { expect } from "chai"; import { SinonStub, stub } from "sinon"; -import * as convenienceFunctions from "convenience-functions"; +import * as convenienceFunctions from "@util/convenience-functions"; import { Media } from "./media"; diff --git a/src/file/media/media.ts b/src/file/media/media.ts index d71f4fc15a..8e366f4608 100644 --- a/src/file/media/media.ts +++ b/src/file/media/media.ts @@ -1,7 +1,6 @@ -import { uniqueId } from "convenience-functions"; +import { uniqueId } from "@util/convenience-functions"; import { IMediaData } from "./data"; -// import { Image } from "./image"; export interface IMediaTransformation { readonly width: number; diff --git a/src/file/numbering/abstract-numbering.spec.ts b/src/file/numbering/abstract-numbering.spec.ts index 8ab0845ed8..e17c826c2d 100644 --- a/src/file/numbering/abstract-numbering.spec.ts +++ b/src/file/numbering/abstract-numbering.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { Formatter } from "@export/formatter"; +import { EMPTY_OBJECT } from "@file/xml-components"; import { AlignmentType, EmphasisMarkType, TabStopPosition } from "../paragraph"; import { UnderlineType } from "../paragraph/run/underline"; diff --git a/src/file/numbering/abstract-numbering.ts b/src/file/numbering/abstract-numbering.ts index 6c4af129c3..bf692c9602 100644 --- a/src/file/numbering/abstract-numbering.ts +++ b/src/file/numbering/abstract-numbering.ts @@ -1,5 +1,5 @@ -import { decimalNumber } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber } from "@util/values"; import { ILevelsOptions, Level } from "./level"; import { MultiLevelType } from "./multi-level-type"; diff --git a/src/file/numbering/concrete-numbering.spec.ts b/src/file/numbering/concrete-numbering.spec.ts index 76ef39ccc7..4e0e6e03ad 100644 --- a/src/file/numbering/concrete-numbering.spec.ts +++ b/src/file/numbering/concrete-numbering.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { ConcreteNumbering } from "./num"; diff --git a/src/file/numbering/level.spec.ts b/src/file/numbering/level.spec.ts index 5748a9c610..608474888a 100644 --- a/src/file/numbering/level.spec.ts +++ b/src/file/numbering/level.spec.ts @@ -1,5 +1,7 @@ import { expect } from "chai"; +import { Formatter } from "@export/formatter"; + import { LevelFormat, LevelSuffix } from "."; import { AlignmentType } from ".."; @@ -22,4 +24,41 @@ describe("Level", () => { ).to.throw(); }); }); + + describe("isLegalNumberingStyle", () => { + it("should work", () => { + const concreteNumbering = new Level({ + level: 9, + isLegalNumberingStyle: true, + }); + const tree = new Formatter().format(concreteNumbering); + expect(tree).to.deep.equal({ + "w:lvl": [ + { + "w:start": { + _attr: { + "w:val": 1, + }, + }, + }, + { + "w:isLgl": {}, + }, + { + "w:lvlJc": { + _attr: { + "w:val": "start", + }, + }, + }, + { + _attr: { + "w15:tentative": 1, + "w:ilvl": 9, + }, + }, + ], + }); + }); + }); }); diff --git a/src/file/numbering/level.ts b/src/file/numbering/level.ts index 1ebf2222dd..cedf0745a7 100644 --- a/src/file/numbering/level.ts +++ b/src/file/numbering/level.ts @@ -1,6 +1,7 @@ // http://officeopenxml.com/WPnumbering-numFmt.php -import { decimalNumber } from "file/values"; -import { Attributes, NumberValueElement, XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { Attributes, NumberValueElement, XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber } from "@util/values"; + import { AlignmentType } from "../paragraph/formatting"; import { ILevelParagraphStylePropertiesOptions, ParagraphProperties } from "../paragraph/properties"; import { IRunStylePropertiesOptions, RunProperties } from "../paragraph/run/properties"; @@ -86,6 +87,7 @@ export interface ILevelsOptions { readonly alignment?: AlignmentType; readonly start?: number; readonly suffix?: LevelSuffix; + readonly isLegalNumberingStyle?: boolean; readonly style?: { readonly run?: IRunStylePropertiesOptions; readonly paragraph?: ILevelParagraphStylePropertiesOptions; @@ -113,6 +115,14 @@ class Suffix extends XmlComponent { } } +// http://officeopenxml.com/WPnumbering-isLgl.php +// https://docs.microsoft.com/en-us/dotnet/api/documentformat.openxml.wordprocessing.islegalnumberingstyle?view=openxml-2.8.1 +class IsLegalNumberingStyle extends XmlComponent { + constructor() { + super("w:isLgl"); + } +} + // // // @@ -136,7 +146,7 @@ export class LevelBase extends XmlComponent { private readonly paragraphProperties: ParagraphProperties; private readonly runProperties: RunProperties; - constructor({ level, format, text, alignment = AlignmentType.START, start = 1, style, suffix }: ILevelsOptions) { + constructor({ level, format, text, alignment = AlignmentType.START, start = 1, style, suffix, isLegalNumberingStyle }: ILevelsOptions) { super("w:lvl"); this.root.push(new NumberValueElement("w:start", decimalNumber(start))); @@ -149,6 +159,10 @@ export class LevelBase extends XmlComponent { this.root.push(new Suffix(suffix)); } + if (isLegalNumberingStyle) { + this.root.push(new IsLegalNumberingStyle()); + } + if (text) { this.root.push(new LevelText(text)); } diff --git a/src/file/numbering/multi-level-type.ts b/src/file/numbering/multi-level-type.ts index c2d53bb8cf..7419d84432 100644 --- a/src/file/numbering/multi-level-type.ts +++ b/src/file/numbering/multi-level-type.ts @@ -1,4 +1,4 @@ -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; // // ... diff --git a/src/file/numbering/num.ts b/src/file/numbering/num.ts index 87cd399a96..3f07074596 100644 --- a/src/file/numbering/num.ts +++ b/src/file/numbering/num.ts @@ -1,5 +1,5 @@ -import { decimalNumber } from "file/values"; -import { Attributes, XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { Attributes, XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber } from "@util/values"; class AbstractNumId extends XmlComponent { constructor(value: number) { diff --git a/src/file/numbering/numbering.spec.ts b/src/file/numbering/numbering.spec.ts index 83314eabcd..fb81a17e2b 100644 --- a/src/file/numbering/numbering.spec.ts +++ b/src/file/numbering/numbering.spec.ts @@ -1,8 +1,8 @@ import { expect } from "chai"; import { SinonStub, stub } from "sinon"; -import * as convenienceFunctions from "convenience-functions"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; +import * as convenienceFunctions from "@util/convenience-functions"; import { Numbering } from "./numbering"; diff --git a/src/file/numbering/numbering.ts b/src/file/numbering/numbering.ts index 998cd144a2..f323745db1 100644 --- a/src/file/numbering/numbering.ts +++ b/src/file/numbering/numbering.ts @@ -1,8 +1,8 @@ // http://officeopenxml.com/WPnumbering.php // https://stackoverflow.com/questions/58622437/purpose-of-abstractnum-and-numberinginstance -import { convertInchesToTwip, uniqueNumericId } from "convenience-functions"; -import { AlignmentType } from "file/paragraph"; -import { IContext, IXmlableObject, XmlComponent } from "file/xml-components"; +import { AlignmentType } from "@file/paragraph"; +import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components"; +import { convertInchesToTwip, uniqueNumericId } from "@util/convenience-functions"; import { DocumentAttributes } from "../document/document-attributes"; import { AbstractNumbering } from "./abstract-numbering"; diff --git a/src/file/paragraph/formatting/alignment.spec.ts b/src/file/paragraph/formatting/alignment.spec.ts index cb2a5babce..9fcca0a5c7 100644 --- a/src/file/paragraph/formatting/alignment.spec.ts +++ b/src/file/paragraph/formatting/alignment.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Alignment, AlignmentType } from "./alignment"; describe("Alignment", () => { diff --git a/src/file/paragraph/formatting/alignment.ts b/src/file/paragraph/formatting/alignment.ts index 117b584a01..16cb3dc2da 100644 --- a/src/file/paragraph/formatting/alignment.ts +++ b/src/file/paragraph/formatting/alignment.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPalignment.php // http://officeopenxml.com/WPtableAlignment.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; export enum AlignmentType { START = "start", diff --git a/src/file/paragraph/formatting/border.spec.ts b/src/file/paragraph/formatting/border.spec.ts index 33e026f7c4..5071d92bbe 100644 --- a/src/file/paragraph/formatting/border.spec.ts +++ b/src/file/paragraph/formatting/border.spec.ts @@ -1,8 +1,8 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; -import { BorderStyle } from "file/border"; +import { BorderStyle } from "@file/border"; import { Border, ThematicBreak } from "./border"; describe("Border", () => { diff --git a/src/file/paragraph/formatting/border.ts b/src/file/paragraph/formatting/border.ts index b84b24df99..2fe58082fc 100644 --- a/src/file/paragraph/formatting/border.ts +++ b/src/file/paragraph/formatting/border.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPborders.php -import { BorderElement, BorderStyle, IBorderOptions } from "file/border"; -import { IgnoreIfEmptyXmlComponent, XmlComponent } from "file/xml-components"; +import { BorderElement, BorderStyle, IBorderOptions } from "@file/border"; +import { IgnoreIfEmptyXmlComponent, XmlComponent } from "@file/xml-components"; export interface IBordersOptions { readonly top?: IBorderOptions; diff --git a/src/file/paragraph/formatting/break.spec.ts b/src/file/paragraph/formatting/break.spec.ts index 5f838438e4..7d41e3ed42 100644 --- a/src/file/paragraph/formatting/break.spec.ts +++ b/src/file/paragraph/formatting/break.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { ColumnBreak, PageBreak, PageBreakBefore } from "./break"; diff --git a/src/file/paragraph/formatting/break.ts b/src/file/paragraph/formatting/break.ts index 9e9d400d21..8792d13b58 100644 --- a/src/file/paragraph/formatting/break.ts +++ b/src/file/paragraph/formatting/break.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPtextSpecialContent-break.php -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; import { Run } from "../run"; enum BreakType { diff --git a/src/file/paragraph/formatting/indent.spec.ts b/src/file/paragraph/formatting/indent.spec.ts index 9a4991c56f..4f00d89ee4 100644 --- a/src/file/paragraph/formatting/indent.spec.ts +++ b/src/file/paragraph/formatting/indent.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Indent } from "./indent"; diff --git a/src/file/paragraph/formatting/indent.ts b/src/file/paragraph/formatting/indent.ts index aad272fa7c..b868192347 100644 --- a/src/file/paragraph/formatting/indent.ts +++ b/src/file/paragraph/formatting/indent.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPindentation.php -import { signedTwipsMeasureValue, twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { signedTwipsMeasureValue, twipsMeasureValue } from "@util/values"; export interface IIndentAttributesProperties { readonly start?: number | string; diff --git a/src/file/paragraph/formatting/spacing.spec.ts b/src/file/paragraph/formatting/spacing.spec.ts index 09d88dc31c..3a3cc23c64 100644 --- a/src/file/paragraph/formatting/spacing.spec.ts +++ b/src/file/paragraph/formatting/spacing.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Spacing } from "./spacing"; diff --git a/src/file/paragraph/formatting/spacing.ts b/src/file/paragraph/formatting/spacing.ts index bac1a17049..5a893d7018 100644 --- a/src/file/paragraph/formatting/spacing.ts +++ b/src/file/paragraph/formatting/spacing.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPspacing.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; export enum LineRuleType { AT_LEAST = "atLeast", diff --git a/src/file/paragraph/formatting/style.spec.ts b/src/file/paragraph/formatting/style.spec.ts index af3fd9e3a7..0bf230c4bf 100644 --- a/src/file/paragraph/formatting/style.spec.ts +++ b/src/file/paragraph/formatting/style.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Style } from "./style"; diff --git a/src/file/paragraph/formatting/style.ts b/src/file/paragraph/formatting/style.ts index edde301290..a6dc0c1ab7 100644 --- a/src/file/paragraph/formatting/style.ts +++ b/src/file/paragraph/formatting/style.ts @@ -1,4 +1,4 @@ -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; export enum HeadingLevel { HEADING_1 = "Heading1", diff --git a/src/file/paragraph/formatting/tab-stop.ts b/src/file/paragraph/formatting/tab-stop.ts index cfe121b119..31eab5d33a 100644 --- a/src/file/paragraph/formatting/tab-stop.ts +++ b/src/file/paragraph/formatting/tab-stop.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPtab.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; export class TabStop extends XmlComponent { constructor(type: TabStopType, position: number, leader?: LeaderType) { diff --git a/src/file/paragraph/formatting/unordered-list.spec.ts b/src/file/paragraph/formatting/unordered-list.spec.ts index 1bcab8855d..cc0181c2db 100644 --- a/src/file/paragraph/formatting/unordered-list.spec.ts +++ b/src/file/paragraph/formatting/unordered-list.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { NumberProperties } from "./unordered-list"; diff --git a/src/file/paragraph/formatting/unordered-list.ts b/src/file/paragraph/formatting/unordered-list.ts index 82fa3924f9..a2a34d07a4 100644 --- a/src/file/paragraph/formatting/unordered-list.ts +++ b/src/file/paragraph/formatting/unordered-list.ts @@ -1,4 +1,4 @@ -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; export class NumberProperties extends XmlComponent { constructor(numberId: number | string, indentLevel: number) { diff --git a/src/file/paragraph/frame/frame-properties.spec.ts b/src/file/paragraph/frame/frame-properties.spec.ts index 33a5bb4d4a..495bad9d20 100644 --- a/src/file/paragraph/frame/frame-properties.spec.ts +++ b/src/file/paragraph/frame/frame-properties.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { HorizontalPositionAlign, VerticalPositionAlign } from "file/shared"; +import { Formatter } from "@export/formatter"; +import { HorizontalPositionAlign, VerticalPositionAlign } from "@file/shared"; import { FrameAnchorType, FrameProperties } from "./frame-properties"; diff --git a/src/file/paragraph/frame/frame-properties.ts b/src/file/paragraph/frame/frame-properties.ts index baac4e79f4..06abbff615 100644 --- a/src/file/paragraph/frame/frame-properties.ts +++ b/src/file/paragraph/frame/frame-properties.ts @@ -1,7 +1,7 @@ // http://officeopenxml.com/WPparagraph-textFrames.php -import { HeightRule } from "file"; -import { HorizontalPositionAlign, VerticalPositionAlign } from "file/shared/alignment"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { HorizontalPositionAlign, VerticalPositionAlign } from "@file/shared/alignment"; +import { HeightRule } from "@file/table"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; export enum DropCapType { NONE = "none", diff --git a/src/file/paragraph/links/bookmark-attributes.ts b/src/file/paragraph/links/bookmark-attributes.ts index f5f3425da1..c6174732dc 100644 --- a/src/file/paragraph/links/bookmark-attributes.ts +++ b/src/file/paragraph/links/bookmark-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class BookmarkStartAttributes extends XmlAttributeComponent<{ readonly id: number; diff --git a/src/file/paragraph/links/bookmark.ts b/src/file/paragraph/links/bookmark.ts index f329b87701..ded57ebc42 100644 --- a/src/file/paragraph/links/bookmark.ts +++ b/src/file/paragraph/links/bookmark.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPbookmark.php -import { uniqueNumericId } from "convenience-functions"; -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; +import { uniqueNumericId } from "@util/convenience-functions"; import { ParagraphChild } from "../paragraph"; import { BookmarkEndAttributes, BookmarkStartAttributes } from "./bookmark-attributes"; diff --git a/src/file/paragraph/links/hyperlink-attributes.ts b/src/file/paragraph/links/hyperlink-attributes.ts index 983331154a..c31f943ce0 100644 --- a/src/file/paragraph/links/hyperlink-attributes.ts +++ b/src/file/paragraph/links/hyperlink-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export interface IHyperlinkAttributesProperties { readonly id?: string; diff --git a/src/file/paragraph/links/hyperlink.spec.ts b/src/file/paragraph/links/hyperlink.spec.ts index 9f79a19ff1..8ef9e532b6 100644 --- a/src/file/paragraph/links/hyperlink.spec.ts +++ b/src/file/paragraph/links/hyperlink.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { TextRun } from "../run"; import { ConcreteHyperlink, ExternalHyperlink, InternalHyperlink } from "./hyperlink"; diff --git a/src/file/paragraph/links/hyperlink.ts b/src/file/paragraph/links/hyperlink.ts index 2c39997908..a3e6697bd6 100644 --- a/src/file/paragraph/links/hyperlink.ts +++ b/src/file/paragraph/links/hyperlink.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPhyperlink.php -import { uniqueId } from "convenience-functions"; -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; +import { uniqueId } from "@util/convenience-functions"; import { ParagraphChild } from "../paragraph"; import { HyperlinkAttributes, IHyperlinkAttributesProperties } from "./hyperlink-attributes"; @@ -38,6 +38,8 @@ export class InternalHyperlink extends ConcreteHyperlink { } } -export class ExternalHyperlink { - constructor(public readonly options: { readonly children: ParagraphChild[]; readonly link: string }) {} +export class ExternalHyperlink extends XmlComponent { + constructor(public readonly options: { readonly children: ParagraphChild[]; readonly link: string }) { + super("w:externalHyperlink"); + } } diff --git a/src/file/paragraph/links/outline-level.spec.ts b/src/file/paragraph/links/outline-level.spec.ts index 96cb3ab500..7b58d704fe 100644 --- a/src/file/paragraph/links/outline-level.spec.ts +++ b/src/file/paragraph/links/outline-level.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { OutlineLevel } from "./outline-level"; diff --git a/src/file/paragraph/links/outline-level.ts b/src/file/paragraph/links/outline-level.ts index bb3258a02b..3e6165b949 100644 --- a/src/file/paragraph/links/outline-level.ts +++ b/src/file/paragraph/links/outline-level.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPparagraph.php -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; export class OutlineLevel extends XmlComponent { constructor(public readonly level: number) { diff --git a/src/file/paragraph/links/pageref-field-instruction.spec.ts b/src/file/paragraph/links/pageref-field-instruction.spec.ts index 942c108be9..b113c84cd1 100644 --- a/src/file/paragraph/links/pageref-field-instruction.spec.ts +++ b/src/file/paragraph/links/pageref-field-instruction.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { PageReferenceFieldInstruction } from "./pageref-field-instruction"; describe("PageReference field instruction", () => { diff --git a/src/file/paragraph/links/pageref-field-instruction.ts b/src/file/paragraph/links/pageref-field-instruction.ts index af15635256..2285b0f4d4 100644 --- a/src/file/paragraph/links/pageref-field-instruction.ts +++ b/src/file/paragraph/links/pageref-field-instruction.ts @@ -1,5 +1,5 @@ -import { SpaceType } from "file/space-type"; -import { XmlComponent } from "file/xml-components"; +import { SpaceType } from "@file/space-type"; +import { XmlComponent } from "@file/xml-components"; import { TextAttributes } from "../run/text-attributes"; import { IPageReferenceOptions } from "./pageref-properties"; diff --git a/src/file/paragraph/links/pageref.spec.ts b/src/file/paragraph/links/pageref.spec.ts index c26c8c8632..f65cd2be67 100644 --- a/src/file/paragraph/links/pageref.spec.ts +++ b/src/file/paragraph/links/pageref.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { PageReference } from "./pageref"; describe("PageReference", () => { diff --git a/src/file/paragraph/links/pageref.ts b/src/file/paragraph/links/pageref.ts index b2f1880d2d..72e7803e41 100644 --- a/src/file/paragraph/links/pageref.ts +++ b/src/file/paragraph/links/pageref.ts @@ -1,5 +1,5 @@ // See https://www.ecma-international.org/publications/standards/Ecma-376.htm (at Part 1, Page 1234) -import { Begin, End } from "file/paragraph/run/field"; +import { Begin, End } from "@file/paragraph/run/field"; import { Run } from "../run"; import { PageReferenceFieldInstruction } from "./pageref-field-instruction"; import type { IPageReferenceOptions } from "./pageref-properties"; diff --git a/src/file/paragraph/math/brackets/math-angled-brackets.spec.ts b/src/file/paragraph/math/brackets/math-angled-brackets.spec.ts index ccd73b192b..4e147deca8 100644 --- a/src/file/paragraph/math/brackets/math-angled-brackets.spec.ts +++ b/src/file/paragraph/math/brackets/math-angled-brackets.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathAngledBrackets } from "./math-angled-brackets"; diff --git a/src/file/paragraph/math/brackets/math-angled-brackets.ts b/src/file/paragraph/math/brackets/math-angled-brackets.ts index 48fe0d415d..6d4cf78476 100644 --- a/src/file/paragraph/math/brackets/math-angled-brackets.ts +++ b/src/file/paragraph/math/brackets/math-angled-brackets.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_d-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; import { MathBase } from "../n-ary"; diff --git a/src/file/paragraph/math/brackets/math-beginning-character.spec.ts b/src/file/paragraph/math/brackets/math-beginning-character.spec.ts index bf9196c0a9..8306228161 100644 --- a/src/file/paragraph/math/brackets/math-beginning-character.spec.ts +++ b/src/file/paragraph/math/brackets/math-beginning-character.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathBeginningCharacter } from "./math-beginning-character"; diff --git a/src/file/paragraph/math/brackets/math-beginning-character.ts b/src/file/paragraph/math/brackets/math-beginning-character.ts index aa9e06d87a..ed4320572a 100644 --- a/src/file/paragraph/math/brackets/math-beginning-character.ts +++ b/src/file/paragraph/math/brackets/math-beginning-character.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_begChr-1.html -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class MathBeginningCharacterAttributes extends XmlAttributeComponent<{ readonly character: string }> { protected readonly xmlKeys = { character: "m:val" }; diff --git a/src/file/paragraph/math/brackets/math-bracket-properties.spec.ts b/src/file/paragraph/math/brackets/math-bracket-properties.spec.ts index d80976d8f6..59b0dbb482 100644 --- a/src/file/paragraph/math/brackets/math-bracket-properties.spec.ts +++ b/src/file/paragraph/math/brackets/math-bracket-properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathBracketProperties } from "./math-bracket-properties"; diff --git a/src/file/paragraph/math/brackets/math-bracket-properties.ts b/src/file/paragraph/math/brackets/math-bracket-properties.ts index 5bba7bf935..33f1a8c94c 100644 --- a/src/file/paragraph/math/brackets/math-bracket-properties.ts +++ b/src/file/paragraph/math/brackets/math-bracket-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_dPr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathBeginningCharacter } from "./math-beginning-character"; import { MathEndingCharacter } from "./math-ending-char"; diff --git a/src/file/paragraph/math/brackets/math-curly-brackets.spec.ts b/src/file/paragraph/math/brackets/math-curly-brackets.spec.ts index d6defd57ef..4df8f16499 100644 --- a/src/file/paragraph/math/brackets/math-curly-brackets.spec.ts +++ b/src/file/paragraph/math/brackets/math-curly-brackets.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathCurlyBrackets } from "./math-curly-brackets"; diff --git a/src/file/paragraph/math/brackets/math-curly-brackets.ts b/src/file/paragraph/math/brackets/math-curly-brackets.ts index ccce71e6a7..d402df098f 100644 --- a/src/file/paragraph/math/brackets/math-curly-brackets.ts +++ b/src/file/paragraph/math/brackets/math-curly-brackets.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_d-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; import { MathBase } from "../n-ary"; diff --git a/src/file/paragraph/math/brackets/math-ending-char.ts b/src/file/paragraph/math/brackets/math-ending-char.ts index 86d0a0a58c..2ff644ae10 100644 --- a/src/file/paragraph/math/brackets/math-ending-char.ts +++ b/src/file/paragraph/math/brackets/math-ending-char.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_endChr-1.html -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class MathEndingCharacterAttributes extends XmlAttributeComponent<{ readonly character: string }> { protected readonly xmlKeys = { character: "m:val" }; diff --git a/src/file/paragraph/math/brackets/math-ending-character.spec.ts b/src/file/paragraph/math/brackets/math-ending-character.spec.ts index ba28ac7840..ffbfed444d 100644 --- a/src/file/paragraph/math/brackets/math-ending-character.spec.ts +++ b/src/file/paragraph/math/brackets/math-ending-character.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathEndingCharacter } from "./math-ending-char"; diff --git a/src/file/paragraph/math/brackets/math-round-brackets.spec.ts b/src/file/paragraph/math/brackets/math-round-brackets.spec.ts index 5138e9d085..2514e8149e 100644 --- a/src/file/paragraph/math/brackets/math-round-brackets.spec.ts +++ b/src/file/paragraph/math/brackets/math-round-brackets.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathRoundBrackets } from "./math-round-brackets"; diff --git a/src/file/paragraph/math/brackets/math-round-brackets.ts b/src/file/paragraph/math/brackets/math-round-brackets.ts index 6fe60318a4..37c8fd0703 100644 --- a/src/file/paragraph/math/brackets/math-round-brackets.ts +++ b/src/file/paragraph/math/brackets/math-round-brackets.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_d-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; import { MathBase } from "../n-ary"; diff --git a/src/file/paragraph/math/brackets/math-square-brackets.spec.ts b/src/file/paragraph/math/brackets/math-square-brackets.spec.ts index b0e2ec9e26..ba53d7a918 100644 --- a/src/file/paragraph/math/brackets/math-square-brackets.spec.ts +++ b/src/file/paragraph/math/brackets/math-square-brackets.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathSquareBrackets } from "./math-square-brackets"; diff --git a/src/file/paragraph/math/brackets/math-square-brackets.ts b/src/file/paragraph/math/brackets/math-square-brackets.ts index fdfe88a004..6cc4b852dd 100644 --- a/src/file/paragraph/math/brackets/math-square-brackets.ts +++ b/src/file/paragraph/math/brackets/math-square-brackets.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_d-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; import { MathBase } from "../n-ary"; diff --git a/src/file/paragraph/math/fraction/math-denominator.spec.ts b/src/file/paragraph/math/fraction/math-denominator.spec.ts index f2e7459e1e..e899da4bd7 100644 --- a/src/file/paragraph/math/fraction/math-denominator.spec.ts +++ b/src/file/paragraph/math/fraction/math-denominator.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathDenominator } from "./math-denominator"; diff --git a/src/file/paragraph/math/fraction/math-denominator.ts b/src/file/paragraph/math/fraction/math-denominator.ts index 8df68bf4b0..6e6f11ef04 100644 --- a/src/file/paragraph/math/fraction/math-denominator.ts +++ b/src/file/paragraph/math/fraction/math-denominator.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; diff --git a/src/file/paragraph/math/fraction/math-fraction.spec.ts b/src/file/paragraph/math/fraction/math-fraction.spec.ts index 51cac646bf..0613960f8b 100644 --- a/src/file/paragraph/math/fraction/math-fraction.spec.ts +++ b/src/file/paragraph/math/fraction/math-fraction.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathFraction } from "./math-fraction"; diff --git a/src/file/paragraph/math/fraction/math-fraction.ts b/src/file/paragraph/math/fraction/math-fraction.ts index 84a803a872..385071c20f 100644 --- a/src/file/paragraph/math/fraction/math-fraction.ts +++ b/src/file/paragraph/math/fraction/math-fraction.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; import { MathDenominator } from "./math-denominator"; diff --git a/src/file/paragraph/math/fraction/math-numerator.spec.ts b/src/file/paragraph/math/fraction/math-numerator.spec.ts index e3aaf35c0e..104b9ee85d 100644 --- a/src/file/paragraph/math/fraction/math-numerator.spec.ts +++ b/src/file/paragraph/math/fraction/math-numerator.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathNumerator } from "./math-numerator"; diff --git a/src/file/paragraph/math/fraction/math-numerator.ts b/src/file/paragraph/math/fraction/math-numerator.ts index b7a49d9a75..323af84e35 100644 --- a/src/file/paragraph/math/fraction/math-numerator.ts +++ b/src/file/paragraph/math/fraction/math-numerator.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; diff --git a/src/file/paragraph/math/function/math-function-name.spec.ts b/src/file/paragraph/math/function/math-function-name.spec.ts index 8a37ee998e..fc2930f8d8 100644 --- a/src/file/paragraph/math/function/math-function-name.spec.ts +++ b/src/file/paragraph/math/function/math-function-name.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathFunctionName } from "./math-function-name"; diff --git a/src/file/paragraph/math/function/math-function-name.ts b/src/file/paragraph/math/function/math-function-name.ts index e58488dd28..96314a2ccd 100644 --- a/src/file/paragraph/math/function/math-function-name.ts +++ b/src/file/paragraph/math/function/math-function-name.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_fName-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; export class MathFunctionName extends XmlComponent { diff --git a/src/file/paragraph/math/function/math-function-properties.spec.ts b/src/file/paragraph/math/function/math-function-properties.spec.ts index 63ec2e4f60..10be672efe 100644 --- a/src/file/paragraph/math/function/math-function-properties.spec.ts +++ b/src/file/paragraph/math/function/math-function-properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathFunctionProperties } from "./math-function-properties"; diff --git a/src/file/paragraph/math/function/math-function-properties.ts b/src/file/paragraph/math/function/math-function-properties.ts index f6e8d608ac..ba6d85be69 100644 --- a/src/file/paragraph/math/function/math-function-properties.ts +++ b/src/file/paragraph/math/function/math-function-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_radPr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class MathFunctionProperties extends XmlComponent { constructor() { diff --git a/src/file/paragraph/math/function/math-function.spec.ts b/src/file/paragraph/math/function/math-function.spec.ts index 6ea02b6c9d..7e3379e8af 100644 --- a/src/file/paragraph/math/function/math-function.spec.ts +++ b/src/file/paragraph/math/function/math-function.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathFunction } from "./math-function"; diff --git a/src/file/paragraph/math/function/math-function.ts b/src/file/paragraph/math/function/math-function.ts index 86b66392cc..4b4921d150 100644 --- a/src/file/paragraph/math/function/math-function.ts +++ b/src/file/paragraph/math/function/math-function.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_func-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; import { MathBase } from "../n-ary"; diff --git a/src/file/paragraph/math/math-run.spec.ts b/src/file/paragraph/math/math-run.spec.ts index 2773a0fb9c..dbc12622cb 100644 --- a/src/file/paragraph/math/math-run.spec.ts +++ b/src/file/paragraph/math/math-run.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "./math-run"; diff --git a/src/file/paragraph/math/math-run.ts b/src/file/paragraph/math/math-run.ts index 0d2c48910f..f13b4364e8 100644 --- a/src/file/paragraph/math/math-run.ts +++ b/src/file/paragraph/math/math-run.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_r-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathText } from "./math-text"; diff --git a/src/file/paragraph/math/math-text.spec.ts b/src/file/paragraph/math/math-text.spec.ts index 0001816ed1..c9d4fe05c0 100644 --- a/src/file/paragraph/math/math-text.spec.ts +++ b/src/file/paragraph/math/math-text.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathText } from "./math-text"; diff --git a/src/file/paragraph/math/math-text.ts b/src/file/paragraph/math/math-text.ts index 6087c7e611..1d943ec5e5 100644 --- a/src/file/paragraph/math/math-text.ts +++ b/src/file/paragraph/math/math-text.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class MathText extends XmlComponent { constructor(text: string) { diff --git a/src/file/paragraph/math/math.spec.ts b/src/file/paragraph/math/math.spec.ts index d5c4f6f494..cc2591d0e2 100644 --- a/src/file/paragraph/math/math.spec.ts +++ b/src/file/paragraph/math/math.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Math } from "./math"; import { MathRun } from "./math-run"; diff --git a/src/file/paragraph/math/math.ts b/src/file/paragraph/math/math.ts index 69ebae4dff..0f7458d148 100644 --- a/src/file/paragraph/math/math.ts +++ b/src/file/paragraph/math/math.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_oMath-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "./math-component"; diff --git a/src/file/paragraph/math/n-ary/index.ts b/src/file/paragraph/math/n-ary/index.ts index 6929544152..59df698e9c 100644 --- a/src/file/paragraph/math/n-ary/index.ts +++ b/src/file/paragraph/math/n-ary/index.ts @@ -1,7 +1,7 @@ export * from "./math-accent-character"; export * from "./math-base"; export * from "./math-limit-location"; -export * from "./math-naray-properties"; +export * from "./math-n-ary-properties"; export * from "./math-sub-script"; export * from "./math-sum"; export * from "./math-super-script"; diff --git a/src/file/paragraph/math/n-ary/math-accent-character.spec.ts b/src/file/paragraph/math/n-ary/math-accent-character.spec.ts index b414f4c744..7ab553278d 100644 --- a/src/file/paragraph/math/n-ary/math-accent-character.spec.ts +++ b/src/file/paragraph/math/n-ary/math-accent-character.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathAccentCharacter } from "./math-accent-character"; diff --git a/src/file/paragraph/math/n-ary/math-accent-character.ts b/src/file/paragraph/math/n-ary/math-accent-character.ts index 00182bd1f2..663aa644b5 100644 --- a/src/file/paragraph/math/n-ary/math-accent-character.ts +++ b/src/file/paragraph/math/n-ary/math-accent-character.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_chr-1.html -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class MathAccentCharacterAttributes extends XmlAttributeComponent<{ readonly accent: string }> { protected readonly xmlKeys = { accent: "m:val" }; diff --git a/src/file/paragraph/math/n-ary/math-base.spec.ts b/src/file/paragraph/math/n-ary/math-base.spec.ts index c282537970..fb4d2de0f6 100644 --- a/src/file/paragraph/math/n-ary/math-base.spec.ts +++ b/src/file/paragraph/math/n-ary/math-base.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathBase } from "./math-base"; diff --git a/src/file/paragraph/math/n-ary/math-base.ts b/src/file/paragraph/math/n-ary/math-base.ts index 6c2320439f..f6b5b2cdf6 100644 --- a/src/file/paragraph/math/n-ary/math-base.ts +++ b/src/file/paragraph/math/n-ary/math-base.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_e-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; diff --git a/src/file/paragraph/math/n-ary/math-limit-location.spec.ts b/src/file/paragraph/math/n-ary/math-limit-location.spec.ts index 426f3d0198..96ab07785f 100644 --- a/src/file/paragraph/math/n-ary/math-limit-location.spec.ts +++ b/src/file/paragraph/math/n-ary/math-limit-location.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathLimitLocation } from "./math-limit-location"; diff --git a/src/file/paragraph/math/n-ary/math-limit-location.ts b/src/file/paragraph/math/n-ary/math-limit-location.ts index 5504e1890d..c7d53bf863 100644 --- a/src/file/paragraph/math/n-ary/math-limit-location.ts +++ b/src/file/paragraph/math/n-ary/math-limit-location.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_limLoc-1.html -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class MathLimitLocationAttributes extends XmlAttributeComponent<{ readonly value: string }> { protected readonly xmlKeys = { value: "m:val" }; diff --git a/src/file/paragraph/math/n-ary/math-naray-properties.spec.ts b/src/file/paragraph/math/n-ary/math-n-ary-properties.spec.ts similarity index 80% rename from src/file/paragraph/math/n-ary/math-naray-properties.spec.ts rename to src/file/paragraph/math/n-ary/math-n-ary-properties.spec.ts index 70aa74a1c4..03111874d4 100644 --- a/src/file/paragraph/math/n-ary/math-naray-properties.spec.ts +++ b/src/file/paragraph/math/n-ary/math-n-ary-properties.spec.ts @@ -1,15 +1,15 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; -import { MathNArayProperties } from "./math-naray-properties"; +import { MathNAryProperties } from "./math-n-ary-properties"; -describe("MathNArayProperties", () => { +describe("MathNAryProperties", () => { describe("#constructor()", () => { - it("should create a MathNArayProperties with correct root key", () => { - const mathNArayProperties = new MathNArayProperties("∑", true, true); + it("should create a MathNAryProperties with correct root key", () => { + const mathNAryProperties = new MathNAryProperties("∑", true, true); - const tree = new Formatter().format(mathNArayProperties); + const tree = new Formatter().format(mathNAryProperties); expect(tree).to.deep.equal({ "m:naryPr": [ { @@ -31,9 +31,9 @@ describe("MathNArayProperties", () => { }); it("should add super-script hide attributes", () => { - const mathNArayProperties = new MathNArayProperties("∑", false, true); + const mathNAryProperties = new MathNAryProperties("∑", false, true); - const tree = new Formatter().format(mathNArayProperties); + const tree = new Formatter().format(mathNAryProperties); expect(tree).to.deep.equal({ "m:naryPr": [ { @@ -62,9 +62,9 @@ describe("MathNArayProperties", () => { }); it("should add sub-script hide attributes", () => { - const mathNArayProperties = new MathNArayProperties("∑", true, false); + const mathNAryProperties = new MathNAryProperties("∑", true, false); - const tree = new Formatter().format(mathNArayProperties); + const tree = new Formatter().format(mathNAryProperties); expect(tree).to.deep.equal({ "m:naryPr": [ { @@ -93,9 +93,9 @@ describe("MathNArayProperties", () => { }); it("should add both super-script and sub-script hide attributes", () => { - const mathNArayProperties = new MathNArayProperties("∑", false, false); + const mathNAryProperties = new MathNAryProperties("∑", false, false); - const tree = new Formatter().format(mathNArayProperties); + const tree = new Formatter().format(mathNAryProperties); expect(tree).to.deep.equal({ "m:naryPr": [ { diff --git a/src/file/paragraph/math/n-ary/math-naray-properties.ts b/src/file/paragraph/math/n-ary/math-n-ary-properties.ts similarity index 86% rename from src/file/paragraph/math/n-ary/math-naray-properties.ts rename to src/file/paragraph/math/n-ary/math-n-ary-properties.ts index f8e91e746a..8edacc8530 100644 --- a/src/file/paragraph/math/n-ary/math-naray-properties.ts +++ b/src/file/paragraph/math/n-ary/math-n-ary-properties.ts @@ -1,12 +1,12 @@ // http://www.datypic.com/sc/ooxml/e-m_naryPr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathAccentCharacter } from "./math-accent-character"; import { MathLimitLocation } from "./math-limit-location"; import { MathSubScriptHide } from "./math-sub-script-hide"; import { MathSuperScriptHide } from "./math-super-script-hide"; -export class MathNArayProperties extends XmlComponent { +export class MathNAryProperties extends XmlComponent { constructor(accent: string, hasSuperScript: boolean, hasSubScript: boolean) { super("m:naryPr"); diff --git a/src/file/paragraph/math/n-ary/math-sub-script-hide.spec.ts b/src/file/paragraph/math/n-ary/math-sub-script-hide.spec.ts index 2e9845172f..7f4ed9ced9 100644 --- a/src/file/paragraph/math/n-ary/math-sub-script-hide.spec.ts +++ b/src/file/paragraph/math/n-ary/math-sub-script-hide.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathSubScriptHide } from "./math-sub-script-hide"; diff --git a/src/file/paragraph/math/n-ary/math-sub-script-hide.ts b/src/file/paragraph/math/n-ary/math-sub-script-hide.ts index ef735744e0..d9435f617c 100644 --- a/src/file/paragraph/math/n-ary/math-sub-script-hide.ts +++ b/src/file/paragraph/math/n-ary/math-sub-script-hide.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_subHide-1.html -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class MathSubScriptHideAttributes extends XmlAttributeComponent<{ readonly hide: number }> { protected readonly xmlKeys = { hide: "m:val" }; diff --git a/src/file/paragraph/math/n-ary/math-sub-script.spec.ts b/src/file/paragraph/math/n-ary/math-sub-script.spec.ts index d342946b74..0b98a1d5f9 100644 --- a/src/file/paragraph/math/n-ary/math-sub-script.spec.ts +++ b/src/file/paragraph/math/n-ary/math-sub-script.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathSubScriptElement } from "./math-sub-script"; diff --git a/src/file/paragraph/math/n-ary/math-sub-script.ts b/src/file/paragraph/math/n-ary/math-sub-script.ts index 48268312cf..960d8a2234 100644 --- a/src/file/paragraph/math/n-ary/math-sub-script.ts +++ b/src/file/paragraph/math/n-ary/math-sub-script.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sub-3.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; diff --git a/src/file/paragraph/math/n-ary/math-sum.spec.ts b/src/file/paragraph/math/n-ary/math-sum.spec.ts index 9a7cbbaaa2..7214446a4e 100644 --- a/src/file/paragraph/math/n-ary/math-sum.spec.ts +++ b/src/file/paragraph/math/n-ary/math-sum.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathSum } from "./math-sum"; diff --git a/src/file/paragraph/math/n-ary/math-sum.ts b/src/file/paragraph/math/n-ary/math-sum.ts index af14730bbf..4d4506eb98 100644 --- a/src/file/paragraph/math/n-ary/math-sum.ts +++ b/src/file/paragraph/math/n-ary/math-sum.ts @@ -1,9 +1,9 @@ // http://www.datypic.com/sc/ooxml/e-m_nary-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; import { MathBase } from "./math-base"; -import { MathNArayProperties } from "./math-naray-properties"; +import { MathNAryProperties } from "./math-n-ary-properties"; import { MathSubScriptElement } from "./math-sub-script"; import { MathSuperScriptElement } from "./math-super-script"; @@ -17,7 +17,7 @@ export class MathSum extends XmlComponent { constructor(options: IMathSumOptions) { super("m:nary"); - this.root.push(new MathNArayProperties("∑", !!options.superScript, !!options.subScript)); + this.root.push(new MathNAryProperties("∑", !!options.superScript, !!options.subScript)); if (!!options.subScript) { this.root.push(new MathSubScriptElement(options.subScript)); diff --git a/src/file/paragraph/math/n-ary/math-super-script-hide.spec.ts b/src/file/paragraph/math/n-ary/math-super-script-hide.spec.ts index 89a28564ac..7157bebe00 100644 --- a/src/file/paragraph/math/n-ary/math-super-script-hide.spec.ts +++ b/src/file/paragraph/math/n-ary/math-super-script-hide.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathSuperScriptHide } from "./math-super-script-hide"; diff --git a/src/file/paragraph/math/n-ary/math-super-script-hide.ts b/src/file/paragraph/math/n-ary/math-super-script-hide.ts index a55c15a7ad..a7043621eb 100644 --- a/src/file/paragraph/math/n-ary/math-super-script-hide.ts +++ b/src/file/paragraph/math/n-ary/math-super-script-hide.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_subHide-1.html -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class MathSuperScriptHideAttributes extends XmlAttributeComponent<{ readonly hide: number }> { protected readonly xmlKeys = { hide: "m:val" }; diff --git a/src/file/paragraph/math/n-ary/math-super-script.spec.ts b/src/file/paragraph/math/n-ary/math-super-script.spec.ts index 10e037eba3..ea7a538401 100644 --- a/src/file/paragraph/math/n-ary/math-super-script.spec.ts +++ b/src/file/paragraph/math/n-ary/math-super-script.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathSuperScriptElement } from "./math-super-script"; diff --git a/src/file/paragraph/math/n-ary/math-super-script.ts b/src/file/paragraph/math/n-ary/math-super-script.ts index 8d8386addc..2c922d7739 100644 --- a/src/file/paragraph/math/n-ary/math-super-script.ts +++ b/src/file/paragraph/math/n-ary/math-super-script.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sup-3.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; diff --git a/src/file/paragraph/math/radical/math-degree-hide.spec.ts b/src/file/paragraph/math/radical/math-degree-hide.spec.ts index 0c3f335a13..5e9ce50fda 100644 --- a/src/file/paragraph/math/radical/math-degree-hide.spec.ts +++ b/src/file/paragraph/math/radical/math-degree-hide.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathDegreeHide } from "./math-degree-hide"; diff --git a/src/file/paragraph/math/radical/math-degree-hide.ts b/src/file/paragraph/math/radical/math-degree-hide.ts index c1b9dd2ae5..8b55368c8e 100644 --- a/src/file/paragraph/math/radical/math-degree-hide.ts +++ b/src/file/paragraph/math/radical/math-degree-hide.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_degHide-1.html -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class MathDegreeHideAttributes extends XmlAttributeComponent<{ readonly hide: number }> { protected readonly xmlKeys = { hide: "m:val" }; diff --git a/src/file/paragraph/math/radical/math-degree.spec.ts b/src/file/paragraph/math/radical/math-degree.spec.ts index 3d1f17dfa8..656d8d8ac9 100644 --- a/src/file/paragraph/math/radical/math-degree.spec.ts +++ b/src/file/paragraph/math/radical/math-degree.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathDegree } from "./math-degree"; diff --git a/src/file/paragraph/math/radical/math-degree.ts b/src/file/paragraph/math/radical/math-degree.ts index 79923bbde8..24bb672e3e 100644 --- a/src/file/paragraph/math/radical/math-degree.ts +++ b/src/file/paragraph/math/radical/math-degree.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_deg-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; export class MathDegree extends XmlComponent { diff --git a/src/file/paragraph/math/radical/math-radical-properties.spec.ts b/src/file/paragraph/math/radical/math-radical-properties.spec.ts index 12d29a2962..75f3db07cf 100644 --- a/src/file/paragraph/math/radical/math-radical-properties.spec.ts +++ b/src/file/paragraph/math/radical/math-radical-properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRadicalProperties } from "./math-radical-properties"; diff --git a/src/file/paragraph/math/radical/math-radical-properties.ts b/src/file/paragraph/math/radical/math-radical-properties.ts index b4e90ed4df..ce545a1c47 100644 --- a/src/file/paragraph/math/radical/math-radical-properties.ts +++ b/src/file/paragraph/math/radical/math-radical-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_radPr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathDegreeHide } from "./math-degree-hide"; export class MathRadicalProperties extends XmlComponent { diff --git a/src/file/paragraph/math/radical/math-radical.spec.ts b/src/file/paragraph/math/radical/math-radical.spec.ts index e388edece4..b065794f74 100644 --- a/src/file/paragraph/math/radical/math-radical.spec.ts +++ b/src/file/paragraph/math/radical/math-radical.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathRadical } from "./math-radical"; diff --git a/src/file/paragraph/math/radical/math-radical.ts b/src/file/paragraph/math/radical/math-radical.ts index 1469867a5f..872ff6dcb7 100644 --- a/src/file/paragraph/math/radical/math-radical.ts +++ b/src/file/paragraph/math/radical/math-radical.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_rad-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; import { MathBase } from "../n-ary"; diff --git a/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function-properties.spec.ts b/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function-properties.spec.ts index a6f1d5383e..6da12e9082 100644 --- a/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function-properties.spec.ts +++ b/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function-properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathPreSubSuperScriptProperties } from "./math-pre-sub-super-script-function-properties"; describe("MathPreSubSuperScriptProperties", () => { diff --git a/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function-properties.ts b/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function-properties.ts index fed0cb3564..ed2dffa7ae 100644 --- a/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function-properties.ts +++ b/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sPrePr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class MathPreSubSuperScriptProperties extends XmlComponent { constructor() { diff --git a/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function.spec.ts b/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function.spec.ts index 20d00a639d..3311abd304 100644 --- a/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function.spec.ts +++ b/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../../math-run"; import { MathPreSubSuperScript } from "./math-pre-sub-super-script-function"; diff --git a/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function.ts b/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function.ts index 3a58675b0f..a13e8437fa 100644 --- a/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function.ts +++ b/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sPre-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../../math-component"; import { MathBase, MathSubScriptElement, MathSuperScriptElement } from "../../n-ary"; diff --git a/src/file/paragraph/math/script/sub-script/math-sub-script-function-properties.spec.ts b/src/file/paragraph/math/script/sub-script/math-sub-script-function-properties.spec.ts index be229e066b..c02b114d31 100644 --- a/src/file/paragraph/math/script/sub-script/math-sub-script-function-properties.spec.ts +++ b/src/file/paragraph/math/script/sub-script/math-sub-script-function-properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathSubScriptProperties } from "./math-sub-script-function-properties"; describe("MathSubScriptProperties", () => { diff --git a/src/file/paragraph/math/script/sub-script/math-sub-script-function-properties.ts b/src/file/paragraph/math/script/sub-script/math-sub-script-function-properties.ts index bf37b1d885..48dc3f3198 100644 --- a/src/file/paragraph/math/script/sub-script/math-sub-script-function-properties.ts +++ b/src/file/paragraph/math/script/sub-script/math-sub-script-function-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sSubPr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class MathSubScriptProperties extends XmlComponent { constructor() { diff --git a/src/file/paragraph/math/script/sub-script/math-sub-script-function.spec.ts b/src/file/paragraph/math/script/sub-script/math-sub-script-function.spec.ts index a3ea8d680c..3a5435167d 100644 --- a/src/file/paragraph/math/script/sub-script/math-sub-script-function.spec.ts +++ b/src/file/paragraph/math/script/sub-script/math-sub-script-function.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../../math-run"; import { MathSubScript } from "./math-sub-script-function"; diff --git a/src/file/paragraph/math/script/sub-script/math-sub-script-function.ts b/src/file/paragraph/math/script/sub-script/math-sub-script-function.ts index 319d4d1f1a..877dedd226 100644 --- a/src/file/paragraph/math/script/sub-script/math-sub-script-function.ts +++ b/src/file/paragraph/math/script/sub-script/math-sub-script-function.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sSub-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../../math-component"; import { MathBase, MathSubScriptElement } from "../../n-ary"; diff --git a/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function-properties.spec.ts b/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function-properties.spec.ts index b0f934823a..af5db454b1 100644 --- a/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function-properties.spec.ts +++ b/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function-properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathSubSuperScriptProperties } from "./math-sub-super-script-function-properties"; describe("MathSubSuperScriptProperties", () => { diff --git a/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function-properties.ts b/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function-properties.ts index b3218a7d3a..cbd7adde58 100644 --- a/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function-properties.ts +++ b/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sSubSupPr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class MathSubSuperScriptProperties extends XmlComponent { constructor() { diff --git a/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function.spec.ts b/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function.spec.ts index 68a86fb26b..6edcee075a 100644 --- a/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function.spec.ts +++ b/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../../math-run"; import { MathSubSuperScript } from "./math-sub-super-script-function"; diff --git a/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function.ts b/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function.ts index c382c9ff4c..c942309566 100644 --- a/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function.ts +++ b/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sSubSup-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../../math-component"; import { MathBase, MathSubScriptElement, MathSuperScriptElement } from "../../n-ary"; diff --git a/src/file/paragraph/math/script/super-script/math-super-script-function-properties.spec.ts b/src/file/paragraph/math/script/super-script/math-super-script-function-properties.spec.ts index f95920f152..b6d213f481 100644 --- a/src/file/paragraph/math/script/super-script/math-super-script-function-properties.spec.ts +++ b/src/file/paragraph/math/script/super-script/math-super-script-function-properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathSuperScriptProperties } from "./math-super-script-function-properties"; describe("MathSuperScriptProperties", () => { diff --git a/src/file/paragraph/math/script/super-script/math-super-script-function-properties.ts b/src/file/paragraph/math/script/super-script/math-super-script-function-properties.ts index ea5dbac20b..275afc1296 100644 --- a/src/file/paragraph/math/script/super-script/math-super-script-function-properties.ts +++ b/src/file/paragraph/math/script/super-script/math-super-script-function-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sSupPr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class MathSuperScriptProperties extends XmlComponent { constructor() { diff --git a/src/file/paragraph/math/script/super-script/math-super-script-function.spec.ts b/src/file/paragraph/math/script/super-script/math-super-script-function.spec.ts index ae3740360b..8b3ab1fcad 100644 --- a/src/file/paragraph/math/script/super-script/math-super-script-function.spec.ts +++ b/src/file/paragraph/math/script/super-script/math-super-script-function.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../../math-run"; import { MathSuperScript } from "./math-super-script-function"; diff --git a/src/file/paragraph/math/script/super-script/math-super-script-function.ts b/src/file/paragraph/math/script/super-script/math-super-script-function.ts index eeffdf124a..31fef60f64 100644 --- a/src/file/paragraph/math/script/super-script/math-super-script-function.ts +++ b/src/file/paragraph/math/script/super-script/math-super-script-function.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sSup-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../../math-component"; import { MathBase, MathSuperScriptElement } from "../../n-ary"; diff --git a/src/file/paragraph/paragraph.spec.ts b/src/file/paragraph/paragraph.spec.ts index a416785d0e..f6440bf23b 100644 --- a/src/file/paragraph/paragraph.spec.ts +++ b/src/file/paragraph/paragraph.spec.ts @@ -1,11 +1,11 @@ import { assert, expect } from "chai"; import { SinonStub, stub } from "sinon"; -import * as convenienceFunctions from "convenience-functions"; +import * as convenienceFunctions from "@util/convenience-functions"; -import { Formatter } from "export/formatter"; -import { BorderStyle } from "file/border"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { Formatter } from "@export/formatter"; +import { BorderStyle } from "@file/border"; +import { EMPTY_OBJECT } from "@file/xml-components"; import { IViewWrapper } from "../document-wrapper"; import { File } from "../file"; diff --git a/src/file/paragraph/paragraph.ts b/src/file/paragraph/paragraph.ts index 4257816375..0647258213 100644 --- a/src/file/paragraph/paragraph.ts +++ b/src/file/paragraph/paragraph.ts @@ -1,7 +1,7 @@ // http://officeopenxml.com/WPparagraph.php -import { uniqueId } from "convenience-functions"; -import { FootnoteReferenceRun } from "file/footnotes/footnote/run/reference-run"; -import { IContext, IXmlableObject, XmlComponent } from "file/xml-components"; +import { FootnoteReferenceRun } from "@file/footnotes"; +import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components"; +import { uniqueId } from "@util/convenience-functions"; import { TargetModeType } from "../relationships/relationship/relationship"; import { DeletedTextRun, InsertedTextRun } from "../track-revision"; diff --git a/src/file/paragraph/properties.spec.ts b/src/file/paragraph/properties.spec.ts index dbf2021e8a..9d466bc33c 100644 --- a/src/file/paragraph/properties.spec.ts +++ b/src/file/paragraph/properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { DocumentWrapper } from "../document-wrapper"; import { File } from "../file"; diff --git a/src/file/paragraph/properties.ts b/src/file/paragraph/properties.ts index fd1e18c826..194d4a56fd 100644 --- a/src/file/paragraph/properties.ts +++ b/src/file/paragraph/properties.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPparagraphProperties.php // https://c-rex.net/projects/samples/ooxml/e1/Part4/OOXML_P4_DOCX_suppressLineNumbers_topic_ID0ECJAO.html -import { IContext, IgnoreIfEmptyXmlComponent, IXmlableObject, OnOffElement, XmlComponent } from "file/xml-components"; +import { IContext, IgnoreIfEmptyXmlComponent, IXmlableObject, OnOffElement, XmlComponent } from "@file/xml-components"; import { DocumentWrapper } from "../document-wrapper"; import { IShadingAttributesProperties, Shading } from "../shading"; import { Alignment, AlignmentType } from "./formatting/alignment"; diff --git a/src/file/paragraph/run/break.spec.ts b/src/file/paragraph/run/break.spec.ts index 98e058937d..dbd96cc26f 100644 --- a/src/file/paragraph/run/break.spec.ts +++ b/src/file/paragraph/run/break.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Break } from "./break"; diff --git a/src/file/paragraph/run/break.ts b/src/file/paragraph/run/break.ts index 0d0eac8c8c..850020815d 100644 --- a/src/file/paragraph/run/break.ts +++ b/src/file/paragraph/run/break.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPtextSpecialContent-break.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; // // ... diff --git a/src/file/paragraph/run/comment-run.spec.ts b/src/file/paragraph/run/comment-run.spec.ts index d0e90aabc9..4f19d8b28d 100644 --- a/src/file/paragraph/run/comment-run.spec.ts +++ b/src/file/paragraph/run/comment-run.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Comment, CommentRangeEnd, CommentRangeStart, CommentReference, Comments } from "./comment-run"; describe("CommentRangeStart", () => { diff --git a/src/file/paragraph/run/comment-run.ts b/src/file/paragraph/run/comment-run.ts index 16054ad778..acbff137df 100644 --- a/src/file/paragraph/run/comment-run.ts +++ b/src/file/paragraph/run/comment-run.ts @@ -1,5 +1,5 @@ -import { Paragraph } from "file/paragraph"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { Paragraph } from "@file/paragraph"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { TextRun } from "./text-run"; diff --git a/src/file/paragraph/run/emphasis-mark.spec.ts b/src/file/paragraph/run/emphasis-mark.spec.ts index 4ad4878f64..d37bbdffd1 100644 --- a/src/file/paragraph/run/emphasis-mark.spec.ts +++ b/src/file/paragraph/run/emphasis-mark.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import * as em from "./emphasis-mark"; diff --git a/src/file/paragraph/run/emphasis-mark.ts b/src/file/paragraph/run/emphasis-mark.ts index b8af756072..8ce985fed6 100644 --- a/src/file/paragraph/run/emphasis-mark.ts +++ b/src/file/paragraph/run/emphasis-mark.ts @@ -1,4 +1,4 @@ -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; export enum EmphasisMarkType { DOT = "dot", diff --git a/src/file/paragraph/run/field.ts b/src/file/paragraph/run/field.ts index 462c961cdc..173a0dc10d 100644 --- a/src/file/paragraph/run/field.ts +++ b/src/file/paragraph/run/field.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; enum FieldCharacterType { BEGIN = "begin", diff --git a/src/file/paragraph/run/formatting.spec.ts b/src/file/paragraph/run/formatting.spec.ts index cf590d8cf6..4c8da63fc8 100644 --- a/src/file/paragraph/run/formatting.spec.ts +++ b/src/file/paragraph/run/formatting.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { CharacterSpacing, Color } from "./formatting"; diff --git a/src/file/paragraph/run/formatting.ts b/src/file/paragraph/run/formatting.ts index 5f735fdfbb..284633e2ec 100644 --- a/src/file/paragraph/run/formatting.ts +++ b/src/file/paragraph/run/formatting.ts @@ -1,5 +1,5 @@ -import { hexColorValue, signedTwipsMeasureValue } from "file/values"; -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; +import { hexColorValue, signedTwipsMeasureValue } from "@util/values"; export class CharacterSpacing extends XmlComponent { constructor(value: number | string) { diff --git a/src/file/paragraph/run/image-run.spec.ts b/src/file/paragraph/run/image-run.spec.ts index 9fa1c1a2ee..64c2835b34 100644 --- a/src/file/paragraph/run/image-run.spec.ts +++ b/src/file/paragraph/run/image-run.spec.ts @@ -1,10 +1,10 @@ import { expect } from "chai"; import { SinonStub, stub } from "sinon"; -import * as convenienceFunctions from "convenience-functions"; -import { Formatter } from "export/formatter"; -import { IViewWrapper } from "file/document-wrapper"; -import { File } from "file/file"; +import { Formatter } from "@export/formatter"; +import { IViewWrapper } from "@file/document-wrapper"; +import { File } from "@file/file"; +import * as convenienceFunctions from "@util/convenience-functions"; import { ImageRun } from "./image-run"; diff --git a/src/file/paragraph/run/image-run.ts b/src/file/paragraph/run/image-run.ts index 1ef919c47a..6daf04d31b 100644 --- a/src/file/paragraph/run/image-run.ts +++ b/src/file/paragraph/run/image-run.ts @@ -1,6 +1,6 @@ -import { uniqueId } from "convenience-functions"; +import { uniqueId } from "@util/convenience-functions"; -import { IContext, IXmlableObject } from "file/xml-components"; +import { IContext, IXmlableObject } from "@file/xml-components"; import { Drawing, IFloating } from "../../drawing"; import { IMediaTransformation } from "../../media"; diff --git a/src/file/paragraph/run/page-number.spec.ts b/src/file/paragraph/run/page-number.spec.ts index aa01aa8d71..eb5861d52e 100644 --- a/src/file/paragraph/run/page-number.spec.ts +++ b/src/file/paragraph/run/page-number.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { NumberOfPages, NumberOfPagesSection, Page } from "./page-number"; diff --git a/src/file/paragraph/run/page-number.ts b/src/file/paragraph/run/page-number.ts index 0a652f3d09..55566fe08c 100644 --- a/src/file/paragraph/run/page-number.ts +++ b/src/file/paragraph/run/page-number.ts @@ -1,5 +1,5 @@ -import { SpaceType } from "file/space-type"; -import { XmlComponent } from "file/xml-components"; +import { SpaceType } from "@file/space-type"; +import { XmlComponent } from "@file/xml-components"; import { TextAttributes } from "./text-attributes"; diff --git a/src/file/paragraph/run/properties.ts b/src/file/paragraph/run/properties.ts index 77aec7ae81..32ce33c655 100644 --- a/src/file/paragraph/run/properties.ts +++ b/src/file/paragraph/run/properties.ts @@ -1,8 +1,8 @@ -import { BorderElement, IBorderOptions } from "file/border"; -import { IShadingAttributesProperties, Shading } from "file/shading"; -import { SpaceType } from "file/space-type"; -import { ChangeAttributes, IChangedAttributesProperties } from "file/track-revision/track-revision"; -import { HpsMeasureElement, IgnoreIfEmptyXmlComponent, OnOffElement, StringValueElement, XmlComponent } from "file/xml-components"; +import { BorderElement, IBorderOptions } from "@file/border"; +import { IShadingAttributesProperties, Shading } from "@file/shading"; +import { SpaceType } from "@file/space-type"; +import { ChangeAttributes, IChangedAttributesProperties } from "@file/track-revision/track-revision"; +import { HpsMeasureElement, IgnoreIfEmptyXmlComponent, OnOffElement, StringValueElement, XmlComponent } from "@file/xml-components"; import { EmphasisMark, EmphasisMarkType } from "./emphasis-mark"; import { CharacterSpacing, Color, Highlight, HighlightComplexScript } from "./formatting"; diff --git a/src/file/paragraph/run/run-components/symbol.spec.ts b/src/file/paragraph/run/run-components/symbol.spec.ts index 559790577e..7df914a2e2 100644 --- a/src/file/paragraph/run/run-components/symbol.spec.ts +++ b/src/file/paragraph/run/run-components/symbol.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Symbol } from "./symbol"; diff --git a/src/file/paragraph/run/run-components/symbol.ts b/src/file/paragraph/run/run-components/symbol.ts index e5350cd998..db72f0d064 100644 --- a/src/file/paragraph/run/run-components/symbol.ts +++ b/src/file/paragraph/run/run-components/symbol.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class SymbolAttributes extends XmlAttributeComponent<{ readonly char: string; diff --git a/src/file/paragraph/run/run-components/text.spec.ts b/src/file/paragraph/run/run-components/text.spec.ts index 6393cebd8b..fd4bbd01b0 100644 --- a/src/file/paragraph/run/run-components/text.spec.ts +++ b/src/file/paragraph/run/run-components/text.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Text } from "./text"; diff --git a/src/file/paragraph/run/run-components/text.ts b/src/file/paragraph/run/run-components/text.ts index f25c39c1ad..0bc28fcb27 100644 --- a/src/file/paragraph/run/run-components/text.ts +++ b/src/file/paragraph/run/run-components/text.ts @@ -1,5 +1,5 @@ -import { SpaceType } from "file/space-type"; -import { XmlComponent } from "file/xml-components"; +import { SpaceType } from "@file/space-type"; +import { XmlComponent } from "@file/xml-components"; import { TextAttributes } from "../text-attributes"; diff --git a/src/file/paragraph/run/run-fonts.spec.ts b/src/file/paragraph/run/run-fonts.spec.ts index a0180eae81..3e8df6c68c 100644 --- a/src/file/paragraph/run/run-fonts.spec.ts +++ b/src/file/paragraph/run/run-fonts.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { RunFonts } from "./run-fonts"; diff --git a/src/file/paragraph/run/run-fonts.ts b/src/file/paragraph/run/run-fonts.ts index c1eed32613..415a3812d0 100644 --- a/src/file/paragraph/run/run-fonts.ts +++ b/src/file/paragraph/run/run-fonts.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; export interface IFontAttributesProperties { readonly ascii?: string; diff --git a/src/file/paragraph/run/run.spec.ts b/src/file/paragraph/run/run.spec.ts index e356173b0b..05f7b20ca4 100644 --- a/src/file/paragraph/run/run.spec.ts +++ b/src/file/paragraph/run/run.spec.ts @@ -1,10 +1,10 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { BorderStyle } from "file/border"; -// import { FootnoteReferenceRun } from "file/footnotes/footnote/run/reference-run"; -import { ShadingType } from "file/shading"; -import { SpaceType } from "file/space-type"; +import { Formatter } from "@export/formatter"; +import { BorderStyle } from "@file/border"; +// import { FootnoteReferenceRun } from "@file/footnotes/footnote/run/reference-run"; +import { ShadingType } from "@file/shading"; +import { SpaceType } from "@file/space-type"; import { Run } from "./"; import { EmphasisMarkType } from "./emphasis-mark"; diff --git a/src/file/paragraph/run/run.ts b/src/file/paragraph/run/run.ts index 8f9dc65011..a24ce75786 100644 --- a/src/file/paragraph/run/run.ts +++ b/src/file/paragraph/run/run.ts @@ -1,8 +1,8 @@ // http://officeopenxml.com/WPtext.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; -import { FootnoteReferenceRun } from "file/footnotes/footnote/run/reference-run"; -import { FieldInstruction } from "file/table-of-contents/field-instruction"; +import { FootnoteReferenceRun } from "@file/footnotes/footnote/run/reference-run"; +import { FieldInstruction } from "@file/table-of-contents/field-instruction"; import { Break } from "./break"; import { Begin, End, Separate } from "./field"; diff --git a/src/file/paragraph/run/script.ts b/src/file/paragraph/run/script.ts index b0b4862c16..b1f1b0ac2a 100644 --- a/src/file/paragraph/run/script.ts +++ b/src/file/paragraph/run/script.ts @@ -1,4 +1,4 @@ -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; export abstract class VerticalAlign extends XmlComponent { constructor(type: string) { diff --git a/src/file/paragraph/run/sequential-identifier-instruction.ts b/src/file/paragraph/run/sequential-identifier-instruction.ts index eb830096a6..81762e7812 100644 --- a/src/file/paragraph/run/sequential-identifier-instruction.ts +++ b/src/file/paragraph/run/sequential-identifier-instruction.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPfieldInstructions.php -import { SpaceType } from "file/space-type"; -import { XmlComponent } from "file/xml-components"; +import { SpaceType } from "@file/space-type"; +import { XmlComponent } from "@file/xml-components"; import { TextAttributes } from "./text-attributes"; diff --git a/src/file/paragraph/run/sequential-identifier.spec.ts b/src/file/paragraph/run/sequential-identifier.spec.ts index f4a85393b6..f68c356ec9 100644 --- a/src/file/paragraph/run/sequential-identifier.spec.ts +++ b/src/file/paragraph/run/sequential-identifier.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { SequentialIdentifier } from "./sequential-identifier"; diff --git a/src/file/paragraph/run/sequential-identifier.ts b/src/file/paragraph/run/sequential-identifier.ts index e193307e83..6931a0eb73 100644 --- a/src/file/paragraph/run/sequential-identifier.ts +++ b/src/file/paragraph/run/sequential-identifier.ts @@ -1,5 +1,5 @@ -import { Run } from "file/paragraph/run"; -import { Begin, End, Separate } from "file/paragraph/run/field"; +import { Run } from "@file/paragraph/run"; +import { Begin, End, Separate } from "@file/paragraph/run/field"; import { SequentialIdentifierInstruction } from "./sequential-identifier-instruction"; export class SequentialIdentifier extends Run { diff --git a/src/file/paragraph/run/simple-field.spec.ts b/src/file/paragraph/run/simple-field.spec.ts index 4368c1f47c..ac42bafdf4 100644 --- a/src/file/paragraph/run/simple-field.spec.ts +++ b/src/file/paragraph/run/simple-field.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { SimpleField, SimpleMailMergeField } from "./simple-field"; diff --git a/src/file/paragraph/run/simple-field.ts b/src/file/paragraph/run/simple-field.ts index 719c2dded5..e741dc374f 100644 --- a/src/file/paragraph/run/simple-field.ts +++ b/src/file/paragraph/run/simple-field.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-w_fldSimple-1.html -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { TextRun } from "./text-run"; class FldSimpleAttrs extends XmlAttributeComponent<{ readonly instr: string }> { diff --git a/src/file/paragraph/run/symbol-run.spec.ts b/src/file/paragraph/run/symbol-run.spec.ts index 06e98a4373..f8393a3751 100644 --- a/src/file/paragraph/run/symbol-run.spec.ts +++ b/src/file/paragraph/run/symbol-run.spec.ts @@ -2,7 +2,7 @@ import { expect } from "chai"; import { EmphasisMarkType } from "./emphasis-mark"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { UnderlineType } from "./underline"; diff --git a/src/file/paragraph/run/tab.spec.ts b/src/file/paragraph/run/tab.spec.ts index 04d3503521..03381200a5 100644 --- a/src/file/paragraph/run/tab.spec.ts +++ b/src/file/paragraph/run/tab.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Tab } from "./tab"; diff --git a/src/file/paragraph/run/tab.ts b/src/file/paragraph/run/tab.ts index 33f2b09427..cd81fbc0a2 100644 --- a/src/file/paragraph/run/tab.ts +++ b/src/file/paragraph/run/tab.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; // // ... diff --git a/src/file/paragraph/run/text-attributes.ts b/src/file/paragraph/run/text-attributes.ts index e380959c40..742f640002 100644 --- a/src/file/paragraph/run/text-attributes.ts +++ b/src/file/paragraph/run/text-attributes.ts @@ -1,5 +1,5 @@ -import { SpaceType } from "file/space-type"; -import { XmlAttributeComponent } from "file/xml-components"; +import { SpaceType } from "@file/space-type"; +import { XmlAttributeComponent } from "@file/xml-components"; export class TextAttributes extends XmlAttributeComponent<{ readonly space: SpaceType }> { protected readonly xmlKeys = { space: "xml:space" }; diff --git a/src/file/paragraph/run/text-run.spec.ts b/src/file/paragraph/run/text-run.spec.ts index b36b3c3139..d3a3c82383 100644 --- a/src/file/paragraph/run/text-run.spec.ts +++ b/src/file/paragraph/run/text-run.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { FootnoteReferenceRun } from "file/footnotes/footnote/run/reference-run"; +import { Formatter } from "@export/formatter"; +import { FootnoteReferenceRun } from "@file/footnotes/footnote/run/reference-run"; import { TextRun } from "./text-run"; diff --git a/src/file/paragraph/run/underline.spec.ts b/src/file/paragraph/run/underline.spec.ts index bc406a1da4..c8a26b3e78 100644 --- a/src/file/paragraph/run/underline.spec.ts +++ b/src/file/paragraph/run/underline.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Underline, UnderlineType } from "./underline"; diff --git a/src/file/paragraph/run/underline.ts b/src/file/paragraph/run/underline.ts index a94c37e1f5..12459398f5 100644 --- a/src/file/paragraph/run/underline.ts +++ b/src/file/paragraph/run/underline.ts @@ -1,5 +1,5 @@ -import { hexColorValue } from "file/values"; -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; +import { hexColorValue } from "@util/values"; export enum UnderlineType { SINGLE = "single", diff --git a/src/file/relationships/attributes.ts b/src/file/relationships/attributes.ts index 5aba4b730a..fbf13a8ef8 100644 --- a/src/file/relationships/attributes.ts +++ b/src/file/relationships/attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class RelationshipsAttributes extends XmlAttributeComponent<{ readonly xmlns: string; diff --git a/src/file/relationships/relationship/relationship-attributes.ts b/src/file/relationships/relationship/relationship-attributes.ts index 8b9db06240..c2d0daaf44 100644 --- a/src/file/relationships/relationship/relationship-attributes.ts +++ b/src/file/relationships/relationship/relationship-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class RelationshipAttributes extends XmlAttributeComponent<{ readonly id: string; diff --git a/src/file/relationships/relationship/relationship.ts b/src/file/relationships/relationship/relationship.ts index 79204e4ff8..d6384a08c1 100644 --- a/src/file/relationships/relationship/relationship.ts +++ b/src/file/relationships/relationship/relationship.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { RelationshipAttributes } from "./relationship-attributes"; export type RelationshipType = diff --git a/src/file/relationships/relationships.spec.ts b/src/file/relationships/relationships.spec.ts index 9525bd4fff..fd47ec55c6 100644 --- a/src/file/relationships/relationships.spec.ts +++ b/src/file/relationships/relationships.spec.ts @@ -1,7 +1,7 @@ // tslint:disable:no-string-literal import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Relationships } from "./relationships"; diff --git a/src/file/relationships/relationships.ts b/src/file/relationships/relationships.ts index 3a5447c2d9..4e9d98530b 100644 --- a/src/file/relationships/relationships.ts +++ b/src/file/relationships/relationships.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { RelationshipsAttributes } from "./attributes"; import { Relationship, RelationshipType, TargetModeType } from "./relationship/relationship"; diff --git a/src/file/settings/compatibility-setting/compatibility-setting.spec.ts b/src/file/settings/compatibility-setting/compatibility-setting.spec.ts index 0f65697cda..7d927f283e 100644 --- a/src/file/settings/compatibility-setting/compatibility-setting.spec.ts +++ b/src/file/settings/compatibility-setting/compatibility-setting.spec.ts @@ -1,5 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; + +import { Formatter } from "@export/formatter"; import { CompatibilitySetting } from "./compatibility-setting"; diff --git a/src/file/settings/compatibility-setting/compatibility-setting.ts b/src/file/settings/compatibility-setting/compatibility-setting.ts index 43a7c5d71a..5e57503f32 100644 --- a/src/file/settings/compatibility-setting/compatibility-setting.ts +++ b/src/file/settings/compatibility-setting/compatibility-setting.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; // Currently, this is hard-coded for Microsoft word compatSettings. // Theoretically, we could add compatSettings for other programs, but diff --git a/src/file/settings/compatibility.spec.ts b/src/file/settings/compatibility.spec.ts index fa9809672d..c264ad70bf 100644 --- a/src/file/settings/compatibility.spec.ts +++ b/src/file/settings/compatibility.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { Formatter } from "@export/formatter"; +import { EMPTY_OBJECT } from "@file/xml-components"; import { Compatibility } from "./compatibility"; diff --git a/src/file/settings/compatibility.ts b/src/file/settings/compatibility.ts index 1405697bca..00a3de3d64 100644 --- a/src/file/settings/compatibility.ts +++ b/src/file/settings/compatibility.ts @@ -1,4 +1,4 @@ -import { OnOffElement, XmlComponent } from "file/xml-components"; +import { OnOffElement, XmlComponent } from "@file/xml-components"; import { CompatibilitySetting } from "./compatibility-setting/compatibility-setting"; // diff --git a/src/file/settings/settings.spec.ts b/src/file/settings/settings.spec.ts index b12f340f43..7bd473bdbf 100644 --- a/src/file/settings/settings.spec.ts +++ b/src/file/settings/settings.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Settings } from "./settings"; diff --git a/src/file/settings/settings.ts b/src/file/settings/settings.ts index 4c57532a41..c463ab4d3b 100644 --- a/src/file/settings/settings.ts +++ b/src/file/settings/settings.ts @@ -1,4 +1,4 @@ -import { OnOffElement, XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { OnOffElement, XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { Compatibility } from "./compatibility"; diff --git a/src/file/shading/shading.spec.ts b/src/file/shading/shading.spec.ts index 7b808aa829..7db9ca2859 100644 --- a/src/file/shading/shading.spec.ts +++ b/src/file/shading/shading.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Shading, ShadingType } from "./shading"; diff --git a/src/file/shading/shading.ts b/src/file/shading/shading.ts index 9199122c78..f6d2c2bbf9 100644 --- a/src/file/shading/shading.ts +++ b/src/file/shading/shading.ts @@ -17,8 +17,8 @@ // // // -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; -import { hexColorValue } from "../values"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { hexColorValue } from "@util/values"; export interface IShadingAttributesProperties { readonly fill?: string; diff --git a/src/file/styles/defaults/document-defaults.spec.ts b/src/file/styles/defaults/document-defaults.spec.ts index 79ca9cccf7..fd89930f4d 100644 --- a/src/file/styles/defaults/document-defaults.spec.ts +++ b/src/file/styles/defaults/document-defaults.spec.ts @@ -2,7 +2,7 @@ import { expect } from "chai"; import { DocumentDefaults } from "./document-defaults"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; describe("DocumentDefaults", () => { it("#constructor", () => { diff --git a/src/file/styles/defaults/document-defaults.ts b/src/file/styles/defaults/document-defaults.ts index 67ddbfd6bd..455da10bd3 100644 --- a/src/file/styles/defaults/document-defaults.ts +++ b/src/file/styles/defaults/document-defaults.ts @@ -1,6 +1,6 @@ -import { IParagraphStylePropertiesOptions } from "file/paragraph/properties"; -import { IRunStylePropertiesOptions } from "file/paragraph/run/properties"; -import { XmlComponent } from "file/xml-components"; +import { IParagraphStylePropertiesOptions } from "@file/paragraph/properties"; +import { IRunStylePropertiesOptions } from "@file/paragraph/run/properties"; +import { XmlComponent } from "@file/xml-components"; import { ParagraphPropertiesDefaults } from "./paragraph-properties"; import { RunPropertiesDefaults } from "./run-properties"; diff --git a/src/file/styles/defaults/paragraph-properties.ts b/src/file/styles/defaults/paragraph-properties.ts index cac92575a4..1ea94b9e15 100644 --- a/src/file/styles/defaults/paragraph-properties.ts +++ b/src/file/styles/defaults/paragraph-properties.ts @@ -1,5 +1,5 @@ -import { IParagraphStylePropertiesOptions, ParagraphProperties } from "file/paragraph/properties"; -import { XmlComponent } from "file/xml-components"; +import { IParagraphStylePropertiesOptions, ParagraphProperties } from "@file/paragraph/properties"; +import { XmlComponent } from "@file/xml-components"; export class ParagraphPropertiesDefaults extends XmlComponent { constructor(options?: IParagraphStylePropertiesOptions) { diff --git a/src/file/styles/defaults/run-properties.ts b/src/file/styles/defaults/run-properties.ts index 9a09001289..3e8db82362 100644 --- a/src/file/styles/defaults/run-properties.ts +++ b/src/file/styles/defaults/run-properties.ts @@ -1,5 +1,5 @@ -import { IRunStylePropertiesOptions, RunProperties } from "file/paragraph/run/properties"; -import { XmlComponent } from "file/xml-components"; +import { IRunStylePropertiesOptions, RunProperties } from "@file/paragraph/run/properties"; +import { XmlComponent } from "@file/xml-components"; export class RunPropertiesDefaults extends XmlComponent { constructor(options?: IRunStylePropertiesOptions) { diff --git a/src/file/styles/external-styles-factory.ts b/src/file/styles/external-styles-factory.ts index 839041d690..b40a0bff46 100644 --- a/src/file/styles/external-styles-factory.ts +++ b/src/file/styles/external-styles-factory.ts @@ -1,4 +1,4 @@ -import { convertToXmlComponent, ImportedRootElementAttributes, ImportedXmlComponent } from "file/xml-components"; +import { convertToXmlComponent, ImportedRootElementAttributes, ImportedXmlComponent } from "@file/xml-components"; import { Element as XMLElement, xml2js } from "xml-js"; import { Styles } from "./"; diff --git a/src/file/styles/latent-styles/exceptions.spec.ts b/src/file/styles/latent-styles/exceptions.spec.ts index 2fc477b762..0b38ea75dd 100644 --- a/src/file/styles/latent-styles/exceptions.spec.ts +++ b/src/file/styles/latent-styles/exceptions.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { LatentStyleException } from "./exceptions"; diff --git a/src/file/styles/latent-styles/exceptions.ts b/src/file/styles/latent-styles/exceptions.ts index 3ae340b922..2db716aac4 100644 --- a/src/file/styles/latent-styles/exceptions.ts +++ b/src/file/styles/latent-styles/exceptions.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; export interface ILatentStyleExceptionAttributesProperties { readonly name?: string; diff --git a/src/file/styles/latent-styles/latent-styles.spec.ts b/src/file/styles/latent-styles/latent-styles.spec.ts index 78807c0306..3364654ef4 100644 --- a/src/file/styles/latent-styles/latent-styles.spec.ts +++ b/src/file/styles/latent-styles/latent-styles.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { LatentStyleException } from "./exceptions"; import { LatentStyles } from "./latent-styles"; diff --git a/src/file/styles/latent-styles/latent-styles.ts b/src/file/styles/latent-styles/latent-styles.ts index d0f9bd3034..5f4ddbb3f9 100644 --- a/src/file/styles/latent-styles/latent-styles.ts +++ b/src/file/styles/latent-styles/latent-styles.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { LatentStyleException } from "./exceptions"; export class LatentStyles extends XmlComponent { diff --git a/src/file/styles/style/character-style.spec.ts b/src/file/styles/style/character-style.spec.ts index 4ddf087f2d..a91cd05f7a 100644 --- a/src/file/styles/style/character-style.spec.ts +++ b/src/file/styles/style/character-style.spec.ts @@ -1,10 +1,10 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { EmphasisMarkType } from "file/paragraph/run/emphasis-mark"; -import { UnderlineType } from "file/paragraph/run/underline"; -import { ShadingType } from "file/shading"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { Formatter } from "@export/formatter"; +import { EmphasisMarkType } from "@file/paragraph/run/emphasis-mark"; +import { UnderlineType } from "@file/paragraph/run/underline"; +import { ShadingType } from "@file/shading"; +import { EMPTY_OBJECT } from "@file/xml-components"; import { StyleForCharacter } from "./character-style"; diff --git a/src/file/styles/style/character-style.ts b/src/file/styles/style/character-style.ts index 229c8e54c6..bb5f9ac5ee 100644 --- a/src/file/styles/style/character-style.ts +++ b/src/file/styles/style/character-style.ts @@ -1,4 +1,4 @@ -import { IRunStylePropertiesOptions, RunProperties } from "file/paragraph/run/properties"; +import { IRunStylePropertiesOptions, RunProperties } from "@file/paragraph/run/properties"; import { IStyleOptions, Style } from "./style"; diff --git a/src/file/styles/style/components.spec.ts b/src/file/styles/style/components.spec.ts index 7ce7df62ab..5ae8205e25 100644 --- a/src/file/styles/style/components.spec.ts +++ b/src/file/styles/style/components.spec.ts @@ -1,5 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; + +import { Formatter } from "@export/formatter"; + import * as components from "./components"; describe("Style components", () => { diff --git a/src/file/styles/style/components.ts b/src/file/styles/style/components.ts index 4b35ba38b3..65046a5c10 100644 --- a/src/file/styles/style/components.ts +++ b/src/file/styles/style/components.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPstyleGenProps.php -import { decimalNumber } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber } from "@util/values"; class ComponentAttributes extends XmlAttributeComponent<{ readonly val: string | number; diff --git a/src/file/styles/style/default-styles.spec.ts b/src/file/styles/style/default-styles.spec.ts index dda921a110..cca9bb74bb 100644 --- a/src/file/styles/style/default-styles.spec.ts +++ b/src/file/styles/style/default-styles.spec.ts @@ -1,8 +1,10 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; + +import { Formatter } from "@export/formatter"; + import * as defaultStyles from "./default-styles"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { EMPTY_OBJECT } from "@file/xml-components"; describe("Default Styles", () => { it("HeadingStyle#constructor", () => { diff --git a/src/file/styles/style/default-styles.ts b/src/file/styles/style/default-styles.ts index 779f06b6c0..990187bc01 100644 --- a/src/file/styles/style/default-styles.ts +++ b/src/file/styles/style/default-styles.ts @@ -1,6 +1,6 @@ -import { UnderlineType } from "file/paragraph/run/underline"; +import { UnderlineType } from "@file/paragraph/run/underline"; -import { LineRuleType } from "file/paragraph"; +import { LineRuleType } from "@file/paragraph"; import { IBaseCharacterStyleOptions, StyleForCharacter } from "./character-style"; import { IBaseParagraphStyleOptions, IParagraphStyleOptions, StyleForParagraph } from "./paragraph-style"; diff --git a/src/file/styles/style/paragraph-style.spec.ts b/src/file/styles/style/paragraph-style.spec.ts index 28f229677b..4ccac61b5a 100644 --- a/src/file/styles/style/paragraph-style.spec.ts +++ b/src/file/styles/style/paragraph-style.spec.ts @@ -1,10 +1,10 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { AlignmentType, EmphasisMarkType, TabStopPosition } from "file/paragraph"; -import { UnderlineType } from "file/paragraph/run/underline"; -import { ShadingType } from "file/shading"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { Formatter } from "@export/formatter"; +import { AlignmentType, EmphasisMarkType, TabStopPosition } from "@file/paragraph"; +import { UnderlineType } from "@file/paragraph/run/underline"; +import { ShadingType } from "@file/shading"; +import { EMPTY_OBJECT } from "@file/xml-components"; import { StyleForParagraph } from "./paragraph-style"; diff --git a/src/file/styles/style/paragraph-style.ts b/src/file/styles/style/paragraph-style.ts index 5f90a87fe2..da89bbce49 100644 --- a/src/file/styles/style/paragraph-style.ts +++ b/src/file/styles/style/paragraph-style.ts @@ -1,5 +1,5 @@ -import { IParagraphStylePropertiesOptions, IRunStylePropertiesOptions, ParagraphProperties } from "file/paragraph"; -import { RunProperties } from "file/paragraph/run/properties"; +import { IParagraphStylePropertiesOptions, IRunStylePropertiesOptions, ParagraphProperties } from "@file/paragraph"; +import { RunProperties } from "@file/paragraph/run/properties"; import { IStyleOptions, Style } from "./style"; export interface IBaseParagraphStyleOptions extends IStyleOptions { diff --git a/src/file/styles/style/style.spec.ts b/src/file/styles/style/style.spec.ts index 4135272e5d..ea250bfe30 100644 --- a/src/file/styles/style/style.spec.ts +++ b/src/file/styles/style/style.spec.ts @@ -1,5 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; + +import { Formatter } from "@export/formatter"; + import { Style } from "./style"; describe("Style", () => { diff --git a/src/file/styles/style/style.ts b/src/file/styles/style/style.ts index 767539503b..9b9d49efdf 100644 --- a/src/file/styles/style/style.ts +++ b/src/file/styles/style/style.ts @@ -1,4 +1,4 @@ -import { OnOffElement, StringValueElement, XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { OnOffElement, StringValueElement, XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { Name, UiPriority } from "./components"; // diff --git a/src/file/styles/styles.spec.ts b/src/file/styles/styles.spec.ts index acc782c743..8d0c8c7777 100644 --- a/src/file/styles/styles.spec.ts +++ b/src/file/styles/styles.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { Formatter } from "@export/formatter"; +import { EMPTY_OBJECT } from "@file/xml-components"; import { Styles } from "./styles"; diff --git a/src/file/styles/styles.ts b/src/file/styles/styles.ts index e37fe8c263..98c1c83479 100644 --- a/src/file/styles/styles.ts +++ b/src/file/styles/styles.ts @@ -1,5 +1,5 @@ -import { IDefaultStylesOptions } from "file/styles/factory"; -import { BaseXmlComponent, ImportedXmlComponent, XmlComponent } from "file/xml-components"; +import { IDefaultStylesOptions } from "@file/styles/factory"; +import { BaseXmlComponent, ImportedXmlComponent, XmlComponent } from "@file/xml-components"; import { StyleForCharacter, StyleForParagraph } from "./style"; import { ICharacterStyleOptions } from "./style/character-style"; import { IParagraphStyleOptions } from "./style/paragraph-style"; diff --git a/src/file/table-of-contents/alias.ts b/src/file/table-of-contents/alias.ts index 4cc9f82440..2137523c2d 100644 --- a/src/file/table-of-contents/alias.ts +++ b/src/file/table-of-contents/alias.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class AliasAttributes extends XmlAttributeComponent<{ readonly alias: string }> { protected readonly xmlKeys = { alias: "w:val" }; diff --git a/src/file/table-of-contents/field-instruction.ts b/src/file/table-of-contents/field-instruction.ts index c5ab1144d6..7076296493 100644 --- a/src/file/table-of-contents/field-instruction.ts +++ b/src/file/table-of-contents/field-instruction.ts @@ -1,7 +1,7 @@ // http://officeopenxml.com/WPfieldInstructions.php -import { TextAttributes } from "file/paragraph/run/text-attributes"; -import { SpaceType } from "file/space-type"; -import { XmlComponent } from "file/xml-components"; +import { TextAttributes } from "@file/paragraph/run/text-attributes"; +import { SpaceType } from "@file/space-type"; +import { XmlComponent } from "@file/xml-components"; import { ITableOfContentsOptions } from "./table-of-contents-properties"; diff --git a/src/file/table-of-contents/sdt-content.ts b/src/file/table-of-contents/sdt-content.ts index 5228ff447f..351ceb973e 100644 --- a/src/file/table-of-contents/sdt-content.ts +++ b/src/file/table-of-contents/sdt-content.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class StructuredDocumentTagContent extends XmlComponent { constructor() { diff --git a/src/file/table-of-contents/sdt-properties.ts b/src/file/table-of-contents/sdt-properties.ts index 3f7019f561..e1d96164c3 100644 --- a/src/file/table-of-contents/sdt-properties.ts +++ b/src/file/table-of-contents/sdt-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-w_sdtPr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { Alias } from "./alias"; export class StructuredDocumentTagProperties extends XmlComponent { diff --git a/src/file/table-of-contents/table-of-contents.spec.ts b/src/file/table-of-contents/table-of-contents.spec.ts index f5cf06cf84..aba9647dc4 100644 --- a/src/file/table-of-contents/table-of-contents.spec.ts +++ b/src/file/table-of-contents/table-of-contents.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { TableOfContents } from "./table-of-contents"; import { StyleLevel } from "./table-of-contents-properties"; diff --git a/src/file/table-of-contents/table-of-contents.ts b/src/file/table-of-contents/table-of-contents.ts index e3d874e4a3..7945140f78 100644 --- a/src/file/table-of-contents/table-of-contents.ts +++ b/src/file/table-of-contents/table-of-contents.ts @@ -1,9 +1,9 @@ // http://officeopenxml.com/WPtableOfContents.php // http://www.datypic.com/sc/ooxml/e-w_sdt-1.html -import { Paragraph } from "file/paragraph"; -import { Run } from "file/paragraph/run"; -import { Begin, End, Separate } from "file/paragraph/run/field"; -import { XmlComponent } from "file/xml-components"; +import { Paragraph } from "@file/paragraph"; +import { Run } from "@file/paragraph/run"; +import { Begin, End, Separate } from "@file/paragraph/run/field"; +import { XmlComponent } from "@file/xml-components"; import { FieldInstruction } from "./field-instruction"; import { StructuredDocumentTagContent } from "./sdt-content"; import { StructuredDocumentTagProperties } from "./sdt-properties"; diff --git a/src/file/table/grid.spec.ts b/src/file/table/grid.spec.ts index e38b8da413..43b631c2aa 100644 --- a/src/file/table/grid.spec.ts +++ b/src/file/table/grid.spec.ts @@ -1,10 +1,10 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { GridCol, TableGrid } from "./grid"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { EMPTY_OBJECT } from "@file/xml-components"; describe("GridCol", () => { describe("#constructor", () => { diff --git a/src/file/table/grid.ts b/src/file/table/grid.ts index b8a683f255..7c3fdbaa41 100644 --- a/src/file/table/grid.ts +++ b/src/file/table/grid.ts @@ -9,8 +9,8 @@ // // -import { twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { twipsMeasureValue } from "@util/values"; export class TableGrid extends XmlComponent { constructor(widths: number[] | string[]) { diff --git a/src/file/table/table-cell/table-cell-components.ts b/src/file/table/table-cell/table-cell-components.ts index e57785a19f..bcb8317602 100644 --- a/src/file/table/table-cell/table-cell-components.ts +++ b/src/file/table/table-cell/table-cell-components.ts @@ -1,6 +1,6 @@ -import { BorderElement, IBorderOptions } from "file/border"; -import { decimalNumber } from "file/values"; -import { IgnoreIfEmptyXmlComponent, XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { BorderElement, IBorderOptions } from "@file/border"; +import { IgnoreIfEmptyXmlComponent, XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber } from "@util/values"; // // diff --git a/src/file/table/table-cell/table-cell-properties.spec.ts b/src/file/table/table-cell/table-cell-properties.spec.ts index 03bd2adc3b..4a26ed46c7 100644 --- a/src/file/table/table-cell/table-cell-properties.spec.ts +++ b/src/file/table/table-cell/table-cell-properties.spec.ts @@ -1,8 +1,8 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { BorderStyle } from "file/border"; -import { VerticalAlign } from "file/vertical-align"; +import { Formatter } from "@export/formatter"; +import { BorderStyle } from "@file/border"; +import { VerticalAlign } from "@file/vertical-align"; import { WidthType } from "../table-width"; diff --git a/src/file/table/table-cell/table-cell-properties.ts b/src/file/table/table-cell/table-cell-properties.ts index a10808ef7c..c89c15fef0 100644 --- a/src/file/table/table-cell/table-cell-properties.ts +++ b/src/file/table/table-cell/table-cell-properties.ts @@ -1,5 +1,5 @@ -import { VerticalAlign, VerticalAlignElement } from "file/vertical-align"; -import { IgnoreIfEmptyXmlComponent } from "file/xml-components"; +import { VerticalAlign, VerticalAlignElement } from "@file/vertical-align"; +import { IgnoreIfEmptyXmlComponent } from "@file/xml-components"; import { IShadingAttributesProperties, Shading } from "../../shading"; import { ITableCellMarginOptions, TableCellMargin, TableCellMarginElementType } from "../table-properties/table-cell-margin"; diff --git a/src/file/table/table-cell/table-cell.spec.ts b/src/file/table/table-cell/table-cell.spec.ts index b4fa5e7429..acd42d7a31 100644 --- a/src/file/table/table-cell/table-cell.spec.ts +++ b/src/file/table/table-cell/table-cell.spec.ts @@ -1,9 +1,9 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { BorderStyle } from "file/border"; -import { ShadingType } from "file/shading"; -import { VerticalAlign } from "file/vertical-align"; +import { Formatter } from "@export/formatter"; +import { BorderStyle } from "@file/border"; +import { ShadingType } from "@file/shading"; +import { VerticalAlign } from "@file/vertical-align"; import { WidthType } from "../table-width"; import { TableCell } from "./table-cell"; diff --git a/src/file/table/table-cell/table-cell.ts b/src/file/table/table-cell/table-cell.ts index 565d389c6d..f77349829a 100644 --- a/src/file/table/table-cell/table-cell.ts +++ b/src/file/table/table-cell/table-cell.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPtableGrid.php -import { Paragraph } from "file/paragraph"; -import { IContext, IXmlableObject, XmlComponent } from "file/xml-components"; +import { Paragraph } from "@file/paragraph"; +import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components"; import { Table } from "../table"; import { ITableCellPropertiesOptions, TableCellProperties } from "./table-cell-properties"; diff --git a/src/file/table/table-properties/table-borders.spec.ts b/src/file/table/table-properties/table-borders.spec.ts index a13482f349..cfb869cacf 100644 --- a/src/file/table/table-properties/table-borders.spec.ts +++ b/src/file/table/table-properties/table-borders.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { BorderStyle } from "file/border"; +import { Formatter } from "@export/formatter"; +import { BorderStyle } from "@file/border"; import { TableBorders } from "./table-borders"; diff --git a/src/file/table/table-properties/table-borders.ts b/src/file/table/table-properties/table-borders.ts index 923a7bb019..bcfe20be8b 100644 --- a/src/file/table/table-properties/table-borders.ts +++ b/src/file/table/table-properties/table-borders.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPtableBorders.php -import { BorderElement, BorderStyle, IBorderOptions } from "file/border"; -import { XmlComponent } from "file/xml-components"; +import { BorderElement, BorderStyle, IBorderOptions } from "@file/border"; +import { XmlComponent } from "@file/xml-components"; export interface ITableBordersOptions { readonly top?: IBorderOptions; diff --git a/src/file/table/table-properties/table-cell-margin.spec.ts b/src/file/table/table-properties/table-cell-margin.spec.ts index 0361b37f27..97c6418bac 100644 --- a/src/file/table/table-properties/table-cell-margin.spec.ts +++ b/src/file/table/table-properties/table-cell-margin.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { WidthType } from "../table-width"; import { TableCellMargin, TableCellMarginElementType } from "./table-cell-margin"; diff --git a/src/file/table/table-properties/table-cell-margin.ts b/src/file/table/table-properties/table-cell-margin.ts index c01cf84f6e..24471f5d93 100644 --- a/src/file/table/table-properties/table-cell-margin.ts +++ b/src/file/table/table-properties/table-cell-margin.ts @@ -1,4 +1,4 @@ -import { IgnoreIfEmptyXmlComponent } from "file/xml-components"; +import { IgnoreIfEmptyXmlComponent } from "@file/xml-components"; import { TableWidthElement, WidthType } from "../table-width"; export interface ITableCellMarginOptions { diff --git a/src/file/table/table-properties/table-float-properties.spec.ts b/src/file/table/table-properties/table-float-properties.spec.ts index 10d38f31f3..88efe2821f 100644 --- a/src/file/table/table-properties/table-float-properties.spec.ts +++ b/src/file/table/table-properties/table-float-properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { RelativeHorizontalPosition, RelativeVerticalPosition, TableAnchorType, TableFloatProperties } from "./table-float-properties"; import { OverlapType } from "./table-overlap"; diff --git a/src/file/table/table-properties/table-float-properties.ts b/src/file/table/table-properties/table-float-properties.ts index 8e365fc93d..e0f19fc093 100644 --- a/src/file/table/table-properties/table-float-properties.ts +++ b/src/file/table/table-properties/table-float-properties.ts @@ -1,5 +1,5 @@ -import { signedTwipsMeasureValue, twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { signedTwipsMeasureValue, twipsMeasureValue } from "@util/values"; import { OverlapType, TableOverlap } from "./table-overlap"; @@ -27,6 +27,7 @@ export enum RelativeVerticalPosition { } export interface ITableFloatOptions { + /* cSpell:disable */ /** * Specifies the horizontal anchor or the base object from which the horizontal positioning in the * tblpX or tblpXSpec attribute should be determined. @@ -35,6 +36,7 @@ export interface ITableFloatOptions { * text - relative to the vertical edge of the text margin for the column in which the anchor paragraph is located * If omitted, the value is assumed to be page. */ + /* cSpell:enable */ readonly horizontalAnchor?: TableAnchorType; /** @@ -90,25 +92,25 @@ export interface ITableFloatOptions { readonly relativeVerticalPosition?: RelativeVerticalPosition; /** - * Specifies the minimun distance to be maintained between the table and the top of text in the paragraph + * Specifies the minimum distance to be maintained between the table and the top of text in the paragraph * below the table. The value is in twentieths of a point. If omitted, the value is assumed to be zero. */ readonly bottomFromText?: number | string; /** - * Specifies the minimun distance to be maintained between the table and the bottom edge of text in the paragraph + * Specifies the minimum distance to be maintained between the table and the bottom edge of text in the paragraph * above the table. The value is in twentieths of a point. If omitted, the value is assumed to be zero. */ readonly topFromText?: number | string; /** - * Specifies the minimun distance to be maintained between the table and the edge of text in the paragraph + * Specifies the minimum distance to be maintained between the table and the edge of text in the paragraph * to the left of the table. The value is in twentieths of a point. If omitted, the value is assumed to be zero. */ readonly leftFromText?: number | string; /** - * Specifies the minimun distance to be maintained between the table and the edge of text in the paragraph + * Specifies the minimum distance to be maintained between the table and the edge of text in the paragraph * to the right of the table. The value is in twentieths of a point. If omitted, the value is assumed to be zero. */ readonly rightFromText?: number | string; diff --git a/src/file/table/table-properties/table-layout.ts b/src/file/table/table-properties/table-layout.ts index ddbec7e66a..254e842729 100644 --- a/src/file/table/table-properties/table-layout.ts +++ b/src/file/table/table-properties/table-layout.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; // // diff --git a/src/file/table/table-properties/table-overlap.spec.ts b/src/file/table/table-properties/table-overlap.spec.ts index 80ddd13e3d..c4d3830c5e 100644 --- a/src/file/table/table-properties/table-overlap.spec.ts +++ b/src/file/table/table-properties/table-overlap.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { OverlapType, TableOverlap } from "./table-overlap"; diff --git a/src/file/table/table-properties/table-overlap.ts b/src/file/table/table-properties/table-overlap.ts index 102d2afa5d..a14a70accb 100644 --- a/src/file/table/table-properties/table-overlap.ts +++ b/src/file/table/table-properties/table-overlap.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; // // diff --git a/src/file/table/table-properties/table-properties.spec.ts b/src/file/table/table-properties/table-properties.spec.ts index ceadb5c3a8..bf4832691f 100644 --- a/src/file/table/table-properties/table-properties.spec.ts +++ b/src/file/table/table-properties/table-properties.spec.ts @@ -1,9 +1,9 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; -import { AlignmentType } from "file/paragraph"; -import { ShadingType } from "file/shading"; +import { AlignmentType } from "@file/paragraph"; +import { ShadingType } from "@file/shading"; import { WidthType } from "../table-width"; import { TableLayoutType } from "./table-layout"; diff --git a/src/file/table/table-properties/table-properties.ts b/src/file/table/table-properties/table-properties.ts index 5e46cfa92a..1be92a9392 100644 --- a/src/file/table/table-properties/table-properties.ts +++ b/src/file/table/table-properties/table-properties.ts @@ -21,7 +21,7 @@ // // // -import { IgnoreIfEmptyXmlComponent, OnOffElement, StringValueElement } from "file/xml-components"; +import { IgnoreIfEmptyXmlComponent, OnOffElement, StringValueElement } from "@file/xml-components"; import { Alignment, AlignmentType } from "../../paragraph"; import { IShadingAttributesProperties, Shading } from "../../shading"; diff --git a/src/file/table/table-row/table-row-height.ts b/src/file/table/table-row/table-row-height.ts index 84d696b63b..b8b1390fa0 100644 --- a/src/file/table/table-row/table-row-height.ts +++ b/src/file/table/table-row/table-row-height.ts @@ -1,5 +1,5 @@ -import { twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { twipsMeasureValue } from "@util/values"; // // diff --git a/src/file/table/table-row/table-row-properties.spec.ts b/src/file/table/table-row/table-row-properties.spec.ts index 3f008ce77e..b9cde6078b 100644 --- a/src/file/table/table-row/table-row-properties.spec.ts +++ b/src/file/table/table-row/table-row-properties.spec.ts @@ -1,6 +1,8 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { HeightRule } from "file/table/table-row/table-row-height"; + +import { Formatter } from "@export/formatter"; +import { HeightRule } from "@file/table/table-row/table-row-height"; + import { TableRowProperties } from "./table-row-properties"; describe("TableRowProperties", () => { diff --git a/src/file/table/table-row/table-row-properties.ts b/src/file/table/table-row/table-row-properties.ts index 2168d0774a..d4ebdc0264 100644 --- a/src/file/table/table-row/table-row-properties.ts +++ b/src/file/table/table-row/table-row-properties.ts @@ -27,7 +27,7 @@ // // // -import { IgnoreIfEmptyXmlComponent, OnOffElement } from "file/xml-components"; +import { IgnoreIfEmptyXmlComponent, OnOffElement } from "@file/xml-components"; import { HeightRule, TableRowHeight } from "./table-row-height"; diff --git a/src/file/table/table-row/table-row.spec.ts b/src/file/table/table-row/table-row.spec.ts index f1bcbb1aaf..f8bf783fd8 100644 --- a/src/file/table/table-row/table-row.spec.ts +++ b/src/file/table/table-row/table-row.spec.ts @@ -1,10 +1,10 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; -import { Paragraph } from "file/paragraph"; -import { HeightRule } from "file/table/table-row/table-row-height"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { Paragraph } from "@file/paragraph"; +import { HeightRule } from "@file/table/table-row/table-row-height"; +import { EMPTY_OBJECT } from "@file/xml-components"; import { TableCell } from "../table-cell"; import { TableRow } from "./table-row"; diff --git a/src/file/table/table-row/table-row.ts b/src/file/table/table-row/table-row.ts index 11dc9c776a..cfa22a5b6d 100644 --- a/src/file/table/table-row/table-row.ts +++ b/src/file/table/table-row/table-row.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { TableCell } from "../table-cell"; import { ITableRowPropertiesOptions, TableRowProperties } from "./table-row-properties"; diff --git a/src/file/table/table-width.ts b/src/file/table/table-width.ts index 554654a583..530a34b3e9 100644 --- a/src/file/table/table-width.ts +++ b/src/file/table/table-width.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPtableWidth.php -import { measurementOrPercentValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { measurementOrPercentValue } from "@util/values"; // // diff --git a/src/file/table/table.spec.ts b/src/file/table/table.spec.ts index 78a273e4e1..38d0620f7d 100644 --- a/src/file/table/table.spec.ts +++ b/src/file/table/table.spec.ts @@ -1,7 +1,7 @@ /* tslint:disable:no-unused-expression */ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { AlignmentType, Paragraph } from "../paragraph"; import { Table } from "./table"; diff --git a/src/file/table/table.ts b/src/file/table/table.ts index 5751207ba9..a7564104c8 100644 --- a/src/file/table/table.ts +++ b/src/file/table/table.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPtableGrid.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { AlignmentType } from "../paragraph"; import { TableGrid } from "./grid"; diff --git a/src/file/track-revision/track-revision-components/deleted-page-number.spec.ts b/src/file/track-revision/track-revision-components/deleted-page-number.spec.ts index 5e0238da96..274484ea02 100644 --- a/src/file/track-revision/track-revision-components/deleted-page-number.spec.ts +++ b/src/file/track-revision/track-revision-components/deleted-page-number.spec.ts @@ -1,5 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; + +import { Formatter } from "@export/formatter"; + import { DeletedNumberOfPages, DeletedNumberOfPagesSection, DeletedPage } from "./deleted-page-number"; describe("Deleted Page", () => { @@ -11,7 +13,7 @@ describe("Deleted Page", () => { }); }); -describe("Delted NumberOfPages", () => { +describe("Deleted NumberOfPages", () => { describe("#constructor()", () => { it("uses the font name for both ascii and hAnsi", () => { const tree = new Formatter().format(new DeletedNumberOfPages()); diff --git a/src/file/track-revision/track-revision-components/deleted-page-number.ts b/src/file/track-revision/track-revision-components/deleted-page-number.ts index 469b9b1700..27b8e52bdf 100644 --- a/src/file/track-revision/track-revision-components/deleted-page-number.ts +++ b/src/file/track-revision/track-revision-components/deleted-page-number.ts @@ -1,6 +1,6 @@ -import { TextAttributes } from "file/paragraph/run/text-attributes"; -import { SpaceType } from "file/space-type"; -import { XmlComponent } from "file/xml-components"; +import { TextAttributes } from "@file/paragraph/run/text-attributes"; +import { SpaceType } from "@file/space-type"; +import { XmlComponent } from "@file/xml-components"; export class DeletedPage extends XmlComponent { constructor() { diff --git a/src/file/track-revision/track-revision-components/deleted-text-run.spec.ts b/src/file/track-revision/track-revision-components/deleted-text-run.spec.ts index 9eacb7c23c..0e445888d7 100644 --- a/src/file/track-revision/track-revision-components/deleted-text-run.spec.ts +++ b/src/file/track-revision/track-revision-components/deleted-text-run.spec.ts @@ -1,6 +1,9 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { FootnoteReferenceRun, PageNumber } from "../../index"; + +import { Formatter } from "@export/formatter"; +import { FootnoteReferenceRun } from "@file/footnotes"; +import { PageNumber } from "@file/paragraph"; + import { DeletedTextRun } from "./deleted-text-run"; describe("DeletedTextRun", () => { diff --git a/src/file/track-revision/track-revision-components/deleted-text-run.ts b/src/file/track-revision/track-revision-components/deleted-text-run.ts index 7830d3d63c..cc4d41cf9e 100644 --- a/src/file/track-revision/track-revision-components/deleted-text-run.ts +++ b/src/file/track-revision/track-revision-components/deleted-text-run.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { IRunOptions, RunProperties } from "../../index"; import { Break } from "../../paragraph/run/break"; diff --git a/src/file/track-revision/track-revision-components/deleted-text.spec.ts b/src/file/track-revision/track-revision-components/deleted-text.spec.ts index d9c8de46bf..7a4b859acf 100644 --- a/src/file/track-revision/track-revision-components/deleted-text.spec.ts +++ b/src/file/track-revision/track-revision-components/deleted-text.spec.ts @@ -1,5 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; + +import { Formatter } from "@export/formatter"; + import { DeletedText } from "./deleted-text"; describe("Deleted Text", () => { diff --git a/src/file/track-revision/track-revision-components/deleted-text.ts b/src/file/track-revision/track-revision-components/deleted-text.ts index 1311e056d8..f0e3ee4d34 100644 --- a/src/file/track-revision/track-revision-components/deleted-text.ts +++ b/src/file/track-revision/track-revision-components/deleted-text.ts @@ -1,6 +1,6 @@ -import { TextAttributes } from "file/paragraph/run/text-attributes"; -import { SpaceType } from "file/space-type"; -import { XmlComponent } from "file/xml-components"; +import { TextAttributes } from "@file/paragraph/run/text-attributes"; +import { SpaceType } from "@file/space-type"; +import { XmlComponent } from "@file/xml-components"; export class DeletedText extends XmlComponent { constructor(text: string) { diff --git a/src/file/track-revision/track-revision-components/inserted-text-run.spec.ts b/src/file/track-revision/track-revision-components/inserted-text-run.spec.ts index c23069fbba..ee5e2b957e 100644 --- a/src/file/track-revision/track-revision-components/inserted-text-run.spec.ts +++ b/src/file/track-revision/track-revision-components/inserted-text-run.spec.ts @@ -1,5 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; + +import { Formatter } from "@export/formatter"; + import { InsertedTextRun } from "./inserted-text-run"; describe("InsertedTextRun", () => { diff --git a/src/file/track-revision/track-revision-components/inserted-text-run.ts b/src/file/track-revision/track-revision-components/inserted-text-run.ts index 3d39e92c1c..0389de2d89 100644 --- a/src/file/track-revision/track-revision-components/inserted-text-run.ts +++ b/src/file/track-revision/track-revision-components/inserted-text-run.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { IRunOptions, TextRun } from "../../index"; import { ChangeAttributes, IChangedAttributesProperties } from "../track-revision"; diff --git a/src/file/track-revision/track-revision.ts b/src/file/track-revision/track-revision.ts index 4318e9a468..37fe5ef951 100644 --- a/src/file/track-revision/track-revision.ts +++ b/src/file/track-revision/track-revision.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export interface IChangedAttributesProperties { readonly id: number; diff --git a/src/file/vertical-align/vertical-align.ts b/src/file/vertical-align/vertical-align.ts index 1213eec45b..30b8300990 100644 --- a/src/file/vertical-align/vertical-align.ts +++ b/src/file/vertical-align/vertical-align.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; // // diff --git a/src/file/xml-components/imported-xml-component.ts b/src/file/xml-components/imported-xml-component.ts index 0bf29c401e..85d46a7dbd 100644 --- a/src/file/xml-components/imported-xml-component.ts +++ b/src/file/xml-components/imported-xml-component.ts @@ -13,8 +13,8 @@ export function convertToXmlComponent(element: XmlElement): ImportedXmlComponent case undefined: case "element": const xmlComponent = new ImportedXmlComponent(element.name as string, element.attributes); - const childElments = element.elements || []; - for (const childElm of childElments) { + const childElements = element.elements || []; + for (const childElm of childElements) { const child = convertToXmlComponent(childElm); if (child !== undefined) { xmlComponent.push(child); diff --git a/src/file/xml-components/initializable-xml-component.ts b/src/file/xml-components/initializable-xml-component.ts index 5d461c007a..636f6d5a4d 100644 --- a/src/file/xml-components/initializable-xml-component.ts +++ b/src/file/xml-components/initializable-xml-component.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export abstract class InitializableXmlComponent extends XmlComponent { constructor(rootKey: string, initComponent?: InitializableXmlComponent) { diff --git a/src/file/xml-components/simple-elements.ts b/src/file/xml-components/simple-elements.ts index 02562e4c58..6478d5cec3 100644 --- a/src/file/xml-components/simple-elements.ts +++ b/src/file/xml-components/simple-elements.ts @@ -1,6 +1,6 @@ -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; -import { hpsMeasureValue } from "../values"; +import { hpsMeasureValue } from "@util/values"; // This represents element type CT_OnOff, which indicate a boolean value. // diff --git a/src/file/xml-components/xml-component.spec.ts b/src/file/xml-components/xml-component.spec.ts index 497f14eab2..414059ee61 100644 --- a/src/file/xml-components/xml-component.spec.ts +++ b/src/file/xml-components/xml-component.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Attributes, BaseXmlComponent, XmlComponent } from "./"; class TestComponent extends XmlComponent { diff --git a/src/import-dotx/import-dotx.ts b/src/import-dotx/import-dotx.ts index 3ef73208d8..faaf2b9bdd 100644 --- a/src/import-dotx/import-dotx.ts +++ b/src/import-dotx/import-dotx.ts @@ -1,12 +1,12 @@ import * as JSZip from "jszip"; import { Element as XMLElement, ElementCompact as XMLElementCompact, xml2js } from "xml-js"; -import { HeaderFooterReferenceType } from "file/document/body/section-properties"; -import { FooterWrapper, IDocumentFooter } from "file/footer-wrapper"; -import { HeaderWrapper, IDocumentHeader } from "file/header-wrapper"; -import { Media } from "file/media"; -import { TargetModeType } from "file/relationships/relationship/relationship"; -import { convertToXmlComponent, ImportedXmlComponent } from "file/xml-components"; +import { HeaderFooterReferenceType } from "@file/document/body/section-properties"; +import { FooterWrapper, IDocumentFooter } from "@file/footer-wrapper"; +import { HeaderWrapper, IDocumentHeader } from "@file/header-wrapper"; +import { Media } from "@file/media"; +import { TargetModeType } from "@file/relationships/relationship/relationship"; +import { convertToXmlComponent, ImportedXmlComponent } from "@file/xml-components"; const schemeToType = { "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header": "header", @@ -141,12 +141,12 @@ export class ImportDotx { } private async addRelationshipToWrapper( - relationhipFile: IRelationshipFileInfo, + relationshipFile: IRelationshipFileInfo, zipContent: JSZip, wrapper: HeaderWrapper | FooterWrapper, media: Media, ): Promise { - const refFile = zipContent.files[`word/_rels/${relationhipFile.target}.rels`]; + const refFile = zipContent.files[`word/_rels/${relationshipFile.target}.rels`]; if (!refFile) { return; diff --git a/src/index.ts b/src/index.ts index a319e4dcfe..3d76a0f70f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -4,4 +4,4 @@ export { File as Document } from "./file"; export * from "./file"; export * from "./export"; export * from "./import-dotx"; -export * from "./convenience-functions"; +export * from "./util"; diff --git a/src/convenience-functions.spec.ts b/src/util/convenience-functions.spec.ts similarity index 86% rename from src/convenience-functions.spec.ts rename to src/util/convenience-functions.spec.ts index 9a437adc73..79527d3854 100644 --- a/src/convenience-functions.spec.ts +++ b/src/util/convenience-functions.spec.ts @@ -4,13 +4,13 @@ import { convertInchesToTwip, convertMillimetersToTwip, uniqueId, uniqueNumericI describe("Utility", () => { describe("#convertMillimetersToTwip", () => { - it("should call the underlying header's addChildElement for Paragraph", () => { + it("should convert millimeters to TWIP", () => { expect(convertMillimetersToTwip(1000)).to.equal(56692); }); }); describe("#convertInchesToTwip", () => { - it("should call the underlying header's addChildElement", () => { + it("should convert inches to TWIP", () => { expect(convertInchesToTwip(1)).to.equal(1440); expect(convertInchesToTwip(0.5)).to.equal(720); expect(convertInchesToTwip(0.25)).to.equal(360); diff --git a/src/convenience-functions.ts b/src/util/convenience-functions.ts similarity index 100% rename from src/convenience-functions.ts rename to src/util/convenience-functions.ts diff --git a/src/util/index.ts b/src/util/index.ts new file mode 100644 index 0000000000..36d4db927d --- /dev/null +++ b/src/util/index.ts @@ -0,0 +1,2 @@ +export * from "./convenience-functions"; +export * from "./values"; diff --git a/src/file/values.spec.ts b/src/util/values.spec.ts similarity index 99% rename from src/file/values.spec.ts rename to src/util/values.spec.ts index 3ef06a6abc..b4b36dbe44 100644 --- a/src/file/values.spec.ts +++ b/src/util/values.spec.ts @@ -73,6 +73,7 @@ describe("values", () => { it("should throw on invalid values", () => { expect(() => shortHexNumber("11")).to.throw(); expect(() => shortHexNumber("112233")).to.throw(); + /* cspell:disable-next-line */ expect(() => shortHexNumber("FFFG")).to.throw(); }); }); diff --git a/src/file/values.ts b/src/util/values.ts similarity index 99% rename from src/file/values.ts rename to src/util/values.ts index 8634d47de4..aab6bc11ab 100644 --- a/src/file/values.ts +++ b/src/util/values.ts @@ -208,6 +208,7 @@ export const pointMeasureValue = unsignedDecimalNumber; // // http://www.datypic.com/sc/xsd/t-xsd_dateTime.html // The type xsd:dateTime represents a specific date and time in the format +/* cspell:disable-next-line */ // CCYY-MM-DDThh:mm:ss.sss, which is a concatenation of the date and time forms, // separated by a literal letter "T". All of the same rules that apply to the date // and time types are applicable to xsd:dateTime as well. diff --git a/tsconfig.json b/tsconfig.json index 1105b2e0ef..f56947caa9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,9 +14,9 @@ "noUnusedParameters": true, "baseUrl": "./src", "paths": { - "convenience-functions": ["./convenience-functions"], + "@util/*": ["./util/*"], "@export/*": ["./export/*"], - "file/*": ["./file/*"] + "@file/*": ["./file/*"] } }, "include": ["src"] diff --git a/tsconfig.lib.json b/tsconfig.lib.json new file mode 100644 index 0000000000..7017350e3a --- /dev/null +++ b/tsconfig.lib.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts"], + "exclude": ["src/**/*.spec.ts"] +} diff --git a/tsconfig.typedoc.json b/tsconfig.typedoc.json index 741f3906df..0f192deeb8 100644 --- a/tsconfig.typedoc.json +++ b/tsconfig.typedoc.json @@ -7,5 +7,5 @@ "excludePrivate": true, "excludeProtected": true, "excludeExternals": false - } + } } diff --git a/webpack.config.ts b/webpack.config.ts index 1c7d3dcb22..5871440f3f 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -1,5 +1,6 @@ const path = require("path"); const { ProvidePlugin } = require("webpack"); +const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin"); const configuration = { mode: "production", @@ -21,6 +22,10 @@ const configuration = { buffer: require.resolve("buffer"), stream: require.resolve("stream-browserify"), }, + plugins: [new TsconfigPathsPlugin()], + alias: { + jszip: require.resolve('jszip/lib/index.js'), + }, }, module: { @@ -29,7 +34,7 @@ const configuration = { test: /\.ts$/, loader: "ts-loader", options: { - configFile: "tsconfig.json", + configFile: "tsconfig.lib.json", }, }, ],