@startinblox/core 0.18.1 → 0.19.0-beta.2

package/dist/mixins/requiredMixin.js

@@ -1,3 +1,4 @@
+import { store } from '../libs/store/store.js';
 const RequiredMixin = {
   name: 'required-mixin',
   use: [],
@@ -11,9 +12,20 @@ const RequiredMixin = {
       for (let resource of resources) {
         let hasProps = true;
         for (let field of requiredFields) {
-          if ((await resource[field]) == null || (await resource[field]) == "") {
-            hasProps = false;
-            continue;
+          // Retrieve resource from store
+          let res = store.get(resource['@id']);
+          if (!res && !resource[field] && !(await resource[field])) {
+            //TODO: refactor to better handle this edge case where res is either the direct resource or a proxy
+            res = await store.getData(resource['@id'], this.context);
+            if (!res || res[field] == null || res[field] == "") {
+              hasProps = false;
+              continue;
+            }
+          } else if (res) {
+            if ((await res[field]) == null || (await res[field]) == "") {
+              hasProps = false;
+              continue;
+            }
           }
         }
         if (hasProps) displays.push(resource);

package/dist/mixins/storeMixin.js

@@ -35,6 +35,17 @@ const StoreMixin = {
     nestedField: {
       type: String,
       default: null
+    },
+    arrayField: {
+      type: String,
+      default: null,
+      callback: function (value) {
+        if (value) this.predicateName = store.getExpandedPredicate(this.arrayField, this.context);
+      }
+    },
+    predicateName: {
+      type: String,
+      default: null
     }
   },
   initialState: {
@@ -67,7 +78,26 @@ const StoreMixin = {
     if (!value || value == "undefined") return;
     this.resourceId = value;
     if (this.nestedField) {
+      // First step: store.getData
       const resource = await store.getData(value, this.context);
+
+      // Which internally triggers store.fetchData -> Fine
+
+      // Which triggers store.fetchAuthn -> Fine
+
+      // Once done it calls store.cacheGraph
+
+      // And the issue seems to reside in the caching ?
+
+      // How is computed the key to cache the nested resource with proper id like 
+      // http:///localhost:3000/examples/data/list/group-3.jsonld#foaf:member ?
+      // Should it be:
+      //    - http:///localhost:3000/examples/data/list/group-3.jsonld#foaf:member
+      //    - _:b1/examples/data/list/group-3.jsonld#foaf:member
+      //    - _:b9/examples/data/list/group-3.jsonld
+      //    - examples/data/list/group-3.jsonld#foaf:member
+
+      // So the work is in cacheGraph ?
       const nestedResource = resource ? await resource[this.nestedField] : null;
       this.resourceId = nestedResource ? nestedResource['@id'] : null;
       if (!this.resourceId) throw `Error: the key "${this.nestedField}" does not exist on the resource`;

package/dist/mixins/widgetMixin.js

@@ -53,6 +53,12 @@ const WidgetMixin = {
         resource = res;
         break;
       }
+    } else if (resource && this.arrayField && this.predicateName) {
+      // if array, keep the 1rst resource
+      for (let res of resource[this.predicateName]) {
+        resource = res;
+        break;
+      }
     }
     if (!this.dataSrc) console.error(new Error('You must provide a "fields" attribute'));
     if (!resource) return [];
@@ -114,6 +120,16 @@ const WidgetMixin = {
    * @param resource - Resource
    */
   async fetchValue(field, resource) {
+    if (resource && !resource.isContainer?.()) {
+      let fieldValue = await resource[field];
+      if (fieldValue === null || fieldValue === undefined || fieldValue === '') return undefined;
+      if (Array.isArray(fieldValue) && !fieldValue['ldp:contains']) {
+        return JSON.stringify(fieldValue);
+        // Dumb edge case because if it bears only one item, when compacted the array translates into one object
+      } else if (typeof fieldValue === 'object' && fieldValue['@id'] && 1 === Object.keys(fieldValue).length) {
+        return JSON.stringify([fieldValue]);
+      }
+    }
     return resource && !resource.isContainer?.() ? await resource[field] : undefined;
   },
   /**
@@ -160,8 +176,7 @@ const WidgetMixin = {
    * @param field - string
    * @param isSet - boolean
    */
-  getWidget(field) {
-    let isSet = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  getWidget(field, isSet = false) {
     const widget = this.element.getAttribute('widget-' + field);
     if (widget) return this.widgetFromTagName(widget);
     if (this.getAction(field)) return this.widgetFromTagName('solid-action');
@@ -223,9 +238,7 @@ const WidgetMixin = {
    * Creates and return a widget for field + add it to the widget list
    * @param field - string
    */
-  async createWidgetTemplate(field) {
-    let resource = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-    let transformAttributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  async createWidgetTemplate(field, resource = null, transformAttributes = false) {
     if (this.isString(field)) return this.createString(field); // field is a static string
     if (this.isSet(field)) return await this.createSet(field);
     const currentResource = resource || this.resource;

package/dist/new-widgets/templates/formTemplatesDirectory.js

@@ -176,17 +176,14 @@ export const formTemplates = {
             ${el.label}
           </option>
         `)}
-        ${Object.entries(attributes.enum || []).map(_ref => {
-      let [key, val] = _ref;
-      return html`
+        ${Object.entries(attributes.enum || []).map(([key, val]) => html`
           <option
             value="${key}"
             ?selected=${!attributes.multiple ? value === key : attributes.values.includes(key)}
           >
             ${val}
           </option>
-        `;
-    })}
+        `)}
       </select>
     `,
     dependencies: [FormDropdownMixin, FormMixin, RangeMixin]
@@ -207,9 +204,7 @@ export const formTemplates = {
             > <span>${el.label}</span>
           </label>
         `)}
-        ${Object.entries(attributes.enum || []).map(_ref2 => {
-      let [key, val] = _ref2;
-      return html`
+        ${Object.entries(attributes.enum || []).map(([key, val]) => html`
           <label>
             <input
               type="radio"
@@ -219,8 +214,7 @@ export const formTemplates = {
               ?checked=${value === key}
             > <span>${val}</span>
           </label>
-        `;
-    })}
+        `)}
     `,
     dependencies: [FormRadioMixin, FormMixin, RangeMixin]
   },
@@ -238,16 +232,13 @@ export const formTemplates = {
             /> <span>${el.label}</span>
           </label>
         `)}
-        ${Object.entries(attributes.enum || []).map(_ref3 => {
-      let [key, val] = _ref3;
-      return html`
+        ${Object.entries(attributes.enum || []).map(([key, val]) => html`
           <label>
             <input type="checkbox"
               value="${key}"
             /> <span>${val}</span>
           </label>
-        `;
-    })}
+        `)}
       </select>
     `,
     dependencies: [FormCheckboxesMixin, FormMixin, RangeMixin]

package/dist/new-widgets/templatesDependencies/formDropdownMixin.js

@@ -28,6 +28,9 @@ const FormDropdownMixin = {
   },
   created() {
     this.listAttributes['values'] = [];
+    if (this.listAttributes['value'] && !JSON.parse(this.listAttributes['value']['@id']) && Array.isArray(JSON.parse(this.listAttributes['value']))) {
+      this.listAttributes['values'] = this.listAttributes['value'];
+    }
     if (this.multiple) this.listAttributes['multiple'] = true;
   },
   dispatchChange() {

package/dist/new-widgets/templatesDependencies/multipleFormMixin.js

@@ -63,7 +63,16 @@ const MultipleFormMixin = {
     };
   },
   setDataSrc(value, listValueTransformations) {
-    if (value && value !== this.dataSrc) this.dataSrc = value;
+    if (value && value !== this.dataSrc) {
+      try {
+        if (Array.isArray(JSON.parse(value))) {
+          this.setValue(JSON.parse(value));
+        }
+      } catch (ex) {
+        this.dataSrc = value;
+        console.log('Not an array', ex);
+      }
+    }
     const nextProcessor = listValueTransformations.shift();
     if (nextProcessor) nextProcessor(value, listValueTransformations);
   },
@@ -79,8 +88,7 @@ const MultipleFormMixin = {
 
     this.planRender();
   },
-  insertWidget() {
-    let value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  insertWidget(value = '') {
     if (!this.widget) return;
     const widget = document.createElement(this.widget);
     const attributes = {
@@ -100,7 +108,12 @@ const MultipleFormMixin = {
   },
   getValue() {
     if (!this.dataHolder) return [];
-    return Array.from(this.dataHolder).map(element => this.getValueFromElement(element));
+    // Was returning an array of functions, now returns an array of values.
+    // Not sure about the tests results in that context
+    return Array.from(this.dataHolder).map(element => {
+      let elValue = this.getValueFromElement(element);
+      return elValue;
+    });
   },
   get type() {
     return 'resource';

package/dist/new-widgets/templatesDependencies/multipleselectFormMixin.js

@@ -38,12 +38,21 @@ const MultipleselectFormMixin = {
     this.listValueTransformations.push(this.setDataSrc.bind(this));
   },
   setDataSrc(value, listValueTransformations) {
-    if (value && value !== this.dataSrc) this.dataSrc = value;
+    if (value && value !== this.dataSrc) {
+      try {
+        if (Array.isArray(JSON.parse(value))) {
+          this.setValue(JSON.parse(value));
+        }
+      } catch (ex) {
+        this.dataSrc = value;
+        console.log('Not an array', ex);
+      }
+    }
     const nextProcessor = listValueTransformations.shift();
     if (nextProcessor) nextProcessor(value, listValueTransformations);
   },
   populate() {
-    if (!this.resource || !this.resource['ldp:contains']) return;
+    if (!this.resource || !this.resource['ldp:contains'] && !Array.isArray(this.resource)) return;
     this.setValue(this.resource['ldp:contains']);
     this.planRender();
   },

package/dist/widgets/baseWidget.js

@@ -4,8 +4,8 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
 import { evalTemplateString } from '../libs/helpers.js';
 import { store } from '../libs/store/store.js';
 export class BaseWidget extends HTMLElement {
-  constructor() {
-    super(...arguments);
+  constructor(...args) {
+    super(...args);
     _defineProperty(this, "src", void 0);
     _defineProperty(this, "multiple", void 0);
     _defineProperty(this, "editable", void 0);
@@ -155,7 +155,7 @@ export class BaseWidget extends HTMLElement {
       if (!res) {
         // child not in cache yet
         try {
-          const resourceId = resource.getChildren()[index]['@id'];
+          const resourceId = resource.getChildren('ldp:contains')[index]['@id'];
           res = await store.getData(resourceId, this.context);
         } catch (e) {
           continue;
@@ -210,8 +210,7 @@ export class BaseWidget extends HTMLElement {
   subscribe(event) {
     this._listen(event);
   }
-  _listen(id) {
-    let callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : () => {};
+  _listen(id, callback = () => {}) {
     if (!this._subscriptions.get(id)) {
       this._subscriptions.set(id, PubSub.subscribe(id, async () => {
         await callback();

package/dist/widgets/widget-factory.js

@@ -1,8 +1,6 @@
 import { BaseWidget } from './baseWidget.js';
 import { defineComponent } from '../libs/helpers.js';
-export const widgetFactory = function (tagName, customTemplate) {
-  let childTemplate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
-  let callback = arguments.length > 3 ? arguments[3] : undefined;
+export const widgetFactory = (tagName, customTemplate, childTemplate = '', callback) => {
   const registered = customElements.get(tagName);
   if (registered) return registered;
   const cls = class extends BaseWidget {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startinblox/core",
-  "version": "0.18.1",
+  "version": "0.19.0-beta.2",
   "description": "This is a series of web component respecting both the web components standards and the Linked Data Platform convention.",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -13,7 +13,7 @@
   ],
   "scripts": {
     "build": "snowpack build --polyfill-node",
-    "watch": "npm run build -- --watch",
+    "watch": "snowpack build --polyfill-node --watch",
     "serve": "node --watch server.js",
     "dev": "concurrently -n 'WATCH,SERVE' -c 'yellow.bold,magenta.bold' 'npm run watch' 'npm run serve'",
     "check-types": "tsc",
@@ -93,6 +93,8 @@
     "express": "^4.17.1",
     "find-free-port": "^2.0.0",
     "fuse.js": "^6.4.6",
+    "semver": "^7.4.0",
+    "jsonld": "^8.3.1",
     "jsonld-context-parser": "^1.3.4",
     "leaflet": "1.7.1",
     "leaflet.markercluster": "1.5.3",
@@ -108,8 +110,7 @@
     "ts-node": "^9.1.1",
     "tui-calendar": "^1.13.0",
     "typescript": "^4.1.3",
-    "wait-on": "^5.2.1",
-    "semver": "^7.4.0"
+    "wait-on": "^5.2.1"
   },
   "dependencies": {
     "cors": "^2.8.5"

package/dist/_snowpack/pkg/common/_commonjsHelpers-37fa8da4.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"_commonjsHelpers-37fa8da4.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;"}