Merge 4d9271b into b6426a1

.eslintignore

@@ -3,4 +3,5 @@ dist
 coverage
 test/e2e.spec.js
 ssr.php
-ssr.js
+ssr.js
+src/types

.eslintrc.json

@@ -19,6 +19,7 @@
     "no-var": 2,
     "prefer-const": 2,
     "no-labels": "off",
+    "no-useless-constructor": "off",
     "@typescript-eslint/indent": "off",
     "@typescript-eslint/explicit-function-return-type": "off",
     "@typescript-eslint/no-explicit-any": "off",

bin/auto-complete

@@ -9,11 +9,8 @@
 # 3. Input `./bin/test.ts` and press <Tab>
 
 compdef _test debug
-compdef _test scat
-compdef _test render.ts
-compdef _test compile-to-js.ts
-compdef _test compile-to-php.ts
-compdef _test render.php
+compdef _test render-by-source.js
+compdef _test render-onthefly.js
 
 function _test {
     local line

bin/debug

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
 
+require('source-map-support/register')
 const { execCommandSync, assertSanHTMLEqual } = require('../dist/index')
 const chalk = require('chalk')
 const { readFileSync, readdirSync } = require('fs')
 const { resolve } = require('path')
-const { compile } = require('../dist/target-js/utils/case')
 const root = resolve(__dirname, '../test/cases')
+const { compile } = require('../dist/fixtures/case')
 
 const caseName = process.argv[2]
 if (!caseName) {
@@ -19,25 +20,25 @@ if (!caseName) {
 
 const htmlPath = resolve(root, caseName, 'expected.html')
 const expected = readFileSync(htmlPath, 'utf8')
-console.log(chalk.cyan(`[EXPECTED] ${caseName}`), expected)
+console.log(chalk.cyan(`[EXPECT] ${caseName}`), expected)
 
 let got1
 try {
     compile(caseName)
     got1 = execCommandSync(resolve(__dirname, `./render-by-source.js`), [caseName])
     assertSanHTMLEqual(got1, expected)
-    console.log(chalk.green(`[ SOURCE ] ${caseName}`), got1)
+    console.log(chalk.green(`[SOURCE] ${caseName}`), got1)
 } catch (err) {
-    console.log(chalk.red(`[ SOURCE ] ${caseName}`), got1)
+    console.log(chalk.red(`[SOURCE] ${caseName}`), got1)
     console.error(err)
 }
 
 let got2
 try {
     got2 = execCommandSync(resolve(__dirname, `./render-onthefly.js`), [caseName])
     assertSanHTMLEqual(got2, expected)
-    console.log(chalk.green(`[ RENDER ] ${caseName}`), got2)
+    console.log(chalk.green(`[RENDER] ${caseName}`), got2)
 } catch (err) {
-    console.log(chalk.red(`[ RENDER ] ${caseName}`), got2)
+    console.log(chalk.red(`[RENDER] ${caseName}`), got2)
     console.error(err)
 }

bin/render-by-source.js

@@ -1,23 +1,9 @@
 #!/usr/bin/env node
 
-const { existsSync, readFileSync } = require('fs')
-const { resolve, join } = require('path')
+require('source-map-support/register')
+const { renderBySource } = require('../dist/fixtures/case')
 
 const caseName = process.argv[2]
-const caseRoot = resolve(__dirname, '../test/cases')
-const caseDir = resolve(caseRoot, caseName)
-const jsSSRPath = join(caseDir, 'ssr.js')
+const html = renderBySource(caseName)
 
-const data = getData(caseDir)
-const noDataOutput = /-ndo$/.test(caseDir)
-const jsRendered = require(jsSSRPath)(data, noDataOutput)
-process.stdout.write(jsRendered)
-
-function getData (caseDir) {
-    const dataJSPath = join(caseDir, 'data.js')
-    if (existsSync(dataJSPath)) {
-        return require(dataJSPath)
-    }
-    const dataPath = join(caseDir, 'data.json')
-    return JSON.parse(readFileSync(dataPath, 'utf8'))
-}
+process.stdout.write(html)

bin/render-onthefly.js

@@ -1,31 +1,8 @@
 #!/usr/bin/env node
 
-const { existsSync, readFileSync } = require('fs')
-const { resolve, join } = require('path')
-
+require('source-map-support/register')
+const { renderOnthefly } = require('../dist/fixtures/case')
 const caseName = process.argv[2]
-const caseRoot = resolve(__dirname, '../test/cases')
-const caseDir = resolve(caseRoot, caseName)
-
-const render = getRender()
-const data = getData()
-const noDataOutput = /-ndo$/.test(caseName)
 
-const html = render(data, noDataOutput)
+const html = renderOnthefly(caseName)
 process.stdout.write(html)
-
-function getData () {
-    const dataJSPath = join(caseDir, 'data.js')
-    if (existsSync(dataJSPath)) {
-        return require(dataJSPath)
-    }
-    const dataPath = join(caseDir, 'data.json')
-    return JSON.parse(readFileSync(dataPath, 'utf8'))
-}
-
-function getRender () {
-    const ComponentClass = require(join(caseDir, 'component.js'))
-    return require('../dist/index.js').compileToRenderer(ComponentClass, {
-        noTemplateOutput: caseDir.indexOf('notpl') > -1
-    })
-}

jest.config.js

@@ -4,8 +4,11 @@ module.exports = {
     ],
     testMatch: [
         '<rootDir>/test/unit/**/*.ts',
-        '<rootDir>/test/integration.spec.js'
+        '<rootDir>/test/integration.spec.ts'
     ],
+    transform: {
+        '^.+\\.ts$': 'babel-jest'
+    },
     globals: {
         tsConfig: {
             skipLibCheck: true,