@luomus/laji-form-builder 1.1.7 → 1.1.9

package/lib/model.d.ts

@@ -10,10 +10,10 @@ export declare enum PropertyRange {
     keyAny = "MZ.keyAny",
     Decimal = "xsd:decimal"
 }
-export declare type Property = {
+export type Property = {
     property: string;
     label: Partial<Record<Lang, string>>;
-    range: (PropertyRange | string)[];
+    range: (PropertyRange | string);
     shortName: string;
     comment?: Partial<Record<Lang, string>>;
     maxOccurs: string;
@@ -23,24 +23,24 @@ export declare type Property = {
     required: boolean;
     domain: string[];
 };
-export declare type PropertyContext = {
+export type PropertyContext = {
     "@id": string;
     "@type"?: PropertyRange;
     "@container"?: "@set";
 };
-export declare type Lang = "fi" | "sv" | "en";
+export type Lang = "fi" | "sv" | "en";
 export declare const LANGS: Lang[];
 export declare const isLang: (lang: unknown) => lang is Lang;
-export declare type CompleteTranslations = Record<Lang, Record<string, string>>;
-export declare type Translations = Partial<CompleteTranslations>;
-declare type KnownFormOptions = {
+export type CompleteTranslations = Record<Lang, Record<string, string>>;
+export type Translations = Partial<CompleteTranslations>;
+type KnownFormOptions = {
     prepopulatedDocument?: Record<string, JSONObject>;
     prepopulateWithInformalTaxonGroups?: string[];
     prepopulateWithTaxonSets?: string[];
     useSchemaCommentsAsHelpTexts?: boolean;
 };
-export declare type FormOptions = JSONObject & KnownFormOptions;
-export declare type CommonFormat = {
+export type FormOptions = JSONObject & KnownFormOptions;
+export type CommonFormat = {
     id?: string;
     options?: FormOptions;
     title?: string;
@@ -56,19 +56,19 @@ export declare type CommonFormat = {
     baseFormID?: string;
     fieldsFormID?: string;
 };
-export declare type FormListing = CommonFormat & {
+export type FormListing = CommonFormat & {
     id: string;
 };
-export declare type CommonExpanded = CommonFormat & {
+export type CommonExpanded = CommonFormat & {
     uiSchema?: JSONObject;
 };
-export declare type JSON = string | number | boolean | JSONObject | JSON[] | null;
-export declare type JSONObject = {
+export type JSON = string | number | boolean | JSONObject | JSON[] | null;
+export type JSONObject = {
     [prop: string]: JSON;
 };
-export declare const isJSONObject: (json?: JSON | undefined) => json is JSONObject;
-export declare const isJSONObjectOrUndefined: (v?: JSON | undefined) => v is JSON | undefined;
-export declare type Master = CommonExpanded & {
+export declare const isJSONObject: (json?: JSON) => json is JSONObject;
+export declare const isJSONObjectOrUndefined: (v?: JSON) => v is JSON | undefined;
+export type Master = CommonExpanded & {
     fields?: Field[];
     patch?: any[];
     "@type"?: string;
@@ -79,7 +79,7 @@ export declare type Master = CommonExpanded & {
     }>;
 };
 export declare function isMaster(master: unknown): master is Master;
-export declare type SchemaFormat = CommonExpanded & {
+export type SchemaFormat = CommonExpanded & {
     schema: JSONSchema;
     validators: {
         [prop: string]: (JSONObject | boolean);
@@ -102,18 +102,18 @@ export declare type SchemaFormat = CommonExpanded & {
     context?: string;
     translations?: Translations;
 };
-export declare type ExpandedJSONFormat = CommonExpanded & {
+export type ExpandedJSONFormat = CommonExpanded & {
     fields?: ExpandedField[];
 };
-export declare type SupportedFormat = ExpandedJSONFormat | SchemaFormat | RemoteMaster;
-export declare type ExpandedMaster = Omit<Master, "baseFormID" | "patch"> & {
+export type SupportedFormat = ExpandedJSONFormat | SchemaFormat | RemoteMaster;
+export type ExpandedMaster = Omit<Master, "baseFormID" | "patch"> & {
     fields?: Field[];
     uiSchema: JSONObject;
 };
-export declare type RemoteMaster = Master & {
+export type RemoteMaster = Master & {
     id: string;
 };
-export declare type FieldOptions = {
+export type FieldOptions = {
     excludeFromCopy?: boolean;
     default?: JSON;
     whitelist?: string[];
@@ -123,7 +123,7 @@ export declare type FieldOptions = {
     minItems?: number;
     value_options?: Record<string, string>;
 };
-export declare type Field = {
+export type Field = {
     name: string;
     type?: "hidden" | "string" | "checkbox";
     required?: boolean;
@@ -133,64 +133,64 @@ export declare type Field = {
     label?: string;
     fields?: Field[];
 };
-export declare type ExpandedFieldType = "text" | "fieldset" | "select" | "checkbox" | "string" | "number" | "integer" | "integer:nonNegativeInteger" | "integer:positiveInteger";
-export declare type ExpandedFieldOptions = FieldOptions & {
+export type ExpandedFieldType = "text" | "fieldset" | "select" | "checkbox" | "string" | "number" | "integer" | "integer:nonNegativeInteger" | "integer:positiveInteger";
+export type ExpandedFieldOptions = FieldOptions & {
     target_element?: {
         type: ExpandedFieldType;
     };
 };
-export declare type ExpandedField = Omit<Field, "type" | "fields"> & {
+export type ExpandedField = Omit<Field, "type" | "fields"> & {
     type?: "hidden" | "collection" | ExpandedFieldType;
     fields?: ExpandedField[];
     options?: ExpandedFieldOptions;
 };
-export declare type AltTreeParent = {
+export type AltTreeParent = {
     children: Record<string, AltTreeNode>;
     order: string[];
 };
-export declare type AltTreeLeaf = {
+export type AltTreeLeaf = {
     [K in any]: never;
 };
-export declare type AltTreeNode = AltTreeParent | AltTreeLeaf;
-export declare type AltParentMap = Record<string, string[]>;
-export declare type Range = {
+export type AltTreeNode = AltTreeParent | AltTreeLeaf;
+export type AltParentMap = Record<string, string[]>;
+export type Range = {
     id: string;
     value?: Partial<Record<Lang, string>>;
     vernacularName?: Partial<Record<Lang, string>>;
     altParent?: string;
 };
-export declare type Class = {
+export type Class = {
     class: string;
     label: Partial<Record<Lang, string>>;
     shortName: string;
 };
-export declare type FormDeleteResult = {
+export type FormDeleteResult = {
     affected: number;
 };
 export declare enum Format {
     Schema = "schema",
     JSON = "json"
 }
-export declare type JSONSchema = JSONSchemaObject | JSONSchemaArray | JSONSchemaNumber | JSONSchemaInteger | JSONSchemaBoolean | JSONSchemaString | JSONSchemaEnumOneOf;
-declare type JSONShemaTypeCommon<T, D> = {
+export type JSONSchema = JSONSchemaObject | JSONSchemaArray | JSONSchemaNumber | JSONSchemaInteger | JSONSchemaBoolean | JSONSchemaString | JSONSchemaEnumOneOf;
+type JSONShemaTypeCommon<T, D> = {
     type: T;
     default?: D;
     title?: string;
 };
-export declare type JSONSchemaObject = JSONShemaTypeCommon<"object", Record<string, unknown>> & {
+export type JSONSchemaObject = JSONShemaTypeCommon<"object", Record<string, unknown>> & {
     properties: Record<string, JSONSchema>;
     required?: string[];
 };
 export declare function isJSONSchemaObject(schema: JSONSchema): schema is JSONSchemaObject;
-export declare type JSONSchemaArray = JSONShemaTypeCommon<"array", unknown[]> & {
+export type JSONSchemaArray = JSONShemaTypeCommon<"array", unknown[]> & {
     items: JSONSchema;
     uniqueItems?: boolean;
 };
-export declare type JSONSchemaNumber = JSONShemaTypeCommon<"number", number>;
-export declare type JSONSchemaInteger = JSONShemaTypeCommon<"integer", number>;
-export declare type JSONSchemaBoolean = JSONShemaTypeCommon<"boolean", boolean>;
-export declare type JSONSchemaString = JSONShemaTypeCommon<"string", string>;
-export declare type JSONSchemaEnumOneOf = JSONSchemaString & {
+export type JSONSchemaNumber = JSONShemaTypeCommon<"number", number>;
+export type JSONSchemaInteger = JSONShemaTypeCommon<"integer", number>;
+export type JSONSchemaBoolean = JSONShemaTypeCommon<"boolean", boolean>;
+export type JSONSchemaString = JSONShemaTypeCommon<"string", string>;
+export type JSONSchemaEnumOneOf = JSONSchemaString & {
     oneOf: {
         const: string;
         title: string;

package/lib/model.js

@@ -18,12 +18,12 @@ var PropertyRange;
 exports.LANGS = ["fi", "en", "sv"];
 const isLang = (lang) => typeof lang === "string" && exports.LANGS.includes(lang);
 exports.isLang = isLang;
-const isJSONObject = (json) => utils_1.isObject(json);
+const isJSONObject = (json) => (0, utils_1.isObject)(json);
 exports.isJSONObject = isJSONObject;
-const isJSONObjectOrUndefined = (v) => v === undefined || exports.isJSONObject(v);
+const isJSONObjectOrUndefined = (v) => v === undefined || (0, exports.isJSONObject)(v);
 exports.isJSONObjectOrUndefined = isJSONObjectOrUndefined;
 function isMaster(master) {
-    return utils_1.isObject(master);
+    return (0, utils_1.isObject)(master);
 }
 exports.isMaster = isMaster;
 var Format;

package/lib/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAEnC,IAAY,aAWX;AAXD,WAAY,aAAa;IACxB,oCAAmB,CAAA;IACnB,wCAAuB,CAAA;IACvB,sCAAqB,CAAA;IACrB,2BAAU,CAAA;IACV,wDAAuC,CAAA;IACvC,0CAAyB,CAAA;IACzB,8DAA6C,CAAA;IAC7C,yCAAwB,CAAA;IACxB,qCAAoB,CAAA;IACpB,wCAAuB,CAAA;AACxB,CAAC,EAXW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAWxB;AAwBY,QAAA,KAAK,GAAW,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAEzC,MAAM,MAAM,GAAG,CAAC,IAAa,EAAgB,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,aAAK,CAAC,QAAQ,CAAC,IAAW,CAAC,CAAC;AAAlG,QAAA,MAAM,UAA4F;AAyCxG,MAAM,YAAY,GAAG,CAAC,IAAW,EAAsB,EAAE,CAAC,gBAAQ,CAAC,IAAI,CAAC,CAAC;AAAnE,QAAA,YAAY,gBAAuD;AAEzE,MAAM,uBAAuB,GAAG,CAAC,CAAQ,EAA2B,EAAE,CAAC,CAAC,KAAK,SAAS,IAAI,oBAAY,CAAC,CAAC,CAAC,CAAC;AAApG,QAAA,uBAAuB,2BAA6E;AAWjH,SAAgB,QAAQ,CAAC,MAAe;IACvC,OAAO,gBAAQ,CAAC,MAAM,CAAC,CAAC;AACzB,CAAC;AAFD,4BAEC;AAwGD,IAAY,MAGX;AAHD,WAAY,MAAM;IACjB,2BAAiB,CAAA;IACjB,uBAAa,CAAA;AACd,CAAC,EAHW,MAAM,GAAN,cAAM,KAAN,cAAM,QAGjB;AAsBD,SAAgB,kBAAkB,CAAC,MAAkB;IACpD,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC;AACjC,CAAC;AAFD,gDAEC;AAmBD,SAAgB,qBAAqB,CAAC,UAAsB;IAC3D,OAAO,CAAC,CAAE,UAAkB,CAAC,KAAK,CAAC;AACpC,CAAC;AAFD,sDAEC"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAEnC,IAAY,aAWX;AAXD,WAAY,aAAa;IACxB,oCAAmB,CAAA;IACnB,wCAAuB,CAAA;IACvB,sCAAqB,CAAA;IACrB,2BAAU,CAAA;IACV,wDAAuC,CAAA;IACvC,0CAAyB,CAAA;IACzB,8DAA6C,CAAA;IAC7C,yCAAwB,CAAA;IACxB,qCAAoB,CAAA;IACpB,wCAAuB,CAAA;AACxB,CAAC,EAXW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAWxB;AAwBY,QAAA,KAAK,GAAW,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAEzC,MAAM,MAAM,GAAG,CAAC,IAAa,EAAgB,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,aAAK,CAAC,QAAQ,CAAC,IAAW,CAAC,CAAC;AAAlG,QAAA,MAAM,UAA4F;AAyCxG,MAAM,YAAY,GAAG,CAAC,IAAW,EAAsB,EAAE,CAAC,IAAA,gBAAQ,EAAC,IAAI,CAAC,CAAC;AAAnE,QAAA,YAAY,gBAAuD;AAEzE,MAAM,uBAAuB,GAAG,CAAC,CAAQ,EAA2B,EAAE,CAAC,CAAC,KAAK,SAAS,IAAI,IAAA,oBAAY,EAAC,CAAC,CAAC,CAAC;AAApG,QAAA,uBAAuB,2BAA6E;AAWjH,SAAgB,QAAQ,CAAC,MAAe;IACvC,OAAO,IAAA,gBAAQ,EAAC,MAAM,CAAC,CAAC;AACzB,CAAC;AAFD,4BAEC;AAwGD,IAAY,MAGX;AAHD,WAAY,MAAM;IACjB,2BAAiB,CAAA;IACjB,uBAAa,CAAA;AACd,CAAC,EAHW,MAAM,GAAN,cAAM,KAAN,cAAM,QAGjB;AAsBD,SAAgB,kBAAkB,CAAC,MAAkB;IACpD,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC;AACjC,CAAC;AAFD,gDAEC;AAmBD,SAAgB,qBAAqB,CAAC,UAAsB;IAC3D,OAAO,CAAC,CAAE,UAAkB,CAAC,KAAK,CAAC;AACpC,CAAC;AAFD,sDAEC"}

package/lib/services/form-expander-service.d.ts

@@ -1,5 +1,5 @@
 import { ExpandedMaster, Master } from "../model";
-declare type HasGetForm = {
+type HasGetForm = {
     getForm: (id: string, abort?: AbortSignal) => Promise<Master>;
 };
 export default class FormExpanderService {
@@ -8,7 +8,7 @@ export default class FormExpanderService {
     linkMaster(master: Master, signal?: AbortSignal): Promise<Omit<Omit<Master, "baseFormID">, "fieldsFormID">>;
     private mapBaseForm;
     private mapBaseFormFrom;
-    mapFieldsFormID: <T extends Pick<Master, "uiSchema" | "fields" | "translations" | "fieldsFormID" | "context">>(master: T) => Promise<Omit<T, "fieldsFormID">>;
+    mapFieldsFormID: <T extends Pick<Master, "context" | "uiSchema" | "fields" | "translations" | "fieldsFormID">>(master: T) => Promise<Omit<T, "fieldsFormID">>;
     expandMaster(master: Master, signal?: AbortSignal): Promise<ExpandedMaster>;
     private applyPatches;
 }

package/lib/services/form-expander-service.js

@@ -41,7 +41,7 @@ class FormExpanderService {
             }
             const { fieldsFormID } = master, masterWithoutFieldsFormID = __rest(master, ["fieldsFormID"]);
             const { fields, uiSchema, translations, context } = yield this.expandMaster(yield this.storeService.getForm(fieldsFormID));
-            const _master = Object.assign(Object.assign({}, masterWithoutFieldsFormID), { fields, translations: deepmerge_1.default(translations || {}, master.translations || {}), uiSchema: deepmerge_1.default(master.uiSchema || {}, uiSchema || {}) });
+            const _master = Object.assign(Object.assign({}, masterWithoutFieldsFormID), { fields, translations: (0, deepmerge_1.default)(translations || {}, master.translations || {}), uiSchema: (0, deepmerge_1.default)(master.uiSchema || {}, uiSchema || {}) });
             if (!master.context && context) {
                 _master.context = context;
             }
@@ -50,23 +50,23 @@ class FormExpanderService {
         this.storeService = storeService;
     }
     linkMaster(master, signal) {
-        return utils_1.reduceWith(JSON.parse(JSON.stringify(master)), signal, this.mapBaseForm, this.mapFieldsFormID);
+        return (0, utils_1.reduceWith)(JSON.parse(JSON.stringify(master)), signal, this.mapBaseForm, this.mapFieldsFormID);
     }
     mapBaseFormFrom(form, baseForm) {
         const { id } = baseForm, _baseForm = __rest(baseForm, ["id"]);
-        form = Object.assign(Object.assign(Object.assign({}, _baseForm), form), { translations: deepmerge_1.default(_baseForm.translations || {}, form.translations || {}), uiSchema: deepmerge_1.default(_baseForm.uiSchema || {}, form.uiSchema || {}) });
+        form = Object.assign(Object.assign(Object.assign({}, _baseForm), form), { translations: (0, deepmerge_1.default)(_baseForm.translations || {}, form.translations || {}), uiSchema: (0, deepmerge_1.default)(_baseForm.uiSchema || {}, form.uiSchema || {}) });
         delete form.baseFormID;
         return form;
     }
     expandMaster(master, signal) {
         return __awaiter(this, void 0, void 0, function* () {
-            return utils_1.reduceWith(yield this.linkMaster(master, signal), undefined, this.applyPatches, addEmptyUiSchema);
+            return (0, utils_1.reduceWith)(yield this.linkMaster(master, signal), undefined, this.applyPatches, addEmptyUiSchema);
         });
     }
     applyPatches(master) {
         const { patch } = master, _master = __rest(master, ["patch"]);
         return patch
-            ? fast_json_patch_1.applyPatch(_master, patch, undefined, false).newDocument
+            ? (0, fast_json_patch_1.applyPatch)(_master, patch, undefined, false).newDocument
             : master;
     }
 }

package/lib/services/form-expander-service.js.map

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

package/lib/services/metadata-service.d.ts

@@ -1,19 +1,19 @@
 /// <reference types="memoizee" />
 import ApiClient from "../api-client";
 import { Property, PropertyContext, Range, Lang, Class, JSONSchema, Field } from "../model";
-import HasCache from "./has-cache";
-export default class MetadataService extends HasCache {
+import UsesMemoization from "./uses-memoization";
+export default class MetadataService extends UsesMemoization {
     private apiClient;
     private lang;
-    private allRanges;
+    private allAlts;
     constructor(apiClient: ApiClient, lang: Lang);
     flush(): void;
     setLang(lang: Lang): void;
     getPropertiesContextFor: ((context: string) => Promise<Record<string, PropertyContext>>) & import("memoizee").Memoized<(context: string) => Promise<Record<string, PropertyContext>>>;
-    getPropertiesForEmbeddedProperty: ((property: string, lang?: string, signal?: AbortSignal | undefined) => Promise<Property[]>) & import("memoizee").Memoized<(property: string, lang?: string, signal?: AbortSignal | undefined) => Promise<Property[]>>;
+    getPropertiesForEmbeddedProperty: ((property: string, lang?: string, signal?: AbortSignal) => Promise<Property[]>) & import("memoizee").Memoized<(property: string, lang?: string, signal?: AbortSignal) => Promise<Property[]>>;
     getProperties(fields: Field[], property: Property, signal?: AbortSignal): Promise<Record<string, Property>>;
-    getRange: ((property: string) => Promise<Range[]>) & import("memoizee").Memoized<(property: string) => Promise<Range[]>>;
-    getAllRanges: () => Promise<Record<string, Range[]>>;
+    getAlt: ((property: string) => Promise<Range[]>) & import("memoizee").Memoized<(property: string) => Promise<Range[]>>;
+    getAllAlts: () => Promise<Record<string, Range[]>>;
     isAltRange: (range: string) => Promise<boolean>;
     getJSONSchemaFromProperty<T extends JSONSchema>(property: Property): Promise<T>;
     getClasses: (() => Promise<Class[]>) & import("memoizee").Memoized<() => Promise<Class[]>>;

package/lib/services/metadata-service.js

@@ -14,35 +14,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const model_1 = require("../model");
 const utils_1 = require("../utils");
-const has_cache_1 = __importDefault(require("./has-cache"));
-class MetadataService extends has_cache_1.default {
+const uses_memoization_1 = __importDefault(require("./uses-memoization"));
+class MetadataService extends uses_memoization_1.default {
     constructor(apiClient, lang) {
         super();
-        this.getPropertiesContextFor = this.cache((context) => utils_1.fetchJSON(`https://schema.laji.fi/context/${context}.jsonld`)
+        this.getPropertiesContextFor = this.memoize((context) => (0, utils_1.fetchJSON)(`https://schema.laji.fi/context/${context}.jsonld`)
             .then(result => result["@context"]));
-        this.getPropertiesForEmbeddedProperty = this.cache((property, lang = "multi", signal) => __awaiter(this, void 0, void 0, function* () {
-            return (yield this.apiClient.fetchJSON(`/metadata/classes/${utils_1.unprefixProp(property)}/properties`, { lang }, { signal })).results;
+        this.getPropertiesForEmbeddedProperty = this.memoize((property, lang = "multi", signal) => __awaiter(this, void 0, void 0, function* () {
+            return (yield this.apiClient.fetchJSON(`/metadata/classes/${property}/properties`, { lang }, { signal })).results;
         }), { length: 2 });
-        this.getRange = this.cache((property) => this.allRanges && Promise.resolve(this.allRanges[property])
+        this.getAlt = this.memoize((property) => this.allAlts && Promise.resolve(this.allAlts[property])
             || this.apiClient.fetchJSON(
             // eslint-disable-next-line max-len
-            `/metadata/ranges/${utils_1.unprefixProp(property)}`, { lang: "multi" }));
-        this.getAllRanges = () => __awaiter(this, void 0, void 0, function* () {
-            if (this.allRanges) {
-                return this.allRanges;
+            `/metadata/alts/${property}`, { lang: "multi" }));
+        this.getAllAlts = () => __awaiter(this, void 0, void 0, function* () {
+            if (this.allAlts) {
+                return this.allAlts;
             }
-            const ranges = yield this.apiClient.fetchJSON("/metadata/ranges", { lang: "multi" });
-            this.allRanges = ranges;
-            return ranges;
+            const alts = yield this.apiClient.fetchJSON("/metadata/alts", { lang: "multi" });
+            this.allAlts = alts;
+            return alts;
         });
-        this.isAltRange = (range) => __awaiter(this, void 0, void 0, function* () { return !!(yield this.getAllRanges())[range]; });
-        this.getClasses = this.cache(() => __awaiter(this, void 0, void 0, function* () { return (yield this.apiClient.fetchJSON("/metadata/classes")).results; }));
+        this.isAltRange = (range) => __awaiter(this, void 0, void 0, function* () { return !!(yield this.getAllAlts())[range]; });
+        this.getClasses = this.memoize(() => __awaiter(this, void 0, void 0, function* () { return (yield this.apiClient.fetchJSON("/metadata/classes")).results; }));
         this.apiClient = apiClient;
         this.lang = lang;
     }
     flush() {
         super.flush();
-        this.allRanges = undefined;
+        this.allAlts = undefined;
     }
     setLang(lang) {
         this.lang = lang;
@@ -50,10 +50,10 @@ class MetadataService extends has_cache_1.default {
     getProperties(fields, property, signal) {
         return __awaiter(this, void 0, void 0, function* () {
             return fields
-                ? (yield this.getPropertiesForEmbeddedProperty(property.range[0], undefined, signal))
+                ? (yield this.getPropertiesForEmbeddedProperty(property.range, undefined, signal))
                     .reduce((propMap, prop) => {
-                    if (fields.some(f => utils_1.unprefixProp(prop.property) === utils_1.unprefixProp(f.name))) {
-                        propMap[utils_1.unprefixProp(prop.property)] = prop;
+                    if (fields.some(f => (0, utils_1.unprefixProp)(prop.property) === (0, utils_1.unprefixProp)(f.name))) {
+                        propMap[(0, utils_1.unprefixProp)(prop.property)] = prop;
                     }
                     return propMap;
                 }, {})
@@ -63,10 +63,10 @@ class MetadataService extends has_cache_1.default {
     getJSONSchemaFromProperty(property) {
         const mapRangeToSchema = (property) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const range = property.range[0];
-            const isRange = yield this.isAltRange(range);
-            if (isRange) {
-                const _enums = yield this.getRange(range);
+            const range = property.range;
+            const isAlt = yield this.isAltRange(range);
+            if (isAlt) {
+                const _enums = yield this.getAlt(range);
                 const empty = property.minOccurs === "1" ? [] : [""];
                 let enums = [...empty], enumNames = [...empty];
                 for (const e of _enums) {
@@ -110,7 +110,7 @@ class MetadataService extends has_cache_1.default {
                     schema = utils_1.JSONSchemaBuilder.object();
                     break;
                 default:
-                    if (!property.isEmbeddable && utils_1.unprefixProp(property.property) !== "geometry") {
+                    if (!property.isEmbeddable && (0, utils_1.unprefixProp)(property.property) !== "geometry") {
                         schema = utils_1.JSONSchemaBuilder.String();
                     }
                     else {
@@ -123,11 +123,11 @@ class MetadataService extends has_cache_1.default {
             ? utils_1.JSONSchemaBuilder.array(schema)
             : schema;
         const mapUniqueItemsForUnboundedAlt = (schema, { range, maxOccurs }) => __awaiter(this, void 0, void 0, function* () {
-            return (yield this.isAltRange(range[0])) && maxOccurs === "unbounded"
+            return (yield this.isAltRange(range)) && maxOccurs === "unbounded"
                 ? Object.assign(Object.assign({}, schema), { uniqueItems: true }) : schema;
         });
-        const mapLabel = (schema, { label }) => (Object.assign(Object.assign({}, schema), { title: utils_1.multiLang(label, this.lang) }));
-        const mapPropertyToJSONSchema = (property) => utils_1.reduceWith(mapRangeToSchema(property), property, mapMaxOccurs, mapUniqueItemsForUnboundedAlt, mapLabel);
+        const mapLabel = (schema, { label }) => (Object.assign(Object.assign({}, schema), { title: (0, utils_1.multiLang)(label, this.lang) }));
+        const mapPropertyToJSONSchema = (property) => (0, utils_1.reduceWith)(mapRangeToSchema(property), property, mapMaxOccurs, mapUniqueItemsForUnboundedAlt, mapLabel);
         const propertiesToSchema = (modelProperties) => __awaiter(this, void 0, void 0, function* () {
             return utils_1.JSONSchemaBuilder.object((yield Promise.all(modelProperties.map((m) => __awaiter(this, void 0, void 0, function* () { return ({ property: m.shortName, schema: (yield mapPropertyToJSONSchema(m)) }); })))).reduce((properties, { property, schema }) => (Object.assign(Object.assign({}, properties), { [property]: schema })), {}));
         });

package/lib/services/metadata-service.js.map

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

package/lib/services/uses-memoization.d.ts

@@ -0,0 +1,8 @@
+import memoize from "memoizee";
+export default class UsesMemoization {
+    private memoizeStore;
+    protected memoize: <F extends Function>(fn: F, options?: memoize.Options & {
+        clearDepLength?: number;
+    }) => F & memoize.Memoized<F>;
+    flush(): void;
+}

package/lib/services/{has-cache.js → uses-memoization.js}

@@ -4,19 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const memoizee_1 = __importDefault(require("memoizee"));
-class HasCache {
+class UsesMemoization {
     constructor() {
-        this.cacheStore = [];
+        this.memoizeStore = [];
         // eslint-disable-next-line @typescript-eslint/ban-types
-        this.cache = (fn, options) => {
-            const cached = memoizee_1.default(fn, Object.assign({ promise: true, primitive: true }, (options || {})));
-            this.cacheStore.push(cached);
+        this.memoize = (fn, options) => {
+            const cached = (0, memoizee_1.default)(fn, Object.assign({ promise: true, primitive: true }, (options || {})));
+            this.memoizeStore.push(cached);
             return cached;
         };
     }
     flush() {
-        this.cacheStore.forEach(c => c.clear());
+        this.memoizeStore.forEach(c => c.clear());
     }
 }
-exports.default = HasCache;
-//# sourceMappingURL=has-cache.js.map
+exports.default = UsesMemoization;
+//# sourceMappingURL=uses-memoization.js.map

package/lib/services/uses-memoization.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"uses-memoization.js","sourceRoot":"","sources":["../../src/services/uses-memoization.ts"],"names":[],"mappings":";;;;;AAAA,wDAA6C;AAE7C,MAAqB,eAAe;IAApC;QACS,iBAAY,GAAsB,EAAE,CAAC;QAE7C,wDAAwD;QAC9C,YAAO,GAAG,CAAqB,EAAK,EAAE,OAAuD,EAAE,EAAE;YAC1G,MAAM,MAAM,GAAG,IAAA,kBAAO,EAAC,EAAE,kBAAI,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,IAAK,CAAC,OAAO,IAAI,EAAE,CAAC,EAAG,CAAC;YACnF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC/B,OAAO,MAAM,CAAC;QACf,CAAC,CAAC;IAKH,CAAC;IAHO,KAAK;QACX,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IAC3C,CAAC;CACD;AAbD,kCAaC"}

package/lib/utils.d.ts

@@ -1,6 +1,6 @@
 import { Field, JSONSchema, JSONSchemaArray, JSONSchemaBoolean, JSONSchemaEnumOneOf, JSONSchemaInteger, JSONSchemaNumber, JSONSchemaObject, JSONSchemaString, Lang, Master, Property } from "./model";
 export declare const translate: <T>(obj: T, translations: Record<string, string>) => T;
-declare type EVOptions = Record<string, unknown>;
+type EVOptions = Record<string, unknown>;
 export declare class JSONSchemaBuilder {
     static type: <T extends JSONSchema>(type: string) => (options?: {}) => T;
     static String: (options?: {}) => JSONSchemaString;
@@ -14,8 +14,8 @@ export declare class JSONSchemaBuilder {
         enumNames: string[];
     }, options?: EVOptions): JSONSchemaEnumOneOf;
 }
-export declare const parseJSONPointer: (obj: any, path: string, safeMode?: true | "createParents" | undefined) => any;
-declare type Reducer<T, R, P> = {
+export declare const parseJSONPointer: (obj: any, path: string, safeMode?: true | "createParents") => any;
+type Reducer<T, R, P> = {
     (value: T, reduceWith: P): R | Promise<R>;
 };
 /**
@@ -58,6 +58,6 @@ export declare const fetchJSON: <T>(path: string, options?: any) => Promise<T>;
  **/
 export declare const dictionarify: <T, K extends string | number | symbol>(arr: T[], operator?: ((item: T) => K) | undefined) => Record<K, true>;
 export declare const dictionarifyByKey: <T extends Record<string, unknown>>(objects: T[], key: keyof T) => Record<string, T>;
-export declare const getPropertyContextName: (context?: string | undefined) => string;
+export declare const getPropertyContextName: (context?: string) => string;
 export declare const getRootField: (master: Pick<Master, "context">) => Field;
 export declare const getRootProperty: (rootField: Field) => Property;

package/lib/utils.js

@@ -8,7 +8,7 @@ const cross_fetch_1 = __importDefault(require("cross-fetch"));
 const utils_1 = require("@luomus/laji-form/lib/utils");
 const translate = (obj, translations) => {
     function translate(_any) {
-        if (exports.isObject(_any)) {
+        if ((0, exports.isObject)(_any)) {
             return Object.keys(_any).reduce((translated, key) => {
                 translated[key] = translate(_any[key]);
                 return translated;
@@ -48,7 +48,7 @@ JSONSchemaBuilder.Boolean = JSONSchemaBuilder.type("boolean");
 JSONSchemaBuilder.array = (items, options = {}) => JSONSchemaBuilder.type("array")(Object.assign({ items }, options));
 JSONSchemaBuilder.object = (properties = {}, options = {}) => JSONSchemaBuilder.type("object")(Object.assign({ properties }, options));
 const parseJSONPointer = (obj, path, safeMode) => {
-    return utils_1.parseJSONPointer(obj, path, safeMode, true);
+    return (0, utils_1.parseJSONPointer)(obj, path, safeMode, true);
 };
 exports.parseJSONPointer = parseJSONPointer;
 function isPromise(p) {
@@ -73,7 +73,7 @@ exports.isObject = utils_1.isObject;
  **/
 const unprefixProp = (s) => s.replace(/^.+\./, "");
 exports.unprefixProp = unprefixProp;
-const fetchJSON = (path, options) => cross_fetch_1.default(path, options).then(r => r.json());
+const fetchJSON = (path, options) => (0, cross_fetch_1.default)(path, options).then(r => r.json());
 exports.fetchJSON = fetchJSON;
 /**
  * Converts an array into a dictionary with the array items as the keys.
@@ -91,25 +91,23 @@ const dictionarifyByKey = (objects, key) => objects.reduce((map, obj) => {
     return map;
 }, {});
 exports.dictionarifyByKey = dictionarifyByKey;
-const getPropertyContextName = (context) => typeof context === "string" ? context : "document";
+const getPropertyContextName = (context) => typeof context === "string" ? context : "MY.document";
 exports.getPropertyContextName = getPropertyContextName;
-const getRootField = (master) => {
-    return { name: exports.unprefixProp(exports.getPropertyContextName(master.context)) };
-};
+const getRootField = (master) => ({
+    name: (0, exports.getPropertyContextName)(master.context)
+});
 exports.getRootField = getRootField;
-const getRootProperty = (rootField) => {
-    return {
-        property: rootField.name,
-        isEmbeddable: true,
-        range: [rootField.name],
-        label: {},
-        shortName: exports.unprefixProp(rootField.name),
-        required: true,
-        minOccurs: "1",
-        maxOccurs: "1",
-        multiLanguage: false,
-        domain: []
-    };
-};
+const getRootProperty = (rootField) => ({
+    property: rootField.name,
+    isEmbeddable: true,
+    range: rootField.name,
+    label: {},
+    shortName: (0, exports.unprefixProp)(rootField.name),
+    required: true,
+    minOccurs: "1",
+    maxOccurs: "1",
+    multiLanguage: false,
+    domain: []
+});
 exports.getRootProperty = getRootProperty;
 //# sourceMappingURL=utils.js.map

package/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAgC;AAChC,uDAA2G;AAIpG,MAAM,SAAS,GAAG,CAAI,GAAM,EAAE,YAAoC,EAAK,EAAE;IAC/E,SAAS,SAAS,CAAC,IAAS;QAC3B,IAAI,IAAA,gBAAQ,EAAC,IAAI,CAAC,EAAE;YACnB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAM,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE;gBACxD,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBACvC,OAAO,UAAU,CAAC;YACnB,CAAC,EAAE,EAAE,CAAC,CAAC;SACP;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;SAC3B;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YAChD,IAAI,OAAO,YAAY,CAAC,IAAI,CAAC,KAAK,QAAQ,EAAE;gBAC3C,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;aAC1B;YACD,iDAAiD;YACjD,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;gBACjC,OAAO,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;aACpC;SACD;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IACD,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;AACvB,CAAC,CAAC;AAtBW,QAAA,SAAS,aAsBpB;AAIF,MAAa,iBAAiB;IAU7B,MAAM,CAAC,GAAG,CAAC,KAA4C,EAAE,OAAmB;QAE3E,uCACI,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,GACjC,CAAC,EAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;gBACjD,KAAK,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,EAAC,CAAC,CAAC;gBACtD,OAAO,KAAK,CAAC;YACd,CAAC,EAAE,EAAsC,CAAC,EAAC,CAAC,EAC3C;IACH,CAAC;;AAnBF,8CAoBC;AAnBO,sBAAI,GAAG,CAAuB,IAAY,EAAE,EAAE,CAAC,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,gBAAC,IAAI,IAAK,OAAO,CAAO,CAAA,CAAC;AAC3F,wBAAM,GAAG,iBAAiB,CAAC,IAAI,CAAmB,QAAQ,CAAC,CAAC;AAC5D,wBAAM,GAAG,iBAAiB,CAAC,IAAI,CAAmB,QAAQ,CAAC,CAAC;AAC5D,yBAAO,GAAG,iBAAiB,CAAC,IAAI,CAAoB,SAAS,CAAC,CAAC;AAC/D,yBAAO,GAAG,iBAAiB,CAAC,IAAI,CAAoB,SAAS,CAAC,CAAC;AAC/D,uBAAK,GAAG,CAAC,KAAU,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAkB,OAAO,CAAC,iBAAE,KAAK,IAAK,OAAO,EAAE,CAAC;AAC5G,wBAAM,GAAG,CAAC,UAAU,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,CACjD,iBAAiB,CAAC,IAAI,CAAmB,QAAQ,CAAC,iBAAE,UAAU,IAAK,OAAO,EAAE,CAAC;AAcxE,MAAM,gBAAgB,GAAG,CAAC,GAAQ,EAAE,IAAY,EAAE,QAAiC,EAAE,EAAE;IAC7F,OAAO,IAAA,wBAAiB,EAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AAEF,SAAS,SAAS,CAAI,CAAM;IAC3B,OAAO,CAAC,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,IAAI,CAAA,CAAC;AAClB,CAAC;AA2BD,SAAS,UAAU,CAAO,YAA4B,EAAE,UAAa,EAAE,GAAG,QAAgC;IACzG,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CACnD,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC;QACrB,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC;QACvB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CACzC,EACC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;AAC3E,CAAC;AAGQ,gCAAU;AAEZ,MAAM,MAAM,GAAG,CAAI,GAAM,EAAK,EAAE,CAAC,GAAG,CAAC;AAA/B,QAAA,MAAM,UAAyB;AAErC,MAAM,SAAS,GAAG,CAAC,GAA8C,EAAE,IAAU,EAAE,EAAE,WACvF,OAAA,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAA,GAAG,CAAC,IAAI,CAAC,mCAAI,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA,EAAA,CAAC;AADhC,QAAA,SAAS,aACuB;AAEhC,QAAA,QAAQ,GAAiD,gBAAS,CAAC;AAEhF;;;;;IAKI;AACG,MAAM,YAAY,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AAArD,QAAA,YAAY,gBAAyC;AAE3D,MAAM,SAAS,GAAG,CAAI,IAAY,EAAE,OAAa,EAAE,EAAE,CAAC,IAAA,qBAAK,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAkB,CAAC,CAAC;AAAzG,QAAA,SAAS,aAAgG;AAEtH;;;;;IAKI;AACG,MAAM,YAAY,GAAG,CAC1B,GAAQ,EAAE,QAAyB,EAAmB,EAAE,CACxD,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;IACxB,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAM,CAAC,GAAG,IAAI,CAAC;IACnD,OAAO,IAAI,CAAC;AACb,CAAC,EAAE,EAAqB,CAAC,CAAE;AALhB,QAAA,YAAY,gBAKI;AAEtB,MAAM,iBAAiB,GAAG,CAAoC,OAAY,EAAE,GAAY,EAAE,EAAE,CAClG,OAAO,CAAC,MAAM,CAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IAC9C,GAAG,CAAC,GAAG,CAAC,GAAG,CAAW,CAAC,GAAG,GAAG,CAAC;IAC9B,OAAO,GAAG,CAAC;AACZ,CAAC,EAAE,EAAE,CAAC,CAAC;AAJK,QAAA,iBAAiB,qBAItB;AAED,MAAM,sBAAsB,GAAG,CAAC,OAAgB,EAAE,EAAE,CAC1D,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC;AAD1C,QAAA,sBAAsB,0BACoB;AAEhD,MAAM,YAAY,GAAG,CAAC,MAA+B,EAAS,EAAE,CAAC,CAAC;IACxE,IAAI,EAAE,IAAA,8BAAsB,EAAC,MAAM,CAAC,OAAO,CAAC;CAC5C,CAAC,CAAC;AAFU,QAAA,YAAY,gBAEtB;AAEI,MAAM,eAAe,GAAG,CAAC,SAAgB,EAAY,EAAE,CAAC,CAAC;IAC/D,QAAQ,EAAE,SAAS,CAAC,IAAI;IACxB,YAAY,EAAE,IAAI;IAClB,KAAK,EAAE,SAAS,CAAC,IAAI;IACrB,KAAK,EAAE,EAAE;IACT,SAAS,EAAE,IAAA,oBAAY,EAAC,SAAS,CAAC,IAAI,CAAC;IACvC,QAAQ,EAAE,IAAI;IACd,SAAS,EAAE,GAAG;IACd,SAAS,EAAE,GAAG;IACd,aAAa,EAAE,KAAK;IACpB,MAAM,EAAE,EAAE;CACV,CAAC,CAAC;AAXU,QAAA,eAAe,mBAWzB"}