Improve ESM support by using import with file extensions

.github/workflows/main.yml

@@ -5,6 +5,21 @@ on:
   push:
 
 jobs:
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16
+      - name: npm install
+        run: npm ci
+      - name: Check import file extensions
+        run: npm run lint:ext
+
   unit-tests:
     runs-on: buildjet-2vcpu-ubuntu-2004
     strategy:
@@ -345,3 +360,112 @@ jobs:
 #        run: cd packages/benchmark && sh setup.sh
 #      - name: Benchmark run
 #        run: cd packages/benchmark && npm run benchmark
+
+  platform-browser:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16
+      - name: Install NPM dependencies
+        run: npm ci
+      - name: Bootstrap
+        run: npm run bootstrap:ci -- --scope @deepkit/platform
+      # - name: Link
+      #   run: npm run link
+      # - name: Install compiler
+      #   run: npm run install-compiler
+      - name: Build Platform
+        run: npm run lerna -- build --scope="@deepkit/platform"
+      - name: Test
+        run: npm run lerna -- test:browser --scope="@deepkit/platform"
+
+  platform-deno:
+    strategy:
+      matrix:
+        node-version: [ 16.x]
+        deno-version: [ vx.x.x ]
+        os:
+          - macos-latest
+          - ubuntu-latest
+          - windows-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Setup Deno
+        uses: denolib/setup-deno@v2
+        with:
+          deno-version: ${{ matrix.deno-version }}
+      - name: Install NPM dependencies
+        run: npm ci
+      - name: Bootstrap
+        run: npm run bootstrap:ci -- --scope @deepkit/platform
+      # - name: Link
+      #   run: npm run link
+      # - name: Install compiler
+      #   run: npm run install-compiler
+      - name: Build Platform
+        run: npm run lerna -- build --scope="@deepkit/platform"
+      - name: Test
+        run: npm run lerna -- test:deno --scope="@deepkit/platform"
+
+  platform-gjs:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16
+      - name: Install GJS
+        run: sudo apt-get --yes install gjs
+      - name: Install NPM dependencies
+        run: npm ci
+      - name: Bootstrap
+        run: npm run bootstrap:ci -- --scope @deepkit/platform
+      # - name: Link
+      #   run: npm run link
+      # - name: Install compiler
+      #   run: npm run install-compiler
+      - name: Build Platform
+        run: npm run lerna -- build --scope="@deepkit/platform"
+      - name: Test
+        run: npm run lerna -- test:gjs --scope="@deepkit/platform"
+
+  platform-node:
+    strategy:
+      matrix:
+        node-version: [ 16.x ]
+        os:
+          - macos-latest
+          - ubuntu-latest
+          - windows-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install NPM dependencies
+        run: npm ci
+      - name: Bootstrap
+        run: npm run bootstrap:ci -- --scope @deepkit/platform
+      # - name: Link
+      #   run: npm run link
+      # - name: Install compiler
+      #   run: npm run install-compiler
+      - name: Build Platform
+        run: npm run lerna -- build --scope="@deepkit/platform"
+      - name: Test
+        run: npm run lerna -- test:node --scope="@deepkit/platform"

.gitignore

@@ -5,6 +5,8 @@ coverage
 packages/node
 packages/network
 packages/*/dist/*
+!packages/*/dist/esm/
+packages/*/dist/esm/*
 !packages/*/dist/esm/package.json
 !packages/*/dist/.gitkeep
 packages/benchmark/src/orm/end-to-end/sqlite/prisma.sqlite
@@ -13,3 +15,4 @@ packages/benchmark/results
 packages/example-app/var/debug
 packages/example-app/migrations
 .vs
+packages/platform/test/browser/base.test.js

lint-file-extension.cjs

@@ -0,0 +1,74 @@
+const path = require('path');
+const fs = require('fs/promises');
+
+const search = async (dir, regex, ext, exclude) => {
+    const files = await getFiles(dir, ext, exclude);
+    const result = [];
+
+    for (file of files) {
+        const content = await fs.readFile(file, 'utf8');
+
+        if (regex.test(content)) {
+            result.push(file);
+        }
+    };
+
+    return result;
+}
+
+/**
+ *
+ * @param {string} dir
+ * @param {string} ext
+ * @param {string[]} excludes
+ * @returns
+ */
+const getFiles = async (dir, ext, excludes) => {
+    let files = [];
+
+    if(excludes.find(exclude => dir.includes(exclude))) {
+        console.debug("exclude", dir)
+        return files;
+    }
+
+    const stat = await fs.lstat(dir);
+    if (!stat.isDirectory()) {
+        return files;
+    }
+
+    const dirFiles = await fs.readdir(dir);
+
+    for (let file of dirFiles) {
+        const filePath = path.join(dir, file);
+
+        if(excludes.find(exclude => filePath.includes(exclude))) {
+            continue
+        }
+
+        const stat = await fs.lstat(filePath);
+
+        if (stat.isDirectory()) {
+            const nestedFiles = await getFiles(filePath, ext, excludes);
+            files = files.concat(nestedFiles);
+        } else if (stat.isFile()) {
+            if (path.extname(file) === ext) {
+                files.push(filePath);
+            }
+        }
+    };
+
+    return files;
+}
+
+search('./packages', /(import|from) ("|')\..*(?<!.js)("|')/g, '.ts', ['dist', 'node_modules', 'compiler.spec.ts', 'mod.ts']).then((files)=> {
+    if(files.length) {
+        console.error(`Imports without file extension found!`);
+        console.error('\t' + files.join('\n\t'));
+        process.exit(1);
+    }
+    console.info("All imports are looking good :)");
+    process.exit(0);
+
+}).catch((error) => {
+    console.error(error);
+})

package.json

@@ -6,6 +6,7 @@
   "private": true,
   "scripts": {
     "test": "node --max_old_space_size=3048 node_modules/jest/bin/jest.js --forceExit --no-cache",
+    "lerna": "lerna run",
     "test:coverage": "node --max_old_space_size=3048 node_modules/jest/bin/jest.js --coverage --forceExit --no-cache",
     "bootstrap": "lerna bootstrap --no-ci",
     "bootstrap:ci": "lerna bootstrap --ignore @deepkit/benchmark",
@@ -22,7 +23,8 @@
     "docs": "rm -rf docs && node --max-old-space-size=12096 node_modules/.bin/typedoc packages/*/index.ts",
     "publish": "lerna publish --no-private prerelease",
     "publish-force": "npm run build && lerna publish --no-private --force-publish",
-    "publish-website": "heroku container:push web && heroku container:release web"
+    "publish-website": "heroku container:push web && heroku container:release web",
+    "lint:ext": "node lint-file-extension.cjs"
   },
   "peerDependencies": {},
   "devDependencies": {
@@ -46,6 +48,9 @@
     "node": ">= 14.0.0"
   },
   "jest": {
+    "moduleNameMapper": {
+      "(.+)\\.js": "$1"
+    },
     "resolver": "./jest-resolver.js",
     "testPathIgnorePatterns": [
       "packages/*/dist"

packages/angular-universal/index.ts

@@ -8,6 +8,6 @@
  * You should have received a copy of the MIT License along with this program.
  */
 
-export * from './src/listener';
-export * from './src/module';
+export * from './src/listener.js';
+export * from './src/module.js';
 export { HttpResponse, HttpRequest } from '@deepkit/http';

packages/angular-universal/package.json

@@ -54,7 +54,10 @@
     "@deepkit/type": "^1.0.1-alpha.75",
     "@types/node": "^14.0.0"
   },
-  "jest": {
+   "jest": {
+    "moduleNameMapper": {
+      "(.+)\\.js": "$1"
+    },
     "transform": {
       "^.+\\.(ts|tsx)$": "ts-jest"
     },

packages/angular-universal/src/listener.ts

@@ -11,11 +11,11 @@
 import { HtmlResponse, httpWorkflow, RouteConfig } from '@deepkit/http';
 import { eventDispatcher } from '@deepkit/event';
 import { Logger } from '@deepkit/logger';
-import { Config } from './config';
+import { Config } from './config.js';
 import { join } from 'path';
 import { readFileSync } from 'fs';
 import type { Router } from '@angular/router';
-import { AngularUniversalModule } from './module';
+import { AngularUniversalModule } from './module.js';
 
 export class AngularUniversalListener {
     protected serverModule: any;

packages/angular-universal/src/module.ts

@@ -9,8 +9,8 @@
  */
 
 import { createModule } from '@deepkit/app';
-import { AngularUniversalListener } from './listener';
-import { Config } from './config';
+import { AngularUniversalListener } from './listener.js';
+import { Config } from './config.js';
 
 export class AngularUniversalModule extends createModule({
     config: Config,

packages/angular-universal/tsconfig.json

@@ -43,4 +43,4 @@
       "path": "../type/tsconfig.json"
     }
   ]
-}
+}

packages/api-console-api/index.ts

@@ -8,4 +8,4 @@
  * You should have received a copy of the MIT License along with this program.
  */
 
-export * from './src/api';
+export * from './src/api.js';

packages/api-console-api/package.json

@@ -39,7 +39,10 @@
     "@deepkit/rpc": "^1.0.1-alpha.75",
     "@deepkit/type": "^1.0.1-alpha.75"
   },
-  "jest": {
+   "jest": {
+    "moduleNameMapper": {
+      "(.+)\\.js": "$1"
+    },
     "testEnvironment": "node",
     "transform": {
       "^.+\\.(ts|tsx)$": "ts-jest"

packages/api-console-api/tsconfig.esm.json

@@ -5,11 +5,26 @@
     "module": "ES2020"
   },
   "references": [
+    {
+      "path": "../bson/tsconfig.esm.json"
+    },
+    {
+      "path": "../core/tsconfig.esm.json"
+    },
+    {
+      "path": "../crypto/tsconfig.json"
+    },
+    {
+      "path": "../injector/tsconfig.esm.json"
+    },
+    {
+      "path": "../logger/tsconfig.esm.json"
+    },
     {
       "path": "../rpc/tsconfig.esm.json"
     },
     {
       "path": "../type/tsconfig.esm.json"
     }
   ]
-}
+}