@swipt/cli 0.1.0-nightly.42 → 0.1.0-nightly.43

package/metro.mjs

@@ -13,7 +13,7 @@ const cliDirectory = path.dirname(fileURLToPath(import.meta.url));
 const sourceExtensions = ["js", "jsx", "json", "ts", "tsx", "cjs", "mjs"];
 const assetExtensions = [
   "bmp", "gif", "jpg", "jpeg", "png", "psd", "svg", "webp", "xml", "m4v", "mov", "mp4", "mpeg", "mpg", "webm", "aac", "aiff", "caf",
-  "m4a", "mp3", "wav", "html", "pdf", "yaml", "yml", "otf", "ttf", "zip",
+  "m4a", "mp3", "wav", "html", "pdf", "yaml", "yml", "otf", "ttf", "zip", "db", "sqlite", "sqlite3",
 ];
 const imageExtensions = new Set(["png", "jpg", "jpeg", "bmp", "gif", "webp", "psd", "svg", "tiff", "ktx"]);
 const babelConfigNames = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swipt/cli",
-  "version": "0.1.0-nightly.42",
+  "version": "0.1.0-nightly.43",
   "license": "GPL-3.0-or-later",
   "repository": {
     "type": "git",
@@ -20,6 +20,7 @@
   },
   "dependencies": {
     "@babel/core": "^7.29.7",
+    "@babel/plugin-transform-block-scoping": "^7.29.12",
     "@babel/runtime": "^7.29.10",
     "@bufbuild/protobuf": "^2.16.0",
     "@expo/env": "^2.5.3",
@@ -30,7 +31,7 @@
     "react-native-worklets": "0.13.0"
   },
   "peerDependencies": {
-    "@swipt/api": "0.1.0-nightly.42"
+    "@swipt/api": "0.1.0-nightly.43"
   },
   "devDependencies": {
     "@bufbuild/protoc-gen-es": "^2.16.0"

package/project.mjs

@@ -7,12 +7,14 @@ import path from "node:path";
 import { parseArgs } from "node:util";
 import vm from "node:vm";
 
+import { transformAsync } from "@babel/core";
 import { build } from "esbuild";
 
 import { loadEnvironment, metro } from "./metro.mjs";
 
 const { version } = JSON.parse(fs.readFileSync(new URL("package.json", import.meta.url), "utf8"));
-const { peerDependencies } = createRequire(import.meta.url)("@swipt/api/package.json");
+const require = createRequire(import.meta.url);
+const { peerDependencies } = require("@swipt/api/package.json");
 
 const appModules = [
   "react",
@@ -27,6 +29,8 @@ const appModules = [
   "@swipt/api/swiplet",
   "@swipt/api/file-system",
   "expo-sqlite",
+  "expo-sqlite/kv-store",
+  "expo-sqlite/localStorage/install",
 ];
 const extensionModules = [
   "@swipt/api",
@@ -39,6 +43,8 @@ const extensionModules = [
   "@swipt/api/image",
   "expo-localization",
   "expo-sqlite",
+  "expo-sqlite/kv-store",
+  "expo-sqlite/localStorage/install",
 ];
 
 const idPattern = /^[a-z0-9][a-z0-9._-]{0,127}$/;
@@ -124,7 +130,10 @@ async function bundle(project) {
       logLevel: "silent",
       plugins: [...(project.extension ? [typeImport(project.extension)] : []), metro(project.root, { assets: out.assets })],
     });
-    out.app = result.outputFiles[0].text;
+    const scoped = await transformAsync(result.outputFiles[0].text, {
+      babelrc: false, configFile: false, sourceType: "script", compact: false, plugins: [require.resolve("@babel/plugin-transform-block-scoping")],
+    });
+    out.app = scoped.code;
   }
   if (out.app === "" && out.extension === "") {
     throw new Error('package.json names neither "swiplet.app" nor "swiplet.extension"');
@@ -158,6 +167,9 @@ function describeExtension(source) {
       get dataDirectory() {
         throw new Error("dataDirectory is used while extension.js loads; use it inside run or an action");
       },
+      get cacheDirectory() {
+        throw new Error("cacheDirectory is used while extension.js loads; use it inside run or an action");
+      },
       get assets() {
         throw new Error("assets is used while extension.js loads; use it inside run or an action");
       },
@@ -169,26 +181,63 @@ function describeExtension(source) {
     "@swipt/api/image": loading("image"),
     "expo-localization": { getLocales: () => [{ languageTag: "en", languageCode: "en" }], getCalendars: () => [] },
     "expo-sqlite": {
+      SQLiteDatabase: loading("SQLiteDatabase"),
+      SQLiteStatement: loading("SQLiteStatement"),
+      SQLiteTaggedQuery: loading("SQLiteTaggedQuery"),
+      SQLiteSession: loading("SQLiteSession"),
       openDatabaseSync: () => loading("the database"),
       openDatabaseAsync: () => Promise.resolve(loading("the database")),
+      deserializeDatabaseSync: () => loading("the database"),
+      deserializeDatabaseAsync: () => Promise.resolve(loading("the database")),
       deleteDatabaseSync: () => {},
       deleteDatabaseAsync: () => Promise.resolve(),
+      backupDatabaseSync: () => {},
+      backupDatabaseAsync: () => Promise.resolve(),
+      importDatabaseFromAssetAsync: () => Promise.resolve(),
       addDatabaseChangeListener: () => ({ remove: () => {} }),
       defaultDatabaseDirectory: "",
+      bundledExtensions: {},
+      configureWeb: () => {},
+      deepEqual: function deepEqual(a, b) {
+        if (a === b) {
+          return true;
+        }
+        if (a === null || b === null || typeof a !== "object" || typeof b !== "object") {
+          return false;
+        }
+        const keys = Object.keys(a);
+        return keys.length === Object.keys(b).length && keys.every(key => deepEqual(a[key], b[key]));
+      },
+      SQLiteProvider: () => {
+        throw new Error("SQLiteProvider renders React, so it works only in the swiplet interface");
+      },
+      useSQLiteContext: () => {
+        throw new Error("useSQLiteContext renders React, so it works only in the swiplet interface");
+      },
+    },
+    "expo-sqlite/kv-store": {
+      SQLiteStorage: loading("SQLiteStorage"),
+      AsyncStorage: loading("the storage"),
+      Storage: loading("the storage"),
+      default: loading("the storage"),
+    },
+    get "expo-sqlite/localStorage/install"() {
+      context.localStorage = loading("localStorage");
+      return {};
     },
   };
   const ignored = () => 0;
   const webGlobals = [
-    "MessageEvent", "CloseEvent", "ErrorEvent", "File", "FormData", "ReadableStream", "ReadableStreamDefaultReader", "ReadableStreamBYOBReader",
-    "ReadableStreamBYOBRequest", "ReadableStreamDefaultController", "ReadableByteStreamController", "WritableStream", "WritableStreamDefaultWriter",
-    "WritableStreamDefaultController", "TransformStream", "TransformStreamDefaultController", "ByteLengthQueuingStrategy", "CountQueuingStrategy",
-    "TextEncoderStream", "TextDecoderStream", "CompressionStream", "DecompressionStream", "WebSocket", "EventSource",
+    "ErrorEvent", "File", "FormData", "ReadableStream", "ReadableStreamDefaultReader", "ReadableStreamBYOBReader", "ReadableStreamBYOBRequest",
+    "ReadableStreamDefaultController", "ReadableByteStreamController", "WritableStream", "WritableStreamDefaultWriter", "WritableStreamDefaultController",
+    "TransformStream", "TransformStreamDefaultController", "ByteLengthQueuingStrategy", "CountQueuingStrategy", "TextEncoderStream", "TextDecoderStream",
+    "CompressionStream", "DecompressionStream", "performance", "Performance", "PerformanceEntry", "PerformanceMark", "PerformanceMeasure",
+    "PerformanceObserver", "PerformanceObserverEntryList",
   ];
   const context = vm.createContext({
     console, URL, URLSearchParams, TextEncoder, TextDecoder, atob, btoa, structuredClone, queueMicrotask, crypto,
-    AbortController, AbortSignal, Event, EventTarget, CustomEvent, DOMException, Headers, Request, Response, Blob,
+    AbortController, AbortSignal, Event, EventTarget, CustomEvent, DOMException, Blob,
     ...Object.fromEntries(webGlobals.map(name => [name, globalThis[name]])),
-    fetch: loading("fetch"),
     setTimeout: ignored, setInterval: ignored, clearTimeout: ignored, clearInterval: ignored,
     navigator: { userAgent: "Swipt", language: "en", languages: ["en"] },
   });
@@ -417,6 +466,8 @@ export function sourceCommand(root, given) {
   console.log(path.relative(process.cwd(), path.join(dist, "swiplets.json")));
 }
 
+const swiptRange = version.includes("-") ? version : `>=${version}-0 <=${version}`;
+
 const idOf = name => name.toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^[._-]+/, "").slice(0, 128).replace(/[._-]+$/, "") || "swiplet";
 
 const templates = {
@@ -437,8 +488,8 @@ const templates = {
         scripts: { build: "swipt project build", check: "tsc" },
         dependencies: { zod: "^4.6.7" },
         devDependencies: {
-          "@swipt/api": version,
-          "@swipt/cli": version,
+          "@swipt/api": swiptRange,
+          "@swipt/cli": swiptRange,
           typescript: "^7.0.2",
           ...Object.fromEntries(["@expo/ui", "@types/react", "react"].map(name => [name, peerDependencies[name]])),
         },

package/swipt.mjs

@@ -169,8 +169,8 @@ const commands = [
           "FILE, or standard input given as - or no argument, is a program; only its console output and thrown error are printed, and the global args holds its ARGs.",
           'Top-level await is available, and top-level bindings persist across runs until "swipt repl reset".',
           "An image given to show(), or as the completion value of CODE, is saved as a PNG file and printed as its path.",
-          'There is no module system, so import is unavailable; the globals are accessibility, input, device, screen, image, dialog, dataDirectory, show and sleep, declared by "swipt repl api".',
-          'dataDirectory is the directory that "swipt repl data" manages.',
+          'The globals are accessibility, input, device, screen, image, dialog, dataDirectory, show and sleep; import declarations and import() load the modules that swiplets get from Swipt; "swipt repl api" declares both.',
+          'dataDirectory, which also holds the expo-sqlite databases, is the directory that "swipt repl data" manages.',
         ],
         args: [0, Infinity],
         passthrough: device.isProgram,
@@ -178,7 +178,7 @@ const commands = [
         run: device.run,
       },
       { name: "reset", short: "Reset the session", args: [0, 0], run: device.reset },
-      { name: "api", short: "Print the TypeScript declarations of the globals", args: [0, 0], run: device.api },
+      { name: "api", short: "Print the TypeScript declarations of the globals and modules", args: [0, 0], run: device.api },
       dataCommands("", device.replData),
     ],
   },