Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .oxlintrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./node_modules/oxlint/configuration_schema.json",
"plugins": ["typescript", "unicorn", "oxc", "import", "jest"],
"plugins": ["typescript", "unicorn", "oxc", "import", "vitest"],
"categories": {
"correctness": "error"
},
Expand Down
1 change: 0 additions & 1 deletion global.d.ts

This file was deleted.

21 changes: 0 additions & 21 deletions jest.config.base.mjs

This file was deleted.

9 changes: 0 additions & 9 deletions jest.setup.ts

This file was deleted.

22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
"lodash": ">=4.18.1",
"tar": "^7.5.13",
"undici": ">=8.0.2"
}
},
"ignoredBuiltDependencies": [
"nx"
]
},
"scripts": {
"build": "nx run-many --target=build",
Expand All @@ -39,22 +42,19 @@
"@changesets/changelog-github": "^0.5.2",
"@changesets/cli": "^2.30.0",
"@codecov/bundle-analyzer": "^1.9.1",
"@jest/globals": "^30.3.0",
"@swc/core": "^1.15.24",
"@swc/jest": "^0.2.39",
"@types/jest": "^30.0.0",
"@vitest/coverage-v8": "^4.0.10",
"@vitest/eslint-plugin": "^1.4.3",
"@vitest/ui": "^4.0.10",
"all-contributors-cli": "github:jdalrymple/all-contributors-cli#dist",
"globals": "^16.5.0",
"husky": "^9.1.7",
"jest": "^30.3.0",
"jest-extended": "^7.0.0",
"jest-junit": "^16.0.0",
"lint-staged": "^16.4.0",
"nx": "^22.6.4",
"lint-staged": "^16.2.6",
"nx": "^22.0.3",
"oxlint": "^1.58.0",
"prettier": "3.6.2",
"tsdown": "^0.21.7",
"typescript": "^5.9.3"
"typescript": "^5.9.3",
"vitest": "^4.1.5"
},
"packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319"
}
11 changes: 0 additions & 11 deletions packages/cli/jest.config.mjs

This file was deleted.

8 changes: 5 additions & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"dist"
],
"scripts": {
"test:unit": "vitest run --config vitest.config.mjs test/unit",
"test:e2e": "vitest run --config vitest.config.mjs test/e2e",
"build": "tsdown src/index.ts --format esm --target esnext",
"test:unit": "jest --maxWorkers=50% test/unit",
"test:e2e": "jest --maxWorkers=50% test/e2e",
"lint": "oxlint src test scripts",
"lint:fix": "oxlint src test scripts --fix"
},
Expand All @@ -47,6 +47,8 @@
},
"devDependencies": {
"tsdown": "^0.21.7",
"typescript": "^5.9.3"
"@vitest/expect": "^4.0.10",
"typescript": "^5.9.3",
"vitest-extended": "^0.0.1"
}
}
7 changes: 5 additions & 2 deletions packages/cli/src/cli.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import type { MethodTemplate } from './utils';
import API_MAP from '@gitbeaker/core/map.json' with { type: 'json' };
import * as Gitbeaker from '@gitbeaker/rest';
import Chalk from 'chalk';
import Sywac from 'sywac';
import API_MAP from './map';
import pkg from '../package.json';
import {
buildArgumentObjects,
getCLISafeNormalizedTerm,
Expand Down Expand Up @@ -70,7 +71,9 @@ const optionStyle = Chalk.white.bold;
const descriptionStyle = Chalk.hex('#848484');
const hintStyle = Chalk.hex('#6a5f88');

const cli = Sywac.version('-v, --version')
const cli = Sywac.version('-v, --version', {
version: pkg.version,
})
.help('-h, --help')
.showHelpByDefault()
.epilogue(`Copyright ${new Date().getFullYear()}`)
Expand Down
4 changes: 4 additions & 0 deletions packages/cli/src/map.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Wrapper module to handle JSON import with assertion
import API_MAP from '@gitbeaker/core/map.json' with { type: 'json' };

export default API_MAP;
2 changes: 2 additions & 0 deletions packages/cli/test/e2e/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import pkg from '../../package.json';

import { describe, expect, it } from 'vitest';

describe('General', () => {
it('should return the expose a gitbeaker commnad', () => {
expect(pkg.bin).toHaveProperty('gitbeaker');
Expand Down
1 change: 1 addition & 0 deletions packages/cli/test/e2e/resources/Projects.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { exec } from 'node:child_process';
import { promisify } from 'node:util';

import { describe, expect, it } from 'vitest';
const execP: (command: string) => Promise<{ stdout: string }> = promisify(exec);

const { GITLAB_PERSONAL_ACCESS_TOKEN = '', GITLAB_URL = '', TEST_ID = Date.now() } = process.env;
Expand Down
9 changes: 7 additions & 2 deletions packages/cli/test/unit/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import pkg from '../../package.json';
import mockMapData from '../__mocks__/map.json';

jest.mock('@gitbeaker/rest');
vi.mock('@gitbeaker/rest');
vi.mock('../../src/map', () => ({
default: mockMapData,
}));

const OLD_ENV = process.env;
let Projects;

beforeEach(async () => {
jest.resetModules();
vi.resetModules();

({ Projects } = await import('@gitbeaker/rest'));

Expand Down
17 changes: 17 additions & 0 deletions packages/cli/vitest.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { defineProject, mergeConfig } from 'vitest/config';
import base from '../../vitest.config.base.mjs';

export default mergeConfig(
base,
defineProject({
test: {
name: 'Gitbeaker CLI',
testTimeout: 10000,
server: {
deps: {
inline: ['@gitbeaker/core'],
},
},
},
}),
);
6 changes: 0 additions & 6 deletions packages/core/jest.config.mjs

This file was deleted.

4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"build:map": "tsx scripts/generate.ts",
"build:self": "tsdown src/index.ts --format esm,cjs --dts --treeshake",
"test:types": "tsc",
"test:integration": "jest --maxWorkers=50% test/integration",
"test:unit": "jest --maxWorkers=50% test/unit",
"test:integration": "vitest run --config vitest.config.mjs test/integration",
"test:unit": "vitest run --config vitest.config.mjs test/unit",
"lint": "oxlint src test scripts",
"lint:fix": "oxlint src test scripts --fix"
},
Expand Down
3 changes: 1 addition & 2 deletions packages/core/scripts/generate.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { RequesterType } from '@gitbeaker/requester-utils';
import FS from 'node:fs';
import * as resources from '../src/resources';
import { getParamNames } from './getParamNames';
Expand Down Expand Up @@ -32,7 +31,7 @@ export function buildMap() {
const { Gitlab, ...directResources } = resources;

Object.entries(directResources).forEach(([name, Resource]) => {
const r = new Resource({ token: 'dummey', requesterFn: () => ({}) as RequesterType });
const r = new (Resource as any)({ token: 'dummy', requesterFn: () => ({}) });
const formattedInstanceMethods = getInstanceMethods(r).map((m) => ({
name: m,
args: removeOptionalArg(getParamNames(r[m] as () => unknown)),
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/resources/PackageRegistry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ export class PackageRegistry<C extends boolean = false> extends BaseResource<C>
packageVersion: string,
filename: string,
options?: ShowExpanded<E> & Sudo,
) {
): Promise<GitlabAPIResponse<Blob, C, E, void>> {
const { sudo, showExpanded } = options || {};

return RequestHelper.get<{ message: string }>()(
return RequestHelper.get<Blob>()(
this,
endpoint`projects/${projectId}/packages/generic/${packageName}/${packageVersion}/${filename}`,
{
Expand Down
5 changes: 4 additions & 1 deletion packages/core/test/__mocks__/RequestHelper.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
const mockHelperFn = jest.fn();
/* eslint-disable vitest/require-mock-type-parameters */
import { vi } from 'vitest';

const mockHelperFn = vi.fn();

export default {
RequestHelper: {
Expand Down
7 changes: 5 additions & 2 deletions packages/core/test/integration/map.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { describe, expect, it } from 'vitest';

describe('API Map', () => {
it('should return object representing all resources in JSON format', async () => {
const keys = [
Expand Down Expand Up @@ -189,7 +191,8 @@ describe('API Map', () => {

const map: Record<string, unknown> = await import('../../dist/map.json');

expect(map).toBeObject();
expect(Object.keys(map)).toIncludeAllMembers(keys);
keys.forEach((key) => {
expect(Object.keys(map)).include(key);
});
});
});
Loading
Loading