@trebco/treb 30.2.14 → 30.3.2

package/dist/treb.d.ts

@@ -1,4 +1,4 @@
-/*! API v30.2. Copyright 2018-2024 trebco, llc. All rights reserved. LGPL: https://treb.app/license */
+/*! API v30.3. Copyright 2018-2024 trebco, llc. All rights reserved. LGPL: https://treb.app/license */
 
 /**
  * add our tag to the map

package/{esbuild-custom-element.mjs → esbuild-composite.mjs}

@@ -4,7 +4,7 @@
 
 import * as esbuild from 'esbuild';
 
-import { SassPlugin, WorkerPlugin, NotifyPlugin, HTMLPlugin } from './esbuild-utils.mjs';
+import { SassPlugin, WorkerPlugin, NotifyPlugin, HTMLPlugin, RewriteIgnoredImports } from './esbuild-utils.mjs';
 import { promises as fs } from 'fs';
 
 import pkg from './package.json' with { type: 'json' }; 
@@ -32,7 +32,7 @@ const options = {
   minify: true, 
   verbose: false,
   xlsx_support: true,
-  output_filename: 'treb-spreadsheet.mjs',
+  output_filename: 'treb-spreadsheet',
 };
 
 //------------------------------------------------------------------------------
@@ -60,36 +60,19 @@ for (let i = 0; i < process.argv.length; i++) {
   }
 }
 
-/**
- * thanks to
- * https://github.com/evanw/esbuild/issues/3337#issuecomment-2085394950
- */
-function RewriteIgnoredImports() {
-  return {
-    name: 'RewriteIgnoredImports',
-    setup(build) {
-      build.onEnd(async (result) => {
-        if (result.outputFiles) {
-          for (const file of result.outputFiles) {
-            const { path, text } = file;
-            await fs.writeFile(path, text.replace(/esbuild-ignore-import:/, ''));
-          }
-        }
-      });
-    },
-  };
-}
 
 /** @type esbuild.BuildOptions */
 const build_options = {
   entryPoints: [
-    'treb-embed/src/index.ts',
+    { in: 'treb-embed/src/index.ts', out: options.output_filename },
+    { in: 'treb-embed/src/export-worker.ts', out: 'treb-export-worker' },
   ],
   banner: { 
     js: `/*! TREB v${pkg.version}. Copyright 2018-${new Date().getFullYear()} trebco, llc. All rights reserved. LGPL: https://treb.app/license */`
   },
   bundle: true,
-  outfile: 'dist/' + options.output_filename,
+  outdir: 'dist',
+  // outfile: 'dist/' + options.output_filename,
   outExtension: { '.js': '.mjs' },
   minify: options.minify,
   metafile: true,

package/esbuild-utils.mjs

@@ -5,7 +5,7 @@
 
 import * as esbuild from 'esbuild';
 import { promises as fs } from 'fs';
-import { minify } from 'html-minifier';
+import { minify } from 'html-minifier-terser';
 import path from 'path';
 import * as sass from 'sass';
 import cssnano from 'cssnano';
@@ -116,7 +116,7 @@ export const WorkerPlugin = (options) => ({
         resolveDir: args.resolveDir,
       });
       return { path: result.path, namespace: 'worker', };
-    }),
+    });
 
     // for some reason I can't get the filter to work here, but using
     // namespace works. as long as we don't collide with anybody else.
@@ -219,10 +219,14 @@ export const HTMLPlugin = (options) => ({
       }
 
       const text = await fs.readFile(args.path, 'utf8');
+
       return {
-        contents: options?.minify ? minify(text, html_minifier_options) : text,
+        contents: options?.minify ? await minify(text, html_minifier_options) : text,
         loader: 'text',
       };
+
+
+
     });
   },
 });
@@ -282,3 +286,24 @@ export const SassPlugin = (options) => ({
     });
   },
 });
+
+/**
+ * thanks to
+ * https://github.com/evanw/esbuild/issues/3337#issuecomment-2085394950
+ */
+export const RewriteIgnoredImports = () => {
+  return {
+    name: 'RewriteIgnoredImports',
+    setup(build) {
+      build.onEnd(async (result) => {
+        if (result.outputFiles) {
+          for (const file of result.outputFiles) {
+            const { path, text } = file;
+            await fs.writeFile(path, text.replace(/esbuild-ignore-import:/g, ''));
+          }
+        }
+      });
+    },
+  };
+};
+

package/eslint.config.js

@@ -23,7 +23,8 @@ export default tseslint.config(
 
       "@typescript-eslint/no-unused-vars": [
         "error", { 
-          "destructuredArrayIgnorePattern": "^_",
+          destructuredArrayIgnorePattern: "^_",
+          varsIgnorePattern: "^_",
         }],
     },
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trebco/treb",
-  "version": "30.2.14",
+  "version": "30.3.2",
   "license": "LGPL-3.0-or-later",
   "homepage": "https://treb.app",
   "repository": {
@@ -19,7 +19,7 @@
     "esbuild": "^0.23.0",
     "eslint": "^9.8.0",
     "fast-xml-parser": "^4.0.7",
-    "html-minifier": "^4.0.0",
+    "html-minifier-terser": "^7.2.0",
     "sass": "^1.69.3",
     "treb-base-types": "file:treb-base-types",
     "treb-calculator": "file:treb-calculator",
@@ -37,17 +37,16 @@
     "uzip": "^0.20201231.0"
   },
   "scripts": {
-    "build": "node esbuild-custom-element.mjs",
-    "build-light": "node esbuild-custom-element.mjs --no-xlsx --output-filename treb-spreadsheet-light.mjs",
-    "dev": "node esbuild-custom-element.mjs --dev",
+    "build": "node esbuild-composite.mjs",
+    "dev": "node esbuild-composite.mjs --dev",
     "clean": "rm -fr build dist declaration",
-    "watch": "node --watch esbuild-custom-element.mjs --watch --dev",
-    "watch-production": "node --watch esbuild-custom-element.mjs --watch",
+    "watch": "node --watch esbuild-composite.mjs --watch --dev",
+    "watch-production": "node --watch esbuild-composite.mjs --watch",
     "tsc": "tsc -b treb-embed/modern.tsconfig.json",
     "rebuild-tsc": "tsc -b --force treb-embed/modern.tsconfig.json",
     "watch-tsc": "tsc -b treb-embed/modern.tsconfig.json -w",
     "watch-api": "ts-node-dev --respawn api-generator/api-generator.ts --config api-config.json",
     "generate-api": "ts-node-dev api-generator/api-generator.ts --config api-config.json",
-    "release": "npm run rebuild-tsc && npm run build && npm run generate-api && npm run build-light"
+    "release": "npm run rebuild-tsc && npm run build && npm run generate-api"
   }
 }

package/treb-embed/modern.tsconfig.json

@@ -12,7 +12,6 @@
     "../treb-parser/**/*.ts",
     "../treb-calculator/**/*.ts",
     "../treb-base-types/**/*.ts",
-    "../treb-export/**/*.ts",
     "src/content-types.d.ts"
   ],
   "exclude": [

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

@@ -107,13 +107,6 @@ import type { StateLeafVertex } from 'treb-calculator';
  */
 import './content-types.d.ts';
 
-/**
- * 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 * as export_worker_script from 'worker:../../treb-export/src/export-worker/index.worker';
-
 // --- types -------------------------------------------------------------------
 
 /**
@@ -6162,39 +6155,21 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
   }
 
   /**
-   * load worker. optionally uses an ambient path as prefix; intended for
-   * loading in different directories (or different hosts?)
+   * worker now uses a dynamic import with a module built separately.
+   * see `export-worker.ts` (in this directory) for more detail.
    */
   protected async LoadWorker(): Promise<Worker> {
-
-    // this is inlined to ensure the code will be tree-shaken properly
-    // (we're trying to force it to remove the imported worker script)
-
-    if (process.env.XLSX_SUPPORT) {
-    
-      // for esm we now support embedding the worker as a blob
-      // (as text, actually); we can construct it from the text 
-      // as necessary.
-
-      if (export_worker_script) {
-        try {
-          const worker = new Worker(
-              URL.createObjectURL(new Blob([(export_worker_script as {default: string}).default], { type: 'application/javascript' })));
-          return worker;
-        }
-        catch (err) {
-          console.info('embedded worker failed');
-          console.error(err);
-        }
-      }
-
-    } 
-    else {
-      console.warn('this build does not include xlsx support.');
+    try {
+      const worker = `export`;
+      const mod = await import(`esbuild-ignore-import:./treb-${worker}-worker.mjs`) as {
+        CreateWorker: () => Promise<Worker>;
+      };
+      return await mod.CreateWorker();
+    }
+    catch (err) {
+      console.error(err);
+      throw(err);
     }
-
-    throw new Error('creating worker failed');
-
   }
 
   /**

package/treb-embed/src/export-worker.ts

@@ -0,0 +1,44 @@
+/*
+ * 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
+ * 
+ */
+
+// this is a new entrypoint for the worker, as a module. while we can't 
+// just create a worker script, if we create this as a module and embed
+// the worker script we can still get the benefits of dynamic loading.
+
+// why can't we create a worker script? it's OK for direct embedding but
+// breaks when embedding in a bundler (vite is OK, but webpack is not).
+// but all bundlers seem ok with local modules (knock on wood).
+
+/**
+ * import the worker as text so it will be embedded in this module
+ */
+import * as export_worker_script from 'worker:../../treb-export/src/index.worker';
+
+/**
+ * create the worker by loading the embedded text
+ * @returns 
+ */
+export const CreateWorker = async (): Promise<Worker> => {
+  const worker = new Worker(
+    URL.createObjectURL(new Blob([(export_worker_script as {default: string}).default], { type: 'application/javascript' })));
+  return worker;
+};
+

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

@@ -22,8 +22,8 @@
 import type { ImportedSheetData } from 'treb-base-types';
 import type { SerializedModel } from 'treb-data-model';
 
-import { Exporter } from '../export';
-import { Importer } from '../import2';
+import { Exporter } from './export';
+import { Importer } from './import2';
 
 const ctx: Worker = self as unknown as Worker;
 const exporter = new Exporter();