@zcomponent/core 1.21.1-beta → 1.22.0-beta.1

package/index.js

@@ -1,2 +1,4 @@
-/* eslint-disable node/no-unsupported-features/es-syntax */
+/* eslint-disable n/no-unsupported-features/es-syntax */
+/* eslint-disable n/no-missing-import */
+
 export * from './lib';

package/lib/animation/animation.d.ts

@@ -19,6 +19,10 @@ export declare enum AnimationEvents {
  */
 export declare class Animation {
     private _initialize;
+    /**
+     * @internal
+     */
+    _FIX_SERIALIZE: boolean;
     /**
      * Collection of layers indexed by ID.
      */

package/lib/animation/animation.js

@@ -19,6 +19,10 @@ export class Animation {
      */
     constructor(_initialize = true) {
         this._initialize = _initialize;
+        /**
+         * @internal
+         */
+        this._FIX_SERIALIZE = true;
         /**
          * Collection of layers indexed by ID.
          */

package/lib/animation/layer.d.ts

@@ -100,6 +100,7 @@ export declare class Layer {
     _activateLayerClip(layerClip: LayerClip | null | undefined, playOptions?: LayerClipPlayOptions): void;
     /** @internal */
     _evaulate(): void;
+    private _getTime;
     /** @internal */
     _serialize(state: AnimationState): void;
     /** @internal */

package/lib/animation/layer.js

@@ -69,6 +69,8 @@ export class Layer {
             if (next && next.startTime && next.startTime && entry !== this._active && t - next.startTime > next.fadeTime) {
                 entry.layerClip?.pause();
                 this._queue.splice(i, 1);
+                if (entry.layerClip)
+                    this.animation._pendingEvents.push({ evt: AnimationEvents.onLayerClipState, args: [entry.layerClip] });
             }
             if (entry.layerClip && entry === this._active) {
                 if (next && (entry.layerClip.state.value === StreamState.Ended || next.fadeTime >= entry.layerClip.getRemainingTimeEstimate())) {
@@ -181,6 +183,9 @@ export class Layer {
     _evaulate() {
         this.animation.evaluateTouchedPaths([...this.influencedPaths.values()]);
     }
+    _getTime() {
+        return Math.floor(this.animation.timeSource?.() ?? performance.now());
+    }
     /** @internal */
     _serialize(state) {
         for (const layerClip of this._layerClips) {
@@ -191,13 +196,17 @@ export class Layer {
         const entry = {
             queue: [],
         };
+        const timeOfSerialization = this._getTime();
         for (const queueEntry of this._queue) {
             if (queueEntry.layerClip && queueEntry.layerClip.id === undefined)
                 continue;
-            entry.queue.push({
+            const mqe = {
                 ...queueEntry,
                 layerClip: queueEntry.layerClip === null ? null : queueEntry.layerClip?.id,
-            });
+            };
+            if (mqe.startTime !== undefined)
+                mqe.startTime -= timeOfSerialization;
+            entry.queue.push(mqe);
         }
         entry.active = this._active === null ? null : this._active === undefined ? undefined : this._queue.indexOf(this._active);
         state.byLayer[this.id] = entry;
@@ -213,6 +222,7 @@ export class Layer {
         if (!entry)
             return;
         this._queue = [];
+        const timeOfSerialization = this._getTime();
         for (const qe of entry.queue) {
             let layerClip;
             if (typeof qe.layerClip === 'string') {
@@ -221,10 +231,13 @@ export class Layer {
             else if (qe.layerClip === null)
                 layerClip = null;
             if (layerClip !== undefined) {
-                this._queue.push({
+                const mqe = {
                     ...qe,
                     layerClip,
-                });
+                };
+                if (mqe.startTime !== undefined)
+                    mqe.startTime += timeOfSerialization;
+                this._queue.push(mqe);
             }
         }
         if (typeof entry.active === 'number') {

package/lib/animation/layerclip.js

@@ -262,9 +262,9 @@ export class LayerClip {
         if (this.id === undefined)
             return;
         const timeOfSerialization = this._getTime();
-        const t0 = timeOfSerialization - this._t0;
-        const pauseTime = this._pauseTime === undefined ? undefined : timeOfSerialization - this._pauseTime;
-        const t1 = isFinite(this._t1) ? timeOfSerialization - this._t1 : null;
+        const t0 = this._t0 - timeOfSerialization;
+        const pauseTime = this._pauseTime === undefined ? undefined : this._pauseTime - timeOfSerialization;
+        const t1 = isFinite(this._t1) ? this._t1 - timeOfSerialization : null;
         const ret = {
             t0,
             t1,
@@ -284,9 +284,9 @@ export class LayerClip {
         if (!entry)
             return;
         const timeOfDeserialization = this._getTime();
-        this._t0 = timeOfDeserialization - entry.t0;
-        this._t1 = entry.t1 === null ? Infinity : timeOfDeserialization - entry.t1;
-        this._pauseTime = entry.pauseTime === undefined ? undefined : timeOfDeserialization - entry.pauseTime;
+        this._t0 = timeOfDeserialization + entry.t0;
+        this._t1 = entry.t1 === null ? Infinity : timeOfDeserialization + entry.t1;
+        this._pauseTime = entry.pauseTime === undefined ? undefined : timeOfDeserialization + entry.pauseTime;
         this._rate = entry.rate;
         this._loop = entry.loop;
         this._stopped = entry.stopped;

package/lib/components/DefaultCookieConsent.js

@@ -301,10 +301,7 @@ export class DefaultCookieConsent extends Component {
         if (isDesignTime(this.contextManager) && !designTimeOverride)
             return;
         const context = this.contextManager.get(CookieConsentContext);
-        if (context.functionalCookies.value !== ConsentStatus.unknown &&
-            context.marketingCookies.value !== ConsentStatus.unknown &&
-            context.performanceCookies.value !== ConsentStatus.unknown &&
-            !designTimeOverride)
+        if (context.functionalCookies.value !== ConsentStatus.unknown && context.marketingCookies.value !== ConsentStatus.unknown && context.performanceCookies.value !== ConsentStatus.unknown && !designTimeOverride)
             return;
         this._loadDOM(isSettings);
         const acceptedEssential = window.localStorage.getItem('zcomponent-cookieconsent-essential');

package/lib/data/change.js

@@ -180,7 +180,7 @@ export function deleteEntityPropOverride(zcomp, id) {
  * @returns The unique ID for the EntityPropOverride.
  */
 function idForEntityPropOverride(override) {
-    return (override.type + ':' + (override.entityPropIsConstructor ? 'constructorprop' : 'prop') + ':' + override.entityID + ':' + override.entityPropPath.join('.'));
+    return override.type + ':' + (override.entityPropIsConstructor ? 'constructorprop' : 'prop') + ':' + override.entityID + ':' + override.entityPropPath.join('.');
 }
 /**
  * Deep clones the given object.

package/lib/fractionalindexing.js

@@ -1,3 +1,4 @@
+/* eslint-disable eqeqeq */
 // License: CC0 (no rights reserved).
 // From https://github.com/rocicorp/fractional-indexing
 // This is based on https://observablehq.com/@dgreensp/implementing-fractional-indexing

package/lib/observable.js

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-this-alias */
+/* eslint-disable @typescript-eslint/adjacent-overload-signatures */
 import { Emitter } from './emitter';
 /**
  * A class that holds a value and watches it for changes (deeply by default).
@@ -114,6 +116,7 @@ export class Observable extends Emitter {
         this._emit(this._value.proxy);
     }
     setValueAtPath(path, val) {
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
         let target = this;
         let key = 'value';
         for (let i = 0; i < path.length; i++) {

package/lib/selectors.js

@@ -342,9 +342,7 @@ ${Object.entries(scriptNames ?? {})
         .map(entry => {
         const values = Object.keys(entry[1]);
         if (values.length > 1) {
-            return `\t\t${entry[0]}: {${values
-                .map(e => `${JSON.stringify(e)}: ${importMapping.get(nodes[e].type)}${getBehaviorBlockForNode(behaviors, behaviorsByNodeID[nodes[e].id] ?? [], importMapping)}`)
-                .join(', ')}},`;
+            return `\t\t${entry[0]}: {${values.map(e => `${JSON.stringify(e)}: ${importMapping.get(nodes[e].type)}${getBehaviorBlockForNode(behaviors, behaviorsByNodeID[nodes[e].id] ?? [], importMapping)}`).join(', ')}},`;
         }
         else {
             return `\t\t${entry[0]}: ${importMapping.get(nodes[values[0]].type)}${getBehaviorBlockForNode(behaviors, behaviorsByNodeID[nodes[values[0]].id] ?? [], importMapping)},`;

package/lib/types.js

@@ -1,4 +1,5 @@
-import { EntityPropOverrideType, FunctionCallType, } from './data/core';
+/* eslint-disable no-case-declarations */
+import { EntityPropOverrideType, FunctionCallType } from './data/core';
 import { getSafeKeyName } from './selectors';
 /**
  * Enumeration of type names used in type definitions.
@@ -52,6 +53,7 @@ export var TypeHint;
  *
  * This enum lists different kinds of values types that can be used in a values definition, representing various data sources or formats.
  */
+// If you add a new value here, please also add it to typeinfo.ts > ZAnnotationValue
 export var ValuesType;
 (function (ValuesType) {
     ValuesType["files"] = "files";

package/package.json

@@ -1,14 +1,21 @@
 {
   "name": "@zcomponent/core",
-  "version": "1.21.1-beta",
+  "version": "1.22.0-beta.1",
   "description": "The core component model and built-in functionality for Mattercraft.",
+  "author": "Zappar Limited",
+  "license": "Proprietary",
   "main": "index.js",
   "types": "index.d.ts",
+  "type": "module",
   "engines": {
     "node": ">=12.0.0",
     "browsers": "defaults"
   },
-  "type": "module",
+  "zexports": [
+    "./lib/components/**/*",
+    "./lib/behaviors/**/*",
+    "./lib/contexts/**/*"
+  ],
   "directories": {
     "lib": "lib"
   },
@@ -20,27 +27,59 @@
     "assets/**/*"
   ],
   "scripts": {
-    "build": "rm -rf lib && tsc",
-    "build-animation-tests": "tsc -p ./tsconfig.test.animation.json",
-    "test": "env TS_NODE_PROJECT=\"tsconfig.testing.json\" mocha --es-module-specifier-resolution=node",
+    "build": "rm -rf lib && tsc && tsc-alias",
     "watch": "tsc -w",
-    "predocs": "tsc",
-    "docs": "typedoc"
+    "prepack": "npm run build",
+    "docs": "typedoc --out docs",
+    "test": "env TS_NODE_PROJECT=\"tsconfig.testing.json\" mocha --es-module-specifier-resolution=node",
+    "build-animation-tests": "tsc -p ./tsconfig.test.animation.json",
+    "predocs": "npm run ctix",
+    "ctix": "ctix build"
   },
-  "author": "Zappar Limited",
-  "license": "Proprietary",
   "devDependencies": {
     "@types/mocha": "^10.0.1",
-    "@zappar/typedoc-plugin-mattercraft": "^0.0.4",
-    "mocha": "^10.2.0",
-    "ts-node": "^10.9.1",
-    "typedoc": "^0.24.8",
-    "typedoc-plugin-mdn-links": "^3.1.7",
-    "typescript": "^4.9.4"
+    "mocha": "^10.2.0"
   },
-  "zexports": [
-    "./lib/components/**/*",
-    "./lib/behaviors/**/*",
-    "./lib/contexts/**/*"
-  ]
+  "keywords": [],
+  "release": {
+    "extends": "semantic-release-commit-filter",
+    "ci": true,
+    "branches": [
+      "main",
+      {
+        "name": "beta",
+        "channel": "beta",
+        "prerelease": "beta"
+      },
+      {
+        "name": "alpha",
+        "channel": "alpha",
+        "prerelease": "alpha"
+      }
+    ],
+    "plugins": [
+      "@semantic-release/commit-analyzer",
+      "@semantic-release/release-notes-generator",
+      "@semantic-release/changelog",
+      "@semantic-release/npm",
+      "@semantic-release/gitlab",
+      "@semantic-release/git",
+      [
+        "@rimac-technology/semantic-release-s3",
+        {
+          "s3Bucket": {
+            "main": "mattercraft-api-docs/prod",
+            "beta": "mattercraft-api-docs-beta",
+            "alpha": "mattercraft-api-docs-alpha"
+          },
+          "directoryPath": "../../docs/**/*",
+          "objectACL": "",
+          "removeDirectoryRoot": true,
+          "awsAccessKeyName": "DOCS_AWS_ACCESS_KEY_ID",
+          "awsSecretAccessKeyName": "DOCS_AWS_SECRET_ACCESS_KEY"
+        }
+      ]
+    ],
+    "tagFormat": "@zcomponent/core@${version}"
+  }
 }