Move GetOpenApiDocRouteHandler back into repo/rest-api/

Bug: T384283 Change-Id: Ic41019c0268aa86770f9d03cb65a0709fb656fd6
wikimedia · Jan 31, 2025 · 8bc702e · 8bc702e
1 parent 1074be0
commit 8bc702e
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/publishRestApiClient.yml b/.github/workflows/publishRestApiClient.yml
@@ -3,7 +3,7 @@ on:
     push:
         branches: [ master ]
         paths:
-            - repo/domains/crud/src/RouteHandlers/openapi.json
+            - repo/rest-api/src/RouteHandlers/openapi.json
             - .github/workflows/publishRestApiClient.yml
             - .github/workflows/publishRestApiClient/**
 jobs:
@@ -17,11 +17,11 @@ jobs:
             - name: Define next package version
               run: |
                   NEXT_PATCH_VERSION=$(npx semver $(npm view @wmde/wikibase-rest-api version) --increment patch)
-                  CURRENT_OAS_DOC_INTERFACE_VERSION=$(npx semver --coerce $(jq -r .info.version repo/domains/crud/src/RouteHandlers/openapi.json))
+                  CURRENT_OAS_DOC_INTERFACE_VERSION=$(npx semver --coerce $(jq -r .info.version repo/rest-api/src/RouteHandlers/openapi.json))
                   NEXT_VERSION=$(printf "$NEXT_PATCH_VERSION\n$CURRENT_OAS_DOC_INTERFACE_VERSION" | sort -V | tail -1)
                   echo "VERSION=$NEXT_VERSION" >> $GITHUB_ENV
             - name: Copy OpenApi spec file
-              run: cp repo/domains/crud/src/RouteHandlers/openapi.json openapi.json
+              run: cp repo/rest-api/src/RouteHandlers/openapi.json openapi.json
             - name: Build the API client
               uses: addnab/docker-run-action@v3
               with:

diff --git a/.phan/config.php b/.phan/config.php
@@ -34,6 +34,7 @@
 		'repo/includes',
 		'repo/domains/crud/src',
 		'repo/domains/search/src',
+		'repo/rest-api/src',
 		'lib/includes',
 		'client/maintenance',
 		'repo/maintenance',

diff --git a/extension-repo.json b/extension-repo.json
@@ -632,7 +632,7 @@
 		{
 			"path": "/wikibase/v1/openapi.json",
 			"method": "GET",
-			"factory": "Wikibase\\Repo\\Domains\\Crud\\RouteHandlers\\GetOpenApiDocRouteHandler::factory"
+			"factory": "Wikibase\\Repo\\RestApi\\GetOpenApiDocRouteHandler::factory"
 		},
 		{
 			"path": "/wikibase/v1/property-data-types",
@@ -911,6 +911,7 @@
 		"Wikibase\\Repo\\": "repo/includes/",
 		"Wikibase\\Repo\\Domains\\Search\\": "repo/domains/search/src/",
 		"Wikibase\\Repo\\Domains\\Crud\\": "repo/domains/crud/src/",
+		"Wikibase\\Repo\\RestApi\\": "repo/rest-api/src/",
 		"Wikibase\\Lib\\": "lib/includes/",
 		"Wikibase\\Lib\\FederatedProperties\\": "lib/packages/wikibase/federated-properties/src/",
 		"Wikibase\\Lib\\Changes\\": "lib/packages/wikibase/changes/src/",

diff --git a/repo/rest-api/docs/index.js b/repo/rest-api/docs/index.js
@@ -1,7 +1,7 @@
 import SwaggerUI from 'swagger-ui';
 import 'swagger-ui/dist/swagger-ui.css';
 
-import spec from '../../domains/crud/src/RouteHandlers/openapi.json';
+import spec from '../src/openapi.json';
 
 const ui = SwaggerUI( {
 	spec,

diff --git a/repo/rest-api/package.json b/repo/rest-api/package.json
@@ -18,7 +18,7 @@
 		"build": "run-s build:docs build:spec",
 		"build:docs": "webpack --config docs/webpack.config.js",
 		"serve:docs": "webpack serve --config docs/webpack.config.js --mode development",
-		"build:spec": "redocly bundle specs/openapi.json --dereferenced -o ../domains/crud/src/RouteHandlers/openapi.json && cp ../domains/crud/src/RouteHandlers/openapi.json ../../docs/rest-api/openapi.json"
+		"build:spec": "redocly bundle specs/openapi.json --dereferenced -o src/openapi.json && cp src/openapi.json ../../docs/rest-api/openapi.json"
 	},
 	"engines": {
 		"node": ">=18"

diff --git a/...uteHandlers/GetOpenApiDocRouteHandler.php → ...est-api/src/GetOpenApiDocRouteHandler.php b/...uteHandlers/GetOpenApiDocRouteHandler.php → ...est-api/src/GetOpenApiDocRouteHandler.php
@@ -1,6 +1,6 @@
 <?php declare( strict_types=1 );
 
-namespace Wikibase\Repo\Domains\Crud\RouteHandlers;
+namespace Wikibase\Repo\RestApi;
 
 use MediaWiki\Rest\Handler;
 use MediaWiki\Rest\Response;

diff --git a/...mains/crud/src/RouteHandlers/openapi.json → repo/rest-api/src/openapi.json b/...mains/crud/src/RouteHandlers/openapi.json → repo/rest-api/src/openapi.json
diff --git a/repo/rest-api/tests/mocha/helpers/RequestBuilder.js b/repo/rest-api/tests/mocha/helpers/RequestBuilder.js
@@ -6,7 +6,7 @@ const { default: OpenAPIRequestCoercer } = require( 'openapi-request-coercer' );
 const { default: OpenAPIRequestValidator } = require( 'openapi-request-validator' );
 
 const basePath = 'rest.php/wikibase';
-const openapiSchema = JSON.parse( readFileSync( `${__dirname}/../../../../domains/crud/src/RouteHandlers/openapi.json` ) );
+const openapiSchema = JSON.parse( readFileSync( `${__dirname}/../../../src/openapi.json` ) );
 
 class RequestBuilder {
 

diff --git a/repo/rest-api/tests/mocha/helpers/chaiHelper.js b/repo/rest-api/tests/mocha/helpers/chaiHelper.js
@@ -7,7 +7,7 @@ const { readFileSync } = require( 'fs' );
 
 function compileSchemaAndValidator() {
 	const openApiSchema = JSON.parse(
-		readFileSync( `${__dirname}/../../../../domains/crud/src/RouteHandlers/openapi.json` )
+		readFileSync( `${__dirname}/../../../src/openapi.json` )
 	);
 
 	const schemaValidator = new Ajv( { strictTypes: false } );