Fix #513 Use Request and Response from @enonic-types (#514)

Author: ComLock

gradle.properties

@@ -1,4 +1,4 @@
 group = com.enonic.lib
 projectName = lib-static
-xpVersion = 7.14.0
+xpVersion = 7.15.0
 version = 2.0.1-SNAPSHOT

package-lock.json

@@ -29,10 +29,10 @@
   },
   "homepage": "https://developer.enonic.com/docs/lib-static",
   "devDependencies": {
-    "@enonic-types/core": "^7.14.2",
-    "@enonic-types/global": "^7.14.4",
-    "@enonic-types/lib-io": "^7.15.0",
-    "@enonic-types/lib-portal": "^7.15.0",
+    "@enonic-types/core": "^7.15.0",
+    "@enonic-types/global": "7.15.0",
+    "@enonic-types/lib-io": "7.15.0",
+    "@enonic-types/lib-portal": "7.15.0",
     "@enonic-types/lib-vhost": "^7.15.0",
     "@enonic/eslint-config": "^2.0.1",
     "@eslint/js": "^9.22.0",

package.json

@@ -1,16 +1,17 @@
 import type {StepDefinitions} from 'jest-cucumber';
 import type {
 	Request,
-  RequestHandlerOptions,
 	Response,
+} from '@enonic-types/core';
+import type {
+  RequestHandlerOptions,
 } from '../../main/resources/lib/enonic/static/types';
 import type {App, DoubleUnderscore, Log} from '../../jest/global.d';
 
 import {describe} from '@jest/globals';
 import {
   expect,
   test,
-  // @ts-expect-error Not using types: bun to avoid Duplicate identifier 'fetch'
 } from 'bun:test';
 import {
   autoBindSteps,
@@ -189,7 +190,7 @@ export const steps: StepDefinitions = ({
       // if (value === 'null') {
       //   value = null;
       // }
-      expect(response.headers[header]).toStrictEqual(v);
+      expect(response.headers[header]).toStrictEqual(v as string | number | (string | number)[]);
     });
 	});
 

src/bun/features/requestHandler.feature.test.ts

@@ -1,3 +1,4 @@
+import type {ScriptValue} from '@enonic-types/core';
 import type {AssetUrlParams} from '@enonic-types/lib-portal';
 import type {App, DoubleUnderscore, Log} from '../jest/global.d';
 
@@ -6,7 +7,6 @@ import {
   // jest,
   mock,
   // test as it
-  // @ts-expect-error Not using types: bun to avoid Duplicate identifier 'fetch'
 } from 'bun:test';
 import {stringify} from 'q-i';
 import {isObject} from '../jest/isObject';

src/bun/setup.ts

@@ -2,7 +2,7 @@ import type {Log} from './global.d';
 import type {
   Request,
   Response
-} from '../main/resources/lib/enonic/static/types';
+} from '@enonic-types/core';
 
 import {
   expect,

src/jest/expectations.ts

@@ -1,4 +1,4 @@
-import type {Request} from '/lib/enonic/static/types';
+import type {Request} from '@enonic-types/core';
 
 import {
   describe,

src/jest/lib/enonic/static/resource/path/getRelative.test.ts

@@ -1,4 +1,4 @@
-import type {Request} from '../types'; // Keep this relative for @enonic-types/lib-static to be correct.
+import type {Request} from '@enonic-types/core';
 
 import {lcKeys} from '/lib/enonic/static/util/lcKeys';
 

src/main/resources/lib/enonic/static/request/getLowerCasedHeaders.ts

@@ -1,4 +1,4 @@
-import type {Response} from '../../types'; // Keep this relative for @enonic-types/lib-static to be correct.
+import type {Response} from '@enonic-types/core';
 
 import {getPathError} from '/lib/enonic/static/path/getPathError';
 import {isDev} from '/lib/enonic/static/runMode';

src/main/resources/lib/enonic/static/resource/path/checkPath.ts

@@ -1,4 +1,4 @@
-import type {Request} from '../../types'; // Keep this relative for @enonic-types/lib-static to be correct.
+import type {Request} from '@enonic-types/core';
 
 import {isStringLiteral} from '/lib/enonic/static/util/isStringLiteral';
 import {stringStartsWith} from '../../util/stringStartsWith';

src/main/resources/lib/enonic/static/resource/path/getRelative.ts

@@ -1,4 +1,4 @@
-import type {Request} from '../../types'; // Keep this relative for @enonic-types/lib-static to be correct.
+import type {Request} from '@enonic-types/core';
 
 import {getRelative} from '/lib/enonic/static/resource/path/getRelative';
 import {isStringLiteral} from '/lib/enonic/static/util/isStringLiteral';