@researchdatabox/redbox-core 0.0.1-beta.9228 → 0.0.1-beta.9604

package/dist/services/StorageManagerService.d.ts

@@ -1,4 +1,5 @@
 import { Services as services } from '../CoreService';
+import { StorageConfig, DiskConfig } from '../config/storage.config';
 /**
  * StorageManagerService
  *
@@ -47,6 +48,7 @@ export declare namespace Services {
         private _DiskConstructor;
         private _FSDriver;
         private _S3Driver;
+        private _GridFSDriver;
         private _disks;
         private _bootstrapped;
         private _bootstrapPromise;
@@ -59,12 +61,14 @@ export declare namespace Services {
          * Called during service initialization (after Sails is ready).
          */
         bootstrap(): Promise<void>;
-        private getMergedStorageConfig;
+        getMergedStorageConfig(): StorageConfig;
         private performBootstrap;
         /**
          * Create a Flydrive driver from a DiskConfig entry.
          */
         private createDriver;
+        private normalizeGridFSString;
+        private normalizeOptionalBoolean;
         /**
          * Get a disk by name.
          * @throws Error if disk is not found.
@@ -74,6 +78,14 @@ export declare namespace Services {
          * Get the staging disk (where TUS uploads land).
          */
         stagingDisk(): IDisk;
+        /**
+         * Get the merged config for a named disk.
+         */
+        getDiskConfig(name: string): DiskConfig;
+        /**
+         * Get the merged config for the configured staging disk.
+         */
+        getStagingDiskConfig(): DiskConfig;
         /**
          * Get the primary disk (permanent file storage).
          */

package/dist/services/StorageManagerService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StorageManagerService.d.ts","sourceRoot":"","sources":["../../src/services/StorageManagerService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"StorageManagerService.d.ts","sourceRoot":"","sources":["../../src/services/StorageManagerService.ts"],"names":[],"mappings":"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"}

package/dist/services/StorageManagerService.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Services = void 0;
 const CoreService_1 = require("../CoreService");
 const storage_config_1 = require("../config/storage.config");
+const GridFSDriver_1 = require("../storage/GridFSDriver");
 /**
  * StorageManagerService
  *
@@ -36,12 +37,23 @@ var Services;
         return typeof record.S3Driver === 'function';
     };
     class StorageManager extends CoreService_1.Services.Core.Service {
-        _exportedMethods = ['init', 'bootstrap', 'disk', 'stagingDisk', 'primaryDisk', 'isBootstrapped'];
+        _exportedMethods = [
+            'init',
+            'bootstrap',
+            'disk',
+            'stagingDisk',
+            'primaryDisk',
+            'isBootstrapped',
+            'getMergedStorageConfig',
+            'getDiskConfig',
+            'getStagingDiskConfig',
+        ];
         logHeader = 'StorageManagerService::';
         // Flydrive module references (loaded dynamically since ESM-only)
         _DiskConstructor = null;
         _FSDriver = null;
         _S3Driver = null;
+        _GridFSDriver = GridFSDriver_1.GridFSDriver;
         // Map of instantiated disks, keyed by disk name
         _disks = new Map();
         _bootstrapped = false;
@@ -135,6 +147,7 @@ var Services;
                 return;
             }
             const storageConfig = this.getMergedStorageConfig();
+            const disks = new Map();
             if (!storageConfig.disks || Object.keys(storageConfig.disks).length === 0) {
                 throw new Error('StorageManagerService: no disks configured in storage.disks and no defaults available');
             }
@@ -151,12 +164,13 @@ var Services;
                 const driver = this.createDriver(name, diskConf);
                 if (this._DiskConstructor) {
                     const disk = new this._DiskConstructor(driver);
-                    this._disks.set(name, disk);
+                    disks.set(name, disk);
                 }
                 else {
                     throw new Error('StorageManagerService: Flydrive Disk constructor unavailable');
                 }
             }
+            this._disks = disks;
             this._bootstrapped = true;
             this.logger.verbose(`${this.logHeader} Bootstrapped with disks: ${Array.from(this._disks.keys()).join(', ')}`);
         }
@@ -169,24 +183,56 @@ var Services;
                     if (!this._FSDriver) {
                         throw new Error(`StorageManagerService: FSDriver not available but disk '${name}' requires it`);
                     }
+                    const visibility = diskConf.config.visibility ?? 'public';
                     return new this._FSDriver({
                         location: diskConf.config.root,
-                        visibility: diskConf.config.visibility || 'public',
+                        visibility,
                     });
                 }
                 case 's3': {
                     if (!this._S3Driver) {
                         throw new Error(`StorageManagerService: S3Driver not available but disk '${name}' requires it`);
                     }
-                    return new this._S3Driver({
-                        credentials: {
-                            accessKeyId: diskConf.config.key,
-                            secretAccessKey: diskConf.config.secret,
-                        },
+                    const visibility = diskConf.config.visibility ?? 'public';
+                    const opts = {
                         region: diskConf.config.region,
                         bucket: diskConf.config.bucket,
-                        endpoint: diskConf.config.endpoint,
-                        visibility: diskConf.config.visibility || 'public',
+                        visibility,
+                        requestChecksumCalculation: diskConf.config.requestChecksumCalculation ?? 'WHEN_REQUIRED',
+                        supportsACL: this.normalizeOptionalBoolean(diskConf.config.supportsACL) ?? false,
+                    };
+                    const accessKeyId = String(diskConf.config.key ?? '').trim();
+                    const secretAccessKey = String(diskConf.config.secret ?? '').trim();
+                    if (accessKeyId && secretAccessKey) {
+                        opts.credentials = {
+                            accessKeyId,
+                            secretAccessKey,
+                        };
+                    }
+                    if (diskConf.config.endpoint) {
+                        opts.endpoint = diskConf.config.endpoint;
+                    }
+                    if (diskConf.config.forcePathStyle !== undefined) {
+                        opts.forcePathStyle = this.normalizeOptionalBoolean(diskConf.config.forcePathStyle);
+                    }
+                    if (diskConf.config.bucketEndpoint !== undefined) {
+                        opts.bucketEndpoint = this.normalizeOptionalBoolean(diskConf.config.bucketEndpoint);
+                    }
+                    if (diskConf.config.tls !== undefined) {
+                        opts.tls = this.normalizeOptionalBoolean(diskConf.config.tls);
+                    }
+                    if (diskConf.config.useAccelerateEndpoint !== undefined) {
+                        opts.useAccelerateEndpoint = this.normalizeOptionalBoolean(diskConf.config.useAccelerateEndpoint);
+                    }
+                    return new this._S3Driver(opts);
+                }
+                case 'gridfs': {
+                    return new this._GridFSDriver({
+                        datastore: this.normalizeGridFSString(diskConf.config.datastore, 'mongodb'),
+                        url: this.normalizeGridFSString(diskConf.config.url, ''),
+                        databaseName: this.normalizeGridFSString(diskConf.config.databaseName, ''),
+                        bucketName: this.normalizeGridFSString(diskConf.config.bucketName, 'fs'),
+                        visibility: diskConf.config.visibility ?? 'public',
                     });
                 }
                 default: {
@@ -195,6 +241,24 @@ var Services;
                 }
             }
         }
+        normalizeGridFSString(value, fallback) {
+            return typeof value === 'string' && value.trim() ? value : fallback;
+        }
+        normalizeOptionalBoolean(value) {
+            if (typeof value === 'boolean') {
+                return value;
+            }
+            if (typeof value === 'string') {
+                const normalized = value.trim().toLowerCase();
+                if (normalized === 'true') {
+                    return true;
+                }
+                if (normalized === 'false') {
+                    return false;
+                }
+            }
+            return undefined;
+        }
         /**
          * Get a disk by name.
          * @throws Error if disk is not found.
@@ -214,6 +278,25 @@ var Services;
             const stagingName = mergedStorage.stagingDisk ?? 'staging';
             return this.disk(stagingName);
         }
+        /**
+         * Get the merged config for a named disk.
+         */
+        getDiskConfig(name) {
+            const mergedStorage = this.getMergedStorageConfig();
+            const diskConfig = mergedStorage.disks?.[name];
+            if (!diskConfig) {
+                throw new Error(`StorageManagerService: disk '${name}' is not registered. Available: ${Object.keys(mergedStorage.disks ?? {}).join(', ')}`);
+            }
+            return diskConfig;
+        }
+        /**
+         * Get the merged config for the configured staging disk.
+         */
+        getStagingDiskConfig() {
+            const mergedStorage = this.getMergedStorageConfig();
+            const stagingName = mergedStorage.stagingDisk ?? 'staging';
+            return this.getDiskConfig(stagingName);
+        }
         /**
          * Get the primary disk (permanent file storage).
          */
@@ -231,4 +314,4 @@ var Services;
     }
     Services.StorageManager = StorageManager;
 })(Services || (exports.Services = Services = {}));
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"StorageManagerService.js","sourceRoot":"","sources":["../../src/services/StorageManagerService.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"StorageManagerService.js","sourceRoot":"","sources":["../../src/services/StorageManagerService.ts"],"names":[],"mappings":"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"}

package/dist/services/TemplateService.d.ts

@@ -1,7 +1,6 @@
 import { Services as services } from '../CoreService';
-import { Expression } from "jsonata";
 import { TemplateDelegate as HandlebarsTemplateDelegate } from "handlebars";
-import { TemplateCompileItem, TemplateCompileInput, TemplateCompileKey } from "@researchdatabox/sails-ng-common";
+import { TemplateCompileInput, TemplateCompileItem, TemplateCompileKey } from "@researchdatabox/sails-ng-common";
 export declare namespace Services {
     class Template extends services.Core.Service {
         private helpersRegistered;
@@ -25,14 +24,6 @@ export declare namespace Services {
          * @param expression The JSONata expression to compile.
          */
         buildClientJsonata(expression: string): string | null;
-        /**
-         * Compile a JSONata expression to a form that is ready to be executed on the server.
-         *
-         * The expression will be normalised and have some transformations applied.
-         *
-         * @param expression The JSONata expression to compile.
-         */
-        buildServerJsonata(expression: string): Expression | null;
         /**
          * Compile a Handlebars template to a form that is ready to be executed on the client.
          *
@@ -50,13 +41,6 @@ export declare namespace Services {
          */
         buildServerHandlebars(template: string): HandlebarsTemplateDelegate | null;
         buildKeyString(key: TemplateCompileKey): string;
-        private buildSharedJsonata;
-        /**
-         * Normalise a string to reduce the potential variations in how characters are specified.
-         *
-         * @param value The string to normalise.
-         */
-        private normalise;
     }
 }
 declare global {

package/dist/services/TemplateService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TemplateService.d.ts","sourceRoot":"","sources":["../../src/services/TemplateService.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,QAAQ,IAAI,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAgB,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAmB,EAAE,gBAAgB,IAAI,0BAA0B,EAAE,MAAM,YAAY,CAAC;AACxF,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,kBAAkB,EAAwE,MAAM,kCAAkC,CAAC;AAIvL,yBAAiB,QAAQ,CAAC;IAEtB,MACa,QAAS,SAAQ,QAAQ,CAAC,IAAI,CAAC,OAAO;QAE/C,OAAO,CAAC,iBAAiB,CAAkB;QAE3C;;WAEG;QACH,OAAO,CAAC,uBAAuB;QAQ/B;;;;;;WAMG;QACI,kBAAkB,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,mBAAmB,EAAE;QAqChF;;;;;;WAMG;QACI,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;QAe5D;;;;;;WAMG;QACI,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;QAYhE;;;;;;WAMG;QACI,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;QAc7D;;;;;;WAMG;QACI,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,0BAA0B,GAAG,IAAI;QAa1E,cAAc,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM;QAItD,OAAO,CAAC,kBAAkB;QAe1B;;;;WAIG;QACH,OAAO,CAAC,SAAS;KAYpB;CACJ;AAED,OAAO,CAAC,MAAM,CAAC;IACX,IAAI,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC;CAC1C"}
+{"version":3,"file":"TemplateService.d.ts","sourceRoot":"","sources":["../../src/services/TemplateService.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,QAAQ,IAAI,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AACpD,OAAmB,EAAC,gBAAgB,IAAI,0BAA0B,EAAC,MAAM,YAAY,CAAC;AACtF,OAAO,EAKL,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAEnB,MAAM,kCAAkC,CAAC;AAG1C,yBAAiB,QAAQ,CAAC;IAEtB,MACa,QAAS,SAAQ,QAAQ,CAAC,IAAI,CAAC,OAAO;QAE/C,OAAO,CAAC,iBAAiB,CAAkB;QAE3C;;WAEG;QACH,OAAO,CAAC,uBAAuB;QAQ/B;;;;;;WAMG;QACI,kBAAkB,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,mBAAmB,EAAE;QAqChF;;;;;;WAMG;QACI,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;QAe5D;;;;;;WAMG;QACI,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;QAc7D;;;;;;WAMG;QACI,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,0BAA0B,GAAG,IAAI;QAa1E,cAAc,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM;KAGzD;CACJ;AAED,OAAO,CAAC,MAAM,CAAC;IACX,IAAI,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC;CAC1C"}

package/dist/services/TemplateService.js

@@ -30,7 +30,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Services = void 0;
 const PopulateExportedMethods_decorator_1 = require("../decorator/PopulateExportedMethods.decorator");
 const CoreService_1 = require("../CoreService");
-const jsonata_1 = __importDefault(require("jsonata"));
 const handlebars_1 = __importDefault(require("handlebars"));
 const sails_ng_common_1 = require("@researchdatabox/sails-ng-common");
 var Services;
@@ -98,9 +97,9 @@ var Services;
          */
         buildClientJsonata(expression) {
             try {
-                expression = this.normalise(expression);
+                expression = (0, sails_ng_common_1.normaliseVisual)(expression);
                 // Validate the expression by compiling it
-                const compiled = this.buildSharedJsonata(expression);
+                const compiled = (0, sails_ng_common_1.jsonataCompile)(expression);
                 sails.log.verbose(`Validated client JSONata expression '${expression}'`, compiled);
                 // Return the expression string for client-side compilation
                 // The client will call jsonata(expression).evaluate(context)
@@ -111,25 +110,6 @@ var Services;
                 return null;
             }
         }
-        /**
-         * Compile a JSONata expression to a form that is ready to be executed on the server.
-         *
-         * The expression will be normalised and have some transformations applied.
-         *
-         * @param expression The JSONata expression to compile.
-         */
-        buildServerJsonata(expression) {
-            try {
-                expression = this.normalise(expression);
-                const result = this.buildSharedJsonata(expression);
-                sails.log.verbose(`Built server JSONata expression '${expression}'`);
-                return result;
-            }
-            catch (error) {
-                sails.log.error(`Could not build server JSONata expression '${expression}'`, error);
-                return null;
-            }
-        }
         /**
          * Compile a Handlebars template to a form that is ready to be executed on the client.
          *
@@ -140,7 +120,7 @@ var Services;
         buildClientHandlebars(template) {
             try {
                 this.ensureHelpersRegistered();
-                template = this.normalise(template);
+                template = (0, sails_ng_common_1.normaliseVisual)(template);
                 // handlebars pre-compiled output is already a string
                 const result = handlebars_1.default.precompile(template)?.toString();
                 sails.log.verbose(`Built client Handlebars template '${template}'`);
@@ -161,7 +141,7 @@ var Services;
         buildServerHandlebars(template) {
             try {
                 this.ensureHelpersRegistered();
-                template = this.normalise(template);
+                template = (0, sails_ng_common_1.normaliseVisual)(template);
                 const result = handlebars_1.default.compile(template);
                 sails.log.verbose(`Built server Handlebars template '${template}'`);
                 return result;
@@ -174,35 +154,10 @@ var Services;
         buildKeyString(key) {
             return (0, sails_ng_common_1.buildKeyString)(key);
         }
-        buildSharedJsonata(expression) {
-            const compiled = (0, jsonata_1.default)(expression);
-            // override the built-in JSONata 'eval' function
-            // TODO: check this actually overrides the 'eval' function
-            compiled.registerFunction("eval", () => undefined);
-            // TODO: register a function for obtaining translations
-            // TODO: register a function for formatting date time values
-            // TODO: register a function / context state holder that provides model data
-            // TODO: replace regex with google's re2?
-            return compiled;
-        }
-        /**
-         * Normalise a string to reduce the potential variations in how characters are specified.
-         *
-         * @param value The string to normalise.
-         */
-        normalise(value) {
-            value = value?.toString() ?? "";
-            // Use NFKC: Compatibility Decomposition, followed by Canonical Composition.
-            // For Identifiers matching: Canonical form, no visual variants
-            const normForm = "NFKC";
-            const norm = value.normalize(normForm);
-            // TODO: other normalisations?
-            return norm;
-        }
     };
     Template = __decorate([
         PopulateExportedMethods_decorator_1.PopulateExportedMethods
     ], Template);
     Services.Template = Template;
 })(Services || (exports.Services = Services = {}));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVtcGxhdGVTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2VzL1RlbXBsYXRlU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEZBQTBGO0FBQzFGLEVBQUU7QUFDRiw2QkFBNkI7QUFDN0IsMEJBQTBCO0FBQzFCLEVBQUU7QUFDRix1RUFBdUU7QUFDdkUsdUVBQXVFO0FBQ3ZFLG9FQUFvRTtBQUNwRSxzQ0FBc0M7QUFDdEMsRUFBRTtBQUNGLGtFQUFrRTtBQUNsRSxpRUFBaUU7QUFDakUsZ0VBQWdFO0FBQ2hFLCtDQUErQztBQUMvQyxFQUFFO0FBQ0YsMEVBQTBFO0FBQzFFLDBFQUEwRTtBQUMxRSw4REFBOEQ7Ozs7Ozs7Ozs7OztBQUU5RCxzR0FBeUY7QUFDekYsZ0RBQXNEO0FBQ3RELHNEQUE4QztBQUM5Qyw0REFBd0Y7QUFDeEYsc0VBQXVMO0FBSXZMLElBQWlCLFFBQVEsQ0FxTHhCO0FBckxELFdBQWlCLFFBQVE7SUFHckIsSUFBYSxRQUFRLEdBQXJCLE1BQWEsUUFBUyxTQUFRLHNCQUFRLENBQUMsSUFBSSxDQUFDLE9BQU87UUFFdkMsaUJBQWlCLEdBQVksS0FBSyxDQUFDO1FBRTNDOztXQUVHO1FBQ0ssdUJBQXVCO1lBQzNCLElBQUksQ0FBQyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztnQkFDMUIsSUFBQSxpREFBK0IsRUFBQyxvQkFBVSxDQUFDLENBQUM7Z0JBQzVDLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxJQUFJLENBQUM7Z0JBQzlCLEtBQUssQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLHVEQUF1RCxDQUFDLENBQUM7WUFDL0UsQ0FBQztRQUNMLENBQUM7UUFFRDs7Ozs7O1dBTUc7UUFDSSxrQkFBa0IsQ0FBQyxNQUE4QjtZQUNwRCxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBQSxnQ0FBYyxFQUFDLENB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVtcGxhdGVTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2VzL1RlbXBsYXRlU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEZBQTBGO0FBQzFGLEVBQUU7QUFDRiw2QkFBNkI7QUFDN0IsMEJBQTBCO0FBQzFCLEVBQUU7QUFDRix1RUFBdUU7QUFDdkUsdUVBQXVFO0FBQ3ZFLG9FQUFvRTtBQUNwRSxzQ0FBc0M7QUFDdEMsRUFBRTtBQUNGLGtFQUFrRTtBQUNsRSxpRUFBaUU7QUFDakUsZ0VBQWdFO0FBQ2hFLCtDQUErQztBQUMvQyxFQUFFO0FBQ0YsMEVBQTBFO0FBQzFFLDBFQUEwRTtBQUMxRSw4REFBOEQ7Ozs7Ozs7Ozs7OztBQUU5RCxzR0FBdUY7QUFDdkYsZ0RBQW9EO0FBQ3BELDREQUFzRjtBQUN0RixzRUFTMEM7QUFHMUMsSUFBaUIsUUFBUSxDQWlJeEI7QUFqSUQsV0FBaUIsUUFBUTtJQUdyQixJQUFhLFFBQVEsR0FBckIsTUFBYSxRQUFTLFNBQVEsc0JBQVEsQ0FBQyxJQUFJLENBQUMsT0FBTztRQUV2QyxpQkFBaUIsR0FBWSxLQUFLLENBQUM7UUFFM0M7O1dBRUc7UUFDSyx1QkFBdUI7WUFDM0IsSUFBSSxDQUFDLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO2dCQUMxQixJQUFBLGlEQUErQixFQUFDLG9CQUFVLENBQUMsQ0FBQztnQkFDNUMsSUFBSSxDQUFDLGlCQUFpQixHQUFHLElBQUksQ0FBQztnQkFDOUIsS0FBSyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsdURBQXVELENBQUMsQ0FBQztZQUMvRSxDQUFDO1FBQ0wsQ0FBQztRQUVEOzs7Ozs7V0FNRztRQUNJLGtCQUFrQixDQUFDLE1BQThCO1lBQ3BELE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxJQUFBLGdDQUFjLEVBQUMsQ0FBQyxDQUFDLEdBQUcs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

package/dist/services/VocabularyService.d.ts

@@ -49,6 +49,7 @@ export declare namespace Services {
         notation?: string;
         parent?: string | null;
         hasChildren: boolean;
+        children?: VocabularyChildrenNode[];
     }
     export interface VocabularyChildrenResponse {
         entries: VocabularyChildrenNode[];
@@ -58,6 +59,13 @@ export declare namespace Services {
             total: number;
         };
     }
+    export interface VocabularyExpandPathResponse {
+        paths: Record<string, VocabularyChildrenNode[]>;
+        meta: {
+            vocabularyId: string;
+            notations: string[];
+        };
+    }
     export class InvalidParentIdError extends Error {
         readonly code: 'invalid-parent-id';
         constructor(message?: string);
@@ -80,6 +88,10 @@ export declare namespace Services {
         getByIdOrSlug(branding: string, idOrSlug: string): Promise<VocabularyAttributes | null>;
         getEntries(branding: string, vocabIdOrSlug: string, options?: VocabularyEntriesOptions): Promise<VocabularyEntriesResponse | null>;
         getChildren(branding: string, vocabIdOrSlug: string, parentId?: string | null): Promise<VocabularyChildrenResponse | null>;
+        expandPaths(branding: string, vocabIdOrSlug: string, notations: string[]): Promise<VocabularyExpandPathResponse | null>;
+        getEntryByNotation(branding: string, vocabIdOrSlug: string, notation: string): Promise<VocabularyEntryAttributes | null>;
+        getAncestorChain(branding: string, vocabIdOrSlug: string, notation: string): Promise<VocabularyEntryAttributes[]>;
+        private toVocabularyChildrenNode;
         create(input: VocabularyInput): Promise<VocabularyAttributes>;
         bootstrapData(): Promise<void>;
         update(id: string, input: Partial<VocabularyInput>): Promise<VocabularyAttributes>;

package/dist/services/VocabularyService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VocabularyService.d.ts","sourceRoot":"","sources":["../../src/services/VocabularyService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"VocabularyService.d.ts","sourceRoot":"","sources":["../../src/services/VocabularyService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAEtF,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAIvC,yBAAiB,QAAQ,CAAC;IACxB,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;IACjC,KAAK,WAAW,GAAG,OAAO,GAAG,KAAK,CAAC;IAOnC,MAAM,MAAM,oBAAoB,GAC9B,IAAI,CAAC,yBAAyB,EAAE,IAAI,GAAG,OAAO,GAAG,OAAO,GAAG,YAAY,GAAG,OAAO,GAAG,YAAY,CAAC,GAAG;QAClG,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,QAAQ,CAAC,EAAE,oBAAoB,EAAE,CAAC;KACnC,CAAC;IAEJ,MAAM,MAAM,eAAe,GACzB,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,CAAC,GAAG;QAChF,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,SAAS,CAAC;QACjB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,OAAO,CAAC,EAAE,oBAAoB,EAAE,CAAC;KAClC,CAAC;IAEJ,MAAM,WAAW,qBAAqB;QACpC,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;IAED,MAAM,WAAW,kBAAmB,SAAQ,yBAAyB;QACnE,QAAQ,EAAE,kBAAkB,EAAE,CAAC;KAChC;IAED,MAAM,WAAW,wBAAwB;QACvC,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,uBAAuB,CAAC,EAAE,OAAO,CAAC;KACnC;IAED,MAAM,WAAW,yBAAyB;QACxC,OAAO,EAAE,yBAAyB,EAAE,CAAC;QACrC,IAAI,EAAE;YACJ,KAAK,EAAE,MAAM,CAAC;YACd,KAAK,EAAE,MAAM,CAAC;YACd,MAAM,EAAE,MAAM,CAAC;YACf,YAAY,EAAE,MAAM,CAAC;SACtB,CAAC;KACH;IAED,MAAM,WAAW,sBAAsB;QACrC,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,WAAW,EAAE,OAAO,CAAC;QACrB,QAAQ,CAAC,EAAE,sBAAsB,EAAE,CAAC;KACrC;IAED,MAAM,WAAW,0BAA0B;QACzC,OAAO,EAAE,sBAAsB,EAAE,CAAC;QAClC,IAAI,EAAE;YACJ,YAAY,EAAE,MAAM,CAAC;YACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;YACxB,KAAK,EAAE,MAAM,CAAC;SACf,CAAC;KACH;IAED,MAAM,WAAW,4BAA4B;QAC3C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAC;QAChD,IAAI,EAAE;YACJ,YAAY,EAAE,MAAM,CAAC;YACrB,SAAS,EAAE,MAAM,EAAE,CAAC;SACrB,CAAC;KACH;IAED,MAAM,OAAO,oBAAqB,SAAQ,KAAK;QAC7C,SAAgB,IAAI,EAAE,mBAAmB,CAAC;oBAE9B,OAAO,SAA6D;KAKjF;IAuCD,MAAM,OAAO,iBAAkB,SAAQ,QAAQ,CAAC,IAAI,CAAC,OAAO;QAC1D,UAAmB,gBAAgB,EAAE,MAAM,EAAE,CAkB3C;gBAEY,YAAY;gBAOZ,gBAAgB;gBAOhB,cAAc;QAK5B,OAAO,CAAC,iBAAiB;QA+BZ,IAAI,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC;YAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC;YAAC,IAAI,EAAE;gBAAE,KAAK,EAAE,MAAM,CAAC;gBAAC,KAAK,EAAE,MAAM,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,CAAC;QA4BvI,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;QAIzD,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;QAcvF,UAAU,CACrB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,wBAAwB,GACjC,OAAO,CAAC,yBAAyB,GAAG,IAAI,CAAC;QAuC/B,WAAW,CACtB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GACvB,OAAO,CAAC,0BAA0B,GAAG,IAAI,CAAC;QAwDhC,WAAW,CACtB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,4BAA4B,GAAG,IAAI,CAAC;QAyKlC,kBAAkB,CAC7B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,yBAAyB,GAAG,IAAI,CAAC;QAiB/B,gBAAgB,CAC3B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,yBAAyB,EAAE,CAAC;QA+BvC,OAAO,CAAC,wBAAwB;QAiBnB,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,oBAAoB,CAAC;QAiE7D,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;QAsC9B,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC;QAwDlF,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC;YAAE,EAAE,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;QAkDxG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;QAKvC,cAAc,CAAC,KAAK,EAAE,oBAAoB,GAAG,oBAAoB;QAS3D,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,KAAK,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;QA+BnI,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;QA0B5D,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,EAAE,UAAU,CAAC,EAAE,KAAK,CAAC,UAAU,GAAG,OAAO,CAAC;YAAE,OAAO,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC;gBAuElK,cAAc;QA4C5B,OAAO,CAAC,YAAY;QAMpB,OAAO,CAAC,oBAAoB;QAK5B,SAAS,CAAC,mBAAmB,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,GAAG,UAAU,CAAC;gBAI1D,8BAA8B;gBA+C9B,qBAAqB;gBAuDrB,YAAY;QAU1B,OAAO,CAAC,kBAAkB;QAQ1B,OAAO,CAAC,gBAAgB;gBA0BV,kBAAkB;QAiBhC,OAAO,CAAC,cAAc;KAiBvB;;CAEF;AAED,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB,CAAC;CACnD"}