Skip to content

Commit

Permalink
chore: lint
Browse files Browse the repository at this point in the history
  • Loading branch information
ijkml committed Nov 24, 2024
1 parent 5ccf05d commit 8922d5d
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 24 deletions.
13 changes: 9 additions & 4 deletions src/runtime/composables.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import type {
StaticPayload, EventPayload, ViewPayload, IdentifyPayload,
PreflightResult, EventData, FetchResult,
EventData,
EventPayload,
FetchResult,
IdentifyPayload,
PreflightResult,
StaticPayload,
ViewPayload,
} from '../types';
import { earlyPromise, flattenObject, isValidString } from './utils';
import { buildPathUrl, collect, config, logger } from '#build/umami.config.mjs';
import { earlyPromise, flattenObject, isValidString } from './utils';

let configChecks: PreflightResult | undefined;
let staticPayload: StaticPayload | undefined;
Expand Down Expand Up @@ -175,4 +180,4 @@ function umIdentify(sessionData?: EventData): FetchResult {
});
}

export { umTrackEvent, umTrackView, umIdentify };
export { umIdentify, umTrackEvent, umTrackView };
2 changes: 1 addition & 1 deletion src/runtime/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ function logger(id: PreflightErrId, raw?: unknown) {

function fauxLogger(..._args: Parameters<typeof logger>) {}

export { logger, fauxLogger };
export { fauxLogger, logger };
30 changes: 22 additions & 8 deletions src/runtime/utils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import type {
EventPayload, PayloadTypes, ServerPayload, ViewPayload,
FetchResult, ModuleOptions, NormalizedModuleOptions,
EventPayload,
FetchResult,
ModuleOptions,
NormalizedModuleOptions,
PayloadTypes,
ServerPayload,
ViewPayload,
} from '../types';

function earlyPromise(ok: boolean): FetchResult {
Expand Down Expand Up @@ -62,8 +67,9 @@ function normalizeConfig(options: ModuleOptions = {}): NormalizedModuleOptions {
if (
isValidString(trailingSlash)
&& ['always', 'never'].includes(trailingSlash.trim())
)
) {
return trailingSlash.trim() as typeof trailingSlash;
}
return 'any';
})(),
ignoreLocalhost: ignoreLocalhost === true,
Expand Down Expand Up @@ -133,8 +139,12 @@ function isValidPayload(obj: object): obj is Payload {
const validators: typeof _payloadProps = { ..._payloadProps };

const validatorKeys: Array<keyof Payload> = [
'hostname', 'language', 'screen',
'url', 'referrer', 'title',
'hostname',
'language',
'screen',
'url',
'referrer',
'title',
];

if (objKeys.includes('name')) {
Expand All @@ -153,7 +163,9 @@ function isValidPayload(obj: object): obj is Payload {
if (
objKeys.length !== validatorKeys.length
|| !validatorKeys.every(k => objKeys.includes(k))
) return false;
) {
return false;
}

// run each value against its validator
for (const key in obj) {
Expand Down Expand Up @@ -185,7 +197,9 @@ function parseEventBody(body: unknown): ValidatePayloadReturn {
'type' in body && isValidString(body.type)
&& 'cache' in body && typeof body.cache === 'string'
&& 'payload' in body && isRecord(body.payload)
)) return error;
)) {
return error;
}

const { payload, cache, type } = body;

Expand All @@ -204,8 +218,8 @@ function parseEventBody(body: unknown): ValidatePayloadReturn {

export {
earlyPromise,
isValidString,
flattenObject,
isValidString,
normalizeConfig,
parseEventBody,
};
22 changes: 11 additions & 11 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,20 +144,20 @@ type FetchFn = (load: ServerPayload) => FetchResult;
type BuildPathUrlFn = () => string;

export type {
PreflightResult,
BuildPathUrlFn,
EventData,
EventPayload,
FetchFn,
FetchResult,
IdentifyPayload,
ModuleMode,
ModuleOptions,
EventData,
StaticPayload,
NormalizedModuleOptions,
UmPublicConfig,
UmPrivateConfig,
ModuleMode,
FetchFn,
BuildPathUrlFn,
PayloadTypes,
ViewPayload,
EventPayload,
IdentifyPayload,
PreflightResult,
ServerPayload,
StaticPayload,
UmPrivateConfig,
UmPublicConfig,
ViewPayload,
};

0 comments on commit 8922d5d

Please sign in to comment.