Support absolute import usage from core-indexers

near · Aug 8, 2024 · b4c0000 · b4c0000
1 parent dbc3246
commit b4c0000
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/core-indexers/jest.config.js b/core-indexers/jest.config.js
@@ -2,5 +2,9 @@ module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   testMatch: ['**/*.test.ts'],
-  testTimeout: 10000
+  testTimeout: 10000,
+  moduleNameMapper: {
+    '^runner/(.*)$': '<rootDir>/../runner/$1', // Ensure tests can find runner imports
+    '^src/(.*)$': '<rootDir>/../runner/src/$1' // Ensure tests can find runner absolute imports
+  }
 };
diff --git a/core-indexers/package.json b/core-indexers/package.json
@@ -7,9 +7,6 @@
   },
   "author": "",
   "license": "ISC",
-  "dependencies": {
-    "queryapi-runner": "file:../runner"
-  },
   "devDependencies": {
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.7.0",

diff --git a/core-indexers/tsconfig.json b/core-indexers/tsconfig.json
@@ -3,7 +3,11 @@
     "target": "es2018",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
     "lib": ["es2021"],                                      /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     "module": "commonjs",                                /* Specify what module code is generated. */
-    "rootDir": "..",    
+    "rootDir": "../", 
+    "paths": {
+      "@queryapi-runner/*": ["../runner/*"],             /* Allow imports from runner using queryapi-runner alias */
+      "src/*": ["../runner/src/*"]                       /* Allow absolute imports in runner */
+    },
     "moduleResolution": "node",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     "resolveJsonModule": true,                           /* Enable importing .json files. */
     "allowJs": true,                                     /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */

diff --git a/runner/src/indexer-config/index.ts b/runner/src/indexer-config/index.ts
@@ -1 +1,2 @@
 export { default } from './indexer-config';
+export { ProvisioningConfig, LocalIndexerConfig } from './indexer-config';
diff --git a/runner/src/indexer/local-indexer/local-indexer.ts b/runner/src/indexer/local-indexer/local-indexer.ts
@@ -1,10 +1,10 @@
 import ContextBuilder, { type ContextObject } from '../context-builder';
 import InMemoryDmlHandler from '../context-builder/dml-handler/in-memory-dml-handler';
-import IndexerConfig from '../../indexer-config';
-import { type LocalIndexerConfig } from '../../indexer-config/indexer-config';
-import NoOpIndexerMeta from '../../indexer-meta/no-op-indexer-meta';
-import Indexer from '../../indexer/indexer';
-import LakeClient from '../../lake-client/lake-client';
+import IndexerConfig from 'src/indexer-config';
+import { type LocalIndexerConfig } from 'src/indexer-config';
+import NoOpIndexerMeta from 'src/indexer-meta/no-op-indexer-meta';
+import Indexer from 'src/indexer';
+import LakeClient from 'src/lake-client/lake-client';
 
 export default class LocalIndexer {
   public readonly indexer: Indexer;
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export { default } from './indexer-config';
		export { ProvisioningConfig, LocalIndexerConfig } from './indexer-config';