From 3552f50613d6846362bc390d68abd1036b6ae29b Mon Sep 17 00:00:00 2001 From: Aria Minaei Date: Thu, 1 Dec 2022 14:47:20 +0100 Subject: [PATCH] Unify Derivation and Prism 9/n --- packages/dataverse/src/Atom.ts | 6 +++--- packages/dataverse/src/Box.ts | 4 ++-- packages/dataverse/src/PointerProxy.ts | 2 +- packages/dataverse/src/index.ts | 10 +++++----- packages/dataverse/src/integration.test.ts | 2 +- .../dataverse/src/{derivations => prisms}/Interface.ts | 0 .../{derivations => prisms}/iterateAndCountTicks.ts | 0 .../src/{derivations => prisms}/iterateOver.test.ts | 0 .../src/{derivations => prisms}/iterateOver.ts | 0 .../prism/discoveryMechanism.ts | 0 .../src/{derivations => prisms}/prism/prism.test.ts | 0 .../src/{derivations => prisms}/prism/prism.ts | 0 12 files changed, 12 insertions(+), 12 deletions(-) rename packages/dataverse/src/{derivations => prisms}/Interface.ts (100%) rename packages/dataverse/src/{derivations => prisms}/iterateAndCountTicks.ts (100%) rename packages/dataverse/src/{derivations => prisms}/iterateOver.test.ts (100%) rename packages/dataverse/src/{derivations => prisms}/iterateOver.ts (100%) rename packages/dataverse/src/{derivations => prisms}/prism/discoveryMechanism.ts (100%) rename packages/dataverse/src/{derivations => prisms}/prism/prism.test.ts (100%) rename packages/dataverse/src/{derivations => prisms}/prism/prism.ts (100%) diff --git a/packages/dataverse/src/Atom.ts b/packages/dataverse/src/Atom.ts index a6b1266..cc4f454 100644 --- a/packages/dataverse/src/Atom.ts +++ b/packages/dataverse/src/Atom.ts @@ -1,15 +1,15 @@ import get from 'lodash-es/get' import isPlainObject from 'lodash-es/isPlainObject' import last from 'lodash-es/last' -import type {Prism} from './derivations/Interface' -import {isPrism} from './derivations/Interface' +import type {Prism} from './prisms/Interface' +import {isPrism} from './prisms/Interface' import type {Pointer, PointerType} from './pointer' import {isPointer} from './pointer' import pointer, {getPointerMeta} from './pointer' import type {$FixMe, $IntentionalAny} from './types' import type {PathBasedReducer} from './utils/PathBasedReducer' import updateDeep from './utils/updateDeep' -import prism from './derivations/prism/prism' +import prism from './prisms/prism/prism' type Listener = (newVal: unknown) => void diff --git a/packages/dataverse/src/Box.ts b/packages/dataverse/src/Box.ts index 1715c12..a1f2839 100644 --- a/packages/dataverse/src/Box.ts +++ b/packages/dataverse/src/Box.ts @@ -1,5 +1,5 @@ -import type {Prism} from './derivations/Interface' -import prism from './derivations/prism/prism' +import type {Prism} from './prisms/Interface' +import prism from './prisms/prism/prism' import Emitter from './utils/Emitter' /** diff --git a/packages/dataverse/src/PointerProxy.ts b/packages/dataverse/src/PointerProxy.ts index d0274aa..7ac2d7e 100644 --- a/packages/dataverse/src/PointerProxy.ts +++ b/packages/dataverse/src/PointerProxy.ts @@ -5,7 +5,7 @@ import pointer from './pointer' import type {IBox} from './Box' import Box from './Box' import type {$FixMe, $IntentionalAny} from './types' -import prism from './derivations/prism/prism' +import prism from './prisms/prism/prism' /** * Allows creating pointer-derivations where the pointer can be switched out. diff --git a/packages/dataverse/src/index.ts b/packages/dataverse/src/index.ts index ab5b120..63179e0 100644 --- a/packages/dataverse/src/index.ts +++ b/packages/dataverse/src/index.ts @@ -8,11 +8,11 @@ export type {IdentityPrismProvider} from './Atom' export {default as Atom, val, pointerToPrism} from './Atom' export {default as Box} from './Box' export type {IBox} from './Box' -export {isPrism} from './derivations/Interface' -export type {Prism} from './derivations/Interface' -export {default as iterateAndCountTicks} from './derivations/iterateAndCountTicks' -export {default as iterateOver} from './derivations/iterateOver' -export {default as prism} from './derivations/prism/prism' +export {isPrism} from './prisms/Interface' +export type {Prism} from './prisms/Interface' +export {default as iterateAndCountTicks} from './prisms/iterateAndCountTicks' +export {default as iterateOver} from './prisms/iterateOver' +export {default as prism} from './prisms/prism/prism' export {default as pointer, getPointerParts, isPointer} from './pointer' export type {Pointer, PointerType} from './pointer' export {default as Ticker} from './Ticker' diff --git a/packages/dataverse/src/integration.test.ts b/packages/dataverse/src/integration.test.ts index 5f17fec..6dd2a96 100644 --- a/packages/dataverse/src/integration.test.ts +++ b/packages/dataverse/src/integration.test.ts @@ -2,7 +2,7 @@ * @jest-environment jsdom */ import Atom, {val} from './Atom' -import prism from './derivations/prism/prism' +import prism from './prisms/prism/prism' import Ticker from './Ticker' describe(`v2 atom`, () => { diff --git a/packages/dataverse/src/derivations/Interface.ts b/packages/dataverse/src/prisms/Interface.ts similarity index 100% rename from packages/dataverse/src/derivations/Interface.ts rename to packages/dataverse/src/prisms/Interface.ts diff --git a/packages/dataverse/src/derivations/iterateAndCountTicks.ts b/packages/dataverse/src/prisms/iterateAndCountTicks.ts similarity index 100% rename from packages/dataverse/src/derivations/iterateAndCountTicks.ts rename to packages/dataverse/src/prisms/iterateAndCountTicks.ts diff --git a/packages/dataverse/src/derivations/iterateOver.test.ts b/packages/dataverse/src/prisms/iterateOver.test.ts similarity index 100% rename from packages/dataverse/src/derivations/iterateOver.test.ts rename to packages/dataverse/src/prisms/iterateOver.test.ts diff --git a/packages/dataverse/src/derivations/iterateOver.ts b/packages/dataverse/src/prisms/iterateOver.ts similarity index 100% rename from packages/dataverse/src/derivations/iterateOver.ts rename to packages/dataverse/src/prisms/iterateOver.ts diff --git a/packages/dataverse/src/derivations/prism/discoveryMechanism.ts b/packages/dataverse/src/prisms/prism/discoveryMechanism.ts similarity index 100% rename from packages/dataverse/src/derivations/prism/discoveryMechanism.ts rename to packages/dataverse/src/prisms/prism/discoveryMechanism.ts diff --git a/packages/dataverse/src/derivations/prism/prism.test.ts b/packages/dataverse/src/prisms/prism/prism.test.ts similarity index 100% rename from packages/dataverse/src/derivations/prism/prism.test.ts rename to packages/dataverse/src/prisms/prism/prism.test.ts diff --git a/packages/dataverse/src/derivations/prism/prism.ts b/packages/dataverse/src/prisms/prism/prism.ts similarity index 100% rename from packages/dataverse/src/derivations/prism/prism.ts rename to packages/dataverse/src/prisms/prism/prism.ts