@static-suite/static-suite-data-server 0.0.23 → 0.0.25

package/src/http/routes/index.ts

@@ -44,11 +44,11 @@ routes.get('/status/index/custom', statusIndexCustom);
 routes.get('/status/diff', statusDiff);
 routes.get('/status', statusIndex);
 routes.get('/query', queryIndex);
-routes.get('/query/*', runQuery);
+routes.get('/query/*queryDefinition', runQuery);
 routes.get('/task', taskIndex);
-routes.get('/task/*', runTask);
+routes.get('/task/:taskId', runTask);
 routes.get('/cache', cacheIndex);
-routes.get('/cache/*/clear', cacheClear);
+routes.get('/cache/:cacheBinId/clear', cacheClear);
 routes.get('/dump', dumpIndex);
 routes.get('/dump/incremental', dumpIncremental);
 routes.get('/dump/full', dumpFull);
@@ -61,9 +61,9 @@ routes.get('/dependency/invalidated/tags/all', dependencyAllInvalidatedTags);
 routes.get('/dependency/invalidated/filepaths', dependencyInvalidatedFilepaths);
 routes.get('/dependency/tag/parents', dependencyTagParents);
 routes.get('/dependency', dependencyIndex);
-routes.get(['/data/*', '/data'], data);
-routes.get(['/index/url/*', '/index/url'], indexUrl);
-routes.get(['/index/uuid/*', '/index/uuid'], indexUUID);
+routes.get(['/data/*storeKeyParts', '/data'], data);
+routes.get(['/index/url/*storeKeyParts', '/index/url'], indexUrl);
+routes.get(['/index/uuid/:langcode/:uuid', '/index/uuid'], indexUUID);
 routes.get('/subset', subset);
 
 export default routes;

package/src/http/routes/indexUUID.ts

@@ -6,10 +6,10 @@ import { dataDirManager } from '../../lib/store/dataDir';
 // Url format /index/uuid/fr/4c7a791d-f994-4a0a-81c5-b0cdf759f8b5
 const indexUUID = (req: Request, res: Response): void => {
   dataDirManager.update();
-  const storeKey = req.params[0].split('/');
+  const { langcode, uuid } = req.params;
 
-  const storeFile = storeKey[1]
-    ? store.index.uuid.get(storeKey[0])?.get(storeKey[1])
+  const storeFile = uuid
+    ? store.index.uuid.get(langcode)?.get(uuid)
     : undefined;
   if (storeFile === undefined) {
     res.status(404);

package/src/http/routes/indexUrl.ts

@@ -5,7 +5,11 @@ import { dataDirManager } from '../../lib/store/dataDir';
 
 const indexUrl = (req: Request, res: Response): void => {
   dataDirManager.update();
-  const storeKey = req.params[0] === 'index' ? '' : req.params[0];
+  const storeKeyParts = Array.from(req.params.storeKeyParts || []);
+  const storeKey =
+    storeKeyParts.length === 1 && storeKeyParts[0] === 'index'
+      ? ''
+      : storeKeyParts.join('/');
   const storeFile = store.index.url.get(`/${storeKey}`);
 
   if (storeFile === undefined) {

package/src/http/routes/task.ts

@@ -16,7 +16,7 @@ const taskIndex = (req: Request, res: Response): void => {
 const runTask = (req: Request, res: Response): void => {
   dataDirManager.update();
   const args: any = req.query;
-  const taskId = req.params[0];
+  const { taskId } = req.params;
   const response: TaskSuccessfulResponse | TaskErrorResponse = taskRunner.run(
     taskId,
     args,

package/src/lib/config/__tests__/config.test.ts

@@ -36,7 +36,7 @@ describe('Config test', () => {
       };
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
-      expect(() => setConfig(config)).toThrowError(MissingRequiredOption);
+      expect(() => setConfig(config)).toThrow(MissingRequiredOption);
     });
 
     it('wrong option runMode returns expected error', () => {
@@ -46,7 +46,7 @@ describe('Config test', () => {
       };
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
-      expect(() => setConfig(config)).toThrowError(InvalidRunMode);
+      expect(() => setConfig(config)).toThrow(InvalidRunMode);
     });
 
     it('Wrong dataDir returns expected error', () => {

package/src/lib/config/config.ts

@@ -110,6 +110,7 @@ const setConfig = (options: NonSanitizedConfigOptions): ConfigOptions => {
     try {
       fs.accessSync(localOptions.dumpDir, fs.constants.W_OK);
     } catch (e) {
+      console.error(e);
       throw new NonWritableDirectory('dumpDir', localOptions.dumpDir);
     }
     // fs.realpathSync() throws an error if path does not exist.

package/src/lib/query/__tests__/queryRunner.test.ts

@@ -52,6 +52,7 @@ describe('QueryRunner test', () => {
       logger.error = jest.fn();
       try {
         queryRunner.run('error');
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
       } catch (e) {
         // none
       }

package/src/lib/query/queryTagManager.ts

@@ -33,7 +33,6 @@ export const queryTagManager: QueryTagManager = {
           queryDefinition => {
             const tagsByQuery = tagsByQueryIndex.get(queryDefinition);
             if (tagsByQuery) {
-              // eslint-disable-next-line no-restricted-syntax
               for (const invalidatedTag of invalidatedTags) {
                 if (tagsByQuery.has(invalidatedTag)) {
                   invalidFilepaths.add(relativeFilepath);

package/src/lib/store/dump/dumpMetadataHelper.ts

@@ -19,6 +19,7 @@ export const dumpMetadataHelper = {
       currentDumpMetadata = JSON.parse(
         fs.readFileSync(metadataFilepath).toString(),
       );
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       currentDumpMetadata = fallbackDumpMetadata;
     }

package/src/lib/task/__tests__/taskRunner.test.ts

@@ -38,6 +38,7 @@ describe('TaskRunner test', () => {
       logger.error = jest.fn();
       try {
         taskRunner.run('error', {});
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
       } catch (e) {
         // none
       }

package/src/lib/utils/array/arrayUtils.ts

@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export const arrayRemoveByValue = (arr: any[], value: any): void => {
   const index = arr.indexOf(value);
   if (index !== -1) {

package/src/lib/utils/fs/__tests__/fsUtils.test.ts

@@ -9,7 +9,11 @@ import {
   isJsonFile,
 } from '../fsUtils';
 
-const fixturesDir = path.join(__dirname, './fixtures/');
+// This test is executed from dist folder
+const fixturesDir = path.join(
+  __dirname,
+  '../../../../../src/lib/utils/fs/__tests__/fixtures/',
+);
 const jsonFixturePath = path.join(fixturesDir, 'file.json');
 const jsonRawValue = fs.readFileSync(jsonFixturePath, 'utf8');
 const jsonParsedValue = JSON.parse(jsonRawValue);

package/src/lib/utils/logger/logger.ts

@@ -58,7 +58,6 @@ export const logger: winston.Logger = winston.createLogger({
  * An exception if a log file is defined, but its path is no writable
  */
 export const configureLogger = (
-  // eslint-disable-next-line default-param-last
   level: LogLevel = LogLevel.WARN,
   logFile?: LogFile,
 ): void => {

package/src/lib/utils/module/__mocks__/dummyModule.query.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 module.exports = {
   dummyModule: () => 'dummyModuleValue',
   dummyObject: { key: 'dummyModuleValue' },

package/src/lib/utils/module/__mocks__/dummyModule2.query.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 module.exports = {
   dummyModule2: () => 'dummyModule2Value',
   dummyObject2: { key: 'dummyModule2Value' },

package/src/lib/utils/module/__tests__/dirBasedModuleGroupManager.test.ts

@@ -4,7 +4,9 @@ import { config } from '../../../config';
 import { dirBasedModuleGroupManager } from '..';
 
 config.queryDir = fs.realpathSync(
-  path.resolve(path.join(__dirname, '../__mocks__')),
+  path.resolve(
+    path.join(__dirname, '../../../../../src/lib/utils/module/__mocks__'),
+  ),
 );
 export const exampleQueryManager = dirBasedModuleGroupManager('query');
 

package/src/lib/utils/module/__tests__/moduleHandler.test.ts

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable global-require */
 import fs from 'fs';
 import path from 'path';
 import { logger } from '../../logger';
@@ -8,8 +6,14 @@ import { moduleManager } from '../moduleManager';
 // This works in conjunction with "__mocks__/clear-module.js"
 jest.mock('clear-module');
 
+// This test is executed from dist folder
 const dummyModulePath = fs.realpathSync(
-  path.resolve(path.join(__dirname, '../__mocks__/dummyModule.query.js')),
+  path.resolve(
+    path.join(
+      __dirname,
+      '../../../../../src/lib/utils/module/__mocks__/dummyModule.query.js',
+    ),
+  ),
 );
 
 type DummyModule = {

package/src/lib/utils/module/moduleManager.ts

@@ -1,5 +1,3 @@
-/* eslint-disable global-require */
-/* eslint-disable import/no-dynamic-require */
 import clearModule from 'clear-module';
 import { logger } from '../logger';
 import { config } from '../../config';
@@ -36,6 +34,7 @@ const resolve = (modulePath: string): string => {
   if (!resolvedModulePath) {
     try {
       resolvedModulePath = require.resolve(modulePath);
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       resolvedModulePath = modulePath;
     }

package/tsconfig.json

@@ -50,8 +50,7 @@
     /* Module Resolution Options */
     // "moduleResolution": "node",                  /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
     "baseUrl": "./src" /* Base directory to resolve non-absolute module names. */,
-    "paths": {
-    } /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */,
+    "paths": {} /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */,
     // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
     // "typeRoots": [],                             /* List of folders to include type definitions from. */
     // "types": [],                                 /* Type declaration files to be included in compilation. */

package/.eslintignore

@@ -1,4 +0,0 @@
-node_modules
-dist
-scripts
-__mocks__

package/.eslintrc.json

@@ -1,46 +0,0 @@
-{
-  "settings": {
-    "import/resolver": {
-      "typescript": {}
-    }
-  },
-  "root": true,
-  "parser": "@typescript-eslint/parser",
-  "env": {
-    "commonjs": true,
-    "es2021": true,
-    "node": true
-  },
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "airbnb-typescript-prettier",
-    "prettier"
-  ],
-  "parserOptions": {
-    "ecmaVersion": 12
-  },
-  "plugins": [
-    "@typescript-eslint",
-    "prettier",
-    "import",
-    "eslint-plugin-tsdoc"
-  ],
-  "rules": {
-    "import/prefer-default-export": 0,
-    "prettier/prettier": "error",
-    "arrow-parens": [1, "as-needed"],
-    "prefer-destructuring": [
-      "error",
-      {
-        "array": false,
-        "object": true
-      },
-      {
-        "enforceForRenamedProperties": false
-      }
-    ],
-    "@typescript-eslint/no-explicit-any": "off",
-    "tsdoc/syntax": "error"
-  }
-}