export after compile

Author: doublefint

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [3.1.0]
+### Added
+- Export after compile
+
+
 ## [0.2.3]
 ### Fixed
 - Remove unused command

commands/compile/index.js

@@ -0,0 +1,72 @@
+/**
+* Import and compile current file.
+*/
+const clsRegexName = require( './cls-regex-name' )
+const clsCheckNames = require( './cls-check-names' )
+const rtnRegexName = require( './rtn-regex-name' )
+const rtnCheckNames = require( './rtn-check-names' )
+
+// extract and verify name of active document
+// env - environment { window, languages, log }
+// return { name, content, error }
+const CurrentDoc = env => () => {
+
+    /*
+    env ={
+        window = {},
+        languages = [ 'cacheobjectscript', 'cacheobjectscriptinclude' ],
+        log = data => console.log( 'cos.compile:', JSON.stringify( data ) )
+    }
+    */
+    const { window, languages, log } = env 
+    const editor = window.activeTextEditor
+    if ( !editor ) return {
+        error: 'No active editor, open one at first'
+    }
+
+    const doc = editor.document
+    if ( !doc ) return {
+        error: 'Open ObjectScript file first.'
+    }
+
+    const fullname = doc.fileName
+    if ( !fullname ) return {
+        error: 'You must save the document first'
+    }
+
+    if ( !~languages.indexOf( doc.languageId ) ) return {
+        error: `${ fullname } has unsupported type ${ language }`
+    }
+
+    let file = ( fullname.match( /[^\\\/]+$/ ) || [] )[ 0 ] || '' //only filename without folders
+    let code = doc.getText().replace( /\/\/[^\r\n]*\r?\n/g, '' ) // normalize EOL?
+    let name, ext, codename //server side name
+
+    const cdnm = ({name,ext})=>[name, ext].join('.')
+
+    if ( /\.cls$/i.test( fullname ) ) { // is class?
+
+        ( { name, ext } = clsRegexName( code ) )
+        codename = cdnm({ name, ext })
+        if ( !clsCheckNames( { code: codename, file, log } ) ) return {
+            error: 'check names'
+        }
+
+    } else { // routines
+
+        ( { name, ext } = rtnRegexName( code ) )
+        codename = cdnm({ name, ext })
+        if ( !rtnCheckNames( { code: codename, file, log } ) ) return {
+            error: 'check names'
+        }
+    }
+
+    return {
+        name: codename,
+        content: code.split( /\r?\n/g ), // get code lines array
+        error: ''
+    }
+    
+}
+
+module.exports = { CurrentDoc }

commands/compile/cls-check-names.js renamed to commands/currentdoc/cls-check-names.js

@@ -22,7 +22,7 @@ let doc2file = docname => docname
 const ExportDoc = ( doc, next ) => ({ error, data }) => {
 
     if ( error ){
-        log( `GETDOC ${ doc.name }: ${ JSON.stringify( error ) }\n` )
+        log( `${ JSON.stringify( error ) }\n` )
         return
     }
     const { content, status } = data.result 
@@ -35,10 +35,11 @@ const ExportDoc = ( doc, next ) => ({ error, data }) => {
     if ( !fs.existsSync( folders ) ) mkdir( folders )
     fs.writeFileSync( fullname, ( content || [] ).join( '\n' ) )
     log( `${ doc.name } -> ${ fullname }. ${ status } ` )
-    next()
+    if ( next && ( typeof next === 'function')) next()
 
 }
 
+
 const doclist = ( { error, data } ) => {
 
     if ( error ) return log( `DOCLIST: ${ JSON.stringify( error ) }` )
@@ -69,29 +70,29 @@ const doclist = ( { error, data } ) => {
 /**
  * Export all classes/routines in a namespace to working directory.
 */
-module.exports = environment => {
+module.exports = env => {
 
     //reassign module variables
-    ( { api, log, options } = environment ); 
+    ( { api, log, options } = env ); //env - environment
     ( { root, folder, atelier } = options );
     if ( atelier ) doc2file = doc => asAtelier( doc )
 
     // doclist options 
     const { category, generated, filter } = options;
-
-    return () => {
+    const exportAll = () => {
 
         if ( !root ){
             log( `COS.EXPORT: Open folder before export - Ctrl+K, Ctrl+O` ) 
             return 
         }
-  
+
         log( '\nLoad documents list ...' )
         api.getDocNames( 
             { category, generated, filter }, //doclist options
             ( error, data ) => doclist( { error, data } ) //callback wrapper
         )
-
     }
 
+    return { exportAll, ExportDoc }
+
 }

commands/compile/cls-regex-name.js renamed to commands/currentdoc/cls-regex-name.js

@@ -1,11 +1,16 @@
 const vscode = require('vscode')
 const { workspace, window } = vscode
+const http = require('http')
+
 const API = require('cos-api4node') 
 const LOG = require( './log' )
 const languages = require('./package.json')[ 'contributes' ][ 'languages' ].map( lang => lang.id )
 const panel = require( './status-bar-panel' )
 const CmdExport = require( './commands/export' )
-const CmdCompile = require( './commands/compile' )
+const { CurrentDoc }= require( './commands/currentdoc' ) 
+const IsApiError = require( './is-api-error' ) 
+
+
 
 const activate = context => {
 
@@ -26,7 +31,7 @@ const activate = context => {
 
     api.headServer( err => {
 
-        if ( !!err ) return log( 'Connection FAILED: ' + conn )
+        if ( err ) return log( 'Connection FAILED: ' + conn )
         log( 'Connected ' + conn )
         panel.set( conn )
 
@@ -35,12 +40,67 @@ const activate = context => {
     const exportTo = options.get( 'export' )
     exportTo.root = workspace.rootPath
 
-    const cosExport = CmdExport({ api, log, options: exportTo })
-    const cosCompile = CmdCompile({ window, api, log, languages })
+    const { exportAll, ExportDoc } = CmdExport({ api, log, options: exportTo })
+    const currentDoc = CurrentDoc({ window, languages, log })
+
+    const Save = ({ name, log }) => ( err, data ) => {
+
+        // IsApiError, ExportDoc - global
+        const isGetDocError = IsApiError( name, 'getDoc', log )
+        if ( isGetDocError({ err, data }) ) return
+
+        const completed = () => log( 'Completed.' )
+        const exportDoc = ExportDoc( { name, cat: data.result.cat }, completed )
+
+        exportDoc( { err, data } )
+    }
+
+    const Export = ( { api, name, log } ) => ( err, data ) => { 
+        // IsApiError, Save - from upper scope
+        const isCompileError = IsApiError( name, 'compile', log )
+        if ( isCompileError({ err, data }) ) return;
+        // after compilation API returns updated storage definition
+        // but, currently, we don`t have any AST implementation
+        // so, just export again
+        data.console.forEach( ci => log( ci ) ) //output compilation log
+        //log( ` Export ${ name }` )
+        const save = Save( { name, log } )
+        api.getDoc( name, save )
+    }
+
+    const Compile = ( { api, name, log } ) => ( err, data ) => {
+
+        // IsApiError, Export
+        const isImportError = IsApiError( name, 'import', log )
+        if ( isImportError({ err, data }) ) return;
+
+        const exportCurrent = Export( { api, name, log } )
+        //log( `Compile ${ name }` )
+        api.compile( name, exportCurrent )
+
+    }
+
+    // import -> compile -> export
+    // save to server, compile, export to disk
+    const importCompileExport = () => {
+
+        // api, Compile, log
+        const { name, content, error } = currentDoc()
+        if ( error ) return log( error )
+
+        const compile = Compile({ api, name, log } )
+        //log( ` Import ${ name }` )
+        api.putDoc( name, 
+                { enc: false, content }, 
+                { ignoreConflict: true }, 
+            compile 
+        )
+
+    }
 
     context.subscriptions.push(
-        vscode.commands.registerCommand( 'cos.export', cosExport )
-        , vscode.commands.registerCommand( 'cos.compile', cosCompile )
+        vscode.commands.registerCommand( 'cos.compile', importCompileExport ),  
+        vscode.commands.registerCommand( 'cos.export', exportAll )
     )
 
 }

commands/currentdoc/index.js

@@ -1,4 +1,4 @@
-module.exports = ({ name, action, log }) => ( err, data ) => {
+module.exports = ({ name, action, log }) => ({ err, data }) => {
 
     const { result, status, console } = data