@arpproject/recrate 0.1.14 → 0.1.15

package/dist/crate-builder/CrateManager/profile-manager.d.ts

@@ -12,6 +12,7 @@ export declare class ProfileManager {
     profile?: NormalisedProfile;
     $key?: number;
     context?: any;
+    propertyDefinitionCache: Map<string, ProfileInput>;
     constructor({ profile }: {
         profile?: NormalisedProfile;
     });

package/dist/crate-builder/RenderEntity/RenderLinkedItem.d.ts

@@ -2,7 +2,7 @@ import { default as React } from 'react';
 interface RenderLinkedItemProps {
     entity: {
         '@id': string;
-        '@type': string[];
+        '@type'?: string[] | string;
         name?: string;
         [key: string]: any;
     };

package/dist/recrate.es.js

@@ -79550,13 +79550,61 @@ const RenderLinkedItem = ({
   const crateManager = useContext(CrateManagerContext);
   const profileManager = useContext(ProfileManagerContext);
   const [associations, setAssociations] = useState([]);
+  const effectiveEntity = useMemo$1(() => {
+    const hasTypes = Boolean(entity == null ? void 0 : entity["@type"]);
+    const hasName = Boolean(entity == null ? void 0 : entity.name);
+    if (hasTypes && hasName) {
+      return entity;
+    }
+    const resolved = crateManager.getEntity({
+      id: entity["@id"],
+      link: false,
+      materialise: false
+    });
+    if (!resolved) {
+      return entity;
+    }
+    return {
+      ...resolved,
+      ...entity,
+      "@type": (entity == null ? void 0 : entity["@type"]) ?? resolved["@type"],
+      name: (entity == null ? void 0 : entity.name) ?? resolved.name
+    };
+  }, [crateManager, entity]);
   const showMap = useMemo$1(() => {
-    return (entity == null ? void 0 : entity["@type"].join(", ").match(/Geo/)) ? true : false;
-  }, [entity]);
+    const rawTypes = effectiveEntity == null ? void 0 : effectiveEntity["@type"];
+    const typeList = Array.isArray(rawTypes) ? rawTypes : typeof rawTypes === "string" ? [rawTypes] : [];
+    return typeList.some((type4) => String(type4).includes("Geo"));
+  }, [effectiveEntity]);
   const resolveAssociations = () => {
-    const profile = profileManager.profile;
+    const profile = profileManager == null ? void 0 : profileManager.profile;
+    const resolveConfiguration = Array.isArray(profile == null ? void 0 : profile.resolve) ? profile.resolve : [];
+    if (resolveConfiguration.length === 0) {
+      setAssociations([]);
+      return;
+    }
+    const rawTypes = entity == null ? void 0 : entity["@type"];
+    const typeList = Array.isArray(rawTypes) ? rawTypes.map((type4) => String(type4)) : typeof rawTypes === "string" ? [rawTypes] : [];
+    const hasResolveMatch = typeList.some(
+      (type4) => resolveConfiguration.some(
+        (entry) => Array.isArray(entry == null ? void 0 : entry.types) && entry.types.includes(type4)
+      )
+    );
+    if (!hasResolveMatch) {
+      setAssociations([]);
+      return;
+    }
+    const sourceEntity = crateManager.getEntity({
+      id: entity["@id"],
+      link: false,
+      materialise: false
+    });
+    if (!sourceEntity) {
+      setAssociations([]);
+      return;
+    }
     const resolvedAssociations = crateManager.resolveLinkedEntityAssociations({
-      entity: crateManager.getEntity({ id: entity["@id"] }),
+      entity: sourceEntity,
       profile
     });
     setAssociations(resolvedAssociations);
@@ -79572,6 +79620,15 @@ const RenderLinkedItem = ({
       onUnlinkEntity({ property, tgtEntityId: unlinkData.entity["@id"] });
     }
   };
+  const linkDisplayEntity = useMemo$1(() => {
+    const rawTypes = effectiveEntity == null ? void 0 : effectiveEntity["@type"];
+    const typeList = Array.isArray(rawTypes) ? rawTypes.map((type4) => String(type4)) : typeof rawTypes === "string" ? [rawTypes] : ["Thing"];
+    return {
+      "@id": entity["@id"],
+      "@type": typeList,
+      name: (effectiveEntity == null ? void 0 : effectiveEntity.name) || entity["@id"]
+    };
+  }, [effectiveEntity, entity]);
   if (showMap) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx(Flex, { className: "describo-render-item-link py-1 rounded bg-blue-200 hover:text-black hover:bg-blue-300 hover:rounded-r-none", children: /* @__PURE__ */ jsxRuntimeExports.jsxs(Flex, { vertical: true, className: "space-y-2", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsxs(Flex, { className: "p-2", children: [
@@ -79602,10 +79659,7 @@ const RenderLinkedItem = ({
               /* @__PURE__ */ jsxRuntimeExports.jsx(
                 ItemLink,
                 {
-                  entity: {
-                    ...entity,
-                    name: entity.name || entity["@id"]
-                  },
+                  entity: linkDisplayEntity,
                   onLoadEntity: handleLoadEntity
                 }
               ),
@@ -81364,8 +81418,6 @@ const EntityProperty = ({
   const profileManager = useContext(ProfileManagerContext);
   const crateManager = useContext(CrateManagerContext);
   const state = useStateStore();
-  const [linkInstances, setLinkInstances] = useState([]);
-  const [simpleInstances, setSimpleInstances] = useState([]);
   const propertyDefinition = (_a2 = profileManager == null ? void 0 : profileManager.getPropertyDefinition({
     property,
     entity
@@ -81375,32 +81427,24 @@ const EntityProperty = ({
   const isNotValue = (propertyDefinition == null ? void 0 : propertyDefinition.type) !== "Value";
   const profileWarnMissingProperty = profileManager == null ? void 0 : profileManager.profile.warnMissingProperty;
   const showAddControl = !(propertyDefinition == null ? void 0 : propertyDefinition.readonly) && ((propertyDefinition == null ? void 0 : propertyDefinition.multiple) || !(values == null ? void 0 : values.length));
-  const valuesString = JSON.stringify(values);
-  useEffect(() => {
-    let simpleInsts;
-    if ((propertyDefinition == null ? void 0 : propertyDefinition.handlesMultipleValues) === true) {
-      simpleInsts = values.length === 0 ? values : [values];
-    } else {
-      simpleInsts = values;
-    }
-    setSimpleInstances(
-      simpleInsts.map((v2, i) => {
-        if (!lodashExports.isPlainObject(v2) || typeof v2 === "boolean") {
-          return { idx: i, value: v2 };
-        }
+  const simpleInstances = useMemo$1(() => {
+    const simpleInsts = (propertyDefinition == null ? void 0 : propertyDefinition.handlesMultipleValues) === true ? values.length === 0 ? values : [values] : values;
+    return simpleInsts.map((v2, i) => {
+      if (!lodashExports.isPlainObject(v2) || typeof v2 === "boolean") {
+        return { idx: i, value: v2 };
+      }
+      return null;
+    }).filter(Boolean);
+  }, [values, propertyDefinition == null ? void 0 : propertyDefinition.handlesMultipleValues]);
+  const linkInstances = useMemo$1(() => {
+    return lodashExports.orderBy(
+      values.map((v2, i) => {
+        if (lodashExports.isPlainObject(v2) && typeof v2 !== "boolean") return { idx: i, value: v2 };
         return null;
-      }).filter(Boolean)
+      }).filter(Boolean),
+      ["value.@id"]
     );
-    setLinkInstances(
-      lodashExports.orderBy(
-        values.map((v2, i) => {
-          if (lodashExports.isPlainObject(v2) && typeof v2 !== "boolean") return { idx: i, value: v2 };
-          return null;
-        }).filter(Boolean),
-        "@id"
-      )
-    );
-  }, [valuesString, propertyDefinition == null ? void 0 : propertyDefinition.handlesMultipleValues]);
+  }, [values]);
   return /* @__PURE__ */ jsxRuntimeExports.jsxs(
     "div",
     {
@@ -110503,7 +110547,7 @@ const RenderEntity = forwardRef((props, ref) => {
   }, [entity]);
   useEffect(() => {
     if (profileManager && profileManager.$key) {
-      const entityObj = crateManager.getEntity({ id: entity["@id"] });
+      const entityObj = crateManager.getEntity({ id: entity["@id"], link: false, materialise: false });
       init2({ entity: entityObj });
     }
   }, [profileManager == null ? void 0 : profileManager.$key]);
@@ -110529,7 +110573,7 @@ const RenderEntity = forwardRef((props, ref) => {
     }
   };
   const refresh = () => {
-    const entityObj = crateManager.getEntity({ id: entity["@id"] });
+    const entityObj = crateManager.getEntity({ id: entity["@id"], link: false, materialise: false });
     init2({ entity: entityObj });
   };
   const saveTabToState = (tabName) => {
@@ -110537,8 +110581,6 @@ const RenderEntity = forwardRef((props, ref) => {
   };
   useEffect(() => {
     if (entity == null ? void 0 : entity["@id"]) {
-      const entityObj = crateManager.getEntity({ id: entity["@id"] });
-      init2({ entity: entityObj });
       refresh();
     }
   }, [extraProperties]);
@@ -111055,30 +111097,23 @@ const RenderEntity = forwardRef((props, ref) => {
             ),
             (_o = tabs.find((tab) => tab.name === "about")) == null ? void 0 : _o.inputs.map((input) => {
               if (!["@id", "@type", "name", "@reverse"].includes(input.name)) {
-                return /* @__PURE__ */ jsxRuntimeExports.jsx(
-                  "div",
+                return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: `p-2 hover:bg-sky-100 ${savedProperty === input.name ? "bg-green-200 hover:bg-green-200" : ""}`, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+                  EntityProperty,
                   {
-                    className: `p-2 hover:bg-sky-100 ${savedProperty === input.name ? "bg-green-200 hover:bg-green-200" : ""}`,
-                    children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-                      EntityProperty,
-                      {
-                        entity: contextEntity,
-                        property: input.name,
-                        values: Array.isArray(contextEntity[input.name]) ? contextEntity[input.name] : [contextEntity[input.name]],
-                        highlightRequired: highlightRequiredProperties,
-                        savedProperty: savedProperty === input.name,
-                        onLoadEntity,
-                        onCreateEntity: handleCreateEntity,
-                        onLinkEntity: handleLinkEntity,
-                        onUnlinkEntity: handleUnlinkEntity,
-                        onCreateProperty: handleCreateProperty,
-                        onSaveProperty: handleUpdateEntity,
-                        onDeleteProperty: handleDeleteProperty
-                      }
-                    )
-                  },
-                  input.name
-                );
+                    entity: contextEntity,
+                    property: input.name,
+                    values: Array.isArray(contextEntity[input.name]) ? contextEntity[input.name] : [contextEntity[input.name]],
+                    highlightRequired: highlightRequiredProperties,
+                    savedProperty: savedProperty === input.name,
+                    onLoadEntity,
+                    onCreateEntity: handleCreateEntity,
+                    onLinkEntity: handleLinkEntity,
+                    onUnlinkEntity: handleUnlinkEntity,
+                    onCreateProperty: handleCreateProperty,
+                    onSaveProperty: handleUpdateEntity,
+                    onDeleteProperty: handleDeleteProperty
+                  }
+                ) }, input.name);
               }
               return null;
             })
@@ -115389,6 +115424,7 @@ var hasExports = requireHas();
 const has = /* @__PURE__ */ getDefaultExportFromCjs(hasExports);
 class ProfileManager {
   constructor({ profile }) {
+    this.propertyDefinitionCache = /* @__PURE__ */ new Map();
     if (profile) {
       this.profile = profile;
       this.__processInputs();
@@ -115529,6 +115565,12 @@ class ProfileManager {
     property,
     entity
   }) {
+    const typeList = Array.isArray(entity["@type"]) ? entity["@type"] : [entity["@type"]];
+    const cacheKey = `${typeList.slice().sort().join("|")}::${property.toLowerCase()}`;
+    const cachedPropertyDefinition = this.propertyDefinitionCache.get(cacheKey);
+    if (cachedPropertyDefinition) {
+      return { propertyDefinition: cloneDeep(cachedPropertyDefinition) };
+    }
     let propertyDefinition = {};
     let inputs = this.getInputsFromProfile({ entity });
     if (inputs.length) {
@@ -115557,7 +115599,8 @@ class ProfileManager {
       propertyDefinition.type = [propertyDefinition.type];
     }
     if (!has(propertyDefinition, "multiple")) propertyDefinition.multiple = true;
-    return { propertyDefinition };
+    this.propertyDefinitionCache.set(cacheKey, cloneDeep(propertyDefinition));
+    return { propertyDefinition: cloneDeep(propertyDefinition) };
   }
   /**
    *
@@ -119457,7 +119500,7 @@ var EmotionCacheContext = /* @__PURE__ */ React.createContext(
   }) : null
 );
 var CacheProvider = EmotionCacheContext.Provider;
-const version = "0.1.14";
+const version = "0.1.15";
 const pkg = {
   version
 };
@@ -119495,7 +119538,6 @@ function DescriboCrateBuilder(props) {
     onAddNewProfileRequest,
     onRemoveProfile
   } = props;
-  console.log("DescriboCrateBuilder props:", { crate, profile, entityId });
   const [ready, setReady] = useState(false);
   const [error2, setError] = useState(false);
   const [contextEntity, setContextEntity] = useState(null);
@@ -119549,8 +119591,6 @@ function DescriboCrateBuilder(props) {
     lookup
   ]);
   const init2 = useCallback(async () => {
-    console.log("Initializing with crate:", crate);
-    console.log("Profile loaded:", profile);
     instance.changeLanguage(language2);
     if (!crate || isEmpty(crate)) {
       setReady(false);
@@ -119562,7 +119602,6 @@ function DescriboCrateBuilder(props) {
       crate,
       entityTimestamps: enableEntityTimestamps
     });
-    console.log("Entity:", newCm.getEntity({ id: entityId || "./" }));
     const profileClone = profile ? JSON.parse(JSON.stringify(profile)) : {};
     const newPm = new ProfileManager({
       profile: profileClone
@@ -119589,32 +119628,26 @@ function DescriboCrateBuilder(props) {
     setError(false);
     state.configuration = configuration;
     try {
-      if (entityId) {
-        handleSetCurrentEntity({ id: entityId });
+      const rootEntity = newCm.getEntity({ id: "./", link: false, materialise: false });
+      if (!isEmpty(rootEntity)) {
+        setContextEntity(rootEntity);
+        state.editorState.push({ id: rootEntity["@id"] });
       } else {
-        const rootEntity = newCm.getEntity({ id: "./" });
-        if (!isEmpty(rootEntity)) {
-          setContextEntity(rootEntity);
-          state.editorState.push({ id: rootEntity["@id"] });
-        } else {
-          console.warn("Root entity './' not found");
-          setError(true);
-          return;
-        }
+        setError(true);
+        return;
       }
       setReady(true);
       onReady == null ? void 0 : onReady();
     } catch (error22) {
-      console.error("Error setting current entity:", error22);
       setError(true);
       onError == null ? void 0 : onError({ error: "Failed to initialize entity" });
     }
-  }, [crate, profile, entityId, lookup, configuration]);
+  }, [crate, profile, lookup, configuration, enableEntityTimestamps, language2, onError, onReady, state.editorState]);
   const handleSetCurrentEntity = useCallback((params) => {
     const { id: id2, updateState = true } = params;
     if (!id2 || !cm) return;
     try {
-      const entity = cm.getEntity({ id: id2 });
+      const entity = cm.getEntity({ id: id2, link: false, materialise: false });
       if (!isEmpty(entity)) {
         setContextEntity(entity);
         onNavigation == null ? void 0 : onNavigation({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arpproject/recrate",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "type": "module",
   "main": "./dist/recrate.es.js",
   "module": "./dist/recrate.es.js",