@rs-x/cli 2.0.0-next.20 → 2.0.0-next.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rs-x/cli",
-  "version": "2.0.0-next.20",
+  "version": "2.0.0-next.22",
   "description": "CLI for installing RS-X compiler tooling and VS Code integration",
   "bin": {
     "rsx": "./bin/rsx.cjs"

package/scripts/verify-rsx-cli-mutations.sh

@@ -165,6 +165,27 @@ main();
 EOF
 }
 
+set_build_config_paths() {
+  local project_dir="$1"
+
+  node -e "
+const fs = require('node:fs');
+const path = require('node:path');
+const configPath = path.join(process.argv[1], 'rsx.config.json');
+const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+config.build = {
+  ...(config.build || {}),
+  preparse: true,
+  preparseFile: 'tmp/generated/custom-preparse.ts',
+  compiled: true,
+  compiledFile: 'tmp/generated/custom-compiled.ts',
+  registrationFile: 'tmp/generated/custom-registration.ts',
+  compiledResolvedEvaluator: false,
+};
+fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n', 'utf8');
+" "$project_dir"
+}
+
 rm -rf "$base_dir"
 mkdir -p "$base_dir"
 
@@ -203,10 +224,10 @@ fi
 printf '\n== init-and-add ==\n'
 create_generic_project "$generic_dir"
 
-if ! run_step_in_dir "init-and-add" "npm install" "$generic_dir" "$base_dir/init-install.log" "$pm" install; then
-  summary_lines+=("init-and-add: npm install failed")
-  overall_status=1
-else
+  if ! run_step_in_dir "init-and-add" "npm install" "$generic_dir" "$base_dir/init-install.log" "$pm" install; then
+    summary_lines+=("init-and-add: npm install failed")
+    overall_status=1
+  else
   if ! run_step_in_dir "init-and-add" "rsx init" "$generic_dir" "$base_dir/init.log" \
     "${rsx_cmd[@]}" init --pm "$pm" "$tag_flag" "$skip_vscode_flag" --entry src/main.ts
   then
@@ -218,6 +239,23 @@ else
   then
     summary_lines+=("init-and-add: add failed")
     overall_status=1
+  elif [[ ! -f "$generic_dir/rsx.config.json" ]]; then
+    printf 'init-and-add: rsx.config.json was not created.\n'
+    summary_lines+=("init-and-add: missing rsx.config.json")
+    overall_status=1
+  elif ! set_build_config_paths "$generic_dir"; then
+    printf 'init-and-add: failed to patch rsx.config.json.\n'
+    summary_lines+=("init-and-add: config patch failed")
+    overall_status=1
+  elif ! run_step_in_dir "init-and-add" "rsx build" "$generic_dir" "$base_dir/build.log" \
+    "${rsx_cmd[@]}" build --project tsconfig.json --no-emit --prod
+  then
+    summary_lines+=("init-and-add: build failed")
+    overall_status=1
+  elif [[ ! -f "$generic_dir/tmp/generated/custom-preparse.ts" || ! -f "$generic_dir/tmp/generated/custom-compiled.ts" ]]; then
+    printf 'init-and-add: custom rsx.config.json build outputs were not generated.\n'
+    summary_lines+=("init-and-add: custom build outputs missing")
+    overall_status=1
   elif ! run_step_in_dir "init-and-add" "rsx typecheck" "$generic_dir" "$base_dir/typecheck.log" \
     "${rsx_cmd[@]}" typecheck --project tsconfig.json
   then

package/scripts/verify-rsx-projects.sh

@@ -94,6 +94,7 @@ for entry in "${frameworks[@]}"; do
   template_name="${entry##*:}"
   project_dir="$work_base_dir/rsx-project-${display_name}-verify"
   scaffold_log="$base_dir/${display_name}-scaffold.log"
+  verify_log="$base_dir/${display_name}-verify.log"
   build_log="$base_dir/${display_name}-build.log"
 
   rm -rf "$project_dir"
@@ -112,6 +113,91 @@ for entry in "${frameworks[@]}"; do
     continue
   fi
 
+  if ! run_in_dir_log "$project_dir" "$verify_log" node -e "
+const fs = require('node:fs');
+const path = require('node:path');
+const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+const scripts = pkg.scripts || {};
+const deps = { ...(pkg.dependencies || {}), ...(pkg.devDependencies || {}) };
+const expectedByFramework = {
+  angular: {
+    scripts: ['build:rsx', 'start'],
+    deps: ['@rs-x/angular', '@rs-x/compiler', '@rs-x/typescript-plugin'],
+    files: ['src/main.ts', 'src/app/app.component.ts'],
+    config: {
+      buildPrefix: 'src/rsx-generated/',
+      defaultDirectory: 'src/expressions'
+    }
+  },
+  react: {
+    scripts: ['build:rsx', 'dev', 'build'],
+    deps: ['@rs-x/react', '@rs-x/compiler', '@rs-x/typescript-plugin'],
+    files: ['src/main.tsx', 'src/rsx-bootstrap.ts', 'src/app/app.tsx'],
+    config: {
+      buildPrefix: 'src/rsx-generated/',
+      defaultDirectory: 'src/expressions'
+    }
+  },
+  vue: {
+    scripts: ['build:rsx', 'dev', 'build'],
+    deps: ['@rs-x/vue', '@rs-x/compiler', '@rs-x/typescript-plugin'],
+    files: ['src/main.ts', 'src/App.vue', 'src/lib/rsx-bootstrap.ts'],
+    config: {
+      buildPrefix: 'src/rsx-generated/',
+      defaultDirectory: 'src/expressions'
+    }
+  },
+  next: {
+    scripts: ['build:rsx', 'dev', 'build'],
+    deps: ['@rs-x/react', '@rs-x/compiler', '@rs-x/typescript-plugin'],
+    files: ['app/layout.tsx', 'app/page.tsx', 'components/demo-app.tsx'],
+    config: {
+      buildPrefix: 'app/rsx-generated/',
+      defaultDirectory: 'app/expressions'
+    }
+  }
+};
+const expected = expectedByFramework['$display_name'];
+for (const key of expected.scripts) {
+  if (typeof scripts[key] !== 'string' || scripts[key].trim() === '') {
+    throw new Error('Missing script: ' + key);
+  }
+}
+for (const key of expected.deps) {
+  if (typeof deps[key] !== 'string') {
+    throw new Error('Missing dependency: ' + key);
+  }
+}
+for (const rel of expected.files) {
+  if (!fs.existsSync(path.join(process.cwd(), rel))) {
+    throw new Error('Missing file: ' + rel);
+  }
+}
+const rsxConfig = JSON.parse(fs.readFileSync('rsx.config.json', 'utf8'));
+if (!rsxConfig.build || typeof rsxConfig.build !== 'object') {
+  throw new Error('Missing rsx.config.json build section');
+}
+if (!rsxConfig.cli || !rsxConfig.cli.add || typeof rsxConfig.cli.add !== 'object') {
+  throw new Error('Missing rsx.config.json cli.add section');
+}
+if (typeof rsxConfig.build.preparseFile !== 'string' || !rsxConfig.build.preparseFile.startsWith(expected.config.buildPrefix)) {
+  throw new Error('Unexpected rsx.config.json build.preparseFile: ' + rsxConfig.build.preparseFile);
+}
+if (typeof rsxConfig.build.compiledFile !== 'string' || !rsxConfig.build.compiledFile.startsWith(expected.config.buildPrefix)) {
+  throw new Error('Unexpected rsx.config.json build.compiledFile: ' + rsxConfig.build.compiledFile);
+}
+if (rsxConfig.cli.add.defaultDirectory !== expected.config.defaultDirectory) {
+  throw new Error('Unexpected rsx.config.json cli.add.defaultDirectory: ' + rsxConfig.cli.add.defaultDirectory);
+}
+" 
+  then
+    printf 'Verification failed.\n'
+    print_log_tail "$verify_log"
+    summary_lines+=("$display_name: verify failed")
+    overall_status=1
+    continue
+  fi
+
   printf 'Building %s...\n' "$project_dir"
   if ! run_in_dir_log "$project_dir" "$build_log" "$pm" run build
   then

package/scripts/verify-rsx-setup.sh

@@ -121,6 +121,7 @@ verify_framework() {
   local scaffold_log="$base_dir/${framework}-scaffold.log"
   local install_log="$base_dir/${framework}-install.log"
   local setup_log="$base_dir/${framework}-setup.log"
+  local setup_repeat_log="$base_dir/${framework}-setup-repeat.log"
   local build_log="$base_dir/${framework}-build.log"
 
   rm -rf "$project_dir"
@@ -165,6 +166,9 @@ verify_framework() {
   run_step_in_dir "$framework" "rsx setup" "$project_dir" "$setup_log" "${rsx_cmd[@]}" setup --pm "$pm" "$tag_flag" "$skip_vscode_flag" \
     || { summary_lines+=("$framework: rsx setup failed"); overall_status=1; return; }
 
+  run_step_in_dir "$framework" "rsx setup (repeat)" "$project_dir" "$setup_repeat_log" "${rsx_cmd[@]}" setup --pm "$pm" "$tag_flag" "$skip_vscode_flag" \
+    || { summary_lines+=("$framework: repeat rsx setup failed"); overall_status=1; return; }
+
   run_step_in_dir "$framework" "build" "$project_dir" "$build_log" "$pm" run build \
     || { summary_lines+=("$framework: build failed"); overall_status=1; return; }