@adminide-stack/form-builder-core 5.1.4-alpha.81 → 6.0.1-alpha.0

package/LICENSE

@@ -1,21 +1,30 @@
-The MIT License
-
-Copyright (c) 2017 CDMBase LLC.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+PROPRIETARY SOFTWARE LICENSE
+
+Copyright (c) 2025 CDMBase. All Rights Reserved.
+
+This software and associated documentation files (the "Software") are the 
+proprietary and confidential property of CDMBase.
+
+ALL RIGHTS RESERVED.
+
+No part of this Software may be reproduced, distributed, transmitted, 
+displayed, published, or broadcast in any form or by any means, electronic, 
+mechanical, photocopying, recording, or otherwise, without the prior written 
+permission of CDMBase.
+
+The Software is provided to authorized users only under separate written 
+agreement and may not be used, copied, modified, merged, published, distributed, 
+sublicensed, and/or sold without express written permission from CDMBase.
+
+UNAUTHORIZED USE, REPRODUCTION, OR DISTRIBUTION OF THIS SOFTWARE, OR ANY 
+PORTION OF IT, MAY RESULT IN SEVERE CIVIL AND CRIMINAL PENALTIES, AND WILL 
+BE PROSECUTED TO THE MAXIMUM EXTENT POSSIBLE UNDER LAW.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+CDMBase BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For licensing inquiries, please contact: legal@cdmbase.com

package/lib/index.js

@@ -1 +1 @@
-export{generateFunctionCode,generateHandlerBody,generateStepFromFunction,generateStepFunctionsFromDB,wrapStepsInInngestFunction}from'./inngest/generateFunctionCode.js';export{cleanStepCode,extractFunctionBody,extractStepVarName,generateFromExtractedFunctions}from'./inngest/stepGenerator.js';export{getAvailableDefinitions,installLibraryForAutocomplete,setupMonacoAutocomplete,setupStepAutocomplete,updateAutocompleteConfig}from'./inngest/monacoAutocompleteIntegration.js';export{flatten,unflatten}from'./utils/json.js';//# sourceMappingURL=index.js.map
+export{generateFunctionCode,generateHandlerBody,generateHandlerBodyWithReturn,generateStepFromFunction,generateStepFunctionsFromDB,wrapStepsInInngestFunction}from'./inngest/generateFunctionCode.js';export{cleanStepCode,extractFunctionBody,extractStepVarName,generateFromExtractedFunctions}from'./inngest/stepGenerator.js';export{getAvailableDefinitions,installLibraryForAutocomplete,setupMonacoAutocomplete,setupStepAutocomplete,updateAutocompleteConfig}from'./inngest/monacoAutocompleteIntegration.js';export{flatten,unflatten}from'./utils/json.js';//# sourceMappingURL=index.js.map

package/lib/inngest/generateFunctionCode.d.ts

@@ -2,6 +2,7 @@ import type { InngestFunctionDef, ExtractedFunction, StepFunction, GeneratedFunc
 export { cleanStepCode, extractStepVarName } from './stepGenerator';
 export declare function generateFunctionCode(def: InngestFunctionDef): string;
 export declare function generateHandlerBody(def: InngestFunctionDef): string;
+export declare function generateHandlerBodyWithReturn(def: InngestFunctionDef): string;
 export declare function generateStepFunctionsFromDB(functionId: string, events: string[], extractedFunctions: ExtractedFunction[]): GeneratedFunctionResult;
 export declare function wrapStepsInInngestFunction(functionDef: InngestFunctionDef, stepFunctions: StepFunction[]): string;
 export declare function generateStepFromFunction(stepFunction: StepFunction, index: number): string;

package/lib/inngest/generateFunctionCode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateFunctionCode.d.ts","sourceRoot":"","sources":["../../src/inngest/generateFunctionCode.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,kBAAkB,EAElB,iBAAiB,EACjB,YAAY,EACZ,uBAAuB,EAC1B,MAAM,oBAAoB,CAAC;AAS5B,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AA2DpE,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM,CAWpE;AAGD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM,CAInE;AAGD,wBAAgB,2BAA2B,CACvC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EAAE,EAChB,kBAAkB,EAAE,iBAAiB,EAAE,GACxC,uBAAuB,CAazB;AAGD,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,kBAAkB,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,MAAM,CAWjH;AAGD,wBAAgB,wBAAwB,CAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAoB1F"}
+{"version":3,"file":"generateFunctionCode.d.ts","sourceRoot":"","sources":["../../src/inngest/generateFunctionCode.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,kBAAkB,EAElB,iBAAiB,EACjB,YAAY,EACZ,uBAAuB,EAC1B,MAAM,oBAAoB,CAAC;AAS5B,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAyEpE,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM,CAWpE;AAGD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM,CAInE;AAiDD,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM,CAkC7E;AAGD,wBAAgB,2BAA2B,CACvC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EAAE,EAChB,kBAAkB,EAAE,iBAAiB,EAAE,GACxC,uBAAuB,CAazB;AAGD,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,kBAAkB,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,MAAM,CAWjH;AAGD,wBAAgB,wBAAwB,CAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAoB1F"}

package/lib/inngest/generateFunctionCode.js

@@ -23,6 +23,16 @@ function formatCode(code) {
   // Basic formatting - in production, you'd use a proper formatter
   return code.split('\n').map(line => line.trimEnd()).join('\n').replace(/\n{3,}/g, '\n\n'); // Remove excessive blank lines
 }
+function sanitizeDirectStepCode(code) {
+  if (!code) {
+    return code;
+  }
+  return code
+  // Remove inline object returns (e.g. return { success: true };)
+  .replace(/\n\s*return\s*\{[\s\S]*?\};?/g, '')
+  // Remove simple expression returns (e.g. return result;)
+  .replace(/\n\s*return\s+[^\n;]+;?/g, '');
+}
 function generateStepBlock(step, position) {
   const stepVar = (step.code || '').match(/const\s+(\w+)\s*=/)?.[1] || `step_${position}`;
   // If caller supplied code, embed it inside step.run wrapper by default for consistency
@@ -34,7 +44,7 @@ ${body}`;
   }
   const inner = extractFunctionBody(step.code || '') || 'return { success: true };';
   return `// ${step.description || step.name || `Step ${position}`}
-const ${stepVar}_result = await step.run('${stepVar}', async (event, step) => {
+const ${stepVar}_result = await step.run('${stepVar}', async () => {
 ${indent(inner, 2)}
 });`;
 }
@@ -57,6 +67,65 @@ function generateHandlerBody(def) {
   // Footer removed: callers should append their own consolidated return as needed
   return `${stepBlocks}`;
 }
+function escapeSingleQuotes(value) {
+  return value.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
+}
+function resolveStepVarName(step, index) {
+  const directMatch = (step.code || '').match(/const\s+(\w+)\s*=/);
+  if (directMatch) {
+    return directMatch[1];
+  }
+  if (typeof step.id === 'string' && step.id.trim()) {
+    return step.id;
+  }
+  return `step_${index + 1}`;
+}
+function resolveResultExpression(step, varName) {
+  switch (step.type) {
+    case 'sleep':
+      return 'sleepResult';
+    case 'sendEvent':
+      return 'eventResult';
+    case 'waitForEvent':
+      return 'waitResult';
+    default:
+      return `${varName}_result`;
+  }
+}
+function sanitizeSteps(def) {
+  const sanitizedSteps = def.steps.map(step => {
+    if (step.type === 'sleep' || step.type === 'sendEvent' || step.type === 'waitForEvent') {
+      return {
+        ...step,
+        code: sanitizeDirectStepCode(step.code || '')
+      };
+    }
+    return step;
+  });
+  return {
+    ...def,
+    steps: sanitizedSteps
+  };
+}
+function generateHandlerBodyWithReturn(def) {
+  const sanitizedDef = sanitizeSteps(def);
+  const body = generateHandlerBody(sanitizedDef).trimEnd();
+  const resultLines = sanitizedDef.steps.map((step, index) => {
+    const varName = resolveStepVarName(step, index);
+    const resultExpr = resolveResultExpression(step, varName);
+    if (!resultExpr) {
+      return null;
+    }
+    return `  ${varName}: ${resultExpr},`;
+  }).filter(line => Boolean(line));
+  const escapedId = escapeSingleQuotes(def.id || 'new-function');
+  const returnLines = ['return {', `  functionId: '${escapedId}',`, ...resultLines, '  timestamp: new Date().toISOString()', '};'];
+  const returnBlock = returnLines.join('\n');
+  if (!body) {
+    return returnBlock;
+  }
+  return `${body}\n\n${returnBlock}`;
+}
 // Generate Inngest function from database-extracted functions
 function generateStepFunctionsFromDB(functionId, events, extractedFunctions) {
   if (!extractedFunctions || extractedFunctions.length === 0) {
@@ -93,5 +162,5 @@ function generateStepFromFunction(stepFunction, index) {
   if (hasDirectOps) {
     return `// ${stepFunction.name || `Step ${index}`}\n${cleanedBody}`;
   }
-  return `// ${stepFunction.name || `Step ${index}`}\nconst ${stepVar}_result = await step.run('${stepVar}', async (event, step) => {\n${indent(cleanedBody, 2)}\n});`;
-}export{cleanStepCode,extractStepVarName,generateFunctionCode,generateHandlerBody,generateStepFromFunction,generateStepFunctionsFromDB,wrapStepsInInngestFunction};//# sourceMappingURL=generateFunctionCode.js.map
+  return `// ${stepFunction.name || `Step ${index}`}\nconst ${stepVar}_result = await step.run('${stepVar}', async () => {\n${indent(cleanedBody, 2)}\n});`;
+}export{cleanStepCode,extractStepVarName,generateFunctionCode,generateHandlerBody,generateHandlerBodyWithReturn,generateStepFromFunction,generateStepFunctionsFromDB,wrapStepsInInngestFunction};//# sourceMappingURL=generateFunctionCode.js.map

package/lib/inngest/generateFunctionCode.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateFunctionCode.js","sources":["../../src/inngest/generateFunctionCode.ts"],"sourcesContent":[null],"names":[],"mappings":"qHAyFA;AAOA,SAAA;AAoBA,EAAA,OAAA,+CAA2C,CAAA,IAAA,CAAW,IAAE,CAAA;AAcxD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"generateFunctionCode.js","sources":["../../src/inngest/generateFunctionCode.ts"],"sourcesContent":[null],"names":[],"mappings":"qHAuGA;AAqDA,SAAA;AAqCA,EAAA,OAAA,+CACI,CAAA,IAAA,CAAU,IAAE,CAAA;AAmBhB;AAcA,SAAA,oBAAgB,CAAA,IAAA,EAAA,EAAA,EAAA,KAAA,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@adminide-stack/form-builder-core",
-    "version": "5.1.4-alpha.81",
+    "version": "6.0.1-alpha.0",
     "sideEffects": false,
     "type": "module",
     "main": "lib/index.js",
@@ -24,5 +24,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "883372f3751305aa9c87265af7b7b75ac9eee30e"
+    "gitHead": "3b03b6491950e7c03b51a00014c3ff879a21fcdf"
 }

package/CHANGELOG.md

@@ -1,56 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [5.1.4-alpha.81](https://github.com/CDEBase/forms-stack/compare/v5.1.4-alpha.80...v5.1.4-alpha.81) (2025-10-24)
-
-**Note:** Version bump only for package @adminide-stack/form-builder-core
-
-## [5.1.4-alpha.66](https://github.com/CDEBase/forms-stack/compare/v5.1.4-alpha.65...v5.1.4-alpha.66) (2025-10-16)
-
-**Note:** Version bump only for package @adminide-stack/form-builder-core
-
-## [5.1.4-alpha.62](https://github.com/CDEBase/forms-stack/compare/v5.1.4-alpha.61...v5.1.4-alpha.62) (2025-10-11)
-
-**Note:** Version bump only for package @adminide-stack/form-builder-core
-
-## [5.1.4-alpha.61](https://github.com/CDEBase/forms-stack/compare/v5.1.4-alpha.60...v5.1.4-alpha.61) (2025-10-11)
-
-**Note:** Version bump only for package @adminide-stack/form-builder-core
-
-## [5.1.4-alpha.58](https://github.com/CDEBase/forms-stack/compare/v5.1.4-alpha.57...v5.1.4-alpha.58) (2025-10-06)
-
-**Note:** Version bump only for package @adminide-stack/form-builder-core
-
-## [5.1.4-alpha.57](https://github.com/CDEBase/forms-stack/compare/v5.1.4-alpha.56...v5.1.4-alpha.57) (2025-10-03)
-
-**Note:** Version bump only for package @adminide-stack/form-builder-core
-
-## [5.1.4-alpha.49](https://github.com/CDEBase/forms-stack/compare/v5.1.4-alpha.48...v5.1.4-alpha.49) (2025-09-24)
-
-**Note:** Version bump only for package @adminide-stack/form-builder-core
-
-## [5.1.4-alpha.48](https://github.com/CDEBase/forms-stack/compare/v5.1.4-alpha.47...v5.1.4-alpha.48) (2025-09-23)
-
-**Note:** Version bump only for package @adminide-stack/form-builder-core
-
-## [5.1.4-alpha.47](https://github.com/CDEBase/forms-stack/compare/v5.1.4-alpha.46...v5.1.4-alpha.47) (2025-09-23)
-
-**Note:** Version bump only for package @adminide-stack/form-builder-core
-
-## [5.1.4-alpha.46](https://github.com/CDEBase/forms-stack/compare/v5.1.4-alpha.45...v5.1.4-alpha.46) (2025-09-23)
-
-**Note:** Version bump only for package @adminide-stack/form-builder-core
-
-## [5.1.4-alpha.45](https://github.com/CDEBase/forms-stack/compare/v5.1.4-alpha.44...v5.1.4-alpha.45) (2025-09-23)
-
-**Note:** Version bump only for package @adminide-stack/form-builder-core
-
-## [5.1.4-alpha.44](https://github.com/CDEBase/forms-stack/compare/v5.1.4-alpha.43...v5.1.4-alpha.44) (2025-09-23)
-
-**Note:** Version bump only for package @adminide-stack/form-builder-core
-
-## [5.1.4-alpha.43](https://github.com/CDEBase/forms-stack/compare/v5.1.4-alpha.42...v5.1.4-alpha.43) (2025-09-23)
-
-**Note:** Version bump only for package @adminide-stack/form-builder-core

package/rollup.config.mjs

@@ -1,33 +0,0 @@
-import { createRollupConfig } from '../../../rollup.config.base.mjs';
-
-// Define any additional plugins specific to this bundle
-const additionalPlugins = [];
-
-// Use the createRollupConfig function to merge the base and specific configurations
-export default (commandLineArgs) => {
-    const isWatchMode = commandLineArgs.watch;
-    return [
-        createRollupConfig(
-            {
-                input: ['src/index.ts'],
-                plugins: [
-                    // Spread in additional plugins specific to this config
-                    ...additionalPlugins,
-                ],
-                output: [
-                    {
-                        dir: 'lib',
-                        format: 'es',
-                        name: 'form-stack-server',
-                        compact: true,
-                        exports: 'named',
-                        sourcemap: true,
-                        preserveModules: true,
-                        chunkFileNames: '[name]-[hash].[format].js',
-                    },
-                ],
-            },
-            isWatchMode,
-        ),
-    ];
-};

package/src/index.ts

@@ -1,5 +0,0 @@
-export * from './inngest/interfaces/types';
-export * from './inngest/generateFunctionCode';
-export { generateFromExtractedFunctions, extractFunctionBody } from './inngest/stepGenerator';
-export * from './inngest/monacoAutocompleteIntegration';
-export * from './utils/json';