fi(easy-service): import from easy src

thisisagile · Jul 19, 2024 · b35030a · b35030a
1 parent 7896817
commit b35030a
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 20 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        package: [easy, easy-domain, easy-express, easy-mssql, easy-mongo, easy-react, easy-test, easy-test-react, easy-test-web, easy-puppeteer, easy-playwright]
+        package: [easy, easy-domain, easy-service, easy-express, easy-mssql, easy-mongo, easy-react, easy-test, easy-test-react, easy-test-web, easy-puppeteer, easy-playwright]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/packages/easy-service/src/health/HealthResource.ts b/packages/easy-service/src/health/HealthResource.ts
@@ -1,7 +1,8 @@
 import { resolve, Json } from '@thisisagile/easy';
 import { HealthUri } from './HealthUri';
-import { Resource, route } from '../resources';
-import { get } from '../http';
+import { Resource } from '../resources/Resource';
+import { route } from '../resources/Route';
+import { get } from '../http/Verb';
 
 @route(HealthUri.Health)
 export class HealthResource implements Resource {

diff --git a/packages/easy-service/src/health/index.ts b/packages/easy-service/src/health/index.ts
diff --git a/packages/easy-service/src/http/index.ts b/packages/easy-service/src/http/index.ts
diff --git a/packages/easy-service/src/index.ts b/packages/easy-service/src/index.ts
@@ -1,4 +1,10 @@
-export * from './health';
-export * from './http';
-export * from './resources';
-export * from './security';
+export * from './health/HealthResource';
+export * from './health/HealthUri';
+export * from './http/OriginatedError';
+export * from './http/Verb';
+export * from './resources/AppProvider';
+export * from './resources/Requires';
+export * from './resources/Resource';
+export * from './resources/Route';
+export * from './resources/Service';
+export * from './security/Jwt';
diff --git a/packages/easy-service/src/resources/Route.ts b/packages/easy-service/src/resources/Route.ts
@@ -1,5 +1,4 @@
-import { List, meta, Optional, tryTo, Uri, Scope, UseCase } from '@thisisagile/easy';
-import { Req } from '../../../easy/src/resources/Req';
+import { List, meta, Optional, tryTo, Uri, Scope, UseCase, Req } from '@thisisagile/easy';
 import { Resource } from './Resource';
 import { RequestHandler } from 'express';
 import { Verb } from '../http/Verb';

diff --git a/packages/easy-service/src/resources/index.ts b/packages/easy-service/src/resources/index.ts
diff --git a/packages/easy-service/src/security/index.ts b/packages/easy-service/src/security/index.ts
diff --git a/packages/easy-service/test/http/OriginatedError.test.ts b/packages/easy-service/test/http/OriginatedError.test.ts
@@ -1,6 +1,6 @@
 import { ContentType, toResults } from '@thisisagile/easy';
 import { Dev } from '@thisisagile/easy/test/ref';
-import { isOriginatedError, OriginatedError, toOriginatedError } from '../../src/http';
+import { isOriginatedError, OriginatedError, toOriginatedError } from '../../src';
 
 describe('OriginatedError', () => {
   test('origin', () => {