export without category solve #7

Author: daimor

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [0.7.11]
+
+- added export setting "objectscript.export.addCategory" if enabled uses previous behavior, adds category folder to export folder, disabled by default
+
 ## [0.7.10]
 
 - New logo

commands/export.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
 import fs = require('fs');
 import path = require('path');
 import { AtelierAPI } from '../api';
-import { outputChannel, mkdirSyncRecursive, currentWorkspaceFolder } from '../utils';
+import { outputChannel, mkdirSyncRecursive, currentWorkspaceFolder, notNull } from '../utils';
 import { PackageNode } from '../explorer/models/packageNode';
 import { ClassNode } from '../explorer/models/classesNode';
 import { RoutineNode } from '../explorer/models/routineNode';
@@ -16,16 +16,22 @@ const filesFilter = (file: any) => {
   return true;
 };
 
-const getFileName = (folder: string, name: string, split: boolean): string => {
+const getFileName = (folder: string, name: string, split: boolean, addCategory: boolean): string => {
   let fileNameArray: string[] = name.split('.');
   let fileExt = fileNameArray.pop().toLowerCase();
   const root = [vscode.workspace.rootPath, currentWorkspaceFolder()].join(path.sep);
-  const cat = fileExt === 'cls' ? 'CLS' : ['int', 'mac', 'inc'].includes(fileExt) ? 'RTN' : 'OTH';
+  const cat = addCategory
+    ? fileExt === 'cls'
+      ? 'CLS'
+      : ['int', 'mac', 'inc'].includes(fileExt)
+      ? 'RTN'
+      : 'OTH'
+    : null;
   if (split) {
-    let fileName = [root, folder, cat, ...fileNameArray].join(path.sep);
+    let fileName = [root, folder, cat, ...fileNameArray].filter(notNull).join(path.sep);
     return [fileName, fileExt].join('.');
   }
-  return [root, folder, cat, name].join(path.sep);
+  return [root, folder, cat, name].filter(notNull).join(path.sep);
 };
 
 export async function exportFile(name: string, fileName: string): Promise<any> {
@@ -42,7 +48,7 @@ export async function exportFile(name: string, fileName: string): Promise<any> {
           throw new Error('Something wrong happened');
         }
         const content = data.result.content;
-        const { noStorage, dontExportIfNoChanges } = config().get('export');
+        const { noStorage, dontExportIfNoChanges } = config('export');
 
         const promise = new Promise((resolve, reject) => {
           if (noStorage) {
@@ -108,22 +114,24 @@ export async function exportList(files: string[]): Promise<any> {
   if (!files || !files.length) {
     vscode.window.showWarningMessage('Nothing to export');
   }
-  const { atelier, folder, maxConcurrentConnections } = config().get('export');
+  const { atelier, folder, maxConcurrentConnections, addCategory } = config('export');
 
   if (maxConcurrentConnections > 0) {
     const limiter = new Bottleneck({
       maxConcurrent: maxConcurrentConnections
     });
     const results = [];
     for (let i = 0; i < files.length; i++) {
-      const result = await limiter.schedule(() => exportFile(files[i], getFileName(folder, files[i], atelier)));
+      const result = await limiter.schedule(() =>
+        exportFile(files[i], getFileName(folder, files[i], atelier, addCategory))
+      );
       results.push(result);
     }
     return results;
   }
   return Promise.all(
     files.map(file => {
-      exportFile(file, getFileName(folder, file, atelier));
+      exportFile(file, getFileName(folder, file, atelier, addCategory));
     })
   );
 }
@@ -134,7 +142,7 @@ export async function exportAll(): Promise<any> {
   }
   const api = new AtelierAPI();
   outputChannel.show(true);
-  const { category, generated, filter } = config().get('export');
+  const { category, generated, filter } = config('export');
   const files = data => data.result.content.filter(filesFilter).map(file => file.name);
   return api.getDocNames({ category, generated, filter }).then(data => {
     return exportList(files(data));

extension.ts

@@ -34,7 +34,7 @@ export var extensionContext: vscode.ExtensionContext;
 export const config = (config?: string, workspaceFolderName?: string): any => {
   workspaceFolderName = workspaceFolderName || currentWorkspaceFolder();
 
-  if (['conn'].includes(config)) {
+  if (['conn', 'export'].includes(config)) {
     if (workspaceFolderName !== '') {
       const workspaceFolder = vscode.workspace.workspaceFolders.find(
         el => el.name.toLowerCase() === workspaceFolderName.toLowerCase()

package.json

@@ -386,6 +386,11 @@
           "type": "string",
           "default": "src"
         },
+        "objectscript.export.addCategory": {
+          "description": "add category folder to the export path",
+          "type": "boolean",
+          "default": false
+        },
         "objectscript.export.atelier": {
           "description": "export source code as Atelier it does ( packages to subfolders )",
           "type": "boolean",

utils/index.ts

@@ -96,3 +96,7 @@ export function onlyUnique(value: any, index: number, self: any) {
   }
   return self.indexOf(value) === index;
 }
+
+export function notNull(el: any) {
+  return el !== null;
+}