[IMP] package: use references to build

package.json

@@ -23,24 +23,22 @@
     "prettier": "prettier . --write",
     "check-formatting": "prettier . --check && eslint",
     "lint": "eslint --fix",
-    "dev": "npm-run-all --print-label prebuild build:dev --parallel build:watch:engine build:watch server serve-static",
-    "prebuild": "npm run build --workspaces --if-present",
-    "build:dev": "npm-run-all build:js bundle:iife  \"bundle:xml -- --outDir build\" \"bundle:css -- --out build\"",
-    "build": "npm-run-all build:js bundle:esm bundle:iife \"bundle:xml -- --outDir build\" \"bundle:css -- --out build\"",
-    "build:watch": "npm-run-all  --parallel build:js:watch bundle:iife:watch bundle:xml:watch bundle:css:watch",
-    "build:watch:engine": "npm run build:watch --workspace=@odoo/o-spreadsheet-engine",
-    "build:js": "tsc --module es6 --incremental",
-    "build:js:watch": "npm run build:js -- --watch",
+    "predev": "node tools/clean_build_files.cjs",
+    "dev": "npm-run-all --print-label --parallel build:watch server serve-static:wait",
+    "build": "npm-run-all transpile-js bundle:esm bundle:iife \"bundle:xml -- --outDir build\" \"bundle:css -- --out build\"",
+    "build:watch": "npm-run-all --parallel transpile-js:watch bundle:iife:watch bundle:xml:watch bundle:css:watch",
+    "transpile-js": "tsc --build --incremental --preserveWatchOutput",
+    "transpile-js:watch": "npm run transpile-js -- --watch",
     "bundle:cjs": "rollup -c -m -- --format cjs",
     "bundle:esm": "rollup -c -m -- --format esm",
     "bundle:iife": "rollup -c -m -- --format iife",
-    "bundle:iife:watch": "npm run bundle:iife -- --watch",
-    "bundle:dev": "rollup -c -m -- --format dev",
+    "bundle:iife:watch": "wait-on build/js/src/index.js && npm run bundle:iife -- --watch",
     "bundle:xml": "node tools/bundle_xml/main.cjs",
     "bundle:xml:watch": "node tools/bundle_xml/watch_xml_templates.cjs",
     "bundle:css": "node tools/bundle_css/main.cjs",
     "bundle:css:watch": "node tools/bundle_css/watch_css_files.cjs",
     "serve-static": "live-server --open=demo --watch=build/o_spreadsheet.iife.js,build/o_spreadsheet.xml,build/o_spreadsheet.css,demo",
+    "serve-static:wait": "wait-on build/o_spreadsheet.iife.js build/o_spreadsheet.xml build/o_spreadsheet.css && npm run serve-static",
     "server": "node tools/server/main.cjs",
     "predist": "npm run dist --workspaces --if-present",
     "dist": "tsc --module es6 --declaration --declarationDir dist/types && rollup -c",
@@ -111,6 +109,7 @@
     "seedrandom": "^3.0.5",
     "typescript": "^5.8.2",
     "typescript-eslint": "^8.30.1",
+    "wait-on": "^9.0.1",
     "xml-formatter": "^2.4.0"
   },
   "optionalDependencies": {

packages/o-spreadsheet-engine/package.json

@@ -3,15 +3,7 @@
   "version": "19.1.0-alpha.3",
   "type": "module",
   "scripts": {
-    "build": "npm-run-all build:js",
-    "build:watch": "npm-run-all --parallel build:js:watch",
-    "build:js": "tsc --module es6 --incremental",
-    "build:js:watch": "npm run build:js -- --watch",
-    "bundle:esm": "rollup -c -m -- --format esm",
-    "bundle:cjs": "rollup -c -m -- --format cjs",
-    "bundle:iife": "rollup -c -m -- --format iife",
-    "bundle:iife:watch": "npm run bundle:iife -- --watch",
-    "dist": "tsc --module es6 --declaration --declarationDir ../../dist/types/packages/o-spreadsheet-engine/ && rollup -c",
+    "dist": "tsc --module es6 --declaration && rollup -c",
     "test": "tsc --noEmit --project tsconfig.jest.json && jest"
   },
   "engines": {

packages/o-spreadsheet-engine/rollup.config.js

@@ -74,7 +74,7 @@ export default (commandLineArgs) => {
         plugins,
       },
       {
-        input: "../../dist/types/packages/o-spreadsheet-engine/index.d.ts",
+        input: "./build/js/o-spreadsheet-engine/src/index.d.ts",
         output: [{ file: "../../dist/o-spreadsheet-engine.d.ts", format: "es" }],
         plugins: [dts(), nodeResolve()],
       },

packages/o-spreadsheet-engine/tsconfig.json

@@ -1,8 +1,11 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "outDir": "build/js/o-spreadsheet-engine/src",
-    "preserveWatchOutput": true
+    "outDir": "build/js/o-spreadsheet-engine",
+    "preserveWatchOutput": true,
+    "composite": true,
+    "declaration": true,
+    "declarationMap": true
   },
   "include": ["./src"],
   "exclude": ["../../src/*"]

rollup.config.js

@@ -44,17 +44,11 @@ export default (commandLineArgs) => {
       entries: [
         {
           find: "@odoo/o-spreadsheet-engine",
-          replacement: path.resolve(
-            __dirname,
-            "./packages/o-spreadsheet-engine/build/js/o-spreadsheet-engine/src"
-          ),
+          replacement: path.resolve(__dirname, "./packages/o-spreadsheet-engine/src"),
         },
         {
           find: "@odoo/o-spreadsheet-engine/*",
-          replacement: path.resolve(
-            __dirname,
-            "./packages/o-spreadsheet-engine/build/js/o-spreadsheet-engine/src/*"
-          ),
+          replacement: path.resolve(__dirname, "./packages/o-spreadsheet-engine/src/*"),
         },
       ],
     }),
@@ -79,7 +73,27 @@ export default (commandLineArgs) => {
           format: commandLineArgs.format,
         },
       ],
-      plugins,
+      plugins: [
+        alias({
+          entries: [
+            {
+              find: "@odoo/o-spreadsheet-engine",
+              replacement: path.resolve(
+                __dirname,
+                "./packages/o-spreadsheet-engine/build/js/o-spreadsheet-engine/src"
+              ),
+            },
+            {
+              find: "@odoo/o-spreadsheet-engine/*",
+              replacement: path.resolve(
+                __dirname,
+                "./packages/o-spreadsheet-engine/build/js/o-spreadsheet-engine/src/*"
+              ),
+            },
+          ],
+        }),
+        nodeResolve(),
+      ],
       watch: {
         include: ["build/js/**", "./packages/o-spreadsheet-engine/build/**"],
       },
@@ -101,7 +115,7 @@ export default (commandLineArgs) => {
         plugins,
       },
       {
-        input: "dist/types/src/index.d.ts",
+        input: "dist/types/index.d.ts",
         output: [{ file: "dist/o-spreadsheet.d.ts", format: "es" }],
         plugins: [
           dts(),
@@ -110,13 +124,16 @@ export default (commandLineArgs) => {
             entries: [
               {
                 find: "@odoo/o-spreadsheet-engine",
-                replacement: path.resolve(__dirname, "./dist/types/packages/o-spreadsheet-engine"),
+                replacement: path.resolve(
+                  __dirname,
+                  "./packages/o-spreadsheet-engine/build/js/o-spreadsheet-engine/src"
+                ),
               },
               {
                 find: "@odoo/o-spreadsheet-engine/*",
                 replacement: path.resolve(
                   __dirname,
-                  "./dist/types/packages/o-spreadsheet-engine/*"
+                  "./packages/o-spreadsheet-engine/build/js/o-spreadsheet-engine/src/*"
                 ),
               },
             ],

src/actions/figure_menu_actions.ts

@@ -1,8 +1,8 @@
+import { deepEquals } from "@odoo/o-spreadsheet-engine";
 import { getMaxFigureSize } from "@odoo/o-spreadsheet-engine/helpers/figures/figure/figure";
 import { _t } from "@odoo/o-spreadsheet-engine/translation";
 import { SpreadsheetChildEnv } from "@odoo/o-spreadsheet-engine/types/spreadsheet_env";
 import { UID } from "..";
-import { deepEquals } from "../../packages/o-spreadsheet-engine/src/helpers/misc";
 import { downloadFile } from "../components/helpers/dom_helpers";
 import { chartToImageFile, chartToImageUrl } from "../helpers/figures/charts";
 import { Action, ActionSpec, createActions } from "./action";

src/actions/menu_items_actions.ts

@@ -1,3 +1,4 @@
+import { getPivotTooBigErrorMessage } from "@odoo/o-spreadsheet-engine/components/translations_terms";
 import {
   DEFAULT_FIGURE_HEIGHT,
   DEFAULT_FIGURE_WIDTH,
@@ -16,7 +17,6 @@ import {
 } from "@odoo/o-spreadsheet-engine/types/clipboard";
 import { Image } from "@odoo/o-spreadsheet-engine/types/image";
 import { SpreadsheetChildEnv } from "@odoo/o-spreadsheet-engine/types/spreadsheet_env";
-import { getPivotTooBigErrorMessage } from "../../packages/o-spreadsheet-engine/src/components/translations_terms";
 import { CellPopoverStore } from "../components/popover";
 import { getSmartChartDefinition } from "../helpers/figures/charts/smart_chart_engine";
 import {