@trebco/treb 29.2.0 → 29.3.2

package/treb-export/src/export2.ts

@@ -54,7 +54,7 @@ import { AddRel } from './relationship';
 import { type DOMContent, XMLOptions2 } from './xml-utils';
 
 import type { UnitAddress, UnitRange, ExpressionUnit} from 'treb-parser';
-import { Parser, QuotedSheetNameRegex } from 'treb-parser';
+import { Parser } from 'treb-parser';
 
 // FIXME: move
 import type { ChartOptions } from './drawing2/chart2';
@@ -2464,92 +2464,13 @@ export class Exporter {
           }
         }
 
-        if (entry.area) {
-          let sheet_name = '';
-          const area = new Area(entry.area.start, entry.area.end);
-          area.start.absolute_column = area.start.absolute_row = true;
-          area.end.absolute_column = area.end.absolute_row = true;
-
-          if (entry.area.start.sheet) {
-            sheet_name = entry.area.start.sheet;
-          }
-          else if (entry.area.start.sheet_id) {
-            for (const sheet of source.sheet_data) {
-              if (sheet.id === area.start.sheet_id) {
-                sheet_name = sheet.name || '';
-                break;
-              }
-            }
-          }
-  
-          if (sheet_name) {
-            if (QuotedSheetNameRegex.test(sheet_name)) {
-              sheet_name = `'${sheet_name}'`;
-            }
-            sheet_name += '!';
-          }
-  
-          // console.info({key, area, lx: area.spreadsheet_label, sheet_name });
-          definedNames.definedName.push({
-            a$: { name: entry.name, localSheetId: scope },
-            t$: sheet_name + area.spreadsheet_label,
-          });
-  
-        }
-        else if (entry.expression) {
-          definedNames.definedName.push({
-            a$: { name: entry.name, localSheetId: scope },
-            t$: entry.expression,
-          });
-        }
-
-      }
-    }
-
-    console.info("DB", definedNames);
-
-    /*
-    if (source.named_ranges) {
-      const keys = Object.keys(source.named_ranges);
-      for (const key of keys) {
-        let sheet_name = '';
-        const area = new Area(source.named_ranges[key].start, source.named_ranges[key].end);
-        area.start.absolute_column = area.start.absolute_row = true;
-        area.end.absolute_column = area.end.absolute_row = true;
-
-        if (area.start.sheet_id) {
-          for (const sheet of source.sheet_data) {
-            if (sheet.id === area.start.sheet_id) {
-              sheet_name = sheet.name || '';
-              break;
-            }
-          }
-        }
-
-        if (sheet_name) {
-          if (QuotedSheetNameRegex.test(sheet_name)) {
-            sheet_name = `'${sheet_name}'`;
-          }
-          sheet_name += '!';
-        }
-
-        // console.info({key, area, lx: area.spreadsheet_label, sheet_name });
         definedNames.definedName.push({
-          a$: { name: key },
-          t$: sheet_name + area.spreadsheet_label,
-        });
-
-      }
-    }
-    if (source.named_expressions) {
-      for (const entry of source.named_expressions) {
-        definedNames.definedName.push({
-          a$: { name: entry.name },
+          a$: { name: entry.name, localSheetId: scope },
           t$: entry.expression,
         });
+
       }
     }
-    */
 
     if (!definedNames.definedName.length) {
       definedNames = undefined;

package/treb-export/src/workbook2.ts

@@ -39,7 +39,7 @@ import { Sheet, VisibleState } from './workbook-sheet2';
 import type { RelationshipMap } from './relationship';
 import { ZipWrapper } from './zip-wrapper';
 import type { CellStyle } from 'treb-base-types';
-import type { CompositeNamed } from 'treb-data-model';
+import type { SerializedNamed } from 'treb-data-model';
 
 
 /*
@@ -155,7 +155,7 @@ export class Workbook {
   /* * defined names. these can be ranges or expressions. */
   // public defined_names: Record<string, string> = {};
 
-  public named: Array<CompositeNamed & {local_scope?: number}> = [];
+  public named: Array<SerializedNamed & {local_scope?: number}> = [];
 
   /** the workbook "rels" */
   public rels: RelationshipMap = {};

package/treb-grid/src/types/grid.ts

@@ -83,7 +83,7 @@ import type { GridEvent } from './grid_events';
 import { ErrorCode } from './grid_events';
 
 import type { 
-  CompositeNamed,
+  SerializedNamed,
   DataModel, 
   GridSelection,
   LegacySerializedSheet, 
@@ -890,7 +890,7 @@ export class Grid extends GridBase {
     import_data: {
       sheets: ImportedSheetData[],
       // names?: Record<string, string|number>,
-      named?: CompositeNamed[],
+      named?: SerializedNamed[],
       active_tab?: number,
     },
     render = false,
@@ -972,7 +972,7 @@ export class Grid extends GridBase {
     this.model.named.Reset();
 
     if (import_data.named) {
-      this.model.UnserializeComposite(import_data.named, this.active_sheet);
+      this.model.UnserializeNames(import_data.named, this.active_sheet);
     }
 
     // FIXME: do we need to rebuild autocomplete here (A: yes)