piral-update 0.15.0-alpha.3537 → 0.15.0-alpha.3555

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/esm/actions.d.ts +2 -2
  2. package/esm/actions.js +10 -35
  3. package/esm/actions.js.map +1 -1
  4. package/esm/types.d.ts +5 -5
  5. package/lib/actions.d.ts +2 -2
  6. package/lib/actions.js +10 -35
  7. package/lib/actions.js.map +1 -1
  8. package/lib/types.d.ts +5 -5
  9. package/package.json +3 -3
  10. package/src/actions.ts +14 -34
  11. package/src/types.ts +5 -5
package/esm/actions.d.ts CHANGED
@@ -1,6 +1,6 @@
1
- import { GlobalStateContext, PiletMetadata } from 'piral-core';
1
+ import { GlobalStateContext, PiletEntries } from 'piral-core';
2
2
  import { PiletUpdateMode } from './types';
3
3
  export declare function rejectUpdate(ctx: GlobalStateContext): void;
4
4
  export declare function approveUpdate(ctx: GlobalStateContext): void;
5
- export declare function checkForUpdates(ctx: GlobalStateContext, pilets: Array<PiletMetadata>): void;
5
+ export declare function checkForUpdates(ctx: GlobalStateContext, pilets: PiletEntries): void;
6
6
  export declare function setUpdateMode(ctx: GlobalStateContext, piletName: string, mode: PiletUpdateMode): void;
package/esm/actions.js CHANGED
@@ -1,48 +1,23 @@
1
- import { setupPilet } from 'piral-base';
2
1
  import { withKey } from 'piral-core';
3
2
  function getPiletHash(pilet) {
4
- if ('link' in pilet) {
5
- return {
6
- name: pilet.name || '',
7
- link: pilet.link || '',
8
- };
9
- }
10
- else if ('hash' in pilet) {
11
- return {
12
- name: pilet.name || '',
13
- hash: pilet.hash || '',
14
- };
15
- }
16
- else if ('version' in pilet) {
17
- return {
18
- name: pilet.name || '',
19
- version: pilet.version || '',
20
- };
21
- }
22
- else {
23
- return {
24
- name: pilet['name'] || '',
25
- };
26
- }
3
+ return {
4
+ name: pilet.name,
5
+ version: pilet.version,
6
+ };
7
+ }
8
+ function sortPilets(a, b) {
9
+ return a.name.localeCompare(b.name);
27
10
  }
28
11
  function computePiletHash(pilets) {
29
- return JSON.stringify(pilets.map(getPiletHash).sort((a, b) => a.name.localeCompare(b.name)));
12
+ return JSON.stringify(pilets.map(getPiletHash).sort(sortPilets));
30
13
  }
31
14
  export function rejectUpdate(ctx) {
32
15
  ctx.dispatch((state) => (Object.assign(Object.assign({}, state), { updatability: Object.assign(Object.assign({}, state.updatability), { target: [], active: false }) })));
33
16
  }
34
17
  export function approveUpdate(ctx) {
35
18
  const pilets = ctx.readState((s) => s.updatability.target);
36
- for (const meta of pilets) {
37
- ctx.options.loadPilet(meta).then((pilet) => {
38
- try {
39
- ctx.injectPilet(pilet);
40
- setupPilet(pilet, ctx.options.createApi);
41
- }
42
- catch (error) {
43
- console.error(error);
44
- }
45
- });
19
+ for (const pilet of pilets) {
20
+ ctx.addPilet(pilet);
46
21
  }
47
22
  ctx.rejectUpdate();
48
23
  }
package/esm/actions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"actions.js","sourceRoot":"","sources":["../src/actions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"actions.js","sourceRoot":"","sources":["../src/actions.ts"],"names":[],"mappings":"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"}
package/esm/types.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { Dict, GlobalStateContext, PiletMetadata } from 'piral-core';
1
+ import type { Dict, GlobalStateContext, PiletEntries } from 'piral-core';
2
2
  import type { ComponentType } from 'react';
3
3
  declare module 'piral-core/lib/types/custom' {
4
4
  interface PiletCustomApi extends PiletUpdateApi {
@@ -15,7 +15,7 @@ declare module 'piral-core/lib/types/custom' {
15
15
  interface PiralCustomActions {
16
16
  rejectUpdate(): void;
17
17
  approveUpdate(): void;
18
- checkForUpdates(pilets: Array<PiletMetadata>): void;
18
+ checkForUpdates(pilets: PiletEntries): void;
19
19
  setUpdateMode(piletName: string, mode: PiletUpdateMode): void;
20
20
  }
21
21
  interface PiralCustomComponentsState {
@@ -31,13 +31,13 @@ export interface UpdateModeRegistration {
31
31
  export interface UpdatabilityState {
32
32
  active: boolean;
33
33
  lastHash: string;
34
- target: Array<PiletMetadata>;
34
+ target: PiletEntries;
35
35
  }
36
36
  export interface ListenCallback {
37
- (notify: (pilets: Array<PiletMetadata>) => void, context: GlobalStateContext): void;
37
+ (notify: (pilets: PiletEntries) => void, context: GlobalStateContext): void;
38
38
  }
39
39
  export interface UpdateDialogProps {
40
- piletsToUpdate: Array<PiletMetadata>;
40
+ piletsToUpdate: PiletEntries;
41
41
  onApprove(): void;
42
42
  onReject(): void;
43
43
  }
package/lib/actions.d.ts CHANGED
@@ -1,6 +1,6 @@
1
- import { GlobalStateContext, PiletMetadata } from 'piral-core';
1
+ import { GlobalStateContext, PiletEntries } from 'piral-core';
2
2
  import { PiletUpdateMode } from './types';
3
3
  export declare function rejectUpdate(ctx: GlobalStateContext): void;
4
4
  export declare function approveUpdate(ctx: GlobalStateContext): void;
5
- export declare function checkForUpdates(ctx: GlobalStateContext, pilets: Array<PiletMetadata>): void;
5
+ export declare function checkForUpdates(ctx: GlobalStateContext, pilets: PiletEntries): void;
6
6
  export declare function setUpdateMode(ctx: GlobalStateContext, piletName: string, mode: PiletUpdateMode): void;
package/lib/actions.js CHANGED
@@ -1,35 +1,18 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.setUpdateMode = exports.checkForUpdates = exports.approveUpdate = exports.rejectUpdate = void 0;
4
- const piral_base_1 = require("piral-base");
5
4
  const piral_core_1 = require("piral-core");
6
5
  function getPiletHash(pilet) {
7
- if ('link' in pilet) {
8
- return {
9
- name: pilet.name || '',
10
- link: pilet.link || '',
11
- };
12
- }
13
- else if ('hash' in pilet) {
14
- return {
15
- name: pilet.name || '',
16
- hash: pilet.hash || '',
17
- };
18
- }
19
- else if ('version' in pilet) {
20
- return {
21
- name: pilet.name || '',
22
- version: pilet.version || '',
23
- };
24
- }
25
- else {
26
- return {
27
- name: pilet['name'] || '',
28
- };
29
- }
6
+ return {
7
+ name: pilet.name,
8
+ version: pilet.version,
9
+ };
10
+ }
11
+ function sortPilets(a, b) {
12
+ return a.name.localeCompare(b.name);
30
13
  }
31
14
  function computePiletHash(pilets) {
32
- return JSON.stringify(pilets.map(getPiletHash).sort((a, b) => a.name.localeCompare(b.name)));
15
+ return JSON.stringify(pilets.map(getPiletHash).sort(sortPilets));
33
16
  }
34
17
  function rejectUpdate(ctx) {
35
18
  ctx.dispatch((state) => (Object.assign(Object.assign({}, state), { updatability: Object.assign(Object.assign({}, state.updatability), { target: [], active: false }) })));
@@ -37,16 +20,8 @@ function rejectUpdate(ctx) {
37
20
  exports.rejectUpdate = rejectUpdate;
38
21
  function approveUpdate(ctx) {
39
22
  const pilets = ctx.readState((s) => s.updatability.target);
40
- for (const meta of pilets) {
41
- ctx.options.loadPilet(meta).then((pilet) => {
42
- try {
43
- ctx.injectPilet(pilet);
44
- (0, piral_base_1.setupPilet)(pilet, ctx.options.createApi);
45
- }
46
- catch (error) {
47
- console.error(error);
48
- }
49
- });
23
+ for (const pilet of pilets) {
24
+ ctx.addPilet(pilet);
50
25
  }
51
26
  ctx.rejectUpdate();
52
27
  }
package/lib/actions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"actions.js","sourceRoot":"","sources":["../src/actions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"actions.js","sourceRoot":"","sources":["../src/actions.ts"],"names":[],"mappings":"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"}
package/lib/types.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { Dict, GlobalStateContext, PiletMetadata } from 'piral-core';
1
+ import type { Dict, GlobalStateContext, PiletEntries } from 'piral-core';
2
2
  import type { ComponentType } from 'react';
3
3
  declare module 'piral-core/lib/types/custom' {
4
4
  interface PiletCustomApi extends PiletUpdateApi {
@@ -15,7 +15,7 @@ declare module 'piral-core/lib/types/custom' {
15
15
  interface PiralCustomActions {
16
16
  rejectUpdate(): void;
17
17
  approveUpdate(): void;
18
- checkForUpdates(pilets: Array<PiletMetadata>): void;
18
+ checkForUpdates(pilets: PiletEntries): void;
19
19
  setUpdateMode(piletName: string, mode: PiletUpdateMode): void;
20
20
  }
21
21
  interface PiralCustomComponentsState {
@@ -31,13 +31,13 @@ export interface UpdateModeRegistration {
31
31
  export interface UpdatabilityState {
32
32
  active: boolean;
33
33
  lastHash: string;
34
- target: Array<PiletMetadata>;
34
+ target: PiletEntries;
35
35
  }
36
36
  export interface ListenCallback {
37
- (notify: (pilets: Array<PiletMetadata>) => void, context: GlobalStateContext): void;
37
+ (notify: (pilets: PiletEntries) => void, context: GlobalStateContext): void;
38
38
  }
39
39
  export interface UpdateDialogProps {
40
- piletsToUpdate: Array<PiletMetadata>;
40
+ piletsToUpdate: PiletEntries;
41
41
  onApprove(): void;
42
42
  onReject(): void;
43
43
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "piral-update",
3
- "version": "0.15.0-alpha.3537",
3
+ "version": "0.15.0-alpha.3555",
4
4
  "description": "Plugin for auto-updating pilets in Piral.",
5
5
  "keywords": [
6
6
  "piral",
@@ -42,10 +42,10 @@
42
42
  "test": "echo \"Error: run tests from root\" && exit 1"
43
43
  },
44
44
  "devDependencies": {
45
- "piral-core": "0.15.0-alpha.3537"
45
+ "piral-core": "0.15.0-alpha.3555"
46
46
  },
47
47
  "peerDependencies": {
48
48
  "piral-core": "0.14.x"
49
49
  },
50
- "gitHead": "5da9d7fe4793668e956e96470aef95b41f2805d7"
50
+ "gitHead": "0727a5c782dd1bbc7ccaa11a036a9f16e616bf10"
51
51
  }
package/src/actions.ts CHANGED
@@ -1,32 +1,19 @@
1
- import { setupPilet } from 'piral-base';
2
- import { withKey, GlobalStateContext, PiletMetadata } from 'piral-core';
1
+ import { withKey, GlobalStateContext, PiletEntries, PiletMetadata } from 'piral-core';
3
2
  import { PiletUpdateMode } from './types';
4
3
 
5
4
  function getPiletHash(pilet: PiletMetadata) {
6
- if ('link' in pilet) {
7
- return {
8
- name: pilet.name || '',
9
- link: pilet.link || '',
10
- };
11
- } else if ('hash' in pilet) {
12
- return {
13
- name: pilet.name || '',
14
- hash: pilet.hash || '',
15
- };
16
- } else if ('version' in pilet) {
17
- return {
18
- name: pilet.name || '',
19
- version: pilet.version || '',
20
- };
21
- } else {
22
- return {
23
- name: pilet['name'] || '',
24
- };
25
- }
5
+ return {
6
+ name: pilet.name,
7
+ version: pilet.version,
8
+ };
9
+ }
10
+
11
+ function sortPilets(a: { name: string }, b: { name: string }) {
12
+ return a.name.localeCompare(b.name);
26
13
  }
27
14
 
28
- function computePiletHash(pilets: Array<PiletMetadata>) {
29
- return JSON.stringify(pilets.map(getPiletHash).sort((a, b) => a.name.localeCompare(b.name)));
15
+ function computePiletHash(pilets: PiletEntries) {
16
+ return JSON.stringify(pilets.map(getPiletHash).sort(sortPilets));
30
17
  }
31
18
 
32
19
  export function rejectUpdate(ctx: GlobalStateContext) {
@@ -43,21 +30,14 @@ export function rejectUpdate(ctx: GlobalStateContext) {
43
30
  export function approveUpdate(ctx: GlobalStateContext) {
44
31
  const pilets = ctx.readState((s) => s.updatability.target);
45
32
 
46
- for (const meta of pilets) {
47
- ctx.options.loadPilet(meta).then((pilet) => {
48
- try {
49
- ctx.injectPilet(pilet);
50
- setupPilet(pilet, ctx.options.createApi);
51
- } catch (error) {
52
- console.error(error);
53
- }
54
- });
33
+ for (const pilet of pilets) {
34
+ ctx.addPilet(pilet);
55
35
  }
56
36
 
57
37
  ctx.rejectUpdate();
58
38
  }
59
39
 
60
- export function checkForUpdates(ctx: GlobalStateContext, pilets: Array<PiletMetadata>) {
40
+ export function checkForUpdates(ctx: GlobalStateContext, pilets: PiletEntries) {
61
41
  const checkHash = computePiletHash(pilets);
62
42
  const lastHash = ctx.readState((s) => s.updatability.lastHash || computePiletHash(s.modules));
63
43
 
package/src/types.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { Dict, GlobalStateContext, PiletMetadata } from 'piral-core';
1
+ import type { Dict, GlobalStateContext, PiletEntries } from 'piral-core';
2
2
  import type { ComponentType } from 'react';
3
3
 
4
4
  declare module 'piral-core/lib/types/custom' {
@@ -20,7 +20,7 @@ declare module 'piral-core/lib/types/custom' {
20
20
 
21
21
  approveUpdate(): void;
22
22
 
23
- checkForUpdates(pilets: Array<PiletMetadata>): void;
23
+ checkForUpdates(pilets: PiletEntries): void;
24
24
 
25
25
  setUpdateMode(piletName: string, mode: PiletUpdateMode): void;
26
26
  }
@@ -40,15 +40,15 @@ export interface UpdateModeRegistration {
40
40
  export interface UpdatabilityState {
41
41
  active: boolean;
42
42
  lastHash: string;
43
- target: Array<PiletMetadata>;
43
+ target: PiletEntries;
44
44
  }
45
45
 
46
46
  export interface ListenCallback {
47
- (notify: (pilets: Array<PiletMetadata>) => void, context: GlobalStateContext): void;
47
+ (notify: (pilets: PiletEntries) => void, context: GlobalStateContext): void;
48
48
  }
49
49
 
50
50
  export interface UpdateDialogProps {
51
- piletsToUpdate: Array<PiletMetadata>;
51
+ piletsToUpdate: PiletEntries;
52
52
  onApprove(): void;
53
53
  onReject(): void;
54
54
  }