refactor: integrate persea

build/flecks.yml

@@ -1,35 +1,35 @@
 '@avocado/behavior': {}
-'@avocado/behavior-persea': {}
+'@avocado/behavior/persea': {}
 '@avocado/code': {}
 '@avocado/color': {}
 '@avocado/entity': {}
-'@avocado/entity-persea': {}
+'@avocado/entity/persea': {}
 '@avocado/graphics': {}
-'@avocado/graphics-persea': {}
+'@avocado/graphics/persea': {}
 '@avocado/input': {}
 '@avocado/math': {}
-'@avocado/math-persea': {}
+'@avocado/math/persea': {}
 '@avocado/physics': {}
-'@avocado/physics-persea': {}
+'@avocado/physics/persea': {}
 '@avocado/react': {}
 '@avocado/resource': {}
-'@avocado/resource-persea':
+'@avocado/resource/persea':
   controllers:
-    - '@avocado/behavior-persea'
-    - '@avocado/graphics-persea'
-    - '@avocado/entity-persea'
-    - '@avocado/sound-persea'
-    - '@avocado/timing-persea'
-    - '@avocado/topdown-persea'
+    - '@avocado/behavior/persea'
+    - '@avocado/graphics/persea'
+    - '@avocado/entity/persea'
+    - '@avocado/sound/persea'
+    - '@avocado/timing/persea'
+    - '@avocado/topdown/persea'
 '@avocado/s13n': {}
 '@avocado/sound': {}
-'@avocado/sound-persea': {}
+'@avocado/sound/persea': {}
 '@avocado/timing': {}
-'@avocado/timing-persea': {}
+'@avocado/timing/persea': {}
 '@avocado/topdown': {}
-'@avocado/topdown-persea': {}
+'@avocado/topdown/persea': {}
 '@avocado/traits': {}
-'@avocado/traits-persea': {}
+'@avocado/traits/persea': {}
 '@humus/combat': {}
 '@humus/combat/persea': {}
 '@humus/core': {}

package.json

@@ -11,39 +11,29 @@
     "build:only": "flecks build",
     "debug": "DEBUG=*,-babel* npm run dev",
     "dev": "npm run -- build:only -h",
-    "link-all": "for i in avocado humus persea; do yarn link $(for j in $(ls node_modules/@$i/); do echo \" @$i/$j\"; done); done",
+    "link-all": "yarn && for i in avocado humus persea; do yarn link $(for j in $(ls node_modules/@$i/); do echo \" @$i/$j\"; done); done",
     "postinstall": "patch-package",
     "repl": "npx flecks repl --rlwrap",
-    "start": "DEBUG=@avocado*,@flecks*,@persea*,persea*,-@flecks/core/flecks* npm run dev",
+    "start": "DEBUG=@avocado*,@flecks*,@persea*,persea*,-@flecks/core/flecks*,-*:silly npm run dev",
     "unlink-all": "yarn unlink $(for i in $(ls node_modules/@flecks); do echo -n \"@flecks/$i \"; done) && yarn install --force",
     "up": "yarn add $(for i in $(ls node_modules/@flecks); do echo -n \"@flecks/$i \"; done) $(for i in $(ls node_modules/@avocado); do echo -n \"@avocado/$i \"; done) $(for i in $(ls node_modules/@humus); do echo -n \"@humus/$i \"; done)"
   },
   "dependencies": {
     "@avocado/behavior": "^3.0.0",
-    "@avocado/behavior-persea": "^3.0.0",
     "@avocado/color": "^3.0.0",
     "@avocado/core": "^3.0.0",
     "@avocado/entity": "^3.0.0",
-    "@avocado/entity-persea": "^3.0.0",
     "@avocado/graphics": "^3.0.0",
-    "@avocado/graphics-persea": "^3.0.0",
     "@avocado/input": "^3.0.0",
     "@avocado/math": "^3.0.0",
-    "@avocado/math-persea": "^3.0.0",
     "@avocado/physics": "^3.0.0",
-    "@avocado/physics-persea": "^3.0.0",
     "@avocado/react": "^3.0.0",
     "@avocado/resource": "^3.0.0",
-    "@avocado/resource-persea": "^3.0.0",
     "@avocado/s13n": "^3.0.0",
     "@avocado/sound": "^3.0.0",
-    "@avocado/sound-persea": "^3.0.0",
     "@avocado/timing": "^3.0.0",
-    "@avocado/timing-persea": "^3.0.0",
     "@avocado/topdown": "^3.0.0",
-    "@avocado/topdown-persea": "^3.0.0",
     "@avocado/traits": "^3.0.0",
-    "@avocado/traits-persea": "^3.0.0",
     "@flecks/core": "^1.4.1",
     "@flecks/create-app": "^1.4.1",
     "@flecks/db": "^1.4.1",

packages/core/package.json

@@ -33,7 +33,6 @@
     "@avocado/math": "^3.0.0",
     "@avocado/react": "^3.0.0",
     "@avocado/resource": "^3.0.0",
-    "@avocado/resource-persea": "^3.0.0",
     "@flecks/core": "^1.4.1",
     "@flecks/db": "^1.4.1",
     "@flecks/react": "^1.4.1",

packages/core/src/components/persea/resource/index.jsx

@@ -6,7 +6,7 @@ import {
   TabList,
   TabPanel,
 } from '@avocado/react';
-import {Context, Resource as ResourceComponent} from '@avocado/resource-persea';
+import {Context, Resource as ResourceComponent} from '@avocado/resource/persea';
 import {classnames, PropTypes, React} from '@flecks/react';
 import {useDispatch, useSelector} from '@flecks/redux';
 import {userIdSelector} from '@flecks/user';

packages/core/src/index.js

@@ -1,4 +1,4 @@
-import {patchJsonResource, replaceResource} from '@avocado/resource-persea';
+import {patchJsonResource, replaceResource} from '@avocado/resource/persea';
 import {Hooks} from '@flecks/core';
 
 import Persea from './components/persea';

packages/core/src/server/packets/decorators/action.js

@@ -1,4 +1,4 @@
-import {patchJsonResource, replaceResource} from '@avocado/resource-persea';
+import {patchJsonResource, replaceResource} from '@avocado/resource/persea';
 
 export default (Action, flecks) => class ProjectAction extends Action {
 

packages/core/src/server/start-flush.js

@@ -16,7 +16,7 @@ const startFlush = (flecks) => {
         const {patch, project, uri} = patches.shift();
         const path = join(process.cwd(), 'projects', project, uri);
         if (!patching[path]) {
-          const {toBuffer, fromBuffer} = flecks.get('$avocado/resource-persea.controllers')
+          const {toBuffer, fromBuffer} = flecks.get('$avocado/resource/persea.controllers')
             .find(({matcher}) => uri.match(matcher));
           patching[path] = new Promise((resolve) => {
             readFile(path).then((buffer) => {

packages/core/src/sidebar/organization/organization/index.jsx

@@ -101,7 +101,7 @@ const Organization = ({
         nodes={nodesFromResourcePaths(label, uuid, resourcePaths)}
         renderLabel={({label, nodes, value}) => {
           const {displayName} = flecks
-            .get('$avocado/resource-persea.controllers')
+            .get('$avocado/resource/persea.controllers')
             .find(({matcher}) => value.match(matcher))
             .Component;
           return (

packages/core/src/state/projects.js

@@ -17,7 +17,7 @@ export const fetchProjectResource = createAsyncThunk(
   async ({uri, uuid}, {extra: flecks}) => {
     Resource.root = join('/projects', uuid);
     const buffer = await Resource.read(uri);
-    const {fromBuffer} = flecks.get('$avocado/resource-persea.controllers')
+    const {fromBuffer} = flecks.get('$avocado/resource/persea.controllers')
       .find(({matcher}) => uri.match(matcher));
     try {
       return fromBuffer(Buffer.from(buffer), flecks);