Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update TypeScript, Jest, ts-jest #60

Merged
merged 3 commits into from
Aug 1, 2023
Merged

Update TypeScript, Jest, ts-jest #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e689da7
Update to latest TypeScript
danvk Aug 1, 2023
880b1a9
update one test
danvk Aug 1, 2023
afdcad7
Update Jest and ts-jest
danvk Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"javascriptreact",
"typescript",
"typescriptreact"
]
],
"typescript.tsdk": "node_modules/typescript/lib"
}
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "literate-ts",
"version": "1.2.0",
"version": "1.2.1",
"description": "Code samples that scale",
"main": "dist/index.js",
"repository": "https://github.com/danvk/literate-ts.git",
Expand All @@ -26,7 +26,7 @@
"yargs": "^14.0.0"
},
"peerDependencies": {
"typescript": ">3.6"
"typescript": ">4.1"
},
"devDependencies": {
"@types/fs-extra": "^8.0.0",
Expand All @@ -42,10 +42,10 @@
"eslint": "^6.3.0",
"eslint-config-prettier": "^6.3.0",
"eslint-plugin-prettier": "^3.1.0",
"jest": "^24.9.0",
"jest": "^29.6.2",
"prettier": "^1.18.2",
"ts-jest": "^24.0.2",
"ts-jest": "^29.1.1",
"ts-node": "^8.3.0",
"typescript": "^3.6.2"
"typescript": "^5.1.6"
}
}
2 changes: 1 addition & 1 deletion src/node-runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export async function runNode(path: string): Promise<ExecErrorType> {
const {stdout, stderr} = await util.promisify(exec)(`node ${path}`);
return {code: 0, stderr, stdout};
} catch (eIn) {
const e: ExecErrorType = eIn;
const e = eIn as ExecErrorType;
const {code, stderr, stdout} = e;
log(`Node exited with error ${e.code} on ${path}`);
return {code, stderr, stdout};
Expand Down
150 changes: 75 additions & 75 deletions src/test/__snapshots__/asciidoc.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`extractSamples snapshot: backticks 1`] = `
Array [
Object {
[
{
"checkJS": false,
"content": "function greet(who: string) {
console.log('Hello', who);
Expand All @@ -11,59 +11,59 @@ Array [
"id": "greet-ts",
"isTSX": false,
"language": "ts",
"nodeModules": Array [],
"prefixes": Array [],
"nodeModules": [],
"prefixes": [],
"sectionHeader": null,
"sourceFile": "backticks.asciidoc",
"tsOptions": Object {},
"tsOptions": {},
},
Object {
{
"checkJS": false,
"content": "export const Example = () => <div />;",
"descriptor": "./backticks.asciidoc:11",
"id": "greet-tsx",
"isTSX": false,
"language": "tsx",
"nodeModules": Array [],
"prefixes": Array [],
"nodeModules": [],
"prefixes": [],
"sectionHeader": null,
"sourceFile": "backticks.asciidoc",
"tsOptions": Object {},
"tsOptions": {},
},
Object {
{
"checkJS": false,
"content": "console.log(\\"end of file\\");",
"content": "console.log("end of file");",
"descriptor": "./backticks.asciidoc:26",
"id": "backticks-26",
"isTSX": false,
"language": "ts",
"nodeModules": Array [],
"prefixes": Array [],
"nodeModules": [],
"prefixes": [],
"sectionHeader": null,
"sourceFile": "backticks.asciidoc",
"tsOptions": Object {},
"tsOptions": {},
},
]
`;

exports[`extractSamples snapshot: backticks-disabled 1`] = `Array []`;
exports[`extractSamples snapshot: backticks-disabled 1`] = `[]`;

exports[`extractSamples snapshot: commented-sample 1`] = `
Array [
Object {
[
{
"checkJS": false,
"content": "function somethingDangerous() {}",
"descriptor": "./commented-sample.asciidoc:6",
"id": "commented-sample-6",
"isTSX": false,
"language": "ts",
"nodeModules": Array [],
"prefixes": Array [],
"nodeModules": [],
"prefixes": [],
"sectionHeader": null,
"sourceFile": "commented-sample.asciidoc",
"tsOptions": Object {},
"tsOptions": {},
},
Object {
{
"checkJS": false,
"content": "let val = null; // Type is any
try {
Expand All @@ -78,22 +78,22 @@ val // Type is number | null",
"id": "commented-sample-12",
"isTSX": false,
"language": "ts",
"nodeModules": Array [],
"prefixes": Array [
Object {
"nodeModules": [],
"prefixes": [
{
"id": "commented-sample-6",
},
],
"sectionHeader": null,
"sourceFile": "commented-sample.asciidoc",
"tsOptions": Object {},
"tsOptions": {},
},
]
`;

exports[`extractSamples snapshot: doc1 1`] = `
Array [
Object {
[
{
"checkJS": false,
"content": "function greet(who: string) {
console.log('Hello', who);
Expand All @@ -102,18 +102,18 @@ Array [
"id": "greet-ts",
"isTSX": false,
"language": "ts",
"nodeModules": Array [],
"prefixes": Array [],
"nodeModules": [],
"prefixes": [],
"sectionHeader": null,
"sourceFile": "doc1.asciidoc",
"tsOptions": Object {},
"tsOptions": {},
},
]
`;

exports[`extractSamples snapshot: multilinetype 1`] = `
Array [
Object {
[
{
"checkJS": false,
"content": "const o = {x: 1, y: 2};
// type is {
Expand All @@ -124,13 +124,13 @@ Array [
"id": "multilinetype-3",
"isTSX": false,
"language": "ts",
"nodeModules": Array [],
"prefixes": Array [],
"nodeModules": [],
"prefixes": [],
"sectionHeader": null,
"sourceFile": "multilinetype.asciidoc",
"tsOptions": Object {},
"tsOptions": {},
},
Object {
{
"checkJS": false,
"content": "function addWithExtras(a: number, b: number) {
const c = a + b; // type is number
Expand All @@ -141,134 +141,134 @@ Array [
"id": "multilinetype-13",
"isTSX": false,
"language": "ts",
"nodeModules": Array [],
"prefixes": Array [],
"nodeModules": [],
"prefixes": [],
"sectionHeader": null,
"sourceFile": "multilinetype.asciidoc",
"tsOptions": Object {},
"tsOptions": {},
},
]
`;

exports[`extractSamples snapshot: noid 1`] = `
Array [
Object {
[
{
"checkJS": false,
"content": "console.log('Hello', 'TS');",
"descriptor": "./noid.asciidoc:9",
"id": "noid-9",
"isTSX": false,
"language": "ts",
"nodeModules": Array [],
"prefixes": Array [],
"nodeModules": [],
"prefixes": [],
"sectionHeader": null,
"sourceFile": "noid.asciidoc",
"tsOptions": Object {},
"tsOptions": {},
},
]
`;

exports[`extractSamples snapshot: prepend 1`] = `
Array [
Object {
[
{
"checkJS": false,
"content": "type AB = 'a' | 'b';",
"descriptor": "./prepend.asciidoc:1",
"id": "prefix",
"isTSX": false,
"language": "ts",
"nodeModules": Array [],
"prefixes": Array [],
"nodeModules": [],
"prefixes": [],
"sectionHeader": null,
"sourceFile": "prepend.asciidoc",
"tsOptions": Object {},
"tsOptions": {},
},
Object {
{
"checkJS": false,
"content": "const a: AB = 'a';",
"descriptor": "./prepend.asciidoc:7",
"id": "combined",
"isTSX": false,
"language": "ts",
"nodeModules": Array [],
"prefixes": Array [
Object {
"nodeModules": [],
"prefixes": [
{
"id": "prefix",
},
],
"sectionHeader": null,
"sourceFile": "prepend.asciidoc",
"tsOptions": Object {},
"tsOptions": {},
},
Object {
{
"checkJS": false,
"content": "const a: AB = 'a';",
"descriptor": "./prepend.asciidoc:15",
"id": "final",
"isTSX": false,
"language": "ts",
"nodeModules": Array [],
"prefixes": Array [],
"nodeModules": [],
"prefixes": [],
"sectionHeader": null,
"sourceFile": "prepend.asciidoc",
"tsOptions": Object {},
"tsOptions": {},
},
]
`;

exports[`extractSamples snapshot: prepend-multiple 1`] = `
Array [
Object {
[
{
"checkJS": false,
"content": "type AB = 'a' | 'b';",
"descriptor": "./prepend-multiple.asciidoc:3",
"id": "prepend-multiple-3",
"isTSX": false,
"language": "ts",
"nodeModules": Array [],
"prefixes": Array [],
"nodeModules": [],
"prefixes": [],
"sectionHeader": null,
"sourceFile": "prepend-multiple.asciidoc",
"tsOptions": Object {},
"tsOptions": {},
},
Object {
{
"checkJS": false,
"content": "type ABC = AB | 'c';",
"descriptor": "./prepend-multiple.asciidoc:9",
"id": "prepend-multiple-9",
"isTSX": false,
"language": "ts",
"nodeModules": Array [],
"prefixes": Array [
Object {
"nodeModules": [],
"prefixes": [
{
"id": "prepend-multiple-3",
},
],
"sectionHeader": null,
"sourceFile": "prepend-multiple.asciidoc",
"tsOptions": Object {},
"tsOptions": {},
},
Object {
{
"checkJS": false,
"content": "const c: ABC = 'c';",
"descriptor": "./prepend-multiple.asciidoc:14",
"id": "prepend-multiple-14",
"isTSX": false,
"language": "ts",
"nodeModules": Array [],
"prefixes": Array [
Object {
"nodeModules": [],
"prefixes": [
{
"id": "prepend-multiple-3",
},
Object {
{
"id": "prepend-multiple-9",
},
],
"sectionHeader": null,
"sourceFile": "prepend-multiple.asciidoc",
"tsOptions": Object {},
"tsOptions": {},
},
]
`;

exports[`extractSamples snapshot: skip 1`] = `Array []`;
exports[`extractSamples snapshot: skip 1`] = `[]`;
Loading
Loading