@trebco/treb 28.17.4 → 29.1.2

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

@@ -19,9 +19,8 @@
  * 
  */
 
-import type { DataModel, ViewModel } from './data_model';
+import type { DataModel, ViewModel, Sheet } from 'treb-data-model';
 import { EventSource } from 'treb-utils';
-import type { Sheet } from './sheet';
 import type { BaseLayout } from '../layout/base_layout';
 import { MouseDrag } from './drag_mask';
 import type { GridOptions } from './grid_options';

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

@@ -95,7 +95,8 @@ export interface UnitImaginary extends BaseUnit {
 /**
  * expression unit representing an array of primitive values. array
  * can contain mixed values, and holes. array cannot contain arrays,
- * or any other complex type.
+ * or any other complex type (including complex, apparently. we should
+ * remedy that).
  */
 export interface UnitArray extends BaseUnit {
   type: 'array';

package/treb-parser/src/parser.ts

@@ -104,7 +104,7 @@ const UC_Z = 0x5a;
 const LC_Z = 0x7a;
 
 const LC_I = 0x69;
-const LC_J = 0x6a;
+// const LC_J = 0x6a;
 
 const ACCENTED_RANGE_START = 192;
 const ACCENTED_RANGE_END = 312;
@@ -289,7 +289,7 @@ export class Parser {
     // uses it. this test only works because we know the internal type
     // representation, but that's fragile and not a good idea. FIXME
 
-    if ((argument_separator as any) === (decimal_mark as any)) {
+    if ((argument_separator as string) === (decimal_mark as string)) {
       throw new Error('invalid locale setting');
     }
 
@@ -452,7 +452,7 @@ export class Parser {
     const { 
       convert_decimal, 
       convert_argument_separator, 
-      convert_imaginary_number, 
+      // convert_imaginary_number, 
       long_structured_references, 
       table_name 
     } = options;
@@ -467,10 +467,12 @@ export class Parser {
       separator = '; ';
     }
 
+    /*
     let imaginary_character = this.imaginary_number;
     if (convert_imaginary_number) {
       imaginary_character = convert_imaginary_number;
     }
+    */
 
     // this is only used if we're converting.
 
@@ -1821,7 +1823,7 @@ export class Parser {
       }
       else {
         this.error = `multiple expressions`;
-        this.error_position = (element as any).position;
+        this.error_position = (element as {position?: number}).position;
         this.valid = false;
         return {
           type: 'group',
@@ -2258,7 +2260,7 @@ export class Parser {
     // whitespace around column names is also ignored, but spaces within
     // a column name are OK, at least within the second set of brackets. 
 
-    const index = position;
+    // const index = position;
     const token_length = token.length;
 
     const label = token;

package/treb-utils/src/event_source.ts

@@ -25,7 +25,7 @@
 let subscription_token_generator = 1000;
 
 interface EventSubscription<T> {
-  subscriber: (event: T) => any;
+  subscriber: (event: T) => void;
   token: number;
 }
 

package/treb-utils/src/serialize_html.ts

@@ -28,18 +28,35 @@ interface StringMap {
  */
 let default_properties: StringMap|undefined;
 
+const PropertyMap = (source: CSSStyleDeclaration): StringMap => {
+
+  const map: StringMap = {};
+
+  // you can iterate this thing, although apparently ts won't allow
+  // it because it's not in the spec? should probably play ball
+
+  for (let i = 0; i < source.length; i++) {
+    const key = source[i];
+    map[key] = source.getPropertyValue(key);
+  }
+
+  return map;
+
+}
+
 /**
  * get applied style as text (for attribute)
  */
 const GetAppliedStyle = (node: Element, computed: CSSStyleDeclaration, defaults: StringMap) => {
 
   const applied: StringMap = {};
-
-  Array.prototype.forEach.call(computed, (key) => {
-    if (computed[key] !== defaults[key]) {
-      applied[key] = computed[key];
+  const computed_map = PropertyMap(computed);
+  
+  for (const key of Object.keys(computed_map)) {
+    if (computed_map[key] !== defaults[key]) {
+      applied[key] = defaults[key];
     }
-  });
+  }
 
   return (Object.keys(applied).map((key) => `${key}: ${applied[key]}`).join('; ') +
     '; ' + (node.getAttribute('style') || '')).trim().replace(/"/g, '\'');
@@ -58,13 +75,21 @@ const RenderNode = (node: Element, defaults: StringMap) => {
   (clone as HTMLElement).removeAttribute('class');
   (clone as HTMLElement).setAttribute('style', style);
 
+  let computed_map: StringMap|undefined;
+
   Array.prototype.forEach.call(node.childNodes, (child: Node) => {
 
     switch (child.nodeType) {
 
       case Node.ELEMENT_NODE:
+
         // here we use the parent as the default style, assuming the child will inherit
-        clone.appendChild(RenderNode(child as Element, computed as any));
+
+        // create on demand, if necessary
+        if (!computed_map) {
+          computed_map = PropertyMap(computed);          
+        }
+        clone.appendChild(RenderNode(child as Element, computed_map));
         break;
 
       case Node.TEXT_NODE:

package/.eslintignore

@@ -1,8 +0,0 @@
-
-node_modules
-dist
-build
-declaration
-treb.d.ts
-
-

package/.eslintrc.cjs

@@ -1,168 +0,0 @@
-module.exports = {
-  env: {
-    'browser': true,
-    'node': true,
-  },
-  root: true,
-  parser: '@typescript-eslint/parser',
-  plugins: [
-    '@typescript-eslint',
-  ],
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/eslint-recommended',
-    'plugin:@typescript-eslint/recommended',
-  ],
-
-  rules: {
-    'no-irregular-whitespace': [
-      'error',
-      {
-        skipComments: true,
-      }
-    ],
-    'camelcase': 'off',
-    '@typescript-eslint/no-unsafe-declaration-merging': 'error',
-    '@typescript-eslint/camelcase': 'off',     
-    // '@typescript-eslint/explicit-function-return-type': 'off',     
-    '@typescript-eslint/quotes': [
-      'error',
-      'single',
-      { 'allowTemplateLiterals': true },
-    ],
-    'brace-style': 'off',
-    '@typescript-eslint/brace-style': [
-      'error',
-      'stroustrup',
-      { 'allowSingleLine': true },
-    ],
-    '@typescript-eslint/interface-name-prefix': 'off',
-
-    /*
-
-    FIXME: needs configuration. I'm ok with it generally but why split 
-    accessors for the same field?
-
-    UPDATE: see also https://eslint.org/docs/rules/grouped-accessor-pairs
-
-    not sure how these work together
-
-    '@typescript-eslint/member-ordering': [
-      'error',
-    ],
-    */
-
-    'grouped-accessor-pairs': ['error', 'getBeforeSet'],
-    
-    '@typescript-eslint/consistent-type-imports': 'error',
-    // '@typescript-eslint/consistent-type-exports': 'error',
-
-  }
-
-  /*
-  "rules": {
-    "@typescript-eslint/adjacent-overload-signatures": "error",
-    "@typescript-eslint/array-type": "error",
-    "@typescript-eslint/ban-types": "error",
-    "@typescript-eslint/class-name-casing": "error",
-    "@typescript-eslint/consistent-type-assertions": "error",
-    "@typescript-eslint/indent": [
-        2
-    ],
-    "@typescript-eslint/no-empty-function": "error",
-    "@typescript-eslint/no-empty-interface": "error",
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-misused-new": "error",
-    "@typescript-eslint/no-namespace": "error",
-    "@typescript-eslint/no-parameter-properties": "off",
-    "@typescript-eslint/no-use-before-define": "off",
-    "@typescript-eslint/no-var-requires": "error",
-    "@typescript-eslint/prefer-for-of": "error",
-    "@typescript-eslint/prefer-function-type": "error",
-    "@typescript-eslint/prefer-namespace-keyword": "error",
-    "@typescript-eslint/quotes": [
-        "error",
-        "single"
-    ],
-    "@typescript-eslint/triple-slash-reference": "error",
-    "@typescript-eslint/unified-signatures": "error",
-    "camelcase": "off",
-    "complexity": "off",
-    "constructor-super": "error",
-    "curly": [
-        "error",
-        "multi-line"
-    ],
-    "dot-notation": "error",
-    "eqeqeq": [
-        "error",
-        "smart"
-    ],
-    "guard-for-in": "error",
-    "id-blacklist": "error",
-    "id-match": "error",
-    "import/order": "off",
-    "max-classes-per-file": [
-        "error",
-        1
-    ],
-    "new-parens": "error",
-    "no-bitwise": "error",
-    "no-caller": "error",
-    "no-cond-assign": "error",
-    "no-console": "off",
-    "no-debugger": "error",
-    "no-empty": "error",
-    "no-eval": "error",
-    "no-fallthrough": "off",
-    "no-invalid-this": "off",
-    "no-multiple-empty-lines": "off",
-    "no-new-wrappers": "error",
-    "no-shadow": [
-        "error",
-        {
-            "hoist": "all"
-        }
-    ],
-    "no-throw-literal": "error",
-    "no-trailing-spaces": "error",
-    "no-undef-init": "error",
-    "no-underscore-dangle": "error",
-    "no-unsafe-finally": "error",
-    "no-unused-expressions": "error",
-    "no-unused-labels": "error",
-    "no-var": "error",
-    "object-shorthand": "error",
-    "one-var": [
-        "error",
-        "never"
-    ],
-    "prefer-arrow/prefer-arrow-functions": "error",
-    "prefer-const": "error",
-    "quote-props": [
-        "error",
-        "as-needed"
-    ],
-    "radix": "error",
-    "spaced-comment": "error",
-    "use-isnan": "error",
-    "valid-typeof": "off",
-
-    / *
-    "@typescript-eslint/tslint/config": [
-        "error",
-        {
-            "rules": {
-                "jsdoc-format": true,
-                "no-reference-import": true,
-                "one-line": [
-                    true,
-                    "check-open-brace"
-                ]
-            }
-        }
-    ]
-    * /
-  }
-  */
-};

package/treb-grid/src/layout/rectangle_cache.ts

@@ -1,86 +0,0 @@
-/*
- * This file is part of TREB.
- *
- * TREB is free software: you can redistribute it and/or modify it under the 
- * terms of the GNU General Public License as published by the Free Software 
- * Foundation, either version 3 of the License, or (at your option) any 
- * later version.
- *
- * TREB is distributed in the hope that it will be useful, but WITHOUT ANY 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 
- * details.
- *
- * You should have received a copy of the GNU General Public License along 
- * with TREB. If not, see <https://www.gnu.org/licenses/>. 
- *
- * Copyright 2022-2024 trebco, llc. 
- * info@treb.app
- * 
- */
-
-import type { Rectangle } from 'treb-base-types';
-
-/**
- * FIXME: efficiency of using sparse arrays here?
- *
- * (vs what, a lookup table? sparse arrays are basically a lookup
- * table, and we can assume they're reasonably efficient)
- */
-/*export*/ class RectangleCache {
-
-  private cache: Rectangle[][] = [];
-
-  /*
-
-  private hits = 0;
-  private misses = 0;
-
-  public Stats(){
-    return {
-      hits: this.hits,
-      misses: this.misses,
-      hit_rate: (this.hits + this.misses) ? this.hits / (this.hits + this.misses) : 0,
-    };
-  }
-
-  */
-
-  /** flush cache */
-  public Clear(){
-    this.cache = [];
-  }
-
-  /**
-   * cache lookup.
-   * FIXME: why row/column and not address type?
-   */
-  public Get(column: number, row: number): Rectangle|undefined {
-
-    if (!this.cache[column]) return undefined;
-    const rect = this.cache[column][row];
-    return rect ? rect.Shift(0, 0) : undefined;
-
-    /*
-    if (this.cache[column]) {
-      const rect = this.cache[column][row];
-      if (rect) {
-        this.hits++;
-        return rect.Shift(0, 0);
-      }
-    }
-    this.misses++;
-    return undefined;
-    */
-  }
-
-  /**
-   * cache set.
-   * FIXME: why row/column and not address type?
-   */
-  public Set(column: number, row: number, rect: Rectangle) {
-    if (!this.cache[column]) this.cache[column] = [];
-    this.cache[column][row] = rect.Shift(0, 0); // clone
-  }
-
-}