compiling

5f9c6e06 · Иван Кубота · 86be9cd6 · 5f9c6e06 · 5f9c6e06 · 5f9c6e06
Commit 5f9c6e06 authored Jun 09, 2017 by Иван Кубота
Show whitespace changes
Inline Side-by-side

Showing with 91 additions and 13 deletions

cmd.js bin/cmd.js +22 -11

server.js bin/server.js +66 -0

package.json package.json +1 -1

test1.qs test/test1.qs +2 -1

No files found.
--- a/bin/cmd.js
+++ b/bin/cmd.js
@@ -4,12 +4,13 @@
 */
 var args = process.argv.slice(2);
 var fileName = args[0];
-var QRequire = global.QRequire = require('./QRequire'),
-    TypeTable = require('./TypeTable'),
+var path = require('path');

-    path = require('path'),
+var QRequire = global.QRequire = require(path.join(__dirname,'QRequire')),
+    TypeTable = require(path.join(__dirname,'TypeTable')),
    uglify = require('uglify-js');

+
 QRequire('quokka-script', 'quokka-core', 'Core.TypeTable', 'fs', function(qs, QCore, TypeTable, fs) {

    var cache = {};
@@ -72,6 +73,8 @@ QRequire('quokka-script', 'quokka-core', 'Core.TypeTable', 'fs', function(qs, QC
        };*/
        return store;
    };
+    var parsed = path.parse(fileName);
+    var serverDir = path.join(__dirname, parsed.dir);

    qs({
        lib: [QCore.dir],
@@ -84,8 +87,8 @@ QRequire('quokka-script', 'quokka-core', 'Core.TypeTable', 'fs', function(qs, QC
            modulePaths = {};

        var deps = startDepsResolve(mainObj, result.world).list.filter(function (dep) {
-            if(dep.name === 'observable-sequence')
-                debugger;
+            /*if(dep.name === 'observable-sequence')
+                debugger;*/
            var d = QRequire.get(dep.name);
            if(d) {
                if (!(d instanceof QRequire.Waiter)) {
@@ -133,7 +136,7 @@ QRequire('quokka-script', 'quokka-core', 'Core.TypeTable', 'fs', function(qs, QC

        letsConcat.unshift('QRequire = (function(QRequire){var require = QRequire.require');
        letsConcat.push('return QRequire;})((function(){var module = {}; '+
-            fs.readFileSync('./bin/QRequire.js')
+            fs.readFileSync(path.join(__dirname,'QRequire.js'))
            +'var require = module.exports.require;return module.exports;})())');

        letsConcat.push(result.js);
@@ -142,16 +145,23 @@ QRequire('quokka-script', 'quokka-core', 'Core.TypeTable', 'fs', function(qs, QC
        var error = result.error;
        var code = result.code;

-        fs.writeFileSync('../tmpConcat.js', code);
-        var x = require('../../tmpConcat');
+        var server = require('./server');
+        var srv = new server({
+            code: code,
+            dir: serverDir
+        });
+        //fs.writeFileSync('../tmpConcat.js', code);
+        //var x = require('../../tmpConcat');
+        var open = require('open');
+        open('http://localhost:'+srv.port);

        console.log(deps)
-        require
-        cache
+        //require
+        //cache

    });
    console.log('arguments cmd', args);
    console.log('Building:', fileName);
-    var open = require('open');
+
 });
 //open('http://ya.ru')
\ No newline at end of file
--- a/bin/server.js
+++ b/bin/server.js
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * *
+ */
+;// QUOKKA 2017
+// By zibx on 6/7/17.
+
+module.exports = (function () {
+    'use strict';
+    var Http = require("http");
+    var Fs = require("fs");
+    var Path = require("path");
+
+    var Server = function(cfg){
+        var server = Http.createServer(function (req, res) {
+            var reqURL = req.url,
+                tokens = reqURL.split('?'),
+                args = tokens[1];
+            reqURL = tokens[0];
+            var inPath = Path.join.apply(this, reqURL.split("/"));
+            var rPath = inPath;
+            console.log(inPath, rPath)
+            if(rPath === '.'){
+                res.end([
+                    '<html>',
+                    '<head><script src="source.js"></script></head>',
+                    '<body><div id="viewport"></div>',
+                    '<script>var main = QRequire.get(\'inline.main\').res; var m = new main();m.load()</script></body>',
+                    '</html>'
+                ].join('\n'))
+            }else if(rPath === 'source.js'){
+                return res.end(cfg.code);
+            }else{
+                Fs.stat(rPath, function (err, stat) {
+                    if(err)
+                        return res.end('no file');
+                    if (stat.isFile()) {
+                        var info = Path.parse(rPath);
+                        Fs.readFile(rPath, function (err, fData) {
+                            if (info.ext) {
+                                var ext = info.ext.substr(1),
+                                    headers = types[ext], i;
+                                if (headers) {
+                                    for (i in headers) {
+                                        res.setHeader(i, headers[i]);
+                                    }
+                                }
+                            }
+
+                            //Content-Type: image/svg+xml
+                            //Vary: Accept-Encoding
+                            res.end(fData, 'binary');
+                            return;
+                        });
+                    }
+                });
+            }
+        });
+        var port = 8000+((Math.random()*2000)|0);
+        this.port = port;
+        server.listen(port);
+    };
+    return Server;
+})();
\ No newline at end of file
--- a/package.json
+++ b/package.json
 {
  "name": "qscript",
-  "version": "0.0.5",
+  "version": "0.0.8",
  "description": "quokka-script env wizard",
  "main": "index.js",
  "bin": {

--- a/test/test1.qs
+++ b/test/test1.qs
@@ -16,7 +16,7 @@ def Page main
        color: rgba({{((Math.sin(s1/71)/2+0.5)*255)|0}},{{((Math.sin(s1/15)/2+0.5)*255)|0}},{{((Math.sin(s1/31)/2+0.5)*255)|0}},1)

  Timer
-    enabled: false
+    enabled: true
    interval: 10
    .tick: ()->
      n1++;
\ No newline at end of file