fix: rebase cleanup

fix: rebase cleanup

fix: rebase cleanup

packages/api/CHANGELOG.md

@@ -1,25 +1,16 @@
 # [1.1.0](https://gitlab.com/openstapps/api/compare/v1.0.1...v1.1.0) (2023-05-19)
 
-
-
 ## [1.0.1](https://gitlab.com/openstapps/api/compare/v1.0.0...v1.0.1) (2023-05-08)
 
-
 ### Bug Fixes
 
-* changelog generation on version tags ([a5291af](https://gitlab.com/openstapps/api/commit/a5291af83831d542a60d8df119dc10fc44233ae6))
-* rename deprecated Gitlab CI variables ([10f7cb8](https://gitlab.com/openstapps/api/commit/10f7cb802883b51fcee52b05d2751cbac27130cd))
-
-
+- changelog generation on version tags ([a5291af](https://gitlab.com/openstapps/api/commit/a5291af83831d542a60d8df119dc10fc44233ae6))
+- rename deprecated Gitlab CI variables ([10f7cb8](https://gitlab.com/openstapps/api/commit/10f7cb802883b51fcee52b05d2751cbac27130cd))
 
 # [1.0.0](https://gitlab.com/openstapps/api/compare/v0.46.0...v1.0.0) (2023-05-04)
 
-
-
 # [0.46.0](https://gitlab.com/openstapps/api/compare/v0.45.0...v0.46.0) (2023-05-04)
 
-
-
 # [0.45.0](https://gitlab.com/openstapps/api/compare/v0.44.0...v0.45.0) (2022-12-06)
 
 # [0.44.0](https://gitlab.com/openstapps/api/compare/v0.43.0...v0.44.0) (2022-10-18)

packages/core/CHANGELOG.md

@@ -1,24 +1,16 @@
 # [1.1.0](https://gitlab.com/openstapps/core/compare/v1.0.1...v1.1.0) (2023-05-19)
 
-
 ### Features
 
-* add certification thing ([fd63fb7](https://gitlab.com/openstapps/core/commit/fd63fb764f882a87b8da3c5fb27701a090469df2))
-
-
+- add certification thing ([fd63fb7](https://gitlab.com/openstapps/core/commit/fd63fb764f882a87b8da3c5fb27701a090469df2))
 
 ## [1.0.1](https://gitlab.com/openstapps/core/compare/v1.0.0...v1.0.1) (2023-04-28)
 
-
-
 # [1.0.0](https://gitlab.com/openstapps/core/compare/v0.75.0...v1.0.0) (2023-04-28)
 
-
 ### Features
 
-* support ES 8.4 via mapping generator ([afcc73f](https://gitlab.com/openstapps/core/commit/afcc73f3da856a76a613d939a759cf1cd701a2c5))
-
-
+- support ES 8.4 via mapping generator ([afcc73f](https://gitlab.com/openstapps/core/commit/afcc73f3da856a76a613d939a759cf1cd701a2c5))
 
 # [0.75.0](https://gitlab.com/openstapps/core/compare/v0.74.0...v0.75.0) (2023-02-28)
 

packages/core/src/meta.ts

@@ -23,7 +23,11 @@ import {SCAssessment, SCAssessmentMeta, SCAssessmentWithoutReferences} from './t
 import {SCBook, SCBookMeta, SCBookWithoutReferences} from './things/book.js';
 import {SCBuilding, SCBuildingMeta, SCBuildingWithoutReferences} from './things/building.js';
 import {SCCatalog, SCCatalogMeta, SCCatalogWithoutReferences} from './things/catalog.js';
-import {SCCertification, SCCertificationMeta, SCCertificationWithoutReferences} from './things/certification';
+import {
+  SCCertification,
+  SCCertificationMeta,
+  SCCertificationWithoutReferences,
+} from './things/certification.js';
 import {SCContactPoint, SCContactPointMeta, SCContactPointWithoutReferences} from './things/contact-point.js';
 import {
   SCCourseOfStudy,

packages/core/src/things/certification.ts

@@ -12,16 +12,16 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-import {SCMetaTranslations, SCTranslations} from '../general/i18n';
-import {SCThing, SCThingMeta, SCThingType} from './abstract/thing';
+import {SCMetaTranslations, SCTranslations} from '../general/i18n.js';
+import {SCThing, SCThingMeta, SCThingType} from './abstract/thing.js';
 import {
   SCThingWithCategories,
   SCThingWithCategoriesSpecificValues,
   SCThingWithCategoriesTranslatableProperties,
   SCThingWithCategoriesWithoutReferences,
   SCThingWithCategoriesWithoutReferencesMeta,
-} from './abstract/thing-with-categories';
-import {SCOrganizationWithoutReferences} from './organization';
+} from './abstract/thing-with-categories.js';
+import {SCOrganizationWithoutReferences} from './organization.js';
 
 export interface SCCertificationWithoutReferences
   extends SCThingWithCategoriesWithoutReferences<

packages/core/test/guards.spec.ts

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-import {SCMultiSearchResponse} from '../src/index.js';
 import {expect} from 'chai';
 import {
   isBulkResponse,
@@ -26,11 +25,7 @@ import {bulkResponse} from './dummy/bulk-response.js';
 import {dishWithTranslation} from './dummy/dish-with-translation.js';
 import {dishWithTranslationSearchResponse} from './dummy/dish-with-translation-search-response.js';
 import {notADish} from './dummy/not-a-dish.js';
-import {SCBulkResponse} from '../src/protocol/routes/bulk-request.js';
-import {SCSearchResponse} from '../src/protocol/routes/search.js';
-import {SCMultiSearchResponse} from '../src/protocol/routes/search-multi.js';
-import {SCThingOriginType, SCThingType} from '../src/things/abstract/thing.js';
-import {SCDish} from '../src/things/dish.js';
+import {SCMultiSearchResponse} from '../src/index.js';
 
 describe('Guards', function () {
   this.timeout(10_000);

packages/core/test/routes.spec.ts

@@ -12,7 +12,6 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-import {slow, suite, test, timeout} from '@testdeck/mocha';
 import {expect} from 'chai';
 import {SCBulkRoute} from '../src/index.js';
 import {SCBulkAddRoute} from '../src/index.js';

packages/core/test/translator.spec.ts

@@ -12,7 +12,6 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-import {slow, suite, test, timeout} from '@testdeck/mocha';
 import {expect} from 'chai';
 import clone from 'rfdc';
 import {SCThingRemoteOrigin} from '../src/index.js';

packages/es-mapping-generator/CHANGELOG.md

@@ -1,11 +1,7 @@
 # [0.6.0](https://gitlab.com/openstapps/es-mapping-generator/compare/v0.5.0...v0.6.0) (2023-04-28)
 
-
-
 # [0.5.0](https://gitlab.com/openstapps/es-mapping-generator/compare/v0.4.0...v0.5.0) (2023-04-27)
 
-
-
 # [0.4.0](https://gitlab.com/openstapps/es-mapping-generator/compare/v0.3.0...v0.4.0) (2023-01-12)
 
 # [0.3.0](https://gitlab.com/openstapps/es-mapping-generator/compare/v0.2.0...v0.3.0) (2022-08-17)

packages/es-mapping-generator/package.json

@@ -10,7 +10,6 @@
   "bin": {
     "openstapps-es-mapping-generator": "app.js"
   },
-  "author": "Thea Schöbl <dev@theaninova.de>",
   "scripts": {
     "build": "rimraf lib && tsc",
     "format": "prettier . --ignore-path ../../.gitignore",
@@ -41,7 +40,7 @@
     "c8": "7.13.0",
     "nock": "13.3.0",
     "rimraf": "5.0.0",
-    "ts-node": "10.9.1",
+    "ts-node": "10.9.1"
   },
   "prettier": "@openstapps/prettier-config"
 }

packages/es-mapping-generator/src/app.ts

@@ -77,7 +77,7 @@ commander
     }
     if (typeof options.errorPath !== 'undefined') {
       const errorPath = path.resolve(options.errorPath);
-      mkdirSync(path.dirname(errPath), {recursive: true});
+      mkdirSync(path.dirname(errorPath), {recursive: true});
       // tslint:disable-next-line:no-magic-numbers
       writeFileSync(errorPath, JSON.stringify(result.errors, null, 2));
       console.log(`Mapping errors written to ${errorPath}.`);

packages/es-mapping-generator/src/mapping.ts

@@ -17,7 +17,6 @@ import {
   MappingObjectProperty,
   MappingProperty,
 } from '@elastic/elasticsearch/lib/api/types';
-import {Logger} from '@openstapps/logger';
 import merge from 'deepmerge';
 import {stringify} from 'flatted';
 import {DeclarationReflection, ProjectReflection, SignatureReflection} from 'typedoc';
@@ -38,8 +37,7 @@ import {premaps} from './config/premap';
 import {settings} from './config/settings';
 import {dynamicTypes, isTagType, MISSING_PREMAP, PARSE_ERROR, TYPE_CONFLICT, typemap} from './config/typemap';
 import {AggregationSchema, ESNestedAggregation} from './types/aggregation';
-import {ElasticsearchTemplateCollection,
-  MappingGenTemplate} from './types/mapping';
+import {ElasticsearchTemplateCollection, MappingGenTemplate} from './types/mapping';
 import * as console from 'console';
 
 let dynamicTemplates: Record<string, MappingDynamicTemplate>[] = [];
@@ -260,11 +258,7 @@ function handleDeclarationReflection(
   // check if we have an object referencing a generic
   if (generics.has(decl.name)) {
     // if the object name is the same as the generic name
-    return readFieldTags(
-      generics.get(decl.name)!,
-      path,
-      topTypeName, decl.comment?.tags ?? [],
-    );
+    return readFieldTags(generics.get(decl.name)!, path, topTypeName, decl.comment?.tags ?? []);
     // use the value defined by the generic
   }
 
@@ -687,12 +681,7 @@ function readFieldTags(
  * @param topTypeName the name of the SCThingType
  * @param tags tags attached to the value
  */
-function readTypeTags(
-  type: string,
-  path: string,
-  topTypeName: string,
-  tags: CommentTag[],
-): MappingProperty {
+function readTypeTags(type: string, path: string, topTypeName: string, tags: CommentTag[]): MappingProperty {
   let out: MappingProperty = {type: PARSE_ERROR};
 
   if (typeof typemap[type] !== 'undefined') {