Refactor of asset bundles

common/hack.ts

@@ -1,4 +0,0 @@
-export function patchDenoLibJS(code: string): string {
-  // The Deno std lib has one occurence of a regex that Webkit JS doesn't (yet parse), we'll strip it because it's likely never invoked anyway, YOLO
-  return code.replaceAll("/(?<=\\n)/", "/()/");
-}

common/spaces/asset_bundle_space_primitives.ts

@@ -1,10 +1,7 @@
 import { Plug } from "../../plugos/plug.ts";
-import {
-  AssetBundle,
-  assetReadFileSync,
-} from "../../plugos/asset_bundle_reader.ts";
 import { FileMeta } from "../types.ts";
 import { FileData, FileEncoding, SpacePrimitives } from "./space_primitives.ts";
+import { AssetBundle } from "../../plugos/asset_bundle/bundle.ts";
 
 export class AssetBundlePlugSpacePrimitives implements SpacePrimitives {
   constructor(
@@ -15,17 +12,22 @@ export class AssetBundlePlugSpacePrimitives implements SpacePrimitives {
 
   async fetchFileList(): Promise<FileMeta[]> {
     const l = await this.wrapped.fetchFileList();
-    return Object.entries(this.assetBundle).filter(([k]) =>
-      k.startsWith("_plug/")
-    ).map(([_, v]) => v.meta).concat(l);
+    return this.assetBundle.listFiles().filter((p) => p.startsWith("_plug/"))
+      .map((p) => ({
+        name: p,
+        contentType: "application/json",
+        lastModified: 0,
+        perm: "ro",
+        size: -1,
+      } as FileMeta)).concat(l);
   }
 
   readFile(
     name: string,
     encoding: FileEncoding,
   ): Promise<{ data: FileData; meta: FileMeta }> {
-    if (this.assetBundle[name]) {
-      const data = assetReadFileSync(this.assetBundle, name);
+    if (this.assetBundle.has(name)) {
+      const data = this.assetBundle.readFileSync(name);
       // console.log("Requested encoding", encoding);
       return Promise.resolve({
         data: encoding === "string" ? new TextDecoder().decode(data) : data,
@@ -41,8 +43,8 @@ export class AssetBundlePlugSpacePrimitives implements SpacePrimitives {
   }
 
   getFileMeta(name: string): Promise<FileMeta> {
-    if (this.assetBundle[name]) {
-      const data = assetReadFileSync(this.assetBundle, name);
+    if (this.assetBundle.has(name)) {
+      const data = this.assetBundle.readFileSync(name);
       return Promise.resolve({
         lastModified: 0,
         size: data.byteLength,
@@ -63,7 +65,7 @@ export class AssetBundlePlugSpacePrimitives implements SpacePrimitives {
   }
 
   deleteFile(name: string): Promise<void> {
-    if (this.assetBundle[name]) {
+    if (this.assetBundle.has(name)) {
       // Quietly ignore
       return Promise.resolve();
     }

common/spaces/disk_space_primitives.ts

@@ -5,7 +5,10 @@ import { FileMeta } from "../types.ts";
 import { FileData, FileEncoding, SpacePrimitives } from "./space_primitives.ts";
 import { Plug } from "../../plugos/plug.ts";
 import { mime } from "https://deno.land/x/mimetypes@v1.0.0/mod.ts";
-import { base64Decode, base64Encode } from "../../plugos/base64.ts";
+import {
+  base64Decode,
+  base64Encode,
+} from "../../plugos/asset_bundle/base64.ts";
 
 function lookupContentType(path: string): string {
   return mime.getType(path) || "application/octet-stream";

common/spaces/evented_space_primitives.ts

@@ -19,14 +19,14 @@ export class EventedSpacePrimitives implements SpacePrimitives {
     plug: Plug<any>,
     env: string,
     name: string,
-    args: any[]
+    args: any[],
   ): Promise<any> {
     return this.wrapped.invokeFunction(plug, env, name, args);
   }
 
   readFile(
     name: string,
-    encoding: FileEncoding
+    encoding: FileEncoding,
   ): Promise<{ data: FileData; meta: FileMeta }> {
     return this.wrapped.readFile(name, encoding);
   }
@@ -35,13 +35,13 @@ export class EventedSpacePrimitives implements SpacePrimitives {
     name: string,
     encoding: FileEncoding,
     data: FileData,
-    selfUpdate: boolean
+    selfUpdate: boolean,
   ): Promise<FileMeta> {
     const newMeta = await this.wrapped.writeFile(
       name,
       encoding,
       data,
-      selfUpdate
+      selfUpdate,
     );
     // This can happen async
     if (name.endsWith(".md")) {

common/spaces/space_primitives.ts

@@ -8,14 +8,14 @@ export interface SpacePrimitives {
   fetchFileList(): Promise<FileMeta[]>;
   readFile(
     name: string,
-    encoding: FileEncoding
+    encoding: FileEncoding,
   ): Promise<{ data: FileData; meta: FileMeta }>;
   getFileMeta(name: string): Promise<FileMeta>;
   writeFile(
     name: string,
     encoding: FileEncoding,
     data: FileData,
-    selfUpdate?: boolean
+    selfUpdate?: boolean,
   ): Promise<FileMeta>;
   deleteFile(name: string): Promise<void>;
 
@@ -25,6 +25,6 @@ export interface SpacePrimitives {
     plug: Plug<any>,
     env: string,
     name: string,
-    args: any[]
+    args: any[],
   ): Promise<any>;
 }

common/tree.ts

@@ -34,7 +34,7 @@ export function removeParentPointers(tree: ParseTree) {
 
 export function findParentMatching(
   tree: ParseTree,
-  matchFn: (tree: ParseTree) => boolean
+  matchFn: (tree: ParseTree) => boolean,
 ): ParseTree | null {
   let node = tree.parent;
   while (node) {
@@ -48,14 +48,14 @@ export function findParentMatching(
 
 export function collectNodesOfType(
   tree: ParseTree,
-  nodeType: string
+  nodeType: string,
 ): ParseTree[] {
   return collectNodesMatching(tree, (n) => n.type === nodeType);
 }
 
 export function collectNodesMatching(
   tree: ParseTree,
-  matchFn: (tree: ParseTree) => boolean
+  matchFn: (tree: ParseTree) => boolean,
 ): ParseTree[] {
   if (matchFn(tree)) {
     return [tree];
@@ -72,7 +72,7 @@ export function collectNodesMatching(
 // return value: returning undefined = not matched, continue, null = delete, new node = replace
 export function replaceNodesMatching(
   tree: ParseTree,
-  substituteFn: (tree: ParseTree) => ParseTree | null | undefined
+  substituteFn: (tree: ParseTree) => ParseTree | null | undefined,
 ) {
   if (tree.children) {
     let children = tree.children.slice();
@@ -95,14 +95,14 @@ export function replaceNodesMatching(
 
 export function findNodeMatching(
   tree: ParseTree,
-  matchFn: (tree: ParseTree) => boolean
+  matchFn: (tree: ParseTree) => boolean,
 ): ParseTree | null {
   return collectNodesMatching(tree, matchFn)[0];
 }
 
 export function findNodeOfType(
   tree: ParseTree,
-  nodeType: string
+  nodeType: string,
 ): ParseTree | null {
   return collectNodesMatching(tree, (n) => n.type === nodeType)[0];
 }
@@ -110,7 +110,7 @@ export function findNodeOfType(
 export function traverseTree(
   tree: ParseTree,
   // Return value = should stop traversal?
-  matchFn: (tree: ParseTree) => boolean
+  matchFn: (tree: ParseTree) => boolean,
 ): void {
   // Do a collect, but ignore the result
   collectNodesMatching(tree, matchFn);