Skip to content

Commit 355fcf1

Browse files
TlacenkaTlacenka
committed
chore(models): improve file naming
1 parent fc281a0 commit 355fcf1

13 files changed

Lines changed: 37 additions & 55 deletions

‎packages/models/src/index.ts‎

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
export { Audit, auditSchema, pluginAuditsSchema } from './lib/audit';
2+
export { Issue, IssueSeverity } from './lib/audit-issue';
3+
export {
4+
AuditOutput,
5+
AuditOutputs,
6+
auditOutputsSchema,
7+
} from './lib/audit-output';
18
export {
29
CategoryConfig,
310
CategoryRef,
@@ -10,20 +17,21 @@ export {
1017
refineCoreConfig,
1118
unrefinedCoreConfigSchema,
1219
} from './lib/core-config';
20+
export { AuditGroup, AuditGroupRef, auditGroupSchema } from './lib/group';
21+
export {
22+
PERSIST_FILENAME,
23+
PERSIST_FORMAT,
24+
PERSIST_OUTPUT_DIR,
25+
} from './lib/implementation/constants';
1326
export {
1427
MAX_DESCRIPTION_LENGTH,
1528
MAX_SLUG_LENGTH,
1629
MAX_TITLE_LENGTH,
1730
} from './lib/implementation/limits';
1831
export {
19-
PERSIST_FILENAME,
20-
PERSIST_OUTPUT_DIR,
21-
PERSIST_FORMAT,
22-
} from './lib/implementation/constants';
23-
export {
24-
materialIconSchema,
25-
filePathSchema,
2632
fileNameSchema,
33+
filePathSchema,
34+
materialIconSchema,
2735
urlSchema,
2836
} from './lib/implementation/schemas';
2937
export {
@@ -34,32 +42,9 @@ export {
3442
} from './lib/persist-config';
3543
export {
3644
PluginConfig,
37-
pluginConfigSchema,
3845
PluginMeta,
46+
pluginConfigSchema,
3947
} from './lib/plugin-config';
40-
export {
41-
Audit,
42-
auditSchema,
43-
pluginAuditsSchema,
44-
} from './lib/plugin-config-audits';
45-
export {
46-
AuditGroup,
47-
AuditGroupRef,
48-
auditGroupSchema,
49-
} from './lib/plugin-config-groups';
50-
export {
51-
OnProgress,
52-
RunnerConfig,
53-
RunnerFunction,
54-
onProgressSchema,
55-
runnerConfigSchema,
56-
} from './lib/plugin-config-runner';
57-
export {
58-
AuditOutput,
59-
AuditOutputs,
60-
auditOutputsSchema,
61-
} from './lib/plugin-process-output';
62-
export { Issue, IssueSeverity } from './lib/plugin-process-output-audit-issue';
6348
export {
6449
AuditReport,
6550
PluginReport,
@@ -68,4 +53,11 @@ export {
6853
pluginReportSchema,
6954
reportSchema,
7055
} from './lib/report';
56+
export {
57+
OnProgress,
58+
RunnerConfig,
59+
RunnerFunction,
60+
onProgressSchema,
61+
runnerConfigSchema,
62+
} from './lib/runner-config';
7163
export { UploadConfig, uploadConfigSchema } from './lib/upload-config';

packages/models/src/lib/plugin-process-output-audit-issue.ts renamed to packages/models/src/lib/audit-issue.ts

File renamed without changes.

packages/models/src/lib/plugin-process-output.ts renamed to packages/models/src/lib/audit-output.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { z } from 'zod';
2+
import { issueSchema } from './audit-issue';
23
import { positiveIntSchema, slugSchema } from './implementation/schemas';
34
import { errorItems, hasDuplicateStrings } from './implementation/utils';
4-
import { issueSchema } from './plugin-process-output-audit-issue';
55

66
export const auditOutputSchema = z.object(
77
{

packages/models/src/lib/plugin-config-audits.ts renamed to packages/models/src/lib/audit.ts

File renamed without changes.

‎packages/models/src/lib/audit.unit.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { describe, expect, it } from 'vitest';
22
import { reportMock } from '../../test';
3+
import { auditOutputsSchema } from './audit-output';
34
import { pluginConfigSchema } from './plugin-config';
4-
import { auditOutputsSchema } from './plugin-process-output';
55

66
describe('auditOutputsSchema', () => {
77
it('should pass if output audits are valid', () => {

packages/models/src/lib/plugin-config-groups.ts renamed to packages/models/src/lib/group.ts

File renamed without changes.

packages/models/src/lib/plugin-config-groups.unit.test.ts renamed to packages/models/src/lib/group.unit.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { describe, expect, it } from 'vitest';
22
import { config } from '../../test';
3-
import { auditGroupSchema } from './plugin-config-groups';
3+
import { auditGroupSchema } from './group';
44

55
describe('auditGroupSchema', () => {
66
it('should throw if a group has duplicate audit refs', () => {

‎packages/models/src/lib/plugin-config.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
import { z } from 'zod';
2+
import { pluginAuditsSchema } from './audit';
3+
import { auditGroupsSchema } from './group';
24
import {
35
materialIconSchema,
46
metaSchema,
57
packageVersionSchema,
68
slugSchema,
79
} from './implementation/schemas';
810
import { errorItems, hasMissingStrings } from './implementation/utils';
9-
import { pluginAuditsSchema } from './plugin-config-audits';
10-
import { auditGroupsSchema } from './plugin-config-groups';
11-
import {
12-
runnerConfigSchema,
13-
runnerFunctionSchema,
14-
} from './plugin-config-runner';
11+
import { runnerConfigSchema, runnerFunctionSchema } from './runner-config';
1512

1613
export const pluginMetaSchema = packageVersionSchema({
1714
optional: true,

‎packages/models/src/lib/plugin-config.unit.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { describe, expect, it } from 'vitest';
22
import { config, pluginConfig } from '../../test';
3+
import { AuditOutputs } from './audit-output';
34
import { pluginConfigSchema } from './plugin-config';
4-
import { AuditOutputs } from './plugin-process-output';
55

66
describe('pluginConfigSchema', () => {
77
it('should parse if plugin configuration is valid', () => {

‎packages/models/src/lib/report.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { z } from 'zod';
2+
import { auditSchema } from './audit';
3+
import { auditOutputSchema } from './audit-output';
24
import { categoryConfigSchema } from './category-config';
5+
import { auditGroupSchema } from './group';
36
import {
47
executionMetaSchema,
58
packageVersionSchema,
69
} from './implementation/schemas';
710
import { pluginMetaSchema } from './plugin-config';
8-
import { auditSchema } from './plugin-config-audits';
9-
import { auditGroupSchema } from './plugin-config-groups';
10-
import { auditOutputSchema } from './plugin-process-output';
1111

1212
export const auditReportSchema = auditSchema.merge(auditOutputSchema);
1313
export type AuditReport = z.infer<typeof auditReportSchema>;

0 commit comments

Comments
 (0)