X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FPacker.vala;h=077599823c8ef68de9c378cc4287d32d9a89b8bd;hp=bd8f2db1432526d3c64fe99e1477357a68303639;hb=beb6eade33157f6da325f821dd63ac1975eda94f;hpb=fd2a4a10e89ad733a9ca627edeeacf489af6b6cc diff --git a/JSDOC/Packer.vala b/JSDOC/Packer.vala index bd8f2db..0775998 100644 --- a/JSDOC/Packer.vala +++ b/JSDOC/Packer.vala @@ -18,11 +18,9 @@ x.srcfiles = array of files (that list other files...) << not supported? x.target = "output.pathname.js" x.debugTarget = "output.pathname.debug.js" - -x.debugTranslateTarget : "/tmp/output.translate.js" << this used to be the single vs double quotes.. we may not use it in future.. -x.translateJSON: "/tmp/translate.json", + -x.packAll(); // writes files etc.. +x.pack(); // writes files etc.. * * @@ -56,7 +54,9 @@ x.packAll(); // writes files etc.. */ namespace JSDOC { - + public errordomain PackerError { + ArgumentError + } public class Packer : Object { @@ -64,14 +64,21 @@ namespace JSDOC * @cfg {String} target to write files to - must be full path. */ string target; + GLib.FileOutputStream targetStream = null; /** * @cfg {String} debugTarget target to write files debug version to (uncompacted)- must be full path. */ - string debugTarget; - + string targetDebug; + + + GLib.FileOutputStream targetDebugStream = null; /** * @cfg {String} tmpDir (optional) where to put the temporary files. * if you set this, then files will not be cleaned up + * + * at present we need tmpfiles - as we compile multiple files into one. + * we could do this in memory now, as I suspect vala will not be as bad as javascript for leakage... + * */ public string tmpDir = "/tmp"; // FIXME??? in ctor? @@ -95,13 +102,23 @@ namespace JSDOC // list of files to compile... Gee.ArrayList files; - public string out = ""; // if no target is specified - then this will contain the result + /** + * @cfg debug -- pretty obvious. + */ + + public string activeFile = ""; + + + public string outstr = ""; // if no target is specified - then this will contain the result - public Packer(string target, string debugTarget) + public Packer(string target, string targetDebug = "") { this.target = target; - this.debugTarget = debugTarget; - + this.targetDebug = targetDebug; + this.files = new Gee.ArrayList(); + + new Lang_Class(); ///initilizaze lang.. + } public void loadSourceIndexes(Gee.ArrayList indexes) @@ -111,17 +128,30 @@ namespace JSDOC } } - public void loadFiles(Gee.ArrayList fs) + public void loadFiles(string[] fs) { foreach(var f in fs) { + GLib.debug("add File: %s", f); this.files.add(f); //?? easier way? } } + public void loadFile(string f) + { + GLib.debug("add File: %s", f); + this.files.add(f); + GLib.debug("FILE LEN: %d", this.files.size); + } public void pack() { - if (!this.files) { - throw new Packer.ArgumentError("No Files loaded before pack() called"); + if (this.files.size < 1) { + throw new PackerError.ArgumentError("No Files loaded before pack() called"); + } + if (this.target.length > 0 ) { + this.targetStream = File.new_for_path(this.target).replace(null, false,FileCreateFlags.NONE); + } + if (this.targetDebug.length > 0 ) { + this.targetDebugStream = File.new_for_path(this.targetDebug).replace(null, false,FileCreateFlags.NONE); } this.packAll(); } @@ -147,409 +177,224 @@ namespace JSDOC var lines = str.split("\n"); for(var i =0; i < lines.length;i++) { - var f = lines[i]; - if (Regex.match_simple ("^\s*\/", f) || + var f = lines[i].strip(); + if (f.length < 1 || + Regex.match_simple ("^/", f) || !Regex.match_simple ("[a-zA-Z]+", f) ){ - continue; // blank or not starting with a-z + continue; // blank comment or not starting with a-z } - if (/\.js$/.test(f)) { - _this.files.push( f); + + if (Regex.match_simple ("\\.js$", f)) { + this.files.add( f); // js file.. - return; + continue; } - //println("ADD"+ f.replace(/\./g, '/')); - var add = f.replace(/\./g, '/').replace(/\s+/g,'')+'.js'; - if (_this.files.indexOf(f) > -1) { - return; + // this maps Roo.bootstrap.XXX to Roo/bootstrap/xxx.js + // should we prefix? =- or should this be done elsewhere? + + var add = f.replace(".", "/") + ".js"; + if (this.files.contains(add)) { + continue; } - _this.files.push( add ); + this.files.add( add ); - }) - }, - - - packAll : function() // do the packing (run from constructor) - { - - //this.transOrigFile= bpath + '/../lang.en.js'; // needs better naming... - //File.write(this.transfile, ""); - if (this.target) { - File.write(this.target, ""); - } - - if (this.debugTarget) { - File.write(this.debugTarget, ""); - } - if (this.debugTranslateTarget) { - File.write(this.debugTarget, ""); - } - - for(var i=0; i < this.files.length; i++) { - var file = this.files[i]; - - print("reading " +file ); - if (!File.isFile(file)) { - print("SKIP (is not a file) " + file); - continue; - } - - // debug Target - - if (this.debugTarget) { - File.append(this.debugTarget, File.read(file)); - } - // it's a good idea to check with 0 compression to see if the code can parse!! - - // debug file.. - //File.append(dout, str +"\n"); - - - - var minfile = this.tmpDir + '/' +file.replace(/\//g, '.'); - - - // let's see if we have a min file already? - // this might happen if tmpDir is set .. - if (true && File.exists(minfile)) { - var mt = File.mtime(minfile); - var ot = File.mtime(file); - print("compare : " + mt + "=>" + ot); - if (mt >= ot) { - continue; - - } - - } - - print("COMPRESSING "); - //var codeComp = pack(str, 10, 0, 0); - if (File.exists(minfile)) { - File.remove(minfile); - } - var str = File.read(file); - var str = this.pack(str, file, minfile); - - - } - - - - // if we are translating, write the translations strings at the top - // of the file.. - - if (this.translateJSON) { - - - print("MERGING LANGUAGE"); - var out = "if (typeof(_T) == 'undefined') { _T={};}\n" - if (this.target) { - File.write(this.target, out); - } else { - this.out += out; - } - - File.write(this.translateJSON, ""); - for(var i=0; i < this.files.length; i++) { - var file = this.files[i]; - var transfile= this.tmpDir + '/' +file.replace(/\//g, '.') +'.lang.trans'; - var transmd5 = this.tmpDir + '/' +file.replace(/\//g, '.') +'.lang'; - if (File.exists(transmd5)) { - var str = File.read(transmd5); - if (str.length) { - if (this.target) { - File.append(this.target, str + "\n"); - } else { - this.out += str + "\n"; - } - - } - if (this.cleanup) { - File.remove(transmd5); - } - } - if (File.exists(transfile)) { - var str = File.read(transfile); - if (str.length) { - File.append(this.translateJSON, str); - } - if (this.cleanup) { - File.remove(transfile); - } - } - - - } - } - - print("MERGING SOURCE"); - - for(var i=0; i < this.files.length; i++) { - var file = this.files[i]; - var minfile = this.tmpDir + '/' + file.replace(/\//g, '.'); - - - if (!File.exists(minfile)) { - continue; - } - var str = File.read(minfile); - print("using MIN FILE "+ minfile); - if (str.length) { - if (this.target) { - File.append(this.target, '//' + file + "\n"); - File.append(this.target, str + "\n"); - } else { - this.out += '//' + file + "\n"; - this.out += str + "\n"; - } - - } - if (this.cleanup) { - File.remove(minfile); - } - - } - print("Output file: " + this.target); - if (this.debugTarget) print("Output debug file: " + this.debugTarget); - - - - - }, - /** - * Core packing routine for a file - * - * @param str - str source text.. - * @param fn - filename (for reference?) - * @param minfile - min file location... - * - */ - - pack : function (str,fn,minfile) - { - - var tr = new TokenReader( { - keepDocs :true, - keepWhite : true, - keepComments : true, - sepIdents : true, - collapseWhite : false, - filename : fn - }); - this.timerPrint("START" + fn); - - // we can load translation map here... - - var toks = tr.tokenize(new TextStream(str)); // dont merge xxx + . + yyyy etc. - - // at this point we can write a language file... - if (this.translateJSON) { - - this.writeTranslateFile(fn, minfile, toks); - } - - this.activeFile = fn; - - // and replace if we are generating a different language.. - - this.timerPrint("Tokenized"); - //var ts = new TokenStream(toks); - //print(JSON.stringify(toks, null,4 )); Seed.quit(); - var ts = new Collapse(toks); - // print(JSON.stringify(ts.tokens, null,4 )); Seed.quit(); - //return;// - var sp = new ScopeParser(ts); - this.timerPrint("Converted to Parser"); - sp.packer = this; - sp.buildSymbolTree(); - this.timerPrint("Built Sym tree"); - sp.mungeSymboltree(); - this.timerPrint("Munged Sym tree"); - print(sp.warnings.join("\n")); - this.timerPrint("Compressed"); - - var out = CompressWhite(new TokenStream(toks), this, this.keepWhite); // do not kill whitespace.. - - - this.timerPrint("Compressed"); - - if (out.length) { - File.write(minfile, out); - this.timerPrint("Write (" + out.length + "bytes) " + minfile); - } - - return out; - - - - }, - - timerPrint: function (str) { - var ntime = new Date() * 1; - var tdif = ntime -this.timer; - this.timer = ntime; - print('['+tdif+']'+str); - }, + } + } + - /** - * - * Translation concept... - * -> replace text strings with _T.... - * -> this file will need inserting at the start of the application.... - * -> we need to generate 2 files, - * -> a reference used to do the translation, and the _T file.. - * - * - * We store the trsum on the token... - * - */ + private void packAll() // do the packing (run from constructor) + { + + //this.transOrigFile= bpath + '/../lang.en.js'; // needs better naming... + //File.write(this.transfile, ""); + if (this.target.length > 0) { + this.targetStream.write("".data); + } + + if (this.targetDebugStream != null) { + this.targetDebugStream.write("".data); + } + + + foreach(var file in this.files) { + + print("reading %s\n",file ); + + if (!FileUtils.test (file, FileTest.EXISTS) || FileUtils.test (file, FileTest.IS_DIR)) { + print("SKIP (is not a file) %s\n ", file); + continue; + } + + var loaded_string = false; + string file_contents = ""; + // debug Target + + if (this.targetDebugStream !=null) { + + FileUtils.get_contents(file,out file_contents); + this.targetDebugStream.write(file_contents.data); + loaded_string = false; + } + // it's a good idea to check with 0 compression to see if the code can parse!! + + // debug file.. + //File.append(dout, str +"\n"); + + + + var minfile = this.tmpDir + "/" + file.replace("/", "."); + + + // let's see if we have a min file already? + // this might happen if tmpDir is set .. + + + if (false && FileUtils.test (minfile, FileTest.EXISTS)) { + + var otv = File.new_for_path(file).query_info (FileAttribute.TIME_MODIFIED, 0).get_modification_time(); + var mtv = File.new_for_path(minfile).query_info (FileAttribute.TIME_MODIFIED, 0).get_modification_time(); + + var ot = new Date(); + ot.set_time_val(otv); + var mt = new Date(); + mt.set_time_val(mtv); + //print("compare : " + mt + "=>" + ot); + if (mt.compare(ot) >= 0) { + continue; // file is newer or the same time.. + + } + + } + + print("COMPRESSING "); + //var codeComp = pack(str, 10, 0, 0); + if (FileUtils.test (minfile, FileTest.EXISTS)) { + FileUtils.remove(minfile); + } + if (!loaded_string) { + FileUtils.get_contents(file,out file_contents); + } + + this.packFile(file_contents, file, minfile); + + + } + + + print("MERGING SOURCE"); + + for(var i=0; i < this.files.size; i++) { + var file = this.files[i]; + var minfile = this.tmpDir + "/" + file.replace("/", "."); + + + if ( FileUtils.test(minfile, FileTest.EXISTS)) { + continue; + } + string str; + FileUtils.get_contents(minfile, out str); + print("using MIN FILE %s\n", minfile); + if (str.length > 0) { + if (this.targetStream != null) { + this.targetStream.write(("//" + file + "\n").data); + this.targetStream.write((str + "\n").data); + + } else { + this.outstr += "//" + file + "\n"; + this.outstr += str + "\n"; + } + + } + if (this.cleanup) { + FileUtils.remove(minfile); + } + + } + print("Output file: " + this.target); + if (this.targetDebug.length > 0) { + print("Output debug file: " + this.targetDebug); + } + + + + + } + /** + * Core packing routine for a file + * + * @param str - str source text.. + * @param fn - filename (for reference?) + * @param minfile - min file location... + * + */ + + private string packFile (string str,string fn, string minfile) + { + + var tr = new TokenReader(); + tr.keepDocs =true; + tr.keepWhite = true; + tr.keepComments = true; + tr.sepIdents = true; + tr.collapseWhite = false; + tr.filename = fn; + + // we can load translation map here... + + TokenArray toks = tr.tokenize(new TextStream(str)); // dont merge xxx + . + yyyy etc. + + + + this.activeFile = fn; + + // and replace if we are generating a different language.. + + + //var ts = new TokenStream(toks); + //print(JSON.stringify(toks, null,4 )); Seed.quit(); + var ts = new Collapse(toks.tokens); + + //ts.dumpAll(""); print("Done collaps"); Process.exit(1); + + // print(JSON.stringify(ts.tokens, null,4 )); Seed.quit(); + //return;// + var sp = new ScopeParser(ts); + + //sp.packer = this; + sp.buildSymbolTree(); + + sp.mungeSymboltree(); + sp.printWarnings(); + //print(sp.warnings.join("\n")); + + + var outf = CompressWhite(new TokenStream(toks.tokens), this, this.keepWhite); // do not kill whitespace.. + + + + + if (outf.length > 0) { + FileUtils.set_contents(minfile, outf); + + } + + return outf; + + + + } + + + public string md5(string str) + { + + return GLib.Checksum.compute_for_string(GLib.ChecksumType.MD5, str); + + } - writeTranslateFile : function(fn, minfile, toks) - { - - var map = {}; // 'string=> md5sum' - var _this = this; - var t, last, next; - - - var tokfind = function (j,dir) { - while (1) { - if ((dir < 0) && (j < 0)) { - return false; - } - if ((dir > 0) && (j >= toks.length)) { - return false; - } - j += dir; - if (toks[j].type != 'WHIT') { - return toks[j]; - } - } - return false; - - } - - - for (var i=0;i