Don't compile aleph.config.ts and api modules

Author: ije

cli.ts

@@ -1,7 +1,9 @@
-import { resolve } from 'https://deno.land/[email protected]/path/mod.ts'
+import { bold } from 'https://deno.land/[email protected]/fmt/colors.ts'
+import { basename, resolve } from 'https://deno.land/[email protected]/path/mod.ts'
 import { parse } from 'https://deno.land/[email protected]/flags/mod.ts'
-import { existsDir } from './shared/fs.ts'
-import log, { LevelNames } from './shared/log.ts'
+import { loadImportMap } from './server/config.ts'
+import { existsDir, findFile } from './shared/fs.ts'
+import log from './shared/log.ts'
 import util from './shared/util.ts'
 import { VERSION } from './version.ts'
 
@@ -61,40 +63,95 @@ async function main() {
   }
 
   const command = String(args.shift()) as keyof typeof commands
-  const { default: cmd, helpMessage: cmdHelpMessage } = await import(`./commands/${command}.ts`)
 
   // prints command help message
   if (options.h || options.help) {
+    const { helpMessage: cmdHelpMessage } = await import(`./commands/${command}.ts`)
     console.log(commands[command])
     console.log(cmdHelpMessage)
     Deno.exit(0)
   }
 
   // execute `init` command
   if (command === 'init') {
-    await cmd(options?.template, args[0])
+    const { default: init } = await import(`./commands/init.ts`)
+    await init(options?.template, args[0])
     return
   }
 
   // execute `upgrade` command
   if (command === 'upgrade') {
-    await cmd(options.v || options.version || args[0] || 'latest')
+    const { default: upgrade } = await import(`./commands/upgrade.ts`)
+    await upgrade(options.v || options.version || args[0] || 'latest')
     return
   }
 
-  // set log level
-  const l = options.L || options['log-level']
-  if (util.isFilledString(l)) {
-    log.setLevel(l.toLowerCase() as LevelNames)
-  }
-
   // check working dir
   const workingDir = resolve(String(args[0] || '.'))
   if (!await existsDir(workingDir)) {
     log.fatal('No such directory:', workingDir)
   }
 
-  await cmd(workingDir, options)
+  // run the command if import maps exists
+  const importMapFile = await findFile(workingDir, ['import_map', 'import-map', 'importmap', 'importMap'].map(name => `${name}.json`))
+  if (importMapFile) {
+    const importMap = await loadImportMap(importMapFile)
+    let updateImportMaps: boolean | null = null
+    let verison: string | null = null
+    for (const key in importMap.imports) {
+      const url = importMap.imports[key]
+      console.log(url, /\/\/deno\.land\/x\/aleph@v?\d+\.\d+\.\d+(-[a-z0-9\.]+)?\//.test(url))
+      if (/\/\/deno\.land\/x\/aleph@v?\d+\.\d+\.\d+(-[a-z0-9\.]+)?\//.test(url)) {
+        const [prefix, rest] = util.splitBy(url, '@')
+        const [ver, suffix] = util.splitBy(rest, '/')
+        console.log(ver)
+        if (ver !== 'v' + VERSION && updateImportMaps === null) {
+          updateImportMaps = confirm(`You are using a different version of Aleph.js, expect ${ver} -> v${bold(VERSION)}, update '${basename(importMapFile)}'?`)
+        }
+        if (updateImportMaps) {
+          importMap.imports[key] = `${prefix}@v${VERSION}/${suffix}`
+        } else if (verison === null) {
+          verison = ver
+        }
+      }
+    }
+    if (updateImportMaps) {
+      await Deno.writeTextFile(importMapFile, JSON.stringify(importMap, undefined, 2))
+    }
+    await run(command, verison || undefined, importMapFile)
+  }
+
+  // run the command without import maps
+  await run(command)
+}
+
+async function run(name: string, version?: string, importMap?: string) {
+  const cmd: string[] = [
+    Deno.execPath(),
+    'run',
+    '-A',
+    '--unstable',
+    '--no-check',
+    '--location', 'http://localhost/'
+  ]
+  if (importMap) {
+    cmd.push('--import-map', importMap)
+  }
+  if (!version || version === 'v' + VERSION) {
+    cmd.push(`./commands/${name}.ts`)
+  } else {
+    cmd.push(`https://deno.land/x/aleph@${version}/commands/${name}.ts`)
+  }
+  cmd.push(...Deno.args.slice(1))
+  console.log(cmd.join(' '))
+  const p = Deno.run({
+    cmd,
+    stdout: 'inherit',
+    stderr: 'inherit'
+  })
+  const c = await p.status()
+  console.log(c)
+  p.close()
 }
 
 if (import.meta.main) {

commands/analyze.ts

@@ -1,6 +1,6 @@
 import { serve } from 'https://deno.land/[email protected]/http/server.ts'
 import { Aleph } from '../server/aleph.ts'
-import { getFlag, parsePortNumber } from '../shared/flags.ts'
+import { parse, getFlag, parsePortNumber } from './helper/flags.ts'
 import log from '../shared/log.ts'
 
 export const helpMessage = `
@@ -17,9 +17,17 @@ Options:
     -h, --help                   Prints help message
 `
 
-export default async function (workingDir: string, flags: Record<string, any>) {
-  const aleph = new Aleph(workingDir, 'production', Boolean(flags.r || flags.reload))
-  const port = parsePortNumber(getFlag(flags, ['p', 'port'], '9000'))
+export default async function () {
+  const { args, options } = parse()
+
+  // check working dir
+  const workingDir = resolve(String(args[0] || '.'))
+  if (!await existsDir(workingDir)) {
+    log.fatal('No such directory:', workingDir)
+  }
+
+  const aleph = new Aleph(workingDir, 'production', Boolean(options.r || options.reload))
+  const port = parsePortNumber(getFlag(options, ['p', 'port'], '9000'))
   await aleph.ready
   const entries = aleph.analyze()
   const s = serve({ port })

commands/build.ts

@@ -1,4 +1,8 @@
+import { resolve } from 'https://deno.land/[email protected]/path/mod.ts'
 import { Aleph } from '../server/aleph.ts'
+import { parse } from './helper/flags.ts'
+import log from '../shared/log.ts'
+import { existsDir } from '../shared/fs.ts'
 
 export const helpMessage = `
 Usage:
@@ -13,7 +17,15 @@ Options:
     -h, --help                   Prints help message
 `
 
-export default async function (workingDir: string, options: Record<string, any>) {
+if (import.meta.main) {
+  const { args, options } = parse()
+
+  // check working dir
+  const workingDir = resolve(String(args[0] || '.'))
+  if (!await existsDir(workingDir)) {
+    log.fatal('No such directory:', workingDir)
+  }
+
   const aleph = new Aleph(workingDir, 'production', Boolean(options.r || options.reload))
   await aleph.build()
   Deno.exit(0)

commands/dev.ts

@@ -1,7 +1,9 @@
+import { resolve } from 'https://deno.land/[email protected]/path/mod.ts'
 import { Aleph } from '../server/aleph.ts'
 import { serve } from '../server/mod.ts'
-import { getFlag, parsePortNumber } from '../shared/flags.ts'
+import { getFlag, parse, parsePortNumber } from './helper/flags.ts'
 import log from '../shared/log.ts'
+import { existsDir } from '../shared/fs.ts'
 
 export const helpMessage = `
 Usage:
@@ -20,12 +22,20 @@ Options:
     -h, --help                   Prints help message
 `
 
-export default async function (workingDir: string, flags: Record<string, any>) {
-  const aleph = new Aleph(workingDir, 'development', Boolean(flags.r || flags.reload))
-  const port = parsePortNumber(getFlag(flags, ['p', 'port'], '8080'))
-  const hostname = getFlag(flags, ['hostname'])
-  const certFile = getFlag(flags, ['tls-cert'])
-  const keyFile = getFlag(flags, ['tls-key'])
+if (import.meta.main) {
+  const { args, options } = parse()
+
+  // check working dir
+  const workingDir = resolve(String(args[0] || '.'))
+  if (!await existsDir(workingDir)) {
+    log.fatal('No such directory:', workingDir)
+  } 
+
+  const aleph = new Aleph(workingDir, 'development', Boolean(options.r || options.reload))
+  const port = parsePortNumber(getFlag(options, ['p', 'port'], '8080'))
+  const hostname = getFlag(options, ['hostname'])
+  const certFile = getFlag(options, ['tls-cert'])
+  const keyFile = getFlag(options, ['tls-key'])
   if (keyFile !== undefined && certFile === undefined) {
     log.fatal('missing `--tls-cert` option')
   } else if (certFile !== undefined && keyFile === undefined) {

shared/flags.ts renamed to commands/helper/flags.ts

@@ -1,3 +1,19 @@
+import { parse as parseArgs } from 'https://deno.land/[email protected]/flags/mod.ts'
+import log, { LevelNames } from '../../shared/log.ts'
+import util from '../../shared/util.ts'
+
+export function parse() {
+  const { _: args, ...options } = parseArgs(Deno.args)
+
+  // set log level
+  const l = options.L || options['log-level']
+  if (util.isFilledString(l)) {
+    log.setLevel(l.toLowerCase() as LevelNames)
+  }
+
+  return { args, options }
+}
+
 /** parse port number */
 export function parsePortNumber(v: string): number {
   const num = parseInt(v)

commands/start.ts

@@ -1,6 +1,8 @@
+import { resolve } from 'https://deno.land/[email protected]/path/mod.ts'
+import { existsDir } from '../shared/fs.ts'
 import { Aleph } from '../server/aleph.ts'
 import { serve } from '../server/mod.ts'
-import { getFlag, parsePortNumber } from '../shared/flags.ts'
+import { getFlag, parse, parsePortNumber } from './helper/flags.ts'
 import log from '../shared/log.ts'
 
 export const helpMessage = `
@@ -20,12 +22,20 @@ Options:
     -h, --help                   Prints help message
 `
 
-export default async function (workingDir: string, flags: Record<string, any>) {
-  const aleph = new Aleph(workingDir, 'production', Boolean(flags.r || flags.reload))
-  const port = parsePortNumber(getFlag(flags, ['p', 'port'], '8080'))
-  const hostname = getFlag(flags, ['hostname'])
-  const certFile = getFlag(flags, ['tls-cert'])
-  const keyFile = getFlag(flags, ['tls-key'])
+if (import.meta.main) {
+  const { args, options } = parse()
+
+  // check working dir
+  const workingDir = resolve(String(args[0] || '.'))
+  if (!await existsDir(workingDir)) {
+    log.fatal('No such directory:', workingDir)
+  }
+
+  const aleph = new Aleph(workingDir, 'production', Boolean(options.r || options.reload))
+  const port = parsePortNumber(getFlag(options, ['p', 'port'], '8080'))
+  const hostname = getFlag(options, ['hostname'])
+  const certFile = getFlag(options, ['tls-cert'])
+  const keyFile = getFlag(options, ['tls-key'])
   if (keyFile !== undefined && certFile === undefined) {
     log.fatal('missing `--tls-cert` option')
   } else if (certFile !== undefined && keyFile === undefined) {