@trebco/treb 25.8.0 → 25.9.1

package/dist/treb.d.ts

@@ -1,4 +1,4 @@
-/*! API v25.8. Copyright 2018-2023 trebco, llc. All rights reserved. LGPL: https://treb.app/license */
+/*! API v25.9. Copyright 2018-2023 trebco, llc. All rights reserved. LGPL: https://treb.app/license */
 
 /**
  * add our tag to the map

package/esbuild-utils.mjs

@@ -81,17 +81,25 @@ export const FormatSize = (size, precision = 1) => {
  * 
  * if you import a worker script like this 
  * ```
- * import worker_script from 'worker://path/to/worker.ts';
+ * import * as worker_script from 'worker:path/to/worker';
  * ```
  * the plugin will compile the target (with esbuild) and then return the 
  * compiled script as a string. the child build inherits minify settings 
  * from the parent build.
  * 
+ * note the `import *` syntax; we can't just import the script, because
+ * tsc will complain about a missing default export (and you can't have 
+ * a default export, or it will break when it runs).
+ * 
  * you can then use it in the containing script by creating a worker:
  * ```
- * const worker = new Worker(URL.createObjectURL(new Blob([worker_script], { type: 'application/javascript' })));
+ * const worker = new Worker(URL.createObjectURL(new Blob([(worker_script as any).default], { type: 'application/javascript' })));
  * ```
  * 
+ * here we have to use `any`, for the time being, because when tsc reads
+ * this it will note (correctly) that there's no default. but for our 
+ * esbuild import, we will have a default string.
+ * 
  * this might cause problems with CSP. if so, we'll sort that out separately.
  * 
  */
@@ -99,8 +107,8 @@ export const WorkerPlugin = (options) => ({
   name: 'worker',
   setup(build) {
 
-    build.onResolve({ filter: /^worker:\/\//}, async (args) => {
-      args.path = args.path.substring(9);
+    build.onResolve({ filter: /^worker:/}, async (args) => {
+      args.path = args.path.substring(7);
       const result = await build.resolve(args.path, {
         kind: args.kind,
         resolveDir: args.resolveDir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trebco/treb",
-  "version": "25.8.0",
+  "version": "25.9.1",
   "license": "LGPL-3.0-or-later",
   "homepage": "https://treb.app",
   "repository": {
@@ -26,6 +26,7 @@
     "treb-base-types": "file:treb-base-types",
     "treb-calculator": "file:treb-calculator",
     "treb-charts": "file:treb-charts",
+    "treb-export": "file:treb-export",
     "treb-format": "file:treb-format",
     "treb-grid": "file:treb-grid",
     "treb-parser": "file:treb-parser",

package/treb-embed/modern.tsconfig.json

@@ -6,6 +6,7 @@
     "../treb-utils/**/*.ts",
     "../treb-grid/**/*.ts",
     "../treb-charts/**/*.ts",
+    "../treb-export/**/*.ts",
     "../treb-format/**/*.ts",
     "../treb-parser/**/*.ts",
     "../treb-calculator/**/*.ts",

package/treb-embed/src/embedded-spreadsheet.ts

@@ -75,17 +75,11 @@ import type { SetRangeOptions } from 'treb-grid';
 // --- worker ------------------------------------------------------------------
 
 /**
- * note the clumsy URI-like syntax. if typescript can see that the thing
- * is a ts file, even if we have a prefix and a type defined for that 
- * prefix, it will still try to read it. 
- * 
- * this is not a great solution. I was thinking about letting ts read it.
- * That won't impact esbuild, and it has the helpful side effect of type 
- * checking the worker when we run tsc. but it doesn't like the .ts extension.
- * also it actually tries to import the file, which means you have to export
- * some junk value.
+ * import the worker as a script file. tsc will read this on typecheck but 
+ * that's actually to the good; when we build with esbuild we will inline
+ * the script so we can run it as a worker.
  */
-import export_worker_script from 'worker://../../treb-export/src/export-worker/index-modern.ts';
+import * as export_worker_script from 'worker:../../treb-export/src/export-worker/index.worker';
 
 // --- types -------------------------------------------------------------------
 
@@ -2813,7 +2807,7 @@ export class EmbeddedSpreadsheet {
     }
 
     if (text && filename) {
-      const blob = new Blob([text], { type: 'text/plain;charset=utf-8' });
+      const blob = new Blob([text as any], { type: 'text/plain;charset=utf-8' });
       /*
       // FileSaver.saveAs(blob, filename, { autoBom: false });
       const a = document.createElement('a');
@@ -5327,7 +5321,7 @@ export class EmbeddedSpreadsheet {
       if (export_worker_script) {
         try {
           const worker = new Worker(
-              URL.createObjectURL(new Blob([export_worker_script], { type: 'application/javascript' })));
+              URL.createObjectURL(new Blob([(export_worker_script as any).default], { type: 'application/javascript' })));
           return worker;
         }
         catch (err) {

package/treb-export/src/export-worker/{index-modern.ts → index.worker.ts}

@@ -21,3 +21,12 @@
 
 import './export-worker';
 
+/**
+ * default export so tsc will allow us to import it. we use a string
+ * because when actually running (via the esbuild build) it will be 
+ * the code as text. HOWEVER, this will break if we actually try to 
+ * run it in a browser, so we need to clean it up in the compiler.
+ */
+// export default '';
+
+

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

@@ -122,7 +122,7 @@ export abstract class BaseLayout {
    * an event we can trap for that. it might be necessary to test this
    * periodically.
    */
-  public dpr = Math.max(1, self.devicePixelRatio || 1);
+  public dpr = 1; // Math.max(1, self.devicePixelRatio || 1);
 
   /** separate scale, user-controlled (testing...) */
   public scale = 1;
@@ -193,6 +193,8 @@ export abstract class BaseLayout {
       return;
     }
 
+    this.dpr = Math.max(1, self.devicePixelRatio || 1);
+
     // now attaching to node... no longer global
     // actually if we are not in a web component, we might as well
     // use global...

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

@@ -196,7 +196,7 @@ export class MDParser {
         const followed_by_punctuation = following && following.type === 'text' && /^[^\w\d]/.test(following.text);
 
         token.left_flanking = ((!followed_by_whitespace) && ((!followed_by_punctuation) || preceded_by_whitespace));
-        token.right_flanking = ((!preceded_by_whitespace) && ((!preceded_by_punctuation) || followed_by_whitespace));
+        token.right_flanking = ((!preceded_by_whitespace) && ((!preceded_by_punctuation) || (followed_by_whitespace || followed_by_punctuation)));
 
       }
     }