Skip to content

Commit 71e59dc

Browse files
progfayprogfay
committedJan 24, 2025··
refactor(tsc): enable isolated{Modules,Declarations} 
1 parent 2fefb8d commit 71e59dc

13 files changed

+82
-48
lines changed
 

‎src/block/node/FormulaNode.ts

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { createPlainNode } from "./PlainNode.ts";
22
import { createNodeParser } from "./creator.ts";
33

44
import type { NodeCreator } from "./creator.ts";
5+
import type { NodeParser } from "./index.ts";
56
import type { FormulaNode, PlainNode } from "./type.ts";
67

78
const formulaWithTailHalfSpaceRegExp = /\[\$ .+? \]/;
@@ -18,8 +19,11 @@ const createFormulaNode: NodeCreator<FormulaNode | PlainNode> = (raw, opts) =>
1819
},
1920
];
2021

21-
export const FormulaNodeParser = createNodeParser(createFormulaNode, {
22-
parseOnNested: false,
23-
parseOnQuoted: true,
24-
patterns: [formulaWithTailHalfSpaceRegExp, formulaRegExp],
25-
});
22+
export const FormulaNodeParser: NodeParser = createNodeParser(
23+
createFormulaNode,
24+
{
25+
parseOnNested: false,
26+
parseOnQuoted: true,
27+
patterns: [formulaWithTailHalfSpaceRegExp, formulaRegExp],
28+
},
29+
);

‎src/block/node/GoogleMapNode.ts

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { createPlainNode } from "./PlainNode.ts";
22
import { createNodeParser } from "./creator.ts";
33

44
import type { NodeCreator } from "./creator.ts";
5+
import type { NodeParser } from "./index.ts";
56
import type { GoogleMapNode, PlainNode } from "./type.ts";
67

78
const placeFirstGoogleMapRegExp =
@@ -62,8 +63,11 @@ const createGoogleMapNode: NodeCreator<GoogleMapNode | PlainNode> = (
6263
];
6364
};
6465

65-
export const GoogleMapNodeParser = createNodeParser(createGoogleMapNode, {
66-
parseOnNested: false,
67-
parseOnQuoted: true,
68-
patterns: [placeFirstGoogleMapRegExp, coordFirstGoogleMapRegExp],
69-
});
66+
export const GoogleMapNodeParser: NodeParser = createNodeParser(
67+
createGoogleMapNode,
68+
{
69+
parseOnNested: false,
70+
parseOnQuoted: true,
71+
patterns: [placeFirstGoogleMapRegExp, coordFirstGoogleMapRegExp],
72+
},
73+
);

‎src/block/node/HashTagNode.ts

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { createPlainNode } from "./PlainNode.ts";
22
import { createNodeParser } from "./creator.ts";
33

44
import type { NodeCreator } from "./creator.ts";
5+
import type { NodeParser } from "./index.ts";
56
import type { HashTagNode, PlainNode } from "./type.ts";
67

78
const hashTagRegExp = /(?:^|\s)#\S+/;
@@ -34,8 +35,11 @@ const createHashTagNode: NodeCreator<HashTagNode | PlainNode> = (raw, opts) => {
3435
];
3536
};
3637

37-
export const HashTagNodeParser = createNodeParser(createHashTagNode, {
38-
parseOnNested: true,
39-
parseOnQuoted: true,
40-
patterns: [hashTagRegExp],
41-
});
38+
export const HashTagNodeParser: NodeParser = createNodeParser(
39+
createHashTagNode,
40+
{
41+
parseOnNested: true,
42+
parseOnQuoted: true,
43+
patterns: [hashTagRegExp],
44+
},
45+
);

‎src/block/node/HelpfeelNode.ts

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { createPlainNode } from "./PlainNode.ts";
22
import { createNodeParser } from "./creator.ts";
33

44
import type { NodeCreator } from "./creator.ts";
5+
import type { NodeParser } from "./index.ts";
56
import type { HelpfeelNode, PlainNode } from "./type.ts";
67

78
const helpfeelRegExp = /^\? .+$/;
@@ -20,8 +21,11 @@ const createHelpfeelNode: NodeCreator<HelpfeelNode | PlainNode> = (
2021
},
2122
];
2223

23-
export const HelpfeelNodeParser = createNodeParser(createHelpfeelNode, {
24-
parseOnNested: false,
25-
parseOnQuoted: false,
26-
patterns: [helpfeelRegExp],
27-
});
24+
export const HelpfeelNodeParser: NodeParser = createNodeParser(
25+
createHelpfeelNode,
26+
{
27+
parseOnNested: false,
28+
parseOnQuoted: false,
29+
patterns: [helpfeelRegExp],
30+
},
31+
);

‎src/block/node/IconNode.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { createNodeParser } from "./creator.ts";
22
import type { NodeCreator } from "./creator.ts";
3+
import type { NodeParser } from "./index.ts";
34
import type { IconNode } from "./type.ts";
45

56
const iconRegExp = /\[[^[\]]*\.icon(?:\*[1-9]\d*)?\]/;
@@ -18,7 +19,7 @@ const createIconNode: NodeCreator<IconNode> = (raw) => {
1819
.map(() => ({ path, pathType, type: "icon", raw }));
1920
};
2021

21-
export const IconNodeParser = createNodeParser(createIconNode, {
22+
export const IconNodeParser: NodeParser = createNodeParser(createIconNode, {
2223
parseOnNested: true,
2324
parseOnQuoted: true,
2425
patterns: [iconRegExp],

‎src/block/node/ImageNode.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { createPlainNode } from "./PlainNode.ts";
22
import { createNodeParser } from "./creator.ts";
33

44
import type { NodeCreator } from "./creator.ts";
5+
import type { NodeParser } from "./index.ts";
56
import type { ImageNode, PlainNode } from "./type.ts";
67

78
const srcFirstStrongImageRegExp =
@@ -46,7 +47,7 @@ const createImageNode: NodeCreator<ImageNode | PlainNode> = (raw, opts) => {
4647
];
4748
};
4849

49-
export const ImageNodeParser = createNodeParser(createImageNode, {
50+
export const ImageNodeParser: NodeParser = createNodeParser(createImageNode, {
5051
parseOnNested: true,
5152
parseOnQuoted: true,
5253
patterns: [

‎src/block/node/InternalLinkNode.ts

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { createNodeParser } from "./creator.ts";
22

33
import type { NodeCreator } from "./creator.ts";
4+
import type { NodeParser } from "./index.ts";
45
import type { LinkNode } from "./type.ts";
56

67
const internalLinkRegExp = /\[\/?[^[\]]+\]/;
@@ -18,8 +19,11 @@ const createInternalLinkNode: NodeCreator<LinkNode> = (raw) => {
1819
];
1920
};
2021

21-
export const InternalLinkNodeParser = createNodeParser(createInternalLinkNode, {
22-
parseOnNested: true,
23-
parseOnQuoted: true,
24-
patterns: [internalLinkRegExp],
25-
});
22+
export const InternalLinkNodeParser: NodeParser = createNodeParser(
23+
createInternalLinkNode,
24+
{
25+
parseOnNested: true,
26+
parseOnQuoted: true,
27+
patterns: [internalLinkRegExp],
28+
},
29+
);

‎src/block/node/NumberListNode.ts

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { createPlainNode } from "./PlainNode.ts";
22
import { createNodeParser } from "./creator.ts";
3-
import { convertToNodes } from "./index.ts";
3+
import { type NodeParser, convertToNodes } from "./index.ts";
44

55
import type { NodeCreator } from "./creator.ts";
66
import type { NumberListNode, PlainNode } from "./type.ts";
@@ -30,8 +30,11 @@ const createNumberListNode: NodeCreator<NumberListNode | PlainNode> = (
3030
];
3131
};
3232

33-
export const NumberListNodeParser = createNodeParser(createNumberListNode, {
34-
parseOnNested: false,
35-
parseOnQuoted: false,
36-
patterns: [numberListRegExp],
37-
});
33+
export const NumberListNodeParser: NodeParser = createNodeParser(
34+
createNumberListNode,
35+
{
36+
parseOnNested: false,
37+
parseOnQuoted: false,
38+
patterns: [numberListRegExp],
39+
},
40+
);

‎src/block/node/QuoteNode.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { createPlainNode } from "./PlainNode.ts";
22
import { createNodeParser } from "./creator.ts";
3-
import { convertToNodes } from "./index.ts";
3+
import { type NodeParser, convertToNodes } from "./index.ts";
44

55
import type { NodeCreator } from "./creator.ts";
66
import type { PlainNode, QuoteNode } from "./type.ts";
@@ -18,7 +18,7 @@ const createQuoteNode: NodeCreator<QuoteNode | PlainNode> = (raw, opts) =>
1818
},
1919
];
2020

21-
export const QuoteNodeParser = createNodeParser(createQuoteNode, {
21+
export const QuoteNodeParser: NodeParser = createNodeParser(createQuoteNode, {
2222
parseOnNested: false,
2323
parseOnQuoted: false,
2424
patterns: [quoteRegExp],

‎src/block/node/StrongIconNode.ts

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { createPlainNode } from "./PlainNode.ts";
22
import { type NodeCreator, createNodeParser } from "./creator.ts";
3+
import type { NodeParser } from "./index.ts";
34
import type { PlainNode, StrongIconNode } from "./type.ts";
45

56
const strongIconRegExp = /\[\[[^[\]]*\.icon(?:\*\d+)?\]\]/;
@@ -23,8 +24,11 @@ const createStrongIconNode: NodeCreator<StrongIconNode | PlainNode> = (
2324
.map(() => ({ path, pathType, type: "strongIcon", raw }));
2425
};
2526

26-
export const StrongIconNodeParser = createNodeParser(createStrongIconNode, {
27-
parseOnNested: false,
28-
parseOnQuoted: true,
29-
patterns: [strongIconRegExp],
30-
});
27+
export const StrongIconNodeParser: NodeParser = createNodeParser(
28+
createStrongIconNode,
29+
{
30+
parseOnNested: false,
31+
parseOnQuoted: true,
32+
patterns: [strongIconRegExp],
33+
},
34+
);

‎src/block/node/StrongImageNode.ts

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { createPlainNode } from "./PlainNode.ts";
22
import { createNodeParser } from "./creator.ts";
33

44
import type { NodeCreator } from "./creator.ts";
5+
import type { NodeParser } from "./index.ts";
56
import type { PlainNode, StrongImageNode } from "./type.ts";
67

78
const strongImageRegExp =
@@ -29,8 +30,11 @@ const createStrongImageNode: NodeCreator<StrongImageNode | PlainNode> = (
2930
];
3031
};
3132

32-
export const StrongImageNodeParser = createNodeParser(createStrongImageNode, {
33-
parseOnNested: false,
34-
parseOnQuoted: true,
35-
patterns: [strongImageRegExp, strongGyazoImageRegExp],
36-
});
33+
export const StrongImageNodeParser: NodeParser = createNodeParser(
34+
createStrongImageNode,
35+
{
36+
parseOnNested: false,
37+
parseOnQuoted: true,
38+
patterns: [strongImageRegExp, strongGyazoImageRegExp],
39+
},
40+
);

‎tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272
"declarationDir": "./out" /* Specify the output directory for generated declaration files. */,
7373

7474
/* Interop Constraints */
75-
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
75+
"isolatedModules": true /* Ensure that each file can be safely transpiled without relying on other imports. */,
7676
"verbatimModuleSyntax": true /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */,
77-
// "isolatedDeclarations": true, /* Require sufficient annotation on exports so other tools can trivially generate declaration files. */
77+
"isolatedDeclarations": true /* Require sufficient annotation on exports so other tools can trivially generate declaration files. */,
7878
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
7979
"esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
8080
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */

‎tsconfig.lint.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"extends": "./tsconfig",
33
"compilerOptions": {
44
"emitDeclarationOnly": false,
5-
"noEmit": true
5+
"noEmit": true,
6+
"isolatedDeclarations": false
67
},
78
"include": ["**/*"]
89
}

0 commit comments

Comments
 (0)
Please sign in to comment.