fix filter for HetaCode

hetalang · Dec 17, 2023 · 4deb132 · 4deb132
1 parent 7b2e396
commit 4deb132
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/src/heta-code-export/index.js b/src/heta-code-export/index.js
@@ -1,7 +1,6 @@
 /* global compiledTemplates */
 const { AbstractExport } = require('../abstract-export');
 const { ajv } = require('../utils');
-require('./namespace');
 
 const schema = {
   type: 'object',
@@ -32,10 +31,9 @@ class HetaCodeExport extends AbstractExport{
    *
    * @return {string} Text code of exported format.
    */
-  makeText(){
-    // let logger = this._container.logger;
+  makeText() {
+    // let { logger } = this._container;
 
-    // XXX: do not filter namespaces
     let image = this.getHetaCodeImage(this._container);
     let content = this.getHetaCodeCode(image);
 
@@ -51,15 +49,15 @@ class HetaCodeExport extends AbstractExport{
    *
    * @return {undefined}
    */
-  getHetaCodeImage(container){
-    // let logger = this._container.logger;
+  getHetaCodeImage() {
+    let { namespaceStorage, functionDefStorage, unitDefStorage, logger } = this._container;
 
-    let filteredNamespaceStorage = [...container.namespaceStorage]
+    let filteredNamespaceStorage = [...namespaceStorage]
       .filter(([spaceName, ns]) => new RegExp(this.spaceFilter).test(spaceName));
 
     return {
-      functionDefStorage: [...container.functionDefStorage],
-      unitDefStorage: [...container.unitDefStorage],
+      functionDefStorage: [...functionDefStorage],
+      unitDefStorage: [...unitDefStorage],
       namespaceStorage: filteredNamespaceStorage
     };
   }

diff --git a/src/heta-code-export/namespace.js b/src/heta-code-export/namespace.js
diff --git a/src/json-export/index.js b/src/json-export/index.js
@@ -40,7 +40,7 @@ class JSONExport extends AbstractExport {
 
     // create qArr from NS
     let qArr_ns = nsArrayFiltered.reduce((accumulator, [spaceName, ns]) => {
-      let qArr_setns = ns.spaceName === 'nameless' ? [] : [ns.toQ()]; // skip default NS
+      let qArr_setns = ns.spaceName === 'nameless' && !ns.isAbstract ? [] : [ns.toQ()]; // skip #setNS {space: nameless};
       let qArr_components = ns.toQArr(true, { noUnitsExpr: this.noUnitsExpr });
       return accumulator.concat(qArr_setns, qArr_components);
     }, []);