Skip to content

Commit 945a57f

Browse files
committed
Fix typings issues
1 parent 00d96b6 commit 945a57f

11 files changed

+20
-17
lines changed

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
"./entity/model": "./esm/lib/entity/ModelEntry.js",
1919
"./entity/name": "./esm/lib/entity/NameEntry.js",
2020
"./entity/prop": "./esm/lib/entity/PropEntry.js",
21-
"./entity/RestValue": "./esm/lib/entity/RestValue.js",
21+
"./entity/rest": "./esm/lib/entity/RestValue.js",
2222
"./entity/slot": "./esm/lib/entity/SlotEntry.js",
2323
"./entity/value": "./esm/lib/entity/Value.js",
24+
"./parser": "./esm/lib/parsers/Parser.js",
2425
"./jsdoc": "./esm/lib/JSDoc.js",
2526
"./loaders/html": "./esm/loaders/html.js",
2627
"./loaders/javascript": "./esm/loaders/javascript.js",

src/lib/parser/AbstractParser.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Value, UndefinedValue, NullValue } from '../entity/Value.js';
33
import { Syntax, Type, TypeList, ScalarTypeList } from '../Enum.js';
44
import { get } from '@b613/utils/lib/object.js';
55
import { Vuedoc } from '../../../types/index.js';
6-
import type { Parser } from './Parser.js';
6+
import { Parser } from './Parser.js';
77
import * as Babel from '@babel/types';
88

99
const DUPLICATED_SPACES_RE = /\s+/g;

src/lib/parser/ClassComponentParser.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { ComputedEntry } from '../entity/ComputedEntry.js';
1616
import { Syntax, Type, Feature, Visibility, PropTypesTag } from '../Enum.js';
1717
import { Value } from '../entity/Value.js';
1818
import { Vuedoc } from '../../../types/index.js';
19-
import type { Parser } from './Parser.js';
19+
import { Parser } from './Parser.js';
2020

2121
import * as Babel from '@babel/types';
2222

src/lib/parser/CompositionParser.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import { EventParser } from './EventParser.js';
1010

1111
import { Value } from '../entity/Value.js';
1212

13-
import { Syntax, Properties, Feature, Type, Visibility, CompositionAPI, CompositionHooks, RouterKeys, CompositionProperties, CompositionAPIComputedValues } from '../Enum.js';
13+
import { Syntax, Properties, Feature, Type, Visibility, CompositionAPI, RouterKeys, CompositionProperties, CompositionAPIComputedValues } from '../Enum.js';
1414
import { CommentParser } from './CommentParser.js';
1515
import { Vuedoc } from '../../../types/index.js';
16-
import type { Parser } from './Parser.js';
16+
import { Parser } from './Parser.js';
1717

1818
export type ParseDataValueOptions = {
1919
name: string;

src/lib/parser/ComputedParser.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import { Value } from '../entity/Value.js';
66

77
import { Syntax, Tag, Type, Visibility } from '../Enum.js';
88
import { KeywordsUtils } from '../utils/KeywordsUtils.js';
9+
import { Vuedoc } from '../../../types/index.js';
910

1011
import * as Babel from '@babel/types';
11-
import { Vuedoc } from '../../../types/index.js';
1212

1313
const RE_THIS_EXPRESSION = /this\.([a-z0-9_$]+)/ig;
1414
const RE_THIS_DESTRUCTURING_EXPRESSION = /\{(([a-z0-9_$.,\s]+)((\s*:\s*[a-z0-9_$.,\s]+)|(\s*=\s*.+))?)\}\s*=\s*this;?/ig;

src/lib/parser/MarkupTemplateParser.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { EventEntry, EventArgumentGenerator } from '../entity/EventEntry.js';
1010
import { JSDoc } from '../JSDoc.js';
1111
import { Feature, Tag } from '../Enum.js';
1212
import { Vuedoc } from '../../../types/index.js';
13-
import type { Parser } from './Parser.js';
13+
import { Parser } from './Parser.js';
1414

1515
const EVENT_EMIT_RE = /^\$emit\(['"](.+)['"]/;
1616

src/lib/parser/Parser.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { MarkupTemplateParser } from './MarkupTemplateParser.js';
66
import { CompositionParser } from './CompositionParser.js';
77

88
import { NameEntry } from '../entity/NameEntry.js';
9-
import { Feature, Features, DEFAULT_IGNORED_VISIBILITIES, CompositionAPIValues, FeatureEvent, TypedocTag, JSDocTag } from '../Enum.js';
9+
import { Feature, Features, DEFAULT_IGNORED_VISIBILITIES, CompositionAPIValues, TypedocTag, JSDocTag } from '../Enum.js';
1010
import { Vuedoc } from '../../../types/index.js';
1111

1212
type AsyncOperation = () => Promise<void>;

src/lib/parser/PropParser.ts

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { Syntax, Type, Tag } from '../Enum.js';
88
import { KeywordsUtils } from '../utils/KeywordsUtils.js';
99
import { MethodReturns, MethodParamGenerator } from '../entity/MethodEntry.js';
1010
import { MethodParser } from './MethodParser.js';
11+
1112
import * as Babel from '@babel/types';
1213

1314
const PROP_TYPES_OBJECT_NAME = 'PropTypes';

src/lib/parser/ScriptParser.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { parse as BabelParser, ParseResult, ParserPlugin } from '@babel/parser';
1+
import { parse as BabelParser, ParserPlugin } from '@babel/parser';
22

33
import { AbstractSourceParser } from './AbstractSourceParser.js';
44
import { SlotParser } from './SlotParser.js';
@@ -18,10 +18,10 @@ import { DescriptionEntry } from '../entity/DescriptionEntry.js';
1818
import { KeywordsEntry } from '../entity/KeywordsEntry.js';
1919
import { UndefinedValue } from '../entity/Value.js';
2020

21-
import { Syntax, Properties, Feature, Tag, PropTypesTag, CompositionAPIValues } from '../Enum.js';
21+
import { Syntax, Properties, Feature, Tag, PropTypesTag } from '../Enum.js';
2222
import { KeywordsUtils } from '../utils/KeywordsUtils.js';
2323
import { JSXParser } from './JSXParser.js';
24-
import type { Parser } from './Parser.js';
24+
import { Parser } from './Parser.js';
2525
import { Vuedoc } from '../../../types/index.js';
2626

2727
import * as Babel from '@babel/types';

src/lib/parser/SetupParser.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { DataParser, ParseDataValueOptions } from './DataParser.js';
22
import { ComputedParser } from './ComputedParser.js';
3-
import { CompositionHooks, Feature, Syntax, Type } from '../Enum.js';
3+
import { Feature, Syntax, Type } from '../Enum.js';
44
import { MethodParser } from './MethodParser.js';
55
import * as Babel from '@babel/types';
66

types/index.d.ts

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import EventEmitter from 'node:events';
33
// eslint-disable-next-line import/extensions
44
import { PropType } from '@b613/utils/typings';
55
import { ParseResult } from '@babel/parser';
6-
import { Value } from '../src/lib/entity/Value.js';
6+
import { Value } from '../esm/lib/entity/Value.js';
77

88
import * as Babel from '@babel/types';
99

10-
export { Loader } from './lib/Loader.js';
11-
export { Parser } from './lib/parser/Parser.js';
10+
export { Loader } from '../esm/lib/Loader.js';
11+
export { Parser } from '../esm/lib/parser/Parser.js';
1212

1313
export declare namespace Vuedoc {
1414
namespace Parser {
@@ -413,9 +413,10 @@ export declare namespace Vuedoc {
413413
}
414414
}
415415

416-
export declare function parseOptions(options: Vuedoc.Index.Options): Promise<Vuedoc.Parser.ResolvedOptions>;
417416
declare type ExtendedParsingResult = Vuedoc.Index.ParsingResult & {
418-
model?: Vuedoc.Entry.ModelEntry[];
417+
model?: Vuedoc.Entry.ModelEntry[];
419418
};
419+
420+
export declare function parseOptions(options: Vuedoc.Index.Options): Promise<Vuedoc.Parser.ResolvedOptions>;
420421
export declare function synchronizeParsingResult(options: Vuedoc.Index.Options, component: ExtendedParsingResult): void;
421422
export declare function parseComponent(options: Vuedoc.Index.Options): Promise<Vuedoc.Index.ParsingResult>;

0 commit comments

Comments
 (0)