More cleanup

Author: zefhemel

lib/data/datastore.test.ts

@@ -1,9 +1,9 @@
 import "fake-indexeddb/auto";
-import { IndexedDBKvPrimitives } from "../data/indexeddb_kv_primitives.ts";
-import { MemoryKvPrimitives } from "../data/memory_kv_primitives.ts";
-import type { KvPrimitives } from "../data/kv_primitives.ts";
+import { IndexedDBKvPrimitives } from "./indexeddb_kv_primitives.ts";
+import { MemoryKvPrimitives } from "./memory_kv_primitives.ts";
+import type { KvPrimitives } from "./kv_primitives.ts";
 import { assertEquals } from "@std/assert";
-import { PrefixedKvPrimitives } from "../data/prefixed_kv_primitives.ts";
+import { PrefixedKvPrimitives } from "./prefixed_kv_primitives.ts";
 import { DataStore } from "$lib/data/datastore.ts";
 import { LuaEnv, LuaStackFrame } from "../space_lua/runtime.ts";
 import { parseExpressionString } from "../space_lua/parse.ts";

lib/data/memory_kv_primitives.ts

@@ -1,6 +1,6 @@
-import type { KV, KvKey } from "../../plug-api/types.ts";
+import type { KV, KvKey } from "@silverbulletmd/silverbullet/types";
 import type { KvPrimitives, KvQueryOptions } from "./kv_primitives.ts";
-import { throttle } from "../../lib/async.ts";
+import { throttle } from "../async.ts";
 
 const memoryKeySeparator = "\0";
 

lib/space_lua/eval.ts

@@ -697,10 +697,9 @@ export async function evalStatement(
     }
     case "Return": {
       if (returnOnReturn) {
-        const val = await evalPromiseValues(
+        return await evalPromiseValues(
           s.expressions.map((value) => evalExpression(value, env, sf)),
         );
-        return val;
       } else {
         throw new LuaReturn(
           await evalPromiseValues(

lib/space_lua/stdlib/os.ts

@@ -176,6 +176,5 @@ export const osApi = new LuaTable({
 function dayOfYear(date: Date) {
   const start = new Date(date.getFullYear(), 0, 0);
   const diff = date.getTime() - start.getTime();
-  const dayOfYear = Math.floor(diff / ONE_DAY);
-  return dayOfYear;
+  return Math.floor(diff / ONE_DAY);
 }

lib/spaces/http_space_primitives.ts

@@ -184,8 +184,7 @@ export class HttpSpacePrimitives implements SpacePrimitives {
         body: data,
       },
     );
-    const newMeta = this.responseToMeta(name, res);
-    return newMeta;
+    return this.responseToMeta(name, res);
   }
 
   async deleteFile(name: string): Promise<void> {

lib/spaces/plug_space_primitives.ts

@@ -1,6 +1,6 @@
-import type { SpacePrimitives } from "../spaces/space_primitives.ts";
+import type { SpacePrimitives } from "./space_primitives.ts";
 import type { NamespaceOperation } from "$lib/plugos/namespace.ts";
-import type { FileMeta } from "../../plug-api/types.ts";
+import type { FileMeta } from "@silverbulletmd/silverbullet/types";
 import type { PlugNamespaceHook } from "../../web/hooks/plug_namespace.ts";
 
 export class PlugSpacePrimitives implements SpacePrimitives {

lib/spaces/sync.ts

@@ -1,6 +1,6 @@
 import type { SpacePrimitives } from "./space_primitives.ts";
-import { EventEmitter } from "../../lib/plugos/event.ts";
-import type { FileMeta } from "../../plug-api/types.ts";
+import { EventEmitter } from "../plugos/event.ts";
+import type { FileMeta } from "@silverbulletmd/silverbullet/types";
 import { plugPrefix } from "./constants.ts";
 
 type SyncHash = number;

web/cm_plugins/inline_content.ts

@@ -32,10 +32,9 @@ class InlineContentWidget extends WidgetType {
   }
 
   override get estimatedHeight(): number {
-    const cachedHeight = this.client.getCachedWidgetHeight(
+    return this.client.getCachedWidgetHeight(
       `content:${this.url}`,
     );
-    return cachedHeight;
   }
 
   override eq(other: InlineContentWidget) {

web/cm_plugins/lua_directive.ts

@@ -105,7 +105,7 @@ export function luaDirectivePlugin(client: Client) {
                     client.clientSystem.spaceLuaEnv.env,
                   );
                   threadLocalizedEnv.setLocal("_CTX", tl);
-                  const result = luaValueToJS(
+                  return luaValueToJS(
                     singleResult(
                       await evalExpression(
                         expr,
@@ -115,7 +115,6 @@ export function luaDirectivePlugin(client: Client) {
                     ),
                     sf,
                   );
-                  return result;
                 } catch (e: any) {
                   if (e instanceof LuaRuntimeError) {
                     if (e.sf?.astCtx) {

web/cm_plugins/table.ts

@@ -31,11 +31,9 @@ class TableViewWidget extends WidgetType {
   }
 
   override get estimatedHeight(): number {
-    const height = this.client.getCachedWidgetHeight(
+    return this.client.getCachedWidgetHeight(
       `table:${this.tableBodyText}`,
     );
-    // console.log("Calling estimated height for table", height);
-    return height;
   }
 
   toDOM(): HTMLElement {