rapier-compat can now use the conf asset from rust, and generate 1 package only thanks to build_json.sh script

ThierryBerger · ThierryBerger · commit 93bc0343ca65 · 2025-06-04T18:19:47.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/builds/prepare_builds/assets/dim2.json b/builds/prepare_builds/assets/dim2.json
@@ -8,5 +8,8 @@
     "template_dir": "./templates/",
     "additional_rust_flags": "",
     "additional_wasm_opt_flags": [],
-    "js_package_name": "rapier2d"
+    "js_package_name": "rapier2d",
+    "conditions_to_remove": [
+        "DIM3"
+    ]
 }
diff --git a/builds/prepare_builds/assets/dim2_deterministic.json b/builds/prepare_builds/assets/dim2_deterministic.json
@@ -9,5 +9,8 @@
     "template_dir": "./templates/",
     "additional_rust_flags": "",
     "additional_wasm_opt_flags": [],
-    "js_package_name": "rapier2d-deterministic"
+    "js_package_name": "rapier2d-deterministic",
+    "conditions_to_remove": [
+        "DIM3"
+    ]
 }
diff --git a/builds/prepare_builds/assets/dim2_simd.json b/builds/prepare_builds/assets/dim2_simd.json
@@ -11,5 +11,8 @@
   "additional_wasm_opt_flags": [
     "--enable-simd"
   ],
-  "js_package_name": "rapier2d-simd"
+  "js_package_name": "rapier2d-simd",
+  "conditions_to_remove": [
+    "DIM3"
+  ]
 }
diff --git a/builds/prepare_builds/assets/dim3.json b/builds/prepare_builds/assets/dim3.json
@@ -8,5 +8,8 @@
     "template_dir": "./templates/",
     "additional_rust_flags": "",
     "additional_wasm_opt_flags": [],
-    "js_package_name": "rapier3d"
+    "js_package_name": "rapier3d",
+    "conditions_to_remove": [
+        "DIM2"
+    ]
 }
diff --git a/builds/prepare_builds/assets/dim3_deterministic.json b/builds/prepare_builds/assets/dim3_deterministic.json
@@ -9,5 +9,8 @@
     "template_dir": "./templates/",
     "additional_rust_flags": "",
     "additional_wasm_opt_flags": [],
-    "js_package_name": "rapier3d-deterministic"
+    "js_package_name": "rapier3d-deterministic",
+    "conditions_to_remove": [
+        "DIM2"
+    ]
 }
diff --git a/builds/prepare_builds/assets/dim3_simd.json b/builds/prepare_builds/assets/dim3_simd.json
@@ -11,5 +11,8 @@
     "additional_wasm_opt_flags": [
         "--enable-simd"
     ],
-    "js_package_name": "rapier3d-simd"
+    "js_package_name": "rapier3d-simd",
+    "conditions_to_remove": [
+        "DIM2"
+    ]
 }
diff --git a/builds/prepare_builds/assets/example_dim2_minimal.json b/builds/prepare_builds/assets/example_dim2_minimal.json
@@ -5,5 +5,10 @@
     "template_dir": "./templates/",
     "additional_rust_flags": "",
     "additional_wasm_opt_flags": [],
-    "js_package_name": "rapier3d-minimal"
+    "js_package_name": "rapier3d-minimal",
+    "conditions_to_remove": [
+        "DIM3",
+        "SERDE_SERIALIZE",
+        "DEBUG_RENDER"
+    ]
 }
diff --git a/builds/prepare_builds/assets/example_dim3_minimal.json b/builds/prepare_builds/assets/example_dim3_minimal.json
@@ -5,5 +5,10 @@
     "template_dir": "./templates/",
     "additional_rust_flags": "",
     "additional_wasm_opt_flags": [],
-    "js_package_name": "rapier3d-minimal"
+    "js_package_name": "rapier3d-minimal",
+    "conditions_to_remove": [
+        "DIM2",
+        "SERDE_SERIALIZE",
+        "DEBUG_RENDER"
+    ]
 }
diff --git a/builds/prepare_builds/src/main.rs b/builds/prepare_builds/src/main.rs
@@ -30,6 +30,8 @@ pub struct BuildValues {
     pub additional_rust_flags: String,
     pub additional_wasm_opt_flags: Vec<String>,
     pub js_package_name: String,
+    /// To remove text blocks present in non-rust files bounded by `#if CONDITION ... #endif`
+    pub conditions_to_remove: Vec<String>,
 }
 
 impl BuildValues {
@@ -105,6 +107,7 @@ fn process_templates(build_values: &BuildValues) -> std::io::Result<()> {
         &build_values.additional_wasm_opt_flags,
     );
     context.insert("js_package_name", &build_values.js_package_name);
+    context.insert("conditions_to_remove", &build_values.conditions_to_remove);
 
     let tera = match Tera::new(target_dir.join("**/*.tera").to_str().unwrap()) {
         Ok(t) => t,
diff --git a/builds/prepare_builds/templates/Cargo.toml.tera b/builds/prepare_builds/templates/Cargo.toml.tera
@@ -12,28 +12,33 @@ license = "Apache-2.0"
 edition = "2018"
 
 [features]
-default = ["dim{{ dimension }}"]
+default = ["dim{{ dimension }}",
+    {%- for feature in additional_features %}
+    "{{ feature }}",
+    {%- endfor %}]
 dim{{ dimension }} = []
 debug-render = ["rapier{{ dimension }}d/debug-render", "dep:palette"]
 serde-serialize = ["rapier{{ dimension }}d/serde-serialize", "dep:serde", "dep:bincode"]
+enhanced-determinism = ["rapier{{ dimension }}d/enhanced-determinism"]
+simd-stable = ["rapier{{ dimension }}d/simd-stable"]
 
 [lib]
 name = "rapier_wasm{{ dimension }}d"
 path = "../../src/lib.rs"
 crate-type = ["cdylib", "rlib"]
-required-features = ["dim{{ dimension }}"]
+required-features = ["dim{{ dimension }}",
+    {%- for feature in additional_features %}
+    "{{ feature }}",
+    {%- endfor %}
+]
 
 [lints]
 rust.unexpected_cfgs = { level = "warn", check-cfg = [
     'cfg(feature, values("dim{% if dimension == "2" %}3{% else %}2{% endif %}"))',
 ] }
 
 [dependencies]
-rapier{{ dimension }}d = { version = "0.26.1", features = [
-    {%- for feature in additional_features %}
-    "{{ feature }}",
-    {%- endfor %}
-] }
+rapier{{ dimension }}d = { version = "0.26.1" }
 ref-cast = "1"
 wasm-bindgen = "0.2.100"
 js-sys = "0.3"
diff --git a/builds/prepare_builds/templates/build_rust.sh.tera b/builds/prepare_builds/templates/build_rust.sh.tera
@@ -6,12 +6,11 @@ cargo clean
 RUSTFLAGS='{{ additional_rust_flags }}' {% else -%}
 {%- endif -%} npx wasm-pack build
 
-sed -i.bak 's#dimforge_rapier#@dimforge/rapier#g' pkg/package.json
-sed -i.bak 's/"rapier_wasm{{ dimension }}d_bg.wasm"/"*"/g' pkg/package.json
+sed -i 's#dimforge_rapier#@dimforge/rapier#g' pkg/package.json
+sed -i 's/"rapier_wasm{{ dimension }}d_bg.wasm"/"*"/g' pkg/package.json
 (
     cd pkg
     npm pkg delete sideEffects
     npm pkg set 'sideEffects[0]'="./*.js"
 )
-rm pkg/*.bak
 rm pkg/.gitignore
diff --git a/builds/prepare_builds/templates/build_typescript.sh.tera b/builds/prepare_builds/templates/build_typescript.sh.tera
@@ -5,15 +5,10 @@ cp -r ../../src.ts/* pkg/src/.
 rm -f ./pkg/raw.ts
 echo 'export * from "./rapier_wasm{{ dimension }}d"' > pkg/src/raw.ts
 # See https://serverfault.com/a/137848
-find pkg/ -type f -print0 | LC_ALL=C xargs -0 sed -i.bak '\:#if DIM{% if dimension == "2" %}3{% else %}2{% endif %}:,\:#endif:d'
-{% if "serde-serialize" not in additional_features -%}
-find pkg/ -type f -print0 | LC_ALL=C xargs -0 sed -i.bak '\:#if SERDE_SERIALIZE:,\:#endif:d'
-{% endif -%}
-{% if "debug-render" not in additional_features -%}
-find pkg/ -type f -print0 | LC_ALL=C xargs -0 sed -i.bak '\:#if DEBUG_RENDER:,\:#endif:d'
-{% endif -%}
+{% for condition_to_remove in conditions_to_remove %}
+find pkg/ -type f -print0 | LC_ALL=C xargs -0 sed -i '\:#if {{condition_to_remove}}:,\:#endif:d'
+{% endfor %}
 npx tsc
 # NOTE: we keep the typescripts files into the NPM package for source mapping: see #3
-sed -i.bak 's/"module": "rapier_wasm{{ dimension }}d.js"/"module": "rapier.js"/g' pkg/package.json
-sed -i.bak 's/"types": "rapier_wasm{{ dimension }}d.d.ts"/"types": "rapier.d.ts"/g' pkg/package.json
-find pkg/ -type f -name '*.bak' | xargs rm
+sed -i 's/"module": "rapier_wasm{{ dimension }}d.js"/"module": "rapier.js"/g' pkg/package.json
+sed -i 's/"types": "rapier_wasm{{ dimension }}d.d.ts"/"types": "rapier.d.ts"/g' pkg/package.json
diff --git a/rapier-compat/build-rust.sh b/rapier-compat/build-rust.sh
@@ -2,18 +2,10 @@
 
 help()
 {
-    printf "Usage: %s: [-c CONFIG_NAME]\n" $0
+    printf "Usage: %s: CONFIG_NAME\n" $0
 }
 
-while getopts :c: conf_name
-do
-    case $conf_name in
-    c)  
-        config_file_name="$OPTARG"
-        ;;
-    ?)  help ; exit 1;;
-    esac
-done
+config_file_name="$1"
 
 if [[ -z "$config_file_name" ]]; then
     help; exit 2;
diff --git a/rapier-compat/build_conf.sh b/rapier-compat/build_conf.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+help()
+{
+    printf "Usage: %s: CONFIG_FILE_NAME ...\n" $0
+}
+
+if [[ -z "$@" ]]; then
+    help; exit 2;
+fi
+
+for config_file_name in "$@"
+do
+
+  ./build-rust.sh $config_file_name
+  ./gen_src.sh $config_file_name
+  npm run my_rollup
+
+done
diff --git a/rapier-compat/fix_raw_file.sh b/rapier-compat/fix_raw_file.sh
diff --git a/rapier-compat/gen_src.sh b/rapier-compat/gen_src.sh
@@ -1,60 +1,58 @@
+#!/bin/sh
+
 # Copy source and remove #if sections - similar to script in ../rapierXd
 set -e
 
-gen_js() {
-  DIM=$1
-  GENOUT="./gen${DIM}"
+help()
+{
+    printf "Usage: %s: CONFIG_FILE_NAME\n" $0
+}
 
-  # Make output directories
-  rm -rf ${GENOUT}
-  mkdir -p ${GENOUT}
+config_file_name=$1
 
-  # Copy common sources
-  cp -r ../src.ts/* $GENOUT
+if [ -z "$config_file_name" ]; then
+    help; exit 2;
+fi
 
-  # Copy compat mode override sources
-  rm -f "${GENOUT}/raw.ts" "${GENOUT}/init.ts"
-  cp -r ./src${DIM}/* $GENOUT
-}
+config_file_path="../builds/prepare_builds/assets/$config_file_name.json"
 
-gen_js "2d"
-gen_js "3d"
+js_package_name=`node -pe 'JSON.parse(process.argv[1]).js_package_name' "$(cat ${config_file_path})"`
+dimension=`node -pe 'JSON.parse(process.argv[1]).dim' "$(cat ${config_file_path})"`
+conditions_to_remove=`node -pe 'JSON.parse(process.argv[1]).conditions_to_remove.join(" ")' "$(cat ${config_file_path})"`
 
-# See https://serverfault.com/a/137848
-find gen2d/ -type f -print0 | LC_ALL=C xargs -0 sed -i.bak '\:#if DIM3:,\:#endif:d'
-find gen3d/ -type f -print0 | LC_ALL=C xargs -0 sed -i.bak '\:#if DIM2:,\:#endif:d'
+DIM="${dimension}d"
+GENOUT="./builds/${js_package_name}/gen${DIM}"
 
-# Clean up backup files.
-find gen2d/ -type f -name '*.bak' | xargs rm
-find gen3d/ -type f -name '*.bak' | xargs rm
+# Make output directories
+rm -rf ${GENOUT}
+mkdir -p ${GENOUT}
 
-for features_set in \
-"2" "2 deterministic" "2 simd" \
-"3" "3 deterministic" "3 simd" "3"
-do
+# Copy common sources
+cp -r ../src.ts/* $GENOUT
 
-  set -- $features_set # Convert the "tuple" into the param args $1 $2...
-  dimension=$1
-  if [ -z "$2" ]; then
-    feature="${1}d";
-  else
-    feature="${1}d-${2}";
-  fi
-  
-  rm -rf ./builds/${feature}/pkg/
-  mkdir -p ./builds/${feature}/pkg/
+# Copy compat mode override sources
+rm -f "${GENOUT}/raw.ts" "${GENOUT}/init.ts"
+cp -r ./src${DIM}/* $GENOUT
 
-  cp ./builds/${feature}/wasm-build/rapier_wasm* ./builds/${feature}/pkg/
-  cp -r ./gen${dimension}d ./builds/${feature}/
+echo ${conditions_to_remove}
 
-  # copy tsconfig, as they contain paths
-  cp ./tsconfig.common.json ./tsconfig.json ./builds/${feature}/
-  cp ./tsconfig.pkg${dimension}d.json ./builds/${feature}/tsconfig.pkg.json
+for condition_to_remove in "${conditions_to_remove}" ; do
+  # See https://serverfault.com/a/137848
+  echo "find ${GENOUT} -type f -print0 | LC_ALL=C xargs -0 sed -i \"\\:#if ${condition_to_remove}:,\\:#endif:d\""
+  find ${GENOUT} -type f -print0 | LC_ALL=C xargs -0 sed -i "\\:#if ${condition_to_remove}:,\\:#endif:d"
+done
 
-  # "import.meta" causes Babel to choke, but the code path is never taken so just remove it.
-  sed -i.bak 's/import.meta.url/"<deleted>"/g' ./builds/${feature}/pkg/rapier_wasm${dimension}d.js
+rm -rf ./builds/${js_package_name}/pkg/
+mkdir -p ./builds/${js_package_name}/pkg/
 
-  # Clean up backup files.
-  find ./builds/${feature}/pkg/ -type f -name '*.bak' | xargs rm
+cp ./builds/${js_package_name}/wasm-build/rapier_wasm* ./builds/${js_package_name}/pkg/
 
-done
+# fix raw file
+echo 'export * from "'"./rapier_wasm$DIM"'"' > builds/${js_package_name}/pkg/raw.d.ts
+
+# copy tsconfig, as they contain paths
+cp ./tsconfig.common.json ./tsconfig.json ./builds/${js_package_name}/
+cp ./tsconfig.pkg${dimension}d.json ./builds/${js_package_name}/tsconfig.pkg.json
+
+# "import.meta" causes Babel to choke, but the code path is never taken so just remove it.
+sed -i 's/import.meta.url/"<deleted>"/g' ./builds/${js_package_name}/pkg/rapier_wasm${dimension}d.js
diff --git a/rapier-compat/package-lock.json b/rapier-compat/package-lock.json
diff --git a/rapier-compat/package.json b/rapier-compat/package.json
diff --git a/rapier-compat/rollup.config.js b/rapier-compat/rollup.config.js
diff --git a/rapier-compat/tsconfig.pkg3d.json b/rapier-compat/tsconfig.pkg3d.json
