@promptbook/markdown-utils 0.85.0-3 → 0.85.0-5

package/esm/typings/src/execution/ExecutionTask.d.ts

@@ -1,7 +1,7 @@
 import type { Observable } from 'rxjs';
 import { PartialDeep } from 'type-fest';
-import type { string_SCREAMING_CASE } from '../utils/normalization/normalizeTo_SCREAMING_CASE';
 import type { task_id } from '../types/typeAliases';
+import type { string_SCREAMING_CASE } from '../utils/normalization/normalizeTo_SCREAMING_CASE';
 import type { AbstractTaskResult } from './AbstractTaskResult';
 import type { PipelineExecutorResult } from './PipelineExecutorResult';
 /**
@@ -30,7 +30,7 @@ export declare function createTask<TTaskResult extends AbstractTaskResult>(optio
  */
 export type ExecutionTask = AbstractTask<PipelineExecutorResult> & {
     readonly taskType: 'EXECUTION';
-    readonly taskId: `execution-${task_id}`;
+    readonly taskId: `exec-${task_id}`;
 };
 /**
  * Represents a task that prepares a pipeline
@@ -38,7 +38,7 @@ export type ExecutionTask = AbstractTask<PipelineExecutorResult> & {
  */
 export type PreparationTask = AbstractTask<PipelineExecutorResult> & {
     readonly taskType: 'PREPARATION';
-    readonly taskId: `preparation-${task_id}`;
+    readonly taskId: `prep-${task_id}`;
 };
 /**
  * Base interface for all task types
@@ -62,6 +62,10 @@ export type AbstractTask<TTaskResult extends AbstractTaskResult> = {
      * Gets an observable stream of partial task results
      */
     asObservable(): Observable<PartialDeep<TTaskResult>>;
+    /**
+     * Gets just the current value which is mutated during the task processing
+     */
+    currentValue: PartialDeep<TTaskResult>;
 };
 export type Task = ExecutionTask | PreparationTask;
 export {};

package/esm/typings/src/execution/FilesystemTools.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type fs from 'node:fs/promises';
+import type fs from 'fs/promises';
 /**
  * Container for all the tools needed to manipulate with filesystem
  */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@promptbook/markdown-utils",
-    "version": "0.85.0-3",
+    "version": "0.85.0-5",
     "description": "It's time for a paradigm shift. The future of software in plain English, French or Latin",
     "private": false,
     "sideEffects": false,

package/umd/index.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('spacetrim'), require('prettier'), require('prettier/parser-html'), require('rxjs'), require('crypto'), require('waitasecond'), require('crypto-js/enc-hex'), require('crypto-js/sha256'), require('node:path'), require('crypto-js'), require('mime-types'), require('papaparse')) :
-    typeof define === 'function' && define.amd ? define(['exports', 'spacetrim', 'prettier', 'prettier/parser-html', 'rxjs', 'crypto', 'waitasecond', 'crypto-js/enc-hex', 'crypto-js/sha256', 'node:path', 'crypto-js', 'mime-types', 'papaparse'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["promptbook-markdown-utils"] = {}, global.spaceTrim, global.prettier, global.parserHtml, global.rxjs, global.crypto, global.waitasecond, global.hexEncoder, global.sha256, global.node_path, global.cryptoJs, global.mimeTypes, global.papaparse));
-})(this, (function (exports, spaceTrim, prettier, parserHtml, rxjs, crypto, waitasecond, hexEncoder, sha256, node_path, cryptoJs, mimeTypes, papaparse) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('spacetrim'), require('prettier'), require('prettier/parser-html'), require('rxjs'), require('crypto'), require('waitasecond'), require('crypto-js/enc-hex'), require('crypto-js/sha256'), require('path'), require('crypto-js'), require('mime-types'), require('papaparse')) :
+    typeof define === 'function' && define.amd ? define(['exports', 'spacetrim', 'prettier', 'prettier/parser-html', 'rxjs', 'crypto', 'waitasecond', 'crypto-js/enc-hex', 'crypto-js/sha256', 'path', 'crypto-js', 'mime-types', 'papaparse'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["promptbook-markdown-utils"] = {}, global.spaceTrim, global.prettier, global.parserHtml, global.rxjs, global.crypto, global.waitasecond, global.hexEncoder, global.sha256, global.path, global.cryptoJs, global.mimeTypes, global.papaparse));
+})(this, (function (exports, spaceTrim, prettier, parserHtml, rxjs, crypto, waitasecond, hexEncoder, sha256, path, cryptoJs, mimeTypes, papaparse) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -25,7 +25,7 @@
      * @generated
      * @see https://github.com/webgptorg/promptbook
      */
-    var PROMPTBOOK_ENGINE_VERSION = '0.85.0-2';
+    var PROMPTBOOK_ENGINE_VERSION = '0.85.0-4';
     /**
      * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
      * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -2190,11 +2190,29 @@
      */
     function createTask(options) {
         var taskType = options.taskType, taskProcessCallback = options.taskProcessCallback;
-        var taskId = "".concat(taskType.toLowerCase(), "-").concat($randomToken(256 /* <- TODO: !!! To global config */));
+        var taskId = "".concat(taskType.toLowerCase().substring(0, 4), "-").concat($randomToken(8 /* <- TODO: !!! To global config + Use Base58 to avoid simmilar char conflicts   */));
         var partialResultSubject = new rxjs.BehaviorSubject({});
         var finalResultPromise = /* not await */ taskProcessCallback(function (newOngoingResult) {
             partialResultSubject.next(newOngoingResult);
         });
+        finalResultPromise
+            .catch(function (error) {
+            // console.error('!!!!! Task failed:', error);
+            partialResultSubject.error(error);
+        })
+            .then(function (value) {
+            // console.error('!!!!! Task finished:', value);
+            if (value) {
+                try {
+                    assertsTaskSuccessful(value);
+                    partialResultSubject.next(value);
+                }
+                catch (error) {
+                    partialResultSubject.error(error);
+                }
+            }
+            partialResultSubject.complete();
+        });
         function asPromise(options) {
             return __awaiter(this, void 0, void 0, function () {
                 var _a, isCrashedOnError, finalResult;
@@ -2205,7 +2223,9 @@
                             return [4 /*yield*/, finalResultPromise];
                         case 1:
                             finalResult = _b.sent();
+                            console.error('!!!!! finalResult:', finalResult);
                             if (isCrashedOnError) {
+                                console.error('!!!!! isCrashedOnError:', finalResult);
                                 assertsTaskSuccessful(finalResult);
                             }
                             return [2 /*return*/, finalResult];
@@ -2218,9 +2238,10 @@
             taskId: taskId,
             asPromise: asPromise,
             asObservable: function () {
-                return rxjs.concat(partialResultSubject.asObservable(), rxjs.from(asPromise({
-                    isCrashedOnError: true,
-                })));
+                return partialResultSubject.asObservable();
+            },
+            get currentValue() {
+                return partialResultSubject.value;
             },
         };
     }
@@ -3650,7 +3671,7 @@
             value = value.replace(/\.html$/, '');
         }
         else if (isValidFilePath(value)) {
-            value = node_path.basename(value);
+            value = path.basename(value);
             // Note: Keeping extension in the name
         }
         value = value.split('/').join('-');
@@ -3756,9 +3777,9 @@
                         }
                         basename = url.split('/').pop() || titleToName(url);
                         hash = sha256__default["default"](hexEncoder__default["default"].parse(url)).toString( /* hex */);
-                        rootDirname_1 = node_path.join(process.cwd(), DEFAULT_DOWNLOAD_CACHE_DIRNAME);
-                        filepath = node_path.join.apply(void 0, __spreadArray(__spreadArray([], __read(nameToSubfolderPath(hash /* <- TODO: [🎎] Maybe add some SHA256 prefix */)), false), ["".concat(basename.substring(0, MAX_FILENAME_LENGTH), ".").concat(mimeTypeToExtension(mimeType))], false));
-                        return [4 /*yield*/, tools.fs.mkdir(node_path.dirname(node_path.join(rootDirname_1, filepath)), { recursive: true })];
+                        rootDirname_1 = path.join(process.cwd(), DEFAULT_DOWNLOAD_CACHE_DIRNAME);
+                        filepath = path.join.apply(void 0, __spreadArray(__spreadArray([], __read(nameToSubfolderPath(hash /* <- TODO: [🎎] Maybe add some SHA256 prefix */)), false), ["".concat(basename.substring(0, MAX_FILENAME_LENGTH), ".").concat(mimeTypeToExtension(mimeType))], false));
+                        return [4 /*yield*/, tools.fs.mkdir(path.dirname(path.join(rootDirname_1, filepath)), { recursive: true })];
                     case 2:
                         _h.sent();
                         _g = (_f = Buffer).from;
@@ -3768,7 +3789,7 @@
                         if (fileContent.length > DEFAULT_MAX_FILE_SIZE /* <- TODO: Allow to pass different value to remote server */) {
                             throw new LimitReachedError("File is too large (".concat(Math.round(fileContent.length / 1024 / 1024), "MB). Maximum allowed size is ").concat(Math.round(DEFAULT_MAX_FILE_SIZE / 1024 / 1024), "MB."));
                         }
-                        return [4 /*yield*/, tools.fs.writeFile(node_path.join(rootDirname_1, filepath), fileContent)];
+                        return [4 /*yield*/, tools.fs.writeFile(path.join(rootDirname_1, filepath), fileContent)];
                     case 4:
                         _h.sent();
                         // TODO: [💵] Check the file security
@@ -3784,7 +3805,7 @@
                             throw new EnvironmentMismatchError('Can not import file knowledge in non-file pipeline');
                             //          <- TODO: [🧠] What is the best error type here`
                         }
-                        filename_1 = node_path.join(rootDirname, knowledgeSourceContent).split('\\').join('/');
+                        filename_1 = path.join(rootDirname, knowledgeSourceContent).split('\\').join('/');
                         fileExtension = getFileExtension(filename_1);
                         mimeType = extensionToMimeType(fileExtension || '');
                         return [4 /*yield*/, isFileExisting(filename_1, tools.fs)];