@nascentdigital/funnel-core 4.5.3 → 4.5.4

package/dist/errors/IsometricError.d.ts

@@ -9,6 +9,7 @@ export declare class IsometricError extends Error {
 export declare namespace IsometricError {
     type ConstructorArgs = {
         moduleId: IsometricErrorModule.Id;
+        name: string;
         message: string;
         cause?: Error | undefined;
         trace?: ((...args: any) => any) | undefined;

package/dist/errors/IsometricError.js

@@ -10,7 +10,7 @@ class IsometricError extends Error {
         Object.setPrototypeOf(this, new.target.prototype);
         // bind properties
         const object = this;
-        this.name = object.constructor.name;
+        this.name = args.name || object.constructor.name;
         this.moduleId = args.moduleId;
         this.cause = args.cause;
         // bind stack trace (if provided)

package/dist/errors/IsometricErrorUtils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IsometricErrorUtils = void 0;
-const Value_1 = require("../utils/Value");
+const utils_1 = require("../utils");
 const api_1 = require("./api");
 const IsometricError_1 = require("./IsometricError");
 const SerializedIsometricError_1 = require("./SerializedIsometricError");
@@ -13,6 +13,7 @@ var IsometricErrorUtils;
     // methods
     function registerModule(ModuleClass) {
         const module = new ModuleClass();
+        console.debug('registering new module', module);
         modules.set(module.id, module);
     }
     IsometricErrorUtils.registerModule = registerModule;
@@ -34,17 +35,17 @@ var IsometricErrorUtils;
     function deserializeError(data) {
         // skip if it's not isometric
         if (!SerializedIsometricError_1.SerializedIsometricError.filter(data)) {
-            console.debug('[IsometricErrorUtils/deserialize] data is not an error', data);
+            console.debug('deserializeError: data is not an error', data);
             return undefined;
         }
         // or skip if there's no registered module
         const module = modules.get(data.moduleId);
         if (!module) {
-            console.debug('[IsometricErrorUtils/deserialize] module not found', data.moduleId);
+            console.warn('deserializeError: module not found', data.moduleId);
             return undefined;
         }
         const error = module.deserialize(data);
-        console.debug('[IsometricErrorUtils/deserialize] parsed error', { module, error });
+        console.debug('deserializeError: parsed error', { module, error });
         // deserialize
         return error;
     }
@@ -56,7 +57,7 @@ var IsometricErrorUtils;
             return;
         }
         const { bodyUsed, headers, type } = response;
-        console.debug('[IsometricErrorUtils] handling error', { type, bodyUsed, headers });
+        console.debug('checkResponse: handling error', { type, bodyUsed, headers });
         // throw network error if the request didn't even go through
         let error;
         if (response.type === 'error') {
@@ -65,11 +66,11 @@ var IsometricErrorUtils;
         // or try to extract from json
         else {
             const json = await response.json();
-            console.debug('[IsometricErrorUtils] transforming error', {
+            console.debug('checkResponse: transforming error', {
                 json,
                 isIso: SerializedIsometricError_1.SerializedIsometricError.filter(json.error)
             });
-            const { error: errorData } = Value_1.Value.typeOf(json) === 'object'
+            const { error: errorData } = utils_1.Value.typeOf(json) === 'object'
                 ? json
                 : {};
             error = (_a = deserializeError(errorData)) !== null && _a !== void 0 ? _a : new api_1.ServerError();

package/dist/errors/SerializedIsometricError.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SerializedIsometricError = void 0;
-const Value_1 = require("../utils/Value");
+const utils_1 = require("../utils");
 // extension
 var SerializedIsometricError;
 (function (SerializedIsometricError) {
     // guard
     function filter(value) {
-        return Value_1.Value.typeOf(value) === 'object'
+        return utils_1.Value.typeOf(value) === 'object'
             && 'moduleId' in value
-            && Value_1.Value.typeOf(value.moduleId) === 'string';
+            && utils_1.Value.typeOf(value.moduleId) === 'string';
     }
     SerializedIsometricError.filter = filter;
 })(SerializedIsometricError || (exports.SerializedIsometricError = SerializedIsometricError = {}));

package/dist/errors/api/ApiError.d.ts

@@ -11,5 +11,5 @@ export declare namespace ApiError {
     type ConstructorArgs = IsometricError.ConstructorArgs.WithoutModuleId & {
         status: number;
     };
-    type Options = Omit<ConstructorArgs, 'status' | 'message'>;
+    type Options = Omit<ConstructorArgs, 'name' | 'status' | 'message'>;
 }

package/dist/errors/api/ApiErrors.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiErrors = void 0;
-const Value_1 = require("../../utils/Value");
+const utils_1 = require("../../utils");
 const ApiError_1 = require("./ApiError");
 const ArgumentError_1 = require("./ArgumentError");
+const ConcurrencyError_1 = require("./ConcurrencyError");
 const ConflictError_1 = require("./ConflictError");
 const DependencyError_1 = require("./DependencyError");
 const IllegalStateError_1 = require("./IllegalStateError");
@@ -30,33 +31,35 @@ class ApiErrors {
         // convert
         switch (data.name) {
             // re-hydrate error
-            case ArgumentError_1.ArgumentError.name:
-                return new ArgumentError_1.ArgumentError(data.message, Value_1.Value.parseString(data.argumentName));
-            case ConflictError_1.ConflictError.name:
+            case 'ArgumentError':
+                return new ArgumentError_1.ArgumentError(data.message, utils_1.Value.parseString(data.argumentName));
+            case 'ConcurrencyError':
+                return new ConcurrencyError_1.ConcurrencyError(data.message);
+            case 'ConflictError':
                 return new ConflictError_1.ConflictError(data.message);
-            case DependencyError_1.DependencyError.name:
+            case 'DependencyError':
                 return new DependencyError_1.DependencyError(data.message);
-            case IllegalStateError_1.IllegalStateError.name:
+            case 'IllegalStateError':
                 return new IllegalStateError_1.IllegalStateError(data.message);
-            case InvalidOperationError_1.InvalidOperationError.name:
+            case 'InvalidOperationError':
                 return new InvalidOperationError_1.InvalidOperationError(data.message);
-            case NotAuthenticatedError_1.NotAuthenticatedError.name:
+            case 'NotAuthenticatedError':
                 return new NotAuthenticatedError_1.NotAuthenticatedError(data.message);
-            case NotAuthorizedError_1.NotAuthorizedError.name:
+            case 'NotAuthorizedError':
                 return new NotAuthorizedError_1.NotAuthorizedError(data.message);
-            case NotAvailableError_1.NotAvailableError.name:
+            case 'NotAvailableError':
                 return new NotAvailableError_1.NotAvailableError(data.message);
-            case NotFoundError_1.NotFoundError.name:
+            case 'NotFoundError':
                 return new NotFoundError_1.NotFoundError(data.message);
-            case NotImplementedError_1.NotImplementedError.name:
+            case 'NotImplementedError':
                 return new NotImplementedError_1.NotImplementedError(data.message);
-            case OfflineError_1.OfflineError.name:
+            case 'OfflineError':
                 return new OfflineError_1.OfflineError(data.message);
-            case RangeError_1.RangeError.name:
+            case 'RangeError':
                 return new RangeError_1.RangeError(data.message);
-            case ServerError_1.ServerError.name:
+            case 'ServerError':
                 return new ServerError_1.ServerError(data.message);
-            case TimeoutError_1.TimeoutError.name:
+            case 'TimeoutError':
                 return new TimeoutError_1.TimeoutError(data.message);
             // or ignore if not matching
             default:

package/dist/errors/api/ArgumentError.js

@@ -6,7 +6,7 @@ const ApiError_1 = require("./ApiError");
 class ArgumentError extends ApiError_1.ApiError {
     constructor(message = 'Invalid arguments', argumentName, options = {}) {
         // construct base
-        super(Object.assign({ status: 400, message }, options));
+        super(Object.assign({ name: 'ArgumentError', status: 400, message }, options));
         // capture argument
         this.argumentName = argumentName;
     }

package/dist/errors/api/ConcurrencyError.js

@@ -5,7 +5,7 @@ const ApiError_1 = require("./ApiError");
 // error
 class ConcurrencyError extends ApiError_1.ApiError {
     constructor(message = 'Concurrency error', options = {}) {
-        super(Object.assign({ status: 423, message }, options));
+        super(Object.assign({ name: 'ConcurrencyError', status: 423, message }, options));
     }
 }
 exports.ConcurrencyError = ConcurrencyError;

package/dist/errors/api/ConflictError.js

@@ -5,7 +5,7 @@ const ApiError_1 = require("./ApiError");
 // error
 class ConflictError extends ApiError_1.ApiError {
     constructor(message = 'A conflict is preventing this operation from succeeding', options = {}) {
-        super(Object.assign({ status: 409, message }, options));
+        super(Object.assign({ name: 'ConflictError', status: 409, message }, options));
     }
 }
 exports.ConflictError = ConflictError;

package/dist/errors/api/DependencyError.js

@@ -5,7 +5,7 @@ const ApiError_1 = require("./ApiError");
 // error
 class DependencyError extends ApiError_1.ApiError {
     constructor(message = 'Upstream operation failed', options = {}) {
-        super(Object.assign({ status: 424, message }, options));
+        super(Object.assign({ name: 'DependencyError', status: 424, message }, options));
     }
 }
 exports.DependencyError = DependencyError;

package/dist/errors/api/IllegalStateError.js

@@ -5,7 +5,7 @@ const ApiError_1 = require("./ApiError");
 // error
 class IllegalStateError extends ApiError_1.ApiError {
     constructor(message = 'Preconditions not met', options = {}) {
-        super(Object.assign({ status: 412, message }, options));
+        super(Object.assign({ name: 'IllegalStateError', status: 412, message }, options));
     }
 }
 exports.IllegalStateError = IllegalStateError;

package/dist/errors/api/InvalidOperationError.js

@@ -5,7 +5,7 @@ const ApiError_1 = require("./ApiError");
 // error
 class InvalidOperationError extends ApiError_1.ApiError {
     constructor(message = 'Invalid operation', options = {}) {
-        super(Object.assign({ status: 405, message }, options));
+        super(Object.assign({ name: 'InvalidOperationError', status: 405, message }, options));
     }
 }
 exports.InvalidOperationError = InvalidOperationError;

package/dist/errors/api/NotAuthenticatedError.js

@@ -5,7 +5,7 @@ const ApiError_1 = require("./ApiError");
 // error
 class NotAuthenticatedError extends ApiError_1.ApiError {
     constructor(message = 'Authentication is invalid or missing', options = {}) {
-        super(Object.assign({ status: 401, message }, options));
+        super(Object.assign({ name: 'NotAuthenticatedError', status: 401, message }, options));
     }
 }
 exports.NotAuthenticatedError = NotAuthenticatedError;

package/dist/errors/api/NotAuthorizedError.js

@@ -5,7 +5,7 @@ const ApiError_1 = require("./ApiError");
 // error
 class NotAuthorizedError extends ApiError_1.ApiError {
     constructor(message = 'User does not have permissions for this method', options = {}) {
-        super(Object.assign({ status: 403, message }, options));
+        super(Object.assign({ name: 'NotAuthorizedError', status: 403, message }, options));
     }
 }
 exports.NotAuthorizedError = NotAuthorizedError;

package/dist/errors/api/NotAvailableError.js

@@ -5,7 +5,7 @@ const ApiError_1 = require("./ApiError");
 // error
 class NotAvailableError extends ApiError_1.ApiError {
     constructor(message = 'Not available', options = {}) {
-        super(Object.assign({ status: 503, message }, options));
+        super(Object.assign({ name: 'NotAvailableError', status: 503, message }, options));
     }
 }
 exports.NotAvailableError = NotAvailableError;

package/dist/errors/api/NotFoundError.js

@@ -5,7 +5,7 @@ const ApiError_1 = require("./ApiError");
 // error
 class NotFoundError extends ApiError_1.ApiError {
     constructor(message = 'Not found', options = {}) {
-        super(Object.assign({ status: 404, message }, options));
+        super(Object.assign({ name: 'NotFoundError', status: 404, message }, options));
     }
 }
 exports.NotFoundError = NotFoundError;

package/dist/errors/api/NotImplementedError.js

@@ -5,7 +5,7 @@ const ApiError_1 = require("./ApiError");
 // error
 class NotImplementedError extends ApiError_1.ApiError {
     constructor(message = 'Not implemented', options = {}) {
-        super(Object.assign({ status: 501, message }, options));
+        super(Object.assign({ name: 'NotImplementedError', status: 501, message }, options));
     }
 }
 exports.NotImplementedError = NotImplementedError;

package/dist/errors/api/OfflineError.js

@@ -5,7 +5,7 @@ const ApiError_1 = require("./ApiError");
 // error
 class OfflineError extends ApiError_1.ApiError {
     constructor(message = 'Unable to connect to network', options = {}) {
-        super(Object.assign({ status: 0, message }, options));
+        super(Object.assign({ name: 'OfflineError', status: 0, message }, options));
     }
 }
 exports.OfflineError = OfflineError;

package/dist/errors/api/RangeError.js

@@ -5,7 +5,7 @@ const ApiError_1 = require("./ApiError");
 // error
 class RangeError extends ApiError_1.ApiError {
     constructor(message = 'Invalid range', options = {}) {
-        super(Object.assign({ status: 416, message }, options));
+        super(Object.assign({ name: 'RangeError', status: 416, message }, options));
     }
 }
 exports.RangeError = RangeError;

package/dist/errors/api/ServerError.js

@@ -5,7 +5,7 @@ const ApiError_1 = require("./ApiError");
 // error
 class ServerError extends ApiError_1.ApiError {
     constructor(message = 'Server error', options = {}) {
-        super(Object.assign({ status: 500, message }, options));
+        super(Object.assign({ name: 'ServerError', status: 500, message }, options));
     }
 }
 exports.ServerError = ServerError;

package/dist/errors/api/TimeoutError.js

@@ -5,7 +5,7 @@ const ApiError_1 = require("./ApiError");
 // error
 class TimeoutError extends ApiError_1.ApiError {
     constructor(message = 'Timeout', options = {}) {
-        super(Object.assign({ status: 408, message }, options));
+        super(Object.assign({ name: 'TimeoutError', status: 408, message }, options));
     }
 }
 exports.TimeoutError = TimeoutError;

package/dist/errors/api/index.d.ts

@@ -1,6 +1,7 @@
 export * from './ApiError';
 export * from './ApiErrors';
 export * from './ArgumentError';
+export * from './ConcurrencyError';
 export * from './ConflictError';
 export * from './DependencyError';
 export * from './IllegalStateError';

package/dist/errors/api/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ApiError"), exports);
 __exportStar(require("./ApiErrors"), exports);
 __exportStar(require("./ArgumentError"), exports);
+__exportStar(require("./ConcurrencyError"), exports);
 __exportStar(require("./ConflictError"), exports);
 __exportStar(require("./DependencyError"), exports);
 __exportStar(require("./IllegalStateError"), exports);

package/dist/schema/Site.d.ts

@@ -37,4 +37,6 @@ export declare namespace Site {
         function forSite(site: Site): Data;
         function toSiteModel(data: Data): SiteModel;
     }
+    function extractCollectionsFrom<TRegions extends Regions>(regions: Site.CreateArgs<TRegions>): Collection[];
+    function uniqueCollections(collections: ReadonlyArray<Collection>): Collection[];
 }

package/dist/schema/Site.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Site = void 0;
 const errors_1 = require("../errors");
+const utils_1 = require("../utils");
+const field_1 = require("./field");
 const SiteModel_1 = require("./SiteModel");
 // class
 class Site {
@@ -16,8 +18,13 @@ class Site {
         return Site.Data.forSite(this);
     }
     static create(regions, collections = []) {
+        // extract collections from regions schema
+        const collectionsFromSchema = Site.extractCollectionsFrom(regions);
         // create new Site
-        const site = new Site({ regions, collections });
+        const site = new Site({
+            regions,
+            collections: Site.uniqueCollections([...collections, ...collectionsFromSchema])
+        });
         // bind site
         this._site = site;
         // return site
@@ -84,4 +91,37 @@ exports.Site = Site;
         }
         Data.toSiteModel = toSiteModel;
     })(Data = Site.Data || (Site.Data = {}));
+    // helpers
+    function extractCollectionsFrom(regions) {
+        // extract collections from regions schema
+        const collections = [];
+        utils_1.ObjectUtils.walk(regions, ({ value }) => {
+            // look for collection fields
+            if (value instanceof field_1.CollectionField) {
+                collections.push(...value.collections);
+                // don't recurse
+                return false;
+            }
+            // otherwise keep recursing
+            return true;
+        });
+        // return
+        return collections;
+    }
+    Site.extractCollectionsFrom = extractCollectionsFrom;
+    function uniqueCollections(collections) {
+        // setup
+        const uniqueCollections = [];
+        const collectionTypes = new Set();
+        collections.forEach(collection => {
+            // add to unique collections if type doesn't exist in set
+            if (!collectionTypes.has(collection.type)) {
+                uniqueCollections.push(collection);
+                collectionTypes.add(collection.type);
+            }
+        });
+        // return unique collections
+        return uniqueCollections;
+    }
+    Site.uniqueCollections = uniqueCollections;
 })(Site || (exports.Site = Site = {}));

package/dist/schema/field/base/RichTextField.d.ts

@@ -3,10 +3,10 @@ import { Tagged } from 'type-fest';
 import { Field } from '../index';
 export declare class RichTextField extends Field<RichTextField> {
     readonly type: "richtext";
+    readonly semantics: RichTextField.Semantics;
     readonly capabilities: Readonly<RichTextField.Capabilities.Options>;
     readonly minLength?: number;
     readonly maxLength?: number;
-    readonly size: RichTextField.Size;
     constructor(args: RichTextField.ConstructorArgs);
     modify({ capabilities, ...args }: RichTextField.ModifyArgs): RichTextField;
 }
@@ -20,9 +20,9 @@ export declare namespace RichTextField {
         function toData(value: Value): Field.Data<RichTextField>;
         function isEmpty(value: Value | undefined): boolean;
     }
-    type Capabilities = Capabilities.Preset | Partial<Capabilities.Options>;
+    type Semantics = 'field' | 'area' | 'mini-editor' | 'full-editor';
+    type Capabilities = Partial<Capabilities.Options>;
     namespace Capabilities {
-        type Preset = 'l1' | 'l2' | 'l3';
         type Headings = Partial<Record<Heading, string>>;
         namespace Headings {
             const defaults: Readonly<Headings>;
@@ -58,14 +58,13 @@ export declare namespace RichTextField {
             const article: Options;
             const full: Options;
         }
-        function parse(options: Preset | Partial<Options>): Options;
+        function parse(options: Partial<Options>): Options;
     }
     type ConstructorArgs = Field.ConstructorArgs & {
+        semantics: Semantics;
         capabilities: Capabilities;
         minLength?: number;
         maxLength?: number;
-        size?: Size;
     };
-    type Size = 'sm' | 'md' | 'lg';
     type ModifyArgs = Omit<Partial<ConstructorArgs>, 'required'>;
 }

package/dist/schema/field/base/RichTextField.js

@@ -20,19 +20,14 @@ class RichTextField extends index_1.Field {
         super(args);
         this.type = 'richtext';
         // initialize instance variables
+        this.semantics = args.semantics;
         this.capabilities = RichTextField.Capabilities.parse(args.capabilities);
         this.minLength = args.minLength;
         this.maxLength = args.maxLength;
-        const intrinsicSize = getSize(args.capabilities);
-        this.size = !args.size || intrinsicSize === 'lg'
-            ? intrinsicSize
-            : args.size;
     }
     modify(_a) {
         var { capabilities = {} } = _a, args = __rest(_a, ["capabilities"]);
-        return new RichTextField(Object.assign(Object.assign({ name: this.name, hint: this.hint, description: this.description, required: this.required, minLength: this.minLength, maxLength: this.maxLength, size: this.size }, args), { capabilities: typeof capabilities === 'string'
-                ? RichTextField.Capabilities.parse(capabilities)
-                : Object.assign(Object.assign({}, this.capabilities), capabilities) }));
+        return new RichTextField(Object.assign({ name: this.name, hint: this.hint, description: this.description, semantics: this.semantics, capabilities: Object.assign(Object.assign({}, this.capabilities), capabilities), required: this.required, minLength: this.minLength, maxLength: this.maxLength }, args));
     }
 }
 exports.RichTextField = RichTextField;
@@ -158,39 +153,8 @@ exports.RichTextField = RichTextField;
         })(Options = Capabilities.Options || (Capabilities.Options = {}));
         // helpers
         function parse(options) {
-            switch (options) {
-                case 'l1':
-                    return Object.assign(Object.assign({}, Options.minimal), { bold: true, italics: true, underline: true, superscript: true, subscript: true });
-                case 'l2':
-                    return Object.assign(Object.assign({}, Options.minimal), { bold: true, italics: true, underline: true, superscript: true, subscript: true, links: true });
-                case 'l3':
-                    return Object.assign(Object.assign({}, Options.minimal), { bold: true, italics: true, underline: true, strikethrough: true, superscript: true, subscript: true, links: true, headings: Headings.defaults, lists: true, quotes: true, hr: true });
-                default:
-                    return Object.assign(Object.assign({}, Options.minimal), options);
-            }
+            return Object.assign(Object.assign({}, Options.minimal), options);
         }
         Capabilities.parse = parse;
     })(Capabilities = RichTextField.Capabilities || (RichTextField.Capabilities = {}));
 })(RichTextField || (exports.RichTextField = RichTextField = {}));
-// helpers
-function getSize(capabilities) {
-    // go with default scaling (if applicable)
-    if (capabilities === 'l1') {
-        return 'sm';
-    }
-    else if (capabilities === 'l2') {
-        return 'md';
-    }
-    else if (capabilities === 'l3') {
-        return 'lg';
-    }
-    // or large if there are lists/breaks
-    const { headings, lists, quotes, hr } = capabilities;
-    if (headings || lists || quotes || hr) {
-        return 'lg';
-    }
-    // otherwise, small
-    else {
-        return 'sm';
-    }
-}

package/dist/ui/BlockThemes.d.ts

@@ -15,5 +15,4 @@ export declare namespace BlockThemes {
     type Options = Record<Theme.Extended, Option>;
     function current(): Readonly<Options>;
     function set<TTheme extends string = string>(themes: PartialBy<BlockThemes, 'default'>): void;
-    function getClassName(theme: Theme): string;
 }

package/dist/ui/BlockThemes.js

@@ -13,14 +13,6 @@ var BlockThemes;
         _themes = Object.assign(Object.assign({}, _default), themes);
     }
     BlockThemes.set = set;
-    function getClassName(theme) {
-        var _a;
-        // get entry
-        const { group = 'default' } = (_a = _themes[theme]) !== null && _a !== void 0 ? _a : {};
-        // render
-        return `nd-theme-${theme} nd-themeGroup-${group}`;
-    }
-    BlockThemes.getClassName = getClassName;
 })(BlockThemes || (exports.BlockThemes = BlockThemes = {}));
 // constants
 const _default = {

package/dist/ui/FileType.d.ts

@@ -3,6 +3,6 @@ export type FileType = 'image' | 'video' | 'icon' | 'audio' | 'document' | 'othe
 export declare namespace FileType {
     const values: ReadonlyArray<FileType>;
     function coerce(mimeType: MimeType): FileType;
-    function compare(lhs: FileType, rhs: FileType): 0 | 1 | -1;
+    function compare(lhs: FileType, rhs: FileType): 1 | 0 | -1;
     function filter(value: any): value is FileType;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nascentdigital/funnel-core",
-  "version": "4.5.3",
+  "version": "4.5.4",
   "repository": {
     "url": "git+https://github.com/nascentdigital/funnel.git",
     "directory": "libs/core"
@@ -65,5 +65,5 @@
     "jest-tsd": "^0.2.2",
     "ts-jest": "^29.3.2"
   },
-  "gitHead": "ef42bb5440cc23187aeefc29319875ed5402676f"
+  "gitHead": "d3d65564e0935e40c8b1e441316b63a126516bca"
 }