Merge pull request #98 from alephjs/bundler-improvement

Compiler&Bundler improvement

Author: ije

.github/workflows/aleph_in_deno.yml

@@ -1,9 +1,4 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: compiler
+name: Aleph.js Testing
 
 on:
   push:
@@ -13,16 +8,21 @@ on:
 
 jobs:
   test:
-    runs-on: ${{ matrix.os }} # runs a test on macOS, Windows and Ubuntu
+    runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
         os: [macOS-latest, windows-latest, ubuntu-latest]
 
     steps:
-      - name: Setup repo
+      - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Setup deno
+        uses: denolib/setup-deno@v2
+        with:
+          deno-version: v1.x
+
       - name: Setup rust
         uses: hecrj/setup-rust-action@v1
         with:
@@ -33,5 +33,11 @@ jobs:
         with:
           version: latest
 
-      - name: Run tests
+      - name: Cache deps
+        run: deno cache deps.ts
+
+      - name: Deno test
+        run: deno test -A --unstable --location "http://localhost/"
+
+      - name: Cargo test
         run: cd compiler && cargo test --all

.github/workflows/swc.yml renamed to .github/workflows/testing.yml

@@ -2,5 +2,5 @@
 Thumbs.db
 compiler/target/
 compiler/pkg/
-.aleph/
-dist/
+examples/**/.aleph/
+examples/**/dist/

.gitignore

@@ -2,6 +2,7 @@
     "files.eol": "\n",
     "files.trimTrailingWhitespace": true,
     "typescript.format.semicolons": "remove",
+    "typescript.preferences.quoteStyle": "single",
     "[javascript]": {
         "editor.defaultFormatter": "vscode.typescript-language-features"
     },

.vscode/settings.json

@@ -19,31 +19,32 @@ You will need [Deno](https://deno.land/) 1.7+.
 
 ```bash
 # ssr
-deno run -A --unstable --import-map=import_map.json cli.ts dev ./examples/hello-world -L debug
+deno run -A --unstable --import-map=import_map.json --location=http://localhost cli.ts dev ./examples/hello-world -L debug
 # ssg
-deno run -A --unstable --import-map=import_map.json cli.ts build ./examples/hello-world -L debug
+deno run -A --unstable --import-map=import_map.json --location=http://localhost cli.ts build ./examples/hello-world -L debug
 ```
 
 ## Testing
 
 Run all tests:
 
 ```bash
-deno test -A
+deno test -A --location=http://localhost
 ```
 
 ## Project Structure
 
-- **/cli** command code
-- **/compiler** compiler in rust with swc
-- **/framework** framework code
+- **/cli** commands code
+- **/compiler** compiler in rust powered by swc
+- **/framework**
+  - **core** framework core
+  - **react** react framework code
 - **/design** design drawings and assets
 - **/examples** examples
 - **/plugins** official plugins
 - **/server** server code
 - **/shared** shared code
 - **/test** testings
-- **/vendor** packages from npm
 
 ## Code of Conduct
 

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-![Aleph.js: The Full-stack Framework in Deno.](./design/poster.svg)
+[![Aleph.js: The Full-stack Framework in Deno.](./design/poster.svg)](https://alephjs.org)
 
 <p>
   <span>&nbsp;&nbsp;&nbsp;<span>

README.md

@@ -1,9 +1,11 @@
-import { listenAndServe, path, ServerRequest, walk } from './deps.ts'
+import { listenAndServe, path, walk } from './deps.ts'
 import { Request } from './server/api.ts'
-import log from './server/log.ts'
 import { getContentType } from './server/mime.ts'
-import { createHtml, existsDirSync, existsFileSync } from './server/util.ts'
+import { createHtml } from './server/util.ts'
+import { existsDirSync, existsFileSync } from './shared/fs.ts'
+import log from './shared/log.ts'
 import util from './shared/util.ts'
+import { ServerRequest } from './types.ts'
 import { VERSION } from './version.ts'
 
 const commands = {
@@ -15,7 +17,7 @@ const commands = {
 }
 
 const helpMessage = `Aleph.js v${VERSION}
-The React Framework in deno.
+The Full-stack Framework in Deno.
 
 Docs: https://alephjs.org/docs
 Bugs: https://github.com/alephjs/aleph.js/issues
@@ -27,47 +29,46 @@ Commands:
     ${Object.entries(commands).map(([name, desc]) => `${name.padEnd(15)}${desc}`).join('\n    ')}
 
 Options:
-    -h, --help     Prints help message
     -v, --version  Prints version number
+    -h, --help     Prints help message
 `
 
 async function main() {
     // parse deno args
     const args: Array<string> = []
-    const argOptions: Record<string, string | boolean> = {}
+    const flags: Record<string, string | boolean> = {}
     for (let i = 0; i < Deno.args.length; i++) {
         const arg = Deno.args[i]
         if (arg.startsWith('-')) {
             if (arg.includes('=')) {
                 const [key, value] = arg.replace(/^-+/, '').split('=', 2)
-                argOptions[key] = value
+                flags[key] = value
             } else {
                 const key = arg.replace(/^-+/, '')
                 const nextArg = Deno.args[i + 1]
                 if (nextArg && !nextArg.startsWith('-')) {
-                    argOptions[key] = nextArg
+                    flags[key] = nextArg
                     i++
                 } else {
-                    argOptions[key] = true
+                    flags[key] = true
                 }
             }
         } else {
             args.push(arg)
         }
     }
 
-    // get command, default is 'dev'
     const hasCommand = args.length > 0 && args[0] in commands
     const command = (hasCommand ? String(args.shift()) : 'dev') as keyof typeof commands
 
     // prints aleph.js version
-    if (argOptions.v && command != 'upgrade') {
+    if (flags.v && command != 'upgrade') {
         console.log(`aleph.js v${VERSION}`)
         Deno.exit(0)
     }
 
     // prints aleph.js and deno version
-    if (argOptions.version && command != 'upgrade') {
+    if (flags.version && command != 'upgrade') {
         const { deno, v8, typescript } = Deno.version
         console.log(`aleph.js ${VERSION}`)
         console.log(`deno ${deno}`)
@@ -77,7 +78,7 @@ async function main() {
     }
 
     // prints help message
-    if (argOptions.h || argOptions.help) {
+    if (flags.h || flags.help) {
         if (hasCommand) {
             import(`./cli/${command}.ts`).then(({ helpMessage }) => {
                 console.log(commands[command])
@@ -94,7 +95,7 @@ async function main() {
     }
 
     // sets log level
-    const l = argOptions.L || argOptions['log-level']
+    const l = flags.L || flags['log-level']
     if (util.isNEString(l)) {
         log.setLevel(l)
     }
@@ -116,7 +117,7 @@ async function main() {
         }
     }
 
-    // proxy https://deno.land/x/aleph for framework dev
+    // proxy https://deno.land/x/aleph for aleph.js dev
     if (['dev', 'start', 'build'].includes(command) && existsFileSync('./import_map.json')) {
         const { imports } = JSON.parse(Deno.readTextFileSync('./import_map.json'))
         if (imports['https://deno.land/x/aleph/']) {
@@ -161,14 +162,14 @@ async function main() {
 
     const { default: cmd } = await import(`./cli/${command}.ts`)
     if (command === 'upgrade') {
-        await cmd(argOptions.v || argOptions.version || 'latest')
-    } else {
-        const appDir = path.resolve(args[0] || '.')
-        if (command !== 'init' && !existsDirSync(appDir)) {
-            log.fatal('No such directory:', appDir)
-        }
-        await cmd(appDir, argOptions)
+        await cmd(flags.v || flags.version || args[0] || 'latest')
+        return
+    }
+    const appDir = path.resolve(args[0] || '.')
+    if (command !== 'init' && !existsDirSync(appDir)) {
+        log.fatal('No such directory:', appDir)
     }
+    await cmd(appDir, flags)
 }
 
 if (import.meta.main) {

cli.ts

@@ -1,4 +1,4 @@
-import { Project } from '../server/project.ts'
+import { Appliaction } from '../server/mod.ts'
 
 export const helpMessage = `
 Usage:
@@ -8,13 +8,13 @@ Usage:
 if the <dir> is empty, the current directory will be used.
 
 Options:
-    -L, --log-level  Set log level [possible values: debug, info]
-    -r, --reload     Reload source code cache
-    -h, --help       Prints help message
+    -L, --log-level <log-level>  Set log level [possible values: debug, info]
+    -r, --reload                 Reload source code cache
+    -h, --help                   Prints help message
 `
 
-export default async function (appDir: string, options: Record<string, string | boolean>) {
-    const project = new Project(appDir, 'production', Boolean(options.r || options.reload))
-    await project.build()
+export default async function (workingDir: string, options: Record<string, string | boolean>) {
+    const app = new Appliaction(workingDir, 'production', Boolean(options.r || options.reload))
+    await app.build()
     Deno.exit(0)
 }

cli/build.ts

@@ -1,5 +1,4 @@
-import log from '../server/log.ts'
-import { start } from '../server/server.ts'
+import { Appliaction, parsePortNumber, serve } from '../server/mod.ts'
 
 export const helpMessage = `
 Usage:
@@ -9,19 +8,14 @@ Usage:
 if the <dir> is empty, the current directory will be used.
 
 Options:
-    -hn, --host      A host to start the Aleph.js app, default is localhost
-    -p, --port       A port number to start the Aleph.js app, default is 8080
-    -L, --log-level  Set log level [possible values: debug, info]
-    -r, --reload     Reload source code cache
-    -h, --help       Prints help message
+    -p, --port      <port>       A port number to start the Aleph.js app, default is 8080
+    -L, --log-level <log-level>  Set log level [possible values: debug, info]
+    -r, --reload                 Reload source code cache
+    -h, --help                   Prints help message
 `
 
-export default async function (appDir: string, options: Record<string, string | boolean>) {
-    const host = String(options.hn || options.host || 'localhost')
-    const port = parseInt(String(options.p || options.port || '8080'))
-    if (isNaN(port) || port <= 0 || !Number.isInteger(port)) {
-        log.error(`invalid port '${options.port || options.p}'`)
-        Deno.exit(1)
-    }
-    start(appDir, host, port, true, Boolean(options.r || options.reload))
+export default async function (workingDir: string, options: Record<string, string | boolean>) {
+    const port = parsePortNumber(String(options.p || options.port || '8080'))
+    const app = new Appliaction(workingDir, 'development', Boolean(options.r || options.reload))
+    serve('localhost', port, app)
 }