fix documentation command

AmpersandTarski · Feb 9, 2025 · 027ed0e · 027ed0e
1 parent 505d233
commit 027ed0e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -104,14 +104,10 @@
                 "command": "extension.startDaemon",
                 "title": "Ampersand: Start checker"
             },
-            {
-                "command": "extension.generateFunctionalSpec",
-                "title": "Ampersand: generate functional spec"
-            },
-            {
-                "command": "extension.generateAtlas",
-                "title": "Ampersand: Generate atlas"
-            },
+            // {
+            //     "command": "extension.generateFunctionalSpec",
+            //     "title": "Ampersand: Generate functional spec"
+            // },
             {
                 "command": "extension.generatePrototype",
                 "title": "Ampersand: Generate prototype"
@@ -191,7 +187,7 @@
                     "default": false,
                     "description": "Generate binary tables instead of broad tables in SQL database, for testing purposes."
                 },
-                "ampersand.outputFolder": {
+                "ampersand.outputDir": {
                     "type": "string",
                     "default": "./output",
                     "description": "The path of the folder where the output of the ampersand compiler will be stored."
@@ -263,4 +259,4 @@
         "ts-node": "^10.9.2",
         "typescript": "^5.7.3"
     }
-}
+}
diff --git a/src/commands/generateAtlasCommand.ts b/src/commands/generateAtlasCommand.ts
@@ -19,6 +19,6 @@ export class generateAtlasCommand implements ICommand {
             .getTerminal();
 
         terminalUtils.runCommandsInExistingTerminal(terminal,
-            [`ampersand population --output-dir=${extensionSettings.outputFolder} --build-recipe Grind --output-format json --verbosity ${extensionSettings.verbosity} ${currentActiveFilePath}`]);
+            [`ampersand population --output-dir=${extensionSettings.outputDir} --build-recipe Grind --output-format json --verbosity ${extensionSettings.verbosity} ${currentActiveFilePath}`]);
     }
 }
diff --git a/src/commands/generateFunctionalSpecCommand.ts b/src/commands/generateFunctionalSpecCommand.ts
@@ -44,14 +44,14 @@ export class generateFunctionalSpecCommand implements ICommand {
             "ampersand documentation",
             mainScriptPath,
             "--format " + extensionSettings.documentation.format,
-            extensionSettings.graphicsSetting ? "--graphics" : "--no-graphics",
+            extensionSettings.graphicsSetting ? "" : "--no-graphics",
             extensionSettings.documentation.intro ? "" : "--no-intro",
             extensionSettings.documentation.sharedLang ? "" : "--no-SharedLang",
             extensionSettings.documentation.diagnosis ? "" : "--no-Diagnosis",
             extensionSettings.documentation.conceptualAnalysis ? "" : "--no-ConceptualAnalysis",
             extensionSettings.documentation.dataAnalysis ? "" : "--no-DataAnalysis",
             "--language=" + extensionSettings.outputLanguage,
-            "--output-folder " + extensionSettings.outputFolder,
+            "--output-dir " + extensionSettings.outputDir,
             extensionSettings.sqlBinaryTables ? "--sql-binary-tables" : "",
             "--verbosity " + extensionSettings.verbosity
         ]

diff --git a/src/utils/settings.ts b/src/utils/settings.ts
@@ -13,7 +13,7 @@ export interface ExtensionSettings {
   folderSetting: string;
   graphicsSetting: boolean;
   mainScriptSetting: string;
-  outputFolder: string;
+  outputDir: string;
   sqlBinaryTables: boolean;
   verbosity: string;
   outputLanguage: string;
@@ -37,7 +37,7 @@ export function loadSettings() {
     folderSetting: config.get('folderName', "./project"),
     graphicsSetting: config.get('graphics', true),
     mainScriptSetting: config.get('mainScriptName', "main.adl"),
-    outputFolder: config.get('outputFolder', "./output"),
+    outputDir: config.get('outputDir', "./output"),
     outputLanguage: config.get('outputLanguage', "NL"),
     sqlBinaryTables: config.get('sqlBinaryTables', false),
     verbosity: config.get<string>('verbosity', "warn"),