Updated the aliases to the root of the package, rather than directly …

…to a subdir such as /interfaces or /enums
Informatievlaanderen · Jan 18, 2024 · 69d3ded · 69d3ded
1 parent c688bbc
commit 69d3ded
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 21 deletions.
diff --git a/packages/oslo-converter-stakeholders/package.json b/packages/oslo-converter-stakeholders/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "main": "index.js",
   "_moduleAliases": {
-    "../enums": "./lib/enums"
+    "@oslo-converter-stakeholders": "./lib"
   },
   "bin": {
     "oslo-stakeholders-converter": "./bin/runner.js"

diff --git a/packages/oslo-converter-uml-ea/lib/ConnectorNormalisationService.ts b/packages/oslo-converter-uml-ea/lib/ConnectorNormalisationService.ts
@@ -7,7 +7,7 @@ import type {
 import { injectable } from 'inversify';
 import { container } from './config/DependencyInjectionConfig';
 import { EaUmlConverterServiceIdentifier } from './config/EaUmlConverterServiceIdentifier';
-import type { IConnectorNormalisationCase } from '@interfaces/IConnectorNormalisationCase';
+import type { IConnectorNormalisationCase } from '@oslo-converter-uml-ea/interfaces/IConnectorNormalisationCase';
 
 @injectable()
 export class ConnectorNormalisationService {

diff --git a/packages/oslo-converter-uml-ea/lib/ConverterHandlerService.ts b/packages/oslo-converter-uml-ea/lib/ConverterHandlerService.ts
@@ -4,7 +4,7 @@ import type { DataRegistry, EaObject } from '@oslo-flanders/ea-uml-extractor';
 import { container } from './config/DependencyInjectionConfig';
 import { EaUmlConverterServiceIdentifier } from './config/EaUmlConverterServiceIdentifier';
 import { UriRegistry } from './UriRegistry';
-import type { ConverterHandler } from '@interfaces/ConverterHandler';
+import type { ConverterHandler } from '@oslo-converter-uml-ea/interfaces/ConverterHandler';
 
 export class ConverterHandlerService<T extends EaObject> {
   public readonly logger: Logger;

diff --git a/packages/oslo-converter-uml-ea/lib/config/DependencyInjectionConfig.ts b/packages/oslo-converter-uml-ea/lib/config/DependencyInjectionConfig.ts
@@ -27,7 +27,7 @@ import { EaUmlConversionService } from '../EaUmlConversionService';
 import { OutputHandlerService } from '../OutputHandlerService';
 import { EaUmlConverterConfiguration } from './EaUmlConverterConfiguration';
 import { EaUmlConverterServiceIdentifier } from './EaUmlConverterServiceIdentifier';
-import type { ConverterHandler } from '@interfaces/ConverterHandler';
+import type { ConverterHandler } from '@oslo-converter-uml-ea/interfaces/ConverterHandler';
 
 export const container = new Container();
 

diff --git a/...-uml-ea/lib/connector-normalisation-cases/AssociationWithAssociationClassConnectorCase.ts b/...-uml-ea/lib/connector-normalisation-cases/AssociationWithAssociationClassConnectorCase.ts
@@ -11,7 +11,7 @@ import { inject, injectable } from 'inversify';
 import { EaUmlConverterServiceIdentifier } from '../config/EaUmlConverterServiceIdentifier';
 import { TagNames } from '../enums/TagNames';
 import { getTagValue, toCamelCase, toPascalCase } from '../utils/utils';
-import type { IConnectorNormalisationCase } from '@interfaces/IConnectorNormalisationCase';
+import type { IConnectorNormalisationCase } from '@oslo-converter-uml-ea/interfaces/IConnectorNormalisationCase';
 
 @injectable()
 export class AssociationWithAssociationClassConnectorCase implements IConnectorNormalisationCase {

diff --git a/...r-uml-ea/lib/connector-normalisation-cases/AssociationWithDestinationRoleConnectorCase.ts b/...r-uml-ea/lib/connector-normalisation-cases/AssociationWithDestinationRoleConnectorCase.ts
@@ -11,7 +11,7 @@ import { inject, injectable } from 'inversify';
 import { EaUmlConverterServiceIdentifier } from '../config/EaUmlConverterServiceIdentifier';
 import { TagNames } from '../enums/TagNames';
 import { getTagValue, toCamelCase, updateNameTag } from '../utils/utils';
-import type { IConnectorNormalisationCase } from '@interfaces/IConnectorNormalisationCase';
+import type { IConnectorNormalisationCase } from '@oslo-converter-uml-ea/interfaces/IConnectorNormalisationCase';
 
 @injectable()
 export class AssociationWithDestinationRoleConnectorCase implements IConnectorNormalisationCase {

diff --git a/...lo-converter-uml-ea/lib/connector-normalisation-cases/AssociationWithNameConnectorCase.ts b/...lo-converter-uml-ea/lib/connector-normalisation-cases/AssociationWithNameConnectorCase.ts
@@ -12,7 +12,7 @@ import { inject, injectable } from 'inversify';
 import { EaUmlConverterServiceIdentifier } from '../config/EaUmlConverterServiceIdentifier';
 import { TagNames } from '../enums/TagNames';
 import { getTagValue, toCamelCase, toPascalCase, updateNameTag } from '../utils/utils';
-import type { IConnectorNormalisationCase } from '@interfaces/IConnectorNormalisationCase';
+import type { IConnectorNormalisationCase } from '@oslo-converter-uml-ea/interfaces/IConnectorNormalisationCase';
 
 @injectable()
 export class AssociationWithNameConnectorCase implements IConnectorNormalisationCase {

diff --git a/...verter-uml-ea/lib/connector-normalisation-cases/AssociationWithSourceRoleConnectorCase.ts b/...verter-uml-ea/lib/connector-normalisation-cases/AssociationWithSourceRoleConnectorCase.ts
@@ -11,7 +11,7 @@ import { inject, injectable } from 'inversify';
 import { EaUmlConverterServiceIdentifier } from '../config/EaUmlConverterServiceIdentifier';
 import { TagNames } from '../enums/TagNames';
 import { getTagValue, toCamelCase, updateNameTag } from '../utils/utils';
-import type { IConnectorNormalisationCase } from '@interfaces/IConnectorNormalisationCase';
+import type { IConnectorNormalisationCase } from '@oslo-converter-uml-ea/interfaces/IConnectorNormalisationCase';
 
 @injectable()
 export class AssocationWithSourceRoleConnectorCase implements IConnectorNormalisationCase {

diff --git a/...-ea/lib/connector-normalisation-cases/SelfAssociationWithAssociationClassConnectorCase.ts b/...-ea/lib/connector-normalisation-cases/SelfAssociationWithAssociationClassConnectorCase.ts
@@ -12,7 +12,7 @@ import { inject, injectable } from 'inversify';
 import { EaUmlConverterServiceIdentifier } from '../config/EaUmlConverterServiceIdentifier';
 import { TagNames } from '../enums/TagNames';
 import { getTagValue, toCamelCase, toPascalCase } from '../utils/utils';
-import type { IConnectorNormalisationCase } from '@interfaces/IConnectorNormalisationCase';
+import type { IConnectorNormalisationCase } from '@oslo-converter-uml-ea/interfaces/IConnectorNormalisationCase';
 
 @injectable()
 export class SelfAssociationWithAssociationClassConnectorCase implements IConnectorNormalisationCase {

diff --git a/...onverter-uml-ea/lib/connector-normalisation-cases/SelfAssociationWithNameConnectorCase.ts b/...onverter-uml-ea/lib/connector-normalisation-cases/SelfAssociationWithNameConnectorCase.ts
@@ -17,7 +17,7 @@ import {
   toPascalCase,
   updateNameTag,
 } from '../utils/utils';
-import type { IConnectorNormalisationCase } from '@interfaces/IConnectorNormalisationCase';
+import type { IConnectorNormalisationCase } from '@oslo-converter-uml-ea/interfaces/IConnectorNormalisationCase';
 
 @injectable()
 export class SelfAssociationWithNameConnectorCase implements IConnectorNormalisationCase {

diff --git a/packages/oslo-converter-uml-ea/lib/converter-handlers/AttributeConverterHandler.ts b/packages/oslo-converter-uml-ea/lib/converter-handlers/AttributeConverterHandler.ts
@@ -18,7 +18,7 @@ import { DataTypes, datatypeIdentifierToHash } from '../enums/DataTypes';
 import { TagNames } from '../enums/TagNames';
 import type { UriRegistry } from '../UriRegistry';
 import { getTagValue, ignore, toCamelCase } from '../utils/utils';
-import { ConverterHandler } from '@interfaces/ConverterHandler';
+import { ConverterHandler } from '@oslo-converter-uml-ea/interfaces/ConverterHandler';
 
 @injectable()
 export class AttributeConverterHandler extends ConverterHandler<EaAttribute> {

diff --git a/packages/oslo-converter-uml-ea/lib/converter-handlers/ConnectorConverterHandler.ts b/packages/oslo-converter-uml-ea/lib/converter-handlers/ConnectorConverterHandler.ts
@@ -17,7 +17,7 @@ import { ConnectorNormalisationService } from '../ConnectorNormalisationService'
 import { TagNames } from '../enums/TagNames';
 import type { UriRegistry } from '../UriRegistry';
 import { getTagValue, ignore } from '../utils/utils';
-import { ConverterHandler } from '@interfaces/ConverterHandler';
+import { ConverterHandler } from '@oslo-converter-uml-ea/interfaces/ConverterHandler';
 
 @injectable()
 export class ConnectorConverterHandler extends ConverterHandler<NormalizedConnector> {

diff --git a/packages/oslo-converter-uml-ea/lib/converter-handlers/ElementConverterHandler.ts b/packages/oslo-converter-uml-ea/lib/converter-handlers/ElementConverterHandler.ts
@@ -8,7 +8,7 @@ import { injectable } from 'inversify';
 import { TagNames } from '../enums/TagNames';
 import type { UriRegistry } from '../UriRegistry';
 import { getTagValue, ignore, toPascalCase } from '../utils/utils';
-import { ConverterHandler } from '@interfaces/ConverterHandler';
+import { ConverterHandler } from '@oslo-converter-uml-ea/interfaces/ConverterHandler';
 
 @injectable()
 export class ElementConverterHandler extends ConverterHandler<EaElement> {

diff --git a/packages/oslo-converter-uml-ea/lib/converter-handlers/PackageConverterHandler.ts b/packages/oslo-converter-uml-ea/lib/converter-handlers/PackageConverterHandler.ts
@@ -7,7 +7,7 @@ import { injectable } from 'inversify';
 import { TagNames } from '../enums/TagNames';
 import type { UriRegistry } from '../UriRegistry';
 import { getTagValue, ignore } from '../utils/utils';
-import { ConverterHandler } from '@interfaces/ConverterHandler';
+import { ConverterHandler } from '@oslo-converter-uml-ea/interfaces/ConverterHandler';
 
 @injectable()
 export class PackageConverterHandler extends ConverterHandler<EaPackage> {

diff --git a/packages/oslo-converter-uml-ea/package.json b/packages/oslo-converter-uml-ea/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "main": "index.js",
   "_moduleAliases": {
-    "@interfaces": "./lib/interfaces"
+    "@oslo-converter-uml-ea": "./lib"
   },
   "bin": {
     "oslo-converter-ea": "./bin/runner.js"

diff --git a/packages/oslo-core/lib/logging/LogUtil.ts b/packages/oslo-core/lib/logging/LogUtil.ts
@@ -3,7 +3,7 @@ import type { LoggerFactory } from './LoggerFactory';
 import type { LogLevel } from './LogLevel';
 import { VoidLoggerFactory } from './VoidLoggerFactory';
 import { WinstonLoggerFactory } from './WinstonLoggerFactory';
-import type { YargsParams } from '@interfaces/AppRunner';
+import type { YargsParams } from '@oslo-core/interfaces/AppRunner';
 
 let loggerFactory: LoggerFactory = new VoidLoggerFactory();
 

diff --git a/packages/oslo-core/package.json b/packages/oslo-core/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "main": "index.js",
   "_moduleAliases": {
-    "@interfaces": "./lib/interfaces"
+    "@@oslo-core": "./lib"
   },
   "directories": {
     "lib": "lib"

diff --git a/tsconfig.json b/tsconfig.json
@@ -18,10 +18,20 @@
     "emitDecoratorMetadata": true,
     "baseUrl": ".", // This must be specified if "paths" is.
     "paths": {
-      "@interfaces/*": [
-        "packages/oslo-converter-stakeholders/lib/interfaces/*",
-        "packages/oslo-converter-uml-ea/lib/interfaces/*",
-        "packages/oslo-core/lib/interfaces/*",
+      "@oslo-converter-uml-ea/*": ["packages/oslo-converter-uml-ea/lib/*"],
+      "@oslo-core/*": ["packages/oslo-core/lib/*"],
+      "@oslo-extractor-uml-ea/*": ["packages/oslo-extractor-uml-ea/lib/*"],
+      "@oslo-converter-stakeholders/*": [
+        "packages/oslo-converter-stakeholders/lib/*"
+      ],
+      "@oslo-generator-jsonld-context/*": [
+        "packages/oslo-generator-jsonld-context/lib/*"
+      ],
+      "@oslo-generator-rdf-vocabulary/*": [
+        "packages/oslo-generator-rdf-vocabulary/lib/*"
+      ],
+      "@oslo-generator-respec-html/*": [
+        "packages/oslo-generator-respec-html/lib/*"
       ]
     }
   },