codify-plugin-lib 1.0.5 → 1.0.7

package/dist/messages/handlers.js

@@ -20,7 +20,7 @@ const SupportedRequests = {
     },
     'apply': {
         requestValidator: codify_schemas_1.ApplyRequestDataSchema,
-        responseValidator: codify_schemas_1.ApplyRequestDataSchema,
+        responseValidator: codify_schemas_1.ApplyResponseDataSchema,
         handler: async (plugin, data) => plugin.apply(data)
     }
 };

package/dist/utils/utils.d.ts

@@ -1,11 +1,12 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { SpawnOptions } from 'child_process';
+export declare enum SpawnStatus {
+    SUCCESS = 0,
+    ERROR = 1
+}
 export interface SpawnResult {
-    code: number;
-    signal: NodeJS.Signals | null;
-    stdout: string;
-    stderr: string;
+    status: SpawnStatus;
+    data: string;
 }
 type CodifySpawnOptions = {
     cwd?: string;

package/dist/utils/utils.js

@@ -3,15 +3,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDebug = exports.codifySpawn = void 0;
+exports.isDebug = exports.codifySpawn = exports.SpawnStatus = void 0;
 const promise_spawn_1 = __importDefault(require("@npmcli/promise-spawn"));
+var SpawnStatus;
+(function (SpawnStatus) {
+    SpawnStatus[SpawnStatus["SUCCESS"] = 0] = "SUCCESS";
+    SpawnStatus[SpawnStatus["ERROR"] = 1] = "ERROR";
+})(SpawnStatus || (exports.SpawnStatus = SpawnStatus = {}));
 async function codifySpawn(cmd, args, opts, extras) {
     try {
         const stdio = isDebug() ? 'inherit' : 'pipe';
-        return await (0, promise_spawn_1.default)(cmd, args, { ...opts, stdio, stdioString: true }, extras);
+        const result = await (0, promise_spawn_1.default)(cmd, args, { ...opts, stdio, stdioString: true, shell: true }, extras);
+        const status = (result.code === 0 && !result.stderr)
+            ? SpawnStatus.SUCCESS
+            : SpawnStatus.ERROR;
+        return {
+            status,
+            data: status === SpawnStatus.SUCCESS ? result.stdout : result.stderr
+        };
     }
     catch (e) {
-        return e;
+        return {
+            status: SpawnStatus.ERROR,
+            data: e,
+        };
     }
 }
 exports.codifySpawn = codifySpawn;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-plugin-lib",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -13,7 +13,7 @@
   "dependencies": {
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
-    "codify-schemas": "1.0.3",
+    "codify-schemas": "1.0.5",
     "@npmcli/promise-spawn": "^7.0.1"
   },
   "devDependencies": {

package/src/messages/handlers.ts

@@ -10,7 +10,7 @@ import {
   MessageStatus,
   PlanRequestDataSchema,
   PlanResponseDataSchema,
-  ApplyRequestDataSchema
+  ApplyRequestDataSchema, ApplyResponseDataSchema
 } from 'codify-schemas';
 
 const SupportedRequests: Record<string, { requestValidator: SchemaObject; responseValidator: SchemaObject; handler: (plugin: Plugin, data: any) => Promise<unknown> }> = {
@@ -26,7 +26,7 @@ const SupportedRequests: Record<string, { requestValidator: SchemaObject; respon
   },
   'apply': {
     requestValidator: ApplyRequestDataSchema,
-    responseValidator: ApplyRequestDataSchema, // Replace with response validator
+    responseValidator: ApplyResponseDataSchema, // Replace with response validator
     handler: async (plugin: Plugin, data: any) => plugin.apply(data)
   }
 }

package/src/utils/utils.ts

@@ -1,11 +1,14 @@
 import promiseSpawn from '@npmcli/promise-spawn';
 import { SpawnOptions } from 'child_process';
 
+export enum SpawnStatus {
+  SUCCESS,
+  ERROR,
+}
+
 export interface SpawnResult {
-  code: number;
-  signal: NodeJS.Signals | null;
-  stdout: string;
-  stderr: string;
+  status: SpawnStatus,
+  data: string;
 }
 
 type CodifySpawnOptions = {
@@ -21,14 +24,26 @@ export async function codifySpawn(
 ): Promise<SpawnResult> {
   try {
     const stdio = isDebug() ? 'inherit' : 'pipe';
-    return await promiseSpawn(
+    const result = await promiseSpawn(
       cmd,
       args,
-      { ...opts, stdio, stdioString: true },
+      { ...opts, stdio, stdioString: true, shell: true },
       extras
     );
+
+    const status = (result.code === 0 && !result.stderr)
+      ? SpawnStatus.SUCCESS
+      : SpawnStatus.ERROR;
+
+    return {
+      status,
+      data: status === SpawnStatus.SUCCESS ? result.stdout : result.stderr
+    }
   } catch (e) {
-    return e as any;
+    return {
+      status: SpawnStatus.ERROR,
+      data: e as string,
+    }
   }
 }