auto-bundle asset defined packs (#932)

* auto-bundle asset defined packs

* improve err

* schema correction, write bundle buffer not bundle object

* prebuild file url, write prebuilds to asset folder

* working

* disambiguate "bundle"

* missed a spot

* factor out *pack() for later

* proper rename in spec

* spec lint

* one more refactor

* tweak

* liiiiiint

---------

Co-authored-by: HDegroote <75906619+HDegroote@users.noreply.github.com>

Author: davidmarkclements

cmd/run.js

@@ -187,7 +187,6 @@ module.exports = (ipc) =>
 
     state.update({ config })
     global.Pear = new API(ipc, state)
-
     const protocol = new Module.Protocol({
       exists(url) {
         if (url.href.endsWith('.bare') || url.href.endsWith('.node'))

examples/terminal/package.json

@@ -6,7 +6,6 @@
   "type": "module",
   "pear": {
     "name": "termex",
-    "type": "terminal",
     "bin": "termex"
   },
   "keywords": [],

package-lock.json

@@ -52,7 +52,7 @@
   ],
   "dependencies": {
     "b4a": "^1.6.7",
-    "bare-bundle": "^1.8.3",
+    "bare-bundle": "^1.10.0",
     "bare-daemon": "^1.1.0",
     "bare-env": "^3.0.0",
     "bare-events": "^2.5.4",
@@ -104,6 +104,7 @@
     "pear-ipc": "^6.7.0",
     "pear-link": "^4.1.0",
     "pear-logger": "^1.0.0",
+    "pear-pack": "^1.1.2",
     "pear-pipe": "^1.0.1",
     "pear-run": "^1.0.8",
     "pear-shake": "^2.0.1",

package.json

@@ -42,6 +42,40 @@ pearSchema.register({
   ]
 })
 
+pearSchema.register({
+  name: 'pack',
+  fields: [
+    {
+      name: 'bundle',
+      type: 'string',
+      required: true
+    },
+    {
+      name: 'entry',
+      type: 'string',
+      required: true
+    },
+    {
+      name: 'builtins',
+      type: 'string',
+      array: true,
+      required: false
+    },
+    {
+      name: 'conditions',
+      type: 'string',
+      array: true,
+      required: false
+    },
+    {
+      name: 'extensions',
+      type: 'string',
+      array: true,
+      required: false
+    }
+  ]
+})
+
 // both structs & custom types
 pearSchema.register({
   name: 'assets',
@@ -73,6 +107,11 @@ pearSchema.register({
     {
       name: 'bytes',
       type: 'uint'
+    },
+    {
+      name: 'pack',
+      type: '@pear/pack',
+      array: true
     }
   ]
 })
@@ -101,7 +140,7 @@ pearSchema.register({
 })
 
 pearSchema.register({
-  name: 'bundle',
+  name: 'traits',
   fields: [
     {
       name: 'link',
@@ -179,8 +218,8 @@ pearDB.collections.register({
 })
 
 pearDB.collections.register({
-  name: 'bundle',
-  schema: '@pear/bundle',
+  name: 'traits',
+  schema: '@pear/traits',
   key: ['link']
 })
 
@@ -197,8 +236,8 @@ pearDB.collections.register({
 })
 
 pearDB.indexes.register({
-  name: 'bundle-by-tags',
-  collection: '@pear/bundle',
+  name: 'traits-by-tags',
+  collection: '@pear/traits',
   unique: false,
   key: {
     type: 'string',

scripts/build-hyperdb.js

@@ -80,6 +80,30 @@
       "derived": false,
       "key": ["link"],
       "trigger": null
+    },
+    {
+      "name": "traits",
+      "namespace": "pear",
+      "id": 7,
+      "type": 1,
+      "indexes": ["@pear/traits-by-tags"],
+      "schema": "@pear/traits",
+      "derived": false,
+      "key": ["link"],
+      "trigger": null
+    },
+    {
+      "name": "traits-by-tags",
+      "namespace": "pear",
+      "id": 8,
+      "type": 2,
+      "collection": "@pear/traits",
+      "unique": false,
+      "deprecated": false,
+      "key": {
+        "type": "string",
+        "map": "tags"
+      }
     }
   ]
 }