etro 0.8.1 → 0.8.2

package/.github/workflows/shipjs-trigger.yml

@@ -0,0 +1,29 @@
+name: Ship js trigger
+on:
+  pull_request:
+    types:
+      - closed
+jobs:
+  build:
+    name: Release
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged == true && startsWith(github.head_ref, 'releases/v')
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          ref: master
+      - uses: actions/setup-node@v1
+        with:
+          registry-url: "https://registry.npmjs.org"
+      - run: |
+          if [ -f "yarn.lock" ]; then
+            yarn install
+          else
+            npm install
+          fi
+      - run: npx shipjs trigger
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
+          SLACK_INCOMING_HOOK: ${{ secrets.SLACK_INCOMING_HOOK }}

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [0.8.2] - 2021-07-08
+### Fixed
+- `GaussianBlur` effect throwing a `TypeError` when applied to a movie or layer (the problem persisted).
+- Ignore layers and effects removed with `delete`.
+
 ## [0.8.1] - 2021-04-20
 ### Fixed
 - `sourceStartTime` getting ignored on `'movie.seek'`.
@@ -143,12 +153,12 @@
 - Null or undefined layer dimensions default to the width or height of the movie.
 - Movie "end" event is now called "ended".
 
-### Fixed
-- Bug with layer options
-
 ### Removed
 - Volume, speed and muted properties. These will most likely be added as separate audio effects in the future.
 
+### Fixed
+- Bug with layer options
+
 ## [0.2.0] - 2018-10-14
 ### Added
 - Keyframes
@@ -158,7 +168,7 @@
 - Elliptical mask effect.
 - Many small improvements.
 
-## [0.1.0] - 2018-10-06
+## 0.1.0 - 2018-10-06
 ### Added
 - Movies
   - Timeline
@@ -178,13 +188,12 @@
   - Gaussian blur
   - Transform
 
-[Unreleased]: https://github.com/etro-js/etro/compare/v0.8.1...HEAD
-[0.8.1]: https://github.com/etro-js/etro/compare/v0.8...v0.8.1
-[0.8.0]: https://github.com/etro-js/etro/compare/v0.7...v0.8
-[0.7.0]: https://github.com/etro-js/etro/compare/v0.6...v0.7
-[0.6.0]: https://github.com/etro-js/etro/compare/v0.5...v0.6
-[0.5.0]: https://github.com/etro-js/etro/compare/v0.4...v0.5
-[0.4.0]: https://github.com/etro-js/etro/compare/v0.3...v0.4
-[0.3.0]: https://github.com/etro-js/etro/compare/v0.2...v0.3
-[0.2.0]: https://github.com/etro-js/etro/compare/v0.1...v0.2
-[0.1.0]: https://github.com/etro-js/etro/releases/tag/v0.1
+[0.8.2]: https://github.com/etro-js/etro/compare/v0.8.1...v0.8.2
+[0.8.1]: https://github.com/etro-js/etro/compare/v0.8.0...v0.8.1
+[0.8.0]: https://github.com/etro-js/etro/compare/v0.7.0...v0.8.0
+[0.7.0]: https://github.com/etro-js/etro/compare/v0.6.0...v0.7.0
+[0.6.0]: https://github.com/etro-js/etro/compare/v0.5.0...v0.6.0
+[0.5.0]: https://github.com/etro-js/etro/compare/v0.4.0...v0.5.0
+[0.4.0]: https://github.com/etro-js/etro/compare/v0.3.0...v0.4.0
+[0.3.0]: https://github.com/etro-js/etro/compare/v0.2.0...v0.3.0
+[0.2.0]: https://github.com/etro-js/etro/compare/v0.1.0...v0.2.0

package/dist/etro-cjs.js

@@ -496,7 +496,7 @@ function watchPublic(target) {
         publish(proxy, target.type + ".change.modify", { property: getPath(receiver, prop), newValue: val });
     };
     var canWatch = function (receiver, prop) { return !prop.startsWith('_') &&
-        (target.publicExcludes === undefined || !target.publicExcludes.includes(prop)); };
+        (receiver.publicExcludes === undefined || !receiver.publicExcludes.includes(prop)); };
     // The path to each child property (each is a unique proxy)
     var paths = new WeakMap();
     var handler = {
@@ -940,7 +940,7 @@ var Visual = /** @class */ (function (_super) {
     Visual.prototype._applyEffects = function () {
         for (var i = 0; i < this.effects.length; i++) {
             var effect = this.effects[i];
-            if (effect.enabled)
+            if (effect && effect.enabled)
                 // Pass relative time
                 effect.apply(this, this.movie.currentTime - this.startTime);
         }
@@ -1902,20 +1902,22 @@ var Stack = /** @class */ (function (_super) {
     }
     Stack.prototype.attach = function (movie) {
         _super.prototype.attach.call(this, movie);
-        this.effects.forEach(function (effect) {
+        this.effects.filter(function (effect) { return !!effect; }).forEach(function (effect) {
             effect.detach();
             effect.attach(movie);
         });
     };
     Stack.prototype.detach = function () {
         _super.prototype.detach.call(this);
-        this.effects.forEach(function (effect) {
+        this.effects.filter(function (effect) { return !!effect; }).forEach(function (effect) {
             effect.detach();
         });
     };
     Stack.prototype.apply = function (target, reltime) {
         for (var i = 0; i < this.effects.length; i++) {
             var effect = this.effects[i];
+            if (!effect)
+                continue;
             effect.apply(target, reltime);
         }
     };
@@ -8967,11 +8969,12 @@ var Movie = /** @class */ (function () {
     Movie.prototype.pause = function () {
         this._paused = true;
         // Deactivate all layers
-        for (var i = 0; i < this.layers.length; i++) {
-            var layer = this.layers[i];
-            layer.stop();
-            layer.active = false;
-        }
+        for (var i = 0; i < this.layers.length; i++)
+            if (Object.prototype.hasOwnProperty.call(this.layers, i)) {
+                var layer = this.layers[i];
+                layer.stop();
+                layer.active = false;
+            }
         publish(this, 'movie.pause', {});
         return this;
     };
@@ -9020,15 +9023,16 @@ var Movie = /** @class */ (function () {
             if (!this.repeat || this.recording) {
                 this._ended = true;
                 // Deactivate all layers
-                for (var i = 0; i < this.layers.length; i++) {
-                    var layer = this.layers[i];
-                    // A layer that has been deleted before layers.length has been updated
-                    // (see the layers proxy in the constructor).
-                    if (!layer)
-                        continue;
-                    layer.stop();
-                    layer.active = false;
-                }
+                for (var i = 0; i < this.layers.length; i++)
+                    if (Object.prototype.hasOwnProperty.call(this.layers, i)) {
+                        var layer = this.layers[i];
+                        // A layer that has been deleted before layers.length has been updated
+                        // (see the layers proxy in the constructor).
+                        if (!layer)
+                            continue;
+                        layer.stop();
+                        layer.active = false;
+                    }
             }
         }
         // Stop playback or recording if done
@@ -9085,6 +9089,8 @@ var Movie = /** @class */ (function () {
     Movie.prototype._renderLayers = function () {
         var frameFullyLoaded = true;
         for (var i = 0; i < this.layers.length; i++) {
+            if (!Object.prototype.hasOwnProperty.call(this.layers, i))
+                continue;
             var layer = this.layers[i];
             // A layer that has been deleted before layers.length has been updated
             // (see the layers proxy in the constructor).
@@ -9151,7 +9157,8 @@ var Movie = /** @class */ (function () {
      */
     Movie.prototype._publishToLayers = function (type, event) {
         for (var i = 0; i < this.layers.length; i++)
-            publish(this.layers[i], type, event);
+            if (Object.prototype.hasOwnProperty.call(this.layers, i))
+                publish(this.layers[i], type, event);
     };
     Object.defineProperty(Movie.prototype, "rendering", {
         /**

package/dist/etro-iife.js

@@ -497,7 +497,7 @@ var etro = (function () {
             publish(proxy, target.type + ".change.modify", { property: getPath(receiver, prop), newValue: val });
         };
         var canWatch = function (receiver, prop) { return !prop.startsWith('_') &&
-            (target.publicExcludes === undefined || !target.publicExcludes.includes(prop)); };
+            (receiver.publicExcludes === undefined || !receiver.publicExcludes.includes(prop)); };
         // The path to each child property (each is a unique proxy)
         var paths = new WeakMap();
         var handler = {
@@ -941,7 +941,7 @@ var etro = (function () {
         Visual.prototype._applyEffects = function () {
             for (var i = 0; i < this.effects.length; i++) {
                 var effect = this.effects[i];
-                if (effect.enabled)
+                if (effect && effect.enabled)
                     // Pass relative time
                     effect.apply(this, this.movie.currentTime - this.startTime);
             }
@@ -1903,20 +1903,22 @@ var etro = (function () {
         }
         Stack.prototype.attach = function (movie) {
             _super.prototype.attach.call(this, movie);
-            this.effects.forEach(function (effect) {
+            this.effects.filter(function (effect) { return !!effect; }).forEach(function (effect) {
                 effect.detach();
                 effect.attach(movie);
             });
         };
         Stack.prototype.detach = function () {
             _super.prototype.detach.call(this);
-            this.effects.forEach(function (effect) {
+            this.effects.filter(function (effect) { return !!effect; }).forEach(function (effect) {
                 effect.detach();
             });
         };
         Stack.prototype.apply = function (target, reltime) {
             for (var i = 0; i < this.effects.length; i++) {
                 var effect = this.effects[i];
+                if (!effect)
+                    continue;
                 effect.apply(target, reltime);
             }
         };
@@ -8968,11 +8970,12 @@ var etro = (function () {
         Movie.prototype.pause = function () {
             this._paused = true;
             // Deactivate all layers
-            for (var i = 0; i < this.layers.length; i++) {
-                var layer = this.layers[i];
-                layer.stop();
-                layer.active = false;
-            }
+            for (var i = 0; i < this.layers.length; i++)
+                if (Object.prototype.hasOwnProperty.call(this.layers, i)) {
+                    var layer = this.layers[i];
+                    layer.stop();
+                    layer.active = false;
+                }
             publish(this, 'movie.pause', {});
             return this;
         };
@@ -9021,15 +9024,16 @@ var etro = (function () {
                 if (!this.repeat || this.recording) {
                     this._ended = true;
                     // Deactivate all layers
-                    for (var i = 0; i < this.layers.length; i++) {
-                        var layer = this.layers[i];
-                        // A layer that has been deleted before layers.length has been updated
-                        // (see the layers proxy in the constructor).
-                        if (!layer)
-                            continue;
-                        layer.stop();
-                        layer.active = false;
-                    }
+                    for (var i = 0; i < this.layers.length; i++)
+                        if (Object.prototype.hasOwnProperty.call(this.layers, i)) {
+                            var layer = this.layers[i];
+                            // A layer that has been deleted before layers.length has been updated
+                            // (see the layers proxy in the constructor).
+                            if (!layer)
+                                continue;
+                            layer.stop();
+                            layer.active = false;
+                        }
                 }
             }
             // Stop playback or recording if done
@@ -9086,6 +9090,8 @@ var etro = (function () {
         Movie.prototype._renderLayers = function () {
             var frameFullyLoaded = true;
             for (var i = 0; i < this.layers.length; i++) {
+                if (!Object.prototype.hasOwnProperty.call(this.layers, i))
+                    continue;
                 var layer = this.layers[i];
                 // A layer that has been deleted before layers.length has been updated
                 // (see the layers proxy in the constructor).
@@ -9152,7 +9158,8 @@ var etro = (function () {
          */
         Movie.prototype._publishToLayers = function (type, event) {
             for (var i = 0; i < this.layers.length; i++)
-                publish(this.layers[i], type, event);
+                if (Object.prototype.hasOwnProperty.call(this.layers, i))
+                    publish(this.layers[i], type, event);
         };
         Object.defineProperty(Movie.prototype, "rendering", {
             /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "etro",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "An extendable video-editing framework for the browser and Node",
   "browser": "dist/etro-cjs.js",
   "types": "dist/index.d.ts",
@@ -36,6 +36,7 @@
     "karma-jasmine": "^2.0.1",
     "karma-requirejs": "^1.1.0",
     "karma-super-dots-reporter": "^0.2.0",
+    "keep-a-changelog": "^0.10.4",
     "puppeteer": "^2.0.0",
     "resemblejs": "^3.2.5",
     "rollup": "^1.19.4",
@@ -44,6 +45,7 @@
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-typescript2": "^0.29.0",
     "rollup-plugin-uglify-es": "^0.0.1",
+    "shipjs": "0.23.3",
     "typedoc": "^0.20.34",
     "typescript": "^4.1.3"
   },
@@ -57,7 +59,8 @@
     "lint:test": "eslint -c eslint.test-conf.js spec",
     "lint:examples": "eslint -c eslint.example-conf.js --ext .html examples",
     "start": "http-server",
-    "test": "karma start"
+    "test": "karma start",
+    "release": "shipjs prepare"
   },
   "repository": {
     "type": "git",

package/ship.config.js

@@ -0,0 +1,80 @@
+const { parser } = require('keep-a-changelog')
+const fs = require('fs')
+const semver = require('semver')
+
+module.exports = {
+  updateChangelog: false,
+  formatCommitMessage: ({ version }) => `Release v${version}`,
+  formatPullRequestTitle: ({ version }) => `Release v${version}`,
+  getNextVersion: ({ currentVersion, dir }) => {
+    const changelog = new Changelog(`${dir}/CHANGELOG.md`)
+    return changelog.nextVersion(currentVersion)
+  },
+  versionUpdated: async ({ version, _releaseType, dir, _exec }) => {
+    const parsedVersion = semver.parse(version)
+    if (parsedVersion.prerelease.length)
+      return
+
+    // Release 'Unreleased' section in changelog
+    const changelogFile = `${dir}/CHANGELOG.md`
+    const oldChangelog = fs.readFileSync(changelogFile, 'utf8')
+    const parsed = parser(oldChangelog)
+    const release = parsed.findRelease() // get 'Unreleased' section
+    release.setVersion(version) // release
+    release.setDate(new Date()) // today
+    const newChangelog = parsed.toString()
+    fs.writeFileSync(changelogFile, newChangelog, 'utf8')
+  }
+}
+
+class Changelog {
+  constructor (path) {
+    const data = fs.readFileSync(path, 'utf8')
+    const lines = data.split(/\r?\n/)
+    const headings = []
+    let unreleased = false
+
+    this.releaseTag = 'latest'
+    lines.every((line) => {
+      if (line.startsWith('## [Unreleased]')) {
+        unreleased = true
+        const tagMatch = line.match(/## \[Unreleased\]\[(.*)\]/)
+        if (tagMatch)
+          this.releaseTag = tagMatch[1].trim()
+      } else if (line.startsWith('## ')) {
+        return false
+      }
+
+      if (unreleased)
+        if (line.startsWith('### ')) {
+          headings.push(line.match(/### (.*)/)[1].trim())
+        }
+
+      return true
+    })
+
+    if (headings.includes('Changed'))
+      this.releaseType = 'major'
+    else if (headings.includes('Added'))
+      this.releaseType = 'minor'
+    else
+      this.releaseType = 'patch'
+  }
+
+  nextVersion (version) {
+    const parsedVersion = semver.parse(version)
+
+    if (this.releaseTag !== 'latest')
+      if (parsedVersion.prerelease.length) {
+        parsedVersion.inc('prerelease', this.releaseTag)
+      } else {
+        parsedVersion.inc(this.releaseType)
+        parsedVersion.prerelease = [this.releaseTag, 0]
+        parsedVersion.format()
+      }
+    else
+      parsedVersion.inc(this.releaseType)
+
+    return parsedVersion.version
+  }
+}

package/src/effect/stack.ts

@@ -46,7 +46,7 @@ export class Stack extends Base {
 
   attach (movie: Movie): void {
     super.attach(movie)
-    this.effects.forEach(effect => {
+    this.effects.filter(effect => !!effect).forEach(effect => {
       effect.detach()
       effect.attach(movie)
     })
@@ -54,7 +54,7 @@ export class Stack extends Base {
 
   detach (): void {
     super.detach()
-    this.effects.forEach(effect => {
+    this.effects.filter(effect => !!effect).forEach(effect => {
       effect.detach()
     })
   }
@@ -62,6 +62,7 @@ export class Stack extends Base {
   apply (target: Movie | Visual, reltime: number): void {
     for (let i = 0; i < this.effects.length; i++) {
       const effect = this.effects[i]
+      if (!effect) continue
       effect.apply(target, reltime)
     }
   }

package/src/layer/visual.ts

@@ -125,7 +125,7 @@ class Visual extends Base {
   _applyEffects (): void {
     for (let i = 0; i < this.effects.length; i++) {
       const effect = this.effects[i]
-      if (effect.enabled)
+      if (effect && effect.enabled)
         // Pass relative time
         effect.apply(this, this.movie.currentTime - this.startTime)
     }

package/src/movie.ts

@@ -324,11 +324,13 @@ export class Movie {
   pause (): Movie {
     this._paused = true
     // Deactivate all layers
-    for (let i = 0; i < this.layers.length; i++) {
-      const layer = this.layers[i]
-      layer.stop()
-      layer.active = false
-    }
+    for (let i = 0; i < this.layers.length; i++)
+      if (Object.prototype.hasOwnProperty.call(this.layers, i)) {
+        const layer = this.layers[i]
+        layer.stop()
+        layer.active = false
+      }
+
     publish(this, 'movie.pause', {})
     return this
   }
@@ -380,16 +382,17 @@ export class Movie {
       if (!this.repeat || this.recording) {
         this._ended = true
         // Deactivate all layers
-        for (let i = 0; i < this.layers.length; i++) {
-          const layer = this.layers[i]
-          // A layer that has been deleted before layers.length has been updated
-          // (see the layers proxy in the constructor).
-          if (!layer)
-            continue
-
-          layer.stop()
-          layer.active = false
-        }
+        for (let i = 0; i < this.layers.length; i++)
+          if (Object.prototype.hasOwnProperty.call(this.layers, i)) {
+            const layer = this.layers[i]
+            // A layer that has been deleted before layers.length has been updated
+            // (see the layers proxy in the constructor).
+            if (!layer)
+              continue
+
+            layer.stop()
+            layer.active = false
+          }
       }
     }
 
@@ -456,6 +459,8 @@ export class Movie {
   private _renderLayers () {
     let frameFullyLoaded = true
     for (let i = 0; i < this.layers.length; i++) {
+      if (!Object.prototype.hasOwnProperty.call(this.layers, i)) continue
+
       const layer = this.layers[i]
       // A layer that has been deleted before layers.length has been updated
       // (see the layers proxy in the constructor).
@@ -532,7 +537,8 @@ export class Movie {
    */
   private _publishToLayers (type, event) {
     for (let i = 0; i < this.layers.length; i++)
-      publish(this.layers[i], type, event)
+      if (Object.prototype.hasOwnProperty.call(this.layers, i))
+        publish(this.layers[i], type, event)
   }
 
   /**

package/src/util.ts

@@ -425,7 +425,7 @@ export function watchPublic (target: EtroObject): EtroObject {
     publish(proxy, `${target.type}.change.modify`, { property: getPath(receiver, prop), newValue: val })
   }
   const canWatch = (receiver, prop) => !prop.startsWith('_') &&
-    (target.publicExcludes === undefined || !target.publicExcludes.includes(prop))
+    (receiver.publicExcludes === undefined || !receiver.publicExcludes.includes(prop))
 
   // The path to each child property (each is a unique proxy)
   const paths = new WeakMap()