@onivoro/onix 20.5.74 → 20.5.76

package/executors.json

@@ -74,6 +74,11 @@
       "implementation": "./src/executors/terraform/executor",
       "schema": "./src/executors/terraform/schema.json",
       "description": "terraform"
+    },
+    "deploy-fullstack": {
+      "implementation": "./src/executors/deploy-fullstack/executor",
+      "schema": "./src/executors/deploy-fullstack/schema.json",
+      "description": "Builds a server project with embedded UI assets and publishes to npm"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onivoro/onix",
-  "version": "20.5.74",
+  "version": "20.5.76",
   "type": "commonjs",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",

package/src/executors/deploy-fullstack/executor.d.ts

@@ -0,0 +1,4 @@
+import { PromiseExecutor } from '@nx/devkit';
+import { ExecutorSchema } from './schema';
+declare const executor: PromiseExecutor<ExecutorSchema>;
+export default executor;

package/src/executors/deploy-fullstack/executor.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const extract_project_build_outputs_function_1 = require("../../functions/extract-project-build-outputs.function");
+const extract_project_build_assets_function_1 = require("../../functions/extract-project-build-assets.function");
+const extract_project_configuration_function_1 = require("../../functions/extract-project-configuration.function");
+const pmx_function_1 = require("../../functions/pmx.function");
+const uiAssetFolderName = 'ui';
+const executor = (options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const { ui, dryRun, tag = 'latest', access = 'public' } = options;
+    const serverProject = context.projectName;
+    try {
+        // Step 1: Build the server project (browser build runs first via dependsOn)
+        devkit_1.logger.info(`Building ${serverProject}...`);
+        (0, pmx_function_1.pmxSpawn)(context, `nx build ${serverProject}`, { NODE_ENV: 'production' });
+        // Step 2: Extract paths from project configurations
+        const [serverAssetPath] = (0, extract_project_build_assets_function_1.extractProjectBuildAssets)(context, serverProject);
+        const [serverOutput] = (0, extract_project_build_outputs_function_1.extractProjectBuildOutputs)(context, serverProject);
+        if (!serverOutput) {
+            throw new Error(`Could not determine build output path for "${serverProject}". Ensure targets.build.options.outputPath is configured.`);
+        }
+        // Step 3: Build UI and copy into server assets
+        if (!serverAssetPath) {
+            throw new Error(`Could not determine asset path for "${serverProject}". Ensure targets.build.options.assets is configured (e.g. ["./src/assets"]).`);
+        }
+        const [uiOutput] = (0, extract_project_build_outputs_function_1.extractProjectBuildOutputs)(context, ui);
+        if (!uiOutput) {
+            throw new Error(`Could not determine build output path for UI project "${ui}". Ensure it has a build target with outputPath configured.`);
+        }
+        // Build the UI project explicitly (may already be built via dependsOn, but ensure it)
+        devkit_1.logger.info(`Building UI project ${ui}...`);
+        (0, pmx_function_1.pmxSpawn)(context, `nx build ${ui}`, { NODE_ENV: 'production' });
+        if (!(0, fs_1.existsSync)(uiOutput)) {
+            throw new Error(`UI build output directory does not exist: ${uiOutput}. The UI build may have failed.`);
+        }
+        // Compute destination path: {serverDist}/assets/ui/
+        const serverConfig = (0, extract_project_configuration_function_1.extractProjectConfiguration)(context, serverProject);
+        const [distPrefix] = serverOutput.split(serverConfig.root);
+        const [, assetsRelativePath] = serverAssetPath.split(serverConfig.sourceRoot);
+        const uiDestination = (0, path_1.join)(distPrefix, serverConfig.root, assetsRelativePath, uiAssetFolderName);
+        devkit_1.logger.info(`Copying UI build from ${uiOutput} to ${uiDestination}`);
+        (0, child_process_1.execSync)(`cp -R ${uiOutput} ${uiDestination}`, { stdio: 'inherit' });
+        // Verify the copy succeeded
+        const indexHtml = (0, path_1.join)(uiDestination, 'index.html');
+        if (!(0, fs_1.existsSync)(indexHtml)) {
+            throw new Error(`UI asset copy verification failed: ${indexHtml} not found.`);
+        }
+        devkit_1.logger.info(`UI assets embedded successfully.`);
+        // Step 4: Publish to npm
+        if (dryRun) {
+            devkit_1.logger.info(`Dry run mode — skipping npm publish. Package is ready at: ${serverOutput}`);
+        }
+        else {
+            const publishCmd = `npm publish ${serverOutput} --access ${access} --tag ${tag}`;
+            devkit_1.logger.info(`Publishing: ${publishCmd}`);
+            (0, child_process_1.execSync)(publishCmd, { stdio: 'inherit' });
+            devkit_1.logger.info(`Published successfully.`);
+        }
+        return { success: true };
+    }
+    catch (error) {
+        devkit_1.logger.error((error === null || error === void 0 ? void 0 : error.message) || error);
+        return { success: false };
+    }
+});
+exports.default = executor;
+//# sourceMappingURL=executor.js.map

package/src/executors/deploy-fullstack/executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/deploy-fullstack/executor.ts"],"names":[],"mappings":"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"}

package/src/executors/deploy-fullstack/schema.d.ts

@@ -0,0 +1,6 @@
+export interface ExecutorSchema {
+    ui: string;
+    dryRun?: boolean;
+    tag?: string;
+    access?: 'public' | 'restricted';
+}

package/src/executors/deploy-fullstack/schema.json

@@ -0,0 +1,30 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "version": 2,
+  "title": "Release Fullstack executor",
+  "description": "Builds a server project with embedded UI assets and publishes to npm",
+  "type": "object",
+  "properties": {
+    "ui": {
+      "type": "string",
+      "description": "Name of the browser/UI project whose build output should be embedded in the server assets"
+    },
+    "dryRun": {
+      "type": "boolean",
+      "description": "If true, performs the build and asset copy but skips npm publish",
+      "default": false
+    },
+    "tag": {
+      "type": "string",
+      "description": "npm dist-tag to publish under (e.g. 'latest', 'next', 'beta')",
+      "default": "latest"
+    },
+    "access": {
+      "type": "string",
+      "enum": ["public", "restricted"],
+      "description": "npm publish access level",
+      "default": "public"
+    }
+  },
+  "required": ["ui"]
+}

package/src/executors/openapi-gen/executor.js

@@ -4,9 +4,12 @@ const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
 const executor_factory_function_1 = require("../../functions/executor-factory.function");
 const DEFAULT_OPENAPI_GENERATOR_VERSION = 'v6.3.0';
-exports.default = (0, executor_factory_function_1.executorFactory)((_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ flavor = 'typescript-axios', version = DEFAULT_OPENAPI_GENERATOR_VERSION, openapiJsonPath, outputPath }) {
+exports.default = (0, executor_factory_function_1.executorFactory)((_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ flavor = 'typescript-axios', version = DEFAULT_OPENAPI_GENERATOR_VERSION, additionalProperties, openapiJsonPath, outputPath }) {
     (0, child_process_1.execSync)(`rm -rf ${outputPath}`, { stdio: 'inherit' });
     (0, child_process_1.execSync)(`mkdir -p ${outputPath}`, { stdio: 'inherit' });
-    (0, child_process_1.execSync)(`docker run --rm -v .:/local openapitools/openapi-generator-cli:${version} generate -i local/${openapiJsonPath} -g ${flavor} -o local/${outputPath}`, { stdio: 'inherit' });
+    const additionalPropertiesArg = additionalProperties
+        ? ` --additional-properties ${additionalProperties}`
+        : '';
+    (0, child_process_1.execSync)(`docker run --rm -v .:/local openapitools/openapi-generator-cli:${version} generate -i local/${openapiJsonPath} -g ${flavor} -o local/${outputPath}${additionalPropertiesArg}`, { stdio: 'inherit' });
 }));
 //# sourceMappingURL=executor.js.map

package/src/executors/openapi-gen/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/openapi-gen/executor.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,yFAA4E;AAG5E,MAAM,iCAAiC,GAAG,QAAQ,CAAC;AAEnD,kBAAe,IAAA,2CAAe,EAAC,KAAkI,EAAE,oDAA7H,EAAE,MAAM,GAAG,kBAAkB,EAAE,OAAO,GAAG,iCAAiC,EAAE,eAAe,EAAE,UAAU,EAAkB;IAC7J,IAAA,wBAAQ,EAAC,UAAU,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACvD,IAAA,wBAAQ,EAAC,YAAY,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACzD,IAAA,wBAAQ,EAAC,kEAAkE,OAAO,sBAAsB,eAAe,OAAO,MAAM,aAAa,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;AACvL,CAAC,CAAA,CAAC,CAAC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/openapi-gen/executor.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,yFAA4E;AAG5E,MAAM,iCAAiC,GAAG,QAAQ,CAAC;AAEnD,kBAAe,IAAA,2CAAe,EAAC,KAAwJ,EAAE,oDAAnJ,EAAE,MAAM,GAAG,kBAAkB,EAAE,OAAO,GAAG,iCAAiC,EAAE,oBAAoB,EAAE,eAAe,EAAE,UAAU,EAAkB;IACnL,IAAA,wBAAQ,EAAC,UAAU,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACvD,IAAA,wBAAQ,EAAC,YAAY,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACzD,MAAM,uBAAuB,GAAG,oBAAoB;QAClD,CAAC,CAAC,4BAA4B,oBAAoB,EAAE;QACpD,CAAC,CAAC,EAAE,CAAC;IAEP,IAAA,wBAAQ,EAAC,kEAAkE,OAAO,sBAAsB,eAAe,OAAO,MAAM,aAAa,UAAU,GAAG,uBAAuB,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;AACjN,CAAC,CAAA,CAAC,CAAC"}

package/src/executors/openapi-gen/schema.d.ts

@@ -1,6 +1,7 @@
 export interface ExecutorSchema {
     flavor?: string;
     version?: string;
+    additionalProperties?: string;
     openapiJsonPath: string;
     outputPath: string;
 }

package/src/executors/openapi-gen/schema.json

@@ -13,6 +13,10 @@
       "type": "string",
       "description": "Container version tag for openapitools/openapi-generator-cli. Defaults to 'v6.3.0'."
     },
+    "additionalProperties": {
+      "type": "string",
+      "description": "Comma-separated key=value pairs passed to OpenAPI Generator CLI --additional-properties."
+    },
     "openapiJsonPath": {
       "type": "string",
       "description": "Path to the openapi definition JSON file (or yml file)."