Merge pull request #24 from daimor/issue17

use original filename in export

Author: doublefint

commands/currentdoc/index.js

@@ -65,7 +65,8 @@ const CurrentDoc = env => () => {
     return {
         name: codename,
         content: code.split( /\r?\n/g ), // get code lines array
-        error: ''
+        error: '',
+        fileName: fullname
     }
 
 }

commands/export/index.js

@@ -7,30 +7,30 @@ const mkdir = require('./mkdir-p-sync') // mkdir -p 'path/to/file'
 // see module.exports
 let api = {
     getDocNames: ( opts, cb ) => cb( null, {} ),
-    getDoc: ( docname, cb ) => cb( null, {} ) 
+    getDoc: ( docname, cb ) => cb( null, {} )
 }
 
 // see module.exports
-let log = (...msg) => console.log('cos.export:', ...msg ) 
+let log = (...msg) => console.log('cos.export:', ...msg )
 // export options
 let root = '.'
 let folder = 'src'
 let atelier = false
-let doc2file = docname => docname 
+let doc2file = docname => docname
 
-// Export one document 
+// Export one document
 const ExportDoc = ( doc, next ) => ({ error, data }) => {
 
     if ( error ){
         log( `${ JSON.stringify( error ) }\n` )
         return
     }
 
-    const { content, status } = data.result 
+    const { content, status } = data.result
 
     // atelier: 'mypkg.subpkg.myclass.cls' => 'mypkg/subpkg/myclass.cls'
     const filename = doc2file( doc.name )
-    const fullname = [ root, folder, doc.cat, filename ].join( path.sep )
+    const fullname = doc.fileName || ([ root, folder, doc.cat, filename ].join( path.sep ))
     const folders = path.dirname( fullname )
 
     if ( !fs.existsSync( folders ) ) mkdir( folders )
@@ -86,14 +86,14 @@ module.exports = env => {
     const exportAll = () => {
 
         if ( !root ){
-            log( `COS.EXPORT: Open folder before export - Ctrl+K, Ctrl+O` ) 
-            return 
+            log( `COS.EXPORT: Open folder before export - Ctrl+K, Ctrl+O` )
+            return
         }
 
         init()
 
         log( '\nLoad documents list ...' )
-        api.getDocNames( 
+        api.getDocNames(
 
             { category, generated, filter }, //doclist options
             ( error, data ) => doclist( { error, data } ) //callback wrapper
@@ -103,4 +103,4 @@ module.exports = env => {
 
     return { exportAll, ExportDoc }
 
-}
+}

extension.js

@@ -2,30 +2,30 @@ const vscode = require('vscode')
 const { workspace, window } = vscode
 const http = require('http')
 
-const API = require('cos-api4node') 
+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 { CurrentDoc }= require( './commands/currentdoc' ) 
-const IsApiError = require( './is-api-error' ) 
+const { CurrentDoc }= require( './commands/currentdoc' )
+const IsApiError = require( './is-api-error' )
 
 const activate = context => {
 
     const log = LOG( window )
 
     const Config = workspace => {
 
-        let options = null; 
+        let options = null;
         const init = () =>{ options = workspace.getConfiguration( 'cos' ) }
         init()
 
         return {
 
-            init, 
+            init,
             conn: () => {
                 const _conn = options.get( 'conn' )
-                _conn.toString = () => JSON.stringify( Object.assign( {}, _conn, { password: '***' } ), null, 4 )  
+                _conn.toString = () => JSON.stringify( Object.assign( {}, _conn, { password: '***' } ), null, 4 )
                 return _conn
             },
             export: () => {
@@ -56,19 +56,19 @@ const activate = context => {
 
     const currentDoc = CurrentDoc({ window, languages, log })
 
-    const Save = ({ name, log }) => ( err, data ) => {
+    const Save = ({ name, log, fileName }) => ( 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 )
+        const exportDoc = ExportDoc( { name, cat: data.result.cat, fileName }, completed )
 
         exportDoc( { err, data } )
     }
 
-    const Export = ( { api, name, log } ) => ( err, data ) => { 
+    const Export = ( { api, name, log, fileName } ) => ( err, data ) => {
         // IsApiError, Save - from upper scope
         const isCompileError = IsApiError( name, 'compile', log )
         if ( isCompileError({ err, data }) ) return;
@@ -77,17 +77,17 @@ const activate = context => {
         // so, just export again
         data.console.forEach( ci => log( ci ) ) //output compilation log
         //log( ` Export ${ name }` )
-        const save = Save( { name, log } )
+        const save = Save( { name, log, fileName } )
         api.getDoc( name, save )
     }
 
-    const Compile = ( { api, name, log } ) => ( err, data ) => {
+    const Compile = ( { api, name, log, fileName } ) => ( err, data ) => {
 
         // IsApiError, Export
         const isImportError = IsApiError( name, 'import', log )
         if ( isImportError({ err, data }) ) return;
 
-        const exportCurrent = Export( { api, name, log } )
+        const exportCurrent = Export( { api, name, log, fileName } )
         //log( `Compile ${ name }` )
         api.compile( name, exportCurrent )
 
@@ -98,15 +98,15 @@ const activate = context => {
     const importCompileExport = () => {
 
         // api, Compile, log
-        const { name, content, error } = currentDoc()
+        const { name, content, error, fileName } = currentDoc()
         if ( error ) return log( error )
 
-        const compile = Compile({ api, name, log } )
+        const compile = Compile({ api, name, log, fileName } )
         //log( ` Import ${ name }` )
-        api.putDoc( name, 
-                { enc: false, content }, 
-                { ignoreConflict: true }, 
-            compile 
+        api.putDoc( name,
+                { enc: false, content },
+                { ignoreConflict: true },
+            compile
         )
 
     }
@@ -118,4 +118,4 @@ const activate = context => {
 
 }
 
-module.exports = { activate, deactivate: () => {} }
+module.exports = { activate, deactivate: () => {} }