@saltcorn/cli 1.6.0-alpha.2 → 1.6.0-alpha.3

package/oclif.manifest.json

@@ -2040,6 +2040,38 @@
         "transform-field.js"
       ]
     },
+    "dev:build": {
+      "aliases": [],
+      "args": {
+        "component": {
+          "description": "Component to rebuild",
+          "name": "component",
+          "options": [
+            "builder",
+            "filemanager",
+            "workflow-editor"
+          ],
+          "required": false
+        }
+      },
+      "description": "Rebuild static assets",
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "dev:build",
+      "pluginAlias": "@saltcorn/cli",
+      "pluginName": "@saltcorn/cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "src",
+        "commands",
+        "dev",
+        "build.js"
+      ]
+    },
     "dev:localize-plugin": {
       "aliases": [],
       "args": {
@@ -2277,6 +2309,46 @@
         "release.js"
       ]
     },
+    "dev:serve": {
+      "aliases": [],
+      "args": {},
+      "description": "Development server. Serve on port 3000, restart when source files change",
+      "flags": {
+        "port": {
+          "char": "p",
+          "description": "port",
+          "name": "port",
+          "default": 3000,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "workers": {
+          "char": "w",
+          "description": "workers",
+          "name": "workers",
+          "default": 1,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "dev:serve",
+      "pluginAlias": "@saltcorn/cli",
+      "pluginName": "@saltcorn/cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "src",
+        "commands",
+        "dev",
+        "serve.js"
+      ]
+    },
     "dev:test-plugin": {
       "aliases": [],
       "args": {
@@ -2341,5 +2413,5 @@
       ]
     }
   },
-  "version": "1.6.0-alpha.2"
+  "version": "1.6.0-alpha.3"
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@saltcorn/cli",
   "description": "Command-line interface for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
-  "version": "1.6.0-alpha.2",
+  "version": "1.6.0-alpha.3",
   "author": "Tom Nielsen @glutamate",
   "bin": {
     "saltcorn": "./bin/saltcorn"
@@ -11,13 +11,13 @@
   "dependencies": {
     "@oclif/core": "4.4.0",
     "@oclif/plugin-plugins": "^5.4.26",
-    "@saltcorn/admin-models": "1.6.0-alpha.2",
-    "@saltcorn/common-code": "1.6.0-alpha.2",
-    "@saltcorn/data": "1.6.0-alpha.2",
-    "@saltcorn/mobile-app": "1.6.0-alpha.2",
-    "@saltcorn/mobile-builder": "1.6.0-alpha.2",
-    "@saltcorn/plugins-loader": "1.6.0-alpha.2",
-    "@saltcorn/server": "1.6.0-alpha.2",
+    "@saltcorn/admin-models": "1.6.0-alpha.3",
+    "@saltcorn/common-code": "1.6.0-alpha.3",
+    "@saltcorn/data": "1.6.0-alpha.3",
+    "@saltcorn/mobile-app": "1.6.0-alpha.3",
+    "@saltcorn/mobile-builder": "1.6.0-alpha.3",
+    "@saltcorn/plugins-loader": "1.6.0-alpha.3",
+    "@saltcorn/server": "1.6.0-alpha.3",
     "contractis": "^0.1.0",
     "dateformat": "^4.6.3",
     "inquirer": "^12.3.3",

package/src/commands/dev/build.js

@@ -0,0 +1,47 @@
+/**
+ * @category saltcorn-cli
+ * @module commands/dev/build
+ */
+const { Command, Flags, Args } = require("@oclif/core");
+const { spawnSync } = require("child_process");
+const { sleep } = require("../../common");
+/**
+ * DevBuildCommand Class
+ * @extends oclif.Command
+ * @category saltcorn-cli
+ */
+class DevBuildCommand extends Command {
+  /**
+   * @returns {Promise<void>}
+   */
+  async run() {
+    const { args } = await this.parse(DevBuildCommand);
+
+    const { reactPackages } = require("@saltcorn/server/restart_watcher");
+
+    for (const { buildDir } of reactPackages) {
+      if (args.component && !buildDir.includes(args.component)) continue;
+
+      const { status, signal } = spawnSync("npm", ["run", "build"], {
+        stdio: "inherit",
+        cwd: buildDir,
+      });
+      if (status) process.exit(status);
+      if (signal) process.exit();
+    }
+  }
+}
+
+/**
+ * @type {string}
+ */
+DevBuildCommand.description = `Rebuild static assets`;
+
+DevBuildCommand.args = {
+  component: Args.string({
+    required: false,
+    description: "Component to rebuild",
+    options: ["builder", "filemanager", "workflow-editor"],
+  }),
+};
+module.exports = DevBuildCommand;

package/src/commands/dev/serve.js

@@ -0,0 +1,75 @@
+/**
+ * @category saltcorn-cli
+ * @module commands/dev/serve
+ */
+const { Command, Flags } = require("@oclif/core");
+const { execSync, spawnSync } = require("child_process");
+const { sleep } = require("../../common");
+/**
+ * DevServeCommand Class
+ * @extends oclif.Command
+ * @category saltcorn-cli
+ */
+class DevServeCommand extends Command {
+  /**
+   * @returns {Promise<void>}
+   */
+  async run() {
+    const { flags } = await this.parse(DevServeCommand);
+
+    await this.tryTsc();
+    for (;;) {
+      const scResult = spawnSync(
+        "saltcorn",
+        [
+          "serve",
+          "--dev",
+          "--addschema",
+          ...(flags.port ? ["-p", flags.port] : []),
+        ],
+        {
+          env: {
+            ...process.env,
+            SALTCORN_NWORKERS:
+              flags.workers || process.env.SALTCORN_NWORKERS || 1,
+          },
+          stdio: "inherit",
+        }
+      );
+      if (scResult.signal) process.exit();
+      switch (scResult.status) {
+        case 3:
+          //root tsc error
+          await this.tryTsc();
+          break;
+
+        // todo builder error
+        default:
+          break;
+      }
+    }
+  }
+
+  async tryTsc() {
+    const tscResult = spawnSync("npm", ["run", "tsc"], {
+      stdio: "inherit",
+    });
+    if (tscResult.status) {
+      //todo watch instead
+      await sleep(3000);
+      await this.tryTsc();
+    }
+  }
+}
+
+/**
+ * @type {string}
+ */
+DevServeCommand.description = `Development server. Serve on port 3000, restart when source files change`;
+
+DevServeCommand.flags = {
+  port: Flags.integer({ char: "p", description: "port", default: 3000 }),
+  workers: Flags.integer({ char: "w", description: "workers", default: 1 }),
+};
+
+module.exports = DevServeCommand;